Skip to content

chore: merge upstream pingdotgg/t3code - #166

Merged
andrewcai8 merged 48 commits into
mainfrom
sync/upstream-1005
Oct 5, 2026
Merged

andrewcai8 merged 48 commits into
mainfrom
sync/upstream-1005

Conversation

@andrewcai8

@andrewcai8 andrewcai8 commented Oct 5, 2026 •

Copy link
Copy Markdown
Owner

Brings the fork up to date with 46 upstream commits through 7812230. This is a true merge commit, like the previous syncs.

What came in

Fork code deleted as superseded

  • pairedEnvironmentMismatch and the fork's own expectedEnvironmentId on pairing input. Upstream's route pairing adds the same field and checks it before the one-time code is spent.
  • keepsBoxPairing. Upstream's setRoutesInCatalog only drops records of routes that leave the list, so re-saving a box under the same connection id keeps its pairing on its own.

Conflicts resolved

  • ScheduledTaskService.ts. Started from upstream's file, including its mode: "queue", and re-applied the cloud target as hooks. The fork's diff against upstream drops from 231+/130- to 65+/8-. runTask stays upstream's. It gains a resumed trigger with the original start time, a launch that sends cloud tasks to ScheduledCloudFire, and an onError that keeps a cloud run 'running' when shutdown interrupts it. A new startRun runs cloud fires in a FiberSet and refuses a manual run of a task that is already running before the hand-off. Startup resumes running cloud rows through startRun. The SQL target column and the upsert check are unchanged from the fork. launchFire, keepsCloudRun, and resumableCloudRun live in ScheduledCloudFire.ts. A cloud fire is now keyed by task id and start, without the trigger, so a resumed fire sends the same request.
  • ClaudeProvider.ts. Took upstream's includeUsage probe flag for workspace snapshots. Kept the fork's CLAUDE_USAGE_PROBE_TIMEOUT_MS and the exported runClaudeCommand used by the host probe and setup-token usage.
  • client-runtime registry, persistence, and supervisor. registryBoxes.ts now works with upstream's route-aware internals: persistedEnvironmentIds, register(registration, routes), and removeLocked. Box drivers spread upstream's checkRoute and preflight. Boxes skip learned routes, since a box is reached only through its host. Removing a host's last route, including removeRelayEnvironments, also forgets its unpaired boxes. A new test fails without that hook.
  • storageDocument.ts, persistence.ts, index.ts, presentation.ts, providerSkills.ts. Upstream's route APIs, with the fork's CatalogRegistration and box imports kept.
  • ChatView.tsx. Upstream's compaction revert, keeping the held cloud send's message id and time.
  • ServerUpdateAction.tsx. Upstream's install-aware relaunch command, with the fork's guest box update label still taking precedence.
  • scripts/cloud/verify-box-reconnect.ts (follow-up commit). Its in-memory catalog store gains setRoutes and the route-aware register and remove. The scripts package now typechecks with the DOM lib, because upstream's registry reads globalThis.location.

Verification

  • Typecheck passes for t3, @t3tools/client-runtime, @t3tools/web, @t3tools/mobile, @t3tools/desktop, @t3tools/contracts, and @t3tools/scripts. CI is green on the latest commit.
  • Server: src/scheduledTasks, src/provider/Layers/Claude* and claude*, src/environmentControl, and scripts pass (64 files, 822 tests). undici@7.29.1 is still declared.
  • client-runtime: src/connection, src/platform, src/state, and providerSkills pass, including registry.cloud.test.ts (39 tests).
  • Web guestServerUpdate, ServerUpdateAction, and versionSkew tests pass. Mobile use-composer-command-menu passes after adding the fork's provisionedSkills argument to upstream's new test.
  • ProviderRegistry.test.ts > re-probes when settings change the codex binaryPath fails locally only because this Mac has Homebrew installed. The merge does not touch that file. CI runs it on Linux.
  • ORCHESTRATION_PROTOCOL_VERSION stays 2. No live E2B or Namespace smoke in this PR.

🤖 Generated with Claude Code

maria-rcks and others added 30 commits October 4, 2026 07:58
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…ingdotgg#15505)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
… cards (pingdotgg#15506)

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

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

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

Co-authored-by: Bil0000 <62337003+Bil0000@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
maria-rcks and others added 17 commits October 4, 2026 22:37
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ngdotgg#15847)

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

Co-authored-by: T3 Code Test <t3code-test@example.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…otgg#15577)

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

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

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

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…ingdotgg#15546)

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

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Resolves conflicts with upstream's multi-route connections, the
automatic-compaction revert, relaunch commands for manual server updates,
per-workspace Claude command discovery, and queued scheduled prompts.

Scheduled tasks re-apply the fork's cloud target on top of upstream's
runTask through small hooks, with the cloud-only logic moved into
ScheduledCloudFire.ts. Cloud boxes adapt to the route-aware registry
and skip learned routes.

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. 📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. size:XXL labels Oct 5, 2026
Upstream's registry reads globalThis.location, so the scripts package
typechecks with the DOM lib.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@github-actions

github-actions Bot commented Oct 5, 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 4.9 KiB 4.9 KiB +59 B (+1.2%) 6.8 KiB ✅
Codex Thread snapshot wire 3.7 KiB 3.8 KiB +81 B (+2.1%) 4.9 KiB ✅
Codex Live turn WebSocket wire 1.2 KiB 1.2 KiB −22 B (−1.8%) 2.0 KiB ✅
Codex Live turn WebSocket decoded 20.4 KiB 20.8 KiB +400 B (+1.9%) 29.3 KiB ✅
Codex Live turn messages 2 1 −1 (−50.0%) 8 ✅
Claude Total thread wire 4.9 KiB 5.0 KiB +100 B (+2.0%) 6.8 KiB ✅
Claude Thread snapshot wire 3.7 KiB 3.8 KiB +82 B (+2.2%) 4.9 KiB ✅
Claude Live turn WebSocket wire 1.2 KiB 1.2 KiB +18 B (+1.5%) 2.0 KiB ✅
Claude Live turn WebSocket decoded 20.8 KiB 21.2 KiB +441 B (+2.1%) 29.3 KiB ✅
Claude Live turn messages 2 2 0 (0.0%) 8 ✅

Baseline: 13c4ea4 · PR result: 86efe2b · 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 94d93e1 into main Oct 5, 2026
26 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.