[chrisohearn]

One-time nightly-track upstream sync (owner decision): merges pingdotgg/t3code main at 5f29d87c9b (474 commits, contains v0.1.10-nightly.20261114.4709) into integration/mcp-events-20261109. After this run the hourly sync stays on the stable track.

The automatic sync stopped on 29 conflicting files (#124). This PR resolves them by hand, following FORK.md.

Migrations

• Upstream's 090_AuthConnectDevices, 091_AuthConnectDeniedRequests, 092_QueuedTurnInputIndexJsonValid and 093_ProviderTurnAttemptIndex are taken as-is in Migrations/ and Migrations.ts.
• Fork migrations stay in ForkMigrations/ (ids 1–17, unchanged). No id or name clashes.

Resolution notes

Most conflicts keep both sides, with upstream's restructuring kept and the fork's additions carried onto it. Four resolutions involve judgement and need a reviewer's attention:

1. thread.create.initialMessage. Upstream now sends a launch's first message inside thread.create. The fork's launch path also sends clientRequestId (idempotency) and senderClient (authenticated MCP sender). Both are added to that server-only struct, so they still reach message.dispatch. withCreationProvenance still strips a client-sent initialMessage entirely.
2. forkInheritedRunOrdinalsAt. The fork replaced upstream's rollback-time estimate with run exclusions recorded at fork time. Upstream's new title regeneration reads fork history through ThreadManagement, which does not expose those exclusions. It therefore keeps upstream's rollback-time estimate, under the separate name forkInheritedRunOrdinalsAt. Inheritance itself still uses the recorded exclusions.
3. thread_end placement. TurnItemPositionStore.allocate now moves an existing position into its run's range (upstream). A fork thread_end item (a posted message) keeps its position, as keepExisting does.
4. unenv. Upstream now pins unenv: 2.0.0-rc.24 globally. The fork's narrower @alchemy.run/cloudflare-runtime@2.0.0-beta.85>unenv override (fix(build): keep Cloudflare runtime unenv within its preset peer #122) is redundant, so it is removed from pnpm-workspace.yaml and the lockfile's overrides. pnpm install --frozen-lockfile passes.

Other notable carries:

• Peer links (fix(auth): register peer links with authorization_code only #120). The authorization_code-only peer-link registration in mcpOAuthHttp.ts merged cleanly and is unchanged.
• Forwarded waits. Upstream replaced the chunked forwarded t3_thread_wait with one capped piece. The fork's several-thread form still forwards and is still tested.
• Scheduled task list. Upstream's change never to list webhook URLs (fix(server): filter scheduled tasks without exposing webhook URLs pingdotgg/t3code#27716) is kept. The fork's recentFailures/missedRun fields stay on listed tasks.
• Thread list. Upstream's lazy shell paging is kept. The fork's launchedByMe, provenance and pending-request counts are layered on the page.
• CI and context budget. ci.yml keeps the fork's repository-conditional runners, now with upstream's macos-27 label. fork-integration-ci.yml is regenerated. agentContextBudget.json is taken from upstream and re-measured.

Checks

Local: frozen install, vp fmt --check, lint, vp run typecheck (41/41), knip and the context-budget test. The server test suite, the container build and smoke test, and the live-database service preflight run through the sync script before merge.

🤖 Generated with Claude Code

[chatgpt-codex-connector]

Codex Review Summary: ✅ Completed

This comment shows the latest Codex review activity on this pull request.

Review	Status	Commit	Review trigger
📝 Code Review	✅ Completed 2026-11-15T01:20:09.122949Z	98e7399	New commits
🔒 Security Review	✅ Completed 2026-11-15T01:23:52.940777Z	98e7399	New commits

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

[chrisohearn]

Agent context budget: mcpToolListJsonBytes grows 60093 → 61317 (+1224). The growth is entirely upstream's: upstream's own budget moved 48566 → 49790 (+1224) between the previous merge base 36f011dfb7 and 5f29d87c9b. No fork tool text changed. Labelled agent-context-increase, as for the previous upstream sync (#112).

[chrisohearn]

Independent review of the conflict resolution (Codex gpt-6.1-sol, xhigh; read the full --remerge-diff and checked the four judgement calls in the PR body): one P2. An upstream ThreadLaunchService test fetched the base twice because the fork re-checks the worktree base before provisioning. Its fixture now has a local main. Fixed in 98e7399, which also aligns two fork tests with upstream behaviour changes found by the full local server run: queued completions now interleave with messages by request time, and a failed branch lookup waits until it is due again. No other actionable findings. The repair is test-only.

[chrisohearn]

Upstream sync: merges pingdotgg/t3code upstream commit (5f29d87) (5f29d87, 474 commits) into integration/mcp-events-20261109.

Format, lint, typecheck, server tests, the container release build with its smoke test, and the service preflight against the live database passed. Prepared release candidate v0.1.10-preview.20261115.2; publication follows a successful merge.

🤖 Generated with Claude Code