[joaoheusi]

The fork is 294 commits behind pingdotgg/t3code. PR #47 landed as a squash, so it also cut the history link to upstream again.

Please land this with a merge commit, not a squash. A squash drops the upstream history this PR restores, and the next sync then replays conflicts that are already resolved.

What changed

• History link restored. The first commit is a content-free "ours" merge of PR chore: merge upstream updates and restore mobile model selection #47's head (b7b2427fc7). That head has the same tree as the squash commit f4dd65980a, so the record is accurate. With it, the real merge conflicts in 63 files instead of hundreds.
• Upstream merged through 80455376f0.
• Migrations. Upstream's new migrations 68 (ShellStopRequestIndex) and 69 (ThreadMessageSearch) are appended as 74 and 75. Released fork migration ids 59 to 73 are unchanged. The fork upgrade and reconcile tests now expect migrations through 75.
• Fork identity kept. This covers versions (0.1.0-j4.14), the .j4code home, the desktop app id, the URL scheme, and the CLI name. The mobile native version moves to upstream's 2.1.0, which is higher than the fork's 2.0.1.
• Fork code adapted to upstream changes:
  • Upstream moved pull request URL and key helpers into the source-control packages. WorkspaceRepositorySync and ThreadRepositoriesSection now use them.
  • The fork-only GitManager tests now use upstream's rewritten provider test helper.
  • The fork-only ServerBrowser tests now await fixture events instead of polling, as upstream's new lint rule requires.
  • Fork comments are cut to upstream's new limit of four lines. One em dash in product copy is replaced.

Judgment calls worth a look

• Mobile new-thread flow. Upstream (fix(mobile): unify draft and thread navigation and composer behavior pingdotgg/t3code#23467) replaced the separate new-thread sheet stack with the shared thread composer. The fork's multi-repository picker, folder-project labels, and workspace locks were moved onto it. The fork's separate quick-actions route for drafts was dropped, because the shared composer shows quick actions for drafts too.
• Mobile composer. The fork's design from fix(mobile): composer opens as a card while typing #54 is kept: one row when idle, a card while focused. Because of this, upstream's growing row editor is not used, and its alignment fixes are only partly present.
• Handoff preview (client-runtime/handoff.ts). The fork hides the preview while a run is still preparing or queued (fix(clients): show pending handoffs beside the composer #36), because that run already consumes the handoff and the fork shows pending handoffs beside the composer. Upstream's fix(client-runtime): avoid duplicate handoff previews during startup pingdotgg/t3code#24349 hides it only once the run starts, so the fork rule includes upstream's case. The fork behavior is kept, and the two upstream test cases that expected otherwise were removed. The fork's own test had an empty timeline and never reached this rule. It now has a real timeline.
• Thread settlement. Upstream's change to inactivity settlement (fix(server): settle inactive threads with persisted open PR links pingdotgg/t3code#24617) is merged. Threads with several repositories keep the fork's stricter rule that every pull request must be merged.
• Web. Upstream split ChatView into hooks. The fork's first send for multi-repository threads now lives in useComposerSend.

Verification

• Typecheck passes for server, web, mobile, desktop, client-runtime, contracts, shared, provider-muse, and scripts.
• scripts/verify-fork.sh: 776 passed, 7 failed. Tests beside every file with a conflict or fix: 1346 passed, 3 failed. Browser tests: 46 passed, 4 failed.
• All of these failures also fail on the current fork main, which I checked in a separate checkout. They are pre-existing and out of scope here:
  • Linux theme icon tests, which assume a case-sensitive filesystem.
  • CheckpointDiffQuery.
  • build-desktop-artifact.
  • PullRequestDetailPanel "Resolve conflicts".
• Lint and format on all fork-changed files report no new errors compared with main. Knip output is identical to main.
• migrate-dev-db ran on a read-only snapshot of the real fork database at ~/.j4code. Migrations 74 and 75 applied cleanly. The live database was not written.
• Not tested: iOS and Android devices (the mobile composer and new-thread flow need a device check), a desktop build, a live provider turn, and remote connections.

Model: Claude Opus 5.5 through Claude Code in T3 Code. Three parallel subagents of the same model resolved the mobile, web, and server conflicts.