# fix: repair rerere-damaged files and reconcile main's round-3 features with v2 · pingdotgg/t3code

[View on GitCafe](https://git.cafe/pingdotgg/t3code/commit/3bb5fe8ddf3a1f56d1c03b767fe4031d32f5d40d)

Repository: [pingdotgg/t3code](https://git.cafe/pingdotgg/t3code)

Visibility: public

Requested revision: 3bb5fe8ddf3a1f56d1c03b767fe4031d32f5d40d

Requested commit: 3bb5fe8ddf3a1f56d1c03b767fe4031d32f5d40d

Commit: 3bb5fe8ddf3a1f56d1c03b767fe4031d32f5d40d

Tree: fadb2bcc42fe733dce88a8332ebfe3d647d55776

Author: Julius Marminge

Committer: Julius Marminge

## Message

```
fix: repair rerere-damaged files and reconcile main's round-3 features with v2

Post-rebase reconciliation sweep:
- Sidebar: main's folded Sidebar.tsx/Sidebar.logic.ts adapted to v2 shells
  (latestRun/runtime naming, waiting status instead of monitoring), with
  subagent-thread filtering and main's pinned-reorder helpers re-exported
- Pinned drag reorder (#5581) ported into v2: thread.pin orderKey +
  thread.pin.reorder command, thread.pin-reordered event, Orchestrator fold,
  ProjectionStore/Maintenance, client-runtime commands and shell mapping
- Project favicon (#4849-era) and defaultThreadEnvMode flowed through v2
  contracts (OrchestrationProjectShell, application event payloads)
- ChatView: main's #5592 header props, pull-request right-panel surfaces,
  liveAgentCount badge (#5745) wired into the v2 panel layout
- enableAssistantStreaming -> enableLegacyTokenStreaming rename applied to
  v2 RunExecutionService and replay testkit
- Removed v1 zombies resurrected by the rebase (provider service/reaper/
  ingestion + v1 layer tests, server.test.ts, integration harness)
- routeTree: main's tree + branch's /settings/scheduled-tasks route
- Misc marker-sweep syntax repairs (rpc.ts, entities.ts, localApi.test.ts,
  rightPanelStore.test.ts, GitManager.test.ts, mobile model menu helpers)

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

```

## Parents

- [6f3645a995df1c839a0346b28b817f0f2ae7b20a](https://git.cafe/pingdotgg/t3code/commit/6f3645a995df1c839a0346b28b817f0f2ae7b20a?format=markdown)

[Source at this commit](https://git.cafe/pingdotgg/t3code/tree/3bb5fe8ddf3a1f56d1c03b767fe4031d32f5d40d?format=markdown)