Skip to content

chore: sync with upstream T3 Code main - #73

Merged
t3-code-sandboxes[bot] merged 856 commits into
feat/sandbox-environmentsfrom
chore/sync-upstream
Nov 15, 2026
Merged

t3-code-sandboxes[bot] merged 856 commits into
feat/sandbox-environmentsfrom
chore/sync-upstream

Conversation

@t3-code-sandboxes

Copy link
Copy Markdown

Stacked on #72.

Problem. The fork's sandbox branch was 852 commits behind upstream T3 Code. The fork should behave like T3 Code except for running chats on sandboxes, and several bugs we hit here were already fixed upstream.

Fix. A merge commit (1bc96a96c1) of pingdotgg/t3code main 51cdf23265 into the stack top. Conflicts (29 files) were resolved as follows:

  • General T3 code takes upstream's version. Sandbox hooks are re-applied where the sandbox feature needs them: the Orchestrator's model-switch refusal after refuseNativeSubagentMessage, cancelWith under the new dispatch-permit rule, the sandbox ACP flavor next to prefersHttpMcpTransport, and the web composer, sidebar, lineage and queued-runs hooks.
  • Sandbox code keeps the fork's version, ported to upstream's new APIs: the scoped-settings write planner, moveComposerContent, resolveThreadOpenRoute, deriveTimelineWorking, hasPendingUserInput, WorkingDuration's environmentId, and deriveProjectGroupLabel's groupKey.
  • The fork's backports (dd50613, f968db1, 294a841) and .repos/ now match upstream exactly.
  • Follow-ups:
    • 118d917ce4: web API renames.
    • 048ad2db4f: upstream's new server settings sorted for sandboxes. Appearance follows the host; device approval stays host-only.
    • 02c93c1d84: server test mocks for upstream's runStatus and task_status.

Fork changes that still differ from upstream outside sandbox code are listed in the thread; none were removed here.

Test plan

  • Typecheck: all 42 packages
  • Format and lint on all 367 changed files
  • Full suites pass: sandbox-bridge, provider-acp, client-runtime, shared and contracts. provider-acp-registry 93/94; the one timeout also fails on upstream/main.
  • apps/server: 55 sandbox and hand-resolved test files. Remaining failures also fail on upstream/main or before the merge, from Node 24 here (Node 26 pinned) and the tailscale host leak fixed in test: fix the tests that fail on the sandbox branch itself #69.
  • apps/web: 56 files (577 tests). apps/mobile: the sandbox test.

Claude Opus 5.5 via Claude Code.

🤖 Generated with Claude Code

spoukyii and others added 30 commits November 14, 2026 19:56
…e sequences (pingdotgg#31882)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ntry" and "1 cell" (pingdotgg#31886)

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

Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#32089)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: marcel <marcel@marcels-MacBook-Air.local>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…32177)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ssions (pingdotgg#31870)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…loss (pingdotgg#32169)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dvertised as LAN routes (pingdotgg#32140)

Co-authored-by: repparw <repparw@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#32183)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#32188)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…res (pingdotgg#32122)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…URL (pingdotgg#29625)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ards (pingdotgg#30695)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.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: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Jerry Wu <haoyuwu@andrew.cmu.edu>
Co-authored-by: sisyphus-dev-ai <sisyphus-dev-ai@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t declined (pingdotgg#33575)

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

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

Co-authored-by: CommandCodeBot <noreply@commandcode.ai>
…dotgg#29498)

Co-authored-by: amr sarhan <amr@amrs-MacBook-Air.local>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…startup (pingdotgg#32053)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…the caller's project (pingdotgg#35913)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
drstrangerujn and others added 25 commits November 15, 2026 08:07
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#37285)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…age (pingdotgg#37021)

Co-authored-by: Christopher Wilkus <309776208+cwilkus1-bit@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#32946)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Merges pingdotgg/t3code main (51cdf23) into the sandbox stack top
(fix/sandbox-wake-reaches-host). General T3 code follows upstream; sandbox
hooks are re-applied on top of upstream's new APIs.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…g APIs

Upstream renamed moveComposerPromptAndImages to moveComposerContent, gave
WorkingDuration a server clock, made deriveProjectGroupLabel take the group
key, and added a search-row test that passes no sandbox.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A sandbox follows the host's default appearance like its default theme, and
keeps device-approval policy on the host.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Upstream's delegate_task now reads the remote run's status, so the mock needs
runStatus, and a task delegated to a fake box that already finished completes
before a cancel reaches it; the cancel case now runs while the box still works.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Base automatically changed from fix/sandbox-wake-reaches-host to feat/sandbox-environments November 15, 2026 21:16
@t3-code-sandboxes
t3-code-sandboxes Bot merged commit 2086698 into feat/sandbox-environments Nov 15, 2026
@t3-code-sandboxes
t3-code-sandboxes Bot deleted the chore/sync-upstream branch November 15, 2026 21:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.