[adampeterhiggins]

What's in this sync

131 upstream commits add Kiro as an ACP provider, improve provider and thread recovery, and reduce work during startup, streaming, and background operations.

New features

• Kiro is available as an ACP provider (feat(provider-kiro): add Kiro as an ACP provider pingdotgg/t3code#14693).
• Source-control host tokens can come from a secret provider (feat(server): read source control host tokens from a secret provider pingdotgg/t3code#27756).
• The web app can ask for a GitHub star while idle and celebrate a completed star (feat(web): ask for a GitHub star when idle, and star in one click pingdotgg/t3code#29922, feat(web): celebrate a GitHub star with confetti pingdotgg/t3code#29987).

Fixes

• Claude imports, nested subagents, compaction chains, wake runs, and completion delivery recover more reliably. Codex unknown errors, interrupted usage, background output, and checkpoint restore are handled correctly.
• OpenCode 2 history, upgrades, forks, pending work, and skill reads are repaired; Cursor compaction, usage after SDK sign-in, and SDK write failures are handled; Pi holds messages through compaction.
• T3 Connect repairs drifted tunnel ingress, clients reconnect through misleading offline states, and PR watches survive host failures.
• Mobile keeps conversations steady through layout changes, refreshes rewritten chat images, improves attachment uploads, and reports merge states accurately. Web fixes include sidebar accessibility, checkout grouping, terminal controls, and diff formatting.
• Desktop packaging fixes cover Linux permissions, Linux startup helpers, macOS x64 bytecode, and bytecode generation after the Effect update.

Notable internal changes

• Effect moves to 4.1.2 and alchemy to beta.85 (chore(deps): upgrade Effect to 4.1.2 and alchemy to beta.85 pingdotgg/t3code#26833).
• Server queries for recovery, compaction, task cancellation, thread snapshots, shell updates, and diffs do less work. Client streaming and PDF previews avoid redundant processing.
• Changed-file verification now covers Astro components and handles ignored files correctly.

Discord announcements were not used: the requested channel contained no announcement crossposts matching this commit range.

Other commits improve Unicode-safe titles/context labels, file-link paths, Git host link and review handling, provider updates, scheduled webhook dispatch, and docs for recurring tasks and managed links.

Complete upstream commit list (131 commits)

• 701e13c fix(web): hide image action tooltip in expanded viewer (fix(web): hide image action tooltip in expanded viewer pingdotgg/t3code#29329)
• 22b5252 feat(server): log fast and ultrafast service tiers in analytics (feat(server): log fast and ultrafast service tiers in analytics pingdotgg/t3code#29348)
• ac8dce0 fix(marketing): show 40k+ GitHub stars (fix(marketing): show 40k+ GitHub stars pingdotgg/t3code#29362)
• edc37c9 fix(web): center authorized client settings rows (fix(web): center authorized client settings rows pingdotgg/t3code#29382)
• 5e966bc fix(mobile): keep One UI navigation and Compose on one row (fix(mobile): keep One UI navigation and Compose on one row pingdotgg/t3code#29203)
• d833184 perf(server): bound runtime recovery reads by thread ownership (perf(server): bound runtime recovery reads by thread ownership pingdotgg/t3code#29429)
• 7cf653b perf(server): narrow delegated recovery reads to delivery records (perf(server): narrow delegated recovery reads to delivery records pingdotgg/t3code#29435)
• c8a601c fix(cursor): /compact compacts with the SDK's summarize (fix(cursor): /compact compacts with the SDK's summarize pingdotgg/t3code#29398)
• ed8833f fix(mobile): pending auto-merge shows in the merge button (fix(mobile): pending auto-merge shows in the merge button pingdotgg/t3code#29465)
• 8657eec fix(server): defer Tailscale endpoint discovery during startup (fix(server): defer Tailscale endpoint discovery during startup pingdotgg/t3code#29432)
• 0847a44 fix(mobile): merge button names merged, closed, draft, and conflict states (fix(mobile): merge button names merged, closed, draft, and conflict states pingdotgg/t3code#29486)
• 1416947 test(evals): guard how agents tell threads from tasks and subagents (test(evals): guard how agents tell threads from tasks and subagents pingdotgg/t3code#27138)
• 9bcf753 fix(server): background agent asks go to delegate_task, not a background Agent (fix(server): background agent asks go to delegate_task, not a background Agent pingdotgg/t3code#27139)
• 84537c4 feat(server): read source control host tokens from a secret provider (feat(server): read source control host tokens from a secret provider pingdotgg/t3code#27756)
• a497f7b fix(web): confirm before removing a provider instance's saved settings (fix(web): confirm before removing a provider instance's saved settings pingdotgg/t3code#29480)
• 3ddd398 fix(server): settled threads no longer re-send relay clears on every PR update (fix(server): settled threads no longer re-send relay clears on every PR update pingdotgg/t3code#29369)
• a821f03 fix(client-runtime): connection diagnosis no longer blames the host while this device's sign-in loads (fix(client-runtime): connection diagnosis no longer blames the host while this device's sign-in loads pingdotgg/t3code#29352)
• 6f41364 fix(opencode): Claude usage limits through OpenCode keep their reset time (fix(opencode): Claude usage limits through OpenCode keep their reset time pingdotgg/t3code#29301)
• bdf5806 fix(desktop): prepare macOS x64 bytecode under Rosetta (fix(desktop): prepare macOS x64 bytecode under Rosetta pingdotgg/t3code#29484)
• cc59f99 fix(server): keep PR watches active after host failures (fix(server): keep PR watches active after host failures pingdotgg/t3code#29450)
• af00cf7 fix(cursor): show Cursor usage after signing in with Cursor (fix(cursor): show Cursor usage after signing in with Cursor pingdotgg/t3code#29419)
• cbd3e14 perf(server): skip redundant claude session naming (perf(server): skip redundant claude session naming pingdotgg/t3code#28910)
• a9ac1e8 fix(mobile): keep the conversation steady during layout changes (fix(mobile): keep the conversation steady during layout changes pingdotgg/t3code#29545)
• 60aec28 feat(marketing): fetch GitHub stars at build time (feat(marketing): fetch GitHub stars at build time pingdotgg/t3code#29555)
• 065a433 perf(server): pin the index for the unscoped agent event high-water (perf(server): pin the index for the unscoped agent event high-water pingdotgg/t3code#29623)
• 30084f0 perf(web): the pull request code tab derives its file model once per diff load (perf(web): the pull request code tab derives its file model once per diff load pingdotgg/t3code#27833)
• ea16fcb perf(server): stop tracing project enrichment cache reads (perf(server): stop tracing project enrichment cache reads pingdotgg/t3code#29640)
• 8648aea perf(server): seek live nodes for the subagent recovery probe (perf(server): seek live nodes for the subagent recovery probe pingdotgg/t3code#29644)
• 55e2538 feat(provider-kiro): add Kiro as an ACP provider (feat(provider-kiro): add Kiro as an ACP provider pingdotgg/t3code#14693)
• a036489 revert(web): undo hover timestamp change from fix(web): finished replies keep their hover timestamp while commands run pingdotgg/t3code#28610 (revert(web): undo hover timestamp change from #28610 pingdotgg/t3code#29680)
• bad610b perf(server): idle compaction reads only the latest run, live work and newest usage (perf(server): idle compaction reads only the latest run, live work and newest usage pingdotgg/t3code#29648)
• 71646e0 perf(server): cancelling a task reads only the tasks and runs it uses (perf(server): cancelling a task reads only the tasks and runs it uses pingdotgg/t3code#29652)
• 5b9731c fix(web): screen readers can browse and Tab through the threads sidebar again without going into focus mode (fix(web): screen readers can browse and Tab through the threads sidebar again without going into focus mode pingdotgg/t3code#26690)
• 57cd059 chore(deps): upgrade Effect to 4.1.2 and alchemy to beta.85 (chore(deps): upgrade Effect to 4.1.2 and alchemy to beta.85 pingdotgg/t3code#26833)
• d8a829e perf(web): PDF previews reload without starting a new pdf.js worker (perf(web): PDF previews reload without starting a new pdf.js worker pingdotgg/t3code#29626)
• f6503f0 fix(mobile): shorten the iOS undo toast and balance its insets (fix(mobile): shorten the iOS undo toast and balance its insets pingdotgg/t3code#29775)
• 2d2299a fix(web): file save session browser test no longer hangs on the discovery poll (fix(web): file save session browser test no longer hangs on the discovery poll pingdotgg/t3code#29813)
• 92dee20 fix(server): Changes totals no longer diff against a guessed base after a branch rename (fix(server): Changes totals no longer diff against a guessed base after a branch rename pingdotgg/t3code#26125)
• 3c59595 perf(server): skip unused parent history in linked task status (perf(server): skip unused parent history in linked task status pingdotgg/t3code#27913)
• 6a61904 fix(server): native Claude updates use the native release feed (fix(server): native Claude updates use the native release feed pingdotgg/t3code#27958)
• e2d3aa9 fix(tailscale): escalate hung serve commands to SIGKILL (fix(tailscale): escalate hung serve commands to SIGKILL pingdotgg/t3code#28529)
• 948433d refactor(server): provider registry owns explicit model cache invalidation (refactor(server): provider registry owns explicit model cache invalidation pingdotgg/t3code#19599)
• 0b2c13a perf(server): bound ordinal recovery to selected messages (perf(server): bound ordinal recovery to selected messages pingdotgg/t3code#27495)
• 1d80d0e fix(client-runtime): branch picker shows branches changed outside T3 Code (fix(client-runtime): branch picker shows branches changed outside T3 Code pingdotgg/t3code#27438)
• f981b7a perf(client): skip idle inbox placement serialization (perf(client): skip idle inbox placement serialization pingdotgg/t3code#27460)
• 8430db6 fix(server): project content search finds matches past a line's first 512 characters (fix(server): project content search finds matches past a line's first 512 characters pingdotgg/t3code#29167)
• ab06e2a fix(clients): attachment sizes just under 1 MB no longer read "1024 KB" (fix(clients): attachment sizes just under 1 MB no longer read "1024 KB" pingdotgg/t3code#29165)
• a4f4741 fix(gitlab): merge request links keep an HTTP remote's port and scheme (fix(gitlab): merge request links keep an HTTP remote's port and scheme pingdotgg/t3code#29170)
• 064cf8f fix(server): an upstream shadowed by a local origin/ branch keeps its real remote (fix(server): an upstream shadowed by a local origin/<branch> branch keeps its real remote pingdotgg/t3code#29180)
• 5815442 fix(server): turn diffs keep signed commits' files under log.showSignature (fix(server): turn diffs keep signed commits' files under log.showSignature pingdotgg/t3code#29124)
• 50106ef fix(server): generated commit and PR text no longer reads colored git output (fix(server): generated commit and PR text no longer reads colored git output pingdotgg/t3code#29126)
• 4494faa fix(client-runtime): checking out a pull request refreshes cached branch lists (fix(client-runtime): checking out a pull request refreshes cached branch lists pingdotgg/t3code#29161)
• 5fa0d0b fix(clients): cancel oversized project icon responses (fix(clients): cancel oversized project icon responses pingdotgg/t3code#29006)
• d1e5044 fix(shared): context chip labels no longer split an emoji at the 200-character cap (fix(shared): context chip labels no longer split an emoji at the 200-character cap pingdotgg/t3code#29158)
• 448c1ac fix(server): create_threads titles no longer end in a broken character (fix(server): create_threads titles no longer end in a broken character pingdotgg/t3code#29163)
• 6739dd7 perf(server): thread snapshots skip serializing a row past the row limit (perf(server): thread snapshots skip serializing a row past the row limit pingdotgg/t3code#29103)
• 071660e fix(server): Uncommitted review keeps a staged deletion that git pairs into a rename (fix(server): Uncommitted review keeps a staged deletion that git pairs into a rename pingdotgg/t3code#29571)
• a565d89 fix(cli): t3 thread start titles no longer end in a broken character (fix(cli): t3 thread start titles no longer end in a broken character pingdotgg/t3code#29563)
• 89c2a5c perf(client-runtime): expanding deferred work skips an unused timeline rebuild (perf(client-runtime): expanding deferred work skips an unused timeline rebuild pingdotgg/t3code#29114)
• b1913b9 fix(server): honor relocated systemd user configuration (fix(server): honor relocated systemd user configuration pingdotgg/t3code#29244)
• 5231459 fix(web): review comments keep a trailing blank line in their diff (fix(web): review comments keep a trailing blank line in their diff pingdotgg/t3code#29575)
• dfbafee fix(server): side chat and merge-back context no longer cut an emoji in half (fix(server): side chat and merge-back context no longer cut an emoji in half pingdotgg/t3code#29572)
• a5e7e5b perf(server): loading a file's diff skips unused repository lookups (perf(server): loading a file's diff skips unused repository lookups pingdotgg/t3code#29115)
• 87e13d3 fix(cli): make relative install homes produce working commands (fix(cli): make relative install homes produce working commands pingdotgg/t3code#29241)
• c3cfb5e fix(forgejo): dismissed reviews no longer read as requested changes or approvals (fix(forgejo): dismissed reviews no longer read as requested changes or approvals pingdotgg/t3code#29567)
• efcb937 fix(shared): Linux file links preserve literal backslashes (fix(shared): Linux file links preserve literal backslashes pingdotgg/t3code#29245)
• 5349ecb fix(gitcafe): PR link previews show a GitHub-merged pull request as merged (fix(gitcafe): PR link previews show a GitHub-merged pull request as merged pingdotgg/t3code#29595)
• ba962f2 fix(codex): restoring a checkpoint works after the Codex session was archived (fix(codex): restoring a checkpoint works after the Codex session was archived pingdotgg/t3code#29582)
• cf48ea8 perf(acp): ACP agents skip decoding output twice for unused diagnostics (perf(acp): ACP agents skip decoding output twice for unused diagnostics pingdotgg/t3code#29100)
• 35af849 fix(server): diffs keep blank context lines under diff.suppressBlankEmpty (fix(server): diffs keep blank context lines under diff.suppressBlankEmpty pingdotgg/t3code#29579)
• f639c15 fix(scripts): check:changed passes when only lint-ignored code changed (fix(scripts): check:changed passes when only lint-ignored code changed pingdotgg/t3code#29596)
• a6a921c perf(client): streamed row updates no longer rescan question history (perf(client): streamed row updates no longer rescan question history pingdotgg/t3code#29105)
• 5eb8154 perf(desktop): keep Linux MIME helpers off the startup path (perf(desktop): keep Linux MIME helpers off the startup path pingdotgg/t3code#29247)
• e051363 perf(server): shell updates read a burst of threads once (perf(server): shell updates read a burst of threads once pingdotgg/t3code#29101)
• ae1ccb1 fix(opencode): forks from compacted threads no longer fail (fix(opencode): forks from compacted threads no longer fail pingdotgg/t3code#29221)
• 8cebee4 fix(scripts): check:changed lints Astro components and runs knip for them (fix(scripts): check:changed lints Astro components and runs knip for them pingdotgg/t3code#29573)
• e72a0c7 fix(desktop): Linux .deb no longer installs files any local user can overwrite (fix(desktop): Linux .deb no longer installs files any local user can overwrite pingdotgg/t3code#28351)
• 9f63268 fix(desktop): native builds prepare server bytecode again after the Effect 4.1.2 upgrade (fix(desktop): native builds prepare server bytecode again after the Effect 4.1.2 upgrade pingdotgg/t3code#29780)
• 30b9c4a fix(codex): a background command's wake no longer hangs when its output tail splits an emoji (fix(codex): a background command's wake no longer hangs when its output tail splits an emoji pingdotgg/t3code#29168)
• 07846fc test(scripts): expect the unmatched-pattern flag in the Astro check:changed test (test(scripts): expect the unmatched-pattern flag in the Astro check:changed test pingdotgg/t3code#29839)
• 927a2c6 fix(mobile): drafts on threads with colons in their ids upload attachments early (fix(mobile): drafts on threads with colons in their ids upload attachments early pingdotgg/t3code#29717)
• d0f5ae6 fix(server): provider refresh no longer reverts an enriched sign-in status (fix(server): provider refresh no longer reverts an enriched sign-in status pingdotgg/t3code#29627)
• ff73c4c fix(server): forked Claude threads keep their compaction chain (fix(server): forked Claude threads keep their compaction chain pingdotgg/t3code#27577)
• 709cfb3 fix(server): Claude subagents left by a stopped process no longer stay Running (fix(server): Claude subagents left by a stopped process no longer stay Running pingdotgg/t3code#28356)
• 95414cf fix(server): usage-limit auto-resume no longer arms children of settled parents (fix(server): usage-limit auto-resume no longer arms children of settled parents pingdotgg/t3code#27951)
• 727a502 fix(cursor): a write-after-end in the Cursor SDK no longer stops the server (fix(cursor): a write-after-end in the Cursor SDK no longer stops the server pingdotgg/t3code#27703)
• 65aaf97 fix(server): avoid reparsing streamed replies for timestamps (fix(server): avoid reparsing streamed replies for timestamps pingdotgg/t3code#25252)
• f2513bd fix(web): project settings can set a checkout's grouping rule again (fix(web): project settings can set a checkout's grouping rule again pingdotgg/t3code#23641)
• 42ca7c0 fix(server): reject oversized goal objectives before dispatch (fix(server): reject oversized goal objectives before dispatch pingdotgg/t3code#23033)
• 07a1e79 fix(server): checkpoints no longer rehash every file when one entry is skip-worktree or assume-unchanged (fix(server): checkpoints no longer rehash every file when one entry is skip-worktree or assume-unchanged pingdotgg/t3code#23624)
• e0f69e9 fix(web,mobile): chat images reload when the agent rewrites the file (fix(web,mobile): chat images reload when the agent rewrites the file pingdotgg/t3code#29741)
• e1e520c fix(web): show the project pin before the remote badge (fix(web): show the project pin before the remote badge pingdotgg/t3code#29704)
• 84547b9 fix(server): Codex usage keeps requests from interrupted turns (fix(server): Codex usage keeps requests from interrupted turns pingdotgg/t3code#29415)
• 1436c45 fix(client-runtime): connect to the primary environment while the browser reports offline (fix(client-runtime): connect to the primary environment while the browser reports offline pingdotgg/t3code#29347)
• 48c8cf7 fix(server): a failed worktree add no longer leaves its new branch behind (fix(server): a failed worktree add no longer leaves its new branch behind pingdotgg/t3code#28373)
• 8c9945d fix(provider-acp): Kiro's html_render pages show in the thread (fix(provider-acp): Kiro's html_render pages show in the thread pingdotgg/t3code#28253)
• f80be8e fix(server): streamed Browser clicks no longer wait behind queued wheel bursts (fix(server): streamed Browser clicks no longer wait behind queued wheel bursts pingdotgg/t3code#28236)
• 997e3f3 fix(server): Codex turns that fail with an unlisted error code no longer stay running (fix(server): Codex turns that fail with an unlisted error code no longer stay running pingdotgg/t3code#28040)
• 503488d fix(opencode): sessions open through OpenCode 2 after an in-place upgrade from 1.x (fix(opencode): sessions open through OpenCode 2 after an in-place upgrade from 1.x pingdotgg/t3code#27779)
• 607e373 fix(server): T3 Connect not-linked fix no longer tells Desktop users to run t3 service restart (fix(server): T3 Connect not-linked fix no longer tells Desktop users to run t3 service restart pingdotgg/t3code#27660)
• 371e945 fix(server): anchor Claude wake cooldowns to result arrival (fix(server): anchor Claude wake cooldowns to result arrival pingdotgg/t3code#25061)
• 16fd1a4 fix(web): match new-thread hero to selected checkout (fix(web): match new-thread hero to selected checkout pingdotgg/t3code#25064)
• d3d7f03 fix(server): stop PR lookups in emptied worktree folders (fix(server): stop PR lookups in emptied worktree folders pingdotgg/t3code#24803)
• 71a7bf9 fix(server): agent session scans no longer hang the server on an unreadable .git/config (fix(server): agent session scans no longer hang the server on an unreadable .git/config pingdotgg/t3code#23690)
• 371c9a9 docs(connect): held webhooks are kept per managed link (docs(connect): held webhooks are kept per managed link pingdotgg/t3code#23612)
• 0ad3dc1 fix(server): delegated children keep replies after their parent settles (fix(server): delegated children keep replies after their parent settles pingdotgg/t3code#23456)
• 6e58094 fix(preview): explain invalid URLs and locators (fix(preview): explain invalid URLs and locators pingdotgg/t3code#23396)
• 296b089 fix(web): terminal controls no longer cover the first line (fix(web): terminal controls no longer cover the first line pingdotgg/t3code#23373)
• 93a3e8f fix(server): stop maintaining the unused event correlation index (fix(server): stop maintaining the unused event correlation index pingdotgg/t3code#23211)
• 46212dd docs(mcp): document existing recurring-task tools (docs(mcp): document existing recurring-task tools pingdotgg/t3code#23199)
• c0ec87a fix(server): release the previous session when sending to another instance (fix(server): release the previous session when sending to another instance pingdotgg/t3code#23198)
• 692dd9c fix(claude): a background-task wake run no longer hangs after a user turn absorbed its wake (fix(claude): a background-task wake run no longer hangs after a user turn absorbed its wake pingdotgg/t3code#28010)
• 78aee8a fix(server): OpenCode no longer drops a $skill read before its directory scan ends (fix(server): OpenCode no longer drops a $skill read before its directory scan ends pingdotgg/t3code#29535)
• b492e28 fix(server): coalesced webhook runs use the prompt saved before dispatch (fix(server): coalesced webhook runs use the prompt saved before dispatch pingdotgg/t3code#29476)
• d5afb1a fix(server): slow forge CLI calls no longer delay checkpoints and turn starts (fix(server): slow forge CLI calls no longer delay checkpoints and turn starts pingdotgg/t3code#28431)
• 0c863d6 fix(relay): T3 Connect repairs tunnel ingress that drifted from a matching origin (fix(relay): T3 Connect repairs tunnel ingress that drifted from a matching origin pingdotgg/t3code#27961)
• 6f4bc77 fix(provider-core): npm-installed Claude in ~/.local gets npm updates (fix(provider-core): npm-installed Claude in ~/.local gets npm updates pingdotgg/t3code#27957)
• acd2db9 fix(server): git hooks keep the user's locale (fix(server): git hooks keep the user's locale pingdotgg/t3code#27778)
• 18ac394 fix(pi): hold messages until compaction ends (fix(pi): hold messages until compaction ends pingdotgg/t3code#24388)
• fd63914 fix(server): show why Claude refuses full access as root (fix(server): show why Claude refuses full access as root pingdotgg/t3code#23804)
• 10f3657 fix(server): preview click timeouts identify the target (fix(server): preview click timeouts identify the target pingdotgg/t3code#23489)
• 30767c2 fix(cursor): supporting files no longer hide sibling skills (fix(cursor): supporting files no longer hide sibling skills pingdotgg/t3code#23326)
• 689bdb8 fix(web): usage-limit retry notice shows the timezone (fix(web): usage-limit retry notice shows the timezone pingdotgg/t3code#23029)
• bb221f0 fix(server): preserve nested Claude subagent completion across turns (fix(server): preserve nested Claude subagent completion across turns pingdotgg/t3code#23561)
• c3e1e0a fix(opencode): publish ordered pending-work snapshots (fix(opencode): publish ordered pending-work snapshots pingdotgg/t3code#21460)
• 53e168f fix(opencode): decode compaction history from OpenCode 2.1 (fix(opencode): decode compaction history from OpenCode 2.1 pingdotgg/t3code#22661)
• 3e1e776 fix(server): import valid conversations within each transcript record limit (fix(server): import valid conversations within each transcript record limit pingdotgg/t3code#23192)
• 61c3794 fix(server): imported Claude sessions resume on their first turn (fix(server): imported Claude sessions resume on their first turn pingdotgg/t3code#23219)
• 5d3d78a feat(web): ask for a GitHub star when idle, and star in one click (feat(web): ask for a GitHub star when idle, and star in one click pingdotgg/t3code#29922)
• e2bb9e6 fix(server): subagent questions reach a busy parent agent (fix(server): subagent questions reach a busy parent agent pingdotgg/t3code#29909)
• cefb544 feat(web): celebrate a GitHub star with confetti (feat(web): celebrate a GitHub star with confetti pingdotgg/t3code#29987)

Merge details

Base: e77e0d5a92fc41a93acd3cf1553e2c43a77da56d (origin/main). Parent PR: none; targets main.
Before the merge, the fork had 598 fork-only commits and was missing 131 upstream commits.
Pinned upstream: cefb544af3c98224874419198c0359b652ca3c94.
Upstream range: e77e0d5a92fc41a93acd3cf1553e2c43a77da56d..cefb544af3c98224874419198c0359b652ca3c94 (131 commits absent from the base).

Conflict resolutions

• Clients: retain fork sidebar organization, previews, timeline behavior, model-change markers, integrations, settings removal semantics, and review excerpts; add upstream accessibility, image refresh context, grouping controls, and Kiro entries.
• Server: preserve fork worktree/context features, browser deadline/artifact protections, link watches, per-instance auth, and provider budget behavior while adopting upstream fixes and the Effect MCP transport API.
• Providers/contracts: retain Devin and Custom ACP alongside Kiro, union permission/settings lists, preserve instance-aware Cursor sign-in and quota handling, and adopt upstream Claude/Codex recovery and Cursor account source behavior.
• Effect 4.1.2: migrate fork-only crypto use to SecureRandom/Digest and explicitly provide those services in production/test layers. Kiro implements the fork's additional text-generation interface as unsupported.
• Docs: retain fork provider/install guidance and remove the obsolete claim that upstream lacks Cursor SDK usage.
• No conflicted file was split by this upstream range; moved-block fork commit checklists were therefore unnecessary. Fork-specific callers and provider registration were audited across clients and server. The fork's individual skill symlink layout remains intact (skills:check passes).

Baseline fork fix

The changed-file gate also found an existing fork bug on origin/main: a fresh successful completion in a snoozed child tab did not return its group as documented. Per the sync skill, its two-file fix is kept in a separate follow-up PR stacked on this sync. Merge this PR first, then the follow-up: #539.

Verification

Passed focused verification:

• Typechecks: server, web, mobile, desktop, client-runtime, contracts, and the affected provider packages.
• 472 Claude/Codex adapter tests; 629 server conflict-related tests; 100 additional crypto/auth/MCP migration tests; 25 fork-provider tests.
• 51 provider tests plus 18 final Kiro/Cursor tests; 13 web unit tests; 4 appearance tests plus 5 desktop startup/authority tests; 14 shared-client command tests.
• Resolved-file formatting/lint, skill links, and diff whitespace checks. Merge precommit formatting/lint/knip passed.

Changed-file gate (check:changed origin/main --timeout 1800): format, lint, both knip passes, both GraphQL checks, unused patches, the React Compiler check and affected typechecks (40 packages) pass on the final tree. Its test phase ran 371 files: 349 passed, 5 non-browser tests failed and 16 browser suites could not collect (browser mode was switched off, see below). The 5 failures were fixed in the merge commit: two Kiro replay fixtures had hard-coded runtime_info tails, and the AgentSessionScanner, ProviderRegistry and CodexDeveloperInstructions tests needed updates after upstream behaviour changes. The settlement failure already exists on origin/main and is fixed in the follow-up PR. A focused rerun of those 5 files on the final tree passes (164 tests). settlement.test.ts will keep failing on this PR until the follow-up merges.

Web browser suites (run afterwards in headless Chromium, one file at a time because several in one process crash on macOS): all 16 suites skipped by the gate now pass. 15 passed as merged. ProviderSettingsPanel.environment.browser.test.tsx had 5 failures: upstream's new confirm-before-removing dialog (pingdotgg#29480) blocked the fork's delete tests, and upstream's tests targeted a "Reset provider settings" button that the fork replaces with Delete. Commit 293deb0 adapts those tests (15/15 pass); component behaviour is unchanged.

Real web client (dev server from this branch, fresh database, free Replay provider): a full showcase turn (plan, tool calls, approval, approve, markdown, code block, table) streams and completes, with the sidebar status updating; all 23 Settings sections open with no errors; Settings › Providers lists live Codex/Claude status, and deleting a provider now asks for confirmation first; terminal drawer, right panel and branch Diff load; snooze → Wake now works; no server errors in the dev log. One existing fork bug found, not caused by this merge: after deleting a default provider such as Codex it stays listed as "Disabled", because the server's foldProviderInstanceEnabledFlags drops the config.enabled: false marker the client uses to hide it. The same code is on main.

The gate ran through a gitignored wrapper that excludes the browser*/renders* projects and **/*.browser.test.*, and switches browser mode off, because this run was not allowed to use browser automation. No check source is modified.

The model-routing evals (tt-background-agent, tt-background-worker-pr-is-delegate) were attempted but could not run because ANTHROPIC_API_KEY is unavailable. No paid model calls ran. This remains a verification gap for the merged model-facing guidance.

PR merging and releases are excluded from this run.

Merge with Create a merge commit. It keeps upstream history and the merge base for the next sync.

Model: gpt-6.1-sol (merge, resolutions, checks), finished by claude-opus-5-5 after a 429 interruption. Harness: Codex and Claude Code in T3 Code.

🤖 Generated with Claude Code