Skip to content

chore: sync upstream through 22c37a8da4 - #275

Merged
andrewcai8 merged 145 commits into
mainfrom
sync/upstream-22c37a8da4
Oct 30, 2026
Merged

andrewcai8 merged 145 commits into
mainfrom
sync/upstream-22c37a8da4

Conversation

@andrewcai8

@andrewcai8 andrewcai8 commented Oct 29, 2026 •

Copy link
Copy Markdown
Owner

Brings the fork up to upstream 22c37a8 (142 commits since #272's 612a8e5; upstream CI green at that commit). Merge commit, not squash, so the next sync's merge base stays upstream's sha.

Notable upstream changes

Conflict resolutions (20 files + lockfile)

  • Usage host identity: upstream's persisted host id (T3CODE_HOST_ID, else usage-host-id seeded from the hostname) replaces per-call hostname(). A cloud box's T3CODE_USAGE_HOST_ID (its lease) still takes precedence. The fork's usageHostId helper is gone; box-usage folding now receives the service's own host id, so a host's own sources and its retired-home rows agree when T3CODE_HOST_ID is set.
  • MCP links: upstream's threadLinkFor(scope, …) for list/read/search/launch. The fork's Home fleet reads (FleetService) share listItemFromShell/readThreadPage and pass a scope with no MCP client, so they keep t3-thread:// links. t3_thread_search keeps the fork's Home all-projects default.
  • t3_thread_launch: the fork's Home/fleet routing, with upstream's project-default fallback model and web links reapplied.
  • Storage cleanup: upstream's { waiting, kept } sweep result, with the fork's orphan-worktree policy still able to run the sweep when every worktree policy is off.
  • Scheduled tasks: the fork's launchInput (cloud fires) beside upstream's sendBound retry for threads that move project.
  • Mobile outbox: the fork's claimFirstTurnCloudBox before upstream's sequence-aware delivery completion.
  • Contracts: autoApproveFullAccessPrompts and fallbackModelSelection both in the settings patch.
  • Web:
    • Server updates: guest upgrades through the manager are kept, and the bulk Update all list also skips upstream's refused release-track crossings.
    • Thread menu: the fork's machine-gone/stop-cloud-machine items beside upstream's find and turn-into-project.
    • Thread details card: upstream's configurable card, with the fork's cloudRunOn on the environment toolbar.
    • Chat header: the fork's Home breadcrumb rule. New-thread hook: the fork's cloud placement and upstream's fallback model.
  • apps/server/package.json: both diff (upstream) and e2b (fork).
  • Tests: ForkMigrations.test.ts gains migration 73. ProviderRegistry mocks added to fork MCP launch tests, since the launch handler now reads providers for the fallback. Upstream's ScheduledTasksSettings browser test now looks for the fork's "Server" label (upstream's "Runs on"; the fork uses "Run on" for local/cloud). The guest-update unit test mocks useServerConfigs.
  • Agent context budget: mcpToolListJsonBytes 52518 → 52618 from upstream tool text (needs agent-context-increase).

Verification

  • Typecheck clean: server, web, mobile, desktop, scripts, contracts, client-runtime, shared.
  • Lint and format clean on all 730 files the fork changes relative to upstream; vp run knip:check clean.
  • Full vp test run: contracts, client-runtime, shared, web, mobile, desktop, scripts. Server: src/mcp, src/home, src/usage, src/scheduledTasks, src/storageCleanup, src/persistence, src/provider, src/environmentControl, src/textGeneration, src/orchestration-v2.
  • vp i --frozen-lockfile passes.
  • Locally failing, all from this Mac's environment, and none in files the fork changes: *.renders.tsx (need T3CODE_RENDER_REPORT_DIR), ClaudeSkills.test.ts install order, build-npm-launcher.test.ts and two UsageService.test.ts cases (/private/var tmp symlink; both pass with a resolved TMPDIR), DesktopLinuxUrlHandler.test.ts icon names (case-insensitive APFS).

Independent review (Opus, medium effort) of the resolutions and the auto-merged orchestration files found no blocking defects; its stale-comment note is fixed in a007208.

Not verified

  • Web, desktop and mobile not run in a real client.
  • Cloud-box usage identity and guest server upgrades not exercised against a real box.

Follow-ups

  • Home's fleet threads.launch on another environment still uses that environment's plain default model, without upstream's out-of-usage fallback or project overrides.
  • Fleet-routed thread links stay t3-thread:// even when the outside MCP client has a web origin.
  • scripts/import-machine-usage.ts keeps its own usage-host-id under its cache dir, separate from the server's. Both start from the hostname, so they only drift if the hostname changes between their first runs; then imported and live usage for that machine would stop deduplicating.
  • No fork test exercises the project-default fallback inside t3_thread_launch (the fork's launch tests mock an empty ProviderRegistry).
  • Carried from chore: sync upstream through 612a8e59f0 #272: removed cloud chats in the folder-row sidebar layout lack a touch-only settle; cloud-box create paths pair without expectedEnvironmentId; resumed-path turn-start budget notes; Home's fleet t3_thread_interrupt ignores stop; fleet launch doesn't dedupe by clientRequestId.

Model: Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits October 28, 2026 11:39
…er's edge (pingdotgg#26597)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pha) (pingdotgg#25259)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…26373)

Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#21046)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…26639)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t the terminal (pingdotgg#26647)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… 0.3 ms (pingdotgg#26727)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…a new draft (pingdotgg#26565)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…checks tokens, and lists the pool through worker reconnects (pingdotgg#26706)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…filter (pingdotgg#26730)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ong threads (pingdotgg#26739)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…f usage (pingdotgg#26164)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…6779)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…its usage limit (pingdotgg#26234)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#24937)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#26522)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
koushikxd and others added 24 commits October 29, 2026 18:02
…ning effort (pingdotgg#24467)

Co-authored-by: maria-rcks <maria@kuuro.net>
…5225)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…otgg#25228)

Co-authored-by: Inaya Yousfi <193243337+inayayousfi@users.noreply.github.com>
…#25220)

Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
…tgg#25230)

Co-authored-by: Alex Southwell <4596216+saphid@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Rishabh Bothra <37180068+07rjain@users.noreply.github.com>
…gdotgg#25235)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…otgg#24092)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…ncher as another t3 (pingdotgg#22375)

Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…ingdotgg#27063)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…ingdotgg#24472)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…#27008)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…Bitbucket (pingdotgg#27102)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…7110)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… 80x faster (pingdotgg#27106)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Merge upstream pingdotgg/t3code 22c37a8 (142 commits since 612a8e5).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@andrewcai8 andrewcai8 added the agent-context-increase Accept agent context growth in agentContextBudget.json label Oct 29, 2026
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL labels Oct 29, 2026
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@github-actions

Copy link
Copy Markdown

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider Metric Main baseline This PR Impact PR ceiling
Codex Total thread wire 5.0 KiB 5.0 KiB −6 B (−0.1%) 6.8 KiB ✅
Codex Thread snapshot wire 3.8 KiB 3.8 KiB 0 B (0.0%) 4.9 KiB ✅
Codex Live turn WebSocket wire 1.3 KiB 1.2 KiB −6 B (−0.5%) 2.0 KiB ✅
Codex Live turn WebSocket decoded 21.6 KiB 21.6 KiB 0 B (0.0%) 24.4 KiB ✅
Codex Live turn messages 2 2 0 (0.0%) 8 ✅
Claude Total thread wire 5.1 KiB 5.1 KiB 0 B (0.0%) 6.8 KiB ✅
Claude Thread snapshot wire 3.8 KiB 3.8 KiB 0 B (0.0%) 4.9 KiB ✅
Claude Live turn WebSocket wire 1.3 KiB 1.3 KiB 0 B (0.0%) 2.0 KiB ✅
Claude Live turn WebSocket decoded 21.9 KiB 21.9 KiB 0 B (0.0%) 24.4 KiB ✅
Claude Live turn messages 2 2 0 (0.0%) 8 ✅

Baseline: 147434f · PR result: a007208 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

  • Codex decoded thread snapshot: 108.5 KiB
  • Claude decoded thread snapshot: 108.8 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

@andrewcai8
andrewcai8 merged commit 62af40f into main Oct 30, 2026
27 of 28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

agent-context-increase Accept agent context growth in agentContextBudget.json size:XXL vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.