Re-based onto the current shared remote tip (4110c296a, which already
carried an older main sync + windows-update-daemon-adoption); this brings
in the 18 newer main commits through v1.4.124-rc.1. MERGE, not rebase.
Conflict resolutions (our structure wins; main's semantics graft in):
- update-check feature (update-check-click-options.ts + test,
GeneralUpdateSettingsSection.tsx, SidebarSettingsHelpMenu.tsx + test,
updater.ts + test): took main's shape — getUpdateCheckHint() centralizes
the RC/perf hint, pointerdown modifier-capture handler, and the refined
`checkVariant === 'prerelease'` guard so a perf check never permanently
opts background retries into the RC channel. getUpdateCheckClickOptions
(the actual behavior) was byte-identical on both sides.
- Ctrl+K clear vs producer flow control (pty-subprocess.ts, session.ts,
session.test.ts): kept BOTH — our pause()/resume() flow-control methods
AND main's clear() ConPTY screen-state resync (#7413). Orthogonal.
- orca-runtime.ts: took main's public visibility on
clearHeadlessTerminalBuffer (ipc/pty.ts Ctrl+K path calls it); dropped
main's createHeadlessEmulator factory — our Phase-5 query-authority
emulator construction is restructured and has no caller for it.
Incoming (auto-merged, off the byte-delivery path): #6277 agent cold-
restore fallback (pty-connection.ts), node-pty ConPTY relocation (#7421),
MiniMax rate limits, translations.
Gates: typecheck 0 errors; ipc+daemon+terminal-pane+pane-manager 4204
passed; both fuzz suites pass; hand-resolved renderer files pass. No
delivery/restore/flow-control/ACK/batching/scheduler bytes changed, so no
10MB bench required.
Co-authored-by: Orca <help@stably.ai>
Jinwoo-HandOrca
3a55b58086