mirror of
https://github.com/stablyai/orca.git
synced 2026-10-02 08:02:02 +00:00
Conflict resolutions: - terminal-stream-protocol: Metadata keeps opcode 12 (shipped to mobile in v1.4.120); branch-only Ack renumbers to 13. - scheduler: keep HIGH_PRIORITY_MAX_WRITES_PER_DRAIN=8 (perf fix) over main's 2 (#7139 landed there with the old constant). - headless-emulator: keep chain structure (scanner classes, query-reply forwarding); graft main's pathFlavor/remotePosixFileUriAuthority OSC7 options through TerminalOscCwdTitleScanner. Main's TerminalPrivateModeTracker is logic-identical to the chain's TerminalMouseModeMirror (kept, with pre-filter). - orca-runtime: keep chain factory; graft main's pathFlavor wiring and snapshot cwd fallback; keep both teardown lines. - pty-connection: keep both chain reconcile and main's ordered-seq tracking; clear the chain's restored-snapshot baseline on pty exit (same seq-domain boundary main's reset enforces) — fixes revive with restarted seq counter dropping chunks as duplicates. - subscribe-buffer tests: updated to merged semantics — main's inline overflow recovery ships current data as the FIRST snapshot; the chain's resized/pending-output-overflow follow-up remains as backstop. Validation: typecheck clean; 7,548 tests green across daemon/ipc/ runtime/pane-manager/terminal-pane/shared/mobile-transport (1 documented pre-existing WSL failure). Co-authored-by: Orca <help@stably.ai>