Skip to content

chore: merge upstream pingdotgg/t3code - #145

Merged
andrewcai8 merged 20 commits into
mainfrom
sync/upstream
Oct 2, 2026
Merged

andrewcai8 merged 20 commits into
mainfrom
sync/upstream

Conversation

@andrewcai8

@andrewcai8 andrewcai8 commented Oct 2, 2026 •

Copy link
Copy Markdown
Owner

Merges 19 upstream commits through pingdotgg/t3code@b33eda1399. Merge with Create a merge commit, never squash. A squash drops upstream's history, and then the next sync conflicts on every file again.

Upstream changes

Conflicts

apps/web/src/components/Sidebar.logic.test.ts. Both sides appended a describe block at the end of the file. I kept the fork's sidebarDraftRows block, then upstream's Working shelf block.

third-party-licenses.config.json. Both sides only added entries. I kept the fork's @namespacelabs/sdk, @bufbuild/protobuf, @connectrpc/*, and khroma entries, then appended upstream's nine noxcturnal entries. licenses:sync regenerates the notices with no diff.

pnpm-lock.yaml. I took upstream's lockfile and ran vp i. The result is upstream's lockfile plus the fork's @namespacelabs/sdk, e2b, and mermaid trees. iconv-lite is no longer optional, because mermaid depends on it.

Fork code upstream reached

The merge changes only files upstream changed. It changes nothing under packages/client-runtime/src/connection (#137, #139, #142) or apps/server/src/environmentControl. The 140 files only upstream touched match upstream exactly. Sixteen more files changed on both sides and git merged them cleanly. I read upstream's side of the ones that meet cloud code: mobile CloudEnvironmentRows.tsx (React Native 0.88 event type), web Sidebar.tsx and Sidebar.logic.ts (the Working section beside the fork's cloud draft rows), ws.ts and assets.ts (the clone-aware favicon beside the fork's gateway URL prefix), and settings.ts. The other mobile screens take React Native 0.88 type renames and notification routing, and CI's typecheck covers them.

Update all and cloud boxes. Update all reads useEnvironments(), which leaves out cloud boxes, so it updates the host and other user machines but never a box. It does not conflict with guestProviderInstall.ts. That file reinstalls each provider CLI at @latest whenever a box is prepared or resumed, so a box is already current when a chat starts on it.

Verification

Targeted vp test run:

  • apps/mobile, the whole package, ran 194 files and 1782 tests, with 2 failures. Both are macOS-only native tests, and CI skips them on Linux. notification-center-manager.test.ts no longer compiles Expo 58's NotificationCenterManager.swift (cannot find 'Mutex' in scope). permissions-service.test.ts reports a ThreadSanitizer race. Both fail the same way on unmodified upstream main and pass on fork main, so they come from upstream's SDK 58 upgrade.
  • packages/client-runtime (connection, cloud, state) ran 848 tests, all passing.
  • apps/web (Sidebar.logic, ProviderUpdateLaunchNotification.logic, src/cloud, src/components/chat, src/hooks) ran 1263 tests, all passing.
  • apps/server (server.test.ts, src/environmentControl, src/git, src/sourceControl) ran 1112 tests, all passing.
  • packages/contracts (settings, server, rpc) ran 163 tests, and scripts third-party-licenses.test.ts ran 18, all passing.

vp lint on the 18 source files both sides changed reports 0 errors. Typecheck, mobile included, runs in CI, because this machine's policy blocks local typecheck.

🤖 Generated with Claude Code

juliusmarminge and others added 20 commits October 1, 2026 10:51
…tale (pingdotgg#12047)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…URL (pingdotgg#12049)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…UIScreen.main (pingdotgg#12050)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…bers (pingdotgg#12051)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ard (pingdotgg#13487)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
…tgg#14635)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…#14613)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ched GraphQL (pingdotgg#14673)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…g#14678)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
pingdotgg#13926)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Brings in 19 upstream commits, including Expo SDK 58 and React Native
0.88 RC on mobile, Update all for providers, batched GitHub polling, and
the beta Working section.

Conflicts:
- Sidebar.logic.test.ts: both sides appended a describe block at the end.
  Kept the fork's sidebarDraftRows block, then upstream's Working shelf
  block.
- third-party-licenses.config.json: both sides only added entries. Kept
  the fork's Namespace SDK, protobuf, connect, and khroma entries, then
  appended upstream's noxcturnal entries.
- pnpm-lock.yaml: upstream's lockfile, reinstalled with vp i, which adds
  only the fork's @namespacelabs/sdk, e2b, and mermaid trees.

No upstream migrations since the last sync; the fork stays at 060.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL 📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. labels Oct 2, 2026
@github-actions

github-actions Bot commented Oct 2, 2026

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 13.5 KiB 13.5 KiB +1 B (+0.0%) 15.1 KiB ✅
Codex Thread snapshot wire 7.1 KiB 7.1 KiB +2 B (+0.0%) 7.3 KiB ✅
Codex Live turn WebSocket wire 6.4 KiB 6.4 KiB −1 B (−0.0%) 7.8 KiB ✅
Codex Live turn WebSocket decoded 56.2 KiB 56.2 KiB 0 B (0.0%) 66.4 KiB ✅
Codex Live turn messages 9 9 0 (0.0%) 21 ✅
Claude Total thread wire 13.5 KiB 13.5 KiB −27 B (−0.2%) 15.1 KiB ✅
Claude Thread snapshot wire 7.1 KiB 7.1 KiB −4 B (−0.1%) 7.3 KiB ✅
Claude Live turn WebSocket wire 6.4 KiB 6.4 KiB −23 B (−0.3%) 7.8 KiB ✅
Claude Live turn WebSocket decoded 57.0 KiB 57.0 KiB −44 B (−0.1%) 66.4 KiB ✅
Claude Live turn messages 9 8 −1 (−11.1%) 21 ✅

Baseline: ec89414 · PR result: 176320d · 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: 114.0 KiB
  • Claude decoded thread snapshot: 114.6 KiB

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

@andrewcai8

Copy link
Copy Markdown
Owner Author

Verdict: PASS. Reviewed by an agent that did not write this change. There are three additive conflicts (tests, license entries, lockfile), all resolved keeping both sides. Fork cloud code (client-runtime/src/connection, environmentControl) is untouched, and files only upstream changed match upstream exactly. pingdotgg#14678 "Update all" doesn't reach boxes, which reinstall CLIs on prepare and resume. CI is green (22 pass). The fork's deploy-relay workflow is skipped on this repo. Note: the mobile native fingerprint changed (Expo 58 / RN 0.88 RC), so native builds are needed before installed apps can take this JS. Merging as a merge commit, per #122/#131.

@andrewcai8
andrewcai8 merged commit 6334b25 into main Oct 2, 2026
24 of 25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. 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.

6 participants