mirror of
https://github.com/stablyai/orca.git
synced 2026-09-22 16:02:32 +00:00
Two conflicts: - .gitignore — both sides added doc negations; kept both. - orchestration/db.ts — this branch moved `isEquivalentPaneKey` into shared/stable-pane-id (collapsing a duplicate), while main added `parseWorkerTerminalPriorOwnerIds` beside the old local copy. Kept the move and kept main's new helper, rather than resurrecting the duplicate. 43,250 pass. The 7 failures are the same environment-specific pre-existing ones (osc8 snapshot round-trip, IME resumed-preedit) that fail on clean origin/main in this environment.