Skip to content

chore(upstream-sync): port 6 t3code commits - #450

Merged
trancong12102 merged 9 commits into
mainfrom
chore/upstream-sync-20261120-0206
Nov 19, 2026
Merged

trancong12102 merged 9 commits into
mainfrom
chore/upstream-sync-20261120-0206

Conversation

@trancong12102

Copy link
Copy Markdown
Contributor

Ports the 6 new upstream t3code commits (106a1e03b7..80cf4f7945): a Cursor model-list fix, workspace models in MCP delegation, a forced index for shell reads, notebook output cleanup, a terminal drawer fix, and French wording.

Risky commits

  • 9246c3235e fix(server): remove terminal styling from saved notebook outputs (provider). Test file conflicted because Onicode stores extracted text in a versioned sidecar (<file>.v2.txt). I kept Onicode's sidecar path and took upstream's stricter output asserts. Review found the port also needed an extractor version bump, so notebooks extracted before this fix don't keep reusing the old text with ANSI codes. Follow-up 124f540 moves DocumentText to version 3. The notebook test now seeds a styled .v2.txt and fails on version 2.
  • d1f8636f49 fix(mobile,web): quote and port messages are translated in every language (mobile). Onicode had already translated all 198 keys in web and mobile, all 9 locales, so the rest of Onicode's wording stays. The exception is six mobile French quote messages that used "tu", while the rest of mobile fr uses "vous" (122 vs 30 imperatives). Those six take upstream's formal wording (76d174f).
  • 106a1e03b7 fix(cursor): models added to the account run in workspaces that already ran Cursor. Upstream patches @cursor/sdk@1.3.1, which Onicode doesn't have (MISSING). Onicode runs 1.4.0, which has the same model-list cache bug. I applied the same refetch-on-miss change to the minified dist/bundled, dist/cjs and dist/esm code in patches/@cursor__sdk@1.4.0.patch, using 1.4.0's own identifiers. The new adapter test fails on main ("Cannot use this model: composer-2.5") and passes with the patch. 4cd9b0d refreshes the patch's blob headers.

Routine commits

  • c0b1d32c97 fix(server): MCP delegation accepts models from the project's own provider config. Taken as is (but see follow-ups).
  • 2fe74b00fa fix(server): shell reads no longer walk a thread's finished tool calls. Taken as is. orchestration_v2_projection_turn_items_shell_pending_idx exists in Onicode's ShellIndexes migration with a matching predicate.
  • 80cf4f7945 fix(web): the terminal button reopens the drawer after its last terminal closed. Taken as is. Web-only store; mobile has no equivalent reconcile.

Adopt-or-keep decisions

  • Adopted upstream over Onicode's French quote wording (mobile, 6 keys): it matches the formal register the rest of the mobile French locale uses.
  • Kept Onicode's wording for the other quote and port keys in d1f8636f49: Onicode had already translated each one correctly. The differences are word choice only.
  • Kept Onicode's versioned extracted-text sidecar over upstream's <file>.txt: Onicode's version re-extracts text an older extractor wrote. Upstream's fix exposed exactly that need here.

Skipped

None. d1f8636f49 was first recorded as a skip (7483e76) and then changed to an adapted take (76d174f).

E2E scenarios

None in this batch.

Follow-ups

Queued in the follow-up queue (## From sync chore/upstream-sync-20261120-0206). A batch fix thread (Batched fixes: Force stop/session release, PR watch, mobile RTL…, queue 2026-11-20 00:35) is still running, so no new thread was started. The next batch takes these:

  • P2, shared core: orchestrator_capabilities now scans every enabled provider for an unscanned folder and waits for the slowest (OrchestratorMcpService.ts ~2569-2588). It ignores project enablement, and only OpenCode supplies workspace models. A Claude or Codex orchestrator in a fresh worktree can wait on a Codex app-server probe (20 s timeout), and each scan republishes the provider list to older clients.

Left to upstream (OpenCode only, the only driver with workspace models). All four come from c0b1d32c97:

  • An expired or pending snapshot still suppresses the scan.
  • Driver-only delegate_task skips the workspace retry.
  • oni_thread_launch into a new worktree validates against the project root.
  • The model_unavailable retry doesn't force a fresh scan.

Review findings

Codex gpt-6.2-astra (high) and a Claude Opus subagent reviewed independently, using the same brief.

  • Extractor version not bumped after the notebook output change. Raised by both. Fixed (124f540), with a test that fails on main.
  • orchestrator_capabilities scans unrelated providers. Raised by both. This is upstream's design, in shared core. Queued (see above).
  • Stale index blob headers in the hand-edited Cursor patch. Raised by both, as a nit (pnpm ignores them). Fixed (4cd9b0d). The headers now match the installed patched files.
  • French "tu" vs "vous" in mobile quote messages. Raised by Codex. Adopted upstream's wording (76d174f).
  • Notebook outputText joins all fragments before the 1M-character budget applies. Raised by Codex. Dismissed: the isolated worker has already parsed the whole notebook JSON, and the join adds one linear pass over data already in memory.
  • OpenCode-only workspace-model resolution gaps. Codex raised three and Claude one. Left to upstream (see above).
  • Both reviewers checked the hand-edited Cursor patch against upstream's 1.3.1 change. Each edit matches character for character, apart from minified names, and introduces no shadowing.

vp run check:changed passes on the final head. The focused suites pass: the cursor adapter test, the MCP service, toolkit and handler suites, ProjectionStore, userInputAttachments, attachment upload, store and claims, and terminalUiStateStore.

Done with Claude Opus 5.5 in Claude Code, reviewed by Codex gpt-6.2-astra and Claude Opus 5.5.

🤖 Generated with Claude Code

juliusmarminge and others added 9 commits November 20, 2026 02:11
…dy ran Cursor (#39246)

Ported from pingdotgg/t3code@106a1e03b7.

Adapted: Onicode runs @cursor/sdk 1.4.0, so the model-list cache refetch went into patches/@cursor__sdk@1.4.0.patch instead of upstream's 1.3.1 patch.
…s (#39235)

Ported from pingdotgg/t3code@2fe74b00fa.

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Onicode already translates every quote and port key this commit translates.
…253)

Ported from pingdotgg/t3code@9246c3235e.

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…nal closed (#39260)

Ported from pingdotgg/t3code@80cf4f7945.

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…extracted again

Follow-up to b961674 (port of pingdotgg/t3code@9246c3235e): the worker output changed, so the extractor version moves to 3 and old v2 sidecars with ANSI codes are not reused.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Follow-up to 3b2043d (port of pingdotgg/t3code@106a1e03b7): the index headers of the three edited dist files now match the patched output.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…est of the app

Ported from pingdotgg/t3code@d1f8636f49 (adapted): Onicode already translated every key in that commit; only the six mobile French quote messages that used "tu" take upstream's "vous" wording.

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@trancong12102
trancong12102 merged commit 9296f8c into main Nov 19, 2026
18 checks passed
@trancong12102
trancong12102 deleted the chore/upstream-sync-20261120-0206 branch November 19, 2026 19:32
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.

6 participants