mirror of
https://github.com/stablyai/orca.git
synced 2026-10-22 16:03:47 +00:00
Neil
26af3d8234
Three conflicts, all resolved keeping both sides: - persistence.ts — both sides added a field to persistPtyBinding's options. Kept `mayCreate` (ours) and `expectedSourceBinding` (main's). - ipc/pty.ts — main added an `expectedSourceBinding` CAS and a `terminal_split_source_not_found` throw to the exact block our `bindPaneShell` producer replaced. Threaded `expectedSourceBinding` THROUGH the producer rather than dropping it, and kept main's refusal throw on `bound === false`. Dropping it would have silently disarmed a CAS main just added. - pty-connection.test.ts — main added `startupCommandDelivery: 'shell-ready'` to a resume assertion this branch deletes outright (the resume no longer happens). Took ours; main's addition is moot in an inverted clause. Also repairs a rename/rename divergence unrelated to STA-3077: both sides deleted a different half of a duplicated xterm-bypass fixture, so the merge deleted both. Restored main's `xterm-bypass-event-fixture.ts` and repointed three test imports at it, adopting main's convention rather than this branch's older move. Verified after merge: 43,179 tests pass. The 7 failures (osc8 snapshot round-trip, IME resumed-preedit) are PRE-EXISTING on clean origin/main — checked against a baseline worktree, not assumed. Typecheck clean on node and web.