Repository navigation
sync: upstream 33ddab70b7 into swaplabs/main - #58
Merged
Merged
Conversation
…term relay (stablyai#33495) Release queued startup input when a figterm-style relay (Kiro CLI's kiro-cli-term) exec-replaces the shell: if the pane's foreground process isn't a shell, accept a direct child that is the expected shell, foreground on its own tty, at an editable prompt. Startup with Kiro shell integration drops from a 15s timeout to <1s. Fixes stablyai#25586 Supersedes stablyai#25899 Co-authored-by: ggbdpq <67929842+ggbdpq@users.noreply.github.com>
…tablyai#33493) Codex sessions launched from an Orca-managed account home now honor the user's global ~/.codex/rules exec-policy files: each regular global .rules file is copied in as rules/_orca-global-<name> on launch (sorted before the account's own files so its saved decisions still win last-one-wins rules); approvals keep saving to the account's default.rules. Fixes stablyai#24431 Co-authored-by: Yuichi Uemura <82369+u-ichi@users.noreply.github.com>
…reattached (stablyai#33494) After Wake the window paints the restored history and then blanks its viewport, so the new shell's prompt starts on a clean screen. The daemon's own copy of the screen, seeded with the same history, skipped that step. A later reattach (a reload, a second window, the phone) therefore showed the new prompt beside the dead shell's last one: `p7/sub$ orca@awin:~/projects/p7$` (awin verify-11). The seed now ends with the same viewport blanking the window writes, built by one shared function, after the process-boundary ground, which still never moves the cursor. Co-authored-by: Claude <noreply@anthropic.com>
…lder when slept (stablyai#33496) After an app relaunch, the window reattaches a live pane without its spawn environment, so the daemon client never learned the pane's ORCA_PANE_KEY. Sleep then skipped the folder read for it, and the pane woke at its spawn folder. A move's kill-at-quiesced rollback also put a pane `cd`'d before the relaunch back at the project root (awin verify-11, 5e). Sleep now takes the pane key from the daemon's session list when it knows the session's distro but not its key. That is the same one `listSessions` the adoption of an unattached session already uses. Co-authored-by: Claude <noreply@anthropic.com>
…lyai#33498) * test: remove redundant checks and strengthen runtime assertions * test: prune resolved real-time wait baseline --------- Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
…ker's first dispatch (stablyai#33499) dsh worker dispatches (and other dsh agent-prompt sends) now get stablyai#33316's bounded Enter retry: dsh paints its launchpad before its session opens and refuses the first Enter with "still starting", so a fresh worker's task sat unsent. The retry only re-presses while the launchpad still holds the same prompt and stops once a turn starts. Fixes stablyai#30778 Co-authored-by: Jinwoo Hong <73622457+Jinwoo-H@users.noreply.github.com>
…ine tail kept after the TUI erased it (stablyai#33485) A Codex (or Antigravity/Cline/Prime Agent) dialog drawn and erased in place no longer leaves the pane "blocked" forever when no hook/OSC 7501 clears it. The line tail still decides; the live screen may only clear a tail block when caught up, quiet 3s, no blocker anywhere on screen, and the agent's composer is ready — then the stale block stamp is cleared so the send's own echo doesn't re-block. Also defers the daemon re-attach seed's output sequence until the seed lands. Fixes stablyai#24187 Supersedes stablyai#24308 Co-authored-by: Wooseong Kim <2222333+innocarpe@users.noreply.github.com>
…#33503) Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
…d only by the login shell (stablyai#33506) Claude history, usage, native-chat lookup and worktree-retirement discovery now include the user's own CLAUDE_CONFIG_DIR read from the login shell, so sessions in a custom config folder show up even when Orca was launched from the Dock. Refs stablyai#23505
) * [comment audit] Align legacy failure-read counts with cached display * [comment audit] Condense shared provider lifecycle and browser recovery comments [skip ci] * [comment audit] Condense shared generation, path and preview comments [skip ci] * [comment audit] Condense host, file and Git contract rationale [skip ci] * [comment audit] Tighten Git lifecycle and provider contract comments [skip ci] * [comment audit] Clarify shared host authority and launch isolation [skip ci] * [comment audit] simplify local access mobile and native chat contracts [skip ci] * [comment audit] simplify native chat presentation and state contracts [skip ci] * [comment audit] simplify native runtime and provider contracts [skip ci] * [comment audit] simplify migration and orchestration contracts [skip ci] * [comment audit] simplify plugin trust and process capture rationale [skip ci] * [comment audit] simplify terminal delivery and remote compatibility rationale [skip ci] * [comment audit] clarify remote recovery and launch wire rationale [skip ci] * [comment audit] shorten shared RPC compatibility and runtime evidence comments [skip ci] * [comment audit] simplify secure storage shell startup and sidebar rationale [skip ci] * [comment audit] clarify sidebar, skill and SSH invariants [skip ci] * [comment audit] condense structured chat delivery and timing rationale [skip ci] * [comment audit] condense terminal replay and telemetry invariants [skip ci] * [comment audit] clarify launch permission and terminal delivery rationale [skip ci] * [comment audit] clarify workspace ownership and layout contracts [skip ci] * [comment audit] wait for fitted and painted SSH terminal links * [comment audit] clarify layout persistence and session ownership [skip ci] * [comment audit] clarify host routing and workspace lifecycle contracts [skip ci] * [comment audit] clarify startup persistence and app lifetime comments [skip ci] * [comment audit] clarify recovery and activity boundaries [skip ci] * [comment audit] condense activity and artifact invariants [skip ci] * [comment audit] condense automation authority contracts [skip ci] * [comment audit] simplify automation scheduling and history contracts [skip ci] * [comment audit] clarify browser chrome and annotation lifecycles [skip ci] * [comment audit] clarify browser routing and retained guest ownership [skip ci] * [comment audit] clarify browser recovery and document ownership comments [skip ci] * [comment audit] restore hosted runners required by native IME fixtures * [comment audit] shorten preview, palette and dashboard invariants [skip ci] * [comment audit] clarify terminal preview, dashboard and retention comments [skip ci] * [comment audit] clarify diff-note recovery and editor lifecycle comments [skip ci] * [comment audit] shorten rich-text and combined-diff ownership comments [skip ci] * [comment audit] shorten autosave, draft recovery and model ownership comments [skip ci] * [comment audit] shorten save-queue, notebook and Markdown constraints [skip ci] * [comment audit] shorten Monaco, PDF and rich Markdown safeguards [skip ci] * [comment audit] clarify rich Markdown source and selection safeguards [skip ci] * [comment audit] clarify editor loading and emulator stream lifetimes [skip ci] * [comment audit] trim emulator and feature tour narration [skip ci] * [comment audit] clarify floating workspace and GitHub cache ownership [skip ci] * [comment audit] trim provider controls and Linear filter explanations [skip ci] * [comment audit] clarify pairing and chat resume lifetimes [skip ci] * [comment audit] clarify chat delivery and transcript lifetimes [skip ci] * [comment audit] clarify session options and host-owned status [skip ci] * [comment audit] clarify draft durability and live-status precedence [skip ci] * [comment audit] Trim chat send and model ownership explanations [skip ci] * [comment audit] Shorten transcript ownership and send recovery comments [skip ci] * [comment audit] Simplify native chat composer and transcript hook comments [skip ci] * [comment audit] Shorten native chat scroll and structured session explanations [skip ci] * [comment audit] Trim workspace picker and onboarding commentary [skip ci] * [comment audit] Simplify pet rendering, review cache and quick open comments [skip ci] * [comment audit] Trim sidebar and session history explanations [skip ci] * [comment audit] Condense session resume and review checks comments [skip ci] * [comment audit] Shorten checks state and file explorer refresh comments [skip ci] * [comment audit] Trim plugin bridge and source-control action rationale [skip ci] * [comment audit] Trim source-control listing and review rationale [skip ci] * [comment audit] Shorten sidebar lifecycle and explorer safeguards [skip ci] * [comment audit] Condense Settings account and appearance rationale [skip ci] * [comment audit] Trim pairing and repository Settings explanations [skip ci] * [comment audit] Condense Settings search SSH and terminal safeguards [skip ci] * [comment audit] Shorten Settings voice and provider ownership comments [skip ci] * [comment audit] Condense Settings draft persistence and host-state rationale [skip ci] * [comment audit] Trim Settings hooks and sidebar setup rationale [skip ci] * [comment audit] Condense sidebar deletion and board-filter safeguards [skip ci] * [comment audit] Condense worktree cards, host ownership and Markdown contracts [skip ci] * [comment audit] Condense sidebar drag, folder and filtering contracts [skip ci] * [comment audit] Condense sidebar parity, sleep and host ownership contracts [skip ci] * [comment audit] Prune focus-read baseline after comment cleanup * [comment audit] Clarify sidebar visibility, board drops and agent evidence [skip ci] * [comment audit] Tighten sidebar listing, drag and reveal contracts [skip ci] * [comment audit] Clarify viewport geometry and skill update safeguards [skip ci] * [comment audit] Tighten skill inventory, usage and host status comments [skip ci] * [comment audit] Clarify usage ownership and resource kill safeguards [skip ci] * [comment audit] Tighten tab selection, rename and search contracts [skip ci] * [comment audit] Tighten tab-strip geometry and drag ownership comments [skip ci] * [comment audit] Tighten Tasks recovery, pagination and mutation comments [skip ci] * [comment audit] Tighten provider loading and terminal recovery comments [skip ci] * [comment audit] Tighten completion, cadence and PTY ownership comments [skip ci] * [comment audit] Clarify terminal restore and parked-pane boundaries [skip ci] * [comment audit] Tighten PTY startup and replay explanations [skip ci] * [comment audit] Clarify PTY identity and delivery ownership [skip ci] * [comment audit] Shorten remote reconnect and input replay rationale [skip ci] * [comment audit] Condense terminal parking clipboard and file link comments [skip ci] * [comment audit] Clarify IME ownership and trim trace history [skip ci] * [comment audit] Shorten pane recovery and parked watcher explanations [skip ci] * [comment audit] Condense snapshot replay and visibility recovery rationale [skip ci] * [comment audit] Shorten terminal parking and keyboard ownership rationale [skip ci] * [comment audit] Trim renderer lifecycle and menu rationale [skip ci] * [comment audit] Condense workspace cleanup ownership and settlement notes [skip ci] * [comment audit] Clarify renderer hook evidence and source ownership [skip ci] * [comment audit] Tighten IPC ownership and reconnect explanations [skip ci] * [comment audit] Trim renderer focus, paste and attention comments [skip ci] * [comment audit] Shorten scroll, locale and agent lifecycle comments [skip ci] * [comment audit] Trim agent launch, resume and ownership commentary [skip ci] * [comment audit] Shorten account, browser and editor comments [skip ci] * [comment audit] Clarify host-mirror waits, previews and input ownership [skip ci] * [comment audit] Condense launch recovery and editor tokenization comments [skip ci] * [comment audit] Condense workspace selection and terminal pane rationale [skip ci] * [comment audit] Condense terminal fitting and rendering recovery comments [skip ci] * [comment audit] Condense terminal input and host routing explanations [skip ci] * [comment audit] Condense ownership and sleeping-session recovery rationale [skip ci] * [comment audit] Condense structured launch and terminal link explanations [skip ci] * [comment audit] Condense terminal ownership and workspace file routing rationale [skip ci] * [comment audit] Condense session persistence and workspace activation rationale [skip ci] * [comment audit] Condense workspace routing and browser ownership rationale [skip ci] * [comment audit] Condense mirror recovery and layout authority rationale [skip ci] * [comment audit] Condense runtime transport and file safety rationale [skip ci] * [comment audit] Condense runtime graph and structured session rationale [skip ci] * [comment audit] Condense browser creation and remote tab recovery rationale [skip ci] * [comment audit] Condense snapshot authority and publisher recovery rationale [skip ci] * [comment audit] Condense frame, startup and provider cache rationale [skip ci] * [comment audit] Condense host twin and agent lifecycle rationale [skip ci] * [comment audit] Condense browser authority and editor cleanup rationale [skip ci] * [comment audit] Condense editor buffer identity and review cache rationale [skip ci] * [comment audit] Condense provider lifetime and repository ownership rationale [skip ci] * [comment audit] Condense reconnect, hydration and terminal retirement rationale [skip ci] * [comment audit] Condense recovery, reconciliation and persistence rationale [skip ci] * [comment audit] Condense cleanup ownership and listing admission rationale [skip ci] * [comment audit] Condense teardown ordering and terminal ownership rationale [skip ci] * [comment audit] Condense recovery ledger and web host-boundary rationale [skip ci] * [comment audit] Condense web reconnect and credential lifecycle rationale [skip ci] * [comment audit] Condense cloud rollout and assignment safety rationale [skip ci] * [comment audit] Condense relay session and database recovery rationale [skip ci] * [comment audit] Condense relay placement and protocol compatibility rationale [skip ci] * [comment audit] Condense build and packaging constraints [skip ci] * [comment audit] Condense CI gates and validation isolation rationale [skip ci] * [comment audit] Condense catalog identity and browser validation rationale [skip ci] * [comment audit] Condense mobile browser and frame-budget rationale [skip ci] * [comment audit] Shorten mobile route and browser test explanations [skip ci] * [comment audit] Condense editor and session seam test rationale [skip ci] * [comment audit] Trim session and terminal closure history [skip ci] * [comment audit] Shorten terminal browser and census explanations [skip ci] * [comment audit] Preserve root-only E2E diagnostic baseline * [comment audit] Condense mobile seam and HTML preview test rationale [skip ci] * [comment audit] Condense preview instrumentation and render harness rationale [skip ci] * [comment audit] Condense bundle contracts and native-build constraints [skip ci] * [comment audit] Shorten native packaging and CI routing rationale [skip ci] * [comment audit] Condense release tooling and benchmark constraints [skip ci] * [comment audit] Condense packaging and platform gate rationale [skip ci] * [comment audit] Shorten mobile route and history rationale [skip ci] * [comment audit] Condense mobile browser and component rationale [skip ci] * [comment audit] Shorten drawer and workspace-form rationale [skip ci] * [comment audit] Trim mobile review and editor-document explanations [skip ci] * [comment audit] Condense editor lifecycle and Markdown explanations [skip ci] * [comment audit] Trim mobile file, diagnostics and dictation commentary [skip ci] * [comment audit] Simplify mobile host-list and workspace-view explanations [skip ci] * [comment audit] Clarify mobile shell lifetime and bridge delivery constraints [skip ci] * [comment audit] Condense bridge stream, native request and audio rationale [skip ci] * [comment audit] Reduce bridge schema and page-client commentary [skip ci] * [comment audit] Tighten mobile page bridge contracts [skip ci] * [comment audit] Clarify mobile cache and session constraints [skip ci] * [comment audit] Condense mobile route and lifecycle rationale [skip ci] * [comment audit] Tighten mobile shell hook timing rationale [skip ci] * [comment audit] Clarify route handoff and notification compatibility [skip ci] * [comment audit] Clarify push registration and dictation cleanup constraints [skip ci] * [comment audit] Condense keyboard geometry and native media ownership rationale [skip ci] * [comment audit] Tighten mobile chat scroll and composer concurrency rationale [skip ci] * [comment audit] Condense mobile reply compatibility and upload ownership rationale [skip ci] * [comment audit] Condense optimistic echo and scroll ownership rationale [skip ci] * [comment audit] Tighten stream replay and queued session ownership rationale [skip ci] * [comment audit] Condense mobile composer and reply-schema constraints [skip ci] * [comment audit] Clarify mobile transcript recovery and session ownership [skip ci] * [comment audit] Clarify mobile queue and source-control compatibility [skip ci] * [comment audit] Condense storage and task launch constraints [skip ci] * [comment audit] Clarify task schemas and terminal document ownership [skip ci] * [comment audit] Tighten terminal input and viewport rationale [skip ci] * [comment audit] Shorten terminal and RPC recorder contracts [skip ci] * [comment audit] Condense recorder engine and connection contracts [skip ci] * [comment audit] Shorten host credential and relay recovery comments [skip ci] * [comment audit] Tighten pairing recovery and bundle transport rationale [skip ci] * [comment audit] Clarify RPC delivery and workspace catalog boundaries [skip ci] * [comment audit] Condense catalog and relay entry contracts [skip ci] * [comment audit] Shorten shutdown and SSH relay delivery contracts [skip ci] * [comment audit] Condense WSL relay and E2E regression rationale [skip ci] * [comment audit] Shorten cross-version harness and renderer fixture explanations [skip ci] * [comment audit] Condense paired-host and E2E lifecycle rationale [skip ci] * [comment audit] Shorten layout oracle and regression explanations [skip ci] * [comment audit] Condense paired recovery and ownership regression contracts [skip ci] * [comment audit] Shorten restart, sidebar and SSH lifecycle contracts [skip ci] * [comment audit] Condense terminal rendering and IME regression rationale [skip ci] * [comment audit] Shorten terminal recovery and benchmark contracts [skip ci] * [comment audit] Condense tooling and Windows lifecycle proof rationale [skip ci] * [comment audit] Condense workflow routing and release rationale [skip ci] * [comment audit] Condense mobile security and installer contracts [skip ci] * [comment audit] Shorten native rationale and stylesheet workarounds [skip ci] * [comment audit] Shorten Windows visibility probe rationale [skip ci] * [comment audit] Condense embedded release and signing rationale [skip ci] * [comment audit] Retain current main test behavior in final reconciliation [skip ci] * [comment audit] Complete final comment review across current source inventory * [comment audit] Handle consolidated audit reports before final CI * [comment audit] Preserve credential storage census detail [skip ci] * [comment audit] Scale broad changed E2E selections with verified timing shards * [comment audit] Align E2E assertions with browser close and settled session metadata * [comment audit] Match existing E2Es to current resource and windowing contracts * [comment audit] Observe the shared server outage notice in reconnect coverage * [comment audit] Make existing renderer probes measure settled tab and PTY work * [comment audit] Align palette E2E selector with task search * [comment audit] Refresh remaining palette search selectors * [comment audit] Keep selector correction within selected audit specs * [comment audit] Await emoji fixture settings inside renderer evaluation * [comment audit] Cancel fixture fit retries between terminal tests --------- Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
…blyai#33513) Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
…ession (stablyai#33514) Hermes panes resume their own conversation after an Orca restart: record the Hermes session id from Orca's Hermes plugin hooks and relaunch with `hermes --resume <id>` (remote hosts gated on agent-session.hermes-resume.v1). Delegate-child hooks no longer replace the pane's session id. Fixes stablyai#15808 Supersedes stablyai#31327, stablyai#15809, stablyai#12075 Co-authored-by: tomaszamoranoq <268064671+tomaszamoranoq@users.noreply.github.com> Co-authored-by: Yi Lok Enoch Lam <22125285+eloklam@users.noreply.github.com> Co-authored-by: GoodFarming <34622709+GoodFarming@users.noreply.github.com>
* test: remove mock-only cases and repair audit fixtures * test: use checked upload fetch mocks * test: assert upload MIME on actual multipart wire bytes --------- Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
…blyai#33518) Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
…chat runtime isn't installed (stablyai#33520) When Antigravity's Orca-managed chat runtime isn't installed, default-chat launches (orchestration workers, agent.launch from CLI/mobile/automations) fall back to a terminal running agy with reason chat_runtime_not_installed instead of failing at terminal_create; an explicit --surface chat is refused with an install hint. Desktop chat tabs still show the install card. Fixes stablyai#30973
…estart restores them (stablyai#33523) A woken sleeping agent keeps its launch config (flags like permission mode, model, custom args) so a later Orca restart restores it with the same flags; consuming the sleeping record no longer deletes the pane's launch config (retirement and launch-token/session matching still govern it). Supersedes stablyai#31756 Co-authored-by: Jinwoo Hong <73622457+Jinwoo-H@users.noreply.github.com>
* test: strengthen CLI and mobile behavior checks * test: prune resolved host-edit wall-clock allowance --------- Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
* test: strengthen CLI errors and mobile lifecycle checks * test: use preferred callback array type notation --------- Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
…tablyai#33534) Main built its copy of a hidden pane from the renderer's xterm at the phone's 1000-row limit, and the hidden-output reveal repaints the pane from that copy, so a restored pane with more history lost all but its last 1000 rows on first reveal.
…tablyai#33517) Claude panes show Needs You while a Claude Code MCP server's elicitation dialog is open: install Claude's Elicitation/ElicitationResult hooks (>=2.1.63), map Elicitation to waiting and restore the pre-dialog state on ElicitationResult (done when there is no prior record). Fixes stablyai#25020 Supersedes stablyai#25057 Co-authored-by: Wooseong Kim <2222333+innocarpe@users.noreply.github.com>
…lyai#33428) * fix(worktrees): one host's git status no longer rewrites a same-path twin's branch (stablyai#32918) * fix(worktrees): match a twin through its runtime alias and persist its review clear on the same copy * fix(worktrees): keep the id-only patch for a lone copy; background refreshes refuse an unplaced twin * fix(worktrees): a twin's identity patch skips the id-keyed review clear instead of reaching its sibling * fix(worktrees): count runtime provenance when finding twins; Source Control refresh refuses an unplaced twin * fix(worktrees): a twin's branch switch clears its own push target and review link on its host * fix(worktrees): a twin's review clear keeps its stale-refetch guard and relink check, scoped to its own copy * fix(worktrees): a twin tombstone names its full owner, and detected rows are stamped before sanitizing * fix(worktrees): each twin copy keeps its own review-clear tombstone * fix(worktrees): a rename carries each twin copy's review-clear tombstone * fix(worktrees): a copy's tombstone from its twin days still drives its clear retry * chore(worktrees): name why the existing review-link cast is safe * fix(worktrees): one resolver names the copy for every git-identity read and write * fix(worktrees): a Create PR run refuses when its copy no longer resolves; local null stays local * fix(worktrees): an unselected twin stays unplaced; a legacy row's guard survives its first stamp * fix(worktrees): a Create PR run keeps the copy it pinned at start; a legacy row's relink drops its stamped guard * fix(worktrees): key review clears by the full stamp the next listing gives the row * fix(worktrees): fill only missing stamp parts when keying review clears * fix(worktrees): stamp review-clear keys from repo registrations, not the focused host * fix(worktrees): a local row keeps its review-clear guard when discovery stamps it local * fix(worktrees): stamp review-clear keys from the sole repo registration first * fix(worktrees): a runtime-hosted copy's owner key ignores backfilled provenance * fix(worktrees): Create PR and post-generation refresh read the pinned copy's push target * fix(worktrees): a lone copy's push target still answers when the host index misses * fix(worktrees): the push-target fallback accepts only an unstamped lone copy for a named host * fix(worktrees): only SSH copies borrow a registration's provenance for review-clear keys
…s start folder (stablyai#33527) Resumed Claude/Codex agents come back in the folder they were started in: resume records save the agent's starting cwd from hooks (kept within a session and across Claude /clear and compact), persist it, and resume as `cd <folder> && <agent> --resume <id>` when it differs from the workspace root. A deleted folder now fails loudly at the cd instead of silently resuming in the root. Fixes stablyai#16960 Refs stablyai#15485
…emp path (stablyai#33540) On macOS the temp dir sits behind the /private symlink and the runtime stores the resolved path, so two existing-folder tests failed locally. realpath is a no-op on Linux CI.
…3538) * test: strengthen transport lifecycle and benchmark checks * test: attach mock cast rationale to the reported assertion --------- Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
… waiting for Claude, not signed out (stablyai#33542) An idle saved Claude account whose ~8h access token lapsed (Orca never refreshes Claude logins; the CLI does on its next run) keeps its last-good usage for up to 24h and reads "Updates when Claude runs" instead of "signed out". Logins that can't recover (no refresh token, expired refresh token, or a revoked 401) still ask to sign in again, and the status bar keeps its warning icon when shown usage is over 30 minutes old. Kept snapshots drop windows whose reset has passed. Fixes stablyai#30289 Supersedes stablyai#31105 Co-authored-by: luijoc <96428056+luijoc@users.noreply.github.com>
…cribes (stablyai#33537) * fix(terminal): keep desktop history in main's copy after a phone or paired desktop subscribes A phone subscribe rebuilt main's hidden copy of a pane from the phone snapshot (at most 1000 rows, or the screen alone under the byte budget), so a later desktop reveal repainted the pane truncated again. Seed the copy from a desktop-depth renderer read of the same sequence instead, falling back to the phone snapshot if the renderer moved on. Paired desktop clients' initial snapshot now carries desktop depth within the 2 MB requested-snapshot budget, matching what their reveal snapshots already allow; phones keep 1000 rows and 512 KB. The headless emulator's default scrollback now names the shared desktop default. * fix(terminal): publish the phone recovery before deepening main's copy The desktop-depth read ran before the late-renderer recovery's sequence check, so output during that read aborted the phone recovery and left the phone blank. Keep the original order (check, seed from the phone snapshot, publish) and deepen main's copy afterwards, only while no output has followed. Paired desktop initial snapshots keep a margin under older clients' 2 MiB cap (1.75 MiB) and step down through 2500 rows. * revert(terminal): keep paired desktop initial snapshots at 1000 rows Deeper first snapshots cost every pane on every reconnect; a lazy background top-up is the follow-up design. This PR keeps the phone recovery's hidden-copy fix and the shared scrollback default. * test(terminal): build the late-renderer runtime fake with checked types
…tablyai#33833) Concurrent new-PTY resolver probes shared the 'resolver-health-check' clientId, so the daemon evicted the older probe's control socket and that probe waited out the 3s timeout before its terminal could spawn. Use a per-probe UUID clientId and settle as 'unknown' as soon as the probe socket closes. Fixes stablyai#27751 Co-authored-by: outof-place <contact@outofplace.space>
…tablyai#33820) Each desktop socket to a WSL host's orcad, and the liveness watch, ran a Node process in the distro just to copy bytes (~42-50 MB RSS each). A bash /dev/tcp relay does the same with bash and two cats (~4.5 MB). The Node bridge stays as the fallback for hosts without bash 4.3+ or /dev/tcp and for refused dials, so refusal and missing-runtime signals are unchanged. SSH hosts keep the Node bridge.
…rvers (stablyai#33845) Only desktop requests reach a host's scanner child, which holds ~60 MB of RSS even idle, and the 10-minute default kept it alive most of the time. orcad now sets a 60 s idle timeout; the desktop keeps its default.
… mimalloc purge) (stablyai#33836) * perf(dev): size the dev server's Rolldown runtime for many parallel instances ~93% of idle electron-vite RSS is Rolldown's native mimalloc arenas. The dev wrapper now gives electron-vite MIMALLOC_PURGE_DELAY=0 and 4 Rolldown/Rayon threads; a serve-only renderer plugin strips exactly those keys before Electron spawns, so dev Orca's terminals never inherit them. * fix(dev): add the runtime-env plugin only when the dev wrapper set its keys Keeps createDevServeConfig returning the renderer config unchanged when there is no port and nothing to strip, as electron-vite-output-contract pins. --------- Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
…ses (stablyai#33848) A killed Vitest left its node-runtime worker running the rest of the file (still alive after 150s). Exit on 'disconnect' with process.exit captured before Vitest replaces it with a throwing guard. Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
Grok's installer defaults to ~/.grok/bin and only symlinks into ~/.local/bin when that dir is already on PATH. A GUI-launched Orca never looked in ~/.grok/bin, so the Agents page reported Grok as not installed. Append ~/.grok/bin after ~/.vite-plus/bin in the three lists that must stay in step: the packaged PATH seed, the system install-dir lookup fallback, and the POSIX/WSL guest fallback prelude. Fixes stablyai#17590 Co-authored-by: brynnclaw <261708852+brynnclaw@users.noreply.github.com>
…stablyai#33783) * fix(terminal): answer queries in ACK-pending output a paused paired view discards Refs stablyai#32944 * fix(terminal): capture yielded-query ownership at ingestion and cap reply age Refs stablyai#32944 * fix(terminal): settle yielded queries by their own end seq across split frames Refs stablyai#32944 * test: use a fixed timestamp in the yielded-query responder test * test(cross-version-wire): stub yielded-query runtime methods on the host runtime Refs stablyai#32944
stablyai#33027) * test(e2e): a pane moved to a new tab on a paired server workspace stays moved * fix(terminal): keep a pane moved to a new tab on paired runtimes Moving a split pane to a new tab in a paired-runtime worktree changed only the window store. The host never learned about the move, so the next host snapshot rebuilt the old tab and the pane snapped back. Add a session.tabs.movePaneToNewTab RPC that commits the move in the host session through planTerminalLeafMove and republishes the session tabs. For a mirrored host tab, the renderer applies the move first under the mirrored id the host snapshot will use, then asks the host to commit it. An older host or a refused move falls back to the old local-only move. Fixes stablyai#32939 * fix(terminal): commit a host pane move through the existing leaf-move writer The layout-writer ratchet allows no new main-process layout writers. The headless host now hands the move to commitLeafMoveAndRekey, the same commit a local window uses, and keeps only the window check, validation, rehydrate and notify. * fix(terminal): gate the host pane move on a host capability An older host keeps today's window-only move under a local tab id instead of a mirrored one it never confirms. Adds a terminal.list check to the e2e. * test: drop type assertions from the pane-move tests * fix(terminal): the host keeps a moved pane's place, focus and live terminal After the host commits the move, the window gives it the drop position and focus through the existing tab move and activate calls; a refusal redraws the host's tabs. The host moves the live PTY's surface with its pane and checks the target tab id. The move lives in its own runtime module. * fix(terminal): hold a moved pane's drop order until the host has it The host's snapshot of the commit goes out before its reply and appends the tab, so the window records the drawn order as a reorder intent at the drop and sends that order, and the focus read then, once the host answers. * fix(terminal): route the moved tab's reorder to its owning host The follow-up names the worktree's host instead of reading the active-server setting (focus-read ratchet); the e2e narrows host rows to terminal tabs. * fix(terminal): the host places a moved pane's tab in the move itself; a refusal reverts The move carries the drop's group and index (optional; an older host appends) and the host places and selects the tab before its one publish, replacing the follow-up reorder and the drop-time order hold. A refused move closes the tab this window drew without stopping its terminal and redraws the host's tabs even when unchanged. E2e covers a same-group drop and a refusal; host unit tests cover same-group and cross-group placement. * fix(terminal): a refused pane move keeps its pane records; drop index in host order The revert hands the pane's status and launch records back to the source tab before closing the drawn tab. The host turns a projected client's drop index into its raw order with translateProjectedSessionTabMove, as session.tabs.move does. * fix(terminal): only an unknown drop group appends a moved pane's tab The host catches only target_group_not_found and invalid_tab_order from the index translation and rethrows anything else. * fix(terminal): settle a pane move by what the host holds when its reply is lost A lost reply is not a refusal: the window asks the host whether it holds the pane in the new tab before undoing anything, and waits for the next snapshot when it cannot ask. A move the host committed but this window could not draw takes the host's tabs. * fix(terminal): a lost transport on a pane move is unknown, not a refusal runtimeEnvironments.call answers a dropped or overloaded transport with an error envelope; those codes (the shared recoverable set) now ask the host instead of undoing a move it may have committed. * test(e2e): pane-move spec waits on real signals, not delays The source tab is created on the server and split once its shell is listed, so the split no longer races a desktop-seeded tab's first spawn (the CI failure). The stay check follows output from the moved pane; the refusal check waits for the drawn tab to appear and go. * test(e2e): read the refused move's tab counts without Reflect (anti-slop) * fix(terminal): a moved pane's tab joins the order the user had, not a rebuilt one The host inserts the new tab into the group order captured before the commit, appending without a drop position, so editors and pages keep their places. The shared group-move fallback is no longer used here. * fix(terminal): a moved pane's groups hold the host's current tabs, in the user's order Placement takes membership from the rebuild after the commit and only the order from before it, so a tab opened while the commit was pending stays (after the user's tabs) and no stale id is written. * fix(terminal): a moved pane's placement keeps a reorder made while it committed The order is read after the commit, from the host's current tabs, not before it. * fix(terminal): a moved pane keeps the lone group the user merged into A rebuild names a single group with the default id; placement keeps the user's id for it, so the drop position still applies after a split was merged back. * fix: import error classification from its new shared/remote-runtime path * fix(terminal): a pane or divider drag survives focus moving inside the window The drag's window blur listener was registered in the capture phase, so it also heard every element blur. A terminal attach or host snapshot that moved focus between panes mid-gesture ended the drag; in the paired pane-move e2e on CI it cancelled the drag before the drop. Only the window losing focus ends it now. * test: drive the focus-change drag test through a real pane manager, without casts * fix(terminal): a headless host moves a pane with its live terminal and never empties its source The host names the PTY it holds for the pane, so a session copy an SSH respawn left with an old id no longer refuses the move as a mismatch. A move that would leave its source tab with no pane (a sibling closed meanwhile) is refused, since no headless cleanup retires the emptied tab and it would publish as a phantom. The e2e fences its stays-moved check on a later server rename instead of sampling on a timer. --------- Co-authored-by: Ben Grynhaus <ben.grynhaus@wiz.io>
…blyai#29832) * fix(wsl-host): bind a WSL host record to its pairing's server key (R31) A valid but stale record could overlay WSL hosting onto a different loopback server re-paired under the same environment id and bridge port. The record now carries the paired orcad's host key; the overlay ignores a record whose key differs from the pairing's. Add writes the key and a pairing refresh rewrites it with the ports, so a relaunch that changes the key still matches. Records written before carry no key and keep port-only binding until their next refresh. Co-Authored-By: Claude <noreply@anthropic.com> * fix(wsl-host): validate a refreshed pairing before writing, and accept the previous key mid-refresh Review: the refresh wrote the record's new key before validating the pairing, so a refused or interrupted refresh could leave a real WSL host without its overlay. Validate first, and keep the replaced key as previousPairingPublicKeyB64 so the record stays bound across the two writes. Co-Authored-By: Claude <noreply@anthropic.com> * test(wsl-host): use a key distinct from the fixture's own in the R31 overlay tests Main gave the WSL fixture its own pairing key (stablyai#30676), the same one these tests used as the 'other server' key, so both cases inverted after the rebase. Production code is unchanged. Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com>
stablyai#33819) Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
…hen its connect hangs (stablyai#33865)
…ps failing (stablyai#33841) * fix(agent-awake): keep sleep-assertion failures warn-once across respawns A successful spawn reset the failure streak, so a systemd-inhibit or caffeinate that exits right away re-warned on every 30s retry. * fix(agent-awake): back off sleep-assertion retries after consecutive failures * test(agent-awake): dispose the real-timer assertion
…, −75 MB after bursts) (stablyai#33837) * perf(daemon): cap the terminal daemon's young generation Idle terminal polling in the daemon allocates a few MB/s of short-lived strings (process-table captures), and V8 answers by growing the young generation to its 64 MB semispace maximum. Nothing is retained (heapUsed returns to ~12 MB after GC), but the committed semispaces held ~120 MB of resident memory per daemon. Launch the daemon with --max-semi-space-size=4 on the fork, direct and extracted-AppImage paths. The flag goes on the command line, not NODE_OPTIONS, because PTYs inherit the daemon's env. * perf(daemon): pass the young-generation cap through the macOS launchd job Release macOS builds start the terminal daemon from the signed helper bundle through a launchd job, not the fork path, so the flag must be in its ProgramArguments too. --------- Co-authored-by: m4air <m4air@Mac.localdomain>
…oo (stablyai#33829) A visible local shell pane with no agent evidence was inspected every 2 s forever. Each inspection is a full-system `ps -axo ...,tty=,lstart=,command=` capture in the terminal daemon (0.155 s of CPU at ~1,100 processes, ~1.15 s at ~1,950), which also churned ~2.7 MB/s of short-lived strings and grew the daemon's young generation to ~120 MB resident. Apply the existing no-evidence cadence (15 s while quiet; output, title or hook activity re-arms 2 s for 10 s; agent evidence returns to the active/idle tiers) to local POSIX panes, as it already is for Windows and remote panes. Co-authored-by: m4air <m4air@Mac.localdomain>
…tablyai#33786) V8 stores a script source as UTF-16 when any character is above U+00FF, so a single em dash in a hot chunk doubled that chunk's resident source. Emit ASCII (escaped) output for main, preload, renderer and worker bundles, escape the CJK sentence marks in the prose URL regex source, and fail the renderer boot-graph check if a boot chunk regresses to two-byte. Co-authored-by: m4air <m4air@Mac.localdomain>
…tablyai#33810) Monaco's TypeScript WorkerManager has no idle stop, so viewing a single .ts file kept a ~40 MB language worker alive for the rest of the session. After 60 s with no typescript/javascript model, re-apply the current compiler options, which makes Monaco dispose the worker; the next TS/JS model starts a fresh one lazily. Co-authored-by: m4air <m4air@Mac.localdomain>
…ver save (stablyai#33864) * fix(runtime): recover from a NUL-filled server list instead of blocking every save Fixes stablyai#18766 * fix(runtime): recover only crash-zeroed server lists; keep removal proofs fail-closed * fix(runtime): copy the blank server list aside on write instead of renaming it on read * fix(runtime): recover a crash-zeroed server list only when saving a server Plain reads stay fail-closed so startup cleanup cannot treat the zeroed file as 'every server was removed'; saving copies the bytes aside and publishes an empty store only if the file is still blank. * fix(runtime): publish the recovered server list only together with the saved server A failed save now leaves the zeroed file in place instead of an empty registry that startup cleanup would read as 'every server was removed'. * fix(runtime): let SSH and WSL server setup save over a crash-zeroed server list Their duplicate and conflict pre-checks read the list before the add and threw on the zeroed file. The blank-file backup is now taken only once the write is attempted. * test(runtime): give the fsynced interleaving property test room on slow disks * test(runtime): run three guard-killing seeds instead of raising the interleaving timeout The fsync on every store write made 40 seeds x 40 steps slow; seeds 1, 6 and 8 each fail when one of the three guards this test protects is removed.
…eady painted (stablyai#33766) (stablyai#33880) Main seeds its terminal model from the renderer's xterm and queues live chunks behind the seed. The renderer keeps parsing those chunks while it serializes, so they were in the seed and then written again, doubling TUI frames and splitting escapes (literal ';242m'). Hidden-pane reveals repaint from this model. Skip queued chunks at or below the seed's seq and carry any unfinished escape into the next chunk.
…ai#33876) Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
…n Linux (stablyai#33878) * feat(serve): keep macOS serve out of the Dock and opt in to the GPU on Linux On macOS, orca serve now runs as an accessory app with no Dock icon or Cmd-Tab entry, and gets them back only while it hosts a desktop window. On Linux, ORCA_SERVE_GPU=1 keeps hardware acceleration on for hosts that expose a GPU to the server. * fix(serve): restore the Dock only for real launches, after window services resolve Gate the restore on any background or E2E launch, since dock.show() activates the app, and run it just before the window is created so a services failure cannot leave a windowless Dock tile. Say in the docs what the GPU opt-in can't do on Orca's own Xvfb.
Upstream range 0571e45..33ddab7, 210 commits. 31 conflicted files, 45 hunks. 20 files come from upstream's comment audit (7d6603a, stablyai#33249), which shortened comments beside fork lines; each keeps the fork's lines unchanged next to upstream's new comment. Where the fork had moved the commented code, upstream's new comment follows it (first-window-deferral.ts, GeneralUpdateSettingsSection.tsx, workspace-session-host-split.ts); where the fork rewrote a comment to describe its own behaviour, the fork's comment stays. - Update sources (fork #10 #14 #16 #27): updater-prerelease-feed.ts keeps the fork's move of the manifest naming, which already carries upstream stablyai#18339's Linux arm64 manifest; its test takes upstream's arm64 case through the fork's setHostSliceForTest. release-channel.test.ts takes upstream stablyai#33757's dropped import and keeps the fork's getUpdateManifestName. - Agent status (fork #1): upstream stablyai#33665 moved the agent-status records into store/slices/agent-status/; the fork's imports follow. - Host resume (fork #30): wsl-agent-hook-relay.ts, the relay server and its contract carry upstream stablyai#33322's forwardClaudeAgentView beside the fork's user-ended-session forward. agent-hook-listener.ts drops the import upstream stablyai#33514 removed. - Unreachable-host removal (fork #3), resume handles (fork #5) and auto-resume (fork #6, #11): upstream comments only. - config/flaky-test-pattern-baseline.txt takes upstream's removed daemon-health row and keeps the fork's daemon-drain row. Breaks the conflict list did not show: - Upstream stablyai#30930 makes ColdRestoreAgentResumeStartup carry resumeOrigin 'saved'. The fork's host-index auto-resume (#6) is an automatic resume from recorded facts, so candidate-resume-startup.ts sets it as upstream's cold restore does: the host now refuses it for a conversation an open chat continues. - Upstream stablyai#33665 moved MAX_LIVE_AGENT_STATUSES; the fork's agent-status-sleeping-record-retirement.test.ts follows the move. - Four upstream files went over max-lines because of fork lines. The fork's lines move into fork-owned modules: - agentProviderSessionIdentityKey leaves agent-session-resume.ts for agent-provider-session-identity-key.ts (#30); - the delegated-worktree edge fields (#4) leave session-window-graph.ts for a syncWindowGraph override in the fork-owned runtime layer delegated-worktree-edge-graph-sync.ts; - the retained-identity row read (#1) in server-status-update.ts becomes readStatusRowsForUpdate in server-retained-identity.ts; - the relay server's user-ended-session reporter (#30) moves into the fork-owned base class agent-hook-user-ended-session-server.ts. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 task done
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
This was referenced Oct 26, 2026
Author
|
After the merge, "PR Checks / static analysis and typecheck" failed at Enforce ratchets: the flaky-test ratchet gets no sync diff base, diffed all ~18,000 upstream files against the PR base and died with |
This was referenced Oct 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ELI5
Upstream Orca moved forward 210 commits since yesterday's sync (#56). This PR merges them into
swaplabs/main. 31 files conflicted with fork changes, 20 of them because upstream shortened the comments next to fork lines. The fork's lines are kept unchanged. A few more things broke without a conflict: an upstream type change, a moved export, and four upstream files that the fork's lines pushed over the 300-line limit. Those are fixed here by moving the fork's lines into fork-owned files, without changing what any fork feature does, with one deliberate exception (see "Breaks"). This PR replaces #57 (headmain), which could not merge.What Changed
Upstream range
0571e45107..33ddab70b7, 210 commits (compare). One signed merge commit,a864b3a09e(Merge upstream main (33ddab70b7) into swaplabs/main), onsync/upstream-20261026, cut at the integration head48d48683c3.Conflicts, by fork PR (
orca-fork-ops conflicts)Upstream's comment audit (
7d6603aa176, stablyai#33249) shortened the comment beside a fork line. In each of these files the resolution is upstream's new comment plus the fork's lines, unchanged:src/renderer/src/lib/workspace-session-host-persistence.ts,workspace-session-host-split.tssrc/renderer/src/components/settings/settings-project-list.ts,src/renderer/src/components/sidebar/RemoveFolderDialog.tsx,ssh-host-remove-workspaces.ts,src/renderer/src/store/slices/repos-remove-missing-remote-project.test.tssrc/renderer/src/components/terminal-pane/pty-connection/pane-agent-identity.ts,pty-input-forward.tsconfig/electron-builder.config.cjs,src/main/startup/first-window-deferral.ts,src/main/updater/updater-build-selection.ts,updater-check-failure.ts,updater-menu-checks.ts,updater-release-feed.ts,updater-scheduling.ts,src/renderer/src/components/settings/GeneralUpdateSettingsSection.tsx,ReleaseChannelSection.tsx,src/shared/release-channel.tssrc/shared/agent-hook-relay.ts, andsrc/main/runtime/session-lifecycle/projection/restored-pane-materialize.tsthrough the past sync resolutions5aafdd009fand1a247d1c5cDetails worth knowing:
first-window-deferral.ts: the fork'srunAfterFirstWindowShownwrapper takes upstream's one-line doc.GeneralUpdateSettingsSection.tsx: the fork'sCheckForUpdatesButtontakes upstream's modifier-click comment.workspace-session-host-split.ts: the fork'sbuildSliceTemplatestakes upstream's own-keys comment.ReleaseChannelSection.tsx(why a download instead of an update),ssh-host-remove-workspaces.ts(removal outcome verification),release-channel.ts(compareBuildStamps),updater-build-selection.ts(the refusal reason, which the fork moved intorefusePinnedBuild).workspace-session-host-persistence.ts(the known-limitation note),release-channel.ts(per-slice installers),repos-remove-missing-remote-project.test.ts(theowner-unverifiablesplit).updater-menu-checks.ts: upstream deleted the class doc comment, and the fork'sPinnedBuildTargettype stays above the class.The other eleven conflicts:
src/main/updater-prerelease-feed.tslatest-linux-arm64.ymlon Linux arm64getUpdateManifestName(release-channel.ts), which suffixes non-x64 Linux the same way. Upstream's edit was to code the fork removedsrc/main/updater-prerelease-feed.test.tssetArchForTestsetHostSliceForTest({ platform, arch }); upstream's arch helper is not neededsrc/shared/release-channel.test.tsgetReleaseRepoForChannelgetUpdateManifestNameimport stayssrc/renderer/src/store/slices/agent-status/agent-status-live-facts.ts,agent-status-sleeping-records.tsstore/slices/agent-status/../src/shared/agent-hook-listener.tsextractAgentProviderSessionwithreadPaneProviderSessionstatusRowToCompleteimport stays1a247d1c5csrc/wsl-guest/agent-hook-request.ts,agent-hook-server-contract.ts,agent-hook-server.ts,wsl-agent-hook-relay.tsforwardClaudeAgentViewto the WSL relay serverconfig/flaky-test-pattern-baseline.txtdaemon-health.test.ts's rowdaemon-drain.test.tsrow staysFork delta check: for 325 of the 348 files the fork changes, the fork's added and removed lines against upstream are the same before and after the merge. The other 23 are the comment cases above and the moves below.
src/shared/agent-session-resume.tsandsrc/main/runtime/session-graph/session-window-graph.tsnow equal upstream's.Breaks the conflict list did not show
pty-connection/candidate-resume-startup.tsColdRestoreAgentResumeStartupcarryresumeOrigin: 'saved': a resume built from saved facts, not asked for by the user. The host's admission refuses one for a conversation that an open native chat continues or may be writingresumeOrigin: 'saved', as upstream's own cold restore does: #6's host-index auto-resume is automatic and built from recorded facts. Behaviour change: the host now refuses a #6 resume of a conversation a native chat holds. Before, it could start a second writer, the gap #41 listssrc/renderer/src/store/slices/agent-status-sleeping-record-retirement.test.tsMAX_LIVE_AGENT_STATUSEStoagent-status/agent-status-capacity-eviction.tssrc/shared/agent-session-resume.ts(307 counted lines, max 300)agentProviderSessionIdentityKeymoves unchanged to the fork-ownedsrc/shared/agent-provider-session-identity-key.tssrc/main/runtime/session-graph/session-window-graph.ts(301; upstream alone is at 300)buildSyncWindowGraphFields()spread becomes asyncWindowGraphoverride in a fork-owned runtime layer,session-lifecycle/projection/delegated-worktree-edge-graph-sync.ts. It sits under #30's layer, and only fork lines change its place in the class chain. No class between it and the base method overridessyncWindowGraph, so every caller gets the same fields as beforesrc/main/agent-hooks/server/server-status-update.ts(301)previousis no row for aproviderSessionOnlyremnant) moves intoreadStatusRowsForUpdatein the fork-ownedserver-retained-identity.ts, together with the row cast it needs. Now 299src/wsl-guest/agent-hook-server.ts(303)src/wsl-guest/agent-hook-user-ended-session-server.ts. Now exactly 300: the twouserEndedSessionsoptions are the fork's only added linesNo other fork lines were moved or dropped. Follow-ups: #59 (CI: the flaky-test ratchet on sync PRs), #41 (resume paths and upstream's new chat-ownership and resume-folder rules, comment) and #45 (fork lines near line limits, comment).
Upstream's own failures (reported, not patched)
Two upstream test files also fail on pristine upstream
33ddab70b7on this host; they are environment failures, not the merge's (see Testing).check:flaky-test-pattern-ratchetover the whole repo (ORCA_FLAKY_TEST_RATCHET_ALL=1) still fails on upstream's stale filesystem-watcher rows, as in #56: 6 findings insrc/main/ipc/filesystem/watchers/with no baseline row. The fork changes none of those files.CI's "Enforce ratchets" step failed on this PR for a fork reason instead: it gets no sync diff base, so the flaky-test ratchet diffed all ~18,000 upstream files against the PR base and died with
spawnSync git ENOBUFS. Follow-up: #59 (pass the sync base to that step too).Some notable upstream changes in the range
store/slices/agent-status/(refactor(renderer): group agent-status records and reducers stablyai/orca#33665);Why
Daily upstream sync.
Linked Issue
N/A: daily upstream sync. Follow-ups: #41, #45, #59.
Visual Proof
N/A: no UI change of the fork's. The conflicts are in comments, imports, tests and main-process wiring.
Testing
All checks ran on the merge result in the sync worktree, before the commit:
pnpm install --frozen-lockfile(the lockfile and everypackage.jsonequal upstream's).pnpm tcfailed on the two hidden breaks above (candidate-resume-startup.ts,agent-status-sleeping-record-retirement.test.ts), which shows the gate is live. It passes after the fixes, and again after the max-lines moves.src/main/runtime,src/main/agent-hooks,src/main/updater*,src/main/startup,src/renderer/src/components/{settings,sidebar,terminal-pane},src/renderer/src/lib,src/renderer/src/store,src/shared,src/wsl-guestandconfig/scripts: 5,850 files, 5,764 passed, 71 skipped, 15 failed (73 tests). None of the 15 is a fork file. With fixture signing off (commit.gpgsign=false,tag.gpgsign=false), 13 of them pass: this host's signing wrapper refuses their fixture commits. The other 2 fail the same way on pristine upstream33ddab70b7on this host:structured-session-cli-login-shell.live-shell.test.ts(no/bin/zsh) and one case ofwindows-native-preparation-benchmark.test.mjs("Duplicate environment keys").pnpm lint(37 steps) passes, with the flaky-test ratchet scoped as a fork checkout sees it after the merge (ORCA_SYNC_PR_DIFF_BASE=33ddab70b7). Run mid-merge without that variable, the ratchet diffs against the old mirror and overflowsspawnSync's buffer (ENOBUFS). That is an artifact of running before the commit.check:code-quality:changedwithORCA_SYNC_PR_DIFF_BASE=33ddab70b7: 0 findings across 329 fork files (code quality, JS plugins, casting, type-aware, React Doctor, design system, ast-grep).cloud/):oxfmt --checkreports every file formatted, andoxlint,oxlint --config config/oxlint-js-plugins.json,ast-grep scan --min-severity warningandoxlint --config config/oxlint-react-doctor.jsonpass. The pre-commit hook then ran normally, and the tree before the commit (a801d7c8e3) equalsHEAD^{tree}after it.a864b3a09eisGfrom the sync keyBF1DD75F888E96080C2453E2D9E158C5D6874235.AI Disclosure
Prepared by the "Orca upstream sync" automation (Claude Code, Claude Opus 5.5).
Agent skill upstream boundary
Notes
orca-fork-ops statusforswaplabs/main(48d48683c3) against upstream33ddab70b7, before this merge:LOCAL:prefix and no upstream PR.Upstream release tag
v1.4.241was copied to the fork.🤖 Generated with Claude Code
Need help on this PR? Tag
@codesmith-botwith what you need.