Repository navigation
chore: merge upstream pingdotgg/t3code - #145
Conversation
…otgg#12045) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
pingdotgg#12046) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…tale (pingdotgg#12047) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ingdotgg#12048) 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>
…ingdotgg#12052) 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>
…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>
Thread transfer impact✅ Thread transfer remains within every enforced ceiling.
Baseline: Scenario and decoded snapshot size10 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.
Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed. |
|
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 ( |
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
eas-clifor mobile previews, docs, a test cleanup, and marketing updates.Conflicts
apps/web/src/components/Sidebar.logic.test.ts. Both sides appended adescribeblock at the end of the file. I kept the fork'ssidebarDraftRowsblock, 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/*, andkhromaentries, then appended upstream's ninenoxcturnalentries.licenses:syncregenerates the notices with no diff.pnpm-lock.yaml. I took upstream's lockfile and ranvp i. The result is upstream's lockfile plus the fork's@namespacelabs/sdk,e2b, andmermaidtrees.iconv-liteis no longer optional, becausemermaiddepends 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) orapps/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: mobileCloudEnvironmentRows.tsx(React Native 0.88 event type), webSidebar.tsxandSidebar.logic.ts(the Working section beside the fork's cloud draft rows),ws.tsandassets.ts(the clone-aware favicon beside the fork's gateway URL prefix), andsettings.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 withguestProviderInstall.ts. That file reinstalls each provider CLI at@latestwhenever 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.tsno longer compiles Expo 58'sNotificationCenterManager.swift(cannot find 'Mutex' in scope).permissions-service.test.tsreports 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, andscriptsthird-party-licenses.test.tsran 18, all passing.vp linton 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