[kiwidream]

	Files	Added	Deleted	Net
Test	1746	$\color{#1a7f37}{\Huge{\mathbf{+}}}$​24020	$\color{#cf222e}{\Huge{\mathbf{−}}}$​11870	$\color{#1a7f37}{\Huge{\mathbf{+}}}$​12150
Prod	1254	$\color{#1a7f37}{\Huge{\mathbf{+}}}$​20662	$\color{#cf222e}{\Huge{\mathbf{−}}}$​6336	$\color{#1a7f37}{\Huge{\mathbf{+}}}$​14326

ELI5

Upstream Orca moved forward 213 commits since yesterday's sync (#53). This PR merges them into swaplabs/main. 11 files conflicted with fork changes, each in one small spot, and the fork's lines are kept unchanged. Two more things broke without a conflict: a new upstream lint rule and a new upstream test-pattern ratchet. Both are fixed here without changing any fork behaviour. This PR replaces #55 (head main), which could not merge.

What Changed

Upstream range 30733ac703..0571e45107, 213 commits (compare). One signed merge commit, d0a85cc508 (Merge upstream main (0571e45107) into swaplabs/main), on sync/upstream-20261025, cut at the integration head a1c9ba1fd4.

Conflicts, by fork PR (orca-fork-ops conflicts)

Fork PR	File	Upstream change	Resolution
#17 (managed-server update help)	src/renderer/src/components/settings/RemoteServerUpdateStatus.tsx	stablyai#33397 adds a managedOverSsh branch at the top of getRemoteServerManualUpdateHelp	both branches; the fork's help-URL branch stays first (see below)
#17	src/renderer/src/i18n/locales/{en,es,fr,ja,ko,zh}.json	stablyai#33397 adds managedOverSshHelp as the last key of the same object	upstream's key, then the fork's managedByDeploymentHelp and howToUpdate
#6 (auto-resume)	src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty.ts	stablyai#33315 installs installAgentPreReadyTypedDraft after installPtyInputRecovery	both: the fork's installAgentResumeRecovery (it must follow installPtyInputRecovery), then upstream's draft
#6	src/renderer/src/components/terminal-pane/pty-connection/session-reconcile-dispose.ts	stablyai#33315 discards the pre-ready draft on dispose	both: the fork's resume cleanup, then upstream's discardAgentPreReadyDraft
#10, #16 (update sources, mac self-update)	src/main/updater.check-preflight.test.ts	stablyai#33294 replaces an inline window cast with updaterMainWindow from the new updater-test-main-window.ts	both imports: the fork's tests still use createUpdaterMainWindowFake, and upstream's test uses its helper
#8 (fork build pipeline)	.gitignore	stablyai#33406 allow-lists docs/reference/component-fixtures.md	upstream's line, plus the fork's two docs/reference/swaplabs-*.md lines

RemoteServerUpdateStatus.tsx, why the fork's branch stays first: the fork's help-URL branch only fires for a host that reports manual-service-update-required and publishes an ORCA_SERVER_UPDATE_HELP_URL, and it is what the fork's "How to update" link trails. Upstream's new branch is for a server this desktop deployed over SSH (orcadDeployment). Every case that occurs today behaves as before on each side. A devvms host is paired, not SSH-deployed, so it gets the deployment text and link. An SSH-deployed server has no help URL (the variable is set only in orca-serve.service), so it gets upstream's text. Only a host that is both would see the fork's text; keeping it first means the help text and the link always agree.

For all 31 files both sides changed, the fork's added and removed lines against upstream are the same before and after the merge. The one exception is the six catalogs: the trailing comma the fork added moves from legacyHelp to upstream's new last key.

Breaks the conflict list did not show

Fork PR	File	Upstream change	Fix
#10 (update sources)	src/main/updater-release-source-feed.fixture.ts → .test-fixture.ts; import in src/main/updater-test-harness.ts	stablyai#33406 adds a no-restricted-imports pattern: a *.fixture module is a dev-only component fixture and may be imported only from tests. The harness is not a test file, so the fork's import of this module failed oxlint	rename the module to upstream's test-fixture convention (*.test-fixture.ts, already a knip entry and an anti-slop test-support pattern) and follow the rename in the harness. The fork's other *.fixture.ts modules are imported only by test files and are left alone
all fork test files	config/flaky-test-pattern-baseline.txt	stablyai#33430 adds a flaky-test ratchet (wall-clock reads, real-time waits, polling loops, timeouts without a reason). It grandfathers every existing finding in upstream's tree, but none in the fork's	add the fork's 17 rows (52 findings, all in fork-only test files) with the note fork test, predates this ratchet, inserted in place. Upstream's rows are unchanged. Without them, pnpm lint and pnpm check:changed fail on any fork checkout, because their local scope is the whole fork delta. A precedent for a fork row in an upstream ratchet baseline is workspace-record-read-baseline.txt (sync 1a247d1c5c)

No other fork lines were moved or dropped.

Upstream's own failures (reported, not patched)

check:flaky-test-pattern-ratchet fails on pristine upstream 0571e45107 too. Upstream's baseline predates stablyai#33407's move of the filesystem-watcher tests into src/main/ipc/filesystem/watchers/: 6 stale rows at the old paths, 6 unbaselined rows at the new ones. It also has windows-pty-job.win32.test.ts at 8 against 6 and orchestration-idle-mail-delivery.spec.ts at 6 against 7. CI's "Enforce ratchets" step scopes to the files this PR changes, which include those, so it is expected to be red for upstream's reasons.

Some notable upstream changes in the range

• managed SSH servers: Update and Update anyway from the server's row, keeping its running terminals (feat(managed-server): Update and Update anyway for a managed SSH server, keeping its running terminals stablyai/orca#33397);
• terminal input: keys typed into a starting agent pane become an unsubmitted draft (fix(terminal): keep keys typed into a starting agent pane as an unsubmitted draft stablyai/orca#33315), and keys typed before a pane's terminal exists are kept (fix(terminal): keep keys typed before a pane's terminal exists stablyai/orca#33281);
• resume: an agent whose spawned PTY is still live is not resumed (fix(terminal): don't resume an agent whose spawned PTY is still live stablyai/orca#33380); a cold-restored terminal keeps its agent session (fix(runtime): a cold-restored terminal keeps its agent session without showing the old Done (STA-12043) stablyai/orca#33302); a resumed Kimi pane stays resumable across restarts (fix(kimi): keep a resumed Kimi pane resumable across the next Orca restart stablyai/orca#33489);
• SSH: saved port forwards come back after a restart through the host's Orca server (fix(ssh): saved port forwards come back after a restart that reconnects through the host's Orca server (#32484) stablyai/orca#33388), and ones that couldn't start say why and can be removed (feat(ssh): show saved port forwards that couldn't start, with why, and let you remove them stablyai/orca#33450);
• daemon: input to a live terminal whose PTY stopped taking it is refused (fix(daemon): refuse input to a live terminal whose PTY stopped taking it instead of reporting delivery stablyai/orca#33269), and descendants are swept on a graceful close (fix(daemon): sweep descendants on graceful close of shells without launch metadata stablyai/orca#33317);
• browser: a link-URL bubble (feat(browser): show a hovered or focused link's URL in a bubble at the bottom of the page stablyai/orca#32978), tab mute (feat(browser): speaker icon on tabs playing sound, with tab mute stablyai/orca#32981), bigger new tab tiles (feat(browser): bigger new tab tiles and roomier workspace card stablyai/orca#33178);
• tooling: component fixtures with headless screenshots (feat(devex): component fixtures with headless screenshots for fast UI checks stablyai/orca#33406), ast-grep rules plus the flaky-test ratchet (perf(lint): keep JS plugins out of default oxlint and adopt ast-grep stablyai/orca#33430), pnpm check:changed as the single pre-handoff gate (feat(devex): pnpm check:changed as the single pre-handoff gate stablyai/orca#33432), bundled renderer dev mode by default (perf(dev): serve the renderer with bundled dev mode by default stablyai/orca#33449);
• the PTY pane-copy census test is deleted (test: delete the PTY pane-copy census stablyai/orca#33338); its invariant is now proven at runtime by pty-pane-copies-untouched-main.test.ts. That is the test Host resume (#30): upstream PTY pane-copy census flags host-pane-agent-resume-start.ts #54 is about.

Why

Daily upstream sync.

Linked Issue

N/A: daily upstream sync.

Visual Proof

N/A: no visible change in the fork's UI. The conflicts are in help-text selection, catalogs, terminal wiring and tests.

Testing

All checks ran on the merge result in the sync worktree, before the commit:

• Install: pnpm install --frozen-lockfile (the lockfile and every package.json equal upstream's).
• Typecheck: pnpm tc passes, before and after the fixture rename. A deliberate type error in a scratch file made it fail, which proves the gate is live.
• Fork tests: every unit test file the fork adds or changes against upstream: 115 files, 1,451 tests passed, 8 skipped. orca-runtime.test.ts (it runs the fork's worktree-ps-agent-row-dismissal.spec.ts), run with fixture signing off: 1,505 passed, 3 skipped. The fork's 3 e2e specs were not run.
• Touched directories: src/main/updater*, src/renderer/src/components/settings, src/renderer/src/components/terminal-pane, src/renderer/src/i18n, plus pty-pane-copies-untouched-main.test.ts: 907 files passed, 1 skipped; 8,415 tests passed, 38 skipped.
• Changed-code gate: check-changed-code-quality.mjs with ORCA_SYNC_PR_DIFF_BASE=0571e45107. It found 1 finding across 328 fork files (the .fixture import above), and 0 after the rename.
• Lint: full-repo oxlint reports 0 errors, and every other step of pnpm lint passes on its own. The exception is the flaky-test ratchet. In the fork-delta scope (ORCA_SYNC_PR_DIFF_BASE=0571e45107, what a fork checkout sees after this merge) it passes. In this PR's CI scope it shows only upstream's own rows above. verify:localization-catalog and verify:localization-runtime-catalog also pass.
• Lint and format of everything the merge stages (3,189 code files and 69 others outside cloud/): oxlint with the default, JS-plugin and React Doctor configs, ast-grep scan, and oxfmt --check all pass. The pre-commit hook then ran normally, and the tree before the commit (291811324c) equals HEAD^{tree} after it.
• Signature: d0a85cc508 is G from the sync key BF1DD75F888E96080C2453E2D9E158C5D6874235.

AI Disclosure

Prepared by the "Orca upstream sync" automation (Claude Code, Claude Opus 5.5).

Agent skill upstream boundary

• Not applicable: this PR merges upstream's history; it adds no agent skill.

Notes

orca-fork-ops status for swaplabs/main (a1c9ba1fd4) against upstream 0571e45107, before this merge:

• merged upstream: 0;
• pending upstream: 0;
• local forever: 83 (unchanged since sync: upstream 30733ac703 into swaplabs/main #53);
• 30 commits have no LOCAL: prefix and no upstream PR.

Upstream release tag v1.4.240 was copied to the fork.

🤖 Generated with Claude Code

---

^{Need help on this PR? Tag @codesmith-bot with what you need.}

[chatgpt-codex-connector]

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review	Status	Commit	Review trigger
📝 Code Review	✅ Completed 2026-10-25T10:27:15.873478Z	d0a85cc	PR opened

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.