Skip to content

revert: drop the steer secret-card fix, upstream #34634 covers it - #81

Merged
OmarAlex24 merged 4 commits into
feat/sandbox-environmentsfrom
revert/steer-secret-card-fix
Nov 17, 2026
Merged

OmarAlex24 merged 4 commits into
feat/sandbox-environmentsfrom
revert/steer-secret-card-fix

Conversation

@OmarAlex24

@OmarAlex24 OmarAlex24 commented Nov 17, 2026 •

Copy link
Copy Markdown
Owner

Upstream pingdotgg#34634 fixes the same bug as the fork's "a steer no longer leaves a secret card nobody can close", and a maintainer is taking it over. Our copy would conflict with it in Orchestrator.ts once it merges.

This is a plain git revert of the squashed steer commit. Until pingdotgg#34634 lands, the bug comes back: a steer can leave a secret card nobody can close. The full fix is kept in archive/sandbox-environments-pre-squash-20261117.

After the revert, SecretRequests.ts, SecretRequests.test.ts, SteeringCompletion.integration.test.ts and McpHttpServer.test.ts match upstream. Orchestrator.ts keeps only sandbox hunks, which belong to the sandbox commit: the bridge imports, isStaleSandboxBridgeRun, the switch refusals off the sandbox bridge, held-run cancellation, and the launch wait in prepared-run.retry.

Test plan

  • vp test run on SecretRequests.test.ts, SteeringCompletion.integration.test.ts and McpHttpServer.test.ts: 126 passed
  • git diff upstream/main on the four files above is empty

Opus 5.5 (claude-opus-5-5) in Claude Code, via T3 Code.

🤖 Generated with Claude Code

OmarAlex24 and others added 4 commits November 17, 2026 17:10
…abel file

The desktop no longer sends its display name to the server. A renamed build, like t3code-diy's
side-by-side app, writes `environment-label` in its T3 home, which the server already reads for
sandboxes. T3CODE_DESKTOP_DISPLAY_NAME still names the app's windows and About panel.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Sandbox cases appended to upstream test files move to sibling *.sandbox.test.ts files, so those
upstream files match upstream again and stop conflicting on the nightly rebase. The environment
label no longer needs Path, so ServerEnvironmentLabel.test.ts stays identical to upstream.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The sandbox sections move from remote-access.md, which now matches upstream, to sandboxes.md.

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

This reverts commit a21d203. Upstream
pingdotgg#34634 fixes the same bug, and this copy would conflict with it in
Orchestrator.ts once it merges.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@OmarAlex24
OmarAlex24 changed the base branch from docs/sandboxes-page to feat/sandbox-environments November 17, 2026 23:43
@OmarAlex24
OmarAlex24 merged commit aaca4de into feat/sandbox-environments Nov 17, 2026
@OmarAlex24
OmarAlex24 deleted the revert/steer-secret-card-fix branch November 17, 2026 23:44
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.

1 participant