[joaoheusi]

Problem

The fork's main was behind pingdotgg/t3code by 339 commits (through 65b4a69407). This merges the latest upstream/main into the fork.

How I fixed it

Merged upstream/main into t3/merge-latest-upstream and resolved 35 conflicted files, keeping fork features (Muse provider, quick actions, multi-repository workspaces, model fallback chain, J4 branding and home directory) working on the new upstream code.

Notable resolutions:

• Mobile outbox: ported the fork's workspace-configuration creation and pull-request checkout steps into upstream's new atom-driven threadOutboxDelivery; the fork's use-thread-outbox-drain hook is gone.
• Mobile new-task flow: took upstream's derived branch defaults and project-defaults hook; kept repository selection, workspace configuration, and the model fallback chain. Upstream removed the pending-task editor as unreachable (refactor(mobile): drop the unreachable pending-task editor from new-task drafts pingdotgg/t3code#25684); the fork had no producer for pendingTaskId either, so the removal stands.
• Mobile header toolbar: upstream now solves the stale-handler problem the fork fixed in fix(mobile): native header buttons run their current handler #56, with committed-only handlers; took upstream's mechanism and its test coverage.
• Codex: upstream dropped its own developer instructions for native collaboration modes; the fork's multi-repository workspace instructions still ride in developer_instructions when present.
• Web settings routes moved under _chat.settings; moved the fork's quick-actions settings route with them and regenerated the route tree.
• Web chat: background-work and pending-handoff notices now live in upstream's timeline footer instead of the fork's composer banners.
• Updated fork server code for upstream's new Effect diagnostics (Effect.fn forms, orElseSucceed, filterOrElse, single pipe calls) and pruned 16 stale React Compiler bailout entries that compile now.
• Kept the fork's default port (4773), ~/.j4code home, and j4code CLI command against upstream's new telemetry channel, launcher path, and 500 MiB dev-seed limit.

Verification: web build passes. Format, lint, and knip pass. Typecheck passes for all 36 affected packages. Focused tests pass for settlement, Codex multi-root turns, workspace repositories, composer drafts, thread outbox, header toolbar, desktop CLI, dev-runner, and React Compiler coverage (982 tests).

The full changed-test run (644 files, 9,561 tests) has 37 failures in 11 files, triaged as:

• 24 update tests (DesktopUpdates, cli/update, selfUpdate): pre-existing on the fork's main. The fork hard-disables updates (forkUpdatesEnabled() is false, desktop disableAutoUpdate is true); the upstream tests were never adapted to that.
• 6 tests in pure-upstream packages (provider-fx, UsageService, AntigravityAdapterV2, ServerEnvironment): they compare /var/folders/... temp paths against /private/var/folders/... realpaths on this Mac. The code is byte-identical to upstream; this is a local macOS tmpdir artifact.
• composer-attachment-uploads fails to load with __DEV__ is not defined from expo setup; the module and test are byte-identical to upstream.
• 4 PullRequestDetailPanel browser tests for "Resolve conflicts" and 1 GuestPage scroll test fail locally. The Resolve-conflicts delivery goes through the fork's task-destination flow and needs a follow-up look against upstream's new shell/context plumbing.

Work performed with Muse Code (muse-wonder-full-1.0).