[OrcaWin]

	Files	Added	Deleted	Net
Test	742	$\color{#1a7f37}{\Huge{\mathbf{+}}}$​56314	$\color{#cf222e}{\Huge{\mathbf{−}}}$​10654	$\color{#1a7f37}{\Huge{\mathbf{+}}}$​45660
Prod	1003	$\color{#1a7f37}{\Huge{\mathbf{+}}}$​32500	$\color{#cf222e}{\Huge{\mathbf{−}}}$​10252	$\color{#1a7f37}{\Huge{\mathbf{+}}}$​22248

ELI5

Phase 3.7 has been waiting on its own branch while main moved ahead by 90 commits. This brings main into the Phase 3.7 branch so the landing PR shows only the Phase 3.7 work and is tested against current main.

What Changed

A merge of origin/main (e43997c) into OrcaWin/phase37 (64d3f55). No new behavior. Three files conflicted, and a few more were changed on both sides and merged on their own. Each one keeps what both sides meant.

Conflicts resolved by hand

• src/main/ipc/runtime-environment-managed-tunnel.ts: keeps Phase 3.7's redeploy of a server another desktop stopped (redeployStoppedManagedOrcad, MANAGED_ORCAD_NOT_ACTIVATED_DETAIL, OrcadManagedServing, rebuildOrcadManagedTunnel). Also keeps main's getSshHostServerStatus, which backs the new clearManagedServerNotes. publishHostServerStatus now takes a target id (main's version), and the Phase 3.7 callers type-check against it.
• src/shared/wsl-login-shell-command.ts: main reverted the per-account Claude folders (Revert Claude per-account folders (#24434, #26405) before release #26638), which removed the fish claude function import. Phase 3.7's stdout fence import (buildPosixStdoutFence, HH-1) is kept.
• source-control-too-many-changes-banner.test.tsx: main moved TooManyChangesBanner into source-control/listing/too-many-changes-banner.tsx. The test now imports it from there and keeps Phase 3.7's SourceControlContentStatus import for the Stage All cases. The moved banner keeps the onStageAll prop from fix(source-control): Stage All stages every change when the listing hit the 1,000 cap (HH-4) #26618.

Changed on both sides, merged automatically and checked by hand

• managed-orcad-actions.ts: main's "clear the stale update/serving notes after an update" and Phase 3.7's forget action with the shared unlink policy both stay.
• orcad-managed-tunnel-manager.ts: main's superseded-tunnel check after checkServing and Phase 3.7's rebuild() sit in separate methods.
• runtime-environments.ts, the i18n catalogs, en-runtime-required.json, rpc-params-catalog.generated.ts, reliability-gates.jsonc: these are additions from both sides. The catalogs pass their verifiers.

RPC permissions: the only new RPC method in Phase 3.7, managedServer.forget, declares permission: 'host-admin'. defineMethod requires the field, and a scan of every method finds none without it.

Why

A merge, not a rebase, because phase37 is a shared branch that already has squash-merged PRs on it. Bringing main in before the landing PR means the final review and CI run against what will actually ship.

Linked Issue

N/A (maintainer sync of an integration branch)

Visual Proof

N/A: a merge with no behavior change of its own.

Testing

Local, macOS, one worker:

• pnpm install --frozen-lockfile, pnpm tc: pass

• oxlint, pnpm run check:code-quality:changed (0 new findings across 224 files), pnpm run audit:anti-slop: pass

• verify:rpc-params-catalog, verify:localization-catalog, verify:localization-runtime-catalog, verify:localization-extraction, verify:localization-coverage, check:max-lines-ratchet, check:reliability-gates, check:ts-nocheck-ratchet, check:runtime-electron-ratchet: pass

• Runtime boundary tests (vitest-node-runtime-boundary, vitest-runtime-boundary, vitest-sqlite-runtime-boundary, plain-node-entry-guard): 46/46 pass

• Every test file Phase 3.7 touched, plus the tests for the overlapping files: 99 files, 1069 tests pass. The mobile capped Stage All test passes 4/4.

• check-runtime-launcher-protocol-ratchet --base origin/main: OK. Against the phase37 base it flags main's own protocol 43 bump and launcher change, which come in through this merge. They are not new in this PR.

• I manually tested these changes locally

• Automated tests added/updated, or explained why not below (a merge; the existing tests cover it)

Review

Conflicts were resolved by hand, and each file changed on both sides was read.

Agent skill upstream boundary

• Not applicable, or this change copies or mechanically translates no upstream skill-installer source, tests, fixtures, registry entries, path tables, comments, or documentation.

Notes

SSH/remote: the conflicting code is the managed-server status line and the WSL login shell. Both sides' behavior is kept as described above.

Checklist

• This PR is small and focused
• I explained what changed and why
• Before/after screenshots or videos attached for UI changes, or N/A with reason
• Self-reviewed for correctness, security, and performance
• Cross-platform, SSH/remote, and path/shortcut impact considered (or N/A)
• pnpm lint, pnpm typecheck, pnpm test, and pnpm build pass (or CI will cover; local preferred)

[OrcaWin]

CI notes for this sync:

• static analysis and typecheck / verify (changed-code quality): the 341 findings (331 casting, 10 React Doctor) are all main's own lines. The gate compares against the PR base (OrcaWin/phase37), so every line main changed in the last 90 commits counts as "added". The top files are src/main/claude-accounts/*.test.ts, which main restored in its revert Revert Claude per-account folders (#24434, #26405) before release #26638. Locally, pnpm run check:code-quality:changed against origin/main reports 0 new findings across the 224 files this branch changes. The landing PR into main runs the gate against main.
• test (cloud relay-postgres drain-release-cell-row-contention-postgres.test.ts, expected 180 got 178): a timing-based cloud relay test from main, not touched by Phase 3.7. Rerun once.