[eyeveil]

Why

The fork was 197 commits behind upstream main. This merges upstream through 8b44f42b with a merge commit, so the next sync starts from here and doesn't conflict on the same files again.

What changed

• Upstream's 197 commits, including the linked-peer rename fix and the per-project provider check in t3_capabilities.
• Eleven conflicted files resolved in favor of the fork's behavior, with upstream's changes carried into it. The merge commit message lists each one.
• Three new upstream tests adjusted to fork behavior. Peer link tests run over HTTPS, an unresolved thread link stays a link, and a skill token before punctuation still matches.

Scope

• Covers upstream main only. The carried upstream PRs are unchanged, because none moved or merged upstream.
• No release. The merge to main uses [skip ci] so it does not publish a nightly.

Tradeoffs

Peer links keep the fork's single fenced trusted origin instead of upstream's probe of every saved URL. Upstream's label refresh now runs on that one origin.

Blast Radius

Server, web, and mobile all take upstream changes. The riskiest area is linked peers, where the fork and upstream diverged most. The PeerLinks and PeerMcpClient suites cover it.

Verification

• vp run typecheck passes across all 40 packages on nixbox.
• vp test run apps/server/src/peer/ and the eight test files beside the conflicts pass. ClaudeAdapterV2.test.ts failed once in the full run and passed three times alone.
• vp run check:changed passes format, lint, knip, and the React compiler. Browser tests could not start on nixbox, which has no Playwright browsers, so this PR's CI covers them.

Model and harness: Claude Opus 5.5 (merge, conflict resolution, verification) via Claude Code in T3 Code.

---

^{Open in [code]smith · Need help on this PR? Tag @codesmith-bot with what you need.}

[greptile-apps]

Confidence Score: 3/5

[High impact] The merge changes behavior across server, mobile, web, and command-line workflows.

Fix launch retries after event pruning and protect local reference files before merging.

Summary

Merges upstream changes across server, web, mobile, providers, and reference repositories.

• Upstream Alchemy examples and development files are updated as part of the merge; their behavior depends on the individual carried changes.

_{Reviews (1) · Last reviewed commit: "Merge upstream pingdotgg/t3code main thr..." · Reviewed by Greptile}

[eyeveil]

Note

Written by claude-opus-5-5 on behalf of eyeveil

Both points come from upstream code that this merge carries unchanged, so this PR leaves them as they are.

Launch retries after event pruning. Upstream pingdotgg#29806 prunes events older than a day and keeps command receipts. A delegate_task retried with the same request id after that finds no subagent.updated event and fails at OrchestratorMcpService.ts:2546. The fork does not change that path, and upstream main has it in exactly this form. A retry would have to arrive more than a day after the first call. That is worth an upstream fix, not a fork divergence in a sync.

Local reference files. scripts/sync-reference-repos.ts replaces each .repos/<name> directory with a fresh clone. The repository treats .repos/ as read-only vendored references, so overwriting them is intended. The fork has no changes to that script.