mirror of
https://github.com/stablyai/orca.git
synced 2026-10-21 16:03:26 +00:00
Neil
af968e3d15
Collapses a 13-PR stack (#12289 -> ... -> #12553, plus #12560) onto `main`, which had moved 253 commits ahead of the stack's base. The stack could not land in order: its base was CONFLICTING/DIRTY and every PR above it was blocked. 21 conflicts. Seven were modify/delete — `main` editing files this work removes — and each was checked for a fix worth carrying rather than resolved by reflex: - #12462 (ConPTY Ctrl+Enter) is a real fix; `main`'s version now stands here, and it is FULLER than the port made on the branch, which had to omit `hasCtrlEnterCsiUAuthority` because that helper did not exist there - #12442 (candidate-anchor layout perf) is moot: the anchor is removed entirely - #12357, #12763 target machinery this work replaces `main`'s deleted `onKeyUp` also held non-IME behaviour — the `optionKeyLocation` reset — which this branch preserves via `installTerminalNativeInputListeners`. Four stale fixtures, all this work's tests meeting changes `main` made while the stack waited: the chat message shape moved from `text` to `blocks`, a button was renamed to "Submit", `createBrowserSessionProfile` gained a third parameter, and `updateWorktreeMeta` began returning a result the dialog reads `.ok` from. Two files exceeded `max-lines` after the merge. Suppressions are forbidden here, so both were reduced by extraction: the ConPTY Ctrl+Enter cases move to their own spec, and the dialog's Enter handling moves to `worktree-meta-enter-handlers.ts` — the two fields need different IME tiers, which is a second responsibility. Full suite: 4538 files / 48145 tests pass. Four files fail and none is caused by this merge — all are untouched by this branch, two pass in isolation (parallelism), one is a known local-environment failure, and one is the cross-version harness needing a checkout it cannot fetch here.