[shuv1337]

Why

This brings the 12 new upstream t3code commits up to tag v0.1.8-nightly.20261106.4288 into s2code as one merge that keeps their history, without losing any fork-only behavior.

This PR is not fully green locally. Two tests fail on the local machine. Both also fail at BASE and come from the machine's setup (details below). CI Full is being run on this branch.

Pins

• Base is main at 44d5caf39ec85cb4f25c068769035019a2d6cbcd (merge of test: fix CI Full fixtures (contracts mock, VoiceProvider caret, connect unlink product home) #420, which contains ec886172).
• Upstream is lightweight tag v0.1.8-nightly.20261106.4288 on 32a0531748c44b25072d7495ce0b9bd7e9450a87.
• The merge-base is 6577c6b6185167c0e502fa01f9e8e8f2dee6ff25. Upstream was 12 commits ahead and the fork was 802 ahead.
• The merge commit is 085f0c9f9b85cb00dd313ab2f06c1f06d9623c9d. Its parents are base and upstream, and its message follows chore(sync): merge upstream t3code through 6577c6b (nightly .4275) #419.

Conflicts

Git reported zero textual conflicts. These 10 files were changed on both sides. Git merged them cleanly, and the only new lines are upstream's.

File	Upstream intent	Fork intent	Decision
ClaudeAdapterV2.ts, CodexAdapterV2.ts	Stop tracing a per-event check (Effect.fnUntraced)	Unrelated additions	Take both
ProjectionStore.ts and ProjectionStore.test.ts	Faster query for a thread's provider rows	Unrelated additions	Take both
ThreadSettlementService.ts	Run merged-PR cleanup in a separate background git lane	Settlement changes	Take both
GitVcsDriverCore.ts and GitVcsDriverCore.test.ts	Background git work gets its own 2-slot limit	Path and worktree changes	Take both
provider-cursor/.../accountUsage.ts	Stop tracing the per-event hash	One-line change	Take both
provider-muse/.../adapter.ts and adapter.test.ts	Report an unavailable session view as an error	Unrelated additions	Take both

Upstream changes near protected areas

These merged without conflict. None of them change a protected behavior.

• VoiceInputPill.tsx, VoiceSettingsPanel.tsx, AssistantCitationCommentEditor.tsx, and apps/desktop/src/preview/PickPreload.ts change voice layout and add sorting and filtering for transcription models. None of them touch GPT-Live or the voice audit log.
• apps/web/src/components/ui/popover.tsx drops a slide-in animation on popovers that stay mounted. It doesn't change any colors.
• AnnotationStyles.generated.ts adds .sr-only and drops two unused classes. It doesn't touch the canvas.
• The three apps/mobile/src/features/pull-requests/* files are the pull-request markdown renderer, not the fix(mobile): saved environments survive a catalog this build cannot fully read #412 catalog.

Omissions

None. I searched every line upstream added for official branding (t3.codes, T3 Code, t3code, pingdotgg, official, App Store, Google Play, T3 Connect, ping.gg, marketing, download). The only hits were "download" in the speech-model filter. I also checked the paths upstream changed. None of them are under .github, apps/marketing, docs, branding, or identity.

Protected files

All checks below were run on the merge commit's files, not just its history.

• Merge footprint. The merge changed exactly the 36 files upstream changed. None of them belong to feat(server): persist redacted voice session logs #411, fix(mobile): saved environments survive a catalog this build cannot fully read #412, fix: pooled threads stay on their placed account across turns #413, or test: fix CI Full fixtures (contracts mock, VoiceProvider caret, connect unlink product home) #420.
• Unchanged since base. All 49 files from those four PRs are byte-identical to base. So are .github, apps/marketing, and the canvas, identity, voice, and mobile catalog paths (index.css, themePalette.ts, packages/shared/src/themePalettes.ts, packages/shared/src/productHome.ts, apps/desktop/src/app, apps/web/src/voice, apps/server/src/voice, apps/mobile/src/connection).
• Canvas. #0c1119 is still in apps/web/src/index.css, apps/web/src/themePalette.ts, packages/shared/src/themePalettes.ts, and the mobile theme files.
• Workflows. The release workflows are unchanged. .github/workflows/desktop-macos-preview.yml is still absent.
• test: fix CI Full fixtures (contracts mock, VoiceProvider caret, connect unlink product home) #420 fixtures. All three are in place.
  • ensureProductHome(baseDir) is at apps/server/src/cli/connect.test.ts:92.
  • The partial vi.mock("@t3tools/contracts", ...) that spreads the original module is at apps/web/src/hooks/useHandleNewThread.test.ts:152.
  • The caret case at apps/web/src/components/CommandPalette.composition.browser.test.tsx:146 is still wrapped in <VoiceProvider>.

Local test results

• vp test run apps/server/src/cli/connect.test.ts apps/web/src/hooks/useHandleNewThread.test.ts apps/web/src/components/CommandPalette.composition.browser.test.tsx passed 21 of 21 across 3 files.
• vp run check:changed failed. Format, lint, knip, graphql, typecheck (13 packages), and the React compiler check passed. Tests were 1108 passed and 2 failed across 22 files, plus a second batch of 14 passed.
• vp test run on the 10 test files the merge touched gave 414 passed and 1 failed.

Both failures also fail at base 44d5caf3 with the same assertions (2 failed, 307 passed in a temporary worktree). They come from the local machine's setup.

• GitVcsDriver.test.ts "lists the fetch and push URLs of a partial clone remote" fails because the global git config rewrites https://github.com/ to git@github.com:.
• GitVcsDriverCore.test.ts "keeps generated worktree folders short without changing long branch names" fails because macOS temp paths resolve from /var to /private/var.

Risks

• The new provider-thread query names an index directly (INDEXED BY orchestration_v2_projection_provider_threads_owner_idx). Migration 055_OrchestrationV2.ts creates it, and the ProjectionStore tests pass. A database that lacks the index would fail at query time.
• No full suite was run locally. CI Full is running on this branch.
• Nobody has checked the upstream voice and popover layout changes in a real client.

Done by claude-opus-5-5 in T3 Code through the Cursor harness.