[OrcaWin]

	Files	Added	Deleted	Net
Test	90	$\color{#1a7f37}{\Huge{\mathbf{+}}}$​7263	$\color{#cf222e}{\Huge{\mathbf{−}}}$​3191	$\color{#1a7f37}{\Huge{\mathbf{+}}}$​4072
Prod	179	$\color{#1a7f37}{\Huge{\mathbf{+}}}$​5889	$\color{#cf222e}{\Huge{\mathbf{−}}}$​3869	$\color{#1a7f37}{\Huge{\mathbf{+}}}$​2020

Summary

Merges current main (8ae5264, 17 commits) into OrcaWin/phase35 (c8f0a25, after the five elegance-pass refactors). This is a real merge commit, so both sides are kept. Files main owns stay identical to main, except the one port below. It makes the landing PR #26483 mergeable again.

Conflicts and resolutions

• src/main/runtime/terminal-tail-redraw-buffer.ts: main's Remove repeated row copying from terminal redraw ingestion #26118 ("Remove repeated row copying from terminal redraw ingestion") and Phase 3.5's fix(terminal): keep the main-process terminal tail linear under TUI redraw floods #26316 (with its elegance pass refactor(terminal-tail): Phase 3.5 elegance pass #26465) rewrote the same redraw ingestion for the same goal. Main batches each text run and copies a completed row's trimmed text at newline. Phase 3.5 writes each run once into flat rows that cache their trimmed snapshot, drops rows in batches, and windows by the cursor's net reach. Kept Phase 3.5's model, which covers main's change and is pinned by the equivalence, scaling and wall-time tests. Took main's tests.
• src/main/runtime/terminal-tail-row-retention.test.ts: kept Phase 3.5's ownership assertion and main's new heap test ("does not pin overwritten multiline redraw chunks through completed rows").

Semantic port

• Retention on erase-to-end: main's new heap test failed on Phase 3.5's row model (6.7 MB retained vs a 4 MB cap). A 64 KiB row rewritten as step N done and then erased with ESC[K kept the short result as a slice of the whole 64 KiB row. eraseRetainedRow now copies a kept prefix that is less than half the row, the same rule retainedRowSnapshot already uses. This is main's intent ("own only retained text") in Phase 3.5's model.

Other main changes checked

• The relay bulk-frame backpressure fix (fix: admit relay bulk frames once under backpressure #26333) and the SQLite reply drain (Drain queued SQLite replies before faulting after a main-loop stall #26444) don't overlap any Phase 3.5 file. No new RPC methods (typecheck with required permissions is clean). Nothing new calls the removed id-only repos:remove / Store.removeProject.

Verification

• pnpm install --frozen-lockfile with no lockfile change, and pnpm tc pass.
• oxlint on the merge's changed files, check:code-quality:changed, audit:anti-slop, the max-lines, runtime Electron and reliability ratchets, and verify:localization-catalogs pass. The runtime-required catalog needed no regeneration.
• The React Doctor changed-lines gate is clean against both origin/main and origin/OrcaWin/phase35.
• Terminal tail suites: 12 files, 86 tests pass, including main's new spans and heap tests and Phase 3.5's equivalence and wall-time tests.