[D3SOX]

Sync pingdotgg/t3code:main into main.

Merge with a merge commit to preserve fork changes and shared upstream history.

[D3SOX]

Note

🤖 Claude Opus 5.5 responding on behalf of Nico

Merged 423 upstream commits from pingdotgg/t3code (head f12527ecf0) into this branch, then merged main into it. 42 files conflicted. Fork behavior wins where the two sides changed the same thing on purpose.

Conflict decisions

• Storage cleanup: kept the fork's handling of branch changes. It reclaims a worktree after its branch changes and records the checked-out branch when it removes it, and WorktreeBranchSync backfills branches at startup. Upstream's followBranch (keep the worktree and re-record the branch on the next sweep) is dropped, along with its tests. Upstream's owning-repository removal and its later git clean are kept. The other-repository test now adds a remote-tracking ref, because the fork keeps unpublished commits.
• Attachment cleanup: upstream's skipReferenced cleanup for dropped queued-edit files is combined with the fork's thread-scoped image-preview cleanup. A queued edit no longer deletes the thread's retained previews.
• Web queue: kept the fork's composer-banner queue. Ported upstream's quiet projection (fewer re-renders while text streams) and the queued-image viewer, with a new browser test.
• Mobile queue: kept the fork's rewrite. Ported upstream's tap-to-preview thumbnails.
• Queued edits: cancelling a fork edit now releases staged uploads, as upstream's fix intends. Upstream's new test was adjusted for the fork's pause and resume calls.
• Send flow: ported upstream's batched first-send dock transition into the fork's queued send path.
• Kept the fork's mobile disabled-button look. Combined the notification gating (upstream snooze plus fork settle and silent runs), the sidebar row (upstream accessible title plus fork rename permission), and the mobile row status (upstream "opened failure is ready" plus fork branch and draft details).
• agentContextBudget.json is set to the measured values.

Proof: typecheck passes for contracts, shared, client-runtime, server, web, mobile, and desktop. Lint, format, and knip are clean. Unit and browser tests beside every conflicted file pass, including all 235 storage cleanup tests.

Reviewed with sol-loop: 2 rounds with gpt-6.1-sol on xhigh/high.
Sol verdict: approved

[D3SOX]

Note

🤖 Claude Opus 5.5 responding on behalf of Nico

The pull bot reset upstream-sync to upstream 742a91209e (340 new commits), which dropped the earlier merge. I merged it into the previous merge again: c8bc758. Both origin/main and 742a91209e are ancestors of the new head.

Conflicts (10 files):

• storageCleanup.ts: kept both import sets (fork CommandId/randomUuidV4, upstream CheckpointScopeId/Base64Url). Upstream's branch-switch followBranch did not come back; the fork's branch-change removal is unchanged.
• runtimeLayer.test.ts: kept upstream's new delegated-task resend test and the fork's settled: %s version of the held-queue wake test.
• useComposerSend.ts: kept the fork's send pipeline and ported upstream's two fixes into it: the prompt ref and cursor reset only while the sent thread is still on screen, and an image-only failure toast with no copy action. The fork opens a fresh draft after a first send, so an interrupted launch left no notice at all. It now shows "Message may not have been sent" with an "Open draft" action, which makes upstream's new ChatView browser test pass.
• ChatComposer.tsx: upstream's usePendingUserInputDraft hook plus the fork's context-window and compact props.
• Mobile thread-list-v2-items.tsx: upstream's threadListV2RowAccessibilityLabel, extended with the fork's "unsent draft" part (test row added).
• useThreadActions.ts: kept the fork's delete navigation; dropped upstream's now-unused fallback thread lookup.
• preload.ts: both focusWindow and restartAudioService.
• pnpm-workspace.yaml: upstream's @cursor/sdk 1.3.1 and micromark-util-decode-string, the fork's micromark-util-types 2.0.3 and expo-observe patch. Lockfile regenerated.
• agentContextBudget.json: re-measured (MCP tool list 52772 bytes).

Also fixed after the merge: pullRequestWatch.test.ts (upstream's new case needed the fork's host/repository fields) and the web fake environment now advertises attachmentUploads, as the real server does.

Checks: typecheck passes for contracts, shared, client-runtime, server, web, mobile, and desktop; lint, fmt, and knip are clean; server (505), mobile thread (359), web thread-action, and the six fake-environment browser test files pass.