From cd2e0cd787fbef37d93b597b32af15a2c5023322 Mon Sep 17 00:00:00 2001 From: Kelvin Amoaba <97001695+AmoabaKelvin@users.noreply.github.com> Date: Mon, 9 Nov 2026 09:45:46 +0000 Subject: [PATCH 01/90] docs(dictation): say why Hold can't see a key release inside a browser page (#40269) --- src/main/window/createMainWindow.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/window/createMainWindow.ts b/src/main/window/createMainWindow.ts index 868ff78c622..920bbe305d8 100644 --- a/src/main/window/createMainWindow.ts +++ b/src/main/window/createMainWindow.ts @@ -101,7 +101,7 @@ export function createMainWindow( const settings = store?.getSettings() browserManager.setDictationShortcutForwardingPredicate(() => { const voice = store?.getSettings().voice - // Guests forward only keydown, so Hold's release can't reach the renderer; the page keeps the key then. + // Chromium drops a page's key releases after a press cancelled here, so Hold can't see its release; the page keeps the key then. return voice?.enabled === true && voice.dictationMode !== 'hold' }) const windowMaterial = resolveWindowMaterial( From f10be535ca2a0641afe05821356d01144308884f Mon Sep 17 00:00:00 2001 From: OrcaWin Date: Mon, 9 Nov 2026 01:46:01 -0800 Subject: [PATCH 02/90] test: remove low-value mobile renderer and rate-limit suites (#40188) Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com> --- config/flaky-test-pattern-baseline.txt | 2 +- config/reliability-gates.jsonc | 15 +- config/tsconfig.tc.web.json | 1 - config/tsconfig.test.pane-launch.json | 1 - config/tsconfig.web.json | 1 - .../session/mobile-terminal-records.test.ts | 126 -------- .../terminal-live-accessory-raw-send.test.ts | 38 --- .../terminal/terminal-viewport-refit.test.ts | 32 -- .../src/test-support/rpc-recording/README.md | 2 +- .../rpc-recording/mounted-screen-tree.test.ts | 50 --- .../rpc-recording/recording-runner.test.ts | 34 -- .../connection/client-context.test.ts | 73 +---- ...ile-endpoint-supervisor-relay-race.test.ts | 54 ---- .../hosts/host-endpoint-edit.test.ts | 49 --- .../src/transport/hosts/host-endpoint.test.ts | 26 -- .../hosts/host-name-identity.test.ts | 56 ---- .../hosts/host-store-endpoint.test.ts | 92 ------ mobile/src/transport/hosts/host-store.test.ts | 24 -- .../claude-full-access-policy-perf.test.ts | 118 ------- .../opencode-go-api-key-source.test.ts | 93 ------ .../opencode-go-status-parsing.test.ts | 150 +-------- .../service-account-target-selection.test.ts | 176 ---------- .../service-inactive-account-previews.test.ts | 102 ------ .../service/service-live-claude-usage.test.ts | 279 ---------------- ...iraIssueWorkspace.optimistic-edit.test.tsx | 198 ------------ .../use-hold-dictation-gesture.test.tsx | 257 --------------- .../markdown-preview-document-client.test.ts | 39 --- .../feature-tip-startup-gate.test.ts | 47 --- .../work-item-details-issue-target.test.ts | 36 --- .../linear-integration-card.test.tsx | 145 --------- .../NativeChatUsageLimitActions.test.tsx | 217 ------------- .../plugin-frame-host-declarative.test.ts | 50 --- .../ai-vault-session-publication-gate.test.ts | 49 --- .../pr-comments-ai-launch-ack.test.ts | 56 ---- ...ck-log-initial-diagnostic-position.test.ts | 36 --- .../listing/open-uncommitted-entry.test.ts | 40 --- .../AccountsPane.owner-scope.test.tsx | 215 ------------- .../search/workspace-kanban-search.test.ts | 48 --- ...ClaudeSwitcherMenu.owner-lifetime.test.tsx | 164 ---------- .../cli-chat-resume-close-terminal.test.ts | 175 ---------- .../tab-bar/cli-chat-resume-run-close.test.ts | 194 ----------- .../tab-bar/tab-agent-launch-options.test.ts | 48 --- ...ace-tab-close-commands.frame-flush.test.ts | 39 --- .../jira/Content.board-owner.test.tsx | 123 ------- .../jira/task-page-jira-linked-issues.test.ts | 53 --- ...ask-page-linear-creation-lifetime.test.tsx | 187 ----------- .../task-page-cache-selectors.test.ts | 19 +- .../files/terminal-path-exists-cache.test.ts | 49 --- ...nection-main-side-effect-authority.spec.ts | 303 +----------------- ...n-bell-query-reply-and-stale-input.spec.ts | 141 -------- ...and-finished-interrupt-arbitration.spec.ts | 64 ---- ...ction-notification-settings-gating.spec.ts | 27 -- ...-connection-task-complete-dispatch.spec.ts | 137 +------- ...ection-completion-and-notification.test.ts | 4 - .../ssh-managed-server-state-effects.test.ts | 53 --- .../wsl-host-ipc-bridge-capability.test.ts | 49 --- .../agent-settings-update-queue.test.ts | 117 ------- ...ctured-agent-session-launch-record.test.ts | 27 -- ...eping-agent-session-stranded-sleep.test.ts | 55 ---- .../browser-link-profile-isolation.test.ts | 183 ----------- .../http-link-routing-store.test.ts | 50 --- .../browser-palette-page-entries.test.ts | 138 -------- .../src/lib/code-host-error-copy.test.ts | 52 --- .../lib/composer-submit-cancellation.test.ts | 32 -- .../src/lib/create-untitled-markdown.test.ts | 20 -- .../src/lib/emulator-error-copy.test.ts | 31 -- .../lib/new-workspace-composer-repo.test.ts | 33 -- .../claude-account-switch-sessions.test.ts | 124 ------- .../src/lib/renderer-app-platform.test.ts | 13 +- ...ume-stale-structured-agent-session.test.ts | 41 --- src/renderer/src/lib/review-owner.test.ts | 47 --- .../lib/run-target-host-visibility.test.ts | 35 -- .../src/lib/runtime-host-copy.test.ts | 35 -- .../worktree-activation-created-agent.test.ts | 50 --- ...activation-structured-chat-surface.test.ts | 52 --- .../worktree-palette-comment-snippet.test.ts | 54 ---- ...untime-graph-workspace-publication.test.ts | 54 ---- .../agent-status-drop-ipc.test.ts | 53 --- .../tabs/tabs-close-dangling-group.test.ts | 47 --- .../terminals/degraded-repo-hydration.test.ts | 246 -------------- .../terminal-no-op-subscriber.test.ts | 42 --- .../terminal-startup-queue-restart.test.ts | 56 ---- .../terminal-tab-owner-index.test.ts | 53 --- .../worktree-sleep-intent-lifecycle.test.ts | 50 --- .../preload-api/web-ui-compact-notice.test.ts | 54 ---- .../web/web-insecure-origin-pairing.test.ts | 54 ---- ...tive-chat-tool-pairing.performance.test.ts | 156 +-------- 87 files changed, 18 insertions(+), 6892 deletions(-) delete mode 100644 mobile/src/terminal/session/mobile-terminal-records.test.ts delete mode 100644 mobile/src/terminal/terminal-live-accessory-raw-send.test.ts delete mode 100644 mobile/src/terminal/terminal-viewport-refit.test.ts delete mode 100644 mobile/src/test-support/rpc-recording/mounted-screen-tree.test.ts delete mode 100644 mobile/src/test-support/rpc-recording/recording-runner.test.ts delete mode 100644 mobile/src/transport/hosts/host-endpoint-edit.test.ts delete mode 100644 mobile/src/transport/hosts/host-endpoint.test.ts delete mode 100644 mobile/src/transport/hosts/host-store-endpoint.test.ts delete mode 100644 src/main/claude/structured/claude-full-access-policy-perf.test.ts delete mode 100644 src/main/rate-limits/service/service-live-claude-usage.test.ts delete mode 100644 src/renderer/src/components/JiraIssueWorkspace.optimistic-edit.test.tsx delete mode 100644 src/renderer/src/components/dictation/use-hold-dictation-gesture.test.tsx delete mode 100644 src/renderer/src/components/editor/markdown-preview/document-worker/markdown-preview-document-client.test.ts delete mode 100644 src/renderer/src/components/feature-tips/feature-tip-startup-gate.test.ts delete mode 100644 src/renderer/src/components/github-item-dialog/load-item-details/work-item-details-issue-target.test.ts delete mode 100644 src/renderer/src/components/integrations/task-trackers/linear-integration-card.test.tsx delete mode 100644 src/renderer/src/components/native-chat/usage/NativeChatUsageLimitActions.test.tsx delete mode 100644 src/renderer/src/components/plugins/frames/plugin-frame-host-declarative.test.ts delete mode 100644 src/renderer/src/components/right-sidebar/ai-vault/scanning/ai-vault-session-publication-gate.test.ts delete mode 100644 src/renderer/src/components/right-sidebar/checks-panel/comments/pr-comments-ai-launch-ack.test.ts delete mode 100644 src/renderer/src/components/right-sidebar/checks-panel/logs/check-log-initial-diagnostic-position.test.ts delete mode 100644 src/renderer/src/components/right-sidebar/source-control/listing/open-uncommitted-entry.test.ts delete mode 100644 src/renderer/src/components/settings/accounts/AccountsPane.owner-scope.test.tsx delete mode 100644 src/renderer/src/components/sidebar/workspace-board/search/workspace-kanban-search.test.ts delete mode 100644 src/renderer/src/components/status-bar/ClaudeSwitcherMenu.owner-lifetime.test.tsx delete mode 100644 src/renderer/src/components/tab-bar/cli-chat-resume-close-terminal.test.ts delete mode 100644 src/renderer/src/components/tab-bar/cli-chat-resume-run-close.test.ts delete mode 100644 src/renderer/src/components/tab-bar/tab-agent-launch-options.test.ts delete mode 100644 src/renderer/src/components/tab-group/workspace-tab-close-commands.frame-flush.test.ts delete mode 100644 src/renderer/src/components/task-page/jira/Content.board-owner.test.tsx delete mode 100644 src/renderer/src/components/task-page/jira/task-page-jira-linked-issues.test.ts delete mode 100644 src/renderer/src/components/task-page/linear/task-page-linear-creation-lifetime.test.tsx delete mode 100644 src/renderer/src/components/terminal-pane/links/files/terminal-path-exists-cache.test.ts delete mode 100644 src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-bell-query-reply-and-stale-input.spec.ts delete mode 100644 src/renderer/src/hooks/ipc-events/ssh-managed-server-state-effects.test.ts delete mode 100644 src/renderer/src/hooks/ipc-events/wsl-host-ipc-bridge-capability.test.ts delete mode 100644 src/renderer/src/lib/agent-session/launch/agent-settings-update-queue.test.ts delete mode 100644 src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-record.test.ts delete mode 100644 src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session-stranded-sleep.test.ts delete mode 100644 src/renderer/src/lib/browser/navigation/browser-link-profile-isolation.test.ts delete mode 100644 src/renderer/src/lib/code-host-error-copy.test.ts delete mode 100644 src/renderer/src/lib/composer-submit-cancellation.test.ts delete mode 100644 src/renderer/src/lib/create-untitled-markdown.test.ts delete mode 100644 src/renderer/src/lib/emulator-error-copy.test.ts delete mode 100644 src/renderer/src/lib/new-workspace-composer-repo.test.ts delete mode 100644 src/renderer/src/lib/provider-accounts/claude-account-switch-sessions.test.ts delete mode 100644 src/renderer/src/lib/resume-stale-structured-agent-session.test.ts delete mode 100644 src/renderer/src/lib/review-owner.test.ts delete mode 100644 src/renderer/src/lib/run-target-host-visibility.test.ts delete mode 100644 src/renderer/src/lib/runtime-host-copy.test.ts delete mode 100644 src/renderer/src/lib/workspace/activation/worktree-activation-created-agent.test.ts delete mode 100644 src/renderer/src/lib/workspace/activation/worktree-activation-structured-chat-surface.test.ts delete mode 100644 src/renderer/src/lib/workspace/search/worktrees/worktree-palette-comment-snippet.test.ts delete mode 100644 src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-workspace-publication.test.ts delete mode 100644 src/renderer/src/store/slices/agent-status/agent-status-drop-ipc.test.ts delete mode 100644 src/renderer/src/store/slices/tabs/tabs-close-dangling-group.test.ts delete mode 100644 src/renderer/src/store/terminals/degraded-repo-hydration.test.ts delete mode 100644 src/renderer/src/store/terminals/terminal-no-op-subscriber.test.ts delete mode 100644 src/renderer/src/store/terminals/terminal-startup-queue-restart.test.ts delete mode 100644 src/renderer/src/store/terminals/terminal-tab-owner-index.test.ts delete mode 100644 src/renderer/src/store/terminals/worktree-sleep-intent-lifecycle.test.ts delete mode 100644 src/renderer/src/web/preload-api/web-ui-compact-notice.test.ts delete mode 100644 src/renderer/src/web/web-insecure-origin-pairing.test.ts diff --git a/config/flaky-test-pattern-baseline.txt b/config/flaky-test-pattern-baseline.txt index 6c0afd8ee14..67ce4cfb757 100644 --- a/config/flaky-test-pattern-baseline.txt +++ b/config/flaky-test-pattern-baseline.txt @@ -560,7 +560,7 @@ 1 test-no-wall-clock:src/main/pty/history/terminal-history-gc-fs-call-count.test.ts 2 test-no-wall-clock:src/main/pty/process-retirement/posix-pty-process-groups.integration.test.ts 4 test-no-wall-clock:src/main/pty/process-retirement/windows-live-tree-kill.win32.test.ts -17 test-no-wall-clock:src/main/rate-limits/service/service-account-target-selection.test.ts +5 test-no-wall-clock:src/main/rate-limits/service/service-account-target-selection.test.ts 1 test-no-wall-clock:src/main/rate-limits/service/service-cursor-usage.test.ts 3 test-no-wall-clock:src/main/rate-limits/service/service-minimax-usage.test.ts 3 test-no-wall-clock:src/main/rate-limits/service/service-refresh-orchestration.test.ts diff --git a/config/reliability-gates.jsonc b/config/reliability-gates.jsonc index 406884c510d..21f82faaae7 100644 --- a/config/reliability-gates.jsonc +++ b/config/reliability-gates.jsonc @@ -2175,13 +2175,13 @@ "providers": ["local", "daemon", "wsl", "ssh", "remote-runtime"], "coveredPlatforms": ["linux"], "coveredProviders": [], - "coverageNotes": "Audit2133 current-parent preparation: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2065 (sources2063/2064): Intentionally retire these low-value alarms without replacement: src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-startup-cwd-fallback-notice.spec.ts: prints a terminal notice when the startup cwd fell back to the workspace root. src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-pi-coalesce.test.ts: surfaces working frames when many spinner frames arrive in one chunk. src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-pi-spinner.test.ts: surfaces normalized working and idle labels across a spinner cycle; surfaces working even when a single chunk contains multiple spinner frames. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts: ordinary registration cleanup removes only import { registerPtyConnectionStartupCwdFallbackNoticeTests } from '../startup/pty-connection-startup-cwd-fallback-notice.spec'; registerPtyConnectionStartupCwdFallbackNoticeTests(). Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Frozen current literal-import graph reaches these changed test bytes; unresolved local and computed edges remain debt, and current reachability is not historical execution or equivalent replacement evidence. Historical prior account (preserved verbatim): Audit2061 (sources2059/2060): Intentionally retire these low-value alarms without replacement: src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-agent-trust-hold.test.ts: spawns only after the answer, carrying \"let agents ask\" to main for this launch; reattaches a section terminal without asking or changing trust; spawns with today's default when the prompt is released without an answer. src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-connection-ssh-hook-status-authority.spec.ts: leaves SSH IPC OSC 9999 status ownership in the main runtime. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-completion-and-notification.test.ts: ordinary registration cleanup removes only import { registerPtyConnectionSshHookStatusAuthorityTests } from '../host-ownership/pty-connection-ssh-hook-status-authority.spec'; registerPtyConnectionSshHookStatusAuthorityTests(). Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Historical prior account (preserved verbatim): Audit2056 (sources2054/2055): Intentionally retire these low-value alarms without replacement: src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-spawn-intent.test.ts: declares the intent only when the spawn resumes an agent; reports a deferral to the pane instead of an error toast. src/renderer/src/components/terminal-pane/pty-connection/startup/in-place-resume-hold.test.ts: owns the record while the start runs, through a nested start, and releases on settle; holds nothing for a start not resuming a record, or once the pane is disposed. Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Historical prior account (preserved verbatim): Audit1939 (sources1934/1935): The existing directory-level pnpm test selector includes eleven changed source files and automatically omits the three whole deletions. Keep this nonempty discovery command unchanged; no dated receipt uses this broad path. Removed agent admission fields, mock transport routing and terminal-id projection alarms are lost. Retained foreground state, actual headless xterm, redraw, abort/rebind reader and bridge claim progression remain scoped to their unchanged callbacks. No current-source execution, independent replacement, native transport or physical provider result is assigned. Preserve meaningful remaining selectors/assertions and unchanged dated receipts within their original scope. Reduced selectors have no fresh gate execution evidence in this metadata packet. No equivalent replacement, physical watcher/PTY/provider, live SSH/remote/mobile, rendered, cross-platform, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Audit1417 intentionally reduces src/renderer/src/components/terminal-pane/pty-connection/main-pane-start-wait.test.ts: Loses joined waiter invocation/failure notification and raw terminal error/paired-host readable sentence alarms; survivors preserve hold detection and card clearing. deletes src/renderer/src/components/terminal-pane/pty-connection-hidden-tui-snapshot-replay.spec.ts: Loses rich hidden snapshot sequence replay/grid resize and forced repaint after hidden snapshot alarms, including live-trigger deduplication. deletes src/renderer/src/components/terminal-pane/pty-connection-pi-synchronized-input.test.ts: Loses typed-input forced synchronized-frame presentation alarm; setup implements the parser behavior it claims to exercise. deletes src/renderer/src/components/terminal-pane/pty-connection-unserved-ssh-pane.test.ts: Loses automatic SSH dial deduplication, passphrase gating, stale pane exclusion, and disposal cancellation alarms. deletes src/renderer/src/components/terminal-pane/pty-connection-remote-snapshot-source-grid.test.ts: Loses source grid before frame and destination grid restoration ordering alarm. deletes src/renderer/src/components/terminal-pane/pty-connection-restart-replacement.spec.ts: Loses wrapper-level hidden/visible restart resume, dispose/rebind suppression and finished-turn replay alarms; manual pipeline and mock-implemented binding invalidate the whole callbacks. No equivalent replacement coverage or fresh result is claimed. Historical coverage account: Audit1391 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audit1361 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audit1342 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): macOS daemon-backed Electron journey verifies same PID and terminal identity plus rendered output. Focused renderer contracts pass on Linux, Windows and WSL. Neighboring SSH model and replay contracts pass locally; no new live SSH or paired-runtime journey. Audit1342: src/renderer/src/components/terminal-pane/pty-connection-unanswered-command-finish.spec.ts removed. Unanswered SSH shell finish keeps/drops mocked agent row matrix disappears. src/renderer/src/components/terminal-pane/pty-connection-split-cwd-resolution.test.ts reduced. Happy inherited-cwd wait and transport-option forwarding sample loses its individual alarm. src/renderer/src/components/terminal-pane/pty-connection-command-input-agent-identity.spec.ts removed. Typed Droid versus process/launch identity and SSH/runtime process-evidence matrices disappear. src/renderer/src/components/terminal-pane/pty-connection/reattach-success-settle.test.ts removed. Success/no-ID/expired/superseded attach-settlement bag alarms disappear. src/renderer/src/components/terminal-pane/pty-transport-user-input.test.ts reduced. Every-write kind forwarding and synchronous driving-attempt observer/rejection/ACK call counts disappear. src/renderer/src/components/terminal-pane/pty-connection-codex-restart-input-lookup.spec.ts removed. No global tab enumeration on ordinary/stale input and known restart notice input-block mock-call alarms. src/renderer/src/components/terminal-pane/pty-connection-layout-owner-wake.test.ts removed. Hidden-to-visible single-pane start request, attach-only argument and negative local wake-record alarms are intentionally dropped; no real server wake/ack occurs. src/renderer/src/components/terminal-pane/pty-connection-completion-and-notification.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. src/renderer/src/components/terminal-pane/pty-connection-command-finished-cleanup.spec.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. src/renderer/src/components/terminal-pane/pty-connection-terminal-input-gating.spec.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Audit1361: src/renderer/src/components/terminal-pane/pty-connection/foreground-output-scan.test.ts reduced. Internal searched-character budget and ordinary/malformed no-op controls. No equivalent replacement coverage is claimed. Audit1365: focused Linux unit selection passed on source head 8880357cb420c45f1b808ae545a5bc609324624d. This new result has its own exact command; historical results keep their prior scope. Intentional test losses remain recorded in knownGaps. No physical-provider, native input, rendered E2E, p95, soak or replacement-coverage claim. Audit1369: src/renderer/src/components/terminal-pane/pty-connection/disposed-spawn-retention.test.ts removed. Rootless/removed/moved tabs, missing leaves, queued deletion and host-qualified/legacy deletion eligibility fixtures. No equivalent replacement coverage is claimed. Audit1391: src/renderer/src/components/terminal-pane/pty-connection-remote-pause-drop-notice.spec.ts reduced. Lose repeated quiet switches avoiding snapshots and legacy host without drop-report capability requesting a snapshot. Retained imported registrar uses fake transport/xterm writes, exercising real gap/restore lifecycle rather than actual terminal rendering. No equivalent replacement coverage is claimed. Audit1396: src/renderer/src/components/terminal-pane/pty-connection-pending-spawn.spec.ts reduced. Lose standalone debug-state retention/log silence alarm. React StrictMode is not mounted; bindings manually simulate remount over mocked transport. No equivalent replacement coverage is claimed. The existing primary-selector receipt and its claims remain scoped to their unchanged sources; the broad optional command has no new execution result. Audit1400: src/renderer/src/components/terminal-pane/pty-connection/terminal-input-echo-delay.test.ts reduced. Removes two fabricated-binding pipeline registrations; retains timestamp-policy outcomes without wall-clock speed assertions. No equivalent replacement coverage is claimed. The existing primary-selector receipt and its claims remain scoped to their unchanged sources; the broad optional command has no new execution result. Audit1402: src/renderer/src/components/terminal-pane/pty-connection-park-reveal-model-snapshot.spec.ts reduced. Loses basic paired serialize/initial replay forwarding check; hidden alt-frame grid/precedence policy remains. No real terminal renderer claim. src/renderer/src/components/terminal-pane/pty-connection/main-pane-resume-banner.test.ts reduced. Loses subscription-budget and attach-start generation predicate alarms; actual restored-banner renderer is not exercised. No equivalent replacement coverage is claimed. The existing primary-selector receipt and its claims remain scoped to their unchanged sources; the broad optional command has no new execution result.", + "coverageNotes": "Audit2694 source-only review: Remove14 authored/14 expanded cases in the renderer completion wrapper family, including the complete bell/query-reply/stale-input factory, without replacement. Retain29 authored/34 expanded cases with unchanged callback bodies. Three removals are the existing pending2203 overlap and must be adopted/count-reconciled once; eleven are fresh removals. No current-source runtime or gate execution is supplied by this packet; dated evidence retains its original source scope and does not validate the reduced factory bytes. No equivalent replacement, physical provider, mixed-version, mobile, rendered UI, cross-platform, soak or measured-performance result is claimed. The retained directory-level discovery command continues to discover the reduced family; historical wrapper mentions are not fresh import-closure or execution evidence. Historical prior account (preserved verbatim): Audit2133 current-parent preparation: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2065 (sources2063/2064): Intentionally retire these low-value alarms without replacement: src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-startup-cwd-fallback-notice.spec.ts: prints a terminal notice when the startup cwd fell back to the workspace root. src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-pi-coalesce.test.ts: surfaces working frames when many spinner frames arrive in one chunk. src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-pi-spinner.test.ts: surfaces normalized working and idle labels across a spinner cycle; surfaces working even when a single chunk contains multiple spinner frames. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts: ordinary registration cleanup removes only import { registerPtyConnectionStartupCwdFallbackNoticeTests } from '../startup/pty-connection-startup-cwd-fallback-notice.spec'; registerPtyConnectionStartupCwdFallbackNoticeTests(). Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Frozen current literal-import graph reaches these changed test bytes; unresolved local and computed edges remain debt, and current reachability is not historical execution or equivalent replacement evidence. Historical prior account (preserved verbatim): Audit2061 (sources2059/2060): Intentionally retire these low-value alarms without replacement: src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-agent-trust-hold.test.ts: spawns only after the answer, carrying \"let agents ask\" to main for this launch; reattaches a section terminal without asking or changing trust; spawns with today's default when the prompt is released without an answer. src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-connection-ssh-hook-status-authority.spec.ts: leaves SSH IPC OSC 9999 status ownership in the main runtime. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-completion-and-notification.test.ts: ordinary registration cleanup removes only import { registerPtyConnectionSshHookStatusAuthorityTests } from '../host-ownership/pty-connection-ssh-hook-status-authority.spec'; registerPtyConnectionSshHookStatusAuthorityTests(). Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Historical prior account (preserved verbatim): Audit2056 (sources2054/2055): Intentionally retire these low-value alarms without replacement: src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-spawn-intent.test.ts: declares the intent only when the spawn resumes an agent; reports a deferral to the pane instead of an error toast. src/renderer/src/components/terminal-pane/pty-connection/startup/in-place-resume-hold.test.ts: owns the record while the start runs, through a nested start, and releases on settle; holds nothing for a start not resuming a record, or once the pane is disposed. Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Historical prior account (preserved verbatim): Audit1939 (sources1934/1935): The existing directory-level pnpm test selector includes eleven changed source files and automatically omits the three whole deletions. Keep this nonempty discovery command unchanged; no dated receipt uses this broad path. Removed agent admission fields, mock transport routing and terminal-id projection alarms are lost. Retained foreground state, actual headless xterm, redraw, abort/rebind reader and bridge claim progression remain scoped to their unchanged callbacks. No current-source execution, independent replacement, native transport or physical provider result is assigned. Preserve meaningful remaining selectors/assertions and unchanged dated receipts within their original scope. Reduced selectors have no fresh gate execution evidence in this metadata packet. No equivalent replacement, physical watcher/PTY/provider, live SSH/remote/mobile, rendered, cross-platform, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Audit1417 intentionally reduces src/renderer/src/components/terminal-pane/pty-connection/main-pane-start-wait.test.ts: Loses joined waiter invocation/failure notification and raw terminal error/paired-host readable sentence alarms; survivors preserve hold detection and card clearing. deletes src/renderer/src/components/terminal-pane/pty-connection-hidden-tui-snapshot-replay.spec.ts: Loses rich hidden snapshot sequence replay/grid resize and forced repaint after hidden snapshot alarms, including live-trigger deduplication. deletes src/renderer/src/components/terminal-pane/pty-connection-pi-synchronized-input.test.ts: Loses typed-input forced synchronized-frame presentation alarm; setup implements the parser behavior it claims to exercise. deletes src/renderer/src/components/terminal-pane/pty-connection-unserved-ssh-pane.test.ts: Loses automatic SSH dial deduplication, passphrase gating, stale pane exclusion, and disposal cancellation alarms. deletes src/renderer/src/components/terminal-pane/pty-connection-remote-snapshot-source-grid.test.ts: Loses source grid before frame and destination grid restoration ordering alarm. deletes src/renderer/src/components/terminal-pane/pty-connection-restart-replacement.spec.ts: Loses wrapper-level hidden/visible restart resume, dispose/rebind suppression and finished-turn replay alarms; manual pipeline and mock-implemented binding invalidate the whole callbacks. No equivalent replacement coverage or fresh result is claimed. Historical coverage account: Audit1391 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audit1361 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audit1342 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): macOS daemon-backed Electron journey verifies same PID and terminal identity plus rendered output. Focused renderer contracts pass on Linux, Windows and WSL. Neighboring SSH model and replay contracts pass locally; no new live SSH or paired-runtime journey. Audit1342: src/renderer/src/components/terminal-pane/pty-connection-unanswered-command-finish.spec.ts removed. Unanswered SSH shell finish keeps/drops mocked agent row matrix disappears. src/renderer/src/components/terminal-pane/pty-connection-split-cwd-resolution.test.ts reduced. Happy inherited-cwd wait and transport-option forwarding sample loses its individual alarm. src/renderer/src/components/terminal-pane/pty-connection-command-input-agent-identity.spec.ts removed. Typed Droid versus process/launch identity and SSH/runtime process-evidence matrices disappear. src/renderer/src/components/terminal-pane/pty-connection/reattach-success-settle.test.ts removed. Success/no-ID/expired/superseded attach-settlement bag alarms disappear. src/renderer/src/components/terminal-pane/pty-transport-user-input.test.ts reduced. Every-write kind forwarding and synchronous driving-attempt observer/rejection/ACK call counts disappear. src/renderer/src/components/terminal-pane/pty-connection-codex-restart-input-lookup.spec.ts removed. No global tab enumeration on ordinary/stale input and known restart notice input-block mock-call alarms. src/renderer/src/components/terminal-pane/pty-connection-layout-owner-wake.test.ts removed. Hidden-to-visible single-pane start request, attach-only argument and negative local wake-record alarms are intentionally dropped; no real server wake/ack occurs. src/renderer/src/components/terminal-pane/pty-connection-completion-and-notification.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. src/renderer/src/components/terminal-pane/pty-connection-command-finished-cleanup.spec.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. src/renderer/src/components/terminal-pane/pty-connection-terminal-input-gating.spec.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Audit1361: src/renderer/src/components/terminal-pane/pty-connection/foreground-output-scan.test.ts reduced. Internal searched-character budget and ordinary/malformed no-op controls. No equivalent replacement coverage is claimed. Audit1365: focused Linux unit selection passed on source head 8880357cb420c45f1b808ae545a5bc609324624d. This new result has its own exact command; historical results keep their prior scope. Intentional test losses remain recorded in knownGaps. No physical-provider, native input, rendered E2E, p95, soak or replacement-coverage claim. Audit1369: src/renderer/src/components/terminal-pane/pty-connection/disposed-spawn-retention.test.ts removed. Rootless/removed/moved tabs, missing leaves, queued deletion and host-qualified/legacy deletion eligibility fixtures. No equivalent replacement coverage is claimed. Audit1391: src/renderer/src/components/terminal-pane/pty-connection-remote-pause-drop-notice.spec.ts reduced. Lose repeated quiet switches avoiding snapshots and legacy host without drop-report capability requesting a snapshot. Retained imported registrar uses fake transport/xterm writes, exercising real gap/restore lifecycle rather than actual terminal rendering. No equivalent replacement coverage is claimed. Audit1396: src/renderer/src/components/terminal-pane/pty-connection-pending-spawn.spec.ts reduced. Lose standalone debug-state retention/log silence alarm. React StrictMode is not mounted; bindings manually simulate remount over mocked transport. No equivalent replacement coverage is claimed. The existing primary-selector receipt and its claims remain scoped to their unchanged sources; the broad optional command has no new execution result. Audit1400: src/renderer/src/components/terminal-pane/pty-connection/terminal-input-echo-delay.test.ts reduced. Removes two fabricated-binding pipeline registrations; retains timestamp-policy outcomes without wall-clock speed assertions. No equivalent replacement coverage is claimed. The existing primary-selector receipt and its claims remain scoped to their unchanged sources; the broad optional command has no new execution result. Audit1402: src/renderer/src/components/terminal-pane/pty-connection-park-reveal-model-snapshot.spec.ts reduced. Loses basic paired serialize/initial replay forwarding check; hidden alt-frame grid/precedence policy remains. No real terminal renderer claim. src/renderer/src/components/terminal-pane/pty-connection/main-pane-resume-banner.test.ts reduced. Loses subscription-budget and attach-start generation predicate alarms; actual restored-banner renderer is not exercised. No equivalent replacement coverage is claimed. The existing primary-selector receipt and its claims remain scoped to their unchanged sources; the broad optional command has no new execution result.", "motivatingLinks": [ "https://github.com/user-attachments/assets/e8c6d1dc-6150-4c3d-b55a-3d12efefdd04", "https://github.com/user-attachments/assets/b0328f88-34ac-4d51-8119-9efe17072435" ], "invariant": "Adopting a prestarted terminal preserves its existing process and paints snapshot-covered startup output once while retaining subsequent live output. Missing sequence proof or blank snapshots must not authorize dropping output.", - "oracle": "Audit2133 current-parent preparation: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2065 (sources2063/2064): Intentionally retire these low-value alarms without replacement: src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-startup-cwd-fallback-notice.spec.ts: prints a terminal notice when the startup cwd fell back to the workspace root. src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-pi-coalesce.test.ts: surfaces working frames when many spinner frames arrive in one chunk. src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-pi-spinner.test.ts: surfaces normalized working and idle labels across a spinner cycle; surfaces working even when a single chunk contains multiple spinner frames. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts: ordinary registration cleanup removes only import { registerPtyConnectionStartupCwdFallbackNoticeTests } from '../startup/pty-connection-startup-cwd-fallback-notice.spec'; registerPtyConnectionStartupCwdFallbackNoticeTests(). Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Frozen current literal-import graph reaches these changed test bytes; unresolved local and computed edges remain debt, and current reachability is not historical execution or equivalent replacement evidence. Historical prior account (preserved verbatim): Audit2061 (sources2059/2060): Intentionally retire these low-value alarms without replacement: src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-agent-trust-hold.test.ts: spawns only after the answer, carrying \"let agents ask\" to main for this launch; reattaches a section terminal without asking or changing trust; spawns with today's default when the prompt is released without an answer. src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-connection-ssh-hook-status-authority.spec.ts: leaves SSH IPC OSC 9999 status ownership in the main runtime. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-completion-and-notification.test.ts: ordinary registration cleanup removes only import { registerPtyConnectionSshHookStatusAuthorityTests } from '../host-ownership/pty-connection-ssh-hook-status-authority.spec'; registerPtyConnectionSshHookStatusAuthorityTests(). Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Historical prior account (preserved verbatim): Audit2056 (sources2054/2055): Intentionally retire these low-value alarms without replacement: src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-spawn-intent.test.ts: declares the intent only when the spawn resumes an agent; reports a deferral to the pane instead of an error toast. src/renderer/src/components/terminal-pane/pty-connection/startup/in-place-resume-hold.test.ts: owns the record while the start runs, through a nested start, and releases on settle; holds nothing for a start not resuming a record, or once the pane is disposed. Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Historical prior account (preserved verbatim): Audit1939 (sources1934/1935): The existing directory-level pnpm test selector includes eleven changed source files and automatically omits the three whole deletions. Keep this nonempty discovery command unchanged; no dated receipt uses this broad path. Removed agent admission fields, mock transport routing and terminal-id projection alarms are lost. Retained foreground state, actual headless xterm, redraw, abort/rebind reader and bridge claim progression remain scoped to their unchanged callbacks. No current-source execution, independent replacement, native transport or physical provider result is assigned. Preserve meaningful remaining selectors/assertions and unchanged dated receipts within their original scope. Reduced selectors have no fresh gate execution evidence in this metadata packet. No equivalent replacement, physical watcher/PTY/provider, live SSH/remote/mobile, rendered, cross-platform, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Historical pre-audit oracle account for changed sources: The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): Pass snapshot sequence and proven zero keyboard flags through real IPC transport projection. Deliver snapshot-covered and newer output before reattach resolves; drain replay parse callbacks and require one startup marker and the newer output. Repeat with no sequence and blank snapshot to retain unproven bytes. In Electron select a prestarted workspace, type a generated marker and compare PID and stable terminal identities before and after.", + "oracle": "Audit2694 source-only review: Remove14 authored/14 expanded cases in the renderer completion wrapper family, including the complete bell/query-reply/stale-input factory, without replacement. Retain29 authored/34 expanded cases with unchanged callback bodies. Three removals are the existing pending2203 overlap and must be adopted/count-reconciled once; eleven are fresh removals. No current-source runtime or gate execution is supplied by this packet; dated evidence retains its original source scope and does not validate the reduced factory bytes. No equivalent replacement, physical provider, mixed-version, mobile, rendered UI, cross-platform, soak or measured-performance result is claimed. The retained directory-level discovery command continues to discover the reduced family; historical wrapper mentions are not fresh import-closure or execution evidence. Historical prior account (preserved verbatim): Audit2133 current-parent preparation: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2065 (sources2063/2064): Intentionally retire these low-value alarms without replacement: src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-startup-cwd-fallback-notice.spec.ts: prints a terminal notice when the startup cwd fell back to the workspace root. src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-pi-coalesce.test.ts: surfaces working frames when many spinner frames arrive in one chunk. src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-pi-spinner.test.ts: surfaces normalized working and idle labels across a spinner cycle; surfaces working even when a single chunk contains multiple spinner frames. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts: ordinary registration cleanup removes only import { registerPtyConnectionStartupCwdFallbackNoticeTests } from '../startup/pty-connection-startup-cwd-fallback-notice.spec'; registerPtyConnectionStartupCwdFallbackNoticeTests(). Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Frozen current literal-import graph reaches these changed test bytes; unresolved local and computed edges remain debt, and current reachability is not historical execution or equivalent replacement evidence. Historical prior account (preserved verbatim): Audit2061 (sources2059/2060): Intentionally retire these low-value alarms without replacement: src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-agent-trust-hold.test.ts: spawns only after the answer, carrying \"let agents ask\" to main for this launch; reattaches a section terminal without asking or changing trust; spawns with today's default when the prompt is released without an answer. src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-connection-ssh-hook-status-authority.spec.ts: leaves SSH IPC OSC 9999 status ownership in the main runtime. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-completion-and-notification.test.ts: ordinary registration cleanup removes only import { registerPtyConnectionSshHookStatusAuthorityTests } from '../host-ownership/pty-connection-ssh-hook-status-authority.spec'; registerPtyConnectionSshHookStatusAuthorityTests(). Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Historical prior account (preserved verbatim): Audit2056 (sources2054/2055): Intentionally retire these low-value alarms without replacement: src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-spawn-intent.test.ts: declares the intent only when the spawn resumes an agent; reports a deferral to the pane instead of an error toast. src/renderer/src/components/terminal-pane/pty-connection/startup/in-place-resume-hold.test.ts: owns the record while the start runs, through a nested start, and releases on settle; holds nothing for a start not resuming a record, or once the pane is disposed. Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Historical prior account (preserved verbatim): Audit1939 (sources1934/1935): The existing directory-level pnpm test selector includes eleven changed source files and automatically omits the three whole deletions. Keep this nonempty discovery command unchanged; no dated receipt uses this broad path. Removed agent admission fields, mock transport routing and terminal-id projection alarms are lost. Retained foreground state, actual headless xterm, redraw, abort/rebind reader and bridge claim progression remain scoped to their unchanged callbacks. No current-source execution, independent replacement, native transport or physical provider result is assigned. Preserve meaningful remaining selectors/assertions and unchanged dated receipts within their original scope. Reduced selectors have no fresh gate execution evidence in this metadata packet. No equivalent replacement, physical watcher/PTY/provider, live SSH/remote/mobile, rendered, cross-platform, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Historical pre-audit oracle account for changed sources: The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): Pass snapshot sequence and proven zero keyboard flags through real IPC transport projection. Deliver snapshot-covered and newer output before reattach resolves; drain replay parse callbacks and require one startup marker and the newer output. Repeat with no sequence and blank snapshot to retain unproven bytes. In Electron select a prestarted workspace, type a generated marker and compare PID and stable terminal identities before and after.", "commands": [ "pnpm test src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-connect-spawn.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts", "pnpm test src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-connect-spawn.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-visibility-and-exit.test.ts", @@ -2242,6 +2242,7 @@ "Exercise live SSH and paired-runtime snapshot adoption before claiming full provider coverage." ], "knownGaps": [ + "Audit2694 intentional coverage losses (source-only, no replacement): src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-command-finished-interrupt-arbitration.spec.ts: 'drops the command-finished status when pending interrupt inference is rejected': Loses the standalone rejected-inference-to-drop alarm; the delayed-write rows remain but are not equivalent to this immediate rejection example. src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-bell-query-reply-and-stale-input.spec.ts: 'forwards raw onData after a bell as a query reply': Loses raw onData forwarding after the manually raised bell, including its hibernation-counter expectations. src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-bell-query-reply-and-stale-input.spec.ts: 'blocks onData on a stale codex pane': The real isCodexPaneStale guard executes, and removing it would allow the typed a to reach transport. Intentionally loses this genuine stale-account typing refusal alarm. No retained query-reply test is claimed equivalent. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts: 'omits byte-parser callbacks from the local transport options': Loses local main-authority callback omission and lifecycle callback presence checks. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts: 'keeps byte-parser callbacks on remote-runtime transports': Loses remote-runtime parser callback preservation and factory-argument alarm, including this compatibility boundary; no mixed-version execution is covered. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts: 'consumes pty:sideEffect facts with the live-path policy after spawn': Loses title/bell fact routing and exact 250ms delayed fake notification example. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts: 'schedules the completion notification for genuine working→idle facts': Loses positive main-fact working-to-idle scheduling alarm. Retained stale/race cases do not replace this positive example. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts: 'drops the agent status from a command-finished fact like the byte path did': Loses command-finished fact-to-drop routing and removeAgentStatus noncall alarm. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts: 'routes pr-link facts to the worktree PR observer': Loses PR-link fact forwarding, worktree/tab/PTY arguments alarm; retained raw-byte nonconsumption is not equivalent. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts: 'seeds and settles Command Code status from command-code facts': Real Command Code seed/settle policy runs. Loses positive seed, prompt payload, and 1499+1ms completion boundary alarm; retained newer-working cancellation is not equivalent. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts: 'does not byte-scan Command Code output — facts are the only consumer': Loses Command Code-specific no-byte-parser alarm. Retained PR/OSC raw-byte exclusion does not cover this parser. src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-notification-settings-gating.spec.ts: 'shares one raw store subscriber for agent-complete notification settings across panes': Actual shared subscribe/unsubscribe runs. Loses shared single-subscription and final-pane unsubscribe lifetime alarm, with no replacement claimed. src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-task-complete-dispatch.spec.ts: 'dispatches agent-task-complete for generic Codex spinner titles after process identity is confirmed': Real coordinator evidence path runs over fake process answers. Loses positive generic-title/confirmed-Codex completion and inspectProcess-argument alarm. src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-task-complete-dispatch.spec.ts: 'normalizes Pi-compatible remote titles to authoritative OMP launch identity': Real owner-compatible normalization runs. Loses Pi-to-OMP title/status normalization, active tab label, OSC observation, and retained launch-identity example; no real remote transport or equivalent replacement. Wrapper cleanup removes only the deleted bell factory import and its registration-only describe block; no additional authored removal credit. Audit2694 source-only review: Remove14 authored/14 expanded cases in the renderer completion wrapper family, including the complete bell/query-reply/stale-input factory, without replacement. Retain29 authored/34 expanded cases with unchanged callback bodies. Three removals are the existing pending2203 overlap and must be adopted/count-reconciled once; eleven are fresh removals. No current-source runtime or gate execution is supplied by this packet; dated evidence retains its original source scope and does not validate the reduced factory bytes. No equivalent replacement, physical provider, mixed-version, mobile, rendered UI, cross-platform, soak or measured-performance result is claimed. The retained directory-level discovery command continues to discover the reduced family; historical wrapper mentions are not fresh import-closure or execution evidence.", "Audit2133 current-parent preparation (988 authored removals; independently reviewed2099/2107/2115/2116 decisions; upstream clear-buffer and recovery-image regressions retained): Intentionally retire these low-value alarms without replacement: src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts: structural support changed only; no new authored removal credit. src/renderer/src/components/terminal-pane/pty-connection/spawn/unbound-pane-spawn-recovery.test.ts: requests a tab remount for an unbound spawn; leaves recovery to a remote transport that armed its own retry; requests a remount when the transport reports no recovery of its own; settles the spawn as failed before requesting a remount; prefers the restored leaf id when reporting the anomaly; falls back to the pane leaf id when no restored leaf exists. src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-dropped-output-snapshot-healing.spec.ts: repaints from the main-owned snapshot when main drops pending output at the cap. src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-deferred-input-forwarding.spec.ts: routes terminal input through deferPtyInput so the host can withhold it; forwards terminal input directly when the host supplies no deferPtyInput. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-mode2031-raw-subscription.spec.ts: records a mode 2031 subscribe from the raw chunk boundary without answering. src/renderer/src/components/terminal-pane/pty-connection/output/pty-connection-fresh-native-follow-reset.spec.ts: retries a fresh-spawn native follow reset when renderer dimensions return. src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-terminal-bell-attention.spec.ts: forwards onBell to pane attention and notification policy; hands the bell to the attention module with its pane even when pane attention is off. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-foreground-agent.test.ts: remove only literal registration import/call pairs import { registerPtyConnectionDeferredInputForwardingTests } from '../input/pty-connection-deferred-input-forwarding.spec', registerPtyConnectionDeferredInputForwardingTests(); no additional authored credit. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts: remove only literal registration import/call pairs import { registerPtyConnectionFreshNativeFollowResetTests } from '../output/pty-connection-fresh-native-follow-reset.spec', registerPtyConnectionFreshNativeFollowResetTests(); no additional authored credit. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts: remove only literal registration import/call pairs import { registerPtyConnectionTerminalBellAttentionTests } from '../notifications/pty-connection-terminal-bell-attention.spec', registerPtyConnectionTerminalBellAttentionTests(); no additional authored credit. Current changed source bytes, wrapper registrations and reduced selectors have no fresh execution or red/green credit. Unrelated surviving receipt objects keep their original narrow scope; current literal graph reachability does not establish historical import closure or equivalent replacement coverage. Current conservative command/import graph reaches src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts, src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-dropped-output-snapshot-healing.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-mode2031-raw-subscription.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-deferred-input-forwarding.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-terminal-bell-attention.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/output/pty-connection-fresh-native-follow-reset.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/spawn/unbound-pane-spawn-recovery.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-foreground-agent.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts. Unresolved local/computed edges remain explicit debt.", "Audit2065 (sources2063/2064): Intentionally retire these low-value alarms without replacement: src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-startup-cwd-fallback-notice.spec.ts: prints a terminal notice when the startup cwd fell back to the workspace root. src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-pi-coalesce.test.ts: surfaces working frames when many spinner frames arrive in one chunk. src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-pi-spinner.test.ts: surfaces normalized working and idle labels across a spinner cycle; surfaces working even when a single chunk contains multiple spinner frames. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts: ordinary registration cleanup removes only import { registerPtyConnectionStartupCwdFallbackNoticeTests } from '../startup/pty-connection-startup-cwd-fallback-notice.spec'; registerPtyConnectionStartupCwdFallbackNoticeTests(). Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Frozen current literal-import graph reaches these changed test bytes; unresolved local and computed edges remain debt, and current reachability is not historical execution or equivalent replacement evidence.", "Composer draft creation and cancellation are not implemented by this gate.", @@ -2378,13 +2379,13 @@ "providers": ["local", "ssh", "remote-runtime"], "coveredPlatforms": ["macos"], "coveredProviders": [], - "coverageNotes": "Audit2266 reduces cmd-j-host-qualified-candidate-ownership.test.ts to the scoped open-tab hidden same-ID legacy ambiguity refusal. Separate browser/simulator paired-runtime alias and current-row projections, generic workspace host projection and hostless explicit-owner refusal examples are removed without equivalent replacement. No fresh gate execution, browser activation, physical host, simulator or remote delivery evidence is claimed. Historical dated receipts and budgets remain raw-byte exact. Prior coverage account: Audit1899 replays sealed Audit1895: workspace-session-schema.test.ts keeps only cross-workspace truncated-tab salvage and legacy browser-history cap normalization. Four current commands and testFiles retain that reduced source; no current assertionRef or active receipt selects it. SSH file-owner, isolated browser partition, launch/title/quick-command fields, recency, structured-chat/view-mode and remote browser identity hydration alarms are intentionally lost. Existing retired receipt strings and unrelated active receipts remain verbatim. No equivalent replacement, new Cmd-J gate execution, native simulator or remote/browser restore proof is claimed. Historical coverage account before Audit1899: Audit1494 removes use-open-tab-search.test.ts. Supplied host/worktree/title/ranking projections, simple subscription updates and result-array identity alarms are retired. No actual activation or navigation occurred in that suite. No equivalent replacement coverage or fresh Cmd-J gate validation is claimed. Historical receipts remain scoped to their original selectors. Audit1433 narrows worktree-checks-review-index.test.ts to same-ID local/SSH object-key review isolation. Local provider/cache lookup, GitLab preference, suppression/legacy fallback, explicit-PR authority, physical-versus-runtime review isolation, and branchless-workspace alarms are intentionally removed. No equivalent replacement coverage is claimed. Historical receipts and commands remain unchanged and do not certify the reduced source. Historical coverage account: Audit1396 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audit1308 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Deterministic candidate-builder contracts inject local and paired-runtime worktrees with the same bare id into the real aggregated tab buckets, including folder workspaces and a paired runtime transporting an SSH-owned worktree. A mirror contract preserves distinct same-id runtime tabs. A paired Electron journey verifies both visible browser rows and both visible simulator rows, then requires each selection to render its owning active tab and update backing host-qualified state. The test-value audit narrowed simulator-palette-search.test.ts to the recency tie, same-id host isolation, ambiguous legacy host rejection and oversized-input getter tripwire. Supplied timestamp, empty-query context ordering, host projection, alias/range, metadata matching, active-tab score, over-token/whitespace and malformed display-name fallback examples were removed. Their separate alarms are lost; retained candidate and activation contracts do not establish equivalent coverage. Historical run commands and results remain historical. The audit also removed the standalone workspace-tab-palette-search suite: supplied row, title, metadata, alias, range, ranking and ownership examples no longer provide their separate alarms. Other retained contracts are not replacement coverage. The mirror-identity fixture now retains same-id sibling-runtime isolation and the repeated-frame subscriber tripwire only. Supplied field, owner, alias and mapping examples are removed; their separate alarms are lost. The retained sibling-runtime case is not equivalent coverage for them. The test-value audit removed tabs-open-close-lifecycle host-stamping examples and ordinary tab/group operations from tabs-pane-layout-operations. Local-null, explicit-runtime and SSH-without-active-host stamp assertions are lost; retained mobile/MRU and subscriber/atomic split cases do not replace them. Candidate and live Cmd-J evidence retains its own scope. Historical commands, outcomes and narratives remain historical. Audit1308: src/renderer/src/lib/browser-palette-search.test.ts removed. Browser-palette token and pasted-query size-guard work alarms disappear. No equivalent replacement coverage is claimed. Audit1386: src/renderer/src/lib/open-mobile-emulator-tab.test.ts reduced. Duplicate attach count and null-tab creation retry/guard reset standalone alarms removed; no simulator device used. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1396: src/renderer/src/lib/simulator-palette-search.test.ts reduced. Lose simulator-specific lastFocusedAt tie-order alarm; identity/routing and pre-scan size fence remain. No native simulator or real remote launch claim. No equivalent replacement coverage is claimed. Audit1402: src/renderer/src/runtime/web-session-tabs-sync-mirror-identity.test.ts reduced. Loses repeated no-op frame store-notification budget; independent cross-runtime resource preservation remains. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result.", + "coverageNotes": "Audit2697 browser source review (metadata followup2702): Reduce src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts by four authored/expanded cases without replacement. The remaining three cases preserve only their existing same-ID execution-host separation, absent stamped-owner refusal and ambiguous legacy-bucket refusal scope. Intentionally lose duplicate backing-tab-ID suppression, multiple unified-browser claims of one workspace, foreign-worktree unified-tab rejection, and the 1000-workspace output/internal getter-read budget alarm. These are real removed alarms; the retained host cases are not equivalent replacements. Current test-value policy rejects internal getter/read budgets; no replacement performance or measured-cost claim is made. Keep existing nonempty selectors and the retained same-ID browser assertionRef. No fresh gate execution or reduced-source validation is supplied; dated receipts, results, commands and historical coverage accounts remain within their original source scope. No live browser activation, physical provider, mixed-version execution, mobile, native UI, platform hardware, soak or timing result is added. Prior coverage account (preserved verbatim): Audit2266 reduces cmd-j-host-qualified-candidate-ownership.test.ts to the scoped open-tab hidden same-ID legacy ambiguity refusal. Separate browser/simulator paired-runtime alias and current-row projections, generic workspace host projection and hostless explicit-owner refusal examples are removed without equivalent replacement. No fresh gate execution, browser activation, physical host, simulator or remote delivery evidence is claimed. Historical dated receipts and budgets remain raw-byte exact. Prior coverage account: Audit1899 replays sealed Audit1895: workspace-session-schema.test.ts keeps only cross-workspace truncated-tab salvage and legacy browser-history cap normalization. Four current commands and testFiles retain that reduced source; no current assertionRef or active receipt selects it. SSH file-owner, isolated browser partition, launch/title/quick-command fields, recency, structured-chat/view-mode and remote browser identity hydration alarms are intentionally lost. Existing retired receipt strings and unrelated active receipts remain verbatim. No equivalent replacement, new Cmd-J gate execution, native simulator or remote/browser restore proof is claimed. Historical coverage account before Audit1899: Audit1494 removes use-open-tab-search.test.ts. Supplied host/worktree/title/ranking projections, simple subscription updates and result-array identity alarms are retired. No actual activation or navigation occurred in that suite. No equivalent replacement coverage or fresh Cmd-J gate validation is claimed. Historical receipts remain scoped to their original selectors. Audit1433 narrows worktree-checks-review-index.test.ts to same-ID local/SSH object-key review isolation. Local provider/cache lookup, GitLab preference, suppression/legacy fallback, explicit-PR authority, physical-versus-runtime review isolation, and branchless-workspace alarms are intentionally removed. No equivalent replacement coverage is claimed. Historical receipts and commands remain unchanged and do not certify the reduced source. Historical coverage account: Audit1396 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audit1308 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Deterministic candidate-builder contracts inject local and paired-runtime worktrees with the same bare id into the real aggregated tab buckets, including folder workspaces and a paired runtime transporting an SSH-owned worktree. A mirror contract preserves distinct same-id runtime tabs. A paired Electron journey verifies both visible browser rows and both visible simulator rows, then requires each selection to render its owning active tab and update backing host-qualified state. The test-value audit narrowed simulator-palette-search.test.ts to the recency tie, same-id host isolation, ambiguous legacy host rejection and oversized-input getter tripwire. Supplied timestamp, empty-query context ordering, host projection, alias/range, metadata matching, active-tab score, over-token/whitespace and malformed display-name fallback examples were removed. Their separate alarms are lost; retained candidate and activation contracts do not establish equivalent coverage. Historical run commands and results remain historical. The audit also removed the standalone workspace-tab-palette-search suite: supplied row, title, metadata, alias, range, ranking and ownership examples no longer provide their separate alarms. Other retained contracts are not replacement coverage. The mirror-identity fixture now retains same-id sibling-runtime isolation and the repeated-frame subscriber tripwire only. Supplied field, owner, alias and mapping examples are removed; their separate alarms are lost. The retained sibling-runtime case is not equivalent coverage for them. The test-value audit removed tabs-open-close-lifecycle host-stamping examples and ordinary tab/group operations from tabs-pane-layout-operations. Local-null, explicit-runtime and SSH-without-active-host stamp assertions are lost; retained mobile/MRU and subscriber/atomic split cases do not replace them. Candidate and live Cmd-J evidence retains its own scope. Historical commands, outcomes and narratives remain historical. Audit1308: src/renderer/src/lib/browser-palette-search.test.ts removed. Browser-palette token and pasted-query size-guard work alarms disappear. No equivalent replacement coverage is claimed. Audit1386: src/renderer/src/lib/open-mobile-emulator-tab.test.ts reduced. Duplicate attach count and null-tab creation retry/guard reset standalone alarms removed; no simulator device used. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1396: src/renderer/src/lib/simulator-palette-search.test.ts reduced. Lose simulator-specific lastFocusedAt tie-order alarm; identity/routing and pre-scan size fence remain. No native simulator or real remote launch claim. No equivalent replacement coverage is claimed. Audit1402: src/renderer/src/runtime/web-session-tabs-sync-mirror-identity.test.ts reduced. Loses repeated no-op frame store-notification budget; independent cross-runtime resource preservation remains. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result.", "motivatingLinks": [ "https://linear.app/stably/issue/STA-4965", "https://github.com/stablyai/orca/pull/15371" ], "invariant": "Candidate identity is the tuple of execution-host identity and worktree identity: same-id sibling hosts retain separate correct browser, simulator, and workspace tabs, each tab appears exactly once, and selection activates its owning host.", - "oracle": "Audit2266 current retained source checks only that scoped open-tab search rejects hostless legacy browser, simulator and workspace tabs when a hidden same-ID sibling host remains in the ownership catalog. Reduced selectors require fresh validation; existing historical receipts do not validate the changed source. Prior oracle account: Existing exact unchanged-selector receipts remain the only current execution evidence. Changed source selectors have no fresh execution result. Historical prior-source oracle account: The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): Existing exact unchanged-selector receipts remain the only current execution evidence. Changed source selectors have no fresh execution result. Historical prior-source oracle account: The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): Aggregate two hosts' tabs under one intentionally colliding worktree id, stamp each unified tab with its execution host, and require exactly one candidate per owner. Repeat with an SSH physical owner transported by a paired-runtime alias. Independently require each browser and simulator Cmd-J selection to update activeWorkspaceExecutionHostId plus its owning workspace/group and render the selected tab active. Ambiguous legacy tabs without ownership fail closed.", + "oracle": "Audit2697 browser source review (metadata followup2702): Reduce src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts by four authored/expanded cases without replacement. The remaining three cases preserve only their existing same-ID execution-host separation, absent stamped-owner refusal and ambiguous legacy-bucket refusal scope. Intentionally lose duplicate backing-tab-ID suppression, multiple unified-browser claims of one workspace, foreign-worktree unified-tab rejection, and the 1000-workspace output/internal getter-read budget alarm. These are real removed alarms; the retained host cases are not equivalent replacements. Current test-value policy rejects internal getter/read budgets; no replacement performance or measured-cost claim is made. Keep existing nonempty selectors and the retained same-ID browser assertionRef. No fresh gate execution or reduced-source validation is supplied; dated receipts, results, commands and historical coverage accounts remain within their original source scope. No live browser activation, physical provider, mixed-version execution, mobile, native UI, platform hardware, soak or timing result is added. Prior coverage account (preserved verbatim): Audit2266 current retained source checks only that scoped open-tab search rejects hostless legacy browser, simulator and workspace tabs when a hidden same-ID sibling host remains in the ownership catalog. Reduced selectors require fresh validation; existing historical receipts do not validate the changed source. Prior oracle account: Existing exact unchanged-selector receipts remain the only current execution evidence. Changed source selectors have no fresh execution result. Historical prior-source oracle account: The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): Existing exact unchanged-selector receipts remain the only current execution evidence. Changed source selectors have no fresh execution result. Historical prior-source oracle account: The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): Aggregate two hosts' tabs under one intentionally colliding worktree id, stamp each unified tab with its execution host, and require exactly one candidate per owner. Repeat with an SSH physical owner transported by a paired-runtime alias. Independently require each browser and simulator Cmd-J selection to update activeWorkspaceExecutionHostId plus its owning workspace/group and render the selected tab active. Ambiguous legacy tabs without ownership fail closed.", "commands": [ "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/cmd-j/worktree-checks-review-index.test.ts", "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/worktree-jump/WorktreeJumpPalette.test.tsx", @@ -2570,6 +2571,7 @@ "Add a live paired-runtime-over-SSH journey when the E2E harness can provision that combined topology." ], "knownGaps": [ + "Audit2697/2702 intentional palette coverage losses: 'omits a browser row whose backing tab id is duplicated': Remove malformed duplicate unified-tab-ID fixture and its empty result. Real duplicate-ID suppression alarm is lost; this narrow private inventory has no palette selection or activation flow. 'omits a workspace claimed by more than one unified browser tab': Remove two unified browser claims of one workspace. Real first-indexed-foreign-versus-later-owned collision rejection alarm is lost; same-host and ambiguous legacy cases do not replace it. 'omits a workspace whose single unified browser tab is not owned by this worktree': Remove one unique workspace backed by foreign-worktree unified tab fixture. Real foreign-tab/worktree rejection alarm is lost; stamped host tests are not equivalent to foreign worktree mismatch. 'indexes workspace tabs when building a large browser palette': Remove internal getter read budget over1000workspaces: current main policy explicitly rejects getter/Proxy/read counts and says performance changes get correctness tests only. Loses direct quadratic-indexing cost alarm and positive1000workspace output check; no equivalent replacement claimed. The same source review also deletes browser-link-profile-isolation.test.ts (two authored/five expanded) and removes two HTTP-routing declarations (three expanded). Exact tracked-tree filename/case search finds no active gate selector/assertionRef for those navigation sources; their local profile isolation/reuse, deferred minted-profile privacy/lifetime, foreground view/group projection and contextless must-create-page alarms still disappear without replacement. This palette gate is not credited with coverage of those unrelated navigation cases. Historical shard timings are retained unchanged. Audit2697 browser source review (metadata followup2702): Reduce src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts by four authored/expanded cases without replacement. The remaining three cases preserve only their existing same-ID execution-host separation, absent stamped-owner refusal and ambiguous legacy-bucket refusal scope. Intentionally lose duplicate backing-tab-ID suppression, multiple unified-browser claims of one workspace, foreign-worktree unified-tab rejection, and the 1000-workspace output/internal getter-read budget alarm. These are real removed alarms; the retained host cases are not equivalent replacements. Current test-value policy rejects internal getter/read budgets; no replacement performance or measured-cost claim is made. Keep existing nonempty selectors and the retained same-ID browser assertionRef. No fresh gate execution or reduced-source validation is supplied; dated receipts, results, commands and historical coverage accounts remain within their original source scope. No live browser activation, physical provider, mixed-version execution, mobile, native UI, platform hardware, soak or timing result is added.", "Live Linux, Windows, and paired-runtime-over-SSH journeys are not collected; the SSH/runtime dual-owner topology is deterministic renderer coverage.", "The paired Electron simulator path seeds renderer state because remote web clients cannot launch a native emulator.", "The paired Electron journey proves a real host mirror stamp before injecting the same-id sibling state; it does not create the collision through the wire.", @@ -7371,7 +7373,7 @@ "providers": ["local", "daemon", "ssh", "wsl", "remote-runtime"], "coveredPlatforms": ["macos"], "coveredProviders": ["local", "daemon", "ssh", "wsl", "remote-runtime"], - "coverageNotes": "Audit2709 removes src/renderer/src/runtime/web-session-tabs-sync/inventory/remote-runtime-session-tabs-inflight.test.ts: intentionally retire waiting out an older inventory and sharing a fresh post-operation request among concurrent callers. No equivalent replacement or fresh execution is claimed. Dated receipts remain historical evidence for their unchanged selectors only; they do not validate the reduced commands or full current gate. Historical prior account (preserved verbatim): Audit2133 current-parent preparation: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2095 current-parent preparation2126: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2090 (sources2088/2089): Current reduced suites intentionally retire the alarms listed in knownGaps; prior dated execution and replacement claims do not validate changed source bytes or selectors. Historical prior account (preserved verbatim): Audit2086 (sources2082/2083): Current reduced suites intentionally retire the alarms listed in knownGaps; prior dated execution and replacement claims do not validate changed source bytes or selectors. Historical prior account (preserved verbatim): Audit2076 (sources2073/2074): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime-tests/terminal-handles-part-02.spec.ts: recovers a moved SSH pane through the tab it now sits in, not the one its lease froze; reports a plain expired orphan; does not report a pane whose only recent lease was superseded; does not report a pane whose only recent lease had its relay id recycled; picks the eligible orphan over a superseded predecessor that matches first; collects the same tabs the per-tab reader reports, in one sweep of the leases; reports no candidate when no lease names any of the worktree tabs. src/main/runtime/orca-runtime-tests/runtime-availability.spec.ts: starts unavailable with no authoritative window; reports the configured Windows terminal shell on status; reports floating workspace availability from settings on status; polls floating tabs with targeted PTY liveness and no repo/provider inventory; hydrates persisted tabs when the store cannot report repos; advertises browser screencast only when a renderer window is available; routes mobile Codex reset consumption through the account mutation coordinator; maps a definite pre-provider rejection into an authoritative current snapshot. Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Frozen current literal-import graph reaches these changed test bytes; unresolved local and computed edges remain debt, and current reachability is not historical execution or equivalent replacement evidence. Historical prior account (preserved verbatim): Audit2003: Delete the complete pure orphan-topology suite and its file membership; preserve the other selectors from its combined command after archiving the original command string. Lost alarms are synthetic current-layout preservation, one-anchor grafting and ambiguous-anchor appending examples. Do not transfer their ownership/topology scope to sibling suites. Preserve all5 independent historical receipts exactly. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, physical provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1983: Delete the mocked agent-session suite and its prospective selector and aliases. Retire all3 whole dated changed-selector receipts, preserving their original raw objects in historical gaps without transferring counts or durations. Preserve5 unrelated receipts. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1931 (sources1928/1929): Partial agent-operation service suite retains only concurrent retry joining with changed-fingerprint conflict. Retire its complete three-title assertion object: old-owner legacy fallback before side effects, nested SSH Pi transcript refusal and completed/ambiguous physical-commit replay fences are no longer backed. Other probe/launch option/ledger/failure/remote-inventory examples disappear as detailed below. No actual provider spawn, live SSH or physical commit proof is retained by this source. Preserve meaningful remaining selectors/assertions and unchanged dated receipts within their original scope. Reduced selectors have no fresh gate execution evidence in this metadata packet. No equivalent replacement, physical watcher/PTY/provider, live SSH/remote/mobile, rendered, cross-platform, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Audit1911: The complete provider PTY-inspection mock suite is removed: missing-provider rejection, stale-PTY renderer unverifiable mapping, preserved supplied renderer failures, and supplied transport-loss mapping alarms are intentionally lost. No actual terminal teardown, daemon error or remote transport was exercised. Only the deleted explicit source tokens, testFile and whole assertionRef are removed. Meaningful remaining source selectors/assertions and unaffected dated receipts retain their original scope. No equivalent replacement, fresh reduced-gate, native/platform/provider, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Audit1627 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1623 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1495 intentionally deletes the orphan-owner suite: explicit owner/host predicate examples are retired; no equivalent replacement coverage or fresh result is claimed. Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Audit1417 intentionally deletes src/renderer/src/components/terminal-pane/agent-completion-coordinator-pending-title-inspection.test.ts: Loses obsolete pending title process races, inspection failure suppression, explicit completion precedence and delayed remote inspection alarms. No equivalent replacement coverage or fresh result is claimed. Historical coverage account: Audit1342 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audits1301 and1308 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Deterministic macOS tests cover controller claims, daemon and SSH/relay operation replay, mixed-version selection, runtime ownership, exact provisional handoff, durable terminal retirement, two independent viewer mirrors, guarded adoption of legacy live PTYs, and completion classification when either the outer remote transport or authoritative host/provider process inspection becomes unreachable. The adoption harness models v1.4.150 agent/setup/shell tabs, current-generation restart and reconnect, exact handle/incarnation/worktree/host checks, topology CAS, competing clients, split-pane/group restoration, WSL ownership, and SSH owner rejection. The secondary parity repro runs independent clients against one headless remote Orca runtime over encrypted pairing and a real daemon-backed PTY, with tokened fixture-process identity separated from unrelated Codex app-server startup probes. The automated primary topology runs an isolated headed macOS Orca desktop server plus a separate paired web client and proves viewer-local fresh/resume focus, exact legacy placement, writable PTYs, unrelated-terminal survival, and host/client cleanup. SSH coverage is provider/relay contract and fault-injection coverage only; it does not substitute for paired-server coverage. Live Windows, Linux, WSL, SSH, and physical paired-Linux hosts remain gaps. The isolated intent-owner ledger suite was removed. web-runtime-session.test.ts retains exact post-create handoff confirmation only; its previous fresh/resume presentation and publication-replay assertions are no longer current references. Those direct owner-partition, cap and RPC/focus alarms are lost; other agent-session evidence does not establish equivalence. Structured handoff and adopted-leaf focus references now point to their dedicated surviving fixtures. Mixed-version recovery retains actual old-host recovery followed by a new CLI tab; its unsupported/missing-evidence tables are removed. Orphan recovery retains in-flight adoption-conflict serialization only; previous topology/pruning and absence/adoption examples are removed. These removed projection, capability and adoption-shape alarms are lost; retained cases do not replace them. Audit1301: src/renderer/src/runtime/remote-runtime-session-tabs-inflight.test.ts reduced. Direct dedupe eviction/count and equal receipt-position sample loses authored alarm. No equivalent replacement coverage is claimed. Audit1308: src/renderer/src/runtime/web-session-tabs-sync-agent-handoff.test.ts removed. Exact provisional replacement and post-create exit confirmation handoff pipeline alarms disappear. No equivalent replacement coverage is claimed. Audit1313: src/main/runtime/terminal-orphan-topology.test.ts: Retain actual topology merge algorithms preserving disjoint subtrees and grafted/ambiguous shared anchors with independent expected trees. Remove duplicate leaf validator and empty/no-change passthrough examples. Lose basic validation and no-group/noop characterization; no renderer layout proof. Reduced selectors require fresh validation; prior full-suite receipts do not validate removed or changed coverage. No equivalent replacement or physical-provider claim. Audit1342: src/renderer/src/components/terminal-pane/pty-connection-completion-and-notification.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Audit1383: src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts reduced. Lose command-list/receipt/default/background activation matrices whose provider spawn returns canned IDs. Retained test proves actual tab allocation separation, not terminal startup. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1401: src/main/runtime/orca-runtime-tests/mobile-session-tabs-duplicate-pty-repair.spec.ts removed. Loses listing-on-already-repaired-data alarm; it never established runtime repair invocation. src/main/runtime/orca-runtime-tests/mobile-session-tabs-split-agent-tab.spec.ts removed. Loses actual mobile split sibling shell versus recorded-agent resume command alarms; no equivalent coverage asserted. src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts removed. Loses separate setup/startup tab result in that manually assembled path. src/main/runtime/orca-runtime.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result.", + "coverageNotes": "Audit2694 source-only review: Remove14 authored/14 expanded cases in the renderer completion wrapper family, including the complete bell/query-reply/stale-input factory, without replacement. Retain29 authored/34 expanded cases with unchanged callback bodies. Three removals are the existing pending2203 overlap and must be adopted/count-reconciled once; eleven are fresh removals. No current-source runtime or gate execution is supplied by this packet; dated evidence retains its original source scope and does not validate the reduced factory bytes. No equivalent replacement, physical provider, mixed-version, mobile, rendered UI, cross-platform, soak or measured-performance result is claimed. The existing command and testFiles selector retain tests/pty-connection-completion-and-notification.test.ts; no wrapper-specific assertionRef is removed. Historical selector results do not validate its changed reachable factories. Historical prior account (preserved verbatim): Audit2709 removes src/renderer/src/runtime/web-session-tabs-sync/inventory/remote-runtime-session-tabs-inflight.test.ts: intentionally retire waiting out an older inventory and sharing a fresh post-operation request among concurrent callers. No equivalent replacement or fresh execution is claimed. Dated receipts remain historical evidence for their unchanged selectors only; they do not validate the reduced commands or full current gate. Historical prior account (preserved verbatim): Audit2133 current-parent preparation: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2095 current-parent preparation2126: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2090 (sources2088/2089): Current reduced suites intentionally retire the alarms listed in knownGaps; prior dated execution and replacement claims do not validate changed source bytes or selectors. Historical prior account (preserved verbatim): Audit2086 (sources2082/2083): Current reduced suites intentionally retire the alarms listed in knownGaps; prior dated execution and replacement claims do not validate changed source bytes or selectors. Historical prior account (preserved verbatim): Audit2076 (sources2073/2074): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime-tests/terminal-handles-part-02.spec.ts: recovers a moved SSH pane through the tab it now sits in, not the one its lease froze; reports a plain expired orphan; does not report a pane whose only recent lease was superseded; does not report a pane whose only recent lease had its relay id recycled; picks the eligible orphan over a superseded predecessor that matches first; collects the same tabs the per-tab reader reports, in one sweep of the leases; reports no candidate when no lease names any of the worktree tabs. src/main/runtime/orca-runtime-tests/runtime-availability.spec.ts: starts unavailable with no authoritative window; reports the configured Windows terminal shell on status; reports floating workspace availability from settings on status; polls floating tabs with targeted PTY liveness and no repo/provider inventory; hydrates persisted tabs when the store cannot report repos; advertises browser screencast only when a renderer window is available; routes mobile Codex reset consumption through the account mutation coordinator; maps a definite pre-provider rejection into an authoritative current snapshot. Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Frozen current literal-import graph reaches these changed test bytes; unresolved local and computed edges remain debt, and current reachability is not historical execution or equivalent replacement evidence. Historical prior account (preserved verbatim): Audit2003: Delete the complete pure orphan-topology suite and its file membership; preserve the other selectors from its combined command after archiving the original command string. Lost alarms are synthetic current-layout preservation, one-anchor grafting and ambiguous-anchor appending examples. Do not transfer their ownership/topology scope to sibling suites. Preserve all5 independent historical receipts exactly. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, physical provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1983: Delete the mocked agent-session suite and its prospective selector and aliases. Retire all3 whole dated changed-selector receipts, preserving their original raw objects in historical gaps without transferring counts or durations. Preserve5 unrelated receipts. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1931 (sources1928/1929): Partial agent-operation service suite retains only concurrent retry joining with changed-fingerprint conflict. Retire its complete three-title assertion object: old-owner legacy fallback before side effects, nested SSH Pi transcript refusal and completed/ambiguous physical-commit replay fences are no longer backed. Other probe/launch option/ledger/failure/remote-inventory examples disappear as detailed below. No actual provider spawn, live SSH or physical commit proof is retained by this source. Preserve meaningful remaining selectors/assertions and unchanged dated receipts within their original scope. Reduced selectors have no fresh gate execution evidence in this metadata packet. No equivalent replacement, physical watcher/PTY/provider, live SSH/remote/mobile, rendered, cross-platform, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Audit1911: The complete provider PTY-inspection mock suite is removed: missing-provider rejection, stale-PTY renderer unverifiable mapping, preserved supplied renderer failures, and supplied transport-loss mapping alarms are intentionally lost. No actual terminal teardown, daemon error or remote transport was exercised. Only the deleted explicit source tokens, testFile and whole assertionRef are removed. Meaningful remaining source selectors/assertions and unaffected dated receipts retain their original scope. No equivalent replacement, fresh reduced-gate, native/platform/provider, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Audit1627 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1623 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1495 intentionally deletes the orphan-owner suite: explicit owner/host predicate examples are retired; no equivalent replacement coverage or fresh result is claimed. Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Audit1417 intentionally deletes src/renderer/src/components/terminal-pane/agent-completion-coordinator-pending-title-inspection.test.ts: Loses obsolete pending title process races, inspection failure suppression, explicit completion precedence and delayed remote inspection alarms. No equivalent replacement coverage or fresh result is claimed. Historical coverage account: Audit1342 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audits1301 and1308 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Deterministic macOS tests cover controller claims, daemon and SSH/relay operation replay, mixed-version selection, runtime ownership, exact provisional handoff, durable terminal retirement, two independent viewer mirrors, guarded adoption of legacy live PTYs, and completion classification when either the outer remote transport or authoritative host/provider process inspection becomes unreachable. The adoption harness models v1.4.150 agent/setup/shell tabs, current-generation restart and reconnect, exact handle/incarnation/worktree/host checks, topology CAS, competing clients, split-pane/group restoration, WSL ownership, and SSH owner rejection. The secondary parity repro runs independent clients against one headless remote Orca runtime over encrypted pairing and a real daemon-backed PTY, with tokened fixture-process identity separated from unrelated Codex app-server startup probes. The automated primary topology runs an isolated headed macOS Orca desktop server plus a separate paired web client and proves viewer-local fresh/resume focus, exact legacy placement, writable PTYs, unrelated-terminal survival, and host/client cleanup. SSH coverage is provider/relay contract and fault-injection coverage only; it does not substitute for paired-server coverage. Live Windows, Linux, WSL, SSH, and physical paired-Linux hosts remain gaps. The isolated intent-owner ledger suite was removed. web-runtime-session.test.ts retains exact post-create handoff confirmation only; its previous fresh/resume presentation and publication-replay assertions are no longer current references. Those direct owner-partition, cap and RPC/focus alarms are lost; other agent-session evidence does not establish equivalence. Structured handoff and adopted-leaf focus references now point to their dedicated surviving fixtures. Mixed-version recovery retains actual old-host recovery followed by a new CLI tab; its unsupported/missing-evidence tables are removed. Orphan recovery retains in-flight adoption-conflict serialization only; previous topology/pruning and absence/adoption examples are removed. These removed projection, capability and adoption-shape alarms are lost; retained cases do not replace them. Audit1301: src/renderer/src/runtime/remote-runtime-session-tabs-inflight.test.ts reduced. Direct dedupe eviction/count and equal receipt-position sample loses authored alarm. No equivalent replacement coverage is claimed. Audit1308: src/renderer/src/runtime/web-session-tabs-sync-agent-handoff.test.ts removed. Exact provisional replacement and post-create exit confirmation handoff pipeline alarms disappear. No equivalent replacement coverage is claimed. Audit1313: src/main/runtime/terminal-orphan-topology.test.ts: Retain actual topology merge algorithms preserving disjoint subtrees and grafted/ambiguous shared anchors with independent expected trees. Remove duplicate leaf validator and empty/no-change passthrough examples. Lose basic validation and no-group/noop characterization; no renderer layout proof. Reduced selectors require fresh validation; prior full-suite receipts do not validate removed or changed coverage. No equivalent replacement or physical-provider claim. Audit1342: src/renderer/src/components/terminal-pane/pty-connection-completion-and-notification.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Audit1383: src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts reduced. Lose command-list/receipt/default/background activation matrices whose provider spawn returns canned IDs. Retained test proves actual tab allocation separation, not terminal startup. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1401: src/main/runtime/orca-runtime-tests/mobile-session-tabs-duplicate-pty-repair.spec.ts removed. Loses listing-on-already-repaired-data alarm; it never established runtime repair invocation. src/main/runtime/orca-runtime-tests/mobile-session-tabs-split-agent-tab.spec.ts removed. Loses actual mobile split sibling shell versus recorded-agent resume command alarms; no equivalent coverage asserted. src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts removed. Loses separate setup/startup tab result in that manually assembled path. src/main/runtime/orca-runtime.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result.", "motivatingLinks": [ "https://github.com/stablyai/orca/issues/8878", "https://github.com/stablyai/orca/issues/9151", @@ -7381,7 +7383,7 @@ "https://github.com/stablyai/orca/pull/10193" ], "invariant": "For every claim-capable execution route, one provider-session identity has at most one live PTY owner and one canonical host surface across concurrent clients, retries, reconnects, and stale publications. For paired structured fresh and resume requests, the authenticated owning runtime creates in background without a renderer window; activate=true focuses the exact requested leaf only on the requesting viewer, while activate=false changes no viewer focus. A live orphan may be adopted only when the controller proves its exact handle and incarnation, its worktree and host owner match, no competing visual owner exists, and a host topology CAS wins. A viewer may classify completion only from successful host/provider inspection or explicit lifecycle evidence; transport, handle, or provider unavailability remains unknown and breaks any consecutive-idle proof. A physical exit retires that exact incarnation durably so stale client state and host restart cannot recreate it. Mixed-version routes select the unchanged legacy request before any authority side effect or execution-owner-local filesystem access.", - "oracle": "Audit2133 current-parent preparation: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2095 current-parent preparation2126: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2090 (sources2088/2089): Current reduced suites intentionally retire the alarms listed in knownGaps; prior dated execution and replacement claims do not validate changed source bytes or selectors. Historical prior account (preserved verbatim): Audit2086 (sources2082/2083): Current reduced suites intentionally retire the alarms listed in knownGaps; prior dated execution and replacement claims do not validate changed source bytes or selectors. Historical prior account (preserved verbatim): Audit2076 (sources2073/2074): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime-tests/terminal-handles-part-02.spec.ts: recovers a moved SSH pane through the tab it now sits in, not the one its lease froze; reports a plain expired orphan; does not report a pane whose only recent lease was superseded; does not report a pane whose only recent lease had its relay id recycled; picks the eligible orphan over a superseded predecessor that matches first; collects the same tabs the per-tab reader reports, in one sweep of the leases; reports no candidate when no lease names any of the worktree tabs. src/main/runtime/orca-runtime-tests/runtime-availability.spec.ts: starts unavailable with no authoritative window; reports the configured Windows terminal shell on status; reports floating workspace availability from settings on status; polls floating tabs with targeted PTY liveness and no repo/provider inventory; hydrates persisted tabs when the store cannot report repos; advertises browser screencast only when a renderer window is available; routes mobile Codex reset consumption through the account mutation coordinator; maps a definite pre-provider rejection into an authoritative current snapshot. Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Frozen current literal-import graph reaches these changed test bytes; unresolved local and computed edges remain debt, and current reachability is not historical execution or equivalent replacement evidence. Historical prior account (preserved verbatim): Audit2003: Delete the complete pure orphan-topology suite and its file membership; preserve the other selectors from its combined command after archiving the original command string. Lost alarms are synthetic current-layout preservation, one-anchor grafting and ambiguous-anchor appending examples. Do not transfer their ownership/topology scope to sibling suites. Preserve all5 independent historical receipts exactly. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, physical provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1983: Delete the mocked agent-session suite and its prospective selector and aliases. Retire all3 whole dated changed-selector receipts, preserving their original raw objects in historical gaps without transferring counts or durations. Preserve5 unrelated receipts. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1931 (sources1928/1929): Partial agent-operation service suite retains only concurrent retry joining with changed-fingerprint conflict. Retire its complete three-title assertion object: old-owner legacy fallback before side effects, nested SSH Pi transcript refusal and completed/ambiguous physical-commit replay fences are no longer backed. Other probe/launch option/ledger/failure/remote-inventory examples disappear as detailed below. No actual provider spawn, live SSH or physical commit proof is retained by this source. Preserve meaningful remaining selectors/assertions and unchanged dated receipts within their original scope. Reduced selectors have no fresh gate execution evidence in this metadata packet. No equivalent replacement, physical watcher/PTY/provider, live SSH/remote/mobile, rendered, cross-platform, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Audit1911: The complete provider PTY-inspection mock suite is removed: missing-provider rejection, stale-PTY renderer unverifiable mapping, preserved supplied renderer failures, and supplied transport-loss mapping alarms are intentionally lost. No actual terminal teardown, daemon error or remote transport was exercised. Only the deleted explicit source tokens, testFile and whole assertionRef are removed. Meaningful remaining source selectors/assertions and unaffected dated receipts retain their original scope. No equivalent replacement, fresh reduced-gate, native/platform/provider, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Historical pre-audit oracle account for changed sources: Existing exact unchanged-selector receipts remain the only current execution evidence. Changed source selectors have no fresh execution result. Historical prior-source oracle account: The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): Race independent clients and repeated operation IDs, then assert one physical spawn and one canonical PTY/surface; inject exit-before-reply, provider disconnect, conflicting claim scope, old daemon/relay capabilities, reused handles, stale incarnations, owner mismatch, and topology revision conflict; assert safe adoption or explicit failure without a second spawn or wrong-process attachment. Run fresh/resume with activate true/false against an isolated headed desktop host and a separate paired client, then against isolated headless serve: assert host presentation stays background, only the requesting viewer focuses the exact leaf, inactive calls preserve client/DOM focus, a same-version publication replay cannot lose focus intent, and sibling-first split publication cannot consume exact-leaf intent. Restore legacy split panes and groups beside a newer host-owned tab, preserving exact predecessor/new/successor order, output, input, resize, titles, tab/leaf identity, active group, and multi-client convergence. For completion, drive a known running agent through outer transport loss, authoritative provider rejection, reconnect, explicit stop, real exit status, and successful hook completion; assert unavailable evidence never dispatches completion and two fresh authoritative idle samples are required after the gap. After exact exit, assert terminal and tab listings omit the surface, a stale publication cannot restore it, restart cannot resurrect it, exact tokened fixture PIDs are dead, and unrelated tabs/processes survive until scoped cleanup.", + "oracle": "Audit2694 source-only review: Remove14 authored/14 expanded cases in the renderer completion wrapper family, including the complete bell/query-reply/stale-input factory, without replacement. Retain29 authored/34 expanded cases with unchanged callback bodies. Three removals are the existing pending2203 overlap and must be adopted/count-reconciled once; eleven are fresh removals. No current-source runtime or gate execution is supplied by this packet; dated evidence retains its original source scope and does not validate the reduced factory bytes. No equivalent replacement, physical provider, mixed-version, mobile, rendered UI, cross-platform, soak or measured-performance result is claimed. The existing command and testFiles selector retain tests/pty-connection-completion-and-notification.test.ts; no wrapper-specific assertionRef is removed. Historical selector results do not validate its changed reachable factories. Historical prior account (preserved verbatim): Audit2133 current-parent preparation: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2095 current-parent preparation2126: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2090 (sources2088/2089): Current reduced suites intentionally retire the alarms listed in knownGaps; prior dated execution and replacement claims do not validate changed source bytes or selectors. Historical prior account (preserved verbatim): Audit2086 (sources2082/2083): Current reduced suites intentionally retire the alarms listed in knownGaps; prior dated execution and replacement claims do not validate changed source bytes or selectors. Historical prior account (preserved verbatim): Audit2076 (sources2073/2074): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime-tests/terminal-handles-part-02.spec.ts: recovers a moved SSH pane through the tab it now sits in, not the one its lease froze; reports a plain expired orphan; does not report a pane whose only recent lease was superseded; does not report a pane whose only recent lease had its relay id recycled; picks the eligible orphan over a superseded predecessor that matches first; collects the same tabs the per-tab reader reports, in one sweep of the leases; reports no candidate when no lease names any of the worktree tabs. src/main/runtime/orca-runtime-tests/runtime-availability.spec.ts: starts unavailable with no authoritative window; reports the configured Windows terminal shell on status; reports floating workspace availability from settings on status; polls floating tabs with targeted PTY liveness and no repo/provider inventory; hydrates persisted tabs when the store cannot report repos; advertises browser screencast only when a renderer window is available; routes mobile Codex reset consumption through the account mutation coordinator; maps a definite pre-provider rejection into an authoritative current snapshot. Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Frozen current literal-import graph reaches these changed test bytes; unresolved local and computed edges remain debt, and current reachability is not historical execution or equivalent replacement evidence. Historical prior account (preserved verbatim): Audit2003: Delete the complete pure orphan-topology suite and its file membership; preserve the other selectors from its combined command after archiving the original command string. Lost alarms are synthetic current-layout preservation, one-anchor grafting and ambiguous-anchor appending examples. Do not transfer their ownership/topology scope to sibling suites. Preserve all5 independent historical receipts exactly. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, physical provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1983: Delete the mocked agent-session suite and its prospective selector and aliases. Retire all3 whole dated changed-selector receipts, preserving their original raw objects in historical gaps without transferring counts or durations. Preserve5 unrelated receipts. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1931 (sources1928/1929): Partial agent-operation service suite retains only concurrent retry joining with changed-fingerprint conflict. Retire its complete three-title assertion object: old-owner legacy fallback before side effects, nested SSH Pi transcript refusal and completed/ambiguous physical-commit replay fences are no longer backed. Other probe/launch option/ledger/failure/remote-inventory examples disappear as detailed below. No actual provider spawn, live SSH or physical commit proof is retained by this source. Preserve meaningful remaining selectors/assertions and unchanged dated receipts within their original scope. Reduced selectors have no fresh gate execution evidence in this metadata packet. No equivalent replacement, physical watcher/PTY/provider, live SSH/remote/mobile, rendered, cross-platform, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Audit1911: The complete provider PTY-inspection mock suite is removed: missing-provider rejection, stale-PTY renderer unverifiable mapping, preserved supplied renderer failures, and supplied transport-loss mapping alarms are intentionally lost. No actual terminal teardown, daemon error or remote transport was exercised. Only the deleted explicit source tokens, testFile and whole assertionRef are removed. Meaningful remaining source selectors/assertions and unaffected dated receipts retain their original scope. No equivalent replacement, fresh reduced-gate, native/platform/provider, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Historical pre-audit oracle account for changed sources: Existing exact unchanged-selector receipts remain the only current execution evidence. Changed source selectors have no fresh execution result. Historical prior-source oracle account: The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): Race independent clients and repeated operation IDs, then assert one physical spawn and one canonical PTY/surface; inject exit-before-reply, provider disconnect, conflicting claim scope, old daemon/relay capabilities, reused handles, stale incarnations, owner mismatch, and topology revision conflict; assert safe adoption or explicit failure without a second spawn or wrong-process attachment. Run fresh/resume with activate true/false against an isolated headed desktop host and a separate paired client, then against isolated headless serve: assert host presentation stays background, only the requesting viewer focuses the exact leaf, inactive calls preserve client/DOM focus, a same-version publication replay cannot lose focus intent, and sibling-first split publication cannot consume exact-leaf intent. Restore legacy split panes and groups beside a newer host-owned tab, preserving exact predecessor/new/successor order, output, input, resize, titles, tab/leaf identity, active group, and multi-client convergence. For completion, drive a known running agent through outer transport loss, authoritative provider rejection, reconnect, explicit stop, real exit status, and successful hook completion; assert unavailable evidence never dispatches completion and two fresh authoritative idle samples are required after the gap. After exact exit, assert terminal and tab listings omit the surface, a stale publication cannot restore it, restart cannot resurrect it, exact tokened fixture PIDs are dead, and unrelated tabs/processes survive until scoped cleanup.", "commands": [ "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/runtime/web-session-tabs-sync/inventory/web-runtime-session.test.ts src/renderer/src/runtime/web-session-tabs-sync/navigation/web-session-tabs-sync-focus-intent.test.ts", "pnpm exec vitest run --config config/vitest.config.ts src/shared/claimed-agent-pty-owner.test.ts src/main/daemon/providers/adapter/testing/daemon-pty-adapter.test.ts src/main/runtime/session-construction/agent-session/orca-runtime-agent-session-operation.test.ts src/main/runtime/session-construction/agent-session/remote-agent-session-host-authority.integration.test.ts src/main/runtime/terminal/surface/orca-runtime-terminal-retirement.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-session-launch.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-handoff.test.ts src/renderer/src/runtime/web-session-tabs-sync/inventory/web-runtime-session.test.ts", @@ -7592,6 +7594,7 @@ "Add live SSH/WSL provider evidence before claiming full provider coverage; Docker SSH proves only the SSH provider/relay path." ], "knownGaps": [ + "Audit2694 intentional coverage losses (source-only, no replacement): src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-command-finished-interrupt-arbitration.spec.ts: 'drops the command-finished status when pending interrupt inference is rejected': Loses the standalone rejected-inference-to-drop alarm; the delayed-write rows remain but are not equivalent to this immediate rejection example. src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-bell-query-reply-and-stale-input.spec.ts: 'forwards raw onData after a bell as a query reply': Loses raw onData forwarding after the manually raised bell, including its hibernation-counter expectations. src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-bell-query-reply-and-stale-input.spec.ts: 'blocks onData on a stale codex pane': The real isCodexPaneStale guard executes, and removing it would allow the typed a to reach transport. Intentionally loses this genuine stale-account typing refusal alarm. No retained query-reply test is claimed equivalent. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts: 'omits byte-parser callbacks from the local transport options': Loses local main-authority callback omission and lifecycle callback presence checks. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts: 'keeps byte-parser callbacks on remote-runtime transports': Loses remote-runtime parser callback preservation and factory-argument alarm, including this compatibility boundary; no mixed-version execution is covered. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts: 'consumes pty:sideEffect facts with the live-path policy after spawn': Loses title/bell fact routing and exact 250ms delayed fake notification example. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts: 'schedules the completion notification for genuine working→idle facts': Loses positive main-fact working-to-idle scheduling alarm. Retained stale/race cases do not replace this positive example. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts: 'drops the agent status from a command-finished fact like the byte path did': Loses command-finished fact-to-drop routing and removeAgentStatus noncall alarm. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts: 'routes pr-link facts to the worktree PR observer': Loses PR-link fact forwarding, worktree/tab/PTY arguments alarm; retained raw-byte nonconsumption is not equivalent. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts: 'seeds and settles Command Code status from command-code facts': Real Command Code seed/settle policy runs. Loses positive seed, prompt payload, and 1499+1ms completion boundary alarm; retained newer-working cancellation is not equivalent. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts: 'does not byte-scan Command Code output — facts are the only consumer': Loses Command Code-specific no-byte-parser alarm. Retained PR/OSC raw-byte exclusion does not cover this parser. src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-notification-settings-gating.spec.ts: 'shares one raw store subscriber for agent-complete notification settings across panes': Actual shared subscribe/unsubscribe runs. Loses shared single-subscription and final-pane unsubscribe lifetime alarm, with no replacement claimed. src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-task-complete-dispatch.spec.ts: 'dispatches agent-task-complete for generic Codex spinner titles after process identity is confirmed': Real coordinator evidence path runs over fake process answers. Loses positive generic-title/confirmed-Codex completion and inspectProcess-argument alarm. src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-task-complete-dispatch.spec.ts: 'normalizes Pi-compatible remote titles to authoritative OMP launch identity': Real owner-compatible normalization runs. Loses Pi-to-OMP title/status normalization, active tab label, OSC observation, and retained launch-identity example; no real remote transport or equivalent replacement. Wrapper cleanup removes only the deleted bell factory import and its registration-only describe block; no additional authored removal credit. Audit2694 source-only review: Remove14 authored/14 expanded cases in the renderer completion wrapper family, including the complete bell/query-reply/stale-input factory, without replacement. Retain29 authored/34 expanded cases with unchanged callback bodies. Three removals are the existing pending2203 overlap and must be adopted/count-reconciled once; eleven are fresh removals. No current-source runtime or gate execution is supplied by this packet; dated evidence retains its original source scope and does not validate the reduced factory bytes. No equivalent replacement, physical provider, mixed-version, mobile, rendered UI, cross-platform, soak or measured-performance result is claimed. The existing command and testFiles selector retain tests/pty-connection-completion-and-notification.test.ts; no wrapper-specific assertionRef is removed. Historical selector results do not validate its changed reachable factories.", "Audit2145 accepts removal of canned runtime metadata/guard/forwarding, fake in-memory persistence, private work-count and wrapper-duplication tests from the construction/orca-runtime.test.ts aggregate, plus the two automation run-context guards from runtime-workspace-launch-contracts.test.ts. Retained race, framing, physical completion and ownership callbacks remain byte-identical. Existing commands remain valid selectors; historical receipts stay unchanged and provide no fresh validation or replacement coverage for the reduced suites.", "Audit2133 current-parent preparation (988 authored removals; independently reviewed2099/2107/2115/2116 decisions; upstream clear-buffer and recovery-image regressions retained): Intentionally retire these low-value alarms without replacement: src/main/runtime/construction/orca-runtime.test.ts: remove only literal registration import/call pairs await import('../orca-runtime-tests/worktree-setup-and-startup.spec'), await import('../orca-runtime-tests/gitlab-and-pr-bases.spec'); no additional authored credit. src/main/runtime/orca-runtime-tests/targeting-and-resilience.spec.ts: routes tab switch and capture start by explicit page id; accepts focus on tab switch without altering bridge args (focus is main-side concern); keeps terminal cwd resolution fail-soft when the provider is unavailable. src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-04.spec.ts: drops the bounded scan cache when orphan-cleanup removal completes; clears optimistic reconcile tokens when a CLI worktree removal succeeds; emits drift without mutating when the fetched base fast-forwards created HEAD; emits base_changed without mutation when the fetched base rewrote history; skips stale-token reconciles without mutating or emitting stale status; emits unknown without mutation when fetch fails or the base ref is missing. src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-03.spec.ts: routes runtime preserved-branch force-delete through the selected WSL project runtime; replies to a waiting client with the error of a delete that fails after acceptance; treats forced runtime deletion of an already-missing unregistered worktree as cleanup; treats normal runtime deletion of an already-missing unregistered worktree as cleanup. src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-02.spec.ts: warns that a missing-repo removal only forgot the workspace; restores runtime watchers when CLI worktree deletion fails after teardown; does not re-spend the drain budget on a removal after a wedged install was abandoned; routes runtime worktree removal through the selected WSL project runtime; force-deletes a branch that was preserved by runtime worktree removal. src/main/runtime/orca-runtime-tests/gitlab-and-pr-bases-part-02.spec.ts: records GitLab pasted-project recents only after successful runtime lookup; threads explicit origin preference through runtime WSL PR base resolution; resolves local GitLab fork MR bases from the target project MR head ref; captures the fork MR head from a dedicated ref, not the shared FETCH_HEAD; keeps the durable MR head when the head fetch fails but the local ref resolves; routes runtime GitLab fork MR base git calls through the selected WSL project runtime. src/main/runtime/orca-runtime-tests/gitlab-and-pr-bases.spec.ts: passes SSH connection ids through GitLab task operations; routes runtime GitLab issue, MR, work-item, and todo actions through the selected WSL project runtime; routes runtime GitLab MR details, review-management, job, and pasted URL actions through the selected WSL project runtime; normalizes runtime GitLab issue list arguments like the desktop IPC path. src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-03.spec.ts: does not warn when setup is explicitly skipped for CLI-created worktrees; puts the agent a create starts in the first default tab, as the window does; keeps the 8s main-runtime startup readiness budget for agents without an override; gives OpenCode the 20s main-runtime startup readiness budget; launches explicit startup agents with prompts for CLI-created worktrees. src/main/runtime/orca-runtime-tests/worktree-setup-and-startup.spec.ts: returns a setup launch payload for CLI-created worktrees when hooks are explicitly enabled; does not hand the window a setup main never tried to start; passes the selected Windows setup shell into runtime runner generation; follows normal setup policy for CLI-created worktrees without activating them; uses returned WSL setup shell metadata when runtime spawns setup; uses the shell-aware setup runner for windowless creates without a startup command; reports the in-process setup hook as running when nothing can launch the runner. src/main/runtime/orca-runtime-tests/terminal-sleep-and-teardown-part-02.spec.ts: coalesces two clients sleeping the same host worktree; stops exactly the expected live PTYs for a worktree; explains a refused workspace close instead of throwing the raw refusal enum. src/main/runtime/orca-runtime-tests/mobile-summaries-part-03.spec.ts: marks the desktop-active worktree as isActive; includes SSH-backed worktrees in the mobile worktree summary; caches repeated malformed path misses before normalizing them again. src/main/runtime/orca-runtime-tests/mobile-summaries-part-02.spec.ts: keeps title-only foreground work ahead of monitoring in another pane; keeps a local hook row while a connected PTY still backs its pane; keeps an OSC row via its connected PTY after the pane binding is cleared. src/main/runtime/orca-runtime-tests/mobile-summaries.spec.ts: resolves files through a source-visible linked-checkout worktree; marks saved session tabs with live PTYs as host sidebar activity; attributes live legacy PTYs from saved layout bindings when their panes are hidden; marks saved browser tabs as host sidebar activity like desktop; falls back to the path-keyed GitHub cache entry; includes folder workspaces in compact worktree summaries for mobile; attaches inline agent rows from the latest OSC 9999 status; projects monitoring over a title-derived working status. src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-03.spec.ts: pushes to an idle pane when the only live waiter filters out the message type; resolves a registered waiter without PTY-injecting when the leaf is already idle; keeps already-idle status after tui-idle wait for immediate message delivery; resolves message waiters when notifyMessageArrived is called; does not resolve type-filtered message waiters for unrelated message types; removes message waiter abort listeners after message arrival; resolves message waiters on timeout when no message arrives. src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-02.spec.ts: delivers pending mail via notifyMessageArrived when the recipient is already idle; does not keep retrying when every pending row was already pointed; repoints pending rows restored with a live-idle coordinator. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-13.spec.ts: rolls back a half-created terminal whose surface never publishes. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-12.spec.ts: rejects startup prompts for agents that require post-ready stdin; uses portable Unix quoting for mobile agent launch commands in WSL project runtimes; keeps PowerShell quoting for mobile agent launch commands in Windows host runtimes; uses cmd.exe quoting for mobile agent launch commands in local Windows host runtimes; publishes headless mobile session agent identity with synthesized PTY status; rejects disabled mobile session agent launches before spawning; validates mobile terminal insertion anchors before resolving agent launch commands. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-11.spec.ts: coalesces a reconnect close burst onto one authoritative PTY inventory; keeps an explicit user close destructive while the PTY is live; builds mobile session agent launch commands on the runtime host; injects mobile quick-command prompts into the host-built agent startup command. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-10.spec.ts: closes persisted headless terminal parents before any prior list call; tears down a serve-owned headless tab on close while a renderer is attached so it cannot resurrect; defers a renderer-published pending tab to the renderer instead of tearing it down; returns a delegated close outcome with no selection tombstone when the renderer owns the outcome; tears down a runtime pending shell the renderer never adopted on close. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-08.spec.ts: materializes a plain shell when the pending tab has no launch agent; hydrates legacy persisted terminal tabs without layout entries; reads and indexes the full agent-status snapshot once per mobile projection; kills persisted SSH PTYs when closing hydrated headless tabs before pane metadata is restored; materializes hydrated pending headless terminals with the persisted session identity. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-07.spec.ts: hydrates a persisted SSH-owned pane before an attached renderer publishes its graph. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-05.spec.ts: publishes the desktop's tab name over the live agent title, and the live title without one; uses fresh neutral PTY titles over stale mobile snapshot and OSC titles; operates PTY-backed mobile session terminals without a renderer graph; reuses pane close for live PTYs that do not own a renderer tab; lists PTY-backed mobile session terminals without a renderer graph; shows and resolves active PTY-backed mobile session terminals without a renderer graph. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-04.spec.ts: creates mobile session terminals for folder workspaces in a headless runtime server; spawns fresh headless SSH mobile session terminals instead of reattaching synthetic local ids; hydrates headless mobile session terminals from the host workspace session; keeps live headless mobile session terminals when a desktop renderer publishes without them; publishes laptop-created remote runtime split terminals to phone session tabs. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-02.spec.ts: does not report headless wake degradation without sleeping records; does not wake slept agents for non-mobile session-only activation; does not rewrite unread metadata when a mobile activation finds the worktree already read; returns unread:false from worktree.ps after a mobile activation clears the flag; materializes pending mobile session terminals without focusing desktop clients; closes browser mobile session tabs when addressed by browser workspace id. src/main/runtime/orca-runtime-tests/mobile-session-tabs.spec.ts: resolves mobile terminal surfaces by exact split leaf; closes the matching mobile terminal UUID leaf without closing the whole tab; closes the whole mobile terminal tab when addressed by parent tab id; activates the active split leaf when addressed by parent tab id; clears unread metadata on mobile worktree activation without focusing desktop clients; wakes slept agents on the host renderer when a phone activates a worktree. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-05.spec.ts: publishes the hook provider session on a headless mobile tab so native chat can address the transcript; recovers the agent type from the hook row when the pane was launched without an agent hint; reads one agent-status snapshot per projection, not one per terminal tab; waits for unknown-launch foreground owner before publishing Pi-compatible mobile status; keeps Pi-compatible mobile session status as Pi for an unknown-launch foreground pi PTY; keeps renderer-vetted mobile agent status for custom-titled terminals. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-04.spec.ts: publishes terminal surface agent status for paired web clients; preserves authoritative OMP identity for Pi-compatible remote terminal snapshots; normalizes a remote OMP title without republishing omitted launch identity; skips the foreground-process probe when the PTY launch agent is already known; probes the foreground process only on a status transition for unknown launch agents; passes the client signal and the slept-worktree refusal to the spawn. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-03.spec.ts: does not use stale runtime-created PTY status when a neutral PTY title exists; recognizes runtime-created Codex PTY handles from the ready prompt; recognizes runtime-created Antigravity PTY handles from the ready prompt; recognizes live leaf Antigravity terminals from the ready prompt; recognizes a later Antigravity header with a prompt but no model line; keeps mobile terminal surfaces visible while their leaf handle is pending. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-02.spec.ts: lets Claude agents management titles clear stale runtime-created title status; does not recognize live Claude agents panes from a Claude foreground process; does not let stale tab-level agent titles override current neutral pane titles; lists live terminals with fresh pane titles over stale tab titles; lets adopted neutral pane titles use non-shell foreground fallback; lets adopted neutral pane titles retry wrapper foregrounds until recognized; authorizes settled CLI prompts only after positive %s foreground identity; does not recognize arbitrary foreground TUIs as running agents; lets live neutral pane titles retry wrapper foregrounds until recognized; lets current Claude agents PTY titles override stale runtime-created OSC titles; does not let stale Claude agents OSC titles suppress current PTY title activity. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status.spec.ts: keeps preallocated terminal handles valid across renderer reloads; preserves runtime-created PTY process identity after graph unavailable; keeps prompt bindings fenced across runtime restarts without provider incarnation; recognizes runtime-created PTY handles with agent launch titles; does not treat a bare Cursor Agent native title as a running agent session; uses stale runtime-created PTY status when there is no title or foreground evidence. src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-07.spec.ts: keeps orphaned list and show writability aligned with the send gate. src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-04.spec.ts: cancels a coalesced SSH worker recovery retry when its provider disconnects. src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-03.spec.ts: retries renderer reveal before clearing an adopted legacy worker sleeping record. src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-02.spec.ts: recovers exported ORCA_TERMINAL_HANDLE from discovered live PTY sessions. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-12.spec.ts: applies ANSI erase-from-start line controls in retained previews; applies ANSI stripping for private or intermediate CSI line controls; applies ANSI stripping for unsupported erase-line modes; reveals an agent terminal under the pane the caller reserved; keeps a fresh %s pane host-owned when a desktop window is available; keeps desktop publication %s separate from the reserved host spawn; mints its own pane when the reserved leaf is malformed, and reports the one it used; starts an agent terminal with the model the caller picked; starts an agent terminal without a model flag when no pick was made; attributes a startup-agent launch named %s as %s; attributes a fresh agent session the host builds as unknown; leaves a bare agent command the user typed out of launch attribution. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-11.spec.ts: trims oversized terminal output bursts without per-line array shifts; builds terminal previews without mapping the full retained tail; keeps recent PTY replay output capped without needing previous data for large chunks; applies terminal redraw controls before retaining previews; applies ANSI terminal redraw controls before retaining previews; retains multi-line ANSI footer redraws instead of appending old frames; keeps the cursor column when erasing full lines in multi-line redraws; applies ANSI split redraw controls without leaking raw params. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-10.spec.ts: returns renderer visible screen lines through terminal.read RPC JSON result; separates composer drafts from provider-owned terminal screens. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-09.spec.ts: reports an in-flight PTY focus as not navigated when its notifier disappears; reports graph-leaf focus as not navigated without a host notifier; grounds the provider mode tracker before a later chunk, in the emulator order; grounds an in-flight provider snapshot capture so it cannot publish the pre-reset screen; waits for terminal exit and resolves with the exit status; keeps terminal read payloads bounded while retained output remains pageable; trims terminal read preview character budget without per-line array shifts. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-08.spec.ts: submits a silent Claude composer once after the bounded render fallback; chunks large terminal.send text before provider writes; yields chunked terminal input through immediates between writes; yields while validating accepted large terminal.send text before provider writes; reveals a background terminal session when focusing its handle; replays captured launch config when focusing a background agent session; reveals background terminal sessions with the freshest PTY title; renames background terminal handles without requiring a visible tab; keeps a background terminal handle stable while reveal adoption is racing. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-07.spec.ts: resolves tui-idle when a stale Codex prompt is followed by Antigravity readiness; returns an agent-neutral blocked wait result for update prompts; returns an agent-neutral blocked wait result for workspace trust prompts; returns an agent-neutral blocked wait result for cwd selection prompts; returns a blocked wait result for Codex model migration prompts; returns a blocked wait result for Codex startup hook review prompts; returns an agent-neutral blocked wait result for generic interactive prompts; splits text and enter writes for background terminal handles; types the lead line for %s: %s; submits through the agent-specific PTY timing policy for %s. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-06.spec.ts: waits for exit on background terminal handles; keeps retained PTY transcript memory when controller refresh fails; resolves tui-idle from an Antigravity ready prompt preview; resolves Antigravity ready prompts with newline-heavy pasted tails without splitting; resolves live-leaf tui-idle from an Antigravity ready prompt preview. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-03.spec.ts: spawns the available Qoder command for a captured same-session resume: %s; does not use the local Windows shell setting for remote Windows bare agent creates; matches canonical bare agent commands when a command override is configured; keeps non-bare agent command terminal creates unchanged; keeps disabled bare agent command terminal creates unchanged; injects runtime hook receiver env into terminal sessions; creates background terminal sessions for a $label; creates background terminal sessions for a $label; enables Claude Agent Teams only for direct Claude launches when configured in-process; reveals Claude Agent Teams launches with the rewritten launch config; preserves Claude Agent Teams for sequenced Claude launches. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness.spec.ts: creates visible terminal sessions without asking the renderer to focus a tab; asks the pty controller for the requested shell instead of a startup command; knows the agent a flagged launch command names before any process read; retires a flagged command pane identity when the command exits; retires only receipted restored PTY authority on command completion and exit; forgets synthetic handles when disconnected PTY records are pruned. src/main/runtime/orca-runtime-tests/headless-snapshots.spec.ts: returns OSC titles from headless main terminal snapshots; adopts renderer-seeded titles into headless main terminal snapshots; returns cwd metadata from seeded headless main terminal snapshots; adopts OSC7 host metadata from seeded headless terminal scrollback; falls back to the renderer snapshot for hidden-output recovery without headless state; keeps an empty headless snapshot authoritative for hidden-output recovery; advances the absolute output sequence across a daemon stream gap; emits explicit OSC 9999 agent status from runtime PTY data. src/main/runtime/orca-runtime-tests/terminal-side-effect-facts-part-02.spec.ts: falls back to the provider snapshot for a restored PTY with no mounted renderer; falls back to the available mirror when authoritative provider history is unavailable; keeps an empty renderer snapshot when the provider has no retained content; keeps restored provider history authoritative after later live output; uses provider alternate-screen state while a partial model is unsafe; prefers the tracked title over the headless emulator lastTitle; keeps the cursor-agent literal in record-fallback snapshots only without a tracker title; touches mobile snapshots once for decorative spinner ticks, again on idle. src/main/runtime/orca-runtime-tests/local-worktree-creation-part-02.spec.ts: creates a same-repo PR branch override from a resolved head SHA and matching push target; skips broad remote fetch for an existing full-SHA PR base; creates a selected Bitbucket PR branch override from a matching remote branch; suffixes an existing PR when a matching push target lacks selected PR metadata; suffixes a matching push target branch when selected PR metadata has no PR number; suffixes a matching push target branch when the existing PR is different; suffixes a selected PR remote conflict when the PR lookup fails; checks out an unused runtime PR branch only when it is at the resolved head SHA; suffixes only the runtime worktree path when an exact PR branch checkout path exists. src/main/runtime/orca-runtime-tests/local-worktree-creation.spec.ts: returns runtime local base update suggestions from addWorktree; creates a runtime local worktree from a usable persisted local branch base; does not create a runtime local worktree when the refresh fails and no local base ref exists; creates a branchNameOverride worktree from the selected matching remote base ref. Current changed source bytes, wrapper registrations and reduced selectors have no fresh execution or red/green credit. Unrelated surviving receipt objects keep their original narrow scope; current literal graph reachability does not establish historical import closure or equivalent replacement coverage. Current conservative command/import graph reaches src/main/runtime/construction/orca-runtime.test.ts, src/main/runtime/orca-runtime-tests/targeting-and-resilience.spec.ts, src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-04.spec.ts, src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-03.spec.ts, src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-02.spec.ts, src/main/runtime/orca-runtime-tests/gitlab-and-pr-bases-part-02.spec.ts, src/main/runtime/orca-runtime-tests/gitlab-and-pr-bases.spec.ts, src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-03.spec.ts, src/main/runtime/orca-runtime-tests/worktree-setup-and-startup.spec.ts, src/main/runtime/orca-runtime-tests/terminal-sleep-and-teardown-part-02.spec.ts, src/main/runtime/orca-runtime-tests/mobile-summaries-part-03.spec.ts, src/main/runtime/orca-runtime-tests/mobile-summaries-part-02.spec.ts, src/main/runtime/orca-runtime-tests/mobile-summaries.spec.ts, src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-03.spec.ts, src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-02.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-13.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-12.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-11.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-10.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-08.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-07.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-05.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-04.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-02.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-05.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-04.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-03.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-02.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status.spec.ts, src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-07.spec.ts, src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-04.spec.ts, src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-03.spec.ts, src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-02.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-12.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-11.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-10.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-09.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-08.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-07.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-06.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-03.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness.spec.ts, src/main/runtime/orca-runtime-tests/headless-snapshots.spec.ts, src/main/runtime/orca-runtime-tests/terminal-side-effect-facts-part-02.spec.ts, src/main/runtime/orca-runtime-tests/local-worktree-creation-part-02.spec.ts, src/main/runtime/orca-runtime-tests/local-worktree-creation.spec.ts. Unresolved local/computed edges remain explicit debt.", "Audit2095 current-parent preparation2126 (approved2092/2093 removals; source refresh2109/independent2112): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime-tests/terminal-sleep-and-teardown-part-03.spec.ts: rejects exact terminal stop for multiple expected PTYs before stopping anything; omits stale renderer leaves when fresh PTY liveness is required; omits unbound renderer placeholders when fresh PTY liveness is required; captures the event method before the nested sleep receipt changes it; returns the close receipt without requiring a PTY stop; uses the same stop result as an empty explicit stop. src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-04.spec.ts: builds a compact worktree summary from persisted and live runtime state; reads the linked-PR state from the renderer repoId-keyed GitHub cache; carries persisted worktree host ownership in mobile summaries; emits only instance- and boundary-validated lineage parents in mobile summaries; resolves WSL platforms only for repos represented in mobile summaries; omits worktrees hidden by the host visibility policy from mobile summaries; applies linked-checkout source visibility to mobile summaries. src/main/runtime/orca-runtime-tests/hooks-and-hosted-review-part-02.spec.ts: routes runtime GitHub PR details and actions through the selected WSL project runtime; passes SSH connection context through hosted review creation flows; routes local WSL project hosted review flows through runtime git options; treats SSH worktree drift as unknown without local git probes. src/main/runtime/orca-runtime-tests/terminal-listing.spec.ts: emits one mobile session terminal tab per live PTY even if two tabs resolve to it; resolves projected split authority from the parent layout PTY binding; keeps explicit-id terminal lists from resolving all worktrees; keeps explicit-id cold-cache terminal lists from classifying unrelated same-repo worktrees; keeps unknown bare terminal-list ids on the no-scan exact-id path; matches explicit-id cwd PTYs for folder workspace instance IDs; routes PTY output through the PTY leaf index in large terminal graphs. src/main/runtime/orca-runtime-tests/window-authority.spec.ts: claims the first window as authoritative and ignores later windows; transfers authority from the headless sentinel to the first real window; relays terminal browser launches only while headless owns the graph; marks live headless PTYs for renderer reattach before desktop promotion; reports the activation gate state while no desktop window is available; bumps the epoch and enters reloading when the authoritative window reloads; can mark the graph ready for the authoritative window; drops back to unavailable and clears authority when the window disappears; hands the graph back to headless when a promoted serve window closes (#27292); keeps a crashed promoted serve renderer on its own window while the window is open; stays unavailable during initial loads before a graph is published. Current changed source bytes, wrapper registrations and reduced selectors have no fresh execution or red/green credit. Unrelated surviving receipt objects keep their original narrow scope; current literal graph reachability does not establish historical import closure or equivalent replacement coverage. Current conservative command/import graph reaches src/main/runtime/orca-runtime-tests/terminal-sleep-and-teardown-part-03.spec.ts, src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-04.spec.ts, src/main/runtime/orca-runtime-tests/hooks-and-hosted-review-part-02.spec.ts, src/main/runtime/orca-runtime-tests/terminal-listing.spec.ts, src/main/runtime/orca-runtime-tests/window-authority.spec.ts. Unresolved local/computed edges remain explicit debt.", diff --git a/config/tsconfig.tc.web.json b/config/tsconfig.tc.web.json index cf041be983c..d7542c5e628 100644 --- a/config/tsconfig.tc.web.json +++ b/config/tsconfig.tc.web.json @@ -4,7 +4,6 @@ "../src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-main-surface.test.ts", "../src/renderer/src/components/task-page/linear/task-page-linear-detail-query.test.tsx", "../tests/e2e/terminal-agent-pane-launch.unit.test.ts", - "../src/renderer/src/components/status-bar/ClaudeSwitcherMenu.owner-lifetime.test.tsx", "../src/renderer/src/runtime/provider-accounts/observations/provider-account-observation.test-fixture.ts", "../src/shared/**/*.test.ts", "../src/shared/**/*.test.tsx", diff --git a/config/tsconfig.test.pane-launch.json b/config/tsconfig.test.pane-launch.json index f476bd1de39..63896e6d839 100644 --- a/config/tsconfig.test.pane-launch.json +++ b/config/tsconfig.test.pane-launch.json @@ -8,7 +8,6 @@ "../tests/e2e/terminal-agent-pane-launch.unit.test.ts", "../src/renderer/src/runtime/observed-provider-accounts.test.tsx", "../src/renderer/src/components/status-bar/ClaudeSwitcherMenu.observation.test.tsx", - "../src/renderer/src/components/status-bar/ClaudeSwitcherMenu.owner-lifetime.test.tsx", "../src/renderer/src/runtime/provider-accounts/observations/provider-account-observation.test-fixture.ts", "../src/renderer/src/env.d.ts", "../src/types/build-constants.d.ts", diff --git a/config/tsconfig.web.json b/config/tsconfig.web.json index ddb38d005ec..02a420684d3 100644 --- a/config/tsconfig.web.json +++ b/config/tsconfig.web.json @@ -14,7 +14,6 @@ "../src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-main-surface.test.ts", "../src/renderer/src/components/task-page/linear/task-page-linear-detail-query.test.tsx", "../tests/e2e/terminal-agent-pane-launch.unit.test.ts", - "../src/renderer/src/components/status-bar/ClaudeSwitcherMenu.owner-lifetime.test.tsx", "../src/renderer/src/runtime/provider-accounts/observations/provider-account-observation.test-fixture.ts" ], "compilerOptions": { diff --git a/mobile/src/terminal/session/mobile-terminal-records.test.ts b/mobile/src/terminal/session/mobile-terminal-records.test.ts deleted file mode 100644 index d5d663d307e..00000000000 --- a/mobile/src/terminal/session/mobile-terminal-records.test.ts +++ /dev/null @@ -1,126 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { - getTerminalRecordsFromSessionTabs, - mergeTerminalListWithKnownRecords, - mergeTerminalRecordsByCurrentOrder, - type MobileTerminalSessionTab, - type TerminalRecord -} from './mobile-terminal-records' - -const lightTheme = { - mode: 'light' as const, - theme: { - background: '#ffffff', - foreground: '#111111' - } -} - -const darkTheme = { - mode: 'dark' as const, - theme: { - background: '#111111', - foreground: '#eeeeee' - } -} - -describe('mobile terminal records', () => { - it('keeps the known theme when a session-tab snapshot omits it', () => { - const known: TerminalRecord[] = [ - { handle: 'pty-1', title: 'Old title', terminalTheme: darkTheme, isActive: false } - ] - const snapshot: TerminalRecord[] = [{ handle: 'pty-1', title: 'Current title', isActive: true }] - - expect(mergeTerminalRecordsByCurrentOrder(snapshot, known)).toEqual([ - { handle: 'pty-1', title: 'Current title', terminalTheme: darkTheme, isActive: true } - ]) - }) - - it('keeps the host pane identity when a session-tab snapshot omits it', () => { - const known: TerminalRecord[] = [ - { handle: 'pty-1', title: 'Old title', isActive: false, agentIdentity: 'cursor' } - ] - const snapshot: TerminalRecord[] = [{ handle: 'pty-1', title: 'Current title', isActive: true }] - - expect(mergeTerminalRecordsByCurrentOrder(snapshot, known)).toEqual([ - { handle: 'pty-1', title: 'Current title', isActive: true, agentIdentity: 'cursor' } - ]) - }) - - it('lets an authoritative inventory replace or clear an earlier host identity', () => { - const known: TerminalRecord[] = [ - { handle: 'pty-1', title: 'Terminal', isActive: true, agentIdentity: 'cursor' } - ] - for (const agentIdentity of ['claude', undefined]) { - const listed: TerminalRecord[] = [ - { handle: 'pty-1', title: 'Terminal', isActive: true, agentIdentity } - ] - expect(mergeTerminalListWithKnownRecords(listed, known, [])[0]?.agentIdentity).toBe( - agentIdentity - ) - } - }) - - it('keeps session-tab terminal themes when terminal.list omits them', () => { - const terminalList: TerminalRecord[] = [ - { handle: 'pty-1', title: 'Terminal', isActive: true }, - { handle: 'pty-2', title: 'Logs', isActive: false } - ] - const currentTerminals: TerminalRecord[] = [ - { handle: 'pty-1', title: 'Terminal', terminalTheme: darkTheme, isActive: true } - ] - const sessionTabs: MobileTerminalSessionTab[] = [ - { - type: 'terminal', - id: 'term-1::leaf-1', - title: 'Terminal', - terminal: 'pty-1', - terminalTheme: lightTheme, - isActive: true - } - ] - - expect(mergeTerminalListWithKnownRecords(terminalList, currentTerminals, sessionTabs)).toEqual([ - { handle: 'pty-1', title: 'Terminal', terminalTheme: lightTheme, isActive: true }, - { handle: 'pty-2', title: 'Logs', isActive: false } - ]) - }) - - it('falls back to the current terminal theme while waiting for session tabs', () => { - const terminalList: TerminalRecord[] = [{ handle: 'pty-1', title: 'Terminal', isActive: true }] - const currentTerminals: TerminalRecord[] = [ - { handle: 'pty-1', title: 'Terminal', terminalTheme: darkTheme, isActive: true } - ] - - expect(mergeTerminalListWithKnownRecords(terminalList, currentTerminals, [])).toEqual([ - { handle: 'pty-1', title: 'Terminal', terminalTheme: darkTheme, isActive: true } - ]) - }) - - const record = (over: Partial & { handle: string }): TerminalRecord => ({ - title: 'Terminal', - terminalTheme: undefined, - isActive: false, - ...over - }) - const terminalTab = (handle: string): MobileTerminalSessionTab => ({ - id: `tab-${handle}`, - type: 'terminal', - terminal: handle, - title: 'Terminal', - isActive: false - }) - - it('keeps the merge additive so absence only schedules the sweep', () => { - const held = [ - record({ handle: 'pty-1', connected: true }), - record({ handle: 'pty-2', connected: true }) - ] - const tabs = [terminalTab('pty-1')] - - expect( - mergeTerminalRecordsByCurrentOrder(getTerminalRecordsFromSessionTabs(tabs), held).map( - (terminal) => terminal.handle - ) - ).toEqual(['pty-1', 'pty-2']) - }) -}) diff --git a/mobile/src/terminal/terminal-live-accessory-raw-send.test.ts b/mobile/src/terminal/terminal-live-accessory-raw-send.test.ts deleted file mode 100644 index 82b0e0590ab..00000000000 --- a/mobile/src/terminal/terminal-live-accessory-raw-send.test.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { terminalInputSend } from './mobile-terminal-operations' -import { describe, expect, it, vi } from 'vitest' -import { sendTerminalLiveAccessoryRawBytes } from './terminal-live-accessory-raw-send' -import type { RpcClient } from '../transport/rpc/rpc-client-contract' - -function captureClient( - result: Promise = Promise.resolve({ - id: 'send', - ok: true, - result: { send: { handle: 'terminal-a', accepted: true, bytesWritten: 1 } }, - _meta: { runtimeId: 'test-runtime' } - }) -) { - const sendRequest = vi.fn(() => result) - return { client: { sendRequest } as unknown as Pick, sendRequest } -} - -const BASE_ARGS = { - sendTerminalUserInput: terminalInputSend.request, - targetHandle: 'terminal-a', - activeHandle: 'terminal-a', - activeSessionTabType: 'terminal', - connState: 'connected', - bytes: '', - deviceToken: 'tok' -} as const - -describe('terminal live accessory raw send', () => { - it('drops the bytes when the terminal selection went stale mid-flush', async () => { - const { client, sendRequest } = captureClient() - - await expect( - sendTerminalLiveAccessoryRawBytes({ ...BASE_ARGS, client, activeHandle: 'terminal-b' }) - ).resolves.toBe(false) - - expect(sendRequest).not.toHaveBeenCalled() - }) -}) diff --git a/mobile/src/terminal/terminal-viewport-refit.test.ts b/mobile/src/terminal/terminal-viewport-refit.test.ts deleted file mode 100644 index 6c3083d72e5..00000000000 --- a/mobile/src/terminal/terminal-viewport-refit.test.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { describe, expect, it } from 'vitest' - -import { reduceTerminalFrameHeightRefit } from './terminal-viewport-refit-state' - -describe('terminal viewport refit', () => { - it('re-defers a height refit if the keyboard reopens before the debounce fires', () => { - let r = reduceTerminalFrameHeightRefit( - { frameHeight: 600, keyboardVisible: true, pending: false }, - { type: 'frame-height', height: 520 } - ) - expect(r.shouldRefit).toBe(false) - expect(r.state.pending).toBe(true) - - r = reduceTerminalFrameHeightRefit(r.state, { type: 'keyboard-visibility', visible: false }) - expect(r.shouldRefit).toBe(true) - - // Reopen inside debounce; the timer must preserve the pending refit instead of reflowing while typing. - r = reduceTerminalFrameHeightRefit(r.state, { type: 'keyboard-visibility', visible: true }) - const committed = reduceTerminalFrameHeightRefit(r.state, { type: 'refit-committed' }) - expect(committed.shouldRefit).toBe(false) - expect(committed.state.pending).toBe(true) - - const rescheduled = reduceTerminalFrameHeightRefit(committed.state, { - type: 'keyboard-visibility', - visible: false - }) - expect(rescheduled.shouldRefit).toBe(true) - const ran = reduceTerminalFrameHeightRefit(rescheduled.state, { type: 'refit-committed' }) - expect(ran.shouldRefit).toBe(true) - expect(ran.state.pending).toBe(false) - }) -}) diff --git a/mobile/src/test-support/rpc-recording/README.md b/mobile/src/test-support/rpc-recording/README.md index cbd6d8becff..cb81daaa812 100644 --- a/mobile/src/test-support/rpc-recording/README.md +++ b/mobile/src/test-support/rpc-recording/README.md @@ -118,7 +118,7 @@ so the projection has a temporal dimension instead of relying on where a checkpo Any transition the product schedules for itself is recorded at the time it actually fires: change a request deadline or the search debounce by any amount, in either direction, and a recorded number moves. Granularity is exact milliseconds, because the fake timers fire at their scheduled time and -never coalesce; `recording-runner.test.ts` pins a 5 ms deadline settling at exactly `settledAt: 5`. +never coalesce. A checkpoint's own clock is not recorded. It is always the sum of the scripted `advance` steps, so it is a function of the scenario rather than of the code under test; `run-recording.ts` asserts that diff --git a/mobile/src/test-support/rpc-recording/mounted-screen-tree.test.ts b/mobile/src/test-support/rpc-recording/mounted-screen-tree.test.ts deleted file mode 100644 index 015f8ffb68a..00000000000 --- a/mobile/src/test-support/rpc-recording/mounted-screen-tree.test.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { resolve } from 'node:path' -import { describe, expect, it } from 'vitest' -import { pilotMountAdapters } from './pilot-mount-adapters' -import { runRecording } from './run-recording' -import { readScenarios } from './scenario-input' -import { vitestRecordingScheduler } from './vitest-recording-scheduler' - -const root = resolve(import.meta.dirname, '../../../..') -const manifest = readScenarios( - process.env.RPC_FOUNDATION_SCENARIOS ?? - resolve(root, 'mobile/rpc-foundation/pilot-scenarios.json') -).scenarios - -describe('a mounted screen', () => { - // Drive the real panel/context/socket so declared props reach wire params and refusal triggers fallback. - it('sends what the screen sends, with no substitute shaping a param', async () => { - const scenario = manifest.find( - (candidate) => candidate.id === 'files-explorer-legacy-fallback' - )! - const { adapters } = pilotMountAdapters(root, { device: scenario }) - const recording = await runRecording( - scenario, - adapters[scenario.operation]!, - vitestRecordingScheduler() - ) - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a recorded sender entry has a name and three positional argument slots. - const sender = recording.checkpoints.at(-1)!.observation.sender as { - name: string - args: { name: string; value: unknown }[] - }[] - expect( - sender.map((entry) => ({ - name: entry.name, - params: entry.args[1]?.value, - options: entry.args[2]?.value - })) - ).toEqual([ - { - name: 'files.readDir#1', - params: { relativePath: '', worktree: 'id:wt-files', limit: 500 }, - options: { failWhenDisconnected: true } - }, - { - name: 'files.list#1', - params: { worktree: 'id:wt-files' }, - options: { failWhenDisconnected: true } - } - ]) - }) -}) diff --git a/mobile/src/test-support/rpc-recording/recording-runner.test.ts b/mobile/src/test-support/rpc-recording/recording-runner.test.ts deleted file mode 100644 index df1d8b2342b..00000000000 --- a/mobile/src/test-support/rpc-recording/recording-runner.test.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { describe, expect, it } from 'vitest' - -import { ScriptedRpcTransport } from './scripted-rpc-transport' -import { vitestRecordingScheduler } from './vitest-recording-scheduler' - -describe('recording boundaries', () => { - it('requires logical bindings plus matching params for concurrent same-method calls', async () => { - const clock = vitestRecordingScheduler() - await clock.start() - const transport = new ScriptedRpcTransport(clock.elapsed) - try { - const left = transport.client.sendRequest('files.list', { worktree: 'A' }) - const right = transport.client.sendRequest('files.list', { worktree: 'B' }) - await clock.flush() - expect(() => transport.complete('files.list#1', { worktree: 'A' }, {})).toThrow( - 'logical binding' - ) - expect(() => transport.bind('left', 'files.list#1', { worktree: 'B' })).toThrow( - 'params mismatch' - ) - transport.bind('left', 'files.list#1', { worktree: 'A' }) - transport.bind('right', 'files.list#2', { worktree: 'B' }) - transport.complete('right', { worktree: 'B' }, { ok: true, result: [] }) - transport.complete('left', { worktree: 'A' }, { ok: true, result: [] }) - await Promise.all([left, right]) - } finally { - await transport.dispose() - await clock.flush() - transport.causality.assertTransparentCalls() - transport.causality.close() - clock.stop() - } - }) -}) diff --git a/mobile/src/transport/connection/client-context.test.ts b/mobile/src/transport/connection/client-context.test.ts index d0faf1fb4b1..8688ab11863 100644 --- a/mobile/src/transport/connection/client-context.test.ts +++ b/mobile/src/transport/connection/client-context.test.ts @@ -47,7 +47,7 @@ vi.mock('../../diagnostics/connection/connection-log-background-flush', () => ({ })) import { RpcClientProvider } from './client-context' -import { useDisconnectHostClient, useForceReconnect, useHostClient } from './host-client-hooks' +import { useDisconnectHostClient, useHostClient } from './host-client-hooks' import { useAllHostClients } from './use-all-host-clients' import { useRelayRecoveryStatus } from './client-context-connection-metrics' @@ -168,45 +168,6 @@ beforeEach(() => { }) describe('useHostClient', () => { - it('shows connecting while a reused screen resolves an uncached host', async () => { - const client = makeFakeClient('connected') - connectMock.mockReturnValue(client) - loadHostsMock.mockResolvedValueOnce([HOST]).mockReturnValueOnce(new Promise(() => {})) - - let selectedHostId = HOST.id - let renderTick = 0 - const stateByRenderTick = new Map() - let renderer: ReactTestRenderer | null = null - function Probe(): null { - stateByRenderTick.set(renderTick, useHostClient(selectedHostId).state) - return null - } - - try { - await act(async () => { - renderer = create(createElement(RpcClientProvider, null, createElement(Probe))) - await Promise.resolve() - }) - expect(stateByRenderTick.get(0)).toBe('connected') - - // Keep host swaps amber during asynchronous profile/keychain loading. - selectedHostId = 'missing-host' - renderTick = 1 - await act(async () => { - renderer?.update(createElement(RpcClientProvider, null, createElement(Probe))) - }) - expect(stateByRenderTick.get(1)).toBe('connecting') - - renderTick = 2 - await act(async () => { - renderer?.update(createElement(RpcClientProvider, null, createElement(Probe))) - }) - expect(stateByRenderTick.get(2)).toBe('connecting') - } finally { - act(() => renderer?.unmount()) - } - }) - it('drops the closed client when the host entry is removed', async () => { const fake = makeFakeClient('connected') connectMock.mockReturnValue(fake) @@ -226,38 +187,6 @@ describe('useHostClient', () => { harness.unmount() }) - - it('keeps Retry amber through forceReconnect instead of grey-then-amber', async () => { - const first = makeFakeClient('connected') - const second = makeFakeClient('connecting') - connectMock.mockReturnValueOnce(first).mockReturnValueOnce(second) - loadHostsMock.mockResolvedValue([HOST]) - - const states: ConnectionState[] = [] - let forceReconnect: ((hostId: string) => Promise) | null = null - let renderer: ReactTestRenderer | null = null - function Probe(): null { - forceReconnect = useForceReconnect() - states.push(useHostClient(HOST.id).state) - return null - } - try { - await act(async () => { - renderer = create(createElement(RpcClientProvider, null, createElement(Probe))) - await Promise.resolve() - }) - expect(states.at(-1)).toBe('connected') - - await act(async () => { - await forceReconnect?.(HOST.id) - }) - expect(first.closeMock).toHaveBeenCalled() - expect(states.at(-1)).toBe('connecting') - expect(states).not.toContain('disconnected') - } finally { - act(() => renderer?.unmount()) - } - }) }) describe('useAllHostClients', () => { diff --git a/mobile/src/transport/connection/mobile-endpoint-supervisor-relay-race.test.ts b/mobile/src/transport/connection/mobile-endpoint-supervisor-relay-race.test.ts index 81ac5496981..8b9eb4e5875 100644 --- a/mobile/src/transport/connection/mobile-endpoint-supervisor-relay-race.test.ts +++ b/mobile/src/transport/connection/mobile-endpoint-supervisor-relay-race.test.ts @@ -3,12 +3,10 @@ import { dependencies, FakeLogicalClient, FakeRelaySession, - FakeSession, host, relay } from './mobile-endpoint-supervisor-test-fakes' import { MobileEndpointSupervisor } from './mobile-endpoint-supervisor' -import { createStableLogicalRpcClient } from './stable-logical-rpc-client' vi.mock('react-native', () => ({ Platform: { OS: 'ios' } })) vi.mock('expo-secure-store', () => ({ WHEN_UNLOCKED_THIS_DEVICE_ONLY: 'when-unlocked' })) @@ -55,58 +53,6 @@ describe('mobile endpoint supervisor relay race after a mid-session LAN loss', ( supervisor.stop() }) - it('paces relay dials by the shared cooldown while relay is also unreachable', async () => { - // A relay socket that never authenticates fails its migration. - const { logical, openRelay, supervisor } = await startOnLan( - vi.fn(() => new FakeRelaySession('connecting')) - ) - - for (let i = 0; i < 60; i++) { - redialDirect(logical) - await vi.advanceTimersByTimeAsync(2_000) - } - - // 60 redials in 2 min; each attempt is a cell dial plus a director-resolved retry. - // Racing every redial would open 120 sockets; the 0.5 s→30 s backoff keeps it under 20. - expect(openRelay.mock.calls.length).toBeGreaterThan(0) - expect(openRelay.mock.calls.length).toBeLessThanOrEqual(20) - supervisor.stop() - }) - - it('races each slow LAN blip once and closes the relay socket the LAN beat', async () => { - // The real logical client owns the lost-race close: it aborts after relay authentication. - const direct = new FakeSession('connected') - const logical = createStableLogicalRpcClient(direct, 'lan') - const relaySessions: FakeRelaySession[] = [] - const openRelay = vi.fn(() => { - const session = new FakeRelaySession('connecting') - relaySessions.push(session) - return session - }) - const supervisor = new MobileEndpointSupervisor( - logical, - host.id, - relay, - dependencies({ openRelay, randomBytes: () => new Uint8Array([255, 255]) }) - ) - await supervisor.start() - - for (let flap = 0; flap < 10; flap++) { - direct.publishState('reconnecting') - direct.publishState('connecting') - await vi.advanceTimersByTimeAsync(3_000) - direct.publishState('connected') - relaySessions.at(-1)?.publishState('connected') - await vi.advanceTimersByTimeAsync(10_000) - } - - // Accepted cost: one relay dial per blip past the 2.5 s head start, each closed once it loses. - expect(openRelay).toHaveBeenCalledTimes(10) - expect(relaySessions.every((session) => session.close.mock.calls.length > 0)).toBe(true) - expect(logical.getActivePath()).toBe('lan') - supervisor.stop() - }) - it('drops a race deferred by cooldown once the LAN comes back', async () => { const { logical, openRelay, supervisor } = await startOnLan( vi.fn(() => new FakeRelaySession('connecting')) diff --git a/mobile/src/transport/hosts/host-endpoint-edit.test.ts b/mobile/src/transport/hosts/host-endpoint-edit.test.ts deleted file mode 100644 index 9608ca495fe..00000000000 --- a/mobile/src/transport/hosts/host-endpoint-edit.test.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { describe, expect, it } from 'vitest' - -import { resolveHostEndpointEdit } from './host-endpoint-edit' - -describe('resolveHostEndpointEdit', () => { - it.each([ - ['ws://192.168.1.10:6768', 'wss://tunnel.example.com', 'wss://tunnel.example.com:443'], - ['wss://old.example.com:8443', ' WSS://tunnel.example.com ', 'wss://tunnel.example.com:443'], - ['ws://192.168.1.10:6768', 'wss://[2001:db8::2]', 'wss://[2001:db8::2]:443'], - ['ws://192.168.1.10:6768', 'wss://tunnel.example.com:9443', 'wss://tunnel.example.com:9443'], - ['ws://192.168.1.10:6768', 'tunnel.example.com', 'ws://tunnel.example.com:6768'], - [ - 'wss://old.example.com:8443/orca?route=runtime', - 'wss://tunnel.example.com', - 'wss://tunnel.example.com:443/orca?route=runtime' - ] - ])( - 'resolves explicit secure URLs independently of the saved port (%s → %s)', - (stored, input, expected) => { - expect(resolveHostEndpointEdit(stored, input)).toEqual({ - kind: 'changed', - endpoint: expected - }) - } - ) - - it.each([ - ['surrounding whitespace', ' desk.example.com '], - ['hostname case', 'DESK.EXAMPLE.COM'], - ['explicit default port', 'desk.example.com:443'], - ['percent-encoded hostname', 'wss://%64esk.example.com:443'] - ])('preserves routed endpoint bytes for equivalent %s', (_label, input) => { - const stored = 'wss://Desk.Example.com/%6Fruntime?route=%72ed' - - expect(resolveHostEndpointEdit(stored, input)).toEqual({ - kind: 'unchanged', - endpoint: stored - }) - }) - - it('preserves the hidden route when the authority changes', () => { - expect( - resolveHostEndpointEdit('wss://old.example.com/%6Fruntime?route=%72ed', 'new.example.com') - ).toEqual({ - kind: 'changed', - endpoint: 'wss://new.example.com:443/%6Fruntime?route=%72ed' - }) - }) -}) diff --git a/mobile/src/transport/hosts/host-endpoint.test.ts b/mobile/src/transport/hosts/host-endpoint.test.ts deleted file mode 100644 index 997286e0981..00000000000 --- a/mobile/src/transport/hosts/host-endpoint.test.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { displayHostEndpoint, normalizeHostEndpoint } from './host-endpoint' - -describe('normalizeHostEndpoint', () => { - it('preserves explicit ws :80 and wss :443 instead of rewriting to fallback', () => { - expect(normalizeHostEndpoint('ws://192.168.1.10:80', { fallbackPort: '6768' })).toEqual({ - ok: true, - endpoint: 'ws://192.168.1.10:80' - }) - expect(normalizeHostEndpoint('wss://desk.example:443', { fallbackPort: '6768' })).toEqual({ - ok: true, - endpoint: 'wss://desk.example:443' - }) - expect(displayHostEndpoint('ws://192.168.1.10:80')).toBe('192.168.1.10:80') - expect(displayHostEndpoint('wss://desk.example:443')).toBe('desk.example:443') - }) - - it('preserves wss when re-normalizing bare host:port via fallbackScheme', () => { - expect( - normalizeHostEndpoint('desk.example:8443', { fallbackScheme: 'wss', fallbackPort: '8443' }) - ).toEqual({ - ok: true, - endpoint: 'wss://desk.example:8443' - }) - }) -}) diff --git a/mobile/src/transport/hosts/host-name-identity.test.ts b/mobile/src/transport/hosts/host-name-identity.test.ts index f175b608414..0c4878d0ef4 100644 --- a/mobile/src/transport/hosts/host-name-identity.test.ts +++ b/mobile/src/transport/hosts/host-name-identity.test.ts @@ -85,20 +85,6 @@ describe('host name identity', () => { } describe('legacy classification', () => { - it('does not re-classify an adopted machine name once identity fields exist', async () => { - // A record the descriptor writer already touched: non-generated name, no override. - storedHostsRaw = JSON.stringify([ - { - ...GENERATED_HOST, - name: 'm4airs-Air', - lastKnownMachineName: 'm4airs-Air', - lastKnownHostPlatform: 'darwin' - } - ]) - const hosts = await loadHosts() - expect(hosts[0]?.personalName).toBeUndefined() - }) - it('drops only an identity value this build cannot read, never the paired host', async () => { // A newer build's platform, or an empty string, as a rolled-back app would find them. storedHostsRaw = JSON.stringify([ @@ -119,39 +105,7 @@ describe('host name identity', () => { }) }) - describe('updateHostDescriptor', () => { - it('clears a stale machine name when a live host stops reporting one', async () => { - await updateHostDescriptor(GENERATED_HOST.id, { - machineName: 'm4airs-Air', - platform: 'darwin' - }) - await updateHostDescriptor(GENERATED_HOST.id, { machineName: null, platform: 'darwin' }) - const record = stored().find(({ id }) => id === GENERATED_HOST.id) - expect(record?.lastKnownMachineName).toBeUndefined() - expect(record?.name).toBe('m4airs-Air') - }) - }) - describe('re-pair', () => { - it('preserves the override and descriptor a pairing save knows nothing about', async () => { - await updateHostDescriptor(TYPED_HOST.id, { machineName: 'm4airs-Air', platform: 'darwin' }) - await savePairedHost({ - id: TYPED_HOST.id, - name: 'Windows-Low Spec', - endpoint: 'ws://10.0.0.9:6768', - deviceToken: 'fresh-token', - publicKeyB64: TYPED_HOST.publicKeyB64, - lastConnected: 99 - }) - expect(stored().find(({ id }) => id === TYPED_HOST.id)).toMatchObject({ - name: 'Windows-Low Spec', - personalName: 'Windows-Low Spec', - lastKnownMachineName: 'm4airs-Air', - lastKnownHostPlatform: 'darwin', - endpoint: 'ws://10.0.0.9:6768' - }) - }) - it('does not roll back identity changed since a connection took its profile snapshot', async () => { await updateHostDescriptor(TYPED_HOST.id, { machineName: 'Studio', platform: 'darwin' }) // Use a connection-held snapshot to prove saves cannot roll back later identity changes. @@ -168,14 +122,4 @@ describe('host name identity', () => { }) }) }) - - describe('phone override edit', () => { - it('clearing the override returns to the desktop-reported name', async () => { - await updateHostDescriptor(TYPED_HOST.id, { machineName: 'm4airs-Air', platform: 'darwin' }) - await updateHostNameAndEndpoint(TYPED_HOST.id, { personalName: null }) - const record = stored().find(({ id }) => id === TYPED_HOST.id) - expect(record?.personalName).toBeUndefined() - expect(record?.name).toBe('m4airs-Air') - }) - }) }) diff --git a/mobile/src/transport/hosts/host-store-endpoint.test.ts b/mobile/src/transport/hosts/host-store-endpoint.test.ts deleted file mode 100644 index e84ad12e8e4..00000000000 --- a/mobile/src/transport/hosts/host-store-endpoint.test.ts +++ /dev/null @@ -1,92 +0,0 @@ -import AsyncStorage from '@react-native-async-storage/async-storage' -import * as SecureStore from 'expo-secure-store' -import { beforeEach, describe, expect, it, vi } from 'vitest' -import { loadHosts, resetHostStoreForTests, updateHostNameAndEndpoint } from './host-store' -import { resetMobileRelayHostOverlayStoreForTests } from './mobile-relay-host-overlay-store' - -vi.mock('@react-native-async-storage/async-storage', () => ({ - default: { - getItem: vi.fn(), - setItem: vi.fn(), - removeItem: vi.fn() - } -})) - -vi.mock('expo-secure-store', () => ({ - getItemAsync: vi.fn(), - setItemAsync: vi.fn(), - deleteItemAsync: vi.fn(), - WHEN_UNLOCKED_THIS_DEVICE_ONLY: 'WHEN_UNLOCKED_THIS_DEVICE_ONLY' -})) - -vi.mock('react-native', () => ({ - Platform: { OS: 'ios' } -})) - -describe('relay routing after a host edit', () => { - const OVERLAY_KEY = 'orca:mobile-relay:host-overlays:v2' - const OLD_ENDPOINT = 'ws://192.168.1.10:6768' - const NEW_ENDPOINT = 'ws://192.168.1.20:6768' - const relay = { - v: 1 as const, - directorUrl: 'https://relay.onorca.dev', - cellUrl: 'https://relay-c1.onorca.dev', - assignmentEpoch: 7, - relayHostId: 'AbCdEf0123_-xyZ9', - e2eeFraming: 2 as const - } - - const storage = new Map() - - beforeEach(() => { - resetHostStoreForTests() - resetMobileRelayHostOverlayStoreForTests() - storage.clear() - storage.set( - 'orca:hosts', - JSON.stringify([ - { id: 'host-1', name: 'Desk', endpoint: OLD_ENDPOINT, publicKeyB64: 'pk', lastConnected: 1 } - ]) - ) - // An older build's record: a copy of the row's address beside the relay. - storage.set( - OVERLAY_KEY, - JSON.stringify([ - { - v: 2, - hostId: 'host-1', - endpoints: [ - { id: 'direct-primary', kind: 'lan', url: OLD_ENDPOINT }, - { id: 'relay-primary', kind: 'relay', url: 'wss://relay-c1.onorca.dev/v1/connect/id' } - ], - relayHostId: relay.relayHostId, - relay - } - ]) - ) - vi.mocked(AsyncStorage.getItem).mockReset() - vi.mocked(AsyncStorage.getItem).mockImplementation(async (key) => storage.get(key) ?? null) - vi.mocked(AsyncStorage.setItem).mockReset() - vi.mocked(AsyncStorage.setItem).mockImplementation(async (key, value) => { - storage.set(key, value) - }) - vi.mocked(SecureStore.getItemAsync).mockResolvedValue('device-token') - vi.mocked(SecureStore.setItemAsync).mockReset() - }) - - it('loads only the edited address, whatever an older overlay stored', async () => { - await updateHostNameAndEndpoint('host-1', { endpoint: NEW_ENDPOINT }) - - const [host] = await loadHosts() - expect(host).toEqual({ - id: 'host-1', - name: 'Desk', - personalName: 'Desk', - endpoint: NEW_ENDPOINT, - publicKeyB64: 'pk', - lastConnected: 1, - deviceToken: 'device-token', - relay - }) - }) -}) diff --git a/mobile/src/transport/hosts/host-store.test.ts b/mobile/src/transport/hosts/host-store.test.ts index e6218ba96e8..04b82058be9 100644 --- a/mobile/src/transport/hosts/host-store.test.ts +++ b/mobile/src/transport/hosts/host-store.test.ts @@ -1,6 +1,5 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import './mobile-relay-host-overlay' -import type { MobileRelayHostOverlay } from './mobile-relay-host-overlay' const asyncStorageMock = vi.hoisted(() => ({ getItem: vi.fn(), @@ -166,29 +165,6 @@ describe('host-store list mutations', () => { ).resolves.toBe('replacement-token') }) - it('clears stale relay state when an existing host is re-paired direct-only', async () => { - const overlay: MobileRelayHostOverlay = { - v: 2, - hostId: HOST_ONE.id, - endpoints: [ - { id: 'direct-primary', kind: 'lan', url: HOST_ONE.endpoint }, - { - id: 'relay-primary', - kind: 'relay', - url: 'wss://relay-c1.onorca.dev/v1/connect/AbCdEf0123_-xyZ9' - } - ], - relayHostId: HOST_ONE_RELAY.relayHostId, - relay: HOST_ONE_RELAY - } - storedOverlayRaw = JSON.stringify([overlay]) - - await savePairedHost({ ...HOST_ONE, deviceToken: 'replacement-token' }) - - expect(JSON.parse(storedOverlayRaw!)).toEqual([]) - expect(secureStoreMock.deleteItemAsync).not.toHaveBeenCalled() - }) - it('refuses an early same-key token write without durable cleanup intent', async () => { const replacement = { ...HOST_TWO, diff --git a/src/main/claude/structured/claude-full-access-policy-perf.test.ts b/src/main/claude/structured/claude-full-access-policy-perf.test.ts deleted file mode 100644 index 56db3f993aa..00000000000 --- a/src/main/claude/structured/claude-full-access-policy-perf.test.ts +++ /dev/null @@ -1,118 +0,0 @@ -import { performance } from 'node:perf_hooks' -import { afterEach, expect, it, vi } from 'vitest' -import { createClaudeFullAccessPolicy } from './claude-full-access-policy' - -const SESSION = '819cf9f8-e43c-4ad7-b50f-54aa158a726a' -const CHUNK_BYTES = 1000 - -afterEach(() => { - vi.restoreAllMocks() -}) - -const line = (frame: Record): string => `${JSON.stringify(frame)}\n` - -type Work = { chars: number; parses: number; newlineSearched: number; screened: number } - -/** Drives the real policy and counts the characters it searches, so a rescan cannot hide in time. */ -function observeWire(frames: number): Work { - const delta = line({ - type: 'stream_event', - event: { type: 'content_block_delta', delta: { type: 'text_delta', text: 'ok — '.repeat(8) } }, - session_id: SESSION - }) - // A tool result spanning thousands of chunks, as large file reads do. - const longLine = line({ - type: 'user', - message: { - role: 'user', - content: [{ type: 'tool_result', content: 'y'.repeat(frames * 3000) }] - }, - session_id: SESSION - }) - const expected: [string, boolean][] = [] - let wire = '' - for (let index = 0; index < frames; index += 1) { - wire += delta - if (index % 10 === 0) { - const mode = index % 20 === 0 ? 'plan' : 'bypassPermissions' - wire += line({ type: 'system', subtype: 'status', permissionMode: mode, session_id: SESSION }) - wire += line({ - type: 'control_request', - request_id: `r${index}`, - request: { subtype: 'can_use_tool', tool_name: 'Bash', input: {}, tool_use_id: `t${index}` } - }) - expected.push([`r${index}`, mode === 'bypassPermissions']) - } - if (index === frames / 2) { - wire += longLine - } - } - const bytes = Buffer.from(wire) - const policy = createClaudeFullAccessPolicy(SESSION) - // Node's own internals keep their original string methods, so these count only the policy's calls. - const { indexOf, includes } = String.prototype - let newlineSearched = 0 - let screened = 0 - const parse = vi.spyOn(JSON, 'parse') - const searches = vi.spyOn(String.prototype, 'indexOf').mockImplementation(function ( - this: string, - search: string, - position?: number - ) { - const found = indexOf.call(this, search, position) - newlineSearched += (found === -1 ? this.length : found + search.length) - (position ?? 0) - return found - }) - const screens = vi.spyOn(String.prototype, 'includes').mockImplementation(function ( - this: string, - search: string, - position?: number - ) { - screened += this.length - return includes.call(this, search, position) - }) - - const started = performance.now() - // Fixed-size chunks split frames and multibyte characters, as pipe reads do. - try { - for (let offset = 0; offset < bytes.length; offset += CHUNK_BYTES) { - policy.observe(bytes.subarray(offset, offset + CHUNK_BYTES)) - } - } finally { - searches.mockRestore() - screens.mockRestore() - } - const elapsedMs = performance.now() - started - const parses = parse.mock.calls.length - parse.mockRestore() - const work = { chars: wire.length, parses, newlineSearched, screened } - console.info('claude-full-access-policy-perf', { - frames, - bytes: bytes.length, - ...work, - elapsedMs - }) - - // Newlines are looked for in new text only, and each completed line is screened at most twice, - // checked per size so a rescanning policy fails here before the larger run exhausts memory. - expect(newlineSearched).toBeLessThanOrEqual(wire.length) - expect(screened).toBeLessThanOrEqual(2 * wire.length) - // Only mode reports and permission requests are parsed; deltas and the long line never are. - expect(parses).toBe(expected.length * 2) - // Unread requests stay until the SDK hands each to canUseTool, however many queue up. - expect(policy.retained()).toEqual({ partialChars: 0, requests: expected.length }) - for (const [requestId, fullAccess] of expected) { - expect(policy.allows(requestId), requestId).toBe(fullAccess) - } - expect(policy.retained()).toEqual({ partialChars: 0, requests: 0 }) - return work -} - -it('searches each stdout character a bounded number of times, however long a line grows', () => { - const small = observeWire(300) - const large = observeWire(3000) - // Ten times the output, including a ten times longer line, costs ten times the work. - expect(large.newlineSearched).toBeLessThanOrEqual(10 * small.newlineSearched + CHUNK_BYTES) - expect(large.screened).toBeLessThanOrEqual(10 * small.screened + CHUNK_BYTES) - expect(large.parses).toBe(10 * small.parses) -}) diff --git a/src/main/rate-limits/providers/opencode-go/opencode-go-api-key-source.test.ts b/src/main/rate-limits/providers/opencode-go/opencode-go-api-key-source.test.ts index 2f920e73d94..38fb3fc6ba4 100644 --- a/src/main/rate-limits/providers/opencode-go/opencode-go-api-key-source.test.ts +++ b/src/main/rate-limits/providers/opencode-go/opencode-go-api-key-source.test.ts @@ -2,7 +2,6 @@ import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as WslTranscriptFsAccess from '../../../native-chat/wsl-transcript-fs-access' import Database from '../../../sqlite/sync-database' import { detectOpenCodeCredentialBackend } from '../../../opencode/opencode-credential-backend' import { resolveOpenCodeGoApiKey } from './opencode-go-api-key-source' @@ -21,17 +20,6 @@ const ENVIRONMENT_KEYS = [ 'OPENCODE_AUTH_CONTENT' ] as const -// Inject listing failures that host filesystems cannot produce portably. -const readdirFailure = vi.hoisted((): { error: unknown } => ({ error: null })) -vi.mock('../../../native-chat/wsl-transcript-fs-access', async (importOriginal) => { - const actual = await importOriginal() - return { - ...actual, - wslGatedReaddir: (...args: Parameters) => - readdirFailure.error ? Promise.reject(readdirFailure.error) : actual.wslGatedReaddir(...args) - } -}) - describe('resolveOpenCodeGoApiKey', () => { let dataHome: string let originalEnvironment: Partial> @@ -74,7 +62,6 @@ describe('resolveOpenCodeGoApiKey', () => { }) afterEach(() => { - readdirFailure.error = null for (const key of ENVIRONMENT_KEYS) { const value = originalEnvironment[key] if (value === undefined) { @@ -126,84 +113,4 @@ describe('resolveOpenCodeGoApiKey', () => { tier: 'opencode-auth-file' }) }) - - it('does not fall back to the auth file when valid v1 inline auth omits Go', async () => { - writeAuthFile({ 'opencode-go': { type: 'api', key: AUTH_FILE_KEY } }) - process.env.OPENCODE_AUTH_CONTENT = '{}' - process.env.OPENCODE_API_KEY = ENVIRONMENT_KEY - - await expect(resolveOpenCodeGoApiKey({ backend: 'v1' })).resolves.toEqual({ - status: 'found', - key: ENVIRONMENT_KEY, - tier: 'environment' - }) - }) - - it.each([undefined, '', ' \t\n '])( - 'does not borrow the host key when an unknown selected backend has environment key %j', - async (key) => { - vi.mocked(detectOpenCodeCredentialBackend).mockResolvedValue(null) - process.env.OPENCODE_API_KEY = ENVIRONMENT_KEY - const environment: NodeJS.ProcessEnv = { OPENCODE_API_KEY: key } - - await expect(resolveOpenCodeGoApiKey({ environment })).resolves.toEqual({ status: 'missing' }) - expect(detectOpenCodeCredentialBackend).toHaveBeenCalledWith(environment, undefined) - } - ) - - it('propagates unreadable selected context instead of reading host credentials', async () => { - writeAuthFile({ 'opencode-go': { type: 'api', key: AUTH_FILE_KEY } }) - const input = {} - Object.defineProperty(input, 'environment', { - get: () => { - throw new Error('Selected profile metadata is unreadable') - } - }) - - await expect(resolveOpenCodeGoApiKey(input)).rejects.toThrow( - 'Selected profile metadata is unreadable' - ) - }) - - it.each(['v1', 'v2'] as const)( - 'keeps System and selected data roots isolated for %s', - async (backend) => { - writeAuthFile({ 'opencode-go': { type: 'api', key: AUTH_FILE_KEY } }) - const system = { XDG_DATA_HOME: dataHome, OPENCODE_DB: ':memory:' } - const selectedDataHome = join(dataHome, 'selected') - mkdirSync(join(selectedDataHome, 'opencode'), { recursive: true }) - writeFileSync( - join(selectedDataHome, 'opencode', 'auth.json'), - JSON.stringify({ - 'opencode-go': { type: 'api', key: 'selected-auth-placeholder' } - }) - ) - const { path } = writeCredentialDatabase([ - { - value: JSON.stringify({ type: 'key', key: 'selected-table-placeholder' }), - active: 1, - created: 1 - } - ]) - const selected = { XDG_DATA_HOME: selectedDataHome, OPENCODE_DB: path } - const inherited = { ...process.env } - - const first = await resolveOpenCodeGoApiKey({ environment: system, backend }) - const managed = await resolveOpenCodeGoApiKey({ environment: selected, backend }) - const restored = await resolveOpenCodeGoApiKey({ environment: system, backend }) - - expect(first).toEqual({ status: 'found', key: AUTH_FILE_KEY, tier: 'opencode-auth-file' }) - expect(managed).toEqual( - backend === 'v1' - ? { status: 'found', key: 'selected-auth-placeholder', tier: 'opencode-auth-file' } - : { - status: 'found', - key: 'selected-table-placeholder', - tier: 'opencode-credential-database' - } - ) - expect(restored).toEqual(first) - expect(process.env).toEqual(inherited) - } - ) }) diff --git a/src/main/rate-limits/providers/opencode-go/opencode-go-status-parsing.test.ts b/src/main/rate-limits/providers/opencode-go/opencode-go-status-parsing.test.ts index f6adb4173fe..dbfb15f8037 100644 --- a/src/main/rate-limits/providers/opencode-go/opencode-go-status-parsing.test.ts +++ b/src/main/rate-limits/providers/opencode-go/opencode-go-status-parsing.test.ts @@ -1,81 +1,5 @@ import { describe, expect, it } from 'vitest' -import { - isOpenCodeGoExplicitNoAccessPayload, - parseOpenCodeGoBillingStatusPayload, - parseOpenCodeGoStatusPayload, - parseOpenCodeGoUsageApiPayload -} from './opencode-go-status-parsing' - -const ISSUE_PAYLOAD = { - access: { - meters: { - fiveHour: { - resetsAt: '2026-09-18T12:42:04.962Z', - limitMicroCents: '1200000000', - usedMicroCents: '121745383' - }, - week: { - resetsAt: '2026-09-21T00:00:00.000Z', - limitMicroCents: '3000000000', - usedMicroCents: '121745383' - }, - month: { - limitMicroCents: '6000000000', - usedMicroCents: '121745383' - } - } - } -} - -describe('parseOpenCodeGoStatusPayload', () => { - it('maps fiveHour/week/month meters into session/weekly/monthly windows', () => { - const parsed = parseOpenCodeGoStatusPayload(JSON.stringify(ISSUE_PAYLOAD)) - - expect(parsed).not.toBeNull() - expect(parsed?.session).toEqual({ - usedPercent: (121745383 / 1_200_000_000) * 100, - windowMinutes: 300, - resetsAt: Date.parse('2026-09-18T12:42:04.962Z'), - resetDescription: null - }) - expect(parsed?.weekly).toEqual({ - usedPercent: (121745383 / 3_000_000_000) * 100, - windowMinutes: 10_080, - resetsAt: Date.parse('2026-09-21T00:00:00.000Z'), - resetDescription: null - }) - expect(parsed?.monthly).toEqual({ - usedPercent: (121745383 / 6_000_000_000) * 100, - windowMinutes: 43_200, - resetsAt: null, - resetDescription: null - }) - }) - - it('caps usedPercent at 100 and floors at 0', () => { - const parsed = parseOpenCodeGoStatusPayload( - JSON.stringify({ - access: { - meters: { - fiveHour: { - resetsAt: '2026-09-18T12:42:04.962Z', - limitMicroCents: '100', - usedMicroCents: '150' - }, - week: { - resetsAt: '2026-09-21T00:00:00.000Z', - limitMicroCents: '100', - usedMicroCents: '-5' - } - } - } - }) - ) - - expect(parsed?.session?.usedPercent).toBe(100) - expect(parsed?.weekly?.usedPercent).toBe(0) - }) -}) +import { parseOpenCodeGoBillingStatusPayload } from './opencode-go-status-parsing' describe('parseOpenCodeGoBillingStatusPayload', () => { it('maps the verified PAYG micro-cent string into USD major units', () => { @@ -89,76 +13,4 @@ describe('parseOpenCodeGoBillingStatusPayload', () => { ) ).toBe(27.86781005) }) - - it('preserves zero and negative balances', () => { - expect( - parseOpenCodeGoBillingStatusPayload( - JSON.stringify({ - billingMode: 'prepaid', - mode: 'pay-as-you-go', - balanceMicroCents: '0' - }) - ) - ).toBe(0) - expect( - parseOpenCodeGoBillingStatusPayload( - JSON.stringify({ - billingMode: 'prepaid', - mode: 'pay-as-you-go', - balanceMicroCents: '-125000000' - }) - ) - ).toBe(-1.25) - }) - - it.each([ - { billingMode: 'credit', mode: 'pay-as-you-go', balanceMicroCents: '100000000' }, - { billingMode: 'seat', mode: 'pay-as-you-go', balanceMicroCents: '100000000' }, - { billingMode: 'prepaid', mode: 'invoiceable', balanceMicroCents: '100000000' }, - { billingMode: 'prepaid', mode: 'pay-as-you-go', balanceMicroCents: 100000000 }, - { billingMode: 'prepaid', mode: 'pay-as-you-go', balanceMicroCents: '1.5' }, - { - billingMode: 'prepaid', - mode: 'pay-as-you-go', - balanceMicroCents: '9007199254740992' - } - ])('rejects unsupported or unsafe billing payloads: $billingMode/$mode', (payload) => { - expect(parseOpenCodeGoBillingStatusPayload(JSON.stringify(payload))).toBeNull() - }) -}) - -describe('isOpenCodeGoExplicitNoAccessPayload', () => { - it('accepts only explicit JSON null or access:null without an error verdict', () => { - expect(isOpenCodeGoExplicitNoAccessPayload('null')).toBe(true) - expect(isOpenCodeGoExplicitNoAccessPayload('{"access":null}')).toBe(true) - expect( - isOpenCodeGoExplicitNoAccessPayload('{"access":null,"error":{"type":"AuthError"}}') - ).toBe(false) - expect(isOpenCodeGoExplicitNoAccessPayload('{"access":{}}')).toBe(false) - expect(isOpenCodeGoExplicitNoAccessPayload('{}')).toBe(false) - expect(isOpenCodeGoExplicitNoAccessPayload('')).toBe(false) - expect(isOpenCodeGoExplicitNoAccessPayload('{not json')).toBe(false) - }) -}) - -describe('parseOpenCodeGoUsageApiPayload', () => { - it('clamps an out-of-range percent and tolerates a missing resetsAt', () => { - const parsed = parseOpenCodeGoUsageApiPayload( - JSON.stringify({ - usage: { - rolling: { status: 'rate-limited', percent: 140 }, - weekly: { status: 'ok', percent: -5, resetsAt: 'not a date' } - } - }) - ) - - expect(parsed?.session).toEqual({ - usedPercent: 100, - windowMinutes: 300, - resetsAt: null, - resetDescription: null - }) - expect(parsed?.weekly.usedPercent).toBe(0) - expect(parsed?.monthly).toBeNull() - }) }) diff --git a/src/main/rate-limits/service/service-account-target-selection.test.ts b/src/main/rate-limits/service/service-account-target-selection.test.ts index 5a85a8a5941..3e7afe8b6de 100644 --- a/src/main/rate-limits/service/service-account-target-selection.test.ts +++ b/src/main/rate-limits/service/service-account-target-selection.test.ts @@ -77,66 +77,6 @@ describe('RateLimitService', () => { resetRateLimitProviderMocks() }) - it('settles without applying a result when the managed home becomes unavailable mid-fetch', async () => { - const service = new RateLimitService() - const resolver = vi - .fn() - .mockReturnValueOnce({ kind: 'ready', codexHomePath: '/tmp/codex-home' }) - .mockReturnValue({ kind: 'skip' }) - service.setCodexHomePathResolver(resolver) - vi.mocked(fetchCodexRateLimits).mockResolvedValueOnce(okProvider('codex', 20, Date.now())) - - await service.refreshForCodexAccountChange(null, { runtime: 'host' }) - - expect(resolver).toHaveBeenCalledTimes(2) - expect(fetchCodexRateLimits).toHaveBeenCalledOnce() - expect(service.getState().codex).toBeNull() - }) - - it('returns a refreshed scoped state without overwriting a target selected during reset', async () => { - const service = new RateLimitService() - const idempotencyKey = '22222222-2222-4222-8222-222222222222' - const consume = vi.mocked(consumeCodexRateLimitResetCredit) - let resolveConsume: ((outcome: 'reset') => void) | undefined - consume.mockImplementationOnce( - () => - new Promise((resolve) => { - resolveConsume = resolve - }) - ) - vi.mocked(fetchCodexRateLimits).mockResolvedValueOnce(okProvider('codex', 0, Date.now())) - - service.setCodexHomePathResolver(() => ({ kind: 'ready', codexHomePath: '/tmp/new-selection' })) - const pending = service.consumeCodexRateLimitResetCredit({ - idempotencyKey, - target: { runtime: 'host', wslDistro: null }, - codexHomePath: '/tmp/approved-selection' - }) - await vi.waitFor(() => expect(consume).toHaveBeenCalledOnce()) - service.setCodexFetchTarget({ runtime: 'wsl', wslDistro: 'Ubuntu' }) - resolveConsume?.('reset') - - await expect(pending).resolves.toMatchObject({ - outcome: 'reset', - state: { - codexTarget: { runtime: 'host', wslDistro: null }, - codex: { session: { usedPercent: 0 } } - } - }) - expect(consume).toHaveBeenCalledWith({ - codexHomePath: '/tmp/approved-selection', - idempotencyKey - }) - expect(fetchCodexRateLimits).toHaveBeenCalledWith( - expect.objectContaining({ - codexHomePath: '/tmp/approved-selection', - signal: expect.any(AbortSignal) - }) - ) - expect(service.getState().codexTarget).toEqual({ runtime: 'wsl', wslDistro: 'Ubuntu' }) - expect(service.getState().codex).toBeNull() - }) - it('keeps the reset result scoped when the active target changes during its refresh', async () => { const service = new RateLimitService() const idempotencyKey = '33333333-3333-4333-8333-333333333333' @@ -201,120 +141,4 @@ describe('RateLimitService', () => { expect(service.getState().codex?.session?.usedPercent).toBe(0) }) - - it('does not fetch host Codex usage when WSL home resolution fails', async () => { - const service = new RateLimitService() - const resolver = vi.fn(() => ({ kind: 'ready' as const, codexHomePath: null })) - service.setCodexHomePathResolver(resolver) - service.setCodexFetchTarget({ runtime: 'wsl', wslDistro: 'Ubuntu' }) - - vi.mocked(fetchActiveClaudeRateLimits).mockResolvedValueOnce( - okProvider('claude', 10, Date.now()) - ) - - await service.refresh() - - expect(resolver).toHaveBeenCalledWith({ runtime: 'wsl', wslDistro: 'Ubuntu' }) - expect(fetchCodexRateLimits).not.toHaveBeenCalled() - expect(service.getState().codex).toMatchObject({ - provider: 'codex', - status: 'error', - error: 'WSL Codex home unavailable for Ubuntu' - }) - }) - - it('does not cache host Codex usage under an outgoing WSL account', async () => { - const service = new RateLimitService() - const wslCodexHome = - '\\\\wsl.localhost\\Ubuntu\\home\\jin\\.local\\share\\orca\\codex-accounts\\a\\home' - const hostCodexHome = 'C:\\Users\\jin\\.orca\\codex-accounts\\host\\home' - service.setCodexHomePathResolver((target) => ({ - kind: 'ready', - codexHomePath: target?.runtime === 'wsl' ? wslCodexHome : hostCodexHome - })) - - vi.mocked(fetchActiveClaudeRateLimits).mockResolvedValueOnce( - okProvider('claude', 10, Date.now()) - ) - vi.mocked(fetchCodexRateLimits) - .mockResolvedValueOnce(okProvider('codex', 20, Date.now())) - .mockResolvedValueOnce(okProvider('codex', 40, Date.now())) - - await service.refresh() - await service.refreshForCodexAccountChange('wsl-account-1', { - runtime: 'wsl', - wslDistro: 'Ubuntu' - }) - - expect(service.getState().inactiveCodexAccounts).not.toEqual( - expect.arrayContaining([expect.objectContaining({ accountId: 'wsl-account-1' })]) - ) - }) - - it('does not cache host Claude usage under an outgoing WSL account', async () => { - const service = new RateLimitService() - service.setInactiveClaudeAccountsResolver(() => [{ id: 'wsl-account-1' }]) - service.setClaudeAuthPreparationResolver(async (target) => ({ - configDir: - target?.runtime === 'wsl' - ? '\\\\wsl.localhost\\Ubuntu\\home\\jin\\.claude' - : 'C:\\Users\\jin\\.claude', - runtime: target?.runtime ?? 'host', - wslDistro: target?.wslDistro ?? null, - wslLinuxConfigDir: target?.runtime === 'wsl' ? '/home/jin/.claude' : null, - envPatch: {}, - provenance: target?.runtime === 'wsl' ? 'managed:wsl-account-1:wsl:Ubuntu' : 'system' - })) - - vi.mocked(fetchActiveClaudeRateLimits) - .mockResolvedValueOnce(okProvider('claude', 20, Date.now())) - .mockResolvedValueOnce(okProvider('claude', 40, Date.now())) - vi.mocked(fetchCodexRateLimits).mockResolvedValueOnce(okProvider('codex', 20, Date.now())) - - await service.refresh() - await service.refreshForClaudeAccountChange('wsl-account-1', { - runtime: 'wsl', - wslDistro: 'Ubuntu' - }) - - expect(fetchActiveClaudeRateLimits).toHaveBeenLastCalledWith( - expect.objectContaining({ allowPtyFallback: true, allowUsagePanelSupplement: true }) - ) - - expect(service.getState().inactiveClaudeAccounts).not.toEqual( - expect.arrayContaining([expect.objectContaining({ accountId: 'wsl-account-1' })]) - ) - }) - - // Regression: the Codex home resolver is async, and a reset never waits on isFetching. - it('does not apply a stale full-refresh cycle codex result over a newer reset', async () => { - const service = new RateLimitService() - const staleHome = deferred<{ kind: 'ready'; codexHomePath: string | null }>() - const resolver = vi - .fn() - .mockReturnValueOnce(staleHome.promise) - .mockResolvedValue({ kind: 'ready', codexHomePath: '/tmp/approved-selection' }) - service.setCodexHomePathResolver(resolver) - vi.mocked(fetchActiveClaudeRateLimits).mockResolvedValue(okProvider('claude', 10, Date.now())) - vi.mocked(fetchCodexRateLimits) - .mockResolvedValueOnce(okProvider('codex', 0, Date.now())) - .mockResolvedValueOnce(okProvider('codex', 100, Date.now())) - vi.mocked(consumeCodexRateLimitResetCredit).mockResolvedValueOnce('reset') - - const staleRefresh = service.refresh() - await vi.waitFor(() => expect(resolver).toHaveBeenCalledTimes(1)) - - await expect( - service.consumeCodexRateLimitResetCredit({ - idempotencyKey: '55555555-5555-4555-8555-555555555555', - target: { runtime: 'host', wslDistro: null }, - codexHomePath: '/tmp/approved-selection' - }) - ).resolves.toMatchObject({ outcome: 'reset' }) - - staleHome.resolve({ kind: 'ready', codexHomePath: '/tmp/approved-selection' }) - await staleRefresh - - expect(service.getState().codex?.session?.usedPercent).not.toBe(100) - }) }) diff --git a/src/main/rate-limits/service/service-inactive-account-previews.test.ts b/src/main/rate-limits/service/service-inactive-account-previews.test.ts index 2a216e7af68..312507c095d 100644 --- a/src/main/rate-limits/service/service-inactive-account-previews.test.ts +++ b/src/main/rate-limits/service/service-inactive-account-previews.test.ts @@ -10,13 +10,6 @@ import { resetRateLimitProviderMocks } from './rate-limit-service-test-harness' -function inactiveCodexAccount(id: string, managedHomePath: string) { - return { - id, - resolveHome: () => ({ kind: 'ready' as const, managedHomePath }) - } -} - vi.mock('../providers/claude/claude-active-usage-fetch', () => ({ fetchActiveClaudeRateLimits: vi.fn() })) @@ -90,101 +83,6 @@ describe('RateLimitService', () => { vi.useRealTimers() }) - it('keeps sibling inactive Codex preview fetches alive when one account is evicted', async () => { - const service = new RateLimitService() - const accountFetch = deferred() - let inactiveAccounts = [ - inactiveCodexAccount('account-a', '/tmp/account-a/home'), - inactiveCodexAccount('account-b', '/tmp/account-b/home') - ] - service.setInactiveCodexAccountsResolver(() => inactiveAccounts) - vi.mocked(fetchCodexRateLimits).mockReturnValueOnce(accountFetch.promise) - - const fetchOnOpen = service.fetchInactiveCodexAccountsOnOpen() - await Promise.resolve() - expect(service.getState().inactiveCodexAccounts).toEqual([ - { accountId: 'account-a', rateLimits: null, updatedAt: 0, isFetching: true } - ]) - - inactiveAccounts = [inactiveCodexAccount('account-a', '/tmp/account-a/home')] - service.evictInactiveCodexCache('account-b') - accountFetch.resolve(okProvider('codex', 64, Date.now())) - await fetchOnOpen - - expect(fetchCodexRateLimits).toHaveBeenCalledTimes(1) - expect(service.getState().inactiveCodexAccounts).toEqual([ - { - accountId: 'account-a', - rateLimits: expect.objectContaining({ - provider: 'codex', - session: expect.objectContaining({ usedPercent: 64 }) - }), - updatedAt: expect.any(Number), - isFetching: false - } - ]) - }) - - it('does not recache an inactive Codex account that becomes active during fetch-on-open', async () => { - const service = new RateLimitService() - const accountFetch = deferred() - let inactiveAccounts = [inactiveCodexAccount('account-b', '/tmp/account-b/home')] - service.setInactiveCodexAccountsResolver(() => inactiveAccounts) - service.setCodexHomePathResolver(() => ({ - kind: 'ready', - codexHomePath: '/tmp/account-b/home' - })) - vi.mocked(fetchCodexRateLimits) - .mockReturnValueOnce(accountFetch.promise) - .mockResolvedValueOnce(okProvider('codex', 7, Date.now())) - - const fetchOnOpen = service.fetchInactiveCodexAccountsOnOpen() - await Promise.resolve() - expect(service.getState().inactiveCodexAccounts).toEqual([ - { accountId: 'account-b', rateLimits: null, updatedAt: 0, isFetching: true } - ]) - - inactiveAccounts = [] - await service.refreshForCodexAccountChange('account-a') - accountFetch.resolve(okProvider('codex', 42, Date.now())) - await fetchOnOpen - - expect(service.getState().inactiveCodexAccounts).toEqual([]) - }) - - it('does not recache an inactive Claude account removed during fetch-on-open', async () => { - const service = new RateLimitService() - const accountFetch = deferred() - let inactiveAccounts = [{ id: 'account-1' }] - service.setInactiveClaudeAccountsResolver(() => inactiveAccounts) - service.setClaudeAuthPreparationResolver(async () => ({ - configDir: '/tmp/.claude', - envPatch: {}, - provenance: 'system' - })) - vi.mocked(fetchActiveClaudeRateLimits).mockResolvedValue(okProvider('claude', 7)) - await service.refresh() - vi.mocked(fetchInactiveClaudeAccountUsage).mockReturnValueOnce(accountFetch.promise) - - const fetchOnOpen = service.fetchInactiveClaudeAccountsOnOpen() - await Promise.resolve() - expect(service.getState().inactiveClaudeAccounts).toEqual([ - { accountId: 'account-1', rateLimits: null, updatedAt: 0, isFetching: true } - ]) - - service.evictInactiveClaudeCache('account-1') - inactiveAccounts = [{ id: 'account-1' }] - await service.refreshForClaudeAccountChange('account-1') - expect(service.getState().inactiveClaudeAccounts[0]?.accountId).toBe('account-1') - - inactiveAccounts = [] - service.evictInactiveClaudeCache('account-1') - accountFetch.resolve(okProvider('claude', 42)) - await fetchOnOpen - - expect(service.getState().inactiveClaudeAccounts).toEqual([]) - }) - it('does not overwrite inactive Claude cache from a stale same-id fetch', async () => { const service = new RateLimitService() const accountFetch = deferred() diff --git a/src/main/rate-limits/service/service-live-claude-usage.test.ts b/src/main/rate-limits/service/service-live-claude-usage.test.ts deleted file mode 100644 index c776b33666d..00000000000 --- a/src/main/rate-limits/service/service-live-claude-usage.test.ts +++ /dev/null @@ -1,279 +0,0 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest' -import type { ProviderRateLimits } from '../../../shared/rate-limit-types' -import { RateLimitService } from './rate-limit-service' -import { fetchActiveClaudeRateLimits } from '../providers/claude/claude-active-usage-fetch' -import { - deferred, - errorProvider, - flushMicrotasks, - mockFreshBackgroundProviderFetches, - okProvider, - resetRateLimitProviderMocks -} from './rate-limit-service-test-harness' - -class ObservedRateLimitService extends RateLimitService { - get claudeCheckCompletedAt(): number | null { - return this.lastClaudeCheckCompletedAt - } - - get activeRefreshPlan() { - return this.getActiveWindowRefreshPlan(Date.now()) - } -} - -const profileRouter = vi.hoisted((): { userConfigDir?: string } => ({})) -vi.mock('../../claude-accounts/claude-profile-installed-router', () => ({ - getClaudeProfileRouter: () => - profileRouter.userConfigDir ? { userConfigDir: () => profileRouter.userConfigDir } : undefined -})) - -vi.mock('../providers/claude/claude-active-usage-fetch', () => ({ - fetchActiveClaudeRateLimits: vi.fn() -})) -vi.mock('../providers/claude/claude-managed-account-usage', () => ({ - fetchInactiveClaudeAccountUsage: vi.fn() -})) - -vi.mock('../providers/codex/codex-fetcher', () => ({ - consumeCodexRateLimitResetCredit: vi.fn(), - fetchCodexRateLimits: vi.fn() -})) - -vi.mock('../providers/gemini/gemini-usage-fetcher', () => ({ - fetchGeminiRateLimits: vi.fn() -})) - -vi.mock('../providers/kimi/kimi-fetcher', () => ({ - fetchKimiRateLimits: vi.fn() -})) - -vi.mock('../providers/opencode-go/opencode-go-usage-source-selection', () => ({ - fetchOpenCodeGoUsage: vi.fn() -})) - -vi.mock('../providers/zcode/zcode-usage-fetcher', () => ({ - fetchZcodeRateLimits: vi.fn() -})) - -vi.mock('../providers/muse/muse-usage-fetcher', () => ({ - fetchMuseRateLimits: vi.fn() -})) - -vi.mock('../providers/antigravity/antigravity-usage-fetcher', () => ({ - fetchAntigravityRateLimits: vi.fn() -})) - -vi.mock('../providers/minimax/minimax-fetcher', () => ({ - fetchMiniMaxRateLimits: vi.fn() -})) - -vi.mock('../providers/grok/grok-fetcher', () => ({ - fetchGrokRateLimits: vi.fn() -})) - -vi.mock('../providers/cursor/cursor-fetcher', () => ({ - fetchCursorRateLimits: vi.fn() -})) - -vi.mock('../providers/cursor/cursor-auth', () => ({ - readCursorAuthSession: vi.fn() -})) - -vi.mock('../providers/grok/grok-auth', () => ({ - readGrokAuthSession: vi.fn(() => ({ status: 'missing' })) -})) - -vi.mock('../../minimax/minimax-cookie-store', () => ({ - hasMiniMaxSessionCookie: vi.fn(() => false) -})) - -describe('RateLimitService', () => { - beforeEach(() => { - resetRateLimitProviderMocks() - }) - - it('drops statusline posts before attribution is known or from a mismatched config dir', async () => { - vi.useFakeTimers() - try { - vi.mocked(fetchActiveClaudeRateLimits).mockResolvedValue(okProvider('claude', 18)) - mockFreshBackgroundProviderFetches() - - const service = new RateLimitService() - - // No cycle has established selected-account attribution yet. - service.ingestLiveClaudeRateLimits({ - configDir: null, - fiveHour: { used_percentage: 50 }, - sevenDay: null - }) - expect(service.getState().claude).toBeNull() - - await service.refresh() - expect(service.getState().claude?.session?.usedPercent).toBe(18) - - service.ingestLiveClaudeRateLimits({ - configDir: '/some/managed/dir', - fiveHour: { used_percentage: 99 }, - sevenDay: null - }) - expect(service.getState().claude?.session?.usedPercent).toBe(18) - - service.ingestLiveClaudeRateLimits({ - configDir: null, - fiveHour: { used_percentage: 33 }, - sevenDay: null - }) - expect(service.getState().claude?.session?.usedPercent).toBe(33) - } finally { - vi.useRealTimers() - } - }) - - it.each(['full', 'claude-only'])('isolates %s checks on switch', async (cycle) => { - vi.useFakeTimers() - try { - const staleClaudeFetch = deferred() - const incomingFetch = deferred() - vi.mocked(fetchActiveClaudeRateLimits) - .mockImplementationOnce(async () => okProvider('claude', 9)) - .mockImplementationOnce(() => staleClaudeFetch.promise) - .mockImplementationOnce(() => incomingFetch.promise) - mockFreshBackgroundProviderFetches() - - const authGate = deferred() - let resolverCalls = 0 - const service = new ObservedRateLimitService() - await service.refresh() - expect(service.claudeCheckCompletedAt).toBe(Date.now()) - service.setClaudeAuthPreparationResolver(async () => { - resolverCalls += 1 - const outgoing = resolverCalls === 1 - if (outgoing) { - await authGate.promise - } - return { - configDir: outgoing ? '/outgoing/.claude' : '/incoming/.claude', - runtime: 'host', - wslDistro: null, - wslLinuxConfigDir: null, - envPatch: { - CLAUDE_CONFIG_DIR: outgoing ? '/outgoing/.claude' : '/incoming/.claude' - }, - provenance: outgoing ? 'managed:outgoing' : 'managed:incoming' - } - }) - - // Switch while the outgoing account resolver is suspended. - const firstRefresh = cycle === 'full' ? service.refresh() : service.refreshClaudeForTarget() - await flushMicrotasks() - const switchPromise = - cycle === 'full' - ? service.refreshForClaudeAccountChange('outgoing-account') - : service.refreshClaudeForTarget({ runtime: 'wsl', wslDistro: 'Ubuntu' }) - await flushMicrotasks() - authGate.resolve() - await flushMicrotasks(8) - - // The stale resumed cycle must not authorize outgoing live posts on the new account. - const beforeOutgoingPost = service.getState().claude?.session?.usedPercent - service.ingestLiveClaudeRateLimits({ - configDir: '/outgoing/.claude', - fiveHour: { used_percentage: 99 }, - sevenDay: null - }) - expect(service.getState().claude?.session?.usedPercent).toBe(beforeOutgoingPost) - - staleClaudeFetch.resolve(okProvider('claude', 18)) - await vi.advanceTimersByTimeAsync(0) - expect(service.claudeCheckCompletedAt).toBeNull() - - service.ingestLiveClaudeRateLimits({ - configDir: '/incoming/.claude', - fiveHour: { used_percentage: 55 }, - sevenDay: null - }) - expect(service.getState().claude?.session?.usedPercent).toBe(55) - expect(service.activeRefreshPlan).toEqual({ kind: 'full' }) - incomingFetch.resolve(okProvider('claude', 18)) - await Promise.all([firstRefresh, switchPromise]) - expect(fetchActiveClaudeRateLimits).toHaveBeenCalledTimes(3) - expect(service.claudeCheckCompletedAt).toBe(Date.now()) - } finally { - vi.useRealTimers() - } - }) - - it('keeps the newer weekly value when an idle session re-posts an older one for the same window', async () => { - vi.useFakeTimers() - try { - // OAuth and statusline reset timestamps differ in precision. - const sessionReset = Date.now() + 128 * 60 * 1000 + 123 - const weeklyReset = Date.now() + 125 * 60 * 60 * 1000 + 456 - const win = (usedPercent: number, resetsAt: number, windowMinutes: number) => ({ - usedPercent, - windowMinutes, - resetsAt, - resetDescription: null - }) - vi.mocked(fetchActiveClaudeRateLimits).mockResolvedValue({ - ...okProvider('claude', 10), - session: win(10, sessionReset, 300), - weekly: win(25, weeklyReset, 10080) - }) - mockFreshBackgroundProviderFetches() - const service = new RateLimitService() - await service.refresh() - const fetched = service.getState().claude - const post = (session: number | null, weekly: number, weeklyResetAt = weeklyReset) => - service.ingestLiveClaudeRateLimits({ - configDir: null, - fiveHour: - session === null - ? null - : { used_percentage: session, resets_at: Math.floor(sessionReset / 1000) }, - sevenDay: { used_percentage: weekly, resets_at: Math.floor(weeklyResetAt / 1000) } - }) - - // Idle sessions can drop the expired 5h window while repeating stale weekly data; discard the whole stale post. - await vi.advanceTimersByTimeAsync(60 * 1000) - post(null, 8) - expect(service.getState().claude).toEqual(fetched) - - post(10, 8) - expect(service.getState().claude).toEqual(fetched) - post(null, 90, weeklyReset - 7 * 24 * 60 * 60 * 1000) - expect(service.getState().claude).toEqual(fetched) - vi.mocked(fetchActiveClaudeRateLimits).mockResolvedValueOnce({ - ...errorProvider('claude', 'rate limited'), - usageMetadata: { retryAtMs: Date.now() + 60 * 60 * 1000, failureKind: 'rate-limited' } - }) - await service.refresh() - const failed = service.getState().claude - post(10, 8) - expect(service.getState().claude).toEqual(failed) - post(10, 25) - expect(service.getState().claude?.session?.resetsAt).toBe(sessionReset) - expect(service.getState().claude?.status).toBe('ok') - expect(service.getState().claude?.usageMetadata?.retryAtMs).toBe( - failed?.usageMetadata?.retryAtMs - ) - post(11, 25) - expect(service.getState().claude?.weekly?.resetsAt).toBe(weeklyReset) - const grownSessionReset = service.getState().claude?.session?.resetsAt - post(11, 26) - expect(service.getState().claude?.session?.resetsAt).toBe(grownSessionReset) - expect(service.getState().claude?.weekly?.usedPercent).toBe(26) - - post(null, 1, weeklyReset + 7 * 24 * 60 * 60 * 1000) - expect(service.getState().claude?.weekly?.usedPercent).toBe(1) - service.ingestLiveClaudeRateLimits({ - configDir: null, - fiveHour: null, - sevenDay: { utilization: 0 } - }) - expect(service.getState().claude?.weekly?.usedPercent).toBe(0) - } finally { - vi.useRealTimers() - } - }) -}) diff --git a/src/renderer/src/components/JiraIssueWorkspace.optimistic-edit.test.tsx b/src/renderer/src/components/JiraIssueWorkspace.optimistic-edit.test.tsx deleted file mode 100644 index 375c806f1a9..00000000000 --- a/src/renderer/src/components/JiraIssueWorkspace.optimistic-edit.test.tsx +++ /dev/null @@ -1,198 +0,0 @@ -// @vitest-environment happy-dom - -import { - deferred, - editState, - flushPromises, - jiraIssue, - otherIssue, - runtimeMocks, - saveTitle, - selectIssue, - store, - StoreBackedWorkspace -} from './__mocks__/jira-issue-workspace-edit-fixture' -import { act, fireEvent, render, screen } from '@testing-library/react' -import { describe, expect, it, vi } from 'vitest' -import type { JiraIssue, JiraMutationResult } from '../../../shared/jira/jira-types' -import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' -import { getDefaultSettings } from '../../../shared/constants' -import { getProviderRuntimeContextKey } from '@/runtime/hosts/observations/provider-runtime-context' -import { TooltipProvider } from '@/components/ui/tooltip' -import JiraIssueWorkspace from './JiraIssueWorkspace' - -describe('JiraIssueWorkspace optimistic edits', () => { - it.each([true, false])( - 'captures the default host when a save settles after navigation (%s)', - async (ok) => { - const oldSave = deferred() - runtimeMocks.jiraUpdateIssueForTarget.mockReturnValue(oldSave.promise) - const contextKey = getProviderRuntimeContextKey(editState.settings) - const view = render( - - - - ) - await flushPromises() - saveTitle('Old title', 'Local edit') - await flushPromises() - editState.settings = { ...getDefaultSettings(''), activeRuntimeEnvironmentId: 'remote-1' } - runtimeMocks.jiraGetIssueForTarget.mockImplementation(async (source: RuntimeClientTarget) => - jiraIssue(source.kind === 'environment' ? 'Remote title' : 'Local edit') - ) - view.rerender( - - - - ) - await flushPromises() - await act(async () => - oldSave.resolve(ok ? { ok: true } : { ok: false, error: 'Local edit rejected' }) - ) - await flushPromises() - - expect(runtimeMocks.jiraUpdateIssueForTarget).toHaveBeenCalledWith( - { kind: 'local' }, - 'ENG-1', - { title: 'Local edit' }, - 'site-1' - ) - expect(runtimeMocks.jiraGetIssueForTarget).toHaveBeenLastCalledWith( - ok ? { kind: 'local' } : { kind: 'environment', environmentId: 'remote-1' }, - 'ENG-1', - 'site-1' - ) - expect(store.patchJiraIssue).toHaveBeenLastCalledWith( - 'ENG-1', - expect.objectContaining({ title: ok ? 'Local edit' : 'Old title' }), - expect.objectContaining({ contextKey, siteId: 'site-1' }) - ) - expect(screen.getByDisplayValue('Remote title')).toBeDefined() - } - ) - - it('keeps loaded and submitted comments while a title save patches the shared cache', async () => { - runtimeMocks.jiraUpdateIssueForTarget.mockReturnValue(deferred<{ ok: true }>().promise) - runtimeMocks.jiraIssueCommentsForTarget.mockResolvedValue([ - { id: 'server', body: 'Existing comment', createdAt: '2026-09-01' } - ]) - runtimeMocks.jiraAddIssueCommentForTarget.mockResolvedValue({ ok: true, id: 'added' }) - render() - await flushPromises() - fireEvent.change(screen.getByPlaceholderText('Add a Jira comment...'), { - target: { value: 'New comment' } - }) - fireEvent.click(screen.getByRole('button', { name: 'Comment' })) - await flushPromises() - saveTitle('Old title', 'New title') - await flushPromises() - expect(screen.getByText('Existing comment')).toBeDefined() - expect(screen.getByText('New comment')).toBeDefined() - expect(runtimeMocks.jiraIssueCommentsForTarget).toHaveBeenCalledTimes(1) - }) - - it('keeps a cleared priority cleared when an older detail load arrives', async () => { - const initialLoad = deferred() - const initial = jiraIssue('Old title', { priority: { id: '1', name: 'High' } }) - runtimeMocks.jiraGetIssueForTarget.mockReturnValue(initialLoad.promise) - runtimeMocks.jiraUpdateIssueForTarget.mockReturnValue(deferred<{ ok: true }>().promise) - render() - await flushPromises() - fireEvent.click(screen.getByRole('button', { name: 'High' })) - fireEvent.click(await screen.findByRole('button', { name: 'No priority' })) - await act(async () => initialLoad.resolve(initial)) - await flushPromises() - expect(screen.queryByRole('button', { name: 'High' })).toBeNull() - expect(runtimeMocks.jiraGetIssueForTarget).toHaveBeenCalledTimes(1) - expect(runtimeMocks.jiraIssueCommentsForTarget).toHaveBeenCalledTimes(1) - }) - - it('allows editing a newly opened issue while an earlier save is still pending', async () => { - const oldSave = deferred<{ ok: true }>() - runtimeMocks.jiraUpdateIssueForTarget - .mockReturnValueOnce(oldSave.promise) - .mockResolvedValue({ ok: true }) - runtimeMocks.jiraGetIssueForTarget.mockImplementation( - async (_settings: unknown, key: string) => - key === 'ENG-2' ? otherIssue : jiraIssue(editState.serverTitle) - ) - render() - await flushPromises() - saveTitle('Old title', 'New title') - await act(async () => selectIssue(otherIssue)) - await flushPromises() - saveTitle('Other issue', 'Other updated') - await flushPromises() - expect(runtimeMocks.jiraUpdateIssueForTarget).toHaveBeenCalledTimes(2) - await act(async () => oldSave.resolve({ ok: true })) - await flushPromises() - expect(screen.getByText('ENG-2')).toBeDefined() - }) - - it('still hydrates fields the user did not edit when the initial load lands late', async () => { - const initialLoad = deferred() - runtimeMocks.jiraGetIssueForTarget.mockImplementationOnce(() => initialLoad.promise) - runtimeMocks.jiraUpdateIssueForTarget.mockReturnValue(deferred<{ ok: true }>().promise) - render() - await flushPromises() - - saveTitle('Old title', 'New title') - await flushPromises() - await act(async () => initialLoad.resolve(jiraIssue('Old title', { labels: ['backend'] }))) - await flushPromises() - - expect(screen.getByDisplayValue('New title')).toBeDefined() - expect(screen.getByDisplayValue('backend')).toBeDefined() - }) - - it.each([ - ['succeeds', { ok: true }], - ['fails', { ok: false, error: 'Nope' }] - ] as const)( - 'stays on the newly opened issue when a save for the previous one %s', - async (_, outcome) => { - // The task page reuses this instance; a late save must not restore a previously selected issue. - const update = deferred() - runtimeMocks.jiraUpdateIssueForTarget.mockReturnValue(update.promise) - runtimeMocks.jiraGetIssueForTarget.mockImplementation( - async (_settings: unknown, key: string) => - key === 'ENG-2' ? otherIssue : jiraIssue(editState.serverTitle) - ) - render() - await flushPromises() - - saveTitle('Old title', 'New title') - await flushPromises() - await act(async () => selectIssue(otherIssue)) - await flushPromises() - expect(screen.getByText('ENG-2')).toBeDefined() - editState.serverTitle = 'New title' - await act(async () => update.resolve(outcome)) - await flushPromises() - - expect(screen.getByText('ENG-2')).toBeDefined() - expect(screen.queryByText('ENG-1')).toBeNull() - expect(screen.getByDisplayValue('Other issue')).toBeDefined() - } - ) - - it('does not let a slow initial load overwrite a title saved meanwhile', async () => { - const initialLoad = deferred() - runtimeMocks.jiraGetIssueForTarget - .mockImplementationOnce(() => initialLoad.promise) - .mockImplementation(async () => jiraIssue(editState.serverTitle)) - runtimeMocks.jiraUpdateIssueForTarget.mockImplementation(async () => { - editState.serverTitle = 'New title' - return { ok: true } - }) - render() - await flushPromises() - - saveTitle('Old title', 'New title') - await flushPromises() - await act(async () => initialLoad.resolve(jiraIssue('Old title'))) - await flushPromises() - - expect(screen.getByDisplayValue('New title')).toBeDefined() - }) -}) diff --git a/src/renderer/src/components/dictation/use-hold-dictation-gesture.test.tsx b/src/renderer/src/components/dictation/use-hold-dictation-gesture.test.tsx deleted file mode 100644 index 961152c20b4..00000000000 --- a/src/renderer/src/components/dictation/use-hold-dictation-gesture.test.tsx +++ /dev/null @@ -1,257 +0,0 @@ -// @vitest-environment happy-dom - -import { act } from 'react' -import { createRoot, type Root } from 'react-dom/client' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type { DictationState } from '../../../../shared/speech-types' -import type { GlobalSettings } from '../../../../shared/global-settings-types' -import { getDefaultSettings, getDefaultVoiceSettings } from '../../../../shared/constants' -import { useHoldDictationGesture } from './use-hold-dictation-gesture' -import { dictationShortcutModeSettings } from '../../../../shared/dictation-shortcut-mode' - -const originalUserAgent = navigator.userAgent - -let root: Root | null = null -let container: HTMLDivElement | null = null -let dictationState: DictationState -let dictationMode: 'auto' | 'hold' -let terminalShortcutPolicy: 'orca-first' | 'terminal-first' -let startDictation: ReturnType void>> -let stopDictation: ReturnType void>> - -function setUserAgent(userAgent: string): void { - Object.defineProperty(navigator, 'userAgent', { - configurable: true, - value: userAgent - }) -} - -function holdSettings(): GlobalSettings { - return { - ...getDefaultSettings('/home/test'), - terminalShortcutPolicy, - voice: { - ...getDefaultVoiceSettings(), - enabled: true, - sttModel: 'test-model', - ...dictationShortcutModeSettings(dictationMode) - } - } -} - -function Probe(): null { - useHoldDictationGesture({ - canStartDictation: () => dictationState === 'idle', - isDictationUnderway: () => dictationState === 'starting' || dictationState === 'listening', - keybindings: {}, - settings: holdSettings(), - startDictation, - stopDictation - }) - return null -} - -function dispatchKeyDown(init: KeyboardEventInit): KeyboardEvent { - const event = new KeyboardEvent('keydown', { bubbles: true, cancelable: true, ...init }) - window.dispatchEvent(event) - return event -} - -function dispatchKeyUp(init: KeyboardEventInit): KeyboardEvent { - const event = new KeyboardEvent('keyup', { bubbles: true, cancelable: true, ...init }) - window.dispatchEvent(event) - return event -} - -async function renderProbe(): Promise { - container = document.createElement('div') - document.body.appendChild(container) - root = createRoot(container) - await act(async () => { - root?.render() - }) -} - -function beginHold(init: KeyboardEventInit = {}): void { - act(() => { - dispatchKeyDown({ key: 'e', code: 'KeyE', metaKey: true, ...init }) - }) - dictationState = 'listening' -} - -beforeEach(() => { - setUserAgent('Mozilla/5.0 (Macintosh; Intel Mac OS X 14_0)') - dictationState = 'idle' - dictationMode = 'hold' - terminalShortcutPolicy = 'orca-first' - startDictation = vi.fn<() => void>() - stopDictation = vi.fn<() => void>() -}) - -afterEach(async () => { - if (root) { - await act(async () => { - root?.unmount() - }) - } - root = null - container?.remove() - container = null - setUserAgent(originalUserAgent) - vi.clearAllMocks() -}) - -describe('useHoldDictationGesture', () => { - it('stops after a layout-aware shortcut key release drops the modifier flag', async () => { - await renderProbe() - - beginHold({ key: 'e', code: 'KeyD' }) - - act(() => { - dispatchKeyUp({ key: 'e', code: 'KeyD', metaKey: false }) - }) - - expect(startDictation).toHaveBeenCalledTimes(1) - expect(stopDictation).toHaveBeenCalledTimes(1) - }) - - it('stops when the required modifier is released before the shortcut key', async () => { - await renderProbe() - - beginHold() - - act(() => { - dispatchKeyUp({ key: 'Meta', code: 'MetaLeft', metaKey: false }) - }) - - expect(startDictation).toHaveBeenCalledTimes(1) - expect(stopDictation).toHaveBeenCalledTimes(1) - }) - - it('keeps a held dictation when its callbacks and keybindings are re-created', async () => { - await renderProbe() - - beginHold() - - const firstStopDictation = stopDictation - startDictation = vi.fn<() => void>() - stopDictation = vi.fn<() => void>() - await act(async () => { - root?.render() - }) - - expect(firstStopDictation).not.toHaveBeenCalled() - expect(stopDictation).not.toHaveBeenCalled() - - act(() => { - dispatchKeyUp({ key: 'e', code: 'KeyE', metaKey: false }) - }) - - expect(stopDictation).toHaveBeenCalledTimes(1) - }) - - it('does not restart from key repeat after dictation stopped on its own', async () => { - await renderProbe() - - beginHold() - dictationState = 'idle' - - act(() => { - dispatchKeyDown({ key: 'e', code: 'KeyE', metaKey: true, repeat: true }) - }) - - expect(startDictation).toHaveBeenCalledTimes(1) - }) -}) - -describe('useHoldDictationGesture in Auto mode', () => { - let now = 0 - - beforeEach(() => { - dictationMode = 'auto' - now = 1000 - vi.spyOn(performance, 'now').mockImplementation(() => now) - }) - - it('keeps recording after a tap and stops on the next press', async () => { - await renderProbe() - - // macOS drops the E keyup under Cmd, so the tap ends only when Cmd lets go. - beginHold() - now += 600 - act(() => { - dispatchKeyUp({ key: 'Meta', code: 'MetaLeft', metaKey: false }) - }) - expect(stopDictation).not.toHaveBeenCalled() - - act(() => { - dispatchKeyDown({ key: 'e', code: 'KeyE', metaKey: true }) - }) - expect(startDictation).toHaveBeenCalledTimes(1) - expect(stopDictation).toHaveBeenCalledTimes(1) - }) - - it('stops on release after a press held for 300 ms', async () => { - await renderProbe() - - beginHold() - now += 300 - act(() => { - dispatchKeyDown({ key: 'e', code: 'KeyE', metaKey: true, repeat: true }) - }) - act(() => { - dispatchKeyUp({ key: 'Meta', code: 'MetaLeft', metaKey: false }) - }) - - expect(startDictation).toHaveBeenCalledTimes(1) - expect(stopDictation).toHaveBeenCalledTimes(1) - }) - - it('starts a hold pressed while the last dictation was still finishing', async () => { - await renderProbe() - dictationState = 'stopping' - - act(() => { - dispatchKeyDown({ key: 'e', code: 'KeyE', metaKey: true }) - }) - dictationState = 'idle' - act(() => { - dispatchKeyDown({ key: 'e', code: 'KeyE', metaKey: true, repeat: true }) - }) - - expect(stopDictation).not.toHaveBeenCalled() - expect(startDictation).toHaveBeenCalledTimes(1) - }) - - it('leaves the shortcut to the IME while composing', async () => { - await renderProbe() - - const event = dispatchKeyDown({ key: 'e', code: 'KeyE', metaKey: true, isComposing: true }) - - expect(event.defaultPrevented).toBe(false) - expect(startDictation).not.toHaveBeenCalled() - }) - - it('leaves the shortcut to a terminal that owns its keys', async () => { - terminalShortcutPolicy = 'terminal-first' - await renderProbe() - const terminalInput = document.createElement('textarea') - terminalInput.className = 'xterm-helper-textarea' - document.body.appendChild(terminalInput) - - const event = new KeyboardEvent('keydown', { - bubbles: true, - cancelable: true, - key: 'e', - code: 'KeyE', - metaKey: true - }) - act(() => { - terminalInput.dispatchEvent(event) - }) - terminalInput.remove() - - expect(event.defaultPrevented).toBe(false) - expect(startDictation).not.toHaveBeenCalled() - }) -}) diff --git a/src/renderer/src/components/editor/markdown-preview/document-worker/markdown-preview-document-client.test.ts b/src/renderer/src/components/editor/markdown-preview/document-worker/markdown-preview-document-client.test.ts deleted file mode 100644 index 30b82b77773..00000000000 --- a/src/renderer/src/components/editor/markdown-preview/document-worker/markdown-preview-document-client.test.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { afterEach, describe, expect, it, vi } from 'vitest' -import { MarkdownPreviewDocumentClient } from './markdown-preview-document-client' -import { - MARKDOWN_PREVIEW_WORKER_TIMEOUT_MS, - type MarkdownPreviewWorkerResult -} from './markdown-preview-document-types' - -class WorkerTransport extends EventTarget implements Worker { - onmessage: Worker['onmessage'] = null - onerror: Worker['onerror'] = null - onmessageerror: Worker['onmessageerror'] = null - postMessage = vi.fn<(message: unknown) => void>() - terminate = vi.fn() - reply(result: MarkdownPreviewWorkerResult): void { - this.onmessage?.(new MessageEvent('message', { data: result })) - } -} - -afterEach(() => vi.useRealTimers()) -describe('Markdown preview worker ownership', () => { - it('cancels a timed-out search without terminating a working preview', async () => { - vi.useFakeTimers() - const worker = new WorkerTransport() - const failure = vi.fn() - const client = new MarkdownPreviewDocumentClient(worker, failure) - const search = client.request({ type: 'search', query: 'needle' }).catch((error) => error) - await vi.advanceTimersByTimeAsync(MARKDOWN_PREVIEW_WORKER_TIMEOUT_MS) - expect(await search).toEqual(new Error('Preview search timed out.')) - expect(worker.postMessage).toHaveBeenLastCalledWith({ id: 2, type: 'cancel-search' }) - expect(worker.terminate).not.toHaveBeenCalled() - expect(failure).not.toHaveBeenCalled() - worker.reply({ id: 1, type: 'search', matches: [], truncated: false }) - const blocks = client.request({ type: 'blocks', indices: [0] }) - worker.reply({ id: 3, type: 'blocks', blocks: [] }) - expect(await blocks).toMatchObject({ type: 'blocks' }) - expect(vi.getTimerCount()).toBe(0) - client.close() - }) -}) diff --git a/src/renderer/src/components/feature-tips/feature-tip-startup-gate.test.ts b/src/renderer/src/components/feature-tips/feature-tip-startup-gate.test.ts deleted file mode 100644 index 9a33ceba369..00000000000 --- a/src/renderer/src/components/feature-tips/feature-tip-startup-gate.test.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { afterEach, expect, it, vi } from 'vitest' -import { createGlobalSettingsFixture } from '../../../../shared/global-settings-test-fixture' -import { getDefaultVoiceSettings } from '../../../../shared/constants' -import { useAppStore } from '../../store' -import { getPendingFeatureTips } from './feature-tip-startup-gate' - -afterEach(() => { - useAppStore.setState(useAppStore.getInitialState(), true) - vi.unstubAllGlobals() -}) - -it('offers the rollout after historical completion and consumes only its own exposure', () => { - vi.stubGlobal('window', { api: { ui: { set: vi.fn().mockResolvedValue(undefined) } } }) - const settings = createGlobalSettingsFixture({ - voice: { ...getDefaultVoiceSettings(), enabled: true }, - aiVaultSearch: { enabled: true, historyDays: null }, - telemetry: { - optedIn: true, - installId: 'install', - existedBeforeTelemetryRelease: true, - chatUiLaunchTipCohort: 'control', - chatUiLaunchTipRolloutCohort: 'treatment' - } - }) - useAppStore.setState({ - settings, - featureTipsSeenIds: ['chat-ui-here', 'cmd-j-palette'] - }) - const pendingTipIds = () => - getPendingFeatureTips({ - seenTipIds: useAppStore.getState().featureTipsSeenIds, - cliInstalled: true, - featureInteractions: {}, - chatUiLaunchTipVariant: 'chat-ui-off', - settings, - webClient: false - }).map((tip) => tip.id) - - expect(pendingTipIds()).toEqual(['chat-ui-here']) - useAppStore.getState().markFeatureTipsSeen(['chat-ui-here']) - expect(useAppStore.getState().featureTipsSeenIds).toEqual([ - 'chat-ui-here', - 'cmd-j-palette', - 'chat-ui-here-rollout-v1' - ]) - expect(pendingTipIds()).toEqual([]) -}) diff --git a/src/renderer/src/components/github-item-dialog/load-item-details/work-item-details-issue-target.test.ts b/src/renderer/src/components/github-item-dialog/load-item-details/work-item-details-issue-target.test.ts deleted file mode 100644 index 81baee6bf4c..00000000000 --- a/src/renderer/src/components/github-item-dialog/load-item-details/work-item-details-issue-target.test.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' - -import { - getWorkItemDetailsCacheKey, - invalidateWorkItemDetailsCacheByMatch, - touchWorkItemDetailsCache, - workItemDetailsCache -} from './work-item-details-cache' - -vi.mock('@/lib/work-items/github/github-work-item-details-cache-events', () => ({ - onGitHubWorkItemDetailsCacheMutation: vi.fn() -})) - -const keyArgs = { - repoId: 'repo-1', - repoPath: '/home/fixture/widgets', - type: 'issue' as const, - number: 12, - issueSourcePreference: 'origin' -} -const ORIGIN = { owner: 'fork-owner', repo: 'widgets', host: 'github.com' } -const UPSTREAM = { owner: 'upstream-owner', repo: 'widgets', host: 'github.com' } - -describe('issue detail cache repository identity', () => { - it('invalidates both repository variants after a mutation', () => { - const originKey = getWorkItemDetailsCacheKey({ ...keyArgs, ownerRepo: ORIGIN }) - const upstreamKey = getWorkItemDetailsCacheKey({ ...keyArgs, ownerRepo: UPSTREAM }) - touchWorkItemDetailsCache(originKey, { details: null, fetchedAt: 0 }) - touchWorkItemDetailsCache(upstreamKey, { details: null, fetchedAt: 0 }) - - invalidateWorkItemDetailsCacheByMatch(keyArgs) - - expect(workItemDetailsCache.has(originKey)).toBe(false) - expect(workItemDetailsCache.has(upstreamKey)).toBe(false) - }) -}) diff --git a/src/renderer/src/components/integrations/task-trackers/linear-integration-card.test.tsx b/src/renderer/src/components/integrations/task-trackers/linear-integration-card.test.tsx deleted file mode 100644 index 586b448eeea..00000000000 --- a/src/renderer/src/components/integrations/task-trackers/linear-integration-card.test.tsx +++ /dev/null @@ -1,145 +0,0 @@ -// @vitest-environment happy-dom - -import { act } from 'react' -import { createRoot, type Root } from 'react-dom/client' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' - -import { i18n, loadRendererUiLanguage } from '@/i18n/i18n' -import { getProviderRuntimeContextKey } from '@/runtime/hosts/observations/provider-runtime-context' -import { TooltipProvider } from '../../ui/tooltip' -import { LinearIntegrationCard } from './linear-integration-card' - -type StoreState = { - linearStatus: { - connected: boolean - workspaces?: { id: string; organizationName: string; displayName: string; email?: string }[] - } - linearStatusChecked: boolean - linearStatusContextKey: string | null - disconnectLinear: () => Promise - disconnectLinearWorkspace: (workspaceId?: string) => Promise - checkLinearConnection: (force?: boolean) => Promise - testLinearConnection: (workspaceId: string) => Promise<{ ok: boolean; error?: string }> - settings: { activeRuntimeEnvironmentId: string | null } - openSettingsPage: () => void - openSettingsTarget: (target: { pane: string; repoId: string | null }) => void -} - -const mocks = vi.hoisted(() => ({ - store: { current: null as StoreState | null } -})) - -vi.mock('@/store/index', () => ({ - useAppStore: Object.assign( - (selector: (state: StoreState) => unknown) => { - if (!mocks.store.current) { - throw new Error('Store state was not installed') - } - return selector(mocks.store.current) - }, - { getState: () => mocks.store.current } - ) -})) - -vi.mock('@/components/linear-api-key-dialog', () => ({ - LinearApiKeyDialog: ({ onConnected }: { onConnected?: () => void }) => ( - - ) -})) - -let root: Root | null = null -let container: HTMLDivElement | null = null - -function installStore( - connected: boolean, - settings: StoreState['settings'] = { activeRuntimeEnvironmentId: null } -): StoreState { - const state: StoreState = { - linearStatus: { - connected, - workspaces: connected - ? [ - { - id: 'workspace-1', - organizationName: 'Acme', - displayName: 'Acme workspace', - email: 'linear@example.test' - } - ] - : [] - }, - linearStatusChecked: true, - linearStatusContextKey: getProviderRuntimeContextKey(settings), - disconnectLinear: vi.fn(async () => {}), - disconnectLinearWorkspace: vi.fn(async () => {}), - checkLinearConnection: vi.fn(async () => {}), - testLinearConnection: vi.fn(async () => ({ ok: true })), - settings, - openSettingsPage: vi.fn(), - openSettingsTarget: vi.fn() - } - mocks.store.current = state - return state -} - -async function renderCard(): Promise { - container = document.createElement('div') - document.body.appendChild(container) - root = createRoot(container) - await act(async () => { - root?.render( - - - - ) - }) - return container -} - -describe('LinearIntegrationCard account scope', () => { - beforeEach(() => { - // Stub the skill scan so the CTA renders setup state rather than a bridge error. - Object.defineProperty(window, 'api', { - configurable: true, - value: { - skills: { discover: async () => ({ skills: [], sources: [], scannedAt: 0 }) } - } - }) - }) - - afterEach(async () => { - if (root) { - await act(async () => { - root?.unmount() - }) - } - root = null - container?.remove() - container = null - mocks.store.current = null - await i18n.changeLanguage(await loadRendererUiLanguage('en')) - Reflect.deleteProperty(window, 'api') - }) - - it('clears verification state after adding another Linear workspace', async () => { - installStore(true) - const rendered = await renderCard() - - await act(async () => { - Array.from(rendered.querySelectorAll('button')) - .find((button) => button.textContent === 'Test') - ?.dispatchEvent(new MouseEvent('click', { bubbles: true })) - }) - expect(rendered.textContent).toContain('Verified') - - await act(async () => { - rendered - .querySelector('[data-testid="simulate-linear-connected"]') - ?.dispatchEvent(new MouseEvent('click', { bubbles: true })) - }) - - expect(rendered.textContent).not.toContain('Verified') - }) -}) diff --git a/src/renderer/src/components/native-chat/usage/NativeChatUsageLimitActions.test.tsx b/src/renderer/src/components/native-chat/usage/NativeChatUsageLimitActions.test.tsx deleted file mode 100644 index c377da829d7..00000000000 --- a/src/renderer/src/components/native-chat/usage/NativeChatUsageLimitActions.test.tsx +++ /dev/null @@ -1,217 +0,0 @@ -// @vitest-environment happy-dom -import type * as OriginalModule0 from '@/runtime/provider-accounts/observations/runtime-provider-accounts-client' -import '@testing-library/jest-dom/vitest' -import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react' -import { afterEach, beforeEach, expect, it, vi } from 'vitest' -import { NativeChatUsageLimitActionsProvider } from './NativeChatUsageLimitActions' -import { NativeChatNoticeRow } from '../messages/notices/NativeChatNoticeRow' -import type { NativeChatOrcaStopView } from '../messages/notices/native-chat-orca-stop-context' -import { TooltipProvider } from '@/components/ui/tooltip' - -import type { NativeChatMessage } from '../../../../../shared/native-chat/native-chat-types' -import type { AgentType } from '../../../../../shared/agent-status/contracts/agent-status-types' -import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target' -import type { AgentSessionStatusSummary } from '../../../../../shared/agent-session/agent-session-wire' -import type { useNativeChatUsageLimitAutoContinue } from './use-native-chat-usage-limit-auto-continue' - -const mocks = vi.hoisted(() => ({ - readSnapshot: { - canSwitchAccount: true, - transcriptPath: '/work/chat.jsonl' - }, - follows: true, - watch: vi.fn(), - options: vi.fn(), - snapshot: vi.fn(), - select: vi.fn(), - dialog: vi.fn() -})) -let status = new Map>() -vi.mock('@/runtime/native-chat/host-capabilities/structured-agent-session-host-capability', () => ({ - useStructuredAgentSessionHostCapabilityState: () => 'supported' -})) -vi.mock('@/runtime/native-chat/status/structured-agent-session-status-feed', () => ({ - getStructuredAgentSessionStatusFeed: () => ({ - activate: () => () => {}, - subscribe: () => () => {}, - getSnapshot: () => status - }) -})) -vi.mock('../../../runtime/native-chat/requests/structured-agent-session-call', () => ({ - callStructuredAgentSession: mocks.options -})) -vi.mock('@/runtime/native-chat/naming/structured-conversation-name', () => ({ - useStructuredChatTabConversationName: () => 'My chat' -})) -vi.mock('../../../runtime/provider-accounts/ownership/use-active-account-owner', () => ({ - useActiveAccountOwner: () => ({ - target: { kind: 'environment', environmentId: 'other' }, - wslHostDistro: null - }) -})) -vi.mock('@/lib/windows-terminal-capabilities', () => ({ - getWindowsTerminalCapabilityOwnerKey: () => 'local', - useWindowsTerminalCapabilities: () => ({ wslDistros: [] }) -})) -vi.mock( - '@/runtime/provider-accounts/observations/runtime-provider-accounts-client', - async (importOriginal) => ({ - ...(await importOriginal()), - fetchProviderAccountsSnapshot: mocks.snapshot, - watchProviderAccounts: mocks.watch, - selectClaudeProviderAccount: mocks.select, - emptyClaudeAccountsState: () => ({ - accounts: [], - activeAccountId: null, - activeAccountIdsByRuntime: { host: null, wsl: {} } - }) - }) -) -vi.mock('@/lib/provider-accounts/claude-account-switch-sessions', () => ({ - handleRunningClaudeSessionsAfterSwitch: vi.fn() -})) -vi.mock('@/components/agent-session-continuation/AgentSessionContinuationDialog', () => ({ - AgentSessionContinuationDialog: (props: { - onOpenChange: (open: boolean) => void - onStarted?: () => void - }) => { - mocks.dialog(props) - return ( - <> - - - - ) - } -})) -beforeEach(() => { - status = new Map() - mocks.options.mockResolvedValue(mocks.readSnapshot) - mocks.watch.mockImplementation((target, handlers) => { - let closed = false - void mocks.snapshot(target).then((value: unknown) => { - if (!closed) { - handlers.onSnapshot(value) - } - }) - return { - close: () => { - closed = true - } - } - }) -}) -afterEach(() => { - cleanup() - vi.clearAllMocks() - vi.useRealTimers() - mocks.follows = true -}) - -function row( - target: RuntimeClientTarget = { kind: 'local' }, - offered = true, - agent: AgentType = 'claude', - messages: readonly NativeChatMessage[] = [], - recovery: Parameters[0]['recovery'] = { - readCurrent: true, - canSwitchAccount: mocks.follows - }, - automatic?: ReturnType -) { - const view: NativeChatOrcaStopView = { - hostLabel: null, - remoteHost: target.kind !== 'local', - continueAvailable: false, - offeredTurnItemId: null, - continueNow: vi.fn(), - usageLimitTurnItemId: offered ? 'cut' : null, - usageLimitAutoContinue: automatic, - onUsageLimitHandOffStarted: automatic?.kind === 'scheduled' ? automatic.cancel : undefined, - continueUsageLimit: vi.fn() - } - return ( - - - - - - ) -} -function expectInlineActions(accountName: string | null) { - const leadIn = screen.getByText('Continue this chat without waiting:') - const actions = leadIn.parentElement - const handOff = screen.getByRole('button', { name: 'Hand Off to Another Agent' }) - const account = accountName ? screen.getByRole('button', { name: accountName }) : null - expect(actions).toHaveClass('flex', 'flex-wrap', 'items-center') - expect(Array.from(actions?.children ?? [])).toEqual([ - leadIn, - ...(account ? [account.parentElement] : []), - handOff - ]) - if (account) { - expect(account.parentElement).toHaveClass('w-32', 'shrink-0') - } -} -it('admits one preparation and discards it after Continue supersedes the cut', async () => { - let answer: (value: typeof mocks.readSnapshot) => void = () => {} - mocks.options.mockImplementation( - () => - new Promise((resolve) => { - answer = resolve - }) - ) - mocks.follows = false - const view = render(row()) - expect( - screen.getByText('Continue this chat without waiting:').parentElement?.querySelector('.w-32') - ).toBeNull() - expectInlineActions(null) - const button = screen.getByRole('button', { name: 'Hand Off to Another Agent' }) - fireEvent.click(button) - fireEvent.click(button) - expect(mocks.options).toHaveBeenCalledTimes(1) - expect(button).toBeDisabled() - view.rerender(row({ kind: 'local' }, false)) - answer(mocks.readSnapshot) - await waitFor(() => expect(mocks.dialog).not.toHaveBeenCalled()) - view.rerender(row()) - mocks.options.mockResolvedValue(mocks.readSnapshot) - fireEvent.click(screen.getByRole('button', { name: 'Hand Off to Another Agent' })) - await screen.findByText('Cancel hand-off') - fireEvent.click(screen.getByText('Cancel hand-off')) - expect(screen.queryByText('Cancel hand-off')).toBeNull() -}) diff --git a/src/renderer/src/components/plugins/frames/plugin-frame-host-declarative.test.ts b/src/renderer/src/components/plugins/frames/plugin-frame-host-declarative.test.ts deleted file mode 100644 index 6befaf7c128..00000000000 --- a/src/renderer/src/components/plugins/frames/plugin-frame-host-declarative.test.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' - -import { createPluginFrameEnvelopeHandler, type PluginFrameHostOptions } from './plugin-frame-host' -import { pluginWebviewFrameWindow } from './plugin-frame-host-lanes' - -vi.mock('./plugin-panel-design-token-css', () => ({ - currentPluginFrameTheme: () => ({ colorScheme: 'dark', tokens: '' }) -})) - -const guestContext = { userActivation: true, transport: 'guest' as const } -const flush = (): Promise => new Promise((resolve) => setTimeout(resolve, 0)) - -function declarativeGuest(overrides: Partial = {}) { - const webview = { send: vi.fn() } - const onRender = vi.fn() - const onRefused = vi.fn() - const callHostMethod = vi.fn().mockResolvedValue({ ok: true, value: null }) - const handle = createPluginFrameEnvelopeHandler({ - surface: 'panel', - getFrameWindow: () => pluginWebviewFrameWindow(webview), - getSessionToken: () => 'token', - callHostMethod, - declarative: { onRender, onError: vi.fn(), onRefused }, - ...overrides - }) - const render = (tree: unknown, revision = 1) => - handle({ orca: 1, kind: 'evt', event: 'ui.render', payload: { revision, tree } }, guestContext) - return { handle, render, onRender, onRefused, callHostMethod, webview } -} - -describe('declarative render lane', () => { - it("ignores the hidden guest's own activation for user-gesture methods", async () => { - const consumeHostActivation = vi.fn(() => false) - const { handle, callHostMethod } = declarativeGuest({ consumeHostActivation }) - const open = (id: number) => ({ - orca: 1, - kind: 'req', - id, - method: 'shell.openExternal', - params: { url: 'https://example.com' } - }) - handle(open(1), guestContext) - await flush() - expect(callHostMethod).not.toHaveBeenCalled() - consumeHostActivation.mockReturnValue(true) - handle(open(2), { userActivation: false, transport: 'guest' }) - await flush() - expect(callHostMethod).toHaveBeenCalledOnce() - }) -}) diff --git a/src/renderer/src/components/right-sidebar/ai-vault/scanning/ai-vault-session-publication-gate.test.ts b/src/renderer/src/components/right-sidebar/ai-vault/scanning/ai-vault-session-publication-gate.test.ts deleted file mode 100644 index f01e17da20b..00000000000 --- a/src/renderer/src/components/right-sidebar/ai-vault/scanning/ai-vault-session-publication-gate.test.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { afterEach, describe, expect, it, vi } from 'vitest' -import { - markInputQuietSchedulerInput, - resetInputQuietSchedulerForTest -} from '@/lib/input-quiet-scheduler' -import type { AiVaultListResult } from '../../../../../../shared/ai-vault/contracts/ai-vault-types' -import { AiVaultSessionPublicationGate } from './ai-vault-session-publication-gate' - -const FIRST: AiVaultListResult = { sessions: [], issues: [], scannedAt: '2026-08-09T00:00:00.000Z' } -const SECOND: AiVaultListResult = { ...FIRST, scannedAt: '2026-08-09T00:00:01.000Z' } - -afterEach(() => { - vi.useRealTimers() - resetInputQuietSchedulerForTest() -}) - -describe('AiVaultSessionPublicationGate', () => { - // A chat-link snapshot right after a restart cancels the gate; it must not drop the saved list. - it('shows a late saved list after a cancel but never over a newer published list', async () => { - const shown = vi.fn() - const gate = new AiVaultSessionPublicationGate() - gate.showUntilPublished(Promise.resolve(FIRST), shown) - gate.cancel() - await Promise.resolve() - expect(shown).toHaveBeenCalledWith(FIRST) - - const late = vi.fn() - gate.showUntilPublished(Promise.resolve(FIRST), late) - gate.publish(SECOND, vi.fn()) - await Promise.resolve() - expect(late).not.toHaveBeenCalled() - }) - - it('still shows a late saved list when the list published meanwhile was cancelled before it landed', async () => { - vi.useFakeTimers() - const shown = vi.fn() - const published = vi.fn() - const gate = new AiVaultSessionPublicationGate() - gate.showUntilPublished(Promise.resolve(FIRST), shown) - markInputQuietSchedulerInput() - gate.publish(SECOND, published) - gate.cancel() - await Promise.resolve() - vi.advanceTimersByTime(1_000) - - expect(published).not.toHaveBeenCalled() - expect(shown).toHaveBeenCalledWith(FIRST) - }) -}) diff --git a/src/renderer/src/components/right-sidebar/checks-panel/comments/pr-comments-ai-launch-ack.test.ts b/src/renderer/src/components/right-sidebar/checks-panel/comments/pr-comments-ai-launch-ack.test.ts deleted file mode 100644 index 265146d1e6e..00000000000 --- a/src/renderer/src/components/right-sidebar/checks-panel/comments/pr-comments-ai-launch-ack.test.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { describe, expect, it } from 'vitest' -import type { PRComment } from '../../../../../../shared/github/comment-types' -import { - canPostPRReviewThreadReply, - resolvePRReviewReplyThreadId -} from './pr-comments-ai-launch-ack' - -function comment(overrides: Partial = {}): PRComment { - return { - id: 1, - author: 'alice', - authorAvatarUrl: '', - body: 'Please update this.', - createdAt: '2026-05-14T00:00:00Z', - url: 'https://github.com/acme/widgets/pull/42#discussion_r1', - ...overrides - } -} - -describe('canPostPRReviewThreadReply', () => { - // Review-summary anchors override thread metadata; their IDs would 404 on the nested replies endpoint. - it('rejects review summaries even when thread metadata is present', () => { - expect( - canPostPRReviewThreadReply( - comment({ - id: 5, - threadId: 'T1', - path: 'src/a.ts', - url: 'https://github.com/acme/widgets/pull/42#pullrequestreview-999' - }) - ) - ).toBe(false) - }) -}) - -describe('resolvePRReviewReplyThreadId', () => { - it('refuses a path-only match when the file holds several threads', () => { - const existing = [ - comment({ id: 1, threadId: 'T_one', path: 'src/a.ts', line: 3 }), - comment({ id: 2, threadId: 'T_two', path: 'src/a.ts', line: 40 }) - ] - expect( - resolvePRReviewReplyThreadId({ - parent: comment({ id: 50, path: 'src/a.ts', line: undefined }), - existingComments: existing - }) - ).toBeUndefined() - // A line-scoped parent still matches its own thread. - expect( - resolvePRReviewReplyThreadId({ - parent: comment({ id: 50, path: 'src/a.ts', line: 40 }), - existingComments: existing - }) - ).toBe('T_two') - }) -}) diff --git a/src/renderer/src/components/right-sidebar/checks-panel/logs/check-log-initial-diagnostic-position.test.ts b/src/renderer/src/components/right-sidebar/checks-panel/logs/check-log-initial-diagnostic-position.test.ts deleted file mode 100644 index 4d478c5ed82..00000000000 --- a/src/renderer/src/components/right-sidebar/checks-panel/logs/check-log-initial-diagnostic-position.test.ts +++ /dev/null @@ -1,36 +0,0 @@ -// @vitest-environment happy-dom -import { describe, expect, it } from 'vitest' -import { PR_CHECK_LOG_TAIL_EARLIER_SEPARATOR as separator } from '../../../../../../shared/source-control/checks/logs/check-job-log-tail-slice' -import { findInitialCheckLogDiagnostic } from './check-log-initial-diagnostic-position' - -describe('synthetic diagnostic excerpts', () => { - it('keeps an inline diagnostic with stack context ahead of a later standalone error', () => { - const text = '[worker] failed TypeError: invalid argument\n at worker.ts:3:4\nError: later' - const anchor = findInitialCheckLogDiagnostic(text) - expect(anchor && text.slice(anchor.start, anchor.end)).toBe('TypeError: invalid argument') - expect(anchor && text.slice(anchor.nearbyStackStart, anchor.nearbyStackEnd)).toBe( - ' at worker.ts:3:4' - ) - }) - - it('does not borrow a diagnostic or its frame from across the omission boundary', () => { - const text = `[worker] caught Error: expected\n${separator}\nError: failed to open database at database.ts:4:5\n at real.ts:8:9` - const anchor = findInitialCheckLogDiagnostic(text) - expect(anchor && text.slice(anchor.start, anchor.end)).toBe( - 'Error: failed to open database at database.ts:4:5' - ) - expect(anchor && text.slice(anchor.nearbyStackStart, anchor.nearbyStackEnd)).toBe( - ' at real.ts:8:9' - ) - const fallback = findInitialCheckLogDiagnostic( - `[worker] caught Error: expected\n${separator}\n at real.ts:8:9` - ) - expect(fallback?.nearbyStackStart).toBeUndefined() - }) - - it('retains unframed inline diagnostics as the recent-segment fallback', () => { - const text = `Error: earlier failure\n${separator}\n[worker] failed EACCES: open database\n##[error]Process completed with exit code 1` - const anchor = findInitialCheckLogDiagnostic(text) - expect(anchor && text.slice(anchor.start, anchor.end)).toBe('EACCES: open database') - }) -}) diff --git a/src/renderer/src/components/right-sidebar/source-control/listing/open-uncommitted-entry.test.ts b/src/renderer/src/components/right-sidebar/source-control/listing/open-uncommitted-entry.test.ts deleted file mode 100644 index cbe7b2d0d71..00000000000 --- a/src/renderer/src/components/right-sidebar/source-control/listing/open-uncommitted-entry.test.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' -import { createEditorStore } from '@/store/slices/editor/editor-slice-test-harness' -import type { GitStatusEntry } from '../../../../../../shared/git/status/git-status-types' -import { openUncommittedEntry } from './open-uncommitted-entry' - -vi.mock('sonner', () => ({ toast: { error: vi.fn() } })) -vi.mock('@/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab', () => ({ - notifyHostOfMirroredEditorClose: vi.fn() -})) - -function markdownEntry(overrides: Partial = {}): GitStatusEntry { - return { - path: 'docs/new.md', - status: 'untracked', - area: 'untracked', - ...overrides - } -} - -describe('openUncommittedEntry', () => { - it.each(['source', 'changes'] as const)('preserves an explicit %s choice on reselect', (mode) => { - const store = createEditorStore() - const entry = markdownEntry() - openUncommittedEntry(store.getState(), 'wt-1', '/repo', entry) - const fileId = store.getState().openFiles[0].id - if (mode === 'changes') { - store.getState().setEditorViewMode(fileId, 'changes') - } else { - store.getState().setMarkdownViewMode(fileId, 'source') - } - - openUncommittedEntry(store.getState(), 'wt-1', '/repo', entry) - - const state = store.getState() - expect(state.openFiles).toHaveLength(1) - expect(mode === 'changes' ? state.editorViewMode[fileId] : state.markdownViewMode[fileId]).toBe( - mode - ) - }) -}) diff --git a/src/renderer/src/components/settings/accounts/AccountsPane.owner-scope.test.tsx b/src/renderer/src/components/settings/accounts/AccountsPane.owner-scope.test.tsx deleted file mode 100644 index 1d1cc3b2c25..00000000000 --- a/src/renderer/src/components/settings/accounts/AccountsPane.owner-scope.test.tsx +++ /dev/null @@ -1,215 +0,0 @@ -// @vitest-environment happy-dom -import '@testing-library/jest-dom/vitest' -import { act, cleanup, fireEvent, render, screen, within } from '@testing-library/react' -import { afterEach, beforeEach, expect, it, vi } from 'vitest' -import { toast } from 'sonner' -import { i18n } from '@/i18n/i18n' -import { getDefaultSettings } from '../../../../../shared/constants' -import type { - ClaudeManagedAccountSummary, - ClaudeRateLimitAccountsState -} from '../../../../../shared/managed-account-types' -import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target' -import { AccountsPane } from './AccountsPane' -import type { SettingsHostScope } from '../host-scope/settings-host-scope' -import type { SettingsNavigationTarget } from '@/lib/settings-navigation-types' - -// Why: focus deliberately points at another server; the pane must follow hostScope only. -const focusedElsewhere = { - ...getDefaultSettings('/synthetic'), - activeRuntimeEnvironmentId: 'focused-server' -} -const scopeFor = (environmentId: string | null): SettingsHostScope => ({ - target: environmentId ? { kind: 'environment', environmentId } : { kind: 'local' }, - available: true -}) -const renderPane = (scope: SettingsHostScope): React.JSX.Element => ( - -) - -const fake = vi.hoisted(() => { - const state: { - query: string - pendingSelect: ((roster: unknown) => void) | null - write: ReturnType - add: ReturnType - navigate: (target: SettingsNavigationTarget) => void - rosters: Map - watchedTargets: unknown[] - selects: unknown[][] - } = { - query: 'claude', - pendingSelect: null, - write: vi.fn(), - add: vi.fn(), - navigate: () => {}, - rosters: new Map(), - watchedTargets: [], - selects: [] - } - return state -}) -vi.mock('sonner', () => ({ toast: { error: vi.fn(), success: vi.fn(), info: vi.fn() } })) -vi.mock('@/store/index', () => ({ - useAppStore: (selector: (state: Record) => unknown) => - selector({ - settingsSearchQuery: fake.query, - settings: focusedElsewhere, - openSettingsTarget: (target: SettingsNavigationTarget) => fake.navigate(target), - openSettingsPage: fake.write, - rateLimits: { - codex: null, - codexTarget: { runtime: 'host', wslDistro: null }, - minimax: null, - cursor: { updatedAt: 0 }, - grok: { updatedAt: 0 }, - inactiveClaudeAccounts: [], - claudeTarget: { runtime: 'host', wslDistro: null } - }, - runtimeEnvironments: [], - runtimeStatusByEnvironmentId: new Map(), - recordFeatureInteraction: fake.write, - fetchSettings: fake.write, - fetchInactiveClaudeAccountUsage: fake.write - }) -})) -vi.mock('@/runtime/provider-accounts/sign-in/runtime-antigravity-accounts-client', () => ({ - callAntigravityAccounts: vi.fn(), - callAntigravityChatSignIn: vi.fn(), - subscribeAntigravityChatSignIn: vi.fn() -})) -vi.mock('@/runtime/provider-accounts/observations/runtime-provider-accounts-client', () => { - const empty = () => ({ - accounts: [], - activeAccountId: null, - activeAccountIdsByRuntime: { host: null, wsl: {} } - }) - return { - emptyClaudeAccountsState: empty, - emptyCodexAccountsState: empty, - getProviderAccountsOwnerKey: (target: RuntimeClientTarget) => - target.kind === 'environment' ? target.environmentId : 'local', - watchProviderAccounts: ( - target: RuntimeClientTarget, - handlers: { onSnapshot: (snapshot: unknown) => void } - ) => { - fake.watchedTargets.push(target) - handlers.onSnapshot({ - claude: fake.rosters.get(target.kind === 'environment' ? target.environmentId : 'local'), - codex: empty(), - rateLimits: null - }) - return { close: vi.fn() } - }, - fetchProviderAccountsSnapshot: async (target: RuntimeClientTarget) => ({ - claude: fake.rosters.get(target.kind === 'environment' ? target.environmentId : 'local') - }), - selectClaudeProviderAccount: (...args: unknown[]) => { - fake.selects.push(args) - return new Promise((resolve) => { - fake.pendingSelect = resolve - }) - }, - selectCodexProviderAccount: fake.write, - removeClaudeProviderAccount: fake.write, - removeCodexProviderAccount: fake.write - } -}) - -function claudeRoster(id: string, email: string, active: boolean): ClaudeRateLimitAccountsState { - const account: ClaudeManagedAccountSummary = { - id, - email, - authMethod: 'subscription-oauth', - createdAt: 1, - updatedAt: 1, - lastAuthenticatedAt: 1 - } - const activeId = active ? id : null - return { - accounts: [account], - activeAccountId: activeId, - activeAccountIdsByRuntime: { host: activeId, wsl: {} } - } -} - -vi.mock('@/lib/provider-accounts/claude-account-switch-sessions', () => ({ - handleRunningClaudeSessionsAfterSwitch: vi.fn(async () => 'no-running-sessions') -})) -vi.mock('../../../runtime/provider-accounts/ownership/use-active-account-owner', () => ({ - useActiveAccountOwner: () => ({ target: { kind: 'local' }, wslHostDistro: null }) -})) -vi.mock('@/lib/windows-terminal-capabilities', () => ({ - getWindowsTerminalCapabilityOwnerKey: () => 'local', - useWindowsTerminalCapabilities: () => ({ wslDistros: ['Ubuntu'] }) -})) - -beforeEach(async () => { - await i18n.changeLanguage('en') - vi.mocked(toast.error).mockClear() - fake.query = 'claude' - fake.write.mockClear() - fake.add.mockReset() - fake.add.mockImplementation(async () => fake.rosters.get('local')) - fake.pendingSelect = null - fake.watchedTargets = [] - fake.selects = [] - fake.rosters.set('local', claudeRoster('acct-l', 'local@desktop.test', false)) - fake.rosters.set('server-a', claudeRoster('acct-a', 'alpha@server-a.test', false)) - fake.rosters.set('server-b', claudeRoster('acct-b', 'beta@server-b.test', false)) - Object.assign(window, { - api: { - claudeAccounts: { add: fake.add }, - minimaxCredentials: { - getStatus: vi.fn(async () => ({ cookieConfigured: false, apiKeyConfigured: false })) - }, - codexConfigSync: { - status: vi.fn(async () => ({ state: 'synced', reason: null, systemConfigPath: '/x' })) - } - } - }) -}) -afterEach(() => { - cleanup() - vi.restoreAllMocks() - Reflect.deleteProperty(window, 'api') -}) - -it("drops a server's late account result after the page moves to another server", async () => { - const view = render(renderPane(scopeFor('server-a'))) - await act(async () => {}) - fireEvent.click(screen.getByText('alpha@server-a.test')) - expect(fake.pendingSelect).not.toBeNull() - - await act(async () => view.rerender(renderPane(scopeFor('server-b')))) - expect(screen.getByText('beta@server-b.test')).toBeTruthy() - - await act(async () => fake.pendingSelect?.(claudeRoster('acct-a', 'alpha@server-a.test', true))) - - expect(screen.queryByText('alpha@server-a.test')).toBeNull() - expect(screen.getByText('beta@server-b.test')).toBeTruthy() -}) - -it('keeps a late account result once the pane is back on the server it was sent to', async () => { - const view = render(renderPane(scopeFor('server-a'))) - await act(async () => {}) - fireEvent.click(screen.getByText('alpha@server-a.test')) - for (const environmentId of ['server-b', 'server-a']) { - await act(async () => view.rerender(renderPane(scopeFor(environmentId)))) - } - const alphaRow = (): HTMLElement => { - const row = screen.getByText('alpha@server-a.test').closest('button') - expect(row).not.toBeNull() - return row ?? document.body - } - expect(within(alphaRow()).queryByText('Active')).toBeNull() - - await act(async () => fake.pendingSelect?.(claudeRoster('acct-a', 'alpha@server-a.test', true))) - - expect(within(alphaRow()).getByText('Active')).toBeTruthy() -}) diff --git a/src/renderer/src/components/sidebar/workspace-board/search/workspace-kanban-search.test.ts b/src/renderer/src/components/sidebar/workspace-board/search/workspace-kanban-search.test.ts deleted file mode 100644 index 925c9c877e9..00000000000 --- a/src/renderer/src/components/sidebar/workspace-board/search/workspace-kanban-search.test.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { describe, expect, it } from 'vitest' - -import type { Repo } from '../../../../../../shared/repo-types' -import type { Worktree } from '../../../../../../shared/worktree/types' -import { getWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity' -import { matchWorkspaceBoardWorktrees } from './workspace-kanban-search' - -function worktree(overrides: Partial & { id: string }): Worktree { - return { - repoId: 'repo-a', - displayName: 'Workspace', - path: `/${overrides.id}`, - branch: 'main', - baseBranch: 'main', - isPinned: false, - sortOrder: 1, - hostId: 'local', - ...overrides - } as Worktree -} - -const repoMap = new Map([ - ['repo-a', { id: 'repo-a', displayName: 'orca' } as Repo], - ['repo-b', { id: 'repo-b', displayName: 'atlas' } as Repo] -]) - -function match(worktrees: Worktree[], query: string): ReadonlySet | null { - return matchWorkspaceBoardWorktrees({ worktrees, query, repoMap }) -} - -function identities(...worktrees: Worktree[]): Set { - return new Set(worktrees.map(getWorktreeHostIdentity)) -} - -describe('matchWorkspaceBoardWorktrees', () => { - it('separates two same-id host rows', () => { - const local = worktree({ id: 'shared', branch: 'refs/heads/local-only' }) - const remote = worktree({ - id: local.id, - hostId: 'ssh:box', - branch: 'refs/heads/remote-only' - }) - - expect(match([local, remote], 'local-only')).toEqual(identities(local)) - expect(match([local, remote], 'remote-only')).toEqual(identities(remote)) - expect(match([local], 'local-only')).toEqual(identities(local)) - }) -}) diff --git a/src/renderer/src/components/status-bar/ClaudeSwitcherMenu.owner-lifetime.test.tsx b/src/renderer/src/components/status-bar/ClaudeSwitcherMenu.owner-lifetime.test.tsx deleted file mode 100644 index ac375059338..00000000000 --- a/src/renderer/src/components/status-bar/ClaudeSwitcherMenu.owner-lifetime.test.tsx +++ /dev/null @@ -1,164 +0,0 @@ -// @vitest-environment happy-dom -import { act, cleanup, fireEvent, render, screen } from '@testing-library/react' -import { afterEach, expect, it, vi } from 'vitest' -import type { ReactNode } from 'react' -import { useAppStore } from '@/store' -import { getDefaultSettings } from '../../../../shared/constants' -import { - accountHost, - accountTransport -} from '@/runtime/provider-accounts/observations/provider-account-observation.test-fixture' -import { ClaudeSwitcherMenu } from './ClaudeSwitcherMenu' - -const mocks = vi.hoisted(() => ({ rpc: vi.fn() })) -vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({ - callRuntimeRpc: mocks.rpc -})) -vi.mock('@/lib/provider-accounts/claude-account-switch-sessions', () => ({ - handleRunningClaudeSessionsAfterSwitch: vi.fn() -})) -vi.mock('@/lib/windows-terminal-capabilities', () => ({ - useWindowsTerminalCapabilities: () => ({ wslDistros: [], isLoading: false }), - getWindowsTerminalCapabilityOwnerKey: () => 'local' -})) -vi.mock('./ProviderDetailsMenu', () => ({ - ProviderDetailsMenu: ({ children }: { children: ReactNode }) =>
{children}
-})) -vi.mock('@/components/ui/dropdown-menu', () => ({ - DropdownMenuLabel: ({ children }: { children: ReactNode }) =>
{children}
, - DropdownMenuSeparator: () => null, - DropdownMenuItem: ({ - children, - disabled, - onSelect - }: { - children: ReactNode - disabled?: boolean - onSelect: (event: { preventDefault: () => void }) => void - }) => ( -
{ - if (!disabled) { - onSelect({ preventDefault: () => {} }) - } - }} - > - {children} -
- ) -})) -const initial = useAppStore.getState() -afterEach(() => { - cleanup() - useAppStore.setState(initial, true) - vi.clearAllMocks() -}) -function deferred() { - let resolve!: (value: T) => void - let reject!: (error: Error) => void - const promise = new Promise((done, fail) => { - resolve = done - reject = fail - }) - return { promise, resolve, reject } -} -function replacementOwner(id: string | null) { - useAppStore.setState((state) => ({ - settings: { ...state.settings!, activeRuntimeEnvironmentId: id } - })) -} -function row(id: string) { - return screen.getByText(`${id}@example.com`).closest('[role="menuitem"]')! -} -async function expand() { - if (screen.queryByText('b@example.com')) { - return - } - fireEvent.click(screen.getAllByText('a@example.com')[0]) - await act(async () => {}) -} - -it.each([ - ['select', 'resolve'], - ['select', 'reject'], - ['sign-in', 'resolve'], - ['sign-in', 'reject'] -] as const)( - 'retires pending %s with its owner after late %s and admits a replacement action', - async (operation, settlement) => { - const local = accountHost(), - a = accountHost(), - b = accountHost() - const transport = accountTransport({ a, b }) - const pending = deferred() - const select = vi.fn(() => pending.promise) - const reauthenticate = vi.fn(() => pending.promise) - if (operation === 'sign-in') { - local.snapshot.claude.accounts[1].needsSignIn = true - } - Object.defineProperty(window, 'api', { - configurable: true, - value: { - ...window.api, - claudeAccounts: { - ...window.api.claudeAccounts, - list: async () => local.snapshot.claude, - select, - reauthenticate - }, - codexAccounts: { ...window.api.codexAccounts, list: async () => local.snapshot.codex } - } - }) - mocks.rpc.mockImplementation(async (target) => - target.environmentId === 'a' ? pending.promise : b.snapshot.claude - ) - useAppStore.setState({ - settings: { - ...getDefaultSettings('/test'), - claudeManagedAccounts: local.snapshot.claude.accounts.map((account) => ({ - ...account, - managedAuthPath: '/unused' - })), - activeClaudeManagedAccountId: 'a', - activeClaudeManagedAccountIdsByRuntime: { host: 'a', wsl: {} }, - activeRuntimeEnvironmentId: operation === 'sign-in' ? null : 'a' - }, - fetchSettings: vi.fn(async () => {}), - fetchInactiveClaudeAccountUsage: vi.fn(async () => {}) - }) - render() - await act(async () => {}) - await expand() - fireEvent.click(row('b')) - await act(async () => {}) - expect(operation === 'sign-in' ? reauthenticate : mocks.rpc).toHaveBeenCalledTimes(1) - expect(row('b').getAttribute('aria-disabled')).toBe('true') - await act(async () => replacementOwner('b')) - await expand() - // The old answer is deliberately different from the replacement owner's authoritative roster. - const late = { - ...a.snapshot.claude, - activeAccountId: 'b', - activeAccountIdsByRuntime: { host: 'b', wsl: {} } - } - await act(async () => { - if (settlement === 'resolve') { - pending.resolve(late) - } else { - pending.reject(new Error('Fixture operation failed')) - } - }) - expect(row('b').getAttribute('aria-disabled')).toBe('false') - fireEvent.click(row('b')) - await act(async () => {}) - expect(mocks.rpc).toHaveBeenLastCalledWith( - { kind: 'environment', environmentId: 'b' }, - 'accounts.selectClaude', - { accountId: 'b' }, - { timeoutMs: 30000 } - ) - expect(transport.streams.some((stream) => stream.host === 'b')).toBe(true) - } -) diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-close-terminal.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-close-terminal.test.ts deleted file mode 100644 index 4ee8af6e867..00000000000 --- a/src/renderer/src/components/tab-bar/cli-chat-resume-close-terminal.test.ts +++ /dev/null @@ -1,175 +0,0 @@ -// @vitest-environment happy-dom -import { beforeEach, expect, it, vi } from 'vitest' -import type { RuntimeTerminalWait } from '../../../../shared/runtime-types' -import type { ExecutionHostId } from '../../../../shared/execution-host' -const mocks = vi.hoisted(() => ({ - call: vi.fn(), - close: vi.fn(), - state: { - tabsByWorktree: { workspace: [{ id: 'tab', createdAt: 1 }] }, - terminalLayoutsByTabId: { - tab: { - root: { - type: 'split', - first: { type: 'leaf', leafId: 'a' }, - second: { type: 'leaf', leafId: 'b' } - }, - ptyIdsByLeafId: { a: 'pty-a', b: 'pty-b' } - } - }, - ptyIdsByTabId: { tab: ['pty-a', 'pty-b'] }, - terminalPtyIncarnationsByPaneKey: { 'tab:a': 'inc-a', 'tab:b': 'inc-b' } - } -})) -vi.mock('@/store', () => ({ useAppStore: { getState: () => mocks.state } })) -vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({ - callRuntimeRpc: mocks.call -})) -vi.mock('@/runtime/native-chat/session-ownership/structured-agent-session-owner', () => ({ - structuredAgentSessionTargetForHost: (host: string) => - host === 'local' ? { kind: 'local' } : { kind: 'environment', environmentId: 'paired' } -})) -vi.mock('../terminal/terminal-tab-actions', () => ({ closeTerminalTab: mocks.close })) -import { closeCliChatResumeTerminal } from './cli-chat-resume-close-terminal' -const source = { - tabId: 'tab', - workspaceId: 'workspace', - paneKey: 'tab:a', - agent: 'claude', - providerSessionId: 'conversation', - executionHostId: 'local' -} as const -const hooks = (closing = vi.fn()) => ({ prepared: vi.fn(), closing, refused: vi.fn() }) -function deferred() { - let resolve: (value: T) => void = () => {} - const promise = new Promise((done) => { - resolve = done - }) - return { resolve, promise } -} -beforeEach(() => { - vi.clearAllMocks() - mocks.state.terminalPtyIncarnationsByPaneKey['tab:a'] = 'inc-a' - mocks.call.mockImplementation(async (_target, method, params) => { - if (method === 'terminal.resolvePane') { - const leaf = params.paneKey.endsWith(':b') ? 'b' : 'a' - return { - terminal: { handle: `handle-${leaf}`, ptyId: `pty-${leaf}`, incarnationId: `inc-${leaf}` } - } - } - return { wait: { satisfied: true, status: 'exited', exitCode: 0 } } - }) - mocks.close.mockImplementation((_tab, options) => { - options.beforeClose() - }) -}) -it.each(['local', 'runtime:paired'])( - 'pins every split PTY before ordinary tab close on %s and waits for all exits', - async (executionHostId) => { - const exit = deferred<{ - wait: Pick - }>() - mocks.call.mockImplementation(async (_target, method, params) => { - if (method === 'terminal.resolvePane') { - const leaf = params.paneKey.endsWith(':b') ? 'b' : 'a' - return { - terminal: { handle: `handle-${leaf}`, ptyId: `pty-${leaf}`, incarnationId: `inc-${leaf}` } - } - } - return params.terminal === 'handle-b' - ? exit.promise - : { wait: { satisfied: true, status: 'exited', exitCode: 0 } } - }) - const closing = vi.fn(() => - expect(mocks.call.mock.calls.filter((call) => call[1] === 'terminal.wait')).toHaveLength(2) - ) - let finished = false - const closeHooks = hooks(closing) - const run = closeCliChatResumeTerminal( - { ...source, executionHostId }, - () => true, - closeHooks, - new AbortController().signal - ).then((value) => { - finished = true - return value - }) - await vi.waitFor(() => expect(closing).toHaveBeenCalledOnce()) - expect(finished).toBe(false) - expect(closeHooks.prepared).toHaveBeenCalledOnce() - // Only the split's other pane can ask about running work, and the chat keeps the worktree open. - expect(mocks.close).toHaveBeenCalledWith( - 'tab', - expect.objectContaining({ - consentedPtyId: 'pty-a', - preserveWorktreeSelection: true, - onCancel: expect.any(Function) - }) - ) - exit.resolve({ wait: { satisfied: true, status: 'exited', exitCode: 0 } }) - await expect(run).resolves.toBe(true) - } -) -it('leaves the tab and opens nothing when the ordinary close confirmation is cancelled', async () => { - mocks.close.mockImplementation((_tab, options) => options.onCancel()) - const closing = vi.fn() - await expect( - closeCliChatResumeTerminal(source, () => true, hooks(closing), new AbortController().signal) - ).resolves.toBe(false) - expect(closing).not.toHaveBeenCalled() - expect(mocks.call.mock.calls.filter((call) => call[1] === 'terminal.wait')).toHaveLength(0) -}) -it.each([ - { - satisfied: true, - status: 'exited', - exitCode: -1, - exitCause: { kind: 'unknown', reason: 'stop_unverified' } - }, - { satisfied: true, status: 'unknown', exitCode: null }, - new Error('timeout') -])('goes on once an exit the host could not prove settles: %j', async (wait) => { - mocks.call.mockImplementation(async (_target, method, params) => { - const leaf = params.paneKey?.endsWith(':b') ? 'b' : 'a' - return method === 'terminal.resolvePane' - ? { - terminal: { handle: `handle-${leaf}`, ptyId: `pty-${leaf}`, incarnationId: `inc-${leaf}` } - } - : wait instanceof Error - ? Promise.reject(wait) - : { wait } - }) - await expect( - closeCliChatResumeTerminal(source, () => true, hooks(), new AbortController().signal) - ).resolves.toBe(true) -}) -it('rechecks the source incarnation after an existing close dialog and says the close was dropped', async () => { - mocks.close.mockImplementation((_tab, options) => { - mocks.state.terminalPtyIncarnationsByPaneKey['tab:a'] = 'replacement' - expect(options.beforeClose()).toBe(false) - options.onCancel() - }) - const closeHooks = hooks() - await expect( - closeCliChatResumeTerminal(source, () => true, closeHooks, new AbortController().signal) - ).resolves.toBe(false) - expect(closeHooks.refused).toHaveBeenCalledOnce() - expect(closeHooks.closing).not.toHaveBeenCalled() - expect(mocks.call.mock.calls.filter((call) => call[1] === 'terminal.wait')).toHaveLength(0) -}) -it('reports a vetoed confirmed close to its run even after the run was retired', async () => { - const controller = new AbortController() - let reenter: (() => boolean) | undefined - mocks.close.mockImplementation((_tab, options) => { - reenter = options.beforeClose - }) - const closeHooks = hooks() - const run = closeCliChatResumeTerminal(source, () => true, closeHooks, controller.signal) - await vi.waitFor(() => expect(reenter).toBeDefined()) - controller.abort() - await expect(run).resolves.toBe(false) - expect(reenter?.()).toBe(false) - // The run, not this helper, knows whether a newer continuation owns the confirmation. - expect(closeHooks.refused).toHaveBeenCalledOnce() - expect(closeHooks.closing).not.toHaveBeenCalled() -}) diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run-close.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run-close.test.ts deleted file mode 100644 index e38473b574a..00000000000 --- a/src/renderer/src/components/tab-bar/cli-chat-resume-run-close.test.ts +++ /dev/null @@ -1,194 +0,0 @@ -import type * as RuntimeCapabilityProofModule from '@/runtime/rpc/compatibility/runtime-capability-proof' -// @vitest-environment happy-dom -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type { CliChatResumeSource } from './cli-chat-resume-source' -import type * as FrameDrawnChatTabPlacementModule from '@/lib/frame-drawn-chat-tab-placement' -import type * as CloseTerminalModule from './cli-chat-resume-close-terminal' - -const mocks = vi.hoisted(() => { - const state: { source: CliChatResumeSource | null } = { source: null } - return { - ...state, - sourceCapability: vi.fn(), - closeCapability: vi.fn(), - capabilityState: vi.fn(), - closeTerminal: vi.fn(), - probe: vi.fn(), - createCapability: vi.fn(), - call: vi.fn(), - createSupport: vi.fn(), - toast: vi.fn(), - activate: vi.fn(async () => true), - frameDrawn: false - } -}) -vi.mock('./cli-chat-resume-close-terminal', async (importOriginal) => ({ - ...(await importOriginal()), - closeCliChatResumeTerminal: mocks.closeTerminal -})) -vi.mock('./cli-chat-resume-source', () => ({ resolveCliChatResumeSource: () => mocks.source })) -vi.mock('../terminal/pty-running-work-probe', () => ({ probePtyRunningWork: mocks.probe })) -vi.mock( - '../../runtime/native-chat/host-capabilities/structured-agent-session-host-support', - () => ({ - structuredAgentSessionHostSupports: mocks.closeCapability, - structuredAgentSessionHostCapabilityState: async (...args: unknown[]) => - (await mocks.capabilityState(...args)) ?? - ((await mocks.closeCapability(...args)) ? 'supported' : 'unsupported'), - supportsStructuredAgentSessionCliSource: mocks.sourceCapability, - supportsStructuredAgentSessionCreateMessage: mocks.createCapability - }) -) - -vi.mock('../../runtime/native-chat/requests/structured-agent-session-call', () => ({ - callStructuredAgentSession: (...args: unknown[]) => - args[1] === 'agentSession.createSupport' ? mocks.createSupport(args[2]) : mocks.call(...args) -})) -vi.mock('@/runtime/native-chat/tab-inventory/structured-session-tab-inventory', () => ({ - readStructuredSessionTabInventory: async () => { - throw new Error('Reply unavailable') - } -})) -vi.mock('@/lib/agent-session/launch/structured-agent-session-create-hydration', () => ({ - publishStructuredAgentSessionCreateHydration: vi.fn() -})) -vi.mock('sonner', () => ({ toast: { error: mocks.toast } })) -// A frame-drawn server workspace's create carries the tab's place, read as it is sent. -vi.mock('@/lib/frame-drawn-chat-tab-placement', async (importOriginal) => { - const actual = await importOriginal() - return { - ...actual, - withFrameDrawnChatTabPlacement: ( - intent: Parameters[0] - ) => - mocks.frameDrawn - ? { ...intent.params, tabPlacement: { groupId: 'g-1' } } - : actual.withFrameDrawnChatTabPlacement(intent) - } -}) -vi.mock('@/lib/activate-ai-vault-structured-session', () => ({ - activateAiVaultStructuredSession: mocks.activate -})) -// Switch-on, main opens the chat's tab and its frame draws it. -vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) => ({ - ...( - await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture') - ).runtimeRpcClientWithLayoutApply(await importOriginal()) -})) -vi.mock('@/runtime/rpc/compatibility/runtime-capability-proof', async (importOriginal) => ({ - ...(await importOriginal()), - runtimeEnvironmentSupportsCapability: async () => true -})) -vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (importOriginal) => - ( - await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture') - ).runtimeLayoutClientWithTestFrames(await importOriginal()) -) - -import { useAppStore } from '@/store' - -import { getStructuredAgentSessionLaunchLifecycle } from '@/lib/agent-session/launch/structured-agent-session-launch-registry' -import { startStructuredAgentLaunch } from '@/lib/agent-session/launch/structured-agent-session-launch' -import { resolveWebSessionVisibleTabId } from '@/runtime/web-session-tabs-sync/navigation/web-session-focus-intent' -import { - drawTabsFromMain, - type TabsDrawnFromMain -} from '@/store/slices/tabs/tabs-drawn-from-main.test-fixture' -import { runCliChatResume } from './cli-chat-resume-run' - -import { - SOURCE, - refuse, - resetCliChatResumeRun, - showAgentInSource, - tabs -} from './cli-chat-resume-run.test-fixture' - -const creates = () => mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.create') - -let main: TabsDrawnFromMain | undefined -afterEach(() => { - vi.useRealTimers() - vi.unstubAllGlobals() - main?.close() - main = undefined -}) -beforeEach(async () => { - resetCliChatResumeRun(mocks) - mocks.createSupport.mockResolvedValue({ supported: true }) - main = await drawTabsFromMain(useAppStore) -}) - -describe('close terminal then continue on capable hosts', () => { - beforeEach(() => { - mocks.closeCapability.mockResolvedValue(true) - showAgentInSource() - }) - - it('leaves a tab the user picked while the chat waited on the close', async () => { - mocks.closeTerminal.mockImplementation(async (_source, _current, hooks) => { - useAppStore.getState().createUnifiedTab('wt-1', 'agent-session', { - id: 'picked', - entityId: 'picked-chat' - }) - expect(resolveWebSessionVisibleTabId(useAppStore.getState(), 'wt-1')).toBe('picked') - hooks.prepared() - hooks.closing() - mocks.source = null - return true - }) - await runCliChatResume(SOURCE) - await main?.settle() - expect(creates()).toHaveLength(1) - expect(resolveWebSessionVisibleTabId(useAppStore.getState(), 'wt-1')).toBe('picked') - }) - - it('starts the chat anew when the closed terminal never saved its conversation', async () => { - const answer = mocks.call.getMockImplementation() - mocks.call.mockImplementationOnce(async (_target, method) => { - expect(method).toBe('agentSession.create') - return { ok: false, refusal: refuse('transcriptNotFound') } - }) - await runCliChatResume(SOURCE) - await vi.waitFor(() => expect(creates()).toHaveLength(2)) - const [first, second] = creates().map(([, , params]) => params) - expect(first.resumeFrom?.providerSessionId).toBe(SOURCE.providerSessionId) - expect(second.resumeFrom).toBeUndefined() - expect(second.envelope.sessionId).toBe(first.envelope.sessionId) - mocks.call.mockImplementation(answer!) - await main?.settle() - expect(tabs().map((tab) => tab.entityId)).toEqual([first.envelope.sessionId]) - expect(mocks.toast).not.toHaveBeenCalled() - }) - - // Joining it would re-send an unconfirmed chat's create beside the still-running CLI. - it.each(['pending', 'visibility-unknown'])( - 'shows a %s chat already opening this conversation and keeps the terminal', - async (lifecycle) => { - // Its create never answers, or its reply is lost and the host can't be asked whether it exists. - const answer = mocks.call.getMockImplementation() - mocks.call.mockImplementation((...args: unknown[]) => - args[1] !== 'agentSession.create' - ? answer?.(...args) - : lifecycle === 'pending' - ? new Promise(() => undefined) - : Promise.reject(new Error('response lost')) - ) - const other = startStructuredAgentLaunch('wt-1', 'claude', { - requestId: 'other-resume', - resumeFrom: { providerSessionId: SOURCE.providerSessionId } - }) - await vi.waitFor(() => { - expect(creates().length).toBeGreaterThan(0) - expect(getStructuredAgentSessionLaunchLifecycle('wt-1', other.sessionId)).toBe(lifecycle) - }) - const sent = creates().length - await runCliChatResume(SOURCE, true) - await main?.settle() - expect(mocks.closeTerminal).not.toHaveBeenCalled() - expect(tabs().map((tab) => tab.entityId)).toEqual([other.sessionId]) - expect(creates()).toHaveLength(sent) - expect(mocks.toast).not.toHaveBeenCalled() - } - ) -}) diff --git a/src/renderer/src/components/tab-bar/tab-agent-launch-options.test.ts b/src/renderer/src/components/tab-bar/tab-agent-launch-options.test.ts deleted file mode 100644 index 39e79b0878b..00000000000 --- a/src/renderer/src/components/tab-bar/tab-agent-launch-options.test.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { - buildTabAgentLaunchOptions, - buildTabAgentLaunchOptionsFromRows, - findMatchingTabAgentLaunchOptions -} from './tab-agent-launch-options' - -describe('tab agent launch options', () => { - it('ranks an exact alias above weaker prefix matches', () => { - const options = buildTabAgentLaunchOptions(['codebuff', 'codex', 'copilot'], { - codebuff: 'codex-tools' - }) - - // The weaker codex-tools prefix starts first, so exact codex must move ahead. - expect(findMatchingTabAgentLaunchOptions('codex', options)[0]?.agent).toBe('codex') - expect(findMatchingTabAgentLaunchOptions('co', options).map((o) => o.agent)).toEqual( - expect.arrayContaining(['codex', 'copilot', 'codebuff']) - ) - }) - - it('does not match on a mid-string substring that would hijack file results', () => { - const options = buildTabAgentLaunchOptions(['opencode', 'claude']) - - // Agent rows outrank files, so broad mid-string hits must not hijack the result list. - expect(findMatchingTabAgentLaunchOptions('ode', options)).toEqual([]) - }) -}) - -it('projects the same CLI label, unavailable reason and stable chat ID as static rows', () => { - const unavailable = buildTabAgentLaunchOptionsFromRows([ - { kind: 'chat-unavailable', agent: 'claude', reason: 'ssh' }, - { kind: 'cli', agent: 'claude' }, - { kind: 'cli', agent: 'codex', chat: true } - ]) - expect(unavailable).toMatchObject([ - { id: 'chat:claude', label: 'Claude', reason: 'No chat over SSH', disabled: true }, - { id: 'cli:claude', label: 'Claude (CLI)', disabled: false }, - { id: 'cli:codex', label: 'Codex (CLI)', disabled: false } - ]) - // Typing the agent's name and pressing Enter launches its CLI, not the disabled chat. - expect(findMatchingTabAgentLaunchOptions('claude', unavailable)[0]?.id).toBe('cli:claude') - expect( - findMatchingTabAgentLaunchOptions('codex', unavailable).map((option) => [ - option.id, - option.row?.kind - ]) - ).toEqual([['cli:codex', 'cli']]) -}) diff --git a/src/renderer/src/components/tab-group/workspace-tab-close-commands.frame-flush.test.ts b/src/renderer/src/components/tab-group/workspace-tab-close-commands.frame-flush.test.ts deleted file mode 100644 index d78ec3e2a31..00000000000 --- a/src/renderer/src/components/tab-group/workspace-tab-close-commands.frame-flush.test.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { afterEach, expect, it, vi } from 'vitest' - -const requestEditorFileClose = vi.hoisted(() => vi.fn<(fileId: string) => void>()) -vi.mock('../editor/autosave/editor-autosave', () => ({ requestEditorFileClose })) - -import { useAppStore } from '../../store' -import { makeOpenFile } from '../../store/slices/editor/types/open-file.test-fixture' -import { makeUnifiedTab } from '../../store/slices/tabs/tab-group.test-fixture' -import { registerEditorFrameFlush } from '../editor/save/flush/editor-pending-flush' -import { createWorkspaceTabCloseCommands } from './workspace-tab-close-commands' - -const worktreeId = 'wt' -const tabOf = (entityId: string) => - makeUnifiedTab({ id: 'tab', worktreeId, groupId: 'g', entityId, contentType: 'editor' }) -const drainMicrotasks = () => new Promise((resolve) => setImmediate(resolve)) - -let removeFrame = () => {} -afterEach(() => removeFrame()) - -// Why: a rename keeps the tab id but moves its entity while the frame is flushing. -it('closes the renamed file, prompting when it is dirty, after the frame flush', async () => { - let answer: (flushed: boolean) => void = () => {} - removeFrame = registerEditorFrameFlush('old', () => new Promise((resolve) => (answer = resolve))) - useAppStore.setState({ - openFiles: [makeOpenFile({ id: 'old', worktreeId })], - unifiedTabsByWorktree: { [worktreeId]: [tabOf('old')] } - }) - createWorkspaceTabCloseCommands({ worktreeId, groupTabs: [tabOf('old')] }).closeItem('tab') - - useAppStore.setState({ - openFiles: [makeOpenFile({ id: 'new', worktreeId, isDirty: true })], - unifiedTabsByWorktree: { [worktreeId]: [tabOf('new')] } - }) - answer(true) - await drainMicrotasks() - - expect(requestEditorFileClose).toHaveBeenCalledWith('new', { tabId: 'tab' }) - expect(useAppStore.getState().unifiedTabsByWorktree[worktreeId]).toHaveLength(1) -}) diff --git a/src/renderer/src/components/task-page/jira/Content.board-owner.test.tsx b/src/renderer/src/components/task-page/jira/Content.board-owner.test.tsx deleted file mode 100644 index 124f199d0bf..00000000000 --- a/src/renderer/src/components/task-page/jira/Content.board-owner.test.tsx +++ /dev/null @@ -1,123 +0,0 @@ -// @vitest-environment happy-dom - -import { useState, type ComponentProps } from 'react' -import { cleanup, fireEvent, render, screen } from '@testing-library/react' -import { afterEach, expect, it, vi } from 'vitest' -import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions' -import type { TaskPageJiraBoardView } from './task-page-jira-board-view' -import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context' -import { defaultJiraListColumnIds, visibleJiraListColumns } from '../../jira-list-columns' -import { bumpProviderRuntimeSessionGeneration } from '@/runtime/hosts/observations/provider-runtime-context' -import { TaskPageJiraContent } from './Content' -import type * as I18n from '@/i18n/i18n' - -type BoardProps = ComponentProps -vi.mock('@/components/task-page/jira/task-page-jira-board-view', () => ({ - TaskPageJiraBoardView: ({ target, scopeKey }: BoardProps) => { - const [draft, setDraft] = useState('') - return ( -
- setDraft(event.target.value)} - /> - {JSON.stringify(target)} - {scopeKey} -
- ) - } -})) -vi.mock('@/components/JiraIssueWorkspace', () => ({ default: () => null })) -vi.mock('@/components/task-page/linear/Content', () => ({ TaskPageLinearContent: () => null })) -vi.mock('@/components/jira-list-columns-menu', () => ({ JiraListColumnsMenu: () => null })) -vi.mock('@/i18n/i18n', async (importOriginal) => ({ - ...(await importOriginal()), - translate: (_key: string, fallback: string) => fallback -})) - -afterEach(cleanup) - -const source: TaskSourceContext = { - kind: 'task-source', - provider: 'jira', - projectId: 'content-owner-project', - hostId: 'runtime:explicit-jira-owner' -} - -function model(sourceContext: TaskSourceContext | null): TaskPageComposerActionsModel { - const columns = defaultJiraListColumnIds() - const fixture = { - jiraStatus: { credentialError: null }, - jiraHasWorkspace: false, - getJiraIssueWorkspaces: () => [], - jiraStatusReady: true, - jiraConnected: true, - selectedJiraSiteId: 'site-a', - hideTaskSource: vi.fn(), - taskSource: 'jira', - closeTaskDetailPage: vi.fn(), - selectedJiraIssue: null, - jiraDetailSourceContext: sourceContext, - openJiraDetailPage: vi.fn(), - jiraIssues: [], - jiraLoading: false, - jiraError: null, - jiraErrorDetailsOpen: false, - setJiraErrorDetailsOpen: vi.fn(), - jiraJqlRejection: null, - jiraSearchInput: '', - jiraOrderBy: 'updated', - jiraOrderDirection: 'desc', - handleJiraSort: vi.fn(), - jiraColumnIds: columns, - jiraColumns: visibleJiraListColumns(columns), - toggleJiraColumn: vi.fn(), - displayedJiraIssues: [], - displayedJiraStatusOrder: null, - sortedJiraIssues: [], - setJiraConnectOpen: vi.fn(), - handleUseJiraItem: vi.fn(), - jiraViewMode: 'board', - setJiraViewMode: vi.fn(), - jiraCurrentSprint: true, - setJiraCurrentSprint: vi.fn(), - jiraTaskSourceContext: sourceContext, - jiraTaskSourceScopeKey: 'content-source-scope', - accountBackedTaskSourceHostId: 'runtime:account-jira-owner', - providerRuntimeContextKey: 'runtime:unrelated-ui-a#0', - setJiraRefreshNonce: vi.fn() - } - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This presentation fixture supplies every field read by the Jira content branch. - return fixture as unknown as TaskPageComposerActionsModel -} - -it.each([ - { label: 'explicit', sourceContext: source, owner: 'explicit-jira-owner' }, - { label: 'default', sourceContext: null, owner: 'account-jira-owner' } -])( - 'keeps the $label Jira owner draft through unrelated focus and clears it for a new session', - ({ sourceContext, owner }) => { - const current = model(sourceContext) - const { rerender } = render() - expect(screen.getByTestId('board-owner').textContent).toBe( - JSON.stringify({ kind: 'environment', environmentId: owner }) - ) - const initialScope = screen.getByTestId('board-scope').textContent - fireEvent.change(screen.getByRole('textbox', { name: 'Pending board comment' }), { - target: { value: 'Keep this draft' } - }) - current.providerRuntimeContextKey = 'runtime:unrelated-ui-b#0' - rerender() - expect(screen.getByDisplayValue('Keep this draft')).toBeDefined() - expect(screen.getByTestId('board-scope').textContent).toBe(initialScope) - - bumpProviderRuntimeSessionGeneration() - rerender() - expect(screen.queryByDisplayValue('Keep this draft')).toBeNull() - expect(screen.getByTestId('board-scope').textContent).not.toBe(initialScope) - expect(screen.getByTestId('board-owner').textContent).toBe( - JSON.stringify({ kind: 'environment', environmentId: owner }) - ) - } -) diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-linked-issues.test.ts b/src/renderer/src/components/task-page/jira/task-page-jira-linked-issues.test.ts deleted file mode 100644 index 67c4487edcb..00000000000 --- a/src/renderer/src/components/task-page/jira/task-page-jira-linked-issues.test.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' -import type { JiraIssue } from '../../../../../shared/jira/jira-types' -import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context' -import { readLinkedJiraIssues } from './task-page-jira-linked-issues' -const source: TaskSourceContext = { - kind: 'task-source', - provider: 'jira', - projectId: 'app', - hostId: 'runtime:remote' -} -const issue: JiraIssue = { - id: '1', - key: 'APP-1', - title: 'Fix login', - siteId: 'a', - url: 'https://a.example/browse/APP-1', - project: { id: '1', key: 'APP', name: 'Application' }, - issueType: { id: '1', name: 'Bug' }, - status: { id: '1', name: 'Open', categoryKey: 'new', categoryName: 'Open' }, - labels: [], - createdAt: '', - updatedAt: '' -} -describe('Jira Has Workspace issue reads', () => { - it('keeps successful reads when another site fails and reports the failure', async () => { - const search = vi - .fn() - .mockResolvedValueOnce([issue]) - .mockRejectedValueOnce(new Error('Site unavailable')) - const result = await readLinkedJiraIssues( - [ - { key: 'APP-1', siteId: 'a' }, - { key: 'APP-2', siteId: 'b' } - ], - search, - source, - false - ) - expect(result.issues).toEqual([issue]) - expect(result.error).not.toBeNull() - }) - it('does not accept a same-key result from the wrong Jira site', async () => { - const search = vi.fn().mockResolvedValue([{ ...issue, siteId: 'other' }]) - const result = await readLinkedJiraIssues( - [{ key: 'APP-1', siteId: 'a' }], - search, - source, - false - ) - expect(result.issues).toEqual([]) - expect(result.error).not.toBeNull() - }) -}) diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-creation-lifetime.test.tsx b/src/renderer/src/components/task-page/linear/task-page-linear-creation-lifetime.test.tsx deleted file mode 100644 index f2459b45568..00000000000 --- a/src/renderer/src/components/task-page/linear/task-page-linear-creation-lifetime.test.tsx +++ /dev/null @@ -1,187 +0,0 @@ -// @vitest-environment happy-dom -import { - reads, - task, - store, - source, - useRoutingFixture -} from './task-page-linear-refresh-test-fixtures' -import { reads as issueReadRegistry } from '@/store/slices/linear/linear-issue-read-lifecycle' -import { pendingLinearIssueWrites } from '@/store/slices/linear/linear-issue-publication' -import { useLinearIssueCreationForm } from './use-task-page-linear-creation-state' -import { useTaskPageLinearIssueCreation } from './use-task-page-linear-issue-creation' - -import { useTaskPageJiraCreationStatePrelude } from '../jira/use-task-page-jira-creation-state' - -import { useLinearIssueWorkspaceDetail } from '../../linear-issue-workspace-detail-state' -import { useAppStore } from '@/store' - -import { writeLinearIssue } from '@/lib/work-items/linear/linear-issue-write' -import { - getProviderRuntimeContextKey, - bumpProviderRuntimeSessionGeneration -} from '@/runtime/hosts/observations/provider-runtime-context' -import type { LinearIssue } from '../../../../../shared/linear/issue-types' -import { expect, it, vi } from 'vitest' -import { act, renderHook, waitFor } from '@testing-library/react' -import { deferred } from '../../../store/slices/linear/linear-slice-test-harness' - -function useCreateFixture( - context: ReturnType, - initial: LinearIssue | null = null, - initialTitle = 'Created', - initialOpen = true, - runtime = { current: 'runtime' } -) { - const draft = useAppStore.getState().newLinearIssueDraft - const noop = vi.fn() - const form = useLinearIssueCreationForm(runtime.current, { - open: initialOpen, - title: draft?.title ?? initialTitle, - body: draft?.body ?? (initialTitle ? 'Body' : '') - }) - const route = useRoutingFixture(context, initial) - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture supplies the real consumer's exercised fields and actions; unrelated full-page/provider services are intentionally absent. - const creation = useTaskPageLinearIssueCreation({ - ...route, - settings: null, - providerRuntimeContextKey: runtime.current, - providerRuntimeContextKeyRef: runtime, - linearTaskSourceContext: context, - setLinearRefreshNonce: noop, - selectedLinearProject: null, - ...form, - newLinearIssueTargetTeam: { id: 'team-1', workspaceId: 'w' } - } as never) - return { - ...creation, - submitting: form.newLinearIssueSubmitting, - title: form.newLinearIssueTitle, - body: form.newLinearIssueBody, - open: form.newLinearIssueOpen - } -} - -it('create selects N before pending A settles, without waiting for N follow-up hydration', async () => { - const s = store(), - context = source('local') - s.setState({ recordFeatureInteraction: vi.fn(), jiraIssueCache: {}, jiraSearchCache: {} }) - const pending = deferred<{ ok: boolean }>(), - held = deferred() - const created = { - ...task('Created N'), - id: 'N', - identifier: 'ENG-2', - title: 'Created title', - priority: 2 - } - reads.create.mockResolvedValue({ ok: true, id: 'N', identifier: 'ENG-2' }) - reads.detail.mockImplementation((_context, id) => - id === 'N' && reads.detail.mock.calls.filter((call) => call[1] === 'N').length === 1 - ? Promise.resolve(created) - : held.promise - ) - const hook = renderHook(() => { - const creation = useCreateFixture(context, task()) - const detail = useLinearIssueWorkspaceDetail({ - issue: creation.selectedLinearIssue ?? task(), - providerSettings: context, - requestKey: creation.selectedLinearIssue?.id ?? 'A' - }) - return { ...creation, detail } - }) - let saving!: Promise<{ ok: boolean }> - act(() => { - saving = writeLinearIssue(task(), { priority: 4 }, context, () => pending.promise) - }) - await act(async () => { - await hook.result.current.handleCreateNewLinearIssue() - }) - await waitFor(() => expect(hook.result.current.selectedLinearIssue?.id).toBe('N')) - expect(hook.result.current.detail.displayed).toMatchObject({ - id: 'N', - title: 'Created title', - priority: 2, - workspaceId: 'w' - }) - await act(async () => { - pending.resolve({ ok: false }) - await saving - }) - expect(hook.result.current.detail.displayed).toMatchObject({ - id: 'N', - title: 'Created title', - priority: 2, - workspaceId: 'w' - }) - expect(hook.result.current.detail.editState.priority).toBe(2) - expect(hook.result.current.detail.issueLoading).toBe(true) - hook.unmount() - held.resolve(null) - await held.promise - expect(pendingLinearIssueWrites.size).toBe(0) - expect(issueReadRegistry.size).toBe(0) -}) - -it('actual runtime replacement and new create outlive old success and own finally without revival', async () => { - const s = store(), - context = source('local'), - runtime = { current: getProviderRuntimeContextKey(null) } - s.setState({ recordFeatureInteraction: vi.fn(), jiraIssueCache: {}, jiraSearchCache: {} }) - const old = deferred<{ ok: boolean; id: string; identifier: string }>(), - next = deferred<{ ok: boolean; id: string; identifier: string }>() - reads.create.mockReturnValueOnce(old.promise).mockReturnValueOnce(next.promise) - const hook = renderHook(() => { - const model = useCreateFixture(context, null, 'Old', true, runtime) - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the actual runtime reset prelude uses these Linear fields; unrelated Jira/metadata services are inert. - useTaskPageJiraCreationStatePrelude({ - ...model, - setNewLinearIssueTeamId: vi.fn(), - setNewLinearIssueProjects: vi.fn(), - setNewLinearIssueProjectsLoading: vi.fn() - } as never) - return model - }) - let a!: Promise, b!: Promise - act(() => { - a = hook.result.current.handleCreateNewLinearIssue() - }) - act(() => { - bumpProviderRuntimeSessionGeneration() - runtime.current = getProviderRuntimeContextKey(null) - hook.rerender() - }) - expect(hook.result.current.submitting).toBe(false) - act(() => { - hook.result.current.setNewLinearIssueTitle('Replacement') - hook.result.current.setNewLinearIssueBody('New body') - hook.result.current.setNewLinearIssueOpen(true) - }) - act(() => { - b = hook.result.current.handleCreateNewLinearIssue() - }) - expect(hook.result.current.submitting).toBe(true) - await act(async () => { - old.resolve({ ok: true, id: 'Old', identifier: 'W-1' }) - await a - }) - expect(hook.result.current).toMatchObject({ - title: 'Replacement', - body: 'New body', - open: true, - submitting: true - }) - expect(reads.detail).not.toHaveBeenCalled() - await act(async () => { - next.resolve({ ok: false, id: 'New', identifier: 'W-2' }) - await b - }) - expect(hook.result.current.submitting).toBe(false) - act(() => hook.result.current.setNewLinearIssueOpen(false)) - expect(s.getState().newLinearIssueDraft).toEqual({ title: 'Replacement', body: 'New body' }) - hook.unmount() - expect(pendingLinearIssueWrites.size).toBe(0) - expect(issueReadRegistry.size).toBe(0) - act(() => s.getState().patchLinearIssue('Old', { priority: 4 }, { sourceContext: context })) - expect(reads.detail).not.toHaveBeenCalled() -}) diff --git a/src/renderer/src/components/task-page/task-page-cache-selectors.test.ts b/src/renderer/src/components/task-page/task-page-cache-selectors.test.ts index 8c944776823..4ab79151235 100644 --- a/src/renderer/src/components/task-page/task-page-cache-selectors.test.ts +++ b/src/renderer/src/components/task-page/task-page-cache-selectors.test.ts @@ -1,10 +1,7 @@ import { describe, expect, it } from 'vitest' import type { CacheEntry } from '@/store/github/cache/cache-model' import type { GitHubWorkItem } from '../../../../shared/github/work-item-types' -import { - reconcileTaskPagePagesAfterLandingRefresh, - reconcileTaskPagePagesWithWorkItemsCache -} from './task-page-cache-selectors' +import { reconcileTaskPagePagesWithWorkItemsCache } from './task-page-cache-selectors' function entry(data: T): CacheEntry { return { data, fetchedAt: 1 } @@ -28,18 +25,4 @@ describe('task page cache selectors', () => { expect(nextPages[0]?.map((item) => item.repoHostId)).toEqual(['local', 'ssh:builder']) expect(nextPages[0]?.[1]).toBe(remote) }) - - it('replaces GitHub landing refresh rows when membership changes', () => { - const first = workItem('issue-1', 'repo-1') - const second = workItem('issue-2', 'repo-1') - const third = workItem('issue-3', 'repo-1') - const older = workItem('issue-4', 'repo-1') - - const nextPages = reconcileTaskPagePagesAfterLandingRefresh( - [[first, second], [older]], - [third, first] - ) - - expect(nextPages).toEqual([[third, first]]) - }) }) diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-path-exists-cache.test.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-path-exists-cache.test.ts deleted file mode 100644 index 7a42728f677..00000000000 --- a/src/renderer/src/components/terminal-pane/links/files/terminal-path-exists-cache.test.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { describe, expect, it } from 'vitest' - -import { - readTerminalPathExistence, - startTerminalPathExistsProbe, - writeTerminalPathExistence, - type TerminalPathExistsCache -} from './terminal-path-exists-cache' - -describe('terminal path-exists cache', () => { - it('keeps expired negatives as ordering guards for older in-flight probes', () => { - const cache: TerminalPathExistsCache = new Map() - const older = startTerminalPathExistsProbe(1000) - const newer = startTerminalPathExistsProbe(2000) - writeTerminalPathExistence(cache, 'k', false, newer) - - expect(readTerminalPathExistence(cache, 'k', 12_000)).toBeUndefined() - writeTerminalPathExistence(cache, 'k', true, older) - expect(cache.get('k')).toEqual({ exists: false, ...newer }) - - const latest = startTerminalPathExistsProbe(12_000) - writeTerminalPathExistence(cache, 'k', true, latest) - expect(readTerminalPathExistence(cache, 'k', 12_000)).toBe(true) - }) - - it('ignores an older probe result that lands after a newer one', () => { - const cache: TerminalPathExistsCache = new Map() - const older = startTerminalPathExistsProbe(1000) - const newer = startTerminalPathExistsProbe(2000) - writeTerminalPathExistence(cache, 'k', true, newer) - writeTerminalPathExistence(cache, 'k', false, older) - expect(cache.get('k')).toEqual({ exists: true, ...newer }) - const latest = startTerminalPathExistsProbe(3000) - writeTerminalPathExistence(cache, 'k', false, latest) - expect(cache.get('k')).toEqual({ exists: false, ...latest }) - }) - - it('orders overlapping probes that start in the same millisecond', () => { - const cache: TerminalPathExistsCache = new Map() - const older = startTerminalPathExistsProbe(1000) - const newer = startTerminalPathExistsProbe(1000) - writeTerminalPathExistence(cache, 'newer-first', false, newer) - writeTerminalPathExistence(cache, 'newer-first', true, older) - expect(cache.get('newer-first')).toEqual({ exists: false, ...newer }) - writeTerminalPathExistence(cache, 'older-first', false, older) - writeTerminalPathExistence(cache, 'older-first', true, newer) - expect(cache.get('older-first')).toEqual({ exists: true, ...newer }) - }) -}) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts index 491bb2dd2ba..d464fa40703 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts @@ -16,10 +16,7 @@ import { type PtyConnectionAgentTitleMocks, bindPaneAgentTitleMocks } from '../test-fixtures/pty-connection-test-deps' -import { - createInitialStoreState, - buildActiveRuntimeEnvironmentState -} from '../test-fixtures/pty-connection-test-store-fixtures' +import { createInitialStoreState } from '../test-fixtures/pty-connection-test-store-fixtures' import type { StoreState } from '../test-fixtures/pty-connection-test-store-state' import { installTerminalTestGlobals, @@ -36,11 +33,6 @@ export function registerPtyConnectionMainSideEffectAuthorityTests(): void { return buildPaneConnectionDeps(() => mockStoreState, overrides) } - // Why: activeRuntimeEnvironmentId exercises the remote-runtime path where the renderer still owns OSC 9999 status. - function enableActiveRuntimeEnvironment(environmentId = 'env-1'): void { - mockStoreState = buildActiveRuntimeEnvironmentState(mockStoreState, environmentId) - } - function notifyStoreSubscribers(): void { for (const listener of storeSubscribers.slice()) { listener(mockStoreState) @@ -86,101 +78,6 @@ export function registerPtyConnectionMainSideEffectAuthorityTests(): void { } } - it('omits byte-parser callbacks from the local transport options', async () => { - enableMainAuthority() - const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') - const transport = createMockTransport() - transportFactoryQueue.push(transport) - - connectPanePty( - createPane(1) as never, - createManager(1) as never, - bindPaneAgentTitleMocks(createDeps() as never, agentTitleMocks) - ) - - expect(createdTransportOptions[0]).toBeDefined() - for (const callback of SIDE_EFFECT_PARSER_CALLBACKS) { - expect(createdTransportOptions[0]?.[callback]).toBeUndefined() - } - // Lifecycle callbacks stay on the transport; only side-effect parsing moves to the fact consumer. - expect(createdTransportOptions[0]?.onPtySpawn).toBeTypeOf('function') - expect(createdTransportOptions[0]?.onPtyExit).toBeTypeOf('function') - }) - - it('keeps byte-parser callbacks on remote-runtime transports', async () => { - enableMainAuthority() - enableActiveRuntimeEnvironment() - const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') - const { createRemoteRuntimePtyTransport } = - await import('../../pty-transport/remote-runtime/remote-runtime-pty-transport') - const transport = createMockTransport() - transportFactoryQueue.push(transport) - - connectPanePty( - createPane(1) as never, - createManager(1) as never, - bindPaneAgentTitleMocks(createDeps() as never, agentTitleMocks2) - ) - - expect(createRemoteRuntimePtyTransport).toHaveBeenCalledWith('env-1', expect.any(Object)) - for (const callback of SIDE_EFFECT_PARSER_CALLBACKS) { - expect(createdTransportOptions[0]?.[callback]).toBeTypeOf('function') - } - }) - - it('consumes pty:sideEffect facts with the live-path policy after spawn', async () => { - enableMainAuthority() - const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') - const handler = - await import('../../pty-transport/output/terminal-side-effect-facts-handler') - const transport = createMockTransport() - transportFactoryQueue.push(transport) - vi.useFakeTimers() - - const pane = createPane(1) - const manager = createManager(1) - const deps = createDeps() - connectPanePty( - pane as never, - manager as never, - bindPaneAgentTitleMocks(deps as never, agentTitleMocks3) - ) - - const onPtySpawn = createdTransportOptions[0]?.onPtySpawn as (ptyId: string) => void - onPtySpawn('pty-fact-1') - - handler._dispatchTerminalSideEffectBatchForTest({ - ptyId: 'pty-fact-1', - seq: 10, - facts: [ - { kind: 'title', normalizedTitle: 'Codex working', rawTitle: 'Codex working' }, - { kind: 'bell' } - ] - }) - - expect(deps.setRuntimePaneTitle).toHaveBeenCalledWith('tab-1', 1, 'Codex working') - expect(deps.markTerminalBell).toHaveBeenCalledTimes(1) - expect(deps.markTerminalBell).toHaveBeenCalledWith({ - worktreeId: 'wt-1', - tabId: 'tab-1', - paneKey: makePaneKey('tab-1', LEAF_1) - }) - expect(deps.dispatchNotification).not.toHaveBeenCalled() - vi.advanceTimersByTime(250) - expect(deps.dispatchNotification).toHaveBeenCalledWith( - expect.objectContaining({ - source: 'terminal-bell', - paneKey: makePaneKey('tab-1', LEAF_1) - }) - ) - }) - it('stops consuming facts after the pane binding is disposed', async () => { enableMainAuthority() const { connectPanePty } = await import('../connect-pane-pty') @@ -210,49 +107,6 @@ export function registerPtyConnectionMainSideEffectAuthorityTests(): void { expect(deps.markTerminalBell).not.toHaveBeenCalled() }) - it('schedules the completion notification for genuine working→idle facts', async () => { - enableMainAuthority() - const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') - const handler = - await import('../../pty-transport/output/terminal-side-effect-facts-handler') - const transport = createMockTransport() - transportFactoryQueue.push(transport) - vi.useFakeTimers() - - const deps = createDeps() - connectPanePty( - createPane(1) as never, - createManager(1) as never, - bindPaneAgentTitleMocks(deps as never, agentTitleMocks5) - ) - const onPtySpawn = createdTransportOptions[0]?.onPtySpawn as (ptyId: string) => void - onPtySpawn('pty-fact-genuine') - - handler._dispatchTerminalSideEffectBatchForTest({ - ptyId: 'pty-fact-genuine', - seq: 1, - facts: [ - { kind: 'title', normalizedTitle: '⠋ Codex working', rawTitle: '⠋ Codex working' }, - { kind: 'agent-working' } - ] - }) - handler._dispatchTerminalSideEffectBatchForTest({ - ptyId: 'pty-fact-genuine', - seq: 2, - facts: [ - { kind: 'title', normalizedTitle: '* Codex done', rawTitle: '* Codex done' }, - { kind: 'agent-idle', title: '* Codex done' } - ] - }) - vi.advanceTimersByTime(AGENT_TASK_COMPLETE_NOTIFICATION_MAX_WAIT_MS) - - expect(deps.dispatchNotification).toHaveBeenCalledWith( - expect.objectContaining({ source: 'agent-task-complete' }) - ) - }) - it('clears state without completion attention for stale-derived facts', async () => { enableMainAuthority() const { connectPanePty } = await import('../connect-pane-pty') @@ -306,82 +160,6 @@ export function registerPtyConnectionMainSideEffectAuthorityTests(): void { expect(deps.markTerminalBell).not.toHaveBeenCalled() }) - it('drops the agent status from a command-finished fact like the byte path did', async () => { - enableMainAuthority() - const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') - const handler = - await import('../../pty-transport/output/terminal-side-effect-facts-handler') - const transport = createMockTransport() - transportFactoryQueue.push(transport) - const paneKey = makePaneKey('tab-1', LEAF_1) - mockStoreState.agentStatusByPaneKey = { - [paneKey]: { - paneKey, - state: 'done', - prompt: 'hi', - updatedAt: 1000, - stateStartedAt: 1000, - agentType: 'codex', - stateHistory: [] - } - } - - connectPanePty( - createPane(1) as never, - createManager(1) as never, - bindPaneAgentTitleMocks(createDeps() as never, agentTitleMocks7) - ) - const onPtySpawn = createdTransportOptions[0]?.onPtySpawn as (ptyId: string) => void - onPtySpawn('pty-fact-133') - - handler._dispatchTerminalSideEffectBatchForTest({ - ptyId: 'pty-fact-133', - seq: 1, - facts: [{ kind: 'command-finished', exitCode: 130 }] - }) - - expect(mockStoreState.dropAgentStatus).toHaveBeenCalledWith(paneKey) - expect(mockStoreState.removeAgentStatus).not.toHaveBeenCalled() - }) - - it('routes pr-link facts to the worktree PR observer', async () => { - enableMainAuthority() - const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') - const handler = - await import('../../pty-transport/output/terminal-side-effect-facts-handler') - const transport = createMockTransport() - transportFactoryQueue.push(transport) - - connectPanePty( - createPane(1) as never, - createManager(1) as never, - bindPaneAgentTitleMocks(createDeps() as never, agentTitleMocks8) - ) - const onPtySpawn = createdTransportOptions[0]?.onPtySpawn as (ptyId: string) => void - onPtySpawn('pty-fact-pr') - - const link = { - url: 'https://github.com/acme/orca/pull/42', - slug: { owner: 'acme', repo: 'orca' }, - number: 42 - } - handler._dispatchTerminalSideEffectBatchForTest({ - ptyId: 'pty-fact-pr', - seq: 1, - facts: [{ kind: 'pr-link', link }] - }) - - expect(mockStoreState.observeTerminalGitHubPullRequestLink).toHaveBeenCalledWith( - 'wt-1', - link, - expect.objectContaining({ tabId: 'tab-1', ptyId: 'tab-pty' }) - ) - }) - it('does not byte-scan PR links or OSC 133 — facts are the only consumer', async () => { enableMainAuthority() const { connectPanePty } = await import('../connect-pane-pty') @@ -424,53 +202,6 @@ export function registerPtyConnectionMainSideEffectAuthorityTests(): void { expect(mockStoreState.dropAgentStatus).not.toHaveBeenCalled() }) - it('seeds and settles Command Code status from command-code facts', async () => { - enableMainAuthority() - const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') - const handler = - await import('../../pty-transport/output/terminal-side-effect-facts-handler') - const transport = createMockTransport() - transportFactoryQueue.push(transport) - vi.useFakeTimers() - const paneKey = makePaneKey('tab-1', LEAF_1) - - connectPanePty( - createPane(1) as never, - createManager(1) as never, - bindPaneAgentTitleMocks(createDeps() as never, agentTitleMocks10) - ) - const onPtySpawn = createdTransportOptions[0]?.onPtySpawn as (ptyId: string) => void - onPtySpawn('pty-fact-cc') - - handler._dispatchTerminalSideEffectBatchForTest({ - ptyId: 'pty-fact-cc', - seq: 1, - facts: [{ kind: 'command-code-working', prompt: 'say hi' }] - }) - expect(mockStoreState.agentStatusByPaneKey[paneKey]).toMatchObject({ - state: 'working', - prompt: 'say hi', - agentType: 'command-code' - }) - - // Done facts are hints; pane policy owns settling so it can consult the live row before completion. - handler._dispatchTerminalSideEffectBatchForTest({ - ptyId: 'pty-fact-cc', - seq: 2, - facts: [{ kind: 'command-code-done', prompt: 'say hi' }] - }) - vi.advanceTimersByTime(1499) - expect(mockStoreState.agentStatusByPaneKey[paneKey]).toMatchObject({ state: 'working' }) - vi.advanceTimersByTime(1) - expect(mockStoreState.agentStatusByPaneKey[paneKey]).toMatchObject({ - state: 'done', - prompt: 'say hi', - agentType: 'command-code' - }) - }) - it('rejects Command Code facts when Claude owns the pane', async () => { enableMainAuthority() const { connectPanePty } = await import('../connect-pane-pty') @@ -614,38 +345,6 @@ export function registerPtyConnectionMainSideEffectAuthorityTests(): void { }) }) - it('does not byte-scan Command Code output — facts are the only consumer', async () => { - enableMainAuthority() - const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks14 = - await vi.importMock('@/lib/agent-status') - const transport = createMockTransport() - const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } - transport.connect.mockImplementation( - async ({ callbacks }: { callbacks: ConnectCallbacks }) => { - capturedDataCallback.current = callbacks.onData ?? null - return 'pty-authority-cc-bytes' - } - ) - transportFactoryQueue.push(transport) - - connectPanePty( - createPane(1) as never, - createManager(1) as never, - bindPaneAgentTitleMocks( - createDeps({ startup: { command: 'command-code --trust' } }) as never, - agentTitleMocks14 - ) - ) - await flushAsyncTicks() - expect(capturedDataCallback.current).not.toBeNull() - - capturedDataCallback.current?.('# Command Code v0.27.2\r\n') - capturedDataCallback.current?.('❯ Fix the spinner\r\n\x1b[35m✻ Thinking...\x1b[0m') - - expect(mockStoreState.setAgentStatus).not.toHaveBeenCalled() - }) - it('honors the persisted kill switch for panes bound before settings hydrate', async () => { // Pre-hydration: settings not loaded but kill switch persisted off — pane registers byte parsers, not a fact consumer. mockStoreState.settings = null diff --git a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-bell-query-reply-and-stale-input.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-bell-query-reply-and-stale-input.spec.ts deleted file mode 100644 index 3de96233b40..00000000000 --- a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-bell-query-reply-and-stale-input.spec.ts +++ /dev/null @@ -1,141 +0,0 @@ -import { bindPtyConnectionTestMocks } from '../test-fixtures/pty-connection-mocks.spec' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { makePaneKey } from '../../../../../../shared/workspace-layout/stable-pane-id' -import { - LEAF_1, - createMockTransport, - createPane, - createManager, - type MockTransport -} from '../test-fixtures/pty-connection-test-pane-fixtures' -import { - buildPaneConnectionDeps, - type PtyConnectionAgentTitleMocks, - bindPaneAgentTitleMocks -} from '../test-fixtures/pty-connection-test-deps' -import { createInitialStoreState } from '../test-fixtures/pty-connection-test-store-fixtures' -import type { StoreState } from '../test-fixtures/pty-connection-test-store-state' -import { - installTerminalTestGlobals, - restoreTerminalTestGlobals -} from '../test-fixtures/pty-connection-test-environment' - -export function registerPtyConnectionBellQueryReplyAndStaleInputTests(): void { - let mockStoreState: StoreState - let transportFactoryQueue: MockTransport[] = [] - let createdTransportOptions: Record[] = [] - let storeSubscribers: ((state: StoreState) => void)[] = [] - - function createDeps(overrides: Record = {}) { - return buildPaneConnectionDeps(() => mockStoreState, overrides) - } - describe('connectPanePty', () => { - beforeEach(async () => { - vi.clearAllMocks() - transportFactoryQueue = [] - createdTransportOptions = [] - storeSubscribers = [] - mockStoreState = createInitialStoreState(() => mockStoreState) - bindPtyConnectionTestMocks({ - getState: () => mockStoreState, - getTransportQueue: () => transportFactoryQueue, - getTransportOptions: () => createdTransportOptions, - getStoreSubscribers: () => storeSubscribers, - setStoreSubscribers: (subscribers) => { - storeSubscribers = subscribers - } - }) - await installTerminalTestGlobals() - }) - - afterEach(async () => { - await restoreTerminalTestGlobals() - }) - - it('forwards raw onData after a bell as a query reply', async () => { - const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') - const transport = createMockTransport() - transportFactoryQueue.push(transport) - - const pane = createPane(1) - let onDataHandler: ((data: string) => void) | null = null - pane.terminal.onData = vi.fn(((handler: (data: string) => void) => { - onDataHandler = handler - return { dispose: vi.fn() } - }) as typeof pane.terminal.onData) - const manager = createManager(1) - const deps = createDeps() - - connectPanePty( - pane as never, - manager as never, - bindPaneAgentTitleMocks(deps as never, agentTitleMocks7) - ) - - const bellHandler = createdTransportOptions[0]?.onBell as (() => void) | undefined - if (!bellHandler || !onDataHandler) { - throw new Error('expected bell and onData handlers to be registered') - } - - bellHandler() - ;(onDataHandler as (data: string) => void)('a') - - expect(deps.markTerminalBell).toHaveBeenCalledWith({ - worktreeId: 'wt-1', - - tabId: 'tab-1', - - paneKey: makePaneKey('tab-1', LEAF_1) - }) - expect(transport.sendInput).toHaveBeenCalledWith('a', 'query-reply') - }) - - // Why: on a stale-codex pane (pending account-switch restart), production blocks sendInput. - it('blocks onData on a stale codex pane', async () => { - const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') - const transport = createMockTransport('pty-codex-stale') - transportFactoryQueue.push(transport) - // isCodexPaneStale reads codexRestartNoticeByPtyId; seed a restart notice to trigger the stale branch. - mockStoreState = { - ...mockStoreState, - tabsByWorktree: { - 'wt-1': [{ id: 'tab-1', ptyId: 'pty-codex-stale' }] - }, - ptyIdsByTabId: { - 'tab-1': ['pty-codex-stale'] - }, - codexRestartNoticeByPtyId: { - 'pty-codex-stale': { previousAccountLabel: 'A', nextAccountLabel: 'B' } - } - } - - const pane = createPane(1) - let onDataHandler: ((data: string) => void) | null = null - pane.terminal.onData = vi.fn(((handler: (data: string) => void) => { - onDataHandler = handler - return { dispose: vi.fn() } - }) as typeof pane.terminal.onData) - - const manager = createManager(1) - const deps = createDeps() - - connectPanePty( - pane as never, - manager as never, - bindPaneAgentTitleMocks(deps as never, agentTitleMocks8) - ) - - if (!onDataHandler) { - throw new Error('expected onData handler to be registered') - } - ;(onDataHandler as (data: string) => void)('a') - - // Stale-codex input is also blocked from reaching the transport. - expect(transport.sendInput).not.toHaveBeenCalled() - }) - }) -} diff --git a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-command-finished-interrupt-arbitration.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-command-finished-interrupt-arbitration.spec.ts index 95d12b02a70..eee12960498 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-command-finished-interrupt-arbitration.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-command-finished-interrupt-arbitration.spec.ts @@ -165,69 +165,5 @@ export function registerPtyConnectionCommandFinishedInterruptArbitrationTests(): } } ) - - it('drops the command-finished status when pending interrupt inference is rejected', async () => { - const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks15 = - await vi.importMock('@/lib/agent-status') - - vi.mocked(window.api.agentStatus.inferInterrupt).mockResolvedValue(false) - const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } - const transport = createMockTransport() - transport.connect.mockImplementation( - async ({ callbacks }: { callbacks: ConnectCallbacks }) => { - capturedDataCallback.current = callbacks.onData ?? null - return { id: 'tab-pty' } - } - ) - transportFactoryQueue.push(transport) - vi.useFakeTimers() - vi.setSystemTime(1_100) - const paneKey = makePaneKey('tab-1', LEAF_1) - mockStoreState = { - ...mockStoreState, - agentStatusByPaneKey: { - [paneKey]: { - paneKey, - state: 'working', - prompt: 'stop quickly', - updatedAt: 1_000, - stateStartedAt: 900, - agentType: 'custom-agent', - terminalTitle: 'Codex', - stateHistory: [] - } - } - } - const terminalTarget = createKeyboardEventTarget() - const pane = createPane(1) - ;(pane.terminal as { element?: unknown }).element = terminalTarget.target - let onDataHandler: ((data: string) => void) | null = null - pane.terminal.onData = vi.fn(((handler: (data: string) => void) => { - onDataHandler = handler - return { dispose: vi.fn() } - }) as typeof pane.terminal.onData) - - connectPanePty( - ...mockPanePtyArgs( - pane, - createManager(1), - bindPaneAgentTitleMocks(createDeps(), agentTitleMocks15) - ) - ) - vi.advanceTimersByTime(1_000) - await flushAsyncTicks() - if (!onDataHandler) { - throw new Error('expected onData handler to be registered') - } - terminalTarget.dispatch(keyEvent({ key: 'c', ctrlKey: true })) - ;(onDataHandler as unknown as (data: string) => void)('\x03') - - capturedDataCallback.current?.('\x1b]133;D;130\x07thebr ~/repo $ ') - await flushAsyncTicks() - - expect(window.api.agentStatus.inferInterrupt).toHaveBeenCalled() - expect(mockStoreState.dropAgentStatus).toHaveBeenCalledWith(paneKey) - }) }) } diff --git a/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-notification-settings-gating.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-notification-settings-gating.spec.ts index 85b68256634..079130b0947 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-notification-settings-gating.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-notification-settings-gating.spec.ts @@ -125,33 +125,6 @@ export function registerPtyConnectionNotificationSettingsGatingTests(): void { ) }) - it('shares one raw store subscriber for agent-complete notification settings across panes', async () => { - const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') - transportFactoryQueue.push(createMockTransport('pty-1'), createMockTransport('pty-2')) - - vi.useFakeTimers() - const firstBinding = connectPanePty( - createPane(1) as never, - createManager(1) as never, - bindPaneAgentTitleMocks(createDeps() as never, agentTitleMocks4) - ) - const secondBinding = connectPanePty( - createPane(2) as never, - createManager(1) as never, - bindPaneAgentTitleMocks(createDeps() as never, agentTitleMocks4) - ) - await flushAsyncTicks() - - expect(storeSubscribers).toHaveLength(1) - - firstBinding.dispose() - expect(storeSubscribers).toHaveLength(1) - secondBinding.dispose() - expect(storeSubscribers).toHaveLength(0) - }) - it('keeps an in-flight generic completion when desktop completion banners are enabled', async () => { const { connectPanePty } = await import('../connect-pane-pty') const agentTitleMocks6 = diff --git a/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-task-complete-dispatch.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-task-complete-dispatch.spec.ts index aa5980cba17..09c14093eaf 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-task-complete-dispatch.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-task-complete-dispatch.spec.ts @@ -18,10 +18,7 @@ import { type PtyConnectionAgentTitleMocks, bindPaneAgentTitleMocks } from '../test-fixtures/pty-connection-test-deps' -import { - createInitialStoreState, - buildActiveRuntimeEnvironmentState -} from '../test-fixtures/pty-connection-test-store-fixtures' +import { createInitialStoreState } from '../test-fixtures/pty-connection-test-store-fixtures' import type { StoreState } from '../test-fixtures/pty-connection-test-store-state' import { installTerminalTestGlobals, @@ -39,11 +36,6 @@ export function registerPtyConnectionTaskCompleteDispatchTests(): void { return buildPaneConnectionDeps(() => mockStoreState, overrides) } - // Why: activeRuntimeEnvironmentId exercises the remote-runtime path where the renderer still owns OSC 9999 status. - function enableActiveRuntimeEnvironment(environmentId = 'env-1'): void { - mockStoreState = buildActiveRuntimeEnvironmentState(mockStoreState, environmentId) - } - describe('connectPanePty', () => { beforeEach(async () => { vi.clearAllMocks() @@ -67,50 +59,6 @@ export function registerPtyConnectionTaskCompleteDispatchTests(): void { await restoreTerminalTestGlobals() }) - it('dispatches agent-task-complete for generic Codex spinner titles after process identity is confirmed', async () => { - const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') - const transport = createMockTransport('pty-codex') - transportFactoryQueue.push(transport) - - vi.useFakeTimers() - const api = ( - globalThis as unknown as { - window: { api: { pty: { getForegroundProcess: ReturnType } } } - } - ).window.api - api.pty.getForegroundProcess.mockResolvedValue('codex') - const pane = createPane(1) - const manager = createManager(1) - const deps = createDeps() - - connectPanePty( - ...mockPanePtyArgs(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks)) - ) - - const titleHandler = createdTransportOptions[0]?.onTitleChange as - | ((title: string, rawTitle: string) => void) - | undefined - if (!titleHandler) { - throw new Error('Expected onTitleChange to be registered') - } - - titleHandler('⠋ experimental-agent-observability', '⠋ experimental-agent-observability') - titleHandler('experimental-agent-observability', 'experimental-agent-observability') - await flushAsyncTicks() - - vi.advanceTimersByTime(AGENT_TASK_COMPLETE_NOTIFICATION_MAX_WAIT_MS) - - expect(deps.dispatchNotification).toHaveBeenCalledWith({ - source: 'agent-task-complete', - terminalTitle: 'experimental-agent-observability', - ptyId: 'tab-pty', - paneKey: makePaneKey('tab-1', LEAF_1) - }) - expect(window.api.pty.inspectProcess).toHaveBeenCalledWith('pty-codex') - }) - it('does not dispatch generic spinner completions when process inspection finds no agent', async () => { const { connectPanePty } = await import('../connect-pane-pty') const agentTitleMocks2 = @@ -151,89 +99,6 @@ export function registerPtyConnectionTaskCompleteDispatchTests(): void { ) }) - it('normalizes Pi-compatible remote titles to authoritative OMP launch identity', async () => { - const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') - const transport = createMockTransport('pty-omp') - transportFactoryQueue.push(transport) - enableActiveRuntimeEnvironment() - mockStoreState.tabsByWorktree = { - 'wt-1': [{ id: 'tab-1', ptyId: 'tab-pty', launchAgent: 'omp' }] - } - mockStoreState.runtimePaneTitlesByTabId = { 'tab-1': { 1: '\u280b Pi' } } - - const pane = createPane(1) - const manager = createManager(1) - manager.getActivePane.mockReturnValue({ id: 1 }) - const deps = createDeps() - - connectPanePty( - ...mockPanePtyArgs(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks5)) - ) - - const titleHandler = createdTransportOptions[0]?.onTitleChange as - | ((title: string, rawTitle: string) => void) - | undefined - if (!titleHandler) { - throw new Error('Expected onTitleChange to be registered') - } - titleHandler('\u280b Pi', '\u280b Pi') - expect(deps.setRuntimePaneTitle).toHaveBeenCalledWith('tab-1', 1, '\u280b OMP') - expect(deps.updateTabTitle).toHaveBeenCalledWith('tab-1', '\u280b OMP') - titleHandler('π: tmp', 'π: tmp') - expect(deps.setRuntimePaneTitle).toHaveBeenLastCalledWith('tab-1', 1, 'OMP: tmp') - expect(deps.updateTabTitle).toHaveBeenLastCalledWith('tab-1', 'OMP: tmp') - - const statusHandler = createdTransportOptions[0]?.onAgentStatus as - | ((payload: { state: 'working'; prompt: string; agentType: 'pi' }) => void) - | undefined - if (!statusHandler) { - throw new Error('Expected onAgentStatus to be registered') - } - - statusHandler({ - state: 'working', - prompt: 'fix the remote title', - agentType: 'pi' - }) - - expect(mockStoreState.setAgentStatus).toHaveBeenCalledWith( - makePaneKey('tab-1', LEAF_1), - { - state: 'working', - prompt: 'fix the remote title', - agentType: 'omp', - observation: expect.objectContaining({ origin: 'osc', kind: 'snapshot' }) - }, - '\u280b OMP', - undefined, - { connectionId: null } - ) - - mockStoreState.tabsByWorktree = { - 'wt-1': [{ id: 'tab-1', ptyId: 'tab-pty' }] - } - statusHandler({ - state: 'working', - prompt: 'keep the remote title', - agentType: 'pi' - }) - - expect(mockStoreState.setAgentStatus).toHaveBeenLastCalledWith( - makePaneKey('tab-1', LEAF_1), - { - state: 'working', - prompt: 'keep the remote title', - agentType: 'omp', - observation: expect.objectContaining({ origin: 'osc', kind: 'snapshot' }) - }, - '\u280b OMP', - undefined, - { connectionId: null } - ) - }) - it('queues the idle cursor reset behind hidden agent output', async () => { const { connectPanePty } = await import('../connect-pane-pty') const agentTitleMocks8 = diff --git a/src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-completion-and-notification.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-completion-and-notification.test.ts index 0f56921a577..abad8333a68 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-completion-and-notification.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-completion-and-notification.test.ts @@ -1,7 +1,6 @@ import { describe } from 'vitest' import { registerPtyConnectionCommandFinishedCleanupTests } from '../agent-identity/pty-connection-command-finished-cleanup.spec' import { registerPtyConnectionCommandFinishedInterruptArbitrationTests } from '../input/pty-connection-command-finished-interrupt-arbitration.spec' -import { registerPtyConnectionBellQueryReplyAndStaleInputTests } from '../input/pty-connection-bell-query-reply-and-stale-input.spec' import { registerPtyConnectionHookCompletionSideEffectsTests } from '../notifications/pty-connection-hook-completion-side-effects.spec' import { registerPtyConnectionMainSideEffectAuthorityTests } from '../emulation/pty-connection-main-side-effect-authority.spec' import { registerPtyConnectionNotificationSettingsGatingTests } from '../notifications/pty-connection-notification-settings-gating.spec' @@ -11,9 +10,6 @@ describe('pty-connection-command-finished-cleanup', () => { registerPtyConnectionCommandFinishedCleanupTests() registerPtyConnectionCommandFinishedInterruptArbitrationTests() }) -describe('pty-connection-hook-completion-bell-arbitration', () => { - registerPtyConnectionBellQueryReplyAndStaleInputTests() -}) describe( 'pty-connection-hook-completion-side-effects', registerPtyConnectionHookCompletionSideEffectsTests diff --git a/src/renderer/src/hooks/ipc-events/ssh-managed-server-state-effects.test.ts b/src/renderer/src/hooks/ipc-events/ssh-managed-server-state-effects.test.ts deleted file mode 100644 index 6f01bdc3ab9..00000000000 --- a/src/renderer/src/hooks/ipc-events/ssh-managed-server-state-effects.test.ts +++ /dev/null @@ -1,53 +0,0 @@ -// @vitest-environment happy-dom -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' - -const mocks = vi.hoisted(() => ({ - toast: Object.assign(vi.fn(), { - error: vi.fn(), - success: vi.fn(), - loading: vi.fn(() => 'progress'), - dismiss: vi.fn() - }), - fetchReposForAllHosts: vi.fn(async () => undefined), - remountTerminalTabForRecovery: vi.fn() -})) -vi.mock('sonner', () => ({ toast: mocks.toast })) -vi.mock('../../store', () => ({ - useAppStore: { - getState: () => ({ - fetchReposForAllHosts: mocks.fetchReposForAllHosts, - remountTerminalTabForRecovery: mocks.remountTerminalTabForRecovery, - sshTargetLabels: new Map([['ssh-1', 'Box']]), - tabsByWorktree: {}, - ptyIdsByTabId: {}, - terminalLayoutsByTabId: {} - }) - } -})) - -vi.mock( - '../../components/terminal-pane/pty-transport/legacy-relay/legacy-relay-bridge-panes', - () => ({ - legacyRelayBridgedTabIds: (targetId: string) => (targetId === 'ssh-1' ? ['tab-1', 'tab-2'] : []) - }) -) - -beforeEach(() => { - vi.clearAllMocks() -}) -afterEach(() => { - Reflect.deleteProperty(window, 'api') -}) - -describe('a host kept connected for the relay bridge', () => { - it('never loads the bridge panes module, which subscribes on load, just by being imported', async () => { - vi.resetModules() - vi.doUnmock( - '../../components/terminal-pane/pty-transport/legacy-relay/legacy-relay-bridge-panes' - ) - const listPanes = vi.fn(() => undefined) - Object.assign(window, { api: { ssh: {}, legacyRelayBridge: { listPanes, onPanes: vi.fn() } } }) - await import('./ssh-managed-server-state-effects') - expect(listPanes).not.toHaveBeenCalled() - }) -}) diff --git a/src/renderer/src/hooks/ipc-events/wsl-host-ipc-bridge-capability.test.ts b/src/renderer/src/hooks/ipc-events/wsl-host-ipc-bridge-capability.test.ts deleted file mode 100644 index c557aaf7287..00000000000 --- a/src/renderer/src/hooks/ipc-events/wsl-host-ipc-bridge-capability.test.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest' -import { getDefaultSettings } from '../../../../shared/constants' -import type { WslHostCapability } from '../../../../shared/wsl-host-types' -import { seedStore } from '../../store/testing/app-store-test-fixture' - -vi.mock('../../store', async () => { - const { createTestStore } = await import('../../store/testing/app-store-test-fixture') - return { useAppStore: createTestStore() } -}) - -const { useAppStore } = await import('../../store') -const { registerWslHostIpcBridge } = await import('./wsl-host-ipc-bridge') -const { readWslHostOfferGate, wslHostOfferFor } = - await import('../../components/sidebar/wsl-host-offer') - -let pushCapability: (capability: WslHostCapability) => void = () => {} -const api = { - onStatusChanged: vi.fn(() => () => {}), - getStatuses: vi.fn(async () => []), - getCapability: vi.fn(async () => ({ serverFiles: true, acceptsNewWork: true })), - onCapabilityChanged: vi.fn((callback: (capability: WslHostCapability) => void) => { - pushCapability = callback - return () => {} - }) -} - -beforeEach(() => { - vi.clearAllMocks() - Object.assign(globalThis, { window: { api: { runtimeEnvironments: { wslHosts: api } } } }) - seedStore(useAppStore, { - settings: { ...getDefaultSettings('/tmp'), experimentalWslHosts: false } - }) -}) - -describe('WSL host capability pushed mid-run', () => { - it('hides the in-context offer as soon as main stops new work, without a relaunch', async () => { - const unsubs: (() => void)[] = [] - registerWslHostIpcBridge(unsubs) - await vi.waitFor(() => expect(useAppStore.getState().wslHostsAcceptNewWork).toBe(true)) - const uncPath = '\\\\wsl.localhost\\Ubuntu\\home\\me\\app' - expect(wslHostOfferFor(uncPath, readWslHostOfferGate(useAppStore.getState()))).toBe('Ubuntu') - - pushCapability({ serverFiles: true, acceptsNewWork: false }) - - expect(useAppStore.getState().wslHostsAcceptNewWork).toBe(false) - expect(wslHostOfferFor(uncPath, readWslHostOfferGate(useAppStore.getState()))).toBeNull() - unsubs.forEach((unsub) => unsub()) - }) -}) diff --git a/src/renderer/src/lib/agent-session/launch/agent-settings-update-queue.test.ts b/src/renderer/src/lib/agent-session/launch/agent-settings-update-queue.test.ts deleted file mode 100644 index ec15942fc1a..00000000000 --- a/src/renderer/src/lib/agent-session/launch/agent-settings-update-queue.test.ts +++ /dev/null @@ -1,117 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' -import { getDefaultSettings } from '../../../../../shared/constants' -import type { GlobalSettings } from '../../../../../shared/global-settings-types' -import { useAppStore } from '../../../store/index' -import { createAgentAvailabilityUpdateQueue } from './agent-settings-update-queue' - -describe('agent availability settings', () => { - it('continues serializing requests after a rejected write', async () => { - const settings: GlobalSettings = { - ...getDefaultSettings('/tmp'), - defaultTuiAgent: null, - disabledTuiAgents: [] - } - let latest = settings - const updateSettings = vi - .fn<(update: Partial) => Promise>() - .mockRejectedValueOnce(new Error('write failed')) - .mockImplementationOnce(async (update) => { - latest = { ...latest, ...update } - }) - const enqueue = createAgentAvailabilityUpdateQueue() - - await expect( - enqueue({ - getSettings: () => latest, - fallbackSettings: settings, - updateSettings, - agentId: 'claude', - enabled: false - }) - ).rejects.toThrow('write failed') - await enqueue({ - getSettings: () => latest, - fallbackSettings: settings, - updateSettings, - agentId: 'codex', - enabled: false - }) - - expect(updateSettings).toHaveBeenCalledTimes(2) - expect(updateSettings.mock.calls[1][0]).toMatchObject({ disabledTuiAgents: ['codex'] }) - }) -}) - -type Deferred = { - promise: Promise - resolve: () => void -} - -function createDeferred(): Deferred { - let resolve!: () => void - const promise = new Promise((next) => { - resolve = next - }) - return { promise, resolve } -} - -async function flushPromiseQueue(): Promise { - await Promise.resolve() - await Promise.resolve() -} - -describe('AgentsPane', () => { - it('serializes rapid availability writes against the latest settings snapshot', async () => { - const queueAvailabilityUpdate = createAgentAvailabilityUpdateQueue() - const settings: GlobalSettings = { - ...getDefaultSettings('/tmp'), - defaultTuiAgent: null, - disabledTuiAgents: [] - } - const writes: Deferred[] = [] - const updates: Partial[] = [] - - useAppStore.setState({ settings }) - const updateSettings = vi.fn((update: Partial) => { - updates.push(update) - const nextSettings = { - ...(useAppStore.getState().settings ?? settings), - ...update - } - const write = createDeferred() - writes.push(write) - return write.promise.then(() => { - useAppStore.setState({ settings: nextSettings }) - }) - }) - - const firstWrite = queueAvailabilityUpdate({ - getSettings: () => useAppStore.getState().settings, - fallbackSettings: settings, - updateSettings, - agentId: 'claude', - enabled: false - }) - const secondWrite = queueAvailabilityUpdate({ - getSettings: () => useAppStore.getState().settings, - fallbackSettings: settings, - updateSettings, - agentId: 'codex', - enabled: false - }) - - await flushPromiseQueue() - expect(updateSettings).toHaveBeenCalledTimes(1) - expect(updates[0]).toMatchObject({ disabledTuiAgents: ['claude'] }) - - writes[0].resolve() - await firstWrite - await flushPromiseQueue() - - expect(updateSettings).toHaveBeenCalledTimes(2) - expect(updates[1]).toMatchObject({ disabledTuiAgents: ['claude', 'codex'] }) - - writes[1].resolve() - await secondWrite - }) -}) diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-record.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-record.test.ts deleted file mode 100644 index e9a386ed041..00000000000 --- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-record.test.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { afterEach, describe, expect, it, vi } from 'vitest' -import { validRecord } from './structured-agent-session-launch-record' - -const record = { - sessionId: 'codex_11111111_2222_3333_4444_555555555555', - executionHostId: 'local', - agent: 'codex', - lifecycle: 'visibility-unknown', - clientOperationId: 'create-operation', - payloadFingerprint: 'a'.repeat(64), - expectedRuntimeFence: null, - createMessageSupport: true, - firstMessage: { - clientMessageId: 'opening-message', - body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'opening π text' }] } - } -} - -afterEach(() => vi.unstubAllGlobals()) - -describe('a persisted create opening message', () => { - it('loads the frozen user message in a browser without Node Buffer', () => { - vi.stubGlobal('Buffer', undefined) - expect(() => validRecord(record)).not.toThrow() - expect(validRecord(record)).toBe(true) - }) -}) diff --git a/src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session-stranded-sleep.test.ts b/src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session-stranded-sleep.test.ts deleted file mode 100644 index 6970ba51419..00000000000 --- a/src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session-stranded-sleep.test.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { afterEach, expect, it, vi } from 'vitest' -import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session/lifecycle/agent-session-resume' -import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id' -import { useAppStore } from '@/store/index' -import { resumeSleepingAgentSessionsForWorktree } from './resume-sleeping-agent-session' - -vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) => - ( - await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture') - ).runtimeRpcClientWithLayoutApply(await importOriginal()) -) - -const initialAppStoreState = useAppStore.getState() - -afterEach(() => { - vi.unstubAllGlobals() - useAppStore.setState(initialAppStoreState, true) -}) - -// #22657: deleting or ignoring it would leave the session with no resume handle at all. -it('reopens a slept agent whose tab is gone in a fresh tab and retires main’s record', async () => { - const retireStrandedSleepRecord = vi.fn().mockResolvedValue(undefined) - vi.stubGlobal('window', { api: { worktrees: { retireStrandedSleepRecord } } }) - const record: SleepingAgentSessionRecord = { - paneKey: makePaneKey('tab-1', '11111111-1111-4111-8111-111111111111'), - tabId: 'tab-1', - worktreeId: 'wt-1', - agent: 'claude', - providerSession: { key: 'session_id', id: 'sess-1' }, - prompt: '', - state: 'done', - capturedAt: 1, - updatedAt: 1, - origin: 'worktree-sleep', - restoreOnTabOpenOnly: true - } - useAppStore.setState({ - tabsByWorktree: { 'wt-1': [] }, - sleepingAgentSessionsByPaneKey: { [record.paneKey]: record } - } as never) - - expect(resumeSleepingAgentSessionsForWorktree('wt-1')).toBe(1) - const state = useAppStore.getState() - const resumedTab = state.tabsByWorktree['wt-1']?.[0] - expect(state.pendingStartupByTabId[resumedTab!.id]?.resumeProviderSession).toEqual( - record.providerSession - ) - expect(state.sleepingAgentSessionsByPaneKey[record.paneKey]).toBeUndefined() - await vi.waitFor(() => - expect(retireStrandedSleepRecord).toHaveBeenCalledWith({ - worktreeId: 'wt-1', - paneKey: record.paneKey - }) - ) -}) diff --git a/src/renderer/src/lib/browser/navigation/browser-link-profile-isolation.test.ts b/src/renderer/src/lib/browser/navigation/browser-link-profile-isolation.test.ts deleted file mode 100644 index d15daee5e3d..00000000000 --- a/src/renderer/src/lib/browser/navigation/browser-link-profile-isolation.test.ts +++ /dev/null @@ -1,183 +0,0 @@ -import type * as BrowserFocusModule from '@/components/browser-pane/host-guest/browser-focus' -import { beforeEach, describe, expect, it, vi } from 'vitest' -import { createStoreCascadesMockApi } from '@/store/testing/app-store-cascade-api.test-fixture' -import type { BrowserSessionProfile } from '../../../../../shared/browser-workspace-types' -import { getDefaultSettings } from '../../../../../shared/constants' -import { openFileInBrowserTab } from '../../file-preview' -import { openWorkspaceBrowserTabForLink } from '../workspace/workspace-browser-tab-open' -import { captureLinkOpenIntent } from '../../link-open-intent' -import type { BrowserOpenOutcome } from './browser-link-destination' -import { - createBrowserLinkTestStore, - WORKSPACE, - URL_TO_OPEN, - type BrowserLinkTestStore -} from './browser-link-open.test-fixture' - -const mocks = vi.hoisted(() => ({ getState: vi.fn(), ensureProfile: vi.fn() })) -vi.mock('@/store/index', () => ({ useAppStore: { getState: () => mocks.getState() } })) -vi.mock('@/components/browser-pane/host-guest/browser-focus', async (importOriginal) => ({ - ...(await importOriginal()), - requestBrowserFocus: vi.fn() -})) -vi.mock('sonner', () => ({ - toast: { error: vi.fn(), info: vi.fn(), success: vi.fn(), warning: vi.fn() } -})) - -let store: BrowserLinkTestStore -beforeEach(() => { - createStoreCascadesMockApi() - Object.defineProperty(window.api, 'browser', { - value: { - sessionEnsureManagedProfile: mocks.ensureProfile, - notifyActiveTabChanged: vi.fn().mockResolvedValue(undefined) - }, - configurable: true - }) - mocks.ensureProfile.mockReset() - store = createBrowserLinkTestStore() - mocks.getState.mockImplementation(() => store.getState()) - store.setState({ - browserSessionProfilesByHostId: { - local: [ - { - id: 'default', - scope: 'default', - partition: 'persist:shared', - label: 'Default', - source: null - } - ] - } - }) -}) - -function open(surface: 'http' | 'html'): Promise { - const linkContext = { - linkIntent: captureLinkOpenIntent(store.getState(), WORKSPACE, 'source') - } - if (surface === 'http') { - return openWorkspaceBrowserTabForLink({ - workspaceId: WORKSPACE, - url: URL_TO_OPEN, - intent: { kind: 'url' }, - linkContext - }) - } - return new Promise((resolve) => - openFileInBrowserTab({ - filePath: '/repo/report.html', - worktreeId: WORKSPACE, - linkContext, - onLinkOutcome: resolve - }) - ) -} - -describe.each(['repo', 'worktree'] as const)('%s browser profile isolation', (scope) => { - it.each(['http', 'html'] as const)( - 'opens %s links in the managed profile and only reuses pages in that profile', - async (surface) => { - const profile: BrowserSessionProfile = { - id: 'managed', - scope: 'isolated', - partition: 'persist:managed', - label: 'Workspace login', - source: null, - owner: { kind: scope, id: scope === 'repo' ? 'repo1' : WORKSPACE } - } - mocks.ensureProfile.mockResolvedValue(profile) - store.setState((state) => ({ - settings: { ...getDefaultSettings('/home/test'), browserProfileScope: scope }, - browserSessionProfilesByHostId: { - local: [...state.browserSessionProfilesByHostId.local!, profile] - } - })) - const shared = store - .getState() - .createBrowserTab( - WORKSPACE, - surface === 'http' ? URL_TO_OPEN : 'file:///repo/report.html', - { - targetGroupId: 'b', - executionHostId: 'local', - browserRuntimeEnvironmentId: null, - sessionProfileId: 'default', - activate: false - } - ) - - const opened = await open(surface) - expect(opened.status).toBe('opened') - if (opened.status !== 'opened') { - throw new Error('Expected scoped browser page') - } - expect(opened.result.browserWorkspaceId).not.toBe(shared.id) - expect( - store - .getState() - .browserTabsByWorktree[WORKSPACE]?.find( - (workspace) => workspace.id === opened.result.browserWorkspaceId - ) - ).toMatchObject({ sessionProfileId: profile.id, sessionPartition: profile.partition }) - const reopened = await open(surface) - if (surface === 'html') { - expect(reopened).toEqual(opened) - } else { - expect(reopened.status).toBe('opened') - if (reopened.status !== 'opened') { - throw new Error('Expected opened link') - } - expect(reopened.result.browserWorkspaceId).not.toBe(opened.result.browserWorkspaceId) - } - expect(store.getState().browserTabsByWorktree[WORKSPACE]).toHaveLength( - surface === 'http' ? 3 : 2 - ) - } - ) -}) - -it('holds a link in an isolated partition until its workspace profile is minted', async () => { - let mintProfile: ((profile: BrowserSessionProfile) => void) | undefined - mocks.ensureProfile.mockImplementation( - () => new Promise((resolve) => (mintProfile = resolve)) - ) - store.setState({ - settings: { ...getDefaultSettings('/home/test'), browserProfileScope: 'worktree' } - }) - const opened = await open('http') - if (opened.status !== 'opened') { - throw new Error('Expected pending browser page') - } - const pending = store - .getState() - .browserTabsByWorktree[WORKSPACE]?.find( - (workspace) => workspace.id === opened.result.browserWorkspaceId - ) - expect(pending?.sessionProfileId).toBeTruthy() - expect(pending?.sessionProfileId).not.toBe('default') - expect(pending?.sessionPartition).toBe( - `persist:orca-browser-unminted-${pending?.sessionProfileId}` - ) - expect(store.getState().managedBrowserProfileStatusById[pending?.sessionProfileId ?? '']).toBe( - 'pending' - ) - - mintProfile?.({ - id: 'minted', - scope: 'isolated', - partition: 'persist:minted', - label: 'Workspace login', - source: null, - owner: { kind: 'worktree', id: WORKSPACE } - }) - await vi.waitFor(() => - expect( - store - .getState() - .browserTabsByWorktree[WORKSPACE]?.find( - (workspace) => workspace.id === opened.result.browserWorkspaceId - ) - ).toMatchObject({ sessionProfileId: 'minted', sessionPartition: null }) - ) -}) diff --git a/src/renderer/src/lib/browser/navigation/http-link-routing-store.test.ts b/src/renderer/src/lib/browser/navigation/http-link-routing-store.test.ts index b7e481258ed..1078fd125cd 100644 --- a/src/renderer/src/lib/browser/navigation/http-link-routing-store.test.ts +++ b/src/renderer/src/lib/browser/navigation/http-link-routing-store.test.ts @@ -247,38 +247,6 @@ it.each(['workspace', 'view'] as const)( } ) -it.each([false, true])( - 'reveals the tab layout for a foreground source-aware HTTP link (already open: %s)', - async (reuse) => { - if (reuse) { - useAppStore.getState().createBrowserTab(WORKSPACE, URL_TO_OPEN, { - targetGroupId: 'b', - activate: false, - browserRuntimeEnvironmentId: null, - sessionProfileId: null - }) - } - const opening = vi.spyOn(workspaceBrowserTabOpen, 'openWorkspaceBrowserTabForLink') - openHttpLink(URL_TO_OPEN, { - worktreeId: WORKSPACE, - sourceOwner: { kind: 'local' }, - linkContext: { - linkIntent: captureLinkOpenIntent(useAppStore.getState(), WORKSPACE, 'source') - } - }) - await vi.waitFor(() => expect(opening).toHaveBeenCalledOnce()) - const outcome = await opening.mock.results[0]!.value - - expect(outcome).toMatchObject({ status: 'opened' }) - if (outcome.status !== 'opened') { - throw new Error('Expected opened link') - } - expect(useAppStore.getState().activeView).toBe('terminal') - expect(useAppStore.getState().activeGroupIdByWorktree[WORKSPACE]).toBe(outcome.result.groupId) - expect(useAppStore.getState().browserTabsByWorktree[WORKSPACE]).toHaveLength(reuse ? 2 : 1) - } -) - it('keeps the Activity view and current pane selected for background source-aware HTTP links', async () => { useAppStore.setState({ settings: { @@ -340,21 +308,3 @@ it('keeps the main view and workspace selected when revealing a floating HTTP li expect(useAppStore.getState().activeGroupIdByWorktree[floating]).toBe('b') expect(useAppStore.getState().groupsByWorktree[floating]).toHaveLength(3) }) - -it('opens a new page for an HTTP link without source context', async () => { - const browser = useAppStore.getState().createBrowserTab(WORKSPACE, URL_TO_OPEN, { - targetGroupId: 'b', - browserRuntimeEnvironmentId: null, - sessionProfileId: null, - activate: false - }) - const completed = observeBrowserLinkOpen() - openHttpLink(URL_TO_OPEN, { worktreeId: WORKSPACE, sourceOwner: { kind: 'local' } }) - const outcome = await completed - expect(outcome.status).toBe('opened') - if (outcome.status !== 'opened') { - throw new Error('Expected opened link') - } - expect(outcome.result.browserWorkspaceId).not.toBe(browser.id) - expect(useAppStore.getState().browserTabsByWorktree[WORKSPACE]).toHaveLength(2) -}) diff --git a/src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts b/src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts index b5f7d5b5839..d6c1fdbbf2d 100644 --- a/src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts +++ b/src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts @@ -64,12 +64,6 @@ function makePage(overrides: Partial = {}): BrowserPage { } } -const worktreeA = makeWorktree() -const worktreeB = makeWorktree({ - id: 'wt-2', - repoId: 'repo-2', - displayName: 'Other Worktree' -}) const repoMap = new Map([ ['repo-1', { displayName: 'repo/one' }], ['repo-2', { displayName: 'repo/two' }] @@ -79,56 +73,6 @@ const worktreeOrder = new Map([ ['wt-2', 1] ]) -function buildFixture( - overrides: Partial[0]> = {} -): ReturnType { - return buildSearchableBrowserPages({ - worktrees: [worktreeA, worktreeB], - repoMap, - worktreeOrder, - browserTabsByWorktree: { - 'wt-1': [ - makeWorkspace({ - id: 'ws-1', - activePageId: 'page-1', - pageIds: ['page-1', 'page-2'] - }), - makeWorkspace({ - id: 'ws-2', - activePageId: 'page-3', - pageIds: ['page-3'] - }) - ], - 'wt-2': [ - makeWorkspace({ - id: 'ws-3', - worktreeId: 'wt-2', - activePageId: 'page-4' - }) - ] - }, - browserPagesByWorkspace: { - 'ws-1': [ - makePage({ id: 'page-1', title: 'Docs' }), - makePage({ id: 'page-2', title: 'Changelog' }) - ], - 'ws-2': [makePage({ id: 'page-3', workspaceId: 'ws-2', title: 'Issues' })], - 'ws-3': [ - makePage({ - id: 'page-4', - workspaceId: 'ws-3', - worktreeId: 'wt-2', - title: 'Other Docs' - }) - ] - }, - activeBrowserTabId: 'ws-1', - activeWorktreeId: 'wt-1', - activeTabType: 'browser', - ...overrides - }) -} - describe('buildSearchableBrowserPages', () => { it('keeps same-id browser tabs isolated by execution host', () => { const sharedId = 'repo-shared::/workspace' @@ -245,50 +189,6 @@ describe('buildSearchableBrowserPages', () => { }) ).toEqual([]) }) - - it('omits a browser row whose backing tab id is duplicated', () => { - const browserTab = browserUnifiedTab('shared-tab', 'ws-1', 'wt-1') - expect( - buildSearchableBrowserPages({ - worktrees: [worktreeA], - repoMap, - worktreeOrder, - browserTabsByWorktree: { 'wt-1': [makeWorkspace()] }, - browserPagesByWorkspace: { 'ws-1': [makePage()] }, - unifiedTabsByWorktree: { - 'wt-1': [browserTab, { ...browserTab, contentType: 'terminal' }] - }, - activeBrowserTabId: null, - activeWorktreeId: null, - activeTabType: 'terminal' - }) - ).toEqual([]) - }) - - // The index keeps the first tab per workspace ID; prevent duplicates from hiding a later owned tab. - it('omits a workspace claimed by more than one unified browser tab', () => { - const entries = buildFixture({ - unifiedTabsByWorktree: { - 'wt-1': [ - browserUnifiedTab('tab-foreign', 'ws-1', 'wt-2'), - browserUnifiedTab('tab-owned', 'ws-1', 'wt-1') - ] - } - }) - - expect(entries.some((entry) => entry.workspace.id === 'ws-1')).toBe(false) - expect(entries.map((entry) => entry.workspace.id)).toEqual(['ws-2', 'ws-3']) - }) - - // Why: a workspace whose only unified tab belongs to another worktree must stay hidden here. - it('omits a workspace whose single unified browser tab is not owned by this worktree', () => { - const entries = buildFixture({ - unifiedTabsByWorktree: { 'wt-1': [browserUnifiedTab('tab-foreign', 'ws-1', 'wt-2')] } - }) - - expect(entries.some((entry) => entry.workspace.id === 'ws-1')).toBe(false) - expect(entries.some((entry) => entry.workspace.id === 'ws-2')).toBe(true) - }) }) function browserUnifiedTab( @@ -311,41 +211,3 @@ function browserUnifiedTab( createdAt: 0 } } - -it('indexes workspace tabs when building a large browser palette', () => { - let reads = 0 - const workspaces = Array.from({ length: 1000 }, (_, i) => - makeWorkspace({ id: `workspace-${i}`, activePageId: `page-${i}` }) - ) - const tabs: Tab[] = workspaces.map((workspace, i) => ({ - id: `tab-${i}`, - get entityId() { - reads++ - return workspace.id - }, - groupId: 'group-1', - worktreeId: 'wt-1', - contentType: 'browser', - label: 'Example', - customLabel: null, - color: null, - sortOrder: i, - createdAt: 0 - })) - const pages = Object.fromEntries( - workspaces.map((workspace, i) => [ - workspace.id, - [makePage({ id: `page-${i}`, workspaceId: workspace.id })] - ]) - ) - const entries = buildFixture({ - worktrees: [worktreeA], - browserTabsByWorktree: { 'wt-1': workspaces }, - browserPagesByWorkspace: pages, - unifiedTabsByWorktree: { 'wt-1': tabs } - }) - expect(reads).toBeLessThan(6000) - expect(entries.map((entry) => entry.workspace.id)).toEqual( - workspaces.map((workspace) => workspace.id) - ) -}) diff --git a/src/renderer/src/lib/code-host-error-copy.test.ts b/src/renderer/src/lib/code-host-error-copy.test.ts deleted file mode 100644 index 93ba9e7da9f..00000000000 --- a/src/renderer/src/lib/code-host-error-copy.test.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { afterEach, describe, expect, it } from 'vitest' -import { i18n } from '@/i18n/i18n' -import es from '@/i18n/locales/es.json' -import { codeHostFailure } from '../../../shared/code-host-failure-copy' -import { reviewStartPointFailure } from '../../../shared/review-start-point-failure-copy' -import { codeHostErrorText, reviewStartPointErrorText } from './code-host-error-copy' - -const originalLanguage = i18n.language - -afterEach(async () => { - await i18n.changeLanguage(originalLanguage) -}) - -describe('codeHostErrorText', () => { - it('localizes a coded failure and keeps the gh/glab detail verbatim', async () => { - i18n.addResourceBundle('es', 'translation', es) - await i18n.changeLanguage('es') - const unresolved = codeHostFailure('github.repoUnresolved') - expect(unresolved.error).toBe('Could not resolve GitHub owner/repo for this repository') - expect(codeHostErrorText(unresolved)).toBe(es.codeHost.errors.github.repoUnresolved) - - const detail = 'HTTP 422: {{detail}} $& rejected' - const failed = codeHostFailure('github.rerunFailed', detail) - expect(failed.error).toBe(`Failed to rerun checks: ${detail}`) - expect(codeHostErrorText(failed)).toBe( - es.codeHost.errors.github.rerunFailed.replace('{{detail}}', () => detail) - ) - }) - - it('localizes PR/MR start-point failures with their number, ref, and git detail', async () => { - i18n.addResourceBundle('es', 'translation', es) - await i18n.changeLanguage('es') - const missing = reviewStartPointFailure('gitlab.mrNotFound', { number: 7 }) - expect(missing.error).toBe('MR !7 not found.') - expect(reviewStartPointErrorText(missing)).toBe( - es.codeHost.startPoint.gitlab.mrNotFound.replace('{{number}}', '7') - ) - const fetch = reviewStartPointFailure('fetchFailed', { - ref: 'origin/{{detail}}', - detail: 'fatal: no route' - }) - expect(fetch.error).toBe('Failed to fetch origin/{{detail}}: fatal: no route') - expect(reviewStartPointErrorText(fetch)).toBe( - es.codeHost.startPoint.fetchFailed.replace(/\{\{(ref|detail)\}\}/g, (_slot, slot) => - slot === 'ref' ? 'origin/{{detail}}' : 'fatal: no route' - ) - ) - expect(reviewStartPointErrorText({ error: 'English', errorCode: 'gitlab.mrNotFound' })).toBe( - 'English' - ) - }) -}) diff --git a/src/renderer/src/lib/composer-submit-cancellation.test.ts b/src/renderer/src/lib/composer-submit-cancellation.test.ts deleted file mode 100644 index 497b0d0495b..00000000000 --- a/src/renderer/src/lib/composer-submit-cancellation.test.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { settleComposerSubmit } from './composer-submit-cancellation' - -describe('settleComposerSubmit', () => { - it('drops a resolved preflight result after cancellation', async () => { - let cancelled = false - let resolvePreflight: (value: string) => void = () => undefined - const preflight = new Promise((resolve) => { - resolvePreflight = resolve - }) - const settlement = settleComposerSubmit(preflight, () => cancelled) - - cancelled = true - resolvePreflight('stale result') - - await expect(settlement).resolves.toEqual({ status: 'cancelled' }) - }) - - it('suppresses a rejected preflight after cancellation', async () => { - let cancelled = false - let rejectPreflight: (error: Error) => void = () => undefined - const preflight = new Promise((_resolve, reject) => { - rejectPreflight = reject - }) - const settlement = settleComposerSubmit(preflight, () => cancelled) - - cancelled = true - rejectPreflight(new Error('late failure')) - - await expect(settlement).resolves.toEqual({ status: 'cancelled' }) - }) -}) diff --git a/src/renderer/src/lib/create-untitled-markdown.test.ts b/src/renderer/src/lib/create-untitled-markdown.test.ts deleted file mode 100644 index 22b5db8e170..00000000000 --- a/src/renderer/src/lib/create-untitled-markdown.test.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { afterEach, describe, expect, it, vi } from 'vitest' -import { createUntitledMarkdownFile } from './create-untitled-markdown' - -import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' - -const LOCAL: RuntimeClientTarget = { kind: 'local' } - -describe('createUntitledMarkdownFile', () => { - afterEach(() => { - vi.unstubAllGlobals() - }) - - it('rejects captured ownership without a current-generation assertion', async () => { - await expect( - createUntitledMarkdownFile('/repo', 'wt-1', undefined, LOCAL, { - operationProvenance: {} as never - }) - ).rejects.toThrow("Couldn't verify which host owns this file") - }) -}) diff --git a/src/renderer/src/lib/emulator-error-copy.test.ts b/src/renderer/src/lib/emulator-error-copy.test.ts deleted file mode 100644 index 348ea6be05c..00000000000 --- a/src/renderer/src/lib/emulator-error-copy.test.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { afterEach, describe, expect, it } from 'vitest' -import { i18n } from '@/i18n/i18n' -import es from '@/i18n/locales/es.json' -import { emulatorFailureText } from '../../../shared/emulator-failure-copy' -import { emulatorErrorText } from './emulator-error-copy' - -const originalLanguage = i18n.language - -afterEach(async () => { - await i18n.changeLanguage(originalLanguage) -}) - -function rpcError(code: string, message: string): Error { - return Object.assign(new Error(message), { code }) -} - -describe('emulator error copy', () => { - it('translates a thrown error by its operational code and keeps device names verbatim', async () => { - i18n.addResourceBundle('es', 'translation', es) - await i18n.changeLanguage('es') - const message = emulatorFailureText('androidDeviceNotRunning', { device: 'Pixel 7 "Pro"' }) - expect(emulatorErrorText(rpcError('emulator_device_not_found', message), 'fallback')).toBe( - es.emulator.errors.androidDeviceNotRunning.replace('{{device}}', 'Pixel 7 "Pro"') - ) - expect(emulatorErrorText(rpcError('emulator_disabled', message), 'fallback')).toBe(message) - expect(emulatorErrorText(rpcError('emulator_error', 'adb: device offline'), 'x')).toBe( - 'adb: device offline' - ) - expect(emulatorErrorText('not an error', 'fallback')).toBe('fallback') - }) -}) diff --git a/src/renderer/src/lib/new-workspace-composer-repo.test.ts b/src/renderer/src/lib/new-workspace-composer-repo.test.ts deleted file mode 100644 index 9e3eb7fe63a..00000000000 --- a/src/renderer/src/lib/new-workspace-composer-repo.test.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { describe, expect, it } from 'vitest' -import type { ExecutionHostId } from '../../../shared/execution-host' -import type { Repo } from '../../../shared/repo-types' -import { resolveComposerActiveRepoId } from './new-workspace-composer-repo' - -function repo(id: string, executionHostId: ExecutionHostId, path: string): Repo { - return { - id, - path, - displayName: 'app', - badgeColor: '#000000', - addedAt: 0, - executionHostId, - connectionId: null, - gitRemoteIdentity: { - canonicalKey: 'github.com/acme/app', - remoteName: 'origin', - remoteUrl: 'git@github.com:acme/app.git' - } - } -} - -describe('resolveComposerActiveRepoId', () => { - it('seeds from the visible checkout when the active workspace is on a per-workspace VM', () => { - const vmRepo = repo('vm-repo', 'runtime:vm-1', '/home/orca/app') - const macRepo = repo('mac-repo', 'local', '/Users/me/app') - const repos = [vmRepo, macRepo] - - expect( - resolveComposerActiveRepoId(repos, repos, 'vm-repo', [{ id: 'vm-1', source: 'ephemeral-vm' }]) - ).toBe('mac-repo') - }) -}) diff --git a/src/renderer/src/lib/provider-accounts/claude-account-switch-sessions.test.ts b/src/renderer/src/lib/provider-accounts/claude-account-switch-sessions.test.ts deleted file mode 100644 index dd0eb354623..00000000000 --- a/src/renderer/src/lib/provider-accounts/claude-account-switch-sessions.test.ts +++ /dev/null @@ -1,124 +0,0 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest' -import type { ClaudeAccountSwitchRunningSessions } from '../../../../shared/claude-account-switch-settings' -import type { ClaudeManagedAccountSummary } from '../../../../shared/managed-account-types' -import { findClaudeSwitchSessions } from '../agent-session/accounts/claude/claude-session-account-move' -import type * as AccountMove from '../agent-session/accounts/claude/claude-session-account-move' -import type { ClaudeSwitchSessions } from '../agent-session/accounts/claude/claude-session-account-move' -import { - answerClaudeAccountSwitchPrompt, - getClaudeAccountSwitchPrompt, - handleRunningClaudeSessionsAfterSwitch, - resetClaudeAccountSwitchSessionsForTests -} from './claude-account-switch-sessions' - -type SwitchSettings = { claudeAccountSwitchRunningSessions?: ClaudeAccountSwitchRunningSessions } - -type StoreStub = { - settings: SwitchSettings - updateSettings: (updates: SwitchSettings) => Promise - terminalLayoutsByTabId: Record }> - queuePaneAccountRestarts: (ptyIds: string[], agent: string) => void - consumePendingPaneAccountRestart: (ptyId: string) => void -} - -const store = vi.hoisted((): StoreStub => ({ - settings: {}, - terminalLayoutsByTabId: {}, - updateSettings: vi.fn(async () => {}), - queuePaneAccountRestarts: vi.fn(), - consumePendingPaneAccountRestart: vi.fn() -})) -const toastSuccess = vi.hoisted(() => vi.fn()) -const toastWarning = vi.hoisted(() => vi.fn()) - -vi.mock('@/store/index', () => ({ useAppStore: { getState: () => store } })) -vi.mock('sonner', () => ({ toast: { success: toastSuccess, warning: toastWarning } })) -vi.mock('../agent-session/accounts/claude/claude-session-account-move', async (importOriginal) => ({ - ...(await importOriginal()), - findClaudeSwitchSessions: vi.fn(), - findQueuedClaudeRestartsOnAccount: vi.fn(() => []) -})) - -const candidate = (n: number) => ({ - ptyId: `pty-${n}`, - worktreeId: 'wt-1', - tabId: `tab-${n}`, - leafId: `leaf-${n}` -}) -const scan = ( - onAccount: ReturnType[], - others: Partial = {} -): ClaudeSwitchSessions => ({ onAccount, elsewhere: [], cantMove: [], ...others }) -const row = (id: string, extra: Partial = {}) => ({ - id, - email: `${id}@example.com`, - managedAuthRuntime: 'host' as const, - wslDistro: null, - authMethod: 'subscription-oauth' as const, - createdAt: 1, - updatedAt: 1, - lastAuthenticatedAt: 1, - ...extra -}) -const ROSTER = { accounts: [row('account-a'), row('account-b')] } -const SWITCH = { - owner: { kind: 'local' } as const, - target: { runtime: 'host' } as const, - before: { state: ROSTER, accountId: 'account-a' }, - after: { state: ROSTER, accountId: 'account-b' } -} - -describe('handleRunningClaudeSessionsAfterSwitch', () => { - beforeEach(() => { - vi.clearAllMocks() - resetClaudeAccountSwitchSessionsForTests() - store.settings = {} - store.terminalLayoutsByTabId = Object.fromEntries( - [1, 2, 3].map((n) => [`tab-${n}`, { ptyIdsByLeafId: { [`leaf-${n}`]: `pty-${n}` } }]) - ) - }) - - it('restarts a pane on the PTY it has now, and skips a pane that closed', async () => { - vi.mocked(findClaudeSwitchSessions).mockResolvedValue(scan([candidate(1), candidate(2)])) - await handleRunningClaudeSessionsAfterSwitch(SWITCH) - store.terminalLayoutsByTabId = { 'tab-1': { ptyIdsByLeafId: { 'leaf-1': 'pty-1-reattached' } } } - - answerClaudeAccountSwitchPrompt('restart') - - expect(store.queuePaneAccountRestarts).toHaveBeenLastCalledWith(['pty-1-reattached'], 'claude') - }) - - it('applies Never restart chosen while the scan runs', async () => { - vi.mocked(findClaudeSwitchSessions).mockImplementation(async () => { - store.settings = { claudeAccountSwitchRunningSessions: 'keep' } - return scan([candidate(1)]) - }) - - expect(await handleRunningClaudeSessionsAfterSwitch(SWITCH)).toBe('show-confirmation') - expect(getClaudeAccountSwitchPrompt()).toBeNull() - }) - - it('keeps only the newer question when an older scan resolves last', async () => { - const older = Promise.withResolvers() - const newer = Promise.withResolvers() - vi.mocked(findClaudeSwitchSessions) - .mockReturnValueOnce(older.promise) - .mockReturnValueOnce(newer.promise) - const first = handleRunningClaudeSessionsAfterSwitch(SWITCH) - const second = handleRunningClaudeSessionsAfterSwitch({ - ...SWITCH, - before: SWITCH.after, - after: SWITCH.before - }) - - newer.resolve(scan([candidate(2)])) - expect(await second).toBe('handled') - older.resolve(scan([candidate(1)])) - expect(await first).toBe('handled') - - expect(getClaudeAccountSwitchPrompt()).toMatchObject({ - sessions: { onAccount: [expect.objectContaining({ ptyId: 'pty-2' })] }, - nextAccountLabel: 'account-a@example.com' - }) - }) -}) diff --git a/src/renderer/src/lib/renderer-app-platform.test.ts b/src/renderer/src/lib/renderer-app-platform.test.ts index 5a46beb2888..dea5fe06408 100644 --- a/src/renderer/src/lib/renderer-app-platform.test.ts +++ b/src/renderer/src/lib/renderer-app-platform.test.ts @@ -1,5 +1,5 @@ // @vitest-environment happy-dom -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import { afterEach, beforeEach, describe, expect, it } from 'vitest' import { getRendererAppPlatform, resetRendererAppPlatformCacheForTests @@ -19,17 +19,6 @@ describe('getRendererAppPlatform', () => { resetRendererAppPlatformCacheForTests() }) - it('crosses the preload bridge once no matter how many renders ask', () => { - const get = vi.fn(() => ({ platform: 'darwin' as NodeJS.Platform })) - stubPlatformApi(get) - - for (let index = 0; index < 500; index += 1) { - expect(getRendererAppPlatform()).toBe('darwin') - } - - expect(get).toHaveBeenCalledTimes(1) - }) - // The web platform bridge arrives after boot; early user-agent guesses must not become session-long cache entries. it('does not cache the user-agent fallback', () => { // 'freebsd' is never a user-agent fallback answer, so the swap is unambiguous. diff --git a/src/renderer/src/lib/resume-stale-structured-agent-session.test.ts b/src/renderer/src/lib/resume-stale-structured-agent-session.test.ts deleted file mode 100644 index 8737dd554f3..00000000000 --- a/src/renderer/src/lib/resume-stale-structured-agent-session.test.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { afterEach, describe, expect, it } from 'vitest' -import { useAppStore } from '@/store' -import type { SleepingAgentSessionRecord } from '../../../shared/agent-session/lifecycle/agent-session-resume' -import { makePaneKey } from '../../../shared/workspace-layout/stable-pane-id' -import { structuredAgentSessionTabId } from '../../../shared/agent-session/view/structured-agent-session-projection' -import { resumeSleepingAgentSessionsForWorktree } from './agent-session/resume/resume-sleeping-agent-session' - -const initialAppStoreState = useAppStore.getState() -const WORKTREE_ID = 'stale-structured-worktree' -const SESSION_ID = 'structured-session-stale' -const LEAF_ID = '11111111-1111-4111-8111-111111111111' - -afterEach(() => { - useAppStore.setState(initialAppStoreState, true) -}) - -describe('stale structured sleeping session', () => { - it('clears the synthetic terminal projection without spawning', () => { - const tabId = structuredAgentSessionTabId(SESSION_ID) - const paneKey = makePaneKey(tabId, LEAF_ID) - const record: SleepingAgentSessionRecord = { - paneKey, - tabId, - worktreeId: WORKTREE_ID, - agent: 'codex', - providerSession: { key: 'session_id', id: SESSION_ID }, - prompt: 'continue', - state: 'working', - capturedAt: 1, - updatedAt: 1 - } - useAppStore.setState({ - tabsByWorktree: { [WORKTREE_ID]: [] }, - sleepingAgentSessionsByPaneKey: { [paneKey]: record } - } as never) - - expect(resumeSleepingAgentSessionsForWorktree(WORKTREE_ID)).toBe(0) - expect(useAppStore.getState().sleepingAgentSessionsByPaneKey[paneKey]).toBeUndefined() - expect(useAppStore.getState().pendingStartupByTabId).toEqual({}) - }) -}) diff --git a/src/renderer/src/lib/review-owner.test.ts b/src/renderer/src/lib/review-owner.test.ts deleted file mode 100644 index 8202756ff47..00000000000 --- a/src/renderer/src/lib/review-owner.test.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { describe, expect, it } from 'vitest' -import type { Repo } from '../../../shared/repo-types' -import { resolveReviewRepository } from './review-owner' -import { resolveExactWorktreeRoute } from './worktree-owner-route' -import '../runtime/source-control/forge/forge-credential-target' -import '../store/github/repositories/repository-routing' - -const proxy: Repo = { - id: 'project', - path: '/project', - displayName: 'Project', - badgeColor: 'blue', - addedAt: 1, - executionHostId: 'runtime:server', - connectionId: 'builder' -} -const row = { id: 'project::/worktree', repoId: 'project', hostId: 'ssh:builder' as const } - -describe('review repository evidence', () => { - it.each(['distinct', 'competing'] as const)( - 'does not re-enumerate a warmed %s repository snapshot as workspace count increases', - (mode) => { - let reads = 0 - const repos = Array.from({ length: 300 }, (_, i) => ({ - ...proxy, - executionHostId: `runtime:server-${i}` as const, - get id() { - reads++ - return mode === 'distinct' ? `project-${i}` : 'project-299' - } - })) - const workspace = { ...row, repoId: 'project-299' } - resolveReviewRepository(repos, workspace) - resolveExactWorktreeRoute({ repos }, workspace) - reads = 0 - for (let i = 0; i < 400; i++) { - expect(resolveReviewRepository(repos, workspace)).toBe( - mode === 'distinct' ? repos[299] : null - ) - expect(resolveExactWorktreeRoute({ repos }, workspace).kind).toBe( - mode === 'distinct' ? 'resolved' : 'ambiguous' - ) - } - expect(reads).toBeLessThan(400 * 4) - } - ) -}) diff --git a/src/renderer/src/lib/run-target-host-visibility.test.ts b/src/renderer/src/lib/run-target-host-visibility.test.ts deleted file mode 100644 index 4886256d938..00000000000 --- a/src/renderer/src/lib/run-target-host-visibility.test.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { describe, expect, it } from 'vitest' -import type { ExecutionHostRegistryEntry } from '../../../shared/execution-host/execution-host-registry-entry' -import { needsVisibleRunTargetHost } from './run-target-host-visibility' - -const hosts: ExecutionHostRegistryEntry[] = [ - { id: 'local', kind: 'local', label: 'Local Mac', detail: 'This computer', health: 'local' }, - { - id: 'runtime:vm-1', - kind: 'runtime', - label: 'app VM', - detail: 'Orca server', - health: 'available', - source: 'ephemeral-vm' - }, - { - id: 'runtime:build-box', - kind: 'runtime', - label: 'Build box', - detail: 'Orca server', - health: 'available', - source: 'manual' - } -] - -describe('needsVisibleRunTargetHost', () => { - it('holds Create only for a per-workspace VM target, which Run on never lists', () => { - const on = (hostId: 'local' | `runtime:${string}`) => ({ - status: 'ready' as const, - target: { hostId } - }) - expect(needsVisibleRunTargetHost(on('runtime:vm-1'), hosts, null)).toBe(true) - expect(needsVisibleRunTargetHost(on('runtime:build-box'), hosts, null)).toBe(false) - expect(needsVisibleRunTargetHost(on('local'), hosts, null)).toBe(false) - }) -}) diff --git a/src/renderer/src/lib/runtime-host-copy.test.ts b/src/renderer/src/lib/runtime-host-copy.test.ts deleted file mode 100644 index 0521132d144..00000000000 --- a/src/renderer/src/lib/runtime-host-copy.test.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { afterEach, describe, expect, it } from 'vitest' -import { i18n } from '@/i18n/i18n' -import es from '@/i18n/locales/es.json' -import { describeRuntimeCompatBlock, getExecutionHostHealthLabel } from './runtime-host-copy' -import { describeRuntimeCompatBlock as describeRuntimeCompatBlockEnglish } from '../../../shared/protocol-compat' - -const originalLanguage = i18n.language - -afterEach(async () => { - await i18n.changeLanguage(originalLanguage) -}) - -describe('runtime host copy', () => { - it('resolves live labels and compatibility values in the renderer locale', async () => { - i18n.addResourceBundle('es', 'translation', es) - await i18n.changeLanguage('es') - expect(getExecutionHostHealthLabel('blocked', 'access-revoked')).toBe(es.runtime.health.repair) - expect(getExecutionHostHealthLabel('blocked')).toBe(es.runtime.health.update) - const verdict = { - kind: 'blocked', - reason: 'client-too-old', - clientProtocolVersion: 2, - serverProtocolVersion: 4, - requiredClientProtocolVersion: 3 - } as const - expect(describeRuntimeCompatBlock(verdict)).toBe( - es.runtime.compat.clientTooOld - .replace('{{clientProtocol}}', '2') - .replace('{{requiredProtocol}}', '3') - ) - expect(describeRuntimeCompatBlockEnglish(verdict)).toContain('Client protocol 2') - await i18n.changeLanguage('en') - expect(getExecutionHostHealthLabel('blocked', 'access-revoked')).toBe('Re-pair needed') - }) -}) diff --git a/src/renderer/src/lib/workspace/activation/worktree-activation-created-agent.test.ts b/src/renderer/src/lib/workspace/activation/worktree-activation-created-agent.test.ts deleted file mode 100644 index a361afa410c..00000000000 --- a/src/renderer/src/lib/workspace/activation/worktree-activation-created-agent.test.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { afterEach, describe, expect, it, vi } from 'vitest' -import '../../../../../shared/constants' -import { useAppStore } from '@/store/index' - -import { activateAndRevealWorktree } from './worktree-activation' -import '../../web-runtime-worktree-terminal-after-wake' -import { resetWebSessionTabsSnapshotFreshnessForTests } from '@/runtime/web-session-tabs-sync/tracking-lifecycle' -import { resetWebRuntimeWakeTerminalRespawnForTests } from '@/runtime/hosted-terminals/restoration/web-runtime-wake-terminal-respawn' -import '@/runtime/web-session-tabs-sync/host-terminal-count-fixture' -import { - makeCreatedAgentWorktree as makeWorktree, - seedEmptyActivatableWorktree -} from '@/lib/workspace/activation/worktree-activation-created-agent.test-fixture' -import '../../../runtime/rpc/testing/runtime-environment-bridge-fixture' - -// Main's answer to the window's layout commands, as a switch-on build sends them. -vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) => - ( - await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture') - ).runtimeRpcClientWithLayoutApply(await importOriginal()) -) - -const initialAppStoreState = useAppStore.getState() - -/** Activates and asserts a focusable tab appeared with no queued startup, returning its id. */ - -afterEach(() => { - delete (globalThis as { __ORCA_WEB_CLIENT__?: boolean }).__ORCA_WEB_CLIENT__ - vi.unstubAllGlobals() - resetWebSessionTabsSnapshotFreshnessForTests() - resetWebRuntimeWakeTerminalRespawnForTests() - useAppStore.setState(initialAppStoreState, true) -}) - -describe('activateAndRevealWorktree', () => { - it('does not relaunch the creation-time agent when reopening an empty worktree', () => { - const worktree = makeWorktree() - const { revealWorktreeInSidebar } = seedEmptyActivatableWorktree(worktree) - - const result = activateAndRevealWorktree(worktree.id) - const state = useAppStore.getState() - const reopenedTab = state.tabsByWorktree[worktree.id]?.[0] - - // A focusable surface still appears — it is just a plain shell, with no queued agent launch. - expect(result).toEqual({ primaryTabId: reopenedTab?.id }) - expect(reopenedTab).toBeDefined() - expect(state.pendingStartupByTabId[reopenedTab!.id]).toBeUndefined() - expect(revealWorktreeInSidebar).toHaveBeenCalledWith(worktree.id) - }) -}) diff --git a/src/renderer/src/lib/workspace/activation/worktree-activation-structured-chat-surface.test.ts b/src/renderer/src/lib/workspace/activation/worktree-activation-structured-chat-surface.test.ts deleted file mode 100644 index b71099c4435..00000000000 --- a/src/renderer/src/lib/workspace/activation/worktree-activation-structured-chat-surface.test.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { afterEach, describe, expect, it, vi } from 'vitest' -import { useAppStore } from '@/store/index' -import { activateAndRevealWorktree } from './worktree-activation' - -import { - makeCreatedAgentWorktree as makeWorktree, - seedEmptyActivatableWorktree -} from '@/lib/workspace/activation/worktree-activation-created-agent.test-fixture' -import { registerWorktreeActivationReset } from './worktree-activation.test-fixture' - -// Main's answer to the window's layout commands, as a switch-on build sends them. -vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) => - ( - await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture') - ).runtimeRpcClientWithLayoutApply(await importOriginal()) -) - -const initialAppStoreState = useAppStore.getState() - -registerWorktreeActivationReset() - -afterEach(() => { - vi.restoreAllMocks() - useAppStore.setState(initialAppStoreState, true) -}) - -const setup = { - runnerScriptPath: '/tmp/repo/.git/orca/setup-runner.sh', - envVars: { ORCA_WORKTREE_PATH: '/tmp/worktrees/wt-1' } -} - -// Returned setup scripts must not force Terminal 1 beside a new native chat. -describe('seeding beside a caller-provided chat surface', () => { - it('does not enqueue setup again when its consumed tab is reactivated', () => { - const worktree = makeWorktree() - seedEmptyActivatableWorktree(worktree) - activateAndRevealWorktree(worktree.id, { - providesInitialSurface: true, - notifyHostRuntime: false, - setup - }) - const state = useAppStore.getState() - const setupTab = state.tabsByWorktree[worktree.id]?.[0] - if (!setupTab) { - throw new Error('missing Setup tab') - } - expect(state.consumeTabStartupCommand(setupTab.id)?.command).toContain('setup-runner.sh') - activateAndRevealWorktree(worktree.id, { notifyHostRuntime: false }) - expect(useAppStore.getState().tabsByWorktree[worktree.id]).toHaveLength(1) - expect(useAppStore.getState().pendingStartupByTabId).toEqual({}) - }) -}) diff --git a/src/renderer/src/lib/workspace/search/worktrees/worktree-palette-comment-snippet.test.ts b/src/renderer/src/lib/workspace/search/worktrees/worktree-palette-comment-snippet.test.ts deleted file mode 100644 index 6b0db05e48f..00000000000 --- a/src/renderer/src/lib/workspace/search/worktrees/worktree-palette-comment-snippet.test.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { extractWorktreePaletteCommentSnippet } from './worktree-palette-comment-snippet' - -const EMOJI = '\u{1F680}' - -// isWellFormed alone also accepts deleted emoji; require a contiguous source span to catch dropped characters. -function expectContiguousSlice(text: string, comment: string): void { - const core = text.replace(/^\u2026/, '').replace(/\u2026$/, '') - expect(comment).toContain(core) -} - -describe('extractWorktreePaletteCommentSnippet', () => { - // CJK exhausts both 10-step whitespace scans; sweep emoji across cuts to cover either split surrogate half. - it('never splits a surrogate pair at the leading edge', () => { - let keptEmoji = 0 - for (let offset = 0; offset < 40; offset += 1) { - const comment = `${'词'.repeat(offset)}${EMOJI}${'词'.repeat(80 - offset)}目标${'词'.repeat(20)}` - const matchStart = comment.indexOf('目标') - const { text, matchRange } = extractWorktreePaletteCommentSnippet( - comment, - matchStart, - matchStart + '目标'.length - ) - expect(text.isWellFormed()).toBe(true) - expect(text.slice(matchRange.start, matchRange.end)).toBe('目标') - expectContiguousSlice(text, comment) - if (text.includes(EMOJI)) { - keptEmoji += 1 - } - } - // Require boundary iterations or dropping emoji every time would still pass the assertions above. - expect(keptEmoji).toBeGreaterThan(0) - }) - - it('never splits a surrogate pair at the trailing edge', () => { - let keptEmoji = 0 - for (let offset = 0; offset < 70; offset += 1) { - const comment = `${'词'.repeat(20)}目标${'词'.repeat(offset)}${EMOJI}${'词'.repeat(90 - offset)}` - const matchStart = comment.indexOf('目标') - const { text, matchRange } = extractWorktreePaletteCommentSnippet( - comment, - matchStart, - matchStart + '目标'.length - ) - expect(text.isWellFormed()).toBe(true) - expect(text.slice(matchRange.start, matchRange.end)).toBe('目标') - expectContiguousSlice(text, comment) - if (text.includes(EMOJI)) { - keptEmoji += 1 - } - } - expect(keptEmoji).toBeGreaterThan(0) - }) -}) diff --git a/src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-workspace-publication.test.ts b/src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-workspace-publication.test.ts deleted file mode 100644 index c76c08fbfc4..00000000000 --- a/src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-workspace-publication.test.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { buildMobileSessionTabSnapshots } from './mobile-session-snapshots' -import { makeState } from './testing/sync-runtime-graph-test-harness' -import type { AppState } from '../../store/types' - -describe('buildMobileSessionTabSnapshots', () => { - it('evicts a removed folder workspace from the snapshot cache', () => { - const folderWorkspaceId = 'cache-eviction-folder' - const folderKey = `folder:${folderWorkspaceId}` - const liveState = makeState({ - folderWorkspaces: [{ id: folderWorkspaceId } as AppState['folderWorkspaces'][number]], - tabsByWorktree: { - [folderKey]: [{ id: 'term-1', title: 'Terminal 1' }] - } as unknown as AppState['tabsByWorktree'] - }) - const removedState = makeState({ - folderWorkspaces: [], - tabsByWorktree: liveState.tabsByWorktree - }) - - const initial = buildMobileSessionTabSnapshots(liveState)[0]! - expect(buildMobileSessionTabSnapshots(removedState)).toEqual([]) - const restored = buildMobileSessionTabSnapshots(liveState)[0]! - - expect(restored.snapshotVersion).toBeGreaterThan(initial.snapshotVersion) - }) - - it('publishes a new instance identity when unchanged content is recreated', () => { - const worktree = { - id: 'wt-1', - instanceId: 'old-instance', - repoId: 'repo-1' - } - const base = makeState({ - worktreesByRepo: { 'repo-1': [worktree] } as unknown as AppState['worktreesByRepo'], - tabsByWorktree: { - 'wt-1': [{ id: 'term-1', title: 'Terminal 1' }] - } as unknown as AppState['tabsByWorktree'] - }) - const initial = buildMobileSessionTabSnapshots(base)[0]! - const recreated = { - ...base, - worktreesByRepo: { - 'repo-1': [{ ...worktree, instanceId: 'new-instance' }] - } as unknown as AppState['worktreesByRepo'] - } - - const next = buildMobileSessionTabSnapshots(recreated)[0]! - - expect(initial.worktreeInstanceId).toBe('old-instance') - expect(next.worktreeInstanceId).toBe('new-instance') - expect(next.snapshotVersion).toBeGreaterThan(initial.snapshotVersion) - }) -}) diff --git a/src/renderer/src/store/slices/agent-status/agent-status-drop-ipc.test.ts b/src/renderer/src/store/slices/agent-status/agent-status-drop-ipc.test.ts deleted file mode 100644 index cb5bdde1d86..00000000000 --- a/src/renderer/src/store/slices/agent-status/agent-status-drop-ipc.test.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' - -import './agent-status' -import { RECENTLY_CLOSED_AGENT_STATUS_TAB_IDS_MAX } from './agent-status-pane-keyed-records' -import { createTestStore } from '../../testing/app-store-test-fixture' - -// Propagate renderer dismissal to main’s persisted hook cache or restart resurrects dismissed paneKeys. - -const originalWindow = (globalThis as { window?: unknown }).window - -beforeEach(() => { - vi.useFakeTimers() -}) - -afterEach(() => { - vi.useRealTimers() - if (originalWindow === undefined) { - delete (globalThis as { window?: unknown }).window - } else { - ;(globalThis as { window?: unknown }).window = originalWindow - } -}) - -function stubWindowApi(): { - drop: ReturnType - dropByTabPrefix: ReturnType -} { - const drop = vi.fn() - const dropByTabPrefix = vi.fn() - ;(globalThis as { window?: unknown }).window = { - api: { agentStatus: { drop, dropByTabPrefix } } - } - return { drop, dropByTabPrefix } -} - -describe('dropAgentStatusByTabPrefix -> IPC fan-out', () => { - it('FIFO-caps recentlyClosedAgentStatusTabIds so it cannot grow unbounded', () => { - stubWindowApi() - const store = createTestStore() - const cap = RECENTLY_CLOSED_AGENT_STATUS_TAB_IDS_MAX - - for (let i = 0; i < cap + 5; i++) { - store.getState().dropAgentStatusByTabPrefix(`tab-${i}`) - } - - const closed = store.getState().recentlyClosedAgentStatusTabIds - expect(Object.keys(closed)).toHaveLength(cap) - // Evict oldest closed-tab markers; events beyond the cap cannot still arrive. - expect(closed['tab-0']).toBeUndefined() - expect(closed['tab-4']).toBeUndefined() - expect(closed[`tab-${cap + 4}`]).toBe(true) - }) -}) diff --git a/src/renderer/src/store/slices/tabs/tabs-close-dangling-group.test.ts b/src/renderer/src/store/slices/tabs/tabs-close-dangling-group.test.ts deleted file mode 100644 index 67a7c0e5d19..00000000000 --- a/src/renderer/src/store/slices/tabs/tabs-close-dangling-group.test.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { createTabsSliceMockApi } from './tabs-slice-test-harness' -import { createTestStore } from '../../testing/app-store-test-fixture' -import { drawTabsFromMain, type TabsDrawnFromMain } from './tabs-drawn-from-main.test-fixture' - -vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) => - ( - await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture') - ).runtimeRpcClientWithLayoutApply(await importOriginal()) -) -vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (importOriginal) => - ( - await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture') - ).runtimeLayoutClientWithTestFrames(await importOriginal()) -) -vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) - -createTabsSliceMockApi() - -const WT = 'repo1::/tmp/feature' -const NO_MAIN: TabsDrawnFromMain = { settle: async () => {}, close: () => {} } - -describe('closeUnifiedTab with a missing group record (#11308)', () => { - let store: ReturnType - let main: TabsDrawnFromMain - - beforeEach(() => { - store = createTestStore() - }) - - afterEach(() => main.close()) - - it.each(['terminal', 'editor'] as const)('still removes a %s tab', async (contentType) => { - const kept = store.getState().createUnifiedTab(WT, contentType, { id: `${contentType}-kept` }) - const closing = store.getState().createUnifiedTab(WT, contentType, { id: `${contentType}-x` }) - // Only an editor tab's close goes to main first; a terminal's (rowless here) closes as today. - main = contentType === 'editor' ? await drawTabsFromMain(store) : NO_MAIN - store.setState({ groupsByWorktree: { [WT]: [] } }) - - const result = store.getState().closeUnifiedTab(closing.id) - // A layout-owner build closes an editor tab in main; its frame drops it. - await main.settle() - - expect(result).toEqual({ closedTabId: closing.id, wasLastTab: false, worktreeId: WT }) - expect(store.getState().unifiedTabsByWorktree[WT]?.map((tab) => tab.id)).toEqual([kept.id]) - }) -}) diff --git a/src/renderer/src/store/terminals/degraded-repo-hydration.test.ts b/src/renderer/src/store/terminals/degraded-repo-hydration.test.ts deleted file mode 100644 index 676ac16aa9d..00000000000 --- a/src/renderer/src/store/terminals/degraded-repo-hydration.test.ts +++ /dev/null @@ -1,246 +0,0 @@ -import { expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' -import type { BrowserWorkspace } from '../../../../shared/browser-workspace-types' -import type { WorkspaceSessionState } from '../../../../shared/workspace-session/workspace-session-state-types' -import { getDefaultWorkspaceSession } from '../../../../shared/constants' - -vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { - const actual = await importOriginal() - return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } -}) - -// @ts-expect-error -- mocked browser preload API -globalThis.window = { api: {} } - -import { - buildWorkspaceSessionPayload, - shouldPersistWorkspaceSession -} from '@/lib/workspace/persistence/workspace-session' -import { createTestStore } from '../testing/app-store-test-fixture' -import { makeTab } from './terminal-tab.test-fixture' -import { makeWorktree } from '../slices/worktrees/worktree.test-fixture' - -const WORKTREE_ID = 'repo1::/path/degraded' -const TERMINAL_ID = 'terminal-degraded' -const EDITOR_FILE_ID = '/path/degraded/src/App.tsx' -const BROWSER_ID = 'browser-degraded' -const GROUP_ID = 'group-degraded' - -function makeBrowserTab(): BrowserWorkspace { - return { - id: BROWSER_ID, - worktreeId: WORKTREE_ID, - url: 'https://example.com', - title: 'Example', - loading: false, - faviconUrl: null, - canGoBack: false, - canGoForward: false, - loadError: null, - createdAt: 3 - } -} - -function makeDegradedRepoSession(): WorkspaceSessionState { - return { - ...getDefaultWorkspaceSession(), - activeRepoId: 'repo1', - activeWorktreeId: WORKTREE_ID, - activeTabId: TERMINAL_ID, - tabsByWorktree: { - [WORKTREE_ID]: [makeTab({ id: TERMINAL_ID, worktreeId: WORKTREE_ID })] - }, - openFilesByWorktree: { - [WORKTREE_ID]: [ - { - filePath: EDITOR_FILE_ID, - relativePath: 'src/App.tsx', - worktreeId: WORKTREE_ID, - language: 'typescript' - } - ] - }, - activeFileIdByWorktree: { [WORKTREE_ID]: EDITOR_FILE_ID }, - browserTabsByWorktree: { [WORKTREE_ID]: [makeBrowserTab()] }, - activeBrowserTabIdByWorktree: { [WORKTREE_ID]: BROWSER_ID }, - activeTabTypeByWorktree: { [WORKTREE_ID]: 'browser' }, - unifiedTabs: { - [WORKTREE_ID]: [ - { - id: TERMINAL_ID, - entityId: TERMINAL_ID, - groupId: GROUP_ID, - worktreeId: WORKTREE_ID, - contentType: 'terminal', - label: 'Terminal', - customLabel: null, - color: null, - sortOrder: 0, - createdAt: 1 - }, - { - id: EDITOR_FILE_ID, - entityId: EDITOR_FILE_ID, - groupId: GROUP_ID, - worktreeId: WORKTREE_ID, - contentType: 'editor', - label: 'App.tsx', - customLabel: null, - color: null, - sortOrder: 1, - createdAt: 2 - }, - { - id: BROWSER_ID, - entityId: BROWSER_ID, - groupId: GROUP_ID, - worktreeId: WORKTREE_ID, - contentType: 'browser', - label: 'Example', - customLabel: null, - color: null, - sortOrder: 2, - createdAt: 3 - } - ] - }, - tabGroups: { - [WORKTREE_ID]: [ - { - id: GROUP_ID, - worktreeId: WORKTREE_ID, - activeTabId: BROWSER_ID, - tabOrder: [TERMINAL_ID, EDITOR_FILE_ID, BROWSER_ID], - recentTabIds: [TERMINAL_ID, EDITOR_FILE_ID, BROWSER_ID] - } - ] - }, - activeGroupIdByWorktree: { [WORKTREE_ID]: GROUP_ID } - } -} - -function makeTerminalFreeDegradedRepoSession(): WorkspaceSessionState { - const session = makeDegradedRepoSession() - session.activeTabId = null - session.tabsByWorktree = {} - session.unifiedTabs![WORKTREE_ID] = session.unifiedTabs![WORKTREE_ID].filter( - (tab) => tab.contentType !== 'terminal' - ) - session.tabGroups![WORKTREE_ID] = session.tabGroups![WORKTREE_ID].map((group) => ({ - ...group, - tabOrder: [EDITOR_FILE_ID, BROWSER_ID], - recentTabIds: [EDITOR_FILE_ID, BROWSER_ID] - })) - return session -} - -function hydrateWithRepoScan( - store: ReturnType, - session: WorkspaceSessionState, - authoritative = false -): void { - store.setState({ - repos: [{ id: 'repo1', path: '/repo1', displayName: 'Repo 1', badgeColor: '#000', addedAt: 0 }], - worktreesByRepo: { repo1: [] }, - detectedWorktreesByRepo: { - repo1: { - repoId: 'repo1', - authoritative, - source: authoritative ? 'git' : 'metadata-fallback', - worktrees: [] - } - } - }) - store.getState().hydrateWorkspaceSession(session) - store.getState().hydrateTabsSession(session) - store.getState().hydrateEditorSession(session) - store.getState().hydrateBrowserSession(session) -} - -it('keeps tab, editor, and browser chrome through degraded hydration and persistence', () => { - const firstStore = createTestStore() - hydrateWithRepoScan(firstStore, makeDegradedRepoSession()) - firstStore.setState({ workspaceSessionReady: true }) - firstStore.getState().setHydrationSucceeded(true) - expect(shouldPersistWorkspaceSession(firstStore.getState())).toBe(true) - - const persisted = buildWorkspaceSessionPayload(firstStore.getState()) - const restoredStore = createTestStore() - hydrateWithRepoScan(restoredStore, persisted) - - const restored = restoredStore.getState() - expect(restored.unifiedTabsByWorktree[WORKTREE_ID]?.map((tab) => tab.id)).toEqual([ - TERMINAL_ID, - EDITOR_FILE_ID, - BROWSER_ID - ]) - expect(restored.openFiles.map((file) => file.id)).toEqual([EDITOR_FILE_ID]) - expect(restored.browserTabsByWorktree[WORKTREE_ID]?.map((tab) => tab.id)).toEqual([BROWSER_ID]) -}) - -it('keeps a terminal-free degraded workspace selected through hydration and persistence', () => { - const firstStore = createTestStore() - hydrateWithRepoScan(firstStore, makeTerminalFreeDegradedRepoSession()) - - const first = firstStore.getState() - expect(first.activeWorktreeId).toBe(WORKTREE_ID) - expect(first.activeTabType).toBe('browser') - - firstStore.setState({ workspaceSessionReady: true }) - firstStore.getState().setHydrationSucceeded(true) - const persisted = buildWorkspaceSessionPayload(firstStore.getState()) - const restoredStore = createTestStore() - hydrateWithRepoScan(restoredStore, persisted) - - const restored = restoredStore.getState() - expect(restored.activeWorktreeId).toBe(WORKTREE_ID) - expect(restored.unifiedTabsByWorktree[WORKTREE_ID]?.map((tab) => tab.id)).toEqual([ - EDITOR_FILE_ID, - BROWSER_ID - ]) - expect(restored.activeTabType).toBe('browser') -}) - -it('keeps chrome when a non-authoritative fallback lists only some of the repo worktrees', () => { - const store = createTestStore() - // Nonempty SSH metadata fallback can still omit ambiguous/hidden rows; partial lists prove no deletion. - const sibling = makeWorktree({ - id: 'repo1::/path/sibling', - repoId: 'repo1', - path: '/path/sibling' - }) - store.setState({ - repos: [{ id: 'repo1', path: '/repo1', displayName: 'Repo 1', badgeColor: '#000', addedAt: 0 }], - worktreesByRepo: { repo1: [sibling] }, - detectedWorktreesByRepo: { - repo1: { - repoId: 'repo1', - authoritative: false, - source: 'metadata-fallback', - worktrees: [] - } - } - }) - const session = makeDegradedRepoSession() - store.getState().hydrateWorkspaceSession(session) - store.getState().hydrateTabsSession(session) - store.getState().hydrateEditorSession(session) - store.getState().hydrateBrowserSession(session) - - const state = store.getState() - expect(state.tabsByWorktree[WORKTREE_ID]?.map((tab) => tab.id)).toEqual([TERMINAL_ID]) - expect(state.openFiles.map((file) => file.id)).toEqual([EDITOR_FILE_ID]) - expect(state.browserTabsByWorktree[WORKTREE_ID]?.map((tab) => tab.id)).toEqual([BROWSER_ID]) -}) - -it('drops terminal-free chrome when an authoritative scan proves deletion', () => { - const store = createTestStore() - hydrateWithRepoScan(store, makeTerminalFreeDegradedRepoSession(), true) - - const state = store.getState() - expect(state.activeWorktreeId).toBeNull() - expect(state.unifiedTabsByWorktree[WORKTREE_ID]).toBeUndefined() - expect(state.openFiles).toEqual([]) - expect(state.browserTabsByWorktree[WORKTREE_ID]).toBeUndefined() -}) diff --git a/src/renderer/src/store/terminals/terminal-no-op-subscriber.test.ts b/src/renderer/src/store/terminals/terminal-no-op-subscriber.test.ts deleted file mode 100644 index 74c3b25dc2e..00000000000 --- a/src/renderer/src/store/terminals/terminal-no-op-subscriber.test.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { afterEach, describe, expect, it, vi } from 'vitest' -import { - flushTerminalInputActivity, - resetTerminalInputActivityCoalescingForTests -} from '@/lib/terminal-input-activity-coalescing' -import { createTestStore } from '../testing/app-store-test-fixture' - -afterEach(resetTerminalInputActivityCoalescingForTests) - -describe('terminal no-op subscriber budget', () => { - it('retains draft generations when stale resolutions arrive without notifying', () => { - const store = createTestStore() - const draft = { tabId: 'tab', agent: 'codex', text: 'new draft', createdAt: 2 } as const - store.getState().seedNativeChatLaunchDraft(draft) - const before = store.getState() - const listener = vi.fn() - store.subscribe(listener) - - store.getState().resolveNativeChatLaunchDraft('tab', { ...draft, createdAt: 1 }) - store.getState().resolveNativeChatLaunchDraft('tab', { ...draft, text: 'old draft' }) - - expect(listener).not.toHaveBeenCalled() - expect(store.getState()).toBe(before) - expect(store.getState().nativeChatLaunchDraftByTabId.tab).toBe(draft) - }) - - it('drops a trailing input flush after pane teardown without publishing', () => { - const store = createTestStore() - store.getState().recordTerminalInput('tab:leaf', 1000) - store.getState().recordTerminalInput('tab:leaf', 1001) - store.setState({ lastTerminalInputAtByPaneKey: {} }) - const before = store.getState() - const listener = vi.fn() - store.subscribe(listener) - - flushTerminalInputActivity() - - expect(listener).not.toHaveBeenCalled() - expect(store.getState()).toBe(before) - expect(store.getState().lastTerminalInputAtByPaneKey['tab:leaf']).toBeUndefined() - }) -}) diff --git a/src/renderer/src/store/terminals/terminal-startup-queue-restart.test.ts b/src/renderer/src/store/terminals/terminal-startup-queue-restart.test.ts deleted file mode 100644 index 48184a49c3c..00000000000 --- a/src/renderer/src/store/terminals/terminal-startup-queue-restart.test.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { parseWorkspaceSession } from '../../../../shared/workspace-session/workspace-session-schema' -import { buildWorkspaceSessionPayload } from '@/lib/workspace/persistence/workspace-session' -import { createTestStore, seedStore } from '@/store/testing/app-store-test-fixture' -import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' - -const WORKTREE_ID = 'repo1::/wt-1' -const STARTUP_COMMAND = "claude '--dangerously-skip-permissions'" - -function seededStore() { - const store = createTestStore() - seedStore(store, { - worktreesByRepo: { - repo1: [makeWorktree({ id: WORKTREE_ID, repoId: 'repo1', path: '/wt-1' })] - } - }) - return store -} - -// Pin baseline B6/C2 D-b: queued startup for never-mounted tab is not persisted; restart restores a plain shell without launch-record lookup. -describe('queued tab startup across an app restart on main', () => { - it('persists the agent tab but not its queued startup command', () => { - const before = seededStore() - const tab = before.getState().createTab(WORKTREE_ID, undefined, undefined, { - launchAgent: 'claude' - }) - before.getState().queueTabStartupCommand(tab.id, { - command: STARTUP_COMMAND, - launchConfig: { - agentCommand: STARTUP_COMMAND, - agentArgs: '--dangerously-skip-permissions', - agentEnv: {} - } - }) - expect(before.getState().pendingStartupByTabId[tab.id]?.command).toBe(STARTUP_COMMAND) - - const payload = buildWorkspaceSessionPayload(before.getState()) - const written = JSON.stringify(payload) - expect(written).not.toContain(STARTUP_COMMAND) - expect(written).not.toContain('pendingStartup') - - const parsed = parseWorkspaceSession(JSON.parse(written)) - expect(parsed.ok).toBe(true) - if (!parsed.ok) { - return - } - const after = seededStore() - after.getState().hydrateWorkspaceSession(parsed.value) - - // The tab comes back as the agent's tab with no PTY and nothing queued, so its pane spawns a shell. - expect(after.getState().pendingStartupByTabId).toEqual({}) - expect(after.getState().tabsByWorktree[WORKTREE_ID]).toEqual([ - expect.objectContaining({ id: tab.id, launchAgent: 'claude', ptyId: null }) - ]) - }) -}) diff --git a/src/renderer/src/store/terminals/terminal-tab-owner-index.test.ts b/src/renderer/src/store/terminals/terminal-tab-owner-index.test.ts deleted file mode 100644 index 7bbad57c06b..00000000000 --- a/src/renderer/src/store/terminals/terminal-tab-owner-index.test.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { createTerminalTabOwnerIndex } from './terminal-tab-owner-index' - -describe('terminal tab owner index', () => { - it('updates added, removed and moved ownership buckets', () => { - const stableBucket = [{ id: 'stable-tab' }] - const sourceBucket = [{ id: 'moving-tab' }] - const removedBucket = [{ id: 'removed-tab' }] - const index = createTerminalTabOwnerIndex() - - index.getOwners({ stable: stableBucket, source: sourceBucket, removed: removedBucket }) - const owners = index.getOwners({ - stable: stableBucket, - source: [], - destination: [{ id: 'moving-tab' }], - added: [{ id: 'added-tab' }] - }) - - expect(owners.get('stable-tab')).toBe('stable') - expect(owners.get('moving-tab')).toBe('destination') - expect(owners.get('added-tab')).toBe('added') - expect(owners.has('removed-tab')).toBe(false) - }) - - it('keeps owner lookup valid after a metadata-only bucket replacement', () => { - const initial = { - 'wt-0': [{ id: 'tab-0', title: 'Initial title' }], - 'wt-1': [{ id: 'tab-1', title: 'Initial title' }] - } - const index = createTerminalTabOwnerIndex() - index.getOwners(initial) - const next = { ...initial, 'wt-1': [{ id: 'tab-1', title: 'Changed title' }] } - index.adoptMetadataOnlyBucketReplacements(initial, next, ['wt-1']) - - const warmOwners = index.getOwners(next) - - expect(warmOwners.get('tab-1')).toBe('wt-1') - }) - - it('preserves last-wins object order for duplicate ids when only outer keys reorder', () => { - const firstBucket = [{ id: 'duplicate-tab' }, { id: 'duplicate-tab' }] - const secondBucket = [{ id: 'duplicate-tab' }] - const index = createTerminalTabOwnerIndex() - - expect(index.getOwner({ first: firstBucket, second: secondBucket }, 'duplicate-tab')).toBe( - 'second' - ) - - expect(index.getOwner({ second: secondBucket, first: firstBucket }, 'duplicate-tab')).toBe( - 'first' - ) - }) -}) diff --git a/src/renderer/src/store/terminals/worktree-sleep-intent-lifecycle.test.ts b/src/renderer/src/store/terminals/worktree-sleep-intent-lifecycle.test.ts deleted file mode 100644 index 91f6b9d87fd..00000000000 --- a/src/renderer/src/store/terminals/worktree-sleep-intent-lifecycle.test.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest' -import * as intent from '@/lib/worktree-sleep-intent' -import '../slices/worktrees/teardown/worktree-purge-state' -import { createTestStore, seedStore } from '../testing/app-store-test-fixture' -import { makeWorktree } from '../slices/worktrees/worktree.test-fixture' -import { createStoreCascadesMockApi } from '../testing/app-store-cascade-api.test-fixture' -import { resetStructuredAgentSessionReadOwnersForTests } from '@/components/native-chat/session/structured/read/structured-agent-session-read-owner-registry' - -const { clearWorktreeSleepIntent, hasWorktreeSleepIntent, markWorktreeSleepIntent } = intent -const WORKTREE_ID = 'repo1::/path/wt1' -const FOLDER_KEY = 'folder:folder-1' - -createStoreCascadesMockApi() - -function seedWorktree(store: ReturnType): void { - seedStore(store, { - worktreesByRepo: { - repo1: [makeWorktree({ id: WORKTREE_ID, repoId: 'repo1', path: '/path/wt1' })] - }, - refreshGitHubForWorktree: vi.fn(), - refreshGitHubForWorktreeIfStale: vi.fn() - }) -} - -// Sleep intent keeps mounted panes cold after teardown; every wake route must release it or PTYs stay cold and exits cease counting as activity (#10205). -describe('worktree sleep intent lifecycle', () => { - beforeEach(() => { - clearWorktreeSleepIntent(WORKTREE_ID) - clearWorktreeSleepIntent(FOLDER_KEY) - resetStructuredAgentSessionReadOwnersForTests() - }) - - it('ignores a PTY bind that lands while the sleep teardown is in flight', async () => { - const store = createTestStore() - seedWorktree(store) - const tab = store.getState().createTab(WORKTREE_ID, undefined, undefined, { activate: false }) - markWorktreeSleepIntent(WORKTREE_ID) - const woke = vi.fn() - intent.onWorktreeSleepIntentCleared(WORKTREE_ID, woke) - - await intent.withWorktreeSleepTeardown(WORKTREE_ID, async () => { - store.getState().updateTabPtyId(tab.id, 'pty-late-spawn') - }) - - expect(hasWorktreeSleepIntent(WORKTREE_ID)).toBe(true) - expect(woke).not.toHaveBeenCalled() - store.getState().updateTabPtyId(tab.id, 'pty-after-teardown') - expect(hasWorktreeSleepIntent(WORKTREE_ID)).toBe(false) - }) -}) diff --git a/src/renderer/src/web/preload-api/web-ui-compact-notice.test.ts b/src/renderer/src/web/preload-api/web-ui-compact-notice.test.ts deleted file mode 100644 index ba462d6b708..00000000000 --- a/src/renderer/src/web/preload-api/web-ui-compact-notice.test.ts +++ /dev/null @@ -1,54 +0,0 @@ -// @vitest-environment happy-dom - -import { afterEach, beforeEach, expect, it, vi } from 'vitest' -import { getDefaultUIState } from '../../../../shared/constants' -import { UiUpdateFields } from '../../../../shared/rpc-contract/client-ui-params' -import { createUIStore } from '../../store/slices/ui/ui-slice-test-harness' -import { createWebUiApi } from './web-ui-api' - -const runtime = vi.hoisted(() => ({ call: vi.fn(), id: 'new' })) -vi.mock('./web-runtime-calls', () => ({ callRuntimeResult: runtime.call })) -vi.mock('./web-runtime-session', () => ({ - webRuntimeState: { activeEnvironment: null }, - requireActiveEnvironmentOrNull: () => ({ id: runtime.id }) -})) - -beforeEach(() => { - localStorage.clear() - runtime.call.mockReset() - runtime.id = 'new' -}) -afterEach(() => vi.unstubAllGlobals()) - -it.each(['verbose', 'compact'] as const)( - 'saves %s to an older host after caching a pending notice from a newer host', - async (mode) => { - const ui = createWebUiApi() - runtime.call.mockResolvedValue({ - ui: { ...getDefaultUIState(), statusBarCompactChangeNoticeDismissed: false } - }) - expect((await ui.get()).statusBarCompactChangeNoticeDismissed).toBe(false) - - runtime.id = 'old' - const oldHostSchema = UiUpdateFields.omit({ statusBarCompactChangeNoticeDismissed: true }) - const olderUI = getDefaultUIState() - delete olderUI.statusBarCompactChangeNoticeDismissed - runtime.call.mockImplementation(async (method: string, params: unknown) => { - if (method === 'ui.set') { - Object.assign(olderUI, oldHostSchema.parse(params)) - } - return { ui: olderUI } - }) - const hydrated = await ui.get() - expect(hydrated.statusBarCompactChangeNoticeDismissed).toBe(true) - - const store = createUIStore() - vi.stubGlobal('window', { localStorage, api: { ui } }) - store.getState().hydratePersistedUI(hydrated) - store.getState().setStatusBarUsageMode(mode) - - expect(runtime.call).toHaveBeenLastCalledWith('ui.set', { statusBarUsageMode: mode }, 15_000) - expect(olderUI.statusBarUsageMode).toBe(mode) - expect((await ui.get()).statusBarUsageMode).toBe(mode) - } -) diff --git a/src/renderer/src/web/web-insecure-origin-pairing.test.ts b/src/renderer/src/web/web-insecure-origin-pairing.test.ts deleted file mode 100644 index ed336658743..00000000000 --- a/src/renderer/src/web/web-insecure-origin-pairing.test.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' - -import { PAIRING_OFFER_VERSION } from '../../../shared/remote-runtime/pairing/mobile-relay-pairing-offer' - -vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback })) - -const offer = { - v: PAIRING_OFFER_VERSION, - endpoint: 'ws://100.108.226.109:6768', - deviceToken: 'pairing-code', - publicKeyB64: 'host-key' -} as const - -// A fresh module graph is what a page reload gives the web bundle: no in-memory pairing survives. -async function loadWebClient() { - vi.resetModules() - const support = await import('./web-device-key-support') - support.setWebDeviceKeySupportForTests('token-insecure-origin') - return { - environment: await import('./web-runtime-environment'), - credentials: await import('./preload-api/web-runtime-credentials'), - guidance: await import('./web-pairing-security-guidance') - } -} - -describe('a plain-http page on another machine (LAN or Tailscale)', () => { - beforeEach(() => { - const items = new Map() - vi.stubGlobal('window', { - localStorage: { - getItem: (key: string) => items.get(key) ?? null, - setItem: (key: string, value: string) => items.set(key, value), - removeItem: (key: string) => items.delete(key) - } - }) - }) - afterEach(() => vi.unstubAllGlobals()) - - it('stays paired across a reload and signs in with the stored pairing code', async () => { - const before = await loadWebClient() - const paired = before.environment.createStoredWebRuntimeEnvironment({ name: 'Desk', offer }) - expect(paired.sessionOnly).toBeUndefined() - before.environment.saveStoredWebRuntimeEnvironment(paired) - - const after = await loadWebClient() - const restored = after.environment.readStoredWebRuntimeEnvironment() - expect(restored).toMatchObject({ id: paired.id, endpoints: [{ deviceToken: 'pairing-code' }] }) - const source = after.credentials.webRuntimeCredentialFor(restored!, { - forgetStoredToken: vi.fn(), - forgetPairing: vi.fn() - }) - expect(source.nextPlan(true)).toEqual({ kind: 'legacy-token', deviceToken: 'pairing-code' }) - }) -}) diff --git a/src/shared/native-chat/tools/native-chat-tool-pairing.performance.test.ts b/src/shared/native-chat/tools/native-chat-tool-pairing.performance.test.ts index cd1f769c108..70813875a34 100644 --- a/src/shared/native-chat/tools/native-chat-tool-pairing.performance.test.ts +++ b/src/shared/native-chat/tools/native-chat-tool-pairing.performance.test.ts @@ -1,10 +1,6 @@ import { describe, expect, it } from 'vitest' import { pairToolBlocks, type NativeChatToolPair } from './native-chat-tool-pairs' -import type { - NativeChatBlock, - NativeChatToolCallBlock, - NativeChatToolResultBlock -} from '../native-chat-types' +import type { NativeChatToolCallBlock, NativeChatToolResultBlock } from '../native-chat-types' function call(callId?: string): NativeChatToolCallBlock { return { type: 'tool-call', name: 'Bash', input: {}, ...(callId !== undefined ? { callId } : {}) } @@ -25,157 +21,7 @@ function expectSameReferences( }) } -function countedCalls(count: number): { - calls: NativeChatToolCallBlock[] - reads: () => number -} { - let reads = 0 - const calls = Array.from({ length: count }, (_, index): NativeChatToolCallBlock => ({ - type: 'tool-call', - name: 'Bash', - input: {}, - get callId() { - reads += 1 - return `call-${index}` - } - })) - return { calls, reads: () => reads } -} - -function countQueueMovement(blocks: readonly NativeChatBlock[]): { - pairs: NativeChatToolPair[] - movedSlots: number -} { - const originalSplice = Array.prototype.splice - const originalShift = Array.prototype.shift - let movedSlots = 0 - Array.prototype.splice = function ( - this: unknown[], - requestedIndex: number, - deleteCount?: number, - ...items: unknown[] - ) { - if (arguments.length === 0) { - return originalSplice.call(this, 0, 0) - } - const requestedStart = Math.trunc(requestedIndex) || 0 - const start = - requestedStart < 0 - ? Math.max(0, this.length + requestedStart) - : Math.min(this.length, requestedStart) - const removed = - arguments.length < 2 - ? this.length - start - : Math.min(this.length - start, Math.max(0, Math.trunc(deleteCount ?? 0) || 0)) - if (removed !== items.length) { - movedSlots += this.length - start - removed - } - return originalSplice.call(this, requestedIndex, removed, ...items) - } - Array.prototype.shift = function (this: unknown[]) { - movedSlots += Math.max(0, this.length - 1) - return originalShift.call(this) - } - try { - return { pairs: pairToolBlocks(blocks), movedSlots } - } finally { - Array.prototype.shift = originalShift - Array.prototype.splice = originalSplice - } -} - -describe('tool pairing lookup budget', () => { - it.each(['positional', 'named', 'duplicate'] as const)( - 'removes %s completions without quadratic queue movement', - (kind) => { - const count = 2048 - const idOf = (index: number): string | undefined => - kind === 'positional' ? undefined : kind === 'duplicate' ? 'same' : `call-${index}` - const calls = Array.from({ length: count }, (_, index) => call(idOf(index))) - const results = Array.from({ length: count }, (_, index) => result(idOf(index))) - const blocks = [...calls, ...results] - const measured = countQueueMovement(blocks) - expectSameReferences( - measured.pairs, - calls.map((pending, index) => ({ call: pending, result: results[index] })) - ) - expect(measured.movedSlots).toBeLessThanOrEqual(count * 3) - } - ) - - it.each([64, 512, 2048])( - 'looks up named results in linear work for %i calls answered in reverse order', - (count) => { - const fixture = countedCalls(count) - const results = Array.from({ length: count }, (_, index) => result(`call-${index}`)) - const pairs = pairToolBlocks([...fixture.calls, ...results.toReversed()]) - const lookupReads = fixture.reads() - expect(pairs).toHaveLength(count) - pairs.forEach((pair, index) => { - expect(pair.call).toBe(fixture.calls[index]) - expect(pair.result).toBe(results[index]) - }) - expect(lookupReads).toBeLessThanOrEqual(count * 3) - } - ) - - it.each([64, 512, 2048])( - 'keeps later named completions linear behind %i calls that emitted no result', - (count) => { - const fixture = countedCalls(count) - const laterCalls = Array.from({ length: count }, (_, index) => call(`later-${index}`)) - const results = Array.from({ length: count }, (_, index) => result(`later-${index}`)) - const pairs = pairToolBlocks([ - ...fixture.calls, - ...laterCalls.flatMap((laterCall, index) => [laterCall, results[index]!]) - ]) - const lookupReads = fixture.reads() - expect(pairs).toHaveLength(count * 2) - fixture.calls.forEach((pendingCall, index) => { - expect(pairs[index]?.call).toBe(pendingCall) - expect(pairs[index]?.result).toBeUndefined() - expect(pairs[count + index]?.call).toBe(laterCalls[index]) - expect(pairs[count + index]?.result).toBe(results[index]) - }) - expect(lookupReads).toBeLessThanOrEqual(count * 3) - } - ) - - it.each([64, 512, 2048])( - 'keeps unmatched named results linear behind %i pending calls', - (count) => { - const fixture = countedCalls(count) - const results = Array.from({ length: count }, (_, index) => result(`missing-${index}`)) - const pairs = pairToolBlocks([...fixture.calls, ...results]) - const lookupReads = fixture.reads() - expect(pairs).toHaveLength(count * 2) - results.forEach((unmatched, index) => { - expect(pairs[count + index]?.call).toBeUndefined() - expect(pairs[count + index]?.result).toBe(unmatched) - }) - expect(lookupReads).toBeLessThanOrEqual(count * 3) - } - ) -}) - describe('tool pairing identity and ordering', () => { - it('indexes missing named answers only once when every pending call has no ID', () => { - let reads = 0 - const count = 2048 - const calls: NativeChatToolCallBlock[] = Array.from({ length: count }, () => ({ - type: 'tool-call', - name: 'Bash', - input: {}, - get callId() { - reads += 1 - return undefined - } - })) - const results = Array.from({ length: count }, () => result('missing')) - expect(pairToolBlocks([...calls, ...results])).toHaveLength(count * 2) - expect(reads).toBeLessThanOrEqual(count * 3) - }) - it('matches repeated and empty IDs FIFO while positional results consume the oldest call', () => { const calls = [call('same'), call(''), call('same'), call(), call('same')] const results = [result('same'), result(), result('same'), result(), result('same')] From 75c37220b52e1a506e0b1d551a4647062d9b6b54 Mon Sep 17 00:00:00 2001 From: Neil <4138956+nwparker@users.noreply.github.com> Date: Mon, 9 Nov 2026 02:01:41 -0800 Subject: [PATCH 03/90] fix(terminal): end a dead preserved terminal host's PTYs as host loss (#40095) * fix(terminal): end a dead preserved terminal host's PTYs as host loss After an update Orca keeps the previous version's terminal host so agents survive. That host has no respawn, so when it later died nothing ended its PTYs: panes stayed connected on a frozen frame and input went nowhere. Once every reconnect attempt finds its endpoint refused or missing, each of its PTYs now ends as host loss with history kept, and the pane's restore is no longer refused because the dead host cannot answer. Fixes #38432 * fix(terminal): require process-exit proof on POSIX and keep checking until proven Review follow-ups: an unproven attempt restarts the count instead of ending the check; on POSIX the old host's pid must also be gone; a proven-gone host answers 'not live' for every id; one throwing exit listener cannot strand the remaining sessions. --- .../adapter/daemon-preserved-endpoint-loss.ts | 60 ++++++ .../adapter/daemon-pty-adapter-options.ts | 4 + .../providers/adapter/daemon-pty-adapter.ts | 4 +- .../adapter/daemon-pty-preserved-host-loss.ts | 98 ++++++++++ .../daemon-preserved-endpoint-loss.test.ts | 77 ++++++++ .../daemon-pty-preserved-host-loss.test.ts | 171 ++++++++++++++++++ 6 files changed, 412 insertions(+), 2 deletions(-) create mode 100644 src/main/daemon/providers/adapter/daemon-preserved-endpoint-loss.ts create mode 100644 src/main/daemon/providers/adapter/daemon-pty-preserved-host-loss.ts create mode 100644 src/main/daemon/providers/adapter/testing/daemon-preserved-endpoint-loss.test.ts create mode 100644 src/main/daemon/providers/adapter/testing/daemon-pty-preserved-host-loss.test.ts diff --git a/src/main/daemon/providers/adapter/daemon-preserved-endpoint-loss.ts b/src/main/daemon/providers/adapter/daemon-preserved-endpoint-loss.ts new file mode 100644 index 00000000000..9d9e305a481 --- /dev/null +++ b/src/main/daemon/providers/adapter/daemon-preserved-endpoint-loss.ts @@ -0,0 +1,60 @@ +import { isDaemonEndpointGoneError } from '../../protocol/daemon-errors' +import { inspectProcessSignal } from '../../endpoint/identity/daemon-process-inspection' + +/** + * Delays between reconnect attempts after a preserved daemon's connection drops; the last repeats. + * Loss needs this many attempts in a row to find the endpoint refused or missing: a timeout or any + * other error cannot tell a busy host from a dead one, so it restarts the count. + */ +export const PRESERVED_ENDPOINT_LOSS_PROBE_DELAYS_MS: readonly number[] = [ + 500, 2_000, 5_000, 30_000 +] +export const PRESERVED_ENDPOINT_LOSS_REQUIRED_GONE = 3 + +export type PreservedEndpointLossVerdict = 'gone' | 'reachable' | 'abandoned' + +function delay(ms: number): Promise { + return new Promise((resolve) => setTimeout(resolve, ms)) +} + +/** + * A gone endpoint alone does not prove the process is gone on POSIX: its socket name can be + * unlinked under a live daemon. A Windows pipe exists only while its server handle is open, and + * PID reuse makes a PID probe unsound there, so the missing pipe is the proof. + */ +export function preservedDaemonProcessExited(pid: number | undefined): boolean { + if (process.platform === 'win32') { + return true + } + return pid !== undefined && inspectProcessSignal(pid) === 'missing' +} + +/** Decide whether a daemon Orca cannot respawn is gone for good, so its PTYs can end as host loss. */ +export async function confirmPreservedEndpointLoss(args: { + connect: () => Promise + shouldContinue: () => boolean + processExited: () => boolean + delaysMs?: readonly number[] + requiredGone?: number + sleep?: (ms: number) => Promise +}): Promise { + const sleep = args.sleep ?? delay + const delays = args.delaysMs ?? PRESERVED_ENDPOINT_LOSS_PROBE_DELAYS_MS + const requiredGone = args.requiredGone ?? PRESERVED_ENDPOINT_LOSS_REQUIRED_GONE + let gone = 0 + for (let attempt = 0; ; attempt++) { + await sleep(delays[Math.min(attempt, delays.length - 1)] ?? 0) + if (!args.shouldContinue()) { + return 'abandoned' + } + try { + await args.connect() + return 'reachable' + } catch (error) { + gone = isDaemonEndpointGoneError(error) && args.processExited() ? gone + 1 : 0 + } + if (gone >= requiredGone) { + return 'gone' + } + } +} diff --git a/src/main/daemon/providers/adapter/daemon-pty-adapter-options.ts b/src/main/daemon/providers/adapter/daemon-pty-adapter-options.ts index cfa65471e1d..b70e83de8f2 100644 --- a/src/main/daemon/providers/adapter/daemon-pty-adapter-options.ts +++ b/src/main/daemon/providers/adapter/daemon-pty-adapter-options.ts @@ -15,6 +15,10 @@ export type DaemonPtyAdapterOptions = { readRunningWslDistros?: ReadRunningWslDistros /** Test seam; production reads each distro's boot id through the background-work gate. */ wslBridgeBootIdentity?: WslBridgeBootIdentity + /** Test seam; delays before each reconnect attempt to a dead daemon that cannot respawn. */ + preservedEndpointLossProbeDelaysMs?: readonly number[] + /** Test seam; whether a preserved daemon's process is proven gone, given its last pid. */ + preservedDaemonExited?: (pid: number | undefined) => boolean } export type DaemonRespawnReason = diff --git a/src/main/daemon/providers/adapter/daemon-pty-adapter.ts b/src/main/daemon/providers/adapter/daemon-pty-adapter.ts index 27c7825a371..3512c3e1298 100644 --- a/src/main/daemon/providers/adapter/daemon-pty-adapter.ts +++ b/src/main/daemon/providers/adapter/daemon-pty-adapter.ts @@ -12,7 +12,7 @@ import type { DaemonPtyRouterExitEvent } from '../../protocol/daemon-pty-router- import { logWslPaneDiagnostic } from '../wsl/daemon-wsl-diagnostic-log' import { classifyWslBridgeExit, WSL_DISTRO_LOSS_EXIT_CODE } from '../wsl/daemon-wsl-bridge-exit' import { isProvenProcessExit } from '../../../../shared/terminal/pty/lifecycle/terminal-exit-cause' -import { DaemonPtyDaemonRecovery } from './daemon-pty-daemon-recovery' +import { DaemonPtyPreservedHostLoss } from './daemon-pty-preserved-host-loss' import type { DaemonPtyAdapterOptions } from './daemon-pty-adapter-options' import type { DaemonEvent } from '../../protocol/daemon-stream-events' @@ -34,7 +34,7 @@ import type { import { observeDaemonAsyncIoHealth } from '../../observability/daemon-async-io-telemetry-event' import { sameEndpointIdentity } from '../../endpoint/identity/daemon-endpoint-incarnation' -export class DaemonPtyAdapter extends DaemonPtyDaemonRecovery implements IPtyProvider { +export class DaemonPtyAdapter extends DaemonPtyPreservedHostLoss implements IPtyProvider { constructor(opts: DaemonPtyAdapterOptions) { super(opts) // Registered after the base listener, which marks the sessions awaiting recovery first. diff --git a/src/main/daemon/providers/adapter/daemon-pty-preserved-host-loss.ts b/src/main/daemon/providers/adapter/daemon-pty-preserved-host-loss.ts new file mode 100644 index 00000000000..9e319de1a6c --- /dev/null +++ b/src/main/daemon/providers/adapter/daemon-pty-preserved-host-loss.ts @@ -0,0 +1,98 @@ +import { createPtyExitPayload, emitPtyListeners } from './daemon-pty-listener-emission' +import { DaemonPtyDaemonRecovery } from './daemon-pty-daemon-recovery' +import type { DaemonPtyAdapterOptions } from './daemon-pty-adapter-options' +import { + confirmPreservedEndpointLoss, + PRESERVED_ENDPOINT_LOSS_PROBE_DELAYS_MS, + preservedDaemonProcessExited +} from './daemon-preserved-endpoint-loss' + +/** + * A daemon kept from an older Orca version has no respawn. Why (#38432): when it died, nothing + * ended its PTYs, so every pane stayed "connected" on a frozen frame and input went nowhere. + */ +export abstract class DaemonPtyPreservedHostLoss extends DaemonPtyDaemonRecovery { + private readonly preservedEndpointLossProbeDelaysMs: readonly number[] + private readonly preservedDaemonExited: (pid: number | undefined) => boolean + private preservedEndpointLossProbe: Promise | null = null + /** Set once this adapter ended its sessions because its endpoint stayed gone. */ + private preservedEndpointLossDeclared = false + + constructor(opts: DaemonPtyAdapterOptions) { + super(opts) + this.preservedEndpointLossProbeDelaysMs = + opts.preservedEndpointLossProbeDelaysMs ?? PRESERVED_ENDPOINT_LOSS_PROBE_DELAYS_MS + this.preservedDaemonExited = opts.preservedDaemonExited ?? preservedDaemonProcessExited + } + + protected recoverAfterEndpointLoss(): void { + if (this.respawnFn || this.activeSessionIds.size === 0) { + super.recoverAfterEndpointLoss() + return + } + this.confirmPreservedDaemonLoss() + } + + // A host proven gone runs no session, so restores (attached or not) route to the current daemon. + async probePtyLiveness(id: string): Promise { + return this.isProvenGone() ? false : await super.probePtyLiveness(id) + } + + listsSession(id: string): Promise { + return this.isProvenGone() ? Promise.resolve(false) : super.listsSession(id) + } + + /** Proven gone and not reconnected since; a later reconnect restores the daemon's own answers. */ + private isProvenGone(): boolean { + return this.preservedEndpointLossDeclared && !this.client.isConnected() + } + + private confirmPreservedDaemonLoss(): void { + if (this.preservedEndpointLossProbe || this.respawnAdoptionClosed) { + return + } + const stillLost = (): boolean => + !this.respawnAdoptionClosed && this.activeSessionIds.size > 0 && !this.client.isConnected() + const probe = confirmPreservedEndpointLoss({ + connect: () => this.ensureConnected(), + shouldContinue: stillLost, + processExited: () => this.preservedDaemonExited(this.lastAuthenticatedIdentity?.pid), + delaysMs: this.preservedEndpointLossProbeDelaysMs + }) + .then((verdict) => { + if (verdict === 'gone' && stillLost()) { + this.endPreservedSessionsAsHostLoss() + } + }) + .catch((error) => console.warn('[daemon] Preserved terminal host loss check failed:', error)) + .finally(() => { + if (this.preservedEndpointLossProbe === probe) { + this.preservedEndpointLossProbe = null + } + }) + this.preservedEndpointLossProbe = probe + } + + /** Each PTY ends as host loss with its history kept, so its pane can cold-restore. */ + private endPreservedSessionsAsHostLoss(): void { + const ids = [...this.activeSessionIds] + console.warn( + `[daemon] Terminal host v${this.protocolVersion} is gone - ending ${ids.length} session${ids.length === 1 ? '' : 's'} as host loss` + ) + this.preservedEndpointLossDeclared = true + const exits = ids.map((id) => { + const incarnationId = this.sessionIncarnations.get(id) + this.hostLossSessionIds.add(id) + this.clearExitedSessionState(id, -1, incarnationId, { closeHistory: false }) + return createPtyExitPayload(id, { code: -1, incarnationId, hostLost: true }) + }) + // State is settled for every session first, so one throwing listener cannot strand the rest. + for (const exit of exits) { + try { + emitPtyListeners(this.exitListeners, (listener) => listener(exit)) + } catch (error) { + console.warn('[daemon] Host-loss exit listener failed:', exit.id, error) + } + } + } +} diff --git a/src/main/daemon/providers/adapter/testing/daemon-preserved-endpoint-loss.test.ts b/src/main/daemon/providers/adapter/testing/daemon-preserved-endpoint-loss.test.ts new file mode 100644 index 00000000000..695a19e38e7 --- /dev/null +++ b/src/main/daemon/providers/adapter/testing/daemon-preserved-endpoint-loss.test.ts @@ -0,0 +1,77 @@ +import { describe, expect, it } from 'vitest' +import { confirmPreservedEndpointLoss } from '../daemon-preserved-endpoint-loss' +import { DaemonProtocolError } from '../../../protocol/daemon-errors' + +function connectError(code: string): Error { + return Object.assign(new Error(`connect ${code}`), { code, syscall: 'connect' }) +} + +const sleep = async (): Promise => {} + +/** Replays connect outcomes in order; once spent, the caller no longer needs a verdict. */ +function script(outcomes: (Error | 'ok')[]) { + let index = 0 + return { + connect: async () => { + const outcome = outcomes[index++] + if (outcome instanceof Error) { + throw outcome + } + }, + shouldContinue: () => index < outcomes.length + } +} + +describe('confirmPreservedEndpointLoss', () => { + it('is gone after three refused or missing attempts in a row with the process gone', async () => { + const run = script([ + connectError('ECONNREFUSED'), + connectError('ENOENT'), + connectError('ECONNREFUSED') + ]) + await expect( + confirmPreservedEndpointLoss({ ...run, processExited: () => true, delaysMs: [1], sleep }) + ).resolves.toBe('gone') + }) + + it('restarts the count on a timeout or other failure instead of reading it as death', async () => { + const run = script([ + connectError('ENOENT'), + connectError('ENOENT'), + new DaemonProtocolError('Connection timed out'), + connectError('EPERM'), + connectError('ENOENT'), + connectError('ENOENT') + ]) + await expect( + confirmPreservedEndpointLoss({ ...run, processExited: () => true, delaysMs: [1], sleep }) + ).resolves.toBe('abandoned') + }) + + it('keeps checking after an unproven attempt, so a host that dies later is still caught', async () => { + const run = script([ + new DaemonProtocolError('Connection timed out'), + connectError('ENOENT'), + connectError('ENOENT'), + connectError('ENOENT'), + connectError('ENOENT') + ]) + await expect( + confirmPreservedEndpointLoss({ ...run, processExited: () => true, delaysMs: [1], sleep }) + ).resolves.toBe('gone') + }) + + it('never declares loss while the daemon process may still be alive', async () => { + const run = script(Array.from({ length: 10 }, () => connectError('ECONNREFUSED'))) + await expect( + confirmPreservedEndpointLoss({ ...run, processExited: () => false, delaysMs: [1], sleep }) + ).resolves.toBe('abandoned') + }) + + it('stops when the host answers again', async () => { + const run = script([connectError('ECONNREFUSED'), 'ok', connectError('ECONNREFUSED')]) + await expect( + confirmPreservedEndpointLoss({ ...run, processExited: () => true, delaysMs: [1], sleep }) + ).resolves.toBe('reachable') + }) +}) diff --git a/src/main/daemon/providers/adapter/testing/daemon-pty-preserved-host-loss.test.ts b/src/main/daemon/providers/adapter/testing/daemon-pty-preserved-host-loss.test.ts new file mode 100644 index 00000000000..b9aadc7a2b4 --- /dev/null +++ b/src/main/daemon/providers/adapter/testing/daemon-pty-preserved-host-loss.test.ts @@ -0,0 +1,171 @@ +// #38432: after an update keeps the previous version's terminal host, that host dying left its +// panes "connected" on a frozen frame. Simulates the upgrade with live sessions on both hosts. +import '../../../pty-subprocess/testing/mock-descendant-sweep' +import { afterEach, describe, expect, it, vi } from 'vitest' +import { mkdtempSync, rmSync } from 'node:fs' +import { tmpdir } from 'node:os' +import { join } from 'node:path' +import { DaemonPtyAdapter } from '../daemon-pty-adapter' +import { DaemonPtyRouter } from '../../routing/daemon-pty-router' +import { DaemonServer } from '../../../server/daemon-server' +import { PROTOCOL_VERSION } from '../../../protocol/daemon-protocol-version' +import { getDaemonSocketPath } from '../../../launch/daemon-spawner' +import type { DaemonFileLog } from '../../../observability/daemon-file-log' +import type { DaemonPtyRouterExitEvent } from '../../../protocol/daemon-pty-router-events' +import { createMockSubprocess } from './daemon-pty-adapter-test-harness' + +const LEGACY_PROTOCOL = PROTOCOL_VERSION - 1 + +type ClientInternals = { + handleDisconnect: (generation: number) => void + connectionGeneration: number + isConnected: () => boolean +} + +function adapterClient(adapter: DaemonPtyAdapter): ClientInternals { + // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: reads the adapter's own DaemonClient to drop only its transport, as a broken pipe would. + const internals = adapter as unknown as { client: ClientInternals } + return internals.client +} + +describe('a preserved older-version terminal host that dies', () => { + const servers: DaemonServer[] = [] + const adapters: DaemonPtyAdapter[] = [] + const directories: string[] = [] + let router: DaemonPtyRouter | null = null + + afterEach(async () => { + router?.dispose() + router = null + for (const adapter of adapters.splice(0)) { + adapter.dispose() + } + await Promise.all(servers.splice(0).map((server) => server.shutdown().catch(() => {}))) + for (const directory of directories.splice(0)) { + rmSync(directory, { recursive: true, force: true }) + } + }) + + async function upgradeWithLiveSessions() { + const directory = mkdtempSync(join(tmpdir(), 'daemon-preserved-host-loss-')) + directories.push(directory) + const log: DaemonFileLog = { log: () => {}, close: () => {} } + const legacySocketPath = getDaemonSocketPath(directory, LEGACY_PROTOCOL) + const currentSocketPath = getDaemonSocketPath(directory, PROTOCOL_VERSION) + const legacyTokenPath = join(directory, 'legacy.token') + const currentTokenPath = join(directory, 'current.token') + const legacySubprocesses: ReturnType[] = [] + const currentSubprocesses: ReturnType[] = [] + const legacyServer = new DaemonServer({ + socketPath: legacySocketPath, + tokenPath: legacyTokenPath, + protocolVersion: LEGACY_PROTOCOL, + log, + spawnSubprocess: () => { + const subprocess = createMockSubprocess() + legacySubprocesses.push(subprocess) + return subprocess + } + }) + const currentServer = new DaemonServer({ + socketPath: currentSocketPath, + tokenPath: currentTokenPath, + protocolVersion: PROTOCOL_VERSION, + log, + spawnSubprocess: () => { + const subprocess = createMockSubprocess() + currentSubprocesses.push(subprocess) + return subprocess + } + }) + servers.push(legacyServer, currentServer) + await Promise.all([legacyServer.start(), currentServer.start()]) + + // The previous app version starts two agent panes on its own host, then quits to update. + const oldApp = new DaemonPtyAdapter({ + socketPath: legacySocketPath, + tokenPath: legacyTokenPath, + protocolVersion: LEGACY_PROTOCOL + }) + adapters.push(oldApp) + const first = await oldApp.spawn({ sessionId: 'agent-1', cols: 80, rows: 24 }) + const second = await oldApp.spawn({ sessionId: 'agent-2', cols: 80, rows: 24 }) + oldApp.dispose() + + // The updated app keeps the old host (no respawn) and starts its own. + const legacy = new DaemonPtyAdapter({ + socketPath: legacySocketPath, + tokenPath: legacyTokenPath, + protocolVersion: LEGACY_PROTOCOL, + runtimeDir: directory, + preservedEndpointLossProbeDelaysMs: [5], + // The fixture host shares this test's pid, so its exit is stubbed as proven. + preservedDaemonExited: () => true + }) + const current = new DaemonPtyAdapter({ + socketPath: currentSocketPath, + tokenPath: currentTokenPath, + protocolVersion: PROTOCOL_VERSION, + runtimeDir: directory + }) + adapters.push(legacy, current) + router = new DaemonPtyRouter({ current, legacy: [legacy] }) + await router.discoverLegacySessions() + const exits: DaemonPtyRouterExitEvent[] = [] + router.onExit((payload) => exits.push(payload)) + for (const session of [first, second]) { + await router.spawn({ sessionId: session.id, cols: 80, rows: 24, attachOnly: true }) + } + const fresh = await router.spawn({ sessionId: 'new-pane', cols: 80, rows: 24 }) + return { + router, + legacy, + legacyServer, + legacySubprocesses, + currentSubprocesses, + exits, + first, + second, + fresh + } + } + + it('ends each of its PTYs as host loss, and the panes restore on the current host', async () => { + const run = await upgradeWithLiveSessions() + expect(run.legacySubprocesses).toHaveLength(2) + expect(run.currentSubprocesses).toHaveLength(1) + + // The old host dies: its socket stays behind but nothing listens. + await run.legacyServer.shutdown() + + await vi.waitFor(() => expect(run.exits).toHaveLength(2), { timeout: 3_000 }) + expect(run.exits).toEqual( + expect.arrayContaining([ + { id: run.first.id, code: -1, incarnationId: run.first.incarnationId, hostLost: true }, + { id: run.second.id, code: -1, incarnationId: run.second.incarnationId, hostLost: true } + ]) + ) + // The current host's pane is untouched. + expect(run.exits.some((exit) => exit.id === run.fresh.id)).toBe(false) + expect(run.router.hasPty(run.fresh.id)).toBe(true) + + // Restoring the pane must not be refused because the dead host cannot answer. + const restored = await run.router.spawn({ sessionId: run.first.id, cols: 80, rows: 24 }) + expect(restored.id).toBe(run.first.id) + expect(run.currentSubprocesses).toHaveLength(2) + }) + + it('keeps the panes when the host answers again before the loss is proven', async () => { + const run = await upgradeWithLiveSessions() + // Drop only the connection; the host and its PTYs keep running. + const client = adapterClient(run.legacy) + client.handleDisconnect(client.connectionGeneration) + expect(client.isConnected()).toBe(false) + + // The first probe reconnects, which settles the check without a verdict of loss. + await vi.waitFor(() => expect(client.isConnected()).toBe(true)) + expect(run.exits).toEqual([]) + expect(run.router.hasPty(run.first.id)).toBe(true) + expect(run.router.hasPty(run.second.id)).toBe(true) + }) +}) From 0684ef586fee3dcaa47544be2ec6b57eb348d96a Mon Sep 17 00:00:00 2001 From: Kelvin Amoaba <97001695+AmoabaKelvin@users.noreply.github.com> Date: Mon, 9 Nov 2026 10:03:37 +0000 Subject: [PATCH 04/90] feat(i18n): translate the dictation pill, error pill and queued-send copy (#40266) * fix(dictation): don't throw when the paired web client has no speech catalog * feat(i18n): translate the dictation pill, error pill and queued-send copy * fix(i18n): say Chinese queued sends happen automatically --- .../dictation/DictationIndicator.tsx | 3 ++- src/renderer/src/i18n/locales/de.json | 19 +++++++++++++++++-- src/renderer/src/i18n/locales/es.json | 19 +++++++++++++++++-- src/renderer/src/i18n/locales/fr.json | 19 +++++++++++++++++-- src/renderer/src/i18n/locales/ja.json | 19 +++++++++++++++++-- src/renderer/src/i18n/locales/ko.json | 19 +++++++++++++++++-- src/renderer/src/i18n/locales/pt.json | 19 +++++++++++++++++-- src/renderer/src/i18n/locales/ru.json | 19 +++++++++++++++++-- src/renderer/src/i18n/locales/tr.json | 19 +++++++++++++++++-- src/renderer/src/i18n/locales/zh-Hant.json | 19 +++++++++++++++++-- src/renderer/src/i18n/locales/zh.json | 19 +++++++++++++++++-- 11 files changed, 172 insertions(+), 21 deletions(-) diff --git a/src/renderer/src/components/dictation/DictationIndicator.tsx b/src/renderer/src/components/dictation/DictationIndicator.tsx index e92f2b1ab89..e28f3d62f16 100644 --- a/src/renderer/src/components/dictation/DictationIndicator.tsx +++ b/src/renderer/src/components/dictation/DictationIndicator.tsx @@ -75,7 +75,8 @@ function useIsCloudModel(): boolean { let current = true if (!catalogRequest) { catalogRequest = Promise.resolve() - .then(() => window.api.speech.getCatalog()) + // The paired web client's fallback resolves with nothing rather than a list. + .then(async () => (await window.api.speech.getCatalog()) ?? []) .catch(() => []) } void catalogRequest.then((catalog) => { diff --git a/src/renderer/src/i18n/locales/de.json b/src/renderer/src/i18n/locales/de.json index 090345f268b..21f10a7612b 100644 --- a/src/renderer/src/i18n/locales/de.json +++ b/src/renderer/src/i18n/locales/de.json @@ -16974,7 +16974,8 @@ "micFallback": "Ausgewähltes Mikrofon nicht verfügbar. Systemstandard wird verwendet.", "micDisconnected": "Mikrofon getrennt. Diktat gestoppt.", "cloudLimitReached": "Diktat am 10-Minuten-Limit der Cloud gestoppt.", - "stoppedAfterSilence": "Nach einer Minute Stille beendet" + "stoppedAfterSilence": "Nach einer Minute Stille beendet", + "retryUnmatched": "Beim erneuten Versuch war nicht erkennbar, welche Wörter schon eingegeben waren, daher wurden alle eingefügt." }, "dictation-transcript-delivery": { "copiedAfterFailedInsert": "Das Diktat konnte nicht eingefügt werden und wurde in die Zwischenablage kopiert.", @@ -16982,7 +16983,21 @@ "lost": "Das Diktat konnte weder eingefügt noch kopiert werden." }, "DictationIndicator": { - "4977162383": "Zu laut" + "4977162383": "Zu laut", + "finishing": "Wird abgeschlossen…", + "listening": "Hört zu…", + "cancel": "Abbrechen", + "finish": "Fertig", + "oneMinuteLeft": "Noch eine Minute.", + "sendsWhenLanded": "Sendet, sobald der Text da ist", + "entersWhenLanded": "Drückt Enter, sobald der Text da ist" + }, + "DictationPillFailure": { + "discard": "Aufnahme verwerfen", + "modelFailed": "Modell nicht geladen.", + "transcribeFailed": "Nicht erkannt. Aufnahme behalten.", + "openSettings": "Einstellungen", + "retry": "Wiederholen" } }, "dashboard": { diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json index e7c433aa147..24007e63f01 100644 --- a/src/renderer/src/i18n/locales/es.json +++ b/src/renderer/src/i18n/locales/es.json @@ -16700,7 +16700,8 @@ "micFallback": "Micrófono seleccionado no disponible. Se usará el predeterminado del sistema.", "micDisconnected": "Micrófono desconectado. Dictado detenido.", "cloudLimitReached": "Dictado detenido al llegar al límite de 10 minutos en la nube.", - "stoppedAfterSilence": "Se detuvo tras un minuto de silencio" + "stoppedAfterSilence": "Se detuvo tras un minuto de silencio", + "retryUnmatched": "Al reintentar no se pudo saber qué palabras ya estaban escritas, así que se insertaron todas." }, "dictation-transcript-delivery": { "copiedAfterFailedInsert": "No se pudo insertar el dictado, así que se copió al portapapeles.", @@ -16708,7 +16709,21 @@ "lost": "No se pudo insertar ni copiar el dictado." }, "DictationIndicator": { - "4977162383": "Volumen demasiado alto" + "4977162383": "Volumen demasiado alto", + "finishing": "Terminando…", + "listening": "Escuchando…", + "cancel": "Cancelar", + "finish": "Terminar", + "oneMinuteLeft": "Queda un minuto.", + "sendsWhenLanded": "Se enviará cuando llegue el texto", + "entersWhenLanded": "Pulsará Enter cuando llegue el texto" + }, + "DictationPillFailure": { + "discard": "Descartar grabación", + "modelFailed": "El modelo no cargó.", + "transcribeFailed": "No se transcribió. Grabación guardada.", + "openSettings": "Configuración", + "retry": "Reintentar" } }, "dashboard": { diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json index 2b8b042c3ed..fc72f89f67c 100644 --- a/src/renderer/src/i18n/locales/fr.json +++ b/src/renderer/src/i18n/locales/fr.json @@ -16925,7 +16925,8 @@ "micFallback": "Micro sélectionné indisponible. Utilisation du micro par défaut du système.", "micDisconnected": "Micro déconnecté. Dictée arrêtée.", "cloudLimitReached": "Dictée arrêtée à la limite cloud de 10 minutes.", - "stoppedAfterSilence": "Arrêt après une minute de silence" + "stoppedAfterSilence": "Arrêt après une minute de silence", + "retryUnmatched": "La nouvelle tentative n'a pas pu repérer les mots déjà saisis, ils ont donc tous été insérés." }, "dictation-transcript-delivery": { "copiedAfterFailedInsert": "La dictée n'a pas pu être insérée, elle a donc été copiée dans le presse-papiers.", @@ -16933,7 +16934,21 @@ "lost": "La dictée n'a pu être ni insérée ni copiée." }, "DictationIndicator": { - "4977162383": "Trop fort" + "4977162383": "Trop fort", + "finishing": "Finalisation…", + "listening": "Écoute…", + "cancel": "Annuler", + "finish": "Terminer", + "oneMinuteLeft": "Plus qu’une minute.", + "sendsWhenLanded": "Envoi dès que le texte arrive", + "entersWhenLanded": "Entrée dès que le texte arrive" + }, + "DictationPillFailure": { + "discard": "Supprimer l'enregistrement", + "modelFailed": "Modèle non chargé.", + "transcribeFailed": "Échec. Enregistrement conservé.", + "openSettings": "Paramètres", + "retry": "Réessayer" } }, "dashboard": { diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json index 0b518832052..a161f789437 100644 --- a/src/renderer/src/i18n/locales/ja.json +++ b/src/renderer/src/i18n/locales/ja.json @@ -16298,7 +16298,8 @@ "micFallback": "選択したマイクが使用できません。システムのデフォルトを使用します。", "micDisconnected": "マイクが接続されていません。ディクテーションが停止しました。", "cloudLimitReached": "クラウドの10分の上限に達したため、ディクテーションが停止しました。", - "stoppedAfterSilence": "1分間音声がなかったため停止しました。" + "stoppedAfterSilence": "1分間音声がなかったため停止しました。", + "retryUnmatched": "再試行で入力済みの語句を特定できなかったため、すべて挿入しました。" }, "dictation-transcript-delivery": { "copiedAfterFailedInsert": "音声入力を挿入できなかったため、クリップボードにコピーしました。", @@ -16306,7 +16307,21 @@ "lost": "音声入力を挿入もコピーもできませんでした。" }, "DictationIndicator": { - "4977162383": "音量が大きすぎます" + "4977162383": "音量が大きすぎます", + "finishing": "仕上げ中…", + "listening": "聞き取り中…", + "cancel": "キャンセル", + "finish": "完了", + "oneMinuteLeft": "残り1分です。", + "sendsWhenLanded": "テキストの入力後に送信します", + "entersWhenLanded": "テキストの入力後に Enter を押します" + }, + "DictationPillFailure": { + "discard": "録音を破棄", + "modelFailed": "音声モデルを読み込めません。", + "transcribeFailed": "文字起こしに失敗。録音は保持しました。", + "openSettings": "設定を開く", + "retry": "再試行" } }, "dashboard": { diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json index 0180fd9d8bd..75e6a229e7a 100644 --- a/src/renderer/src/i18n/locales/ko.json +++ b/src/renderer/src/i18n/locales/ko.json @@ -16298,7 +16298,8 @@ "micFallback": "선택한 마이크를 사용할 수 없습니다. 시스템 기본값을 사용합니다.", "micDisconnected": "마이크 연결이 끊어졌습니다. 받아쓰기가 중지되었습니다.", "cloudLimitReached": "클라우드 10분 제한에 도달해 받아쓰기가 중지되었습니다.", - "stoppedAfterSilence": "1분 동안 말소리가 없어 중지했습니다." + "stoppedAfterSilence": "1분 동안 말소리가 없어 중지했습니다.", + "retryUnmatched": "다시 시도할 때 이미 입력된 단어를 찾지 못해 전부 삽입했습니다." }, "dictation-transcript-delivery": { "copiedAfterFailedInsert": "받아쓰기를 삽입할 수 없어 클립보드에 복사했습니다.", @@ -16306,7 +16307,21 @@ "lost": "받아쓰기를 삽입하거나 복사할 수 없습니다." }, "DictationIndicator": { - "4977162383": "음량이 너무 큽니다" + "4977162383": "음량이 너무 큽니다", + "finishing": "마무리 중…", + "listening": "듣는 중…", + "cancel": "취소", + "finish": "완료", + "oneMinuteLeft": "1분 남았습니다.", + "sendsWhenLanded": "텍스트가 입력되면 전송합니다", + "entersWhenLanded": "텍스트가 입력되면 Enter를 누릅니다" + }, + "DictationPillFailure": { + "discard": "녹음 삭제", + "modelFailed": "음성 모델을 불러오지 못했습니다.", + "transcribeFailed": "받아쓰기에 실패했습니다. 녹음은 보관됩니다.", + "openSettings": "설정 열기", + "retry": "다시 시도" } }, "dashboard": { diff --git a/src/renderer/src/i18n/locales/pt.json b/src/renderer/src/i18n/locales/pt.json index 720b00f8403..fe78ad3d3de 100644 --- a/src/renderer/src/i18n/locales/pt.json +++ b/src/renderer/src/i18n/locales/pt.json @@ -19259,7 +19259,8 @@ "micFallback": "O microfone selecionado não está disponível. Usando o padrão do sistema.", "micDisconnected": "Microfone desconectado. O ditado foi interrompido.", "cloudLimitReached": "O ditado foi interrompido no limite de 10 minutos da nuvem.", - "stoppedAfterSilence": "Parou após um minuto de silêncio" + "stoppedAfterSilence": "Parou após um minuto de silêncio", + "retryUnmatched": "Ao tentar de novo, não foi possível saber quais palavras já estavam digitadas, então todas foram inseridas." }, "dictation-transcript-delivery": { "copiedAfterFailedInsert": "Não foi possível inserir o ditado, então ele foi copiado para a área de transferência.", @@ -19267,7 +19268,21 @@ "lost": "Não foi possível inserir nem copiar o ditado." }, "DictationIndicator": { - "4977162383": "Muito alto" + "4977162383": "Muito alto", + "finishing": "Finalizando…", + "listening": "Ouvindo…", + "cancel": "Cancelar", + "finish": "Concluir", + "oneMinuteLeft": "Falta um minuto.", + "sendsWhenLanded": "Envia quando o texto chegar", + "entersWhenLanded": "Pressiona Enter quando o texto chegar" + }, + "DictationPillFailure": { + "discard": "Descartar gravação", + "modelFailed": "Modelo não carregou.", + "transcribeFailed": "Não transcrito. Gravação mantida.", + "openSettings": "Configurações", + "retry": "Repetir" } }, "link": { diff --git a/src/renderer/src/i18n/locales/ru.json b/src/renderer/src/i18n/locales/ru.json index 774868e30fb..cc61948d8e0 100644 --- a/src/renderer/src/i18n/locales/ru.json +++ b/src/renderer/src/i18n/locales/ru.json @@ -17470,7 +17470,8 @@ "micFallback": "Выбранный микрофон недоступен. Используется системный микрофон по умолчанию.", "micDisconnected": "Микрофон отключён. Диктовка остановлена.", "cloudLimitReached": "Диктовка остановлена: достигнут 10-минутный облачный лимит.", - "stoppedAfterSilence": "Остановлено после минуты тишины" + "stoppedAfterSilence": "Остановлено после минуты тишины", + "retryUnmatched": "При повторе не удалось понять, какие слова уже введены, поэтому вставлено всё." }, "dictation-transcript-delivery": { "copiedAfterFailedInsert": "Не удалось вставить диктовку, поэтому она скопирована в буфер обмена.", @@ -17478,7 +17479,21 @@ "lost": "Не удалось ни вставить, ни скопировать диктовку." }, "DictationIndicator": { - "4977162383": "Слишком громко" + "4977162383": "Слишком громко", + "finishing": "Завершение…", + "listening": "Слушаю…", + "cancel": "Отмена", + "finish": "Готово", + "oneMinuteLeft": "Осталась минута.", + "sendsWhenLanded": "Отправится, когда текст появится", + "entersWhenLanded": "Нажмёт Enter, когда текст появится" + }, + "DictationPillFailure": { + "discard": "Удалить запись", + "modelFailed": "Модель не загружена.", + "transcribeFailed": "Не удалось распознать. Запись сохранена.", + "openSettings": "Настройки", + "retry": "Повторить" } }, "dashboard": { diff --git a/src/renderer/src/i18n/locales/tr.json b/src/renderer/src/i18n/locales/tr.json index 47a5314415e..b1d069b3554 100644 --- a/src/renderer/src/i18n/locales/tr.json +++ b/src/renderer/src/i18n/locales/tr.json @@ -16958,7 +16958,8 @@ "micFallback": "Seçili mikrofon kullanılamıyor. Sistem varsayılanı kullanılıyor.", "micDisconnected": "Mikrofon bağlantısı kesildi. Dikte durduruldu.", "cloudLimitReached": "Dikte, 10 dakikalık bulut sınırında durduruldu.", - "stoppedAfterSilence": "Bir dakika sessizlikten sonra durduruldu" + "stoppedAfterSilence": "Bir dakika sessizlikten sonra durduruldu", + "retryUnmatched": "Yeniden deneme hangi kelimelerin zaten yazıldığını anlayamadı, bu yüzden hepsini ekledi." }, "dictation-transcript-delivery": { "copiedAfterFailedInsert": "Dikte eklenemedi, bu yüzden panoya kopyalandı.", @@ -16966,7 +16967,21 @@ "lost": "Dikte eklenemedi ve kopyalanamadı." }, "DictationIndicator": { - "4977162383": "Çok yüksek sesli" + "4977162383": "Çok yüksek sesli", + "finishing": "Tamamlanıyor…", + "listening": "Dinleniyor…", + "cancel": "İptal", + "finish": "Bitir", + "oneMinuteLeft": "Bir dakika kaldı.", + "sendsWhenLanded": "Metin gelince gönderilecek", + "entersWhenLanded": "Metin gelince Enter'a basılacak" + }, + "DictationPillFailure": { + "discard": "Kaydı sil", + "modelFailed": "Model yüklenemedi.", + "transcribeFailed": "Yazıya dökülemedi. Kayıt saklandı.", + "openSettings": "Ayarlar", + "retry": "Yeniden dene" } }, "dashboard": { diff --git a/src/renderer/src/i18n/locales/zh-Hant.json b/src/renderer/src/i18n/locales/zh-Hant.json index 0d6da58cb87..abaa5ff49a0 100644 --- a/src/renderer/src/i18n/locales/zh-Hant.json +++ b/src/renderer/src/i18n/locales/zh-Hant.json @@ -16747,7 +16747,8 @@ "micFallback": "所選麥克風不可用。使用系統預設值。", "micDisconnected": "麥克風已中斷連線。聽寫已停止。", "cloudLimitReached": "已達 10 分鐘雲端上限。聽寫已停止。", - "stoppedAfterSilence": "靜音一分鐘後已停止" + "stoppedAfterSilence": "靜音一分鐘後已停止", + "retryUnmatched": "重試時無法判斷哪些字詞已輸入,因此已全部插入。" }, "dictation-transcript-delivery": { "copiedAfterFailedInsert": "無法插入聽寫內容,已複製到剪貼簿。", @@ -16755,7 +16756,21 @@ "lost": "無法插入或複製聽寫內容。" }, "DictationIndicator": { - "4977162383": "聲音太大" + "4977162383": "聲音太大", + "finishing": "正在完成…", + "listening": "正在聆聽…", + "cancel": "取消", + "finish": "完成", + "oneMinuteLeft": "剩下 1 分鐘。", + "sendsWhenLanded": "文字送達後自動傳送", + "entersWhenLanded": "文字送達後自動按 Enter" + }, + "DictationPillFailure": { + "discard": "捨棄錄音", + "modelFailed": "無法載入語音模型。", + "transcribeFailed": "無法轉錄。已保留錄音。", + "openSettings": "開啟設定", + "retry": "重試" } }, "dashboard": { diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json index 602f52d1124..4f7595734eb 100644 --- a/src/renderer/src/i18n/locales/zh.json +++ b/src/renderer/src/i18n/locales/zh.json @@ -16298,7 +16298,8 @@ "micFallback": "所选麦克风不可用。使用系统默认值。", "micDisconnected": "麦克风已断开。听写停止了。", "cloudLimitReached": "已达 10 分钟云端上限。听写已停止。", - "stoppedAfterSilence": "静音一分钟后已停止" + "stoppedAfterSilence": "静音一分钟后已停止", + "retryUnmatched": "重试时无法判断哪些字词已输入,因此已全部插入。" }, "dictation-transcript-delivery": { "copiedAfterFailedInsert": "无法插入听写内容,已复制到剪贴板。", @@ -16306,7 +16307,21 @@ "lost": "无法插入或复制听写内容。" }, "DictationIndicator": { - "4977162383": "音量过大" + "4977162383": "音量过大", + "finishing": "正在完成…", + "listening": "正在聆听…", + "cancel": "取消", + "finish": "完成", + "oneMinuteLeft": "还剩 1 分钟。", + "sendsWhenLanded": "文字送达后自动发送", + "entersWhenLanded": "文字送达后自动按 Enter" + }, + "DictationPillFailure": { + "discard": "舍弃录音", + "modelFailed": "无法加载语音模型。", + "transcribeFailed": "无法转录。已保留录音。", + "openSettings": "打开设置", + "retry": "重试" } }, "dashboard": { From 19afa64ee74673b4e994cb7834487ccbdf713f7d Mon Sep 17 00:00:00 2001 From: OrcaWin Date: Mon, 9 Nov 2026 02:11:48 -0800 Subject: [PATCH 05/90] test: remove low-value provider and renderer assertions (#40279) Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com> --- config/reliability-gates.jsonc | 3 +- .../claude/claude-informational-row.test.ts | 79 ------- .../claude/claude-model-catalog-probe.test.ts | 1 - ...ude-structured-execution-recording.test.ts | 2 +- .../claude-structured-applied-options.test.ts | 39 ---- .../claude-structured-child-env.test.ts | 16 -- .../catalog/codex-model-catalog-probe.test.ts | 7 +- .../codex/codex-fetcher-auth-errors.test.ts | 167 -------------- .../codex-fetcher-process-contract.test.ts | 206 ------------------ ...codex-fetcher-rpc-exit-diagnostics.test.ts | 23 -- .../claude-plugin-skill-sources-wsl.test.ts | 10 - .../skill-package-creation.test.ts | 29 +-- .../sharing/skill-share-preparation.test.ts | 19 -- .../git-graph/git-graph-rendering.test.tsx | 22 -- .../NativeChatToolRun.appearance.test.tsx | 66 ------ .../developer-permissions-search.test.ts | 57 ----- .../shortcuts/keybinding-title-copy.test.ts | 49 ----- .../TerminalInteractionSection.test.tsx | 49 ----- .../browser-page-palette-activation.test.ts | 76 ------- ...source-control-agent-launch-picker.test.ts | 29 --- 20 files changed, 5 insertions(+), 944 deletions(-) delete mode 100644 src/main/claude/claude-informational-row.test.ts delete mode 100644 src/main/rate-limits/providers/codex/codex-fetcher-auth-errors.test.ts delete mode 100644 src/main/rate-limits/providers/codex/codex-fetcher-process-contract.test.ts delete mode 100644 src/renderer/src/components/settings/developer-permissions/developer-permissions-search.test.ts delete mode 100644 src/renderer/src/components/settings/shortcuts/keybinding-title-copy.test.ts delete mode 100644 src/renderer/src/components/settings/terminal/TerminalInteractionSection.test.tsx diff --git a/config/reliability-gates.jsonc b/config/reliability-gates.jsonc index 21f82faaae7..00b3edcbd75 100644 --- a/config/reliability-gates.jsonc +++ b/config/reliability-gates.jsonc @@ -2379,7 +2379,7 @@ "providers": ["local", "ssh", "remote-runtime"], "coveredPlatforms": ["macos"], "coveredProviders": [], - "coverageNotes": "Audit2697 browser source review (metadata followup2702): Reduce src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts by four authored/expanded cases without replacement. The remaining three cases preserve only their existing same-ID execution-host separation, absent stamped-owner refusal and ambiguous legacy-bucket refusal scope. Intentionally lose duplicate backing-tab-ID suppression, multiple unified-browser claims of one workspace, foreign-worktree unified-tab rejection, and the 1000-workspace output/internal getter-read budget alarm. These are real removed alarms; the retained host cases are not equivalent replacements. Current test-value policy rejects internal getter/read budgets; no replacement performance or measured-cost claim is made. Keep existing nonempty selectors and the retained same-ID browser assertionRef. No fresh gate execution or reduced-source validation is supplied; dated receipts, results, commands and historical coverage accounts remain within their original source scope. No live browser activation, physical provider, mixed-version execution, mobile, native UI, platform hardware, soak or timing result is added. Prior coverage account (preserved verbatim): Audit2266 reduces cmd-j-host-qualified-candidate-ownership.test.ts to the scoped open-tab hidden same-ID legacy ambiguity refusal. Separate browser/simulator paired-runtime alias and current-row projections, generic workspace host projection and hostless explicit-owner refusal examples are removed without equivalent replacement. No fresh gate execution, browser activation, physical host, simulator or remote delivery evidence is claimed. Historical dated receipts and budgets remain raw-byte exact. Prior coverage account: Audit1899 replays sealed Audit1895: workspace-session-schema.test.ts keeps only cross-workspace truncated-tab salvage and legacy browser-history cap normalization. Four current commands and testFiles retain that reduced source; no current assertionRef or active receipt selects it. SSH file-owner, isolated browser partition, launch/title/quick-command fields, recency, structured-chat/view-mode and remote browser identity hydration alarms are intentionally lost. Existing retired receipt strings and unrelated active receipts remain verbatim. No equivalent replacement, new Cmd-J gate execution, native simulator or remote/browser restore proof is claimed. Historical coverage account before Audit1899: Audit1494 removes use-open-tab-search.test.ts. Supplied host/worktree/title/ranking projections, simple subscription updates and result-array identity alarms are retired. No actual activation or navigation occurred in that suite. No equivalent replacement coverage or fresh Cmd-J gate validation is claimed. Historical receipts remain scoped to their original selectors. Audit1433 narrows worktree-checks-review-index.test.ts to same-ID local/SSH object-key review isolation. Local provider/cache lookup, GitLab preference, suppression/legacy fallback, explicit-PR authority, physical-versus-runtime review isolation, and branchless-workspace alarms are intentionally removed. No equivalent replacement coverage is claimed. Historical receipts and commands remain unchanged and do not certify the reduced source. Historical coverage account: Audit1396 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audit1308 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Deterministic candidate-builder contracts inject local and paired-runtime worktrees with the same bare id into the real aggregated tab buckets, including folder workspaces and a paired runtime transporting an SSH-owned worktree. A mirror contract preserves distinct same-id runtime tabs. A paired Electron journey verifies both visible browser rows and both visible simulator rows, then requires each selection to render its owning active tab and update backing host-qualified state. The test-value audit narrowed simulator-palette-search.test.ts to the recency tie, same-id host isolation, ambiguous legacy host rejection and oversized-input getter tripwire. Supplied timestamp, empty-query context ordering, host projection, alias/range, metadata matching, active-tab score, over-token/whitespace and malformed display-name fallback examples were removed. Their separate alarms are lost; retained candidate and activation contracts do not establish equivalent coverage. Historical run commands and results remain historical. The audit also removed the standalone workspace-tab-palette-search suite: supplied row, title, metadata, alias, range, ranking and ownership examples no longer provide their separate alarms. Other retained contracts are not replacement coverage. The mirror-identity fixture now retains same-id sibling-runtime isolation and the repeated-frame subscriber tripwire only. Supplied field, owner, alias and mapping examples are removed; their separate alarms are lost. The retained sibling-runtime case is not equivalent coverage for them. The test-value audit removed tabs-open-close-lifecycle host-stamping examples and ordinary tab/group operations from tabs-pane-layout-operations. Local-null, explicit-runtime and SSH-without-active-host stamp assertions are lost; retained mobile/MRU and subscriber/atomic split cases do not replace them. Candidate and live Cmd-J evidence retains its own scope. Historical commands, outcomes and narratives remain historical. Audit1308: src/renderer/src/lib/browser-palette-search.test.ts removed. Browser-palette token and pasted-query size-guard work alarms disappear. No equivalent replacement coverage is claimed. Audit1386: src/renderer/src/lib/open-mobile-emulator-tab.test.ts reduced. Duplicate attach count and null-tab creation retry/guard reset standalone alarms removed; no simulator device used. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1396: src/renderer/src/lib/simulator-palette-search.test.ts reduced. Lose simulator-specific lastFocusedAt tie-order alarm; identity/routing and pre-scan size fence remain. No native simulator or real remote launch claim. No equivalent replacement coverage is claimed. Audit1402: src/renderer/src/runtime/web-session-tabs-sync-mirror-identity.test.ts reduced. Loses repeated no-op frame store-notification budget; independent cross-runtime resource preservation remains. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result.", + "coverageNotes": "Audit2729 reduces browser-page-palette-activation.test.ts: separate SSH/paired-runtime alias forwarding, distinct multigroup views accepted, and remote-folder activation forwarding alarms are removed. Collision refusal, preactivation address-bar focus capture, owning-group activation state and missing-tab refusal remain byte-identical. No equivalent replacement, fresh gate execution or actual host/browser delivery evidence is claimed. Prior coverage account: Audit2697 browser source review (metadata followup2702): Reduce src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts by four authored/expanded cases without replacement. The remaining three cases preserve only their existing same-ID execution-host separation, absent stamped-owner refusal and ambiguous legacy-bucket refusal scope. Intentionally lose duplicate backing-tab-ID suppression, multiple unified-browser claims of one workspace, foreign-worktree unified-tab rejection, and the 1000-workspace output/internal getter-read budget alarm. These are real removed alarms; the retained host cases are not equivalent replacements. Current test-value policy rejects internal getter/read budgets; no replacement performance or measured-cost claim is made. Keep existing nonempty selectors and the retained same-ID browser assertionRef. No fresh gate execution or reduced-source validation is supplied; dated receipts, results, commands and historical coverage accounts remain within their original source scope. No live browser activation, physical provider, mixed-version execution, mobile, native UI, platform hardware, soak or timing result is added. Prior coverage account (preserved verbatim): Audit2266 reduces cmd-j-host-qualified-candidate-ownership.test.ts to the scoped open-tab hidden same-ID legacy ambiguity refusal. Separate browser/simulator paired-runtime alias and current-row projections, generic workspace host projection and hostless explicit-owner refusal examples are removed without equivalent replacement. No fresh gate execution, browser activation, physical host, simulator or remote delivery evidence is claimed. Historical dated receipts and budgets remain raw-byte exact. Prior coverage account: Audit1899 replays sealed Audit1895: workspace-session-schema.test.ts keeps only cross-workspace truncated-tab salvage and legacy browser-history cap normalization. Four current commands and testFiles retain that reduced source; no current assertionRef or active receipt selects it. SSH file-owner, isolated browser partition, launch/title/quick-command fields, recency, structured-chat/view-mode and remote browser identity hydration alarms are intentionally lost. Existing retired receipt strings and unrelated active receipts remain verbatim. No equivalent replacement, new Cmd-J gate execution, native simulator or remote/browser restore proof is claimed. Historical coverage account before Audit1899: Audit1494 removes use-open-tab-search.test.ts. Supplied host/worktree/title/ranking projections, simple subscription updates and result-array identity alarms are retired. No actual activation or navigation occurred in that suite. No equivalent replacement coverage or fresh Cmd-J gate validation is claimed. Historical receipts remain scoped to their original selectors. Audit1433 narrows worktree-checks-review-index.test.ts to same-ID local/SSH object-key review isolation. Local provider/cache lookup, GitLab preference, suppression/legacy fallback, explicit-PR authority, physical-versus-runtime review isolation, and branchless-workspace alarms are intentionally removed. No equivalent replacement coverage is claimed. Historical receipts and commands remain unchanged and do not certify the reduced source. Historical coverage account: Audit1396 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audit1308 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Deterministic candidate-builder contracts inject local and paired-runtime worktrees with the same bare id into the real aggregated tab buckets, including folder workspaces and a paired runtime transporting an SSH-owned worktree. A mirror contract preserves distinct same-id runtime tabs. A paired Electron journey verifies both visible browser rows and both visible simulator rows, then requires each selection to render its owning active tab and update backing host-qualified state. The test-value audit narrowed simulator-palette-search.test.ts to the recency tie, same-id host isolation, ambiguous legacy host rejection and oversized-input getter tripwire. Supplied timestamp, empty-query context ordering, host projection, alias/range, metadata matching, active-tab score, over-token/whitespace and malformed display-name fallback examples were removed. Their separate alarms are lost; retained candidate and activation contracts do not establish equivalent coverage. Historical run commands and results remain historical. The audit also removed the standalone workspace-tab-palette-search suite: supplied row, title, metadata, alias, range, ranking and ownership examples no longer provide their separate alarms. Other retained contracts are not replacement coverage. The mirror-identity fixture now retains same-id sibling-runtime isolation and the repeated-frame subscriber tripwire only. Supplied field, owner, alias and mapping examples are removed; their separate alarms are lost. The retained sibling-runtime case is not equivalent coverage for them. The test-value audit removed tabs-open-close-lifecycle host-stamping examples and ordinary tab/group operations from tabs-pane-layout-operations. Local-null, explicit-runtime and SSH-without-active-host stamp assertions are lost; retained mobile/MRU and subscriber/atomic split cases do not replace them. Candidate and live Cmd-J evidence retains its own scope. Historical commands, outcomes and narratives remain historical. Audit1308: src/renderer/src/lib/browser-palette-search.test.ts removed. Browser-palette token and pasted-query size-guard work alarms disappear. No equivalent replacement coverage is claimed. Audit1386: src/renderer/src/lib/open-mobile-emulator-tab.test.ts reduced. Duplicate attach count and null-tab creation retry/guard reset standalone alarms removed; no simulator device used. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1396: src/renderer/src/lib/simulator-palette-search.test.ts reduced. Lose simulator-specific lastFocusedAt tie-order alarm; identity/routing and pre-scan size fence remain. No native simulator or real remote launch claim. No equivalent replacement coverage is claimed. Audit1402: src/renderer/src/runtime/web-session-tabs-sync-mirror-identity.test.ts reduced. Loses repeated no-op frame store-notification budget; independent cross-runtime resource preservation remains. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result.", "motivatingLinks": [ "https://linear.app/stably/issue/STA-4965", "https://github.com/stablyai/orca/pull/15371" @@ -2571,6 +2571,7 @@ "Add a live paired-runtime-over-SSH journey when the E2E harness can provision that combined topology." ], "knownGaps": [ + "Audit2729 retires browser palette standalone paired-runtime SSH alias forwarding, multigroup-view acceptance and remote-folder forwarding alarms without equivalent replacement. The retained partial suite has no fresh execution result; existing exact receipts and budgets stay scoped to their unchanged selectors.", "Audit2697/2702 intentional palette coverage losses: 'omits a browser row whose backing tab id is duplicated': Remove malformed duplicate unified-tab-ID fixture and its empty result. Real duplicate-ID suppression alarm is lost; this narrow private inventory has no palette selection or activation flow. 'omits a workspace claimed by more than one unified browser tab': Remove two unified browser claims of one workspace. Real first-indexed-foreign-versus-later-owned collision rejection alarm is lost; same-host and ambiguous legacy cases do not replace it. 'omits a workspace whose single unified browser tab is not owned by this worktree': Remove one unique workspace backed by foreign-worktree unified tab fixture. Real foreign-tab/worktree rejection alarm is lost; stamped host tests are not equivalent to foreign worktree mismatch. 'indexes workspace tabs when building a large browser palette': Remove internal getter read budget over1000workspaces: current main policy explicitly rejects getter/Proxy/read counts and says performance changes get correctness tests only. Loses direct quadratic-indexing cost alarm and positive1000workspace output check; no equivalent replacement claimed. The same source review also deletes browser-link-profile-isolation.test.ts (two authored/five expanded) and removes two HTTP-routing declarations (three expanded). Exact tracked-tree filename/case search finds no active gate selector/assertionRef for those navigation sources; their local profile isolation/reuse, deferred minted-profile privacy/lifetime, foreground view/group projection and contextless must-create-page alarms still disappear without replacement. This palette gate is not credited with coverage of those unrelated navigation cases. Historical shard timings are retained unchanged. Audit2697 browser source review (metadata followup2702): Reduce src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts by four authored/expanded cases without replacement. The remaining three cases preserve only their existing same-ID execution-host separation, absent stamped-owner refusal and ambiguous legacy-bucket refusal scope. Intentionally lose duplicate backing-tab-ID suppression, multiple unified-browser claims of one workspace, foreign-worktree unified-tab rejection, and the 1000-workspace output/internal getter-read budget alarm. These are real removed alarms; the retained host cases are not equivalent replacements. Current test-value policy rejects internal getter/read budgets; no replacement performance or measured-cost claim is made. Keep existing nonempty selectors and the retained same-ID browser assertionRef. No fresh gate execution or reduced-source validation is supplied; dated receipts, results, commands and historical coverage accounts remain within their original source scope. No live browser activation, physical provider, mixed-version execution, mobile, native UI, platform hardware, soak or timing result is added.", "Live Linux, Windows, and paired-runtime-over-SSH journeys are not collected; the SSH/runtime dual-owner topology is deterministic renderer coverage.", "The paired Electron simulator path seeds renderer state because remote web clients cannot launch a native emulator.", diff --git a/src/main/claude/claude-informational-row.test.ts b/src/main/claude/claude-informational-row.test.ts deleted file mode 100644 index 8bd8ff68d62..00000000000 --- a/src/main/claude/claude-informational-row.test.ts +++ /dev/null @@ -1,79 +0,0 @@ -import { mkdtemp, rm } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import { openAgentSessionJournal } from '../native-chat/agent-session-journal/journal-store-factory' -import { createDeferredStructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import { createClaudeJournalTranslator } from './structured/journal/claude-structured-journal-translation' -import { - closeTestJournalHostDatabases, - openTestJournalHostDatabase -} from '../native-chat/agent-session-journal/store-lifecycle/journal-host-database-test-support' -import { testEventSinkLogging } from '../native-chat/agent-session-wire/host/testing/structured-agent-session-logger-test-support' -import { claudeProviderHandle } from '../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding' - -const IDENTITY: AgentSessionJournalIdentity = { - sessionId: 'session-1', - workspaceId: 'workspace-1', - hostId: 'host-1', - agent: 'claude', - providerHandle: claudeProviderHandle('provider-1', 'leaf-1') -} - -/** Informational frame shape from CLI 2.1.280. */ -function informational( - level: 'info' | 'notice' | 'suggestion' | 'warning', - content: string -): Record { - return { - type: 'system', - subtype: 'informational', - content, - level, - uuid: `5d3c1f0e-7a2b-4c6d-9e8f-00000000000${level.length}`, - session_id: 'provider-1' - } -} - -let root = '' - -beforeEach(async () => { - root = await mkdtemp(join(tmpdir(), 'orca-claude-informational-')) -}) - -afterEach(async () => { - await closeTestJournalHostDatabases() - await rm(root, { recursive: true, force: true }) -}) - -async function itemsFor(frames: Record[]) { - const journal = await openAgentSessionJournal({ - identity: IDENTITY, - database: openTestJournalHostDatabase(root), - now: () => 1_700_000_000_000, - mintEpoch: () => 'epoch-1' - }) - const deferred = createDeferredStructuredAgentSessionEventSink(testEventSinkLogging()) - deferred.bind({ journal, fence: 1, publish: vi.fn() }) - const translator = createClaudeJournalTranslator({ sink: deferred.sink, fallbackIdPrefix: '1' }) - for (const frame of frames) { - translator.handle({ type: 'message', sessionId: 'orca-session', message: frame }) - await deferred.drained() - } - return journal.snapshot().items.map((item) => item.body) -} - -describe('a Claude informational frame', () => { - it.each(['info', 'notice', 'suggestion'] as const)('writes no row at level %s', async (level) => { - expect(await itemsFor([informational(level, `A ${level} note`)])).toEqual([]) - }) - - it('writes its own words as one warning row at level warning', async () => { - const content = - 'UserPromptSubmit operation blocked by hook: secrets are not allowed\n\nOriginal prompt: deploy it' - const items = await itemsFor([informational('warning', content)]) - - expect(items).toEqual([{ kind: 'status', tone: 'warning', text: content }]) - }) -}) diff --git a/src/main/claude/claude-model-catalog-probe.test.ts b/src/main/claude/claude-model-catalog-probe.test.ts index 8cb9dac7e30..e807112bf26 100644 --- a/src/main/claude/claude-model-catalog-probe.test.ts +++ b/src/main/claude/claude-model-catalog-probe.test.ts @@ -55,7 +55,6 @@ describe('claude model catalog probe', () => { it.each([ [[], [], ['/orca-probe', '/orca-probe'], 'user,project,local'], [['node_modules/claude/cli.js'], [], ['/chat-a', '/chat-b'], 'user'], - [['--env-file=work env', '--', 'claude'], [], ['/chat-a', '/chat-b'], 'user'], [[], ['--settings', 'settings.json'], ['/chat-a', '/chat-b'], 'user'] ])( 'lists prefix %j with arguments %j from %j, reading %s settings', diff --git a/src/main/claude/structured/claude-structured-execution-recording.test.ts b/src/main/claude/structured/claude-structured-execution-recording.test.ts index bc2b1f50b73..b20f110b9e6 100644 --- a/src/main/claude/structured/claude-structured-execution-recording.test.ts +++ b/src/main/claude/structured/claude-structured-execution-recording.test.ts @@ -14,7 +14,7 @@ import { HOST_TEST_SESSION as SESSION } from '../../native-chat/agent-session-wi const claudeTurnEnds = (connection: Parameters[0]) => claudeFrame(connection, { type: 'system', subtype: 'session_state_changed', state: 'idle' }) -it.each(['low', 'high', undefined])( +it.each(['high', undefined])( 'admits accepted high independently of resolved effort (effective %s)', async (effective) => { const models = [ diff --git a/src/main/claude/structured/launch/claude-structured-applied-options.test.ts b/src/main/claude/structured/launch/claude-structured-applied-options.test.ts index ac112bb968c..07b4c3e57a3 100644 --- a/src/main/claude/structured/launch/claude-structured-applied-options.test.ts +++ b/src/main/claude/structured/launch/claude-structured-applied-options.test.ts @@ -46,16 +46,6 @@ const SETTINGS = { effective: { model: 'haiku' }, sources: [{ source: 'userSettings', settings: { model: 'haiku' } }], applied: { model: 'claude-haiku-4-5-20251001', effort: null, advisor: null, ultracode: false } - }, - envSonnet: { - effective: {}, - sources: [], - applied: { model: 'claude-sonnet-5', effort: 'high', advisor: null, ultracode: false } - }, - settingsHaikuEnvSonnet: { - effective: { model: 'haiku' }, - sources: [{ source: 'userSettings', settings: { model: 'haiku' } }], - applied: { model: 'claude-sonnet-5', effort: 'high', advisor: null, ultracode: false } } } @@ -69,29 +59,7 @@ function startedWithoutATurn(settings: unknown) { }) } -async function readCurrent(settings: unknown) { - const adapter = await acquired(startedWithoutATurn(settings)) - return (await adapter.readOptions({ sessionId: 'session-1', fence: 7 })).current -} - describe('Claude model before the first turn', () => { - it.each([ - ['nothing overrides the default', SETTINGS.noOverride, 'claude-opus-5-5[1m]', 'medium'], - ['settings name a model', SETTINGS.settingsHaiku, 'claude-haiku-4-5-20251001', undefined], - ['the env names a model', SETTINGS.envSonnet, 'claude-sonnet-5', 'high'], - ['the env overrides the settings', SETTINGS.settingsHaikuEnvSonnet, 'claude-sonnet-5', 'high'] - ])( - 'names what Claude will apply when %s, unconfirmed', - async (_case, settings, model, effort) => { - const current = await readCurrent(settings) - - expect(current.model).toBe(model) - expect(current.effort).toBe(effort) - expect(current.confirmed ?? []).not.toContain('model') - expect(current.confirmed ?? []).not.toContain('effort') - } - ) - it('uses native applied effort despite settings High, before and after a reply', async () => { // Claude Code 2.1.318: no flag applies Medium; --effort low applies Low. const claude = startedWithoutATurn({ @@ -156,13 +124,6 @@ describe('Claude model before the first turn', () => { await adapter.closeAll() }) - it('marks an unknown applied model as defaulted for the host to resolve', async () => { - const current = await readCurrent({ effective: {}, sources: [] }) - - expect(current.defaulted).toEqual(['model']) - expect(current.effort).toBeUndefined() - }) - it('lets the first turn confirm or correct it', async () => { const claude = startedWithoutATurn(SETTINGS.settingsHaiku) const adapter = await acquired(claude) diff --git a/src/main/claude/structured/launch/claude-structured-child-env.test.ts b/src/main/claude/structured/launch/claude-structured-child-env.test.ts index aff78f757a7..18c73fc32e0 100644 --- a/src/main/claude/structured/launch/claude-structured-child-env.test.ts +++ b/src/main/claude/structured/launch/claude-structured-child-env.test.ts @@ -3,7 +3,6 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, expect, it, vi } from 'vitest' import { - claudeChildEnv, resolveClaudeChildEnvSources, withOrcaClaudeEntrypoint } from './claude-structured-child-env' @@ -32,21 +31,6 @@ it('resolves a custom Claude command against the login shell PATH', async () => } }) -it('names Orca as the Claude client unless the launch environment sets one', () => { - const sources = { - command: 'claude', - prefixArgs: [], - overlay: undefined, - inheritedEnv: { CLAUDE_CODE_ENTRYPOINT: 'cli' } - } - const options = { runtimeOnPath: false } - expect(claudeChildEnv(sources, undefined, options).CLAUDE_CODE_ENTRYPOINT).toBe('orca') - const overlay = { CLAUDE_CODE_ENTRYPOINT: 'custom' } - expect(claudeChildEnv({ ...sources, overlay }, undefined, options).CLAUDE_CODE_ENTRYPOINT).toBe( - 'custom' - ) -}) - it('keeps a differently cased Windows launch value over the Orca default', () => { const inherited = { Claude_Code_Entrypoint: 'cli', PATH: 'C:\\bin' } expect( diff --git a/src/main/codex/structured/catalog/codex-model-catalog-probe.test.ts b/src/main/codex/structured/catalog/codex-model-catalog-probe.test.ts index d3fb98dccf4..47779af453c 100644 --- a/src/main/codex/structured/catalog/codex-model-catalog-probe.test.ts +++ b/src/main/codex/structured/catalog/codex-model-catalog-probe.test.ts @@ -15,12 +15,7 @@ const MODEL_ROW = { } describe('codex model catalog probe', () => { - it.each([ - [[]], - [['node_modules/@openai/codex/bin/codex.js']], - [['--env-file=work env', '--', 'codex']], - [['-c', 'model_instructions_file="./prompt.md"']] - ])( + it.each([[[]]])( "lists a command line with arguments %j from Orca's folder for every chat", async (prefixArgs) => { // The chat's repo never picks the list, so no listing runs in a chat's folder. diff --git a/src/main/rate-limits/providers/codex/codex-fetcher-auth-errors.test.ts b/src/main/rate-limits/providers/codex/codex-fetcher-auth-errors.test.ts deleted file mode 100644 index 3561c7344a8..00000000000 --- a/src/main/rate-limits/providers/codex/codex-fetcher-auth-errors.test.ts +++ /dev/null @@ -1,167 +0,0 @@ -import { EventEmitter } from 'node:events' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' - -const { childSpawnMock, resolveCodexCommandMock, ptySpawnMock } = vi.hoisted(() => ({ - childSpawnMock: vi.fn(), - resolveCodexCommandMock: vi.fn(), - ptySpawnMock: vi.fn() -})) - -// Keep child-process assertions in this suite; worker transport is covered separately. -vi.mock( - '../../../worker-thread-child-process/worker-thread-child-process', - () => - import('../../../worker-thread-child-process/worker-thread-child-process-in-process.test-fixtures') -) -vi.mock('node:child_process', () => ({ - spawn: childSpawnMock -})) - -// Mock recovery so its process-table import does not require real execFile. -vi.mock('../../../codex/history/index/codex-state-db-backfill-recovery', () => ({ - startCodexStateDbBackfillRecoveryInBackground: vi.fn() -})) - -vi.mock('../../../codex-cli/command', () => ({ - resolveCodexCommand: resolveCodexCommandMock -})) - -vi.mock('node-pty', () => ({ - spawn: ptySpawnMock -})) - -vi.mock('./codex-auth-presence', () => ({ - probeCodexAuthPresence: vi.fn(() => 'present') -})) - -import { fetchCodexRateLimits } from './codex-fetcher' - -function makeRpcChild() { - const child = new EventEmitter() as EventEmitter & { - stdout: EventEmitter - stderr: EventEmitter - stdin: EventEmitter & { write: ReturnType; end: ReturnType } - kill: ReturnType - exitCode: number | null - } - child.stdout = new EventEmitter() - child.stderr = new EventEmitter() - // Graceful shutdown must wait for EOF/signal to produce exit, as real app-server does. - const exitNow = (): void => { - child.exitCode = 0 - child.emit('exit', 0, null) - } - child.stdin = Object.assign(new EventEmitter(), { write: vi.fn(), end: vi.fn(exitNow) }) - child.exitCode = null - child.kill = vi.fn(() => { - exitNow() - return true - }) - return child -} - -describe('fetchCodexRateLimits auth errors', () => { - beforeEach(() => { - vi.useFakeTimers() - vi.clearAllMocks() - resolveCodexCommandMock.mockReturnValue('codex') - vi.stubGlobal('fetch', vi.fn()) - }) - - afterEach(() => { - vi.unstubAllGlobals() - }) - - it('returns Codex RPC auth refresh errors without masking them behind a fallback', async () => { - const rpcChild = makeRpcChild() - const authError = - 'Your access token could not be refreshed because your refresh token was already used. Please log out and sign in again.' - - childSpawnMock.mockReturnValue(rpcChild) - rpcChild.stdin.write.mockImplementation((line: string) => { - const msg = JSON.parse(line) as { id?: number; method?: string } - if (msg.method === 'initialize') { - setTimeout(() => { - rpcChild.stdout.emit( - 'data', - Buffer.from(`${JSON.stringify({ jsonrpc: '2.0', id: msg.id, result: {} })}\n`) - ) - }, 0) - } - if (msg.method === 'account/rateLimits/read') { - setTimeout(() => { - rpcChild.stdout.emit( - 'data', - Buffer.from( - `${JSON.stringify({ - jsonrpc: '2.0', - id: msg.id, - error: { code: -32000, message: authError } - })}\n` - ) - ) - }, 0) - } - }) - - const resultPromise = fetchCodexRateLimits() - await vi.advanceTimersByTimeAsync(1) - await vi.advanceTimersByTimeAsync(1) - - await expect(resultPromise).resolves.toMatchObject({ - provider: 'codex', - session: null, - weekly: null, - status: 'error', - error: authError - }) - expect(fetch).not.toHaveBeenCalled() - expect(ptySpawnMock).not.toHaveBeenCalled() - }) - - it('returns the app-server chatgpt-auth-required error without falling back', async () => { - const rpcChild = makeRpcChild() - const authError = 'chatgpt authentication required to read rate limits' - - childSpawnMock.mockReturnValue(rpcChild) - rpcChild.stdin.write.mockImplementation((line: string) => { - const msg = JSON.parse(line) as { id?: number; method?: string } - if (msg.method === 'initialize') { - setTimeout(() => { - rpcChild.stdout.emit( - 'data', - Buffer.from(`${JSON.stringify({ jsonrpc: '2.0', id: msg.id, result: {} })}\n`) - ) - }, 0) - } - if (msg.method === 'account/rateLimits/read') { - setTimeout(() => { - rpcChild.stdout.emit( - 'data', - Buffer.from( - `${JSON.stringify({ - jsonrpc: '2.0', - id: msg.id, - error: { code: -32600, message: authError } - })}\n` - ) - ) - }, 0) - } - }) - - const resultPromise = fetchCodexRateLimits() - await vi.advanceTimersByTimeAsync(1) - await vi.advanceTimersByTimeAsync(1) - - await expect(resultPromise).resolves.toMatchObject({ - provider: 'codex', - session: null, - weekly: null, - status: 'error', - error: authError - }) - expect(fetch).not.toHaveBeenCalled() - expect(ptySpawnMock).not.toHaveBeenCalled() - }) -}) diff --git a/src/main/rate-limits/providers/codex/codex-fetcher-process-contract.test.ts b/src/main/rate-limits/providers/codex/codex-fetcher-process-contract.test.ts deleted file mode 100644 index 58dedbdcc78..00000000000 --- a/src/main/rate-limits/providers/codex/codex-fetcher-process-contract.test.ts +++ /dev/null @@ -1,206 +0,0 @@ -import { mkdtempSync, rmSync, writeFileSync } from 'node:fs' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as RunProcess from '@orca/process-host' - -const { ptySpawnMock, resolveCodexCommandMock, stubScript } = vi.hoisted(() => ({ - stubScript: { path: '' }, - ptySpawnMock: vi.fn(), - resolveCodexCommandMock: vi.fn() -})) - -// Run the Node fixture through the real process chokepoint; worker transport has separate coverage. -vi.mock( - '../../../worker-thread-child-process/worker-thread-child-process', - () => - import('../../../worker-thread-child-process/worker-thread-child-process-in-process.test-fixtures') -) -vi.mock('@orca/process-host', async (importOriginal) => { - const actual = await importOriginal() - return { - ...actual, - spawnProcess: (spec: Parameters[0]) => - actual.spawnProcess({ - ...spec, - program: process.execPath, - args: [stubScript.path, ...(spec.args ?? [])] - }) - } -}) - -vi.mock('../../../codex-cli/command', () => ({ - resolveCodexCommand: resolveCodexCommandMock -})) - -vi.mock('node-pty', () => ({ - spawn: ptySpawnMock -})) - -vi.mock('./codex-auth-presence', () => ({ - probeCodexAuthPresence: vi.fn(() => 'present') -})) - -vi.mock('../../../codex/history/index/codex-state-db', () => ({ - isCodexStateDbBackfillPending: vi.fn(() => false) -})) - -vi.mock('../../../codex/history/index/codex-state-db-backfill-recovery', () => ({ - startCodexStateDbBackfillRecoveryInBackground: vi.fn(() => Promise.resolve(null)) -})) - -import { fetchCodexRateLimits } from './codex-fetcher' - -const STUB_CODEX_SOURCE = ` -const expectedArgs = [ - '-c', - 'approval_policy=never', - '-c', - 'features.plugins=false', - '-s', - 'read-only', - '-a', - 'never', - 'app-server' -] -if (JSON.stringify(process.argv.slice(2)) !== JSON.stringify(expectedArgs)) { - process.stderr.write( - "error: invalid value 'untrusted' for '--ask-for-approval '\\n" + - ' [possible values: on-request, never]\\n' - ) - process.exit(2) -} -if (process.env.CODEX_HOME !== process.env.ORCA_EXPECTED_CODEX_HOME) { - process.stderr.write('managed CODEX_HOME was not preserved\\n') - process.exit(3) -} -if (process.env.ORCA_EXPECTED_PROXY_ENV) { - for (const [key, value] of Object.entries(JSON.parse(process.env.ORCA_EXPECTED_PROXY_ENV))) { - if (process.env[key] !== value) { - process.stderr.write('probe proxy environment mismatch: ' + key + '\\n') - process.exit(4) - } - } -} -let buffer = '' -function send(message) { - process.stdout.write(JSON.stringify(message) + '\\n') -} -process.stdin.setEncoding('utf8') -process.stdin.on('data', (chunk) => { - buffer += chunk - let newlineIndex - while ((newlineIndex = buffer.indexOf('\\n')) !== -1) { - const line = buffer.slice(0, newlineIndex).trim() - buffer = buffer.slice(newlineIndex + 1) - if (!line) continue - const message = JSON.parse(line) - if (message.method === 'initialize') { - send({ id: message.id, result: { userAgent: 'codex-contract/0.149.0' } }) - continue - } - if (message.method === 'account/rateLimits/read') { - send({ - id: message.id, - result: { - rateLimits: { - primary: { usedPercent: 17, windowDurationMins: 300 }, - secondary: { usedPercent: 29, windowDurationMins: 10080 } - } - } - }) - } - } -}) -process.stdin.on('end', () => process.exit(0)) -` - -let tempRoot: string -let stubPath: string -let previousExpectedHome: string | undefined - -describe('Codex rate-limit process contract', () => { - beforeEach(() => { - tempRoot = mkdtempSync(join(tmpdir(), 'orca-codex-rate-limit-contract-')) - stubPath = join(tempRoot, 'codex-contract.cjs') - writeFileSync(stubPath, STUB_CODEX_SOURCE) - previousExpectedHome = process.env.ORCA_EXPECTED_CODEX_HOME - process.env.ORCA_EXPECTED_CODEX_HOME = join(tempRoot, 'managed-codex-home') - resolveCodexCommandMock.mockReturnValue('codex') - stubScript.path = stubPath - }) - - afterEach(() => { - vi.unstubAllEnvs() - if (previousExpectedHome === undefined) { - delete process.env.ORCA_EXPECTED_CODEX_HOME - } else { - process.env.ORCA_EXPECTED_CODEX_HOME = previousExpectedHome - } - rmSync(tempRoot, { recursive: true, force: true }) - vi.clearAllMocks() - }) - - it('starts a read-only non-interactive app-server with the managed home', async () => { - await expect( - fetchCodexRateLimits({ - codexHomePath: process.env.ORCA_EXPECTED_CODEX_HOME - }) - ).resolves.toMatchObject({ - provider: 'codex', - session: { usedPercent: 17, windowMinutes: 300 }, - weekly: { usedPercent: 29, windowMinutes: 10080 }, - status: 'ok', - error: null - }) - expect(ptySpawnMock).not.toHaveBeenCalled() - }) - - it.each(['localhost;*.fixture.invalid', ''])( - 'passes configured proxy and bypass %j to the actual probe', - async (bypassRules) => { - const proxy = 'http://proxy.fixture.invalid:8080' - const expected = { - HTTP_PROXY: proxy, - HTTPS_PROXY: proxy, - ALL_PROXY: proxy, - http_proxy: proxy, - https_proxy: proxy, - all_proxy: proxy, - NO_PROXY: bypassRules.replaceAll(';', ','), - no_proxy: bypassRules.replaceAll(';', ',') - } - vi.stubEnv('NO_PROXY', 'inherited.invalid') - vi.stubEnv('no_proxy', 'inherited.invalid') - vi.stubEnv('ORCA_EXPECTED_PROXY_ENV', JSON.stringify(expected)) - - await expect( - fetchCodexRateLimits({ - codexHomePath: process.env.ORCA_EXPECTED_CODEX_HOME, - networkProxySettings: { httpProxyUrl: proxy, httpProxyBypassRules: bypassRules } - }) - ).resolves.toMatchObject({ status: 'ok', session: { usedPercent: 17 } }) - expect(process.env.NO_PROXY).toBe('inherited.invalid') - } - ) - - it.each([undefined, { httpProxyUrl: '' }, { httpProxyUrl: 'file:///invalid-proxy' }])( - 'preserves inherited proxy settings when app settings are unset or invalid: %j', - async (networkProxySettings) => { - const inherited = { - HTTPS_PROXY: 'http://inherited.fixture.invalid:8080', - NO_PROXY: 'fixture.invalid' - } - for (const [key, value] of Object.entries(inherited)) { - vi.stubEnv(key, value) - } - vi.stubEnv('ORCA_EXPECTED_PROXY_ENV', JSON.stringify(inherited)) - await expect( - fetchCodexRateLimits({ - codexHomePath: process.env.ORCA_EXPECTED_CODEX_HOME, - networkProxySettings - }) - ).resolves.toMatchObject({ status: 'ok', session: { usedPercent: 17 } }) - } - ) -}) diff --git a/src/main/rate-limits/providers/codex/codex-fetcher-rpc-exit-diagnostics.test.ts b/src/main/rate-limits/providers/codex/codex-fetcher-rpc-exit-diagnostics.test.ts index 1cadfd71314..9cc25820685 100644 --- a/src/main/rate-limits/providers/codex/codex-fetcher-rpc-exit-diagnostics.test.ts +++ b/src/main/rate-limits/providers/codex/codex-fetcher-rpc-exit-diagnostics.test.ts @@ -86,29 +86,6 @@ describe('Codex RPC exit diagnostics', () => { vi.clearAllMocks() }) - it('names the exit code and what the child reported', async () => { - const result = await runStub( - "error: invalid value 'untrusted' for '--ask-for-approval '\n" + - " [possible values: on-request, never]\n\nFor more information, try '--help'.\n", - 2 - ) - - expect(result.error).toContain('Codex RPC process exited (exit code 2)') - expect(result.error).toContain("invalid value 'untrusted'") - expect(result.error).toContain("try '--help'") - }) - - it('classifies a dead refresh token so the re-auth warning fires', async () => { - const result = await runStub( - '2026-08-20T18:04:11.221Z INFO codex_core::auth: refreshing ChatGPT tokens\n' + - 'ERROR: The ChatGPT access token could not be refreshed; please sign in again.\n', - 1 - ) - - expect(result.error).toBe('Your ChatGPT session could not be refreshed. Please sign in again.') - expect(isCodexAuthError(result.error)).toBe(true) - }) - it('keeps the re-auth phrase that path redaction would swallow', async () => { const result = await runStub( `ERROR: /Users/haris/.codex/auth.json is stale — please sign in again.\n`, diff --git a/src/main/skills/discovery/claude-plugin-skill-sources-wsl.test.ts b/src/main/skills/discovery/claude-plugin-skill-sources-wsl.test.ts index cf3538343a1..74a81dc0efa 100644 --- a/src/main/skills/discovery/claude-plugin-skill-sources-wsl.test.ts +++ b/src/main/skills/discovery/claude-plugin-skill-sources-wsl.test.ts @@ -6,16 +6,6 @@ function record(...fields: string[]): string { } describe('WSL Claude plugin metadata', () => { - it('decodes present files and retains missing files as null', () => { - const settings = JSON.stringify({ enabledPlugins: { 'plugin@market': true } }) - const output = [ - record('F', '0', '1', Buffer.from(settings).toString('base64')), - record('F', '1', '0', '') - ].join('') - - expect(parseWslClaudePluginMetadataOutput(output, 2)).toEqual([settings, null]) - }) - it('rejects malformed metadata responses', () => { expect(() => parseWslClaudePluginMetadataOutput(record('F', '4', '1', ''), 1)).toThrow( 'invalid response' diff --git a/src/main/skills/package-archive/skill-package-creation.test.ts b/src/main/skills/package-archive/skill-package-creation.test.ts index 5e912d3cb17..bac5070ed31 100644 --- a/src/main/skills/package-archive/skill-package-creation.test.ts +++ b/src/main/skills/package-archive/skill-package-creation.test.ts @@ -1,4 +1,4 @@ -import { chmod, lstat, mkdir, mkdtemp, readFile, rm, stat, writeFile } from 'node:fs/promises' +import { chmod, mkdir, mkdtemp, readFile, rm, stat, writeFile } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { gunzipSync, gzipSync } from 'node:zlib' @@ -136,33 +136,6 @@ describe('skill package creation and extraction', () => { ).rejects.toThrow('skill-package-tar-truncated') }) - it('cancels during streamed extraction and removes partial bytes', async () => { - const root = await temporaryDirectory() - const created = await createSkillPackageArchive({ - sourceDirectory: await createSkill(root), - archivePath: join(root, 'package.tar.gz'), - packageId: 'package_1', - versionId: 'version_1' - }) - let checks = 0 - const signal = { - get aborted() { - checks += 1 - return checks >= 3 - } - } as AbortSignal - const destinationDirectory = join(root, 'cancelled-extraction') - - await expect( - extractSkillPackageArchive({ - archivePath: created.archivePath, - destinationDirectory, - signal - }) - ).rejects.toThrow('skill-install-cancelled') - await expect(lstat(destinationDirectory)).rejects.toMatchObject({ code: 'ENOENT' }) - }) - it('rejects content checksum and SKILL identity mismatches', async () => { const root = await temporaryDirectory() const created = await createSkillPackageArchive({ diff --git a/src/main/skills/sharing/skill-share-preparation.test.ts b/src/main/skills/sharing/skill-share-preparation.test.ts index 6bd5f82ae54..552409c769c 100644 --- a/src/main/skills/sharing/skill-share-preparation.test.ts +++ b/src/main/skills/sharing/skill-share-preparation.test.ts @@ -69,23 +69,4 @@ describe('SkillSharePreparationService', () => { expect(prepared.skills?.[0]?.executablePaths).toEqual(['run.sh']) }) - - it('enforces the preparation cap while archives are still being created', async () => { - const { root, source } = await createSource() - const service = new SkillSharePreparationService(join(root, 'preparations'), { - findOwnedPackageId: nameIsFree, - publishVersion: vi.fn(), - createShare: vi.fn() - }) - - const results = await Promise.allSettled( - Array.from({ length: 9 }, () => service.prepare({ sourceDirectory: source })) - ) - - expect(results.filter((result) => result.status === 'fulfilled')).toHaveLength(8) - expect(results.filter((result) => result.status === 'rejected')).toHaveLength(1) - expect(results.find((result) => result.status === 'rejected')).toMatchObject({ - reason: new Error('skill-share-preparation-limit') - }) - }) }) diff --git a/src/renderer/src/components/editor/git-graph/git-graph-rendering.test.tsx b/src/renderer/src/components/editor/git-graph/git-graph-rendering.test.tsx index d04bcf20276..f4b13750029 100644 --- a/src/renderer/src/components/editor/git-graph/git-graph-rendering.test.tsx +++ b/src/renderer/src/components/editor/git-graph/git-graph-rendering.test.tsx @@ -102,28 +102,6 @@ it('keeps the branch checkout strip open after selecting a badge context-menu ac expect(container.querySelector('form')?.textContent).toContain('Check out branch topic?') }) -it('renders converging branch lanes and a detached root without duplicate child keys', async () => { - const errors = vi.spyOn(console, 'error').mockImplementation(() => {}) - getHistory.mockReset().mockResolvedValue({ - ...result, - items: [ - { id: 'a', subject: 'a', message: 'a', parentIds: ['root'] }, - { id: 'b', subject: 'b', message: 'b', parentIds: ['root'] }, - { id: 'c', subject: 'c', message: 'c', parentIds: ['root'] }, - { id: 'detached', subject: 'detached', message: 'detached', parentIds: [] }, - { id: 'root', subject: 'root', message: 'root', parentIds: [] } - ] - }) - await act(async () => - root.render( - - - - ) - ) - expect(errors.mock.calls.filter(([message]) => String(message).includes('same key'))).toEqual([]) -}) - it('recovers silently after each later token expiry and ignores refreshes for other worktrees', async () => { let history: ReturnType function History() { diff --git a/src/renderer/src/components/native-chat/tools/runs/NativeChatToolRun.appearance.test.tsx b/src/renderer/src/components/native-chat/tools/runs/NativeChatToolRun.appearance.test.tsx index 7228e7622d9..8d491592066 100644 --- a/src/renderer/src/components/native-chat/tools/runs/NativeChatToolRun.appearance.test.tsx +++ b/src/renderer/src/components/native-chat/tools/runs/NativeChatToolRun.appearance.test.tsx @@ -18,9 +18,6 @@ import { useNativeChatDisclosures } from '../../messages/disclosure/native-chat-disclosure-store' -import { i18n } from '@/i18n/i18n' -import { TranslationScopeProvider } from '@/i18n/translation-scope-provider' - { const QUESTION = 'What would you like me to do next in this repo?' const ASK_INPUT = { questions: [{ question: QUESTION }] } @@ -288,66 +285,3 @@ import { TranslationScopeProvider } from '@/i18n/translation-scope-provider' }) }) } - -{ - function runHeader(container: HTMLElement): HTMLElement { - const header = container.querySelector('button') - if (!header) { - throw new Error('run header did not render') - } - return header - } - - describe('tool run sentences', () => { - afterEach(async () => { - cleanup() - await i18n.changeLanguage('en') - }) - - it('relabels an already-mounted run and its rows when the UI language changes', async () => { - const blocks: NativeChatBlock[] = [ - { type: 'tool-call', name: 'Bash', input: { command: 'false' }, state: 'failed' }, - { type: 'tool-result', output: 'exit 1', isError: true }, - { - type: 'tool-call', - name: 'Agent', - input: { description: 'explore settings' }, - state: 'completed' - } - ] - const { container } = render( - , - { wrapper: TranslationScopeProvider } - ) - const header = runHeader(container) - expect(header).toHaveTextContent('Ran 1 command and ran 1 agent · 1 failed') - expect(screen.getByText('Subagent')).toBeInTheDocument() - expect(screen.getByText('Background workflow')).toBeInTheDocument() - expect(screen.getByText('Output: /tmp/result.txt')).toBeInTheDocument() - - await act(async () => { - await i18n.changeLanguage('es') - }) - - expect(header).toHaveTextContent('Se ejecutó 1 comando y se ejecutó 1 agente · 1 fallidas') - expect(header).toHaveAccessibleName(/Llamadas a herramientas fallidas: 1/) - expect(screen.getByText('Subagente')).toBeInTheDocument() - expect(screen.getByText('Flujo de trabajo en segundo plano')).toBeInTheDocument() - expect(screen.getByText('Salida: /tmp/result.txt')).toBeInTheDocument() - expect(screen.getByText('bloqueado · con error')).toBeInTheDocument() - }) - }) -} diff --git a/src/renderer/src/components/settings/developer-permissions/developer-permissions-search.test.ts b/src/renderer/src/components/settings/developer-permissions/developer-permissions-search.test.ts deleted file mode 100644 index ffb180ce1dc..00000000000 --- a/src/renderer/src/components/settings/developer-permissions/developer-permissions-search.test.ts +++ /dev/null @@ -1,57 +0,0 @@ -import { afterAll, describe, expect, it } from 'vitest' - -import { i18n } from '@/i18n/i18n' -import { getDeveloperPermissionsPaneSearchEntries } from './developer-permissions-search' -import { matchesSettingsSearch } from '../search/settings-search' - -// Use macOS 26’s actual Local Network translations (SecurityPrivacyExtension LOCAL_NETWORK). -const MACOS_LOCAL_NETWORK_LABEL = { - en: 'local network', - es: 'red local', - ja: 'ローカルネットワーク', - ko: '로컬 네트워크', - zh: '本地网络' -} as const - -function getLanEntry() { - const entry = getDeveloperPermissionsPaneSearchEntries().find((candidate) => - candidate.keywords?.includes('usb') - ) - if (!entry) { - throw new Error('LAN, USB, and Bluetooth search entry is missing') - } - return entry -} - -async function searchInLocale(locale: string, query: string): Promise { - await i18n.changeLanguage(locale) - return matchesSettingsSearch(query, getLanEntry()) -} - -describe('developer permissions LAN search', () => { - afterAll(async () => { - await i18n.changeLanguage('en') - }) - - it.each(Object.entries(MACOS_LOCAL_NETWORK_LABEL))( - 'finds the LAN row from the macOS Local Network wording in %s', - async (locale, label) => { - expect(await searchInLocale(locale, label)).toBe(true) - } - ) - - it('keeps the English LAN aliases findable in every locale', async () => { - for (const locale of Object.keys(MACOS_LOCAL_NETWORK_LABEL)) { - for (const query of ['lan', 'local network', 'local-network']) { - expect(await searchInLocale(locale, query)).toBe(true) - } - } - }) - - it('keeps the localized LAN wording findable', async () => { - expect(await searchInLocale('zh', '局域网')).toBe(true) - expect(await searchInLocale('ja', 'LAN')).toBe(true) - expect(await searchInLocale('ko', 'LAN')).toBe(true) - expect(await searchInLocale('es', 'LAN')).toBe(true) - }) -}) diff --git a/src/renderer/src/components/settings/shortcuts/keybinding-title-copy.test.ts b/src/renderer/src/components/settings/shortcuts/keybinding-title-copy.test.ts deleted file mode 100644 index ae7fe38db06..00000000000 --- a/src/renderer/src/components/settings/shortcuts/keybinding-title-copy.test.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { afterEach, describe, expect, it } from 'vitest' -import { - agentTabActionId, - getKeybindingDefinition -} from '../../../../../shared/keybindings/definitions' -import type { - KeybindingActionId, - KeybindingDefinition -} from '../../../../../shared/keybindings/types' -import { i18n } from '@/i18n/i18n' -import { localizeKeybindingDefinition } from './keybinding-title-copy' - -function definition(actionId: KeybindingActionId): KeybindingDefinition { - const found = getKeybindingDefinition(actionId) - if (!found) { - throw new Error(`missing ${actionId}`) - } - return found -} - -describe('localizeKeybindingDefinition', () => { - afterEach(async () => { - await i18n.changeLanguage('en') - }) - - it('localizes built-in titles, keeps English searchable, and leaves plugin titles alone', async () => { - await i18n.changeLanguage('ko') - const quickOpen = definition('worktree.quickOpen') - - const localized = localizeKeybindingDefinition(quickOpen) - expect(localized.title).not.toBe(quickOpen.title) - expect(localized.group).not.toBe(quickOpen.group) - expect(localized.searchKeywords).toEqual( - expect.arrayContaining([quickOpen.title, quickOpen.group]) - ) - const agentTab = definition(agentTabActionId('claude')) - const agentTitle = localizeKeybindingDefinition(agentTab).title - expect(agentTitle).not.toBe(agentTab.title) - expect(agentTitle).toContain('Claude') - - const plugin: KeybindingDefinition = { - ...quickOpen, - id: 'plugin:orca-samples.tasks/open', - title: 'Open Tasks — Tasks', - group: 'Plugins' - } - expect(localizeKeybindingDefinition(plugin)).toBe(plugin) - }) -}) diff --git a/src/renderer/src/components/settings/terminal/TerminalInteractionSection.test.tsx b/src/renderer/src/components/settings/terminal/TerminalInteractionSection.test.tsx deleted file mode 100644 index 710397a6731..00000000000 --- a/src/renderer/src/components/settings/terminal/TerminalInteractionSection.test.tsx +++ /dev/null @@ -1,49 +0,0 @@ -// @vitest-environment happy-dom - -import { cleanup, render, screen } from '@testing-library/react' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { createGlobalSettingsFixture } from '../../../../../shared/global-settings-test-fixture' -import { useAppStore } from '../../../store' -import { TerminalInteractionSection } from './TerminalInteractionSection' - -const i18nMock = vi.hoisted(() => { - const translations: Record = {} - return { language: 'en', translations } -}) - -vi.mock('@/i18n/i18n', () => ({ - translate: (key: string, defaultValue: string) => i18nMock.translations[key] ?? defaultValue, - i18n: i18nMock -})) - -vi.mock('@/i18n/localized-catalog', () => ({ - createLocalizedCatalog: (factory: () => unknown) => factory -})) - -describe('TerminalInteractionSection scroll on input', () => { - beforeEach(() => { - useAppStore.setState({ settingsSearchQuery: '' }) - }) - - afterEach(() => { - cleanup() - i18nMock.language = 'en' - i18nMock.translations = {} - }) - - it('keeps the row visible for a localized search keyword', () => { - i18nMock.language = 'de' - i18nMock.translations = { 'components.settings.terminal.search.snap': 'einrasten' } - useAppStore.setState({ settingsSearchQuery: 'einrasten' }) - - render( - - ) - - expect(screen.getByRole('switch', { name: 'Scroll to Bottom on Input' })).toBeTruthy() - }) -}) diff --git a/src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts b/src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts index 8cacc1dcb90..3ccabf528a7 100644 --- a/src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts +++ b/src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts @@ -2,12 +2,10 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import type { BrowserPage, BrowserWorkspace } from '../../../../../shared/browser-workspace-types' -import type { FolderWorkspace } from '../../../../../shared/folder-workspaces/folder-workspace-types' import type { Tab, TabGroup } from '../../../../../shared/tab-types' import type { Worktree } from '../../../../../shared/worktree/types' import '../../../../../shared/constants' import { ORCA_BROWSER_BLANK_URL } from '../../../../../shared/browser/browser-blank-page' -import { folderWorkspaceKey } from '../../../../../shared/workspace-scope' import { useAppStore } from '@/store/index' import type { AppState } from '@/store/types' @@ -44,25 +42,6 @@ function makeWorktree(overrides: Partial = {}): Worktree { } } -function makeFolderWorkspace(overrides: Partial = {}): FolderWorkspace { - return { - id: 'folder-1', - projectGroupId: 'project-1', - name: 'Remote folder', - folderPath: '/workspace/folder-1', - linkedTask: null, - comment: '', - isArchived: false, - isUnread: false, - isPinned: false, - sortOrder: 0, - lastActivityAt: 0, - createdAt: 0, - updatedAt: 0, - ...overrides - } -} - function makeWorkspace(overrides: Partial = {}): BrowserWorkspace { return { id: 'ws-1', @@ -150,26 +129,6 @@ describe('activateBrowserPagePaletteResult', () => { seedStore() }) - it('activates an SSH worktree through its paired-runtime owner alias', () => { - seedStore({ - worktreesByRepo: { - 'repo-1': [ - makeWorktree({ - hostId: 'ssh:private-target', - runtimeOwnerEnvironmentId: 'paired-host' - }) - ] - } - }) - - expect( - activateBrowserPagePaletteResult({ ...target, executionHostId: 'runtime:paired-host' }).status - ).toBe('activated') - expect(mocks.activateAndRevealWorkspace).toHaveBeenCalledWith('wt-1', { - executionHostId: 'runtime:paired-host' - }) - }) - it('rejects colliding child ids before mutating either host', () => { seedStore({ worktreesByRepo: { @@ -196,41 +155,6 @@ describe('activateBrowserPagePaletteResult', () => { expect(mocks.activateAndRevealWorkspace).not.toHaveBeenCalled() }) - it('keeps browser workspaces with distinct unified tabs in multiple groups activatable', () => { - seedStore({ - unifiedTabsByWorktree: { - 'wt-1': [makeBrowserTab(), makeBrowserTab({ id: 'second-view', groupId: 'group-2' })] - }, - groupsByWorktree: { - 'wt-1': [ - makeGroup(), - makeGroup({ id: 'group-2', activeTabId: 'second-view', tabOrder: ['second-view'] }) - ] - } - }) - expect(activateBrowserPagePaletteResult(target).status).toBe('activated') - }) - - it('activates pages in remote folder workspaces', () => { - const worktreeId = folderWorkspaceKey('folder-1') - seedStore({ - worktreesByRepo: {}, - folderWorkspaces: [makeFolderWorkspace({ executionHostId: 'ssh:host-1' })], - browserTabsByWorktree: { [worktreeId]: [makeWorkspace({ worktreeId })] }, - browserPagesByWorkspace: { 'ws-1': [makePage({ worktreeId })] }, - unifiedTabsByWorktree: { [worktreeId]: [makeBrowserTab({ worktreeId })] }, - groupsByWorktree: { [worktreeId]: [makeGroup({ worktreeId })] }, - activeGroupIdByWorktree: { [worktreeId]: 'group-1' } - }) - - expect( - activateBrowserPagePaletteResult({ pageId: 'page-1', workspaceId: 'ws-1', worktreeId }) - ).toMatchObject({ status: 'activated' }) - expect(mocks.activateAndRevealWorkspace).toHaveBeenCalledWith(worktreeId, { - executionHostId: 'ssh:host-1' - }) - }) - it('derives the focus target from the page url captured before worktree activation', () => { seedStore({ browserPagesByWorkspace: { diff --git a/src/renderer/src/lib/source-control/ai/source-control-agent-launch-picker.test.ts b/src/renderer/src/lib/source-control/ai/source-control-agent-launch-picker.test.ts index d19a09bc566..38def191301 100644 --- a/src/renderer/src/lib/source-control/ai/source-control-agent-launch-picker.test.ts +++ b/src/renderer/src/lib/source-control/ai/source-control-agent-launch-picker.test.ts @@ -608,32 +608,3 @@ it('replaces the full unaccepted extent, accepts once, and preserves promoted ch expect(reopened.delegated).toEqual(expect.arrayContaining(['model', 'effort'])) expect(agentPickerEffectiveChoices(entry, reopened).model).toBeUndefined() }) - -it('orders raw and control picks once and gives one-shot and sparse consumers the same choices', () => { - const selection = canonicalSourceControlActionSelection({ agentId: 'claude', agentArgs: '' }) - for (const edits of [ - [ - { kind: 'arguments', text: '--model sonnet --effort high --debug' }, - { kind: 'choice', patch: { model: 'opus' } } - ], - [ - { kind: 'choice', patch: { model: 'opus' } }, - { kind: 'arguments', text: '--model sonnet --effort high --debug' } - ] - ] satisfies AgentPickerEdit[][]) { - const draft = acceptAgentPickerArguments( - entry, - edits.reduce( - (value, edit) => applyAgentPickerEdit(entry, value, edit), - sourceControlPickerDraft(selection, entry, 'terminal') - ) - ) - const saved = project(applySourceControlPickerDraft(selection, entry, draft)) - const chat = agentPickerLaunchInputs({ ...draft, surface: 'chat' }, entry) - expect(saved.sessionOptions?.model).toBe(chat.sessionOptions?.model) - expect(saved.sessionOptions?.effort).toBe(chat.sessionOptions?.effort) - expect(saved.agentArgs).toBe('--debug') - expect(agentPickerLaunchInputs(draft, entry).agentArgs).toContain('--debug') - expect(draft.pendingArguments).toBeUndefined() - } -}) From a163b9fc5b87ee9cee66f1522f74804e9190ccbb Mon Sep 17 00:00:00 2001 From: OrcaWin Date: Mon, 9 Nov 2026 02:25:23 -0800 Subject: [PATCH 06/90] test: remove low-value copy, inventory, and runner assertions (#40282) Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com> --- .../action-contract.test.mjs | 23 -------- .../storage-lease.test.mjs | 12 ----- cloud/dev/scripts/run-relay-tests.test.mjs | 3 +- .../orcad-child-artifacts.test.mjs | 12 ----- docs/site/tests/docs-package.test.mjs | 44 ---------------- docs/site/tests/search-excerpt.test.mjs | 35 ------------- docs/site/tests/zod-security.test.mjs | 52 ------------------- ...AutomationsPage.refresh-selection.spec.tsx | 12 ----- .../src/hooks/shortcut-label-cache.test.tsx | 44 ---------------- src/renderer/src/i18n/I18nProvider.test.tsx | 36 ------------- .../src/i18n/relative-time-format.test.ts | 21 -------- .../src/i18n/ui-intl-formatters.test.ts | 15 ------ .../lib/text-generation-error-copy.test.ts | 34 ------------ ...ntime-shared-control-app-heartbeat.test.ts | 14 +---- 14 files changed, 3 insertions(+), 354 deletions(-) delete mode 100644 .github/actions/cloud-sql-rollout-lease/action-contract.test.mjs delete mode 100644 config/scripts/orcad-distribution/server-bundle/orcad-child-artifacts.test.mjs delete mode 100644 docs/site/tests/zod-security.test.mjs delete mode 100644 src/renderer/src/i18n/relative-time-format.test.ts delete mode 100644 src/renderer/src/i18n/ui-intl-formatters.test.ts delete mode 100644 src/renderer/src/lib/text-generation-error-copy.test.ts diff --git a/.github/actions/cloud-sql-rollout-lease/action-contract.test.mjs b/.github/actions/cloud-sql-rollout-lease/action-contract.test.mjs deleted file mode 100644 index 4acfc3552da..00000000000 --- a/.github/actions/cloud-sql-rollout-lease/action-contract.test.mjs +++ /dev/null @@ -1,23 +0,0 @@ -import assert from 'node:assert/strict' -import { readFileSync } from 'node:fs' -import { test } from 'node:test' - -const here = new URL('./', import.meta.url) -const action = readFileSync(new URL('action.yml', here), 'utf8') - -test('is a node24 JavaScript action with an always-run post step', () => { - // A composite action has no `post:`, so the lease could never be released on cancel or failure. - assert.match(action, /^ {2}using: node24$/m) - assert.doesNotMatch(action, /using: composite/) - assert.match(action, /^ {2}main: main\.mjs$/m) - assert.match(action, /^ {2}post: post\.mjs$/m) - assert.match(action, /^ {2}post-if: always\(\)$/m) -}) - -test('declares the inputs the wave-chain callers depend on', () => { - for (const input of ['bucket:', 'object:', 'holder-key:', 'release:']) { - assert.match(action, new RegExp(`^ {2}${input}$`, 'm'), input) - } - assert.match(action, /default: \$\{\{ github\.repository \}\}\/\$\{\{ github\.run_id \}\}/) - assert.match(action, /default: 'true'/) -}) diff --git a/.github/actions/cloud-sql-rollout-lease/storage-lease.test.mjs b/.github/actions/cloud-sql-rollout-lease/storage-lease.test.mjs index 73d1a1e6e78..469f64291d4 100644 --- a/.github/actions/cloud-sql-rollout-lease/storage-lease.test.mjs +++ b/.github/actions/cloud-sql-rollout-lease/storage-lease.test.mjs @@ -234,18 +234,6 @@ test('fails closed when the bucket answers 5xx', async () => { assert.equal(storage.state.requests.filter((request) => request.method !== 'GET').length, 0) }) -test('fails closed when permission is denied', async () => { - const storage = fakeStorage({ - faults: [{ when: (request) => request.method === 'GET', status: 403 }] - }) - - const error = await leaseFor(storage) - .acquire(HOLDER) - .catch((thrown) => thrown) - - assert.match(error.message, /lease inspection failed: 403/) -}) - test('treats an unreadable record as held, not free', async () => { const storage = fakeStorage({ object: { generation: '1500', body: { holder_key: 'stablyai/orca/9001' } } diff --git a/cloud/dev/scripts/run-relay-tests.test.mjs b/cloud/dev/scripts/run-relay-tests.test.mjs index 1f806f183dc..70a332ea205 100644 --- a/cloud/dev/scripts/run-relay-tests.test.mjs +++ b/cloud/dev/scripts/run-relay-tests.test.mjs @@ -110,8 +110,7 @@ for (const [name, options] of [ { env: { ORCA_IDLE_REHOME_POSTGRES_URL: 'postgres://localhost:55440/relay' } } ], ['application database', { env: { DATABASE_URL: databaseUrl } }], - ['one CPU', { parallelism: 1 }], - ['two CPUs', { parallelism: 2 }] + ['one CPU', { parallelism: 1 }] ]) { test(`retains the original single run for ${name}`, async (t) => { const h = start(t, options) diff --git a/config/scripts/orcad-distribution/server-bundle/orcad-child-artifacts.test.mjs b/config/scripts/orcad-distribution/server-bundle/orcad-child-artifacts.test.mjs deleted file mode 100644 index 0ab57b04a53..00000000000 --- a/config/scripts/orcad-distribution/server-bundle/orcad-child-artifacts.test.mjs +++ /dev/null @@ -1,12 +0,0 @@ -import { expect, it } from 'vitest' -import { ORCAD_ARTIFACTS } from '../../../../src/shared/orcad-artifacts.ts' -import { ORCAD_CHILD_ENTRY_POINTS, orcadChildOutputFilename } from './orcad-entry-build.mjs' - -// A child built but not listed never reaches remote hosts, so its client fails there. -it.each(Object.entries(ORCAD_CHILD_ENTRY_POINTS))( - 'ships the %s child bundle as an orcad artifact', - (_name, entryPoint) => { - const filenames = ORCAD_ARTIFACTS.map((artifact) => artifact.filename) - expect(filenames).toContain(orcadChildOutputFilename(entryPoint)) - } -) diff --git a/docs/site/tests/docs-package.test.mjs b/docs/site/tests/docs-package.test.mjs index 06b35a04207..4b353a717c6 100644 --- a/docs/site/tests/docs-package.test.mjs +++ b/docs/site/tests/docs-package.test.mjs @@ -3,16 +3,11 @@ import { readFile, readdir } from 'node:fs/promises' import { existsSync } from 'node:fs' import path from 'node:path' import test from 'node:test' -import { pathToFileURL } from 'node:url' const siteRoot = path.resolve(import.meta.dirname, '..') const contentRoot = path.join(siteRoot, 'content', 'docs') const publicRoot = path.join(siteRoot, 'public') -async function read(relativePath) { - return readFile(path.join(siteRoot, relativePath), 'utf8') -} - async function walkFiles(directory, extension) { const entries = await readDirectory(directory) const files = [] @@ -40,19 +35,6 @@ function isMediaPath(urlPath) { return /\.(?:gif|jpe?g|png|webp|mp4|svg|ico)$/i.test(urlPath.split(/[?#]/, 1)[0]) } -test('docs content and navigation metadata are discoverable', async () => { - const pages = await walkFiles(contentRoot, '.mdx') - assert.ok(pages.length > 0, 'expected docs content pages') - - const navigationFiles = await walkFiles(contentRoot, 'meta.json') - assert.ok(navigationFiles.length > 0, 'expected navigation metadata') - for (const file of navigationFiles) { - const metadata = JSON.parse(await readFile(file, 'utf8')) - assert.ok(metadata.title, `navigation title missing in ${file}`) - assert.ok(Array.isArray(metadata.pages), `navigation pages missing in ${file}`) - } -}) - test('every local media URL referenced by docs resolves in public assets', async () => { const files = await walkFiles(contentRoot, '.mdx') const localUrls = new Set() @@ -84,29 +66,3 @@ test('docs content does not link to routes that only exist on the marketing site } } }) - -test('GIF media helpers use the shared poster and video variants', async () => { - const media = await import(pathToFileURL(path.join(siteRoot, 'src', 'lib', 'demoMedia.mjs')).href) - assert.equal(media.posterFor('/docs/orca-design-mode.gif'), '/docs/posters/orca-design-mode.jpg') - assert.equal(media.videoFor('/docs/orca-design-mode.gif'), '/docs/videos/orca-design-mode.mp4') - assert.equal(media.posterFor('/docs/tab-split.gif'), '/docs/posters/tab-split.jpg') - assert.equal(media.videoFor('/docs/tab-split.gif'), '/docs/videos/tab-split.mp4') - - for (const name of ['orca-design-mode', 'tab-split']) { - assert.ok(existsSync(path.join(publicRoot, 'docs', 'posters', `${name}.jpg`))) - assert.ok(existsSync(path.join(publicRoot, 'docs', 'videos', `${name}.mp4`))) - } -}) - -test('OG image fonts ship with their required third-party notice', async () => { - for (const filename of ['Geist-Regular.ttf', 'Geist-Bold.ttf', 'Geist-Variable.woff2']) { - assert.ok( - existsSync(path.join(siteRoot, 'src', 'assets', 'fonts', filename)), - `missing font: ${filename}` - ) - } - - const notice = await read('THIRD_PARTY_NOTICES.md') - assert.match(notice, /SIL OPEN FONT LICENSE Version 1\.1/) - assert.match(notice, /Copyright \(c\) 2023 Vercel/) -}) diff --git a/docs/site/tests/search-excerpt.test.mjs b/docs/site/tests/search-excerpt.test.mjs index 9ce21d1c874..68b2c87869d 100644 --- a/docs/site/tests/search-excerpt.test.mjs +++ b/docs/site/tests/search-excerpt.test.mjs @@ -1,22 +1,7 @@ import assert from 'node:assert/strict' import test from 'node:test' -import { runInNewContext } from 'node:vm' import { stripSearchExcerptMarkdown } from '../src/components/docs/search-excerpt.mjs' -test('unterminated escaped link destinations do not backtrack exponentially', () => { - for (const prefix of ['![](', '[label](']) { - const input = prefix + '\\('.repeat(32_768) - const result = runInNewContext( - 'strip(input)', - { strip: stripSearchExcerptMarkdown, input }, - { - timeout: 250 - } - ) - assert.equal(result, input.replace(/\\\(/g, '(')) - } -}) - test('link destinations retain escaped closing parentheses and literal escapes', () => { for (const prefix of ['![label](', '[label](']) { assert.equal(stripSearchExcerptMarkdown(prefix + 'https://example.com/a\\)b)'), 'label') @@ -60,16 +45,6 @@ test('search excerpts preserve highlighted matches inside Markdown', () => { ) }) -test('unclosed angles finish within the excerpt budget without changing text', () => { - const input = '<'.repeat(131_072) - const result = runInNewContext( - 'strip(input)', - { strip: stripSearchExcerptMarkdown, input }, - { timeout: 250 } - ) - assert.equal(result, input) -}) - test('tag guards preserve malformed markup, protected code and highlighted matches', () => { const cases = [ ['**bold**', 'bold'], @@ -99,13 +74,3 @@ test('tag guards preserve malformed markup, protected code and highlighted match assert.equal(stripSearchExcerptMarkdown(input), expected, input) } }) - -test('unclosed brackets finish within the excerpt budget without changing text', () => { - const input = '['.repeat(131_072) - const result = runInNewContext( - 'strip(input)', - { strip: stripSearchExcerptMarkdown, input }, - { timeout: 250 } - ) - assert.equal(result, input) -}) diff --git a/docs/site/tests/zod-security.test.mjs b/docs/site/tests/zod-security.test.mjs deleted file mode 100644 index 8308ff558a4..00000000000 --- a/docs/site/tests/zod-security.test.mjs +++ /dev/null @@ -1,52 +0,0 @@ -import assert from 'node:assert/strict' -import { createRequire } from 'node:module' -import { dirname, join } from 'node:path' -import test from 'node:test' -import { pathToFileURL } from 'node:url' - -const require = createRequire(import.meta.url) -const vercelRequire = createRequire(require.resolve('vercel/package.json')) -const backendsRequire = createRequire(vercelRequire.resolve('@vercel/backends/package.json')) -const zodRoot = dirname(backendsRequire.resolve('zod/package.json')) - -for (const extension of ['cjs', 'js']) { - for (const entry of ['index', 'v3/index', 'v4/index']) { - test(`Vercel Zod rejects oversized collections before parsing elements (${entry}.${extension})`, async () => { - const path = join(zodRoot, `${entry}.${extension}`) - const z = extension === 'cjs' ? require(path) : await import(pathToFileURL(path).href) - let parsed = 0 - const element = z.preprocess((value) => { - parsed += 1 - return value - }, z.string()) - for (const [schema, value, valid] of [ - [z.array(element).max(2), Array(1_000).fill(0), ['a']], - [z.array(element).length(2), Array(1_000).fill(0), ['a', 'b']], - [z.set(element).max(2), new Set([1, 2, 3]), new Set(['a'])], - [z.set(element).size(2), new Set([1, 2, 3]), new Set(['a', 'b'])] - ]) { - parsed = 0 - for (const result of [schema.safeParse(value), await schema.safeParseAsync(value)]) { - assert.equal(result.success, false) - assert.deepEqual( - result.error.issues.map((issue) => issue.code), - ['too_big'] - ) - } - assert.equal(parsed, 0) - assert.deepEqual(schema.parse(valid), valid) - assert.deepEqual(await schema.parseAsync(valid), valid) - } - }) - } -} - -test('docs Zod 4 keeps valid schemas working after the security upgrade', async () => { - const { z } = await import('zod') - const schema = z.array(z.string()).max(2) - assert.deepEqual(schema.parse(['a']), ['a']) - assert.deepEqual( - schema.safeParse([1, 2, 3]).error.issues.map((issue) => issue.code), - ['too_big'] - ) -}) diff --git a/src/renderer/src/components/automations/AutomationsPage.refresh-selection.spec.tsx b/src/renderer/src/components/automations/AutomationsPage.refresh-selection.spec.tsx index 4d1cf996009..36b4a3a5aa6 100644 --- a/src/renderer/src/components/automations/AutomationsPage.refresh-selection.spec.tsx +++ b/src/renderer/src/components/automations/AutomationsPage.refresh-selection.spec.tsx @@ -132,18 +132,6 @@ describe('AutomationsPage refresh', () => { expect(reads()).toHaveLength(beforeEvents + 2) } ) - - it('does not re-run the whole refresh when the settings identity changes', async () => { - const { rerender } = await renderPage() - expect(api.automations.list).toHaveBeenCalledTimes(1) - - mocks.state.settings = { ...(mocks.state.settings as Record) } - await rerender() - - // Settings no longer aim the list, so a new settings object is not a reason - // to re-fetch every host. - expect(api.automations.list).toHaveBeenCalledTimes(1) - }) }) describe('AutomationsPage selection', () => { diff --git a/src/renderer/src/hooks/shortcut-label-cache.test.tsx b/src/renderer/src/hooks/shortcut-label-cache.test.tsx index f273005acc7..50c6adb79eb 100644 --- a/src/renderer/src/hooks/shortcut-label-cache.test.tsx +++ b/src/renderer/src/hooks/shortcut-label-cache.test.tsx @@ -1,46 +1,17 @@ // @vitest-environment happy-dom import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { act, cleanup, render, screen } from '@testing-library/react' -import type * as KeybindingsModule from '../../../shared/keybindings' import type { KeybindingOverrides } from '../../../shared/keybindings' -const counters = vi.hoisted(() => ({ effective: 0, formatList: 0, formatBinding: 0 })) const platformRef = vi.hoisted(() => ({ current: 'darwin' as NodeJS.Platform })) vi.mock('../lib/shortcut-platform', () => ({ getShortcutPlatform: () => platformRef.current })) -vi.mock('../../../shared/keybindings', async (importOriginal) => { - const actual = await importOriginal() - return { - ...actual, - getEffectiveKeybindingsForAction: ( - ...args: Parameters - ) => { - counters.effective++ - return actual.getEffectiveKeybindingsForAction(...args) - }, - formatKeybindingList: (...args: Parameters) => { - counters.formatList++ - return actual.formatKeybindingList(...args) - }, - formatKeybinding: (...args: Parameters) => { - counters.formatBinding++ - return actual.formatKeybinding(...args) - } - } -}) - const { formatShortcutLabel, useShortcutLabel } = await import('./useShortcutLabel') const { useAppStore } = await import('@/store') -function resetCounters(): void { - counters.effective = 0 - counters.formatList = 0 - counters.formatBinding = 0 -} - // A fresh overrides object per test keeps each case on its own cache entry, exactly as a real edit does. function overridesFor(binding: string): KeybindingOverrides { return { 'tab.close': [binding] } @@ -49,7 +20,6 @@ function overridesFor(binding: string): KeybindingOverrides { describe('shortcut label memoization', () => { beforeEach(() => { platformRef.current = 'darwin' - resetCounters() }) it('keys the cache by platform so Mac and Windows glyphs never cross', () => { @@ -69,7 +39,6 @@ function CloseLabel(): React.JSX.Element { describe('useShortcutLabel', () => { beforeEach(() => { platformRef.current = 'darwin' - resetCounters() }) afterEach(() => { @@ -77,19 +46,6 @@ describe('useShortcutLabel', () => { useAppStore.setState({ keybindings: {} }) }) - it('does not recompute the label on re-render', () => { - useAppStore.setState({ keybindings: overridesFor('Mod+Shift+K') }) - const { rerender } = render() - expect(screen.getByTestId('close-label').textContent).toBe('⌘⇧K') - resetCounters() - for (let index = 0; index < 25; index++) { - rerender() - } - expect(screen.getByTestId('close-label').textContent).toBe('⌘⇧K') - expect(counters.effective).toBe(0) - expect(counters.formatList).toBe(0) - }) - it('shows an edited keybinding immediately, with no stale-cache window', () => { useAppStore.setState({ keybindings: overridesFor('Mod+Shift+K') }) render() diff --git a/src/renderer/src/i18n/I18nProvider.test.tsx b/src/renderer/src/i18n/I18nProvider.test.tsx index 8e8b3f9ee8d..638b3d6aa44 100644 --- a/src/renderer/src/i18n/I18nProvider.test.tsx +++ b/src/renderer/src/i18n/I18nProvider.test.tsx @@ -16,7 +16,6 @@ import * as rendererI18n from './i18n' import { useLanguageReadiness } from './language-readiness' import * as languageReadiness from './language-readiness' import { usePluginLanguagePackStore } from '../store/plugins/localization/plugin-language-packs' -import { pluginLanguageResourceId } from '../../../shared/plugins/artifacts/plugin-language-pack-artifact' import { I18nProvider } from './I18nProvider' // Wait for async settings before selecting the OS locale, or an in-flight load can override the persisted preference. @@ -203,38 +202,3 @@ it('continues in English while plugin discovery is pending without changing the expect(usePluginLanguagePackStore.getState().loaded).toBe(false) expect(useAppStore.getState().settings?.uiLanguage).toBe('plugin:example.missing/de') }) - -it("re-applies a plugin language only when the selected pack's content changes", async () => { - const id = 'plugin:example.german/de-DE' as const - const pack = (save: string) => ({ - id, - resourceLanguage: pluginLanguageResourceId(id), - pluginKey: 'example.german', - coverage: 100, - locale: 'de-DE', - catalog: { common: { save } } - }) - let listed = [pack('Speichern')] - Object.defineProperty(window, 'api', { - configurable: true, - value: { plugins: { listLanguagePacks: async () => structuredClone(listed) } } - }) - usePluginLanguagePackStore.setState({ entries: [], loaded: false }) - useAppStore.setState({ settings: { ...getDefaultSettings('/tmp'), uiLanguage: id } }) - await renderProvider() - await act(() => usePluginLanguagePackStore.getState().fetchEntries()) - await vi.waitFor(() => expect(i18n.language).toBe(pluginLanguageResourceId(id))) - const changeLanguage = vi.spyOn(i18n, 'changeLanguage') - const removeBundle = vi.spyOn(i18n, 'removeResourceBundle') - - // Plugin-change refreshes rebuild every registration over IPC, even when nothing changed. - await act(() => usePluginLanguagePackStore.getState().fetchEntries()) - await vi.waitFor(() => expect(useLanguageReadiness.getState().loading).toBe(false)) - expect(changeLanguage).not.toHaveBeenCalled() - expect(removeBundle).not.toHaveBeenCalled() - - listed = [pack('Sichern')] - await act(() => usePluginLanguagePackStore.getState().fetchEntries()) - await vi.waitFor(() => expect(changeLanguage).toHaveBeenCalledWith(pluginLanguageResourceId(id))) - expect(rendererI18n.translate('common.save', 'Save')).toBe('Sichern') -}) diff --git a/src/renderer/src/i18n/relative-time-format.test.ts b/src/renderer/src/i18n/relative-time-format.test.ts deleted file mode 100644 index dcef475ee7d..00000000000 --- a/src/renderer/src/i18n/relative-time-format.test.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest' - -const { mockIntlLocale } = vi.hoisted(() => ({ mockIntlLocale: { value: 'en' } })) - -vi.mock('./i18n', () => ({ getIntlLocale: () => mockIntlLocale.value })) - -import { getUiRelativeTimeFormatter } from './relative-time-format' - -beforeEach(() => { - mockIntlLocale.value = 'en' -}) - -describe('getUiRelativeTimeFormatter', () => { - it('rebuilds the formatter after a runtime language switch', () => { - const english = getUiRelativeTimeFormatter() - mockIntlLocale.value = 'ko' - const korean = getUiRelativeTimeFormatter() - expect(korean).not.toBe(english) - expect(korean.format(-1, 'day')).toBe('어제') - }) -}) diff --git a/src/renderer/src/i18n/ui-intl-formatters.test.ts b/src/renderer/src/i18n/ui-intl-formatters.test.ts deleted file mode 100644 index 49432d51222..00000000000 --- a/src/renderer/src/i18n/ui-intl-formatters.test.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { afterEach, expect, it } from 'vitest' -import { i18n, loadRendererUiLanguage } from './i18n' -import { uiNumberFormat } from './ui-intl-formatters' - -const GROUPED: Intl.NumberFormatOptions = {} - -afterEach(async () => { - await i18n.changeLanguage('en') -}) - -it('rebuilds a shared formatter when the UI language changes', async () => { - expect(uiNumberFormat(GROUPED).format(1234.5)).toBe('1,234.5') - await i18n.changeLanguage(await loadRendererUiLanguage('de')) - expect(uiNumberFormat(GROUPED).format(1234.5)).toBe('1.234,5') -}) diff --git a/src/renderer/src/lib/text-generation-error-copy.test.ts b/src/renderer/src/lib/text-generation-error-copy.test.ts deleted file mode 100644 index 4655d4aa8b3..00000000000 --- a/src/renderer/src/lib/text-generation-error-copy.test.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { afterEach, describe, expect, it } from 'vitest' -import { i18n } from '@/i18n/i18n' -import es from '@/i18n/locales/es.json' -import { textGenerationFailure } from '../../../shared/text-generation-failure-copy' -import { localizeTextGenerationResult, textGenerationErrorText } from './text-generation-error-copy' - -const originalLanguage = i18n.language -const errors = es.sourceControl.textGeneration.errors - -afterEach(async () => { - await i18n.changeLanguage(originalLanguage) -}) - -describe('textGenerationErrorText', () => { - it('localizes a coded failure and keeps the agent label and CLI output verbatim', async () => { - i18n.addResourceBundle('es', 'translation', es) - await i18n.changeLanguage('es') - const failed = textGenerationFailure('cliFailedWithDetail', { - label: 'Codex', - exitCode: 2, - detail: 'unauthorized {{label}}' - }) - expect(failed.error).toBe('Codex CLI command failed with code 2: unauthorized {{label}}') - expect(textGenerationErrorText(failed)).toBe( - errors.cliFailedWithDetail - .replace('{{label}}', 'Codex') - .replace('{{exitCode}}', '2') - .replace('{{detail}}', 'unauthorized {{label}}') - ) - expect( - localizeTextGenerationResult({ success: false, ...textGenerationFailure('noStagedChanges') }) - ).toEqual({ success: false, error: errors.noStagedChanges, errorCode: 'noStagedChanges' }) - }) -}) diff --git a/src/shared/remote-runtime/control/remote-runtime-shared-control-app-heartbeat.test.ts b/src/shared/remote-runtime/control/remote-runtime-shared-control-app-heartbeat.test.ts index b14b85878fc..196ef0a8a8f 100644 --- a/src/shared/remote-runtime/control/remote-runtime-shared-control-app-heartbeat.test.ts +++ b/src/shared/remote-runtime/control/remote-runtime-shared-control-app-heartbeat.test.ts @@ -13,7 +13,7 @@ const ok: RuntimeRpcResponse = { _meta: { runtimeId: 'r' } } -function setup(probe: Probe, shouldProbe: () => boolean = () => true) { +function setup(probe: Probe) { const onUnresponsive = vi.fn() const onRecovered = vi.fn() const probeSpy = vi.fn(probe) @@ -22,7 +22,7 @@ function setup(probe: Probe, shouldProbe: () => boolean = () => true) { { probe: probeSpy, isCurrent: () => true, - shouldProbe, + shouldProbe: () => true, onUnresponsive, onRecovered } @@ -129,16 +129,6 @@ describe('shared control app heartbeat', () => { heartbeat.stop() }) - it('does not probe an asleep host', async () => { - const { heartbeat, probe } = setup( - () => Promise.resolve(ok), - () => false - ) - await vi.advanceTimersByTimeAsync(5_000) - expect(probe).not.toHaveBeenCalled() - heartbeat.stop() - }) - it('restarts the silence window after this process stalls instead of blaming the host', async () => { let now = 0 const probe = vi.fn(() => Promise.resolve(ok)) From fc156aad4b5bebe73582528b089f47e85d0f1581 Mon Sep 17 00:00:00 2001 From: Neil <4138956+nwparker@users.noreply.github.com> Date: Mon, 9 Nov 2026 02:36:00 -0800 Subject: [PATCH 07/90] feat(release): publish a server-only Linux tarball for orca serve (#40280) * feat(release): publish a server-only Linux tarball for orca serve Each release now also uploads orca-server-linux-x64.tar.gz and orca-server-linux-arm64.tar.gz (orcad slot from the qualified template, the pinned Node, and an orca-ide launcher) plus orca-server-sha256sums.txt, so a Linux host can run orca serve without the desktop package. The tarballs are packed and smoke-tested (serve --recipe-json, then pair a second profile) on both architectures, including bare ubuntu:24.04 and debian:12-slim containers. Upload runs only after the release is published and nothing depends on it, so it cannot hold the desktop release. * fix(release): keep the server tarball's launcher env out of its terminals; skip refs that predate it - The launcher runs the CLI with ELECTRON_RUN_AS_NODE=1, as the packaged app does, and the CLI strips it before starting orcad; ORCA_APP_EXECUTABLE and ORCA_SERVE_RUNTIME are cleared. - Ship Node's LICENSE beside the runtime. - Skip packing on release refs that predate the scripts, and upload only when both tarballs passed. - Run the PR smoke when the CLI's serve-runtime selection changes; document service install. --- .github/workflows/orca-server-artifact.yml | 133 +++++++++ .github/workflows/release-cut.yml | 48 +++ .../pack-orcad-server-artifact.mjs | 273 ++++++++++++++++++ .../smoke-orcad-server-artifact.mjs | 135 +++++++++ docs/site/content/docs/remote-servers.mdx | 18 ++ 5 files changed, 607 insertions(+) create mode 100644 .github/workflows/orca-server-artifact.yml create mode 100644 config/scripts/orcad-distribution/server-artifact/pack-orcad-server-artifact.mjs create mode 100644 config/scripts/orcad-distribution/server-artifact/smoke-orcad-server-artifact.mjs diff --git a/.github/workflows/orca-server-artifact.yml b/.github/workflows/orca-server-artifact.yml new file mode 100644 index 00000000000..2840ad7caa7 --- /dev/null +++ b/.github/workflows/orca-server-artifact.yml @@ -0,0 +1,133 @@ +name: Server-only Linux artifact + +on: + pull_request: + types: [opened, synchronize, reopened, ready_for_review] + paths: + - 'config/scripts/orcad-distribution/server-artifact/**' + - '.github/workflows/orca-server-artifact.yml' + # The launcher relies on how the CLI picks and starts its serve runtime. + - 'src/cli/runtime/launch.ts' + - 'src/cli/runtime/orca-app-executable.ts' + - 'src/cli/runtime/serve-orcad-launch.ts' + - 'src/shared/orcad-local-serve-selection.ts' + - 'src/shared/orcad-artifacts.ts' + # Catch serve regressions on main between releases. + schedule: + - cron: '45 11 * * *' + workflow_dispatch: + # Releases pass the qualified template this run already built, so the tarball ships its exact bytes. + workflow_call: + inputs: + ref: + description: Git ref to check out, e.g. the release tag + type: string + required: true + template_artifact: + description: Name of this run's qualified orcad-template artifact; blank builds the host slot + type: string + default: '' + outputs: + packed: + description: "'true' when both tarballs were packed and passed the smoke" + value: ${{ jobs.package.outputs.packed }} + +permissions: + contents: read + +concurrency: + group: orca-server-artifact-${{ inputs.ref && format('run-{0}', github.run_id) || github.event.pull_request.number || github.ref }} + cancel-in-progress: ${{ !inputs.ref }} + +jobs: + package: + if: github.event_name != 'pull_request' || github.event.pull_request.draft != true + strategy: + fail-fast: false + matrix: + include: + - arch: x64 + runner: ubuntu-24.04 + - arch: arm64 + runner: ubuntu-24.04-arm + runs-on: ${{ matrix.runner }} + timeout-minutes: 30 + permissions: + contents: read + actions: read + env: + ORCA_BACKGROUND_LAUNCH: '1' + TARGET: linux-${{ matrix.arch }}-glibc + outputs: + packed: ${{ steps.smoke.outcome == 'success' }} + steps: + - uses: actions/checkout@v6 + with: + ref: ${{ inputs.ref }} + persist-credentials: false + # A release cut from a ref older than this workflow has nothing to pack; skip instead of failing. + - name: Check the ref can pack the tarball + id: supported + run: | + if [ -f config/scripts/orcad-distribution/server-artifact/pack-orcad-server-artifact.mjs ]; then + echo 'supported=true' >> "$GITHUB_OUTPUT" + else + echo '::notice::This ref predates the server-only tarball; skipping it.' + fi + - uses: ./.github/actions/install-node-dependencies + if: steps.supported.outputs.supported == 'true' + with: + cache-pnpm-store: ${{ !inputs.ref }} + - name: Use the qualified release template + if: steps.supported.outputs.supported == 'true' && inputs.template_artifact != '' + uses: actions/download-artifact@v8 + with: + name: ${{ inputs.template_artifact }} + path: out/orcad-template + # Without a release template, build this runner's slot the way the desktop template does. + - uses: ./.github/actions/build-mobile-web-bundle + if: steps.supported.outputs.supported == 'true' && inputs.template_artifact == '' + - name: Build this runner's template slot + if: steps.supported.outputs.supported == 'true' && inputs.template_artifact == '' + run: pnpm build:orcad-template --targets "$TARGET" + - name: Pack the tarball + if: steps.supported.outputs.supported == 'true' + run: | + pnpm build:packages + SOURCE_DATE_EPOCH="$(git log -1 --format=%ct)" node config/scripts/orcad-distribution/server-artifact/pack-orcad-server-artifact.mjs --template out/orcad-template --target "$TARGET" --out-dir out/orca-server + { + echo "### orca-server-linux-${{ matrix.arch }}" + echo '```' + ls -l out/orca-server + cat out/orca-server/*.sha256 + echo '```' + } >> "$GITHUB_STEP_SUMMARY" + - name: Start and pair on the runner + if: steps.supported.outputs.supported == 'true' + run: node config/scripts/orcad-distribution/server-artifact/smoke-orcad-server-artifact.mjs --archive "out/orca-server/orca-server-linux-${{ matrix.arch }}.tar.gz" + # Bare images with no Node, display, GTK or X11: the tarball's own Node runs the smoke. + - name: Start and pair on minimal images + id: smoke + if: steps.supported.outputs.supported == 'true' + run: | + for image in ubuntu:24.04 debian:12-slim; do + echo "::group::$image" + docker run --rm --init \ + -v "$PWD/out/orca-server:/artifacts:ro" \ + -v "$PWD/config/scripts/orcad-distribution/server-artifact:/smoke:ro" \ + "$image" sh -ec ' + mkdir -p /tmp/runtime + tar -xzf /artifacts/orca-server-linux-${{ matrix.arch }}.tar.gz -C /tmp/runtime --strip-components=1 + /tmp/runtime/runtimes/node-*/bin/node /smoke/smoke-orcad-server-artifact.mjs --archive /artifacts/orca-server-linux-${{ matrix.arch }}.tar.gz + ' + echo '::endgroup::' + done + - uses: actions/upload-artifact@v7 + if: steps.supported.outputs.supported == 'true' + with: + name: orca-server-linux-${{ matrix.arch }} + path: | + out/orca-server/orca-server-linux-${{ matrix.arch }}.tar.gz + out/orca-server/orca-server-linux-${{ matrix.arch }}.tar.gz.sha256 + if-no-files-found: error + retention-days: 7 diff --git a/.github/workflows/release-cut.yml b/.github/workflows/release-cut.yml index ffc61def51f..01ed0b8ffe1 100644 --- a/.github/workflows/release-cut.yml +++ b/.github/workflows/release-cut.yml @@ -1039,6 +1039,21 @@ jobs: ref: refs/tags/${{ needs.cut.outputs.tag }} fast_runners: false + # Server-only Linux tarballs from the same qualified template. Nothing depends on this job, so a + # failure here never holds the desktop release. + orca-server-artifact: + needs: + - cut + - orcad-template + if: ${{ !cancelled() && needs.cut.outputs.should_release == 'true' && needs.orcad-template.result == 'success' }} + permissions: + contents: read + actions: read + uses: ./.github/workflows/orca-server-artifact.yml + with: + ref: refs/tags/${{ needs.cut.outputs.tag }} + template_artifact: orcad-template + # Gate SignPath artifact requests behind blocking tests to avoid approvals for unpublishable builds. release-preflight: needs: @@ -2241,6 +2256,39 @@ jobs: --prerelease="$prerelease" \ --repo "$GITHUB_REPOSITORY" + # After publish: the draft's asset checks and undraft never see these, and a failure here only + # leaves the server tarballs missing from an already published release. + publish-orca-server-artifact: + needs: + - cut + - publish-release + - orca-server-artifact + if: ${{ !cancelled() && needs.publish-release.result == 'success' && needs.orca-server-artifact.result == 'success' && needs.orca-server-artifact.outputs.packed == 'true' && needs.cut.outputs.tag != '' }} + runs-on: ubuntu-latest + timeout-minutes: 15 + permissions: + contents: write + steps: + - uses: actions/download-artifact@v8 + with: + pattern: orca-server-linux-* + path: orca-server + merge-multiple: true + - name: Write the checksum manifest and upload + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TAG: ${{ needs.cut.outputs.tag }} + working-directory: orca-server + run: | + set -euo pipefail + cat orca-server-linux-x64.tar.gz.sha256 orca-server-linux-arm64.tar.gz.sha256 > orca-server-sha256sums.txt + sha256sum -c orca-server-sha256sums.txt + gh release upload "$TAG" \ + orca-server-linux-x64.tar.gz \ + orca-server-linux-arm64.tar.gz \ + orca-server-sha256sums.txt \ + --clobber --repo "$GITHUB_REPOSITORY" + post-release-e2e: needs: - cut diff --git a/config/scripts/orcad-distribution/server-artifact/pack-orcad-server-artifact.mjs b/config/scripts/orcad-distribution/server-artifact/pack-orcad-server-artifact.mjs new file mode 100644 index 00000000000..7dd14db6070 --- /dev/null +++ b/config/scripts/orcad-distribution/server-artifact/pack-orcad-server-artifact.mjs @@ -0,0 +1,273 @@ +#!/usr/bin/env node +// Packs one target's qualified template slot, its pinned Node and a launcher into the server-only +// tarball `orca serve` runs from on hosts without the desktop app. +// node pack-orcad-server-artifact.mjs --template out/orcad-template --target linux-x64-glibc [--out-dir out/orca-server] +import { createHash } from 'node:crypto' +import { + chmodSync, + copyFileSync, + mkdirSync, + readFileSync, + readdirSync, + rmSync, + writeFileSync +} from 'node:fs' +import { dirname, join, relative, resolve } from 'node:path' +import { c as createTar } from 'tar' +import { + ORCAD_NODE_RUNTIME_DIR_PREFIX, + ORCAD_RUNTIMES_DIRNAME, + ORCAD_SERVER_ENTRY_FILENAME, + ORCAD_TEMPLATE_MANIFEST_FILENAME, + ORCAD_TEMPLATE_TARGETS_DIR, + ORCAD_VERSION_FILENAME, + ORCAD_CLI_ENTRY_FILENAME, + orcadNodeRuntimeExecutable, + orcadTemplateCommonFilenames, + orcadTemplateTargetFilenames +} from '../../../../src/shared/orcad-artifacts.ts' +import { ORCAD_LOCAL_SERVE_SELECTION_ENTRY } from '../../../../src/shared/orcad-local-serve-selection.ts' +import { + NODE_RUNTIME_PIN, + nodeRuntimeExecutablePath, + nodeRuntimeReleaseUrl, + pinnedNodeRuntimeAsset +} from '../../../../src/shared/node-runtime-pin.ts' +import { + ensurePinnedNodeExecutable, + fetchPinnedFile, + pinnedNodeCacheDir +} from '../prebuilds/pinned-node-downloads.mjs' +import { extract } from '../../node-runtime/archive-identity/update-node-runtime-pin.mjs' +import { computeOrcadFullVersion } from '../server-bundle/orcad-artifact-version.mjs' +import { assertNotDarkBuild } from '../../../dark-build-switches.cjs' +import { isDirectInvocation } from '../../tool-invocation/script-entry-detection.mjs' + +const root = resolve(import.meta.dirname, '../../../..') +const SLOT_DIR = 'orcad' +const LAUNCHER = 'bin/orca-ide' + +/** Published name without the libc suffix: only glibc slots are published. */ +export function orcaServerArtifactName(target) { + const match = /^(linux|darwin)-(x64|arm64)(?:-glibc)?$/.exec(target) + if (!match) { + throw new Error( + `No server-only artifact for ${target}; use linux-x64-glibc or linux-arm64-glibc` + ) + } + return `orca-server-${match[1]}-${match[2]}` +} + +function sha256(path) { + return createHash('sha256').update(readFileSync(path)).digest('hex') +} + +function isExecutable(filename) { + return /(?:^|\/)(?:rg|spawn-helper)$/.test(filename) +} + +function copyVerified(source, destination, expectedSha256, executable) { + mkdirSync(dirname(destination), { recursive: true }) + copyFileSync(source, destination) + const actual = sha256(destination) + if (actual !== expectedSha256) { + throw new Error(`${source} hashed ${actual}; the template manifest expects ${expectedSha256}`) + } + if (executable) { + chmodSync(destination, 0o755) + } +} + +/** Copies exactly the slot files the desktop deploys over SSH, each checked against the manifest. */ +function stageSlot(templateDir, target, slotDir) { + const manifest = JSON.parse( + readFileSync(join(templateDir, ORCAD_TEMPLATE_MANIFEST_FILENAME), 'utf8') + ) + const targetManifest = manifest.targets?.[target] + if (!targetManifest) { + throw new Error(`${templateDir} has no ${target} slot`) + } + const mobileWebAssets = Object.keys(manifest.commonSha256).filter((name) => + name.startsWith('out/mobile-web/') + ) + const common = orcadTemplateCommonFilenames([]) + const commonFiles = [...new Set([...common, ...mobileWebAssets])] + for (const filename of commonFiles) { + const expected = manifest.commonSha256[filename] + if (!expected) { + throw new Error(`Template manifest omits ${filename}`) + } + copyVerified( + join(templateDir, ...filename.split('/')), + join(slotDir, ...filename.split('/')), + expected, + isExecutable(filename) + ) + } + for (const filename of orcadTemplateTargetFilenames(target)) { + const expected = targetManifest.files?.[filename] + if (!expected) { + throw new Error(`Template manifest omits ${target} ${filename}`) + } + copyVerified( + join(templateDir, ORCAD_TEMPLATE_TARGETS_DIR, target, ...filename.split('/')), + join(slotDir, ...filename.split('/')), + expected, + isExecutable(filename) + ) + } + // Hashed like a desktop slot without the optional browser, which this tarball omits. + const version = computeOrcadFullVersion(slotDir, { target, agentBrowserFilename: null }) + writeFileSync(join(slotDir, ORCAD_VERSION_FILENAME), `${version}\n`) + return version +} + +// Why sh: it must run before any Node exists on the host. ELECTRON_RUN_AS_NODE=1 is how the packaged +// app's CLI runs, and the CLI strips it from the server's environment; the other two would point +// `serve` at a desktop app this install does not have. +function launcherScript(nodeRelativePath) { + return `#!/bin/sh +# Orca server-only launcher: runs the bundled Orca CLI under the bundled Node. +set -e +self=$0 +if command -v readlink >/dev/null 2>&1 && resolved=$(readlink -f -- "$self" 2>/dev/null); then + self=$resolved +fi +root=$(CDPATH= cd -- "$(dirname -- "$self")/.." && pwd -P) +node="$root/${nodeRelativePath}" +unset ORCA_APP_EXECUTABLE ORCA_SERVE_RUNTIME +ELECTRON_RUN_AS_NODE=1 +export ELECTRON_RUN_AS_NODE +exec "$node" "$root/${SLOT_DIR}/${ORCAD_CLI_ENTRY_FILENAME}" "$@" +` +} + +// The CLI asks `/out/main/.js` which server to run; here the answer is fixed. +function selectionEntryScript() { + return `'use strict' +// Answers \`orca serve\`'s runtime question for the server-only artifact (src/shared/orcad-local-serve-selection.ts). +const { readFileSync } = require('node:fs') +const { join } = require('node:path') +const flag = process.argv.indexOf('--app-root') +const root = flag === -1 ? join(__dirname, '..', '..', '..') : process.argv[flag + 1] +const slot = join(root, ${JSON.stringify(SLOT_DIR)}) +let selection +try { + const version = readFileSync(join(slot, ${JSON.stringify(ORCAD_VERSION_FILENAME)}), 'utf8').trim() + selection = { kind: 'orcad', runtime: process.execPath, entry: join(slot, ${JSON.stringify(ORCAD_SERVER_ENTRY_FILENAME)}), version } +} catch (error) { + process.stderr.write('This Orca server install is incomplete; extract the release archive again.\\n') + process.exit(1) +} +process.stdout.write('ORCA_SERVE_RUNTIME ' + JSON.stringify(selection) + '\\n') +` +} + +/** Node's notice ships with its binary; it comes from the same hash-checked archive. */ +async function copyNodeLicense(target, destination) { + const asset = pinnedNodeRuntimeAsset(target) + const cacheDir = pinnedNodeCacheDir() + const archive = await fetchPinnedFile({ + url: nodeRuntimeReleaseUrl(asset.source, asset.archive), + destination: join(cacheDir, asset.archive), + sha256: asset.archiveSha256 + }) + const topLevel = nodeRuntimeExecutablePath(target, asset.archive).replace(/\/bin\/node$/, '') + const extractDir = join(cacheDir, `license-${asset.archiveSha256.slice(0, 12)}`) + extract(archive, extractDir, `${topLevel}/LICENSE`) + copyFileSync(join(extractDir, topLevel, 'LICENSE'), destination) +} + +function listEntries(dir, base = dir) { + const entries = [] + for (const name of readdirSync(dir, { withFileTypes: true }).sort((a, b) => + a.name < b.name ? -1 : a.name > b.name ? 1 : 0 + )) { + const path = join(dir, name.name) + entries.push(relative(base, path)) + if (name.isDirectory()) { + entries.push(...listEntries(path, base)) + } + } + return entries +} + +export async function packOrcaServerArtifact({ templateDir, target, outDir }) { + // A dark build's template must never ship as a server either. + assertNotDarkBuild([templateDir]) + const name = orcaServerArtifactName(target) + const { version: appVersion } = JSON.parse(readFileSync(join(root, 'package.json'), 'utf8')) + const topDir = `orca-server-${appVersion}-${name.slice('orca-server-'.length)}` + const stagingRoot = join(outDir, '.staging') + const staging = join(stagingRoot, topDir) + rmSync(stagingRoot, { recursive: true, force: true }) + mkdirSync(staging, { recursive: true }) + + const orcadVersion = stageSlot(templateDir, target, join(staging, SLOT_DIR)) + const runtimeAsset = pinnedNodeRuntimeAsset(target) + const nodeRelativePath = [ + ORCAD_RUNTIMES_DIRNAME, + `${ORCAD_NODE_RUNTIME_DIR_PREFIX}${runtimeAsset.executableSha256}`, + orcadNodeRuntimeExecutable(target) + ].join('/') + copyVerified( + await ensurePinnedNodeExecutable({ target }), + join(staging, ...nodeRelativePath.split('/')), + runtimeAsset.executableSha256, + true + ) + const launcher = join(staging, ...LAUNCHER.split('/')) + mkdirSync(dirname(launcher), { recursive: true }) + writeFileSync(launcher, launcherScript(nodeRelativePath), { mode: 0o755 }) + chmodSync(launcher, 0o755) + const selectionEntry = join(staging, 'out', 'main', `${ORCAD_LOCAL_SERVE_SELECTION_ENTRY}.js`) + mkdirSync(dirname(selectionEntry), { recursive: true }) + writeFileSync(selectionEntry, selectionEntryScript()) + writeFileSync( + join(staging, 'VERSION'), + `orca ${appVersion}\norcad ${orcadVersion}\nnode ${NODE_RUNTIME_PIN.version}\ntarget ${target}\n` + ) + copyFileSync(join(root, 'LICENSE'), join(staging, 'LICENSE')) + await copyNodeLicense(target, join(staging, ORCAD_RUNTIMES_DIRNAME, 'NODE-LICENSE')) + + const archive = join(outDir, `${name}.tar.gz`) + rmSync(archive, { force: true }) + createTar( + { + file: archive, + sync: true, + cwd: stagingRoot, + gzip: { level: 9 }, + portable: true, + noDirRecurse: true, + // Fixed mtime: rebuilding the same tag yields the same bytes. + mtime: new Date(Number(process.env.SOURCE_DATE_EPOCH ?? 0) * 1000) + }, + [topDir, ...listEntries(staging).map((entry) => `${topDir}/${entry}`)] + ) + rmSync(stagingRoot, { recursive: true, force: true }) + const digest = sha256(archive) + writeFileSync(`${archive}.sha256`, `${digest} ${name}.tar.gz\n`) + return { archive, sha256: digest, topDir, orcadVersion } +} + +function argument(argv, name) { + const index = argv.indexOf(name) + return index === -1 ? null : (argv[index + 1] ?? null) +} + +if (isDirectInvocation(import.meta.url, process.argv[1])) { + const templateDir = argument(process.argv, '--template') + const target = argument(process.argv, '--target') + if (!templateDir || !target) { + throw new Error( + 'Usage: pack-orcad-server-artifact.mjs --template --target [--out-dir ]' + ) + } + const result = await packOrcaServerArtifact({ + templateDir: resolve(templateDir), + target, + outDir: resolve(argument(process.argv, '--out-dir') ?? join(root, 'out', 'orca-server')) + }) + process.stdout.write(`${JSON.stringify(result)}\n`) +} diff --git a/config/scripts/orcad-distribution/server-artifact/smoke-orcad-server-artifact.mjs b/config/scripts/orcad-distribution/server-artifact/smoke-orcad-server-artifact.mjs new file mode 100644 index 00000000000..c4c96330aac --- /dev/null +++ b/config/scripts/orcad-distribution/server-artifact/smoke-orcad-server-artifact.mjs @@ -0,0 +1,135 @@ +#!/usr/bin/env node +// Installs a server-only tarball the documented way, starts `orca serve --recipe-json`, then pairs a +// second CLI profile with the printed code. Uses only node: builtins so the archive's own Node can run it +// on an image that has nothing else. +// node smoke-orcad-server-artifact.mjs --archive out/orca-server/orca-server-linux-x64.tar.gz +import { execFileSync, spawnSync } from 'node:child_process' +import { createHash } from 'node:crypto' +import { + closeSync, + existsSync, + mkdirSync, + mkdtempSync, + openSync, + readFileSync, + rmSync +} from 'node:fs' +import { tmpdir } from 'node:os' +import { basename, join, resolve } from 'node:path' + +const argv = process.argv.slice(2) +const archiveArg = argv[argv.indexOf('--archive') + 1] +if (!argv.includes('--archive') || !archiveArg) { + fail('Usage: smoke-orcad-server-artifact.mjs --archive ') +} +const archive = resolve(archiveArg) +const work = mkdtempSync(join(tmpdir(), 'orca-server-smoke-')) +const install = join(work, 'install') +const projectRoot = join(work, 'project') +const serverProfile = join(work, 'server-profile') +const clientProfile = join(work, 'client-profile') +// Linux names the CLI orca-ide, like the desktop package. +const orca = join(install, 'bin', 'orca-ide') + +try { + verifyChecksum() + for (const dir of [install, projectRoot, serverProfile, clientProfile]) { + mkdirSync(dir, { recursive: true }) + } + execFileSync('tar', ['-xzf', archive, '-C', install, '--strip-components=1'], { + stdio: 'inherit' + }) + const version = run([orca, '--version'], serverProfile) + assert(version.status === 0, `orca --version failed:\n${version.stderr}`) + console.log(`installed ${version.stdout.trim()}`) + + const started = Date.now() + const serve = run( + [orca, 'serve', '--recipe-json', '--project-root', projectRoot, '--port', '0'], + serverProfile, + { timeout: 120_000 } + ) + assert(serve.status === 0, `serve --recipe-json exited ${serve.status}:\n${serve.stderr}`) + const recipe = JSON.parse(serve.stdout.trim().split('\n').at(-1)) + const pairingCode = recipe.pairingCode ?? recipe.connection?.pairingCode + assert( + typeof pairingCode === 'string' && pairingCode.length > 0, + `no pairing code: ${serve.stdout}` + ) + assert( + (recipe.projectRoot ?? recipe.connection?.projectRoot) === projectRoot, + `recipe JSON names another project root: ${serve.stdout}` + ) + console.log(`PASS serve --recipe-json printed a pairing code in ${Date.now() - started} ms`) + + const status = run([orca, '--pairing-code', pairingCode, 'status', '--json'], clientProfile, { + timeout: 60_000 + }) + assert(status.status === 0, `paired status failed:\n${status.stderr}\n${status.stdout}`) + const result = JSON.parse(status.stdout).result ?? {} + assert( + result.runtime?.state === 'ready' && result.runtime?.reachable !== false, + `paired client did not reach a ready server: ${status.stdout}` + ) + console.log( + `PASS a second profile paired and saw runtime ${result.runtime.runtimeId ?? ''} ready` + ) +} finally { + stopServersFrom(install) + rmSync(work, { recursive: true, force: true }) +} + +function verifyChecksum() { + const sums = `${archive}.sha256` + if (!existsSync(sums)) { + return + } + const [expected, name] = readFileSync(sums, 'utf8').trim().split(/\s+/) + const actual = createHash('sha256').update(readFileSync(archive)).digest('hex') + assert(name === basename(archive) && actual === expected, `${archive} does not match ${sums}`) + console.log('PASS checksum') +} + +// stderr goes to a file: the detached server keeps it open, and a pipe would hold spawnSync until timeout. +function run(command, profile, { timeout = 30_000 } = {}) { + const [program, ...args] = command + const log = join(work, `${basename(profile)}.stderr.log`) + const fd = openSync(log, 'a') + try { + const result = spawnSync(program, args, { + cwd: projectRoot, + encoding: 'utf8', + timeout, + stdio: ['ignore', 'pipe', fd], + env: { ...process.env, ORCA_USER_DATA_PATH: profile, ORCA_BACKGROUND_LAUNCH: '1' } + }) + return { ...result, stderr: readFileSync(log, 'utf8').slice(-4000) } + } finally { + closeSync(fd) + } +} + +// --recipe-json leaves the server running on purpose; this smoke must not. +function stopServersFrom(dir) { + const listing = spawnSync('ps', ['-eo', 'pid=,args='], { encoding: 'utf8' }) + for (const line of (listing.stdout ?? '').split('\n')) { + const match = /^\s*(\d+)\s+(.*)$/.exec(line) + if (match && match[2].includes(dir) && Number(match[1]) !== process.pid) { + try { + process.kill(Number(match[1]), 'SIGKILL') + } catch {} + } + } +} + +function assert(condition, message) { + if (!condition) { + fail(message) + } +} + +function fail(message) { + console.error(`FAIL ${message}`) + process.exitCode = 1 + throw new Error(message) +} diff --git a/docs/site/content/docs/remote-servers.mdx b/docs/site/content/docs/remote-servers.mdx index 866722a7fc5..0b85c58e10a 100644 --- a/docs/site/content/docs/remote-servers.mdx +++ b/docs/site/content/docs/remote-servers.mdx @@ -189,6 +189,24 @@ Use only one host mode at a time. If the Orca desktop app is already sharing tha `orca serve` runs on Orca's own Node server (orcad) by default. If orcad can't serve on this computer, it uses the desktop app's server instead and prints one line saying why. On a packaged macOS app it uses the desktop app's server, so paired clients can still update it, unless you set `ORCA_SERVE_RUNTIME=orcad` (see [A Mac reached only over SSH](#a-mac-reached-only-over-ssh)). To always use the desktop app's server, set `ORCA_SERVE_RUNTIME=electron`. +### Install only the server on Linux + +Each release also publishes the server alone for Linux x64 and arm64: orcad, the Node runtime it runs on, and the `orca-ide` CLI. It needs no desktop packages (GTK, X11, Xvfb), so it suits your own headless Linux servers, VMs and containers. It is about 60 MB to download, against 190 MB for the `.deb`. Download it, check it, and unpack it: + +```bash +arch=$(uname -m | sed 's/x86_64/x64/; s/aarch64/arm64/') +base=https://github.com/stablyai/orca/releases/latest/download +curl -fsSLO "$base/orca-server-linux-$arch.tar.gz" -O "$base/orca-server-sha256sums.txt" +sha256sum --check --ignore-missing orca-server-sha256sums.txt +sudo mkdir -p /opt/orca-server +sudo tar -xzf "orca-server-linux-$arch.tar.gz" -C /opt/orca-server --strip-components=1 +/opt/orca-server/bin/orca-ide serve --pairing-address +``` + +To pin a release, replace `latest/download` with `download/v`, and keep that release's checksum in your script rather than downloading it next to the archive. The server needs glibc 2.28 or newer (Ubuntu 20.04, Debian 10, RHEL 8 and later). + +`orca-ide serve` takes the same flags as above, including `--supervise` under a service manager and `--recipe-json`. To update, stop the server, replace `/opt/orca-server` with a newer release, and start it again; paired clients cannot update it for you. For `orca-ide serve service install`, pass `--command /opt/orca-server/bin/orca-ide` or put `/opt/orca-server/bin` on `PATH`. A server-only install has no browser panes, dictation or paired web client, because those come with the desktop app. + ### Limit terminal memory on a Linux server By default, nothing caps how much memory a terminal's processes use, so one runaway job can push the whole server into the kernel's out-of-memory killer. On Linux you can cap each terminal by setting these variables in the environment that starts `orca serve` (or in its service unit): From ccd4592634f5aeca03c58b80a36c619432211fa7 Mon Sep 17 00:00:00 2001 From: Neil <4138956+nwparker@users.noreply.github.com> Date: Mon, 9 Nov 2026 02:38:15 -0800 Subject: [PATCH 08/90] refactor: group renderer workspace ownership and navigation (#40230) * refactor: group renderer workspace ownership and navigation * refactor: use the defining WSL rewrite store identifier * refactor: route new upstream consumers to workspace owners * refactor: consolidate connection owner test imports * refactor: preserve upstream review-owner test retirement --- config/flaky-test-pattern-baseline.txt | 2 +- config/focus-setting-read-baseline.txt | 10 +++--- .../scripts/ci/sharding/ci-shard-timings.json | 26 +++++++-------- .../source-routing/pr-e2e-source-routing.mjs | 4 +-- .../source-routing/pr-layout-oracle-route.mjs | 2 +- config/workspace-record-read-baseline.txt | 14 ++++---- src/renderer/src/App.tsx | 6 ++-- .../attention/notification-subject-owner.ts | 5 ++- .../notification-workspace-labels.ts | 2 +- .../src/components/JiraIssueWorkspace.tsx | 2 +- .../src/components/LinearIssueTextEditor.tsx | 2 +- .../src/components/LinearIssueWorkspace.tsx | 2 +- .../src/components/LinearItemDrawer.tsx | 2 +- .../activity/activity-thread-actions.ts | 4 +-- .../activity/activity-thread-context-menu.tsx | 2 +- .../activity-thread-hover-card-summary.tsx | 4 +-- .../automations/automation-run-open-target.ts | 8 ++--- .../automation-run-workspace-action.ts | 8 ++--- .../annotate/use-browser-annotation-images.ts | 2 +- .../assemble-chrome/browser-page-pane.tsx | 26 +++------------ .../describe-page/browser-page-types.ts | 16 ++++++++++ .../navigate/browser-file-editor-open.test.ts | 4 +-- .../navigate/browser-file-editor-open.ts | 2 +- .../navigate/navigate-browser-page-url.ts | 2 +- .../HtmlDocPreview.toolbar.test.tsx | 6 ++-- .../workspace-doc/HtmlDocPreview.tsx | 2 +- .../doc-preview-document-actions.test.ts | 4 +-- .../doc-preview-document-actions.ts | 6 ++-- .../dashboard-preview-http-actions.ts | 4 +-- .../AgentDashboardDrawer.focus.test.tsx | 2 +- .../dashboard/AgentDashboardDrawer.test.tsx | 2 +- .../dashboard-card-terminal-input.ts | 3 +- .../dashboard/reveal-dashboard-agent.test.ts | 4 +-- .../components/dashboard/useRetainedAgents.ts | 2 +- .../diff-comments/use-diff-comment-owner.ts | 2 +- .../use-visible-worktree-diff-comments.ts | 2 +- .../editor/EditorEditFileSurface.tsx | 2 +- .../editor/EditorFileLoadErrorView.test.tsx | 2 +- .../src/components/editor/EditorPanel.tsx | 2 +- .../src/components/editor/MonacoEditor.tsx | 5 ++- .../editor/MonacoGutterContextMenu.tsx | 2 +- .../ai-vault-session-log-content.test.tsx | 2 +- .../editor-autosave-conflict-flow.test.ts | 2 +- .../editor-autosave-controller.test.ts | 2 +- .../actions/check-run-details-fix-with-ai.ts | 4 +-- .../combined-diff-section-connection.ts | 2 +- .../components/editor/csv/csv-link-routing.ts | 2 +- .../editor/diff/monaco-view/DiffViewer.tsx | 2 +- .../diff/monaco-view/diff-viewer-props.ts | 2 +- .../editor/diff/sections/DiffSectionItem.tsx | 2 +- .../diff/sections/diff-section-item-props.ts | 2 +- .../editor/editor-dropped-file-open.ts | 2 +- .../ExternalFileChangeBanner.tsx | 2 +- .../ExternalFileChangeCompareDialog.tsx | 2 +- .../editor-external-change-tab-reset.ts | 2 +- .../editor-external-change-telemetry.ts | 2 +- ...restored-tab-conflict-scan.recheck.test.ts | 4 ++- .../editor-restored-tab-conflict-scan.test.ts | 2 +- .../editor-restored-tab-conflict-scan.ts | 2 +- .../useEditorPanelExternalContentEvents.ts | 2 +- .../git-graph/git-graph-rendering.test.tsx | 2 +- .../links/markdown-preview-link-actions.ts | 2 +- .../links/markdown-preview-source-routing.ts | 2 +- ...nPreview.link-routing.interaction.test.tsx | 4 +-- .../use-markdown-preview-source-foundation.ts | 2 +- .../monaco/use-monaco-markdown-annotations.ts | 2 +- .../useMarkdownDocuments.navigation.test.ts | 8 +++-- .../documents/useMarkdownDocuments.ts | 4 +-- .../useMarkdownDocuments.watch.test.ts | 8 +++-- .../buffer-text/editor-buffer-sharing.test.ts | 4 ++- .../editor-model-host-isolation.test.ts | 2 +- .../identity/editor-model-owner.ts | 2 +- .../notebook/kernel/ipynb-execution-host.ts | 4 +-- .../kernel/useIpynbCellExecution.test.tsx | 2 +- ...tored-editor-same-workspace-reown.test.tsx | 7 ++-- ...ed-editor-workspace-runtime-owner.test.tsx | 7 ++-- ...restored-editor-workspace-runtime-owner.ts | 4 +-- .../useRichMarkdownSuperscriptLinkSetup.ts | 2 +- ...arkdown-large-text-paste.selection.test.ts | 4 ++- .../rich-markdown-large-text-paste.test.ts | 4 ++- .../rich-markdown-async-image-paste.test.ts | 4 ++- .../rich-markdown-async-image-table.test.ts | 4 ++- .../rich-markdown-blob-image-paste.test.ts | 2 +- .../rich-markdown-image-context.test.ts | 2 +- .../images/rich-markdown-image-context.ts | 2 +- ...h-markdown-image-insert-code-block.test.ts | 2 +- .../images/rich-markdown-image-insert.ts | 2 +- .../images/rich-markdown-paste-image.ts | 2 +- .../images/useLocalImagePick.test.tsx | 4 ++- .../review/useRichMarkdownReviewController.ts | 2 +- .../editor-file-save-utf8-conversion.test.ts | 4 ++- .../editor-untitled-save-lifecycle.test.ts | 2 +- ...card-editor-file-changes.save-race.test.ts | 4 ++- ...ditor-save-disk-precondition.races.test.ts | 4 ++- .../editor-save-disk-precondition.test.ts | 2 +- ...tor-save-queue-closed-view-records.test.ts | 4 ++- .../editor-save-queue-closed-view.test.ts | 4 ++- .../queue/editor-save-queue-records.test.ts | 4 ++- .../editor-save-queue-shared-records.test.ts | 4 ++- .../save/queue/editor-save-queue.test.ts | 4 ++- .../editor-save-shared-model-dirty.test.ts | 4 ++- .../queue/editor-save-shared-model.test.ts | 4 ++- .../editor-final-newline-save.test.ts | 4 ++- .../transforms/editor-format-on-save.test.ts | 4 ++- .../editor-save-plugin-hook.test.ts | 4 ++- .../editor/use-custom-editor-outside-merge.ts | 2 +- .../useEditorPanelActiveTabContentLoad.ts | 7 ++-- .../useEditorPanelContentReloadTriggers.ts | 3 +- .../useEditorPanelContentState.test.tsx | 2 +- .../editor/useEditorPanelFileContentLoader.ts | 17 ++++------ ...ditorPanelFloatingTabContentState.test.tsx | 2 +- ...orPanelHostUnresolvedContentState.test.tsx | 2 +- ...EditorPanelVisibilityContentState.test.tsx | 2 +- .../file-actions/OpenInContextSubmenu.tsx | 2 +- .../workspace-editor-ssh-target.ts | 8 ++--- .../use-floating-terminal-create-actions.ts | 2 +- .../github-project/ProjectCellIssueType.tsx | 2 +- .../github-work-item-mutation-target.ts | 2 +- .../src/components/jira-user-picker.tsx | 2 +- .../src/components/linear-api-key-dialog.tsx | 2 +- ...inear-issue-attribute-filter-dropdowns.tsx | 2 +- .../linear-issue-project-selector.tsx | 2 +- .../components/linear-issue-sub-issues.tsx | 2 +- .../linear-issue-workspace-detail-state.ts | 2 +- .../linear-item-drawer-comment-footer.tsx | 2 +- .../linear-item-drawer-edit-controller.tsx | 2 +- .../ManagedRuntimeRemoveDialog.tsx | 2 +- .../NativeChatImageAttachmentPreview.test.tsx | 2 +- .../uploads/native-chat-attachment-owner.ts | 4 +-- .../native-chat-composer-workspace.ts | 2 +- .../native-chat-skill-discovery-context.ts | 2 +- .../drafts/native-chat-draft-owner.ts | 2 +- .../host-access/native-chat-sign-in.ts | 2 +- .../use-native-chat-host-outage-notice.ts | 2 +- .../use-native-chat-host-outage.ts | 2 +- .../native-chat-file-link-existence.test.ts | 2 +- .../native-chat-file-link-existence.ts | 2 +- .../native-chat-host-file-open.test.ts | 4 ++- .../native-chat-http-link-source-owner.ts | 2 +- .../use-native-chat-file-link-existence.tsx | 2 +- .../NativeChatTranscriptChrome.test.tsx | 2 +- .../native-chat-image-runtime-context.ts | 4 +-- ...use-structured-agent-session-host-label.ts | 2 +- .../pane/routing/native-chat-open-wake.ts | 2 +- .../routing/native-chat-split-flow.test.ts | 4 +-- .../use-native-chat-toggle-shortcut.ts | 2 +- .../native-chat-workspace-selection.ts | 4 +-- .../native-chat-session-option-discovery.ts | 4 +-- ...tructured-agent-session-tab-owner-cache.ts | 2 +- .../use-work-item-source-foundation.ts | 2 +- .../onboarding-completion-agent-launch.ts | 2 +- .../use-onboarding-flow-actions.test.tsx | 2 +- .../provider-account-scope.ts | 2 +- .../pull-request-page/checks/tab.tsx | 2 +- .../quick-open-file-history.test.ts | 2 +- .../ai-vault-original-pane-actions.ts | 4 +-- .../ai-vault-session-delete-action.ts | 2 +- .../checks-panel/checks-panel-forge-owner.ts | 2 +- .../use-checks-panel-generation.tsx | 2 +- .../use-checks-panel-controller-state.tsx | 4 +-- .../useFileSearchRunner.test.tsx | 2 +- .../content-search/useFileSearchRunner.ts | 4 +-- .../file-explorer-operation-owner.ts | 14 +++++--- .../file-explorer/panel/FileExplorer.tsx | 2 +- .../tree/FileExplorerFilesTreePane.tsx | 2 +- .../tree/use-file-explorer-ignored-paths.ts | 2 +- .../use-file-explorer-tree-load-effects.ts | 2 +- .../file-explorer-stale-retry.test.tsx | 2 +- ...se-create-pull-request-field-generation.ts | 2 +- .../right-sidebar/ports-panel-host.ts | 4 +-- .../source-control/ai/recovery-launch.ts | 2 +- .../runSourceControlAgentActionStart.test.ts | 2 +- .../ai/section-agent-placement.ts | 6 ++-- .../ai/use-ai.operation-recovery.test.tsx | 2 +- ...e-commit-message-generation.cancel.test.ts | 2 +- .../listing/use-worktree-context.ts | 4 +-- .../useSourceControlSubmoduleStatus.test.tsx | 4 ++- .../source-control/panel/worktree-scope.tsx | 2 +- .../sync/stale-conflict-operation-poll.ts | 2 +- .../source-control/sync/use-git-history.ts | 2 +- ...use-source-control-branch-compare.test.tsx | 4 ++- .../use-source-control-git-history.test.tsx | 4 ++- .../use-worktree-git-status-observation.ts | 2 +- .../sync/worktree-git-owner-target.ts | 5 ++- .../settings/general/GeneralPane.tsx | 2 +- .../settings/page/use-settings-store-model.ts | 2 +- .../TerminalPane.section-lifetime.test.tsx | 4 ++- .../ManageSessionsSection.tsx | 2 +- .../sidebar/WslMovedProjectsSection.tsx | 4 +-- .../drop/useSidebarProjectDrop.ts | 2 +- .../AddRepoExistingWslHostOffer.tsx | 2 +- .../AddRepoWindowsDriveNotice.tsx | 2 +- .../host-selection/AddRepoWslHostOffer.tsx | 2 +- .../use-worktree-context-menu-commands.ts | 2 +- ...e-worktree-dirty-change-hydration.test.tsx | 2 +- .../deletion/delete-worktree-flow.ts | 2 +- .../deletion/folder-workspace-delete.ts | 2 +- .../run-worktree-delete-with-toast.ts | 2 +- .../ssh-workspace-forget-resolution.ts | 2 +- .../use-delete-worktree-status-hydration.ts | 4 +-- .../open/WorktreeOpenInMenu.tsx | 4 +-- .../open/WorktreeRowOpenInSubMenu.tsx | 2 +- .../parenting/ParentMachineBadge.tsx | 2 +- .../sleep/SleepTwinWorkspaceDialog.tsx | 2 +- .../sleep/workspace-sleep-follower.ts | 2 +- .../sleep/workspace-sleep-target.ts | 2 +- ...pace-board-task-status-sync.queued.test.ts | 2 +- .../use-workspace-board-task-status-sync.ts | 6 ++-- .../workspace-board-task-status-sync.ts | 2 +- .../activity/activate-retained-agent-row.ts | 4 +-- .../activity/use-worktree-activity-status.ts | 2 +- .../activity/use-worktree-agent-activation.ts | 4 +-- .../use-worktree-card-activation-actions.ts | 2 +- .../use-worktree-card-foundation.ts | 2 +- .../host/WorktreeWslHostStartMenuItem.tsx | 2 +- .../review/WorkspaceAttachmentOrigins.tsx | 2 +- .../folder/folder-workspace-agent-startup.ts | 6 ++-- .../folder-workspace-composer-path-status.ts | 4 +-- .../folder-workspace-composer-submit.ts | 2 +- ....lineage-agent-expansion-coupling.test.tsx | 2 +- .../listing/use-folder-path-statuses.ts | 2 +- .../visible-worktree-activity-inputs.ts | 2 +- .../worktree-list/navigation/use-keyboard.ts | 2 +- .../rows/FolderPathStatusIndicator.tsx | 2 +- .../rows/HostSectionHeaderMenu.tsx | 2 +- .../rows/project-group-header-actions.tsx | 2 +- .../components/sidebar/wsl-host-removal.ts | 2 +- .../status-bar/ClaudeSwitcherMenu.tsx | 2 +- .../use-codex-switcher-controller.ts | 2 +- .../status-bar/use-resource-usage-actions.ts | 2 +- .../use-resource-usage-derived-model.ts | 5 ++- .../workspace-space-visit-activity.ts | 2 +- .../src/components/tab-bar/EditorFileTab.tsx | 2 +- .../tab-bar/agent-menu-launch-facts.ts | 2 +- .../tab-bar/open-tab-search-entries.ts | 2 +- .../src/components/tab-bar/open-tab-search.ts | 2 +- .../tab-bar-layout-owner-props.test.ts | 2 +- .../tab-bar/tab-create-entry-local-path.ts | 2 +- .../tab-bar/use-tab-bar-item-actions.ts | 2 +- .../tab-bar/use-tab-bar-runtime-model.ts | 3 +- .../task-page/jira/IssueAssigneeField.tsx | 2 +- .../task-page/jira/IssueUserField.tsx | 2 +- .../jira/task-page-jira-status-order.ts | 2 +- .../use-task-page-jira-creation-metadata.ts | 2 +- .../jira/use-task-page-jira-issue-creation.ts | 2 +- .../components/task-page/linear/Filters.tsx | 2 +- ...page-linear-committed-publication.test.tsx | 2 +- .../linear/task-page-linear-issue-model.tsx | 2 +- .../task-page-linear-refresh-entry.test.tsx | 2 +- ...ask-page-linear-refresh-lifecycle.test.tsx | 2 +- ...task-page-linear-refresh-test-fixtures.tsx | 2 +- .../task-page-linear-refresh-writers.test.tsx | 2 +- .../linear/use-task-page-linear-board.ts | 2 +- .../use-task-page-linear-context-state.ts | 2 +- .../use-task-page-linear-creation-state.ts | 2 +- .../use-task-page-linear-issue-creation.ts | 2 +- .../use-task-page-linear-project-creation.ts | 2 +- .../linear/use-task-page-linear-view-state.ts | 2 +- .../task-page/use-task-page-detail-routing.ts | 2 +- .../use-task-page-provider-metadata.ts | 2 +- .../pane-ownership/codex-restart-main-pane.ts | 2 +- .../errors/TerminalErrorToast.tsx | 2 +- .../errors/terminal-error-display.ts | 4 +-- .../host-files/terminal-file-path-mapping.ts | 6 ++-- .../host-state/terminal-pane-host-state.ts | 2 +- .../terminal-pane-local-windows-conpty.ts | 2 +- .../host-state/terminal-pane-owner-context.ts | 4 +-- .../input/file-drop/terminal-drop-handler.ts | 2 +- .../terminal-drop-source-owner.test.ts | 2 +- .../file-drop/terminal-drop-worktree-path.ts | 2 +- .../input/paste/terminal-pane-menu-paste.ts | 2 +- .../paste/terminal-pane-paste-execution.ts | 2 +- .../paste/terminal-pane-paste-listeners.ts | 2 +- .../input/terminal-input-host-platform.ts | 4 +-- .../split/terminal-pane-split-in-main.ts | 2 +- .../terminal-link-file-open-routing.test.ts | 2 +- .../terminal-link-provider-batching.test.ts | 2 +- ...l-link-provider-candidate-failures.test.ts | 6 ++-- .../terminal-link-provider-chat-cases.test.ts | 2 +- ...minal-link-provider-link-detection.test.ts | 4 +-- .../terminal-link-provider-markdown.test.ts | 4 ++- ...erminal-link-same-id-ssh-file-host.test.ts | 2 +- .../files/terminal-worktree-path-link.test.ts | 2 +- .../files/terminal-worktree-path-link.ts | 4 +-- .../handles/terminal-handle-links.test.ts | 2 +- .../links/handles/terminal-handle-links.ts | 4 +-- .../http/terminal-http-link-source-owner.ts | 4 +-- .../terminal-link-osc-url-routing.test.ts | 2 +- .../terminal-link-click-fallback.test.ts | 2 +- .../terminal-link-handlers-test-harness.ts | 2 +- .../terminal-link-open-beside-source.test.ts | 2 +- ...erminal-link-paired-click-fallback.test.ts | 4 +-- .../terminal-pane-mount-preparation.ts | 2 +- .../parked-terminal-command-status.test.ts | 2 +- .../parked-terminal-command-status.ts | 2 +- .../terminal-hidden-worktree-retention.ts | 2 +- .../lifecycle/exited-split-pane-close.ts | 2 +- ...n-reattach-wsl-distro-stopped-hold.test.ts | 2 +- .../pty-connection/spawn/main-starts-pane.ts | 2 +- .../spawn/wsl-distro-stopped-hold-pane.ts | 2 +- .../startup/cold-restore-resume-startup.ts | 2 +- .../server-outage/remote-server-outage.ts | 2 +- .../recovery/wsl/WslHostStoppedCard.tsx | 2 +- .../recovery/wsl/WslHostUnavailableBanner.tsx | 2 +- .../recovery/wsl/use-wsl-host-stopped-pane.ts | 7 ++-- .../TerminalPaneRecoveryPortals.test.tsx | 2 +- .../recovery/TerminalPaneRecoveryPortals.tsx | 4 +-- .../TerminalRemoteRuntimeReconnectBanner.tsx | 2 +- .../recovery/use-managed-pairing-refused.ts | 2 +- .../remote-runtime-pty-transport.ts | 2 +- .../terminal-agent-session-fork.ts | 2 +- ...minal-parked-watcher-sync-entries.test.tsx | 2 +- .../initial-terminal-admission-wait.test.tsx | 2 +- ...nitial-terminal-structured-launch.test.tsx | 2 +- .../use-new-linear-issue-projects.ts | 2 +- .../use-terminal-editor-close-queue.ts | 2 +- .../use-terminal-watcher-effects.ts | 2 +- .../use-terminal-workspace-foundation.ts | 2 +- .../workspace-cleanup-facet-row-caches.ts | 2 +- .../workspace-cleanup-facets.ts | 2 +- .../use-worktree-jump-palette-task-url.ts | 2 +- .../worktree-jump-palette-worktree-row.tsx | 2 +- .../WslHostStoppedNotice.test.tsx | 2 +- .../wsl-host-stopped/WslHostStoppedNotice.tsx | 2 +- .../wsl-host-stopped/use-stopped-wsl-host.ts | 4 +-- .../gitlab-provider-selection.ts | 2 +- .../composer-state/quick-startup-plan.ts | 6 ++-- .../composer-state/runtime-target-model.ts | 2 +- .../runtime-target-selection.ts | 8 ++--- ...tor-external-watch-background-trim.test.ts | 2 +- .../src/hooks/editor-external-watch-scope.ts | 2 +- ...ditor-external-watch-selected-host.test.ts | 4 +-- .../editor-external-watch-target-rows.ts | 2 +- .../src/hooks/ipc-events-test-harness.ts | 4 ++- .../browser-request-workspace-owner.ts | 4 +-- .../mobile-terminal-close-ipc-bridge.ts | 2 +- .../ssh-managed-server-state-effects.ts | 2 +- .../terminal-pane-reveal-ipc-bridge.ts | 2 +- .../terminal-presentation-ipc-bridge.ts | 2 +- .../ipc-events/terminal-request-ipc-bridge.ts | 2 +- .../terminal-ui-routing-ipc-bridge.ts | 4 +-- .../ipc-events/worktree-event-runtime.ts | 2 +- .../hooks/ipc-events/wsl-host-ipc-bridge.ts | 2 +- ...pc-tab-switch-structured-tab-cycle.test.ts | 4 ++- src/renderer/src/hooks/ipc-tab-switch.ts | 2 +- ...e-active-skill-discovery-runtime-target.ts | 2 +- .../src/hooks/useAgentDetectionTarget.ts | 4 +-- ...seEditorExternalWatch-switch-back.test.tsx | 4 ++- .../useEditorExternalWatch-targets.test.ts | 2 +- src/renderer/src/hooks/useIssueMetadata.ts | 2 +- .../src/hooks/useLinearIssuePublication.ts | 2 +- .../hooks/useSettingsNavigationMetadata.ts | 2 +- ...e-ai-vault-structured-session-host.test.ts | 4 ++- .../activate-ai-vault-structured-session.ts | 2 +- src/renderer/src/lib/agent-launch-failure.ts | 2 +- .../accounts/agent-account-restart-startup.ts | 4 +-- .../codex-session-restart-shell-flap.test.ts | 2 +- .../codex/codex-session-restart.test.ts | 2 +- .../ai-vault-tab-title-sync-inputs.ts | 2 +- .../launch-agent-session-continuation.ts | 2 +- ...ent-launch-caller-prompt-transport.test.ts | 8 +++-- .../agent-launch-caller-routing.test.ts | 8 +++-- .../new-tab/launch-agent-execution-context.ts | 8 ++--- ...unch-agent-in-new-tab-main-surface.test.ts | 3 +- .../new-tab/launch-agent-tab-refusal.ts | 2 +- .../agent-launch-tab-main-written.test.ts | 4 ++- .../pane/agent-launch-tab-main-written.ts | 2 +- .../pane/agent-launch-tab-presentation.ts | 2 +- .../routing/agent-launch-route-input.test.ts | 4 +-- .../routing/agent-launch-route-input.ts | 2 +- ...-agent-session-launch-admission-notices.ts | 2 +- .../history/ai-vault-resume-platform.ts | 2 +- .../resume/history/ai-vault-resume-shell.ts | 7 ++-- .../resume/host-mirrored-pane-liveness.ts | 2 +- .../resume/resume-sleeping-agent-session.ts | 2 +- .../resume/sleeping-agent-session-launch.ts | 4 +-- .../sleeping-record-execution-host-scope.ts | 4 +-- .../browser/navigation/browser-link-owner.ts | 4 +-- .../browser/navigation/browser-link-reveal.ts | 5 ++- .../http-link-in-group-availability.ts | 2 +- .../browser/navigation/http-link-routing.ts | 2 +- .../palette/browser-palette-page-entries.ts | 2 +- .../browser-workspace-tab-activation.ts | 2 +- .../workspace/workspace-browser-link-open.ts | 4 +-- .../workspace-browser-route-eligibility.ts | 2 +- .../workspace/workspace-browser-tab-close.ts | 2 +- .../workspace/workspace-browser-tab-open.ts | 2 +- .../lib/command-code-prompt-status-seed.ts | 2 +- .../src/lib/doc-preview-grants.test.ts | 2 +- src/renderer/src/lib/doc-preview-grants.ts | 2 +- .../src/lib/editor-file-child-owner.ts | 6 ++-- .../src/lib/editor-file-operation-owner.ts | 4 +-- .../lib/editor-file-operation-provenance.ts | 10 +++--- src/renderer/src/lib/ensure-simulator-tab.ts | 4 +-- .../src/lib/environment-setup-agent-launch.ts | 2 +- .../lib/execute-open-editor-path-move.test.ts | 2 +- .../lib/external-editor-open-capability.ts | 2 +- .../src/lib/file-owner-runtime-target.ts | 4 +-- .../src/lib/file-preview-link-open.ts | 2 +- .../src/lib/file-preview-page-conversion.ts | 2 +- src/renderer/src/lib/file-preview.ts | 4 +-- .../src/lib/fix-checks-agent-launch.ts | 4 +-- .../lib/floating-workspace-tab-creation.ts | 2 +- src/renderer/src/lib/git-graph-tab.ts | 4 +-- .../lib/github-source-runtime-context.test.ts | 2 +- .../src/lib/github-source-runtime-context.ts | 2 +- src/renderer/src/lib/local-file-access.ts | 2 +- .../src/lib/local-preflight-context.ts | 4 +-- .../src/lib/open-agent-message-sender.test.ts | 4 ++- .../src/lib/open-editor-move-owner.ts | 2 +- .../src/lib/open-html-file-preview.ts | 2 +- .../src/lib/order-empty-query-worktrees.ts | 2 +- .../src/lib/parked-terminal-host-hydration.ts | 2 +- .../src/lib/quick-open-file-history.ts | 2 +- src/renderer/src/lib/repo-slug-cache.ts | 2 +- .../lib/resolved-worktree-execution-host.ts | 2 +- .../src/lib/reveal-in-file-manager.ts | 2 +- src/renderer/src/lib/reveal-terminal-pane.ts | 4 +-- src/renderer/src/lib/review-owner.ts | 5 ++- .../src/lib/runtime-session-mirror-targets.ts | 2 +- .../src/lib/runtime-workspace-file-route.ts | 4 +-- .../src/lib/simulator-palette-search.ts | 2 +- .../src/lib/simulator-tab-layout-owner.ts | 2 +- .../lib/simulator-tab-palette-activation.ts | 2 +- ...ent-session-launch-windows-quoting.test.ts | 4 +-- .../src/lib/ssh-mutation-expectation.ts | 2 +- .../src/lib/terminal-worktree-route.ts | 9 ++++-- .../src/lib/user-opened-local-path.test.ts | 2 +- .../work-items/linear/linear-issue-write.ts | 2 +- .../lib/workspace-doc-address-input.test.ts | 2 +- .../src/lib/workspace-doc-address-input.ts | 2 +- .../lib/workspace-file-browser-open-target.ts | 4 +-- .../src/lib/workspace-file-drag-source.ts | 2 +- .../active-worktree-removal-successor.test.ts | 14 ++++---- .../active-worktree-removal-successor.ts | 12 +++---- .../worktree-initial-terminal-seeding.ts | 2 +- .../sidebar-worktree-activation.ts | 6 ++-- .../workspace-activation-path-gate.test.ts | 14 ++++---- .../workspace-activation-terminal-focus.ts | 2 +- .../workspace-navigation-toast-action.tsx | 2 +- .../activation}/workspace-surface-reveal.ts | 8 ++--- .../activation}/workspace-switch-user-act.ts | 0 ...ktree-activation-automation-filter.test.ts | 4 +-- .../worktree-activation-outcome.ts | 8 ++--- .../worktree-activation-pty-inventory.ts | 2 +- .../activation/worktree-activation-visit.ts | 2 +- .../activation/worktree-activation.ts | 11 +++---- .../worktree-agent-activation-gate.ts | 2 +- ...live-surface-adoption-layout-owner.test.ts | 2 +- .../worktree-agent-live-surface-adoption.ts | 6 ++-- .../activation}/worktree-jump-navigation.ts | 9 ++++-- .../worktree-nav-view-history-replay.ts | 2 +- ...ivation-preserved-pane-replacement.test.ts | 14 ++++---- ...worktree-reactivation-tab-forkbomb.test.ts | 22 ++++++------- .../activation}/worktree-visit-recency.ts | 6 ++-- .../activation}/wsl-moved-chat-activation.ts | 4 +-- .../workspace-attachment-observed-origin.ts | 12 +++---- .../launch-work-item-direct-agent-routing.ts | 4 +-- .../launch-work-item-direct-preflight.ts | 2 +- ...unch-work-item-direct-route-preparation.ts | 4 +-- .../launch-work-item-direct-test-fixture.ts | 2 +- .../creation/worktree-creation-completion.ts | 2 +- .../worktree-creation-flow-execute.ts | 6 ++-- .../worktree-creation-flow-startup.ts | 2 +- .../worktree-creation-ready-toast.tsx | 2 +- .../worktree-creation-structured-session.ts | 6 ++-- .../wsl-host-windows-drive-refusal-toast.ts | 2 +- .../ownership}/active-workspace-host.ts | 2 +- .../ownership}/connection-context.test.ts | 19 ++++++----- .../ownership}/connection-context.ts | 6 ++-- .../ownership}/connection-owner-resolution.ts | 32 +++++++++---------- .../direct-ssh-target-owner-index.ts | 0 .../direct-ssh-target-scope-types.ts | 4 +-- .../direct-ssh-target-scope.test.ts | 6 ++-- .../ownership}/direct-ssh-target-scope.ts | 5 ++- .../ownership}/folder-workspace-connection.ts | 21 ++++-------- .../folder-workspace-runtime-owner.ts | 14 ++++---- .../qualified-worktree-execution-owner.ts | 12 +++---- .../ownership}/repo-runtime-owner.ts | 8 ++--- .../ownership}/repository-owner-index.ts | 4 +-- .../ownership}/resolve-owner.ts | 18 +++++------ .../runtime-session-mirror-owners.ts | 4 +-- .../ownership}/single-runtime-legacy-owner.ts | 2 +- .../ownership}/unified-tab-host-ownership.ts | 14 ++++---- .../ownership}/workspace-copy-owner.ts | 14 ++++---- .../ownership}/workspace-row-owner-host.ts | 12 +++---- .../workspace-runtime-environment.ts | 2 +- .../workspace-runtime-host-ownership.ts | 4 +-- .../workspace-terminal-host-authority.test.ts | 2 +- .../workspace-terminal-host-authority.ts | 14 ++++---- .../worktree-execution-host-alias.ts | 4 +-- .../worktree-host-connection-phase.ts | 6 ++-- ...ktree-live-terminal-surface-owners.test.ts | 4 +-- .../worktree-live-terminal-surface-owners.ts | 8 ++--- .../worktree-operation-catalog-route.ts | 11 +++---- .../worktree-operation-generation.ts | 4 +-- .../worktree-operation-route-index.test.ts | 0 .../worktree-operation-route.test.ts | 2 +- .../ownership}/worktree-operation-route.ts | 17 ++++------ .../ownership}/worktree-owner-route.ts | 4 +-- .../ownership}/worktree-owner-rows-token.ts | 0 .../ownership}/worktree-row-open-in-owner.ts | 10 +++--- .../ownership/worktree-runtime-owner.ts | 12 +++---- .../ownership}/wsl-moved-project-use-here.ts | 4 +-- ...lder-workspace-path-status-cache-expiry.ts | 2 +- .../paths}/folder-workspace-path-status.ts | 4 +-- .../persistence/session-write-subscriber.ts | 2 +- .../workspace-session-host-contention.ts | 2 +- .../workspace-session-host-persistence.ts | 2 +- .../workspace-session-unified-tabs.ts | 2 +- .../wsl-drive-unc-renderer-store-rewrites.ts | 26 ++++++++------- .../wsl-move-renderer-rewrite-client.ts | 2 +- .../wsl-move-renderer-store-keys.ts | 8 ++--- .../wsl-move-renderer-store-rewrites.test.ts | 8 ++--- .../wsl-move-renderer-store-rewrites.ts | 14 ++++---- .../search/palette-repo-resolution.ts | 2 +- .../tabs/workspace-tab-agent-metadata.ts | 2 +- .../tabs/workspace-tab-palette-activation.ts | 2 +- .../workspace-tab-palette-entry-builder.ts | 2 +- .../tabs/workspace-tab-palette-results.ts | 2 +- ...ree-palette-runtime-owner-identity.test.ts | 2 +- .../worktrees/worktree-palette-search.ts | 2 +- .../tabs}/activate-tab-and-focus-pane.test.ts | 2 +- .../tabs}/activate-tab-and-focus-pane.ts | 2 +- .../tabs}/cycled-tab-owner-activation.ts | 2 +- .../tabs}/terminal-tab-owner-activation.ts | 2 +- .../tabs}/worktree-tab-bucket-projection.ts | 0 src/renderer/src/lib/worktree-git-copy.ts | 6 ++-- .../src/lib/worktree-sort-order-host-split.ts | 2 +- .../files}/workspace-file-host-routing.ts | 7 ++-- .../actions/web-runtime-leaf-move.ts | 2 +- .../actions/web-runtime-pane-layout-update.ts | 2 +- ...e-session-terminal-pane-delegation.test.ts | 2 +- .../actions/web-runtime-split-focus.ts | 2 +- .../actions/web-runtime-split-source-pty.ts | 2 +- .../actions/web-runtime-tab-properties.ts | 2 +- .../creation/web-runtime-terminal-creation.ts | 2 +- .../host-terminal-scrollback-hydration.ts | 2 +- .../display}/execution-host-display-label.ts | 6 ++-- .../platform}/execution-host-facts.test.ts | 6 ++-- .../hosts/platform}/execution-host-facts.ts | 23 +++++++------ .../platform}/execution-host-platform-fact.ts | 2 +- .../hosts/selection}/default-creation-host.ts | 10 +++--- .../wsl}/local-project-runtime-workspace.ts | 10 +++--- .../hosts/wsl}/wsl-distro-hold-copy.ts | 2 +- .../hosts/wsl}/wsl-host-availability.ts | 8 ++--- .../hosts/wsl}/wsl-host-stopped-status.ts | 0 .../hosts/wsl}/wsl-host-user-start.ts | 2 +- .../src/runtime/jira/runtime-jira-client.ts | 4 +-- .../jira/runtime-jira-summary-client.ts | 4 +-- .../jira/runtime-jira-user-fields-client.ts | 4 +-- .../runtime/linear/runtime-linear-client.ts | 2 +- .../linear/runtime-linear-issue-client.ts | 2 +- .../linear/runtime-linear-project-client.ts | 2 +- .../structured-chat-name-observation.ts | 2 +- .../structured-agent-session-owner.ts | 6 +++- .../editor-buffer-dirty-readers.test.ts | 2 +- .../main-owned-terminal-list.ts | 2 +- .../mobile-session-inputs.ts | 2 +- .../closing/close-mirrored-editor-tab.test.ts | 4 +-- .../closing/close-mirrored-editor-tab.ts | 4 +-- .../mirrored-workspace-owner.ts | 2 +- .../web-session-visible-tab-pick-report.ts | 10 +++--- .../commands/layout-apply-send.ts | 2 +- .../commands/layout-owner-command.test.ts | 2 +- .../server/server-layout-apply.test.ts | 4 +-- .../server-layout-editor-handover.test.ts | 4 +-- .../server-layout-frames-held-tabs.test.ts | 4 +-- .../folder-workspace-mutations.ts | 4 +-- .../folder-workspace-routing.ts | 4 +-- .../projects/github-project-row-owner.ts | 2 +- .../pull-requests/linked-review-clear.ts | 2 +- .../store/github/refresh/worktree-refresh.ts | 2 +- .../github/repositories/repository-routing.ts | 2 +- .../github/work-items/work-item-routing.ts | 2 +- .../src/store/repos/repo-add-actions.ts | 4 +-- .../src/store/repos/repo-host-identity.ts | 5 +++ .../repo-removal-host-twin-attribution.ts | 4 +-- src/renderer/src/store/repos/repo-removal.ts | 11 +++---- .../runtime-detected-agents.test-fixture.ts | 2 +- .../runtime-detected-agents.ts | 2 +- .../hydration/browser-hydration-actions.ts | 2 +- .../profiles/browser-cookie-import-actions.ts | 2 +- .../browser-profile-import-actions.ts | 2 +- .../diff-comments/diff-comment-owner.ts | 4 +-- .../diff-comments/diff-comment-persistence.ts | 2 +- .../worktree-diff-comments-selector.ts | 7 ++-- .../buffers/editor-buffer-identity-cache.ts | 4 +-- .../editor/buffers/editor-buffer-identity.ts | 2 +- .../editor/checks/check-run-details-owner.ts | 10 +++--- .../slices/editor/file-ids/editor-file-ids.ts | 2 +- ...itor-file-rename-twin-layout-owner.test.ts | 2 +- .../slices/editor/git/diff-runtime-owner.ts | 2 +- .../slices/editor/git/git-operation-target.ts | 2 +- .../editor/markdown/markdown-link-action.ts | 2 +- ...editor-file-rename-through-layout-owner.ts | 5 ++- .../editor/tabs/editor-view-placement.ts | 2 +- ...stored-editor-move-through-layout-owner.ts | 2 +- .../editor/tabs/workspace-editor-item.ts | 2 +- .../jira/jira-collection-read-actions.ts | 2 +- .../slices/jira/jira-connection-actions.ts | 2 +- .../slices/jira/jira-read-coordination.ts | 4 +-- .../src/store/slices/linear/linear-cache.ts | 5 ++- .../linear/linear-slice-request-state.ts | 2 +- .../store/slices/linear/linear-slice-scope.ts | 7 ++-- .../src/store/slices/preflight/preflight.ts | 2 +- .../worktree-visibility-owner-settings.ts | 2 +- .../worktree-visibility-settings-write.ts | 2 +- .../store/slices/ssh/ssh-target-cleanup.ts | 2 +- .../slices/tabs/preview-tab-promotion.ts | 2 +- .../store/slices/tabs/tabs-create-actions.ts | 2 +- .../slices/tabs/tabs-create-placement.ts | 2 +- .../workspace-cleanup-agent-evidence.ts | 2 +- .../workspace-cleanup-candidate-enrichment.ts | 2 +- .../workspace-cleanup-local-evidence.ts | 2 +- .../workspace-cleanup-removal-targets.ts | 2 +- .../worktrees/create/create-worktree.ts | 2 +- .../create/prefetch-worktree-create-base.ts | 2 +- .../create/worktree-create-warning-toast.ts | 2 +- .../listing/detected-worktree-meta.test.ts | 2 +- .../listing/worktree-owner-target.ts | 5 ++- .../hosted-review-push-target-ensure.ts | 2 +- .../metadata/update-worktree-meta.ts | 4 +-- .../session/worktree-identity-rename-state.ts | 2 +- .../session/worktree-terminal-reference.ts | 2 +- .../session/worktree-visit-recency.ts | 2 +- .../teardown/force-delete-preserved-branch.ts | 2 +- .../host-qualified-worktree-removal.ts | 4 +-- .../host-qualified-worktree-row-removal.ts | 2 +- .../preview-nested-worktree-removal.ts | 2 +- .../purge-stale-runtime-host-state.ts | 2 +- .../teardown/remove-worktree-store-cleanup.ts | 2 +- .../worktrees/teardown/remove-worktree.ts | 2 +- .../teardown/worktree-purge-state.ts | 2 +- .../worktrees/worktree-slice-contract.ts | 2 +- .../recently-closed-terminal-tabs.ts | 2 +- ...terminal-active-workspace-creation.test.ts | 2 +- .../terminal-active-workspace-creation.ts | 2 +- .../store/terminals/terminal-created-shell.ts | 2 +- ...erminal-tab-create-through-layout-owner.ts | 2 +- .../terminal-tab-layout-owner-actions.ts | 2 +- .../terminals/terminal-workspace-routing.ts | 2 +- .../workspace-terminal-placeholders.test.ts | 2 +- .../host-twin-worktree-purge.test.ts | 2 +- .../selection/known-worktree-selection.ts | 2 +- .../wsl-move/wsl-move-storage-dispositions.ts | 18 ++++++----- tests/e2e/claude-agent-row-view.unit.test.ts | 8 +++-- .../pty-spawn-cwd-folder-owner.unit.test.ts | 2 +- ...ask-page-linear-refresh-authority.test.tsx | 2 +- 649 files changed, 1211 insertions(+), 1108 deletions(-) rename src/renderer/src/{lib => components/file-actions}/workspace-editor-ssh-target.ts (79%) rename src/renderer/src/lib/{ => workspace/activation}/active-worktree-removal-successor.test.ts (93%) rename src/renderer/src/lib/{ => workspace/activation}/active-worktree-removal-successor.ts (95%) rename src/renderer/src/lib/{ => workspace/activation}/sidebar-worktree-activation.ts (89%) rename src/renderer/src/lib/{ => workspace/activation}/workspace-activation-path-gate.test.ts (83%) rename src/renderer/src/lib/{ => workspace/activation}/workspace-navigation-toast-action.tsx (92%) rename src/renderer/src/lib/{ => workspace/activation}/workspace-surface-reveal.ts (87%) rename src/renderer/src/lib/{ => workspace/activation}/workspace-switch-user-act.ts (100%) rename src/renderer/src/lib/{ => workspace/activation}/worktree-activation-outcome.ts (81%) rename src/renderer/src/lib/{ => workspace/activation}/worktree-jump-navigation.ts (94%) rename src/renderer/src/lib/{ => workspace/activation}/worktree-nav-view-history-replay.ts (98%) rename src/renderer/src/lib/{ => workspace/activation}/worktree-reactivation-preserved-pane-replacement.test.ts (95%) rename src/renderer/src/lib/{ => workspace/activation}/worktree-reactivation-tab-forkbomb.test.ts (92%) rename src/renderer/src/lib/{ => workspace/activation}/worktree-visit-recency.ts (94%) rename src/renderer/src/lib/{ => workspace/activation}/wsl-moved-chat-activation.ts (85%) rename src/renderer/src/lib/{ => workspace/attachments}/workspace-attachment-observed-origin.ts (87%) rename src/renderer/src/lib/{ => workspace/creation}/wsl-host-windows-drive-refusal-toast.ts (93%) rename src/renderer/src/lib/{ => workspace/ownership}/active-workspace-host.ts (96%) rename src/renderer/src/lib/{ => workspace/ownership}/connection-context.test.ts (95%) rename src/renderer/src/lib/{ => workspace/ownership}/connection-context.ts (86%) rename src/renderer/src/lib/{ => workspace/ownership}/connection-owner-resolution.ts (85%) rename src/renderer/src/lib/{ => workspace/ownership}/direct-ssh-target-owner-index.ts (100%) rename src/renderer/src/lib/{ => workspace/ownership}/direct-ssh-target-scope-types.ts (82%) rename src/renderer/src/lib/{ => workspace/ownership}/direct-ssh-target-scope.test.ts (95%) rename src/renderer/src/lib/{ => workspace/ownership}/direct-ssh-target-scope.ts (96%) rename src/renderer/src/lib/{ => workspace/ownership}/folder-workspace-connection.ts (80%) rename src/renderer/src/lib/{ => workspace/ownership}/folder-workspace-runtime-owner.ts (94%) rename src/renderer/src/lib/{ => workspace/ownership}/qualified-worktree-execution-owner.ts (79%) rename src/renderer/src/lib/{ => workspace/ownership}/repo-runtime-owner.ts (94%) rename src/renderer/src/lib/{ => workspace/ownership}/repository-owner-index.ts (97%) rename src/renderer/src/lib/{ => workspace/ownership}/resolve-owner.ts (94%) rename src/renderer/src/lib/{ => workspace/ownership}/runtime-session-mirror-owners.ts (92%) rename src/renderer/src/lib/{ => workspace/ownership}/single-runtime-legacy-owner.ts (89%) rename src/renderer/src/lib/{ => workspace/ownership}/unified-tab-host-ownership.ts (88%) rename src/renderer/src/lib/{ => workspace/ownership}/workspace-copy-owner.ts (96%) rename src/renderer/src/lib/{ => workspace/ownership}/workspace-row-owner-host.ts (71%) rename src/renderer/src/lib/{ => workspace/ownership}/workspace-runtime-host-ownership.ts (93%) rename src/renderer/src/lib/{ => workspace/ownership}/workspace-terminal-host-authority.test.ts (99%) rename src/renderer/src/lib/{ => workspace/ownership}/workspace-terminal-host-authority.ts (93%) rename src/renderer/src/lib/{ => workspace/ownership}/worktree-execution-host-alias.ts (81%) rename src/renderer/src/lib/{ => workspace/ownership}/worktree-live-terminal-surface-owners.test.ts (88%) rename src/renderer/src/lib/{ => workspace/ownership}/worktree-live-terminal-surface-owners.ts (94%) rename src/renderer/src/lib/{ => workspace/ownership}/worktree-operation-catalog-route.ts (96%) rename src/renderer/src/lib/{ => workspace/ownership}/worktree-operation-generation.ts (96%) rename src/renderer/src/lib/{ => workspace/ownership}/worktree-operation-route-index.test.ts (100%) rename src/renderer/src/lib/{ => workspace/ownership}/worktree-operation-route.test.ts (94%) rename src/renderer/src/lib/{ => workspace/ownership}/worktree-operation-route.ts (96%) rename src/renderer/src/lib/{ => workspace/ownership}/worktree-owner-route.ts (93%) rename src/renderer/src/lib/{ => workspace/ownership}/worktree-owner-rows-token.ts (100%) rename src/renderer/src/lib/{ => workspace/ownership}/worktree-row-open-in-owner.ts (90%) rename src/renderer/src/lib/{ => workspace/ownership}/wsl-moved-project-use-here.ts (98%) rename src/renderer/src/lib/{ => workspace/paths}/folder-workspace-path-status-cache-expiry.ts (88%) rename src/renderer/src/lib/{ => workspace/paths}/folder-workspace-path-status.ts (97%) rename src/renderer/src/lib/{ => workspace/persistence}/wsl-drive-unc-renderer-store-rewrites.ts (79%) rename src/renderer/src/lib/{ => workspace/persistence}/wsl-move-renderer-rewrite-client.ts (91%) rename src/renderer/src/lib/{ => workspace/persistence}/wsl-move-renderer-store-keys.ts (89%) rename src/renderer/src/lib/{ => workspace/persistence}/wsl-move-renderer-store-rewrites.test.ts (93%) rename src/renderer/src/lib/{ => workspace/persistence}/wsl-move-renderer-store-rewrites.ts (91%) rename src/renderer/src/lib/{ => workspace/tabs}/activate-tab-and-focus-pane.test.ts (98%) rename src/renderer/src/lib/{ => workspace/tabs}/activate-tab-and-focus-pane.ts (97%) rename src/renderer/src/lib/{ => workspace/tabs}/cycled-tab-owner-activation.ts (97%) rename src/renderer/src/lib/{ => workspace/tabs}/terminal-tab-owner-activation.ts (98%) rename src/renderer/src/lib/{ => workspace/tabs}/worktree-tab-bucket-projection.ts (100%) rename src/renderer/src/{lib => runtime/files}/workspace-file-host-routing.ts (91%) rename src/renderer/src/{lib => runtime/hosts/display}/execution-host-display-label.ts (89%) rename src/renderer/src/{lib => runtime/hosts/platform}/execution-host-facts.test.ts (94%) rename src/renderer/src/{lib => runtime/hosts/platform}/execution-host-facts.ts (92%) rename src/renderer/src/{lib => runtime/hosts/platform}/execution-host-platform-fact.ts (88%) rename src/renderer/src/{lib => runtime/hosts/selection}/default-creation-host.ts (79%) rename src/renderer/src/{lib => runtime/hosts/wsl}/local-project-runtime-workspace.ts (87%) rename src/renderer/src/{lib => runtime/hosts/wsl}/wsl-distro-hold-copy.ts (95%) rename src/renderer/src/{lib => runtime/hosts/wsl}/wsl-host-availability.ts (81%) rename src/renderer/src/{lib => runtime/hosts/wsl}/wsl-host-stopped-status.ts (100%) rename src/renderer/src/{lib => runtime/hosts/wsl}/wsl-host-user-start.ts (98%) diff --git a/config/flaky-test-pattern-baseline.txt b/config/flaky-test-pattern-baseline.txt index 67ce4cfb757..d2a8360f020 100644 --- a/config/flaky-test-pattern-baseline.txt +++ b/config/flaky-test-pattern-baseline.txt @@ -656,7 +656,7 @@ 1 test-no-wall-clock:src/renderer/src/lib/paired-runtime-closed-tab-resume.test.ts 2 test-no-wall-clock:src/renderer/src/lib/use-tab-agent-observed-signal-dispatch.test.tsx 2 test-no-wall-clock:src/renderer/src/lib/wake-sleeping-agents-live-unmounted-pane.test.ts -1 test-no-wall-clock:src/renderer/src/lib/workspace-terminal-host-authority.test.ts +1 test-no-wall-clock:src/renderer/src/lib/workspace/ownership/workspace-terminal-host-authority.test.ts 1 test-no-wall-clock:src/renderer/src/lib/workspace/activation/worktree-activation-emptied-workspace-reseed.test.ts 2 test-no-wall-clock:src/renderer/src/runtime/native-chat/tab-retirement/structured-agent-session-tab-retirement.test.ts 1 test-no-wall-clock:src/renderer/src/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab.test.ts diff --git a/config/focus-setting-read-baseline.txt b/config/focus-setting-read-baseline.txt index 9e6d01f833d..4b3f4c25346 100644 --- a/config/focus-setting-read-baseline.txt +++ b/config/focus-setting-read-baseline.txt @@ -222,14 +222,14 @@ 2 src/renderer/src/lib/browser/workspace/workspace-browser-tab-open.ts 1 src/renderer/src/lib/client-creation-action-error.ts 2 src/renderer/src/lib/client-creation-action-policy.ts -1 src/renderer/src/lib/default-creation-host.ts # the sanctioned reader of the default host +1 src/renderer/src/runtime/hosts/selection/default-creation-host.ts # the sanctioned reader of the default host 1 src/renderer/src/lib/launch-ai-vault-session.ts 1 src/renderer/src/lib/local-preflight-context.ts 2 src/renderer/src/runtime/hosts/observations/provider-runtime-context.ts -2 src/renderer/src/lib/repo-runtime-owner.ts -1 src/renderer/src/lib/runtime-session-mirror-owners.ts +2 src/renderer/src/lib/workspace/ownership/repo-runtime-owner.ts +1 src/renderer/src/lib/workspace/ownership/runtime-session-mirror-owners.ts 1 src/renderer/src/lib/runtime-session-mirror-targets.ts -1 src/renderer/src/lib/single-runtime-legacy-owner.ts +1 src/renderer/src/lib/workspace/ownership/single-runtime-legacy-owner.ts 1 src/renderer/src/lib/skill-runtime-command.ts 1 src/renderer/src/lib/terminal-close-route.ts 4 src/renderer/src/lib/terminal-worktree-route.ts # resolveTerminalPtyOwner: teardown, close and PTY identity read spawn's attribution (round 3 F8), which retired the deprecated resolver's readers @@ -239,7 +239,7 @@ 1 src/renderer/src/lib/work-items/linear/linear-issue-write.ts 1 src/renderer/src/lib/workspace/activation/worktree-activation.ts 1 src/renderer/src/lib/workspace/ownership/worktree-runtime-owner.ts # a setup terminal with no row spawns on the focused runtime -1 src/renderer/src/lib/worktree-jump-navigation.ts +1 src/renderer/src/lib/workspace/activation/worktree-jump-navigation.ts 17 src/renderer/src/runtime/jira/runtime-jira-client.ts 2 src/renderer/src/runtime/jira/runtime-jira-summary-client.ts 5 src/renderer/src/runtime/jira/runtime-jira-user-fields-client.ts diff --git a/config/scripts/ci/sharding/ci-shard-timings.json b/config/scripts/ci/sharding/ci-shard-timings.json index 27d7cc7420f..0414e12b969 100644 --- a/config/scripts/ci/sharding/ci-shard-timings.json +++ b/config/scripts/ci/sharding/ci-shard-timings.json @@ -6376,7 +6376,7 @@ "src/renderer/src/i18n/ui-intl-formatters.test.ts": 208, "src/renderer/src/lib/activate-ai-vault-structured-session-host.test.ts": 589, "src/renderer/src/lib/activate-ai-vault-structured-session-reveal.test.ts": 2099, - "src/renderer/src/lib/activate-tab-and-focus-pane.test.ts": 54, + "src/renderer/src/lib/workspace/tabs/activate-tab-and-focus-pane.test.ts": 54, "src/renderer/src/lib/active-agent-note-send-explicit-target.test.ts": 980, "src/renderer/src/lib/active-agent-note-send-focused-session.test.ts": 536, "src/renderer/src/lib/activity-thread-display.test.ts": 134, @@ -6461,11 +6461,11 @@ "src/renderer/src/lib/comment-body-line-count.test.ts": 84, "src/renderer/src/lib/comment-body-submit-state.test.ts": 55, "src/renderer/src/lib/composer-submit-cancellation.test.ts": 41, - "src/renderer/src/lib/connection-context.test.ts": 1817, + "src/renderer/src/lib/workspace/ownership/connection-context.test.ts": 1817, "src/renderer/src/lib/crash-diagnostics.test.ts": 176, "src/renderer/src/lib/create-untitled-markdown.test.ts": 566, "src/renderer/src/lib/desktop-created-server-tabs.test.ts": 1933, - "src/renderer/src/lib/direct-ssh-target-scope.test.ts": 48, + "src/renderer/src/lib/workspace/ownership/direct-ssh-target-scope.test.ts": 48, "src/renderer/src/lib/workspace/creation/work-item/direct-work-item-setup-callers.test.tsx": 2436, "src/renderer/src/lib/workspace/creation/work-item/direct-work-item-setup.test.ts": 2072, "src/renderer/src/lib/doc-preview-grants.test.ts": 2094, @@ -6475,7 +6475,7 @@ "src/renderer/src/lib/ensure-hooks-confirmed.test.ts": 799, "src/renderer/src/lib/ensure-simulator-tab-behavior.test.ts": 3601, "src/renderer/src/lib/execute-open-editor-path-move.test.ts": 2458, - "src/renderer/src/lib/execution-host-facts.test.ts": 1796, + "src/renderer/src/runtime/hosts/platform/execution-host-facts.test.ts": 1796, "src/renderer/src/lib/feature-education-telemetry.test.ts": 52, "src/renderer/src/lib/feedback-image-attachments.test.ts": 557, "src/renderer/src/lib/file-preview-link-open.test.ts": 2311, @@ -6690,7 +6690,7 @@ "src/renderer/src/lib/windows-terminal-capabilities-race.test.ts": 450, "src/renderer/src/lib/windows-terminal-capabilities.test.ts": 585, "src/renderer/src/lib/windows-terminal-capability-reprobe.test.ts": 198, - "src/renderer/src/lib/workspace-activation-path-gate.test.ts": 2107, + "src/renderer/src/lib/workspace/activation/workspace-activation-path-gate.test.ts": 2107, "src/renderer/src/lib/browser/workspace/workspace-browser-tab-open-placement.test.ts": 1996, "src/renderer/src/lib/workspace-doc-address-input.test.ts": 470, "src/renderer/src/lib/workspace-file-drag.test.ts": 70, @@ -6701,7 +6701,7 @@ "src/renderer/src/lib/workspace/persistence/workspace-session-ssh-partition-ownership.test.ts": 309, "src/renderer/src/lib/workspace/persistence/workspace-session-ssh-partition-round-trip.test.ts": 1775, "src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-activation.store.test.ts": 1994, - "src/renderer/src/lib/workspace-terminal-host-authority.test.ts": 2066, + "src/renderer/src/lib/workspace/ownership/workspace-terminal-host-authority.test.ts": 2066, "src/renderer/src/lib/workspace/activation/worktree-activation-automation-filter.test.ts": 2431, "src/renderer/src/lib/workspace/activation/worktree-activation-created-agent.test.ts": 2295, "src/renderer/src/lib/workspace/activation/worktree-activation-emptied-workspace-reseed.test.ts": 3630, @@ -6714,21 +6714,21 @@ "src/renderer/src/lib/workspace/creation/worktree-creation-initial-surface.test.ts": 5258, "src/renderer/src/lib/workspace/creation/worktree-creation-structured-session-lifecycle.test.ts": 2633, "src/renderer/src/lib/workspace/creation/worktree-creation-structured-session-prompts.test.tsx": 4554, - "src/renderer/src/lib/worktree-live-terminal-surface-owners.test.ts": 266, - "src/renderer/src/lib/worktree-operation-route-index.test.ts": 262, - "src/renderer/src/lib/worktree-operation-route.test.ts": 342, + "src/renderer/src/lib/workspace/ownership/worktree-live-terminal-surface-owners.test.ts": 266, + "src/renderer/src/lib/workspace/ownership/worktree-operation-route-index.test.ts": 262, + "src/renderer/src/lib/workspace/ownership/worktree-operation-route.test.ts": 342, "src/renderer/src/lib/workspace/search/worktrees/worktree-palette-comment-snippet.test.ts": 53, "src/renderer/src/lib/workspace/search/worktrees/worktree-palette-titleless-review.test.ts": 198, "src/renderer/src/lib/workspace/search/worktrees/worktree-palette-runtime-owner-identity.test.ts": 425, "src/renderer/src/lib/workspace/search/worktrees/worktree-palette-search.test.ts": 206, "src/renderer/src/lib/workspace/search/worktrees/worktree-palette-task-url-match.test.ts": 165, - "src/renderer/src/lib/worktree-reactivation-preserved-pane-replacement.test.ts": 2268, - "src/renderer/src/lib/worktree-reactivation-tab-forkbomb.test.ts": 4131, + "src/renderer/src/lib/workspace/activation/worktree-reactivation-preserved-pane-replacement.test.ts": 2268, + "src/renderer/src/lib/workspace/activation/worktree-reactivation-tab-forkbomb.test.ts": 4131, "src/renderer/src/lib/workspace/ownership/worktree-runtime-owner-index.detected.test.ts": 121, "src/renderer/src/lib/workspace/ownership/worktree-runtime-owner.test.ts": 380, "src/renderer/src/lib/worktree-status-spinner-launch-agent.test.ts": 271, "src/renderer/src/lib/worktree-status.test.ts": 306, - "src/renderer/src/lib/wsl-move-renderer-store-rewrites.test.ts": 1072, + "src/renderer/src/lib/workspace/persistence/wsl-move-renderer-store-rewrites.test.ts": 1072, "src/renderer/src/runtime/rpc/calls/abortable-runtime-environment-call.test.ts": 189, "src/renderer/src/runtime/provider-accounts/observations/claude-agent-view-observations.test.ts": 105, "src/renderer/src/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab.test.ts": 397, @@ -7034,7 +7034,7 @@ "src/renderer/src/store/slices/settings/settings.test.ts": 1938, "src/renderer/src/store/slices/worktrees/create/sparse-presets.test.ts": 217, "src/renderer/src/store/slices/ssh/ssh.test.ts": 1843, - "src/renderer/src/lib/active-worktree-removal-successor.test.ts": 1867, + "src/renderer/src/lib/workspace/activation/active-worktree-removal-successor.test.ts": 1867, "src/renderer/src/store/slices/worktrees/session/store-active-worktree-selection.test.ts": 2039, "src/renderer/src/store/terminals/store-create-tab-start-in-main.test.ts": 1801, "src/renderer/src/store/slices/tabs/store-open-to-side-layout-owner.test.ts": 1919, diff --git a/config/scripts/workflow/source-routing/pr-e2e-source-routing.mjs b/config/scripts/workflow/source-routing/pr-e2e-source-routing.mjs index 509507aa49f..2a6f6e58bac 100644 --- a/config/scripts/workflow/source-routing/pr-e2e-source-routing.mjs +++ b/config/scripts/workflow/source-routing/pr-e2e-source-routing.mjs @@ -259,7 +259,7 @@ export const PR_E2E_SOURCE_ROUTES = [ MANAGED_SSH_HARNESS.test(file) || /^tests\/e2e\/helpers\/browser-split-(?:guest-probes|page-server)\.ts$/.test(file) || (isProductSource(file) && - /^src\/renderer\/src\/(?:lib\/(?:file-preview|workspace-file-drag|worktree-runtime-owner|connection-context)\.ts|components\/(?:right-sidebar\/file-explorer\/panel\/FileExplorer(?:Row|VirtualRows)\.tsx|browser-pane\/(?:navigate\/use-browser-page-navigation-downloads\.ts|host-guest\/attach-browser-page-webview\.ts)))$/.test( + /^src\/renderer\/src\/(?:lib\/(?:file-preview|workspace-file-drag|worktree-runtime-owner)\.ts|lib\/workspace\/ownership\/connection-context\.ts|components\/(?:right-sidebar\/file-explorer\/panel\/FileExplorer(?:Row|VirtualRows)\.tsx|browser-pane\/(?:navigate\/use-browser-page-navigation-downloads\.ts|host-guest\/attach-browser-page-webview\.ts)))$/.test( file )) }, @@ -280,7 +280,7 @@ export const PR_E2E_SOURCE_ROUTES = [ MANAGED_SSH_HARNESS.test(file) || file === 'tests/e2e/helpers/terminal-workspace-root-link.ts' || (isProductSource(file) && - /^src\/renderer\/src\/(?:components\/terminal-pane\/terminal-(?:worktree-path-link|file-link-actions|file-link-hit-testing|file-open-routing|link-handlers)\.ts|lib\/(?:workspace-file-host-routing|worktree-owner-route|worktree-operation-route|worktree-operation-catalog-route)\.ts)$/.test( + /^src\/renderer\/src\/(?:components\/terminal-pane\/terminal-(?:worktree-path-link|file-link-actions|file-link-hit-testing|file-open-routing|link-handlers)\.ts|(?:runtime\/files\/workspace-file-host-routing|lib\/workspace\/ownership\/(?:worktree-owner-route|worktree-operation-route|worktree-operation-catalog-route))\.ts)$/.test( file )) }, diff --git a/config/scripts/workflow/source-routing/pr-layout-oracle-route.mjs b/config/scripts/workflow/source-routing/pr-layout-oracle-route.mjs index 0b31fb8b6f5..ac16f8b4df8 100644 --- a/config/scripts/workflow/source-routing/pr-layout-oracle-route.mjs +++ b/config/scripts/workflow/source-routing/pr-layout-oracle-route.mjs @@ -29,7 +29,7 @@ const LAYOUT_ORACLE_PREFIXES = [ 'src/renderer/src/attention/orca-window-foreground-focus.ts', 'src/renderer/src/attention/notification-workspace-labels.ts', 'src/renderer/src/lib/agent-session/identity/pane-agent-session-id.ts', - 'src/renderer/src/lib/wsl-host-availability.ts', + 'src/renderer/src/runtime/hosts/wsl/wsl-host-availability.ts', 'src/renderer/src/lib/workspace/ownership/workspace-runtime-environment.ts', 'src/renderer/src/components/tab-group/tab-drag-drop-commit.ts', 'src/renderer/src/app-shell/use-runtime-graph-sync.ts', diff --git a/config/workspace-record-read-baseline.txt b/config/workspace-record-read-baseline.txt index 46a6fdd2dbd..ca14f9bf2ad 100644 --- a/config/workspace-record-read-baseline.txt +++ b/config/workspace-record-read-baseline.txt @@ -29,24 +29,24 @@ 2 src/renderer/src/hooks/composer-state/composer-target-state.ts # P5b-2 must clear: composer store snapshot 3 src/renderer/src/lib/agent-session/resume/sleeping-record-execution-host-scope.ts # P5b-2 must clear: loosely typed state param 1 src/renderer/src/lib/browser/navigation/http-link-localhost-route.ts # P5b-2 must clear: optional state field defaults to empty; extracted from http-link-routing.ts -1 src/renderer/src/lib/connection-owner-resolution.ts # P5b-2 must clear: optional-chain compare of a previous slice -2 src/renderer/src/lib/direct-ssh-target-scope.ts # P5b-2 must clear: optional input fields default to empty +1 src/renderer/src/lib/workspace/ownership/connection-owner-resolution.ts # P5b-2 must clear: optional-chain compare of a previous slice +2 src/renderer/src/lib/workspace/ownership/direct-ssh-target-scope.ts # P5b-2 must clear: optional input fields default to empty 3 src/renderer/src/lib/duplicate-paired-servers.ts # P5b-2 must clear: optional state fields default to empty -1 src/renderer/src/lib/folder-workspace-runtime-owner.ts # P5b-2 must clear: loosely typed state param -1 src/renderer/src/lib/local-project-runtime-workspace.ts # P5b-2 must clear: optional state field defaults to empty +1 src/renderer/src/lib/workspace/ownership/folder-workspace-runtime-owner.ts # P5b-2 must clear: loosely typed state param +1 src/renderer/src/runtime/hosts/wsl/local-project-runtime-workspace.ts # P5b-2 must clear: optional state field defaults to empty 1 src/renderer/src/lib/resolved-worktree-execution-host.ts # P5b-2 must clear: loosely typed state param -2 src/renderer/src/lib/runtime-session-mirror-owners.ts # P5b-2 must clear: optional state fields default to empty +2 src/renderer/src/lib/workspace/ownership/runtime-session-mirror-owners.ts # P5b-2 must clear: optional state fields default to empty 2 src/renderer/src/lib/terminal-worktree-route.ts # P5b-2 must clear: the unattributed-twin check reads both catalogs directly 3 src/renderer/src/lib/typing-latency/diagnostic-summary.ts # P5b-2 must clear: optional state field 2 src/renderer/src/lib/unread-badge-count.ts # reads a passed-in copy 1 src/renderer/src/lib/workspace-directory.ts # P5b-2 must clear: optional state field defaults to empty -2 src/renderer/src/lib/workspace-terminal-host-authority.ts # P5b-2 must clear: optional state fields +2 src/renderer/src/lib/workspace/ownership/workspace-terminal-host-authority.ts # P5b-2 must clear: optional state fields 1 src/renderer/src/lib/workspace/activation/initial-surface/worktree-initial-terminal-seeding.ts # P5b-2 must clear: treats an undefined field as a narrow adapter 1 src/renderer/src/lib/workspace/activation/worktree-activation-pty-inventory.ts # P5b-2 must clear: loosely typed state param 2 src/renderer/src/lib/workspace/ownership/worktree-runtime-owner.ts # P5b-2 must clear: loosely typed state param 3 src/renderer/src/lib/workspace/persistence/workspace-session-host-persistence.ts # P5b-2 must clear: loosely typed state param 1 src/renderer/src/lib/workspace/persistence/workspace-session.ts # P5b-2 must clear: store snapshot read; file at the max-lines limit -6 src/renderer/src/lib/worktree-operation-route.ts # P5b-2 must clear: optional state fields default to empty +6 src/renderer/src/lib/workspace/ownership/worktree-operation-route.ts # P5b-2 must clear: optional state fields default to empty 3 src/renderer/src/runtime/native-chat/local-sessions/local-structured-session-tab-retirement.ts # P5b-2 must clear: optional state fields default to empty 2 src/renderer/src/runtime/sync-runtime-graph/sync-key.ts # reads a passed-in copy 3 src/renderer/src/store/folder-workspaces/folder-workspace-catalog-actions.ts # store writer diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx index 2962535ef3b..b3eaaea1d6e 100644 --- a/src/renderer/src/App.tsx +++ b/src/renderer/src/App.tsx @@ -29,8 +29,8 @@ import { useAppSessionPersistence } from './app-shell/use-app-session-persistenc import { useAppShellServices } from './app-shell/use-app-shell-services' import { useAppStartupHydration } from './app-shell/use-app-startup-hydration' import { startNativeChatDraftLoad } from './app-shell/native-chat-draft-startup' -import { runWslMoveRendererStoreRewrites } from './lib/wsl-move-renderer-store-rewrites' -import { runWslDriveUncRendererStoreRewrites } from './lib/wsl-drive-unc-renderer-store-rewrites' +import { runWslMoveRendererStoreRewrites } from './lib/workspace/persistence/wsl-move-renderer-store-rewrites' +import { runWslDriveUncRendererStoreRewrites } from './lib/workspace/persistence/wsl-drive-unc-renderer-store-rewrites' import { useDocumentAppearance } from './app-shell/use-document-appearance' import { useFloatingWorkspacePanel } from './app-shell/use-floating-workspace-panel' import { useGlobalKeybindings } from './app-shell/use-global-keybindings' @@ -42,7 +42,7 @@ import { SpaceWindowStatePublisher } from './components/workspace-space/SpaceWin import { PlainSshTerminalPanels } from './components/plain-ssh-terminal/PlainSshTerminalPanels' import { PluginShotReplayMount } from './components/plugins/view/PluginShotReplayMount' import { AddToChatPointMenuHost } from './components/native-chat/selection-quotes/AddToChatMenu' -import { installActiveWorktreeRemovalSuccessor } from './lib/active-worktree-removal-successor' +import { installActiveWorktreeRemovalSuccessor } from './lib/workspace/activation/active-worktree-removal-successor' function App(): React.JSX.Element { const layout = useAppChromeLayout() diff --git a/src/renderer/src/attention/notification-subject-owner.ts b/src/renderer/src/attention/notification-subject-owner.ts index 4d9a8896891..d36737df226 100644 --- a/src/renderer/src/attention/notification-subject-owner.ts +++ b/src/renderer/src/attention/notification-subject-owner.ts @@ -7,7 +7,10 @@ import type { Tab } from '../../../shared/tab-types' import type { AppState } from '@/store/types' import type { PtyTransport } from '@/components/terminal-pane/pty-transport/pty-transport-types' import { resolveTerminalTabPtyOwnership } from '@/lib/terminal-tab-for-pty-id' -import { resolveExactWorktreeRoute, routeForOwner } from '@/lib/worktree-owner-route' +import { + resolveExactWorktreeRoute, + routeForOwner +} from '@/lib/workspace/ownership/worktree-owner-route' import { findIndexedWorktreeOwner, findIndexedWorktreeOwnerForHost, diff --git a/src/renderer/src/attention/notification-workspace-labels.ts b/src/renderer/src/attention/notification-workspace-labels.ts index d16d5ab853f..cd93d8455da 100644 --- a/src/renderer/src/attention/notification-workspace-labels.ts +++ b/src/renderer/src/attention/notification-workspace-labels.ts @@ -6,7 +6,7 @@ import { worktreeMatchesHost } from '../store/slices/worktrees/listing/worktree-host-ownership' import { getResolvedExecutionHostIdForWorktree } from '../lib/resolved-worktree-execution-host' -import { getActiveWorkspaceExecutionHostId } from '../lib/active-workspace-host' +import { getActiveWorkspaceExecutionHostId } from '../lib/workspace/ownership/active-workspace-host' import { findIndexedFolderWorkspaceOwner, findIndexedProjectGroupOwner diff --git a/src/renderer/src/components/JiraIssueWorkspace.tsx b/src/renderer/src/components/JiraIssueWorkspace.tsx index aa280b752ff..6740918308b 100644 --- a/src/renderer/src/components/JiraIssueWorkspace.tsx +++ b/src/renderer/src/components/JiraIssueWorkspace.tsx @@ -19,7 +19,7 @@ import { JiraIssueMetadataBar, JiraIssueWorkspaceHeader } from './jira-issue-wor import { JiraIssueCommentComposer, JiraIssueWorkspaceContent } from './jira-issue-workspace-content' import { useJiraIssueWorkspaceActions } from './jira-issue-workspace-actions' import { getJiraReadIdentity } from '@/store/slices/jira/jira-read-coordination' -import { defaultScopeHost } from '@/lib/default-creation-host' +import { defaultScopeHost } from '@/runtime/hosts/selection/default-creation-host' import { taskSourceRuntimeTarget } from '@/lib/task-source-runtime-target' import { getEnvironmentRuntimeContextKey } from '@/runtime/hosts/observations/provider-runtime-context' import { runtimeTargetEnvironmentId } from '@/runtime/rpc/targets/runtime-client-target' diff --git a/src/renderer/src/components/LinearIssueTextEditor.tsx b/src/renderer/src/components/LinearIssueTextEditor.tsx index f991da7a5e9..595a2123c0c 100644 --- a/src/renderer/src/components/LinearIssueTextEditor.tsx +++ b/src/renderer/src/components/LinearIssueTextEditor.tsx @@ -23,7 +23,7 @@ import { } from './linear-issue-text-draft-state' import { translate } from '@/i18n/i18n' import { useTranslate } from '@/i18n/use-translate' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' type LinearIssueTextEditorProps = { issue: LinearIssue diff --git a/src/renderer/src/components/LinearIssueWorkspace.tsx b/src/renderer/src/components/LinearIssueWorkspace.tsx index ca62f2a8a1b..ba4bee4a91f 100644 --- a/src/renderer/src/components/LinearIssueWorkspace.tsx +++ b/src/renderer/src/components/LinearIssueWorkspace.tsx @@ -17,7 +17,7 @@ import { LinearIssueSubIssues } from './linear-issue-sub-issues' import { useLinearIssueWorkspaceDetail } from './linear-issue-workspace-detail-state' import { LinearIssueWorkspaceHeader } from './linear-issue-workspace-header' import { LinearIssueWorkspaceSidebar } from './linear-issue-workspace-sidebar' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' import { selectFolderWorkspaces } from '@/store/workspaces/catalog/workspace-record-fields' type LinearIssueWorkspaceProps = { diff --git a/src/renderer/src/components/LinearItemDrawer.tsx b/src/renderer/src/components/LinearItemDrawer.tsx index d96aec5f0b7..a1c8fba8db4 100644 --- a/src/renderer/src/components/LinearItemDrawer.tsx +++ b/src/renderer/src/components/LinearItemDrawer.tsx @@ -20,7 +20,7 @@ import { } from '@/components/linear-item-drawer-types' import { renderLinearItemDrawerSheet } from '@/components/linear-item-drawer-sheet' import { selectFolderWorkspaces } from '@/store/workspaces/catalog/workspace-record-fields' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' export { LinearIssueEditSection } from '@/components/linear-item-drawer-edit-section' export { LinearIssueCommentFooter } from '@/components/linear-item-drawer-comment-footer' diff --git a/src/renderer/src/components/activity/activity-thread-actions.ts b/src/renderer/src/components/activity/activity-thread-actions.ts index fff1580bf85..6c7995f5994 100644 --- a/src/renderer/src/components/activity/activity-thread-actions.ts +++ b/src/renderer/src/components/activity/activity-thread-actions.ts @@ -1,8 +1,8 @@ -import { activateTabAndFocusPane } from '@/lib/activate-tab-and-focus-pane' +import { activateTabAndFocusPane } from '@/lib/workspace/tabs/activate-tab-and-focus-pane' import { revealFloatingWorkspacePanel } from '@/lib/floating-workspace-panel-reveal' import { activateStructuredAgentSessionTab } from '@/lib/agent-session/structured-agent-session-tab-activation' import { activateAndRevealWorkspace } from '@/lib/workspace/activation/worktree-activation' -import { jumpToWorktreeFromSidebar } from '@/lib/worktree-jump-navigation' +import { jumpToWorktreeFromSidebar } from '@/lib/workspace/activation/worktree-jump-navigation' import { useAppStore } from '@/store' import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants' import { diff --git a/src/renderer/src/components/activity/activity-thread-context-menu.tsx b/src/renderer/src/components/activity/activity-thread-context-menu.tsx index 67ed72093fd..a91d6436a18 100644 --- a/src/renderer/src/components/activity/activity-thread-context-menu.tsx +++ b/src/renderer/src/components/activity/activity-thread-context-menu.tsx @@ -12,7 +12,7 @@ import { translate } from '@/i18n/i18n' import { useTranslate, type Translate } from '@/i18n/use-translate' import { CLOSE_ALL_CONTEXT_MENUS_EVENT } from '@/lib/close-all-context-menus' import { formatClipboardFilePath } from '@/lib/clipboard-file-path' -import { getWorktreeRowLocalPathOpenOwner } from '@/lib/worktree-row-open-in-owner' +import { getWorktreeRowLocalPathOpenOwner } from '@/lib/workspace/ownership/worktree-row-open-in-owner' import { useAppStore } from '@/store' import { clearActivityThread, diff --git a/src/renderer/src/components/activity/activity-thread-hover-card-summary.tsx b/src/renderer/src/components/activity/activity-thread-hover-card-summary.tsx index 4c3fd034440..743d8d6247c 100644 --- a/src/renderer/src/components/activity/activity-thread-hover-card-summary.tsx +++ b/src/renderer/src/components/activity/activity-thread-hover-card-summary.tsx @@ -6,11 +6,11 @@ import { RepoBadgeMark } from '@/components/repo/RepoBadgeLabel' import { AgentTypeIcon } from '@/lib/agent-type-icon' import { formatAgentTypeLabel } from '../../../../shared/agent-status/presentation/agent-type-label' import { getWorktreeGitIdentityDisplay } from '../../../../shared/worktree/git-identity-display' -import { jumpToWorktreeFromSidebar } from '@/lib/worktree-jump-navigation' +import { jumpToWorktreeFromSidebar } from '@/lib/workspace/activation/worktree-jump-navigation' import { translate } from '@/i18n/i18n' import { useTranslate } from '@/i18n/use-translate' import { formatClipboardFilePath } from '@/lib/clipboard-file-path' -import { getWorktreeRowLocalPathOpenOwner } from '@/lib/worktree-row-open-in-owner' +import { getWorktreeRowLocalPathOpenOwner } from '@/lib/workspace/ownership/worktree-row-open-in-owner' import { cn } from '@/lib/utils' import { getExecutionHostLabel, diff --git a/src/renderer/src/components/automations/automation-run-open-target.ts b/src/renderer/src/components/automations/automation-run-open-target.ts index fc7801f4754..3ba854dd0a4 100644 --- a/src/renderer/src/components/automations/automation-run-open-target.ts +++ b/src/renderer/src/components/automations/automation-run-open-target.ts @@ -23,13 +23,13 @@ import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields' import { getFolderWorkspaceWorktree } from '../../../../shared/folder-workspaces/folder-workspace-worktree' -import { resolveExactWorktreeRoute } from '@/lib/worktree-owner-route' +import { resolveExactWorktreeRoute } from '@/lib/workspace/ownership/worktree-owner-route' import { parseWorkspaceKey } from '../../../../shared/workspace-scope' import { getAutomationRunViewState } from './automation-run-view-state' -import { resolveOwner } from '@/lib/resolve-owner' -import type { WorktreeOperationRouteState } from '@/lib/worktree-operation-route' +import { resolveOwner } from '@/lib/workspace/ownership/resolve-owner' +import type { WorktreeOperationRouteState } from '@/lib/workspace/ownership/worktree-operation-route' import { resolveQualifiedFolderWorkspaceResult } from '../../../../shared/folder-workspaces/folder-workspace-execution-host' -import { getRuntimeEnvironmentIdForFolderWorkspace } from '@/lib/folder-workspace-runtime-owner' +import { getRuntimeEnvironmentIdForFolderWorkspace } from '@/lib/workspace/ownership/folder-workspace-runtime-owner' export type AutomationRunPaneTarget = { tabId: string diff --git a/src/renderer/src/components/automations/automation-run-workspace-action.ts b/src/renderer/src/components/automations/automation-run-workspace-action.ts index 28a772479de..7606afe8169 100644 --- a/src/renderer/src/components/automations/automation-run-workspace-action.ts +++ b/src/renderer/src/components/automations/automation-run-workspace-action.ts @@ -6,12 +6,12 @@ import { toast } from 'sonner' import { translate } from '@/i18n/i18n' import { activateAndRevealWorktree, - activateAndRevealFolderWorkspace, - type ActivateAndRevealResult + activateAndRevealFolderWorkspace } from '@/lib/workspace/activation/worktree-activation' -import { activateWslMovedWorkspace } from '@/lib/wsl-moved-chat-activation' +import type { ActivateAndRevealResult } from '@/lib/workspace/activation/worktree-activation-outcome' +import { activateWslMovedWorkspace } from '@/lib/workspace/activation/wsl-moved-chat-activation' import { useAppStore } from '@/store' -import { activateTerminalTabOnOwner } from '@/lib/terminal-tab-owner-activation' +import { activateTerminalTabOnOwner } from '@/lib/workspace/tabs/terminal-tab-owner-activation' import { activateWebRuntimeSessionTab } from '@/runtime/web-session-tabs-sync/actions/web-runtime-session-tab-lifecycle' import { resolveWebSessionVisibleTabId } from '@/runtime/web-session-tabs-sync/navigation/web-session-focus-intent' import { parsePaneKey } from '../../../../shared/workspace-layout/stable-pane-id' diff --git a/src/renderer/src/components/browser-pane/annotate/use-browser-annotation-images.ts b/src/renderer/src/components/browser-pane/annotate/use-browser-annotation-images.ts index d0826915700..68c8af448c8 100644 --- a/src/renderer/src/components/browser-pane/annotate/use-browser-annotation-images.ts +++ b/src/renderer/src/components/browser-pane/annotate/use-browser-annotation-images.ts @@ -1,7 +1,7 @@ import { useCallback, useState } from 'react' import { toast } from 'sonner' import { useAppStore } from '@/store' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { useMountedRef } from '@/hooks/useMountedRef' import { createNonSecureContextUuid as createBrowserUuid } from '../../../../../shared/non-secure-context-uuid' import { formatClipboardImagePasteError } from '@/components/terminal-pane/input/paste/terminal-pane-paste-execution' diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-pane.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-pane.tsx index 600c39a0a09..1309fc0be9d 100644 --- a/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-pane.tsx +++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-pane.tsx @@ -1,12 +1,12 @@ import { useEffect, useLayoutEffect, useRef, useState } from 'react' import { createPortal } from 'react-dom' import { cn } from '@/lib/utils' -import { getConnectionIdFromState } from '@/lib/connection-context' +import '@/lib/workspace/ownership/connection-context' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { useAppStore } from '@/store' import { useShortcutLabel } from '@/hooks/useShortcutLabel' import '../../../../../shared/constants' import { ORCA_BROWSER_BLANK_URL } from '../../../../../shared/browser/browser-blank-page' -import type { BrowserPage as BrowserPageState } from '../../../../../shared/browser-workspace-types' import { normalizeExternalBrowserUrl } from '../../../../../shared/browser-url' import { getLiveBrowserUrl } from '../describe-page/live-browser-url-registry' import { getBrowserViewportPreset } from '../../../../../shared/browser-viewport-presets' @@ -20,11 +20,7 @@ import { getShareableBrowserArtifactFile } from '../describe-page/browser-artifa import { useGrabMode } from '../annotate/useGrabMode' import { getOpenableExternalUrl, toDisplayUrl } from '../describe-page/browser-page-url-display' import type { BrowserOverlayViewport } from '../describe-page/browser-annotation-geometry' -import type { - BrowserChromeShortcutScope, - BrowserPageUrlSetter, - BrowserTabPageState -} from '../describe-page/browser-page-types' +import type { BrowserPagePaneProps } from '../describe-page/browser-page-types' import { BrowserPageChromeHeader } from './browser-page-chrome-header' import { BrowserPageContextMenu } from './browser-page-context-menu' import { BrowserPageViewportOverlays } from './browser-page-viewport-overlays' @@ -61,21 +57,7 @@ export function BrowserPagePane({ inputLocked, onUpdatePageState, onSetUrl -}: { - browserTab: BrowserPageState - workspaceId: string - worktreeId: string - sessionProfileId: string | null - sessionPartition: string | null - isActive: boolean - chromeShortcutScope: BrowserChromeShortcutScope - isAutomationVisible: boolean - isMobileDriven: boolean - isRemotelyViewed: boolean - inputLocked: boolean - onUpdatePageState: (tabId: string, updates: BrowserTabPageState) => void - onSetUrl: BrowserPageUrlSetter -}): React.JSX.Element { +}: BrowserPagePaneProps): React.JSX.Element { const isPaintable = isBrowserPagePanePaintable({ isActive, isAutomationVisible, diff --git a/src/renderer/src/components/browser-pane/describe-page/browser-page-types.ts b/src/renderer/src/components/browser-pane/describe-page/browser-page-types.ts index bfb5421801f..6bed75438f0 100644 --- a/src/renderer/src/components/browser-pane/describe-page/browser-page-types.ts +++ b/src/renderer/src/components/browser-pane/describe-page/browser-page-types.ts @@ -131,6 +131,22 @@ export type BrowserPageAnnotationTrayProps = { ) => void } +export type BrowserPagePaneProps = { + browserTab: BrowserPageState + workspaceId: string + worktreeId: string + sessionProfileId: string | null + sessionPartition: string | null + isActive: boolean + chromeShortcutScope: BrowserChromeShortcutScope + isAutomationVisible: boolean + isMobileDriven: boolean + isRemotelyViewed: boolean + inputLocked: boolean + onUpdatePageState: (tabId: string, updates: BrowserTabPageState) => void + onSetUrl: BrowserPageUrlSetter +} + export type ClientHostedBrowserPagePaneProps = { browserTab: BrowserPageState workspaceId: string diff --git a/src/renderer/src/components/browser-pane/navigate/browser-file-editor-open.test.ts b/src/renderer/src/components/browser-pane/navigate/browser-file-editor-open.test.ts index 4f4617c1d65..968097cc67d 100644 --- a/src/renderer/src/components/browser-pane/navigate/browser-file-editor-open.test.ts +++ b/src/renderer/src/components/browser-pane/navigate/browser-file-editor-open.test.ts @@ -1,8 +1,8 @@ import { afterEach, expect, it, vi } from 'vitest' -import type * as ConnectionOwnerModule from '@/lib/connection-owner-resolution' +import type * as ConnectionOwnerModule from '@/lib/workspace/ownership/connection-owner-resolution' // A workspace this computer owns. -vi.mock('@/lib/connection-owner-resolution', async (importOriginal) => ({ +vi.mock('@/lib/workspace/ownership/connection-owner-resolution', async (importOriginal) => ({ ...(await importOriginal()), getConnectionIdFromState: () => null, getConnectionIdForFileFromState: () => null diff --git a/src/renderer/src/components/browser-pane/navigate/browser-file-editor-open.ts b/src/renderer/src/components/browser-pane/navigate/browser-file-editor-open.ts index 99341bb5884..ab370e94327 100644 --- a/src/renderer/src/components/browser-pane/navigate/browser-file-editor-open.ts +++ b/src/renderer/src/components/browser-pane/navigate/browser-file-editor-open.ts @@ -1,4 +1,4 @@ -import { getConnectionIdFromState } from '@/lib/connection-owner-resolution' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { getRuntimeTargetForWorktreeOwner } from '@/lib/file-owner-runtime-target' import { getRelativePathInsideRoot } from '@/lib/path' import { statUserOpenedPath } from '@/lib/user-opened-local-path' diff --git a/src/renderer/src/components/browser-pane/navigate/navigate-browser-page-url.ts b/src/renderer/src/components/browser-pane/navigate/navigate-browser-page-url.ts index 328c48e0f9e..094a88f116a 100644 --- a/src/renderer/src/components/browser-pane/navigate/navigate-browser-page-url.ts +++ b/src/renderer/src/components/browser-pane/navigate/navigate-browser-page-url.ts @@ -1,5 +1,5 @@ import { detectLanguage } from '@/lib/language-detect' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { isPathInsideWorktree, toWorktreeRelativePath diff --git a/src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx b/src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx index 91417d4f21b..503b00bbfe8 100644 --- a/src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx +++ b/src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx @@ -66,7 +66,7 @@ vi.mock('@/components/browser-pane/host-guest/webview-registry', async (importOr moveFocusToRendererBeforeWebviewDetach: () => undefined })) -vi.mock('@/lib/execution-host-display-label', () => ({ +vi.mock('@/runtime/hosts/display/execution-host-display-label', () => ({ selectWorktreeHostDisplayLabel: () => 'Studio Mac mini' })) @@ -78,13 +78,13 @@ const store = vi.hoisted(() => ({ })) // The document lives only on its workspace’s SSH host. -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: () => 'ssh-1', getConnectionIdForFile: () => 'ssh-1', getConnectionIdFromState: () => 'ssh-1' })) -vi.mock('@/lib/connection-owner-resolution', () => ({ +vi.mock('@/lib/workspace/ownership/connection-owner-resolution', () => ({ getConnectionIdForFileFromState: () => 'ssh-1', getConnectionIdFromState: () => 'ssh-1' })) diff --git a/src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.tsx b/src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.tsx index e11c2ca3ca6..8e8f02c2e65 100644 --- a/src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.tsx +++ b/src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.tsx @@ -17,7 +17,7 @@ import { releaseDocPreviewGrant, type DocPreviewGrantHandle } from '@/lib/doc-preview-grants' -import { selectWorktreeHostDisplayLabel } from '@/lib/execution-host-display-label' +import { selectWorktreeHostDisplayLabel } from '@/runtime/hosts/display/execution-host-display-label' import { translate } from '@/i18n/i18n' import { useTranslate } from '@/i18n/use-translate' import { useAppStore } from '@/store' diff --git a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.test.ts b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.test.ts index 52276d375b6..1349e1625a4 100644 --- a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.test.ts +++ b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.test.ts @@ -22,7 +22,7 @@ vi.mock('@/i18n/i18n', () => ({ fallback.replace('{{value0}}', params?.value0 ?? '') })) -vi.mock('@/lib/connection-owner-resolution', () => ({ +vi.mock('@/lib/workspace/ownership/connection-owner-resolution', () => ({ getConnectionIdForFileFromState: () => mocks.connectionIdForFile })) vi.mock('@/lib/workspace/ownership/worktree-runtime-owner', () => ({ @@ -48,7 +48,7 @@ vi.mock('@/lib/file-owner-runtime-target', () => { getRuntimeTargetForFileOwner(state, worktreeId, undefined) } }) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: () => mocks.connectionIdForWorkspace, getConnectionIdForFile: () => mocks.connectionIdForFile })) diff --git a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.ts b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.ts index 481c84fd09e..c024e712359 100644 --- a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.ts +++ b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.ts @@ -1,14 +1,14 @@ import { LOCAL_EXECUTION_HOST_ID } from '../../../../../shared/execution-host' import { toast } from 'sonner' import { translate } from '@/i18n/i18n' -import { getConnectionIdForFileFromState } from '@/lib/connection-owner-resolution' +import { getConnectionIdForFileFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner' -import { isTwinWorkspace } from '@/lib/resolve-owner' +import { isTwinWorkspace } from '@/lib/workspace/ownership/resolve-owner' import { detectLanguage } from '@/lib/language-detect' import { buildWorkspaceFileContextForFile, canClientOsOpenWorkspaceFile -} from '@/lib/workspace-file-host-routing' +} from '@/runtime/files/workspace-file-host-routing' import { useAppStore } from '@/store' import { downloadAndOpenRemoteTerminalFile } from '@/components/terminal-pane/links/files/terminal-remote-file-download-open' diff --git a/src/renderer/src/components/dashboard-popout/dashboard-preview-http-actions.ts b/src/renderer/src/components/dashboard-popout/dashboard-preview-http-actions.ts index af784e17dab..d2bf0a8f9b3 100644 --- a/src/renderer/src/components/dashboard-popout/dashboard-preview-http-actions.ts +++ b/src/renderer/src/components/dashboard-popout/dashboard-preview-http-actions.ts @@ -8,8 +8,8 @@ import { isRemoteRuntimePtyId } from '../../../../shared/remote-runtime/remote-runtime-pty-id' import { useAppStore } from '@/store' -import { resolveOwner } from '@/lib/resolve-owner' -import { resolveWorktreeOperationRoute } from '@/lib/worktree-operation-route' +import { resolveOwner } from '@/lib/workspace/ownership/resolve-owner' +import { resolveWorktreeOperationRoute } from '@/lib/workspace/ownership/worktree-operation-route' import { createBrowserLinkHostMatcher } from '@/lib/browser/navigation/browser-link-owner' import { getWorkspaceClientCreationActionPolicy } from '@/lib/client-creation-action-policy' import { diff --git a/src/renderer/src/components/dashboard/AgentDashboardDrawer.focus.test.tsx b/src/renderer/src/components/dashboard/AgentDashboardDrawer.focus.test.tsx index 20749a747a6..5ed42ac97d4 100644 --- a/src/renderer/src/components/dashboard/AgentDashboardDrawer.focus.test.tsx +++ b/src/renderer/src/components/dashboard/AgentDashboardDrawer.focus.test.tsx @@ -17,7 +17,7 @@ const mocks = vi.hoisted(() => ({ vi.mock('@/lib/workspace/activation/worktree-activation', () => ({ activateAndRevealWorkspace: mocks.activateAndRevealWorkspace })) -vi.mock('@/lib/activate-tab-and-focus-pane', () => ({ +vi.mock('@/lib/workspace/tabs/activate-tab-and-focus-pane', () => ({ activateTabAndFocusPane: mocks.activateTabAndFocusPane })) vi.mock('./useLiveDashboardSnapshot', () => ({ diff --git a/src/renderer/src/components/dashboard/AgentDashboardDrawer.test.tsx b/src/renderer/src/components/dashboard/AgentDashboardDrawer.test.tsx index 65c67ca8cc8..1094ff92a0f 100644 --- a/src/renderer/src/components/dashboard/AgentDashboardDrawer.test.tsx +++ b/src/renderer/src/components/dashboard/AgentDashboardDrawer.test.tsx @@ -13,7 +13,7 @@ const mocks = vi.hoisted(() => ({ activateAndRevealWorkspace: vi.fn(() => ({ primaryTabId: null }) as unknown) })) -vi.mock('@/lib/activate-tab-and-focus-pane', () => ({ +vi.mock('@/lib/workspace/tabs/activate-tab-and-focus-pane', () => ({ activateTabAndFocusPane: mocks.activateTabAndFocusPane })) diff --git a/src/renderer/src/components/dashboard/dashboard-card-terminal-input.ts b/src/renderer/src/components/dashboard/dashboard-card-terminal-input.ts index ca9b746ceed..966355c4260 100644 --- a/src/renderer/src/components/dashboard/dashboard-card-terminal-input.ts +++ b/src/renderer/src/components/dashboard/dashboard-card-terminal-input.ts @@ -3,7 +3,8 @@ import type { DashboardCardTerminalInput } from '../../../../shared/dashboard-sn import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent' import { toRuntimeExecutionHostId, toSshExecutionHostId } from '../../../../shared/execution-host' import { parseAppSshPtyId } from '../../../../shared/ssh-pty-id' -import { getConnectionIdFromState } from '@/lib/connection-context' +import '@/lib/workspace/ownership/connection-context' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner' import { shouldDisableKittyKeyboardForTerminal } from '@/lib/pane-manager/terminal-keyboard-protocol' import { isLocalNativeWindowsConpty } from '@/lib/pane-manager/windows-pty-compatibility' diff --git a/src/renderer/src/components/dashboard/reveal-dashboard-agent.test.ts b/src/renderer/src/components/dashboard/reveal-dashboard-agent.test.ts index 39f96bb8d10..fad79235b6f 100644 --- a/src/renderer/src/components/dashboard/reveal-dashboard-agent.test.ts +++ b/src/renderer/src/components/dashboard/reveal-dashboard-agent.test.ts @@ -29,10 +29,10 @@ vi.mock('@/lib/workspace/activation/worktree-activation', () => ({ vi.mock('@/lib/workspace/ownership/worktree-runtime-owner', () => ({ runtimeEnvironmentIdOrLocalUnlessTwin: () => 'host-A' })) -vi.mock('@/lib/activate-tab-and-focus-pane', () => ({ +vi.mock('@/lib/workspace/tabs/activate-tab-and-focus-pane', () => ({ activateTabAndFocusPane: mocks.activateTabAndFocusPane })) -vi.mock('@/lib/terminal-tab-owner-activation', () => ({ +vi.mock('@/lib/workspace/tabs/terminal-tab-owner-activation', () => ({ activateTerminalTabOnOwner: mocks.activateTerminalTabOnOwner })) vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({ diff --git a/src/renderer/src/components/dashboard/useRetainedAgents.ts b/src/renderer/src/components/dashboard/useRetainedAgents.ts index 573e3eb03a3..8bae0d6d7e1 100644 --- a/src/renderer/src/components/dashboard/useRetainedAgents.ts +++ b/src/renderer/src/components/dashboard/useRetainedAgents.ts @@ -19,7 +19,7 @@ import { agentTurnEndedOnPurpose } from '../../../../shared/agent-status/lifecyc import { createWorktreeTabBucketProjection, type WorktreeTabBucketProjection -} from '@/lib/worktree-tab-bucket-projection' +} from '@/lib/workspace/tabs/worktree-tab-bucket-projection' import { selectFolderWorkspaces, selectWorktreesByRepo diff --git a/src/renderer/src/components/diff-comments/use-diff-comment-owner.ts b/src/renderer/src/components/diff-comments/use-diff-comment-owner.ts index 692677e0871..88bcd069bdc 100644 --- a/src/renderer/src/components/diff-comments/use-diff-comment-owner.ts +++ b/src/renderer/src/components/diff-comments/use-diff-comment-owner.ts @@ -10,7 +10,7 @@ import { type DiffCommentOwner, type DiffCommentView } from '@/store/slices/diff-comments/diff-comment-owner' -import type { WorkspaceCopySource } from '@/lib/workspace-copy-owner' +import type { WorkspaceCopySource } from '@/lib/workspace/ownership/workspace-copy-owner' import type { DiffComment } from '../../../../shared/diff-comment-types' /** diff --git a/src/renderer/src/components/diff-comments/use-visible-worktree-diff-comments.ts b/src/renderer/src/components/diff-comments/use-visible-worktree-diff-comments.ts index 246ef2e3414..f467437b15b 100644 --- a/src/renderer/src/components/diff-comments/use-visible-worktree-diff-comments.ts +++ b/src/renderer/src/components/diff-comments/use-visible-worktree-diff-comments.ts @@ -1,7 +1,7 @@ import { useAppStateValue } from '@/store/retained-views/app-state-view' import { useDiffCommentView } from './use-diff-comment-owner' import type { DiffCommentOwner } from '@/store/slices/diff-comments/diff-comment-owner' -import type { WorkspaceCopySource } from '@/lib/workspace-copy-owner' +import type { WorkspaceCopySource } from '@/lib/workspace/ownership/workspace-copy-owner' import { useMemo } from 'react' import { isMarkdownReviewNotesEnabled, diff --git a/src/renderer/src/components/editor/EditorEditFileSurface.tsx b/src/renderer/src/components/editor/EditorEditFileSurface.tsx index 87aed56dba1..9ab30a934e2 100644 --- a/src/renderer/src/components/editor/EditorEditFileSurface.tsx +++ b/src/renderer/src/components/editor/EditorEditFileSurface.tsx @@ -1,5 +1,5 @@ import { useTranslate } from '@/i18n/use-translate' -import { getConnectionIdForFile } from '@/lib/connection-context' +import { getConnectionIdForFile } from '@/lib/workspace/ownership/connection-context' import type { MarkdownViewMode, OpenFile } from '@/store/slices/editor/types/open-file' import type { PendingEditorReveal } from '@/store/slices/editor/types/pending-editor-reveal' import type { GitDiffResult } from '../../../../shared/git/diff/git-diff-compare-types' diff --git a/src/renderer/src/components/editor/EditorFileLoadErrorView.test.tsx b/src/renderer/src/components/editor/EditorFileLoadErrorView.test.tsx index 261ea742a19..0cba5651e78 100644 --- a/src/renderer/src/components/editor/EditorFileLoadErrorView.test.tsx +++ b/src/renderer/src/components/editor/EditorFileLoadErrorView.test.tsx @@ -17,7 +17,7 @@ vi.mock('../wsl-host-stopped/use-stopped-wsl-host', () => ({ useStoppedWslHost: (worktreeId: string | undefined) => worktreeId === 'wt-wsl' ? mocks.stopped.current : null })) -vi.mock('@/lib/wsl-host-user-start', () => ({ +vi.mock('@/runtime/hosts/wsl/wsl-host-user-start', () => ({ startWslHostAndReloadProjects: mocks.start })) diff --git a/src/renderer/src/components/editor/EditorPanel.tsx b/src/renderer/src/components/editor/EditorPanel.tsx index 4dcd5a6db66..6e4948cae53 100644 --- a/src/renderer/src/components/editor/EditorPanel.tsx +++ b/src/renderer/src/components/editor/EditorPanel.tsx @@ -1,6 +1,6 @@ import React, { useCallback, useMemo, useRef, useState } from 'react' import { useAppStore } from '@/store' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { formatClipboardFilePath } from '@/lib/clipboard-file-path' import { getOpenFileRevealOwner } from '@/lib/reveal-in-file-manager' import { canShowWorkspaceFileBrowserAction } from '@/lib/file-preview' diff --git a/src/renderer/src/components/editor/MonacoEditor.tsx b/src/renderer/src/components/editor/MonacoEditor.tsx index 4ee504c6c36..54ecb6ca889 100644 --- a/src/renderer/src/components/editor/MonacoEditor.tsx +++ b/src/renderer/src/components/editor/MonacoEditor.tsx @@ -13,7 +13,10 @@ import { MAX_TOKENIZATION_LINE_LENGTH } from '@/lib/monaco-languages/monarch-emb import { buildFileEditorWordWrapOptions } from './file-editor-word-wrap-options' import { toEditorModelUri } from './model-lifetime/identity/editor-model-uri' import { getEditorModelOwnerKey } from './model-lifetime/identity/editor-model-owner' -import { NO_RESOURCE_EVIDENCE, type WorkspaceResource } from '@/lib/workspace-copy-owner' +import { + NO_RESOURCE_EVIDENCE, + type WorkspaceResource +} from '@/lib/workspace/ownership/workspace-copy-owner' import { getMonacoAutoHeightForContent, isMonacoAutoHeightCapped } from './monaco-auto-height' import { monacoFindOptions } from './monaco-find-options' import { buildEditorUnicodeHighlightOptions } from './editor-unicode-highlight-options' diff --git a/src/renderer/src/components/editor/MonacoGutterContextMenu.tsx b/src/renderer/src/components/editor/MonacoGutterContextMenu.tsx index bb6c5dcfd44..869a71c7f24 100644 --- a/src/renderer/src/components/editor/MonacoGutterContextMenu.tsx +++ b/src/renderer/src/components/editor/MonacoGutterContextMenu.tsx @@ -9,7 +9,7 @@ import { DropdownMenuTrigger } from '@/components/ui/dropdown-menu' import { useAppStore } from '@/store' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { findFirstIndexedWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner-index' import { getRuntimeGitRemoteFileUrl } from '@/runtime/source-control/git/runtime-git-working-tree-client' import { formatPathLineReference } from './line-copy-path' diff --git a/src/renderer/src/components/editor/ai-vault-session-log-content.test.tsx b/src/renderer/src/components/editor/ai-vault-session-log-content.test.tsx index bbcd52b0067..db24ade6b07 100644 --- a/src/renderer/src/components/editor/ai-vault-session-log-content.test.tsx +++ b/src/renderer/src/components/editor/ai-vault-session-log-content.test.tsx @@ -4,7 +4,7 @@ import { act } from 'react' import { createRoot, type Root } from 'react-dom/client' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { useAppStore } from '@/store' -import { getConnectionIdForFile } from '@/lib/connection-context' +import { getConnectionIdForFile } from '@/lib/workspace/ownership/connection-context' import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' import { TEST_REPO } from '@/store/repos/repo.test-fixture' import type { OpenFile } from '@/store/slices/editor/types/open-file' diff --git a/src/renderer/src/components/editor/autosave/editor-autosave-conflict-flow.test.ts b/src/renderer/src/components/editor/autosave/editor-autosave-conflict-flow.test.ts index 29d6903c91a..26808c81cca 100644 --- a/src/renderer/src/components/editor/autosave/editor-autosave-conflict-flow.test.ts +++ b/src/renderer/src/components/editor/autosave/editor-autosave-conflict-flow.test.ts @@ -19,7 +19,7 @@ const mocks = vi.hoisted(() => ({ getConnectionIdForFile: vi.fn() })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionIdForFile: mocks.getConnectionIdForFile })) diff --git a/src/renderer/src/components/editor/autosave/editor-autosave-controller.test.ts b/src/renderer/src/components/editor/autosave/editor-autosave-controller.test.ts index f5fc02a72f0..6c5521037d0 100644 --- a/src/renderer/src/components/editor/autosave/editor-autosave-controller.test.ts +++ b/src/renderer/src/components/editor/autosave/editor-autosave-controller.test.ts @@ -29,7 +29,7 @@ const mocks = vi.hoisted(() => ({ getConnectionIdForFile: vi.fn() })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionIdForFile: mocks.getConnectionIdForFile })) diff --git a/src/renderer/src/components/editor/check-details/actions/check-run-details-fix-with-ai.ts b/src/renderer/src/components/editor/check-details/actions/check-run-details-fix-with-ai.ts index 39ae86e6723..0d48367b4ae 100644 --- a/src/renderer/src/components/editor/check-details/actions/check-run-details-fix-with-ai.ts +++ b/src/renderer/src/components/editor/check-details/actions/check-run-details-fix-with-ai.ts @@ -9,10 +9,10 @@ import { resolveCheckRunDetailsFixRepo } from './check-run-details-fix-context' import { openSourceControlAiSettingsTarget } from '@/components/right-sidebar/source-control/panel/source-control-ai-settings-navigation' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { startFixChecksAgent } from '@/lib/fix-checks-agent-launch' import { readSourceControlLaunchRecipeAgentId } from '../../../../../../shared/source-control/ai/source-control-launch-agent-selection' -import { resolveRepoWorktreeLaunchPlatform } from '@/lib/execution-host-facts' +import { resolveRepoWorktreeLaunchPlatform } from '@/runtime/hosts/platform/execution-host-facts' import { useAppStore } from '@/store/index' import { findFirstIndexedWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner-index' import { resolveSourceControlActionRecipe } from '../../../../../../shared/source-control/ai/source-control-ai-operation-policy' diff --git a/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-section-connection.ts b/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-section-connection.ts index bbbdd3fcd7c..b18569e9552 100644 --- a/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-section-connection.ts +++ b/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-section-connection.ts @@ -1,4 +1,4 @@ -import { getConnectionIdForFile } from '@/lib/connection-context' +import { getConnectionIdForFile } from '@/lib/workspace/ownership/connection-context' import { joinPath } from '@/lib/path' import { useAppStore } from '@/store' import { acquireEditorFileOperation } from '@/lib/editor-file-operation-owner' diff --git a/src/renderer/src/components/editor/csv/csv-link-routing.ts b/src/renderer/src/components/editor/csv/csv-link-routing.ts index 297f97aa74a..f205d261e4c 100644 --- a/src/renderer/src/components/editor/csv/csv-link-routing.ts +++ b/src/renderer/src/components/editor/csv/csv-link-routing.ts @@ -1,4 +1,4 @@ -import { getConnectionIdForFile } from '@/lib/connection-context' +import { getConnectionIdForFile } from '@/lib/workspace/ownership/connection-context' import { openHttpLink, type HttpLinkSourceOwner } from '@/lib/browser/navigation/http-link-routing' import { resolveMarkdownPreviewHttpOpenOptions } from '../markdown/link-routing/markdown-preview-links' diff --git a/src/renderer/src/components/editor/diff/monaco-view/DiffViewer.tsx b/src/renderer/src/components/editor/diff/monaco-view/DiffViewer.tsx index c493955fc4e..d78217fcab7 100644 --- a/src/renderer/src/components/editor/diff/monaco-view/DiffViewer.tsx +++ b/src/renderer/src/components/editor/diff/monaco-view/DiffViewer.tsx @@ -1,4 +1,4 @@ -import { NO_RESOURCE_EVIDENCE } from '@/lib/workspace-copy-owner' +import { NO_RESOURCE_EVIDENCE } from '@/lib/workspace/ownership/workspace-copy-owner' import { useDiffCommentView } from '../../../diff-comments/use-diff-comment-owner' import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react' import { DiffEditor, type DiffOnMount } from '@monaco-editor/react' diff --git a/src/renderer/src/components/editor/diff/monaco-view/diff-viewer-props.ts b/src/renderer/src/components/editor/diff/monaco-view/diff-viewer-props.ts index f27914f9b45..80b606f0617 100644 --- a/src/renderer/src/components/editor/diff/monaco-view/diff-viewer-props.ts +++ b/src/renderer/src/components/editor/diff/monaco-view/diff-viewer-props.ts @@ -1,4 +1,4 @@ -import type { WorkspaceResource } from '@/lib/workspace-copy-owner' +import type { WorkspaceResource } from '@/lib/workspace/ownership/workspace-copy-owner' import type { LargeDiffRenderLimit } from '../../../../../../shared/large-diff-render-limit' export type DiffViewerProps = { diff --git a/src/renderer/src/components/editor/diff/sections/DiffSectionItem.tsx b/src/renderer/src/components/editor/diff/sections/DiffSectionItem.tsx index 7bd87e72b5c..4c980ab1d6d 100644 --- a/src/renderer/src/components/editor/diff/sections/DiffSectionItem.tsx +++ b/src/renderer/src/components/editor/diff/sections/DiffSectionItem.tsx @@ -1,4 +1,4 @@ -import { NO_RESOURCE_EVIDENCE } from '@/lib/workspace-copy-owner' +import { NO_RESOURCE_EVIDENCE } from '@/lib/workspace/ownership/workspace-copy-owner' import { useDiffCommentView } from '../../../diff-comments/use-diff-comment-owner' import { useCallback, useEffect, useMemo, useRef, useState } from 'react' import type { DiffOnMount } from '@monaco-editor/react' diff --git a/src/renderer/src/components/editor/diff/sections/diff-section-item-props.ts b/src/renderer/src/components/editor/diff/sections/diff-section-item-props.ts index 10a35b52707..1e3399bc38b 100644 --- a/src/renderer/src/components/editor/diff/sections/diff-section-item-props.ts +++ b/src/renderer/src/components/editor/diff/sections/diff-section-item-props.ts @@ -1,5 +1,5 @@ import type { GitHubImageIntake } from '@/components/github/use-github-image-uploads' -import type { WorkspaceResource } from '@/lib/workspace-copy-owner' +import type { WorkspaceResource } from '@/lib/workspace/ownership/workspace-copy-owner' import type { Dispatch, MutableRefObject, ReactNode, SetStateAction } from 'react' import type { editor as monacoEditor } from 'monaco-editor' import type { DecoratedDiffComment } from '../../../diff-comments/decorated-diff-comment' diff --git a/src/renderer/src/components/editor/editor-dropped-file-open.ts b/src/renderer/src/components/editor/editor-dropped-file-open.ts index 89ff59c69d6..491ee1cc509 100644 --- a/src/renderer/src/components/editor/editor-dropped-file-open.ts +++ b/src/renderer/src/components/editor/editor-dropped-file-open.ts @@ -6,7 +6,7 @@ import { toWorktreeRelativePath } from '../../../../shared/terminal/links/terminal-links' import { useAppStore } from '@/store' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { basename, joinPath } from '@/lib/path' import type { WorktreeRuntimeOwnerState } from '@/lib/workspace/ownership/worktree-runtime-owner-state' import { importExternalPathsToRuntime } from '@/runtime/files/imports/runtime-file-import-client' diff --git a/src/renderer/src/components/editor/external-changes/ExternalFileChangeBanner.tsx b/src/renderer/src/components/editor/external-changes/ExternalFileChangeBanner.tsx index d0a7c7b8f02..2b8271ce223 100644 --- a/src/renderer/src/components/editor/external-changes/ExternalFileChangeBanner.tsx +++ b/src/renderer/src/components/editor/external-changes/ExternalFileChangeBanner.tsx @@ -2,7 +2,7 @@ import React, { useState } from 'react' import { TriangleAlert } from 'lucide-react' import { toast } from 'sonner' import { Button } from '@/components/ui/button' -import { getConnectionIdForFile } from '@/lib/connection-context' +import { getConnectionIdForFile } from '@/lib/workspace/ownership/connection-context' import { editorTabFileAccess } from '@/lib/local-file-access' import { readRuntimeFileContent } from '@/runtime/files/reads/runtime-file-read-client' import { getRuntimeTargetForFileOwner } from '@/lib/file-owner-runtime-target' diff --git a/src/renderer/src/components/editor/external-changes/ExternalFileChangeCompareDialog.tsx b/src/renderer/src/components/editor/external-changes/ExternalFileChangeCompareDialog.tsx index f9984c91369..3e7babeb41a 100644 --- a/src/renderer/src/components/editor/external-changes/ExternalFileChangeCompareDialog.tsx +++ b/src/renderer/src/components/editor/external-changes/ExternalFileChangeCompareDialog.tsx @@ -10,7 +10,7 @@ import { DialogTitle } from '@/components/ui/dialog' import { lazyWithRetry as lazy } from '@/lib/lazy-with-retry' -import { getConnectionIdForFile } from '@/lib/connection-context' +import { getConnectionIdForFile } from '@/lib/workspace/ownership/connection-context' import { editorTabFileAccess } from '@/lib/local-file-access' import { detectLanguage } from '../../../../../shared/editor-language/editor-language-detect' import { readRuntimeFileContent } from '@/runtime/files/reads/runtime-file-read-client' diff --git a/src/renderer/src/components/editor/external-changes/editor-external-change-tab-reset.ts b/src/renderer/src/components/editor/external-changes/editor-external-change-tab-reset.ts index fd98c909ac8..c76e4909b53 100644 --- a/src/renderer/src/components/editor/external-changes/editor-external-change-tab-reset.ts +++ b/src/renderer/src/components/editor/external-changes/editor-external-change-tab-reset.ts @@ -1,4 +1,4 @@ -import { getConnectionIdForFile } from '@/lib/connection-context' +import { getConnectionIdForFile } from '@/lib/workspace/ownership/connection-context' import { getOpenFilesForExternalFileChange, type EditorPathMutationTarget diff --git a/src/renderer/src/components/editor/external-changes/editor-external-change-telemetry.ts b/src/renderer/src/components/editor/external-changes/editor-external-change-telemetry.ts index 32c7bbcccc5..88770dbe900 100644 --- a/src/renderer/src/components/editor/external-changes/editor-external-change-telemetry.ts +++ b/src/renderer/src/components/editor/external-changes/editor-external-change-telemetry.ts @@ -1,6 +1,6 @@ // Share path-free conflict enums across marking and banner actions so false-banner rates remain comparable by transport. import { track } from '@/lib/telemetry' -import { getConnectionIdForFile } from '@/lib/connection-context' +import { getConnectionIdForFile } from '@/lib/workspace/ownership/connection-context' import type { OpenFile } from '@/store/slices/editor/types/open-file' type ConflictSurface = 'edit' | 'unstaged-diff' diff --git a/src/renderer/src/components/editor/external-changes/editor-restored-tab-conflict-scan.recheck.test.ts b/src/renderer/src/components/editor/external-changes/editor-restored-tab-conflict-scan.recheck.test.ts index 62b04a4a8b5..44e1125884f 100644 --- a/src/renderer/src/components/editor/external-changes/editor-restored-tab-conflict-scan.recheck.test.ts +++ b/src/renderer/src/components/editor/external-changes/editor-restored-tab-conflict-scan.recheck.test.ts @@ -11,7 +11,9 @@ vi.mock('@/runtime/files/reads/runtime-file-read-client', () => ({ vi.mock('@/runtime/files/metadata/runtime-path-existence-batch', () => ({ runtimePathsExist: mocks.runtimePathsExist })) -vi.mock('@/lib/connection-context', () => ({ getConnectionIdForFile: () => undefined })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionIdForFile: () => undefined +})) vi.mock('@/lib/file-owner-runtime-target', () => { const owner = { kind: 'environment', environmentId: 'env-1' } return { diff --git a/src/renderer/src/components/editor/external-changes/editor-restored-tab-conflict-scan.test.ts b/src/renderer/src/components/editor/external-changes/editor-restored-tab-conflict-scan.test.ts index 26a37718b04..ad10b6b085e 100644 --- a/src/renderer/src/components/editor/external-changes/editor-restored-tab-conflict-scan.test.ts +++ b/src/renderer/src/components/editor/external-changes/editor-restored-tab-conflict-scan.test.ts @@ -17,7 +17,7 @@ vi.mock('@/runtime/files/reads/runtime-file-read-client', () => ({ readRuntimeFileContent: mocks.readRuntimeFileContent })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionIdForFile: mocks.getConnectionIdForFile })) diff --git a/src/renderer/src/components/editor/external-changes/editor-restored-tab-conflict-scan.ts b/src/renderer/src/components/editor/external-changes/editor-restored-tab-conflict-scan.ts index 773167b2108..4e11728a802 100644 --- a/src/renderer/src/components/editor/external-changes/editor-restored-tab-conflict-scan.ts +++ b/src/renderer/src/components/editor/external-changes/editor-restored-tab-conflict-scan.ts @@ -2,7 +2,7 @@ import type { StoreApi } from 'zustand' import type { AppState } from '@/store/types' import type { OpenFile } from '@/store/slices/editor/types/open-file' -import { getConnectionIdForFile } from '@/lib/connection-context' +import { getConnectionIdForFile } from '@/lib/workspace/ownership/connection-context' import { editorTabFileAccess } from '@/lib/local-file-access' import { readRuntimeFileContent } from '@/runtime/files/reads/runtime-file-read-client' import { diff --git a/src/renderer/src/components/editor/external-changes/useEditorPanelExternalContentEvents.ts b/src/renderer/src/components/editor/external-changes/useEditorPanelExternalContentEvents.ts index c45bac703db..02870177a15 100644 --- a/src/renderer/src/components/editor/external-changes/useEditorPanelExternalContentEvents.ts +++ b/src/renderer/src/components/editor/external-changes/useEditorPanelExternalContentEvents.ts @@ -1,6 +1,6 @@ import { useEffect, useRef, type Dispatch, type MutableRefObject, type SetStateAction } from 'react' import { useAppStore } from '@/store/index' -import { getConnectionIdForFile } from '@/lib/connection-context' +import { getConnectionIdForFile } from '@/lib/workspace/ownership/connection-context' import type { OpenFile } from '@/store/slices/editor/types/open-file' import { ORCA_EDITOR_EXTERNAL_FILE_CHANGE_EVENT, diff --git a/src/renderer/src/components/editor/git-graph/git-graph-rendering.test.tsx b/src/renderer/src/components/editor/git-graph/git-graph-rendering.test.tsx index f4b13750029..ba96587e12e 100644 --- a/src/renderer/src/components/editor/git-graph/git-graph-rendering.test.tsx +++ b/src/renderer/src/components/editor/git-graph/git-graph-rendering.test.tsx @@ -4,7 +4,7 @@ import { useAppStore } from '@/store' import { gitGraphHistoryForTab, disposeGitGraphHistory } from './git-graph-tab-controllers' import { attachClosedEditorTabCleanup } from '../model-lifetime/retention/closed-editor-tab-controller' import { gitGraphScope } from '@/lib/git-graph-tab' -import { captureWorktreeOperationGenerationSnapshot } from '@/lib/worktree-operation-generation' +import { captureWorktreeOperationGenerationSnapshot } from '@/lib/workspace/ownership/worktree-operation-generation' import type { OpenFile } from '@/store/slices/editor/types/open-file' import { act } from 'react' import { createRoot } from 'react-dom/client' diff --git a/src/renderer/src/components/editor/markdown-preview/links/markdown-preview-link-actions.ts b/src/renderer/src/components/editor/markdown-preview/links/markdown-preview-link-actions.ts index 5f62566da08..9d02603dbe1 100644 --- a/src/renderer/src/components/editor/markdown-preview/links/markdown-preview-link-actions.ts +++ b/src/renderer/src/components/editor/markdown-preview/links/markdown-preview-link-actions.ts @@ -1,6 +1,6 @@ import { afterPendingEntityTabs } from '@/runtime/workspace-layout/intents/layout-owner-pending-tabs' import { toast } from 'sonner' -import { getConnectionIdForFile } from '@/lib/connection-context' +import { getConnectionIdForFile } from '@/lib/workspace/ownership/connection-context' import { detectLanguage } from '../../../../../../shared/editor-language/editor-language-detect' import { isLocalPathOpenBlocked, showLocalPathOpenBlockedToast } from '@/lib/local-path-open-guard' import { getLinkSourceLocalOpenOwner } from '@/lib/link-source-local-open-owner' diff --git a/src/renderer/src/components/editor/markdown-preview/links/markdown-preview-source-routing.ts b/src/renderer/src/components/editor/markdown-preview/links/markdown-preview-source-routing.ts index 4d1743fa1e5..c64a01d60b5 100644 --- a/src/renderer/src/components/editor/markdown-preview/links/markdown-preview-source-routing.ts +++ b/src/renderer/src/components/editor/markdown-preview/links/markdown-preview-source-routing.ts @@ -1,4 +1,4 @@ -import { getConnectionIdForFile } from '@/lib/connection-context' +import { getConnectionIdForFile } from '@/lib/workspace/ownership/connection-context' import type { HttpLinkSourceOwner } from '@/lib/browser/navigation/http-link-routing' import { dirname } from '@/lib/path' import { findFirstIndexedWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner-index' diff --git a/src/renderer/src/components/editor/markdown-preview/surface/MarkdownPreview.link-routing.interaction.test.tsx b/src/renderer/src/components/editor/markdown-preview/surface/MarkdownPreview.link-routing.interaction.test.tsx index 0d4c84683ee..6dbe378bcac 100644 --- a/src/renderer/src/components/editor/markdown-preview/surface/MarkdownPreview.link-routing.interaction.test.tsx +++ b/src/renderer/src/components/editor/markdown-preview/surface/MarkdownPreview.link-routing.interaction.test.tsx @@ -82,10 +82,10 @@ vi.mock('../../../../runtime/rpc/targets/use-worktree-runtime-target', () => ({ vi.mock('@/runtime/files/metadata/runtime-file-metadata-client', () => ({ statRuntimePath: statRuntimePathMock })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionIdForFile: (worktreeId: string) => targetConnectionOwners.get(worktreeId) })) -vi.mock('@/lib/connection-owner-resolution', () => ({ +vi.mock('@/lib/workspace/ownership/connection-owner-resolution', () => ({ createConnectionIdForFileSelector: () => () => connectionOwner.value })) vi.mock('@/i18n/i18n', () => ({ diff --git a/src/renderer/src/components/editor/markdown-preview/surface/use-markdown-preview-source-foundation.ts b/src/renderer/src/components/editor/markdown-preview/surface/use-markdown-preview-source-foundation.ts index 7eefb31d9e4..212d5dd8b11 100644 --- a/src/renderer/src/components/editor/markdown-preview/surface/use-markdown-preview-source-foundation.ts +++ b/src/renderer/src/components/editor/markdown-preview/surface/use-markdown-preview-source-foundation.ts @@ -1,6 +1,6 @@ import { useDiffCommentView } from '../../../diff-comments/use-diff-comment-owner' import { useCallback, useEffect, useMemo, useRef, useState } from 'react' -import { createConnectionIdForFileSelector } from '@/lib/connection-owner-resolution' +import { createConnectionIdForFileSelector } from '@/lib/workspace/ownership/connection-owner-resolution' import { computeEditorFontSize } from '@/lib/editor-font-zoom' import type { HttpLinkSourceOwner } from '@/lib/browser/navigation/http-link-routing' import { isMarkdownComment } from '@/lib/diff-comment-compat' diff --git a/src/renderer/src/components/editor/markdown-source-tools/monaco/use-monaco-markdown-annotations.ts b/src/renderer/src/components/editor/markdown-source-tools/monaco/use-monaco-markdown-annotations.ts index a2be1f49da8..5cf049fafaa 100644 --- a/src/renderer/src/components/editor/markdown-source-tools/monaco/use-monaco-markdown-annotations.ts +++ b/src/renderer/src/components/editor/markdown-source-tools/monaco/use-monaco-markdown-annotations.ts @@ -14,7 +14,7 @@ import { } from 'react' import type { editor } from 'monaco-editor' import type { DiffComment } from '../../../../../../shared/diff-comment-types' -import type { WorkspaceResource } from '@/lib/workspace-copy-owner' +import type { WorkspaceResource } from '@/lib/workspace/ownership/workspace-copy-owner' import { toast } from 'sonner' import { useTranslate } from '@/i18n/use-translate' import { useAppStore } from '@/store/index' diff --git a/src/renderer/src/components/editor/markdown/documents/useMarkdownDocuments.navigation.test.ts b/src/renderer/src/components/editor/markdown/documents/useMarkdownDocuments.navigation.test.ts index 8709d9db8cf..e49ef399bd6 100644 --- a/src/renderer/src/components/editor/markdown/documents/useMarkdownDocuments.navigation.test.ts +++ b/src/renderer/src/components/editor/markdown/documents/useMarkdownDocuments.navigation.test.ts @@ -3,7 +3,7 @@ import { act, createElement } from 'react' import { createRoot, type Root } from 'react-dom/client' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { MarkdownViewMode, OpenFile } from '@/store/slices/editor/types/open-file' -import type * as ConnectionOwnerResolution from '@/lib/connection-owner-resolution' +import type * as ConnectionOwnerResolution from '@/lib/workspace/ownership/connection-owner-resolution' import { useMarkdownDocuments } from './useMarkdownDocuments' import { useAppStore } from '@/store/index' import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' @@ -26,8 +26,10 @@ const state = { openFile: vi.fn(), openMarkdownPreview: vi.fn() } -vi.mock('@/lib/connection-context', () => ({ getConnectionIdFromState: () => runtimeConnectionId })) -vi.mock('@/lib/connection-owner-resolution', async (importOriginal) => { +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionIdFromState: () => runtimeConnectionId +})) +vi.mock('@/lib/workspace/ownership/connection-owner-resolution', async (importOriginal) => { const actual = await importOriginal() return { ...actual, getConnectionIdFromState: () => runtimeConnectionId } }) diff --git a/src/renderer/src/components/editor/markdown/documents/useMarkdownDocuments.ts b/src/renderer/src/components/editor/markdown/documents/useMarkdownDocuments.ts index 366f918a926..d7100516fda 100644 --- a/src/renderer/src/components/editor/markdown/documents/useMarkdownDocuments.ts +++ b/src/renderer/src/components/editor/markdown/documents/useMarkdownDocuments.ts @@ -3,8 +3,8 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react' import type { MarkdownDocument } from '../../../../../../shared/file-listing/file-document' import { useAppStore } from '@/store/index' import { translate } from '@/i18n/i18n' -import '@/lib/connection-context' -import { getConnectionIdFromState } from '@/lib/connection-owner-resolution' +import '@/lib/workspace/ownership/connection-context' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { statRuntimePath } from '@/runtime/files/metadata/runtime-file-metadata-client' import { acquireEditorFileOperation } from '@/lib/editor-file-operation-owner' import { getRuntimeTargetForFileOwner } from '@/lib/file-owner-runtime-target' diff --git a/src/renderer/src/components/editor/markdown/documents/useMarkdownDocuments.watch.test.ts b/src/renderer/src/components/editor/markdown/documents/useMarkdownDocuments.watch.test.ts index f3eab1176d8..49184312c61 100644 --- a/src/renderer/src/components/editor/markdown/documents/useMarkdownDocuments.watch.test.ts +++ b/src/renderer/src/components/editor/markdown/documents/useMarkdownDocuments.watch.test.ts @@ -6,7 +6,7 @@ import type { FsChangeEvent } from '../../../../../../shared/file-watch/filesyst import type { MarkdownDocument } from '../../../../../../shared/file-listing/file-document' import type { OpenFile } from '@/store/slices/editor/types/open-file' import { ORCA_WORKTREE_FILE_CHANGE_EVENT } from '@/hooks/worktree-file-change-event' -import type * as ConnectionOwnerResolution from '@/lib/connection-owner-resolution' +import type * as ConnectionOwnerResolution from '@/lib/workspace/ownership/connection-owner-resolution' import { useMarkdownDocuments } from './useMarkdownDocuments' const runtime = vi.hoisted(() => ({ list: vi.fn(), stat: vi.fn() })) @@ -21,8 +21,10 @@ vi.mock('@/store/index', () => ({ getState: () => state }) })) -vi.mock('@/lib/connection-context', () => ({ getConnectionIdFromState: () => null })) -vi.mock('@/lib/connection-owner-resolution', async (importOriginal) => { +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionIdFromState: () => null +})) +vi.mock('@/lib/workspace/ownership/connection-owner-resolution', async (importOriginal) => { const actual = await importOriginal() return { ...actual, getConnectionIdFromState: () => null } }) diff --git a/src/renderer/src/components/editor/model-lifetime/buffer-text/editor-buffer-sharing.test.ts b/src/renderer/src/components/editor/model-lifetime/buffer-text/editor-buffer-sharing.test.ts index d1cab149838..045d15caae5 100644 --- a/src/renderer/src/components/editor/model-lifetime/buffer-text/editor-buffer-sharing.test.ts +++ b/src/renderer/src/components/editor/model-lifetime/buffer-text/editor-buffer-sharing.test.ts @@ -20,7 +20,9 @@ import { registerPendingEditorFlush } from '../../save/flush/editor-pending-flus const storeRef = vi.hoisted((): { current: StoreApi | null } => ({ current: null })) vi.mock('sonner', () => ({ toast: Object.assign(vi.fn(), { error: vi.fn() }) })) -vi.mock('@/lib/connection-context', () => ({ getConnectionIdForFile: () => undefined })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionIdForFile: () => undefined +})) vi.mock('@/store/index', () => { const getState = () => storeRef.current!.getState() return { diff --git a/src/renderer/src/components/editor/model-lifetime/identity/editor-model-host-isolation.test.ts b/src/renderer/src/components/editor/model-lifetime/identity/editor-model-host-isolation.test.ts index 2c8f9432179..1626f2d5ffc 100644 --- a/src/renderer/src/components/editor/model-lifetime/identity/editor-model-host-isolation.test.ts +++ b/src/renderer/src/components/editor/model-lifetime/identity/editor-model-host-isolation.test.ts @@ -4,7 +4,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest' import '@/store/slices/editor/create-editor-slice' import { buildOwnedEditorFileId } from '@/store/slices/editor/file-ids/editor-file-ids' import type { OpenFile } from '@/store/slices/editor/types/open-file' -import type { WorktreeOperationRoute } from '@/lib/worktree-operation-route' +import type { WorktreeOperationRoute } from '@/lib/workspace/ownership/worktree-operation-route' import { attachModelLifetimeView, createModelLifetimeFixture, diff --git a/src/renderer/src/components/editor/model-lifetime/identity/editor-model-owner.ts b/src/renderer/src/components/editor/model-lifetime/identity/editor-model-owner.ts index 469b3f157bf..28ddcf7d607 100644 --- a/src/renderer/src/components/editor/model-lifetime/identity/editor-model-owner.ts +++ b/src/renderer/src/components/editor/model-lifetime/identity/editor-model-owner.ts @@ -1,5 +1,5 @@ import type { OpenFile } from '@/store/slices/editor/types/open-file' -import type { WorktreeOperationRouteState } from '@/lib/worktree-operation-route' +import type { WorktreeOperationRouteState } from '@/lib/workspace/ownership/worktree-operation-route' import '@/lib/editor-file-operation-owner' import { resolveEditorOwnerRoute } from '@/lib/editor-file-operation-provenance' import { diff --git a/src/renderer/src/components/editor/notebook/kernel/ipynb-execution-host.ts b/src/renderer/src/components/editor/notebook/kernel/ipynb-execution-host.ts index 12cd4c06258..afe6e7699f2 100644 --- a/src/renderer/src/components/editor/notebook/kernel/ipynb-execution-host.ts +++ b/src/renderer/src/components/editor/notebook/kernel/ipynb-execution-host.ts @@ -1,6 +1,6 @@ import { LOCAL_EXECUTION_HOST_ID } from '../../../../../../shared/execution-host' -import { resolveOwner } from '@/lib/resolve-owner' -import type { WorktreeOperationRouteState } from '@/lib/worktree-operation-route' +import { resolveOwner } from '@/lib/workspace/ownership/resolve-owner' +import type { WorktreeOperationRouteState } from '@/lib/workspace/ownership/worktree-operation-route' /** Where a notebook's kernel would run: kernels exist only on this computer. */ export type NotebookExecutionHost = 'local' | 'remote' | 'unresolved' diff --git a/src/renderer/src/components/editor/notebook/kernel/useIpynbCellExecution.test.tsx b/src/renderer/src/components/editor/notebook/kernel/useIpynbCellExecution.test.tsx index 3fba1ebf4cc..5c49f2123df 100644 --- a/src/renderer/src/components/editor/notebook/kernel/useIpynbCellExecution.test.tsx +++ b/src/renderer/src/components/editor/notebook/kernel/useIpynbCellExecution.test.tsx @@ -6,7 +6,7 @@ import type { KernelFrameEvent } from '../../../../../../shared/notebook-kernel- import type { WorktreeOperationOwnerRecord, WorktreeOperationRouteState -} from '@/lib/worktree-operation-route' +} from '@/lib/workspace/ownership/worktree-operation-route' const { storeState, notebookApi, toastError, frameListener } = vi.hoisted(() => { const frameListener = { current: (_event: KernelFrameEvent): void => {} } diff --git a/src/renderer/src/components/editor/restored-editor-same-workspace-reown.test.tsx b/src/renderer/src/components/editor/restored-editor-same-workspace-reown.test.tsx index c6a137e699f..e1fdca5a809 100644 --- a/src/renderer/src/components/editor/restored-editor-same-workspace-reown.test.tsx +++ b/src/renderer/src/components/editor/restored-editor-same-workspace-reown.test.tsx @@ -7,11 +7,8 @@ import type * as RuntimeFileReadClient from '@/runtime/files/reads/runtime-file- import { useAppStore } from '@/store' import type { AppState } from '@/store/types' import { makeWorktree } from '../../store/slices/worktrees/worktree.test-fixture' -import type { FileContent } from './editor-panel-content-types' -import { - useEditorPanelFileContentLoader, - type EditorPanelFileContentLoader -} from './useEditorPanelFileContentLoader' +import type { FileContent, EditorPanelFileContentLoader } from './editor-panel-content-types' +import { useEditorPanelFileContentLoader } from './useEditorPanelFileContentLoader' import { layoutApplyTestTransport } from '@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture' import { drawTabsFromMain, diff --git a/src/renderer/src/components/editor/restored-editor-workspace-runtime-owner.test.tsx b/src/renderer/src/components/editor/restored-editor-workspace-runtime-owner.test.tsx index ac92b0f7eaa..f79281c1ffe 100644 --- a/src/renderer/src/components/editor/restored-editor-workspace-runtime-owner.test.tsx +++ b/src/renderer/src/components/editor/restored-editor-workspace-runtime-owner.test.tsx @@ -6,11 +6,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type * as RuntimeFileReadClient from '@/runtime/files/reads/runtime-file-read-client' import { useAppStore } from '@/store' import { makeWorktree } from '../../store/slices/worktrees/worktree.test-fixture' -import type { FileContent } from './editor-panel-content-types' -import { - useEditorPanelFileContentLoader, - type EditorPanelFileContentLoader -} from './useEditorPanelFileContentLoader' +import type { FileContent, EditorPanelFileContentLoader } from './editor-panel-content-types' +import { useEditorPanelFileContentLoader } from './useEditorPanelFileContentLoader' const mocks = vi.hoisted(() => ({ readRuntimeFileContent: vi.fn() })) vi.mock('@/runtime/files/reads/runtime-file-read-client', async (importOriginal) => ({ diff --git a/src/renderer/src/components/editor/restored-editor-workspace-runtime-owner.ts b/src/renderer/src/components/editor/restored-editor-workspace-runtime-owner.ts index bee2a4f29ac..ba869f52977 100644 --- a/src/renderer/src/components/editor/restored-editor-workspace-runtime-owner.ts +++ b/src/renderer/src/components/editor/restored-editor-workspace-runtime-owner.ts @@ -1,7 +1,7 @@ import type { OpenFile } from '@/store/slices/editor/types/open-file' import type { AppState } from '@/store/types' -import { hasOpenFileExecutionHostEvidence } from '@/lib/unified-tab-host-ownership' -import { runtimeEnvironmentIdUnlessTwin } from '@/lib/resolve-owner' +import { hasOpenFileExecutionHostEvidence } from '@/lib/workspace/ownership/unified-tab-host-ownership' +import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' import { findRuntimeWorkspaceFileRoute, type RuntimeWorkspaceFileRoute diff --git a/src/renderer/src/components/editor/rich-markdown/citations/useRichMarkdownSuperscriptLinkSetup.ts b/src/renderer/src/components/editor/rich-markdown/citations/useRichMarkdownSuperscriptLinkSetup.ts index 4f64648fe79..0d9490dd4a0 100644 --- a/src/renderer/src/components/editor/rich-markdown/citations/useRichMarkdownSuperscriptLinkSetup.ts +++ b/src/renderer/src/components/editor/rich-markdown/citations/useRichMarkdownSuperscriptLinkSetup.ts @@ -2,7 +2,7 @@ import { useLayoutEffect, useMemo, useState } from 'react' import { useAppStore } from '@/store/index' import { getIndexedWorktreeById } from '@/store/slices/worktrees/listing/worktree-catalog-index' import { parseWorkspaceKey } from '../../../../../../shared/workspace-scope' -import { createConnectionIdForFileSelector } from '@/lib/connection-owner-resolution' +import { createConnectionIdForFileSelector } from '@/lib/workspace/ownership/connection-owner-resolution' import type { HttpLinkSourceOwner } from '@/lib/browser/navigation/http-link-routing' import { createRichMarkdownEditorCodec } from '../document/rich-markdown-source-transport' import { createRichMarkdownHtmlSuperscriptLinkContext } from './rich-markdown-html-superscript-link-context' diff --git a/src/renderer/src/components/editor/rich-markdown/clipboard/rich-markdown-large-text-paste.selection.test.ts b/src/renderer/src/components/editor/rich-markdown/clipboard/rich-markdown-large-text-paste.selection.test.ts index c1847880b6c..4d7a79d4d66 100644 --- a/src/renderer/src/components/editor/rich-markdown/clipboard/rich-markdown-large-text-paste.selection.test.ts +++ b/src/renderer/src/components/editor/rich-markdown/clipboard/rich-markdown-large-text-paste.selection.test.ts @@ -19,7 +19,9 @@ const boundaryMocks = vi.hoisted(() => ({ }) })) -vi.mock('@/lib/connection-context', () => ({ getConnectionId: boundaryMocks.getConnectionId })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionId: boundaryMocks.getConnectionId +})) const editors: Editor[] = [] const largeText = 'X'.repeat(70 * 1024) diff --git a/src/renderer/src/components/editor/rich-markdown/clipboard/rich-markdown-large-text-paste.test.ts b/src/renderer/src/components/editor/rich-markdown/clipboard/rich-markdown-large-text-paste.test.ts index dbe0f800900..56e0d6d944c 100644 --- a/src/renderer/src/components/editor/rich-markdown/clipboard/rich-markdown-large-text-paste.test.ts +++ b/src/renderer/src/components/editor/rich-markdown/clipboard/rich-markdown-large-text-paste.test.ts @@ -21,7 +21,9 @@ const boundaryMocks = vi.hoisted(() => ({ }) })) -vi.mock('@/lib/connection-context', () => ({ getConnectionId: boundaryMocks.getConnectionId })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionId: boundaryMocks.getConnectionId +})) const editors: Editor[] = [] diff --git a/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-async-image-paste.test.ts b/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-async-image-paste.test.ts index 53daa1d64cc..166308130c0 100644 --- a/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-async-image-paste.test.ts +++ b/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-async-image-paste.test.ts @@ -11,7 +11,9 @@ import { handleRichMarkdownImagePaste } from './rich-markdown-paste-image' vi.mock('@/runtime/files/imports/runtime-file-import-client', () => ({ importExternalPathsToRuntime: vi.fn() })) -vi.mock('@/lib/connection-context', () => ({ getConnectionId: vi.fn(() => null) })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionId: vi.fn(() => null) +})) vi.mock('@/store/index', () => ({ useAppStore: { getState: vi.fn(() => ({ diff --git a/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-async-image-table.test.ts b/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-async-image-table.test.ts index ca1362ba320..f55c7dc3259 100644 --- a/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-async-image-table.test.ts +++ b/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-async-image-table.test.ts @@ -10,7 +10,9 @@ import { handleRichMarkdownImagePaste } from './rich-markdown-paste-image' vi.mock('@/runtime/files/imports/runtime-file-import-client', () => ({ importExternalPathsToRuntime: vi.fn() })) -vi.mock('@/lib/connection-context', () => ({ getConnectionId: vi.fn(() => null) })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionId: vi.fn(() => null) +})) vi.mock('@/store/index', () => ({ useAppStore: { getState: vi.fn(() => ({ diff --git a/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-blob-image-paste.test.ts b/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-blob-image-paste.test.ts index aaa9aca060f..2d800ba69db 100644 --- a/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-blob-image-paste.test.ts +++ b/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-blob-image-paste.test.ts @@ -19,7 +19,7 @@ vi.mock('@/store/index', () => ({ getState: vi.fn() } })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: () => null, getConnectionIdForFile: () => null })) diff --git a/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-context.test.ts b/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-context.test.ts index 507416d0139..cc06e5724f0 100644 --- a/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-context.test.ts +++ b/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-context.test.ts @@ -9,7 +9,7 @@ import { prewarmMarkdownPreviewLocalImages } from '../../markdown-preview/links/ import { loadLocalImageSrc } from '../../document-images/useLocalImageSrc' import { resetLocalImageCacheState as resetLocalImageSrcStateForTests } from '../../document-images/local-image-src-cache' -vi.mock('@/lib/connection-context', () => ({ getConnectionId: () => null })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: () => null })) describe('image reads for a document whose owner is unresolved', () => { afterEach(() => { diff --git a/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-context.ts b/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-context.ts index 31bc35f3e3c..dab8a0b154c 100644 --- a/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-context.ts +++ b/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-context.ts @@ -1,5 +1,5 @@ import type { Editor } from '@tiptap/core' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target' import type { RuntimeFileOperationArgs } from '@/runtime/files/runtime-file-client-types' diff --git a/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-insert-code-block.test.ts b/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-insert-code-block.test.ts index 83470f2588e..e977e28d0d7 100644 --- a/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-insert-code-block.test.ts +++ b/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-insert-code-block.test.ts @@ -13,7 +13,7 @@ vi.mock('@/runtime/files/imports/runtime-file-import-client', () => ({ }) })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: vi.fn(() => null) })) diff --git a/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-insert.ts b/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-insert.ts index 472b19a429b..bf4d7556ca7 100644 --- a/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-insert.ts +++ b/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-insert.ts @@ -1,7 +1,7 @@ import type { Editor } from '@tiptap/react' import { toast } from 'sonner' import { dirname, basename } from '@/lib/path' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { useAppStore } from '@/store/index' import { importExternalPathsToRuntime } from '@/runtime/files/imports/runtime-file-import-client' import { diff --git a/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-paste-image.ts b/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-paste-image.ts index c783de0eea1..e028d53f095 100644 --- a/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-paste-image.ts +++ b/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-paste-image.ts @@ -1,6 +1,6 @@ import type { Editor } from '@tiptap/react' import { toast } from 'sonner' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { useAppStore } from '@/store/index' import { requireRuntimeTargetForFileOwner } from '@/lib/file-owner-runtime-target' import { extractIpcErrorMessage } from './rich-markdown-ipc-error-message' diff --git a/src/renderer/src/components/editor/rich-markdown/images/useLocalImagePick.test.tsx b/src/renderer/src/components/editor/rich-markdown/images/useLocalImagePick.test.tsx index ab6ff1e68a7..3daa0eff498 100644 --- a/src/renderer/src/components/editor/rich-markdown/images/useLocalImagePick.test.tsx +++ b/src/renderer/src/components/editor/rich-markdown/images/useLocalImagePick.test.tsx @@ -12,7 +12,9 @@ import { useLocalImagePick } from './useLocalImagePick' vi.mock('@/runtime/files/imports/runtime-file-import-client', () => ({ importExternalPathsToRuntime: vi.fn() })) -vi.mock('@/lib/connection-context', () => ({ getConnectionId: vi.fn(() => null) })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionId: vi.fn(() => null) +})) vi.mock('@/store/index', () => ({ useAppStore: { getState: vi.fn(() => ({ diff --git a/src/renderer/src/components/editor/rich-markdown/review/useRichMarkdownReviewController.ts b/src/renderer/src/components/editor/rich-markdown/review/useRichMarkdownReviewController.ts index 4b9d6939bdb..27bb28000ca 100644 --- a/src/renderer/src/components/editor/rich-markdown/review/useRichMarkdownReviewController.ts +++ b/src/renderer/src/components/editor/rich-markdown/review/useRichMarkdownReviewController.ts @@ -19,7 +19,7 @@ import { useRichMarkdownReviewData } from './useRichMarkdownReviewData' import { useRichMarkdownReviewCopyFeedback } from './useRichMarkdownReviewCopyFeedback' import { useRichMarkdownReviewRailController } from './useRichMarkdownReviewRailController' import type { DiffComment } from '../../../../../../shared/diff-comment-types' -import type { WorkspaceResource } from '@/lib/workspace-copy-owner' +import type { WorkspaceResource } from '@/lib/workspace/ownership/workspace-copy-owner' type UseRichMarkdownReviewControllerOptions = { addDiffComment: AppState['addDiffComment'] diff --git a/src/renderer/src/components/editor/save/commands/editor-file-save-utf8-conversion.test.ts b/src/renderer/src/components/editor/save/commands/editor-file-save-utf8-conversion.test.ts index 48dfd267e84..fb5c15432e3 100644 --- a/src/renderer/src/components/editor/save/commands/editor-file-save-utf8-conversion.test.ts +++ b/src/renderer/src/components/editor/save/commands/editor-file-save-utf8-conversion.test.ts @@ -12,7 +12,9 @@ import { __clearNonUtf8AutosavePausesForTests } from '../../autosave/editor-non- import { __clearSelfWriteRegistryForTests } from '../../external-changes/editor-self-write-registry' vi.mock('sonner', () => ({ toast: { warning: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/connection-context', () => ({ getConnectionIdForFile: () => undefined })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionIdForFile: () => undefined +})) // "café" saved as Latin-1, decoded as UTF-8. const LATIN1 = Buffer.from([0x63, 0x61, 0x66, 0xe9]).toString('utf8') diff --git a/src/renderer/src/components/editor/save/commands/editor-untitled-save-lifecycle.test.ts b/src/renderer/src/components/editor/save/commands/editor-untitled-save-lifecycle.test.ts index fb85e094e96..97eefdea5a2 100644 --- a/src/renderer/src/components/editor/save/commands/editor-untitled-save-lifecycle.test.ts +++ b/src/renderer/src/components/editor/save/commands/editor-untitled-save-lifecycle.test.ts @@ -24,7 +24,7 @@ function requireStore(): StoreApi { } vi.mock('@/store/index', () => ({ useAppStore: { getState: () => requireStore().getState() } })) -vi.mock('@/lib/connection-context', () => ({ getConnectionIdForFile: vi.fn() })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionIdForFile: vi.fn() })) const FILE_ID = '/repo/untitled.md' diff --git a/src/renderer/src/components/editor/save/flush/discard-editor-file-changes.save-race.test.ts b/src/renderer/src/components/editor/save/flush/discard-editor-file-changes.save-race.test.ts index 025edd65118..b74dd8fd23d 100644 --- a/src/renderer/src/components/editor/save/flush/discard-editor-file-changes.save-race.test.ts +++ b/src/renderer/src/components/editor/save/flush/discard-editor-file-changes.save-race.test.ts @@ -22,7 +22,9 @@ const storeRef = vi.hoisted((): { current: ReturnType current: null })) vi.mock('@/store/index', () => ({ useAppStore: { getState: () => storeRef.current?.getState() } })) -vi.mock('@/lib/connection-context', () => ({ getConnectionIdForFile: () => undefined })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionIdForFile: () => undefined +})) // Hold the remote capability/status round trip before bytes are sent. const hostCheck = vi.hoisted((): { wait: Promise | null } => ({ wait: null })) vi.mock('@/runtime/files/mutations/runtime-file-mutation-client', async (importOriginal) => { diff --git a/src/renderer/src/components/editor/save/queue/editor-save-disk-precondition.races.test.ts b/src/renderer/src/components/editor/save/queue/editor-save-disk-precondition.races.test.ts index d31a018accd..8a863405f85 100644 --- a/src/renderer/src/components/editor/save/queue/editor-save-disk-precondition.races.test.ts +++ b/src/renderer/src/components/editor/save/queue/editor-save-disk-precondition.races.test.ts @@ -20,7 +20,9 @@ const storeRef = vi.hoisted((): { current: ReturnType })) vi.mock('sonner', () => ({ toast: Object.assign(vi.fn(), { error: mocks.toastError }) })) -vi.mock('@/lib/connection-context', () => ({ getConnectionIdForFile: () => undefined })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionIdForFile: () => undefined +})) vi.mock('@/store/index', () => ({ useAppStore: { getState: () => storeRef.current?.getState() } })) vi.mock('@/lib/file-owner-runtime-target', () => ({ getRuntimeTargetForFileOwner: () => ({ kind: 'local' }) diff --git a/src/renderer/src/components/editor/save/queue/editor-save-disk-precondition.test.ts b/src/renderer/src/components/editor/save/queue/editor-save-disk-precondition.test.ts index 4b91bd1f4f6..a5108677b4e 100644 --- a/src/renderer/src/components/editor/save/queue/editor-save-disk-precondition.test.ts +++ b/src/renderer/src/components/editor/save/queue/editor-save-disk-precondition.test.ts @@ -18,7 +18,7 @@ const storeRef = vi.hoisted((): { current: ReturnType current: null })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionIdForFile: mocks.getConnectionIdForFile })) vi.mock('@/store/index', () => ({ useAppStore: { getState: () => storeRef.current?.getState() } })) diff --git a/src/renderer/src/components/editor/save/queue/editor-save-queue-closed-view-records.test.ts b/src/renderer/src/components/editor/save/queue/editor-save-queue-closed-view-records.test.ts index 4d3fd153072..7d63b2d7e44 100644 --- a/src/renderer/src/components/editor/save/queue/editor-save-queue-closed-view-records.test.ts +++ b/src/renderer/src/components/editor/save/queue/editor-save-queue-closed-view-records.test.ts @@ -6,7 +6,9 @@ import { type ClosedViewHarness } from './editor-save-closed-view.test-fixture' -vi.mock('@/lib/connection-context', () => ({ getConnectionIdForFile: () => undefined })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionIdForFile: () => undefined +})) // A view opened before a reconnect: its captured connection generation no longer matches. diff --git a/src/renderer/src/components/editor/save/queue/editor-save-queue-closed-view.test.ts b/src/renderer/src/components/editor/save/queue/editor-save-queue-closed-view.test.ts index 118b3f38780..105bf28df59 100644 --- a/src/renderer/src/components/editor/save/queue/editor-save-queue-closed-view.test.ts +++ b/src/renderer/src/components/editor/save/queue/editor-save-queue-closed-view.test.ts @@ -8,7 +8,9 @@ import { type ClosedViewHarness } from './editor-save-closed-view.test-fixture' -vi.mock('@/lib/connection-context', () => ({ getConnectionIdForFile: () => undefined })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionIdForFile: () => undefined +})) describe('editor save queue: the saving view closes mid-write', () => { let h: ClosedViewHarness diff --git a/src/renderer/src/components/editor/save/queue/editor-save-queue-records.test.ts b/src/renderer/src/components/editor/save/queue/editor-save-queue-records.test.ts index 6c742c398a5..1688f46b784 100644 --- a/src/renderer/src/components/editor/save/queue/editor-save-queue-records.test.ts +++ b/src/renderer/src/components/editor/save/queue/editor-save-queue-records.test.ts @@ -12,7 +12,9 @@ import { type FakeEditorDisk } from '../../autosave/editor-autosave-controller-test-fixture' -vi.mock('@/lib/connection-context', () => ({ getConnectionIdForFile: () => undefined })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionIdForFile: () => undefined +})) const PATH = '/repo/a.ts' const DELAY_MS = 1000 diff --git a/src/renderer/src/components/editor/save/queue/editor-save-queue-shared-records.test.ts b/src/renderer/src/components/editor/save/queue/editor-save-queue-shared-records.test.ts index b21e8574f79..c04644be550 100644 --- a/src/renderer/src/components/editor/save/queue/editor-save-queue-shared-records.test.ts +++ b/src/renderer/src/components/editor/save/queue/editor-save-queue-shared-records.test.ts @@ -15,7 +15,9 @@ import { type FakeEditorDisk } from '../../autosave/editor-autosave-controller-test-fixture' -vi.mock('@/lib/connection-context', () => ({ getConnectionIdForFile: () => undefined })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionIdForFile: () => undefined +})) const PATH = '/repo/a.ts' const WORKTREES = { diff --git a/src/renderer/src/components/editor/save/queue/editor-save-queue.test.ts b/src/renderer/src/components/editor/save/queue/editor-save-queue.test.ts index ee1df4afcdb..a9323988cfc 100644 --- a/src/renderer/src/components/editor/save/queue/editor-save-queue.test.ts +++ b/src/renderer/src/components/editor/save/queue/editor-save-queue.test.ts @@ -11,7 +11,9 @@ import { type FakeEditorDisk } from '../../autosave/editor-autosave-controller-test-fixture' -vi.mock('@/lib/connection-context', () => ({ getConnectionIdForFile: () => undefined })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionIdForFile: () => undefined +})) const PATH = '/repo/a.ts' diff --git a/src/renderer/src/components/editor/save/queue/editor-save-shared-model-dirty.test.ts b/src/renderer/src/components/editor/save/queue/editor-save-shared-model-dirty.test.ts index e2ade6884f9..73818a94955 100644 --- a/src/renderer/src/components/editor/save/queue/editor-save-shared-model-dirty.test.ts +++ b/src/renderer/src/components/editor/save/queue/editor-save-shared-model-dirty.test.ts @@ -17,7 +17,9 @@ const storeRef = vi.hoisted((): { current: ReturnType vi.mock('@/store/index', () => ({ useAppStore: { getState: () => storeRef.current?.getState() } })) -vi.mock('@/lib/connection-context', () => ({ getConnectionIdForFile: () => undefined })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionIdForFile: () => undefined +})) vi.mock('@/lib/file-owner-runtime-target', () => ({ getRuntimeTargetForFileOwner: () => ({ kind: 'local' }), requireRuntimeTargetForFileOwner: () => ({ kind: 'local' }) diff --git a/src/renderer/src/components/editor/save/queue/editor-save-shared-model.test.ts b/src/renderer/src/components/editor/save/queue/editor-save-shared-model.test.ts index 58b32cf7296..80898b0c226 100644 --- a/src/renderer/src/components/editor/save/queue/editor-save-shared-model.test.ts +++ b/src/renderer/src/components/editor/save/queue/editor-save-shared-model.test.ts @@ -16,7 +16,9 @@ const storeRef = vi.hoisted((): { current: ReturnType })) vi.mock('sonner', () => ({ toast: Object.assign(vi.fn(), { error: vi.fn() }) })) -vi.mock('@/lib/connection-context', () => ({ getConnectionIdForFile: () => undefined })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionIdForFile: () => undefined +})) vi.mock('@/store/index', () => ({ useAppStore: { getState: () => storeRef.current?.getState() } })) vi.mock('@/lib/file-owner-runtime-target', () => ({ getRuntimeTargetForFileOwner: () => ({ kind: 'local' }) diff --git a/src/renderer/src/components/editor/save/transforms/editor-final-newline-save.test.ts b/src/renderer/src/components/editor/save/transforms/editor-final-newline-save.test.ts index 6381b05cac0..4efc583d593 100644 --- a/src/renderer/src/components/editor/save/transforms/editor-final-newline-save.test.ts +++ b/src/renderer/src/components/editor/save/transforms/editor-final-newline-save.test.ts @@ -17,7 +17,9 @@ import { __clearSelfWriteRegistryForTests } from '../../external-changes/editor- const storeRef = vi.hoisted((): { current: StoreApi | null } => ({ current: null })) -vi.mock('@/lib/connection-context', () => ({ getConnectionIdForFile: () => null })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionIdForFile: () => null +})) vi.mock('@/store/index', () => ({ useAppStore: { getState: () => storeRef.current?.getState() } })) vi.mock('@/lib/file-owner-runtime-target', () => ({ getRuntimeTargetForFileOwner: () => ({ kind: 'local' }) diff --git a/src/renderer/src/components/editor/save/transforms/editor-format-on-save.test.ts b/src/renderer/src/components/editor/save/transforms/editor-format-on-save.test.ts index 954ba01b01b..34d8f382841 100644 --- a/src/renderer/src/components/editor/save/transforms/editor-format-on-save.test.ts +++ b/src/renderer/src/components/editor/save/transforms/editor-format-on-save.test.ts @@ -17,7 +17,9 @@ import { usePluginPanelsStore } from '@/store/plugins/catalog/plugin-contributio import { bumpEditorDiscardEpoch, EditorSaveDiscardedError } from '../flush/editor-discard-epoch' import { editorBufferIdOfView } from '@/store/slices/editor/buffers/editor-buffer-views' -vi.mock('@/lib/connection-context', () => ({ getConnectionIdForFile: () => undefined })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionIdForFile: () => undefined +})) vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({ callRuntimeRpc: vi.fn() })) diff --git a/src/renderer/src/components/editor/save/transforms/editor-save-plugin-hook.test.ts b/src/renderer/src/components/editor/save/transforms/editor-save-plugin-hook.test.ts index c6859f52467..55143a51a1a 100644 --- a/src/renderer/src/components/editor/save/transforms/editor-save-plugin-hook.test.ts +++ b/src/renderer/src/components/editor/save/transforms/editor-save-plugin-hook.test.ts @@ -16,7 +16,9 @@ import { import { EditorSaveDeniedByPluginError } from './editor-save-plugin-hook' import { registerPendingEditorFlush } from '../flush/editor-pending-flush' -vi.mock('@/lib/connection-context', () => ({ getConnectionIdForFile: () => undefined })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionIdForFile: () => undefined +})) vi.mock('sonner', () => ({ toast: { error: vi.fn() } })) const PATH = '/repo/src/a.ts' diff --git a/src/renderer/src/components/editor/use-custom-editor-outside-merge.ts b/src/renderer/src/components/editor/use-custom-editor-outside-merge.ts index 001f3ad3053..e9ea12f0a7b 100644 --- a/src/renderer/src/components/editor/use-custom-editor-outside-merge.ts +++ b/src/renderer/src/components/editor/use-custom-editor-outside-merge.ts @@ -1,6 +1,6 @@ import { useEffect, useLayoutEffect, useRef } from 'react' import { create } from 'zustand' -import { getConnectionIdForFile } from '@/lib/connection-context' +import { getConnectionIdForFile } from '@/lib/workspace/ownership/connection-context' import { editorTabFileAccess } from '@/lib/local-file-access' import { getRuntimeTargetForFileOwner } from '@/lib/file-owner-runtime-target' import { readRuntimeFileContent } from '@/runtime/files/reads/runtime-file-read-client' diff --git a/src/renderer/src/components/editor/useEditorPanelActiveTabContentLoad.ts b/src/renderer/src/components/editor/useEditorPanelActiveTabContentLoad.ts index f33c7617fcf..d146d060ff4 100644 --- a/src/renderer/src/components/editor/useEditorPanelActiveTabContentLoad.ts +++ b/src/renderer/src/components/editor/useEditorPanelActiveTabContentLoad.ts @@ -6,10 +6,13 @@ import { import type { OpenFile } from '@/store/slices/editor/types/open-file' import { joinPath } from '@/lib/path' import { useAppStore } from '@/store' -import type { DiffContent, FileContent } from './editor-panel-content-types' +import type { + DiffContent, + FileContent, + EditorPanelFileContentLoader +} from './editor-panel-content-types' import { isReloadableSingleFileDiffTab } from './editor-panel-diff-reload' import type { EditorPanelDiffContentLoader } from './useEditorPanelDiffContentLoader' -import type { EditorPanelFileContentLoader } from './useEditorPanelFileContentLoader' import { useQuickOpenHistoryVisit } from './use-quick-open-history-visit' // Showing a tab is a user act: its first load may start a stopped WSL distro. Re-runs from diff --git a/src/renderer/src/components/editor/useEditorPanelContentReloadTriggers.ts b/src/renderer/src/components/editor/useEditorPanelContentReloadTriggers.ts index 5c1f9887daf..e21a356bb38 100644 --- a/src/renderer/src/components/editor/useEditorPanelContentReloadTriggers.ts +++ b/src/renderer/src/components/editor/useEditorPanelContentReloadTriggers.ts @@ -1,13 +1,12 @@ import { useEffect, useMemo, type MutableRefObject } from 'react' import type { OpenFile } from '@/store/slices/editor/types/open-file' import type { useAppStore } from '@/store' -import type { DiffContent } from './editor-panel-content-types' +import type { DiffContent, EditorPanelFileContentLoader } from './editor-panel-content-types' import { isReloadableSingleFileDiffTab, shouldReloadDiffOnGitStatusChange } from './editor-panel-diff-reload' import type { EditorPanelDiffContentLoader } from './useEditorPanelDiffContentLoader' -import type { EditorPanelFileContentLoader } from './useEditorPanelFileContentLoader' type GitStatusByWorktree = ReturnType['gitStatusByWorktree'] diff --git a/src/renderer/src/components/editor/useEditorPanelContentState.test.tsx b/src/renderer/src/components/editor/useEditorPanelContentState.test.tsx index 49f0bb4d24a..394a1411f99 100644 --- a/src/renderer/src/components/editor/useEditorPanelContentState.test.tsx +++ b/src/renderer/src/components/editor/useEditorPanelContentState.test.tsx @@ -41,7 +41,7 @@ vi.mock('@/runtime/source-control/git/runtime-git-client-context', () => ({ getRuntimeGitScope: vi.fn(() => null) })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: mocks.getConnectionId, getConnectionIdForFile: mocks.getConnectionIdForFile, isWorktreeConnectionResolved: mocks.isWorktreeConnectionResolved diff --git a/src/renderer/src/components/editor/useEditorPanelFileContentLoader.ts b/src/renderer/src/components/editor/useEditorPanelFileContentLoader.ts index 79dc1786905..b2519124877 100644 --- a/src/renderer/src/components/editor/useEditorPanelFileContentLoader.ts +++ b/src/renderer/src/components/editor/useEditorPanelFileContentLoader.ts @@ -2,7 +2,10 @@ import { useCallback } from 'react' import { translate } from '@/i18n/i18n' import { readEditorPanelFileContent } from './editor-panel-file-reads' import type { OpenFile } from '@/store/slices/editor/types/open-file' -import { getConnectionIdForFile, isWorktreeConnectionResolved } from '@/lib/connection-context' +import { + getConnectionIdForFile, + isWorktreeConnectionResolved +} from '@/lib/workspace/ownership/connection-context' import { useAppStore } from '@/store' import { getRuntimeFileReadScope } from '@/runtime/files/runtime-file-routing' import { readEditorCsvFileContent } from './csv/csv-file-content' @@ -19,7 +22,6 @@ import { type EditorPanelFileContentLoader, type UseEditorPanelFileContentLoaderParams } from './editor-panel-content-types' -import type { EditorPanelContentLoadOptions } from './external-changes/useEditorPanelExternalContentEvents' import { migrateRestoredEditorFileOwner, restoredOwnerMigrationErrorMessage @@ -33,7 +35,6 @@ import { applyEditorFileLoadFailure, getEditorFileLoadFailureContent } from './external-changes/editor-deleted-file-reload' -export type { EditorPanelFileContentLoader } from './editor-panel-content-types' import { acquireEditorFileOperation, isSameEditorFileOperationIdentity @@ -47,14 +48,8 @@ export function useEditorPanelFileContentLoader({ outstandingFileReadsRef, setFileContents }: UseEditorPanelFileContentLoaderParams): EditorPanelFileContentLoader { - return useCallback( - async ( - filePath: string, - id: string, - worktreeId?: string, - relativePath?: string, - options?: EditorPanelContentLoadOptions - ): Promise => { + return useCallback( + async (filePath, id, worktreeId, relativePath, options) => { const generation = ++fileReadGenerationCounterRef.current fileReadGenerationRef.current[id] = generation outstandingFileReadsRef.current[id] = generation diff --git a/src/renderer/src/components/editor/useEditorPanelFloatingTabContentState.test.tsx b/src/renderer/src/components/editor/useEditorPanelFloatingTabContentState.test.tsx index 9eda67b2bc4..ac264d281dd 100644 --- a/src/renderer/src/components/editor/useEditorPanelFloatingTabContentState.test.tsx +++ b/src/renderer/src/components/editor/useEditorPanelFloatingTabContentState.test.tsx @@ -37,7 +37,7 @@ vi.mock('@/runtime/source-control/git/runtime-git-client-context', () => ({ getRuntimeGitScope: vi.fn(() => null) })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: vi.fn(() => null), getConnectionIdForFile: vi.fn(() => null), isWorktreeConnectionResolved: vi.fn(() => true) diff --git a/src/renderer/src/components/editor/useEditorPanelHostUnresolvedContentState.test.tsx b/src/renderer/src/components/editor/useEditorPanelHostUnresolvedContentState.test.tsx index 129bcdd32f2..237b24d9ba5 100644 --- a/src/renderer/src/components/editor/useEditorPanelHostUnresolvedContentState.test.tsx +++ b/src/renderer/src/components/editor/useEditorPanelHostUnresolvedContentState.test.tsx @@ -35,7 +35,7 @@ vi.mock('@/runtime/source-control/git/runtime-git-client-context', () => ({ getRuntimeGitScope: vi.fn(() => null) })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: vi.fn(), getConnectionIdForFile: vi.fn(), isWorktreeConnectionResolved: vi.fn(() => true) diff --git a/src/renderer/src/components/editor/useEditorPanelVisibilityContentState.test.tsx b/src/renderer/src/components/editor/useEditorPanelVisibilityContentState.test.tsx index 0054859050a..39e22be2676 100644 --- a/src/renderer/src/components/editor/useEditorPanelVisibilityContentState.test.tsx +++ b/src/renderer/src/components/editor/useEditorPanelVisibilityContentState.test.tsx @@ -32,7 +32,7 @@ vi.mock('@/runtime/source-control/git/runtime-git-client-context', () => ({ getRuntimeGitScope: vi.fn(() => null) })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: vi.fn(), getConnectionIdForFile: vi.fn(), isWorktreeConnectionResolved: vi.fn(() => true) diff --git a/src/renderer/src/components/file-actions/OpenInContextSubmenu.tsx b/src/renderer/src/components/file-actions/OpenInContextSubmenu.tsx index cec96cedec0..f9cf4e81ea4 100644 --- a/src/renderer/src/components/file-actions/OpenInContextSubmenu.tsx +++ b/src/renderer/src/components/file-actions/OpenInContextSubmenu.tsx @@ -11,7 +11,7 @@ import { } from '@/components/ui/context-menu' import { getRouteForLocalPathOpenOwner } from '@/lib/local-path-open-guard' import { OpenInApplicationIcon } from '@/lib/open-in-app-catalog' -import { getWorkspaceEditorSshHost } from '@/lib/workspace-editor-ssh-target' +import { getWorkspaceEditorSshHost } from '@/components/file-actions/workspace-editor-ssh-target' import { NO_OPEN_IN_APPLICATIONS } from '@/lib/open-in-application-selection' import type { ExecutionHostId } from '../../../../shared/execution-host' import type { OpenInApplication } from '../../../../shared/ui-chrome-types' diff --git a/src/renderer/src/lib/workspace-editor-ssh-target.ts b/src/renderer/src/components/file-actions/workspace-editor-ssh-target.ts similarity index 79% rename from src/renderer/src/lib/workspace-editor-ssh-target.ts rename to src/renderer/src/components/file-actions/workspace-editor-ssh-target.ts index ae77686c362..6b3136e2284 100644 --- a/src/renderer/src/lib/workspace-editor-ssh-target.ts +++ b/src/renderer/src/components/file-actions/workspace-editor-ssh-target.ts @@ -1,10 +1,10 @@ -import { isRuntimeOwnedSshTargetId } from '../../../shared/execution-host' +import { isRuntimeOwnedSshTargetId } from '../../../../shared/execution-host' import { getRuntimeSshAccess, type PublicKnownRuntimeEnvironment -} from '../../../shared/remote-runtime/host-catalog/runtime-environments' -import { resolveOwner, type WorkspaceOwnerRef } from './resolve-owner' -import type { WorktreeOperationRouteState } from './worktree-operation-route' +} from '../../../../shared/remote-runtime/host-catalog/runtime-environments' +import { resolveOwner, type WorkspaceOwnerRef } from '../../lib/workspace/ownership/resolve-owner' +import type { WorktreeOperationRouteState } from '../../lib/workspace/ownership/worktree-operation-route' type EditorSshTargetState = Omit & { runtimeEnvironments?: readonly Pick< diff --git a/src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts b/src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts index 2970d44d5d7..80e496e4628 100644 --- a/src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts +++ b/src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts @@ -1,7 +1,7 @@ import { useCallback } from 'react' import { toast } from 'sonner' import { resolveGroupTabFromVisibleId } from '@/components/tab-group/tab-group-visible-id' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { createUntitledMarkdownFileWithTemplateSelection } from '@/lib/create-untitled-markdown' import { ensureClientCreationActionAllowed } from '@/lib/client-creation-action-error' import { openDocumentInFloatingWorkspace } from '@/lib/open-document-in-floating-workspace' diff --git a/src/renderer/src/components/github-project/ProjectCellIssueType.tsx b/src/renderer/src/components/github-project/ProjectCellIssueType.tsx index 6911e619c7a..ad0735c268e 100644 --- a/src/renderer/src/components/github-project/ProjectCellIssueType.tsx +++ b/src/renderer/src/components/github-project/ProjectCellIssueType.tsx @@ -4,7 +4,7 @@ import { useShallow } from 'zustand/react/shallow' import { CircleDot } from 'lucide-react' import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover' import { useRepoSlugIndex } from '@/lib/repo-slug-index' -import { runtimeTargetForRepoOwner } from '@/lib/repo-runtime-owner' +import { runtimeTargetForRepoOwner } from '@/lib/workspace/ownership/repo-runtime-owner' import { gitHubSlugApiForTarget } from '@/runtime/repository-github/github-slug-owner-api' import { useAppStore } from '@/store' import { useTranslate } from '@/i18n/use-translate' diff --git a/src/renderer/src/components/github/github-work-item-mutation-target.ts b/src/renderer/src/components/github/github-work-item-mutation-target.ts index 8c4cb46f50e..dd908bd4d5b 100644 --- a/src/renderer/src/components/github/github-work-item-mutation-target.ts +++ b/src/renderer/src/components/github/github-work-item-mutation-target.ts @@ -1,6 +1,6 @@ import { useAppStore } from '@/store' import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target' -import { isTwinRepo, runtimeTargetForRepoOwner } from '@/lib/repo-runtime-owner' +import { isTwinRepo, runtimeTargetForRepoOwner } from '@/lib/workspace/ownership/repo-runtime-owner' import { projectViewCacheKeyTarget } from '@/store/github/cache/cache-identity' import type { GitHubWorkItemProjectOrigin } from './github-work-item-identity' diff --git a/src/renderer/src/components/jira-user-picker.tsx b/src/renderer/src/components/jira-user-picker.tsx index 995a640598e..49b74c6050f 100644 --- a/src/renderer/src/components/jira-user-picker.tsx +++ b/src/renderer/src/components/jira-user-picker.tsx @@ -4,7 +4,7 @@ import { LoaderCircle } from 'lucide-react' import { Input } from '@/components/ui/input' import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover' import { jiraSearchUsers } from '@/runtime/jira/runtime-jira-user-fields-client' -import type { RowLessSource as RuntimeJiraSettings } from '@/lib/default-creation-host' +import type { RowLessSource as RuntimeJiraSettings } from '@/runtime/hosts/selection/default-creation-host' import { useTranslate } from '@/i18n/use-translate' import { useUiLanguageRevision } from '@/i18n/use-ui-language-revision' import type { JiraUser } from '../../../shared/jira/jira-types' diff --git a/src/renderer/src/components/linear-api-key-dialog.tsx b/src/renderer/src/components/linear-api-key-dialog.tsx index 6e00a7947bc..ef8c99daa83 100644 --- a/src/renderer/src/components/linear-api-key-dialog.tsx +++ b/src/renderer/src/components/linear-api-key-dialog.tsx @@ -6,7 +6,7 @@ import { buildLinearPersonalApiKeySettingsUrl, buildLinearWorkspaceApiSettingsUrl } from '../../../shared/linear/links' -import { defaultScopeHost } from '@/lib/default-creation-host' +import { defaultScopeHost } from '@/runtime/hosts/selection/default-creation-host' import { useAppStore } from '@/store' import { useMountedRef } from '@/hooks/useMountedRef' import { Button } from '@/components/ui/button' diff --git a/src/renderer/src/components/linear-issue-attribute-filter-dropdowns.tsx b/src/renderer/src/components/linear-issue-attribute-filter-dropdowns.tsx index 78d7c09ffbd..743e341a18e 100644 --- a/src/renderer/src/components/linear-issue-attribute-filter-dropdowns.tsx +++ b/src/renderer/src/components/linear-issue-attribute-filter-dropdowns.tsx @@ -4,7 +4,7 @@ import { Button } from '@/components/ui/button' import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover' import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip' import { useTeamsLabels, useTeamsMembers, useTeamsStates } from '@/hooks/useIssueMetadata' -import type { RowLessSource as RuntimeLinearSettings } from '@/lib/default-creation-host' +import type { RowLessSource as RuntimeLinearSettings } from '@/runtime/hosts/selection/default-creation-host' import { useTranslate } from '@/i18n/use-translate' import { LINEAR_ISSUE_ATTRIBUTE_FILTER_MAX_LABEL_IDS, diff --git a/src/renderer/src/components/linear-issue-project-selector.tsx b/src/renderer/src/components/linear-issue-project-selector.tsx index 79d4d397260..e84cad7264c 100644 --- a/src/renderer/src/components/linear-issue-project-selector.tsx +++ b/src/renderer/src/components/linear-issue-project-selector.tsx @@ -16,7 +16,7 @@ import { useAppStore } from '@/store' import type { LinearIssue } from '../../../shared/linear/issue-types' import type { LinearProjectSummary } from '../../../shared/linear/project-types' import type { TaskSourceContext } from '../../../shared/work-items/task-source-context' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' export function LinearIssueProjectSelector({ issue, diff --git a/src/renderer/src/components/linear-issue-sub-issues.tsx b/src/renderer/src/components/linear-issue-sub-issues.tsx index b49c80b32c3..66b421c8d86 100644 --- a/src/renderer/src/components/linear-issue-sub-issues.tsx +++ b/src/renderer/src/components/linear-issue-sub-issues.tsx @@ -14,7 +14,7 @@ import { linearCreateSubIssue } from '@/runtime/linear/runtime-linear-issue-clie import { useAppStore } from '@/store' import type { LinearIssue, LinearIssueChildSummary } from '../../../shared/linear/issue-types' import type { TaskSourceContext } from '../../../shared/work-items/task-source-context' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' function mergeLinearSubIssues( serverSubIssues: LinearIssueChildSummary[] | undefined, diff --git a/src/renderer/src/components/linear-issue-workspace-detail-state.ts b/src/renderer/src/components/linear-issue-workspace-detail-state.ts index f8a1dd67433..da7cf56d45e 100644 --- a/src/renderer/src/components/linear-issue-workspace-detail-state.ts +++ b/src/renderer/src/components/linear-issue-workspace-detail-state.ts @@ -9,7 +9,7 @@ import { useCallback, useEffect, useRef, useState } from 'react' import { createNonSecureContextUuid as createBrowserUuid } from '../../../shared/non-secure-context-uuid' import { useMountedRef } from '@/hooks/useMountedRef' import { linearIssueComments } from '@/runtime/linear/runtime-linear-issue-client' -import type { RowLessSource as RuntimeLinearSettings } from '@/lib/default-creation-host' +import type { RowLessSource as RuntimeLinearSettings } from '@/runtime/hosts/selection/default-creation-host' import { initLinearIssueEditState, type LinearEditState, diff --git a/src/renderer/src/components/linear-item-drawer-comment-footer.tsx b/src/renderer/src/components/linear-item-drawer-comment-footer.tsx index d94ceda127f..17c2bb85662 100644 --- a/src/renderer/src/components/linear-item-drawer-comment-footer.tsx +++ b/src/renderer/src/components/linear-item-drawer-comment-footer.tsx @@ -17,7 +17,7 @@ import { translate } from '@/i18n/i18n' import { useTranslate } from '@/i18n/use-translate' import type { TaskSourceContext } from '../../../shared/work-items/task-source-context' import type { LinearLocalComment } from '@/components/linear-item-drawer-types' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' export function LinearIssueCommentFooter({ issueId, diff --git a/src/renderer/src/components/linear-item-drawer-edit-controller.tsx b/src/renderer/src/components/linear-item-drawer-edit-controller.tsx index 4e3dd0cdd64..2b748d5d479 100644 --- a/src/renderer/src/components/linear-item-drawer-edit-controller.tsx +++ b/src/renderer/src/components/linear-item-drawer-edit-controller.tsx @@ -15,7 +15,7 @@ import { linearUpdateIssue } from '@/runtime/linear/runtime-linear-issue-client' import { translate } from '@/i18n/i18n' import { formatLinearEstimateInput } from '@/components/linear-item-drawer-edit-controls' import type { LinearIssueEditSectionProps } from '@/components/linear-item-drawer-types' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' export function useLinearIssueEditController({ issue, diff --git a/src/renderer/src/components/managed-runtime/ManagedRuntimeRemoveDialog.tsx b/src/renderer/src/components/managed-runtime/ManagedRuntimeRemoveDialog.tsx index 4ca2458fe2a..d4e10e189e8 100644 --- a/src/renderer/src/components/managed-runtime/ManagedRuntimeRemoveDialog.tsx +++ b/src/renderer/src/components/managed-runtime/ManagedRuntimeRemoveDialog.tsx @@ -1,6 +1,6 @@ import { useAppStateValue } from '@/store/retained-views/app-state-view' import { useTranslate } from '@/i18n/use-translate' -import { selectExecutionHostDisplayLabel } from '@/lib/execution-host-display-label' +import { selectExecutionHostDisplayLabel } from '@/runtime/hosts/display/execution-host-display-label' import { toRuntimeExecutionHostId } from '../../../../shared/execution-host' import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target' import { Button } from '../ui/button' diff --git a/src/renderer/src/components/native-chat/attachments/chips/NativeChatImageAttachmentPreview.test.tsx b/src/renderer/src/components/native-chat/attachments/chips/NativeChatImageAttachmentPreview.test.tsx index ace229b0897..6be4e226b0c 100644 --- a/src/renderer/src/components/native-chat/attachments/chips/NativeChatImageAttachmentPreview.test.tsx +++ b/src/renderer/src/components/native-chat/attachments/chips/NativeChatImageAttachmentPreview.test.tsx @@ -17,7 +17,7 @@ vi.mock('@/i18n/i18n', () => ({ fallback.replace(/\{\{(\w+)\}\}/g, (_match, name: string) => options?.[name] ?? '') })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionIdForFile: mocks.getConnectionIdForFile })) diff --git a/src/renderer/src/components/native-chat/attachments/uploads/native-chat-attachment-owner.ts b/src/renderer/src/components/native-chat/attachments/uploads/native-chat-attachment-owner.ts index 8fac4e5ef99..bd841d66836 100644 --- a/src/renderer/src/components/native-chat/attachments/uploads/native-chat-attachment-owner.ts +++ b/src/renderer/src/components/native-chat/attachments/uploads/native-chat-attachment-owner.ts @@ -3,8 +3,8 @@ import { chatWorkspaceByTabId as findTerminalTabWorktreeId } from '../../../../l import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../../shared/constants' import { getKnownExecutionHostIdForWorktree } from '../../../../lib/workspace/ownership/worktree-runtime-owner' -import { runtimeEnvironmentIdForWorkspaceOwner } from '../../../../lib/resolve-owner' -import { getConnectionIdFromState } from '../../../../lib/connection-owner-resolution' +import { runtimeEnvironmentIdForWorkspaceOwner } from '../../../../lib/workspace/ownership/resolve-owner' +import { getConnectionIdFromState } from '../../../../lib/workspace/ownership/connection-owner-resolution' import { type ExecutionHostId, toRuntimeExecutionHostId, diff --git a/src/renderer/src/components/native-chat/composer/controls/native-chat-composer-workspace.ts b/src/renderer/src/components/native-chat/composer/controls/native-chat-composer-workspace.ts index f381832be04..c0c904f9ad1 100644 --- a/src/renderer/src/components/native-chat/composer/controls/native-chat-composer-workspace.ts +++ b/src/renderer/src/components/native-chat/composer/controls/native-chat-composer-workspace.ts @@ -1,6 +1,6 @@ import type { AppState } from '@/store/types' import { workspaceTabs } from '@/lib/structured-chat-tab-index' -import { selectExecutionHostDisplayLabel } from '@/lib/execution-host-display-label' +import { selectExecutionHostDisplayLabel } from '@/runtime/hosts/display/execution-host-display-label' import { findIndexedRepoOwnerForHost } from '@/lib/workspace/ownership/repo-owner-index' import { getWslDistroFromPath } from '@/lib/local-preflight-context' import { selectWslHostDistro } from '@/components/wsl-host-mark/WslHostMark' diff --git a/src/renderer/src/components/native-chat/composer/pickers/native-chat-skill-discovery-context.ts b/src/renderer/src/components/native-chat/composer/pickers/native-chat-skill-discovery-context.ts index cc3c5158781..c7a41b93e94 100644 --- a/src/renderer/src/components/native-chat/composer/pickers/native-chat-skill-discovery-context.ts +++ b/src/renderer/src/components/native-chat/composer/pickers/native-chat-skill-discovery-context.ts @@ -3,7 +3,7 @@ import type { SkillDiscoveryTarget } from '../../../../../../shared/skills' import { parseExecutionHostId } from '../../../../../../shared/execution-host' import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target' import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner' -import { runtimeEnvironmentIdForWorkspaceOwner } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdForWorkspaceOwner } from '@/lib/workspace/ownership/resolve-owner' import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context' import { resolveWorkspaceDirectory } from '@/lib/workspace-directory' import { diff --git a/src/renderer/src/components/native-chat/drafts/native-chat-draft-owner.ts b/src/renderer/src/components/native-chat/drafts/native-chat-draft-owner.ts index ec169cb73a4..8cff22c0b3d 100644 --- a/src/renderer/src/components/native-chat/drafts/native-chat-draft-owner.ts +++ b/src/renderer/src/components/native-chat/drafts/native-chat-draft-owner.ts @@ -8,7 +8,7 @@ import { chatWorkspaceByTabId, structuredChatWorkspacesBySessionId } from '../../../lib/structured-chat-tab-index' -import { resolveWorktreeOperationRoute } from '../../../lib/worktree-operation-route' +import { resolveWorktreeOperationRoute } from '../../../lib/workspace/ownership/worktree-operation-route' function workspaceOfDraftScope( state: Pick, diff --git a/src/renderer/src/components/native-chat/host-access/native-chat-sign-in.ts b/src/renderer/src/components/native-chat/host-access/native-chat-sign-in.ts index 004cfff5501..23d0c26dedd 100644 --- a/src/renderer/src/components/native-chat/host-access/native-chat-sign-in.ts +++ b/src/renderer/src/components/native-chat/host-access/native-chat-sign-in.ts @@ -7,7 +7,7 @@ import { agentSessionRemoteSignInCommand } from '../../../../../shared/agent-ses import { persistAgentLaunchTabOrder } from '@/lib/agent-session/launch/pane/launch-agent-tab-order' import { createWebRuntimeSessionTerminalOnHost } from '@/runtime/hosted-terminals/creation/web-runtime-terminal-creation' import { notifyWebRuntimeTerminalCreateFailure } from '@/runtime/hosted-terminals/creation/web-runtime-terminal-create-failure-notice' -import { startStoppedWslHostForUserAct } from '@/lib/wsl-host-user-start' +import { startStoppedWslHostForUserAct } from '@/runtime/hosts/wsl/wsl-host-user-start' import { toast } from 'sonner' import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target' diff --git a/src/renderer/src/components/native-chat/host-access/use-native-chat-host-outage-notice.ts b/src/renderer/src/components/native-chat/host-access/use-native-chat-host-outage-notice.ts index 2f173083409..c3781e768b3 100644 --- a/src/renderer/src/components/native-chat/host-access/use-native-chat-host-outage-notice.ts +++ b/src/renderer/src/components/native-chat/host-access/use-native-chat-host-outage-notice.ts @@ -2,7 +2,7 @@ import { useState } from 'react' import { connectRuntimeHostAndReloadProjects } from '@/components/status-bar/runtime-environment-explicit-connect' import { useMountedRef } from '@/hooks/useMountedRef' import { useTranslate } from '@/i18n/use-translate' -import { startWslHostAndReloadProjects } from '@/lib/wsl-host-user-start' +import { startWslHostAndReloadProjects } from '@/runtime/hosts/wsl/wsl-host-user-start' import type { NativeChatComposerNotice } from '../composer/controls/native-chat-composer-notice' import type { NativeChatHostOutage } from './use-native-chat-host-outage' diff --git a/src/renderer/src/components/native-chat/host-access/use-native-chat-host-outage.ts b/src/renderer/src/components/native-chat/host-access/use-native-chat-host-outage.ts index ab4c404825a..ac8066b9a92 100644 --- a/src/renderer/src/components/native-chat/host-access/use-native-chat-host-outage.ts +++ b/src/renderer/src/components/native-chat/host-access/use-native-chat-host-outage.ts @@ -2,7 +2,7 @@ import { useEffect, useMemo, useState } from 'react' import { useAppStore } from '@/store' import { toRuntimeExecutionHostId } from '../../../../../shared/execution-host' import { runtimeHostContactFromSnapshot } from '../../../../../shared/remote-runtime/host-status/runtime-host-contact' -import { selectExecutionHostDisplayLabel } from '@/lib/execution-host-display-label' +import { selectExecutionHostDisplayLabel } from '@/runtime/hosts/display/execution-host-display-label' import { runtimeHostConnectionStateForEntry } from '@/runtime/hosts/connections/runtime-host-connection-state' import type { RuntimeHostConnectionState } from '../../../../../shared/remote-runtime/host-status/runtime-host-connection-state' import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target' diff --git a/src/renderer/src/components/native-chat/links/actions/native-chat-file-link-existence.test.ts b/src/renderer/src/components/native-chat/links/actions/native-chat-file-link-existence.test.ts index fe785068cb5..5618d990670 100644 --- a/src/renderer/src/components/native-chat/links/actions/native-chat-file-link-existence.test.ts +++ b/src/renderer/src/components/native-chat/links/actions/native-chat-file-link-existence.test.ts @@ -12,7 +12,7 @@ const connection = vi.hoisted(() => ({ currentOwnerResolved: true })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ isWorktreeConnectionResolved: () => connection.resolved })) diff --git a/src/renderer/src/components/native-chat/links/actions/native-chat-file-link-existence.ts b/src/renderer/src/components/native-chat/links/actions/native-chat-file-link-existence.ts index a48c02e2ebc..a9f95c2ca9f 100644 --- a/src/renderer/src/components/native-chat/links/actions/native-chat-file-link-existence.ts +++ b/src/renderer/src/components/native-chat/links/actions/native-chat-file-link-existence.ts @@ -1,5 +1,5 @@ import { createContext } from 'react' -import { isWorktreeConnectionResolved } from '@/lib/connection-context' +import { isWorktreeConnectionResolved } from '@/lib/workspace/ownership/connection-context' import { createTerminalPathExistenceBatch } from '@/components/terminal-pane/links/files/terminal-path-existence-batch' import { mayCheckFileLinkTargetUnprompted, diff --git a/src/renderer/src/components/native-chat/links/actions/native-chat-host-file-open.test.ts b/src/renderer/src/components/native-chat/links/actions/native-chat-host-file-open.test.ts index 5eff251d407..bc3890b6acc 100644 --- a/src/renderer/src/components/native-chat/links/actions/native-chat-host-file-open.test.ts +++ b/src/renderer/src/components/native-chat/links/actions/native-chat-host-file-open.test.ts @@ -15,7 +15,9 @@ vi.mock('@/lib/workspace/activation/worktree-activation', () => ({ activateAndRevealWorkspace: vi.fn(), activateAndRevealWorktree: vi.fn() })) -vi.mock('@/lib/connection-context', () => ({ getConnectionId: vi.fn(() => null) })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionId: vi.fn(() => null) +})) installTerminalLinkTestEnvironment(doubles) diff --git a/src/renderer/src/components/native-chat/links/actions/native-chat-http-link-source-owner.ts b/src/renderer/src/components/native-chat/links/actions/native-chat-http-link-source-owner.ts index 43783963424..70cf0f8a6b4 100644 --- a/src/renderer/src/components/native-chat/links/actions/native-chat-http-link-source-owner.ts +++ b/src/renderer/src/components/native-chat/links/actions/native-chat-http-link-source-owner.ts @@ -1,4 +1,4 @@ -import { getConnectionIdFromState } from '@/lib/connection-owner-resolution' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import type { HttpLinkSourceOwner } from '@/lib/browser/navigation/http-link-routing' import { canOpenWorkspaceBrowserTabOnRuntime, diff --git a/src/renderer/src/components/native-chat/links/actions/use-native-chat-file-link-existence.tsx b/src/renderer/src/components/native-chat/links/actions/use-native-chat-file-link-existence.tsx index f7f6b641fed..8006e01180a 100644 --- a/src/renderer/src/components/native-chat/links/actions/use-native-chat-file-link-existence.tsx +++ b/src/renderer/src/components/native-chat/links/actions/use-native-chat-file-link-existence.tsx @@ -1,6 +1,6 @@ import { useContext, useEffect, useMemo, useRef, useSyncExternalStore, type ReactNode } from 'react' import { useAppStore } from '@/store' -import { getConnectionIdFromState } from '@/lib/connection-owner-resolution' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { getRuntimeEnvironmentRevision, onRuntimeEnvironmentRevisionsChanged diff --git a/src/renderer/src/components/native-chat/media/images/NativeChatTranscriptChrome.test.tsx b/src/renderer/src/components/native-chat/media/images/NativeChatTranscriptChrome.test.tsx index 443db26c2f5..c7ef11c5862 100644 --- a/src/renderer/src/components/native-chat/media/images/NativeChatTranscriptChrome.test.tsx +++ b/src/renderer/src/components/native-chat/media/images/NativeChatTranscriptChrome.test.tsx @@ -25,7 +25,7 @@ const mocks = vi.hoisted(() => ({ vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({ callRuntimeRpc: mocks.callRuntimeRpc })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionIdForFile: mocks.getConnectionIdForFile })) diff --git a/src/renderer/src/components/native-chat/media/images/native-chat-image-runtime-context.ts b/src/renderer/src/components/native-chat/media/images/native-chat-image-runtime-context.ts index 32282e59bbe..a7a017009ee 100644 --- a/src/renderer/src/components/native-chat/media/images/native-chat-image-runtime-context.ts +++ b/src/renderer/src/components/native-chat/media/images/native-chat-image-runtime-context.ts @@ -6,7 +6,7 @@ import type { RuntimeClientTarget } from '../../../../../../shared/runtime-clien import { resolveWorktreeOperationRouteResult, type WorktreeOperationRouteResolution -} from '@/lib/worktree-operation-route' +} from '@/lib/workspace/ownership/worktree-operation-route' import { createNativeChatTabOwnerSelector, findNativeChatTabOwnerWorktreeId @@ -18,7 +18,7 @@ import { } from '../../../../../../shared/execution-host' import { isFloatingWorkspaceId } from '../../../../../../shared/floating-workspace-worktree' import { resolveNativeChatTabDirectory } from '../../pane/routing/native-chat-tab-directory' -import { resolveOwner } from '@/lib/resolve-owner' +import { resolveOwner } from '@/lib/workspace/ownership/resolve-owner' import { useMemo } from 'react' import { shallow } from 'zustand/shallow' import { firstRegisteredStructuredChatTab } from '@/lib/structured-chat-tab-index' diff --git a/src/renderer/src/components/native-chat/pane/ownership/use-structured-agent-session-host-label.ts b/src/renderer/src/components/native-chat/pane/ownership/use-structured-agent-session-host-label.ts index 7226fcf5b48..77447bce7ac 100644 --- a/src/renderer/src/components/native-chat/pane/ownership/use-structured-agent-session-host-label.ts +++ b/src/renderer/src/components/native-chat/pane/ownership/use-structured-agent-session-host-label.ts @@ -1,4 +1,4 @@ -import { selectExecutionHostDisplayLabel } from '@/lib/execution-host-display-label' +import { selectExecutionHostDisplayLabel } from '@/runtime/hosts/display/execution-host-display-label' import { executionHostIdForStructuredTarget } from '@/runtime/native-chat/session-ownership/structured-agent-session-owner' import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target' import { useAppStore } from '../../../../store/index' diff --git a/src/renderer/src/components/native-chat/pane/routing/native-chat-open-wake.ts b/src/renderer/src/components/native-chat/pane/routing/native-chat-open-wake.ts index a7a3df7f958..e2de69126dd 100644 --- a/src/renderer/src/components/native-chat/pane/routing/native-chat-open-wake.ts +++ b/src/renderer/src/components/native-chat/pane/routing/native-chat-open-wake.ts @@ -1,4 +1,4 @@ -import { takeRecentWorkspaceSwitchWake } from '@/lib/workspace-switch-user-act' +import { takeRecentWorkspaceSwitchWake } from '@/lib/workspace/activation/workspace-switch-user-act' import type { AppState } from '@/store/types' import { parsePaneKey } from '../../../../../../shared/workspace-layout/stable-pane-id' import { getTabIdToWorktreeId } from '../../../sidebar/workspace-card/activity/worktree-agent-row-selectors' diff --git a/src/renderer/src/components/native-chat/pane/routing/native-chat-split-flow.test.ts b/src/renderer/src/components/native-chat/pane/routing/native-chat-split-flow.test.ts index 33ff4f8298d..2cdea866e51 100644 --- a/src/renderer/src/components/native-chat/pane/routing/native-chat-split-flow.test.ts +++ b/src/renderer/src/components/native-chat/pane/routing/native-chat-split-flow.test.ts @@ -3,7 +3,7 @@ import { beforeAll, beforeEach, expect, it, vi } from 'vitest' import { i18n } from '@/i18n/i18n' import type * as importCreation from '@/runtime/hosted-terminals/creation/web-runtime-terminal-creation' import type * as WorktreeRuntimeOwner from '@/lib/workspace/ownership/worktree-runtime-owner' -import type * as WorktreeOperationRoute from '@/lib/worktree-operation-route' +import type * as WorktreeOperationRoute from '@/lib/workspace/ownership/worktree-operation-route' import { createTestStore } from '@/store/testing/app-store-test-fixture' import { createTabsSliceMockApi } from '@/store/slices/tabs/tabs-slice-test-harness' import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../../shared/constants' @@ -32,7 +32,7 @@ vi.mock('@/lib/workspace/ownership/worktree-runtime-owner', async (original) => runtimeEnvironmentIdOrLocalUnlessTwin: (_state: unknown, worktreeId: string) => runtimeOwners.get(worktreeId) ?? null })) -vi.mock('@/lib/worktree-operation-route', async (original) => ({ +vi.mock('@/lib/workspace/ownership/worktree-operation-route', async (original) => ({ ...(await original()), resolveWorktreeOperationRouteResult: (_state: unknown, worktreeId: string) => ({ kind: 'resolved', diff --git a/src/renderer/src/components/native-chat/pane/routing/use-native-chat-toggle-shortcut.ts b/src/renderer/src/components/native-chat/pane/routing/use-native-chat-toggle-shortcut.ts index 22eda004156..03082c34030 100644 --- a/src/renderer/src/components/native-chat/pane/routing/use-native-chat-toggle-shortcut.ts +++ b/src/renderer/src/components/native-chat/pane/routing/use-native-chat-toggle-shortcut.ts @@ -18,7 +18,7 @@ import { canToggleNativeChat } from '../../../../../../shared/native-chat/native import { isNativeChatTranscriptLocalReadable } from '../../../../../../shared/native-chat/transcript/native-chat-transcript-readability' import { matchesNativeChatToggleShortcut } from './native-chat-shortcut' import { getShortcutPlatform } from '@/lib/shortcut-platform' -import { getConnectionIdFromState } from '@/lib/connection-owner-resolution' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { resolveKeyboardWorkspaceId } from '@/lib/floating-workspace-terminal-actions' import { isNativeChatTabWideFallbackSafe, diff --git a/src/renderer/src/components/native-chat/selection-quotes/native-chat-workspace-selection.ts b/src/renderer/src/components/native-chat/selection-quotes/native-chat-workspace-selection.ts index 38e96f99d6a..ecf19717574 100644 --- a/src/renderer/src/components/native-chat/selection-quotes/native-chat-workspace-selection.ts +++ b/src/renderer/src/components/native-chat/selection-quotes/native-chat-workspace-selection.ts @@ -11,8 +11,8 @@ import type { AgentMessageTarget } from '@/lib/agent-message-target' import { sendMessageToAgent } from '@/lib/agent-message-send' import type { ActiveAgentNotesSendResult } from '@/lib/active-agent-note-send-result' import { activateStructuredAgentSessionTab } from '@/lib/agent-session/structured-agent-session-tab-activation' -import { activateTabAndFocusPane } from '@/lib/activate-tab-and-focus-pane' -import { activateTerminalTabOnOwner } from '@/lib/terminal-tab-owner-activation' +import { activateTabAndFocusPane } from '@/lib/workspace/tabs/activate-tab-and-focus-pane' +import { activateTerminalTabOnOwner } from '@/lib/workspace/tabs/terminal-tab-owner-activation' import { requestNativeChatComposerFocus } from '../composer/focus/native-chat-composer-focus-intent' import { structuredAgentSessionDraftScopeKey } from '../drafts/native-chat-draft-scope' import { appendQuoteToChatDraft } from '../drafts/native-chat-selection-quote-draft' diff --git a/src/renderer/src/components/native-chat/session/options/catalog/native-chat-session-option-discovery.ts b/src/renderer/src/components/native-chat/session/options/catalog/native-chat-session-option-discovery.ts index 0f7b6e36459..82083821e4e 100644 --- a/src/renderer/src/components/native-chat/session/options/catalog/native-chat-session-option-discovery.ts +++ b/src/renderer/src/components/native-chat/session/options/catalog/native-chat-session-option-discovery.ts @@ -7,9 +7,9 @@ import { getCommitMessageModelDiscoveryHostKeyForScope, LOCAL_COMMIT_MESSAGE_HOST_KEY } from '../../../../../../../shared/source-control/ai/generation/commit-message-host-key' -import { runtimeTargetForWorkspaceOwner } from '@/lib/resolve-owner' +import { runtimeTargetForWorkspaceOwner } from '@/lib/workspace/ownership/resolve-owner' import { hasExplicitTuiLaunchCommand } from '../../../../../../../shared/agent-launch/startup/tui-agent-launch-command-override' -import { getConnectionIdFromState } from '@/lib/connection-owner-resolution' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { getLocalProjectExecutionRuntimeContext, getWslDistroFromPath diff --git a/src/renderer/src/components/native-chat/session/status/structured-agent-session-tab-owner-cache.ts b/src/renderer/src/components/native-chat/session/status/structured-agent-session-tab-owner-cache.ts index c6c4349c881..fd63dc30e83 100644 --- a/src/renderer/src/components/native-chat/session/status/structured-agent-session-tab-owner-cache.ts +++ b/src/renderer/src/components/native-chat/session/status/structured-agent-session-tab-owner-cache.ts @@ -1,7 +1,7 @@ import type { ExecutionHostId } from '../../../../../../shared/execution-host' import type { AppState } from '@/store/types' import type { WorktreeRuntimeOwnerState } from '@/lib/workspace/ownership/worktree-runtime-owner-state' -import { worktreeOwnerRowsTokenOf } from '@/lib/worktree-owner-rows-token' +import { worktreeOwnerRowsTokenOf } from '@/lib/workspace/ownership/worktree-owner-rows-token' import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields' import { structuredAgentSessionOwnerForTab } from '@/runtime/native-chat/session-ownership/structured-agent-session-owner' import type { StructuredTab } from './structured-agent-session-tabs' diff --git a/src/renderer/src/components/new-workspace/use-work-item-source-foundation.ts b/src/renderer/src/components/new-workspace/use-work-item-source-foundation.ts index 1f9044b3272..c612cfffa26 100644 --- a/src/renderer/src/components/new-workspace/use-work-item-source-foundation.ts +++ b/src/renderer/src/components/new-workspace/use-work-item-source-foundation.ts @@ -6,7 +6,7 @@ import { getProviderRuntimeContextKey } from '@/runtime/hosts/observations/provi import { useLinearIssueResult } from '@/hooks/linear-issue-committed-state' import { getLinearSourceScope } from '@/store/slices/linear/linear-slice-scope' import { getSelectedWorkspaceId } from '@/store/slices/linear/linear-cache' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' import type { LinearIssue } from '../../../../shared/linear/issue-types' import { parseBoundedSmartWorkspaceLinearIssueUrlIntent } from '../../../../shared/new-workspace/smart-workspace-linear-intent' import { isSmartWorkspaceSourceQueryWithinLimit } from '../../../../shared/new-workspace/smart-workspace-source-results' diff --git a/src/renderer/src/components/onboarding/onboarding-completion-agent-launch.ts b/src/renderer/src/components/onboarding/onboarding-completion-agent-launch.ts index 552db29e080..22f6e3aec81 100644 --- a/src/renderer/src/components/onboarding/onboarding-completion-agent-launch.ts +++ b/src/renderer/src/components/onboarding/onboarding-completion-agent-launch.ts @@ -7,7 +7,7 @@ import { launchAgentInNewTabWithOutcome } from '@/lib/agent-session/launch/new-t import { newAgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agent-launch-request-id' import { captureAgentTabLaunchContext } from '@/components/agent-tab-launch-context' import { activateAndRevealWorkspaceWithOutcome } from '@/lib/workspace/activation/worktree-activation' -import { reportAgentWorkspaceActivation } from '@/lib/worktree-activation-outcome' +import { reportAgentWorkspaceActivation } from '@/lib/workspace/activation/worktree-activation-outcome' export async function launchOnboardingCompletionAgent( worktreeId: string, diff --git a/src/renderer/src/components/onboarding/use-onboarding-flow-actions.test.tsx b/src/renderer/src/components/onboarding/use-onboarding-flow-actions.test.tsx index e54504a39b0..8263d8ab3cc 100644 --- a/src/renderer/src/components/onboarding/use-onboarding-flow-actions.test.tsx +++ b/src/renderer/src/components/onboarding/use-onboarding-flow-actions.test.tsx @@ -8,7 +8,7 @@ import { useOnboardingFlowActions } from './use-onboarding-flow-actions' import { useCloseWith } from './use-onboarding-flow-persistence' import { getDefaultOnboardingState } from '../../../../shared/onboarding-defaults' import { STEPS } from './use-onboarding-flow-types' -import type { WorkspaceActivationOutcome } from '@/lib/worktree-activation-outcome' +import type { WorkspaceActivationOutcome } from '@/lib/workspace/activation/worktree-activation-outcome' const { track, diff --git a/src/renderer/src/components/provider-accounts/provider-account-scope.ts b/src/renderer/src/components/provider-accounts/provider-account-scope.ts index 0269705b52d..7274131fbc0 100644 --- a/src/renderer/src/components/provider-accounts/provider-account-scope.ts +++ b/src/renderer/src/components/provider-accounts/provider-account-scope.ts @@ -2,7 +2,7 @@ import { translate } from '@/i18n/i18n' import type { Translate } from '@/i18n/use-translate' import { getLocalExecutionHostLabel } from '../../../../shared/execution-host' import type { GlobalSettings } from '../../../../shared/global-settings-types' -import { defaultScopeHost } from '@/lib/default-creation-host' +import { defaultScopeHost } from '@/runtime/hosts/selection/default-creation-host' import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target' /** Which host a provider card or budget belongs to, and how to change it. */ diff --git a/src/renderer/src/components/pull-request-page/checks/tab.tsx b/src/renderer/src/components/pull-request-page/checks/tab.tsx index 6e4f5df6328..45c6ab85d74 100644 --- a/src/renderer/src/components/pull-request-page/checks/tab.tsx +++ b/src/renderer/src/components/pull-request-page/checks/tab.tsx @@ -28,7 +28,7 @@ import { } from '@/lib/github-source-runtime-context' import { getLocalRepoProjectExecutionRuntimeContext } from '@/lib/local-preflight-context' import { CLIENT_PLATFORM } from '@/lib/new-workspace' -import { resolveRepoExecutionHostPlatform } from '@/lib/execution-host-facts' +import { resolveRepoExecutionHostPlatform } from '@/runtime/hosts/platform/execution-host-facts' import { resolveSourceControlActionRecipe } from '../../../../../shared/source-control/ai/source-control-ai-operation-policy' import type { GitHubWorkItem, diff --git a/src/renderer/src/components/quick-open-file-history.test.ts b/src/renderer/src/components/quick-open-file-history.test.ts index c6af0e80c21..9d83efaebbd 100644 --- a/src/renderer/src/components/quick-open-file-history.test.ts +++ b/src/renderer/src/components/quick-open-file-history.test.ts @@ -5,7 +5,7 @@ const { owner } = vi.hoisted(() => { } return { owner } }) -vi.mock('@/lib/worktree-operation-route', () => ({ +vi.mock('@/lib/workspace/ownership/worktree-operation-route', () => ({ resolveWorktreeOperationRoute: () => owner.current.kind === 'local' ? { executionHostId: 'local', runtimeEnvironmentId: null } diff --git a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-original-pane-actions.ts b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-original-pane-actions.ts index 3216515dfbe..b27eba0bc1a 100644 --- a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-original-pane-actions.ts +++ b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-original-pane-actions.ts @@ -1,9 +1,9 @@ import { useCallback, useMemo } from 'react' import { useShallow } from 'zustand/react/shallow' import { toast } from 'sonner' -import { activateTabAndFocusPane } from '@/lib/activate-tab-and-focus-pane' +import { activateTabAndFocusPane } from '@/lib/workspace/tabs/activate-tab-and-focus-pane' import { activateAndRevealWorkspace } from '@/lib/workspace/activation/worktree-activation' -import { findFolderWorkspaceOwner } from '@/lib/folder-workspace-runtime-owner' +import { findFolderWorkspaceOwner } from '@/lib/workspace/ownership/folder-workspace-runtime-owner' import { useAppStore } from '@/store/index' import { openDesktopStructuredSession } from '@/lib/activate-ai-vault-structured-session' import { findStructuredAgentSessionTab } from '@/lib/agent-session/structured-agent-session-tab-activation' diff --git a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-delete-action.ts b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-delete-action.ts index 7fb06d2e319..0c08f496b91 100644 --- a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-delete-action.ts +++ b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-delete-action.ts @@ -4,7 +4,7 @@ import type { AiVaultSession } from '../../../../../../shared/ai-vault/contracts import { AI_VAULT_DELETE_SESSION_RUNTIME_CAPABILITY } from '../../../../../../shared/ai-vault/contracts/ai-vault-runtime-capabilities' import { translate } from '@/i18n/i18n' import { useConfirmationDialog } from '@/components/confirmation-dialog-context' -import { selectExecutionHostDisplayLabel } from '@/lib/execution-host-display-label' +import { selectExecutionHostDisplayLabel } from '@/runtime/hosts/display/execution-host-display-label' import { runtimeEnvironmentSupportsCapability } from '@/runtime/rpc/compatibility/runtime-capability-proof' import { lastVerifiedRuntimeStatus } from '../../../../../../shared/remote-runtime/host-status/runtime-host-status' import { resolveContinuedRuntimeEnvironmentRevision } from '@/runtime/rpc/environment-revisions/runtime-environment-revision' diff --git a/src/renderer/src/components/right-sidebar/checks-panel/checks-panel-forge-owner.ts b/src/renderer/src/components/right-sidebar/checks-panel/checks-panel-forge-owner.ts index 8b6f8fa6221..44d1976ed16 100644 --- a/src/renderer/src/components/right-sidebar/checks-panel/checks-panel-forge-owner.ts +++ b/src/renderer/src/components/right-sidebar/checks-panel/checks-panel-forge-owner.ts @@ -1,6 +1,6 @@ import { toRuntimeExecutionHostId } from '../../../../../shared/execution-host' import { translate } from '@/i18n/i18n' -import { selectExecutionHostDisplayLabel } from '@/lib/execution-host-display-label' +import { selectExecutionHostDisplayLabel } from '@/runtime/hosts/display/execution-host-display-label' import { forgeCredentialTarget } from '@/runtime/source-control/forge/forge-credential-target' import { useAppStore } from '@/store' diff --git a/src/renderer/src/components/right-sidebar/checks-panel/review-actions/use-checks-panel-generation.tsx b/src/renderer/src/components/right-sidebar/checks-panel/review-actions/use-checks-panel-generation.tsx index 7319e0b7642..c8ddf92cf2f 100644 --- a/src/renderer/src/components/right-sidebar/checks-panel/review-actions/use-checks-panel-generation.tsx +++ b/src/renderer/src/components/right-sidebar/checks-panel/review-actions/use-checks-panel-generation.tsx @@ -4,7 +4,7 @@ import { useCallback } from 'react' import type { PullRequestGenerationOutcome } from '../../hosted-review/creation/create-pull-request-dialog-field-model' import { settlePullRequestGenerationRequest } from '../../hosted-review/creation/pull-request-generation-request-outcome' import { useAppStore } from '@/store/index' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { resolveWorktreeGitCopyNow } from '@/lib/worktree-git-copy' import { generateRuntimePullRequestFields, diff --git a/src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-controller-state.tsx b/src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-controller-state.tsx index 8f1e5102b99..3a31a6049e5 100644 --- a/src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-controller-state.tsx +++ b/src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-controller-state.tsx @@ -6,12 +6,12 @@ import type { AppState } from '@/store/types' import { useActiveWorktree } from '@/store/workspaces/selection/use-selected-worktree' import { selectReviewRepositoryForWorkspace } from '@/store/slices/hosted-review/workspace-review-repository' import { useChecksPanelTerminalWorktree } from './refresh/use-checks-panel-terminal-worktree' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { readDetectedAgentsForWorktree } from '@/lib/agent-detection-target-inventory' import { useMountedRef } from '@/hooks/useMountedRef' import { useConfirmationDialog } from '@/components/confirmation-dialog-context' import { getWorktreeGitIdentityDisplay } from '../../../../../shared/worktree/git-identity-display' -import { resolveRepoWorktreeLaunchPlatform } from '@/lib/execution-host-facts' +import { resolveRepoWorktreeLaunchPlatform } from '@/runtime/hosts/platform/execution-host-facts' import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner' import { normalizeGlobalWindowsRuntimeDefault } from '../../../../../shared/execution-host/project-runtime-preference' import type { SourceControlAiWriteTarget } from '../../../../../shared/source-control/ai/settings/source-control-ai-recipe-save' diff --git a/src/renderer/src/components/right-sidebar/file-explorer/content-search/useFileSearchRunner.test.tsx b/src/renderer/src/components/right-sidebar/file-explorer/content-search/useFileSearchRunner.test.tsx index 94d7451a4e5..e6a704d65db 100644 --- a/src/renderer/src/components/right-sidebar/file-explorer/content-search/useFileSearchRunner.test.tsx +++ b/src/renderer/src/components/right-sidebar/file-explorer/content-search/useFileSearchRunner.test.tsx @@ -11,7 +11,7 @@ const mocks = vi.hoisted(() => ({ searchRuntimeFiles: vi.fn() })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: mocks.getConnectionId })) diff --git a/src/renderer/src/components/right-sidebar/file-explorer/content-search/useFileSearchRunner.ts b/src/renderer/src/components/right-sidebar/file-explorer/content-search/useFileSearchRunner.ts index a3aa8facf89..17155fdcc52 100644 --- a/src/renderer/src/components/right-sidebar/file-explorer/content-search/useFileSearchRunner.ts +++ b/src/renderer/src/components/right-sidebar/file-explorer/content-search/useFileSearchRunner.ts @@ -1,7 +1,7 @@ import { readIpcErrorDetail } from '@/lib/ipc-error' import { translate } from '@/i18n/i18n' import { useCallback, useEffect, useRef } from 'react' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { createFileSearchResultOwner, type FileSearchResultOwner @@ -16,7 +16,7 @@ import { getExecutionHostIdForWorktree, runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner' -import { isTwinWorkspace } from '@/lib/resolve-owner' +import { isTwinWorkspace } from '@/lib/workspace/ownership/resolve-owner' import type { SearchResult } from '../../../../../../shared/file-search/code-search-types' import { runtimeTargetForOwnerEnvironment } from '@/runtime/rpc/targets/runtime-client-target' diff --git a/src/renderer/src/components/right-sidebar/file-explorer/navigation/file-explorer-operation-owner.ts b/src/renderer/src/components/right-sidebar/file-explorer/navigation/file-explorer-operation-owner.ts index a0cf5d31bb1..900108fe024 100644 --- a/src/renderer/src/components/right-sidebar/file-explorer/navigation/file-explorer-operation-owner.ts +++ b/src/renderer/src/components/right-sidebar/file-explorer/navigation/file-explorer-operation-owner.ts @@ -1,7 +1,7 @@ import { useMemo } from 'react' import { useShallow } from 'zustand/react/shallow' import { useAppStore } from '@/store/index' -import { getSelectedFolderTwinHostId } from '@/lib/folder-workspace-runtime-owner' +import { getSelectedFolderTwinHostId } from '@/lib/workspace/ownership/folder-workspace-runtime-owner' import { selectDetectedWorktreesByRepo, selectFolderWorkspaces, @@ -16,13 +16,17 @@ import { } from '../../../../../../shared/execution-host' import type { HostAuthority } from '../../../../../../shared/host-authority' import { translate } from '@/i18n/i18n' -import { resolveOwner, runtimeEnvironmentIdForWorkspaceOwner } from '@/lib/resolve-owner' -import { getConnectionIdFromState } from '@/lib/connection-context' +import { + resolveOwner, + runtimeEnvironmentIdForWorkspaceOwner +} from '@/lib/workspace/ownership/resolve-owner' +import '@/lib/workspace/ownership/connection-context' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { parseWorkspaceKey } from '../../../../../../shared/workspace-scope' import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target' import type { FileExplorerOperationOwner } from '../tree/file-explorer-types' -import type { WorktreeOperationRoute } from '@/lib/worktree-operation-route' -import { captureWorktreeOperationGenerationGuard } from '@/lib/worktree-operation-generation' +import type { WorktreeOperationRoute } from '@/lib/workspace/ownership/worktree-operation-route' +import { captureWorktreeOperationGenerationGuard } from '@/lib/workspace/ownership/worktree-operation-generation' const ownerUnresolved = (): Error => new Error(getFileExplorerOwnerUnresolvedMessage()) diff --git a/src/renderer/src/components/right-sidebar/file-explorer/panel/FileExplorer.tsx b/src/renderer/src/components/right-sidebar/file-explorer/panel/FileExplorer.tsx index 06b1481484f..469ea4c6d7b 100644 --- a/src/renderer/src/components/right-sidebar/file-explorer/panel/FileExplorer.tsx +++ b/src/renderer/src/components/right-sidebar/file-explorer/panel/FileExplorer.tsx @@ -40,7 +40,7 @@ import { useFileExplorerVisibleRowProjection } from '../tree/useFileExplorerVisi import { useFileExplorerBackgroundMenu } from './use-file-explorer-background-menu' import { useFileExplorerNameFilter } from './use-file-explorer-name-filter' import { useFileExplorerTreePaneState } from '../tree/use-file-explorer-tree-pane-state' -import { useWslHostUnavailableReason } from '../../../../lib/wsl-host-availability' +import { useWslHostUnavailableReason } from '../../../../runtime/hosts/wsl/wsl-host-availability' import { useStoppedWslHost } from '../../../wsl-host-stopped/use-stopped-wsl-host' import { useTranslate } from '@/i18n/use-translate' import { useUiLanguageRevision } from '@/i18n/use-ui-language-revision' diff --git a/src/renderer/src/components/right-sidebar/file-explorer/tree/FileExplorerFilesTreePane.tsx b/src/renderer/src/components/right-sidebar/file-explorer/tree/FileExplorerFilesTreePane.tsx index c990c1927c7..a9a3a43d6fe 100644 --- a/src/renderer/src/components/right-sidebar/file-explorer/tree/FileExplorerFilesTreePane.tsx +++ b/src/renderer/src/components/right-sidebar/file-explorer/tree/FileExplorerFilesTreePane.tsx @@ -16,7 +16,7 @@ import type { FileExplorerRowProjection } from './file-explorer-row-projection' import type { useFileExplorerSelection } from '../selection/useFileExplorerSelection' import type { useFileExplorerTree } from './useFileExplorerTree' import type { useFileExplorerTreePaneState } from './use-file-explorer-tree-pane-state' -import type { WslHostUnavailableReason } from '../../../../lib/wsl-host-availability' +import type { WslHostUnavailableReason } from '../../../../runtime/hosts/wsl/wsl-host-availability' import type { StoppedWslHost } from '../../../wsl-host-stopped/use-stopped-wsl-host' type FileExplorerFilesTreePaneProps = { diff --git a/src/renderer/src/components/right-sidebar/file-explorer/tree/use-file-explorer-ignored-paths.ts b/src/renderer/src/components/right-sidebar/file-explorer/tree/use-file-explorer-ignored-paths.ts index fb919be389d..19150865d25 100644 --- a/src/renderer/src/components/right-sidebar/file-explorer/tree/use-file-explorer-ignored-paths.ts +++ b/src/renderer/src/components/right-sidebar/file-explorer/tree/use-file-explorer-ignored-paths.ts @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { getRuntimeGitIgnoredPaths } from '@/runtime/source-control/git/runtime-git-status-client' import { getWorktreeGitOwnerTarget } from '../../source-control/sync/worktree-git-owner-target' diff --git a/src/renderer/src/components/right-sidebar/file-explorer/tree/use-file-explorer-tree-load-effects.ts b/src/renderer/src/components/right-sidebar/file-explorer/tree/use-file-explorer-tree-load-effects.ts index b38da1b73a7..960980d0db4 100644 --- a/src/renderer/src/components/right-sidebar/file-explorer/tree/use-file-explorer-tree-load-effects.ts +++ b/src/renderer/src/components/right-sidebar/file-explorer/tree/use-file-explorer-tree-load-effects.ts @@ -6,7 +6,7 @@ import { decideExpandedDirLoad } from '../watching/file-explorer-stale-dir-cache import { clearFileExplorerUndoHistory } from '../mutations/fileExplorerUndoRedo' import type { DirCache } from './file-explorer-types' import { splitPathSegments } from '../../../../../../shared/cross-platform-path' -import { takeRecentWorkspaceSwitchWake } from '@/lib/workspace-switch-user-act' +import { takeRecentWorkspaceSwitchWake } from '@/lib/workspace/activation/workspace-switch-user-act' import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner' import { subscribeRuntimeHostContactRegained } from '@/runtime/hosts/connections/runtime-host-contact-regained' diff --git a/src/renderer/src/components/right-sidebar/file-explorer/watching/file-explorer-stale-retry.test.tsx b/src/renderer/src/components/right-sidebar/file-explorer/watching/file-explorer-stale-retry.test.tsx index 927a9978048..73456da1d16 100644 --- a/src/renderer/src/components/right-sidebar/file-explorer/watching/file-explorer-stale-retry.test.tsx +++ b/src/renderer/src/components/right-sidebar/file-explorer/watching/file-explorer-stale-retry.test.tsx @@ -7,7 +7,7 @@ import { noteUserWorkspaceSwitch, resetWorkspaceSwitchUserActsForTests, WORKSPACE_SWITCH_MOUNT_WINDOW_MS -} from '@/lib/workspace-switch-user-act' +} from '@/lib/workspace/activation/workspace-switch-user-act' afterEach(() => { cleanup() diff --git a/src/renderer/src/components/right-sidebar/hosted-review/creation/use-create-pull-request-field-generation.ts b/src/renderer/src/components/right-sidebar/hosted-review/creation/use-create-pull-request-field-generation.ts index 866ca574f97..3f5a0f760cb 100644 --- a/src/renderer/src/components/right-sidebar/hosted-review/creation/use-create-pull-request-field-generation.ts +++ b/src/renderer/src/components/right-sidebar/hosted-review/creation/use-create-pull-request-field-generation.ts @@ -3,7 +3,7 @@ import { translate } from '@/i18n/i18n' import { useTranslate } from '@/i18n/use-translate' import { useCallback, useEffect, type Dispatch, type RefObject, type SetStateAction } from 'react' import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { useAppStore } from '@/store/index' import { cancelRuntimeGeneratePullRequestFields, diff --git a/src/renderer/src/components/right-sidebar/ports-panel-host.ts b/src/renderer/src/components/right-sidebar/ports-panel-host.ts index 191ccf38b45..286a4cfc435 100644 --- a/src/renderer/src/components/right-sidebar/ports-panel-host.ts +++ b/src/renderer/src/components/right-sidebar/ports-panel-host.ts @@ -1,5 +1,5 @@ -import { resolveOwner } from '@/lib/resolve-owner' -import type { WorktreeOperationRouteState } from '@/lib/worktree-operation-route' +import { resolveOwner } from '@/lib/workspace/ownership/resolve-owner' +import type { WorktreeOperationRouteState } from '@/lib/workspace/ownership/worktree-operation-route' import { hostRouteForAuthority, type HostRoute } from '@/runtime/rpc/targets/runtime-client-target' import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target' import { diff --git a/src/renderer/src/components/right-sidebar/source-control/ai/recovery-launch.ts b/src/renderer/src/components/right-sidebar/source-control/ai/recovery-launch.ts index dabb9647d27..a8dbca5179f 100644 --- a/src/renderer/src/components/right-sidebar/source-control/ai/recovery-launch.ts +++ b/src/renderer/src/components/right-sidebar/source-control/ai/recovery-launch.ts @@ -18,7 +18,7 @@ import { focusTerminalTabSurface } from '@/lib/focus-terminal-tab-surface' import { launchAgentInNewTab } from '@/lib/agent-session/launch/new-tab/launch-agent-in-new-tab' import { settleAgentTabLaunch } from '@/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-host-agents' import { newAgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agent-launch-request-id' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { ensureDetectedAgentsForWorktree, type WorktreeAgentInventoryState diff --git a/src/renderer/src/components/right-sidebar/source-control/ai/runSourceControlAgentActionStart.test.ts b/src/renderer/src/components/right-sidebar/source-control/ai/runSourceControlAgentActionStart.test.ts index 525c6d1a541..03c7f5c81aa 100644 --- a/src/renderer/src/components/right-sidebar/source-control/ai/runSourceControlAgentActionStart.test.ts +++ b/src/renderer/src/components/right-sidebar/source-control/ai/runSourceControlAgentActionStart.test.ts @@ -36,7 +36,7 @@ vi.mock('sonner', () => ({ toast: { error: mocks.toastError, success: mocks.toastSuccess } })) -vi.mock('@/lib/workspace-navigation-toast-action', () => ({ +vi.mock('@/lib/workspace/activation/workspace-navigation-toast-action', () => ({ workspaceNavigationToastAction: ({ workspaceId, executionHostId diff --git a/src/renderer/src/components/right-sidebar/source-control/ai/section-agent-placement.ts b/src/renderer/src/components/right-sidebar/source-control/ai/section-agent-placement.ts index b5d2b755931..e7f4a0d1f99 100644 --- a/src/renderer/src/components/right-sidebar/source-control/ai/section-agent-placement.ts +++ b/src/renderer/src/components/right-sidebar/source-control/ai/section-agent-placement.ts @@ -2,10 +2,10 @@ import { toast } from 'sonner' import { useAppStore } from '@/store' import { translate } from '@/i18n/i18n' import { resolveWorktreeDisplayName } from '@/lib/worktree-default-display-name' -import { workspaceNavigationToastAction } from '@/lib/workspace-navigation-toast-action' +import { workspaceNavigationToastAction } from '@/lib/workspace/activation/workspace-navigation-toast-action' import type { ExecutionHostId } from '../../../../../../shared/execution-host' -import { resolveOwner } from '@/lib/resolve-owner' -import type { WorktreeOperationRouteState } from '@/lib/worktree-operation-route' +import { resolveOwner } from '@/lib/workspace/ownership/resolve-owner' +import type { WorktreeOperationRouteState } from '@/lib/workspace/ownership/worktree-operation-route' import { authorityKey } from '../../../../../../shared/host-authority' /** Terminal content still belongs to its placement workspace; a cwd cannot move execution to another host. */ diff --git a/src/renderer/src/components/right-sidebar/source-control/ai/use-ai.operation-recovery.test.tsx b/src/renderer/src/components/right-sidebar/source-control/ai/use-ai.operation-recovery.test.tsx index 17cd76fa388..a94a63bd553 100644 --- a/src/renderer/src/components/right-sidebar/source-control/ai/use-ai.operation-recovery.test.tsx +++ b/src/renderer/src/components/right-sidebar/source-control/ai/use-ai.operation-recovery.test.tsx @@ -38,7 +38,7 @@ vi.mock('@/runtime/source-control/git/runtime-git-status-client', async (importO })) const navigate = vi.hoisted(() => vi.fn()) -vi.mock('@/lib/workspace-navigation-toast-action', () => ({ +vi.mock('@/lib/workspace/activation/workspace-navigation-toast-action', () => ({ workspaceNavigationToastAction: ({ workspaceId, executionHostId diff --git a/src/renderer/src/components/right-sidebar/source-control/commit/use-commit-message-generation.cancel.test.ts b/src/renderer/src/components/right-sidebar/source-control/commit/use-commit-message-generation.cancel.test.ts index f7330c82e95..20829df5dc3 100644 --- a/src/renderer/src/components/right-sidebar/source-control/commit/use-commit-message-generation.cancel.test.ts +++ b/src/renderer/src/components/right-sidebar/source-control/commit/use-commit-message-generation.cancel.test.ts @@ -23,7 +23,7 @@ vi.mock('@/runtime/source-control/git/runtime-git-generation-client', () => ({ }), cancelRuntimeGenerateCommitMessage: () => host.cancel() })) -vi.mock('@/lib/connection-context', () => ({ getConnectionId: () => null })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: () => null })) import { useSourceControlCommitMessageGeneration } from './use-commit-message-generation' diff --git a/src/renderer/src/components/right-sidebar/source-control/listing/use-worktree-context.ts b/src/renderer/src/components/right-sidebar/source-control/listing/use-worktree-context.ts index aebbf8b8bd1..d66e767655b 100644 --- a/src/renderer/src/components/right-sidebar/source-control/listing/use-worktree-context.ts +++ b/src/renderer/src/components/right-sidebar/source-control/listing/use-worktree-context.ts @@ -6,9 +6,9 @@ import { useSourceControlSectionActive } from '../panel/worktree-scope' import { useMemo } from 'react' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { ipcOrRuntimeTargetForHostId } from '@/runtime/rpc/targets/runtime-client-target' -import { resolveRepoWorktreeLaunchPlatform } from '@/lib/execution-host-facts' +import { resolveRepoWorktreeLaunchPlatform } from '@/runtime/hosts/platform/execution-host-facts' import { getWorktreeGitIdentityDisplay } from '../../../../../../shared/worktree/git-identity-display' import type { AppState } from '@/store/types' import { getIndexedWorktreeMap } from '@/store/slices/worktrees/listing/worktree-catalog-index' diff --git a/src/renderer/src/components/right-sidebar/source-control/listing/useSourceControlSubmoduleStatus.test.tsx b/src/renderer/src/components/right-sidebar/source-control/listing/useSourceControlSubmoduleStatus.test.tsx index 3f0d06c9627..c110da784a0 100644 --- a/src/renderer/src/components/right-sidebar/source-control/listing/useSourceControlSubmoduleStatus.test.tsx +++ b/src/renderer/src/components/right-sidebar/source-control/listing/useSourceControlSubmoduleStatus.test.tsx @@ -12,7 +12,9 @@ const mocks = vi.hoisted(() => ({ getRuntimeGitSubmoduleStatus: vi.fn() })) vi.mock('@/runtime/source-control/git/runtime-git-status-client', () => ({ getRuntimeGitSubmoduleStatus: mocks.getRuntimeGitSubmoduleStatus })) -vi.mock('@/lib/connection-context', () => ({ getConnectionId: () => undefined })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionId: () => undefined +})) import { useSourceControlSubmoduleStatus, diff --git a/src/renderer/src/components/right-sidebar/source-control/panel/worktree-scope.tsx b/src/renderer/src/components/right-sidebar/source-control/panel/worktree-scope.tsx index b49af0b0e95..c847fa71f8e 100644 --- a/src/renderer/src/components/right-sidebar/source-control/panel/worktree-scope.tsx +++ b/src/renderer/src/components/right-sidebar/source-control/panel/worktree-scope.tsx @@ -3,7 +3,7 @@ import { create, type StoreApi } from 'zustand' import { AppStateViewContext, useAppStateValue } from '@/store/retained-views/app-state-view' import { useAppStore } from '@/store' import type { AppState } from '@/store/types' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import type { Repo } from '../../../../../../shared/repo-types' import type { AttachedWorktreeOwner } from '../../folder-workspace-attached-worktrees' diff --git a/src/renderer/src/components/right-sidebar/source-control/sync/stale-conflict-operation-poll.ts b/src/renderer/src/components/right-sidebar/source-control/sync/stale-conflict-operation-poll.ts index 026c0e6feaf..0ea112a59ec 100644 --- a/src/renderer/src/components/right-sidebar/source-control/sync/stale-conflict-operation-poll.ts +++ b/src/renderer/src/components/right-sidebar/source-control/sync/stale-conflict-operation-poll.ts @@ -2,7 +2,7 @@ import { useEffect, useMemo } from 'react' import type { GitConflictOperation } from '../../../../../../shared/git/status/git-status-types' import type { Repo } from '../../../../../../shared/repo-types' import { isGitRepoKind } from '../../../../../../shared/repo-kind' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { getRuntimeGitConflictOperation } from '@/runtime/source-control/git/runtime-git-status-client' import { createCoalescedPollRunner, diff --git a/src/renderer/src/components/right-sidebar/source-control/sync/use-git-history.ts b/src/renderer/src/components/right-sidebar/source-control/sync/use-git-history.ts index bfbf974f2c4..43f3916a5a0 100644 --- a/src/renderer/src/components/right-sidebar/source-control/sync/use-git-history.ts +++ b/src/renderer/src/components/right-sidebar/source-control/sync/use-git-history.ts @@ -4,7 +4,7 @@ import type { RuntimeClientTarget } from '../../../../../../shared/runtime-clien import { sourceControlConnectionId, useSourceControlScope } from '../panel/worktree-scope' import { getRuntimeGitHistory } from '@/runtime/source-control/git/runtime-git-status-client' import type { GitHistoryPanelState } from './git-history-panel' -import { takeRecentWorkspaceSwitchWake } from '@/lib/workspace-switch-user-act' +import { takeRecentWorkspaceSwitchWake } from '@/lib/workspace/activation/workspace-switch-user-act' const EMPTY_GIT_HISTORY_STATE: GitHistoryPanelState = { status: 'idle' } diff --git a/src/renderer/src/components/right-sidebar/source-control/sync/use-source-control-branch-compare.test.tsx b/src/renderer/src/components/right-sidebar/source-control/sync/use-source-control-branch-compare.test.tsx index 9cd6402d4a8..f9dbb2093a2 100644 --- a/src/renderer/src/components/right-sidebar/source-control/sync/use-source-control-branch-compare.test.tsx +++ b/src/renderer/src/components/right-sidebar/source-control/sync/use-source-control-branch-compare.test.tsx @@ -18,7 +18,9 @@ const mocks = vi.hoisted(() => ({ vi.mock('@/runtime/source-control/git/runtime-git-diff-client', () => ({ getRuntimeGitBranchCompare: mocks.getRuntimeGitBranchCompare })) -vi.mock('@/lib/connection-context', () => ({ getConnectionId: () => undefined })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionId: () => undefined +})) vi.mock('@/store/index', () => { const state = { beginGitBranchCompareRequest: mocks.beginGitBranchCompareRequest, diff --git a/src/renderer/src/components/right-sidebar/source-control/sync/use-source-control-git-history.test.tsx b/src/renderer/src/components/right-sidebar/source-control/sync/use-source-control-git-history.test.tsx index 7e872dd81ed..e0d7614b13a 100644 --- a/src/renderer/src/components/right-sidebar/source-control/sync/use-source-control-git-history.test.tsx +++ b/src/renderer/src/components/right-sidebar/source-control/sync/use-source-control-git-history.test.tsx @@ -10,7 +10,9 @@ const mocks = vi.hoisted(() => ({ getRuntimeGitHistory: vi.fn() })) vi.mock('@/runtime/source-control/git/runtime-git-status-client', () => ({ getRuntimeGitHistory: mocks.getRuntimeGitHistory })) -vi.mock('@/lib/connection-context', () => ({ getConnectionId: () => undefined })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionId: () => undefined +})) import { useSourceControlGitHistory } from './use-git-history' import { diff --git a/src/renderer/src/components/right-sidebar/source-control/sync/use-worktree-git-status-observation.ts b/src/renderer/src/components/right-sidebar/source-control/sync/use-worktree-git-status-observation.ts index 495146bf119..6961366f30b 100644 --- a/src/renderer/src/components/right-sidebar/source-control/sync/use-worktree-git-status-observation.ts +++ b/src/renderer/src/components/right-sidebar/source-control/sync/use-worktree-git-status-observation.ts @@ -9,7 +9,7 @@ import { isGitRepoKind } from '../../../../../../shared/repo-kind' import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner' import { refreshGitStatusForWorktree } from './git-status-refresh' import { isWindowVisible, windowPollSlowdown } from '@/lib/window-visibility-interval' -import { takeRecentWorkspaceSwitchWake } from '@/lib/workspace-switch-user-act' +import { takeRecentWorkspaceSwitchWake } from '@/lib/workspace/activation/workspace-switch-user-act' import { useRefreshOnHostContact } from './use-refresh-on-host-contact' import { useGitStatusWindowPresence } from './use-git-status-window-presence' import { diff --git a/src/renderer/src/components/right-sidebar/source-control/sync/worktree-git-owner-target.ts b/src/renderer/src/components/right-sidebar/source-control/sync/worktree-git-owner-target.ts index ef2ada9e8ac..613450f04e7 100644 --- a/src/renderer/src/components/right-sidebar/source-control/sync/worktree-git-owner-target.ts +++ b/src/renderer/src/components/right-sidebar/source-control/sync/worktree-git-owner-target.ts @@ -1,5 +1,8 @@ import { useMemo } from 'react' -import { resolveOwner, runtimeTargetForWorkspaceOwner } from '@/lib/resolve-owner' +import { + resolveOwner, + runtimeTargetForWorkspaceOwner +} from '@/lib/workspace/ownership/resolve-owner' import { runtimeTargetForOwnerEnvironment } from '@/runtime/rpc/targets/runtime-client-target' import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target' import { useAppStore } from '@/store/index' diff --git a/src/renderer/src/components/settings/general/GeneralPane.tsx b/src/renderer/src/components/settings/general/GeneralPane.tsx index 26b7857f91a..185a6945228 100644 --- a/src/renderer/src/components/settings/general/GeneralPane.tsx +++ b/src/renderer/src/components/settings/general/GeneralPane.tsx @@ -22,7 +22,7 @@ import { SearchableSetting } from '../section-layout/SearchableSetting' import { SettingsSwitchRow } from '../form-controls/SettingsFormControls' import { useTranslate } from '@/i18n/use-translate' import { DefaultWindowsProjectRuntimeSetting } from './project-runtime/DefaultWindowsProjectRuntimeSetting' -import { defaultScopeHost } from '@/lib/default-creation-host' +import { defaultScopeHost } from '@/runtime/hosts/selection/default-creation-host' import { SettingsGroup } from '../section-layout/SettingsGroup' type GeneralSearchEntry = ReturnType[number] diff --git a/src/renderer/src/components/settings/page/use-settings-store-model.ts b/src/renderer/src/components/settings/page/use-settings-store-model.ts index 71c31b64380..1ba484f9d9d 100644 --- a/src/renderer/src/components/settings/page/use-settings-store-model.ts +++ b/src/renderer/src/components/settings/page/use-settings-store-model.ts @@ -38,7 +38,7 @@ import { } from '../navigation/settings-project-list' import { resolveSettingsHostScope } from '../host-scope/settings-host-scope' import { useSettingsHostNavigation } from '../host-scope/use-settings-host-navigation' -import { defaultScopeHost } from '@/lib/default-creation-host' +import { defaultScopeHost } from '@/runtime/hosts/selection/default-creation-host' import { blockRemovalForUnsavedFiles, projectRemovalTargets diff --git a/src/renderer/src/components/settings/terminal/TerminalPane.section-lifetime.test.tsx b/src/renderer/src/components/settings/terminal/TerminalPane.section-lifetime.test.tsx index 8a92cc1c983..a8c01942be0 100644 --- a/src/renderer/src/components/settings/terminal/TerminalPane.section-lifetime.test.tsx +++ b/src/renderer/src/components/settings/terminal/TerminalPane.section-lifetime.test.tsx @@ -97,7 +97,9 @@ vi.mock('@/components/shared/useDaemonActions', () => ({ vi.mock('@/lib/workspace/activation/worktree-activation', () => ({ activateAndRevealWorktree: vi.fn() })) -vi.mock('@/lib/activate-tab-and-focus-pane', () => ({ activateTabAndFocusPane: vi.fn() })) +vi.mock('@/lib/workspace/tabs/activate-tab-and-focus-pane', () => ({ + activateTabAndFocusPane: vi.fn() +})) beforeEach(() => { vi.clearAllMocks() diff --git a/src/renderer/src/components/settings/terminal/session-management/ManageSessionsSection.tsx b/src/renderer/src/components/settings/terminal/session-management/ManageSessionsSection.tsx index ac8bd54a34a..c30ab3879a3 100644 --- a/src/renderer/src/components/settings/terminal/session-management/ManageSessionsSection.tsx +++ b/src/renderer/src/components/settings/terminal/session-management/ManageSessionsSection.tsx @@ -6,7 +6,7 @@ import { SettingsGroup } from '../../section-layout/SettingsGroup' import { getManageSessionsSearchEntries } from './manage-sessions-search' import { useAppStore } from '../../../../store/index' import { activateAndRevealWorktree } from '@/lib/workspace/activation/worktree-activation' -import { activateTabAndFocusPane } from '@/lib/activate-tab-and-focus-pane' +import { activateTabAndFocusPane } from '@/lib/workspace/tabs/activate-tab-and-focus-pane' import { useDaemonActions, DaemonActionDialog } from '../../../shared/useDaemonActions' import { ManageSessionKillDialog } from './ManageSessionKillDialog' import { ManageSessionsTable } from './ManageSessionsTable' diff --git a/src/renderer/src/components/sidebar/WslMovedProjectsSection.tsx b/src/renderer/src/components/sidebar/WslMovedProjectsSection.tsx index 5f22e5e5535..c3a1edee153 100644 --- a/src/renderer/src/components/sidebar/WslMovedProjectsSection.tsx +++ b/src/renderer/src/components/sidebar/WslMovedProjectsSection.tsx @@ -5,8 +5,8 @@ import { useShallow } from 'zustand/react/shallow' import { useAppStore } from '@/store' import { useTranslate } from '@/i18n/use-translate' import { selectWslMovedChatWorkspaces } from '@/store/repos/wsl-moved-projects' -import { activateWslMovedWorkspace } from '@/lib/wsl-moved-chat-activation' -import { bringWslMovedProjectBack } from '@/lib/wsl-moved-project-use-here' +import { activateWslMovedWorkspace } from '@/lib/workspace/activation/wsl-moved-chat-activation' +import { bringWslMovedProjectBack } from '@/lib/workspace/ownership/wsl-moved-project-use-here' import { useConfirmationDialog } from '@/components/confirmation-dialog-context' import { Button } from '@/components/ui/button' import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip' diff --git a/src/renderer/src/components/sidebar/project-admission/drop/useSidebarProjectDrop.ts b/src/renderer/src/components/sidebar/project-admission/drop/useSidebarProjectDrop.ts index 8f1938609a8..6c7b960f1c3 100644 --- a/src/renderer/src/components/sidebar/project-admission/drop/useSidebarProjectDrop.ts +++ b/src/renderer/src/components/sidebar/project-admission/drop/useSidebarProjectDrop.ts @@ -17,7 +17,7 @@ import { translate } from '@/i18n/i18n' import { useTranslate } from '@/i18n/use-translate' import { userNamedFileAccess } from '@/lib/local-file-access' import { listWslHostWindowsPathAccess } from '@/lib/windows-path-access' -import { addOnThisComputerLabel } from '@/lib/wsl-host-windows-drive-refusal-toast' +import { addOnThisComputerLabel } from '@/lib/workspace/creation/wsl-host-windows-drive-refusal-toast' import type { AppState } from '@/store/types' function getWslDropHosts(state: Pick) { diff --git a/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoExistingWslHostOffer.tsx b/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoExistingWslHostOffer.tsx index aedaa532554..f1023713e95 100644 --- a/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoExistingWslHostOffer.tsx +++ b/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoExistingWslHostOffer.tsx @@ -2,7 +2,7 @@ import { useState } from 'react' import { Button } from '@/components/ui/button' import { LoadingSpinner } from '@/components/LoadingSpinner' import { useTranslate } from '@/i18n/use-translate' -import { addOnThisComputerLabel } from '@/lib/wsl-host-windows-drive-refusal-toast' +import { addOnThisComputerLabel } from '@/lib/workspace/creation/wsl-host-windows-drive-refusal-toast' /** Inline in the add-project flow: the `\\wsl.localhost` path's distro already runs as a host. */ export function AddRepoExistingWslHostOffer({ diff --git a/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoWindowsDriveNotice.tsx b/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoWindowsDriveNotice.tsx index cf877dee4f7..7c5bfcea455 100644 --- a/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoWindowsDriveNotice.tsx +++ b/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoWindowsDriveNotice.tsx @@ -3,7 +3,7 @@ import type { WslHostWindowsDriveRefusal } from '../../../../../../shared/wsl-ho import { addOnThisComputerLabel, wslHostWindowsDriveRefusalCopy -} from '@/lib/wsl-host-windows-drive-refusal-toast' +} from '@/lib/workspace/creation/wsl-host-windows-drive-refusal-toast' import { useTranslate } from '@/i18n/use-translate' /** Inline, not a toast: the user must act, and toasts above the dialog take no clicks. */ diff --git a/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoWslHostOffer.tsx b/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoWslHostOffer.tsx index 3a5b39f5b8c..3fed6c1ab58 100644 --- a/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoWslHostOffer.tsx +++ b/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoWslHostOffer.tsx @@ -3,7 +3,7 @@ import { Button } from '@/components/ui/button' import { LoadingSpinner } from '@/components/LoadingSpinner' import { useTranslate } from '@/i18n/use-translate' import { readIpcErrorDetail } from '@/lib/ipc-error' -import { addOnThisComputerLabel } from '@/lib/wsl-host-windows-drive-refusal-toast' +import { addOnThisComputerLabel } from '@/lib/workspace/creation/wsl-host-windows-drive-refusal-toast' import { useAppStore } from '@/store/index' import type { AddRepoExistingWorkspaceSource } from '../../../../../../shared/telemetry-events' import { addWslHostDistro } from '../../host-admission/wsl/add-wsl-host-distro' diff --git a/src/renderer/src/components/sidebar/workspace-actions/context-menu/use-worktree-context-menu-commands.ts b/src/renderer/src/components/sidebar/workspace-actions/context-menu/use-worktree-context-menu-commands.ts index 5ca733cd32d..744947a4239 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/context-menu/use-worktree-context-menu-commands.ts +++ b/src/renderer/src/components/sidebar/workspace-actions/context-menu/use-worktree-context-menu-commands.ts @@ -17,7 +17,7 @@ import { collectTwinHostsAlsoSlept } from '../sleep/sleep-twin-confirmation' import { activateAndRevealWorktree } from '@/lib/workspace/activation/worktree-activation' import { resolveWorktreeDisplayName } from '@/lib/worktree-default-display-name' import { formatClipboardFilePath } from '@/lib/clipboard-file-path' -import { getWorktreeRowLocalPathOpenOwner } from '@/lib/worktree-row-open-in-owner' +import { getWorktreeRowLocalPathOpenOwner } from '@/lib/workspace/ownership/worktree-row-open-in-owner' import { VIRTUALIZED_SCROLL_ANCHOR_RECORD_EVENT } from '@/hooks/useVirtualizedScrollAnchor' import { canCreateChildWorktree, diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/delete-worktree-dirty-change-hydration.test.tsx b/src/renderer/src/components/sidebar/workspace-actions/deletion/delete-worktree-dirty-change-hydration.test.tsx index 39620e86f6e..5d62c06d861 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/deletion/delete-worktree-dirty-change-hydration.test.tsx +++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/delete-worktree-dirty-change-hydration.test.tsx @@ -33,7 +33,7 @@ vi.mock('@/store', () => ({ vi.mock('@/runtime/source-control/git/runtime-git-status-client', () => ({ getRuntimeGitStatus: vi.fn() })) -vi.mock('@/lib/connection-context', () => ({ getConnectionId: () => null })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: () => null })) const repoMap = new Map() diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/delete-worktree-flow.ts b/src/renderer/src/components/sidebar/workspace-actions/deletion/delete-worktree-flow.ts index 6a19d35c44c..611960f20c4 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/deletion/delete-worktree-flow.ts +++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/delete-worktree-flow.ts @@ -10,7 +10,7 @@ import { } from '../../worktree-list/listing/stale-workspace-list-toast' import { getWorkspaceDeleteLineage } from './workspace-delete-lineage' import { resolveSshWorkspaceForget } from './ssh-workspace-forget-resolution' -import { resolveWorktreeOperationRouteForHost } from '@/lib/worktree-operation-route' +import { resolveWorktreeOperationRouteForHost } from '@/lib/workspace/ownership/worktree-operation-route' import { isPairedWebClientWindow } from '@/lib/desktop-window-chrome' import { parseWorkspaceKey } from '../../../../../../shared/workspace-scope' import { getWorktreeExecutionHostId } from '../../../../../../shared/execution-host' diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/folder-workspace-delete.ts b/src/renderer/src/components/sidebar/workspace-actions/deletion/folder-workspace-delete.ts index 8c9a961ac3a..d0d05d40d1a 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/deletion/folder-workspace-delete.ts +++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/folder-workspace-delete.ts @@ -2,7 +2,7 @@ import type { AppState } from '@/store/types' import type { ExecutionHostId } from '../../../../../../shared/execution-host' import { folderWorkspaceKey } from '../../../../../../shared/workspace-scope' import { blockRemovalForUnsavedFiles } from './removal-unsaved-files' -import { getExecutionHostIdForFolderWorkspace } from '@/lib/folder-workspace-runtime-owner' +import { getExecutionHostIdForFolderWorkspace } from '@/lib/workspace/ownership/folder-workspace-runtime-owner' import '../../../../../../shared/folder-workspaces/folder-workspace-execution-host' import { getFolderWorkspaceHostId } from '../../../../../../shared/folder-workspaces/folder-workspace-host-id' import { selectFolderWorkspaces } from '@/store/workspaces/catalog/workspace-record-fields' diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/run-worktree-delete-with-toast.ts b/src/renderer/src/components/sidebar/workspace-actions/deletion/run-worktree-delete-with-toast.ts index 4c9d8583f80..6d9d55bce1e 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/deletion/run-worktree-delete-with-toast.ts +++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/run-worktree-delete-with-toast.ts @@ -5,7 +5,7 @@ import { translate } from '@/i18n/i18n' import { resolveWorktreeOperationRoute, resolveWorktreeOperationRouteForHost -} from '@/lib/worktree-operation-route' +} from '@/lib/workspace/ownership/worktree-operation-route' import type { WorktreeRemovalTarget } from '../../../../../../shared/worktree/removal' import { showDeleteWorktreeFailureToast } from './delete-worktree-failure-toast' import type { WorktreeDeleteWithToastOptions } from './worktree-delete-request' diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/ssh-workspace-forget-resolution.ts b/src/renderer/src/components/sidebar/workspace-actions/deletion/ssh-workspace-forget-resolution.ts index 71ba500c331..3c52e35c0a9 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/deletion/ssh-workspace-forget-resolution.ts +++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/ssh-workspace-forget-resolution.ts @@ -2,7 +2,7 @@ import { isRuntimeOwnedSshTargetId, parseExecutionHostId } from '../../../../../../shared/execution-host' -import type { WorktreeOperationRoute } from '@/lib/worktree-operation-route' +import type { WorktreeOperationRoute } from '@/lib/workspace/ownership/worktree-operation-route' /** Choose normal deletion or forget-only from the route a removal would take. */ export type SshWorkspaceForgetResolution = diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/use-delete-worktree-status-hydration.ts b/src/renderer/src/components/sidebar/workspace-actions/deletion/use-delete-worktree-status-hydration.ts index 786e075d781..4e17cab05c1 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/deletion/use-delete-worktree-status-hydration.ts +++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/use-delete-worktree-status-hydration.ts @@ -1,7 +1,7 @@ import { useEffect, useRef, useState } from 'react' import { useAppStore } from '@/store' -import { getConnectionId } from '@/lib/connection-context' -import { runtimeTargetForWorkspaceOwner } from '@/lib/resolve-owner' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' +import { runtimeTargetForWorkspaceOwner } from '@/lib/workspace/ownership/resolve-owner' import { ipcOrRuntimeTargetForHostId } from '@/runtime/rpc/targets/runtime-client-target' import { getRuntimeGitStatus } from '@/runtime/source-control/git/runtime-git-status-client' import { findRepoForHost } from '@/store/repos/repo-host-identity' diff --git a/src/renderer/src/components/sidebar/workspace-actions/open/WorktreeOpenInMenu.tsx b/src/renderer/src/components/sidebar/workspace-actions/open/WorktreeOpenInMenu.tsx index 86ea459197f..732bfdb2343 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/open/WorktreeOpenInMenu.tsx +++ b/src/renderer/src/components/sidebar/workspace-actions/open/WorktreeOpenInMenu.tsx @@ -20,8 +20,8 @@ import { getExternalEditorOpenCapability } from '@/lib/external-editor-open-capa import { getWorkspaceEditorSshHost, type WorkspaceEditorSshHost -} from '@/lib/workspace-editor-ssh-target' -import type { WorkspaceOwnerRef } from '@/lib/resolve-owner' +} from '@/components/file-actions/workspace-editor-ssh-target' +import type { WorkspaceOwnerRef } from '@/lib/workspace/ownership/resolve-owner' import { NO_OPEN_IN_APPLICATIONS } from '@/lib/open-in-application-selection' import { showOpenFailureToast } from './worktree-open-failure-toast' import type { OpenInApplication } from '../../../../../../shared/ui-chrome-types' diff --git a/src/renderer/src/components/sidebar/workspace-actions/open/WorktreeRowOpenInSubMenu.tsx b/src/renderer/src/components/sidebar/workspace-actions/open/WorktreeRowOpenInSubMenu.tsx index f2ce96c652c..faa008291bb 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/open/WorktreeRowOpenInSubMenu.tsx +++ b/src/renderer/src/components/sidebar/workspace-actions/open/WorktreeRowOpenInSubMenu.tsx @@ -1,7 +1,7 @@ import type React from 'react' import { useShallow } from 'zustand/react/shallow' import { useAppStore } from '@/store' -import { resolveWorktreeRowOpenInRuntimeOwner } from '@/lib/worktree-row-open-in-owner' +import { resolveWorktreeRowOpenInRuntimeOwner } from '@/lib/workspace/ownership/worktree-row-open-in-owner' import type { Worktree } from '../../../../../../shared/worktree/types' import { WorktreeOpenInSubMenu } from './WorktreeOpenInMenu' diff --git a/src/renderer/src/components/sidebar/workspace-actions/parenting/ParentMachineBadge.tsx b/src/renderer/src/components/sidebar/workspace-actions/parenting/ParentMachineBadge.tsx index 94ac676eb23..5383b185877 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/parenting/ParentMachineBadge.tsx +++ b/src/renderer/src/components/sidebar/workspace-actions/parenting/ParentMachineBadge.tsx @@ -1,5 +1,5 @@ import { useAppStore } from '@/store' -import { selectExecutionHostDisplayLabel } from '@/lib/execution-host-display-label' +import { selectExecutionHostDisplayLabel } from '@/runtime/hosts/display/execution-host-display-label' import type { ExecutionHostId } from '../../../../../../shared/execution-host' import { WorktreeHostContextBadge } from '../../workspace-card/host/WorktreeHostContextBadge' diff --git a/src/renderer/src/components/sidebar/workspace-actions/sleep/SleepTwinWorkspaceDialog.tsx b/src/renderer/src/components/sidebar/workspace-actions/sleep/SleepTwinWorkspaceDialog.tsx index 93a5335b818..49cca8da861 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/sleep/SleepTwinWorkspaceDialog.tsx +++ b/src/renderer/src/components/sidebar/workspace-actions/sleep/SleepTwinWorkspaceDialog.tsx @@ -13,7 +13,7 @@ import { useTranslate } from '@/i18n/use-translate' import { useUiLanguageRevision } from '@/i18n/use-ui-language-revision' import { parseExecutionHostId, type ExecutionHostId } from '../../../../../../shared/execution-host' import { runSleepWorktrees } from './sleep-worktree-flow' -import { selectExecutionHostDisplayLabel } from '@/lib/execution-host-display-label' +import { selectExecutionHostDisplayLabel } from '@/runtime/hosts/display/execution-host-display-label' function readStrings(value: unknown): string[] { return Array.isArray(value) ? value.filter((entry) => typeof entry === 'string') : [] diff --git a/src/renderer/src/components/sidebar/workspace-actions/sleep/workspace-sleep-follower.ts b/src/renderer/src/components/sidebar/workspace-actions/sleep/workspace-sleep-follower.ts index 8d501fe2f83..c6d0e7f9167 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/sleep/workspace-sleep-follower.ts +++ b/src/renderer/src/components/sidebar/workspace-actions/sleep/workspace-sleep-follower.ts @@ -3,7 +3,7 @@ import { captureWorkspaceSelection, restoreWorkspaceSelection, type WorkspaceSelection -} from '@/lib/active-workspace-host' +} from '@/lib/workspace/ownership/active-workspace-host' import { clearWorktreeSleepIntent, markWorktreeSleepIntent, diff --git a/src/renderer/src/components/sidebar/workspace-actions/sleep/workspace-sleep-target.ts b/src/renderer/src/components/sidebar/workspace-actions/sleep/workspace-sleep-target.ts index 9620ef4fd4a..6231cfa7214 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/sleep/workspace-sleep-target.ts +++ b/src/renderer/src/components/sidebar/workspace-actions/sleep/workspace-sleep-target.ts @@ -9,7 +9,7 @@ import type { WorkspaceSleepHost, WorkspaceSleepTarget } from '../../../../../../shared/workspace-sleep' -import { resolveOwner } from '@/lib/resolve-owner' +import { resolveOwner } from '@/lib/workspace/ownership/resolve-owner' import { resolveTerminalPtyOwner } from '@/lib/terminal-worktree-route' import { runtimeRpcTargetForAuthorityKey } from '@/runtime/rpc/targets/runtime-client-target' import { workspacePublishingHosts } from '@/store/slices/worktrees/teardown/host-twin-worktree-purge' diff --git a/src/renderer/src/components/sidebar/workspace-board/projection/use-workspace-board-task-status-sync.queued.test.ts b/src/renderer/src/components/sidebar/workspace-board/projection/use-workspace-board-task-status-sync.queued.test.ts index d35c0c71624..e81ab5c0935 100644 --- a/src/renderer/src/components/sidebar/workspace-board/projection/use-workspace-board-task-status-sync.queued.test.ts +++ b/src/renderer/src/components/sidebar/workspace-board/projection/use-workspace-board-task-status-sync.queued.test.ts @@ -5,7 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { linearGetIssue, linearUpdateIssue } from '@/runtime/linear/runtime-linear-issue-client' import { linearTeamStates } from '@/runtime/linear/runtime-linear-project-client' import type { LinearMutationResult } from '@/runtime/linear/runtime-linear-client' -import type { WorktreeOperationRouteState } from '@/lib/worktree-operation-route' +import type { WorktreeOperationRouteState } from '@/lib/workspace/ownership/worktree-operation-route' import type { WorkspaceRecordState } from '@/store/workspaces/selection/workspace-host-target' import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' import { findKnownWorktreeById } from '@/store/slices/worktrees/listing/detected-worktree-meta' diff --git a/src/renderer/src/components/sidebar/workspace-board/projection/use-workspace-board-task-status-sync.ts b/src/renderer/src/components/sidebar/workspace-board/projection/use-workspace-board-task-status-sync.ts index 5e1fd25cf85..85cedf3d8bf 100644 --- a/src/renderer/src/components/sidebar/workspace-board/projection/use-workspace-board-task-status-sync.ts +++ b/src/renderer/src/components/sidebar/workspace-board/projection/use-workspace-board-task-status-sync.ts @@ -7,11 +7,11 @@ import { } from '@/store/workspaces/selection/workspace-host-target' import { hostWorktreeTarget } from '../../../../../../shared/worktree/host-qualified-identity' import { getRuntimeTargetForWorktreeOwner } from '@/lib/file-owner-runtime-target' -import { runtimeTargetForWorkspaceOwner } from '@/lib/resolve-owner' +import { runtimeTargetForWorkspaceOwner } from '@/lib/workspace/ownership/resolve-owner' import type { ExecutionHostId } from '../../../../../../shared/execution-host' import { warnAmbiguousOwnerOnce } from '@/lib/ambiguous-owner-warning' -import type { WorktreeOperationRouteState } from '@/lib/worktree-operation-route' -import type { RowLessSource as RuntimeLinearSettings } from '@/lib/default-creation-host' +import type { WorktreeOperationRouteState } from '@/lib/workspace/ownership/worktree-operation-route' +import type { RowLessSource as RuntimeLinearSettings } from '@/runtime/hosts/selection/default-creation-host' import { translate } from '@/i18n/i18n' import type { WorkspaceStatus, diff --git a/src/renderer/src/components/sidebar/workspace-board/projection/workspace-board-task-status-sync.ts b/src/renderer/src/components/sidebar/workspace-board/projection/workspace-board-task-status-sync.ts index acbe2616cb4..db8a1874f84 100644 --- a/src/renderer/src/components/sidebar/workspace-board/projection/workspace-board-task-status-sync.ts +++ b/src/renderer/src/components/sidebar/workspace-board/projection/workspace-board-task-status-sync.ts @@ -3,7 +3,7 @@ import { confirmLinearIssueWrite } from '@/store/slices/linear/linear-issue-publ import { linearGetIssue, linearUpdateIssue } from '@/runtime/linear/runtime-linear-issue-client' import { linearTeamStates } from '@/runtime/linear/runtime-linear-project-client' import type { LinearMutationResult } from '@/runtime/linear/runtime-linear-client' -import type { RowLessSource as RuntimeLinearSettings } from '@/lib/default-creation-host' +import type { RowLessSource as RuntimeLinearSettings } from '@/runtime/hosts/selection/default-creation-host' import type { LinearIssue } from '../../../../../../shared/linear/issue-types' import type { LinearWorkflowState } from '../../../../../../shared/linear/workspace-types' import type { diff --git a/src/renderer/src/components/sidebar/workspace-card/activity/activate-retained-agent-row.ts b/src/renderer/src/components/sidebar/workspace-card/activity/activate-retained-agent-row.ts index caf700e9277..f8c76917650 100644 --- a/src/renderer/src/components/sidebar/workspace-card/activity/activate-retained-agent-row.ts +++ b/src/renderer/src/components/sidebar/workspace-card/activity/activate-retained-agent-row.ts @@ -1,7 +1,7 @@ import { useAppStore } from '@/store' import { activateAndRevealWorkspace } from '@/lib/workspace/activation/worktree-activation' -import { activateTabAndFocusPane } from '@/lib/activate-tab-and-focus-pane' -import { activateTerminalTabOnOwner } from '@/lib/terminal-tab-owner-activation' +import { activateTabAndFocusPane } from '@/lib/workspace/tabs/activate-tab-and-focus-pane' +import { activateTerminalTabOnOwner } from '@/lib/workspace/tabs/terminal-tab-owner-activation' import { activateStructuredAgentSessionTab } from '@/lib/agent-session/structured-agent-session-tab-activation' import { structuredAgentSessionOwnerForTab, diff --git a/src/renderer/src/components/sidebar/workspace-card/activity/use-worktree-activity-status.ts b/src/renderer/src/components/sidebar/workspace-card/activity/use-worktree-activity-status.ts index a40bf1555c9..a3902e3bac9 100644 --- a/src/renderer/src/components/sidebar/workspace-card/activity/use-worktree-activity-status.ts +++ b/src/renderer/src/components/sidebar/workspace-card/activity/use-worktree-activity-status.ts @@ -11,7 +11,7 @@ import { selectRuntimePaneTitlesForWorktree } from './worktree-card-status-inputs' import { selectWorktreeAgentActivitySummary } from './worktree-agent-activity-summary' -import { selectStoppedWslDistro } from '@/lib/wsl-host-stopped-status' +import { selectStoppedWslDistro } from '@/runtime/hosts/wsl/wsl-host-stopped-status' import { selectWorkspaceRuntimeEnvironmentId } from '../../../../lib/workspace/ownership/workspace-runtime-environment' import { parseRemoteRuntimePtyId } from '../../../../../../shared/remote-runtime/remote-runtime-pty-id' diff --git a/src/renderer/src/components/sidebar/workspace-card/activity/use-worktree-agent-activation.ts b/src/renderer/src/components/sidebar/workspace-card/activity/use-worktree-agent-activation.ts index fb7cd7cd6d5..096db1c6132 100644 --- a/src/renderer/src/components/sidebar/workspace-card/activity/use-worktree-agent-activation.ts +++ b/src/renderer/src/components/sidebar/workspace-card/activity/use-worktree-agent-activation.ts @@ -1,8 +1,8 @@ import { useCallback } from 'react' import { useAppStore } from '@/store' import { activateAndRevealWorktree } from '@/lib/workspace/activation/worktree-activation' -import { activateTabAndFocusPane } from '@/lib/activate-tab-and-focus-pane' -import { activateTerminalTabOnOwner } from '@/lib/terminal-tab-owner-activation' +import { activateTabAndFocusPane } from '@/lib/workspace/tabs/activate-tab-and-focus-pane' +import { activateTerminalTabOnOwner } from '@/lib/workspace/tabs/terminal-tab-owner-activation' import { parsePaneKey } from '../../../../../../shared/workspace-layout/stable-pane-id' import { dismissStaleAgentRowByKey } from '../../../terminal-pane/agent-status/stale-agent-row' import { activateStructuredAgentSessionTab } from '@/lib/agent-session/structured-agent-session-tab-activation' diff --git a/src/renderer/src/components/sidebar/workspace-card/controller/use-worktree-card-activation-actions.ts b/src/renderer/src/components/sidebar/workspace-card/controller/use-worktree-card-activation-actions.ts index b8edfd03708..febe8f8164c 100644 --- a/src/renderer/src/components/sidebar/workspace-card/controller/use-worktree-card-activation-actions.ts +++ b/src/renderer/src/components/sidebar/workspace-card/controller/use-worktree-card-activation-actions.ts @@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useLayoutEffect, useRef } from 'react' import { getRepoExecutionHostId } from '../../../../../../shared/execution-host' import { recordRendererCrashBreadcrumb } from '@/lib/crash-diagnostics' -import { activateWorktreeFromSidebar } from '@/lib/sidebar-worktree-activation' +import { activateWorktreeFromSidebar } from '@/lib/workspace/activation/sidebar-worktree-activation' import { isEventTargetInsideCurrentTarget } from './worktree-card-dom-events' import { noteWorktreeRowHoverEnd, diff --git a/src/renderer/src/components/sidebar/workspace-card/controller/use-worktree-card-foundation.ts b/src/renderer/src/components/sidebar/workspace-card/controller/use-worktree-card-foundation.ts index bed65cb2632..9af1e13c52a 100644 --- a/src/renderer/src/components/sidebar/workspace-card/controller/use-worktree-card-foundation.ts +++ b/src/renderer/src/components/sidebar/workspace-card/controller/use-worktree-card-foundation.ts @@ -9,7 +9,7 @@ import { } from '../../../../../../shared/execution-host' import { getHostDisplayLabelOverrides } from '../../../../../../shared/host-setting-overrides' import { getWorkspacePortsByWorktreeId } from '@/lib/workspace-ports/workspace-port-groups' -import { runtimeEnvironmentIdUnlessTwin } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' import { hydrateRuntimeEnvironmentSshState } from '@/runtime/hosts/ssh/runtime-environment-ssh-state' import { useRuntimeHostDisconnected } from '@/store/slices/runtime-status/views/use-runtime-status-view' import { useAppStore } from '@/store' diff --git a/src/renderer/src/components/sidebar/workspace-card/host/WorktreeWslHostStartMenuItem.tsx b/src/renderer/src/components/sidebar/workspace-card/host/WorktreeWslHostStartMenuItem.tsx index 3c1dd80ad75..6e8fcf064de 100644 --- a/src/renderer/src/components/sidebar/workspace-card/host/WorktreeWslHostStartMenuItem.tsx +++ b/src/renderer/src/components/sidebar/workspace-card/host/WorktreeWslHostStartMenuItem.tsx @@ -2,7 +2,7 @@ import React from 'react' import { Play } from 'lucide-react' import { DropdownMenuItem, DropdownMenuSeparator } from '@/components/ui/dropdown-menu' import { useTranslate } from '@/i18n/use-translate' -import { startWslHostAndReloadProjects } from '@/lib/wsl-host-user-start' +import { startWslHostAndReloadProjects } from '@/runtime/hosts/wsl/wsl-host-user-start' import { useStoppedWslHost } from '../../../wsl-host-stopped/use-stopped-wsl-host' /** Start for a workspace on a stopped WSL distro. Mounted only inside the open menu, so idle rows add no subscription. */ diff --git a/src/renderer/src/components/sidebar/workspace-card/review/WorkspaceAttachmentOrigins.tsx b/src/renderer/src/components/sidebar/workspace-card/review/WorkspaceAttachmentOrigins.tsx index 3d1ecf1cf0f..ada81a57ca0 100644 --- a/src/renderer/src/components/sidebar/workspace-card/review/WorkspaceAttachmentOrigins.tsx +++ b/src/renderer/src/components/sidebar/workspace-card/review/WorkspaceAttachmentOrigins.tsx @@ -6,7 +6,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip import { useTranslate } from '@/i18n/use-translate' import { resolveNotificationTabOwner } from '@/attention/notification-subject-owner' import { terminalLayoutContainsLeaf } from '../../../../../../shared/workspace-session/workspace-session-pane-ownership' -import { activateTabAndFocusPane } from '@/lib/activate-tab-and-focus-pane' +import { activateTabAndFocusPane } from '@/lib/workspace/tabs/activate-tab-and-focus-pane' import { parsePaneKey } from '../../../../../../shared/workspace-layout/stable-pane-id' import type { WorkspaceAttachment, Worktree } from '../../../../../../shared/worktree/types' import type { Tab } from '../../../../../../shared/tab-types' diff --git a/src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-agent-startup.ts b/src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-agent-startup.ts index 923c722d1b3..cada97b508a 100644 --- a/src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-agent-startup.ts +++ b/src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-agent-startup.ts @@ -3,10 +3,8 @@ import { type AgentStartupSettings } from '../../../../../../shared/agent-launch/startup/agent-startup-plan-inputs' import type { LinkedWorkItemSummary } from '@/lib/new-workspace' -import { - resolveRepoExecutionHostPlatform, - type ExecutionHostPlatformFact -} from '@/lib/execution-host-facts' +import { resolveRepoExecutionHostPlatform } from '@/runtime/hosts/platform/execution-host-facts' +import type { ExecutionHostPlatformFact } from '@/runtime/hosts/platform/execution-host-platform-fact' import type { AppState } from '@/store/types' import { resolveQuickCreateLinkedWorkItemPrompt } from '@/lib/linked-work-item-context' import { diff --git a/src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-composer-path-status.ts b/src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-composer-path-status.ts index c8558b8c8e0..075539f33c2 100644 --- a/src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-composer-path-status.ts +++ b/src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-composer-path-status.ts @@ -1,11 +1,11 @@ import { useEffect, useMemo, useRef, useState } from 'react' import { useShallow } from 'zustand/react/shallow' import { useAppStore } from '@/store/index' -import { useFolderWorkspacePathStatusCacheExpiryTick } from '@/lib/folder-workspace-path-status-cache-expiry' +import { useFolderWorkspacePathStatusCacheExpiryTick } from '@/lib/workspace/paths/folder-workspace-path-status-cache-expiry' import { getFolderWorkspacePathStatusDescription, getFolderWorkspacePathStatusTitle -} from '@/lib/folder-workspace-path-status' +} from '@/lib/workspace/paths/folder-workspace-path-status' import { isConfirmedStaleFolderPathStatus } from '../../../../../../shared/folder-workspaces/folder-workspace-path-status' import type { ProjectGroup } from '../../../../../../shared/project-group-types' import { recomputeOn } from '@/lib/recompute-on' diff --git a/src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-composer-submit.ts b/src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-composer-submit.ts index 3eb72a180fd..49e3d80bff1 100644 --- a/src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-composer-submit.ts +++ b/src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-composer-submit.ts @@ -21,7 +21,7 @@ import { newAgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agen import { beginStructuredAgentSessionProvisionalLaunch } from '@/lib/agent-session/structured-agent-session-provisional-tab' import { getNewWorkspaceProjectGroupHostId } from '@/lib/new-workspace-project-options' import { useAppStore } from '@/store/index' -import { resolveExecutionHostAgentStartupShell } from '@/lib/execution-host-facts' +import { resolveExecutionHostAgentStartupShell } from '@/runtime/hosts/platform/execution-host-facts' import { buildFolderWorkspaceLinkedStartupPlan, getFolderWorkspaceAgentLaunchFact, diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/WorktreeList.lineage-agent-expansion-coupling.test.tsx b/src/renderer/src/components/sidebar/worktree-list/listing/WorktreeList.lineage-agent-expansion-coupling.test.tsx index 9cf6123c37b..082b64de180 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/WorktreeList.lineage-agent-expansion-coupling.test.tsx +++ b/src/renderer/src/components/sidebar/worktree-list/listing/WorktreeList.lineage-agent-expansion-coupling.test.tsx @@ -116,7 +116,7 @@ vi.mock('@/components/ui/dropdown-menu', () => ({ DropdownMenuTrigger: ({ children }: { children: ReactNode }) => <>{children} })) -vi.mock('@/lib/sidebar-worktree-activation', () => ({ +vi.mock('@/lib/workspace/activation/sidebar-worktree-activation', () => ({ activateWorktreeFromSidebar: mockStore.activateWorktreeFromSidebar })) diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-folder-path-statuses.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-folder-path-statuses.ts index 456af7efbf0..e4ecd5b7471 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/use-folder-path-statuses.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-folder-path-statuses.ts @@ -3,7 +3,7 @@ import { getFolderWorkspaceStatusRequestDependencies } from '@/store/folder-work import { useShallow } from 'zustand/react/shallow' import { useAppStore } from '@/store' import { selectFolderWorkspaces } from '@/store/workspaces/catalog/workspace-record-fields' -import { useFolderWorkspacePathStatusCacheExpiryTick } from '@/lib/folder-workspace-path-status-cache-expiry' +import { useFolderWorkspacePathStatusCacheExpiryTick } from '@/lib/workspace/paths/folder-workspace-path-status-cache-expiry' import type { FolderWorkspace } from '../../../../../../shared/folder-workspaces/folder-workspace-types' import type { ProjectGroup } from '../../../../../../shared/project-group-types' import type { Repo } from '../../../../../../shared/repo-types' diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/visible-worktree-activity-inputs.ts b/src/renderer/src/components/sidebar/worktree-list/listing/visible-worktree-activity-inputs.ts index 4de2fdf2a47..df576d451e9 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/visible-worktree-activity-inputs.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/visible-worktree-activity-inputs.ts @@ -3,7 +3,7 @@ import { structuredAgentSessionPaneKey } from '../../../../../../shared/agent-se import type { Tab } from '../../../../../../shared/tab-types' import type { TerminalTab } from '../../../../../../shared/workspace-layout/terminal-tab-types' import { getStructuredAgentSessionTabs } from '@/components/native-chat/session/status/structured-agent-session-tabs' -import { createWorktreeTabBucketProjection } from '@/lib/worktree-tab-bucket-projection' +import { createWorktreeTabBucketProjection } from '@/lib/workspace/tabs/worktree-tab-bucket-projection' import type { StructuredChatSleptAtByPaneKey } from '@/store/slices/agent-status/structured-chat-slept-at' export type TerminalActivityTab = Pick diff --git a/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.ts b/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.ts index 1c8e35481da..828c2323503 100644 --- a/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.ts +++ b/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.ts @@ -2,7 +2,7 @@ import { textFieldClaimsActionKey } from '@/lib/file-search-shortcut-policy' import { useCallback, useEffect, useRef, useState } from 'react' import type React from 'react' import { useAppStore } from '@/store' -import { activateWorktreeFromSidebar } from '@/lib/sidebar-worktree-activation' +import { activateWorktreeFromSidebar } from '@/lib/workspace/activation/sidebar-worktree-activation' import { focusRuntimeTerminalSurface } from '@/runtime/hosted-terminals/mounted-surfaces/mounted-terminal-tab-registry' import { hasVisibleOverlay } from '@/lib/visible-overlay' import type { ExecutionHostId } from '../../../../../../shared/execution-host' diff --git a/src/renderer/src/components/sidebar/worktree-list/rows/FolderPathStatusIndicator.tsx b/src/renderer/src/components/sidebar/worktree-list/rows/FolderPathStatusIndicator.tsx index 74d481ac3f8..c52fba40e65 100644 --- a/src/renderer/src/components/sidebar/worktree-list/rows/FolderPathStatusIndicator.tsx +++ b/src/renderer/src/components/sidebar/worktree-list/rows/FolderPathStatusIndicator.tsx @@ -5,7 +5,7 @@ import { cn } from '@/lib/utils' import { getFolderWorkspacePathStatusDescription, getFolderWorkspacePathStatusTitle -} from '@/lib/folder-workspace-path-status' +} from '@/lib/workspace/paths/folder-workspace-path-status' import { isConfirmedStaleFolderPathStatus, type FolderWorkspacePathStatus diff --git a/src/renderer/src/components/sidebar/worktree-list/rows/HostSectionHeaderMenu.tsx b/src/renderer/src/components/sidebar/worktree-list/rows/HostSectionHeaderMenu.tsx index 85c73e17ded..f0ed1eb77dc 100644 --- a/src/renderer/src/components/sidebar/worktree-list/rows/HostSectionHeaderMenu.tsx +++ b/src/renderer/src/components/sidebar/worktree-list/rows/HostSectionHeaderMenu.tsx @@ -32,7 +32,7 @@ import { parseExecutionHostId } from '../../../../../../shared/execution-host' import { runtimePairingRepairRoute } from '../../../../../../shared/remote-runtime/host-catalog/runtime-environments' import { describeRuntimeCompatBlock } from '@/lib/runtime-host-copy' -import { startWslHostAndReloadProjects } from '@/lib/wsl-host-user-start' +import { startWslHostAndReloadProjects } from '@/runtime/hosts/wsl/wsl-host-user-start' import { clearRuntimeCompatibilityCache } from '@/runtime/rpc/compatibility/runtime-compatibility-cache' import { unwrapRuntimeRpcResult } from '@/runtime/rpc/calls/runtime-rpc-result' import type { RuntimeStatus } from '../../../../../../shared/runtime-session-contracts' diff --git a/src/renderer/src/components/sidebar/worktree-list/rows/project-group-header-actions.tsx b/src/renderer/src/components/sidebar/worktree-list/rows/project-group-header-actions.tsx index 969bf699920..20daee4df19 100644 --- a/src/renderer/src/components/sidebar/worktree-list/rows/project-group-header-actions.tsx +++ b/src/renderer/src/components/sidebar/worktree-list/rows/project-group-header-actions.tsx @@ -10,7 +10,7 @@ import { } from '@/components/ui/dropdown-menu' import { cn } from '@/lib/utils' import { useTranslate } from '@/i18n/use-translate' -import { getFolderWorkspacePathStatusDescription } from '@/lib/folder-workspace-path-status' +import { getFolderWorkspacePathStatusDescription } from '@/lib/workspace/paths/folder-workspace-path-status' import type { ProjectGroup } from '../../../../../../shared/project-group-types' import type { FolderWorkspacePathStatus } from '../../../../../../shared/folder-workspaces/folder-workspace-path-status' import type { ExecutionHostId } from '../../../../../../shared/execution-host' diff --git a/src/renderer/src/components/sidebar/wsl-host-removal.ts b/src/renderer/src/components/sidebar/wsl-host-removal.ts index 4cfec2059b0..375f5271286 100644 --- a/src/renderer/src/components/sidebar/wsl-host-removal.ts +++ b/src/renderer/src/components/sidebar/wsl-host-removal.ts @@ -4,7 +4,7 @@ import type { WslHostServerStop } from '../../../../shared/wsl-host-types' import { translate } from '@/i18n/i18n' import { useAppStore } from '@/store' import { runEnclosingWorktreeRemoval } from '@/store/workspaces/selection/active-worktree-deselection-intent' -import { workspaceOwnerHostId } from '@/lib/workspace-row-owner-host' +import { workspaceOwnerHostId } from '@/lib/workspace/ownership/workspace-row-owner-host' import { wslHostStopReasonMessage } from './wsl-host-failure-text' /** Stop terminals/server, remove records and refresh hosts; report anything still running that keeps the distro alive. */ diff --git a/src/renderer/src/components/status-bar/ClaudeSwitcherMenu.tsx b/src/renderer/src/components/status-bar/ClaudeSwitcherMenu.tsx index 9ab1d2ffce3..cad014d605c 100644 --- a/src/renderer/src/components/status-bar/ClaudeSwitcherMenu.tsx +++ b/src/renderer/src/components/status-bar/ClaudeSwitcherMenu.tsx @@ -2,7 +2,7 @@ import type React from 'react' import type { ProviderRateLimits } from '../../../../shared/rate-limit-types' import type { ChatAccountAction } from './ProviderAccountChatButton' import { useAppStore } from '../../store' -import { defaultScopeHost } from '@/lib/default-creation-host' +import { defaultScopeHost } from '@/runtime/hosts/selection/default-creation-host' import { useActiveAccountOwner } from '@/runtime/provider-accounts/ownership/use-active-account-owner' import { ClaudeSwitcherForOwner } from './ClaudeSwitcherForOwner' import { getProviderAccountsOwnerKey } from '@/runtime/provider-accounts/observations/runtime-provider-accounts-client' diff --git a/src/renderer/src/components/status-bar/use-codex-switcher-controller.ts b/src/renderer/src/components/status-bar/use-codex-switcher-controller.ts index e747ab08bfd..e567bc66672 100644 --- a/src/renderer/src/components/status-bar/use-codex-switcher-controller.ts +++ b/src/renderer/src/components/status-bar/use-codex-switcher-controller.ts @@ -2,7 +2,7 @@ import { useCallback, useEffect, useRef, useState } from 'react' import type { CodexRateLimitAccountsState } from '../../../../shared/managed-account-types' import type { ProviderRateLimits } from '../../../../shared/rate-limit-types' import { useAppStore } from '../../store' -import { defaultScopeHost } from '@/lib/default-creation-host' +import { defaultScopeHost } from '@/runtime/hosts/selection/default-creation-host' import { useActiveAccountOwner } from '@/runtime/provider-accounts/ownership/use-active-account-owner' import { runtimeTargetEnvironmentId } from '@/runtime/rpc/targets/runtime-client-target' import { diff --git a/src/renderer/src/components/status-bar/use-resource-usage-actions.ts b/src/renderer/src/components/status-bar/use-resource-usage-actions.ts index d0325830e54..36d632d77fe 100644 --- a/src/renderer/src/components/status-bar/use-resource-usage-actions.ts +++ b/src/renderer/src/components/status-bar/use-resource-usage-actions.ts @@ -10,7 +10,7 @@ import { activateAndRevealWorkspace, activateAndRevealWorktree } from '@/lib/workspace/activation/worktree-activation' -import { activateTabAndFocusPane } from '@/lib/activate-tab-and-focus-pane' +import { activateTabAndFocusPane } from '@/lib/workspace/tabs/activate-tab-and-focus-pane' import { translate } from '@/i18n/i18n' import { useAppStore } from '../../store' import type { AppState } from '../../store/types' diff --git a/src/renderer/src/components/status-bar/use-resource-usage-derived-model.ts b/src/renderer/src/components/status-bar/use-resource-usage-derived-model.ts index a0e99516c21..7975ba6e01d 100644 --- a/src/renderer/src/components/status-bar/use-resource-usage-derived-model.ts +++ b/src/renderer/src/components/status-bar/use-resource-usage-derived-model.ts @@ -21,7 +21,10 @@ import { getResourceMemoryMetricCopy } from './resource-memory-metric-copy' import { formatMemory } from './resource-usage-metrics' -import { findAmbiguousWorktreeIds, findDuplicateIds } from '../../lib/unified-tab-host-ownership' +import { + findAmbiguousWorktreeIds, + findDuplicateIds +} from '../../lib/workspace/ownership/unified-tab-host-ownership' import { useTranslate } from '../../i18n/use-translate' export function useResourceUsageDerivedModel({ diff --git a/src/renderer/src/components/status-bar/workspace-space-visit-activity.ts b/src/renderer/src/components/status-bar/workspace-space-visit-activity.ts index b27ba466d8d..7d82df47b0d 100644 --- a/src/renderer/src/components/status-bar/workspace-space-visit-activity.ts +++ b/src/renderer/src/components/status-bar/workspace-space-visit-activity.ts @@ -1,6 +1,6 @@ import type { WorkspaceSpaceWorktree } from '../../../../shared/workspace-disk-space/workspace-space-types' import { getWorkspaceLastActiveAt } from '../../../../shared/workspace-last-active' -import { getWorktreeVisitTimestamp } from '@/lib/worktree-visit-recency' +import { getWorktreeVisitTimestamp } from '@/lib/workspace/activation/worktree-visit-recency' /** Rows with visits counted as activity (switch on; `visits` is undefined otherwise). */ export function withWorkspaceSpaceVisitActivity( diff --git a/src/renderer/src/components/tab-bar/EditorFileTab.tsx b/src/renderer/src/components/tab-bar/EditorFileTab.tsx index dafa32cb307..77d856bc48d 100644 --- a/src/renderer/src/components/tab-bar/EditorFileTab.tsx +++ b/src/renderer/src/components/tab-bar/EditorFileTab.tsx @@ -13,7 +13,7 @@ import { isImeCompositionKeyDown } from '@/lib/ime-composition-keyboard-event' import { detectLanguage } from '@/lib/language-detect' import { FileTypeIcon } from '@/components/FileTypeIcon' import { useWorktreeById } from '@/store/workspaces/selection/use-selected-worktree' -import { getOpenFileExecutionHostId } from '@/lib/unified-tab-host-ownership' +import { getOpenFileExecutionHostId } from '@/lib/workspace/ownership/unified-tab-host-ownership' import { resolveReviewRepository } from '@/lib/review-owner' import { useAppStore } from '@/store' import { STATUS_COLORS } from '../../lib/git-path-decoration' diff --git a/src/renderer/src/components/tab-bar/agent-menu-launch-facts.ts b/src/renderer/src/components/tab-bar/agent-menu-launch-facts.ts index 847c48c1e85..96895e847fe 100644 --- a/src/renderer/src/components/tab-bar/agent-menu-launch-facts.ts +++ b/src/renderer/src/components/tab-bar/agent-menu-launch-facts.ts @@ -6,7 +6,7 @@ import { resolveRepoExecutionHostTarget, resolveWorktreeResourceTarget, type ExecutionHostTarget -} from '@/lib/execution-host-facts' +} from '@/runtime/hosts/platform/execution-host-facts' import type { WorktreeRuntimeOwnerState } from '@/lib/workspace/ownership/worktree-runtime-owner-state' import { getIndexedReposById } from '@/store/repos/repository-catalog-index' import { diff --git a/src/renderer/src/components/tab-bar/open-tab-search-entries.ts b/src/renderer/src/components/tab-bar/open-tab-search-entries.ts index d9df73c274f..50c685a5b32 100644 --- a/src/renderer/src/components/tab-bar/open-tab-search-entries.ts +++ b/src/renderer/src/components/tab-bar/open-tab-search-entries.ts @@ -19,7 +19,7 @@ import { getWorktreeExecutionHostId, type ExecutionHostId } from '../../../../shared/execution-host' -import { getPaletteOwnershipWorktreeIds } from '@/lib/unified-tab-host-ownership' +import { getPaletteOwnershipWorktreeIds } from '@/lib/workspace/ownership/unified-tab-host-ownership' import type { StructuredChatTabNames } from '@/runtime/native-chat/naming/structured-chat-tab-name' import type { Translate } from '@/i18n/use-translate' diff --git a/src/renderer/src/components/tab-bar/open-tab-search.ts b/src/renderer/src/components/tab-bar/open-tab-search.ts index 8a7a00f4927..e58668df704 100644 --- a/src/renderer/src/components/tab-bar/open-tab-search.ts +++ b/src/renderer/src/components/tab-bar/open-tab-search.ts @@ -21,7 +21,7 @@ import { type SearchableSimulatorTab, type SimulatorPaletteSearchResult } from '@/lib/simulator-palette-search' -import { getUnifiedTabPaletteExecutionHostId } from '@/lib/unified-tab-host-ownership' +import { getUnifiedTabPaletteExecutionHostId } from '@/lib/workspace/ownership/unified-tab-host-ownership' import type { TerminalAgent } from '../../../../shared/agent-status/identity/terminal-agent' import '@/lib/workspace/search/tabs/workspace-tab-search-types' import { searchWorkspaceTabs } from '@/lib/workspace/search/tabs/workspace-tab-palette-results' diff --git a/src/renderer/src/components/tab-bar/tab-bar-layout-owner-props.test.ts b/src/renderer/src/components/tab-bar/tab-bar-layout-owner-props.test.ts index 3112a928692..e68d10f94d2 100644 --- a/src/renderer/src/components/tab-bar/tab-bar-layout-owner-props.test.ts +++ b/src/renderer/src/components/tab-bar/tab-bar-layout-owner-props.test.ts @@ -20,7 +20,7 @@ vi.mock('@/store', () => ({ }) } })) -vi.mock('@/lib/resolve-owner', () => ({ +vi.mock('@/lib/workspace/ownership/resolve-owner', () => ({ runtimeEnvironmentIdUnlessTwin: () => mocks.ownerEnvironmentId })) diff --git a/src/renderer/src/components/tab-bar/tab-create-entry-local-path.ts b/src/renderer/src/components/tab-bar/tab-create-entry-local-path.ts index 8409d8e3030..9c2a6be4006 100644 --- a/src/renderer/src/components/tab-bar/tab-create-entry-local-path.ts +++ b/src/renderer/src/components/tab-bar/tab-create-entry-local-path.ts @@ -1,5 +1,5 @@ import { getEditorFileOperationContext } from '@/lib/editor-file-operation-owner' -import { getFolderWorkspaceConnectionId } from '@/lib/folder-workspace-connection' +import { getFolderWorkspaceConnectionId } from '@/lib/workspace/ownership/folder-workspace-connection' import { getLocalPathOpenOwnerForRoute, isLocalPathOpenBlocked } from '@/lib/local-path-open-guard' import { getResolvedExecutionHostIdForWorktree } from '@/lib/resolved-worktree-execution-host' import type { RuntimeFileOperationArgs } from '@/runtime/files/runtime-file-client-types' diff --git a/src/renderer/src/components/tab-bar/use-tab-bar-item-actions.ts b/src/renderer/src/components/tab-bar/use-tab-bar-item-actions.ts index 1a78071df88..c6454250f75 100644 --- a/src/renderer/src/components/tab-bar/use-tab-bar-item-actions.ts +++ b/src/renderer/src/components/tab-bar/use-tab-bar-item-actions.ts @@ -1,6 +1,6 @@ import { useLayoutEffect, useMemo, useRef } from 'react' import { clearClientHostedBrowserRowSelection } from '@/lib/pane-manager/client-hosted-browser-row-state' -import { noteUserWorkspaceSwitch } from '@/lib/workspace-switch-user-act' +import { noteUserWorkspaceSwitch } from '@/lib/workspace/activation/workspace-switch-user-act' import { useAppStore } from '@/store' import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch' import type { TabBarItem } from './tab-bar-item-model' diff --git a/src/renderer/src/components/tab-bar/use-tab-bar-runtime-model.ts b/src/renderer/src/components/tab-bar/use-tab-bar-runtime-model.ts index fe59f53fd6b..a55426ec7c7 100644 --- a/src/renderer/src/components/tab-bar/use-tab-bar-runtime-model.ts +++ b/src/renderer/src/components/tab-bar/use-tab-bar-runtime-model.ts @@ -8,7 +8,8 @@ import { useAppStore } from '../../store' import { buildStatusMap } from '../../lib/git-path-decoration' import type { AgentDetectionTarget } from '@/hooks/useDetectedAgents' import { useAgentDetectionTargetForWorktree } from '@/hooks/useAgentDetectionTarget' -import { getConnectionIdFromState } from '@/lib/connection-context' +import '@/lib/workspace/ownership/connection-context' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context' import { isNativeChatTranscriptLocalReadable } from '../../../../shared/native-chat/transcript/native-chat-transcript-readability' import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner' diff --git a/src/renderer/src/components/task-page/jira/IssueAssigneeField.tsx b/src/renderer/src/components/task-page/jira/IssueAssigneeField.tsx index d126d53b1f2..051628eab53 100644 --- a/src/renderer/src/components/task-page/jira/IssueAssigneeField.tsx +++ b/src/renderer/src/components/task-page/jira/IssueAssigneeField.tsx @@ -6,7 +6,7 @@ import { hasJiraAssigneeCreateField } from '@/components/task-page/jira/task-pag import { getJiraProjectSelectionKey } from '@/components/task-page/jira/task-page-jira-project-selection' import { jiraListAssignableUsersForProject } from '@/runtime/jira/runtime-jira-user-fields-client' import { useTranslate } from '@/i18n/use-translate' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' export function TaskPageJiraIssueAssigneeField({ model diff --git a/src/renderer/src/components/task-page/jira/IssueUserField.tsx b/src/renderer/src/components/task-page/jira/IssueUserField.tsx index f6f8a07b962..4243aa53873 100644 --- a/src/renderer/src/components/task-page/jira/IssueUserField.tsx +++ b/src/renderer/src/components/task-page/jira/IssueUserField.tsx @@ -1,6 +1,6 @@ import { useState } from 'react' import { JiraUserPicker } from '@/components/jira-user-picker' -import type { RowLessSource as RuntimeJiraSettings } from '@/lib/default-creation-host' +import type { RowLessSource as RuntimeJiraSettings } from '@/runtime/hosts/selection/default-creation-host' import type { JiraUser } from '../../../../../shared/jira/jira-types' export function TaskPageJiraIssueUserField({ diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-status-order.ts b/src/renderer/src/components/task-page/jira/task-page-jira-status-order.ts index bd5ce28efd1..adef776958e 100644 --- a/src/renderer/src/components/task-page/jira/task-page-jira-status-order.ts +++ b/src/renderer/src/components/task-page/jira/task-page-jira-status-order.ts @@ -3,7 +3,7 @@ import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-t import { runtimeTargetEnvironmentId } from '@/runtime/rpc/targets/runtime-client-target' import { getEnvironmentRuntimeContextKey } from '@/runtime/hosts/observations/provider-runtime-context' import { jiraGetProjectStatusOrder } from '@/runtime/jira/runtime-jira-client' -import type { RowLessSource as RuntimeJiraSettings } from '@/lib/default-creation-host' +import type { RowLessSource as RuntimeJiraSettings } from '@/runtime/hosts/selection/default-creation-host' import { createMetadataRequestStore, loadMetadata } from '@/hooks/metadata-request-cache' export type TaskPageJiraProjectScope = { diff --git a/src/renderer/src/components/task-page/jira/use-task-page-jira-creation-metadata.ts b/src/renderer/src/components/task-page/jira/use-task-page-jira-creation-metadata.ts index 7eced4b2360..588c6b5870c 100644 --- a/src/renderer/src/components/task-page/jira/use-task-page-jira-creation-metadata.ts +++ b/src/renderer/src/components/task-page/jira/use-task-page-jira-creation-metadata.ts @@ -3,7 +3,7 @@ import { useEffect } from 'react' import { jiraListIssueTypes, jiraListCreateFields } from '@/runtime/jira/runtime-jira-client' import { toast } from 'sonner' import { translate } from '@/i18n/i18n' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' export function useTaskPageJiraCreationMetadata(model: TaskPageJiraCreationStateModel) { const { settings, diff --git a/src/renderer/src/components/task-page/jira/use-task-page-jira-issue-creation.ts b/src/renderer/src/components/task-page/jira/use-task-page-jira-issue-creation.ts index f5ccbff3a5c..6439bbc1b56 100644 --- a/src/renderer/src/components/task-page/jira/use-task-page-jira-issue-creation.ts +++ b/src/renderer/src/components/task-page/jira/use-task-page-jira-issue-creation.ts @@ -9,7 +9,7 @@ import { jiraCreateIssue } from '@/runtime/jira/runtime-jira-user-fields-client' import { jiraGetIssue } from '@/runtime/jira/runtime-jira-client' import { toast } from 'sonner' import { translate } from '@/i18n/i18n' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' import { openAppHttpLink } from '@/lib/browser/navigation/app-http-link-open' export function useTaskPageJiraIssueCreation(model: TaskPageLinearIssueCreationModel) { const { diff --git a/src/renderer/src/components/task-page/linear/Filters.tsx b/src/renderer/src/components/task-page/linear/Filters.tsx index 3fe11ebbd85..2477efea984 100644 --- a/src/renderer/src/components/task-page/linear/Filters.tsx +++ b/src/renderer/src/components/task-page/linear/Filters.tsx @@ -8,7 +8,7 @@ import { Plus, LoaderCircle, RefreshCw, Search, X } from 'lucide-react' import LinearIssueAttributeFilterDropdowns from '@/components/linear-issue-attribute-filter-dropdowns' import { Input } from '@/components/ui/input' import { shouldSuppressEnterSubmit } from '@/lib/new-workspace-enter-guard' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' export function TaskPageLinearFilters({ model }: { diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-committed-publication.test.tsx b/src/renderer/src/components/task-page/linear/task-page-linear-committed-publication.test.tsx index c481a58e57f..457929b643b 100644 --- a/src/renderer/src/components/task-page/linear/task-page-linear-committed-publication.test.tsx +++ b/src/renderer/src/components/task-page/linear/task-page-linear-committed-publication.test.tsx @@ -10,7 +10,7 @@ import { reads as issueReadRegistry } from '@/store/slices/linear/linear-issue-r import { pendingLinearIssueWrites } from '@/store/slices/linear/linear-issue-publication' import { getLinearSourceScope } from '@/store/slices/linear/linear-slice-scope' import { writeLinearIssue } from '@/lib/work-items/linear/linear-issue-write' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' import { useLinearIssueWorkspaceDetail } from '../../linear-issue-workspace-detail-state' import type { LinearIssue } from '../../../../../shared/linear/issue-types' import { expect, it } from 'vitest' diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-issue-model.tsx b/src/renderer/src/components/task-page/linear/task-page-linear-issue-model.tsx index 95e2c8a3b58..093c68145f2 100644 --- a/src/renderer/src/components/task-page/linear/task-page-linear-issue-model.tsx +++ b/src/renderer/src/components/task-page/linear/task-page-linear-issue-model.tsx @@ -22,7 +22,7 @@ import { getLinearStateMarkerStyle } from '@/components/linear-state-pill-style' import { LoaderCircle, ChevronDown } from 'lucide-react' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' export type LinearProjectTab = 'overview' | 'issues' export type LinearGroupSection = { key: string diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-refresh-entry.test.tsx b/src/renderer/src/components/task-page/linear/task-page-linear-refresh-entry.test.tsx index 85769e3dcc3..b4edb49b54f 100644 --- a/src/renderer/src/components/task-page/linear/task-page-linear-refresh-entry.test.tsx +++ b/src/renderer/src/components/task-page/linear/task-page-linear-refresh-entry.test.tsx @@ -3,7 +3,7 @@ import { reads, task, store, source } from './task-page-linear-refresh-test-fixt import { getLinearSourceScope } from '@/store/slices/linear/linear-slice-scope' import { writeLinearIssue } from '@/lib/work-items/linear/linear-issue-write' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' import { useLinearIssueWorkspaceDetail } from '../../linear-issue-workspace-detail-state' import type { LinearIssue } from '../../../../../shared/linear/issue-types' diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-refresh-lifecycle.test.tsx b/src/renderer/src/components/task-page/linear/task-page-linear-refresh-lifecycle.test.tsx index 2cef76ea421..71e3e35a17d 100644 --- a/src/renderer/src/components/task-page/linear/task-page-linear-refresh-lifecycle.test.tsx +++ b/src/renderer/src/components/task-page/linear/task-page-linear-refresh-lifecycle.test.tsx @@ -13,7 +13,7 @@ import { } from '@/store/slices/linear/linear-issue-publication' import { writeLinearIssue } from '@/lib/work-items/linear/linear-issue-write' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' import { getLinearSourceScope } from '@/store/slices/linear/linear-slice-scope' import type { LinearIssue } from '../../../../../shared/linear/issue-types' diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-refresh-test-fixtures.tsx b/src/renderer/src/components/task-page/linear/task-page-linear-refresh-test-fixtures.tsx index da29c5583ff..b69852a36fc 100644 --- a/src/renderer/src/components/task-page/linear/task-page-linear-refresh-test-fixtures.tsx +++ b/src/renderer/src/components/task-page/linear/task-page-linear-refresh-test-fixtures.tsx @@ -4,7 +4,7 @@ import type { LinearEditState } from '../../linear-item-drawer-types' import { useCallback } from 'react' import { useLinearIssueResult } from '@/hooks/linear-issue-committed-state' import { getLinearSourceScope } from '@/store/slices/linear/linear-slice-scope' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' import { LinearIssueTextEditor } from '../../LinearIssueTextEditor' import { useLinearIssueEditController } from '../../linear-item-drawer-edit-controller' import type { LinearIssue } from '../../../../../shared/linear/issue-types' diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-refresh-writers.test.tsx b/src/renderer/src/components/task-page/linear/task-page-linear-refresh-writers.test.tsx index f2371d4bbb2..6bc0262d10a 100644 --- a/src/renderer/src/components/task-page/linear/task-page-linear-refresh-writers.test.tsx +++ b/src/renderer/src/components/task-page/linear/task-page-linear-refresh-writers.test.tsx @@ -5,7 +5,7 @@ import { LinearIssueProjectSelector } from '../../linear-issue-project-selector' import { pendingLinearIssueWrites } from '@/store/slices/linear/linear-issue-publication' import { writeLinearIssue } from '@/lib/work-items/linear/linear-issue-write' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' import LinearItemDrawer from '../../LinearItemDrawer' diff --git a/src/renderer/src/components/task-page/linear/use-task-page-linear-board.ts b/src/renderer/src/components/task-page/linear/use-task-page-linear-board.ts index df3f4702e53..f3146f40ade 100644 --- a/src/renderer/src/components/task-page/linear/use-task-page-linear-board.ts +++ b/src/renderer/src/components/task-page/linear/use-task-page-linear-board.ts @@ -20,7 +20,7 @@ import { findLinearWorkflowStateForStatus, getLinearStatusSectionState } from './task-page-linear-issue-model' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' export function useTaskPageLinearBoard(model: TaskPageLinearListProjectionModel) { const { settings, diff --git a/src/renderer/src/components/task-page/linear/use-task-page-linear-context-state.ts b/src/renderer/src/components/task-page/linear/use-task-page-linear-context-state.ts index ba115e48652..70465b16ad3 100644 --- a/src/renderer/src/components/task-page/linear/use-task-page-linear-context-state.ts +++ b/src/renderer/src/components/task-page/linear/use-task-page-linear-context-state.ts @@ -1,6 +1,6 @@ import { useLinearIssueResult } from '@/hooks/linear-issue-committed-state' import { getLinearSourceScope } from '@/store/slices/linear/linear-slice-scope' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' import { useAppStore } from '@/store' import type { TaskPageLinearViewStatePreludeModel } from './use-task-page-linear-view-state' import { useState, useRef } from 'react' diff --git a/src/renderer/src/components/task-page/linear/use-task-page-linear-creation-state.ts b/src/renderer/src/components/task-page/linear/use-task-page-linear-creation-state.ts index 31e171afcbc..8780dbe2cf9 100644 --- a/src/renderer/src/components/task-page/linear/use-task-page-linear-creation-state.ts +++ b/src/renderer/src/components/task-page/linear/use-task-page-linear-creation-state.ts @@ -13,7 +13,7 @@ import { import { useNewLinearIssueProjects } from '../../use-new-linear-issue-projects' import { useContextualTour } from '@/components/contextual-tours/use-contextual-tour' import { writeNewLinearIssueDraft, writeNewLinearProjectDraft } from '../task-page-draft-storage' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' type FormAction = (value: LinearIssueForm, target: string) => LinearIssueForm export function useLinearIssueCreationForm( runtime: string, diff --git a/src/renderer/src/components/task-page/linear/use-task-page-linear-issue-creation.ts b/src/renderer/src/components/task-page/linear/use-task-page-linear-issue-creation.ts index bb0af0b8ff2..cc016965807 100644 --- a/src/renderer/src/components/task-page/linear/use-task-page-linear-issue-creation.ts +++ b/src/renderer/src/components/task-page/linear/use-task-page-linear-issue-creation.ts @@ -7,7 +7,7 @@ import { toast } from 'sonner' import { translate } from '@/i18n/i18n' import { linearCreateIssue } from '@/runtime/linear/runtime-linear-issue-client' import { useAppStore } from '@/store' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' import { openAppHttpLink } from '@/lib/browser/navigation/app-http-link-open' export function useTaskPageLinearIssueCreation(model: TaskPageLinearProjectCreationModel) { const { diff --git a/src/renderer/src/components/task-page/linear/use-task-page-linear-project-creation.ts b/src/renderer/src/components/task-page/linear/use-task-page-linear-project-creation.ts index 4992c0eb8fa..11de9eecb77 100644 --- a/src/renderer/src/components/task-page/linear/use-task-page-linear-project-creation.ts +++ b/src/renderer/src/components/task-page/linear/use-task-page-linear-project-creation.ts @@ -4,7 +4,7 @@ import { useCallback } from 'react' import { linearCreateProject } from '@/runtime/linear/runtime-linear-project-client' import { toast } from 'sonner' import { translate } from '@/i18n/i18n' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' import { openAppHttpLink } from '@/lib/browser/navigation/app-http-link-open' export function useTaskPageLinearProjectCreation(model: TaskPageGitHubIssueCreationModel) { const { diff --git a/src/renderer/src/components/task-page/linear/use-task-page-linear-view-state.ts b/src/renderer/src/components/task-page/linear/use-task-page-linear-view-state.ts index 170a9ea0606..20835165110 100644 --- a/src/renderer/src/components/task-page/linear/use-task-page-linear-view-state.ts +++ b/src/renderer/src/components/task-page/linear/use-task-page-linear-view-state.ts @@ -1,6 +1,6 @@ import { useLinearIssueResult } from '@/hooks/linear-issue-committed-state' import { getLinearSourceScope } from '@/store/slices/linear/linear-slice-scope' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' import { useAppStore } from '@/store' import type { TaskPageDetailRoutingModel } from '../use-task-page-detail-routing' import { useState, useMemo, useRef, useEffect } from 'react' diff --git a/src/renderer/src/components/task-page/use-task-page-detail-routing.ts b/src/renderer/src/components/task-page/use-task-page-detail-routing.ts index d750148f308..c54ba66e5a3 100644 --- a/src/renderer/src/components/task-page/use-task-page-detail-routing.ts +++ b/src/renderer/src/components/task-page/use-task-page-detail-routing.ts @@ -4,7 +4,7 @@ import { projectLinearIssue, registerLinearIssueConsumer } from '@/store/slices/linear/linear-issue-write-publication' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' import type { TaskPageGitHubIssueDraftModel } from './github/use-task-page-github-issue-draft' import { useState, useMemo, useCallback, useLayoutEffect, useRef } from 'react' import type { LinearIssue } from '../../../../shared/linear/issue-types' diff --git a/src/renderer/src/components/task-page/use-task-page-provider-metadata.ts b/src/renderer/src/components/task-page/use-task-page-provider-metadata.ts index 856408e9f70..5e89de776f3 100644 --- a/src/renderer/src/components/task-page/use-task-page-provider-metadata.ts +++ b/src/renderer/src/components/task-page/use-task-page-provider-metadata.ts @@ -3,7 +3,7 @@ import { useState, useEffect } from 'react' import type { LinearTeam } from '../../../../shared/linear/workspace-types' import type { JiraProject } from '../../../../shared/jira/jira-types' import { jiraListProjects } from '@/runtime/jira/runtime-jira-client' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' export function useTaskPageProviderMetadata(model: TaskPageResumeRestorationModel) { const { settings, diff --git a/src/renderer/src/components/terminal-pane/account-restart/pane-ownership/codex-restart-main-pane.ts b/src/renderer/src/components/terminal-pane/account-restart/pane-ownership/codex-restart-main-pane.ts index c5ab4e1e7dd..9891ff64876 100644 --- a/src/renderer/src/components/terminal-pane/account-restart/pane-ownership/codex-restart-main-pane.ts +++ b/src/renderer/src/components/terminal-pane/account-restart/pane-ownership/codex-restart-main-pane.ts @@ -1,5 +1,5 @@ // Main-owned restarts require an existing main pane and use its frame binding; the window must not invent a tree. -import { runtimeEnvironmentIdUnlessTwin } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' import { layoutFrameTerminalTab } from '@/runtime/workspace-layout/frames/layout-frame-terminal-panes' import type { AppState } from '@/store/types' import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch' diff --git a/src/renderer/src/components/terminal-pane/errors/TerminalErrorToast.tsx b/src/renderer/src/components/terminal-pane/errors/TerminalErrorToast.tsx index fb167b9dd0c..fcf71ad9609 100644 --- a/src/renderer/src/components/terminal-pane/errors/TerminalErrorToast.tsx +++ b/src/renderer/src/components/terminal-pane/errors/TerminalErrorToast.tsx @@ -16,7 +16,7 @@ import { failedSpawnEnvironmentFooter, withoutTerminalSpawnIssueRequest } from './terminal-spawn-error-display' -import { isWslDistroHoldText } from '@/lib/wsl-distro-hold-copy' +import { isWslDistroHoldText } from '@/runtime/hosts/wsl/wsl-distro-hold-copy' import { isSshSignInRequiredTerminalError } from './terminal-ssh-sign-in-error' export function TerminalErrorToast({ diff --git a/src/renderer/src/components/terminal-pane/errors/terminal-error-display.ts b/src/renderer/src/components/terminal-pane/errors/terminal-error-display.ts index ac4a1c3bb96..a32726e614d 100644 --- a/src/renderer/src/components/terminal-pane/errors/terminal-error-display.ts +++ b/src/renderer/src/components/terminal-pane/errors/terminal-error-display.ts @@ -4,11 +4,11 @@ import type { Translate } from '../../../i18n/use-translate' import { humanizeFolderWorkspacePathErrors, isFolderWorkspacePathError -} from '../../../lib/folder-workspace-path-status' +} from '../../../lib/workspace/paths/folder-workspace-path-status' import { agentLaunchErrorText } from '../launch-outcome/agent-launch-pane-notice-text' import { stripClientEnvironmentFooter } from '../../../../../shared/client-environment-info' import { localizeTerminalSpawnHints } from './terminal-spawn-error-display' -import { localizeWslDistroHoldText } from '../../../lib/wsl-distro-hold-copy' +import { localizeWslDistroHoldText } from '../../../runtime/hosts/wsl/wsl-distro-hold-copy' import { describeSshSignInRequiredTerminalError, isSshSignInRequiredTerminalError diff --git a/src/renderer/src/components/terminal-pane/host-files/terminal-file-path-mapping.ts b/src/renderer/src/components/terminal-pane/host-files/terminal-file-path-mapping.ts index 5030da9bd36..a356e578e09 100644 --- a/src/renderer/src/components/terminal-pane/host-files/terminal-file-path-mapping.ts +++ b/src/renderer/src/components/terminal-pane/host-files/terminal-file-path-mapping.ts @@ -1,10 +1,10 @@ import { useAppStore } from '@/store/index' -import { getConnectionId } from '@/lib/connection-context' -import { resolveWorktreeOperationRouteResult } from '@/lib/worktree-operation-route' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' +import { resolveWorktreeOperationRouteResult } from '@/lib/workspace/ownership/worktree-operation-route' import { buildWorkspaceFileContext, canClientOsOpenWorkspaceFile -} from '@/lib/workspace-file-host-routing' +} from '@/runtime/files/workspace-file-host-routing' import { getRuntimeTargetForWorktreeOwner } from '@/lib/file-owner-runtime-target' import type { RuntimeFileOperationArgs } from '@/runtime/files/runtime-file-client-types' import { parseExecutionHostId } from '../../../../../shared/execution-host' diff --git a/src/renderer/src/components/terminal-pane/host-state/terminal-pane-host-state.ts b/src/renderer/src/components/terminal-pane/host-state/terminal-pane-host-state.ts index 835578bac4e..c3917ded7f2 100644 --- a/src/renderer/src/components/terminal-pane/host-state/terminal-pane-host-state.ts +++ b/src/renderer/src/components/terminal-pane/host-state/terminal-pane-host-state.ts @@ -1,6 +1,6 @@ import type { AppState } from '@/store/types' import { sshConnectFailureText } from '@/ssh/ssh-host-server-status-copy' -import { getConnectionIdFromState } from '@/lib/connection-owner-resolution' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { resolveWorktreeHostConnection, type WorktreeHostConnection diff --git a/src/renderer/src/components/terminal-pane/host-state/terminal-pane-local-windows-conpty.ts b/src/renderer/src/components/terminal-pane/host-state/terminal-pane-local-windows-conpty.ts index bed6fdf0355..a534a80150d 100644 --- a/src/renderer/src/components/terminal-pane/host-state/terminal-pane-local-windows-conpty.ts +++ b/src/renderer/src/components/terminal-pane/host-state/terminal-pane-local-windows-conpty.ts @@ -1,7 +1,7 @@ import type { ExecutionHostId } from '../../../../../shared/execution-host' import { LOCAL_EXECUTION_HOST_ID } from '../../../../../shared/execution-host' import { isRemoteRuntimePtyId } from '../../../../../shared/remote-runtime/remote-runtime-pty-id' -import { getConnectionIdFromState } from '@/lib/connection-owner-resolution' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner' import type { WorktreeRuntimeOwnerState } from '@/lib/workspace/ownership/worktree-runtime-owner-state' import { isLocalNativeWindowsConpty } from '@/lib/pane-manager/windows-pty-compatibility' diff --git a/src/renderer/src/components/terminal-pane/host-state/terminal-pane-owner-context.ts b/src/renderer/src/components/terminal-pane/host-state/terminal-pane-owner-context.ts index e474541963d..ebd1e9ff0e1 100644 --- a/src/renderer/src/components/terminal-pane/host-state/terminal-pane-owner-context.ts +++ b/src/renderer/src/components/terminal-pane/host-state/terminal-pane-owner-context.ts @@ -1,9 +1,9 @@ import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields' import type { AppState } from '@/store/types' import { getIndexedWorktreeMap } from '@/store/slices/worktrees/listing/worktree-catalog-index' -import { getConnectionIdFromState } from '@/lib/connection-owner-resolution' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import type { TerminalWorktreeRoute } from '@/lib/terminal-worktree-route' -import { resolveWorktreeOperationRouteForHost } from '@/lib/worktree-operation-route' +import { resolveWorktreeOperationRouteForHost } from '@/lib/workspace/ownership/worktree-operation-route' import { getRemoteRuntimePtyEnvironmentId } from '@/runtime/hosted-terminals/identity/remote-runtime-pty-owner' import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../shared/constants' import { isEphemeralSetupTerminalWorktreeId } from '../../../../../shared/ephemeral-setup-terminal-worktree-id' diff --git a/src/renderer/src/components/terminal-pane/input/file-drop/terminal-drop-handler.ts b/src/renderer/src/components/terminal-pane/input/file-drop/terminal-drop-handler.ts index 1564301c1b6..8ebca98bc28 100644 --- a/src/renderer/src/components/terminal-pane/input/file-drop/terminal-drop-handler.ts +++ b/src/renderer/src/components/terminal-pane/input/file-drop/terminal-drop-handler.ts @@ -1,6 +1,6 @@ import { toast } from 'sonner' import { translate } from '@/i18n/i18n' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { parseExecutionHostId, toRuntimeExecutionHostId diff --git a/src/renderer/src/components/terminal-pane/input/file-drop/terminal-drop-source-owner.test.ts b/src/renderer/src/components/terminal-pane/input/file-drop/terminal-drop-source-owner.test.ts index 6b7b7d2a0f9..dbe98c9031c 100644 --- a/src/renderer/src/components/terminal-pane/input/file-drop/terminal-drop-source-owner.test.ts +++ b/src/renderer/src/components/terminal-pane/input/file-drop/terminal-drop-source-owner.test.ts @@ -15,7 +15,7 @@ const mocks = vi.hoisted(() => { }) vi.mock('@/store/index', () => ({ useAppStore: { getState: () => mocks.state } })) vi.mock('sonner', () => ({ toast: { error: mocks.error } })) -vi.mock('@/lib/connection-context', () => ({ getConnectionId: () => null })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: () => null })) vi.mock('./terminal-drop-worktree-path', () => ({ resolveTerminalDropWorktreePath: () => '/repo' })) vi.mock('./terminal-drop-shell', () => ({ resolveTerminalDropTargetShell: () => ({ kind: 'posix' }) diff --git a/src/renderer/src/components/terminal-pane/input/file-drop/terminal-drop-worktree-path.ts b/src/renderer/src/components/terminal-pane/input/file-drop/terminal-drop-worktree-path.ts index 38f513188ae..e08ea3484e7 100644 --- a/src/renderer/src/components/terminal-pane/input/file-drop/terminal-drop-worktree-path.ts +++ b/src/renderer/src/components/terminal-pane/input/file-drop/terminal-drop-worktree-path.ts @@ -6,7 +6,7 @@ import { type ExecutionHostId } from '../../../../../../shared/execution-host' import { DROP_STAGING_RELATIVE_DIR } from '../../../../../../shared/drop-staging-ignore' -import { resolveExactWorktreeRoute } from '@/lib/worktree-owner-route' +import { resolveExactWorktreeRoute } from '@/lib/workspace/ownership/worktree-owner-route' import { isTerminalDropWindowsPathLike } from '../../../../../../shared/image-path-paste' export function resolveTerminalDropWorktreePath( diff --git a/src/renderer/src/components/terminal-pane/input/paste/terminal-pane-menu-paste.ts b/src/renderer/src/components/terminal-pane/input/paste/terminal-pane-menu-paste.ts index 78a17cf8ba3..d37579b0589 100644 --- a/src/renderer/src/components/terminal-pane/input/paste/terminal-pane-menu-paste.ts +++ b/src/renderer/src/components/terminal-pane/input/paste/terminal-pane-menu-paste.ts @@ -2,7 +2,7 @@ import type { ManagedPane } from '@/lib/pane-manager/pane-manager-types' import type { PaneManager } from '@/lib/pane-manager/pane-manager' import type { PtyTransport } from '../../pty-transport/pty-transport-types' import { requestNativeChatCoverPaste } from './native-chat-cover-paste' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { getShortcutPlatform } from '@/lib/shortcut-platform' import { pasteTerminalClipboard } from '../../clipboard/terminal-clipboard-paste' import { createTerminalClipboardCopiedFiles } from '../../clipboard/terminal-clipboard-copied-files' diff --git a/src/renderer/src/components/terminal-pane/input/paste/terminal-pane-paste-execution.ts b/src/renderer/src/components/terminal-pane/input/paste/terminal-pane-paste-execution.ts index 6ddc5aee90d..758d4e0c73f 100644 --- a/src/renderer/src/components/terminal-pane/input/paste/terminal-pane-paste-execution.ts +++ b/src/renderer/src/components/terminal-pane/input/paste/terminal-pane-paste-execution.ts @@ -1,7 +1,7 @@ import { useAppStore } from '../../../../store/index' import type { ManagedPane } from '@/lib/pane-manager/pane-manager-types' import type { PtyTransport } from '../../pty-transport/pty-transport-types' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import type { TerminalPasteSource, TerminalPasteTextOptions } from './terminal-paste-model' import { resolveTerminalPasteRuntime, diff --git a/src/renderer/src/components/terminal-pane/input/paste/terminal-pane-paste-listeners.ts b/src/renderer/src/components/terminal-pane/input/paste/terminal-pane-paste-listeners.ts index 39f90487078..2a922db0e44 100644 --- a/src/renderer/src/components/terminal-pane/input/paste/terminal-pane-paste-listeners.ts +++ b/src/renderer/src/components/terminal-pane/input/paste/terminal-pane-paste-listeners.ts @@ -1,5 +1,5 @@ import { useAppStore } from '../../../../store/index' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { resolveTerminalPasteRuntimeEnvironmentId } from './terminal-paste-runtime' import '../../../../../../shared/keybindings' import { keybindingMatchesAction } from '../../../../../../shared/keybindings/matching' diff --git a/src/renderer/src/components/terminal-pane/input/terminal-input-host-platform.ts b/src/renderer/src/components/terminal-pane/input/terminal-input-host-platform.ts index 4e96ea72401..2a6ea7ec431 100644 --- a/src/renderer/src/components/terminal-pane/input/terminal-input-host-platform.ts +++ b/src/renderer/src/components/terminal-pane/input/terminal-input-host-platform.ts @@ -1,7 +1,7 @@ import { parseExecutionHostId } from '../../../../../shared/execution-host' import { isWslUncPath } from '../../../../../shared/wsl-paths' -import '@/lib/connection-context' -import { getConnectionIdFromState } from '@/lib/connection-owner-resolution' +import '@/lib/workspace/ownership/connection-context' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { getExecutionHostIdForWorktree, runtimeEnvironmentIdOrLocalUnlessTwin diff --git a/src/renderer/src/components/terminal-pane/layout/split/terminal-pane-split-in-main.ts b/src/renderer/src/components/terminal-pane/layout/split/terminal-pane-split-in-main.ts index ed78c7ad0f2..5ce2c96ec7b 100644 --- a/src/renderer/src/components/terminal-pane/layout/split/terminal-pane-split-in-main.ts +++ b/src/renderer/src/components/terminal-pane/layout/split/terminal-pane-split-in-main.ts @@ -1,6 +1,6 @@ // Main writes/starts splits under the window pane ID; frame reconciliation draws and attaches its terminal. import type { TerminalPaneSplitSource } from '../../../../../../shared/feature-education-telemetry' -import { runtimeEnvironmentIdUnlessTwin } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' import { mintStablePaneId } from '@/lib/pane-manager/mint-stable-pane-id' import { refusalActsAsToday } from '@/runtime/workspace-layout/commands/layout-apply-send' import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-link-file-open-routing.test.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-link-file-open-routing.test.ts index ee401f8cfdf..d7875f97c56 100644 --- a/src/renderer/src/components/terminal-pane/links/files/terminal-link-file-open-routing.test.ts +++ b/src/renderer/src/components/terminal-pane/links/files/terminal-link-file-open-routing.test.ts @@ -30,7 +30,7 @@ vi.mock('@/lib/workspace/activation/worktree-activation', () => ({ activateAndRevealWorktree: vi.fn() })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: vi.fn(() => null) })) diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-batching.test.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-batching.test.ts index 636ddb401b9..942e6cdbf77 100644 --- a/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-batching.test.ts +++ b/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-batching.test.ts @@ -30,7 +30,7 @@ vi.mock('@/lib/workspace/activation/worktree-activation', () => ({ activateAndRevealWorktree: vi.fn() })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: vi.fn(() => null) })) diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-candidate-failures.test.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-candidate-failures.test.ts index 58627842080..546f5a8f6a4 100644 --- a/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-candidate-failures.test.ts +++ b/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-candidate-failures.test.ts @@ -2,7 +2,7 @@ import { readFileSync } from 'node:fs' import { Terminal } from '@xterm/headless' import type { ILink } from '@xterm/xterm' import { afterEach, describe, expect, it, vi } from 'vitest' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { createTerminalLinkTestDoubles } from '../terminal-link-handlers-test-fixtures' import { createDeferred, @@ -24,7 +24,9 @@ vi.mock('@/lib/workspace/activation/worktree-activation', () => ({ activateAndRevealWorkspace: vi.fn(), activateAndRevealWorktree: vi.fn() })) -vi.mock('@/lib/connection-context', () => ({ getConnectionId: vi.fn(() => null) })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionId: vi.fn(() => null) +})) installTerminalLinkTestEnvironment(doubles) const firstPath = '/home/alice/dev/notes/README.md' diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-chat-cases.test.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-chat-cases.test.ts index 066c6d54a67..ca3618fe0fc 100644 --- a/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-chat-cases.test.ts +++ b/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-chat-cases.test.ts @@ -9,7 +9,7 @@ vi.mock('@/store/index', () => ({ useAppStore: { getState: () => doubles.storeState } })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: vi.fn(() => null) })) diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-link-detection.test.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-link-detection.test.ts index 8f0166502ce..ae74e67e526 100644 --- a/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-link-detection.test.ts +++ b/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-link-detection.test.ts @@ -4,7 +4,7 @@ import type { PaneManager } from '@/lib/pane-manager/pane-manager' import { createFilePathLinkProvider } from './terminal-link-handlers' import { getTerminalFileOpenHint } from '../terminal-link-open-hints' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { createTerminalLinkTestDoubles } from '../terminal-link-handlers-test-fixtures' import { collectLinks, @@ -39,7 +39,7 @@ vi.mock('@/lib/workspace/activation/worktree-activation', () => ({ activateAndRevealWorktree: vi.fn() })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: vi.fn(() => null) })) diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-markdown.test.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-markdown.test.ts index b911b933717..463acfd0ed6 100644 --- a/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-markdown.test.ts +++ b/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-markdown.test.ts @@ -8,7 +8,9 @@ import { collectLinks } from './terminal-link-provider-buffer-fixtures' const doubles = createTerminalLinkTestDoubles() vi.mock('@/store/index', () => ({ useAppStore: { getState: () => doubles.storeState } })) -vi.mock('@/lib/connection-context', () => ({ getConnectionId: vi.fn(() => null) })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionId: vi.fn(() => null) +})) installTerminalLinkTestEnvironment(doubles) describe('terminal Markdown destination existence', () => { diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-link-same-id-ssh-file-host.test.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-link-same-id-ssh-file-host.test.ts index 0005825ffad..23ea06cde5e 100644 --- a/src/renderer/src/components/terminal-pane/links/files/terminal-link-same-id-ssh-file-host.test.ts +++ b/src/renderer/src/components/terminal-pane/links/files/terminal-link-same-id-ssh-file-host.test.ts @@ -1,5 +1,5 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' type StatArgs = { filePath: string; connectionId?: string } diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-worktree-path-link.test.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-worktree-path-link.test.ts index 223990e2edf..9fbe73cae22 100644 --- a/src/renderer/src/components/terminal-pane/links/files/terminal-worktree-path-link.test.ts +++ b/src/renderer/src/components/terminal-pane/links/files/terminal-worktree-path-link.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' import type { ExecutionHostId } from '../../../../../../shared/execution-host' -import { getConnectionIdFromState } from '@/lib/connection-owner-resolution' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { makeRepo, makeWorktree } from '../../../worktree-jump/worktree-jump-palette-test-fixtures' import { normalizeWorktreeRootPathForTerminalLink, diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-worktree-path-link.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-worktree-path-link.ts index 1113b947c25..93509de60b6 100644 --- a/src/renderer/src/components/terminal-pane/links/files/terminal-worktree-path-link.ts +++ b/src/renderer/src/components/terminal-pane/links/files/terminal-worktree-path-link.ts @@ -1,13 +1,13 @@ import { useAppStore } from '@/store/index' import type { Worktree } from '../../../../../../shared/worktree/types' import { normalizeAbsolutePath } from '../../../../../../shared/file-links/file-link-path-normalization' -import { resolveExactWorktreeRoute } from '@/lib/worktree-owner-route' +import { resolveExactWorktreeRoute } from '@/lib/workspace/ownership/worktree-owner-route' import { getFloatingWorkspaceOperationRoute, resolveWorktreeOperationRouteResult, type WorktreeOperationRoute, type WorktreeOperationRouteState -} from '@/lib/worktree-operation-route' +} from '@/lib/workspace/ownership/worktree-operation-route' import type { RuntimeFileOperationArgs } from '@/runtime/files/runtime-file-client-types' import { toRuntimeExecutionHostId, diff --git a/src/renderer/src/components/terminal-pane/links/handles/terminal-handle-links.test.ts b/src/renderer/src/components/terminal-pane/links/handles/terminal-handle-links.test.ts index 291db595e11..64d84d8f4c3 100644 --- a/src/renderer/src/components/terminal-pane/links/handles/terminal-handle-links.test.ts +++ b/src/renderer/src/components/terminal-pane/links/handles/terminal-handle-links.test.ts @@ -37,7 +37,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/activate-tab-and-focus-pane', () => ({ +vi.mock('@/lib/workspace/tabs/activate-tab-and-focus-pane', () => ({ activateTabAndFocusPane: mocks.activateTabAndFocusPane })) diff --git a/src/renderer/src/components/terminal-pane/links/handles/terminal-handle-links.ts b/src/renderer/src/components/terminal-pane/links/handles/terminal-handle-links.ts index 86bdda7d454..bd54c8fd298 100644 --- a/src/renderer/src/components/terminal-pane/links/handles/terminal-handle-links.ts +++ b/src/renderer/src/components/terminal-pane/links/handles/terminal-handle-links.ts @@ -2,9 +2,9 @@ import type { ILink, ILinkProvider, Terminal } from '@xterm/xterm' import type { AppState } from '@/store/types' import { useAppStore } from '@/store/index' -import { activateTabAndFocusPane } from '@/lib/activate-tab-and-focus-pane' +import { activateTabAndFocusPane } from '@/lib/workspace/tabs/activate-tab-and-focus-pane' import { focusTerminalTabSurface } from '@/lib/focus-terminal-tab-surface' -import { revealWorkspaceSurface } from '@/lib/workspace-surface-reveal' +import { revealWorkspaceSurface } from '@/lib/workspace/activation/workspace-surface-reveal' import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' import { parseRemoteRuntimePtyId } from '../../../../../../shared/remote-runtime/remote-runtime-pty-id' import { diff --git a/src/renderer/src/components/terminal-pane/links/http/terminal-http-link-source-owner.ts b/src/renderer/src/components/terminal-pane/links/http/terminal-http-link-source-owner.ts index 7aca476bf54..8af6e0878a2 100644 --- a/src/renderer/src/components/terminal-pane/links/http/terminal-http-link-source-owner.ts +++ b/src/renderer/src/components/terminal-pane/links/http/terminal-http-link-source-owner.ts @@ -3,8 +3,8 @@ import { getRemoteRuntimePtyEnvironmentId } from '@/runtime/hosted-terminals/ide import { parseRemoteRuntimePtyId } from '../../../../../../shared/remote-runtime/remote-runtime-pty-id' import { parseAppSshPtyId } from '../../../../../../shared/ssh-pty-id' import type { PtyTransport } from '../../pty-transport/pty-transport-types' -import { runtimeEnvironmentIdUnlessTwin } from '@/lib/resolve-owner' -import type { WorktreeOperationRouteState } from '@/lib/worktree-operation-route' +import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' +import type { WorktreeOperationRouteState } from '@/lib/workspace/ownership/worktree-operation-route' import { legacyRelayBridgedPane } from '../../pty-transport/legacy-relay/legacy-relay-bridge-panes' type OwnerTransport = Pick diff --git a/src/renderer/src/components/terminal-pane/links/http/terminal-link-osc-url-routing.test.ts b/src/renderer/src/components/terminal-pane/links/http/terminal-link-osc-url-routing.test.ts index 644bbdccfe7..e3fb3c5b195 100644 --- a/src/renderer/src/components/terminal-pane/links/http/terminal-link-osc-url-routing.test.ts +++ b/src/renderer/src/components/terminal-pane/links/http/terminal-link-osc-url-routing.test.ts @@ -26,7 +26,7 @@ vi.mock('@/lib/workspace/activation/worktree-activation', () => ({ activateAndRevealWorktree: vi.fn() })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: vi.fn(() => null) })) diff --git a/src/renderer/src/components/terminal-pane/links/terminal-link-click-fallback.test.ts b/src/renderer/src/components/terminal-pane/links/terminal-link-click-fallback.test.ts index 6f1f1ae1d76..2c2ca6325f7 100644 --- a/src/renderer/src/components/terminal-pane/links/terminal-link-click-fallback.test.ts +++ b/src/renderer/src/components/terminal-pane/links/terminal-link-click-fallback.test.ts @@ -35,7 +35,7 @@ vi.mock('@/lib/workspace/activation/worktree-activation', () => ({ activateAndRevealWorktree: vi.fn() })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: vi.fn(() => null) })) diff --git a/src/renderer/src/components/terminal-pane/links/terminal-link-handlers-test-harness.ts b/src/renderer/src/components/terminal-pane/links/terminal-link-handlers-test-harness.ts index 779df0f3714..cbd33e3a837 100644 --- a/src/renderer/src/components/terminal-pane/links/terminal-link-handlers-test-harness.ts +++ b/src/renderer/src/components/terminal-pane/links/terminal-link-handlers-test-harness.ts @@ -1,6 +1,6 @@ import { afterEach, beforeEach, vi } from 'vitest' import { registerHttpLinkStoreAccessor } from '@/lib/browser/navigation/http-link-routing' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { createCompatibleRuntimeStatusResponseIfNeeded, type RuntimeEnvironmentCallRequest diff --git a/src/renderer/src/components/terminal-pane/links/terminal-link-open-beside-source.test.ts b/src/renderer/src/components/terminal-pane/links/terminal-link-open-beside-source.test.ts index 498581c9061..5c0fe053e6e 100644 --- a/src/renderer/src/components/terminal-pane/links/terminal-link-open-beside-source.test.ts +++ b/src/renderer/src/components/terminal-pane/links/terminal-link-open-beside-source.test.ts @@ -42,7 +42,7 @@ vi.mock('@/lib/workspace/activation/worktree-activation', () => ({ activateAndRevealWorktree: vi.fn() })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: vi.fn(() => null) })) diff --git a/src/renderer/src/components/terminal-pane/links/terminal-link-paired-click-fallback.test.ts b/src/renderer/src/components/terminal-pane/links/terminal-link-paired-click-fallback.test.ts index 9b86863cf1a..d61988a5425 100644 --- a/src/renderer/src/components/terminal-pane/links/terminal-link-paired-click-fallback.test.ts +++ b/src/renderer/src/components/terminal-pane/links/terminal-link-paired-click-fallback.test.ts @@ -1,6 +1,6 @@ import type { PathExistenceResult } from '../../../../../shared/file-access/path-existence-batch' import { describe, expect, it, vi } from 'vitest' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { openFilePathLinkAtBufferPosition } from './files/terminal-file-link-hit-testing' import { openDetectedFilePath } from './files/terminal-file-open-routing' import { createTerminalLinkTestDoubles } from './terminal-link-handlers-test-fixtures' @@ -33,7 +33,7 @@ vi.mock('@/lib/workspace/activation/worktree-activation', () => ({ activateAndRevealWorktree: vi.fn() })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: vi.fn(() => null) })) diff --git a/src/renderer/src/components/terminal-pane/mounting/terminal-pane-mount-preparation.ts b/src/renderer/src/components/terminal-pane/mounting/terminal-pane-mount-preparation.ts index 1c704cc5d94..fb840ad0048 100644 --- a/src/renderer/src/components/terminal-pane/mounting/terminal-pane-mount-preparation.ts +++ b/src/renderer/src/components/terminal-pane/mounting/terminal-pane-mount-preparation.ts @@ -1,7 +1,7 @@ import type { HttpLinkActionDestinations as TerminalHttpLinkActionDestinations } from '@/lib/browser/navigation/http-link-destinations' import type { PaneManager } from '@/lib/pane-manager/pane-manager' import { useAppStore } from '@/store/index' -import { getConnectionId } from '@/lib/connection-context' +import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { httpLinkActionDestinationsFor } from '@/lib/browser/navigation/http-link-destinations' import '@/lib/browser/workspace/workspace-browser-tab-open' import { diff --git a/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-command-status.test.ts b/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-command-status.test.ts index 91b1b5221a2..7a84c0f22fd 100644 --- a/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-command-status.test.ts +++ b/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-command-status.test.ts @@ -43,7 +43,7 @@ vi.mock('@/hooks/terminal-command-finished-event', () => ({ vi.mock('@/lib/agent-status-connection-ownership', () => ({ resolveLiveAgentStatusConnectionRouting })) -vi.mock('@/lib/connection-owner-resolution', () => ({ +vi.mock('@/lib/workspace/ownership/connection-owner-resolution', () => ({ getConnectionIdFromState })) diff --git a/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-command-status.ts b/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-command-status.ts index d514e4e5bf7..7442862a40d 100644 --- a/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-command-status.ts +++ b/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-command-status.ts @@ -5,7 +5,7 @@ import { parseAppSshPtyId } from '../../../../../../shared/ssh-pty-id' import { isShellProcess } from '../../../../../../shared/agent-status/process/shell-process-detection' import { dispatchTerminalCommandFinishedEvent } from '@/hooks/terminal-command-finished-event' import { resolveLiveAgentStatusConnectionRouting } from '@/lib/agent-status-connection-ownership' -import { getConnectionIdFromState } from '@/lib/connection-owner-resolution' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { rendererAgentStatusObservations } from '@/lib/renderer-agent-status-observations' import { isRetainedProgramResult } from '@/lib/program-status/row' import { useAppStore } from '@/store/index' diff --git a/src/renderer/src/components/terminal-pane/parking/retention/terminal-hidden-worktree-retention.ts b/src/renderer/src/components/terminal-pane/parking/retention/terminal-hidden-worktree-retention.ts index c6058161aff..26cd231360e 100644 --- a/src/renderer/src/components/terminal-pane/parking/retention/terminal-hidden-worktree-retention.ts +++ b/src/renderer/src/components/terminal-pane/parking/retention/terminal-hidden-worktree-retention.ts @@ -9,7 +9,7 @@ import { type TerminalColdParkPolicyOverrides } from './terminal-hidden-view-parking' import type { TerminalTab } from '../../../../../../shared/workspace-layout/terminal-tab-types' -import { createWorktreeTabBucketProjection } from '@/lib/worktree-tab-bucket-projection' +import { createWorktreeTabBucketProjection } from '@/lib/workspace/tabs/worktree-tab-bucket-projection' // Budget hidden worktrees by count and absolute TTL: measured pane heap grows with scrollback. Last-active exempts only the cap; unrestorable live tabs must remain mounted, and scrollback depth is unbounded, so force-park may free nothing. export const TERMINAL_HIDDEN_WORKTREE_RETENTION_LIMIT = 4 diff --git a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/exited-split-pane-close.ts b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/exited-split-pane-close.ts index a1ec76ddd9f..c847e69efe7 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/exited-split-pane-close.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/exited-split-pane-close.ts @@ -1,4 +1,4 @@ -import { runtimeEnvironmentIdUnlessTwin } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' import { expectPaneToClose } from '@/runtime/workspace-layout/intents/layout-owner-pane-intents' import { useAppStore } from '@/store/index' diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/deferred-session-reattach-wsl-distro-stopped-hold.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/deferred-session-reattach-wsl-distro-stopped-hold.test.ts index 67c1ba7cb6b..c7418245d48 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/deferred-session-reattach-wsl-distro-stopped-hold.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach/deferred-session-reattach-wsl-distro-stopped-hold.test.ts @@ -5,7 +5,7 @@ import { registerAgentStatusStartupSnapshot } from '@/hooks/ipc-events/agent-sta import { noteUserWorkspaceSwitch, resetWorkspaceSwitchUserActsForTests -} from '@/lib/workspace-switch-user-act' +} from '@/lib/workspace/activation/workspace-switch-user-act' import { wslDistroHoldMessage } from '../../../../../../shared/wsl-distro-stopped-hold' import { startHeldPanesForWslDistro, diff --git a/src/renderer/src/components/terminal-pane/pty-connection/spawn/main-starts-pane.ts b/src/renderer/src/components/terminal-pane/pty-connection/spawn/main-starts-pane.ts index 7f88f26e879..add3182d962 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/spawn/main-starts-pane.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/spawn/main-starts-pane.ts @@ -1,5 +1,5 @@ import { useAppStore } from '@/store/index' -import { runtimeEnvironmentIdUnlessTwin } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch' import type { ConnectPanePtySession } from '../connect-pane-pty-session' diff --git a/src/renderer/src/components/terminal-pane/pty-connection/spawn/wsl-distro-stopped-hold-pane.ts b/src/renderer/src/components/terminal-pane/pty-connection/spawn/wsl-distro-stopped-hold-pane.ts index bf3dabae668..ea089ad3f71 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/spawn/wsl-distro-stopped-hold-pane.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/spawn/wsl-distro-stopped-hold-pane.ts @@ -1,4 +1,4 @@ -import { takeRecentWorkspaceSwitchWake } from '@/lib/workspace-switch-user-act' +import { takeRecentWorkspaceSwitchWake } from '@/lib/workspace/activation/workspace-switch-user-act' import { holdPaneForStoppedWslDistro } from '../../session-restore/wsl-distro/wsl-distro-stopped-hold-state' import { recordPtyConnectDiagnostic } from '../instrumentation/pty-connect-diagnostics' import type { ConnectPanePtySession } from '../connect-pane-pty-session' diff --git a/src/renderer/src/components/terminal-pane/pty-connection/startup/cold-restore-resume-startup.ts b/src/renderer/src/components/terminal-pane/pty-connection/startup/cold-restore-resume-startup.ts index 22ad322cb7e..af9ebe9c833 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/startup/cold-restore-resume-startup.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/startup/cold-restore-resume-startup.ts @@ -1,7 +1,7 @@ import { getConnectionIdForWorktreeCopy, getConnectionIdFromState -} from '@/lib/connection-owner-resolution' +} from '@/lib/workspace/ownership/connection-owner-resolution' import { normalizeExecutionHostId } from '../../../../../../shared/execution-host' import { parseWorkspaceKey } from '../../../../../../shared/workspace-scope' import { useAppStore } from '@/store/index' diff --git a/src/renderer/src/components/terminal-pane/pty-transport/recovery/server-outage/remote-server-outage.ts b/src/renderer/src/components/terminal-pane/pty-transport/recovery/server-outage/remote-server-outage.ts index 84da542d64e..0fa5797744d 100644 --- a/src/renderer/src/components/terminal-pane/pty-transport/recovery/server-outage/remote-server-outage.ts +++ b/src/renderer/src/components/terminal-pane/pty-transport/recovery/server-outage/remote-server-outage.ts @@ -3,7 +3,7 @@ import { useAppStore } from '@/store/index' import type { AppState } from '@/store/types' import { toRuntimeExecutionHostId } from '../../../../../../../shared/execution-host' import { tailscaleHostOfEndpoint } from '../../../../../../../shared/remote-runtime/remote-runtime-tailscale-hint' -import { selectExecutionHostDisplayLabel } from '@/lib/execution-host-display-label' +import { selectExecutionHostDisplayLabel } from '@/runtime/hosts/display/execution-host-display-label' import { runtimeHostConnectionStateForEntry } from '@/runtime/hosts/connections/runtime-host-connection-state' import type { RemoteRuntimeRecoveryCause } from '../../remote-runtime/recovery/remote-runtime-recovery-copy' diff --git a/src/renderer/src/components/terminal-pane/pty-transport/recovery/wsl/WslHostStoppedCard.tsx b/src/renderer/src/components/terminal-pane/pty-transport/recovery/wsl/WslHostStoppedCard.tsx index 22d9c0eb016..aa4ee9d1f90 100644 --- a/src/renderer/src/components/terminal-pane/pty-transport/recovery/wsl/WslHostStoppedCard.tsx +++ b/src/renderer/src/components/terminal-pane/pty-transport/recovery/wsl/WslHostStoppedCard.tsx @@ -1,4 +1,4 @@ -import { startWslHostAndReloadProjects } from '@/lib/wsl-host-user-start' +import { startWslHostAndReloadProjects } from '@/runtime/hosts/wsl/wsl-host-user-start' import { WslDistroStoppedCard } from './WslDistroStoppedCard' /** diff --git a/src/renderer/src/components/terminal-pane/pty-transport/recovery/wsl/WslHostUnavailableBanner.tsx b/src/renderer/src/components/terminal-pane/pty-transport/recovery/wsl/WslHostUnavailableBanner.tsx index e45de352319..3ff0a3f672f 100644 --- a/src/renderer/src/components/terminal-pane/pty-transport/recovery/wsl/WslHostUnavailableBanner.tsx +++ b/src/renderer/src/components/terminal-pane/pty-transport/recovery/wsl/WslHostUnavailableBanner.tsx @@ -6,7 +6,7 @@ import { getWslHostsTurnedOffLabel, getWslHostsTurnOnLabel } from '../../../../sidebar/wsl-host-row-status' -import type { WslHostUnavailableReason } from '../../../../../lib/wsl-host-availability' +import type { WslHostUnavailableReason } from '../../../../../runtime/hosts/wsl/wsl-host-availability' import { useTranslate } from '@/i18n/use-translate' /** In place of "Reconnecting…" for a WSL host that cannot run: nothing retries, so say why. */ diff --git a/src/renderer/src/components/terminal-pane/pty-transport/recovery/wsl/use-wsl-host-stopped-pane.ts b/src/renderer/src/components/terminal-pane/pty-transport/recovery/wsl/use-wsl-host-stopped-pane.ts index f46b6c63c2e..2bad2aa3cd4 100644 --- a/src/renderer/src/components/terminal-pane/pty-transport/recovery/wsl/use-wsl-host-stopped-pane.ts +++ b/src/renderer/src/components/terminal-pane/pty-transport/recovery/wsl/use-wsl-host-stopped-pane.ts @@ -1,7 +1,10 @@ import { useAppStore } from '@/store/index' -import { paneShowsWslHostStoppedCard, selectStoppedWslDistro } from '@/lib/wsl-host-stopped-status' +import { + paneShowsWslHostStoppedCard, + selectStoppedWslDistro +} from '@/runtime/hosts/wsl/wsl-host-stopped-status' import { selectWorkspaceRuntimeEnvironmentId } from '../../../../../lib/workspace/ownership/workspace-runtime-environment' -import { selectWslHostUnavailableReason } from '../../../../../lib/wsl-host-availability' +import { selectWslHostUnavailableReason } from '../../../../../runtime/hosts/wsl/wsl-host-availability' /** * Whether the active pane's raw error toast gives way to the stopped distro's Start card: only diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/TerminalPaneRecoveryPortals.test.tsx b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/TerminalPaneRecoveryPortals.test.tsx index a522cf3fd0c..428f91ed130 100644 --- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/TerminalPaneRecoveryPortals.test.tsx +++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/TerminalPaneRecoveryPortals.test.tsx @@ -21,7 +21,7 @@ vi.mock('@/i18n/i18n', () => ({ vi.mock('@/store/index', () => ({ useAppStore: (selector: (state: unknown) => unknown) => selector({ wslHostStatuses }) })) -vi.mock('../../../../../lib/wsl-host-availability', () => ({ +vi.mock('../../../../../runtime/hosts/wsl/wsl-host-availability', () => ({ useWslHostUnavailableReason: () => null })) vi.mock('./use-managed-pairing-refused', () => ({ diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/TerminalPaneRecoveryPortals.tsx b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/TerminalPaneRecoveryPortals.tsx index 967de4afe2b..addc34a0c56 100644 --- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/TerminalPaneRecoveryPortals.tsx +++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/TerminalPaneRecoveryPortals.tsx @@ -1,7 +1,7 @@ import { useCallback, useState } from 'react' import { createPortal } from 'react-dom' import type { PtyTransport } from '../../pty-transport-types' -import { useWslHostUnavailableReason } from '../../../../../lib/wsl-host-availability' +import { useWslHostUnavailableReason } from '../../../../../runtime/hosts/wsl/wsl-host-availability' import { useManagedPairingRefusedEnvironmentId, useManagedServerReplaced @@ -18,7 +18,7 @@ import { WslHostStoppedCard } from '../../recovery/wsl/WslHostStoppedCard' import { useRetryPanesWhenWslHostReturns } from '../../recovery/wsl/use-wsl-host-return-retry' import { useCalmStatusReveal } from '@/hooks/use-calm-status-reveal' import { useAppStore } from '@/store/index' -import { paneShowsWslHostStoppedCard } from '@/lib/wsl-host-stopped-status' +import { paneShowsWslHostStoppedCard } from '@/runtime/hosts/wsl/wsl-host-stopped-status' import { withoutWslHostStoppedLines } from '../../../../../../../shared/wsl-host-stopped-message' import { mapPaneTerminalErrors } from '../../../errors/terminal-error-accumulation' import type { TerminalPaneController } from '../../../controller/use-terminal-pane-controller' diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/TerminalRemoteRuntimeReconnectBanner.tsx b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/TerminalRemoteRuntimeReconnectBanner.tsx index a104d1db45f..7ad949a4ee3 100644 --- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/TerminalRemoteRuntimeReconnectBanner.tsx +++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/TerminalRemoteRuntimeReconnectBanner.tsx @@ -3,7 +3,7 @@ import { translate } from '@/i18n/i18n' import { useTranslate, type Translate } from '@/i18n/use-translate' import { useCalmStatusReveal } from '@/hooks/use-calm-status-reveal' import type { VisiblePtyRecoveryState } from './terminal-remote-runtime-recovery-ui-state' -import type { WslHostUnavailableReason } from '../../../../../lib/wsl-host-availability' +import type { WslHostUnavailableReason } from '../../../../../runtime/hosts/wsl/wsl-host-availability' import { WslHostUnavailableBanner } from '../../recovery/wsl/WslHostUnavailableBanner' import { RemoteRuntimeRecoveryCard } from './RemoteRuntimeRecoveryCard' import { diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/use-managed-pairing-refused.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/use-managed-pairing-refused.ts index 475556ce6cd..f99773a606b 100644 --- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/use-managed-pairing-refused.ts +++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/use-managed-pairing-refused.ts @@ -1,6 +1,6 @@ import { parseExecutionHostId } from '../../../../../../../shared/execution-host' import { getOrcadSshDeployment } from '../../../../../../../shared/remote-runtime/host-catalog/runtime-environments' -import { workspaceOwnerHostId } from '@/lib/workspace-row-owner-host' +import { workspaceOwnerHostId } from '@/lib/workspace/ownership/workspace-row-owner-host' import { useAppStore } from '@/store/index' import type { AppState } from '@/store/types' diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport.ts index d352ec784e1..8bcc18152a5 100644 --- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport.ts +++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport.ts @@ -76,7 +76,7 @@ import type { PtyTransportRecoveryState } from '../pty-transport-types' import { createPtyOutputProcessor } from '../output/pty-output-processor' -import { localizeWslDistroHoldText } from '@/lib/wsl-distro-hold-copy' +import { localizeWslDistroHoldText } from '@/runtime/hosts/wsl/wsl-distro-hold-copy' import { isSshSessionGoneError } from '../host-ownership/ssh-session-gone-verdict' import { RuntimeRpcCallError, diff --git a/src/renderer/src/components/terminal-pane/session-fork/terminal-agent-session-fork.ts b/src/renderer/src/components/terminal-pane/session-fork/terminal-agent-session-fork.ts index 78dec00b9c6..9dfd2eb353a 100644 --- a/src/renderer/src/components/terminal-pane/session-fork/terminal-agent-session-fork.ts +++ b/src/renderer/src/components/terminal-pane/session-fork/terminal-agent-session-fork.ts @@ -5,7 +5,7 @@ import { settleAgentTabLaunch } from '@/lib/agent-session/launch/new-tab/launch- import { newAgentPromptOutcome } from '@/lib/new-agent-prompt-outcome' import { buildAgentSessionForkPrompt } from '@/lib/agent-session-fork-context' import { activateAndRevealWorktree } from '@/lib/workspace/activation/worktree-activation' -import { resolveOwner } from '@/lib/resolve-owner' +import { resolveOwner } from '@/lib/workspace/ownership/resolve-owner' import { toRuntimeExecutionHostId, type ExecutionHostId diff --git a/src/renderer/src/components/terminal-parked-watcher-sync-entries.test.tsx b/src/renderer/src/components/terminal-parked-watcher-sync-entries.test.tsx index 303e139508c..ad3f8892f69 100644 --- a/src/renderer/src/components/terminal-parked-watcher-sync-entries.test.tsx +++ b/src/renderer/src/components/terminal-parked-watcher-sync-entries.test.tsx @@ -19,7 +19,7 @@ vi.mock('@/store', () => ({ getState: () => ({ activeWorktreeId: null }) }) })) -vi.mock('@/lib/workspace-terminal-host-authority', () => ({ +vi.mock('@/lib/workspace/ownership/workspace-terminal-host-authority', () => ({ createWorkspaceTerminalHostAuthoritySelector: () => () => 'unverifiable' })) vi.mock('./terminal-pane/parking/output-watchers/terminal-parked-tab-watchers', () => ({ diff --git a/src/renderer/src/components/terminal/initial-terminal-admission-wait.test.tsx b/src/renderer/src/components/terminal/initial-terminal-admission-wait.test.tsx index 550d7dbac10..c7b739e02b9 100644 --- a/src/renderer/src/components/terminal/initial-terminal-admission-wait.test.tsx +++ b/src/renderer/src/components/terminal/initial-terminal-admission-wait.test.tsx @@ -37,7 +37,7 @@ vi.mock('@/lib/workspace/activation/worktree-agent-activation-gate', () => ({ vi.mock('@/lib/agent-session/resume/resume-sleeping-agent-session', () => ({ resumeSleepingAgentSessionsForWorktree: vi.fn() })) -vi.mock('@/lib/workspace-terminal-host-authority', () => ({ +vi.mock('@/lib/workspace/ownership/workspace-terminal-host-authority', () => ({ createWorkspaceTerminalHostAuthoritySelector: () => () => 'none' })) vi.mock('../terminal-pane/parking/output-watchers/terminal-parked-tab-watchers', () => ({ diff --git a/src/renderer/src/components/terminal/initial-terminal-structured-launch.test.tsx b/src/renderer/src/components/terminal/initial-terminal-structured-launch.test.tsx index a9b6e44ccbd..9fad5456322 100644 --- a/src/renderer/src/components/terminal/initial-terminal-structured-launch.test.tsx +++ b/src/renderer/src/components/terminal/initial-terminal-structured-launch.test.tsx @@ -49,7 +49,7 @@ vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-status', () vi.mock('@/lib/agent-session/resume/resume-sleeping-agent-session', () => ({ resumeSleepingAgentSessionsForWorktree: mocks.resume })) -vi.mock('@/lib/workspace-terminal-host-authority', () => ({ +vi.mock('@/lib/workspace/ownership/workspace-terminal-host-authority', () => ({ createWorkspaceTerminalHostAuthoritySelector: () => () => mocks.authority })) vi.mock('../terminal-pane/parking/output-watchers/terminal-parked-tab-watchers', () => ({ diff --git a/src/renderer/src/components/use-new-linear-issue-projects.ts b/src/renderer/src/components/use-new-linear-issue-projects.ts index b857b1f4e9f..f75e28d9191 100644 --- a/src/renderer/src/components/use-new-linear-issue-projects.ts +++ b/src/renderer/src/components/use-new-linear-issue-projects.ts @@ -2,7 +2,7 @@ import { useEffect, useState } from 'react' import type { GlobalSettings } from '../../../shared/global-settings-types' import type { LinearProjectSummary } from '../../../shared/linear/project-types' import type { TaskSourceContext } from '../../../shared/work-items/task-source-context' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' import { linearListProjects } from '@/runtime/linear/runtime-linear-project-client' export function useNewLinearIssueProjects(args: { diff --git a/src/renderer/src/components/use-terminal-editor-close-queue.ts b/src/renderer/src/components/use-terminal-editor-close-queue.ts index ab7ab95172d..86861bc3987 100644 --- a/src/renderer/src/components/use-terminal-editor-close-queue.ts +++ b/src/renderer/src/components/use-terminal-editor-close-queue.ts @@ -13,7 +13,7 @@ import { openFileIndex } from '@/store/slices/editor/tabs/workspace-editor-files' import { editorViewTab } from '@/store/slices/editor/tabs/editor-view-placement' -import { selectWorkspaceSurface } from '@/lib/workspace-surface-reveal' +import { selectWorkspaceSurface } from '@/lib/workspace/activation/workspace-surface-reveal' import type { TerminalEditorCloseFoundation } from './use-terminal-editor-close-foundation' export function useTerminalEditorCloseQueue(controller: TerminalEditorCloseFoundation) { diff --git a/src/renderer/src/components/use-terminal-watcher-effects.ts b/src/renderer/src/components/use-terminal-watcher-effects.ts index 42d48cdbf3e..ccf5d42fd24 100644 --- a/src/renderer/src/components/use-terminal-watcher-effects.ts +++ b/src/renderer/src/components/use-terminal-watcher-effects.ts @@ -16,7 +16,7 @@ import { import { useAppStore } from '@/store' import { isTerminalWorkspaceEmptiedOnPurpose } from '../../../shared/workspace-layout/closed-terminal-tab-tombstones' import { gateWorktreeAgentActivation } from '@/lib/workspace/activation/worktree-agent-activation-gate' -import { createWorkspaceTerminalHostAuthoritySelector } from '@/lib/workspace-terminal-host-authority' +import { createWorkspaceTerminalHostAuthoritySelector } from '@/lib/workspace/ownership/workspace-terminal-host-authority' import { hasStructuredAgentLaunchInWorktree } from '@/lib/agent-session/launch/structured-agent-session-launch-status' import { isEmptyWorkspaceDefaultSurfacePending } from '@/lib/workspace/activation/initial-surface/empty-workspace-default-surface-claims' import type { TerminalColdActivationController } from './terminal-cold-activation' diff --git a/src/renderer/src/components/use-terminal-workspace-foundation.ts b/src/renderer/src/components/use-terminal-workspace-foundation.ts index 4d5caadd5e5..f8ac63939fa 100644 --- a/src/renderer/src/components/use-terminal-workspace-foundation.ts +++ b/src/renderer/src/components/use-terminal-workspace-foundation.ts @@ -4,7 +4,7 @@ import type { TerminalTab } from '../../../shared/workspace-layout/terminal-tab- import { useAppStore } from '../store' import { useWorktreeMap } from '../store/slices/worktrees/listing/use-worktree-catalog' import { getResolvedExecutionHostIdForWorktree } from '@/lib/resolved-worktree-execution-host' -import type { WorktreeTabBucketProjection } from '@/lib/worktree-tab-bucket-projection' +import type { WorktreeTabBucketProjection } from '@/lib/workspace/tabs/worktree-tab-bucket-projection' import { projectWorkspaceSurfaces } from './workspace-surface-projection' import { parseWslMovedSurfacesKey, diff --git a/src/renderer/src/components/workspace-cleanup/workspace-cleanup-facet-row-caches.ts b/src/renderer/src/components/workspace-cleanup/workspace-cleanup-facet-row-caches.ts index 2b0aeb9f36d..891ca569228 100644 --- a/src/renderer/src/components/workspace-cleanup/workspace-cleanup-facet-row-caches.ts +++ b/src/renderer/src/components/workspace-cleanup/workspace-cleanup-facet-row-caches.ts @@ -18,7 +18,7 @@ import { getWorkspaceCleanupCandidateIdentity, getWorkspaceCleanupHostIdentity } from '../../../../shared/workspace-cleanup/workspace-cleanup-host-identity' -import { getWorktreeVisitTimestamp } from '@/lib/worktree-visit-recency' +import { getWorktreeVisitTimestamp } from '@/lib/workspace/activation/worktree-visit-recency' import type { Translate } from '@/i18n/use-translate' /** Cache by candidate identity and reuse unchanged row arrays. useMemo owns invalidation; content-addressed/idempotent fills survive discarded renders without unsafe ref mutation. */ diff --git a/src/renderer/src/components/workspace-cleanup/workspace-cleanup-facets.ts b/src/renderer/src/components/workspace-cleanup/workspace-cleanup-facets.ts index ce7f587eb15..a422eceac73 100644 --- a/src/renderer/src/components/workspace-cleanup/workspace-cleanup-facets.ts +++ b/src/renderer/src/components/workspace-cleanup/workspace-cleanup-facets.ts @@ -23,7 +23,7 @@ import type { import type { WorkspaceCleanupReviewInfo } from './workspace-cleanup-presentation' import type { WorkspaceCleanupWorktreeFacts } from './workspace-cleanup-host-identity' -import { getWorktreeVisitTimestamp } from '@/lib/worktree-visit-recency' +import { getWorktreeVisitTimestamp } from '@/lib/workspace/activation/worktree-visit-recency' import { getWorkspaceCleanupGitChipLabel } from './workspace-cleanup-candidate-labels' import type { Translate } from '@/i18n/use-translate' export type { WorkspaceCleanupWorktreeFacts } from './workspace-cleanup-host-identity' diff --git a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-task-url.ts b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-task-url.ts index cff07e429f6..871fd719a28 100644 --- a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-task-url.ts +++ b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-task-url.ts @@ -1,6 +1,6 @@ import { useLinearIssueResult } from '@/hooks/linear-issue-committed-state' import { getLinearSourceScope } from '@/store/slices/linear/linear-slice-scope' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' import { mapLinearIssueRead, type LinearIssueLease diff --git a/src/renderer/src/components/worktree-jump/worktree-jump-palette-worktree-row.tsx b/src/renderer/src/components/worktree-jump/worktree-jump-palette-worktree-row.tsx index 97715295482..789fefc88d0 100644 --- a/src/renderer/src/components/worktree-jump/worktree-jump-palette-worktree-row.tsx +++ b/src/renderer/src/components/worktree-jump/worktree-jump-palette-worktree-row.tsx @@ -23,7 +23,7 @@ import { formatPaletteSessionAge } from '@/components/cmd-j/palette-session-age' import type { WorktreePaletteItem } from './worktree-jump-palette-model' import type { WorktreeJumpPaletteController } from './use-worktree-jump-palette-controller' import { getWorkspaceLastActiveAt } from '../../../../shared/workspace-last-active' -import { getWorktreeVisitTimestamp } from '@/lib/worktree-visit-recency' +import { getWorktreeVisitTimestamp } from '@/lib/workspace/activation/worktree-visit-recency' import { getPaletteSupportingTextLabel, HighlightedText, diff --git a/src/renderer/src/components/wsl-host-stopped/WslHostStoppedNotice.test.tsx b/src/renderer/src/components/wsl-host-stopped/WslHostStoppedNotice.test.tsx index fd4383ff02f..f9fe7e9ced1 100644 --- a/src/renderer/src/components/wsl-host-stopped/WslHostStoppedNotice.test.tsx +++ b/src/renderer/src/components/wsl-host-stopped/WslHostStoppedNotice.test.tsx @@ -6,7 +6,7 @@ import { WslHostStoppedNotice } from './WslHostStoppedNotice' const start = vi.hoisted(() => vi.fn<(environmentId: string) => Promise>()) -vi.mock('@/lib/wsl-host-user-start', () => ({ +vi.mock('@/runtime/hosts/wsl/wsl-host-user-start', () => ({ startWslHostAndReloadProjects: start })) diff --git a/src/renderer/src/components/wsl-host-stopped/WslHostStoppedNotice.tsx b/src/renderer/src/components/wsl-host-stopped/WslHostStoppedNotice.tsx index cc0a400e1a2..644386e73b9 100644 --- a/src/renderer/src/components/wsl-host-stopped/WslHostStoppedNotice.tsx +++ b/src/renderer/src/components/wsl-host-stopped/WslHostStoppedNotice.tsx @@ -5,7 +5,7 @@ import { LinuxPenguinIcon } from '@/components/icons/LinuxPenguinIcon' import { useMountedRef } from '@/hooks/useMountedRef' import { useTranslate } from '@/i18n/use-translate' import { cn } from '@/lib/utils' -import { startWslHostAndReloadProjects } from '@/lib/wsl-host-user-start' +import { startWslHostAndReloadProjects } from '@/runtime/hosts/wsl/wsl-host-user-start' /** " is stopped" with Start, where a surface would otherwise show a read error. Only the click boots (E9). */ export function WslHostStoppedNotice({ diff --git a/src/renderer/src/components/wsl-host-stopped/use-stopped-wsl-host.ts b/src/renderer/src/components/wsl-host-stopped/use-stopped-wsl-host.ts index 777e61248aa..320b45092a9 100644 --- a/src/renderer/src/components/wsl-host-stopped/use-stopped-wsl-host.ts +++ b/src/renderer/src/components/wsl-host-stopped/use-stopped-wsl-host.ts @@ -1,9 +1,9 @@ import { useAppStateValue } from '@/store/retained-views/app-state-view' import { useMemo } from 'react' import type { AppState } from '@/store/types' -import { selectStoppedWslDistro } from '@/lib/wsl-host-stopped-status' +import { selectStoppedWslDistro } from '@/runtime/hosts/wsl/wsl-host-stopped-status' import { selectWorkspaceRuntimeEnvironmentId } from '../../lib/workspace/ownership/workspace-runtime-environment' -import { selectWslHostEnvironmentUnavailableReason } from '../../lib/wsl-host-availability' +import { selectWslHostEnvironmentUnavailableReason } from '../../runtime/hosts/wsl/wsl-host-availability' export type StoppedWslHost = { environmentId: string; distro: string } diff --git a/src/renderer/src/hooks/composer-state/gitlab-provider-selection.ts b/src/renderer/src/hooks/composer-state/gitlab-provider-selection.ts index 71990830d76..854900456aa 100644 --- a/src/renderer/src/hooks/composer-state/gitlab-provider-selection.ts +++ b/src/renderer/src/hooks/composer-state/gitlab-provider-selection.ts @@ -36,7 +36,7 @@ import { shouldApplyWorkspaceSourceAutoName } from '../../../../shared/new-workspace/workspace-source' import { getLinkedItemDisplayName } from '@/components/sidebar/workspace-creation/folder/folder-workspace-source-selection' -import { runtimeTargetForRepoOwner } from '@/lib/repo-runtime-owner' +import { runtimeTargetForRepoOwner } from '@/lib/workspace/ownership/repo-runtime-owner' import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' import type { GitPushTarget } from '../../../../shared/worktree/types' import { toast } from 'sonner' diff --git a/src/renderer/src/hooks/composer-state/quick-startup-plan.ts b/src/renderer/src/hooks/composer-state/quick-startup-plan.ts index a5f972c706d..27c045aa7d3 100644 --- a/src/renderer/src/hooks/composer-state/quick-startup-plan.ts +++ b/src/renderer/src/hooks/composer-state/quick-startup-plan.ts @@ -20,10 +20,8 @@ import { resolveAgentStartupPlanInputs } from '../../../../shared/agent-launch/s import { tuiAgentToAgentKind } from '@/lib/telemetry' import { getAgentLabel } from '@/lib/agent-catalog' import { translate } from '@/i18n/i18n' -import { - requireExecutionHostPlatform, - type ExecutionHostPlatformFact -} from '@/lib/execution-host-facts' +import { requireExecutionHostPlatform } from '@/runtime/hosts/platform/execution-host-facts' +import type { ExecutionHostPlatformFact } from '@/runtime/hosts/platform/execution-host-platform-fact' export type QuickComposerStartupInput = { agent: TuiAgent | null diff --git a/src/renderer/src/hooks/composer-state/runtime-target-model.ts b/src/renderer/src/hooks/composer-state/runtime-target-model.ts index c588b1f2852..e6a7f51b8b3 100644 --- a/src/renderer/src/hooks/composer-state/runtime-target-model.ts +++ b/src/renderer/src/hooks/composer-state/runtime-target-model.ts @@ -6,7 +6,7 @@ import type { SshConnectionState, SshConnectionStatus } from '../../../../shared import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent' import type { OrcaVmRecipe } from '../../../../shared/orca-yaml-hook-types' import type { AgentStartupShell } from '../../../../shared/agent-launch/startup/tui-agent-startup-shell' -import type { ExecutionHostPlatformFact } from '@/lib/execution-host-facts' +import type { ExecutionHostPlatformFact } from '@/runtime/hosts/platform/execution-host-platform-fact' import type { NewWorkspaceProjectOption } from '@/lib/new-workspace-project-options' import type { ProjectHostSetupOption } from '@/lib/project-host-setup-options' import type { WorkspaceCreationTargetResolution } from '@/lib/project-host-workspace-target' diff --git a/src/renderer/src/hooks/composer-state/runtime-target-selection.ts b/src/renderer/src/hooks/composer-state/runtime-target-selection.ts index 6aa3dff69f3..c2fa25817ac 100644 --- a/src/renderer/src/hooks/composer-state/runtime-target-selection.ts +++ b/src/renderer/src/hooks/composer-state/runtime-target-selection.ts @@ -15,14 +15,14 @@ import { CLIENT_PLATFORM } from '@/lib/new-workspace' import { getLocalRepoProjectExecutionRuntimeContext } from '@/lib/local-preflight-context' import { resolveExecutionHostAgentStartupShell, - resolveRepoExecutionHostPlatform, - type ExecutionHostPlatformFact -} from '@/lib/execution-host-facts' + resolveRepoExecutionHostPlatform +} from '@/runtime/hosts/platform/execution-host-facts' +import type { ExecutionHostPlatformFact } from '@/runtime/hosts/platform/execution-host-platform-fact' import { useAppStore } from '@/store' import { repoIsRemote } from '../../../../shared/agent-launch/startup/agent-launch-remote' import { buildProjectHostSetupOptions } from '@/lib/project-host-setup-options' import { buildNewWorkspaceCreateTargetOptions } from '@/lib/new-workspace-project-options' -import { getRuntimeEnvironmentIdForRepo } from '@/lib/repo-runtime-owner' +import { getRuntimeEnvironmentIdForRepo } from '@/lib/workspace/ownership/repo-runtime-owner' import { useEphemeralVmRecipeOptions } from '@/hooks/useEphemeralVmRecipeOptions' export function useComposerRuntimeTargetSelection(input: ComposerRuntimeTargetSelectionInput) { diff --git a/src/renderer/src/hooks/editor-external-watch-background-trim.test.ts b/src/renderer/src/hooks/editor-external-watch-background-trim.test.ts index 6d483c80340..45465510d45 100644 --- a/src/renderer/src/hooks/editor-external-watch-background-trim.test.ts +++ b/src/renderer/src/hooks/editor-external-watch-background-trim.test.ts @@ -7,7 +7,7 @@ import { PINNED_RECURSIVE_WATCH_WORKSPACE_COUNT, WARM_RECURSIVE_WATCH_WORKSPACE_COUNT } from './editor-external-watch-scope' -import { getWorktreeVisitKey } from '@/lib/worktree-visit-recency' +import { getWorktreeVisitKey } from '@/lib/workspace/activation/worktree-visit-recency' import { getDefaultSettings } from '../../../shared/constants' import { makeFolderWorkspace } from '@/store/folder-workspaces/folder-workspace.test-fixture' import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' diff --git a/src/renderer/src/hooks/editor-external-watch-scope.ts b/src/renderer/src/hooks/editor-external-watch-scope.ts index ce68f25fbb5..998d4c67c13 100644 --- a/src/renderer/src/hooks/editor-external-watch-scope.ts +++ b/src/renderer/src/hooks/editor-external-watch-scope.ts @@ -1,5 +1,5 @@ import type { AppState } from '@/store/types' -import { getWorktreeIdFromVisitKey } from '@/lib/worktree-visit-recency' +import { getWorktreeIdFromVisitKey } from '@/lib/workspace/activation/worktree-visit-recency' // Why: recently used workspaces keep their watch so switching back needs no re-read. export const WARM_RECURSIVE_WATCH_WORKSPACE_COUNT = 3 diff --git a/src/renderer/src/hooks/editor-external-watch-selected-host.test.ts b/src/renderer/src/hooks/editor-external-watch-selected-host.test.ts index 141c948307f..cf76c03df62 100644 --- a/src/renderer/src/hooks/editor-external-watch-selected-host.test.ts +++ b/src/renderer/src/hooks/editor-external-watch-selected-host.test.ts @@ -1,8 +1,8 @@ import { expect, it, vi } from 'vitest' import type { Repo } from '../../../shared/repo-types' -import { resolveQualifiedWorktreeExecutionOwner } from '@/lib/qualified-worktree-execution-owner' +import { resolveQualifiedWorktreeExecutionOwner } from '@/lib/workspace/ownership/qualified-worktree-execution-owner' import { getResolvedExecutionHostIdForWorktree } from '@/lib/resolved-worktree-execution-host' -import { getConnectionIdForWorktreeCopy } from '@/lib/connection-owner-resolution' +import { getConnectionIdForWorktreeCopy } from '@/lib/workspace/ownership/connection-owner-resolution' import { resolveEditorExternalWatchTargetRows } from './editor-external-watch-target-rows' import { useAppStore } from '@/store' import { subscribeEditorRuntimeFileWatch } from './editor-runtime-file-watch' diff --git a/src/renderer/src/hooks/editor-external-watch-target-rows.ts b/src/renderer/src/hooks/editor-external-watch-target-rows.ts index 54f9627ae0b..c56309fc159 100644 --- a/src/renderer/src/hooks/editor-external-watch-target-rows.ts +++ b/src/renderer/src/hooks/editor-external-watch-target-rows.ts @@ -6,7 +6,7 @@ import { parseExecutionHostId, type ExecutionHostId } from '../../../shared/execution-host' -import { resolveQualifiedWorktreeExecutionOwner } from '@/lib/qualified-worktree-execution-owner' +import { resolveQualifiedWorktreeExecutionOwner } from '@/lib/workspace/ownership/qualified-worktree-execution-owner' import { parseWorkspaceKey } from '../../../shared/workspace-scope' import { resolveQualifiedIndexedFolderWorkspace } from '@/store/folder-workspaces/folder-workspace-record-index' import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields' diff --git a/src/renderer/src/hooks/ipc-events-test-harness.ts b/src/renderer/src/hooks/ipc-events-test-harness.ts index 0b4661fb38e..ea149cd7d49 100644 --- a/src/renderer/src/hooks/ipc-events-test-harness.ts +++ b/src/renderer/src/hooks/ipc-events-test-harness.ts @@ -136,7 +136,9 @@ export async function loadIpcEventsHarness( vi.doMock('@/runtime/hosted-terminals/mounted-surfaces/mounted-terminal-tab-registry', () => ({ focusRuntimeTerminalSurface: vi.fn(() => false) })) - vi.doMock('@/lib/activate-tab-and-focus-pane', () => ({ activateTabAndFocusPane: vi.fn() })) + vi.doMock('@/lib/workspace/tabs/activate-tab-and-focus-pane', () => ({ + activateTabAndFocusPane: vi.fn() + })) vi.stubGlobal('window', { dispatchEvent: vi.fn(), diff --git a/src/renderer/src/hooks/ipc-events/browser-request-workspace-owner.ts b/src/renderer/src/hooks/ipc-events/browser-request-workspace-owner.ts index 481bfed59aa..444a65f5f3b 100644 --- a/src/renderer/src/hooks/ipc-events/browser-request-workspace-owner.ts +++ b/src/renderer/src/hooks/ipc-events/browser-request-workspace-owner.ts @@ -1,5 +1,5 @@ -import { resolveOwner } from '@/lib/resolve-owner' -import type { WorktreeOperationRouteState } from '@/lib/worktree-operation-route' +import { resolveOwner } from '@/lib/workspace/ownership/resolve-owner' +import type { WorktreeOperationRouteState } from '@/lib/workspace/ownership/worktree-operation-route' import type { AppState } from '../../store/types' /** Refuse desktop-runtime browser commands where a paired server owns or may own the workspace; its page registry is authoritative. */ diff --git a/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts index a75cb4e9c16..40fe84e4a69 100644 --- a/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts +++ b/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts @@ -6,7 +6,7 @@ import { followWorkspaceSleep } from '@/components/sidebar/workspace-actions/sle import { createProjectMovePauseFollower } from '@/components/sidebar/project-move-pause-follower' import { buildWorkspaceSessionPayload } from '@/lib/workspace/persistence/workspace-session' import { persistWorkspaceSessionByHost } from '@/lib/workspace/persistence/workspace-session-host-persistence' -import { revealWorkspaceSurface } from '@/lib/workspace-surface-reveal' +import { revealWorkspaceSurface } from '@/lib/workspace/activation/workspace-surface-reveal' import { selectFloatingWorkspacePanelVisible } from '@/store/workspaces/floating/floating-workspace-panel-selector' import { isFloatingWorkspaceId } from '../../../../shared/floating-workspace-worktree' import { useAppStore } from '../../store' diff --git a/src/renderer/src/hooks/ipc-events/ssh-managed-server-state-effects.ts b/src/renderer/src/hooks/ipc-events/ssh-managed-server-state-effects.ts index b0e3f249a75..683daf73f30 100644 --- a/src/renderer/src/hooks/ipc-events/ssh-managed-server-state-effects.ts +++ b/src/renderer/src/hooks/ipc-events/ssh-managed-server-state-effects.ts @@ -15,7 +15,7 @@ import { import { toastSshHostMoveRefused } from './ssh-managed-server-refusal-toast' import { useAppStore } from '../../store' import { withoutConvertedSshHostRows } from '../../store/repos/converted-ssh-host-rows' -import { rekeyWorktreeVisitHost } from '@/lib/worktree-visit-recency' +import { rekeyWorktreeVisitHost } from '@/lib/workspace/activation/worktree-visit-recency' import { preserveConvertedSshBrowserPages } from '../../store/repos/converted-ssh-browser-pages' import { selectDetectedWorktreesByRepo, diff --git a/src/renderer/src/hooks/ipc-events/terminal-pane-reveal-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-pane-reveal-ipc-bridge.ts index eb0511bb14b..12941e1658e 100644 --- a/src/renderer/src/hooks/ipc-events/terminal-pane-reveal-ipc-bridge.ts +++ b/src/renderer/src/hooks/ipc-events/terminal-pane-reveal-ipc-bridge.ts @@ -1,5 +1,5 @@ import { revealTerminalPane } from '@/lib/reveal-terminal-pane' -import { runtimeEnvironmentIdUnlessTwin } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' import { useAppStore } from '../../store' import { parseExecutionHostId } from '../../../../shared/execution-host' import type { TerminalPaneRevealTarget } from '../../../../shared/workspace-layout/terminal-pane-reveal' diff --git a/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts index 9e45f6beeec..304cf3cc324 100644 --- a/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts +++ b/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts @@ -11,7 +11,7 @@ import { insertUnifiedTabAfterAnchor } from '@/lib/unified-tab-anchor-insertion' import { tryMakePaneKey } from './agent-status-routing' import { registerLaunchRecipe } from './launch-recipe-registration' import { wasAgentLaunchPaneClosedByUser } from '@/lib/agent-session/launch/pane/agent-launch-pane-closes' -import { revealWorkspaceSurface } from '@/lib/workspace-surface-reveal' +import { revealWorkspaceSurface } from '@/lib/workspace/activation/workspace-surface-reveal' import { useAppStore } from '../../store' import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch' import { diff --git a/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge.ts index 9d644b6e8f2..05e650de3d4 100644 --- a/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge.ts +++ b/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge.ts @@ -2,7 +2,7 @@ import { requestBackgroundTerminalWorktreeMount } from '@/components/terminal/ba import { resolveTerminalWorktreeRoute } from '@/lib/terminal-worktree-route' import { insertUnifiedTabAfterAnchor } from '@/lib/unified-tab-anchor-insertion' import { translate } from '@/i18n/i18n' -import { revealWorkspaceSurface } from '@/lib/workspace-surface-reveal' +import { revealWorkspaceSurface } from '@/lib/workspace/activation/workspace-surface-reveal' import { useAppStore } from '../../store' import { focusTerminalInitiatedTab, resolveTerminalPresentation } from './terminal-command-state' diff --git a/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts index 14537398d49..80029ac0ba8 100644 --- a/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts +++ b/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts @@ -5,12 +5,12 @@ import { queueTerminalPaneSplitRequest } from '@/components/terminal-pane/layout/split/terminal-pane-split-request-routing' import { hasRegisteredRuntimeTerminalTab } from '@/runtime/hosted-terminals/mounted-surfaces/mounted-terminal-tab-registry' -import { activateTabAndFocusPane } from '@/lib/activate-tab-and-focus-pane' +import { activateTabAndFocusPane } from '@/lib/workspace/tabs/activate-tab-and-focus-pane' import { useAppStore } from '../../store' import type { AppState } from '../../store/types' import { resolveBrowserSessionTabTarget } from './browser-session-tab-target' import { resolveWindowTabIdForHostTab } from './host-session-tab-target' -import { revealWorkspaceSurface } from '@/lib/workspace-surface-reveal' +import { revealWorkspaceSurface } from '@/lib/workspace/activation/workspace-surface-reveal' import { focusTerminalInitiatedTab } from './terminal-command-state' import { applyRuntimePaneTitle } from './terminal-pane-title-ipc-bridge' diff --git a/src/renderer/src/hooks/ipc-events/worktree-event-runtime.ts b/src/renderer/src/hooks/ipc-events/worktree-event-runtime.ts index 390e25f62eb..50ae0ebeabe 100644 --- a/src/renderer/src/hooks/ipc-events/worktree-event-runtime.ts +++ b/src/renderer/src/hooks/ipc-events/worktree-event-runtime.ts @@ -22,7 +22,7 @@ import { captureWorkspaceSelection, isWorkspaceSelected, restoreWorkspaceSelection -} from '@/lib/active-workspace-host' +} from '@/lib/workspace/ownership/active-workspace-host' import { invalidateRemoteWorktreeLineage, isRemoteWorktreeLineageFresh diff --git a/src/renderer/src/hooks/ipc-events/wsl-host-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/wsl-host-ipc-bridge.ts index 8ce374bb37a..5e3f340f7b7 100644 --- a/src/renderer/src/hooks/ipc-events/wsl-host-ipc-bridge.ts +++ b/src/renderer/src/hooks/ipc-events/wsl-host-ipc-bridge.ts @@ -2,7 +2,7 @@ import { selectWslHostsServing } from '@/components/sidebar/use-wsl-hosts-enable import type { WslHostCapability, WslHostStatus } from '../../../../shared/wsl-host-types' import { isWslHostRuntimeEnvironment } from '../../../../shared/remote-runtime/host-catalog/runtime-environments' import { parseExecutionHostId } from '../../../../shared/execution-host' -import { workspaceOwnerHostId } from '../../lib/workspace-row-owner-host' +import { workspaceOwnerHostId } from '../../lib/workspace/ownership/workspace-row-owner-host' import type { AppState } from '../../store/types' import { useAppStore } from '../../store' import { selectFolderWorkspaces } from '@/store/workspaces/catalog/workspace-record-fields' diff --git a/src/renderer/src/hooks/ipc-tab-switch-structured-tab-cycle.test.ts b/src/renderer/src/hooks/ipc-tab-switch-structured-tab-cycle.test.ts index 08938a241e5..084b319c6b5 100644 --- a/src/renderer/src/hooks/ipc-tab-switch-structured-tab-cycle.test.ts +++ b/src/renderer/src/hooks/ipc-tab-switch-structured-tab-cycle.test.ts @@ -9,7 +9,9 @@ import { buildActiveSurfacePatch } from '../store/slices/tabs/tabs-surface' const mocks = vi.hoisted(() => ({ getState: vi.fn() })) vi.mock('../store', () => ({ useAppStore: { getState: mocks.getState } })) -vi.mock('@/lib/cycled-tab-owner-activation', () => ({ activateCycledTabOnOwner: vi.fn() })) +vi.mock('@/lib/workspace/tabs/cycled-tab-owner-activation', () => ({ + activateCycledTabOnOwner: vi.fn() +})) vi.mock('@/lib/focus-terminal-tab-surface', () => ({ focusTerminalTabSurface: vi.fn() })) import { handleSwitchTerminalTab } from './ipc-tab-switch' diff --git a/src/renderer/src/hooks/ipc-tab-switch.ts b/src/renderer/src/hooks/ipc-tab-switch.ts index 1d9843cf5f9..e589004a7dc 100644 --- a/src/renderer/src/hooks/ipc-tab-switch.ts +++ b/src/renderer/src/hooks/ipc-tab-switch.ts @@ -9,7 +9,7 @@ import { getPreviousRecentTab, type TypeCyclableTab } from '@/components/terminal/tab-type-cycle' -import { activateCycledTabOnOwner } from '@/lib/cycled-tab-owner-activation' +import { activateCycledTabOnOwner } from '@/lib/workspace/tabs/cycled-tab-owner-activation' type AppStoreState = ReturnType diff --git a/src/renderer/src/hooks/use-active-skill-discovery-runtime-target.ts b/src/renderer/src/hooks/use-active-skill-discovery-runtime-target.ts index 7dd1d5093d3..7d596c09828 100644 --- a/src/renderer/src/hooks/use-active-skill-discovery-runtime-target.ts +++ b/src/renderer/src/hooks/use-active-skill-discovery-runtime-target.ts @@ -1,5 +1,5 @@ import { useMemo } from 'react' -import { getSingleFocusedRuntimeEnvironmentId } from '@/lib/single-runtime-legacy-owner' +import { getSingleFocusedRuntimeEnvironmentId } from '@/lib/workspace/ownership/single-runtime-legacy-owner' import { runtimeTargetForOwnerEnvironment } from '@/runtime/rpc/targets/runtime-client-target' import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' import { useAppStore } from '@/store' diff --git a/src/renderer/src/hooks/useAgentDetectionTarget.ts b/src/renderer/src/hooks/useAgentDetectionTarget.ts index de06fd4ed4a..0218bc117df 100644 --- a/src/renderer/src/hooks/useAgentDetectionTarget.ts +++ b/src/renderer/src/hooks/useAgentDetectionTarget.ts @@ -1,8 +1,8 @@ import { useAppStateValue } from '@/store/retained-views/app-state-view' import { useMemo } from 'react' -import { getConnectionIdFromState } from '@/lib/connection-owner-resolution' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner' -import { runtimeEnvironmentIdForWorkspaceOwner } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdForWorkspaceOwner } from '@/lib/workspace/ownership/resolve-owner' import type { WorktreeRuntimeOwnerState } from '@/lib/workspace/ownership/worktree-runtime-owner-state' import { getResolvedExecutionHostIdForWorktree } from '@/lib/resolved-worktree-execution-host' import { parseExecutionHostId } from '../../../shared/execution-host' diff --git a/src/renderer/src/hooks/useEditorExternalWatch-switch-back.test.tsx b/src/renderer/src/hooks/useEditorExternalWatch-switch-back.test.tsx index 50d305add56..71f241cca53 100644 --- a/src/renderer/src/hooks/useEditorExternalWatch-switch-back.test.tsx +++ b/src/renderer/src/hooks/useEditorExternalWatch-switch-back.test.tsx @@ -43,7 +43,9 @@ vi.mock('./editor-external-watch-targets', async (importOriginal) => ({ vi.mock('@/runtime/files/reads/runtime-file-read-client', () => ({ readRuntimeFileContent: harness.readRuntimeFileContent })) -vi.mock('@/lib/connection-context', () => ({ getConnectionIdForFile: () => undefined })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionIdForFile: () => undefined +})) import { createTestStore } from '@/store/testing/app-store-test-fixture' import { useEditorExternalWatch } from './useEditorExternalWatch' diff --git a/src/renderer/src/hooks/useEditorExternalWatch-targets.test.ts b/src/renderer/src/hooks/useEditorExternalWatch-targets.test.ts index c4f43d419da..a6f4a9f1174 100644 --- a/src/renderer/src/hooks/useEditorExternalWatch-targets.test.ts +++ b/src/renderer/src/hooks/useEditorExternalWatch-targets.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it, vi } from 'vitest' -import { captureWorktreeOperationGenerationSnapshot } from '@/lib/worktree-operation-generation' +import { captureWorktreeOperationGenerationSnapshot } from '@/lib/workspace/ownership/worktree-operation-generation' import type { EditorFileOperationProvenance } from '@/lib/editor-file-operation-provenance' import { selectEditorExternalWatchTargets as getEditorExternalWatchTargets, diff --git a/src/renderer/src/hooks/useIssueMetadata.ts b/src/renderer/src/hooks/useIssueMetadata.ts index 9ae052e5110..b20ceb68d96 100644 --- a/src/renderer/src/hooks/useIssueMetadata.ts +++ b/src/renderer/src/hooks/useIssueMetadata.ts @@ -5,7 +5,7 @@ import { linearTeamStates } from '@/runtime/linear/runtime-linear-project-client' import { getLinearRuntimeTarget } from '@/runtime/linear/runtime-linear-client' -import type { RowLessSource as RuntimeLinearSettings } from '@/lib/default-creation-host' +import type { RowLessSource as RuntimeLinearSettings } from '@/runtime/hosts/selection/default-creation-host' import type { LinearLabel, LinearMember, diff --git a/src/renderer/src/hooks/useLinearIssuePublication.ts b/src/renderer/src/hooks/useLinearIssuePublication.ts index 787a1840c37..4a77c8e7898 100644 --- a/src/renderer/src/hooks/useLinearIssuePublication.ts +++ b/src/renderer/src/hooks/useLinearIssuePublication.ts @@ -1,7 +1,7 @@ import { useAppStore } from '@/store' import { useCallback, useLayoutEffect, useMemo, useRef } from 'react' import type { LinearIssue } from '../../../shared/linear/issue-types' -import type { RowLessSource as RuntimeLinearSettings } from '@/lib/default-creation-host' +import type { RowLessSource as RuntimeLinearSettings } from '@/runtime/hosts/selection/default-creation-host' import { getLinearSourceScope } from '@/store/slices/linear/linear-slice-scope' import { registerLinearIssueConsumer, diff --git a/src/renderer/src/hooks/useSettingsNavigationMetadata.ts b/src/renderer/src/hooks/useSettingsNavigationMetadata.ts index 042e2054a9c..9f21eb66b31 100644 --- a/src/renderer/src/hooks/useSettingsNavigationMetadata.ts +++ b/src/renderer/src/hooks/useSettingsNavigationMetadata.ts @@ -16,7 +16,7 @@ import { isWindowsTerminalCapabilityHost, useWindowsTerminalCapabilities } from '@/lib/windows-terminal-capabilities' -import { defaultScopeHost } from '@/lib/default-creation-host' +import { defaultScopeHost } from '@/runtime/hosts/selection/default-creation-host' import { useAppStore } from '@/store' import { useProjectHostSetupProjection } from '@/store/projects/use-project-host-setup-projection' import { diff --git a/src/renderer/src/lib/activate-ai-vault-structured-session-host.test.ts b/src/renderer/src/lib/activate-ai-vault-structured-session-host.test.ts index d4ebad99089..be489e4d00a 100644 --- a/src/renderer/src/lib/activate-ai-vault-structured-session-host.test.ts +++ b/src/renderer/src/lib/activate-ai-vault-structured-session-host.test.ts @@ -26,7 +26,9 @@ vi.mock('@/runtime/local-structured-session-tabs-sync/inventory-refresh', () => vi.mock('./workspace/activation/worktree-activation', () => ({ activateAndRevealWorktree: mocks.navigate })) -vi.mock('./wsl-moved-chat-activation', () => ({ activateWslMovedWorkspace: mocks.moved })) +vi.mock('./workspace/activation/wsl-moved-chat-activation', () => ({ + activateWslMovedWorkspace: mocks.moved +})) vi.mock('@/store', () => ({ useAppStore: { getState: () => ({ diff --git a/src/renderer/src/lib/activate-ai-vault-structured-session.ts b/src/renderer/src/lib/activate-ai-vault-structured-session.ts index 1908996195d..bf3820bafd0 100644 --- a/src/renderer/src/lib/activate-ai-vault-structured-session.ts +++ b/src/renderer/src/lib/activate-ai-vault-structured-session.ts @@ -13,7 +13,7 @@ import { showAgentPaneUnavailable } from '@/components/terminal-pane/agent-statu import { translate } from '@/i18n/i18n' import { toast } from 'sonner' import { activateAndRevealWorktree } from './workspace/activation/worktree-activation' -import { activateWslMovedWorkspace } from './wsl-moved-chat-activation' +import { activateWslMovedWorkspace } from './workspace/activation/wsl-moved-chat-activation' import { useAppStore } from '@/store' export { revealStructuredSession, diff --git a/src/renderer/src/lib/agent-launch-failure.ts b/src/renderer/src/lib/agent-launch-failure.ts index 2549857f593..180933738bf 100644 --- a/src/renderer/src/lib/agent-launch-failure.ts +++ b/src/renderer/src/lib/agent-launch-failure.ts @@ -2,7 +2,7 @@ import { toast } from 'sonner' import { translate } from '@/i18n/i18n' import { getAgentLabel } from '@/lib/agent-catalog' import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' -import type { ExecutionHostPlatformFact } from './execution-host-facts' +import type { ExecutionHostPlatformFact } from '../runtime/hosts/platform/execution-host-platform-fact' type Recovery = Extract['recovery'] diff --git a/src/renderer/src/lib/agent-session/accounts/agent-account-restart-startup.ts b/src/renderer/src/lib/agent-session/accounts/agent-account-restart-startup.ts index 6de22dd2f3c..94e06a73411 100644 --- a/src/renderer/src/lib/agent-session/accounts/agent-account-restart-startup.ts +++ b/src/renderer/src/lib/agent-session/accounts/agent-account-restart-startup.ts @@ -1,4 +1,4 @@ -import { getConnectionIdFromState } from '@/lib/connection-owner-resolution' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { useAppStore } from '@/store/index' import type { AppState } from '@/store/types' import { buildAgentResumeStartupPlan } from '../../../../../shared/agent-launch/startup/tui-agent-resume-startup' @@ -10,7 +10,7 @@ import { type AgentResumeLaunchTarget } from '@/lib/agent-resume-launch-target' import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner' -import { runtimeEnvironmentIdUnlessTwin } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context' import { repoMatchesHostIdentity } from '@/store/repos/repo-host-identity' import { isSessionHeldByAnotherPane } from '@/lib/agent-session/identity/claude-session-pane-holders' diff --git a/src/renderer/src/lib/agent-session/accounts/codex/codex-session-restart-shell-flap.test.ts b/src/renderer/src/lib/agent-session/accounts/codex/codex-session-restart-shell-flap.test.ts index 529ad6c094d..0350c751878 100644 --- a/src/renderer/src/lib/agent-session/accounts/codex/codex-session-restart-shell-flap.test.ts +++ b/src/renderer/src/lib/agent-session/accounts/codex/codex-session-restart-shell-flap.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { useAppStore } from '@/store/index' -import { defaultScopeHost } from '@/lib/default-creation-host' +import { defaultScopeHost } from '@/runtime/hosts/selection/default-creation-host' // Why: these cases model a switch made on the focused host, as the status bar does. const focusedOwner = () => defaultScopeHost(useAppStore.getState().settings) diff --git a/src/renderer/src/lib/agent-session/accounts/codex/codex-session-restart.test.ts b/src/renderer/src/lib/agent-session/accounts/codex/codex-session-restart.test.ts index 4c5f3f87e93..6563f209e9e 100644 --- a/src/renderer/src/lib/agent-session/accounts/codex/codex-session-restart.test.ts +++ b/src/renderer/src/lib/agent-session/accounts/codex/codex-session-restart.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { useAppStore } from '@/store/index' -import { defaultScopeHost } from '@/lib/default-creation-host' +import { defaultScopeHost } from '@/runtime/hosts/selection/default-creation-host' // Why: these cases model a switch made on the focused host, as the status bar does. const markForFocusedHost = ( diff --git a/src/renderer/src/lib/agent-session/history/title-sync/ai-vault-tab-title-sync-inputs.ts b/src/renderer/src/lib/agent-session/history/title-sync/ai-vault-tab-title-sync-inputs.ts index 4e4313f7a4c..d83da3114cf 100644 --- a/src/renderer/src/lib/agent-session/history/title-sync/ai-vault-tab-title-sync-inputs.ts +++ b/src/renderer/src/lib/agent-session/history/title-sync/ai-vault-tab-title-sync-inputs.ts @@ -6,7 +6,7 @@ import { import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner' import type { AppState } from '@/store/types' import { collectAiVaultTitleRequests } from './ai-vault-tab-title-requests' -import { worktreeOwnerRowsTokenOf } from '../../../worktree-owner-rows-token' +import { worktreeOwnerRowsTokenOf } from '../../../workspace/ownership/worktree-owner-rows-token' import { selectDetectedWorktreesByRepo, selectFolderWorkspaces, diff --git a/src/renderer/src/lib/agent-session/launch/continuation/launch-agent-session-continuation.ts b/src/renderer/src/lib/agent-session/launch/continuation/launch-agent-session-continuation.ts index 1eb7e62e0cd..5c4f1f7ceb2 100644 --- a/src/renderer/src/lib/agent-session/launch/continuation/launch-agent-session-continuation.ts +++ b/src/renderer/src/lib/agent-session/launch/continuation/launch-agent-session-continuation.ts @@ -22,7 +22,7 @@ import type { AgentLaunchRoute } from '@/lib/agent-session/launch/routing/agent- import { translate } from '@/i18n/i18n' import { resolveWorktreeDisplayName } from '@/lib/worktree-default-display-name' import { getResolvedExecutionHostIdForWorktree } from '@/lib/resolved-worktree-execution-host' -import { workspaceNavigationToastAction } from '@/lib/workspace-navigation-toast-action' +import { workspaceNavigationToastAction } from '@/lib/workspace/activation/workspace-navigation-toast-action' type LaunchAgentSessionContinuationArgs = { agent: TuiAgent diff --git a/src/renderer/src/lib/agent-session/launch/new-tab/agent-launch-caller-prompt-transport.test.ts b/src/renderer/src/lib/agent-session/launch/new-tab/agent-launch-caller-prompt-transport.test.ts index 2e0d3a204ee..b331c0db77e 100644 --- a/src/renderer/src/lib/agent-session/launch/new-tab/agent-launch-caller-prompt-transport.test.ts +++ b/src/renderer/src/lib/agent-session/launch/new-tab/agent-launch-caller-prompt-transport.test.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { createLaunchFunnelStore, resetLaunchFunnelStore } from './agent-launch-funnel-test-harness' -import type * as LaunchConnectionOwnerModule from '../../../connection-owner-resolution' +import type * as LaunchConnectionOwnerModule from '../../../workspace/ownership/connection-owner-resolution' import type * as LaunchAgentKindModule from '../../../../../../shared/agent-kind' const store = createLaunchFunnelStore() @@ -12,9 +12,11 @@ const mockPasteDraftWhenAgentReady = vi.fn<(request: Record) => vi.mock('@/store/index', () => ({ useAppStore: { getState: () => store } })) vi.mock('@/lib/new-workspace', () => ({ CLIENT_PLATFORM: 'darwin' })) -vi.mock('@/lib/connection-context', () => ({ getConnectionIdFromState: mockLaunchConnectionId })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionIdFromState: mockLaunchConnectionId +})) const mockLaunchConnectionId = vi.hoisted(() => () => null) -vi.mock('../../../connection-owner-resolution', async (importOriginal) => ({ +vi.mock('../../../workspace/ownership/connection-owner-resolution', async (importOriginal) => ({ ...(await importOriginal()), getConnectionIdFromState: mockLaunchConnectionId })) diff --git a/src/renderer/src/lib/agent-session/launch/new-tab/agent-launch-caller-routing.test.ts b/src/renderer/src/lib/agent-session/launch/new-tab/agent-launch-caller-routing.test.ts index db981584988..e05b76b008e 100644 --- a/src/renderer/src/lib/agent-session/launch/new-tab/agent-launch-caller-routing.test.ts +++ b/src/renderer/src/lib/agent-session/launch/new-tab/agent-launch-caller-routing.test.ts @@ -8,7 +8,7 @@ import { import { createLaunchFunnelStore, resetLaunchFunnelStore } from './agent-launch-funnel-test-harness' import type * as LaunchAdmissionModule from '../structured-agent-session-launch-admission' -import type * as LaunchConnectionOwnerModule from '../../../connection-owner-resolution' +import type * as LaunchConnectionOwnerModule from '../../../workspace/ownership/connection-owner-resolution' import type * as LaunchAgentKindModule from '../../../../../../shared/agent-kind' const store = createLaunchFunnelStore() @@ -22,9 +22,11 @@ const mockExecutionHostId = vi.fn(() => 'local') vi.mock('@/store/index', () => ({ useAppStore: { getState: () => store } })) vi.mock('@/lib/new-workspace', () => ({ CLIENT_PLATFORM: 'darwin' })) -vi.mock('@/lib/connection-context', () => ({ getConnectionIdFromState: mockLaunchConnectionId })) +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ + getConnectionIdFromState: mockLaunchConnectionId +})) const mockLaunchConnectionId = vi.hoisted(() => () => null) -vi.mock('../../../connection-owner-resolution', async (importOriginal) => ({ +vi.mock('../../../workspace/ownership/connection-owner-resolution', async (importOriginal) => ({ ...(await importOriginal()), getConnectionIdFromState: mockLaunchConnectionId })) diff --git a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-execution-context.ts b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-execution-context.ts index bcd6ca5c00f..762916df7f6 100644 --- a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-execution-context.ts +++ b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-execution-context.ts @@ -1,17 +1,17 @@ import type { AgentStartupShell } from '../../../../../../shared/agent-launch/startup/tui-agent-startup-shell' import { launchHostIsRemote } from '../../../../../../shared/agent-launch/startup/agent-launch-remote' -import '@/lib/connection-context' +import '@/lib/workspace/ownership/connection-context' import { getConnectionIdFromState, getConnectionIdForWorktreeCopy -} from '@/lib/connection-owner-resolution' +} from '@/lib/workspace/ownership/connection-owner-resolution' import type { LaunchAgentInNewTabArgs } from './launch-agent-in-new-tab-args' import { - type ExecutionHostPlatformFact, refineLocalLaunchPlatform, resolveExecutionHostAgentStartupShell, resolveWorktreeExecutionHostPlatform -} from '@/lib/execution-host-facts' +} from '@/runtime/hosts/platform/execution-host-facts' +import type { ExecutionHostPlatformFact } from '@/runtime/hosts/platform/execution-host-platform-fact' import type { useAppStore } from '@/store/index' export type AgentLaunchExecutionContext = { diff --git a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-main-surface.test.ts b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-main-surface.test.ts index b9e5ee10ff8..7e2f654fc3f 100644 --- a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-main-surface.test.ts +++ b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-main-surface.test.ts @@ -102,7 +102,8 @@ describe('launchAgentInNewTab main-window surface', () => { const { settleAgentTabLaunch } = await import('./launch-agent-in-new-tab-host-agents') const { activateAndRevealWorkspaceWithOutcome } = await import('@/lib/workspace/activation/worktree-activation') - const { reportAgentWorkspaceActivation } = await import('@/lib/worktree-activation-outcome') + const { reportAgentWorkspaceActivation } = + await import('@/lib/workspace/activation/worktree-activation-outcome') const reveal = vi.fn(() => reportAgentWorkspaceActivation( activateAndRevealWorkspaceWithOutcome(id, { diff --git a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-tab-refusal.ts b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-tab-refusal.ts index 513077383e1..13a73aa6a6c 100644 --- a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-tab-refusal.ts +++ b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-tab-refusal.ts @@ -1,5 +1,5 @@ import { agentLaunchRecoveryMessage, notifyAgentLaunchFailure } from '@/lib/agent-launch-failure' -import type { ExecutionHostPlatformFact } from '@/lib/execution-host-facts' +import type { ExecutionHostPlatformFact } from '@/runtime/hosts/platform/execution-host-platform-fact' import type { LaunchAgentInNewTabArgs } from './launch-agent-in-new-tab-args' import type { AgentTabLaunchOutcome } from './launch-agent-in-new-tab-host-agents' diff --git a/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-main-written.test.ts b/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-main-written.test.ts index 585dd852040..a0f39e6d9d9 100644 --- a/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-main-written.test.ts +++ b/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-main-written.test.ts @@ -43,7 +43,9 @@ vi.mock('@/runtime/workspace-layout/frames/layout-frame-terminal-panes', () => ( layoutFrameTerminalTab: () => (frames.holdsTab ? { id: 'main-tab' } : undefined) })) const revealWorkspaceSurface = vi.hoisted(() => vi.fn()) -vi.mock('../../../workspace-surface-reveal', () => ({ revealWorkspaceSurface })) +vi.mock('../../../workspace/activation/workspace-surface-reveal', () => ({ + revealWorkspaceSurface +})) createTabsSliceMockApi() diff --git a/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-main-written.ts b/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-main-written.ts index 12d6206b36c..22fe9d4cc2a 100644 --- a/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-main-written.ts +++ b/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-main-written.ts @@ -12,7 +12,7 @@ import { forgetAgentLaunchPanePrompt, rememberAgentLaunchPanePrompt } from './agent-launch-pane-prompt' -import { revealWorkspaceSurface } from '../../../workspace-surface-reveal' +import { revealWorkspaceSurface } from '../../../workspace/activation/workspace-surface-reveal' import { layoutFramesFlowing } from '@/runtime/workspace-layout/frames/layout-frame-position' import { layoutFrameTerminalTab } from '@/runtime/workspace-layout/frames/layout-frame-terminal-panes' diff --git a/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-presentation.ts b/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-presentation.ts index bb41fc5aaaa..51ecebb1db2 100644 --- a/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-presentation.ts +++ b/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-presentation.ts @@ -1,7 +1,7 @@ import type { AgentLaunchTabViewerRule } from '../../../../../../shared/agent-launch/contracts/agent-launch-tab-publication' import { focusTerminalInitiatedTab } from '../../../../hooks/ipc-events/terminal-command-state' import { useAppStore } from '../../../../store/index' -import { revealWorkspaceSurface } from '../../../workspace-surface-reveal' +import { revealWorkspaceSurface } from '../../../workspace/activation/workspace-surface-reveal' /** Early publication and host reveal move the same viewer, under the same policy. */ export function presentAgentLaunchTab( diff --git a/src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-input.test.ts b/src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-input.test.ts index 264a73d2980..1c8a801cbd3 100644 --- a/src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-input.test.ts +++ b/src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-input.test.ts @@ -6,7 +6,7 @@ import { STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY } from '../../../../../../shared/agent-session/agent-session-runtime-capabilities' import type { ProjectExecutionRuntimeResolution } from '../../../../../../shared/execution-host/project-execution-runtime' -import type * as ConnectionOwnerResolutionModule from '../../../connection-owner-resolution' +import type * as ConnectionOwnerResolutionModule from '../../../workspace/ownership/connection-owner-resolution' const mocks = vi.hoisted(() => ({ getExecutionHostIdForWorktree: vi.fn(), @@ -21,7 +21,7 @@ vi.mock('@/lib/workspace/ownership/worktree-runtime-owner', () => ({ getExecutionHostIdForWorktree: mocks.getExecutionHostIdForWorktree })) // Stage only workspace ownership; repo fallback must use the real resolver. -vi.mock('@/lib/connection-owner-resolution', async (importOriginal) => ({ +vi.mock('@/lib/workspace/ownership/connection-owner-resolution', async (importOriginal) => ({ ...(await importOriginal()), getConnectionIdFromState: mocks.getConnectionIdFromState })) diff --git a/src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-input.ts b/src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-input.ts index 70e8944d33f..84ba26b20bb 100644 --- a/src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-input.ts +++ b/src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-input.ts @@ -15,7 +15,7 @@ import type { AgentLaunchRoutingInput } from '@/lib/agent-session/launch/routing import { getConnectionIdFromState, getRepoConnectionIdFromState -} from '@/lib/connection-owner-resolution' +} from '@/lib/workspace/ownership/connection-owner-resolution' import { getLocalProjectExecutionRuntimeContext, getLocalRepoProjectExecutionRuntimeContext diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-admission-notices.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-admission-notices.ts index 21820a90ad0..1ec0b758fcc 100644 --- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-admission-notices.ts +++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-admission-notices.ts @@ -5,7 +5,7 @@ import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-ag import type { ExecutionHostId } from '../../../../../shared/execution-host' import { translate } from '@/i18n/i18n' import { useAppStore } from '@/store/index' -import { selectExecutionHostDisplayLabel } from '@/lib/execution-host-display-label' +import { selectExecutionHostDisplayLabel } from '@/runtime/hosts/display/execution-host-display-label' import { structuredAgentLabel } from '@/lib/agent-session/launch/structured-agent-session-launch-label' import { structuredChatUnavailableText } from '@/lib/agent-session/launch/structured-agent-session-launch-failure' diff --git a/src/renderer/src/lib/agent-session/resume/history/ai-vault-resume-platform.ts b/src/renderer/src/lib/agent-session/resume/history/ai-vault-resume-platform.ts index f2362c47de7..81aa282e883 100644 --- a/src/renderer/src/lib/agent-session/resume/history/ai-vault-resume-platform.ts +++ b/src/renderer/src/lib/agent-session/resume/history/ai-vault-resume-platform.ts @@ -2,7 +2,7 @@ import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-co import { CLIENT_PLATFORM } from '@/lib/new-workspace' import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner' import { getAiVaultResumeWorkspacePath } from '@/lib/agent-session/resume/history/ai-vault-resume-shell' -import { resolveWorktreeExecutionHostPlatform } from '@/lib/execution-host-facts' +import { resolveWorktreeExecutionHostPlatform } from '@/runtime/hosts/platform/execution-host-facts' import { parseExecutionHostId } from '../../../../../../shared/execution-host' import { parseWslUncPath } from '../../../../../../shared/wsl-paths' diff --git a/src/renderer/src/lib/agent-session/resume/history/ai-vault-resume-shell.ts b/src/renderer/src/lib/agent-session/resume/history/ai-vault-resume-shell.ts index 64c5ede2dcc..54657b86fa3 100644 --- a/src/renderer/src/lib/agent-session/resume/history/ai-vault-resume-shell.ts +++ b/src/renderer/src/lib/agent-session/resume/history/ai-vault-resume-shell.ts @@ -1,6 +1,7 @@ import type { AppState } from '@/store/types' import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context' -import { getFolderWorkspaceCandidateRepos } from '../../../folder-workspace-connection' +import '../../../workspace/ownership/folder-workspace-connection' +import { findFolderWorkspaceCandidateRepos } from '../../../../../../shared/folder-workspaces/folder-workspace-execution-host' import { getAiVaultResumeWorkspaceExecutionHostId } from './ai-vault-resume-target' import { LOCAL_EXECUTION_HOST_ID } from '../../../../../../shared/execution-host' import { CLIENT_PLATFORM } from '@/lib/new-workspace' @@ -109,7 +110,9 @@ export function getAiVaultResumeWorkspaceWslDistro( ) { return null } - if (getFolderWorkspaceCandidateRepos(runtimeState, workspaceKey.folderWorkspaceId).length > 1) { + if ( + findFolderWorkspaceCandidateRepos(runtimeState, workspaceKey.folderWorkspaceId).length > 1 + ) { return undefined } } diff --git a/src/renderer/src/lib/agent-session/resume/host-mirrored-pane-liveness.ts b/src/renderer/src/lib/agent-session/resume/host-mirrored-pane-liveness.ts index 0168e4cfa3e..fead3ee0b4c 100644 --- a/src/renderer/src/lib/agent-session/resume/host-mirrored-pane-liveness.ts +++ b/src/renderer/src/lib/agent-session/resume/host-mirrored-pane-liveness.ts @@ -8,7 +8,7 @@ import { import { isWebTerminalSurfaceTabId } from '../../../../../shared/workspace-layout/terminal-surface-id' import { hasHostSessionMirrorHydrated } from '@/runtime/web-session-tabs-sync/hydration/host-session-mirror-hydration' import { hasHostMirrorHandleWaitExpired } from '../../host-mirror-handle-gap-wait' -import { runtimeEnvironmentIdForWorkspaceOwner } from '../../resolve-owner' +import { runtimeEnvironmentIdForWorkspaceOwner } from '../../workspace/ownership/resolve-owner' import { warnAmbiguousOwnerOnce } from '../../ambiguous-owner-warning' type AppStoreState = ReturnType diff --git a/src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.ts b/src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.ts index a6f77d4183c..e339e44d40a 100644 --- a/src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.ts +++ b/src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.ts @@ -31,7 +31,7 @@ import { sleepingRecordHostAllowsSessionClaim, sleepingRecordNamesAnotherExecutionHost } from './sleeping-record-execution-host-scope' -import { resolveWorkspaceTerminalHostAuthority } from '../../workspace-terminal-host-authority' +import { resolveWorkspaceTerminalHostAuthority } from '../../workspace/ownership/workspace-terminal-host-authority' import { parkUntilHostSessionMirrorHydrates } from '@/runtime/web-session-tabs-sync/hydration/host-session-mirror-hydration' function clearPassiveCompletedRecordsForClaimKey( diff --git a/src/renderer/src/lib/agent-session/resume/sleeping-agent-session-launch.ts b/src/renderer/src/lib/agent-session/resume/sleeping-agent-session-launch.ts index abf694cc250..f12128c935d 100644 --- a/src/renderer/src/lib/agent-session/resume/sleeping-agent-session-launch.ts +++ b/src/renderer/src/lib/agent-session/resume/sleeping-agent-session-launch.ts @@ -1,4 +1,4 @@ -import { getConnectionIdFromState } from '@/lib/connection-owner-resolution' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { toast } from 'sonner' import { useAppStore } from '@/store/index' import { buildAgentResumeStartupPlan } from '../../../../../shared/agent-launch/startup/tui-agent-resume-startup' @@ -13,7 +13,7 @@ import { type AgentResumeLaunchTarget } from '@/lib/agent-resume-launch-target' import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner' -import { runtimeEnvironmentIdUnlessTwin } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context' import { resolveResumeLaunchRecipe } from '../../../../../shared/agent-launch/choices/tui-agent-launch-defaults' import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session/lifecycle/agent-session-resume' diff --git a/src/renderer/src/lib/agent-session/resume/sleeping-record-execution-host-scope.ts b/src/renderer/src/lib/agent-session/resume/sleeping-record-execution-host-scope.ts index 801cdeb8730..202cbaaa49d 100644 --- a/src/renderer/src/lib/agent-session/resume/sleeping-record-execution-host-scope.ts +++ b/src/renderer/src/lib/agent-session/resume/sleeping-record-execution-host-scope.ts @@ -14,14 +14,14 @@ import { findFolderWorkspaceOwner, getExplicitRuntimeEnvironmentIdForFolderWorkspace, type FolderWorkspaceRuntimeOwnerState -} from '../../folder-workspace-runtime-owner' +} from '../../workspace/ownership/folder-workspace-runtime-owner' import { findIndexedRepoOwner } from '../../workspace/ownership/repo-owner-index' import { findIndexedWorktreeOwner, findIndexedProjectGroupOwner, hasIndexedDetectedWorktree } from '../../workspace/ownership/worktree-runtime-owner-index' -import { resolveExplicitWorktreeOperationRouteResult } from '../../worktree-operation-catalog-route' +import { resolveExplicitWorktreeOperationRouteResult } from '../../workspace/ownership/worktree-operation-catalog-route' import type { WorktreeRuntimeOwnerState } from '../../workspace/ownership/worktree-runtime-owner-state' /** Session locators are machine-scoped, while merged records/current-catalog routes can disagree with capture ownership. Block only known host disagreement; unknown legacy evidence must not strand resumes. Preserve four unknowns: undefined means unstamped (#9030); null means local or paired runtime and only excludes SSH; runtime:* relabels host/nested-SSH workspaces and proves no machine; null current owner means unhydrated catalog, never authoritative local. Wrong-host resume can fork irrecoverably, so preserve records and avoid guessing from routing defaults. This decision differs from workspace-session-terminal-buffers, where refusing unknown capture would lose the only scrollback copy. */ diff --git a/src/renderer/src/lib/browser/navigation/browser-link-owner.ts b/src/renderer/src/lib/browser/navigation/browser-link-owner.ts index 2c5c87257db..f636e9c474f 100644 --- a/src/renderer/src/lib/browser/navigation/browser-link-owner.ts +++ b/src/renderer/src/lib/browser/navigation/browser-link-owner.ts @@ -1,8 +1,8 @@ import type { AppState } from '@/store/types' import type { ExecutionHostId } from '../../../../../shared/execution-host' import { authorityKey } from '../../../../../shared/host-authority' -import { isExecutionHostAliasForWorktree } from '../../worktree-execution-host-alias' -import { resolveOwner } from '../../resolve-owner' +import { isExecutionHostAliasForWorktree } from '../../workspace/ownership/worktree-execution-host-alias' +import { resolveOwner } from '../../workspace/ownership/resolve-owner' export function createBrowserLinkHostMatcher( state: AppState, diff --git a/src/renderer/src/lib/browser/navigation/browser-link-reveal.ts b/src/renderer/src/lib/browser/navigation/browser-link-reveal.ts index 57529623391..09670b89e65 100644 --- a/src/renderer/src/lib/browser/navigation/browser-link-reveal.ts +++ b/src/renderer/src/lib/browser/navigation/browser-link-reveal.ts @@ -1,5 +1,8 @@ import type { AppState } from '@/store/types' -import { captureWorkspaceSelection, isWorkspaceSelected } from '../../active-workspace-host' +import { + captureWorkspaceSelection, + isWorkspaceSelected +} from '../../workspace/ownership/active-workspace-host' type SelectionState = Partial< Pick diff --git a/src/renderer/src/lib/browser/navigation/http-link-in-group-availability.ts b/src/renderer/src/lib/browser/navigation/http-link-in-group-availability.ts index bd10e93cf6c..882bd117110 100644 --- a/src/renderer/src/lib/browser/navigation/http-link-in-group-availability.ts +++ b/src/renderer/src/lib/browser/navigation/http-link-in-group-availability.ts @@ -7,7 +7,7 @@ import { getWorkspaceClientCreationActionPolicy } from '../../client-creation-ac import { getFloatingWorkspaceOperationRoute, resolveWorktreeOperationRoute -} from '../../worktree-operation-route' +} from '../../workspace/ownership/worktree-operation-route' import { isExpectedRuntimeBrowserRoute, isSshDeploymentClientBrowserRoute, diff --git a/src/renderer/src/lib/browser/navigation/http-link-routing.ts b/src/renderer/src/lib/browser/navigation/http-link-routing.ts index 21205803c91..894eb62c927 100644 --- a/src/renderer/src/lib/browser/navigation/http-link-routing.ts +++ b/src/renderer/src/lib/browser/navigation/http-link-routing.ts @@ -15,7 +15,7 @@ import { isFloatingWorkspaceId } from '../../../../../shared/floating-workspace- import type { GlobalSettings } from '../../../../../shared/global-settings-types' import { toast } from 'sonner' import type { ExecutionHostId } from '../../../../../shared/execution-host' -import { reselectWorkspaceKeepingHost } from '../../active-workspace-host' +import { reselectWorkspaceKeepingHost } from '../../workspace/ownership/active-workspace-host' import { captureBrowserLinkReveal, type BrowserLinkSelectionSubscriber diff --git a/src/renderer/src/lib/browser/palette/browser-palette-page-entries.ts b/src/renderer/src/lib/browser/palette/browser-palette-page-entries.ts index 0148f14496a..d039c9750cb 100644 --- a/src/renderer/src/lib/browser/palette/browser-palette-page-entries.ts +++ b/src/renderer/src/lib/browser/palette/browser-palette-page-entries.ts @@ -16,7 +16,7 @@ import { findDuplicateIds, getUnifiedTabPaletteExecutionHostId, isUnifiedTabOwnedByWorktree -} from '../../unified-tab-host-ownership' +} from '../../workspace/ownership/unified-tab-host-ownership' import { maxValidPaletteActivityTimestamp } from '../../../../../shared/palette-match/palette-ranking' type BrowserPaletteActiveTabType = WorkspaceVisibleTabType diff --git a/src/renderer/src/lib/browser/workspace/browser-workspace-tab-activation.ts b/src/renderer/src/lib/browser/workspace/browser-workspace-tab-activation.ts index 1bd6b92f714..a28fc2ee196 100644 --- a/src/renderer/src/lib/browser/workspace/browser-workspace-tab-activation.ts +++ b/src/renderer/src/lib/browser/workspace/browser-workspace-tab-activation.ts @@ -9,7 +9,7 @@ import { findAmbiguousWorktreeIds, getPaletteOwnershipWorktreeIds, isUnifiedTabOwnedByWorktree -} from '../../unified-tab-host-ownership' +} from '../../workspace/ownership/unified-tab-host-ownership' type BrowserWorkspaceTabTarget = { worktreeId: string diff --git a/src/renderer/src/lib/browser/workspace/workspace-browser-link-open.ts b/src/renderer/src/lib/browser/workspace/workspace-browser-link-open.ts index b0cf0750535..4582f7d0e76 100644 --- a/src/renderer/src/lib/browser/workspace/workspace-browser-link-open.ts +++ b/src/renderer/src/lib/browser/workspace/workspace-browser-link-open.ts @@ -19,9 +19,9 @@ import { activateBrowserWorkspaceTab } from './browser-workspace-tab-activation' import { getFloatingWorkspaceOperationRoute, resolveWorktreeOperationRoute -} from '../../worktree-operation-route' +} from '../../workspace/ownership/worktree-operation-route' import { getWorkspaceClientCreationActionPolicy } from '../../client-creation-action-policy' -import { selectWorkspaceSurface } from '../../workspace-surface-reveal' +import { selectWorkspaceSurface } from '../../workspace/activation/workspace-surface-reveal' import { showWorkspaceTabs } from '../navigation/http-link-browser-placement' function ownsBrowserRoute( diff --git a/src/renderer/src/lib/browser/workspace/workspace-browser-route-eligibility.ts b/src/renderer/src/lib/browser/workspace/workspace-browser-route-eligibility.ts index 731ede8fb76..ff73704d4e4 100644 --- a/src/renderer/src/lib/browser/workspace/workspace-browser-route-eligibility.ts +++ b/src/renderer/src/lib/browser/workspace/workspace-browser-route-eligibility.ts @@ -8,7 +8,7 @@ import { runtimeHostsPagesOnThisDesktop, type ClientCreationActionAvailability } from '../../client-creation-action-policy' -import { resolveWorktreeOperationRoute } from '../../worktree-operation-route' +import { resolveWorktreeOperationRoute } from '../../workspace/ownership/worktree-operation-route' import { getExecutionHostIdForWorktree } from '../../workspace/ownership/worktree-runtime-owner' import { resolveSshWorkspaceBrowserRouteEligibility } from './ssh-workspace-browser-route-eligibility' diff --git a/src/renderer/src/lib/browser/workspace/workspace-browser-tab-close.ts b/src/renderer/src/lib/browser/workspace/workspace-browser-tab-close.ts index 6e2ecf59b3c..8d7be5fae12 100644 --- a/src/renderer/src/lib/browser/workspace/workspace-browser-tab-close.ts +++ b/src/renderer/src/lib/browser/workspace/workspace-browser-tab-close.ts @@ -1,6 +1,6 @@ import { useAppStore } from '@/store/index' import { destroyWorkspaceWebviews } from '@/store/slices/browser/cleanup/browser-webview-cleanup' -import { runtimeEnvironmentIdForWorkspaceOwner } from '../../resolve-owner' +import { runtimeEnvironmentIdForWorkspaceOwner } from '../../workspace/ownership/resolve-owner' import { warnAmbiguousOwnerOnce } from '../../ambiguous-owner-warning' import { closeBrowserWorkspaceTabOnHosts } from '@/runtime/browser/closing/browser-workspace-tab-close' import type { BrowserWorkspaceTabClosePlan } from '@/runtime/browser/closing/browser-workspace-tab-close-plan' diff --git a/src/renderer/src/lib/browser/workspace/workspace-browser-tab-open.ts b/src/renderer/src/lib/browser/workspace/workspace-browser-tab-open.ts index 30457bdc480..8ce6f88565a 100644 --- a/src/renderer/src/lib/browser/workspace/workspace-browser-tab-open.ts +++ b/src/renderer/src/lib/browser/workspace/workspace-browser-tab-open.ts @@ -35,7 +35,7 @@ import { import { getFloatingWorkspaceOperationRoute, resolveWorktreeOperationRoute -} from '../../worktree-operation-route' +} from '../../workspace/ownership/worktree-operation-route' import { intentPresentation, openFailure, diff --git a/src/renderer/src/lib/command-code-prompt-status-seed.ts b/src/renderer/src/lib/command-code-prompt-status-seed.ts index b7bcc4c2e99..74fd84f7b84 100644 --- a/src/renderer/src/lib/command-code-prompt-status-seed.ts +++ b/src/renderer/src/lib/command-code-prompt-status-seed.ts @@ -1,6 +1,6 @@ import { useAppStore } from '@/store' import { makePaneKey } from '../../../shared/workspace-layout/stable-pane-id' -import { getConnectionIdFromState } from './connection-owner-resolution' +import { getConnectionIdFromState } from './workspace/ownership/connection-owner-resolution' import { resolveLiveAgentStatusConnectionRouting } from './agent-status-connection-ownership' import { rendererAgentStatusObservations } from './renderer-agent-status-observations' diff --git a/src/renderer/src/lib/doc-preview-grants.test.ts b/src/renderer/src/lib/doc-preview-grants.test.ts index c529acc467a..ffbaa7b5e41 100644 --- a/src/renderer/src/lib/doc-preview-grants.test.ts +++ b/src/renderer/src/lib/doc-preview-grants.test.ts @@ -8,7 +8,7 @@ const mocks = vi.hoisted(() => ({ revokeGrant: vi.fn() })) -vi.mock('@/lib/connection-owner-resolution', () => ({ +vi.mock('@/lib/workspace/ownership/connection-owner-resolution', () => ({ getConnectionIdForFileFromState: () => mocks.connectionId })) vi.mock('@/lib/workspace/ownership/worktree-runtime-owner', () => ({ diff --git a/src/renderer/src/lib/doc-preview-grants.ts b/src/renderer/src/lib/doc-preview-grants.ts index b19261c380b..34a8599c56d 100644 --- a/src/renderer/src/lib/doc-preview-grants.ts +++ b/src/renderer/src/lib/doc-preview-grants.ts @@ -1,6 +1,6 @@ import type { DocPreviewGrantRequest } from '../../../preload/api/doc-preview-api' import { basename, dirname, getRelativePathInsideRoot } from '@/lib/path' -import { getConnectionIdForFileFromState } from '@/lib/connection-owner-resolution' +import { getConnectionIdForFileFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner' import { toRuntimeWorktreeSelector } from '@/runtime/rpc/targets/runtime-worktree-selector' import { chatScratchFileAddress } from '@/runtime/files/addressing/runtime-chat-scratch-file-address' diff --git a/src/renderer/src/lib/editor-file-child-owner.ts b/src/renderer/src/lib/editor-file-child-owner.ts index 26984e450ad..1a8a87867d4 100644 --- a/src/renderer/src/lib/editor-file-child-owner.ts +++ b/src/renderer/src/lib/editor-file-child-owner.ts @@ -6,7 +6,7 @@ import { getRepoSshConnectionId, parseExecutionHostId } from '../../../shared/execution-host' -import { getFolderFileConnectionOwnerFromState } from './connection-owner-resolution' +import { getFolderFileConnectionOwnerFromState } from './workspace/ownership/connection-owner-resolution' import { parseWorkspaceKey } from '../../../shared/workspace-scope' import { assertEditorFileOperationCurrent, @@ -17,8 +17,8 @@ import { import { assertWorktreeOperationGenerationSnapshotCurrent, captureWorktreeOperationGenerationSnapshot -} from './worktree-operation-generation' -import type { WorktreeOperationRoute } from './worktree-operation-route' +} from './workspace/ownership/worktree-operation-generation' +import type { WorktreeOperationRoute } from './workspace/ownership/worktree-operation-route' import { resolveContinuedRuntimeEnvironmentRevision } from '@/runtime/rpc/environment-revisions/runtime-environment-revision' /** A tab retains its owner; a new operation uses that paired host's current session. */ diff --git a/src/renderer/src/lib/editor-file-operation-owner.ts b/src/renderer/src/lib/editor-file-operation-owner.ts index 8178268bbec..3c6f1c2299b 100644 --- a/src/renderer/src/lib/editor-file-operation-owner.ts +++ b/src/renderer/src/lib/editor-file-operation-owner.ts @@ -17,8 +17,8 @@ import type { OpenFile } from '@/store/slices/editor/types/open-file' import { runtimeTargetForOwnerEnvironment } from '@/runtime/rpc/targets/runtime-client-target' import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' import { resolveWorkspaceDirectory } from './workspace-directory' -import { getFileConnectionOwnerFromState } from './connection-owner-resolution' -import { captureWorktreeOperationGenerationSnapshot } from './worktree-operation-generation' +import { getFileConnectionOwnerFromState } from './workspace/ownership/connection-owner-resolution' +import { captureWorktreeOperationGenerationSnapshot } from './workspace/ownership/worktree-operation-generation' import { editorFileChildRoute, editorFileChildAuthority, diff --git a/src/renderer/src/lib/editor-file-operation-provenance.ts b/src/renderer/src/lib/editor-file-operation-provenance.ts index 89253213686..8db6495ba26 100644 --- a/src/renderer/src/lib/editor-file-operation-provenance.ts +++ b/src/renderer/src/lib/editor-file-operation-provenance.ts @@ -3,14 +3,14 @@ import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants' import { parseWorkspaceKey } from '../../../shared/workspace-scope' import type { AppState } from '@/store/types' import type { HostAuthority } from '../../../shared/host-authority' -import { findFolderWorkspaceOwner } from './folder-workspace-runtime-owner' -import { resolveOwner } from './resolve-owner' +import { findFolderWorkspaceOwner } from './workspace/ownership/folder-workspace-runtime-owner' +import { resolveOwner } from './workspace/ownership/resolve-owner' import { captureDirectSshMutationExpectation } from './ssh-mutation-expectation' import { assertWorktreeOperationGenerationSnapshotCurrent, captureWorktreeOperationGenerationSnapshot, type WorktreeOperationGenerationSnapshot -} from './worktree-operation-generation' +} from './workspace/ownership/worktree-operation-generation' import { getFloatingWorkspaceOperationRoute, resolveWorktreeOperationRoute, @@ -18,8 +18,8 @@ import { type WorktreeOperationRoute, type WorktreeOperationRouteResolution, type WorktreeOperationRouteState -} from './worktree-operation-route' -import { resolveExplicitWorktreeOperationRouteResult } from './worktree-operation-catalog-route' +} from './workspace/ownership/worktree-operation-route' +import { resolveExplicitWorktreeOperationRouteResult } from './workspace/ownership/worktree-operation-catalog-route' import { resolveQualifiedIndexedFolderWorkspace } from '@/store/folder-workspaces/folder-workspace-record-index' import { selectFolderWorkspaces, diff --git a/src/renderer/src/lib/ensure-simulator-tab.ts b/src/renderer/src/lib/ensure-simulator-tab.ts index ec1dae8fc88..1bdccff4c78 100644 --- a/src/renderer/src/lib/ensure-simulator-tab.ts +++ b/src/renderer/src/lib/ensure-simulator-tab.ts @@ -8,8 +8,8 @@ import { findAmbiguousWorktreeIds, getActiveExecutionHostIdForWorktree, isUnifiedTabOwnedByWorktree -} from './unified-tab-host-ownership' -import { isExecutionHostAliasForWorktree } from './worktree-execution-host-alias' +} from './workspace/ownership/unified-tab-host-ownership' +import { isExecutionHostAliasForWorktree } from './workspace/ownership/worktree-execution-host-alias' import { folderWorkspaceToWorktree } from '../../../shared/folder-workspaces/folder-workspace-worktree' import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch' import { diff --git a/src/renderer/src/lib/environment-setup-agent-launch.ts b/src/renderer/src/lib/environment-setup-agent-launch.ts index 20d9613bd4d..60cc37865c2 100644 --- a/src/renderer/src/lib/environment-setup-agent-launch.ts +++ b/src/renderer/src/lib/environment-setup-agent-launch.ts @@ -6,7 +6,7 @@ import { launchAgentInNewTabWithOutcome } from '@/lib/agent-session/launch/new-t import { newAgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agent-launch-request-id' import { captureAgentTabLaunchContext } from '@/components/agent-tab-launch-context' import { activateAndRevealWorktreeWithOutcome } from '@/lib/workspace/activation/worktree-activation' -import { reportAgentWorkspaceActivation } from '@/lib/worktree-activation-outcome' +import { reportAgentWorkspaceActivation } from '@/lib/workspace/activation/worktree-activation-outcome' import { focusTerminalTabSurface } from '@/lib/focus-terminal-tab-surface' import { isGitRepoKind } from '../../../shared/repo-kind' import type { Repo } from '../../../shared/repo-types' diff --git a/src/renderer/src/lib/execute-open-editor-path-move.test.ts b/src/renderer/src/lib/execute-open-editor-path-move.test.ts index 44a41122ade..81b59443a45 100644 --- a/src/renderer/src/lib/execute-open-editor-path-move.test.ts +++ b/src/renderer/src/lib/execute-open-editor-path-move.test.ts @@ -27,7 +27,7 @@ vi.mock('@/components/editor/autosave/editor-autosave', async (importOriginal) = import { useAppStore } from '@/store' import { executeOpenEditorPathMove } from './execute-open-editor-path-move' -import { captureWorktreeOperationGenerationSnapshot } from './worktree-operation-generation' +import { captureWorktreeOperationGenerationSnapshot } from './workspace/ownership/worktree-operation-generation' import { drawTabsFromMain, diff --git a/src/renderer/src/lib/external-editor-open-capability.ts b/src/renderer/src/lib/external-editor-open-capability.ts index 158cb4bf6e4..2ecf9338246 100644 --- a/src/renderer/src/lib/external-editor-open-capability.ts +++ b/src/renderer/src/lib/external-editor-open-capability.ts @@ -1,7 +1,7 @@ import { isRemoteSshEditorCommand } from '../../../shared/remote-ssh-editor-launcher' import { toRuntimeExecutionHostId } from '../../../shared/execution-host' import { getWindowsPathAccess } from './windows-path-access' -import type { WorkspaceEditorSshHost } from './workspace-editor-ssh-target' +import type { WorkspaceEditorSshHost } from '../components/file-actions/workspace-editor-ssh-target' export type ExternalEditorOpenCapability = | { diff --git a/src/renderer/src/lib/file-owner-runtime-target.ts b/src/renderer/src/lib/file-owner-runtime-target.ts index 297938582e2..952751c9a23 100644 --- a/src/renderer/src/lib/file-owner-runtime-target.ts +++ b/src/renderer/src/lib/file-owner-runtime-target.ts @@ -1,7 +1,7 @@ import { runtimeTargetForOwnerEnvironment } from '@/runtime/rpc/targets/runtime-client-target' import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' -import { runtimeTargetForWorkspaceOwner, resolveOwner } from './resolve-owner' -import type { WorktreeOperationRouteState } from './worktree-operation-route' +import { runtimeTargetForWorkspaceOwner, resolveOwner } from './workspace/ownership/resolve-owner' +import type { WorktreeOperationRouteState } from './workspace/ownership/worktree-operation-route' const LOCAL_TARGET: RuntimeClientTarget = { kind: 'local' } diff --git a/src/renderer/src/lib/file-preview-link-open.ts b/src/renderer/src/lib/file-preview-link-open.ts index 0c88cd7ad30..1cbed3ee4fc 100644 --- a/src/renderer/src/lib/file-preview-link-open.ts +++ b/src/renderer/src/lib/file-preview-link-open.ts @@ -12,7 +12,7 @@ import type { import { openLocalBrowserLink } from './browser/navigation/browser-link-open' import { getResolvedExecutionHostIdForWorktree } from './resolved-worktree-execution-host' import { createBrowserLinkHostMatcher } from './browser/navigation/browser-link-owner' -import { resolveWorktreeOperationRoute } from './worktree-operation-route' +import { resolveWorktreeOperationRoute } from './workspace/ownership/worktree-operation-route' import { selectDetectedWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields' import { hasIndexedDetectedWorktree } from './workspace/ownership/worktree-runtime-owner-index' diff --git a/src/renderer/src/lib/file-preview-page-conversion.ts b/src/renderer/src/lib/file-preview-page-conversion.ts index b8004822fb1..01e58b7a78b 100644 --- a/src/renderer/src/lib/file-preview-page-conversion.ts +++ b/src/renderer/src/lib/file-preview-page-conversion.ts @@ -2,7 +2,7 @@ import { toast } from 'sonner' import { useAppStore } from '@/store' import type { AppState } from '@/store/types' import { activateBrowserWorkspaceTab } from './browser/workspace/browser-workspace-tab-activation' -import { selectWorkspaceSurface } from './workspace-surface-reveal' +import { selectWorkspaceSurface } from './workspace/activation/workspace-surface-reveal' import { webClientDocPreviewRefusal } from './doc-preview-web-client' import { openFileInBrowserTab } from './file-preview' import { findPage } from '@/store/slices/browser/pages/browser-page-records' diff --git a/src/renderer/src/lib/file-preview.ts b/src/renderer/src/lib/file-preview.ts index cbe3986a7b5..26aae6e2c31 100644 --- a/src/renderer/src/lib/file-preview.ts +++ b/src/renderer/src/lib/file-preview.ts @@ -11,10 +11,10 @@ import { webClientDocPreviewRefusal } from '@/lib/doc-preview-web-client' import { useCallback } from 'react' import { useShallow } from 'zustand/react/shallow' import { basename } from '@/lib/path' -import { getConnectionIdForFileFromState } from '@/lib/connection-owner-resolution' +import { getConnectionIdForFileFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { activateBrowserWorkspaceTab } from '@/lib/browser/workspace/browser-workspace-tab-activation' import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner' -import { isTwinWorkspace } from '@/lib/resolve-owner' +import { isTwinWorkspace } from '@/lib/workspace/ownership/resolve-owner' import { REMOTE_FILE_BROWSER_UNSUPPORTED_MESSAGE, TWIN_FILE_BROWSER_UNSUPPORTED_MESSAGE diff --git a/src/renderer/src/lib/fix-checks-agent-launch.ts b/src/renderer/src/lib/fix-checks-agent-launch.ts index 4afd958a8de..5a61b917c81 100644 --- a/src/renderer/src/lib/fix-checks-agent-launch.ts +++ b/src/renderer/src/lib/fix-checks-agent-launch.ts @@ -24,8 +24,8 @@ import { launchAgentInNewTab } from '@/lib/agent-session/launch/new-tab/launch-a import { newAgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agent-launch-request-id' import { launchWorkItemDirect } from '@/lib/workspace/creation/work-item/launch-work-item-direct' import { readSourceControlLaunchRecipeAgentId } from '../../../shared/source-control/ai/source-control-launch-agent-selection' -import { resolveRepoWorktreeLaunchPlatform } from '@/lib/execution-host-facts' -import { reportAgentWorkspaceActivation } from '@/lib/worktree-activation-outcome' +import { resolveRepoWorktreeLaunchPlatform } from '@/runtime/hosts/platform/execution-host-facts' +import { reportAgentWorkspaceActivation } from '@/lib/workspace/activation/worktree-activation-outcome' import { activateAndRevealWorktreeWithOutcome } from '@/lib/workspace/activation/worktree-activation' import { useAppStore } from '@/store' import { resolveSourceControlActionRecipe } from '../../../shared/source-control/ai/source-control-ai-operation-policy' diff --git a/src/renderer/src/lib/floating-workspace-tab-creation.ts b/src/renderer/src/lib/floating-workspace-tab-creation.ts index c288bf72585..57802f8d22f 100644 --- a/src/renderer/src/lib/floating-workspace-tab-creation.ts +++ b/src/renderer/src/lib/floating-workspace-tab-creation.ts @@ -1,6 +1,6 @@ import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants' import { createUntitledMarkdownFileWithTemplateSelection } from './create-untitled-markdown' -import { getConnectionId } from './connection-context' +import { getConnectionId } from './workspace/ownership/connection-context' import { detectLanguage } from './language-detect' import type { AppState } from '@/store/types' import { focusTerminalTabSurface } from './focus-terminal-tab-surface' diff --git a/src/renderer/src/lib/git-graph-tab.ts b/src/renderer/src/lib/git-graph-tab.ts index 3c90a7bc570..c45f2532df6 100644 --- a/src/renderer/src/lib/git-graph-tab.ts +++ b/src/renderer/src/lib/git-graph-tab.ts @@ -1,6 +1,6 @@ import { useMemo } from 'react' import { useShallow } from 'zustand/react/shallow' -import { captureWorktreeOperationGenerationSnapshot } from './worktree-operation-generation' +import { captureWorktreeOperationGenerationSnapshot } from './workspace/ownership/worktree-operation-generation' import { useAppStore } from '@/store' import { findFirstIndexedWorktree, @@ -16,7 +16,7 @@ import { resolveWorktreeOperationRoute, resolveWorktreeOperationRouteForHost, type WorktreeOperationRouteState -} from './worktree-operation-route' +} from './workspace/ownership/worktree-operation-route' import { openWorkspaceEditorItem } from '@/store/slices/editor/tabs/workspace-editor-item' import { runtimeTargetForOwnerEnvironment } from '@/runtime/rpc/targets/runtime-client-target' import { translate } from '@/i18n/i18n' diff --git a/src/renderer/src/lib/github-source-runtime-context.test.ts b/src/renderer/src/lib/github-source-runtime-context.test.ts index e7416c71727..a0182277702 100644 --- a/src/renderer/src/lib/github-source-runtime-context.test.ts +++ b/src/renderer/src/lib/github-source-runtime-context.test.ts @@ -6,7 +6,7 @@ import { getGitHubRepoRoutingTarget, resolveGitHubRepoOperationOwner } from './github-source-runtime-context' -import type { RepoRuntimeOwnerState } from './repo-runtime-owner' +import type { RepoRuntimeOwnerState } from './workspace/ownership/repo-runtime-owner' const runtimeSourceContext: TaskSourceContext = { kind: 'task-source', diff --git a/src/renderer/src/lib/github-source-runtime-context.ts b/src/renderer/src/lib/github-source-runtime-context.ts index a22b45b18b3..a4b192741fd 100644 --- a/src/renderer/src/lib/github-source-runtime-context.ts +++ b/src/renderer/src/lib/github-source-runtime-context.ts @@ -15,7 +15,7 @@ import { resolveRepoRuntimeOwner, getHostlessSourceRepoOwnerEnvironmentId, type RepoRuntimeOwnerState -} from './repo-runtime-owner' +} from './workspace/ownership/repo-runtime-owner' export type GitHubRuntimeHost = Extract diff --git a/src/renderer/src/lib/local-file-access.ts b/src/renderer/src/lib/local-file-access.ts index 00efe036994..8466d296663 100644 --- a/src/renderer/src/lib/local-file-access.ts +++ b/src/renderer/src/lib/local-file-access.ts @@ -1,7 +1,7 @@ import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants' import type { LocalFileAccess } from '../../../shared/file-access/local-file-access' import type { OpenFile } from '@/store/slices/editor/types/open-file' -import { getConnectionIdForFile } from './connection-context' +import { getConnectionIdForFile } from './workspace/ownership/connection-context' import { getRuntimeTargetForFileOwner } from './file-owner-runtime-target' import type { WorktreeRuntimeOwnerState } from './workspace/ownership/worktree-runtime-owner-state' diff --git a/src/renderer/src/lib/local-preflight-context.ts b/src/renderer/src/lib/local-preflight-context.ts index e97a59d0c04..9200ebd017d 100644 --- a/src/renderer/src/lib/local-preflight-context.ts +++ b/src/renderer/src/lib/local-preflight-context.ts @@ -13,8 +13,8 @@ import type { Worktree } from '../../../shared/worktree/types' import { parseWorkspaceKey } from '../../../shared/workspace-scope' import { projectMatchesRepo } from '../../../shared/project-repo-match' import { getIndexedRepoMap, getIndexedReposById } from '@/store/repos/repository-catalog-index' -import { defaultScopeHost } from './default-creation-host' -import { getLocalProjectRuntimeWorkspace } from './local-project-runtime-workspace' +import { defaultScopeHost } from '../runtime/hosts/selection/default-creation-host' +import { getLocalProjectRuntimeWorkspace } from '../runtime/hosts/wsl/local-project-runtime-workspace' import { getActiveWorkspaceOwnerTarget } from './resolved-worktree-execution-host' import { getEnvironmentRuntimeContextKey } from '../runtime/hosts/observations/provider-runtime-context' import { getRendererAppPlatform } from './renderer-app-platform' diff --git a/src/renderer/src/lib/open-agent-message-sender.test.ts b/src/renderer/src/lib/open-agent-message-sender.test.ts index 8152988ba8c..49f95f052f8 100644 --- a/src/renderer/src/lib/open-agent-message-sender.test.ts +++ b/src/renderer/src/lib/open-agent-message-sender.test.ts @@ -52,7 +52,9 @@ vi.mock('@/components/terminal-pane/links/handles/terminal-handle-links', () => vi.mock('./workspace/activation/worktree-activation', () => ({ activateAndRevealWorktree: mocks.reveal })) -vi.mock('./wsl-moved-chat-activation', () => ({ activateWslMovedWorkspace: () => false })) +vi.mock('./workspace/activation/wsl-moved-chat-activation', () => ({ + activateWslMovedWorkspace: () => false +})) import { openAgentMessageSender } from './open-agent-message-sender' import { RuntimeRpcCallError } from '@/runtime/rpc/calls/runtime-rpc-result' const host = { kind: 'environment', environmentId: 'remote-2' } as const diff --git a/src/renderer/src/lib/open-editor-move-owner.ts b/src/renderer/src/lib/open-editor-move-owner.ts index eec4064aa94..f92f5c27346 100644 --- a/src/renderer/src/lib/open-editor-move-owner.ts +++ b/src/renderer/src/lib/open-editor-move-owner.ts @@ -5,7 +5,7 @@ import { getFileExplorerOperationOwnerFromState, type FileExplorerOwnerState } from '@/components/right-sidebar/file-explorer/navigation/file-explorer-operation-owner' -import { resolveOwner } from './resolve-owner' +import { resolveOwner } from './workspace/ownership/resolve-owner' /** Track server owner (null for this app) and nested SSH owner (null for server-local, undefined for unknown). */ type FileOwner = { runtimeEnvironmentId: string | null; sshHostId: string | null | undefined } diff --git a/src/renderer/src/lib/open-html-file-preview.ts b/src/renderer/src/lib/open-html-file-preview.ts index 3715e919313..43c996961a2 100644 --- a/src/renderer/src/lib/open-html-file-preview.ts +++ b/src/renderer/src/lib/open-html-file-preview.ts @@ -1,6 +1,6 @@ import { openFileInBrowserTab } from './file-preview' import { resolveWorkspaceDocAddressTarget } from './workspace-doc-address-input' -import { selectWorkspaceSurface } from './workspace-surface-reveal' +import { selectWorkspaceSurface } from './workspace/activation/workspace-surface-reveal' import { useAppStore } from '@/store' export function openHtmlFilePreview(params: { diff --git a/src/renderer/src/lib/order-empty-query-worktrees.ts b/src/renderer/src/lib/order-empty-query-worktrees.ts index b9c381f6e0e..1bfeb4c2f1f 100644 --- a/src/renderer/src/lib/order-empty-query-worktrees.ts +++ b/src/renderer/src/lib/order-empty-query-worktrees.ts @@ -2,7 +2,7 @@ import type { ExecutionHostId } from '../../../shared/execution-host' import type { Worktree } from '../../../shared/worktree/types' import { isPaletteCurrentWorktree } from './workspace/search/palette-repo-resolution' import { compareWorktreeDisplayName } from './worktree-display-name-order' -import { getWorktreeVisitTimestamp } from './worktree-visit-recency' +import { getWorktreeVisitTimestamp } from './workspace/activation/worktree-visit-recency' export type OrderEmptyQueryInputs = { visibleWorktrees: readonly Worktree[] diff --git a/src/renderer/src/lib/parked-terminal-host-hydration.ts b/src/renderer/src/lib/parked-terminal-host-hydration.ts index 811f2902e17..0b348bc850e 100644 --- a/src/renderer/src/lib/parked-terminal-host-hydration.ts +++ b/src/renderer/src/lib/parked-terminal-host-hydration.ts @@ -1,4 +1,4 @@ -import { getConnectionIdFromState } from './connection-owner-resolution' +import { getConnectionIdFromState } from './workspace/ownership/connection-owner-resolution' import type { AppState } from '@/store/types' type ParkedPaneHostState = Parameters[0] & diff --git a/src/renderer/src/lib/quick-open-file-history.ts b/src/renderer/src/lib/quick-open-file-history.ts index 921cd85b335..a4ca131e969 100644 --- a/src/renderer/src/lib/quick-open-file-history.ts +++ b/src/renderer/src/lib/quick-open-file-history.ts @@ -3,7 +3,7 @@ import { useAppStore } from '@/store' import type { AppState } from '@/store/types' import type { OpenFile } from '@/store/slices/editor/types/open-file' import { normalizeRuntimePathForComparison } from '../../../shared/cross-platform-path' -import { resolveWorktreeOperationRoute } from './worktree-operation-route' +import { resolveWorktreeOperationRoute } from './workspace/ownership/worktree-operation-route' const STORAGE_KEY = 'orca.quick-open-history.v1' const EMPTY_HISTORY: readonly string[] = [] diff --git a/src/renderer/src/lib/repo-slug-cache.ts b/src/renderer/src/lib/repo-slug-cache.ts index c5153624e8b..649f0824ea8 100644 --- a/src/renderer/src/lib/repo-slug-cache.ts +++ b/src/renderer/src/lib/repo-slug-cache.ts @@ -1,7 +1,7 @@ // Keep synchronous slug cache separate from repo-slug-index so store callers avoid its @/store import cycle. import type { Repo } from '../../../shared/repo-types' import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' -import { runtimeTargetForRepoOwner } from './repo-runtime-owner' +import { runtimeTargetForRepoOwner } from './workspace/ownership/repo-runtime-owner' import { githubRepoIdentityKey, repoUpstreamIdentityKey diff --git a/src/renderer/src/lib/resolved-worktree-execution-host.ts b/src/renderer/src/lib/resolved-worktree-execution-host.ts index ec814fae418..283a856cb06 100644 --- a/src/renderer/src/lib/resolved-worktree-execution-host.ts +++ b/src/renderer/src/lib/resolved-worktree-execution-host.ts @@ -11,7 +11,7 @@ import { findIndexedProjectGroupOwner } from './workspace/ownership/worktree-runtime-owner-index' import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields' -import { resolveQualifiedWorktreeExecutionOwner } from './qualified-worktree-execution-owner' +import { resolveQualifiedWorktreeExecutionOwner } from './workspace/ownership/qualified-worktree-execution-owner' import type { WorktreeRuntimeOwnerState } from './workspace/ownership/worktree-runtime-owner-state' import { runtimeRpcTargetForAuthorityKey } from '@/runtime/rpc/targets/runtime-client-target' import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' diff --git a/src/renderer/src/lib/reveal-in-file-manager.ts b/src/renderer/src/lib/reveal-in-file-manager.ts index 84383fecc95..9ed6c6337ad 100644 --- a/src/renderer/src/lib/reveal-in-file-manager.ts +++ b/src/renderer/src/lib/reveal-in-file-manager.ts @@ -12,7 +12,7 @@ import { } from './local-path-open-guard' import { getResolvedExecutionHostIdForWorktree } from './resolved-worktree-execution-host' import type { WorktreeRuntimeOwnerState } from './workspace/ownership/worktree-runtime-owner-state' -import { getConnectionIdFromState } from './connection-owner-resolution' +import { getConnectionIdFromState } from './workspace/ownership/connection-owner-resolution' import type { AppState } from '@/store/types' /** Menu label for showing a path in the OS file manager, as each platform names it. */ diff --git a/src/renderer/src/lib/reveal-terminal-pane.ts b/src/renderer/src/lib/reveal-terminal-pane.ts index 1b03b8c4485..29c1fb5a494 100644 --- a/src/renderer/src/lib/reveal-terminal-pane.ts +++ b/src/renderer/src/lib/reveal-terminal-pane.ts @@ -1,6 +1,6 @@ -import { activateTabAndFocusPane } from '@/lib/activate-tab-and-focus-pane' +import { activateTabAndFocusPane } from '@/lib/workspace/tabs/activate-tab-and-focus-pane' import { activateAndRevealWorkspace } from '@/lib/workspace/activation/worktree-activation' -import { activateTerminalTabOnOwner } from '@/lib/terminal-tab-owner-activation' +import { activateTerminalTabOnOwner } from '@/lib/workspace/tabs/terminal-tab-owner-activation' import type { TerminalPaneRevealTarget } from '../../../shared/workspace-layout/terminal-pane-reveal' /** Reveal through the workspace dispatcher on local/SSH/server/floating owners. Bare setActiveWorktree skips terminal view, sleeping resume and surface seeding, leaving parked SSH workspaces empty (#16731). Return false for unknown workspaces. */ diff --git a/src/renderer/src/lib/review-owner.ts b/src/renderer/src/lib/review-owner.ts index b276ed53131..81e81eb9c84 100644 --- a/src/renderer/src/lib/review-owner.ts +++ b/src/renderer/src/lib/review-owner.ts @@ -9,7 +9,10 @@ import { toRuntimeExecutionHostId, toSshExecutionHostId } from '../../../shared/execution-host' -import { findIndexedReviewRepository, hasIndexedRepository } from './repository-owner-index' +import { + findIndexedReviewRepository, + hasIndexedRepository +} from './workspace/ownership/repository-owner-index' type ReviewWorkspaceOwner = Pick diff --git a/src/renderer/src/lib/runtime-session-mirror-targets.ts b/src/renderer/src/lib/runtime-session-mirror-targets.ts index d35bab9b5e8..274d95c7d80 100644 --- a/src/renderer/src/lib/runtime-session-mirror-targets.ts +++ b/src/renderer/src/lib/runtime-session-mirror-targets.ts @@ -8,7 +8,7 @@ import { runtimeHostConnectionStateForEntry } from '@/runtime/hosts/connections/runtime-host-connection-state' import type { WorktreeRuntimeOwnerState } from './workspace/ownership/worktree-runtime-owner-state' -import { getRuntimeSessionMirrorEnvironmentIds } from './runtime-session-mirror-owners' +import { getRuntimeSessionMirrorEnvironmentIds } from './workspace/ownership/runtime-session-mirror-owners' type RuntimeMirrorStatus = { status: RuntimeStatus | null diff --git a/src/renderer/src/lib/runtime-workspace-file-route.ts b/src/renderer/src/lib/runtime-workspace-file-route.ts index cedf680e252..d7f99ef05f0 100644 --- a/src/renderer/src/lib/runtime-workspace-file-route.ts +++ b/src/renderer/src/lib/runtime-workspace-file-route.ts @@ -8,8 +8,8 @@ import { folderWorkspaceKey } from '../../../shared/workspace-scope' import type { AppState } from '@/store/types' import { getIndexedAllWorktrees } from '@/store/slices/worktrees/listing/worktree-catalog-index' import { getExecutionHostIdForWorktree } from './workspace/ownership/worktree-runtime-owner' -import { runtimeEnvironmentIdUnlessTwin } from './resolve-owner' -import { resolveExplicitWorktreeOperationRouteResult } from './worktree-operation-catalog-route' +import { runtimeEnvironmentIdUnlessTwin } from './workspace/ownership/resolve-owner' +import { resolveExplicitWorktreeOperationRouteResult } from './workspace/ownership/worktree-operation-catalog-route' import { selectFolderWorkspaces, selectWorktreesByRepo diff --git a/src/renderer/src/lib/simulator-palette-search.ts b/src/renderer/src/lib/simulator-palette-search.ts index bf7833a2445..094307cdb3f 100644 --- a/src/renderer/src/lib/simulator-palette-search.ts +++ b/src/renderer/src/lib/simulator-palette-search.ts @@ -31,7 +31,7 @@ import { findDuplicateIds, getUnifiedTabPaletteExecutionHostId, isUnifiedTabOwnedByWorktree -} from './unified-tab-host-ownership' +} from './workspace/ownership/unified-tab-host-ownership' import type { BuildSearchableSimulatorTabsOptions, SearchableSimulatorTab, diff --git a/src/renderer/src/lib/simulator-tab-layout-owner.ts b/src/renderer/src/lib/simulator-tab-layout-owner.ts index 0445786a5fe..7be4759e4af 100644 --- a/src/renderer/src/lib/simulator-tab-layout-owner.ts +++ b/src/renderer/src/lib/simulator-tab-layout-owner.ts @@ -8,7 +8,7 @@ import { } from '@/runtime/workspace-layout/intents/layout-owner-pending-tabs' import type { AppState } from '@/store/types' import { isFrameDrawnServerWorkspace } from '@/runtime/web-session-tabs-sync/frame-drawn-server-workspace-set' -import { runtimeEnvironmentIdUnlessTwin } from './resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from './workspace/ownership/resolve-owner' import { noteDesktopCreatedServerTab } from './desktop-created-server-tabs' export type SimulatorTabOpen = { diff --git a/src/renderer/src/lib/simulator-tab-palette-activation.ts b/src/renderer/src/lib/simulator-tab-palette-activation.ts index 24af79b2b31..61f6a14a3f5 100644 --- a/src/renderer/src/lib/simulator-tab-palette-activation.ts +++ b/src/renderer/src/lib/simulator-tab-palette-activation.ts @@ -5,7 +5,7 @@ import { findAmbiguousWorktreeIds, getPaletteOwnershipWorktreeIds, isUnifiedTabOwnedByWorktree -} from './unified-tab-host-ownership' +} from './workspace/ownership/unified-tab-host-ownership' export type SimulatorTabPaletteActivationFailure = 'missing-tab' | 'missing-worktree' diff --git a/src/renderer/src/lib/sleeping-agent-session-launch-windows-quoting.test.ts b/src/renderer/src/lib/sleeping-agent-session-launch-windows-quoting.test.ts index 204abc20d69..5b12d22954a 100644 --- a/src/renderer/src/lib/sleeping-agent-session-launch-windows-quoting.test.ts +++ b/src/renderer/src/lib/sleeping-agent-session-launch-windows-quoting.test.ts @@ -2,7 +2,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import type { SleepingAgentSessionRecord } from '../../../shared/agent-session/lifecycle/agent-session-resume' -import type * as ConnectionOwnerResolution from '@/lib/connection-owner-resolution' +import type * as ConnectionOwnerResolution from '@/lib/workspace/ownership/connection-owner-resolution' import type * as LaunchAgentKindModule from '../../../shared/agent-kind' const mockCreateTab = vi.fn() @@ -60,7 +60,7 @@ vi.mock('@/store', () => ({ useAppStore: { getState: () => store } })) const connectionOwner = vi.hoisted((): { nestedConnectionId: string | undefined } => ({ nestedConnectionId: undefined })) -vi.mock('@/lib/connection-owner-resolution', async (importOriginal) => { +vi.mock('@/lib/workspace/ownership/connection-owner-resolution', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/lib/ssh-mutation-expectation.ts b/src/renderer/src/lib/ssh-mutation-expectation.ts index d84aaec717e..c29bb9160b1 100644 --- a/src/renderer/src/lib/ssh-mutation-expectation.ts +++ b/src/renderer/src/lib/ssh-mutation-expectation.ts @@ -1,7 +1,7 @@ import type { SshMutationExpectation } from '../../../shared/ssh-types' import type { AppState } from '@/store/types' import { parseExecutionHostId, toSshExecutionHostId } from '../../../shared/execution-host' -import { resolveOwner } from './resolve-owner' +import { resolveOwner } from './workspace/ownership/resolve-owner' const SSH_OWNER_CHANGED_MESSAGE = "Couldn't verify the SSH connection. Reconnect the host and try again." diff --git a/src/renderer/src/lib/terminal-worktree-route.ts b/src/renderer/src/lib/terminal-worktree-route.ts index 7025ddf83d9..f42f281789d 100644 --- a/src/renderer/src/lib/terminal-worktree-route.ts +++ b/src/renderer/src/lib/terminal-worktree-route.ts @@ -4,14 +4,17 @@ import { parseExecutionHostId } from '../../../shared/execution-host' import { parseWorkspaceKey } from '../../../shared/workspace-scope' import type { AppState } from '@/store/types' import { resolveOwnerOrLocal } from './workspace/ownership/worktree-runtime-owner' -import { namedHostForOwnerRef, runtimeEnvironmentIdUnlessTwin } from './resolve-owner' +import { + namedHostForOwnerRef, + runtimeEnvironmentIdUnlessTwin +} from './workspace/ownership/resolve-owner' import type { WorktreeRuntimeOwnerState } from './workspace/ownership/worktree-runtime-owner-state' import { resolveWorktreeOperationRouteResultForHost, resolveWorktreeOperationRouteResult, type WorktreeOperationRouteResolution -} from './worktree-operation-route' -import { getSingleFocusedRuntimeEnvironmentId } from './single-runtime-legacy-owner' +} from './workspace/ownership/worktree-operation-route' +import { getSingleFocusedRuntimeEnvironmentId } from './workspace/ownership/single-runtime-legacy-owner' import { hasIndexedDetectedWorktree, resolveIndexedWorktreeOwner diff --git a/src/renderer/src/lib/user-opened-local-path.test.ts b/src/renderer/src/lib/user-opened-local-path.test.ts index 9fc9692b782..935806c3a19 100644 --- a/src/renderer/src/lib/user-opened-local-path.test.ts +++ b/src/renderer/src/lib/user-opened-local-path.test.ts @@ -9,7 +9,7 @@ const boundaryMocks = vi.hoisted(() => ({ }) })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionIdForFile: boundaryMocks.getConnectionIdForFile })) diff --git a/src/renderer/src/lib/work-items/linear/linear-issue-write.ts b/src/renderer/src/lib/work-items/linear/linear-issue-write.ts index 3f20ef83910..6ff8fd327f2 100644 --- a/src/renderer/src/lib/work-items/linear/linear-issue-write.ts +++ b/src/renderer/src/lib/work-items/linear/linear-issue-write.ts @@ -1,6 +1,6 @@ import { useAppStore } from '@/store/index' import type { LinearIssue } from '../../../../../shared/linear/issue-types' -import type { RowLessSource as RuntimeLinearSettings } from '@/lib/default-creation-host' +import type { RowLessSource as RuntimeLinearSettings } from '@/runtime/hosts/selection/default-creation-host' import { getLinearSourceScope } from '@/store/slices/linear/linear-slice-scope' import '@/store/slices/linear/linear-issue-publication' import { diff --git a/src/renderer/src/lib/workspace-doc-address-input.test.ts b/src/renderer/src/lib/workspace-doc-address-input.test.ts index a25accdef8d..b7e6fc6a2b1 100644 --- a/src/renderer/src/lib/workspace-doc-address-input.test.ts +++ b/src/renderer/src/lib/workspace-doc-address-input.test.ts @@ -11,7 +11,7 @@ const plan = vi.hoisted(() => ({ })) const hosts = vi.hoisted(() => new Map()) const places = vi.hoisted(() => new Map()) -vi.mock('./resolve-owner', () => ({ +vi.mock('./workspace/ownership/resolve-owner', () => ({ resolveOwner: (_state: unknown, ref: { workspaceId: string }) => { const environmentId = hosts.has(ref.workspaceId) ? hosts.get(ref.workspaceId) : 'server-1' return environmentId diff --git a/src/renderer/src/lib/workspace-doc-address-input.ts b/src/renderer/src/lib/workspace-doc-address-input.ts index bdb37c4632f..1fe29df9942 100644 --- a/src/renderer/src/lib/workspace-doc-address-input.ts +++ b/src/renderer/src/lib/workspace-doc-address-input.ts @@ -6,7 +6,7 @@ import { getWorkspaceFilePreviewPlan } from '@/lib/file-preview' import type { AppState } from '@/store/types' import { htmlFilePathFromUrl } from '../../../shared/file-links/html-file-url' import { authorityKey } from '../../../shared/host-authority' -import { resolveOwner } from './resolve-owner' +import { resolveOwner } from './workspace/ownership/resolve-owner' import { translate } from '@/i18n/i18n' import { selectFolderWorkspaces } from '@/store/workspaces/catalog/workspace-record-fields' diff --git a/src/renderer/src/lib/workspace-file-browser-open-target.ts b/src/renderer/src/lib/workspace-file-browser-open-target.ts index be7c289472f..4fb9d11c999 100644 --- a/src/renderer/src/lib/workspace-file-browser-open-target.ts +++ b/src/renderer/src/lib/workspace-file-browser-open-target.ts @@ -1,7 +1,7 @@ import { absolutePathToFileUri } from '@/components/editor/markdown/link-routing/markdown-internal-links' -import { getConnectionIdForFile } from '@/lib/connection-context' +import { getConnectionIdForFile } from '@/lib/workspace/ownership/connection-context' import { basename } from '@/lib/path' -import { isTwinWorkspace } from '@/lib/resolve-owner' +import { isTwinWorkspace } from '@/lib/workspace/ownership/resolve-owner' import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner' import { useAppStore } from '@/store' diff --git a/src/renderer/src/lib/workspace-file-drag-source.ts b/src/renderer/src/lib/workspace-file-drag-source.ts index bce955b7409..bfa799ea72c 100644 --- a/src/renderer/src/lib/workspace-file-drag-source.ts +++ b/src/renderer/src/lib/workspace-file-drag-source.ts @@ -1,6 +1,6 @@ import { useAppStore } from '@/store' import { getKnownExecutionHostIdForWorktree } from './workspace/ownership/worktree-runtime-owner' -import { runtimeEnvironmentIdForWorkspaceOwner } from './resolve-owner' +import { runtimeEnvironmentIdForWorkspaceOwner } from './workspace/ownership/resolve-owner' import { parseExecutionHostId, toRuntimeExecutionHostId } from '../../../shared/execution-host' import { writeWorkspaceFileDragSourceIfResolved } from './workspace-file-drag' diff --git a/src/renderer/src/lib/active-worktree-removal-successor.test.ts b/src/renderer/src/lib/workspace/activation/active-worktree-removal-successor.test.ts similarity index 93% rename from src/renderer/src/lib/active-worktree-removal-successor.test.ts rename to src/renderer/src/lib/workspace/activation/active-worktree-removal-successor.test.ts index 2212c57c7b5..64adc6088de 100644 --- a/src/renderer/src/lib/active-worktree-removal-successor.test.ts +++ b/src/renderer/src/lib/workspace/activation/active-worktree-removal-successor.test.ts @@ -3,17 +3,17 @@ import type * as AgentStatusModule from '@/lib/agent-status' import { installActiveWorktreeRemovalSuccessor, pickActiveWorktreeSuccessor -} from '@/lib/active-worktree-removal-successor' -import { createTestStore, seedStore } from '../store/testing/app-store-test-fixture' -import { makeWorktree } from '../store/slices/worktrees/worktree.test-fixture' -import { makeTerminalTab } from '../store/terminals/terminal-row.test-fixture' -import { TEST_REPO } from '../store/repos/repo.test-fixture' -import { createStoreCascadesMockApi } from '../store/testing/app-store-cascade-api.test-fixture' +} from '@/lib/workspace/activation/active-worktree-removal-successor' +import { createTestStore, seedStore } from '../../../store/testing/app-store-test-fixture' +import { makeWorktree } from '../../../store/slices/worktrees/worktree.test-fixture' +import { makeTerminalTab } from '../../../store/terminals/terminal-row.test-fixture' +import { TEST_REPO } from '../../../store/repos/repo.test-fixture' +import { createStoreCascadesMockApi } from '../../../store/testing/app-store-cascade-api.test-fixture' import { clearSshHostWorkspaces } from '@/components/sidebar/ssh-host-remove-workspaces' import { drawTabsFromMain, type TabsDrawnFromMain -} from '../store/slices/tabs/tabs-drawn-from-main.test-fixture' +} from '../../../store/slices/tabs/tabs-drawn-from-main.test-fixture' const storeAccess = vi.hoisted(() => ({ getState: vi.fn() })) vi.mock('@/store/index', () => ({ useAppStore: storeAccess })) diff --git a/src/renderer/src/lib/active-worktree-removal-successor.ts b/src/renderer/src/lib/workspace/activation/active-worktree-removal-successor.ts similarity index 95% rename from src/renderer/src/lib/active-worktree-removal-successor.ts rename to src/renderer/src/lib/workspace/activation/active-worktree-removal-successor.ts index 32cdd99440e..01b5b1da7b5 100644 --- a/src/renderer/src/lib/active-worktree-removal-successor.ts +++ b/src/renderer/src/lib/workspace/activation/active-worktree-removal-successor.ts @@ -1,7 +1,7 @@ -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import type { AppState } from '@/store/types' import { getIndexedRepoMap } from '@/store/repos/repository-catalog-index' -import { getRepoIdFromWorktreeId } from '../../../shared/worktree/id' +import { getRepoIdFromWorktreeId } from '../../../../../shared/worktree/id' import { isAutomaticDeselection, subscribeWorktreeDeselectionIntent, @@ -10,7 +10,7 @@ import { import { findIndexedWorktreeOwnerForHost } from '@/lib/workspace/ownership/worktree-runtime-owner-index' import { worktreeOwnerHostIds } from '@/lib/workspace/ownership/workspace-catalog-owner-index' import { activateAndRevealWorktree } from '@/lib/workspace/activation/worktree-activation' -import { getWorktreeVisitTimestamp } from '@/lib/worktree-visit-recency' +import { getWorktreeVisitTimestamp } from '@/lib/workspace/activation/worktree-visit-recency' import { getDeleteStateForWorktreeHost } from '@/components/sidebar/workspace-actions/deletion/worktree-delete-state-host-match' import { createSleepingSweepHiddenCheck } from '@/components/sidebar/worktree-list/listing/sleeping-sweep-visibility' import { getSidebarSleepingSweepRetainedIds } from '@/components/sidebar/worktree-list/listing/use-sleeping-sweep-retention' @@ -18,9 +18,9 @@ import { isRuntimeOwnedSshTargetId, parseExecutionHostId, type ExecutionHostId -} from '../../../shared/execution-host' -import type { Repo } from '../../../shared/repo-types' -import type { Worktree } from '../../../shared/worktree/types' +} from '../../../../../shared/execution-host' +import type { Repo } from '../../../../../shared/repo-types' +import type { Worktree } from '../../../../../shared/worktree/types' import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields' type RemovedActiveRow = { diff --git a/src/renderer/src/lib/workspace/activation/initial-surface/worktree-initial-terminal-seeding.ts b/src/renderer/src/lib/workspace/activation/initial-surface/worktree-initial-terminal-seeding.ts index 180fbe7abb5..245e10aa90a 100644 --- a/src/renderer/src/lib/workspace/activation/initial-surface/worktree-initial-terminal-seeding.ts +++ b/src/renderer/src/lib/workspace/activation/initial-surface/worktree-initial-terminal-seeding.ts @@ -14,7 +14,7 @@ import { getSetupRunnerCommandPlatformForPath } from '../../../../../../shared/a import { agentKindToTuiAgent } from '../../../../../../shared/agent-kind' import { useAppStore } from '@/store/index' import { queueHookCommandsForFirstWorktreeTab } from '@/lib/hook-command-delayed-delivery' -import { resolveWorkspaceTerminalHostAuthority } from '@/lib/workspace-terminal-host-authority' +import { resolveWorkspaceTerminalHostAuthority } from '@/lib/workspace/ownership/workspace-terminal-host-authority' import { seedNativeChatAppliedSessionOptions } from '../../../../../../shared/native-chat/input/native-chat-session-option-cache' import type { InitialTerminalOptions, diff --git a/src/renderer/src/lib/sidebar-worktree-activation.ts b/src/renderer/src/lib/workspace/activation/sidebar-worktree-activation.ts similarity index 89% rename from src/renderer/src/lib/sidebar-worktree-activation.ts rename to src/renderer/src/lib/workspace/activation/sidebar-worktree-activation.ts index 9f815bd06f3..b34a2f3f759 100644 --- a/src/renderer/src/lib/sidebar-worktree-activation.ts +++ b/src/renderer/src/lib/workspace/activation/sidebar-worktree-activation.ts @@ -2,10 +2,10 @@ import { activateAndRevealFolderWorkspace, activateAndRevealWorktree } from '@/lib/workspace/activation/worktree-activation' -import { parseWorkspaceKey } from '../../../shared/workspace-scope' +import { parseWorkspaceKey } from '../../../../../shared/workspace-scope' import { toast } from 'sonner' import { translate } from '@/i18n/i18n' -import type { ExecutionHostId } from '../../../shared/execution-host' +import type { ExecutionHostId } from '../../../../../shared/execution-host' export async function activateWorktreeFromSidebar( worktreeId: string, @@ -39,7 +39,7 @@ async function resumeEphemeralVmWorkspace(worktreeId: string): Promise { try { const runtime = await window.api.ephemeralVm.resumeWorkspace({ workspaceId: worktreeId }) if (runtime?.runtimeEnvironmentId) { - const store = (await import('@/store')).useAppStore + const store = (await import('@/store/index')).useAppStore store.getState().setRuntimeEnvironments(await window.api.runtimeEnvironments.list()) await store.getState().refreshRuntimeEnvironmentStatus(runtime.runtimeEnvironmentId) } diff --git a/src/renderer/src/lib/workspace-activation-path-gate.test.ts b/src/renderer/src/lib/workspace/activation/workspace-activation-path-gate.test.ts similarity index 83% rename from src/renderer/src/lib/workspace-activation-path-gate.test.ts rename to src/renderer/src/lib/workspace/activation/workspace-activation-path-gate.test.ts index ec87e66efbd..73b4cf0ff40 100644 --- a/src/renderer/src/lib/workspace-activation-path-gate.test.ts +++ b/src/renderer/src/lib/workspace/activation/workspace-activation-path-gate.test.ts @@ -1,9 +1,9 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' -import type { FolderWorkspace } from '../../../shared/folder-workspaces/folder-workspace-types' -import type { ProjectGroup } from '../../../shared/project-group-types' -import type { FolderWorkspacePathStatusReason } from '../../../shared/folder-workspaces/folder-workspace-path-status' -import { folderWorkspaceKey } from '../../../shared/workspace-scope' -import '../../../shared/constants' +import type { FolderWorkspace } from '../../../../../shared/folder-workspaces/folder-workspace-types' +import type { ProjectGroup } from '../../../../../shared/project-group-types' +import type { FolderWorkspacePathStatusReason } from '../../../../../shared/folder-workspaces/folder-workspace-path-status' +import { folderWorkspaceKey } from '../../../../../shared/workspace-scope' +import '../../../../../shared/constants' // Drive real activation/store/path guarding; replace only singleton/toast/path IPC so mocking cannot hide dispatch or guard regressions. @@ -17,9 +17,9 @@ vi.mock('sonner', () => ({ toast: { error: mocks.toastError, success: vi.fn() } const { createTestStore } = await import('@/store/testing/app-store-test-fixture') const store = createTestStore() -vi.mock('@/store', () => ({ useAppStore: store })) +vi.mock('@/store/index', () => ({ useAppStore: store })) -const { activateAndRevealWorkspace } = await import('./workspace/activation/worktree-activation') +const { activateAndRevealWorkspace } = await import('./worktree-activation') const projectGroup: ProjectGroup = { id: 'group-1', diff --git a/src/renderer/src/lib/workspace/activation/workspace-activation-terminal-focus.ts b/src/renderer/src/lib/workspace/activation/workspace-activation-terminal-focus.ts index 43602ee322e..4d7f3cffd3d 100644 --- a/src/renderer/src/lib/workspace/activation/workspace-activation-terminal-focus.ts +++ b/src/renderer/src/lib/workspace/activation/workspace-activation-terminal-focus.ts @@ -1,7 +1,7 @@ import { shouldPreserveEditableFocus } from '@/lib/editable-focus-preservation' import { useAppStore } from '@/store/index' import { focusRuntimeTerminalSurface } from '@/runtime/hosted-terminals/mounted-surfaces/mounted-terminal-tab-registry' -import type { ActivateAndRevealResult } from '@/lib/worktree-activation-outcome' +import type { ActivateAndRevealResult } from '@/lib/workspace/activation/worktree-activation-outcome' let cancelPendingFocus: (() => void) | null = null diff --git a/src/renderer/src/lib/workspace-navigation-toast-action.tsx b/src/renderer/src/lib/workspace/activation/workspace-navigation-toast-action.tsx similarity index 92% rename from src/renderer/src/lib/workspace-navigation-toast-action.tsx rename to src/renderer/src/lib/workspace/activation/workspace-navigation-toast-action.tsx index 2572209c434..00999db02f2 100644 --- a/src/renderer/src/lib/workspace-navigation-toast-action.tsx +++ b/src/renderer/src/lib/workspace/activation/workspace-navigation-toast-action.tsx @@ -1,7 +1,7 @@ import { ExternalLink } from 'lucide-react' import { translate } from '@/i18n/i18n' import { activateAndRevealWorkspace } from '@/lib/workspace/activation/worktree-activation' -import type { ExecutionHostId } from '../../../shared/execution-host' +import type { ExecutionHostId } from '../../../../../shared/execution-host' export function workspaceNavigationToastAction({ workspaceId, diff --git a/src/renderer/src/lib/workspace-surface-reveal.ts b/src/renderer/src/lib/workspace/activation/workspace-surface-reveal.ts similarity index 87% rename from src/renderer/src/lib/workspace-surface-reveal.ts rename to src/renderer/src/lib/workspace/activation/workspace-surface-reveal.ts index 7a0e4870c29..d51afa00921 100644 --- a/src/renderer/src/lib/workspace-surface-reveal.ts +++ b/src/renderer/src/lib/workspace/activation/workspace-surface-reveal.ts @@ -1,11 +1,11 @@ import type { AppState } from '@/store/types' -import { isFloatingWorkspaceId } from '../../../shared/floating-workspace-worktree' -import { revealFloatingWorkspacePanel } from './floating-workspace-panel-reveal' -import { markVisited, readPreviousActive } from './workspace/activation/worktree-activation-visit' +import { isFloatingWorkspaceId } from '../../../../../shared/floating-workspace-worktree' +import { revealFloatingWorkspacePanel } from '../../floating-workspace-panel-reveal' +import { markVisited, readPreviousActive } from './worktree-activation-visit' import { getActiveWorkspaceExecutionHostId, reselectWorkspaceKeepingHost -} from './active-workspace-host' +} from '../ownership/active-workspace-host' type FloatingPanelState = Pick< AppState, diff --git a/src/renderer/src/lib/workspace-switch-user-act.ts b/src/renderer/src/lib/workspace/activation/workspace-switch-user-act.ts similarity index 100% rename from src/renderer/src/lib/workspace-switch-user-act.ts rename to src/renderer/src/lib/workspace/activation/workspace-switch-user-act.ts diff --git a/src/renderer/src/lib/workspace/activation/worktree-activation-automation-filter.test.ts b/src/renderer/src/lib/workspace/activation/worktree-activation-automation-filter.test.ts index 8ebe962dbe8..e51f999e112 100644 --- a/src/renderer/src/lib/workspace/activation/worktree-activation-automation-filter.test.ts +++ b/src/renderer/src/lib/workspace/activation/worktree-activation-automation-filter.test.ts @@ -5,12 +5,12 @@ import { activateAndRevealWorktree, activateAndRevealWorkspaceWithOutcome } from './worktree-activation' -import { reportAgentWorkspaceActivation } from '@/lib/worktree-activation-outcome' +import { reportAgentWorkspaceActivation } from '@/lib/workspace/activation/worktree-activation-outcome' const { toastError } = vi.hoisted(() => ({ toastError: vi.fn() })) vi.mock('sonner', () => ({ toast: { error: toastError } })) import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' -import '../../workspace-switch-user-act' +import './workspace-switch-user-act' // Main's answer to the window's layout commands, as a switch-on build sends them. vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) => diff --git a/src/renderer/src/lib/worktree-activation-outcome.ts b/src/renderer/src/lib/workspace/activation/worktree-activation-outcome.ts similarity index 81% rename from src/renderer/src/lib/worktree-activation-outcome.ts rename to src/renderer/src/lib/workspace/activation/worktree-activation-outcome.ts index 8ef174e375a..1b1ef77adf2 100644 --- a/src/renderer/src/lib/worktree-activation-outcome.ts +++ b/src/renderer/src/lib/workspace/activation/worktree-activation-outcome.ts @@ -1,9 +1,9 @@ import { toast } from 'sonner' -import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' -import type { ExecutionHostId } from '../../../shared/execution-host' +import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent' +import type { ExecutionHostId } from '../../../../../shared/execution-host' import type { PendingSidebarWorktreeReveal } from '@/store/slices/ui/ui-slice-contract-core' -import type { WorktreeStartupPayload } from './workspace/creation/worktree-startup-payload' -import type { WorktreeActivationSurfaceSelection } from './workspace/activation/worktree-activation-surface-selection' +import type { WorktreeStartupPayload } from '../creation/worktree-startup-payload' +import type { WorktreeActivationSurfaceSelection } from './worktree-activation-surface-selection' import { agentLaunchPaneNoticeText } from '@/components/terminal-pane/launch-outcome/agent-launch-pane-notice-text' export type ActivateAndRevealResult = { diff --git a/src/renderer/src/lib/workspace/activation/worktree-activation-pty-inventory.ts b/src/renderer/src/lib/workspace/activation/worktree-activation-pty-inventory.ts index 8685e939eb9..ca786b56033 100644 --- a/src/renderer/src/lib/workspace/activation/worktree-activation-pty-inventory.ts +++ b/src/renderer/src/lib/workspace/activation/worktree-activation-pty-inventory.ts @@ -11,7 +11,7 @@ import { resolveIndexedWorktreeOwner } from '../ownership/worktree-runtime-owner import { resolveWorktreeOperationRouteResult, type WorktreeOperationRouteState -} from '../../worktree-operation-route' +} from '../ownership/worktree-operation-route' /** Only a reachable execution-owner route can authorize activation from its inventory. */ export function resolveActivationPtyListScope( diff --git a/src/renderer/src/lib/workspace/activation/worktree-activation-visit.ts b/src/renderer/src/lib/workspace/activation/worktree-activation-visit.ts index 084916eb53f..dccd11afef3 100644 --- a/src/renderer/src/lib/workspace/activation/worktree-activation-visit.ts +++ b/src/renderer/src/lib/workspace/activation/worktree-activation-visit.ts @@ -4,7 +4,7 @@ import type { AppState } from '@/store/types' import type { ActiveWorktreeStateTransition } from '@/store/slices/worktrees/session/worktree-selection-contract' import { stampWorktreeVisit } from '@/store/slices/worktrees/session/worktree-visit-recency' import { appendHistoryEntry } from '@/store/slices/ui/workspace-navigation-history' -import { noteUserWorkspaceOpen } from '../../workspace-switch-user-act' +import { noteUserWorkspaceOpen } from './workspace-switch-user-act' type PreviousActive = { worktreeId: string | null; hostId: ExecutionHostId | null } type VisitState = Pick< diff --git a/src/renderer/src/lib/workspace/activation/worktree-activation.ts b/src/renderer/src/lib/workspace/activation/worktree-activation.ts index b27e4bd3b82..0dfeb8155ba 100644 --- a/src/renderer/src/lib/workspace/activation/worktree-activation.ts +++ b/src/renderer/src/lib/workspace/activation/worktree-activation.ts @@ -1,5 +1,5 @@ import { runtimeEnvironmentIdOrLocalUnlessTwin } from '../ownership/worktree-runtime-owner' -import { noteUserWorkspaceOpen } from '../../workspace-switch-user-act' +import { noteUserWorkspaceOpen } from './workspace-switch-user-act' import { useAppStore } from '@/store/index' import { activateWebRuntimeSessionWorktree } from '@/runtime/web-session-tabs-sync/actions/web-runtime-worktree-activation' import { isWebRuntimeSessionActive } from '@/runtime/web-session-tabs-sync/identity/web-runtime-session-environment' @@ -11,11 +11,11 @@ import { folderWorkspaceKey, parseWorkspaceKey } from '../../../../../shared/wor import { folderWorkspaceActivationBlocked, notifyBlockedFolderWorkspacePath -} from '../../folder-workspace-path-status' +} from '../paths/folder-workspace-path-status' import { findFolderWorkspaceOwner, getRuntimeEnvironmentIdForFolderWorkspace -} from '../../folder-workspace-runtime-owner' +} from '../ownership/folder-workspace-runtime-owner' import '../../../../../shared/folder-workspaces/folder-workspace-execution-host' import { getFolderWorkspaceHostId } from '../../../../../shared/folder-workspaces/folder-workspace-host-id' import { @@ -23,7 +23,7 @@ import { ensureWorktreeHasInitialTerminal } from '@/lib/workspace/activation/initial-surface/worktree-initial-terminal-seeding' import { ensureWebRuntimeWorktreeTerminalAfterWake } from '@/lib/web-runtime-worktree-terminal-after-wake' -import { applyWorktreeNavViewEntry } from '@/lib/worktree-nav-view-history-replay' +import { applyWorktreeNavViewEntry } from '@/lib/workspace/activation/worktree-nav-view-history-replay' import { activationProvidesInitialSurface, activationSeedsUserDefaultSurface, @@ -47,8 +47,7 @@ import { type WorkspaceActivationOutcome, type FolderWorkspaceActivationOptions, type WorkspaceRevealOptions -} from '@/lib/worktree-activation-outcome' -export type { ActivateAndRevealResult } from '@/lib/worktree-activation-outcome' +} from '@/lib/workspace/activation/worktree-activation-outcome' const canInspectAgentActivationInventory = (): boolean => typeof window !== 'undefined' && diff --git a/src/renderer/src/lib/workspace/activation/worktree-agent-activation-gate.ts b/src/renderer/src/lib/workspace/activation/worktree-agent-activation-gate.ts index 1968c820ef0..57e6d76f672 100644 --- a/src/renderer/src/lib/workspace/activation/worktree-agent-activation-gate.ts +++ b/src/renderer/src/lib/workspace/activation/worktree-agent-activation-gate.ts @@ -20,7 +20,7 @@ import { import { type LiveTerminalSurfaceOwnerIndex, readWorktreeLiveTerminalSurfaceOwners -} from '../../worktree-live-terminal-surface-owners' +} from '../ownership/worktree-live-terminal-surface-owners' import { isStructuredAgentSyntheticSleepingRecord } from '../../agent-session/resume/structured-agent-synthetic-sleeping-record' import { readWorktreeStructuredActivationInventory, diff --git a/src/renderer/src/lib/workspace/activation/worktree-agent-live-surface-adoption-layout-owner.test.ts b/src/renderer/src/lib/workspace/activation/worktree-agent-live-surface-adoption-layout-owner.test.ts index 0b73172ed8d..28af5f1408a 100644 --- a/src/renderer/src/lib/workspace/activation/worktree-agent-live-surface-adoption-layout-owner.test.ts +++ b/src/renderer/src/lib/workspace/activation/worktree-agent-live-surface-adoption-layout-owner.test.ts @@ -20,7 +20,7 @@ import { import { createStoreSessionMockApi } from '../../../store/testing/app-store-session-api.test-fixture' import { createTestStore } from '../../../store/testing/app-store-test-fixture' import { adoptLiveWorkspacePtySurfaces } from './worktree-agent-live-surface-adoption' -import type { LiveTerminalSurfaceOwnerIndex } from '../../worktree-live-terminal-surface-owners' +import type { LiveTerminalSurfaceOwnerIndex } from '../ownership/worktree-live-terminal-surface-owners' vi.mock('../../../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true })) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) diff --git a/src/renderer/src/lib/workspace/activation/worktree-agent-live-surface-adoption.ts b/src/renderer/src/lib/workspace/activation/worktree-agent-live-surface-adoption.ts index c6e59942e32..e5f26f1a21c 100644 --- a/src/renderer/src/lib/workspace/activation/worktree-agent-live-surface-adoption.ts +++ b/src/renderer/src/lib/workspace/activation/worktree-agent-live-surface-adoption.ts @@ -3,17 +3,17 @@ import { hasClosedTerminalTabRecord } from '../../../../../shared/workspace-layo import { parsePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id' import { worktreeIdsEqual } from '../../../../../shared/worktree/id' import type { useAppStore } from '@/store/index' -import type { WorktreeOperationRouteState } from '@/lib/worktree-operation-route' +import type { WorktreeOperationRouteState } from '@/lib/workspace/ownership/worktree-operation-route' import { layoutFramesHoldTerminalPane, layoutFrameTerminalTab } from '@/runtime/workspace-layout/frames/layout-frame-terminal-panes' -import { runtimeEnvironmentIdUnlessTwin } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' import { resolveTerminalTabPtyOwnership } from '../../terminal-tab-for-pty-id' import type { LiveTerminalSurfaceOwner, LiveTerminalSurfaceOwnerIndex -} from '../../worktree-live-terminal-surface-owners' +} from '../ownership/worktree-live-terminal-surface-owners' export type LiveSurfaceAdoptionStore = WorktreeOperationRouteState & Pick< diff --git a/src/renderer/src/lib/worktree-jump-navigation.ts b/src/renderer/src/lib/workspace/activation/worktree-jump-navigation.ts similarity index 94% rename from src/renderer/src/lib/worktree-jump-navigation.ts rename to src/renderer/src/lib/workspace/activation/worktree-jump-navigation.ts index 0eb12339527..dec0b983482 100644 --- a/src/renderer/src/lib/worktree-jump-navigation.ts +++ b/src/renderer/src/lib/workspace/activation/worktree-jump-navigation.ts @@ -1,12 +1,15 @@ import { toast } from 'sonner' import { translate } from '@/i18n/i18n' -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import { activateAndRevealWorkspace } from '@/lib/workspace/activation/worktree-activation' import { getVisibleWorktreeShortcutTargets } from '@/components/sidebar/worktree-list/listing/visible-worktrees' import { worktreePassesSidebarFilters } from '@/components/sidebar/worktree-list/listing/worktree-filter-visibility' import { sidebarHasActiveFilters } from '@/components/sidebar/worktree-list/controls/sidebar-filter-actions' -import { parseWorkspaceKey } from '../../../shared/workspace-scope' -import { normalizeExecutionHostId, type ExecutionHostId } from '../../../shared/execution-host' +import { parseWorkspaceKey } from '../../../../../shared/workspace-scope' +import { + normalizeExecutionHostId, + type ExecutionHostId +} from '../../../../../shared/execution-host' import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields' function wasHiddenBySidebarFilters(worktreeId: string, executionHostId?: ExecutionHostId): boolean { diff --git a/src/renderer/src/lib/worktree-nav-view-history-replay.ts b/src/renderer/src/lib/workspace/activation/worktree-nav-view-history-replay.ts similarity index 98% rename from src/renderer/src/lib/worktree-nav-view-history-replay.ts rename to src/renderer/src/lib/workspace/activation/worktree-nav-view-history-replay.ts index 107889c8982..ff583b15ded 100644 --- a/src/renderer/src/lib/worktree-nav-view-history-replay.ts +++ b/src/renderer/src/lib/workspace/activation/worktree-nav-view-history-replay.ts @@ -1,4 +1,4 @@ -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import type { WorktreeNavHistoryViewEntry } from '@/store/slices/ui/workspace-navigation-history' // Replay via setActiveView: open*Page would mutate previousViewBefore* or duplicate history (navigateToIndex). diff --git a/src/renderer/src/lib/worktree-reactivation-preserved-pane-replacement.test.ts b/src/renderer/src/lib/workspace/activation/worktree-reactivation-preserved-pane-replacement.test.ts similarity index 95% rename from src/renderer/src/lib/worktree-reactivation-preserved-pane-replacement.test.ts rename to src/renderer/src/lib/workspace/activation/worktree-reactivation-preserved-pane-replacement.test.ts index f8371355c16..24b1ded4539 100644 --- a/src/renderer/src/lib/worktree-reactivation-preserved-pane-replacement.test.ts +++ b/src/renderer/src/lib/workspace/activation/worktree-reactivation-preserved-pane-replacement.test.ts @@ -1,14 +1,14 @@ -import { getDefaultSettings } from '../../../shared/constants' +import { getDefaultSettings } from '../../../../../shared/constants' import path from 'node:path' import { afterEach, describe, expect, it, vi } from 'vitest' -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import type { AppState } from '@/store/types' -import { activateAndRevealWorktree } from './workspace/activation/worktree-activation' -import { waitForWorktreeAgentActivationGateForTests } from './workspace/activation/worktree-agent-activation-gate' +import { activateAndRevealWorktree } from './worktree-activation' +import { waitForWorktreeAgentActivationGateForTests } from './worktree-agent-activation-gate' import { makeCreatedAgentWorktree as makeWorktree } from '@/lib/workspace/activation/worktree-activation-created-agent.test-fixture' -import { makePaneKey } from '../../../shared/workspace-layout/stable-pane-id' -import type { ExecutionHostId } from '../../../shared/execution-host' -import { runtimeEnvironmentIdOrLocalUnlessTwin } from './workspace/ownership/worktree-runtime-owner' +import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id' +import type { ExecutionHostId } from '../../../../../shared/execution-host' +import { runtimeEnvironmentIdOrLocalUnlessTwin } from '../ownership/worktree-runtime-owner' import { markHostSessionMirrorHydrated, resetHostSessionMirrorHydrationForTests diff --git a/src/renderer/src/lib/worktree-reactivation-tab-forkbomb.test.ts b/src/renderer/src/lib/workspace/activation/worktree-reactivation-tab-forkbomb.test.ts similarity index 92% rename from src/renderer/src/lib/worktree-reactivation-tab-forkbomb.test.ts rename to src/renderer/src/lib/workspace/activation/worktree-reactivation-tab-forkbomb.test.ts index 5774ce345ba..6735f6f43b9 100644 --- a/src/renderer/src/lib/worktree-reactivation-tab-forkbomb.test.ts +++ b/src/renderer/src/lib/workspace/activation/worktree-reactivation-tab-forkbomb.test.ts @@ -1,21 +1,21 @@ -import { getDefaultSettings } from '../../../shared/constants' +import { getDefaultSettings } from '../../../../../shared/constants' import path from 'node:path' import { afterEach, describe, expect, it, vi } from 'vitest' -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import type { AppState } from '@/store/types' -import { activateAndRevealWorktree } from './workspace/activation/worktree-activation' -import { waitForWorktreeAgentActivationGateForTests } from './workspace/activation/worktree-agent-activation-gate' +import { activateAndRevealWorktree } from './worktree-activation' +import { waitForWorktreeAgentActivationGateForTests } from './worktree-agent-activation-gate' import { makeCreatedAgentWorktree as makeWorktree } from '@/lib/workspace/activation/worktree-activation-created-agent.test-fixture' -import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types' -import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch' -import { loadWorkspaceLayoutWithoutReport } from '../../../shared/workspace-layout/workspace-layout-load' -import { nameBasedLoadContext } from '../../../shared/workspace-layout/workspace-layout-minted-ids' -import { publishWorkspaceLayout } from '../../../shared/workspace-layout/workspace-layout-published' +import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts' +import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch' +import { loadWorkspaceLayoutWithoutReport } from '../../../../../shared/workspace-layout/workspace-layout-load' +import { nameBasedLoadContext } from '../../../../../shared/workspace-layout/workspace-layout-minted-ids' +import { publishWorkspaceLayout } from '../../../../../shared/workspace-layout/workspace-layout-published' import { addWorkspace, emptySession -} from '../../../shared/workspace-layout/workspace-layout-session.test-fixture' -import type { WorkspaceLayoutChangeFrame } from '../../../shared/workspace-layout/workspace-layout-stream-frames' +} from '../../../../../shared/workspace-layout/workspace-layout-session.test-fixture' +import type { WorkspaceLayoutChangeFrame } from '../../../../../shared/workspace-layout/workspace-layout-stream-frames' import { provideLayoutFrameTerminalPanes } from '@/runtime/workspace-layout/frames/layout-frame-terminal-panes' import { layoutApplyTestDouble } from '@/runtime/workspace-layout/testing/layout-apply-test-double' import { diff --git a/src/renderer/src/lib/worktree-visit-recency.ts b/src/renderer/src/lib/workspace/activation/worktree-visit-recency.ts similarity index 94% rename from src/renderer/src/lib/worktree-visit-recency.ts rename to src/renderer/src/lib/workspace/activation/worktree-visit-recency.ts index 58637b4d187..767fb0f67f4 100644 --- a/src/renderer/src/lib/worktree-visit-recency.ts +++ b/src/renderer/src/lib/workspace/activation/worktree-visit-recency.ts @@ -1,11 +1,11 @@ -import type { ExecutionHostId } from '../../../shared/execution-host' +import type { ExecutionHostId } from '../../../../../shared/execution-host' import { composeWorktreeHostIdentity, getWorktreeHostIdentity, getWorktreeIdFromHostIdentity, isWorktreeHostIdentity -} from '../../../shared/worktree/host-qualified-identity' -import type { Worktree } from '../../../shared/worktree/types' +} from '../../../../../shared/worktree/host-qualified-identity' +import type { Worktree } from '../../../../../shared/worktree/types' /** The persisted focus-recency map is host-qualified for new writes. */ export type WorktreeVisitOwner = Pick diff --git a/src/renderer/src/lib/wsl-moved-chat-activation.ts b/src/renderer/src/lib/workspace/activation/wsl-moved-chat-activation.ts similarity index 85% rename from src/renderer/src/lib/wsl-moved-chat-activation.ts rename to src/renderer/src/lib/workspace/activation/wsl-moved-chat-activation.ts index e7ddf29cf05..4aa3e3cdbf9 100644 --- a/src/renderer/src/lib/wsl-moved-chat-activation.ts +++ b/src/renderer/src/lib/workspace/activation/wsl-moved-chat-activation.ts @@ -1,6 +1,6 @@ -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import { findWslMovedProjectForWorkspace } from '@/store/repos/wsl-moved-projects' -import { activateStructuredAgentSessionTab } from './agent-session/structured-agent-session-tab-activation' +import { activateStructuredAgentSessionTab } from '../../agent-session/structured-agent-session-tab-activation' /** * Opens a workspace of a project a WSL host now owns, for its chats only. Unlike a normal diff --git a/src/renderer/src/lib/workspace-attachment-observed-origin.ts b/src/renderer/src/lib/workspace/attachments/workspace-attachment-observed-origin.ts similarity index 87% rename from src/renderer/src/lib/workspace-attachment-observed-origin.ts rename to src/renderer/src/lib/workspace/attachments/workspace-attachment-observed-origin.ts index 8fea8a00fdf..5d5fa5eba7b 100644 --- a/src/renderer/src/lib/workspace-attachment-observed-origin.ts +++ b/src/renderer/src/lib/workspace/attachments/workspace-attachment-observed-origin.ts @@ -1,14 +1,14 @@ import type { AppState } from '@/store/types' -import type { ExecutionHostId } from '../../../shared/execution-host' -import type { NotificationWorkspaceOwner } from '../../../shared/notification-source' +import type { ExecutionHostId } from '../../../../../shared/execution-host' +import type { NotificationWorkspaceOwner } from '../../../../../shared/notification-source' import { resolveNotificationTabOwner, resolveTerminalNotificationOwner } from '@/attention/notification-subject-owner' -import type { WorkspaceAttachmentOrigin } from '../../../shared/worktree/types' -import { parsePaneKey } from '../../../shared/workspace-layout/stable-pane-id' -import { terminalLayoutContainsLeaf } from '../../../shared/workspace-session/workspace-session-pane-ownership' -import type { Tab } from '../../../shared/tab-types' +import type { WorkspaceAttachmentOrigin } from '../../../../../shared/worktree/types' +import { parsePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id' +import { terminalLayoutContainsLeaf } from '../../../../../shared/workspace-session/workspace-session-pane-ownership' +import type { Tab } from '../../../../../shared/tab-types' export type WorkspaceReferenceTerminalContext = { kind?: 'terminal' diff --git a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-agent-routing.ts b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-agent-routing.ts index 36cf37328e7..e8939699302 100644 --- a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-agent-routing.ts +++ b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-agent-routing.ts @@ -1,4 +1,4 @@ -import type { ActivateAndRevealResult } from '@/lib/worktree-activation-outcome' +import type { ActivateAndRevealResult } from '@/lib/workspace/activation/worktree-activation-outcome' import { readAgentLaunchPreferencesForWorkspace } from '@/runtime/agent-launch-settings/use-host-agent-launch-preferences' import type { AgentLaunchPreferences } from '@/runtime/agent-launch-settings/host-agent-launch-preferences-resource' import { agentLaunchCommandErrorMessage } from '@/lib/workspace/creation/work-item/launch-work-item-direct-messages' @@ -24,7 +24,7 @@ import type { AgentSessionLaunchPlan } from '@/lib/agent-session/launch/routing/ import { resolveExecutionHostAgentStartupShell, type KnownExecutionHostPlatform -} from '@/lib/execution-host-facts' +} from '@/runtime/hosts/platform/execution-host-facts' import { beginStructuredAgentSessionProvisionalLaunch } from '@/lib/agent-session/structured-agent-session-provisional-tab' import type { DeclinedStructuredLaunchTerminalOptions } from '@/lib/agent-session/launch/structured-agent-session-launch-admission' import { diff --git a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-preflight.ts b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-preflight.ts index 898d33dabed..82a4d45dce0 100644 --- a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-preflight.ts +++ b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-preflight.ts @@ -16,7 +16,7 @@ import { getLocalRepoProjectExecutionRuntimeContext } from '../../../local-prefl import { refineLocalLaunchPlatform, resolveRepoExecutionHostPlatform -} from '../../../execution-host-facts' +} from '../../../../runtime/hosts/platform/execution-host-facts' import { isTuiAgentEnabled } from '../../../../../../shared/agent-launch/catalog/tui-agent-selection' import { resolveDefaultAgentForWorkspace } from '../../../agent-tab-shortcuts' import { isTuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent-config' diff --git a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-route-preparation.ts b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-route-preparation.ts index 621613abff9..764edf5ac28 100644 --- a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-route-preparation.ts +++ b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-route-preparation.ts @@ -1,14 +1,14 @@ import { ensureAgentLaunchPreferences } from '@/runtime/agent-launch-settings/use-host-agent-launch-preferences' import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' import type { AppState } from '@/store/types' -import { getConnectionIdFromState } from '@/lib/connection-owner-resolution' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import type { RepoHostFields } from '@/lib/agent-detection-target-inventory' import type { ProjectExecutionRuntimeResolution } from '../../../../../../shared/execution-host/project-execution-runtime' import { refineLocalLaunchPlatform, resolveRepoExecutionHostPlatform, type KnownExecutionHostPlatform -} from '@/lib/execution-host-facts' +} from '@/runtime/hosts/platform/execution-host-facts' import { CLIENT_PLATFORM } from '@/lib/new-workspace' import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context' import { resolveLocalWindowsTerminalShellOverrideForTab } from '../../../../../../shared/local-windows-terminal-runtime' diff --git a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-test-fixture.ts b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-test-fixture.ts index 262f3a50d7b..45e8b90cb0b 100644 --- a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-test-fixture.ts +++ b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-test-fixture.ts @@ -91,7 +91,7 @@ vi.mock('@/lib/ensure-hooks-confirmed', () => ({ ensureHooksApproved: vi.fn().mockResolvedValue({ decision: 'run' }) })) -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionId: mocks.getConnectionId })) diff --git a/src/renderer/src/lib/workspace/creation/worktree-creation-completion.ts b/src/renderer/src/lib/workspace/creation/worktree-creation-completion.ts index 2d643507bdd..87579aeeca0 100644 --- a/src/renderer/src/lib/workspace/creation/worktree-creation-completion.ts +++ b/src/renderer/src/lib/workspace/creation/worktree-creation-completion.ts @@ -5,7 +5,7 @@ import { useAppStore } from '@/store/index' import { ensureAgentStartupInTerminal } from '@/lib/new-workspace' import { queueWorkspaceActivationTerminalFocus } from '@/lib/workspace/activation/workspace-activation-terminal-focus' import { seedAgentTabStateAfterWorktreeCreate } from '@/lib/workspace/creation/worktree-creation-agent-seeds' -import type { ActivateAndRevealResult } from '@/lib/workspace/activation/worktree-activation' +import type { ActivateAndRevealResult } from '@/lib/workspace/activation/worktree-activation-outcome' import type { WorktreeCreationRequest } from '@/lib/workspace/creation/pending-worktree-creation' export async function completeWorktreeCreation(args: { diff --git a/src/renderer/src/lib/workspace/creation/worktree-creation-flow-execute.ts b/src/renderer/src/lib/workspace/creation/worktree-creation-flow-execute.ts index 27c6a317683..bf95b767dfb 100644 --- a/src/renderer/src/lib/workspace/creation/worktree-creation-flow-execute.ts +++ b/src/renderer/src/lib/workspace/creation/worktree-creation-flow-execute.ts @@ -1,9 +1,7 @@ import { prepareWorktreeCreationHooks, setupCreateArgs } from './worktree-creation-hook-preparation' import { useAppStore } from '@/store/index' -import { - activateAndRevealWorktree, - type ActivateAndRevealResult -} from '@/lib/workspace/activation/worktree-activation' +import { activateAndRevealWorktree } from '@/lib/workspace/activation/worktree-activation' +import type { ActivateAndRevealResult } from '@/lib/workspace/activation/worktree-activation-outcome' import { ensureWorktreeHasInitialTerminal } from '@/lib/workspace/activation/initial-surface/worktree-initial-terminal-seeding' import { attachEphemeralVmRuntimeToWorkspace, diff --git a/src/renderer/src/lib/workspace/creation/worktree-creation-flow-startup.ts b/src/renderer/src/lib/workspace/creation/worktree-creation-flow-startup.ts index 4a0013e3f5d..3c21a5873c6 100644 --- a/src/renderer/src/lib/workspace/creation/worktree-creation-flow-startup.ts +++ b/src/renderer/src/lib/workspace/creation/worktree-creation-flow-startup.ts @@ -1,7 +1,7 @@ import { createNonSecureContextUuid as createBrowserUuid } from '../../../../../shared/non-secure-context-uuid' import { useAppStore } from '@/store/index' import { ipcOrRuntimeTargetForHostId } from '@/runtime/rpc/targets/runtime-client-target' -import { runtimeTargetForRepoOwner } from '@/lib/repo-runtime-owner' +import { runtimeTargetForRepoOwner } from '@/lib/workspace/ownership/repo-runtime-owner' import type { WorktreeStartupPayload } from '@/lib/workspace/creation/worktree-startup-payload' import type { WorktreeCreationPhase, diff --git a/src/renderer/src/lib/workspace/creation/worktree-creation-ready-toast.tsx b/src/renderer/src/lib/workspace/creation/worktree-creation-ready-toast.tsx index 752e1cbecd2..49f3ad94a86 100644 --- a/src/renderer/src/lib/workspace/creation/worktree-creation-ready-toast.tsx +++ b/src/renderer/src/lib/workspace/creation/worktree-creation-ready-toast.tsx @@ -2,7 +2,7 @@ import { toast } from 'sonner' import { translate } from '@/i18n/i18n' import { useAppStore } from '@/store/index' import { getIndexedRepoMap } from '@/store/repos/repository-catalog-index' -import { workspaceNavigationToastAction } from '@/lib/workspace-navigation-toast-action' +import { workspaceNavigationToastAction } from '@/lib/workspace/activation/workspace-navigation-toast-action' import { resolveWorktreeDisplayName } from '@/lib/worktree-default-display-name' import { getResolvedExecutionHostIdForWorktree } from '@/lib/resolved-worktree-execution-host' import { resolveIndexedWorktreeOwner } from '@/lib/workspace/ownership/worktree-runtime-owner-index' diff --git a/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session.ts b/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session.ts index d82fdb15707..8fb320af57b 100644 --- a/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session.ts +++ b/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session.ts @@ -1,9 +1,7 @@ import { useAppStore } from '@/store/index' import { translate } from '@/i18n/i18n' -import { - activateAndRevealWorktree, - type ActivateAndRevealResult -} from '@/lib/workspace/activation/worktree-activation' +import { activateAndRevealWorktree } from '@/lib/workspace/activation/worktree-activation' +import type { ActivateAndRevealResult } from '@/lib/workspace/activation/worktree-activation-outcome' import { adoptAgentSessionLaunchVerdict } from '@/lib/agent-session/launch/routing/agent-session-launch-plan' import type { AgentLaunchRoute } from '@/lib/agent-session/launch/routing/agent-launch-routing' import { diff --git a/src/renderer/src/lib/wsl-host-windows-drive-refusal-toast.ts b/src/renderer/src/lib/workspace/creation/wsl-host-windows-drive-refusal-toast.ts similarity index 93% rename from src/renderer/src/lib/wsl-host-windows-drive-refusal-toast.ts rename to src/renderer/src/lib/workspace/creation/wsl-host-windows-drive-refusal-toast.ts index 6aeb477ec8d..06df9152e2f 100644 --- a/src/renderer/src/lib/wsl-host-windows-drive-refusal-toast.ts +++ b/src/renderer/src/lib/workspace/creation/wsl-host-windows-drive-refusal-toast.ts @@ -1,5 +1,5 @@ import { toast } from 'sonner' -import type { WslHostWindowsDriveRefusal } from '../../../shared/wsl-host-windows-drive-refusal' +import type { WslHostWindowsDriveRefusal } from '../../../../../shared/wsl-host-windows-drive-refusal' import { translate } from '@/i18n/i18n' import type { Translate } from '@/i18n/use-translate' diff --git a/src/renderer/src/lib/active-workspace-host.ts b/src/renderer/src/lib/workspace/ownership/active-workspace-host.ts similarity index 96% rename from src/renderer/src/lib/active-workspace-host.ts rename to src/renderer/src/lib/workspace/ownership/active-workspace-host.ts index 851707acb94..f87b025285c 100644 --- a/src/renderer/src/lib/active-workspace-host.ts +++ b/src/renderer/src/lib/workspace/ownership/active-workspace-host.ts @@ -1,4 +1,4 @@ -import type { ExecutionHostId } from '../../../shared/execution-host' +import type { ExecutionHostId } from '../../../../../shared/execution-host' type SelectionState = { activeWorktreeId?: string | null diff --git a/src/renderer/src/lib/connection-context.test.ts b/src/renderer/src/lib/workspace/ownership/connection-context.test.ts similarity index 95% rename from src/renderer/src/lib/connection-context.test.ts rename to src/renderer/src/lib/workspace/ownership/connection-context.test.ts index c0c5fdebe93..f864ff7b0b9 100644 --- a/src/renderer/src/lib/connection-context.test.ts +++ b/src/renderer/src/lib/workspace/ownership/connection-context.test.ts @@ -1,17 +1,16 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import type { FolderWorkspace } from '../../../shared/folder-workspaces/folder-workspace-types' -import type { ProjectGroup } from '../../../shared/project-group-types' -import type { Repo } from '../../../shared/repo-types' -import type { Worktree } from '../../../shared/worktree/types' -import { useAppStore } from '@/store' +import type { FolderWorkspace } from '../../../../../shared/folder-workspaces/folder-workspace-types' +import type { ProjectGroup } from '../../../../../shared/project-group-types' +import type { Repo } from '../../../../../shared/repo-types' +import type { Worktree } from '../../../../../shared/worktree/types' +import { useAppStore } from '@/store/index' import type { AppState } from '@/store/types' +import { getConnectionId, getConnectionIdForFile } from './connection-context' import { - getConnectionId, - getConnectionIdForFile, + createConnectionIdForFileSelector, getConnectionIdFromState -} from './connection-context' -import { folderWorkspaceKey } from '../../../shared/workspace-scope' -import { createConnectionIdForFileSelector } from './connection-owner-resolution' +} from './connection-owner-resolution' +import { folderWorkspaceKey } from '../../../../../shared/workspace-scope' const initialState = useAppStore.getInitialState() diff --git a/src/renderer/src/lib/connection-context.ts b/src/renderer/src/lib/workspace/ownership/connection-context.ts similarity index 86% rename from src/renderer/src/lib/connection-context.ts rename to src/renderer/src/lib/workspace/ownership/connection-context.ts index 0af16a07a1b..55effa46d5f 100644 --- a/src/renderer/src/lib/connection-context.ts +++ b/src/renderer/src/lib/workspace/ownership/connection-context.ts @@ -1,12 +1,10 @@ -import { useAppStore } from '@/store' -import { parseWorkspaceKey } from '../../../shared/workspace-scope' +import { useAppStore } from '@/store/index' +import { parseWorkspaceKey } from '../../../../../shared/workspace-scope' import { getConnectionIdForFileFromState, getConnectionIdFromState } from './connection-owner-resolution' -export { getConnectionIdFromState } from './connection-owner-resolution' - /** Return SSH target, null for resolved local, or undefined while ownership is unknown. */ export function getConnectionId(worktreeId: string | null): string | null | undefined { return getConnectionIdFromState(useAppStore.getState(), worktreeId) diff --git a/src/renderer/src/lib/connection-owner-resolution.ts b/src/renderer/src/lib/workspace/ownership/connection-owner-resolution.ts similarity index 85% rename from src/renderer/src/lib/connection-owner-resolution.ts rename to src/renderer/src/lib/workspace/ownership/connection-owner-resolution.ts index 8aa6a61b9b3..b0f835e7a20 100644 --- a/src/renderer/src/lib/connection-owner-resolution.ts +++ b/src/renderer/src/lib/workspace/ownership/connection-owner-resolution.ts @@ -1,29 +1,27 @@ import type { AppState } from '@/store/types' +import { findIndexedRepoOwnerForHost, resolveIndexedRepoOwner } from './repo-owner-index' +import { resolveIndexedWorktreeOwner } from './worktree-runtime-owner-index' +import { resolveWorktreeExecutionHost } from '../../../../../shared/execution-host/worktree-execution-host-resolution' import { - findIndexedRepoOwnerForHost, - resolveIndexedRepoOwner -} from './workspace/ownership/repo-owner-index' -import { resolveIndexedWorktreeOwner } from './workspace/ownership/worktree-runtime-owner-index' -import { resolveWorktreeExecutionHost } from '../../../shared/execution-host/worktree-execution-host-resolution' -import { getRepoExecutionHostId, getRepoSshConnectionId } from '../../../shared/execution-host' -import type { Repo } from '../../../shared/repo-types' -import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants' -import { getRepoIdFromWorktreeId } from '../../../shared/worktree/id' -import { parseWorkspaceKey } from '../../../shared/workspace-scope' + getRepoExecutionHostId, + getRepoSshConnectionId +} from '../../../../../shared/execution-host' +import type { Repo } from '../../../../../shared/repo-types' +import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../shared/constants' +import { getRepoIdFromWorktreeId } from '../../../../../shared/worktree/id' +import { parseWorkspaceKey } from '../../../../../shared/workspace-scope' import { isPathInsideOrEqual, normalizeRuntimePathForComparison -} from '../../../shared/cross-platform-path' -import { - getFolderWorkspaceCandidateRepos, - getFolderWorkspaceConnectionId -} from './folder-workspace-connection' +} from '../../../../../shared/cross-platform-path' +import { getFolderWorkspaceConnectionId } from './folder-workspace-connection' +import { findFolderWorkspaceCandidateRepos } from '../../../../../shared/folder-workspaces/folder-workspace-execution-host' import { selectFolderWorkspaces, selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields' import { resolveQualifiedIndexedFolderWorkspace } from '@/store/folder-workspaces/folder-workspace-record-index' -import type { ExecutionHostId } from '../../../shared/execution-host' +import type { ExecutionHostId } from '../../../../../shared/execution-host' import { resolveQualifiedWorktreeExecutionOwner } from './qualified-worktree-execution-owner' type ConnectionOwnerState = Pick< @@ -137,7 +135,7 @@ export function getFolderFileConnectionOwnerFromState( folderWorkspaceId: string, filePath: string ): { connectionId: string | null; repo?: Repo } | undefined { - const candidateRepos = getFolderWorkspaceCandidateRepos(state, folderWorkspaceId) + const candidateRepos = findFolderWorkspaceCandidateRepos(state, folderWorkspaceId) const matchingRepos = candidateRepos .filter((repo) => isPathInsideOrEqual(repo.path, filePath)) .map((repo) => ({ repo, normalizedPath: normalizeRuntimePathForComparison(repo.path) })) diff --git a/src/renderer/src/lib/direct-ssh-target-owner-index.ts b/src/renderer/src/lib/workspace/ownership/direct-ssh-target-owner-index.ts similarity index 100% rename from src/renderer/src/lib/direct-ssh-target-owner-index.ts rename to src/renderer/src/lib/workspace/ownership/direct-ssh-target-owner-index.ts diff --git a/src/renderer/src/lib/direct-ssh-target-scope-types.ts b/src/renderer/src/lib/workspace/ownership/direct-ssh-target-scope-types.ts similarity index 82% rename from src/renderer/src/lib/direct-ssh-target-scope-types.ts rename to src/renderer/src/lib/workspace/ownership/direct-ssh-target-scope-types.ts index 421f6753665..22f6678f977 100644 --- a/src/renderer/src/lib/direct-ssh-target-scope-types.ts +++ b/src/renderer/src/lib/workspace/ownership/direct-ssh-target-scope-types.ts @@ -1,5 +1,5 @@ -import type { Repo } from '../../../shared/repo-types' -import type { Worktree } from '../../../shared/worktree/types' +import type { Repo } from '../../../../../shared/repo-types' +import type { Worktree } from '../../../../../shared/worktree/types' export type DirectSshRepoOwner = Pick< Repo, diff --git a/src/renderer/src/lib/direct-ssh-target-scope.test.ts b/src/renderer/src/lib/workspace/ownership/direct-ssh-target-scope.test.ts similarity index 95% rename from src/renderer/src/lib/direct-ssh-target-scope.test.ts rename to src/renderer/src/lib/workspace/ownership/direct-ssh-target-scope.test.ts index 892722d8253..5588171f30c 100644 --- a/src/renderer/src/lib/direct-ssh-target-scope.test.ts +++ b/src/renderer/src/lib/workspace/ownership/direct-ssh-target-scope.test.ts @@ -1,8 +1,6 @@ import { describe, expect, it } from 'vitest' -import { - resolveDirectSshTargetWorktreeIds, - type DirectSshTargetScopeInput -} from './direct-ssh-target-scope' +import { resolveDirectSshTargetWorktreeIds } from './direct-ssh-target-scope' +import type { DirectSshTargetScopeInput } from './direct-ssh-target-scope-types' const baseInput: DirectSshTargetScopeInput = { targetId: 'target-a', diff --git a/src/renderer/src/lib/direct-ssh-target-scope.ts b/src/renderer/src/lib/workspace/ownership/direct-ssh-target-scope.ts similarity index 96% rename from src/renderer/src/lib/direct-ssh-target-scope.ts rename to src/renderer/src/lib/workspace/ownership/direct-ssh-target-scope.ts index 54d4cf7ef3b..69e343c0207 100644 --- a/src/renderer/src/lib/direct-ssh-target-scope.ts +++ b/src/renderer/src/lib/workspace/ownership/direct-ssh-target-scope.ts @@ -4,15 +4,14 @@ import { toRuntimeExecutionHostId, toSshExecutionHostId, type ExecutionHostId -} from '../../../shared/execution-host' -import { worktreeWorkspaceKey } from '../../../shared/workspace-scope' +} from '../../../../../shared/execution-host' +import { worktreeWorkspaceKey } from '../../../../../shared/workspace-scope' import type { DirectSshRepoOwner as RepoOwner, DirectSshTargetScopeInput, DirectSshWorktreeOwner as WorktreeOwner } from './direct-ssh-target-scope-types' import { indexDirectSshOwnerRows } from './direct-ssh-target-owner-index' -export type { DirectSshTargetScopeInput } from './direct-ssh-target-scope-types' type HostEvidence = { hosts: Set diff --git a/src/renderer/src/lib/folder-workspace-connection.ts b/src/renderer/src/lib/workspace/ownership/folder-workspace-connection.ts similarity index 80% rename from src/renderer/src/lib/folder-workspace-connection.ts rename to src/renderer/src/lib/workspace/ownership/folder-workspace-connection.ts index 0632be5f420..b126df6e650 100644 --- a/src/renderer/src/lib/folder-workspace-connection.ts +++ b/src/renderer/src/lib/workspace/ownership/folder-workspace-connection.ts @@ -1,11 +1,9 @@ -import type { Repo } from '../../../shared/repo-types' -import { - findFolderWorkspaceCandidateRepos, - resolveFolderWorkspaceHost, - type FolderWorkspaceHost, - type FolderWorkspaceHostState, - type FolderWorkspaceHostState as FolderWorkspaceConnectionState -} from '../../../shared/folder-workspaces/folder-workspace-execution-host' +import { resolveFolderWorkspaceHost } from '../../../../../shared/folder-workspaces/folder-workspace-execution-host' +import type { + FolderWorkspaceHost, + FolderWorkspaceHostState, + FolderWorkspaceHostState as FolderWorkspaceConnectionState +} from '../../../../../shared/folder-workspaces/folder-workspace-execution-host' import { selectFolderWorkspaces } from '@/store/workspaces/catalog/workspace-record-fields' type ConnectionsByRepos = WeakMap< @@ -53,13 +51,6 @@ function readFolderWorkspaceHost( return host } -export function getFolderWorkspaceCandidateRepos( - state: FolderWorkspaceConnectionState, - folderWorkspaceId: string -): Repo[] { - return findFolderWorkspaceCandidateRepos(state, folderWorkspaceId) -} - /** Legacy tri-state view of the shared resolution: `undefined` = gone or ambiguous. */ export function getFolderWorkspaceConnectionId( state: FolderWorkspaceConnectionState, diff --git a/src/renderer/src/lib/folder-workspace-runtime-owner.ts b/src/renderer/src/lib/workspace/ownership/folder-workspace-runtime-owner.ts similarity index 94% rename from src/renderer/src/lib/folder-workspace-runtime-owner.ts rename to src/renderer/src/lib/workspace/ownership/folder-workspace-runtime-owner.ts index 0a1469ed157..e2cf26e8444 100644 --- a/src/renderer/src/lib/folder-workspace-runtime-owner.ts +++ b/src/renderer/src/lib/workspace/ownership/folder-workspace-runtime-owner.ts @@ -1,22 +1,22 @@ -import type { QualifiedFolderHostState } from '../../../shared/folder-workspaces/folder-workspace-execution-host' +import type { QualifiedFolderHostState } from '../../../../../shared/folder-workspaces/folder-workspace-execution-host' import { parseExecutionHostId, toRuntimeExecutionHostId, toSshExecutionHostId, type ExecutionHostId, type ParsedExecutionHost -} from '../../../shared/execution-host' +} from '../../../../../shared/execution-host' -import type { FolderWorkspace } from '../../../shared/folder-workspaces/folder-workspace-types' -import type { ProjectGroup } from '../../../shared/project-group-types' -import { folderWorkspaceKey, parseWorkspaceKey } from '../../../shared/workspace-scope' +import type { FolderWorkspace } from '../../../../../shared/folder-workspaces/folder-workspace-types' +import type { ProjectGroup } from '../../../../../shared/project-group-types' +import { folderWorkspaceKey, parseWorkspaceKey } from '../../../../../shared/workspace-scope' import { findIndexedFolderWorkspaceOwner, findIndexedProjectGroupOwner -} from './workspace/ownership/worktree-runtime-owner-index' +} from './worktree-runtime-owner-index' import { resolveQualifiedIndexedFolderWorkspace } from '@/store/folder-workspaces/folder-workspace-record-index' import type { SingleRuntimeLegacyOwnerState } from './single-runtime-legacy-owner' -import { getPairedWebClientEnvironmentId } from './paired-web-client-host' +import { getPairedWebClientEnvironmentId } from '../../paired-web-client-host' type RuntimeExecutionHost = Extract diff --git a/src/renderer/src/lib/qualified-worktree-execution-owner.ts b/src/renderer/src/lib/workspace/ownership/qualified-worktree-execution-owner.ts similarity index 79% rename from src/renderer/src/lib/qualified-worktree-execution-owner.ts rename to src/renderer/src/lib/workspace/ownership/qualified-worktree-execution-owner.ts index ebcaed0fae7..fb64cc7528d 100644 --- a/src/renderer/src/lib/qualified-worktree-execution-owner.ts +++ b/src/renderer/src/lib/workspace/ownership/qualified-worktree-execution-owner.ts @@ -1,15 +1,15 @@ -import type { Worktree } from '../../../shared/worktree/types' -import type { ExecutionHostId } from '../../../shared/execution-host' +import type { Worktree } from '../../../../../shared/worktree/types' +import type { ExecutionHostId } from '../../../../../shared/execution-host' import { resolveWorktreeExecutionHost, type ExecutionHostOwnerRow -} from '../../../shared/execution-host/worktree-execution-host-resolution' +} from '../../../../../shared/execution-host/worktree-execution-host-resolution' import { findIndexedWorktreeOwnerForHost, resolveIndexedWorktreeOwner -} from './workspace/ownership/worktree-runtime-owner-index' -import { worktreeOwnerHostIds } from './workspace/ownership/workspace-catalog-owner-index' -import { getIndexedRepoExecutionHostLookup } from './workspace/ownership/repo-owner-index' +} from './worktree-runtime-owner-index' +import { worktreeOwnerHostIds } from './workspace-catalog-owner-index' +import { getIndexedRepoExecutionHostLookup } from './repo-owner-index' type WorktreeOwnerRow = Pick diff --git a/src/renderer/src/lib/repo-runtime-owner.ts b/src/renderer/src/lib/workspace/ownership/repo-runtime-owner.ts similarity index 94% rename from src/renderer/src/lib/repo-runtime-owner.ts rename to src/renderer/src/lib/workspace/ownership/repo-runtime-owner.ts index 84163edef6e..a0cd7a3bf56 100644 --- a/src/renderer/src/lib/repo-runtime-owner.ts +++ b/src/renderer/src/lib/workspace/ownership/repo-runtime-owner.ts @@ -3,11 +3,11 @@ import { getSettingsFocusedExecutionHostId, parseExecutionHostId, type ExecutionHostId -} from '../../../shared/execution-host' -import type { GlobalSettings } from '../../../shared/global-settings-types' -import type { Repo } from '../../../shared/repo-types' +} from '../../../../../shared/execution-host' +import type { GlobalSettings } from '../../../../../shared/global-settings-types' +import type { Repo } from '../../../../../shared/repo-types' import { ipcOrRuntimeTargetForHostId } from '@/runtime/rpc/targets/runtime-client-target' -import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' +import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target' type RepoOwnerRow = Pick diff --git a/src/renderer/src/lib/repository-owner-index.ts b/src/renderer/src/lib/workspace/ownership/repository-owner-index.ts similarity index 97% rename from src/renderer/src/lib/repository-owner-index.ts rename to src/renderer/src/lib/workspace/ownership/repository-owner-index.ts index aaf73ace2ea..f7a32acc6ae 100644 --- a/src/renderer/src/lib/repository-owner-index.ts +++ b/src/renderer/src/lib/workspace/ownership/repository-owner-index.ts @@ -1,10 +1,10 @@ -import type { Repo } from '../../../shared/repo-types' +import type { Repo } from '../../../../../shared/repo-types' import { getRepoExecutionHostId, getRepoSshConnectionId, toSshExecutionHostId, type ExecutionHostId -} from '../../../shared/execution-host' +} from '../../../../../shared/execution-host' type RepoOwnerRecord = Pick diff --git a/src/renderer/src/lib/resolve-owner.ts b/src/renderer/src/lib/workspace/ownership/resolve-owner.ts similarity index 94% rename from src/renderer/src/lib/resolve-owner.ts rename to src/renderer/src/lib/workspace/ownership/resolve-owner.ts index ee1d7fd22a9..70852ab83ab 100644 --- a/src/renderer/src/lib/resolve-owner.ts +++ b/src/renderer/src/lib/workspace/ownership/resolve-owner.ts @@ -15,21 +15,21 @@ import { toRuntimeExecutionHostId, toSshExecutionHostId, type ExecutionHostId -} from '../../../shared/execution-host' -import { getRepoIdFromWorktreeId } from '../../../shared/worktree/id' +} from '../../../../../shared/execution-host' +import { getRepoIdFromWorktreeId } from '../../../../../shared/worktree/id' import { findIndexedWorktreeOwnerForHost, findIndexedDetectedWorktrees, resolveIndexedFolderWorkspaceOwner, resolveIndexedProjectGroupOwner -} from './workspace/ownership/worktree-runtime-owner-index' -import { resolveQualifiedIndexedRepoOwnerForHost } from './workspace/ownership/repo-owner-index' +} from './worktree-runtime-owner-index' +import { resolveQualifiedIndexedRepoOwnerForHost } from './repo-owner-index' import { hostAuthorityFromOperationRoute, SELF_LOCAL_AUTHORITY, type HostAuthority -} from '../../../shared/host-authority' -import type { ExecutionHostOwnerMatch } from '../../../shared/execution-host/worktree-execution-host-resolution' +} from '../../../../../shared/host-authority' +import type { ExecutionHostOwnerMatch } from '../../../../../shared/execution-host/worktree-execution-host-resolution' import { getFloatingWorkspaceOperationRoute, resolveWorktreeOperationRouteResultForHost, @@ -42,10 +42,10 @@ import { getExplicitRuntimeEnvironmentIdForFolderWorkspace, getNestedSshTargetIdForFolderWorkspace } from './folder-workspace-runtime-owner' -import { parseWorkspaceKey } from '../../../shared/workspace-scope' -import { warnAmbiguousOwnerOnce } from './ambiguous-owner-warning' +import { parseWorkspaceKey } from '../../../../../shared/workspace-scope' +import { warnAmbiguousOwnerOnce } from '../../ambiguous-owner-warning' import { hostRouteForAuthority } from '@/runtime/rpc/targets/runtime-client-target' -import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' +import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target' /** A worktree id, a `folder:` workspace key, or the floating workspace; `hostId` when the row names one. */ export type WorkspaceOwnerRef = { workspaceId: string; hostId?: ExecutionHostId } diff --git a/src/renderer/src/lib/runtime-session-mirror-owners.ts b/src/renderer/src/lib/workspace/ownership/runtime-session-mirror-owners.ts similarity index 92% rename from src/renderer/src/lib/runtime-session-mirror-owners.ts rename to src/renderer/src/lib/workspace/ownership/runtime-session-mirror-owners.ts index 26ed11c1985..6f95d799e7b 100644 --- a/src/renderer/src/lib/runtime-session-mirror-owners.ts +++ b/src/renderer/src/lib/workspace/ownership/runtime-session-mirror-owners.ts @@ -1,5 +1,5 @@ -import { getRepoExecutionHostId, parseExecutionHostId } from '../../../shared/execution-host' -import type { WorktreeRuntimeOwnerState } from './workspace/ownership/worktree-runtime-owner-state' +import { getRepoExecutionHostId, parseExecutionHostId } from '../../../../../shared/execution-host' +import type { WorktreeRuntimeOwnerState } from './worktree-runtime-owner-state' function addRuntimeExecutionHost(ids: Set, hostId: string | null | undefined): void { const parsed = parseExecutionHostId(hostId) diff --git a/src/renderer/src/lib/single-runtime-legacy-owner.ts b/src/renderer/src/lib/workspace/ownership/single-runtime-legacy-owner.ts similarity index 89% rename from src/renderer/src/lib/single-runtime-legacy-owner.ts rename to src/renderer/src/lib/workspace/ownership/single-runtime-legacy-owner.ts index 381d8a92277..06aa590308b 100644 --- a/src/renderer/src/lib/single-runtime-legacy-owner.ts +++ b/src/renderer/src/lib/workspace/ownership/single-runtime-legacy-owner.ts @@ -1,4 +1,4 @@ -import { getPairedWebClientEnvironmentId } from './paired-web-client-host' +import { getPairedWebClientEnvironmentId } from '../../paired-web-client-host' export type SingleRuntimeLegacyOwnerState = { settings?: { activeRuntimeEnvironmentId?: string | null } | null diff --git a/src/renderer/src/lib/unified-tab-host-ownership.ts b/src/renderer/src/lib/workspace/ownership/unified-tab-host-ownership.ts similarity index 88% rename from src/renderer/src/lib/unified-tab-host-ownership.ts rename to src/renderer/src/lib/workspace/ownership/unified-tab-host-ownership.ts index 97c170af92b..13131287d4f 100644 --- a/src/renderer/src/lib/unified-tab-host-ownership.ts +++ b/src/renderer/src/lib/workspace/ownership/unified-tab-host-ownership.ts @@ -1,18 +1,18 @@ -import type { Tab } from '../../../shared/tab-types' -import type { Worktree } from '../../../shared/worktree/types' +import type { Tab } from '../../../../../shared/tab-types' +import type { Worktree } from '../../../../../shared/worktree/types' import type { OpenFile } from '@/store/slices/editor/types/open-file' import { LOCAL_EXECUTION_HOST_ID, toRuntimeExecutionHostId, toSshExecutionHostId, type ExecutionHostId -} from '../../../shared/execution-host' +} from '../../../../../shared/execution-host' import { isExecutionHostAliasForWorktree } from './worktree-execution-host-alias' -import { folderWorkspaceKey } from '../../../shared/workspace-scope' +import { folderWorkspaceKey } from '../../../../../shared/workspace-scope' import type { AppState } from '@/store/types' -import { dedupePaletteWorktrees } from './workspace/search/palette-repo-resolution' -import { getResolvedExecutionHostIdForWorktree } from './resolved-worktree-execution-host' -import type { WorktreeRuntimeOwnerState } from './workspace/ownership/worktree-runtime-owner-state' +import { dedupePaletteWorktrees } from '../search/palette-repo-resolution' +import { getResolvedExecutionHostIdForWorktree } from '../../resolved-worktree-execution-host' +import type { WorktreeRuntimeOwnerState } from './worktree-runtime-owner-state' import { selectFolderWorkspaces, selectWorktreesByRepo diff --git a/src/renderer/src/lib/workspace-copy-owner.ts b/src/renderer/src/lib/workspace/ownership/workspace-copy-owner.ts similarity index 96% rename from src/renderer/src/lib/workspace-copy-owner.ts rename to src/renderer/src/lib/workspace/ownership/workspace-copy-owner.ts index f5c48bd4f11..a5fd185fa50 100644 --- a/src/renderer/src/lib/workspace-copy-owner.ts +++ b/src/renderer/src/lib/workspace/ownership/workspace-copy-owner.ts @@ -8,30 +8,30 @@ import { toRuntimeExecutionHostId, toSshExecutionHostId, type ExecutionHostId -} from '../../../shared/execution-host' +} from '../../../../../shared/execution-host' import { authorityKey, hostAuthorityFromOperationRoute, type HostAuthority, type HostAuthorityEndpoint -} from '../../../shared/host-authority' -import type { ExecutionHostOwnerMatch } from '../../../shared/execution-host/worktree-execution-host-resolution' -import { parseWorkspaceKey } from '../../../shared/workspace-scope' -import { getRepoIdFromWorktreeId } from '../../../shared/worktree/id' +} from '../../../../../shared/host-authority' +import type { ExecutionHostOwnerMatch } from '../../../../../shared/execution-host/worktree-execution-host-resolution' +import { parseWorkspaceKey } from '../../../../../shared/workspace-scope' +import { getRepoIdFromWorktreeId } from '../../../../../shared/worktree/id' import { selectDetectedWorktreesByRepo, selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields' import { selectFolderWorkspaceCopies } from '@/store/folder-workspaces/folder-workspace-record-index' import type { OpenFile } from '@/store/slices/editor/types/open-file' -import { focusFreeRouteStateOf } from './editor-file-operation-provenance' +import { focusFreeRouteStateOf } from '../../editor-file-operation-provenance' import { namedHostForOwnerRef, resolveOwner, resolveOwnerOfRoute } from './resolve-owner' import { resolveUnstampedRecordHost } from './worktree-operation-catalog-route' import { resolveExactWorktreeRoute, routeForOwner } from './worktree-owner-route' import { findIndexedDetectedWorktrees, findIndexedWorktrees as findIndexedWorktreeOwners -} from './workspace/ownership/worktree-runtime-owner-index' +} from './worktree-runtime-owner-index' import type { WorktreeOperationOwnerRecord, WorktreeOperationRouteState diff --git a/src/renderer/src/lib/workspace-row-owner-host.ts b/src/renderer/src/lib/workspace/ownership/workspace-row-owner-host.ts similarity index 71% rename from src/renderer/src/lib/workspace-row-owner-host.ts rename to src/renderer/src/lib/workspace/ownership/workspace-row-owner-host.ts index 53d61f1de50..16e6e0c0d17 100644 --- a/src/renderer/src/lib/workspace-row-owner-host.ts +++ b/src/renderer/src/lib/workspace/ownership/workspace-row-owner-host.ts @@ -1,9 +1,9 @@ -import { getRepoExecutionHostId, type ExecutionHostId } from '../../../shared/execution-host' -import { parseWorkspaceKey } from '../../../shared/workspace-scope' -import { getRepoIdFromWorktreeId } from '../../../shared/worktree/id' -import '../../../shared/folder-workspaces/folder-workspace-execution-host' -import { getFolderWorkspaceHostId } from '../../../shared/folder-workspaces/folder-workspace-host-id' -import type { AppState } from '../store/types' +import { getRepoExecutionHostId, type ExecutionHostId } from '../../../../../shared/execution-host' +import { parseWorkspaceKey } from '../../../../../shared/workspace-scope' +import { getRepoIdFromWorktreeId } from '../../../../../shared/worktree/id' +import '../../../../../shared/folder-workspaces/folder-workspace-execution-host' +import { getFolderWorkspaceHostId } from '../../../../../shared/folder-workspaces/folder-workspace-host-id' +import type { AppState } from '../../../store/types' import { selectFolderWorkspaces } from '@/store/workspaces/catalog/workspace-record-fields' /** diff --git a/src/renderer/src/lib/workspace/ownership/workspace-runtime-environment.ts b/src/renderer/src/lib/workspace/ownership/workspace-runtime-environment.ts index de9b22ca359..c6ad2070a2d 100644 --- a/src/renderer/src/lib/workspace/ownership/workspace-runtime-environment.ts +++ b/src/renderer/src/lib/workspace/ownership/workspace-runtime-environment.ts @@ -1,7 +1,7 @@ import { useAppStore } from '../../../store/index' import type { AppState } from '../../../store/types' import { parseExecutionHostId } from '../../../../../shared/execution-host' -import { workspaceOwnerHostId } from '../../workspace-row-owner-host' +import { workspaceOwnerHostId } from './workspace-row-owner-host' export function selectWorkspaceRuntimeEnvironmentId( state: AppState, diff --git a/src/renderer/src/lib/workspace-runtime-host-ownership.ts b/src/renderer/src/lib/workspace/ownership/workspace-runtime-host-ownership.ts similarity index 93% rename from src/renderer/src/lib/workspace-runtime-host-ownership.ts rename to src/renderer/src/lib/workspace/ownership/workspace-runtime-host-ownership.ts index 330ea86ad16..478afecdc8c 100644 --- a/src/renderer/src/lib/workspace-runtime-host-ownership.ts +++ b/src/renderer/src/lib/workspace/ownership/workspace-runtime-host-ownership.ts @@ -1,9 +1,9 @@ -import type { Worktree } from '../../../shared/worktree/types' +import type { Worktree } from '../../../../../shared/worktree/types' import { parseExecutionHostId, toRuntimeExecutionHostId, type ExecutionHostId -} from '../../../shared/execution-host' +} from '../../../../../shared/execution-host' export type WorkspaceRuntimeOwnerProjection = Pick< Worktree, diff --git a/src/renderer/src/lib/workspace-terminal-host-authority.test.ts b/src/renderer/src/lib/workspace/ownership/workspace-terminal-host-authority.test.ts similarity index 99% rename from src/renderer/src/lib/workspace-terminal-host-authority.test.ts rename to src/renderer/src/lib/workspace/ownership/workspace-terminal-host-authority.test.ts index ec0f9b975f8..c48ab04c49a 100644 --- a/src/renderer/src/lib/workspace-terminal-host-authority.test.ts +++ b/src/renderer/src/lib/workspace/ownership/workspace-terminal-host-authority.test.ts @@ -4,7 +4,7 @@ import type * as AgentStatusModule from '@/lib/agent-status' import { createTestStore } from '@/store/testing/app-store-test-fixture' import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' import { ensureWorktreeHasInitialTerminal } from '@/lib/workspace/activation/initial-surface/worktree-initial-terminal-seeding' -import { resolveWorkspaceTerminalHostAuthority } from '@/lib/workspace-terminal-host-authority' +import { resolveWorkspaceTerminalHostAuthority } from '@/lib/workspace/ownership/workspace-terminal-host-authority' // Main's answer to the window's layout commands, as a switch-on build sends them. vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) => diff --git a/src/renderer/src/lib/workspace-terminal-host-authority.ts b/src/renderer/src/lib/workspace/ownership/workspace-terminal-host-authority.ts similarity index 93% rename from src/renderer/src/lib/workspace-terminal-host-authority.ts rename to src/renderer/src/lib/workspace/ownership/workspace-terminal-host-authority.ts index 9d195150b97..00a980b2f77 100644 --- a/src/renderer/src/lib/workspace-terminal-host-authority.ts +++ b/src/renderer/src/lib/workspace/ownership/workspace-terminal-host-authority.ts @@ -1,16 +1,16 @@ -import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants' -import { parseExecutionHostId, type ExecutionHostId } from '../../../shared/execution-host' -import { parseWorkspaceKey } from '../../../shared/workspace-scope' +import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../shared/constants' +import { parseExecutionHostId, type ExecutionHostId } from '../../../../../shared/execution-host' +import { parseWorkspaceKey } from '../../../../../shared/workspace-scope' import type { HostLiveTerminalProbeVerdict } from '@/runtime/hosted-terminals/inventory/host-live-terminal-probe' -import type { SshConnectionState } from '../../../shared/ssh-types' +import type { SshConnectionState } from '../../../../../shared/ssh-types' import { isWebRuntimeSessionActive } from '@/runtime/web-session-tabs-sync/identity/web-runtime-session-environment' -import { resolveExplicitWorktreeOperationRouteResult } from '@/lib/worktree-operation-catalog-route' -import { resolveWorktreeOperationRouteResultForHost } from '@/lib/worktree-operation-route' +import { resolveExplicitWorktreeOperationRouteResult } from '@/lib/workspace/ownership/worktree-operation-catalog-route' +import { resolveWorktreeOperationRouteResultForHost } from '@/lib/workspace/ownership/worktree-operation-route' import { getPairedWebClientEnvironmentId } from '@/lib/paired-web-client-host' import { findFolderWorkspaceOwner, getExplicitRuntimeEnvironmentIdForFolderWorkspace -} from '@/lib/folder-workspace-runtime-owner' +} from '@/lib/workspace/ownership/folder-workspace-runtime-owner' import { findIndexedProjectGroupOwner, hasIndexedDetectedWorktree diff --git a/src/renderer/src/lib/worktree-execution-host-alias.ts b/src/renderer/src/lib/workspace/ownership/worktree-execution-host-alias.ts similarity index 81% rename from src/renderer/src/lib/worktree-execution-host-alias.ts rename to src/renderer/src/lib/workspace/ownership/worktree-execution-host-alias.ts index e2ee21785ed..11f1711b84e 100644 --- a/src/renderer/src/lib/worktree-execution-host-alias.ts +++ b/src/renderer/src/lib/workspace/ownership/worktree-execution-host-alias.ts @@ -1,9 +1,9 @@ -import type { Worktree } from '../../../shared/worktree/types' +import type { Worktree } from '../../../../../shared/worktree/types' import { LOCAL_EXECUTION_HOST_ID, toRuntimeExecutionHostId, type ExecutionHostId -} from '../../../shared/execution-host' +} from '../../../../../shared/execution-host' export function isExecutionHostAliasForWorktree( executionHostId: ExecutionHostId, diff --git a/src/renderer/src/lib/workspace/ownership/worktree-host-connection-phase.ts b/src/renderer/src/lib/workspace/ownership/worktree-host-connection-phase.ts index 4da439950be..4c2db896cbf 100644 --- a/src/renderer/src/lib/workspace/ownership/worktree-host-connection-phase.ts +++ b/src/renderer/src/lib/workspace/ownership/worktree-host-connection-phase.ts @@ -1,9 +1,9 @@ import { useShallow } from 'zustand/react/shallow' import { useAppStore } from '@/store/index' import type { AppState } from '@/store/types' -import '@/lib/connection-context' -import { getConnectionIdFromState } from '@/lib/connection-owner-resolution' -import { runtimeEnvironmentIdUnlessTwin } from '@/lib/resolve-owner' +import '@/lib/workspace/ownership/connection-context' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' +import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' import '@/store/slices/ssh/runtime-environment-ssh' import { selectRuntimeAwareSshConnectionGeneration, diff --git a/src/renderer/src/lib/worktree-live-terminal-surface-owners.test.ts b/src/renderer/src/lib/workspace/ownership/worktree-live-terminal-surface-owners.test.ts similarity index 88% rename from src/renderer/src/lib/worktree-live-terminal-surface-owners.test.ts rename to src/renderer/src/lib/workspace/ownership/worktree-live-terminal-surface-owners.test.ts index f2a53a33d78..633ee5aec01 100644 --- a/src/renderer/src/lib/worktree-live-terminal-surface-owners.test.ts +++ b/src/renderer/src/lib/workspace/ownership/worktree-live-terminal-surface-owners.test.ts @@ -1,6 +1,6 @@ -import '../../../shared/layout-owner-switch' +import '../../../../../shared/layout-owner-switch' import { afterEach, describe, expect, it, vi } from 'vitest' -import type { RuntimeTerminalSummary } from '../../../shared/runtime-types' +import type { RuntimeTerminalSummary } from '../../../../../shared/runtime-terminal-contracts' import { indexLiveTerminalSurfaceOwners } from './worktree-live-terminal-surface-owners' const WORKTREE_ID = 'repo::/worktree' diff --git a/src/renderer/src/lib/worktree-live-terminal-surface-owners.ts b/src/renderer/src/lib/workspace/ownership/worktree-live-terminal-surface-owners.ts similarity index 94% rename from src/renderer/src/lib/worktree-live-terminal-surface-owners.ts rename to src/renderer/src/lib/workspace/ownership/worktree-live-terminal-surface-owners.ts index 6038fb78463..c0fdd30a54d 100644 --- a/src/renderer/src/lib/worktree-live-terminal-surface-owners.ts +++ b/src/renderer/src/lib/workspace/ownership/worktree-live-terminal-surface-owners.ts @@ -2,15 +2,15 @@ import { isTerminalLeafId, makePaneKey, parsePaneKey -} from '../../../shared/workspace-layout/stable-pane-id' +} from '../../../../../shared/workspace-layout/stable-pane-id' import type { RuntimeTerminalListHostScope, RuntimeTerminalListResult, RuntimeTerminalSummary -} from '../../../shared/runtime-types' -import { worktreeIdsEqual } from '../../../shared/worktree/id' +} from '../../../../../shared/runtime-terminal-contracts' +import { worktreeIdsEqual } from '../../../../../shared/worktree/id' import { toRuntimeWorktreeSelector } from '@/runtime/rpc/targets/runtime-worktree-selector' -import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch' +import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch' /** The exact surface the execution host records as owning a live PTY. */ export type LiveTerminalSurfaceOwner = { diff --git a/src/renderer/src/lib/worktree-operation-catalog-route.ts b/src/renderer/src/lib/workspace/ownership/worktree-operation-catalog-route.ts similarity index 96% rename from src/renderer/src/lib/worktree-operation-catalog-route.ts rename to src/renderer/src/lib/workspace/ownership/worktree-operation-catalog-route.ts index bdfd30b4bb2..88d6d790437 100644 --- a/src/renderer/src/lib/worktree-operation-catalog-route.ts +++ b/src/renderer/src/lib/workspace/ownership/worktree-operation-catalog-route.ts @@ -4,22 +4,19 @@ import { LOCAL_EXECUTION_HOST_ID, parseExecutionHostId, type ExecutionHostId -} from '../../../shared/execution-host' +} from '../../../../../shared/execution-host' import { selectWorktreesByRepo, selectDetectedWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields' -import { getRepoIdFromWorktreeId } from '../../../shared/worktree/id' +import { getRepoIdFromWorktreeId } from '../../../../../shared/worktree/id' import { addRoute, resolveExactWorktreeRoute, routeForOwner } from './worktree-owner-route' import { findIndexedDetectedWorktrees, findIndexedWorktrees, resolveIndexedWorktreeOwner -} from './workspace/ownership/worktree-runtime-owner-index' -import { - findIndexedRepoOwnerForHost, - resolveIndexedRepoOwner -} from './workspace/ownership/repo-owner-index' +} from './worktree-runtime-owner-index' +import { findIndexedRepoOwnerForHost, resolveIndexedRepoOwner } from './repo-owner-index' // Type-only, so routing's shared vocabulary stays in one place without a runtime cycle. import type { WorktreeOperationOwnerRecord, diff --git a/src/renderer/src/lib/worktree-operation-generation.ts b/src/renderer/src/lib/workspace/ownership/worktree-operation-generation.ts similarity index 96% rename from src/renderer/src/lib/worktree-operation-generation.ts rename to src/renderer/src/lib/workspace/ownership/worktree-operation-generation.ts index d36cfb9fc6e..4eb84d61afc 100644 --- a/src/renderer/src/lib/worktree-operation-generation.ts +++ b/src/renderer/src/lib/workspace/ownership/worktree-operation-generation.ts @@ -1,5 +1,5 @@ -import { parseExecutionHostId } from '../../../shared/execution-host' -import { authorityKey, type HostAuthority } from '../../../shared/host-authority' +import { parseExecutionHostId } from '../../../../../shared/execution-host' +import { authorityKey, type HostAuthority } from '../../../../../shared/host-authority' import { getEnvironmentSshStateGeneration, getEnvironmentSshTargetConnectionGeneration diff --git a/src/renderer/src/lib/worktree-operation-route-index.test.ts b/src/renderer/src/lib/workspace/ownership/worktree-operation-route-index.test.ts similarity index 100% rename from src/renderer/src/lib/worktree-operation-route-index.test.ts rename to src/renderer/src/lib/workspace/ownership/worktree-operation-route-index.test.ts diff --git a/src/renderer/src/lib/worktree-operation-route.test.ts b/src/renderer/src/lib/workspace/ownership/worktree-operation-route.test.ts similarity index 94% rename from src/renderer/src/lib/worktree-operation-route.test.ts rename to src/renderer/src/lib/workspace/ownership/worktree-operation-route.test.ts index 61462142993..2ab4d1ed4a6 100644 --- a/src/renderer/src/lib/worktree-operation-route.test.ts +++ b/src/renderer/src/lib/workspace/ownership/worktree-operation-route.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import type { Worktree } from '../../../shared/worktree/types' +import type { Worktree } from '../../../../../shared/worktree/types' import { resolveWorktreeOperationRouteResult } from './worktree-operation-route' const WORKTREE_ID = 'repo-1::/srv/worktree' diff --git a/src/renderer/src/lib/worktree-operation-route.ts b/src/renderer/src/lib/workspace/ownership/worktree-operation-route.ts similarity index 96% rename from src/renderer/src/lib/worktree-operation-route.ts rename to src/renderer/src/lib/workspace/ownership/worktree-operation-route.ts index 6819a881e89..2237dbbdb45 100644 --- a/src/renderer/src/lib/worktree-operation-route.ts +++ b/src/renderer/src/lib/workspace/ownership/worktree-operation-route.ts @@ -3,10 +3,10 @@ import { LOCAL_EXECUTION_HOST_ID, parseExecutionHostId, type ExecutionHostId -} from '../../../shared/execution-host' -import { parseWorkspaceKey } from '../../../shared/workspace-scope' -import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants' -import { getRepoIdFromWorktreeId } from '../../../shared/worktree/id' +} from '../../../../../shared/execution-host' +import { parseWorkspaceKey } from '../../../../../shared/workspace-scope' +import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../shared/constants' +import { getRepoIdFromWorktreeId } from '../../../../../shared/worktree/id' import { resolveExactWorktreeRoute } from './worktree-owner-route' import { findIndexedDetectedWorktrees, @@ -14,13 +14,10 @@ import { findIndexedWorktrees as findIndexedWorktreeOwners, hasIndexedDetectedWorktree, resolveIndexedWorktreeOwner -} from './workspace/ownership/worktree-runtime-owner-index' -import { - findIndexedRepoOwnerForHost, - resolveIndexedRepoOwner -} from './workspace/ownership/repo-owner-index' +} from './worktree-runtime-owner-index' +import { findIndexedRepoOwnerForHost, resolveIndexedRepoOwner } from './repo-owner-index' import { resolveExplicitWorktreeOperationRouteResult } from './worktree-operation-catalog-route' -import { onPairedWebClientHost } from './paired-web-client-host' +import { onPairedWebClientHost } from '../../paired-web-client-host' import { findFolderWorkspaceOwner, getExecutionHostIdForFolderWorkspace, diff --git a/src/renderer/src/lib/worktree-owner-route.ts b/src/renderer/src/lib/workspace/ownership/worktree-owner-route.ts similarity index 93% rename from src/renderer/src/lib/worktree-owner-route.ts rename to src/renderer/src/lib/workspace/ownership/worktree-owner-route.ts index 5d7287317a7..68f3d440e92 100644 --- a/src/renderer/src/lib/worktree-owner-route.ts +++ b/src/renderer/src/lib/workspace/ownership/worktree-owner-route.ts @@ -1,6 +1,6 @@ -import { parseExecutionHostId } from '../../../shared/execution-host' +import { parseExecutionHostId } from '../../../../../shared/execution-host' import { resolveIndexedSshRepositoryHost } from './repository-owner-index' -import type { ExecutionHostId } from '../../../shared/execution-host' +import type { ExecutionHostId } from '../../../../../shared/execution-host' import type { WorktreeOperationOwnerRecord, WorktreeOperationRoute, diff --git a/src/renderer/src/lib/worktree-owner-rows-token.ts b/src/renderer/src/lib/workspace/ownership/worktree-owner-rows-token.ts similarity index 100% rename from src/renderer/src/lib/worktree-owner-rows-token.ts rename to src/renderer/src/lib/workspace/ownership/worktree-owner-rows-token.ts diff --git a/src/renderer/src/lib/worktree-row-open-in-owner.ts b/src/renderer/src/lib/workspace/ownership/worktree-row-open-in-owner.ts similarity index 90% rename from src/renderer/src/lib/worktree-row-open-in-owner.ts rename to src/renderer/src/lib/workspace/ownership/worktree-row-open-in-owner.ts index 6c419f435b9..f22523b7f41 100644 --- a/src/renderer/src/lib/worktree-row-open-in-owner.ts +++ b/src/renderer/src/lib/workspace/ownership/worktree-row-open-in-owner.ts @@ -1,13 +1,13 @@ -import { parseExecutionHostId, type ExecutionHostId } from '../../../shared/execution-host' -import type { Worktree } from '../../../shared/worktree/types' -import { resolveOwnerOrLocal } from './workspace/ownership/worktree-runtime-owner' -import type { WorktreeRuntimeOwnerState } from './workspace/ownership/worktree-runtime-owner-state' +import { parseExecutionHostId, type ExecutionHostId } from '../../../../../shared/execution-host' +import type { Worktree } from '../../../../../shared/worktree/types' +import { resolveOwnerOrLocal } from './worktree-runtime-owner' +import type { WorktreeRuntimeOwnerState } from './worktree-runtime-owner-state' import { resolveWorktreeOperationRouteResultForHost, type WorktreeOperationRouteState } from './worktree-operation-route' import { routeForOwner } from './worktree-owner-route' -import { getLocalPathOpenOwnerForRoute } from './local-path-open-guard' +import { getLocalPathOpenOwnerForRoute } from '../../local-path-open-guard' export type WorktreeRowOpenInOwner = { runtimeEnvironmentId: string | null diff --git a/src/renderer/src/lib/workspace/ownership/worktree-runtime-owner.ts b/src/renderer/src/lib/workspace/ownership/worktree-runtime-owner.ts index 8b7221fbb7e..3a595ab0999 100644 --- a/src/renderer/src/lib/workspace/ownership/worktree-runtime-owner.ts +++ b/src/renderer/src/lib/workspace/ownership/worktree-runtime-owner.ts @@ -13,20 +13,20 @@ import { findIndexedWorktreeOwner as findWorktreeRecord, hasIndexedDetectedWorktree } from './worktree-runtime-owner-index' -import { getActiveWorkspaceExecutionHostId } from '../../active-workspace-host' -import { getSingleFocusedRuntimeEnvironmentId } from '../../single-runtime-legacy-owner' +import { getActiveWorkspaceExecutionHostId } from './active-workspace-host' +import { getSingleFocusedRuntimeEnvironmentId } from './single-runtime-legacy-owner' import { isEphemeralSetupTerminalWorktreeId } from '../../../../../shared/ephemeral-setup-terminal-worktree-id' import { getPairedWebClientEnvironmentId } from '../../paired-web-client-host' import { findFolderWorkspaceOwner, getExecutionHostIdForFolderWorkspace, getRuntimeEnvironmentIdForFolderWorkspace -} from '../../folder-workspace-runtime-owner' -import { namedHostForOwnerRef, resolveOwner, type WorkspaceOwnerRef } from '../../resolve-owner' +} from './folder-workspace-runtime-owner' +import { namedHostForOwnerRef, resolveOwner, type WorkspaceOwnerRef } from './resolve-owner' import { SELF_LOCAL_AUTHORITY, type HostAuthority } from '../../../../../shared/host-authority' import type { ExecutionHostOwnerMatch } from '../../../../../shared/execution-host/worktree-execution-host-resolution' -import { getFloatingWorkspaceOperationRoute } from '../../worktree-operation-route' -import { resolveExplicitWorktreeOperationRouteResult } from '../../worktree-operation-catalog-route' +import { getFloatingWorkspaceOperationRoute } from './worktree-operation-route' +import { resolveExplicitWorktreeOperationRouteResult } from './worktree-operation-catalog-route' import type { WorktreeRuntimeOwnerState } from './worktree-runtime-owner-state' function getExecutionHostIdFromWorktreeHost( diff --git a/src/renderer/src/lib/wsl-moved-project-use-here.ts b/src/renderer/src/lib/workspace/ownership/wsl-moved-project-use-here.ts similarity index 98% rename from src/renderer/src/lib/wsl-moved-project-use-here.ts rename to src/renderer/src/lib/workspace/ownership/wsl-moved-project-use-here.ts index 98dc39ce855..e2ceb02f349 100644 --- a/src/renderer/src/lib/wsl-moved-project-use-here.ts +++ b/src/renderer/src/lib/workspace/ownership/wsl-moved-project-use-here.ts @@ -1,10 +1,10 @@ import { translate } from '@/i18n/i18n' import type { ConfirmationDialogContextValue } from '@/components/confirmation-dialog-context' -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import type { WslMovedProject, WslMoveUseLocallyResult -} from '../../../shared/wsl-move/wsl-moved-project' +} from '../../../../../shared/wsl-move/wsl-moved-project' /** * "Use on this computer again" for a project a WSL host owns: after a plain confirmation, the diff --git a/src/renderer/src/lib/folder-workspace-path-status-cache-expiry.ts b/src/renderer/src/lib/workspace/paths/folder-workspace-path-status-cache-expiry.ts similarity index 88% rename from src/renderer/src/lib/folder-workspace-path-status-cache-expiry.ts rename to src/renderer/src/lib/workspace/paths/folder-workspace-path-status-cache-expiry.ts index 130cd6bbca5..2e4c8ac009e 100644 --- a/src/renderer/src/lib/folder-workspace-path-status-cache-expiry.ts +++ b/src/renderer/src/lib/workspace/paths/folder-workspace-path-status-cache-expiry.ts @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react' -import { FOLDER_WORKSPACE_PATH_STATUS_TTL_MS } from '../../../shared/folder-workspaces/folder-workspace-path-status' +import { FOLDER_WORKSPACE_PATH_STATUS_TTL_MS } from '../../../../../shared/folder-workspaces/folder-workspace-path-status' type FolderWorkspacePathStatusCacheClockEntry = { checkedAt: number diff --git a/src/renderer/src/lib/folder-workspace-path-status.ts b/src/renderer/src/lib/workspace/paths/folder-workspace-path-status.ts similarity index 97% rename from src/renderer/src/lib/folder-workspace-path-status.ts rename to src/renderer/src/lib/workspace/paths/folder-workspace-path-status.ts index c756357d703..b9d5f45d106 100644 --- a/src/renderer/src/lib/folder-workspace-path-status.ts +++ b/src/renderer/src/lib/workspace/paths/folder-workspace-path-status.ts @@ -6,8 +6,8 @@ import { type FolderWorkspacePathStatus, type FolderWorkspacePathStatusReason, blocksFolderWorkspaceActivation -} from '../../../shared/folder-workspaces/folder-workspace-path-status' -import { isHandledWireDiscriminant } from '../../../shared/handled-wire-discriminant' +} from '../../../../../shared/folder-workspaces/folder-workspace-path-status' +import { isHandledWireDiscriminant } from '../../../../../shared/handled-wire-discriminant' // Guard unknown RPC reasons at runtime; union-keyed records make newly known reasons fail typecheck here and in both switches. const HANDLED_PATH_STATUS_REASONS: Record = { diff --git a/src/renderer/src/lib/workspace/persistence/session-write-subscriber.ts b/src/renderer/src/lib/workspace/persistence/session-write-subscriber.ts index 04b8958c3c7..71d095bd42a 100644 --- a/src/renderer/src/lib/workspace/persistence/session-write-subscriber.ts +++ b/src/renderer/src/lib/workspace/persistence/session-write-subscriber.ts @@ -3,7 +3,7 @@ import { isDecorativeAgentTitleFrameChange } from '../../../../../shared/agent-s import type { WorkspaceSessionPatch } from '../../../../../shared/workspace-session/workspace-session-state-types' import { SESSION_RELEVANT_FIELDS, shouldPersistWorkspaceSession } from './workspace-session' import { buildWorkspaceSessionPatch } from './workspace-session-patch' -import { createWorktreeTabBucketProjection } from '../../worktree-tab-bucket-projection' +import { createWorktreeTabBucketProjection } from '../tabs/worktree-tab-bucket-projection' type SessionRelevantField = (typeof SESSION_RELEVANT_FIELDS)[number] type TabsByWorktree = AppState['tabsByWorktree'] diff --git a/src/renderer/src/lib/workspace/persistence/workspace-session-host-contention.ts b/src/renderer/src/lib/workspace/persistence/workspace-session-host-contention.ts index cc8ca3ad0de..980c480a06b 100644 --- a/src/renderer/src/lib/workspace/persistence/workspace-session-host-contention.ts +++ b/src/renderer/src/lib/workspace/persistence/workspace-session-host-contention.ts @@ -11,7 +11,7 @@ import { isWorkspaceSessionRecord, type WorkspaceSessionRecord } from '../../../../../shared/workspace-session/workspace-session-host-records' -import type { WorkspaceRuntimeOwnerProjection } from '../../workspace-runtime-host-ownership' +import type { WorkspaceRuntimeOwnerProjection } from '../ownership/workspace-runtime-host-ownership' import { mergeWorkspaceSessionsFromHosts, type HostSessionSlices diff --git a/src/renderer/src/lib/workspace/persistence/workspace-session-host-persistence.ts b/src/renderer/src/lib/workspace/persistence/workspace-session-host-persistence.ts index 9c063e328fe..d0c5b471df6 100644 --- a/src/renderer/src/lib/workspace/persistence/workspace-session-host-persistence.ts +++ b/src/renderer/src/lib/workspace/persistence/workspace-session-host-persistence.ts @@ -35,7 +35,7 @@ import { import { indexWorkspaceRuntimeHostOwnership, type WorkspaceRuntimeOwnerProjection -} from '../../workspace-runtime-host-ownership' +} from '../ownership/workspace-runtime-host-ownership' import { buildWorktreeIdByTabId, extendWorktreeIdByTabId, diff --git a/src/renderer/src/lib/workspace/persistence/workspace-session-unified-tabs.ts b/src/renderer/src/lib/workspace/persistence/workspace-session-unified-tabs.ts index 2874b84add7..9758798a210 100644 --- a/src/renderer/src/lib/workspace/persistence/workspace-session-unified-tabs.ts +++ b/src/renderer/src/lib/workspace/persistence/workspace-session-unified-tabs.ts @@ -1,6 +1,6 @@ import type { OpenFile } from '@/store/slices/editor/types/open-file' import { editorPlacementIndex } from '@/store/slices/editor/tabs/workspace-editor-files' -import { getOpenFileExecutionHostId } from '@/lib/unified-tab-host-ownership' +import { getOpenFileExecutionHostId } from '@/lib/workspace/ownership/unified-tab-host-ownership' import { isEditorTabContentType } from '@/store/slices/editor/tabs/editor-tab-content-type' import { structuredLaunchSlotIds } from '../../agent-session/launch/structured-agent-session-launch-persistence' import type { Tab, TabGroup, TabGroupLayoutNode } from '../../../../../shared/tab-types' diff --git a/src/renderer/src/lib/wsl-drive-unc-renderer-store-rewrites.ts b/src/renderer/src/lib/workspace/persistence/wsl-drive-unc-renderer-store-rewrites.ts similarity index 79% rename from src/renderer/src/lib/wsl-drive-unc-renderer-store-rewrites.ts rename to src/renderer/src/lib/workspace/persistence/wsl-drive-unc-renderer-store-rewrites.ts index 5314cacee7c..ea3876e7c84 100644 --- a/src/renderer/src/lib/wsl-drive-unc-renderer-store-rewrites.ts +++ b/src/renderer/src/lib/workspace/persistence/wsl-drive-unc-renderer-store-rewrites.ts @@ -10,29 +10,31 @@ import { convertedFileViewPreferenceKey, convertedNotebookEnvironment, convertedQuickOpenHistoryScope, - WSL_DRIVE_UNC_RENDERER_STORE_IDS, - wslDriveUncRendererKeys, - type WslDriveUncPendingRendererRewrite, - type WslDriveUncRendererKeys -} from '../../../shared/wsl-drive-unc-renderer-store-keys' + wslDriveUncRendererKeys +} from '../../../../../shared/wsl-drive-unc-renderer-store-keys' +import type { + WslDriveUncPendingRendererRewrite, + WslDriveUncRendererKeys +} from '../../../../../shared/wsl-drive-unc-renderer-store-keys' +import { WSL_MOVE_RENDERER_REWRITE_STORE_IDS } from '../../../../../shared/wsl-move/wsl-move-renderer-rewrite-types' const APPLIED_STORAGE_KEY = 'orca.wsl-drive-unc.renderer-rewrites.v1' const MAX_APPLIED_MARKERS = 256 -type StoreId = (typeof WSL_DRIVE_UNC_RENDERER_STORE_IDS)[number] +type StoreId = (typeof WSL_MOVE_RENDERER_REWRITE_STORE_IDS)[number] // Loaded only when a conversion is pending, so a profile without one never pays for these modules. const STORE_REWRITES: Record Promise> = { 'quick-open-history': async (keys) => { - const { copyQuickOpenHistoryScopes } = await import('./quick-open-file-history') + const { copyQuickOpenHistoryScopes } = await import('../../quick-open-file-history') copyQuickOpenHistoryScopes((scope) => convertedQuickOpenHistoryScope(scope, keys)) }, 'file-view-preferences': async (keys) => { const [{ copyFileViewPreferences }, { PDF_SCALE_PREFERENCES_STORAGE_KEY }, csv] = await Promise.all([ - import('../components/editor/file-view-preference-storage'), - import('../components/editor/pdf-scale-preference-storage'), - import('../components/editor/csv/csv-column-width-preferences') + import('../../../components/editor/file-view-preference-storage'), + import('../../../components/editor/pdf-scale-preference-storage'), + import('../../../components/editor/csv/csv-column-width-preferences') ]) copyFileViewPreferences(PDF_SCALE_PREFERENCES_STORAGE_KEY, (key) => convertedFileViewPreferenceKey(key, keys) @@ -43,7 +45,7 @@ const STORE_REWRITES: Record Promise }, 'notebook-environments': async (keys) => { const { copyEnvironments } = - await import('../components/editor/notebook/kernel/ipynb-kernel-store') + await import('../../../components/editor/notebook/kernel/ipynb-kernel-store') copyEnvironments((filePath, environment) => convertedNotebookEnvironment(filePath, environment, keys) ) @@ -72,7 +74,7 @@ function writeAppliedMarker(marker: string): void { async function rewriteConversion(conversion: WslDriveUncPendingRendererRewrite): Promise { const keys = wslDriveUncRendererKeys(conversion) - for (const storeId of WSL_DRIVE_UNC_RENDERER_STORE_IDS) { + for (const storeId of WSL_MOVE_RENDERER_REWRITE_STORE_IDS) { const marker = `${conversion.migrationId}:${storeId}` try { if (!readAppliedMarkers().includes(marker)) { diff --git a/src/renderer/src/lib/wsl-move-renderer-rewrite-client.ts b/src/renderer/src/lib/workspace/persistence/wsl-move-renderer-rewrite-client.ts similarity index 91% rename from src/renderer/src/lib/wsl-move-renderer-rewrite-client.ts rename to src/renderer/src/lib/workspace/persistence/wsl-move-renderer-rewrite-client.ts index 24fd85ba0c4..818ad638c4c 100644 --- a/src/renderer/src/lib/wsl-move-renderer-rewrite-client.ts +++ b/src/renderer/src/lib/workspace/persistence/wsl-move-renderer-rewrite-client.ts @@ -5,7 +5,7 @@ import type { WslMovePendingRendererRewrite, WslMoveRecordStoreRewrittenResult -} from '../../../shared/wsl-move/wsl-move-renderer-rewrite-types' +} from '../../../../../shared/wsl-move/wsl-move-renderer-rewrite-types' export function listPendingWslMoveRendererRewrites(): Promise { return window.api.wslMove.listPendingRendererRewrites() diff --git a/src/renderer/src/lib/wsl-move-renderer-store-keys.ts b/src/renderer/src/lib/workspace/persistence/wsl-move-renderer-store-keys.ts similarity index 89% rename from src/renderer/src/lib/wsl-move-renderer-store-keys.ts rename to src/renderer/src/lib/workspace/persistence/wsl-move-renderer-store-keys.ts index 982ba802910..509e915c4c8 100644 --- a/src/renderer/src/lib/wsl-move-renderer-store-keys.ts +++ b/src/renderer/src/lib/workspace/persistence/wsl-move-renderer-store-keys.ts @@ -2,10 +2,10 @@ * The WSL host's key for a renderer-stored entry of a moved local workspace, or null when the entry * is not one: another host's, another distro's, or a project the move did not take. */ -import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host' -import { normalizeRuntimePathForComparison } from '../../../shared/cross-platform-path' -import type { PythonEnvironment } from '../../../shared/notebook-kernel-types' -import type { WslMoveRendererRewriteScope } from '../../../shared/wsl-move/wsl-move-renderer-rewrite-scope' +import { LOCAL_EXECUTION_HOST_ID } from '../../../../../shared/execution-host' +import { normalizeRuntimePathForComparison } from '../../../../../shared/cross-platform-path' +import type { PythonEnvironment } from '../../../../../shared/notebook-kernel-types' +import type { WslMoveRendererRewriteScope } from '../../../../../shared/wsl-move/wsl-move-renderer-rewrite-scope' function parseArray(value: string): unknown[] | null { try { diff --git a/src/renderer/src/lib/wsl-move-renderer-store-rewrites.test.ts b/src/renderer/src/lib/workspace/persistence/wsl-move-renderer-store-rewrites.test.ts similarity index 93% rename from src/renderer/src/lib/wsl-move-renderer-store-rewrites.test.ts rename to src/renderer/src/lib/workspace/persistence/wsl-move-renderer-store-rewrites.test.ts index 9af89bb8261..0b4c8cdf4e6 100644 --- a/src/renderer/src/lib/wsl-move-renderer-store-rewrites.test.ts +++ b/src/renderer/src/lib/workspace/persistence/wsl-move-renderer-store-rewrites.test.ts @@ -1,7 +1,7 @@ // @vitest-environment happy-dom import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type { WslMovePendingRendererRewrite } from '../../../shared/wsl-move/wsl-move-renderer-rewrite-types' -import { WSL_MOVE_RENDERER_REWRITE_STORE_IDS } from '../../../shared/wsl-move/wsl-move-renderer-rewrite-types' +import type { WslMovePendingRendererRewrite } from '../../../../../shared/wsl-move/wsl-move-renderer-rewrite-types' +import { WSL_MOVE_RENDERER_REWRITE_STORE_IDS } from '../../../../../shared/wsl-move/wsl-move-renderer-rewrite-types' import type * as RunnerModule from './wsl-move-renderer-store-rewrites' const client = vi.hoisted(() => ({ @@ -12,7 +12,7 @@ vi.mock('./wsl-move-renderer-rewrite-client', () => ({ listPendingWslMoveRendererRewrites: client.list, recordWslMoveRendererStoreRewritten: client.record })) -vi.mock('@/store', () => ({ useAppStore: { getState: () => ({}) } })) +vi.mock('@/store/index', () => ({ useAppStore: { getState: () => ({}) } })) const UNC_ROOT = '\\\\wsl.localhost\\Ubuntu\\home\\u\\proj' const LOCAL_ID = `repo-1::${UNC_ROOT}` @@ -92,7 +92,7 @@ beforeEach(() => { client.record.mockResolvedValue({ recorded: true }) }) afterEach(() => { - vi.doUnmock('../components/editor/notebook/kernel/ipynb-kernel-store') + vi.doUnmock('../../../components/editor/notebook/kernel/ipynb-kernel-store') }) describe('WSL move renderer store rewrites', () => { diff --git a/src/renderer/src/lib/wsl-move-renderer-store-rewrites.ts b/src/renderer/src/lib/workspace/persistence/wsl-move-renderer-store-rewrites.ts similarity index 91% rename from src/renderer/src/lib/wsl-move-renderer-store-rewrites.ts rename to src/renderer/src/lib/workspace/persistence/wsl-move-renderer-store-rewrites.ts index c1804422128..73351189719 100644 --- a/src/renderer/src/lib/wsl-move-renderer-store-rewrites.ts +++ b/src/renderer/src/lib/workspace/persistence/wsl-move-renderer-store-rewrites.ts @@ -12,11 +12,11 @@ import { WSL_MOVE_RENDERER_REWRITE_STORE_IDS, type WslMovePendingRendererRewrite, type WslMoveRendererRewriteStoreId -} from '../../../shared/wsl-move/wsl-move-renderer-rewrite-types' +} from '../../../../../shared/wsl-move/wsl-move-renderer-rewrite-types' import { wslMoveRendererRewriteScope, type WslMoveRendererRewriteScope -} from '../../../shared/wsl-move/wsl-move-renderer-rewrite-scope' +} from '../../../../../shared/wsl-move/wsl-move-renderer-rewrite-scope' import { listPendingWslMoveRendererRewrites, recordWslMoveRendererStoreRewritten @@ -37,15 +37,15 @@ const STORE_REWRITES: Record< (scope: WslMoveRendererRewriteScope) => Promise > = { 'quick-open-history': async (scope) => { - const { copyQuickOpenHistoryScopes } = await import('./quick-open-file-history') + const { copyQuickOpenHistoryScopes } = await import('../../quick-open-file-history') copyQuickOpenHistoryScopes((key) => hostQuickOpenHistoryScope(key, scope)) }, 'file-view-preferences': async (scope) => { const [{ copyFileViewPreferences }, { PDF_SCALE_PREFERENCES_STORAGE_KEY }, csv] = await Promise.all([ - import('../components/editor/file-view-preference-storage'), - import('../components/editor/pdf-scale-preference-storage'), - import('../components/editor/csv/csv-column-width-preferences') + import('../../../components/editor/file-view-preference-storage'), + import('../../../components/editor/pdf-scale-preference-storage'), + import('../../../components/editor/csv/csv-column-width-preferences') ]) copyFileViewPreferences(PDF_SCALE_PREFERENCES_STORAGE_KEY, (key) => hostFileViewPreferenceKey(key, scope) @@ -56,7 +56,7 @@ const STORE_REWRITES: Record< }, 'notebook-environments': async (scope) => { const { copyEnvironments } = - await import('../components/editor/notebook/kernel/ipynb-kernel-store') + await import('../../../components/editor/notebook/kernel/ipynb-kernel-store') copyEnvironments((filePath, environment) => hostNotebookEnvironment(filePath, environment, scope) ) diff --git a/src/renderer/src/lib/workspace/search/palette-repo-resolution.ts b/src/renderer/src/lib/workspace/search/palette-repo-resolution.ts index ffffa496536..2f0b3477193 100644 --- a/src/renderer/src/lib/workspace/search/palette-repo-resolution.ts +++ b/src/renderer/src/lib/workspace/search/palette-repo-resolution.ts @@ -6,7 +6,7 @@ import { import { getRepoHostIdentityForParts } from '../../../../../shared/repo-host-identity' import { composeWorktreeHostIdentity } from '../../../../../shared/worktree/host-qualified-identity' import type { Worktree } from '../../../../../shared/worktree/types' -import { isExecutionHostAliasForWorktree } from '../../worktree-execution-host-alias' +import { isExecutionHostAliasForWorktree } from '../ownership/worktree-execution-host-alias' type PaletteWorktreeIdentity = Pick diff --git a/src/renderer/src/lib/workspace/search/tabs/workspace-tab-agent-metadata.ts b/src/renderer/src/lib/workspace/search/tabs/workspace-tab-agent-metadata.ts index 0beccbf1490..1b83816de16 100644 --- a/src/renderer/src/lib/workspace/search/tabs/workspace-tab-agent-metadata.ts +++ b/src/renderer/src/lib/workspace/search/tabs/workspace-tab-agent-metadata.ts @@ -7,7 +7,7 @@ import { LOCAL_EXECUTION_HOST_ID, toSshExecutionHostId } from '../../../../../../shared/execution-host' -import { isExecutionHostAliasForWorktree } from '../../../worktree-execution-host-alias' +import { isExecutionHostAliasForWorktree } from '../../ownership/worktree-execution-host-alias' export type AgentMetadata = { paneKey: string diff --git a/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-activation.ts b/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-activation.ts index 930d68bcfbd..16fe152a3e2 100644 --- a/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-activation.ts +++ b/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-activation.ts @@ -15,7 +15,7 @@ import { hasOpenFileExecutionHostEvidence, isOpenFileOwnedByWorktree, isUnifiedTabOwnedByWorktree -} from '../../../unified-tab-host-ownership' +} from '../../ownership/unified-tab-host-ownership' import type { WorkspaceTabPaletteSearchResult } from './workspace-tab-palette-results' export type WorkspaceTabPaletteActivationFailure = diff --git a/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-entry-builder.ts b/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-entry-builder.ts index d8d82bd465a..4df51f6e468 100644 --- a/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-entry-builder.ts +++ b/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-entry-builder.ts @@ -31,7 +31,7 @@ import { hasOpenFileExecutionHostEvidence, isOpenFileOwnedByWorktree, isUnifiedTabOwnedByWorktree -} from '../../../unified-tab-host-ownership' +} from '../../ownership/unified-tab-host-ownership' import type { OpenFile } from '@/store/slices/editor/types/open-file' import type { TerminalTab } from '../../../../../../shared/workspace-layout/terminal-tab-types' import { isWorkspaceTabContentType } from './workspace-tab-palette-content-type' diff --git a/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-results.ts b/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-results.ts index e1308eb9b0a..a116c3a3e19 100644 --- a/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-results.ts +++ b/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-results.ts @@ -25,7 +25,7 @@ import { type PaletteSearchContext } from '../../../../../../shared/palette-match/palette-ranking' import type { TerminalAgent } from '../../../../../../shared/agent-status/identity/terminal-agent' -import { getUnifiedTabPaletteExecutionHostId } from '../../../unified-tab-host-ownership' +import { getUnifiedTabPaletteExecutionHostId } from '../../ownership/unified-tab-host-ownership' import type { SearchableWorkspaceTab, WorkspaceTabContentType } from './workspace-tab-search-types' const NO_RANGES: readonly MatchRange[] = [] diff --git a/src/renderer/src/lib/workspace/search/worktrees/worktree-palette-runtime-owner-identity.test.ts b/src/renderer/src/lib/workspace/search/worktrees/worktree-palette-runtime-owner-identity.test.ts index c530529b94d..e231fb73d39 100644 --- a/src/renderer/src/lib/workspace/search/worktrees/worktree-palette-runtime-owner-identity.test.ts +++ b/src/renderer/src/lib/workspace/search/worktrees/worktree-palette-runtime-owner-identity.test.ts @@ -8,7 +8,7 @@ import { } from '../palette-repo-resolution' import { buildWorktreePaletteDocuments } from './worktree-palette-document' import { searchWorktreeDocuments } from './worktree-palette-search' -import '../../../unified-tab-host-ownership' +import '../../ownership/unified-tab-host-ownership' function makeWorktree(runtimeOwnerEnvironmentId: string, displayName: string): Worktree { return { diff --git a/src/renderer/src/lib/workspace/search/worktrees/worktree-palette-search.ts b/src/renderer/src/lib/workspace/search/worktrees/worktree-palette-search.ts index 8cfe4de5bcd..f37872652c8 100644 --- a/src/renderer/src/lib/workspace/search/worktrees/worktree-palette-search.ts +++ b/src/renderer/src/lib/workspace/search/worktrees/worktree-palette-search.ts @@ -23,7 +23,7 @@ import type { HostedReviewInfo } from '../../../../../../shared/source-control/h import type { Repo } from '../../../../../../shared/repo-types' import type { Worktree } from '../../../../../../shared/worktree/types' import { getWorkspaceLastActiveAt } from '../../../../../../shared/workspace-last-active' -import { getWorktreeVisitTimestamp } from '../../../worktree-visit-recency' +import { getWorktreeVisitTimestamp } from '../../activation/worktree-visit-recency' import { getPaletteWorktreeExecutionHostId, getPaletteWorktreeIdentity, diff --git a/src/renderer/src/lib/activate-tab-and-focus-pane.test.ts b/src/renderer/src/lib/workspace/tabs/activate-tab-and-focus-pane.test.ts similarity index 98% rename from src/renderer/src/lib/activate-tab-and-focus-pane.test.ts rename to src/renderer/src/lib/workspace/tabs/activate-tab-and-focus-pane.test.ts index 2fe3c0148b3..14b76318150 100644 --- a/src/renderer/src/lib/activate-tab-and-focus-pane.test.ts +++ b/src/renderer/src/lib/workspace/tabs/activate-tab-and-focus-pane.test.ts @@ -11,7 +11,7 @@ const worktreeState = vi.hoisted(() => { return state }) -vi.mock('@/store', () => ({ +vi.mock('@/store/index', () => ({ useAppStore: { getState: () => ({ setActiveTab, diff --git a/src/renderer/src/lib/activate-tab-and-focus-pane.ts b/src/renderer/src/lib/workspace/tabs/activate-tab-and-focus-pane.ts similarity index 97% rename from src/renderer/src/lib/activate-tab-and-focus-pane.ts rename to src/renderer/src/lib/workspace/tabs/activate-tab-and-focus-pane.ts index 9694988e6a4..036a81bcd23 100644 --- a/src/renderer/src/lib/activate-tab-and-focus-pane.ts +++ b/src/renderer/src/lib/workspace/tabs/activate-tab-and-focus-pane.ts @@ -1,4 +1,4 @@ -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import { resolveActiveTabOwnerWorktreeId } from '@/store/terminals/active-tab-owner-worktree' import { FOCUS_TERMINAL_PANE_EVENT, type FocusTerminalPaneDetail } from '@/constants/terminal' diff --git a/src/renderer/src/lib/cycled-tab-owner-activation.ts b/src/renderer/src/lib/workspace/tabs/cycled-tab-owner-activation.ts similarity index 97% rename from src/renderer/src/lib/cycled-tab-owner-activation.ts rename to src/renderer/src/lib/workspace/tabs/cycled-tab-owner-activation.ts index 2e60673675e..74b57c6d140 100644 --- a/src/renderer/src/lib/cycled-tab-owner-activation.ts +++ b/src/renderer/src/lib/workspace/tabs/cycled-tab-owner-activation.ts @@ -1,4 +1,4 @@ -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import type { TypeCyclableTab } from '@/components/terminal/tab-type-cycle' import { activateStructuredAgentSessionTabOnOwner } from '@/lib/agent-session/structured-agent-session-tab-activation' import { isWebRuntimeSessionActive } from '@/runtime/web-session-tabs-sync/identity/web-runtime-session-environment' diff --git a/src/renderer/src/lib/terminal-tab-owner-activation.ts b/src/renderer/src/lib/workspace/tabs/terminal-tab-owner-activation.ts similarity index 98% rename from src/renderer/src/lib/terminal-tab-owner-activation.ts rename to src/renderer/src/lib/workspace/tabs/terminal-tab-owner-activation.ts index b05e77bd4aa..cb12ce4d5e4 100644 --- a/src/renderer/src/lib/terminal-tab-owner-activation.ts +++ b/src/renderer/src/lib/workspace/tabs/terminal-tab-owner-activation.ts @@ -1,4 +1,4 @@ -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner' import { activateWebRuntimeSessionTab } from '@/runtime/web-session-tabs-sync/actions/web-runtime-session-tab-lifecycle' import { isWebRuntimeSessionActive } from '@/runtime/web-session-tabs-sync/identity/web-runtime-session-environment' diff --git a/src/renderer/src/lib/worktree-tab-bucket-projection.ts b/src/renderer/src/lib/workspace/tabs/worktree-tab-bucket-projection.ts similarity index 100% rename from src/renderer/src/lib/worktree-tab-bucket-projection.ts rename to src/renderer/src/lib/workspace/tabs/worktree-tab-bucket-projection.ts diff --git a/src/renderer/src/lib/worktree-git-copy.ts b/src/renderer/src/lib/worktree-git-copy.ts index d1255f503fb..91f693db57a 100644 --- a/src/renderer/src/lib/worktree-git-copy.ts +++ b/src/renderer/src/lib/worktree-git-copy.ts @@ -3,18 +3,18 @@ import type { AppState } from '@/store/types' import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' import { parseRoutableExecutionHostId, type ExecutionHostId } from '../../../shared/execution-host' import { getKnownExecutionHostIdForWorktree } from './workspace/ownership/worktree-runtime-owner' -import { getActiveWorkspaceExecutionHostId } from './active-workspace-host' +import { getActiveWorkspaceExecutionHostId } from './workspace/ownership/active-workspace-host' import { selectWorkspaceByHostTarget } from '@/store/workspaces/selection/workspace-host-target' import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields' import { hostWorktreeTarget } from '../../../shared/worktree/host-qualified-identity' import { getRepoIdFromWorktreeId } from '../../../shared/worktree/id' import type { GitPushTarget } from '../../../shared/worktree/types' import { worktreeCopyOwnerKey } from '@/store/slices/worktrees/metadata/worktree-copy-review-clear' -import { runtimeTargetForWorkspaceOwner } from './resolve-owner' +import { runtimeTargetForWorkspaceOwner } from './workspace/ownership/resolve-owner' import { getConnectionIdForWorktreeCopy, getConnectionIdFromState -} from './connection-owner-resolution' +} from './workspace/ownership/connection-owner-resolution' /** * One host's copy of a worktree, for git work whose answer is written back to the store. Worktree diff --git a/src/renderer/src/lib/worktree-sort-order-host-split.ts b/src/renderer/src/lib/worktree-sort-order-host-split.ts index 74906c44474..d5a1f1d50d6 100644 --- a/src/renderer/src/lib/worktree-sort-order-host-split.ts +++ b/src/renderer/src/lib/worktree-sort-order-host-split.ts @@ -1,5 +1,5 @@ import { LOCAL_EXECUTION_HOST_ID, toRuntimeExecutionHostId } from '../../../shared/execution-host' -import { isUnprovenServerSshRoute } from './resolve-owner' +import { isUnprovenServerSshRoute } from './workspace/ownership/resolve-owner' import { resolveOwnerOrLocal } from './workspace/ownership/worktree-runtime-owner' import type { WorktreeRuntimeOwnerState } from './workspace/ownership/worktree-runtime-owner-state' diff --git a/src/renderer/src/lib/workspace-file-host-routing.ts b/src/renderer/src/runtime/files/workspace-file-host-routing.ts similarity index 91% rename from src/renderer/src/lib/workspace-file-host-routing.ts rename to src/renderer/src/runtime/files/workspace-file-host-routing.ts index 1a2b66a5173..2f2b1b126cf 100644 --- a/src/renderer/src/lib/workspace-file-host-routing.ts +++ b/src/renderer/src/runtime/files/workspace-file-host-routing.ts @@ -1,8 +1,11 @@ -import { getConnectionId, getConnectionIdForFile } from '@/lib/connection-context' +import { + getConnectionId, + getConnectionIdForFile +} from '@/lib/workspace/ownership/connection-context' import type { RuntimeFileOperationArgs } from '@/runtime/files/runtime-file-client-types' import { hasRemoteRuntimeOwner } from '@/runtime/files/runtime-file-routing' import { requireRuntimeTargetForFileOwner } from '@/lib/file-owner-runtime-target' -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' /** Which host owns a workspace file, resolved the same way for every surface that opens one. */ export function buildWorkspaceFileContext( diff --git a/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-leaf-move.ts b/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-leaf-move.ts index d35ec7c7f26..0e7c02de755 100644 --- a/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-leaf-move.ts +++ b/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-leaf-move.ts @@ -3,7 +3,7 @@ import { SESSION_TABS_MOVE_PANE_TO_NEW_TAB_RUNTIME_CAPABILITY } from '../../../. import { toHostSessionTabId } from '../../../../../shared/workspace-layout/terminal-surface-id' import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id' import { isRecoverableRemoteRuntimeConnectionError } from '../../../../../shared/remote-runtime/remote-runtime-client-error-classification' -import { runtimeEnvironmentIdUnlessTwin } from '../../../lib/resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from '../../../lib/workspace/ownership/resolve-owner' import { useAppStore } from '../../../store/index' import { runtimeEnvironmentSupportsCapability } from '../../rpc/compatibility/runtime-capability-proof' import { unwrapRuntimeRpcResult } from '../../rpc/calls/runtime-rpc-result' diff --git a/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-pane-layout-update.ts b/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-pane-layout-update.ts index c1264171066..74af69d0abc 100644 --- a/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-pane-layout-update.ts +++ b/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-pane-layout-update.ts @@ -1,6 +1,6 @@ import type { RuntimeRpcResponse } from '../../../../../shared/runtime-rpc-envelope' import type { TerminalPaneLayoutNode } from '../../../../../shared/workspace-layout/terminal-tab-types' -import { runtimeEnvironmentIdUnlessTwin } from '../../../lib/resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from '../../../lib/workspace/ownership/resolve-owner' import { useAppStore } from '../../../store/index' import { unwrapRuntimeRpcResult } from '../../rpc/calls/runtime-rpc-result' import { toRuntimeWorktreeSelector } from '../../rpc/targets/runtime-worktree-selector' diff --git a/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-session-terminal-pane-delegation.test.ts b/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-session-terminal-pane-delegation.test.ts index 8af49778b2e..2352df3f1f9 100644 --- a/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-session-terminal-pane-delegation.test.ts +++ b/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-session-terminal-pane-delegation.test.ts @@ -40,7 +40,7 @@ vi.mock('../../../store/index', () => ({ } })) -vi.mock('../../../lib/activate-tab-and-focus-pane', () => ({ +vi.mock('../../../lib/workspace/tabs/activate-tab-and-focus-pane', () => ({ activateTabAndFocusPane: mocks.activateTabAndFocusPane })) diff --git a/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-split-focus.ts b/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-split-focus.ts index e97a45a7944..156d353b541 100644 --- a/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-split-focus.ts +++ b/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-split-focus.ts @@ -1,4 +1,4 @@ -import { activateTabAndFocusPane } from '../../../lib/activate-tab-and-focus-pane' +import { activateTabAndFocusPane } from '../../../lib/workspace/tabs/activate-tab-and-focus-pane' import { useAppStore } from '../../../store/index' import { matchesWebSessionIntentOwner } from '../../web-session-tabs-sync/identity/web-runtime-session-environment' import { refreshWebRuntimeSessionTabsSnapshot } from '../../web-session-tabs-sync/inventory/web-runtime-session-snapshot' diff --git a/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-split-source-pty.ts b/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-split-source-pty.ts index a41f4b77f57..18e58939cc8 100644 --- a/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-split-source-pty.ts +++ b/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-split-source-pty.ts @@ -2,7 +2,7 @@ import { toast } from 'sonner' import { translate } from '@/i18n/i18n' import { isWebTerminalSurfaceTabId } from '../../../../../shared/workspace-layout/terminal-surface-id' import { parseRemoteRuntimePtyId } from '../../../../../shared/remote-runtime/remote-runtime-pty-id' -import { runtimeEnvironmentIdUnlessTwin } from '../../../lib/resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from '../../../lib/workspace/ownership/resolve-owner' import { useAppStore } from '../../../store/index' import type { WebRuntimeSplitSource } from './web-runtime-split-focus' diff --git a/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-tab-properties.ts b/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-tab-properties.ts index c5dd76c60e3..792f025efac 100644 --- a/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-tab-properties.ts +++ b/src/renderer/src/runtime/hosted-terminals/actions/web-runtime-tab-properties.ts @@ -1,5 +1,5 @@ import type { RuntimeRpcResponse } from '../../../../../shared/runtime-rpc-envelope' -import { runtimeEnvironmentIdUnlessTwin } from '../../../lib/resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from '../../../lib/workspace/ownership/resolve-owner' import { useAppStore } from '../../../store/index' import { unwrapRuntimeRpcResult } from '../../rpc/calls/runtime-rpc-result' import { toRuntimeWorktreeSelector } from '../../rpc/targets/runtime-worktree-selector' diff --git a/src/renderer/src/runtime/hosted-terminals/creation/web-runtime-terminal-creation.ts b/src/renderer/src/runtime/hosted-terminals/creation/web-runtime-terminal-creation.ts index 1a1ca755445..d68e2bff425 100644 --- a/src/renderer/src/runtime/hosted-terminals/creation/web-runtime-terminal-creation.ts +++ b/src/renderer/src/runtime/hosted-terminals/creation/web-runtime-terminal-creation.ts @@ -11,7 +11,7 @@ import { notifyWebRuntimeTerminalCreateFailure } from './web-runtime-terminal-cr import { startStoppedWslHostForUserAct, stoppedWslHostMessage -} from '../../../lib/wsl-host-user-start' +} from '../../hosts/wsl/wsl-host-user-start' type TerminalCreateOptions = { notifyFailure?: boolean; userAct?: boolean } diff --git a/src/renderer/src/runtime/hosted-terminals/hydration/host-terminal-scrollback-hydration.ts b/src/renderer/src/runtime/hosted-terminals/hydration/host-terminal-scrollback-hydration.ts index d3ac5c54b20..93be229bc71 100644 --- a/src/renderer/src/runtime/hosted-terminals/hydration/host-terminal-scrollback-hydration.ts +++ b/src/renderer/src/runtime/hosted-terminals/hydration/host-terminal-scrollback-hydration.ts @@ -5,7 +5,7 @@ import { useAppStore } from '@/store/index' import { runtimeEnvironmentIdForWorkspaceOwner, type RuntimeEnvironmentOwnerMatch -} from '@/lib/resolve-owner' +} from '@/lib/workspace/ownership/resolve-owner' import type { OrcadDeploymentLink } from '../../../../../shared/remote-runtime/host-catalog/runtime-environments' import { callRuntimeRpc } from '../../rpc/calls/runtime-rpc-call' import { runtimeEnvironmentSupportsCapability } from '../../rpc/compatibility/runtime-capability-proof' diff --git a/src/renderer/src/lib/execution-host-display-label.ts b/src/renderer/src/runtime/hosts/display/execution-host-display-label.ts similarity index 89% rename from src/renderer/src/lib/execution-host-display-label.ts rename to src/renderer/src/runtime/hosts/display/execution-host-display-label.ts index 2f48fc565af..e90ab23424f 100644 --- a/src/renderer/src/lib/execution-host-display-label.ts +++ b/src/renderer/src/runtime/hosts/display/execution-host-display-label.ts @@ -3,10 +3,10 @@ import { isUnresolvedOwnerHostId, parseExecutionHostId, type ExecutionHostId -} from '../../../shared/execution-host' -import { getHostSettingOverride } from '../../../shared/host-setting-overrides' +} from '../../../../../shared/execution-host' +import { getHostSettingOverride } from '../../../../../shared/host-setting-overrides' import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner' -import { runtimeEnvironmentIdUnlessTwin } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' import { selectRuntimeAwareSshTargetLabel } from '@/store/slices/ssh/runtime-environment-ssh-selectors' import type { AppState } from '@/store/types' diff --git a/src/renderer/src/lib/execution-host-facts.test.ts b/src/renderer/src/runtime/hosts/platform/execution-host-facts.test.ts similarity index 94% rename from src/renderer/src/lib/execution-host-facts.test.ts rename to src/renderer/src/runtime/hosts/platform/execution-host-facts.test.ts index b1709d2bd7b..4c275b4845b 100644 --- a/src/renderer/src/lib/execution-host-facts.test.ts +++ b/src/renderer/src/runtime/hosts/platform/execution-host-facts.test.ts @@ -1,12 +1,12 @@ import { describe, expect, it, vi } from 'vitest' -import type { RuntimeEnvironmentStatus } from '../../../shared/remote-runtime/host-status/runtime-host-status' +import type { RuntimeEnvironmentStatus } from '../../../../../shared/remote-runtime/host-status/runtime-host-status' import { resolveRepoWorktreeLaunchPlatform, resolveWorktreeExecutionHostPlatform } from './execution-host-facts' -import { getDefaultSettings } from '../../../shared/constants' +import { getDefaultSettings } from '../../../../../shared/constants' -vi.mock('./new-workspace', async (importOriginal) => ({ +vi.mock('../../../lib/new-workspace', async (importOriginal) => ({ ...(await importOriginal>()), CLIENT_PLATFORM: 'win32' })) diff --git a/src/renderer/src/lib/execution-host-facts.ts b/src/renderer/src/runtime/hosts/platform/execution-host-facts.ts similarity index 92% rename from src/renderer/src/lib/execution-host-facts.ts rename to src/renderer/src/runtime/hosts/platform/execution-host-facts.ts index b587451f18c..571d56746ea 100644 --- a/src/renderer/src/lib/execution-host-facts.ts +++ b/src/renderer/src/runtime/hosts/platform/execution-host-facts.ts @@ -3,28 +3,27 @@ import { parseExecutionHostId, type ParsedExecutionHost, type ExecutionHostId -} from '../../../shared/execution-host' -import type { ProjectExecutionRuntimeResolution } from '../../../shared/execution-host/project-execution-runtime' -import { lastVerifiedRuntimeStatus } from '../../../shared/remote-runtime/host-status/runtime-host-status' -import { runtimeHostContactForEntry } from '../../../shared/remote-runtime/host-status/runtime-host-contact' -import type { AgentStartupShell } from '../../../shared/agent-launch/startup/tui-agent-startup-shell' -import { resolveHostAgentStartupShell } from '../../../shared/windows-terminal-shell' -import { isWslUncPath } from '../../../shared/wsl-paths' +} from '../../../../../shared/execution-host' +import type { ProjectExecutionRuntimeResolution } from '../../../../../shared/execution-host/project-execution-runtime' +import { lastVerifiedRuntimeStatus } from '../../../../../shared/remote-runtime/host-status/runtime-host-status' +import { runtimeHostContactForEntry } from '../../../../../shared/remote-runtime/host-status/runtime-host-contact' +import type { AgentStartupShell } from '../../../../../shared/agent-launch/startup/tui-agent-startup-shell' +import { resolveHostAgentStartupShell } from '../../../../../shared/windows-terminal-shell' +import { isWslUncPath } from '../../../../../shared/wsl-paths' import type { AppState } from '@/store/types' import { getConnectionIdForWorktreeCopy, getConnectionIdFromState -} from './connection-owner-resolution' -import { getLocalProjectExecutionRuntimeContext } from './local-preflight-context' -import { CLIENT_PLATFORM } from './new-workspace' +} from '../../../lib/workspace/ownership/connection-owner-resolution' +import { getLocalProjectExecutionRuntimeContext } from '../../../lib/local-preflight-context' +import { CLIENT_PLATFORM } from '../../../lib/new-workspace' import { getExecutionHostIdForWorktree, getResourceExecutionHostIdForWorktree, runtimeEnvironmentIdOrLocalUnlessTwin -} from './workspace/ownership/worktree-runtime-owner' +} from '../../../lib/workspace/ownership/worktree-runtime-owner' import type { ExecutionHostPlatformFact } from './execution-host-platform-fact' -export type { ExecutionHostPlatformFact } from './execution-host-platform-fact' type HostFactsState = Pick< AppState, diff --git a/src/renderer/src/lib/execution-host-platform-fact.ts b/src/renderer/src/runtime/hosts/platform/execution-host-platform-fact.ts similarity index 88% rename from src/renderer/src/lib/execution-host-platform-fact.ts rename to src/renderer/src/runtime/hosts/platform/execution-host-platform-fact.ts index 0fd3fe53e21..4663ff9db57 100644 --- a/src/renderer/src/lib/execution-host-platform-fact.ts +++ b/src/renderer/src/runtime/hosts/platform/execution-host-platform-fact.ts @@ -1,4 +1,4 @@ -import type { ParsedExecutionHost } from '../../../shared/execution-host' +import type { ParsedExecutionHost } from '../../../../../shared/execution-host' /** Withhold unreported execution OS; quoting with client/endpoint guesses would target the wrong shell and must stop launch. */ export type ExecutionHostPlatformFact = diff --git a/src/renderer/src/lib/default-creation-host.ts b/src/renderer/src/runtime/hosts/selection/default-creation-host.ts similarity index 79% rename from src/renderer/src/lib/default-creation-host.ts rename to src/renderer/src/runtime/hosts/selection/default-creation-host.ts index ab346dcbf82..6468e691238 100644 --- a/src/renderer/src/lib/default-creation-host.ts +++ b/src/renderer/src/runtime/hosts/selection/default-creation-host.ts @@ -1,9 +1,9 @@ -import type { GlobalSettings } from '../../../shared/global-settings-types' -import type { TaskSourceContext } from '../../../shared/work-items/task-source-context' -import { getSettingsFocusedExecutionHostId } from '../../../shared/execution-host' +import type { GlobalSettings } from '../../../../../shared/global-settings-types' +import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context' +import { getSettingsFocusedExecutionHostId } from '../../../../../shared/execution-host' import { ipcOrRuntimeTargetForHostId } from '@/runtime/rpc/targets/runtime-client-target' -import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' -import { taskSourceRuntimeTarget } from './task-source-runtime-target' +import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target' +import { taskSourceRuntimeTarget } from '../../../lib/task-source-runtime-target' type DefaultHostSettings = Pick | null | undefined diff --git a/src/renderer/src/lib/local-project-runtime-workspace.ts b/src/renderer/src/runtime/hosts/wsl/local-project-runtime-workspace.ts similarity index 87% rename from src/renderer/src/lib/local-project-runtime-workspace.ts rename to src/renderer/src/runtime/hosts/wsl/local-project-runtime-workspace.ts index e7b5a20e2ea..4fb57a2c78e 100644 --- a/src/renderer/src/lib/local-project-runtime-workspace.ts +++ b/src/renderer/src/runtime/hosts/wsl/local-project-runtime-workspace.ts @@ -1,13 +1,13 @@ import type { AppState } from '@/store/types' import { getIndexedWorktreeById } from '@/store/slices/worktrees/listing/worktree-catalog-index' -import { getRepoExecutionHostId, type ExecutionHostId } from '../../../shared/execution-host' +import { getRepoExecutionHostId, type ExecutionHostId } from '../../../../../shared/execution-host' import { findLocalFolderWorkspaceRuntimeRepo, resolveQualifiedFolderWorkspaceResult -} from '../../../shared/folder-workspaces/folder-workspace-execution-host' -import type { FolderWorkspace } from '../../../shared/folder-workspaces/folder-workspace-types' -import type { Worktree } from '../../../shared/worktree/types' -import { parseWorkspaceKey } from '../../../shared/workspace-scope' +} from '../../../../../shared/folder-workspaces/folder-workspace-execution-host' +import type { FolderWorkspace } from '../../../../../shared/folder-workspaces/folder-workspace-types' +import type { Worktree } from '../../../../../shared/worktree/types' +import { parseWorkspaceKey } from '../../../../../shared/workspace-scope' import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields' type RuntimeWorkspaceState = Pick & diff --git a/src/renderer/src/lib/wsl-distro-hold-copy.ts b/src/renderer/src/runtime/hosts/wsl/wsl-distro-hold-copy.ts similarity index 95% rename from src/renderer/src/lib/wsl-distro-hold-copy.ts rename to src/renderer/src/runtime/hosts/wsl/wsl-distro-hold-copy.ts index a8670f0e982..07af047647f 100644 --- a/src/renderer/src/lib/wsl-distro-hold-copy.ts +++ b/src/renderer/src/runtime/hosts/wsl/wsl-distro-hold-copy.ts @@ -3,7 +3,7 @@ import type { Translate } from '@/i18n/use-translate' import { findWslDistroHoldInText, type WslDistroHoldState -} from '../../../shared/wsl-distro-stopped-hold' +} from '../../../../../shared/wsl-distro-stopped-hold' export function localizedWslDistroHoldMessage( hold: { diff --git a/src/renderer/src/lib/wsl-host-availability.ts b/src/renderer/src/runtime/hosts/wsl/wsl-host-availability.ts similarity index 81% rename from src/renderer/src/lib/wsl-host-availability.ts rename to src/renderer/src/runtime/hosts/wsl/wsl-host-availability.ts index 38a6a9ca0f3..548c35d05d6 100644 --- a/src/renderer/src/lib/wsl-host-availability.ts +++ b/src/renderer/src/runtime/hosts/wsl/wsl-host-availability.ts @@ -1,7 +1,7 @@ -import { selectWslHostsServing } from '../components/sidebar/use-wsl-hosts-enabled' -import { parseExecutionHostId } from '../../../shared/execution-host' -import { isWslHostRuntimeEnvironment } from '../../../shared/remote-runtime/host-catalog/runtime-environments' -import { workspaceOwnerHostId } from '@/lib/workspace-row-owner-host' +import { selectWslHostsServing } from '../../../components/sidebar/use-wsl-hosts-enabled' +import { parseExecutionHostId } from '../../../../../shared/execution-host' +import { isWslHostRuntimeEnvironment } from '../../../../../shared/remote-runtime/host-catalog/runtime-environments' +import { workspaceOwnerHostId } from '@/lib/workspace/ownership/workspace-row-owner-host' import { useAppStore } from '@/store/index' import type { AppState } from '@/store/types' diff --git a/src/renderer/src/lib/wsl-host-stopped-status.ts b/src/renderer/src/runtime/hosts/wsl/wsl-host-stopped-status.ts similarity index 100% rename from src/renderer/src/lib/wsl-host-stopped-status.ts rename to src/renderer/src/runtime/hosts/wsl/wsl-host-stopped-status.ts diff --git a/src/renderer/src/lib/wsl-host-user-start.ts b/src/renderer/src/runtime/hosts/wsl/wsl-host-user-start.ts similarity index 98% rename from src/renderer/src/lib/wsl-host-user-start.ts rename to src/renderer/src/runtime/hosts/wsl/wsl-host-user-start.ts index 5efcdd70894..42efe3f6e07 100644 --- a/src/renderer/src/lib/wsl-host-user-start.ts +++ b/src/renderer/src/runtime/hosts/wsl/wsl-host-user-start.ts @@ -1,6 +1,6 @@ import { toast } from 'sonner' import { translate } from '@/i18n/i18n' -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import { selectStoppedWslDistro } from './wsl-host-stopped-status' /** " is stopped", the same words the chat and terminal Start offers use. */ diff --git a/src/renderer/src/runtime/jira/runtime-jira-client.ts b/src/renderer/src/runtime/jira/runtime-jira-client.ts index 7d8887b6fc3..3b05fcec6f3 100644 --- a/src/renderer/src/runtime/jira/runtime-jira-client.ts +++ b/src/renderer/src/runtime/jira/runtime-jira-client.ts @@ -26,8 +26,8 @@ import { assertRuntimeEnvironmentCapability } from '../rpc/compatibility/runtime import { callRuntimeRpc } from '../rpc/calls/runtime-rpc-call' import { clearJiraImageCache } from './runtime-jira-image-cache' import { isRuntimeProviderSearchQueryWithinLimit } from '../issue-search/runtime-provider-search-bounds' -import { rowLessSourceTarget } from '../../lib/default-creation-host' -import type { RowLessSource as RuntimeJiraSettings } from '../../lib/default-creation-host' +import { rowLessSourceTarget } from '../hosts/selection/default-creation-host' +import type { RowLessSource as RuntimeJiraSettings } from '../hosts/selection/default-creation-host' import { parseJiraConnectionStatus } from './runtime-jira-connection-status' import { jiraListProjectsForTarget, jiraStatusForTarget } from './runtime-jira-project-client' diff --git a/src/renderer/src/runtime/jira/runtime-jira-summary-client.ts b/src/renderer/src/runtime/jira/runtime-jira-summary-client.ts index 42263d44ef6..d7102027ae1 100644 --- a/src/renderer/src/runtime/jira/runtime-jira-summary-client.ts +++ b/src/renderer/src/runtime/jira/runtime-jira-summary-client.ts @@ -1,8 +1,8 @@ import type { JiraConnectionStatus, JiraIssue } from '../../../../shared/jira/jira-types' import { createNonSecureContextUuid as createBrowserUuid } from '../../../../shared/non-secure-context-uuid' import { callRuntimeRpc } from '../rpc/calls/runtime-rpc-call' -import { rowLessSourceTarget } from '../../lib/default-creation-host' -import type { RowLessSource as RuntimeJiraSettings } from '../../lib/default-creation-host' +import { rowLessSourceTarget } from '../hosts/selection/default-creation-host' +import type { RowLessSource as RuntimeJiraSettings } from '../hosts/selection/default-creation-host' import { parseJiraConnectionStatus } from './runtime-jira-connection-status' export async function jiraReadStatus(settings: RuntimeJiraSettings): Promise { diff --git a/src/renderer/src/runtime/jira/runtime-jira-user-fields-client.ts b/src/renderer/src/runtime/jira/runtime-jira-user-fields-client.ts index 7d63d92f069..b2467ba626b 100644 --- a/src/renderer/src/runtime/jira/runtime-jira-user-fields-client.ts +++ b/src/renderer/src/runtime/jira/runtime-jira-user-fields-client.ts @@ -14,8 +14,8 @@ import { } from '../rpc/compatibility/runtime-capability-proof' import { callRuntimeRpc } from '../rpc/calls/runtime-rpc-call' import { isRuntimeProviderSearchQueryWithinLimit } from '../issue-search/runtime-provider-search-bounds' -import { rowLessSourceTarget } from '../../lib/default-creation-host' -import type { RowLessSource as RuntimeJiraSettings } from '../../lib/default-creation-host' +import { rowLessSourceTarget } from '../hosts/selection/default-creation-host' +import type { RowLessSource as RuntimeJiraSettings } from '../hosts/selection/default-creation-host' export async function jiraCreateIssue( settings: RuntimeJiraSettings, diff --git a/src/renderer/src/runtime/linear/runtime-linear-client.ts b/src/renderer/src/runtime/linear/runtime-linear-client.ts index 1ca4eba1ce3..322ea590607 100644 --- a/src/renderer/src/runtime/linear/runtime-linear-client.ts +++ b/src/renderer/src/runtime/linear/runtime-linear-client.ts @@ -13,7 +13,7 @@ import type { RuntimeClientTarget } from '../../../../shared/runtime-client-targ import { rowLessSourceTarget, type RowLessSource as RuntimeLinearSettings -} from '@/lib/default-creation-host' +} from '@/runtime/hosts/selection/default-creation-host' import { isRuntimeProviderSearchQueryWithinLimit } from '../issue-search/runtime-provider-search-bounds' import type { LinearIssueAttributeFilter } from '../../../../shared/linear/issue-attribute-filter' import { diff --git a/src/renderer/src/runtime/linear/runtime-linear-issue-client.ts b/src/renderer/src/runtime/linear/runtime-linear-issue-client.ts index aa35195dbb6..165acdaf38b 100644 --- a/src/renderer/src/runtime/linear/runtime-linear-issue-client.ts +++ b/src/renderer/src/runtime/linear/runtime-linear-issue-client.ts @@ -7,7 +7,7 @@ import { type LinearCreateIssueResult, type LinearMutationResult } from './runtime-linear-client' -import type { RowLessSource as RuntimeLinearSettings } from '../../lib/default-creation-host' +import type { RowLessSource as RuntimeLinearSettings } from '../hosts/selection/default-creation-host' export async function linearCreateIssue( settings: RuntimeLinearSettings, diff --git a/src/renderer/src/runtime/linear/runtime-linear-project-client.ts b/src/renderer/src/runtime/linear/runtime-linear-project-client.ts index 93cd15d3f3b..d9ade21eb01 100644 --- a/src/renderer/src/runtime/linear/runtime-linear-project-client.ts +++ b/src/renderer/src/runtime/linear/runtime-linear-project-client.ts @@ -21,7 +21,7 @@ import { type LinearCreateProjectResult, type LinearReadOptions } from './runtime-linear-client' -import type { RowLessSource as RuntimeLinearSettings } from '../../lib/default-creation-host' +import type { RowLessSource as RuntimeLinearSettings } from '../hosts/selection/default-creation-host' export async function linearListTeams( settings: RuntimeLinearSettings, diff --git a/src/renderer/src/runtime/native-chat/naming/structured-chat-name-observation.ts b/src/renderer/src/runtime/native-chat/naming/structured-chat-name-observation.ts index 6d5ae2b5251..ab068caf710 100644 --- a/src/renderer/src/runtime/native-chat/naming/structured-chat-name-observation.ts +++ b/src/renderer/src/runtime/native-chat/naming/structured-chat-name-observation.ts @@ -14,7 +14,7 @@ import { type StructuredChatTabName, type StructuredChatTabNames } from './structured-chat-tab-name' -import { isUnifiedTabOwnedByWorktree } from '@/lib/unified-tab-host-ownership' +import { isUnifiedTabOwnedByWorktree } from '@/lib/workspace/ownership/unified-tab-host-ownership' import type { Tab } from '../../../../../shared/tab-types' import type { Worktree } from '../../../../../shared/worktree/types' diff --git a/src/renderer/src/runtime/native-chat/session-ownership/structured-agent-session-owner.ts b/src/renderer/src/runtime/native-chat/session-ownership/structured-agent-session-owner.ts index fcff6142e1f..685254db78a 100644 --- a/src/renderer/src/runtime/native-chat/session-ownership/structured-agent-session-owner.ts +++ b/src/renderer/src/runtime/native-chat/session-ownership/structured-agent-session-owner.ts @@ -12,7 +12,11 @@ import { import type { Tab } from '../../../../../shared/tab-types' import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner' import type { WorktreeRuntimeOwnerState } from '@/lib/workspace/ownership/worktree-runtime-owner-state' -import { isTwinWorkspace, namedHostForOwnerRef, resolveOwner } from '@/lib/resolve-owner' +import { + isTwinWorkspace, + namedHostForOwnerRef, + resolveOwner +} from '@/lib/workspace/ownership/resolve-owner' import { authorityKey } from '../../../../../shared/host-authority' import { LOCAL_STRUCTURED_SESSION_OWNER } from '../local-sessions/local-structured-session-owner' import { runtimeRpcTargetForAuthorityKey } from '../../rpc/targets/runtime-client-target' diff --git a/src/renderer/src/runtime/sync-runtime-graph/editor-buffer-dirty-readers.test.ts b/src/renderer/src/runtime/sync-runtime-graph/editor-buffer-dirty-readers.test.ts index c77554d8a2f..b6ef1603d28 100644 --- a/src/renderer/src/runtime/sync-runtime-graph/editor-buffer-dirty-readers.test.ts +++ b/src/renderer/src/runtime/sync-runtime-graph/editor-buffer-dirty-readers.test.ts @@ -7,7 +7,7 @@ import { buildMobileSessionTabSnapshots } from './mobile-session-snapshots' import { makeState } from './testing/sync-runtime-graph-test-harness' import type { Tab } from '../../../../shared/tab-types' -vi.mock('@/lib/connection-context', () => ({ +vi.mock('@/lib/workspace/ownership/connection-context', () => ({ getConnectionIdForFile: () => null })) diff --git a/src/renderer/src/runtime/sync-runtime-graph/main-owned-terminal-list.ts b/src/renderer/src/runtime/sync-runtime-graph/main-owned-terminal-list.ts index 20a72b53e0d..0a99e4b837d 100644 --- a/src/renderer/src/runtime/sync-runtime-graph/main-owned-terminal-list.ts +++ b/src/renderer/src/runtime/sync-runtime-graph/main-owned-terminal-list.ts @@ -1,6 +1,6 @@ // Main lists locally owned workspace terminals in layout-owner builds; window reports shown/parked panes. Paired workspaces retain window lists. import { getParkedTerminalWatcherPaneIdsByPtyId } from '@/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-registry' -import { runtimeEnvironmentIdForWorkspaceOwner } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdForWorkspaceOwner } from '@/lib/workspace/ownership/resolve-owner' import type { AppState } from '@/store/types' import type { RuntimeMountedLeaf } from '../../../../shared/runtime-types' diff --git a/src/renderer/src/runtime/sync-runtime-graph/mobile-session-inputs.ts b/src/renderer/src/runtime/sync-runtime-graph/mobile-session-inputs.ts index 34767525a48..5c345233c59 100644 --- a/src/renderer/src/runtime/sync-runtime-graph/mobile-session-inputs.ts +++ b/src/renderer/src/runtime/sync-runtime-graph/mobile-session-inputs.ts @@ -3,7 +3,7 @@ import { pendingEntityWorkspaceIds } from '@/runtime/workspace-layout/intents/layout-owner-pending-tabs' import { editorPlacementIndex } from '@/store/slices/editor/tabs/workspace-editor-files' -import { runtimeEnvironmentIdForWorkspaceOwner } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdForWorkspaceOwner } from '@/lib/workspace/ownership/resolve-owner' import { hostSessionTabIdsByLocalTabForWorktree } from '../web-session-tabs-sync/tracking-mappings' import type { AppState } from '@/store/types' import { parsePaneKey, makePaneKey } from '../../../../shared/workspace-layout/stable-pane-id' diff --git a/src/renderer/src/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab.test.ts index 094a08927ef..838f96a207d 100644 --- a/src/renderer/src/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab.test.ts +++ b/src/renderer/src/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab.test.ts @@ -1,5 +1,5 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' -import type * as ResolveOwnerModule from '@/lib/resolve-owner' +import type * as ResolveOwnerModule from '@/lib/workspace/ownership/resolve-owner' const closeWebRuntimeSessionTabMock = vi.fn() const ownerLookup = vi.hoisted(() => ({ calls: 0 })) @@ -8,7 +8,7 @@ vi.mock('../actions/web-runtime-session-tab-lifecycle', () => ({ closeWebRuntimeSessionTab: (args: unknown) => closeWebRuntimeSessionTabMock(args) })) -vi.mock('@/lib/resolve-owner', async (importOriginal) => { +vi.mock('@/lib/workspace/ownership/resolve-owner', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab.ts b/src/renderer/src/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab.ts index 8ea7e3b663b..44a440c750c 100644 --- a/src/renderer/src/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab.ts +++ b/src/renderer/src/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab.ts @@ -1,5 +1,5 @@ -import { runtimeEnvironmentIdUnlessTwin } from '@/lib/resolve-owner' -import type { WorktreeOperationRouteState } from '@/lib/worktree-operation-route' +import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' +import type { WorktreeOperationRouteState } from '@/lib/workspace/ownership/worktree-operation-route' import { recordWebSessionCloseIntent } from './web-session-close-intent' import { isServerFrameDrawnWorkspace } from '../frame-drawn-server-workspace-set' import { toHostSessionTabId } from '../../../../../shared/workspace-layout/terminal-surface-id' diff --git a/src/renderer/src/runtime/web-session-tabs-sync/mirrored-workspace-owner.ts b/src/renderer/src/runtime/web-session-tabs-sync/mirrored-workspace-owner.ts index 8fa712ad8e4..2049268dabb 100644 --- a/src/renderer/src/runtime/web-session-tabs-sync/mirrored-workspace-owner.ts +++ b/src/renderer/src/runtime/web-session-tabs-sync/mirrored-workspace-owner.ts @@ -1,4 +1,4 @@ -import { runtimeEnvironmentIdUnlessTwin } from '../../lib/resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from '../../lib/workspace/ownership/resolve-owner' /** The paired server whose tabs this workspace mirrors; an unselected twin mirrors none. */ export function mirroredRuntimeEnvironmentIdForWorkspace( diff --git a/src/renderer/src/runtime/web-session-tabs-sync/navigation/web-session-visible-tab-pick-report.ts b/src/renderer/src/runtime/web-session-tabs-sync/navigation/web-session-visible-tab-pick-report.ts index 776132c97f5..118f944f400 100644 --- a/src/renderer/src/runtime/web-session-tabs-sync/navigation/web-session-visible-tab-pick-report.ts +++ b/src/renderer/src/runtime/web-session-tabs-sync/navigation/web-session-visible-tab-pick-report.ts @@ -236,11 +236,13 @@ function reassertVisibleNonTerminalTab(worktreeId: string, stillCurrent: () => b } const next = { type: visible.contentType, id: visible.entityId, tabId: visible.id } // Loaded lazily: the owner activations reach the session-tab lifecycle, which loads this module. - void import('../../../lib/cycled-tab-owner-activation').then(({ activateCycledTabOnOwner }) => { - if (stillCurrent()) { - activateCycledTabOnOwner(worktreeId, next) + void import('../../../lib/workspace/tabs/cycled-tab-owner-activation').then( + ({ activateCycledTabOnOwner }) => { + if (stillCurrent()) { + activateCycledTabOnOwner(worktreeId, next) + } } - }) + ) } /** The activate answer is the host's per-device frame after the report. */ diff --git a/src/renderer/src/runtime/workspace-layout/commands/layout-apply-send.ts b/src/renderer/src/runtime/workspace-layout/commands/layout-apply-send.ts index 0be8e8e7786..8d5a72ead17 100644 --- a/src/renderer/src/runtime/workspace-layout/commands/layout-apply-send.ts +++ b/src/renderer/src/runtime/workspace-layout/commands/layout-apply-send.ts @@ -2,7 +2,7 @@ import { runtimeEnvironmentIdForWorkspaceOwner, runtimeEnvironmentIdUnlessTwin -} from '@/lib/resolve-owner' +} from '@/lib/workspace/ownership/resolve-owner' import { callLayoutApply } from '@/runtime/workspace-layout/commands/layout-apply-call' import { holdTabPaneTree } from '@/runtime/workspace-layout/intents/layout-owner-pane-tree-holds' import { diff --git a/src/renderer/src/runtime/workspace-layout/commands/layout-owner-command.test.ts b/src/renderer/src/runtime/workspace-layout/commands/layout-owner-command.test.ts index a76e0c20ee4..9c2ede77df3 100644 --- a/src/renderer/src/runtime/workspace-layout/commands/layout-owner-command.test.ts +++ b/src/renderer/src/runtime/workspace-layout/commands/layout-owner-command.test.ts @@ -22,7 +22,7 @@ vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({ callRuntimeRpc: mocks.callRuntimeRpc })) vi.mock('@/store/index', () => ({ useAppStore: { getState: () => ({}) } })) -vi.mock('@/lib/resolve-owner', () => ({ +vi.mock('@/lib/workspace/ownership/resolve-owner', () => ({ runtimeEnvironmentIdUnlessTwin: () => mocks.ownerEnvironmentId, runtimeEnvironmentIdForWorkspaceOwner: () => ({ kind: 'resolved', diff --git a/src/renderer/src/runtime/workspace-layout/server/server-layout-apply.test.ts b/src/renderer/src/runtime/workspace-layout/server/server-layout-apply.test.ts index 629c4e4787e..660dd41ff4f 100644 --- a/src/renderer/src/runtime/workspace-layout/server/server-layout-apply.test.ts +++ b/src/renderer/src/runtime/workspace-layout/server/server-layout-apply.test.ts @@ -1,7 +1,7 @@ import type * as RuntimeRpcCallModule from '@/runtime/rpc/calls/runtime-rpc-call' import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest' import type * as AgentStatusModule from '@/lib/agent-status' -import type * as ResolveOwnerModule from '@/lib/resolve-owner' +import type * as ResolveOwnerModule from '@/lib/workspace/ownership/resolve-owner' import type * as FrameDrawnModule from '../../web-session-tabs-sync/frame-drawn-server-workspaces' import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target' @@ -74,7 +74,7 @@ vi.mock('../../web-session-tabs-sync/mirrored-workspace-owner', () => ({ mirroredRuntimeEnvironmentIdForWorkspace: (_state: unknown, key: string) => hoisted.owners.get(key) ?? null })) -vi.mock('@/lib/resolve-owner', async (importOriginal) => ({ +vi.mock('@/lib/workspace/ownership/resolve-owner', async (importOriginal) => ({ ...(await importOriginal()), runtimeEnvironmentIdUnlessTwin: (_state: unknown, key: string) => hoisted.owners.get(key) ?? null })) diff --git a/src/renderer/src/runtime/workspace-layout/server/server-layout-editor-handover.test.ts b/src/renderer/src/runtime/workspace-layout/server/server-layout-editor-handover.test.ts index 915c03d77a9..86b810f2f56 100644 --- a/src/renderer/src/runtime/workspace-layout/server/server-layout-editor-handover.test.ts +++ b/src/renderer/src/runtime/workspace-layout/server/server-layout-editor-handover.test.ts @@ -1,7 +1,7 @@ import type * as RuntimeRpcCallModule from '@/runtime/rpc/calls/runtime-rpc-call' import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest' import type * as AgentStatusModule from '@/lib/agent-status' -import type * as ResolveOwnerModule from '@/lib/resolve-owner' +import type * as ResolveOwnerModule from '@/lib/workspace/ownership/resolve-owner' import type * as RuntimeFileMutationClient from '../../files/mutations/runtime-file-mutation-client' import type * as FrameDrawnModule from '../../web-session-tabs-sync/frame-drawn-server-workspaces' @@ -78,7 +78,7 @@ vi.mock('../../web-session-tabs-sync/mirrored-workspace-owner', () => ({ mirroredRuntimeEnvironmentIdForWorkspace: (_state: unknown, key: string) => hoisted.owners.get(key) ?? null })) -vi.mock('@/lib/resolve-owner', async (importOriginal) => ({ +vi.mock('@/lib/workspace/ownership/resolve-owner', async (importOriginal) => ({ ...(await importOriginal()), runtimeEnvironmentIdUnlessTwin: (_state: unknown, key: string) => hoisted.owners.get(key) ?? null })) diff --git a/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-held-tabs.test.ts b/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-held-tabs.test.ts index c623a8cc6bd..e4d33816445 100644 --- a/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-held-tabs.test.ts +++ b/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-held-tabs.test.ts @@ -1,7 +1,7 @@ import type * as RuntimeRpcCallModule from '@/runtime/rpc/calls/runtime-rpc-call' import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest' import type * as AgentStatusModule from '@/lib/agent-status' -import type * as ResolveOwnerModule from '@/lib/resolve-owner' +import type * as ResolveOwnerModule from '@/lib/workspace/ownership/resolve-owner' import type * as WorktreeRuntimeOwnerModule from '@/lib/workspace/ownership/worktree-runtime-owner' import type * as FrameDrawnModule from '../../web-session-tabs-sync/frame-drawn-server-workspaces' @@ -79,7 +79,7 @@ vi.mock('../../web-session-tabs-sync/mirrored-workspace-owner', () => ({ mirroredRuntimeEnvironmentIdForWorkspace: (_state: unknown, key: string) => hoisted.owners.get(key) ?? null })) -vi.mock('@/lib/resolve-owner', async (importOriginal) => ({ +vi.mock('@/lib/workspace/ownership/resolve-owner', async (importOriginal) => ({ ...(await importOriginal()), runtimeEnvironmentIdUnlessTwin: (_state: unknown, key: string) => hoisted.owners.get(key) ?? null })) diff --git a/src/renderer/src/store/folder-workspaces/folder-workspace-mutations.ts b/src/renderer/src/store/folder-workspaces/folder-workspace-mutations.ts index 6fab952eceb..810720a264a 100644 --- a/src/renderer/src/store/folder-workspaces/folder-workspace-mutations.ts +++ b/src/renderer/src/store/folder-workspaces/folder-workspace-mutations.ts @@ -12,11 +12,11 @@ import { getRuntimeTargetHostId } from '../../runtime/rpc/targets/runtime-client-target' import { folderWorkspaceKey } from '../../../../shared/workspace-scope' -import { formatFolderWorkspaceCreateError } from '../../lib/folder-workspace-path-status' +import { formatFolderWorkspaceCreateError } from '../../lib/workspace/paths/folder-workspace-path-status' import { findFolderWorkspaceOwner, getExecutionHostIdForFolderWorkspace -} from '@/lib/folder-workspace-runtime-owner' +} from '@/lib/workspace/ownership/folder-workspace-runtime-owner' import { FolderWorkspaceUpdateCoordinator } from './folder-workspace-update-coordinator' import type { FolderWorkspaceUpdates, RepoSlice } from '../repos/repo-state' import { adoptFromEndpoint } from '../host-catalog/endpoint-catalog-adoption' diff --git a/src/renderer/src/store/folder-workspaces/folder-workspace-routing.ts b/src/renderer/src/store/folder-workspaces/folder-workspace-routing.ts index 5ef5da8bc3c..c88d8421aa5 100644 --- a/src/renderer/src/store/folder-workspaces/folder-workspace-routing.ts +++ b/src/renderer/src/store/folder-workspaces/folder-workspace-routing.ts @@ -2,8 +2,8 @@ import type { FolderWorkspace } from '../../../../shared/folder-workspaces/folde import type { FolderWorkspacePathStatusRequest } from '../../../../shared/folder-workspaces/folder-workspace-path-status' import { runtimeTargetForOwnerEnvironment } from '../../runtime/rpc/targets/runtime-client-target' import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target' -import { runtimeTargetForWorkspaceOwner } from '@/lib/resolve-owner' -import type { WorktreeOperationRouteState } from '@/lib/worktree-operation-route' +import { runtimeTargetForWorkspaceOwner } from '@/lib/workspace/ownership/resolve-owner' +import type { WorktreeOperationRouteState } from '@/lib/workspace/ownership/worktree-operation-route' import type { ExecutionHostId } from '../../../../shared/execution-host' import { folderWorkspaceKey } from '../../../../shared/workspace-scope' import type { FolderWorkspacePathStatusRouteOptions } from '../repos/repo-state' diff --git a/src/renderer/src/store/github/projects/github-project-row-owner.ts b/src/renderer/src/store/github/projects/github-project-row-owner.ts index 76c634aa599..72615ac23a3 100644 --- a/src/renderer/src/store/github/projects/github-project-row-owner.ts +++ b/src/renderer/src/store/github/projects/github-project-row-owner.ts @@ -1,7 +1,7 @@ import type { GlobalSettings } from '../../../../../shared/global-settings-types' import type { Repo } from '../../../../../shared/repo-types' import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target' -import { runtimeTargetForRepoOwner } from '@/lib/repo-runtime-owner' +import { runtimeTargetForRepoOwner } from '@/lib/workspace/ownership/repo-runtime-owner' import { lookupReposBySlugFromCache } from '@/lib/repo-slug-cache' type RepoOwnerState = { diff --git a/src/renderer/src/store/github/pull-requests/linked-review-clear.ts b/src/renderer/src/store/github/pull-requests/linked-review-clear.ts index 4c1e650f3e6..a00707dbbfb 100644 --- a/src/renderer/src/store/github/pull-requests/linked-review-clear.ts +++ b/src/renderer/src/store/github/pull-requests/linked-review-clear.ts @@ -9,7 +9,7 @@ import { } from '../../../../../shared/github/linked-pr-staleness' import { getHostedReviewLinkMutationGeneration } from '../../slices/worktrees/metadata/hosted-review-link-mutation' import { tryRuntimeTargetForWorktreeOwner } from '../../slices/worktrees/listing/worktree-owner-target' -import { hasUniqueIndexedRepositoryHost } from '@/lib/repository-owner-index' +import { hasUniqueIndexedRepositoryHost } from '@/lib/workspace/ownership/repository-owner-index' import { resolveReviewRepository } from '@/lib/review-owner' import { findWorktreeById, getWorktreeLookupIndex } from '../refresh/worktree-refresh' diff --git a/src/renderer/src/store/github/refresh/worktree-refresh.ts b/src/renderer/src/store/github/refresh/worktree-refresh.ts index f788fac5cc1..0f90fa4966b 100644 --- a/src/renderer/src/store/github/refresh/worktree-refresh.ts +++ b/src/renderer/src/store/github/refresh/worktree-refresh.ts @@ -15,7 +15,7 @@ import { resolveReviewRepository, reviewRepositoryMatchesWorkspace } from '@/lib import { findIndexedReviewRepository, hasUniqueIndexedRepositoryHost -} from '@/lib/repository-owner-index' +} from '@/lib/workspace/ownership/repository-owner-index' import { worktreeOwnerHostIds } from '@/lib/workspace/ownership/workspace-catalog-owner-index' import { prCacheKey } from '../cache/cache-identity' import { settingsForGitHubRepoOwner } from '../work-items/work-item-routing' diff --git a/src/renderer/src/store/github/repositories/repository-routing.ts b/src/renderer/src/store/github/repositories/repository-routing.ts index ea859ae446c..0f14540fb52 100644 --- a/src/renderer/src/store/github/repositories/repository-routing.ts +++ b/src/renderer/src/store/github/repositories/repository-routing.ts @@ -7,7 +7,7 @@ import type { import type { Repo } from '../../../../../shared/repo-types' import { runtimeTargetForOwnerEnvironment } from '../../../runtime/rpc/targets/runtime-client-target' import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target' -import { hasUniqueIndexedRepositoryHost } from '@/lib/repository-owner-index' +import { hasUniqueIndexedRepositoryHost } from '@/lib/workspace/ownership/repository-owner-index' import { getGitHubRepoLookupIndex } from './github-repo-lookup-index' import { LOCAL_EXECUTION_HOST_ID, diff --git a/src/renderer/src/store/github/work-items/work-item-routing.ts b/src/renderer/src/store/github/work-items/work-item-routing.ts index 9b890f33457..a80f088b87f 100644 --- a/src/renderer/src/store/github/work-items/work-item-routing.ts +++ b/src/renderer/src/store/github/work-items/work-item-routing.ts @@ -19,7 +19,7 @@ import { import { classifyGitHubUnavailable } from '../../../../../shared/github/api-availability' import { callRuntimeRpc } from '../../../runtime/rpc/calls/runtime-rpc-call' import { RuntimeRpcCallError } from '../../../runtime/rpc/calls/runtime-rpc-result' -import { getHostlessSourceRepoOwnerEnvironmentId } from '@/lib/repo-runtime-owner' +import { getHostlessSourceRepoOwnerEnvironmentId } from '@/lib/workspace/ownership/repo-runtime-owner' import { runtimeTargetForOwnerEnvironment, ipcOrRuntimeTargetForHostId diff --git a/src/renderer/src/store/repos/repo-add-actions.ts b/src/renderer/src/store/repos/repo-add-actions.ts index 186f124b446..6ff0b2f5b61 100644 --- a/src/renderer/src/store/repos/repo-add-actions.ts +++ b/src/renderer/src/store/repos/repo-add-actions.ts @@ -6,7 +6,7 @@ import { isGitRepoKind } from '../../../../shared/repo-kind' import { getRepoHostIdentity } from '../../../../shared/repo-host-identity' import { callRuntimeRpc } from '../../runtime/rpc/calls/runtime-rpc-call' import { runtimeTargetForOwnerEnvironment } from '../../runtime/rpc/targets/runtime-client-target' -import { defaultCreationHost } from '@/lib/default-creation-host' +import { defaultCreationHost } from '@/runtime/hosts/selection/default-creation-host' import { markOnboardingProjectAdded } from '@/lib/onboarding-project-checklist' import { translate } from '@/i18n/i18n' import { @@ -28,7 +28,7 @@ import { } from './pending-runtime-repo-removals' import { RuntimeRpcCallError } from '../../runtime/rpc/calls/runtime-rpc-result' import { readWslHostWindowsDriveRefusal } from '../../../../shared/wsl-host-windows-drive-refusal' -import { showWslHostWindowsDriveRefusal } from '@/lib/wsl-host-windows-drive-refusal-toast' +import { showWslHostWindowsDriveRefusal } from '@/lib/workspace/creation/wsl-host-windows-drive-refusal-toast' export function createRepoAddActions( set: Parameters>[0], diff --git a/src/renderer/src/store/repos/repo-host-identity.ts b/src/renderer/src/store/repos/repo-host-identity.ts index 4da0f482c43..68936d1d49c 100644 --- a/src/renderer/src/store/repos/repo-host-identity.ts +++ b/src/renderer/src/store/repos/repo-host-identity.ts @@ -3,6 +3,7 @@ import type { Repo } from '../../../../shared/repo-types' import { getRepoExecutionHostId, getSettingsFocusedExecutionHostId, + LOCAL_EXECUTION_HOST_ID, normalizeHostPart, type ExecutionHostId } from '../../../../shared/execution-host' @@ -10,6 +11,10 @@ import { getRepoHostIdentity } from '../../../../shared/repo-host-identity' type RepoIdentityParts = Pick +export function worktreeBelongsToHost(worktree: { hostId?: string }, hostId: string): boolean { + return (worktree.hostId ?? LOCAL_EXECUTION_HOST_ID) === hostId +} + export function getRepoRowIdentity(repo: RepoIdentityParts): string { return JSON.stringify([getRepoHostIdentity(repo), normalizeHostPart(repo.connectionId)]) } diff --git a/src/renderer/src/store/repos/repo-removal-host-twin-attribution.ts b/src/renderer/src/store/repos/repo-removal-host-twin-attribution.ts index 2a989ae9bd5..e653544b3a1 100644 --- a/src/renderer/src/store/repos/repo-removal-host-twin-attribution.ts +++ b/src/renderer/src/store/repos/repo-removal-host-twin-attribution.ts @@ -7,11 +7,11 @@ import { import { getPtyExecutionHost } from '../../../../shared/terminal/pty/lifecycle/terminal-execution-host' import { collectPtyIdsForTab } from '../terminals/terminal-tab-retirement' import { toVisibleTabType } from '../../../../shared/tab-types' -import { isExecutionHostAliasForWorktree } from '@/lib/worktree-execution-host-alias' +import { isExecutionHostAliasForWorktree } from '@/lib/workspace/ownership/worktree-execution-host-alias' import { getOpenFileExecutionHostId, hasOpenFileExecutionHostEvidence -} from '@/lib/unified-tab-host-ownership' +} from '@/lib/workspace/ownership/unified-tab-host-ownership' import { worktreePurgePublishers } from './repo-removal-publisher-index' /** diff --git a/src/renderer/src/store/repos/repo-removal.ts b/src/renderer/src/store/repos/repo-removal.ts index 9b2a38d73fe..9c98b6d4f6f 100644 --- a/src/renderer/src/store/repos/repo-removal.ts +++ b/src/renderer/src/store/repos/repo-removal.ts @@ -3,9 +3,12 @@ import { isRemoteRuntimePtyId } from '../../../../shared/remote-runtime/remote-r import type { StateCreator } from 'zustand' import type { AppState } from '../types' import { getRepoIdFromWorktreeId } from '../../../../shared/worktree/id' -import { getWorktreeIdFromVisitKey, getWorktreeVisitKey } from '@/lib/worktree-visit-recency' +import { + getWorktreeIdFromVisitKey, + getWorktreeVisitKey +} from '@/lib/workspace/activation/worktree-visit-recency' import { omitSparsePresetsForRepos } from '../slices/worktrees/create/sparse-presets' -import { repoMatchesHostIdentity } from './repo-host-identity' +import { repoMatchesHostIdentity, worktreeBelongsToHost } from './repo-host-identity' import { callRuntimeRpc } from '../../runtime/rpc/calls/runtime-rpc-call' import { hasRuntimeRpcErrorCode } from '../../../../shared/runtime-rpc-error-code' import { ipcOrRuntimeTargetForHostId } from '../../runtime/rpc/targets/runtime-client-target' @@ -33,10 +36,6 @@ import { toastProjectRemovalFailure } from './repo-removal-failure-toast' import { replayPendingRuntimeRepoRemovalsIfReady } from './pending-runtime-repo-removal-replay' import { isRuntimeEnvironmentRegistered } from './runtime-environment-registration' -export function worktreeBelongsToHost(worktree: { hostId?: string }, hostId: string): boolean { - return (worktree.hostId ?? LOCAL_EXECUTION_HOST_ID) === hostId -} - type HostScopedWorktreeRef = { id: string; hostId?: string } type RepoWorktreeCatalog = { diff --git a/src/renderer/src/store/slices/agent-inventory/runtime-detected-agents.test-fixture.ts b/src/renderer/src/store/slices/agent-inventory/runtime-detected-agents.test-fixture.ts index e9eaade6f30..0ad5653c904 100644 --- a/src/renderer/src/store/slices/agent-inventory/runtime-detected-agents.test-fixture.ts +++ b/src/renderer/src/store/slices/agent-inventory/runtime-detected-agents.test-fixture.ts @@ -1,5 +1,5 @@ import { createStore } from 'zustand/vanilla' -import type { getConnectionIdFromState } from '@/lib/connection-owner-resolution' +import type { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { createRuntimeDetectedAgentsSlice, type RuntimeDetectedAgentsStoreState diff --git a/src/renderer/src/store/slices/agent-inventory/runtime-detected-agents.ts b/src/renderer/src/store/slices/agent-inventory/runtime-detected-agents.ts index 787c58f563c..fb2b37731eb 100644 --- a/src/renderer/src/store/slices/agent-inventory/runtime-detected-agents.ts +++ b/src/renderer/src/store/slices/agent-inventory/runtime-detected-agents.ts @@ -4,7 +4,7 @@ import { getRuntimeEnvironmentStatus } from '@/runtime/rpc/compatibility/runtime import { runtimeEnvironmentSupportsCapability } from '@/runtime/rpc/compatibility/runtime-capability-proof' import { RuntimeRpcCallError } from '@/runtime/rpc/calls/runtime-rpc-result' import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target' -import { getConnectionIdFromState } from '@/lib/connection-owner-resolution' +import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { captureRuntimeEnvironmentRequestRevision } from '@/runtime/rpc/environment-revisions/runtime-environment-revision' import { PREFLIGHT_WORKSPACE_SCOPED_RUNTIME_CAPABILITY } from '../../../../../shared/preflight-runtime-capabilities' import { diff --git a/src/renderer/src/store/slices/browser/hydration/browser-hydration-actions.ts b/src/renderer/src/store/slices/browser/hydration/browser-hydration-actions.ts index 381110c56ac..0232f32ee56 100644 --- a/src/renderer/src/store/slices/browser/hydration/browser-hydration-actions.ts +++ b/src/renderer/src/store/slices/browser/hydration/browser-hydration-actions.ts @@ -10,7 +10,7 @@ import { ensureBrowserClientHostsForRestoredPages } from '@/runtime/browser/clie import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch' import { selectFolderWorkspaces } from '../../../workspaces/catalog/workspace-record-fields' -import { runtimeEnvironmentIdUnlessTwin } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' export function createBrowserHydrationActions( set: BrowserSliceSet, diff --git a/src/renderer/src/store/slices/browser/profiles/browser-cookie-import-actions.ts b/src/renderer/src/store/slices/browser/profiles/browser-cookie-import-actions.ts index 6e54ace2935..4feaa3d778d 100644 --- a/src/renderer/src/store/slices/browser/profiles/browser-cookie-import-actions.ts +++ b/src/renderer/src/store/slices/browser/profiles/browser-cookie-import-actions.ts @@ -6,7 +6,7 @@ import type { BrowserProfileClearDefaultCookiesResult } from '../../../../../../shared/browser/runtime/runtime-browser-contracts' import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' -import { selectExecutionHostDisplayLabel } from '@/lib/execution-host-display-label' +import { selectExecutionHostDisplayLabel } from '@/runtime/hosts/display/execution-host-display-label' import { getBrowserSettingsHostId, getBrowserSettingsRuntimeEnvironmentId, diff --git a/src/renderer/src/store/slices/browser/profiles/browser-profile-import-actions.ts b/src/renderer/src/store/slices/browser/profiles/browser-profile-import-actions.ts index 0e5c1e6794b..17c6f4e8ebd 100644 --- a/src/renderer/src/store/slices/browser/profiles/browser-profile-import-actions.ts +++ b/src/renderer/src/store/slices/browser/profiles/browser-profile-import-actions.ts @@ -3,7 +3,7 @@ import type { BrowserCookieImportResult } from '../../../../../../shared/browser import type { BrowserDetectProfilesResult } from '../../../../../../shared/browser/runtime/runtime-browser-contracts' import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' import { translate } from '@/i18n/i18n' -import { selectExecutionHostDisplayLabel } from '@/lib/execution-host-display-label' +import { selectExecutionHostDisplayLabel } from '@/runtime/hosts/display/execution-host-display-label' import { getBrowserSettingsHostId, getBrowserSettingsRuntimeEnvironmentId, diff --git a/src/renderer/src/store/slices/diff-comments/diff-comment-owner.ts b/src/renderer/src/store/slices/diff-comments/diff-comment-owner.ts index a97ce860561..89696476dd9 100644 --- a/src/renderer/src/store/slices/diff-comments/diff-comment-owner.ts +++ b/src/renderer/src/store/slices/diff-comments/diff-comment-owner.ts @@ -5,7 +5,7 @@ import { findFolderWorkspaceOwner, getExecutionHostIdForFolderWorkspace, getRuntimeEnvironmentIdForFolderWorkspace -} from '@/lib/folder-workspace-runtime-owner' +} from '@/lib/workspace/ownership/folder-workspace-runtime-owner' import { parseWorkspaceKey } from '../../../../../shared/workspace-scope' import { DIFF_COMMENT_OWNER_INPUTS, @@ -20,7 +20,7 @@ import { resolveSourceFolderHost, type WorkspaceCopySource, type WorkspaceResource -} from '@/lib/workspace-copy-owner' +} from '@/lib/workspace/ownership/workspace-copy-owner' /** A copy whose notes can be changed: the workspace and the authority serving it (endpoint plus place). */ export type DiffCommentOwner = diff --git a/src/renderer/src/store/slices/diff-comments/diff-comment-persistence.ts b/src/renderer/src/store/slices/diff-comments/diff-comment-persistence.ts index 941f5e6e05e..778061e1331 100644 --- a/src/renderer/src/store/slices/diff-comments/diff-comment-persistence.ts +++ b/src/renderer/src/store/slices/diff-comments/diff-comment-persistence.ts @@ -5,7 +5,7 @@ import type { Worktree } from '../../../../../shared/worktree/types' import { getRepoIdFromWorktreeId } from '../../../../../shared/worktree/id' import { findCopyRows } from './worktree-diff-comments-selector' import { diffCommentOwnerKey, findOwnedFolder, type DiffCommentOwner } from './diff-comment-owner' -import type { getExecutionHostIdForFolderWorkspace } from '@/lib/folder-workspace-runtime-owner' +import type { getExecutionHostIdForFolderWorkspace } from '@/lib/workspace/ownership/folder-workspace-runtime-owner' import { writeDiffCommentsToHost } from './diff-comment-host-write' import { parseWorkspaceKey } from '../../../../../shared/workspace-scope' diff --git a/src/renderer/src/store/slices/diff-comments/worktree-diff-comments-selector.ts b/src/renderer/src/store/slices/diff-comments/worktree-diff-comments-selector.ts index 53c455d5b14..0580f635eb8 100644 --- a/src/renderer/src/store/slices/diff-comments/worktree-diff-comments-selector.ts +++ b/src/renderer/src/store/slices/diff-comments/worktree-diff-comments-selector.ts @@ -2,8 +2,11 @@ import type { DiffComment } from '../../../../../shared/diff-comment-types' import { authorityKey, type HostAuthority } from '../../../../../shared/host-authority' import type { Worktree } from '../../../../../shared/worktree/types' import type { AppState } from '../../types' -import { findFolderWorkspaceOwner } from '@/lib/folder-workspace-runtime-owner' -import { resolveRecordOwner, resolveSourceCopy } from '@/lib/workspace-copy-owner' +import { findFolderWorkspaceOwner } from '@/lib/workspace/ownership/folder-workspace-runtime-owner' +import { + resolveRecordOwner, + resolveSourceCopy +} from '@/lib/workspace/ownership/workspace-copy-owner' import { findIndexedWorktreeRows } from '@/lib/workspace/ownership/worktree-runtime-owner-index' import { getRepoIdFromWorktreeId } from '../../../../../shared/worktree/id' import { parseWorkspaceKey } from '../../../../../shared/workspace-scope' diff --git a/src/renderer/src/store/slices/editor/buffers/editor-buffer-identity-cache.ts b/src/renderer/src/store/slices/editor/buffers/editor-buffer-identity-cache.ts index ff8b616a99a..480e1465746 100644 --- a/src/renderer/src/store/slices/editor/buffers/editor-buffer-identity-cache.ts +++ b/src/renderer/src/store/slices/editor/buffers/editor-buffer-identity-cache.ts @@ -1,6 +1,6 @@ import type { OpenFile } from '../types/open-file' -import type { WorktreeOperationRouteState } from '@/lib/worktree-operation-route' -import { worktreeOwnerRowsTokenOf } from '@/lib/worktree-owner-rows-token' +import type { WorktreeOperationRouteState } from '@/lib/workspace/ownership/worktree-operation-route' +import { worktreeOwnerRowsTokenOf } from '@/lib/workspace/ownership/worktree-owner-rows-token' import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields' import { editorBufferIdentityOf } from './editor-buffer-identity' diff --git a/src/renderer/src/store/slices/editor/buffers/editor-buffer-identity.ts b/src/renderer/src/store/slices/editor/buffers/editor-buffer-identity.ts index 0f0815edf37..5af0a35c66c 100644 --- a/src/renderer/src/store/slices/editor/buffers/editor-buffer-identity.ts +++ b/src/renderer/src/store/slices/editor/buffers/editor-buffer-identity.ts @@ -1,5 +1,5 @@ import type { OpenFile } from '../types/open-file' -import type { WorktreeOperationRouteState } from '@/lib/worktree-operation-route' +import type { WorktreeOperationRouteState } from '@/lib/workspace/ownership/worktree-operation-route' import { resolveEditorModelOwner } from '@/components/editor/model-lifetime/identity/editor-model-owner' import { isLocalWindowsDesktopClient } from '@/lib/desktop-window-chrome' import { resolveContinuedRuntimeEnvironmentRevision } from '@/runtime/rpc/environment-revisions/runtime-environment-revision' diff --git a/src/renderer/src/store/slices/editor/checks/check-run-details-owner.ts b/src/renderer/src/store/slices/editor/checks/check-run-details-owner.ts index 8aa0c3ad50c..d891edf66fe 100644 --- a/src/renderer/src/store/slices/editor/checks/check-run-details-owner.ts +++ b/src/renderer/src/store/slices/editor/checks/check-run-details-owner.ts @@ -13,8 +13,8 @@ import { checkRunDetailsOwnerScope } from '../../../../../../shared/source-contr import { getOpenFileExecutionHostId, hasOpenFileExecutionHostEvidence -} from '@/lib/unified-tab-host-ownership' -import { findIndexedReviewRepository } from '@/lib/repository-owner-index' +} from '@/lib/workspace/ownership/unified-tab-host-ownership' +import { findIndexedReviewRepository } from '@/lib/workspace/ownership/repository-owner-index' import { findIndexedDetectedWorktrees, findIndexedWorktrees as findIndexedWorktreeOwners @@ -25,10 +25,10 @@ import { resolveWorktreeOperationRouteForHost, type WorktreeOperationOwnerRecord, type WorktreeOperationRoute -} from '@/lib/worktree-operation-route' -import { resolveExactWorktreeRoute } from '@/lib/worktree-owner-route' +} from '@/lib/workspace/ownership/worktree-operation-route' +import { resolveExactWorktreeRoute } from '@/lib/workspace/ownership/worktree-owner-route' import { onPairedWebClientHost } from '@/lib/paired-web-client-host' -import { captureWorktreeOperationGenerationSnapshot } from '@/lib/worktree-operation-generation' +import { captureWorktreeOperationGenerationSnapshot } from '@/lib/workspace/ownership/worktree-operation-generation' import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch' import { selectDetectedWorktreesByRepo, diff --git a/src/renderer/src/store/slices/editor/file-ids/editor-file-ids.ts b/src/renderer/src/store/slices/editor/file-ids/editor-file-ids.ts index 3bcaaf0bd27..f9a8d3b0e20 100644 --- a/src/renderer/src/store/slices/editor/file-ids/editor-file-ids.ts +++ b/src/renderer/src/store/slices/editor/file-ids/editor-file-ids.ts @@ -4,7 +4,7 @@ import type { EditorOpenTargetOptions, OpenFile } from '../types/open-file' import type { DiffSource } from '../../../../../../shared/editor-tab-view-types' import { toSshExecutionHostId } from '../../../../../../shared/execution-host' import { areLocalWindowsWslPathAliases } from '../../../../../../shared/cross-platform-path' -import { getConnectionIdForFileFromState } from '@/lib/connection-owner-resolution' +import { getConnectionIdForFileFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { isLocalWindowsDesktopClient } from '@/lib/desktop-window-chrome' import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../../shared/constants' import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch' diff --git a/src/renderer/src/store/slices/editor/file-ids/editor-file-rename-twin-layout-owner.test.ts b/src/renderer/src/store/slices/editor/file-ids/editor-file-rename-twin-layout-owner.test.ts index b9b3ae225cc..199945be4cb 100644 --- a/src/renderer/src/store/slices/editor/file-ids/editor-file-rename-twin-layout-owner.test.ts +++ b/src/renderer/src/store/slices/editor/file-ids/editor-file-rename-twin-layout-owner.test.ts @@ -3,7 +3,7 @@ // Local-main rename and paired twin host_not_owned refusal must isolate each workspace regardless of listing order. import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { useAppStore } from '@/store/index' -import { isTwinWorkspace } from '@/lib/resolve-owner' +import { isTwinWorkspace } from '@/lib/workspace/ownership/resolve-owner' import { buildOwnedEditorFileId } from './editor-file-ids' import type { AppState } from '@/store/types' import type { LayoutCommand } from '../../../../../../shared/workspace-layout/workspace-layout-command-types' diff --git a/src/renderer/src/store/slices/editor/git/diff-runtime-owner.ts b/src/renderer/src/store/slices/editor/git/diff-runtime-owner.ts index a864fa16575..5a9736edfd6 100644 --- a/src/renderer/src/store/slices/editor/git/diff-runtime-owner.ts +++ b/src/renderer/src/store/slices/editor/git/diff-runtime-owner.ts @@ -1,5 +1,5 @@ import type { AppState } from '../../../types' -import { runtimeEnvironmentIdUnlessTwin } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' export function resolveDiffRuntimeEnvironmentId( state: AppState, diff --git a/src/renderer/src/store/slices/editor/git/git-operation-target.ts b/src/renderer/src/store/slices/editor/git/git-operation-target.ts index 6006bc13b7b..bd1ecfc6616 100644 --- a/src/renderer/src/store/slices/editor/git/git-operation-target.ts +++ b/src/renderer/src/store/slices/editor/git/git-operation-target.ts @@ -2,7 +2,7 @@ import { toast } from 'sonner' import { getConnectionExecutionHostId } from '../../../../../../shared/execution-host' import { getRuntimeTargetHostId } from '@/runtime/rpc/targets/runtime-client-target' import type { AppState } from '../../../types' -import { runtimeTargetForWorkspaceOwner } from '@/lib/resolve-owner' +import { runtimeTargetForWorkspaceOwner } from '@/lib/workspace/ownership/resolve-owner' import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target' import type { GitRuntimeOperationOptions } from '../types/git-runtime-operation' diff --git a/src/renderer/src/store/slices/editor/markdown/markdown-link-action.ts b/src/renderer/src/store/slices/editor/markdown/markdown-link-action.ts index 3dcc4e1024f..06430c9e8b1 100644 --- a/src/renderer/src/store/slices/editor/markdown/markdown-link-action.ts +++ b/src/renderer/src/store/slices/editor/markdown/markdown-link-action.ts @@ -4,7 +4,7 @@ import { toast } from 'sonner' import { translate } from '@/i18n/i18n' import { detectLanguage } from '../../../../../../shared/editor-language/editor-language-detect' import { openHttpLink, type HttpLinkSourceOwner } from '@/lib/browser/navigation/http-link-routing' -import { getConnectionIdForFileFromState } from '@/lib/connection-owner-resolution' +import { getConnectionIdForFileFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { isLocalPathOpenBlocked, showLocalPathOpenBlockedToast } from '@/lib/local-path-open-guard' import { getLinkSourceLocalOpenOwner } from '@/lib/link-source-local-open-owner' import { resolveMarkdownLinkTarget } from '@/components/editor/markdown/link-routing/markdown-internal-links' diff --git a/src/renderer/src/store/slices/editor/tabs/editor-file-rename-through-layout-owner.ts b/src/renderer/src/store/slices/editor/tabs/editor-file-rename-through-layout-owner.ts index 9a5eea7f6bc..014c0dc8d00 100644 --- a/src/renderer/src/store/slices/editor/tabs/editor-file-rename-through-layout-owner.ts +++ b/src/renderer/src/store/slices/editor/tabs/editor-file-rename-through-layout-owner.ts @@ -1,6 +1,9 @@ // In layout-owner builds propose per-workspace rename IDs to main; its frame atomically rekeys drafts/buffers/autosave gate. Refusal changes nothing. -import { isTwinWorkspace, runtimeEnvironmentIdUnlessTwin } from '@/lib/resolve-owner' +import { + isTwinWorkspace, + runtimeEnvironmentIdUnlessTwin +} from '@/lib/workspace/ownership/resolve-owner' import { sendLayoutApply } from '@/runtime/workspace-layout/commands/layout-apply-send' import { expectContentRekey, diff --git a/src/renderer/src/store/slices/editor/tabs/editor-view-placement.ts b/src/renderer/src/store/slices/editor/tabs/editor-view-placement.ts index fda6d57854d..3b6765fa5b6 100644 --- a/src/renderer/src/store/slices/editor/tabs/editor-view-placement.ts +++ b/src/renderer/src/store/slices/editor/tabs/editor-view-placement.ts @@ -1,7 +1,7 @@ import { getOpenFileExecutionHostId, hasOpenFileExecutionHostEvidence -} from '@/lib/unified-tab-host-ownership' +} from '@/lib/workspace/ownership/unified-tab-host-ownership' import type { AppState } from '../../../types' import type { OpenFile } from '../types/open-file' import type { Tab } from '../../../../../../shared/tab-types' diff --git a/src/renderer/src/store/slices/editor/tabs/restored-editor-move-through-layout-owner.ts b/src/renderer/src/store/slices/editor/tabs/restored-editor-move-through-layout-owner.ts index 51ac6e35813..37a76349c58 100644 --- a/src/renderer/src/store/slices/editor/tabs/restored-editor-move-through-layout-owner.ts +++ b/src/renderer/src/store/slices/editor/tabs/restored-editor-move-through-layout-owner.ts @@ -1,7 +1,7 @@ // Restore reownership proposes IDs to main (same-workspace reownership is rename); move frames atomically rekey content (F42). import type { Tab } from '../../../../../../shared/tab-types' -import { runtimeEnvironmentIdUnlessTwin } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' import { sendLayoutApply, type WindowLayoutCommand diff --git a/src/renderer/src/store/slices/editor/tabs/workspace-editor-item.ts b/src/renderer/src/store/slices/editor/tabs/workspace-editor-item.ts index 91d52ef7d90..530d16dab4c 100644 --- a/src/renderer/src/store/slices/editor/tabs/workspace-editor-item.ts +++ b/src/renderer/src/store/slices/editor/tabs/workspace-editor-item.ts @@ -5,7 +5,7 @@ import type { EditorTabSelection, OpenFile } from '../types/open-file' import { resolveEditorOpenTargetGroupId } from './editor-open-target-group' import { areEditorPreviewTabsEnabled } from './editor-preview-tab-setting' import { isEditorTabContentType, type EditorTabContentType } from './editor-tab-content-type' -import { getOpenFileExecutionHostId } from '@/lib/unified-tab-host-ownership' +import { getOpenFileExecutionHostId } from '@/lib/workspace/ownership/unified-tab-host-ownership' import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch' import type { Tab } from '../../../../../../shared/tab-types' import { diff --git a/src/renderer/src/store/slices/jira/jira-collection-read-actions.ts b/src/renderer/src/store/slices/jira/jira-collection-read-actions.ts index fb525a48bf7..a2f0f01fe54 100644 --- a/src/renderer/src/store/slices/jira/jira-collection-read-actions.ts +++ b/src/renderer/src/store/slices/jira/jira-collection-read-actions.ts @@ -1,6 +1,6 @@ import { normalizeJiraStatusSelection } from '../../../../../shared/jira/jira-quick-filters' import { jiraListIssuesForTarget, jiraSearchIssues } from '@/runtime/jira/runtime-jira-client' -import { rowLessSourceTarget } from '@/lib/default-creation-host' +import { rowLessSourceTarget } from '@/runtime/hosts/selection/default-creation-host' import { isIntegrationCredentialDecryptionError } from '../../../../../shared/integration-credential-errors' import type { JiraIssue, JiraSiteSelection } from '../../../../../shared/jira/jira-types' import type { JiraSlice, JiraSliceGet, JiraSliceSet } from './jira-slice-contract' diff --git a/src/renderer/src/store/slices/jira/jira-connection-actions.ts b/src/renderer/src/store/slices/jira/jira-connection-actions.ts index 9510c9c2b1b..05440e3c48e 100644 --- a/src/renderer/src/store/slices/jira/jira-connection-actions.ts +++ b/src/renderer/src/store/slices/jira/jira-connection-actions.ts @@ -22,7 +22,7 @@ import { jiraStatusUpdate, nextJiraStatusReadGeneration } from './jira-read-coordination' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' type JiraConnectionActions = Pick< JiraSlice, diff --git a/src/renderer/src/store/slices/jira/jira-read-coordination.ts b/src/renderer/src/store/slices/jira/jira-read-coordination.ts index 13934c02dbd..8531302ce1d 100644 --- a/src/renderer/src/store/slices/jira/jira-read-coordination.ts +++ b/src/renderer/src/store/slices/jira/jira-read-coordination.ts @@ -14,8 +14,8 @@ import { } from '../../../../../shared/work-items/task-source-context' import { getProviderRuntimeContextKey } from '@/runtime/hosts/observations/provider-runtime-context' import { parseJiraStatusError } from '../../../../../shared/jira/jira-status-error' -import { defaultScopeSource } from '@/lib/default-creation-host' -import type { RowLessSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' +import type { RowLessSource } from '@/runtime/hosts/selection/default-creation-host' const CACHE_TTL = 60_000 const MAX_CACHE_ENTRIES = 500 diff --git a/src/renderer/src/store/slices/linear/linear-cache.ts b/src/renderer/src/store/slices/linear/linear-cache.ts index 5d2eb96f31c..6c80354d385 100644 --- a/src/renderer/src/store/slices/linear/linear-cache.ts +++ b/src/renderer/src/store/slices/linear/linear-cache.ts @@ -1,7 +1,10 @@ import type { LinearIssueData } from './linear-issue-read' import { isIntegrationCredentialDecryptionError } from '../../../../../shared/integration-credential-errors' import { RuntimeRpcCallError } from '@/runtime/rpc/calls/runtime-rpc-result' -import { rowLessSourceTarget, type RowLessSource } from '@/lib/default-creation-host' +import { + rowLessSourceTarget, + type RowLessSource +} from '@/runtime/hosts/selection/default-creation-host' import type { CacheEntry } from '../../github/cache/cache-model' import type { LinearIssue } from '../../../../../shared/linear/issue-types' import type { diff --git a/src/renderer/src/store/slices/linear/linear-slice-request-state.ts b/src/renderer/src/store/slices/linear/linear-slice-request-state.ts index 962275e689a..7db1c211c9f 100644 --- a/src/renderer/src/store/slices/linear/linear-slice-request-state.ts +++ b/src/renderer/src/store/slices/linear/linear-slice-request-state.ts @@ -3,7 +3,7 @@ import { invalidateLinearIssueReads, type LinearIssueRequest } from './linear-issue-publication' -import { rowLessSourceTarget } from '@/lib/default-creation-host' +import { rowLessSourceTarget } from '@/runtime/hosts/selection/default-creation-host' import { taskSourceCacheScopeHostId } from '../../../../../shared/work-items/task-source-context' import type { LinearSlice } from './linear-slice-contract' import type { LinearReadScope } from './linear-slice-scope' diff --git a/src/renderer/src/store/slices/linear/linear-slice-scope.ts b/src/renderer/src/store/slices/linear/linear-slice-scope.ts index 8113daf7250..a5826efd20b 100644 --- a/src/renderer/src/store/slices/linear/linear-slice-scope.ts +++ b/src/renderer/src/store/slices/linear/linear-slice-scope.ts @@ -11,8 +11,11 @@ import { getEnvironmentRuntimeContextKey } from '@/runtime/hosts/observations/provider-runtime-context' import { getLinearCacheGeneration, getLinearMutationGeneration } from './linear-slice-request-state' -import { defaultScopeSource, rowLessSourceTarget } from '@/lib/default-creation-host' -import type { RowLessSource } from '@/lib/default-creation-host' +import { + defaultScopeSource, + rowLessSourceTarget +} from '@/runtime/hosts/selection/default-creation-host' +import type { RowLessSource } from '@/runtime/hosts/selection/default-creation-host' export function normalizeListAttributeFilter( attributeFilter?: LinearIssueAttributeFilter | null diff --git a/src/renderer/src/store/slices/preflight/preflight.ts b/src/renderer/src/store/slices/preflight/preflight.ts index d19bc519d47..b3583c9c03a 100644 --- a/src/renderer/src/store/slices/preflight/preflight.ts +++ b/src/renderer/src/store/slices/preflight/preflight.ts @@ -5,7 +5,7 @@ import type { } from '../../../../../preload/api/preflight-api' import type { AppState } from '../../types' import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' -import { defaultScopeHost } from '@/lib/default-creation-host' +import { defaultScopeHost } from '@/runtime/hosts/selection/default-creation-host' import { getActiveWorkspaceOwnerTarget } from '@/lib/resolved-worktree-execution-host' import { getLocalPreflightContext } from '@/lib/local-preflight-context' import { localPreflightContextKey } from '@/lib/local-preflight-context-key' diff --git a/src/renderer/src/store/slices/settings/worktree-visibility-owner-settings.ts b/src/renderer/src/store/slices/settings/worktree-visibility-owner-settings.ts index be4a05ef6a0..d93d6931ed8 100644 --- a/src/renderer/src/store/slices/settings/worktree-visibility-owner-settings.ts +++ b/src/renderer/src/store/slices/settings/worktree-visibility-owner-settings.ts @@ -1,6 +1,6 @@ import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' import { runtimeEnvironmentSupportsCapability } from '@/runtime/rpc/compatibility/runtime-capability-proof' -import { defaultScopeHost } from '@/lib/default-creation-host' +import { defaultScopeHost } from '@/runtime/hosts/selection/default-creation-host' import { LOCAL_EXECUTION_HOST_ID, toRuntimeExecutionHostId, diff --git a/src/renderer/src/store/slices/settings/worktree-visibility-settings-write.ts b/src/renderer/src/store/slices/settings/worktree-visibility-settings-write.ts index 13c31539fb6..09e0e46beab 100644 --- a/src/renderer/src/store/slices/settings/worktree-visibility-settings-write.ts +++ b/src/renderer/src/store/slices/settings/worktree-visibility-settings-write.ts @@ -1,5 +1,5 @@ import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' -import { defaultScopeHost } from '@/lib/default-creation-host' +import { defaultScopeHost } from '@/runtime/hosts/selection/default-creation-host' import { LOCAL_EXECUTION_HOST_ID, toRuntimeExecutionHostId diff --git a/src/renderer/src/store/slices/ssh/ssh-target-cleanup.ts b/src/renderer/src/store/slices/ssh/ssh-target-cleanup.ts index 0b8bd870b94..49a787cb246 100644 --- a/src/renderer/src/store/slices/ssh/ssh-target-cleanup.ts +++ b/src/renderer/src/store/slices/ssh/ssh-target-cleanup.ts @@ -1,6 +1,6 @@ import type { AppState } from '../../types' import { parseAppSshPtyId } from '../../../../../shared/ssh-pty-id' -import { resolveDirectSshTargetWorktreeIds } from '../../../lib/direct-ssh-target-scope' +import { resolveDirectSshTargetWorktreeIds } from '../../../lib/workspace/ownership/direct-ssh-target-scope' import { unbindTerminalTabPtys } from '../tabs/worktree-layout-lifecycle' import { selectDetectedWorktreesByRepo, diff --git a/src/renderer/src/store/slices/tabs/preview-tab-promotion.ts b/src/renderer/src/store/slices/tabs/preview-tab-promotion.ts index ea444382b05..d7ffbdd70ec 100644 --- a/src/renderer/src/store/slices/tabs/preview-tab-promotion.ts +++ b/src/renderer/src/store/slices/tabs/preview-tab-promotion.ts @@ -2,7 +2,7 @@ import type { Tab } from '../../../../../shared/tab-types' import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch' -import { runtimeEnvironmentIdUnlessTwin } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' import { sendLayoutApply } from '@/runtime/workspace-layout/commands/layout-apply-send' import type { AppState } from '../../types' import { patchTab } from './tab-group-state' diff --git a/src/renderer/src/store/slices/tabs/tabs-create-actions.ts b/src/renderer/src/store/slices/tabs/tabs-create-actions.ts index c3c453f1270..dd34a7a72c6 100644 --- a/src/renderer/src/store/slices/tabs/tabs-create-actions.ts +++ b/src/renderer/src/store/slices/tabs/tabs-create-actions.ts @@ -2,7 +2,7 @@ import { releaseUnreferencedEditorContent } from '../editor/tabs/editor-tab-reti import { isEditorTabContentType } from '../editor/tabs/editor-tab-content-type' import { structuredLaunchSlotIds } from '@/lib/agent-session/launch/structured-agent-session-launch-persistence' import { createNonSecureContextUuid as createBrowserUuid } from '../../../../../shared/non-secure-context-uuid' -import { getActiveExecutionHostIdForWorktree } from '@/lib/unified-tab-host-ownership' +import { getActiveExecutionHostIdForWorktree } from '@/lib/workspace/ownership/unified-tab-host-ownership' import type { Tab, TabGroup } from '../../../../../shared/tab-types' import type { TabsSlice, TabsSliceGet, TabsSliceSet } from './tabs-slice-contract' import { buildActiveSurfacePatch } from './tabs-surface' diff --git a/src/renderer/src/store/slices/tabs/tabs-create-placement.ts b/src/renderer/src/store/slices/tabs/tabs-create-placement.ts index f354b30e802..c4b81849bbd 100644 --- a/src/renderer/src/store/slices/tabs/tabs-create-placement.ts +++ b/src/renderer/src/store/slices/tabs/tabs-create-placement.ts @@ -1,7 +1,7 @@ import type { Tab, TabGroup } from '../../../../../shared/tab-types' import type { ExecutionHostId } from '../../../../../shared/execution-host' import type { Worktree } from '../../../../../shared/worktree/types' -import { isExecutionHostAliasForWorktree } from '@/lib/worktree-execution-host-alias' +import { isExecutionHostAliasForWorktree } from '@/lib/workspace/ownership/worktree-execution-host-alias' type WorktreeHostAliases = Pick diff --git a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-agent-evidence.ts b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-agent-evidence.ts index bc4525ba674..0783b2e2baf 100644 --- a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-agent-evidence.ts +++ b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-agent-evidence.ts @@ -15,7 +15,7 @@ import { selectLiveAgentStatusEntriesForWorktree, selectRetainedAgentEntriesForWorktree } from '@/components/sidebar/workspace-card/activity/worktree-agent-row-selectors' -import { isExecutionHostAliasForWorktree } from '@/lib/worktree-execution-host-alias' +import { isExecutionHostAliasForWorktree } from '@/lib/workspace/ownership/worktree-execution-host-alias' import { findIndexedDetectedWorktrees, findIndexedWorktreeOwnerForHost diff --git a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-candidate-enrichment.ts b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-candidate-enrichment.ts index 157cc1cd91f..fe12f82767b 100644 --- a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-candidate-enrichment.ts +++ b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-candidate-enrichment.ts @@ -11,7 +11,7 @@ import { getWorkspaceCleanupCandidateIdentity } from '../../../../../shared/workspace-cleanup/workspace-cleanup-host-identity' import { mapWithConcurrency } from '../../../../../shared/map-with-concurrency' -import { getWorktreeVisitTimestamp } from '@/lib/worktree-visit-recency' +import { getWorktreeVisitTimestamp } from '@/lib/workspace/activation/worktree-visit-recency' import { withCleanupVisitEvidence } from '../../../../../shared/workspace-last-active' import { probeTerminalLiveness, diff --git a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-local-evidence.ts b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-local-evidence.ts index 281dfecc0bc..946ae7a43c6 100644 --- a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-local-evidence.ts +++ b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-local-evidence.ts @@ -2,7 +2,7 @@ import type { AppState } from '../../types' import { classifyTitleActivity } from '@/lib/pane-agent-evidence' import { getWorktreeIdsWithLiveAgent } from '@/lib/worktree-activity-state' import type { WorkspaceCleanupCandidate } from '../../../../../shared/workspace-cleanup/workspace-cleanup' -import { getWorktreeVisitTimestamp } from '@/lib/worktree-visit-recency' +import { getWorktreeVisitTimestamp } from '@/lib/workspace/activation/worktree-visit-recency' const RECENT_VISIBLE_CONTEXT_MS = 24 * 60 * 60 * 1000 const VIEWED_FROM_CLEANUP_MS = 2 * 60 * 60 * 1000 diff --git a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-removal-targets.ts b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-removal-targets.ts index 9e6a0d4f9e0..75aad03bbb6 100644 --- a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-removal-targets.ts +++ b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-removal-targets.ts @@ -14,7 +14,7 @@ import { getWorkspaceCleanupHostIdentity, resolveWorkspaceCleanupRemovalHostId } from '../../../../../shared/workspace-cleanup/workspace-cleanup-host-identity' -import { getWorktreeOperationOwnerHostIds } from '@/lib/worktree-operation-route' +import { getWorktreeOperationOwnerHostIds } from '@/lib/workspace/ownership/worktree-operation-route' import { translate } from '@/i18n/i18n' import type { WorkspaceCleanupFailure } from './workspace-cleanup-removal' import { diff --git a/src/renderer/src/store/slices/worktrees/create/create-worktree.ts b/src/renderer/src/store/slices/worktrees/create/create-worktree.ts index a4172d4cf71..98b3e710451 100644 --- a/src/renderer/src/store/slices/worktrees/create/create-worktree.ts +++ b/src/renderer/src/store/slices/worktrees/create/create-worktree.ts @@ -23,7 +23,7 @@ import { import { assertRuntimeEnvironmentCapability } from '../../../../runtime/rpc/compatibility/runtime-capability-proof' import { runtimeTargetSupportsCapability } from '../../../../runtime/rpc/compatibility/runtime-target-capability' import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target' -import { runtimeTargetForRepoOwner } from '@/lib/repo-runtime-owner' +import { runtimeTargetForRepoOwner } from '@/lib/workspace/ownership/repo-runtime-owner' import { WORKTREE_LINKED_WORK_ITEM_CONTEXT_RUNTIME_CAPABILITY } from '../../../../../../shared/protocol-version' import { WORKTREE_OPEN_EXISTING_BRANCH_RUNTIME_CAPABILITY, diff --git a/src/renderer/src/store/slices/worktrees/create/prefetch-worktree-create-base.ts b/src/renderer/src/store/slices/worktrees/create/prefetch-worktree-create-base.ts index 0c9a8b274f2..4a9e21b957d 100644 --- a/src/renderer/src/store/slices/worktrees/create/prefetch-worktree-create-base.ts +++ b/src/renderer/src/store/slices/worktrees/create/prefetch-worktree-create-base.ts @@ -1,7 +1,7 @@ import type { WorktreeSlice } from '../worktree-slice-contract' import type { WorktreeSliceGet, WorktreeSliceSet } from '../listing/worktree-slice-types' import { callRuntimeRpc } from '../../../../runtime/rpc/calls/runtime-rpc-call' -import { runtimeTargetForRepoOwner } from '@/lib/repo-runtime-owner' +import { runtimeTargetForRepoOwner } from '@/lib/workspace/ownership/repo-runtime-owner' export function createPrefetchWorktreeCreateBase( _set: WorktreeSliceSet, diff --git a/src/renderer/src/store/slices/worktrees/create/worktree-create-warning-toast.ts b/src/renderer/src/store/slices/worktrees/create/worktree-create-warning-toast.ts index 9428613d232..55c6bfa1584 100644 --- a/src/renderer/src/store/slices/worktrees/create/worktree-create-warning-toast.ts +++ b/src/renderer/src/store/slices/worktrees/create/worktree-create-warning-toast.ts @@ -1,5 +1,5 @@ import { toast } from 'sonner' -import { localizeWslDistroHoldText } from '@/lib/wsl-distro-hold-copy' +import { localizeWslDistroHoldText } from '@/runtime/hosts/wsl/wsl-distro-hold-copy' /** The host's create warning; a held terminal reads in the user's language, naming its distro. */ export function showWorktreeCreateWarningToast(warning: string | undefined): void { diff --git a/src/renderer/src/store/slices/worktrees/listing/detected-worktree-meta.test.ts b/src/renderer/src/store/slices/worktrees/listing/detected-worktree-meta.test.ts index 11c838b5c69..2b913095344 100644 --- a/src/renderer/src/store/slices/worktrees/listing/detected-worktree-meta.test.ts +++ b/src/renderer/src/store/slices/worktrees/listing/detected-worktree-meta.test.ts @@ -6,7 +6,7 @@ import { makeFolderWorkspace, makeProjectGroup } from '../../../../components/sidebar/workspace-creation/folder/folder-workspace-composer-submit-fixtures' -import { findFolderWorkspaceOwner } from '@/lib/folder-workspace-runtime-owner' +import { findFolderWorkspaceOwner } from '@/lib/workspace/ownership/folder-workspace-runtime-owner' import { selectWorkspaceByHostTarget } from '../../../workspaces/selection/workspace-host-target' import { resolveWorkspaceDirectory } from '@/lib/workspace-directory' import { resolveQualifiedFolderWorkspaceResult } from '../../../../../../shared/folder-workspaces/folder-workspace-execution-host' diff --git a/src/renderer/src/store/slices/worktrees/listing/worktree-owner-target.ts b/src/renderer/src/store/slices/worktrees/listing/worktree-owner-target.ts index 90ac8f807a5..70cc722ecac 100644 --- a/src/renderer/src/store/slices/worktrees/listing/worktree-owner-target.ts +++ b/src/renderer/src/store/slices/worktrees/listing/worktree-owner-target.ts @@ -1,5 +1,8 @@ import type { ExecutionHostId } from '../../../../../../shared/execution-host' -import { resolveOwner, runtimeTargetForWorkspaceOwner } from '@/lib/resolve-owner' +import { + resolveOwner, + runtimeTargetForWorkspaceOwner +} from '@/lib/workspace/ownership/resolve-owner' import { hostRouteForAuthority, type HostRoute } from '@/runtime/rpc/targets/runtime-client-target' import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target' import type { AppState } from '../../../types' diff --git a/src/renderer/src/store/slices/worktrees/metadata/hosted-review-push-target-ensure.ts b/src/renderer/src/store/slices/worktrees/metadata/hosted-review-push-target-ensure.ts index ed0bbaabb02..b699c77d9c4 100644 --- a/src/renderer/src/store/slices/worktrees/metadata/hosted-review-push-target-ensure.ts +++ b/src/renderer/src/store/slices/worktrees/metadata/hosted-review-push-target-ensure.ts @@ -4,7 +4,7 @@ import { getHostedReviewPushTargetLookup, hostedReviewPushTargetLookupsInFlight } from './hosted-review-push-target' -import { runtimeTargetForWorkspaceOwner } from '@/lib/resolve-owner' +import { runtimeTargetForWorkspaceOwner } from '@/lib/workspace/ownership/resolve-owner' export function createEnsureHostedReviewPushTarget( _set: WorktreeSliceSet, diff --git a/src/renderer/src/store/slices/worktrees/metadata/update-worktree-meta.ts b/src/renderer/src/store/slices/worktrees/metadata/update-worktree-meta.ts index 195cb291cc6..71fcdf6b8d1 100644 --- a/src/renderer/src/store/slices/worktrees/metadata/update-worktree-meta.ts +++ b/src/renderer/src/store/slices/worktrees/metadata/update-worktree-meta.ts @@ -35,9 +35,9 @@ import { buildWorktreeMetaStateUpdate } from './worktree-meta-state-update' import { withPendingSidebarRowWrites } from '@/lib/sidebar-pending-layer' import { isRuntimeSelectorNotFoundError } from '../listing/runtime-worktree-rpc-errors' import { runtimeTargetForWorktreeOwner } from '../listing/worktree-owner-target' -import { runtimeTargetForWorkspaceOwner } from '@/lib/resolve-owner' +import { runtimeTargetForWorkspaceOwner } from '@/lib/workspace/ownership/resolve-owner' -import { hasUniqueIndexedRepositoryHost } from '@/lib/repository-owner-index' +import { hasUniqueIndexedRepositoryHost } from '@/lib/workspace/ownership/repository-owner-index' import { resolveReviewRepository } from '@/lib/review-owner' import { getRepoExecutionHostId } from '../../../../../../shared/execution-host' export function createUpdateWorktreeMeta( diff --git a/src/renderer/src/store/slices/worktrees/session/worktree-identity-rename-state.ts b/src/renderer/src/store/slices/worktrees/session/worktree-identity-rename-state.ts index 27679a9aa29..18acab2fad9 100644 --- a/src/renderer/src/store/slices/worktrees/session/worktree-identity-rename-state.ts +++ b/src/renderer/src/store/slices/worktrees/session/worktree-identity-rename-state.ts @@ -6,7 +6,7 @@ import type { import { remapBrowserPageDocLocation } from '../../../../../../shared/browser-page-doc-location' import { splitWorktreeIdForFilesystem } from '../../../../../../shared/worktree/id' import { worktreeWorkspaceKey } from '../../../../../../shared/workspace-scope' -import { getWorktreeIdFromVisitKey } from '@/lib/worktree-visit-recency' +import { getWorktreeIdFromVisitKey } from '@/lib/workspace/activation/worktree-visit-recency' import { remapClosedTerminalTabSnapshotCwds, type ClosedTerminalTabSnapshot diff --git a/src/renderer/src/store/slices/worktrees/session/worktree-terminal-reference.ts b/src/renderer/src/store/slices/worktrees/session/worktree-terminal-reference.ts index 9aa99311aa8..1a3c95d8b9d 100644 --- a/src/renderer/src/store/slices/worktrees/session/worktree-terminal-reference.ts +++ b/src/renderer/src/store/slices/worktrees/session/worktree-terminal-reference.ts @@ -11,7 +11,7 @@ import { branchName } from '@/lib/git-utils' import { getWorkspaceAttachmentObservedOrigin, resolveWorkspaceReferenceObservationOwner -} from '@/lib/workspace-attachment-observed-origin' +} from '@/lib/workspace/attachments/workspace-attachment-observed-origin' import { getWorkspaceAttachments } from '../../../../../../shared/workspace-attachments/workspace-attachments' import { getWorkspaceAttachmentKey } from '../../../../../../shared/workspace-attachments/workspace-attachment-normalization' import { diff --git a/src/renderer/src/store/slices/worktrees/session/worktree-visit-recency.ts b/src/renderer/src/store/slices/worktrees/session/worktree-visit-recency.ts index 19a64829338..b92c0f20f1a 100644 --- a/src/renderer/src/store/slices/worktrees/session/worktree-visit-recency.ts +++ b/src/renderer/src/store/slices/worktrees/session/worktree-visit-recency.ts @@ -9,7 +9,7 @@ import { getWorktreeIdFromVisitKey, getWorktreeVisitKey, getWorktreeVisitTimestamp -} from '@/lib/worktree-visit-recency' +} from '@/lib/workspace/activation/worktree-visit-recency' import { selectDetectedWorktreesByRepo, selectWorktreesByRepo diff --git a/src/renderer/src/store/slices/worktrees/teardown/force-delete-preserved-branch.ts b/src/renderer/src/store/slices/worktrees/teardown/force-delete-preserved-branch.ts index 17e630a2ad8..800bed7b539 100644 --- a/src/renderer/src/store/slices/worktrees/teardown/force-delete-preserved-branch.ts +++ b/src/renderer/src/store/slices/worktrees/teardown/force-delete-preserved-branch.ts @@ -4,7 +4,7 @@ import type { WorktreeSliceGet, WorktreeSliceSet } from '../listing/worktree-sli import { toast } from 'sonner' import { translate } from '@/i18n/i18n' import { callRuntimeRpc } from '../../../../runtime/rpc/calls/runtime-rpc-call' -import { runtimeTargetForWorkspaceOwner } from '@/lib/resolve-owner' +import { runtimeTargetForWorkspaceOwner } from '@/lib/workspace/ownership/resolve-owner' import { toRuntimeWorktreeSelector } from '../../../../runtime/rpc/targets/runtime-worktree-selector' import { preservedBranchCleanupKey } from '../../../../../../shared/git/branches/preserved-branch-cleanup' import type { ForceDeleteWorktreeBranchResult } from '../../../../../../shared/worktree/create-types' diff --git a/src/renderer/src/store/slices/worktrees/teardown/host-qualified-worktree-removal.ts b/src/renderer/src/store/slices/worktrees/teardown/host-qualified-worktree-removal.ts index 448d69b3185..5e4aa16b121 100644 --- a/src/renderer/src/store/slices/worktrees/teardown/host-qualified-worktree-removal.ts +++ b/src/renderer/src/store/slices/worktrees/teardown/host-qualified-worktree-removal.ts @@ -10,8 +10,8 @@ import { resolveWorktreeOperationRoute, resolveWorktreeOperationRouteForHost, type WorktreeOperationRoute -} from '@/lib/worktree-operation-route' -import { captureWorktreeOperationGenerationGuard } from '@/lib/worktree-operation-generation' +} from '@/lib/workspace/ownership/worktree-operation-route' +import { captureWorktreeOperationGenerationGuard } from '@/lib/workspace/ownership/worktree-operation-generation' import { getRepoIdFromWorktreeId } from '../../../../../../shared/worktree/id' import { appliedWorktreeCatalogVersionPatch } from '../listing/worktree-catalog-version-state' import { WORKTREE_REMOVAL_HOST_CHANGED_ERROR } from '../listing/worktree-slice-constants' diff --git a/src/renderer/src/store/slices/worktrees/teardown/host-qualified-worktree-row-removal.ts b/src/renderer/src/store/slices/worktrees/teardown/host-qualified-worktree-row-removal.ts index c9167370ac9..78f87aefdb8 100644 --- a/src/renderer/src/store/slices/worktrees/teardown/host-qualified-worktree-row-removal.ts +++ b/src/renderer/src/store/slices/worktrees/teardown/host-qualified-worktree-row-removal.ts @@ -1,5 +1,5 @@ import { requestVirtualizedScrollAnchorRecord } from '@/hooks/requestVirtualizedScrollAnchorRecord' -import { getWorktreeOperationOwnerHostIds } from '@/lib/worktree-operation-route' +import { getWorktreeOperationOwnerHostIds } from '@/lib/workspace/ownership/worktree-operation-route' import { parseExecutionHostId, type ExecutionHostId } from '../../../../../../shared/execution-host' import { resolveWorkspaceCleanupRemovalHostId } from '../../../../../../shared/workspace-cleanup/workspace-cleanup-host-identity' import { rememberAuthoritativelyRemovedWorktrees } from '../listing/authoritative-worktree-removal-memory' diff --git a/src/renderer/src/store/slices/worktrees/teardown/preview-nested-worktree-removal.ts b/src/renderer/src/store/slices/worktrees/teardown/preview-nested-worktree-removal.ts index 982898bf1c5..e35f89ac983 100644 --- a/src/renderer/src/store/slices/worktrees/teardown/preview-nested-worktree-removal.ts +++ b/src/renderer/src/store/slices/worktrees/teardown/preview-nested-worktree-removal.ts @@ -2,7 +2,7 @@ import { useAppStore } from '@/store' import { resolveWorktreeOperationRoute, resolveWorktreeOperationRouteForHost -} from '@/lib/worktree-operation-route' +} from '@/lib/workspace/ownership/worktree-operation-route' import { callRuntimeRpc } from '../../../../runtime/rpc/calls/runtime-rpc-call' import { runtimeTargetForOwnerEnvironment } from '../../../../runtime/rpc/targets/runtime-client-target' import { toRuntimeWorktreeSelector } from '../../../../runtime/rpc/targets/runtime-worktree-selector' diff --git a/src/renderer/src/store/slices/worktrees/teardown/purge-stale-runtime-host-state.ts b/src/renderer/src/store/slices/worktrees/teardown/purge-stale-runtime-host-state.ts index 9695efc98e0..1588d6bc375 100644 --- a/src/renderer/src/store/slices/worktrees/teardown/purge-stale-runtime-host-state.ts +++ b/src/renderer/src/store/slices/worktrees/teardown/purge-stale-runtime-host-state.ts @@ -18,7 +18,7 @@ import { } from '../../../host-catalog/removed-runtime-host-rows' import { dropWorktreeRowsForRemovedRuntimeEnvironments } from './stale-runtime-worktree-rows' import { buildFullWorktreePurgeState } from './worktree-purge-state' -import { removeWorktreeVisitEntriesForTargets } from '@/lib/worktree-visit-recency' +import { removeWorktreeVisitEntriesForTargets } from '@/lib/workspace/activation/worktree-visit-recency' import { settleAttentionRemovedBy } from '../../workspace-attention/attention-removal-follow-up' import { flushRetiredHostEdits } from './removed-workspace-unsaved-files' diff --git a/src/renderer/src/store/slices/worktrees/teardown/remove-worktree-store-cleanup.ts b/src/renderer/src/store/slices/worktrees/teardown/remove-worktree-store-cleanup.ts index f6becfb0901..85eaa9c0301 100644 --- a/src/renderer/src/store/slices/worktrees/teardown/remove-worktree-store-cleanup.ts +++ b/src/renderer/src/store/slices/worktrees/teardown/remove-worktree-store-cleanup.ts @@ -3,7 +3,7 @@ import { forgetCombinedDiffViewsForWorktrees } from '@/components/editor/combine import type { ExecutionHostId } from '../../../../../../shared/execution-host' import type { WorktreeSliceSet } from '../listing/worktree-slice-types' import { removeDeleteStatesForWorktreeIds } from './worktree-delete-state' -import { removeWorktreeVisitEntries } from '@/lib/worktree-visit-recency' +import { removeWorktreeVisitEntries } from '@/lib/workspace/activation/worktree-visit-recency' import { forgetAmbiguousOwnerWarnings } from '@/lib/ambiguous-owner-warning' import { omitRecordKeys } from './record-key-omission' import { removeWorktreeLayout } from '../../tabs/worktree-layout-lifecycle' diff --git a/src/renderer/src/store/slices/worktrees/teardown/remove-worktree.ts b/src/renderer/src/store/slices/worktrees/teardown/remove-worktree.ts index 01ceda5523d..0daa81fc50d 100644 --- a/src/renderer/src/store/slices/worktrees/teardown/remove-worktree.ts +++ b/src/renderer/src/store/slices/worktrees/teardown/remove-worktree.ts @@ -12,7 +12,7 @@ import { isArchiveHookRemovalError } from '../../../../../../shared/worktree/arc import { resolveWorktreeOperationRouteResult, resolveWorktreeOperationRouteResultForHost -} from '@/lib/worktree-operation-route' +} from '@/lib/workspace/ownership/worktree-operation-route' import { beginHostQualifiedRemoval, completeSameIdHostScopedRemoval, diff --git a/src/renderer/src/store/slices/worktrees/teardown/worktree-purge-state.ts b/src/renderer/src/store/slices/worktrees/teardown/worktree-purge-state.ts index 7ef147899cf..54df66965b8 100644 --- a/src/renderer/src/store/slices/worktrees/teardown/worktree-purge-state.ts +++ b/src/renderer/src/store/slices/worktrees/teardown/worktree-purge-state.ts @@ -10,7 +10,7 @@ import { createWorktreePurgeOmitters } from './worktree-purge-omitters' import { omitSleepingAgentSessionsForWorktrees } from './sleeping-agent-session-omission' import { removeDeleteStatesForWorktreeIds } from './worktree-delete-state' import { omitRecordKeys } from './record-key-omission' -import { removeWorktreeVisitEntriesForTargets } from '@/lib/worktree-visit-recency' +import { removeWorktreeVisitEntriesForTargets } from '@/lib/workspace/activation/worktree-visit-recency' import { forgetAmbiguousOwnerWarnings } from '@/lib/ambiguous-owner-warning' import { forgetWorktreeSleepIntent } from '@/lib/worktree-sleep-intent' import { removeWorktreeLayout } from '../../tabs/worktree-layout-lifecycle' diff --git a/src/renderer/src/store/slices/worktrees/worktree-slice-contract.ts b/src/renderer/src/store/slices/worktrees/worktree-slice-contract.ts index 31d8364fa04..053f537afd0 100644 --- a/src/renderer/src/store/slices/worktrees/worktree-slice-contract.ts +++ b/src/renderer/src/store/slices/worktrees/worktree-slice-contract.ts @@ -12,7 +12,7 @@ import type { } from './session/worktree-selection-contract' import type { WorkspaceAttachmentMutation } from '../../../../../shared/workspace-attachments/workspace-attachment-mutation' -import type { WorkspaceReferenceObservationContext } from '@/lib/workspace-attachment-observed-origin' +import type { WorkspaceReferenceObservationContext } from '@/lib/workspace/attachments/workspace-attachment-observed-origin' import type { CreateWorktreeCallOptions, CreatedWorktreeResult diff --git a/src/renderer/src/store/terminals/recently-closed-terminal-tabs.ts b/src/renderer/src/store/terminals/recently-closed-terminal-tabs.ts index 6704b7099d4..c7f947cfceb 100644 --- a/src/renderer/src/store/terminals/recently-closed-terminal-tabs.ts +++ b/src/renderer/src/store/terminals/recently-closed-terminal-tabs.ts @@ -1,6 +1,6 @@ import type { StateCreator } from 'zustand' import type { AppState } from '../types' -import { runtimeEnvironmentIdForWorkspaceOwner } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdForWorkspaceOwner } from '@/lib/workspace/ownership/resolve-owner' import { isWindowsAbsolutePathLike, relativePathInsideRoot diff --git a/src/renderer/src/store/terminals/terminal-active-workspace-creation.test.ts b/src/renderer/src/store/terminals/terminal-active-workspace-creation.test.ts index 4b028e2b9d7..15a325634b0 100644 --- a/src/renderer/src/store/terminals/terminal-active-workspace-creation.test.ts +++ b/src/renderer/src/store/terminals/terminal-active-workspace-creation.test.ts @@ -8,7 +8,7 @@ import { MIXED_FOLDER, MIXED_GROUP } from '../../../../shared/folder-workspaces/folder-workspace-host-routing.test-fixture' -import { resolveWorktreeOperationRouteForHost } from '@/lib/worktree-operation-route' +import { resolveWorktreeOperationRouteForHost } from '@/lib/workspace/ownership/worktree-operation-route' import { resolveTerminalPaneOwnerContext } from '@/components/terminal-pane/host-state/terminal-pane-owner-context' const mockUnregisterPtyDataHandlers = vi.hoisted(() => vi.fn<() => unknown[]>(() => [])) diff --git a/src/renderer/src/store/terminals/terminal-active-workspace-creation.ts b/src/renderer/src/store/terminals/terminal-active-workspace-creation.ts index f1b0f18f028..8748529d579 100644 --- a/src/renderer/src/store/terminals/terminal-active-workspace-creation.ts +++ b/src/renderer/src/store/terminals/terminal-active-workspace-creation.ts @@ -3,7 +3,7 @@ import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants' import { parseWorkspaceKey } from '../../../../shared/workspace-scope' import { focusTerminalTabSurface } from '@/lib/focus-terminal-tab-surface' import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner' -import { resolveWorktreeOperationRouteResult } from '@/lib/worktree-operation-route' +import { resolveWorktreeOperationRouteResult } from '@/lib/workspace/ownership/worktree-operation-route' import { isWebClientLocation } from '@/lib/web-client-location' import { workspaceEditorFiles } from '../slices/editor/tabs/workspace-editor-files' import type { TerminalSlice, TerminalStoreGet, TerminalStoreSet } from './terminal-state' diff --git a/src/renderer/src/store/terminals/terminal-created-shell.ts b/src/renderer/src/store/terminals/terminal-created-shell.ts index 2fc8052e6ce..332ff6654e5 100644 --- a/src/renderer/src/store/terminals/terminal-created-shell.ts +++ b/src/renderer/src/store/terminals/terminal-created-shell.ts @@ -1,5 +1,5 @@ import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context' -import { getProjectRuntimeFolder } from '@/lib/local-project-runtime-workspace' +import { getProjectRuntimeFolder } from '@/runtime/hosts/wsl/local-project-runtime-workspace' import { findLocalFolderWorkspaceRuntimeRepo } from '../../../../shared/folder-workspaces/folder-workspace-execution-host' import { folderWorkspaceToWorktree } from '../../../../shared/folder-workspaces/folder-workspace-worktree' import { isWslUncPath } from '../../../../shared/wsl-paths' diff --git a/src/renderer/src/store/terminals/terminal-tab-create-through-layout-owner.ts b/src/renderer/src/store/terminals/terminal-tab-create-through-layout-owner.ts index 7685e0d5256..a5833d419f7 100644 --- a/src/renderer/src/store/terminals/terminal-tab-create-through-layout-owner.ts +++ b/src/renderer/src/store/terminals/terminal-tab-create-through-layout-owner.ts @@ -3,7 +3,7 @@ import { createNonSecureContextUuid as createBrowserUuid } from '../../../../shared/non-secure-context-uuid' import { afterLayoutFrame } from '@/runtime/workspace-layout/frames/layout-frame-position' import { expectTabRowFields } from '@/runtime/workspace-layout/intents/layout-owner-pane-intents' -import { runtimeEnvironmentIdUnlessTwin } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' import { sendLayoutApply } from '@/runtime/workspace-layout/commands/layout-apply-send' import { newGroupSplitOf } from '@/runtime/workspace-layout/commands/layout-owner-new-group-split' import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' diff --git a/src/renderer/src/store/terminals/terminal-tab-layout-owner-actions.ts b/src/renderer/src/store/terminals/terminal-tab-layout-owner-actions.ts index 7f1475d13b3..b9a365c087a 100644 --- a/src/renderer/src/store/terminals/terminal-tab-layout-owner-actions.ts +++ b/src/renderer/src/store/terminals/terminal-tab-layout-owner-actions.ts @@ -8,7 +8,7 @@ import { } from './tab-change-through-layout-owner' import { findRenamableUnifiedTab } from './renamable-unified-tab' import { captureStructuredChatRename } from '@/runtime/native-chat/naming/structured-chat-rename-action' -import { runtimeEnvironmentIdForWorkspaceOwner } from '@/lib/resolve-owner' +import { runtimeEnvironmentIdForWorkspaceOwner } from '@/lib/workspace/ownership/resolve-owner' type RoutedActions = Pick< TerminalSlice, diff --git a/src/renderer/src/store/terminals/terminal-workspace-routing.ts b/src/renderer/src/store/terminals/terminal-workspace-routing.ts index 7cdac7cc49d..1d2932fa49f 100644 --- a/src/renderer/src/store/terminals/terminal-workspace-routing.ts +++ b/src/renderer/src/store/terminals/terminal-workspace-routing.ts @@ -5,7 +5,7 @@ import { isWslUncPath } from '../../../../shared/wsl-paths' import type { ProjectExecutionRuntimeResolution } from '../../../../shared/execution-host/project-execution-runtime' import { resolveLocalWindowsTerminalShellOverrideForTab } from '../../../../shared/local-windows-terminal-runtime' import { WINDOWS_GIT_BASH_SHELL } from '../../../../shared/windows-terminal-shell' -import { getFolderWorkspaceConnectionId } from '@/lib/folder-workspace-connection' +import { getFolderWorkspaceConnectionId } from '@/lib/workspace/ownership/folder-workspace-connection' import { getIndexedRepoMap } from '../repos/repository-catalog-index' import { getIndexedWorktreeMap } from '../slices/worktrees/listing/worktree-catalog-index' import { diff --git a/src/renderer/src/store/terminals/workspace-terminal-placeholders.test.ts b/src/renderer/src/store/terminals/workspace-terminal-placeholders.test.ts index a6090d4be2b..1ee7307eb3d 100644 --- a/src/renderer/src/store/terminals/workspace-terminal-placeholders.test.ts +++ b/src/renderer/src/store/terminals/workspace-terminal-placeholders.test.ts @@ -4,7 +4,7 @@ import type { Repo } from '../../../../shared/repo-types' import { DEFAULT_REPO_BADGE_COLOR } from '../../../../shared/constants' import { buildRuntimeSessionPlaceholders } from './workspace-terminal-placeholders' import { addHydratedSshWorktreePlaceholders } from './workspace-terminal-ssh-placeholders' -import { resolveOwner } from '@/lib/resolve-owner' +import { resolveOwner } from '@/lib/workspace/ownership/resolve-owner' const repo: Repo = { id: 'repo-1', diff --git a/src/renderer/src/store/workspaces/host-isolation/host-twin-worktree-purge.test.ts b/src/renderer/src/store/workspaces/host-isolation/host-twin-worktree-purge.test.ts index 71c49148bde..5de283dc67a 100644 --- a/src/renderer/src/store/workspaces/host-isolation/host-twin-worktree-purge.test.ts +++ b/src/renderer/src/store/workspaces/host-isolation/host-twin-worktree-purge.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { hostWorktreeTarget } from '../../../../../shared/worktree/host-qualified-identity' -import { getWorktreeVisitKey } from '@/lib/worktree-visit-recency' +import { getWorktreeVisitKey } from '@/lib/workspace/activation/worktree-visit-recency' import { hasWorktreeSleepIntent } from '@/lib/worktree-sleep-intent' import { resetHostTwinModuleStores } from './host-twin-state-projection.test-fixture' import { diff --git a/src/renderer/src/store/workspaces/selection/known-worktree-selection.ts b/src/renderer/src/store/workspaces/selection/known-worktree-selection.ts index 7c0e3ec2d72..8654722f2ae 100644 --- a/src/renderer/src/store/workspaces/selection/known-worktree-selection.ts +++ b/src/renderer/src/store/workspaces/selection/known-worktree-selection.ts @@ -1,7 +1,7 @@ import type { AppState } from '../../types' import type { ExecutionHostId } from '../../../../../shared/execution-host' import { findKnownWorktreeById } from '../../slices/worktrees/listing/detected-worktree-meta' -import { getSelectedFolderTwinHostId } from '../../../lib/folder-workspace-runtime-owner' +import { getSelectedFolderTwinHostId } from '../../../lib/workspace/ownership/folder-workspace-runtime-owner' type WorktreeLookupHostState = Pick diff --git a/src/shared/wsl-move/wsl-move-storage-dispositions.ts b/src/shared/wsl-move/wsl-move-storage-dispositions.ts index a04a7f7fedd..19402dd0509 100644 --- a/src/shared/wsl-move/wsl-move-storage-dispositions.ts +++ b/src/shared/wsl-move/wsl-move-storage-dispositions.ts @@ -30,14 +30,16 @@ export const LOCAL_STORAGE_MODULE_DISPOSITIONS: Record ({ activateAndRevealWorktree: vi.fn(), activateAndRevealWorkspace: vi.fn() })) -vi.mock('@/lib/activate-tab-and-focus-pane', () => ({ activateTabAndFocusPane: vi.fn() })) -vi.mock('@/lib/terminal-tab-owner-activation', () => ({ activateTerminalTabOnOwner: vi.fn() })) +vi.mock('@/lib/workspace/tabs/activate-tab-and-focus-pane', () => ({ + activateTabAndFocusPane: vi.fn() +})) +vi.mock('@/lib/workspace/tabs/terminal-tab-owner-activation', () => ({ + activateTerminalTabOnOwner: vi.fn() +})) vi.mock('@/lib/agent-session/structured-agent-session-tab-activation', () => ({ activateStructuredAgentSessionTab: vi.fn() })) diff --git a/tests/e2e/pty-spawn-cwd-folder-owner.unit.test.ts b/tests/e2e/pty-spawn-cwd-folder-owner.unit.test.ts index fb26f9a592b..eb9d6e2fa30 100644 --- a/tests/e2e/pty-spawn-cwd-folder-owner.unit.test.ts +++ b/tests/e2e/pty-spawn-cwd-folder-owner.unit.test.ts @@ -8,7 +8,7 @@ import type { RuntimePtyController } from '../../src/main/runtime/terminal/lifec import { spawnMock } from '../../src/main/ipc/pty/pty-ipc-mock-registry' import { setupPtyIpcSuite } from '../../src/main/ipc/pty/pty-ipc-test-harness' import { registerPtyHandlers } from '../../src/main/ipc/pty/register-handlers' -import { getFolderWorkspacePathErrorCopy } from '../../src/renderer/src/lib/folder-workspace-path-status' +import { getFolderWorkspacePathErrorCopy } from '../../src/renderer/src/lib/workspace/paths/folder-workspace-path-status' vi.mock('electron', () => import('../../src/main/ipc/pty/pty-ipc-mock-registry').then((m) => m.electronModuleMock()) diff --git a/tests/e2e/task-page-linear-refresh-authority.test.tsx b/tests/e2e/task-page-linear-refresh-authority.test.tsx index e846d9a1c0a..45545c6a58e 100644 --- a/tests/e2e/task-page-linear-refresh-authority.test.tsx +++ b/tests/e2e/task-page-linear-refresh-authority.test.tsx @@ -8,7 +8,7 @@ import { source } from '../../src/renderer/src/components/task-page/linear/task-page-linear-refresh-test-fixtures' -import { defaultScopeSource } from '@/lib/default-creation-host' +import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host' import { getLinearSourceScope } from '@/store/slices/linear/linear-slice-scope' import type { LinearIssue } from '../../src/shared/linear/issue-types' From c38a8e4b9a5bdb444d7389b4dbeda256779c6aad Mon Sep 17 00:00:00 2001 From: OrcaWin Date: Mon, 9 Nov 2026 02:52:36 -0800 Subject: [PATCH 09/90] test: remove low-value wrappers, inventories, and timing checks (#40284) Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com> --- .../tests/GzipUtf8CodecChecks.swift | 3 - .../tests/MobileWebShellChecks.swift | 56 --------------- .../platform/on-device-speech.web.test.tsx | 10 --- .../browser-guest-dictation-text.test.ts | 30 -------- .../gitlab/branch-review-discovery.test.ts | 2 +- src/main/gitlab/branch-review-source.test.ts | 2 +- .../merged-mr-commit-membership.test.ts | 2 +- src/main/gitlab/mr-discussion-notes.test.ts | 50 ------------- .../src/hooks/useImmediateMutation.test.ts | 32 --------- .../plugin-syntax-slot-pool.test.ts | 12 ---- .../lib/monaco-languages/register-zig.test.ts | 70 ------------------- .../monaco-languages/zig-highlighting.test.ts | 20 ------ .../src/lib/ssh-config-passive-sync.test.ts | 10 --- .../syntax-highlighting/textmate-core.test.ts | 17 ----- 14 files changed, 3 insertions(+), 313 deletions(-) delete mode 100644 src/main/browser/dictation/browser-guest-dictation-text.test.ts delete mode 100644 src/renderer/src/hooks/useImmediateMutation.test.ts delete mode 100644 src/renderer/src/lib/monaco-languages/register-zig.test.ts diff --git a/mobile/modules/orca-gzip-utf8-codec/tests/GzipUtf8CodecChecks.swift b/mobile/modules/orca-gzip-utf8-codec/tests/GzipUtf8CodecChecks.swift index 53263b7f34c..0d827b818c8 100644 --- a/mobile/modules/orca-gzip-utf8-codec/tests/GzipUtf8CodecChecks.swift +++ b/mobile/modules/orca-gzip-utf8-codec/tests/GzipUtf8CodecChecks.swift @@ -37,9 +37,6 @@ import Foundation check(actual == expected, "gunzip: \(name)") } - let text = "{\"a\":\"x\u{e9}\u{2713}\u{1F642}\"}" - check(decodeStrictUtf8(Data(text.utf8)) == text, "utf8: every sequence length") - check(decodeStrictUtf8(Data()) == "", "utf8: empty") let refused: [[UInt8]] = [ [0xef, 0xbb, 0xbf, 0x41], [0xc0, 0x80], [0xed, 0xa0, 0x80], [0x41, 0xe2, 0x82], [0x80], [0xf5, 0x80, 0x80, 0x80], diff --git a/mobile/modules/orca-mobile-web-shell/tests/MobileWebShellChecks.swift b/mobile/modules/orca-mobile-web-shell/tests/MobileWebShellChecks.swift index 761c1e2a3f0..4b7eba42367 100644 --- a/mobile/modules/orca-mobile-web-shell/tests/MobileWebShellChecks.swift +++ b/mobile/modules/orca-mobile-web-shell/tests/MobileWebShellChecks.swift @@ -151,17 +151,6 @@ import Foundation static func checkLoadStateMachine() { - let failures: [(MobileWebShellFailureReason, String)] = [ - (.generationUnreadable, "generation-unreadable"), - (.isolationUnavailable, "isolation-unavailable"), - (.documentLoadFailed, "document-load-failed"), - (.renderProcessGone, "render-process-gone") - ] - for (reason, expected) in failures { - let machine = MobileWebShellLoadStateMachine() - precondition(machine.failed(reason) == MobileWebShellLoadEmission(state: "failed", reason: expected)) - } - // Only the view’s own load raises the flag; commit, failure, renderer death and failed prop application clear it. let ownLoad = MobileWebShellLoadStateMachine() precondition(!ownLoad.isShellLoad) @@ -320,23 +309,6 @@ import Foundation } - static func checkBridgeByteCap() { - let cap = MobileWebShellBridge.maxMessageByteCount - precondition(cap == 640 * 1024) - precondition(MobileWebShellBridge.acceptsByteCount(0)) - precondition(MobileWebShellBridge.acceptsByteCount(cap - 1)) - precondition(MobileWebShellBridge.acceptsByteCount(cap)) - precondition(!MobileWebShellBridge.acceptsByteCount(cap + 1)) - - let gate = MobileWebShellBridgeGate() - precondition(gate.refusedCount == 0) - precondition(gate.accepts(byteCount: cap)) - precondition(gate.refusedCount == 0) - precondition(!gate.accepts(byteCount: cap + 1)) - precondition(!gate.accepts(byteCount: cap * 2)) - precondition(gate.refusedCount == 2) - } - // One allow/opener decision; TypeScript’s readBridgeExternalLinkUrl owns scheme filtering. static func checkNavigationVerdict() { let foreign = "https://example.com/artifact-link" @@ -400,41 +372,13 @@ import Foundation precondition(verdict("javascript:alert(1)") == .cancelAndOffer("javascript:alert(1)")) } - // Check flag/policy together: only one main-frame action may spend the shell’s own-load allowance. - static func checkOwnLoadIsSpentOnce() { - let document = "orca-mobile-web://\(session)/" - func decide(_ machine: MobileWebShellLoadStateMachine) -> MobileWebShellNavigationVerdict { - MobileWebShellNavigationPolicy.verdict( - url: document, - isMainFrame: true, - isDocumentUrl: true, - isShellLoad: machine.isShellLoad, - hasGesture: false, - isDownload: false - ) - } - let machine = MobileWebShellLoadStateMachine() - machine.shellLoadStarted() - let first = decide(machine) - precondition(first == .allow) - // Spend at decision, before commit: WebKit may decide a second action first. - machine.shellLoadConsumed() - precondition(decide(machine) == .cancel) - // And the endings still drop it, for a load that is allowed and then never commits. - machine.shellLoadStarted() - machine.documentEnded() - precondition(decide(machine) == .cancel) - } - static func main() { checkRequestResolution() checkGenerationMap() checkLoadStateMachine() checkNavigationVerdict() - checkOwnLoadIsSpentOnce() checkBridgeAcceptance() checkBridgePostTarget() - checkBridgeByteCap() print("mobile web shell checks OK") } } diff --git a/mobile/src/platform/on-device-speech.web.test.tsx b/mobile/src/platform/on-device-speech.web.test.tsx index 03da733f3f7..2bcf77019fa 100644 --- a/mobile/src/platform/on-device-speech.web.test.tsx +++ b/mobile/src/platform/on-device-speech.web.test.tsx @@ -54,14 +54,4 @@ describe('on-device dictation text', () => { failure: null }) }) - - it('keeps every word when the computer turned filler removal off', async () => { - const speech = mountSpeech(false) - await speech.start() - - expect(await speech.finish()).toEqual({ - text: 'Äh, das ist, ähm, um fünf Uhr fertig.', - failure: null - }) - }) }) diff --git a/src/main/browser/dictation/browser-guest-dictation-text.test.ts b/src/main/browser/dictation/browser-guest-dictation-text.test.ts deleted file mode 100644 index 8548fa19b65..00000000000 --- a/src/main/browser/dictation/browser-guest-dictation-text.test.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' -import { insertDictationTextIntoGuest } from './browser-guest-dictation-text' - -function guestWithFocusedField(field: unknown) { - const executeJavaScript = vi - .fn<(code: string) => Promise>() - .mockResolvedValueOnce(field) - .mockResolvedValueOnce(true) - const frame = { executeJavaScript } - return { guest: { focusedFrame: frame, mainFrame: frame }, executeJavaScript } -} - -describe('insertDictationTextIntoGuest', () => { - it('types the text into the focused field, spaced from the words around the caret', async () => { - const { guest, executeJavaScript } = guestWithFocusedField({ before: 'Hello', after: 'again' }) - - await expect(insertDictationTextIntoGuest(guest, 'there')).resolves.toBe(true) - - expect(executeJavaScript).toHaveBeenCalledTimes(2) - expect(executeJavaScript.mock.calls[1][0]).toContain('" there "') - }) - - it('reports nothing landed when the page has no editable field focused', async () => { - const { guest, executeJavaScript } = guestWithFocusedField(null) - - await expect(insertDictationTextIntoGuest(guest, 'there')).resolves.toBe(false) - - expect(executeJavaScript).toHaveBeenCalledTimes(1) - }) -}) diff --git a/src/main/gitlab/branch-review-discovery.test.ts b/src/main/gitlab/branch-review-discovery.test.ts index cb406957f60..e2b918de272 100644 --- a/src/main/gitlab/branch-review-discovery.test.ts +++ b/src/main/gitlab/branch-review-discovery.test.ts @@ -92,7 +92,7 @@ it('fails a legacy traversal rather than selecting from an incomplete foreign pr await expect(createGitLabBranchDiscovery(args)('feature')).rejects.toThrow('incomplete') }) -it.each([100, 1000])( +it.each([1000])( 'walks %s raw legacy rows once before choosing an eligible source', async (count) => { read.mockResolvedValue({ stdout: JSON.stringify([row(1, 'opened', 8)]) }) diff --git a/src/main/gitlab/branch-review-source.test.ts b/src/main/gitlab/branch-review-source.test.ts index 5fcbd9a3ae2..ce8bd23a5a5 100644 --- a/src/main/gitlab/branch-review-source.test.ts +++ b/src/main/gitlab/branch-review-source.test.ts @@ -8,7 +8,7 @@ const resolve = (urls: string[]) => beforeEach(() => { identity.mockReset().mockResolvedValue({ id: 1, path: 'team/app' }) }) -it.each([10, 100])( +it.each([10])( 'ignores %s valid hosted mirrors in either URL order without probing them', async (count) => { const mirrors = Array.from({ length: count }, (_, i) => `git@mirror${i}.example:team/app.git`) diff --git a/src/main/gitlab/merged-mr-commit-membership.test.ts b/src/main/gitlab/merged-mr-commit-membership.test.ts index f078334387e..46a95f8a5a2 100644 --- a/src/main/gitlab/merged-mr-commit-membership.test.ts +++ b/src/main/gitlab/merged-mr-commit-membership.test.ts @@ -26,7 +26,7 @@ beforeEach(() => { pages.mockReset() viewer.mockReset().mockResolvedValue({ id: 1 }) }) -it.each([10, 100])( +it.each([10])( 'reuses a complete 500-commit result across %s admitted refreshes and coalesces a cold walk', async (count) => { pages.mockImplementation(async ([endpoint]: string[]) => { diff --git a/src/main/gitlab/mr-discussion-notes.test.ts b/src/main/gitlab/mr-discussion-notes.test.ts index 845fbaf581e..07d9ec0c878 100644 --- a/src/main/gitlab/mr-discussion-notes.test.ts +++ b/src/main/gitlab/mr-discussion-notes.test.ts @@ -68,53 +68,3 @@ it('never presents a successful prefix after a later discussion page fails', asy fetchDiscussionComments('/repo', { host: 'gitlab.com', path: 'g/p' }, 'mr', 7) ).rejects.toThrow('incomplete') }) - -it.each([100, 1000])('measures complete realistic discussions at %s rows', async (count) => { - const body = `## Review\n\nPlease preserve the existing owner across reconnects.\n\n\`\`\`typescript\nconst state = await readOwner()\nreturn state.current\n\`\`\`\n\n${'The next request should retain the confirmed state and report incomplete reads. '.repeat( - 20 - )}` - let rawBytes = 0 - pages.mockImplementation(async ([endpoint]: string[]) => { - const page = Number(new URL(endpoint, 'https://gitlab.com').searchParams.get('page')) - const rows = Array.from({ length: Math.min(100, count - (page - 1) * 100) }, (_, i) => ({ - id: `discussion-${page}-${i}`, - notes: [ - { - id: (page - 1) * 100 + i, - body, - created_at: '2026-11-08T00:00:00Z', - author: { username: 'me', avatar_url: 'https://gitlab.com/avatar.png' }, - resolvable: true, - resolved: false, - position: { new_path: 'src/file.ts', new_line: 17 } - } - ] - })) - const serialized = JSON.stringify(rows) - rawBytes += Buffer.byteLength(serialized) - return { - body: serialized, - headers: { 'x-next-page': page * 100 < count ? String(page + 1) : '' } - } - }) - const before = process.memoryUsage().heapUsed - const start = performance.now() - const result = await fetchDiscussionComments( - '/repo', - { host: 'gitlab.com', path: 'g/p' }, - 'mr', - 7 - ) - const normalized = performance.now() - const wireBytes = Buffer.byteLength(JSON.stringify(result)) - console.info('gitlab-review-parity-discussions', { - count, - rawBytes, - wireBytes, - readParseSortMs: normalized - start, - serializeMs: performance.now() - normalized, - heapDeltaBytes: process.memoryUsage().heapUsed - before - }) - expect(result).toHaveLength(count) - expect(pages).toHaveBeenCalledTimes(count / 100) -}) diff --git a/src/renderer/src/hooks/useImmediateMutation.test.ts b/src/renderer/src/hooks/useImmediateMutation.test.ts deleted file mode 100644 index d532960ca43..00000000000 --- a/src/renderer/src/hooks/useImmediateMutation.test.ts +++ /dev/null @@ -1,32 +0,0 @@ -// @vitest-environment happy-dom - -import { act, cleanup, renderHook } from '@testing-library/react' -import { afterEach, expect, it, vi } from 'vitest' -import { i18n } from '@/i18n/i18n' -import es from '@/i18n/locales/es.json' -import { taskProviderErrorMessage } from '@/lib/task-provider-error-copy' -import { useImmediateMutation } from './useImmediateMutation' - -afterEach(async () => { - cleanup() - await i18n.changeLanguage('en') -}) - -it('reverts a failed edit and delivers its coded error in the UI language', async () => { - i18n.addResourceBundle('es', 'translation', es) - await i18n.changeLanguage('es') - const { result } = renderHook(() => useImmediateMutation()) - const onRevert = vi.fn() - const onError = vi.fn() - await act(async () => { - await result.current.run('status', { - mutate: async () => ({ ok: false, error: 'Host detail', errorCode: 'linear.updateFailed' }), - formatError: taskProviderErrorMessage, - onRevert, - onError - }) - }) - expect(onRevert).toHaveBeenCalledOnce() - expect(onError).toHaveBeenCalledWith(es.taskProviders.errors.linear.updateFailed) - expect(result.current.isPending('status')).toBe(false) -}) diff --git a/src/renderer/src/lib/monaco-languages/plugin-syntax-slot-pool.test.ts b/src/renderer/src/lib/monaco-languages/plugin-syntax-slot-pool.test.ts index bc0176cae6b..a77a1706d54 100644 --- a/src/renderer/src/lib/monaco-languages/plugin-syntax-slot-pool.test.ts +++ b/src/renderer/src/lib/monaco-languages/plugin-syntax-slot-pool.test.ts @@ -25,18 +25,6 @@ function pool(limit?: number) { } describe('PluginSyntaxSlotPool', () => { - it('never runs out when 600 languages are opened and closed one after another', () => { - const { instance, registered, live } = pool() - for (let index = 0; index < 600; index += 1) { - const lease = instance.acquire(`plugin:samples.lang/${index}@r1`) - expect(lease).not.toBeNull() - lease?.release() - } - // Idle languages stay bound for a quick reopen, but only a bounded number of them. - expect(registered.length).toBeLessThanOrEqual(17) - expect(live.size).toBeLessThanOrEqual(16) - }) - it('evicts the least recently used idle language, and only falls back when all are open', () => { const { instance, live } = pool(2) const a = instance.acquire('a@1') diff --git a/src/renderer/src/lib/monaco-languages/register-zig.test.ts b/src/renderer/src/lib/monaco-languages/register-zig.test.ts deleted file mode 100644 index 5f7c79de870..00000000000 --- a/src/renderer/src/lib/monaco-languages/register-zig.test.ts +++ /dev/null @@ -1,70 +0,0 @@ -// @vitest-environment happy-dom -import { describe, expect, it, vi } from 'vitest' -import * as Monaco from 'monaco-editor' -import { loadNodeOniguruma } from '../syntax-highlighting/oniguruma-test-harness' -import { registerZigLanguage } from './register-zig' - -const grammarLoads = vi.hoisted(() => vi.fn()) -vi.mock('shiki/langs/zig.mjs', async (importOriginal) => { - grammarLoads() - return importOriginal() -}) -vi.mock('../syntax-highlighting/oniguruma', () => ({ loadOniguruma: loadNodeOniguruma })) - -type Factory = Parameters[1] - -describe('Zig lazy provider activation', () => { - it('loads once on demand, preserves tokenizer state, and bounds long lines', async () => { - const registered: Monaco.languages.ILanguageExtensionPoint[] = [] - let tokensFactory: Factory | undefined - const languages = { - ...Monaco.languages, - getLanguages: () => registered, - register: vi.fn((language: Monaco.languages.ILanguageExtensionPoint) => { - registered.push(language) - return { dispose: vi.fn() } - }), - setLanguageConfiguration: vi.fn(() => ({ dispose: vi.fn() })), - registerTokensProviderFactory: vi.fn((_id: string, factory: Factory) => { - tokensFactory = factory - return { dispose: vi.fn() } - }) - } - registerZigLanguage({ languages }) - expect(grammarLoads).not.toHaveBeenCalled() - if (!tokensFactory) { - throw new Error('Zig provider factory was not registered') - } - const factory: Factory = tokensFactory - const pending = factory.create() - expect(factory.create()).toBe(pending) - const provider = await pending - if (!provider || !('tokenize' in provider)) { - throw new Error('Expected Zig line tokenizer') - } - expect(grammarLoads).toHaveBeenCalledTimes(1) - registerZigLanguage({ languages }) - expect(languages.register).toHaveBeenCalledTimes(1) - - const opening = provider.tokenize('const text = \\\\fn // literal', provider.getInitialState()) - expect(opening.tokens.map((token) => token.scopes)).toContain('string.multiline.zig') - const clone = opening.endState.clone() - expect(clone.equals(opening.endState)).toBe(true) - const after = provider.tokenize('pub fn after() void {}', clone) - expect(after.tokens).toEqual( - provider.tokenize('pub fn after() void {}', provider.getInitialState()).tokens - ) - expect(after.tokens.map((token) => token.scopes)).toContain('keyword.zig') - const edited = provider.tokenize('pub fn other() void {}', provider.getInitialState()) - expect(edited.endState.equals(after.endState)).toBe(true) - - const started = performance.now() - const skipped = provider.tokenize('x'.repeat(1001), provider.getInitialState()) - const tail = provider.tokenize('pub fn after() void {}', skipped.endState) - expect(performance.now() - started).toBeLessThan(1000) - expect(skipped.tokens).toEqual([{ startIndex: 0, scopes: 'source.zig' }]) - expect(tail.tokens).toEqual(skipped.tokens) - expect(tail.endState.equals(skipped.endState)).toBe(true) - expect(after.endState.equals(skipped.endState)).toBe(false) - }) -}) diff --git a/src/renderer/src/lib/monaco-languages/zig-highlighting.test.ts b/src/renderer/src/lib/monaco-languages/zig-highlighting.test.ts index 1e2b6fc061c..8b3022e6335 100644 --- a/src/renderer/src/lib/monaco-languages/zig-highlighting.test.ts +++ b/src/renderer/src/lib/monaco-languages/zig-highlighting.test.ts @@ -2,30 +2,10 @@ import { describe, expect, it, vi } from 'vitest' import { loadNodeOniguruma } from '../syntax-highlighting/oniguruma-test-harness' import { monaco } from '../monaco-setup' -import { detectLanguage } from '../../../../shared/editor-language/editor-language-detect' vi.mock('../syntax-highlighting/oniguruma', () => ({ loadOniguruma: loadNodeOniguruma })) describe('Zig highlighting through production Monaco setup', () => { - it.each(['main.zig', 'C:\\folder workspace\\MAIN.ZIG'])( - 'recognizes and highlights %s', - async (filename) => { - const language = detectLanguage(filename) - expect(language).toBe('zig') - const source = - 'pub fn main() void {\nconst answer: u32 = 42;\nconst text = "// literal"; // comment\n}' - await monaco.editor.colorize(source, language, {}) - const tokens = monaco.editor.tokenize(source, language) - expect(tokens[0].map((token) => token.type)).toContain('keyword.zig') - expect(tokens[1].map((token) => token.type)).toEqual( - expect.arrayContaining(['type.zig', 'number.zig']) - ) - expect(tokens[2].map((token) => token.type)).toEqual( - expect.arrayContaining(['string.quoted.double.zig', 'comment.line.double-slash.zig']) - ) - } - ) - it('highlights builtins, escapes, characters and multiline strings without leaking state', async () => { const source = [ 'const std = @import("std");', diff --git a/src/renderer/src/lib/ssh-config-passive-sync.test.ts b/src/renderer/src/lib/ssh-config-passive-sync.test.ts index 2c222f3b0a2..2ef18914ffa 100644 --- a/src/renderer/src/lib/ssh-config-passive-sync.test.ts +++ b/src/renderer/src/lib/ssh-config-passive-sync.test.ts @@ -23,16 +23,6 @@ afterEach(() => { }) describe('syncSshConfigTargetsPassively', () => { - it('shares one sync between callers and waits out the interval before the next', async () => { - await Promise.all([syncSshConfigTargetsPassively(), syncSshConfigTargetsPassively()]) - await syncSshConfigTargetsPassively() - expect(importConfig).toHaveBeenCalledTimes(1) - - vi.advanceTimersByTime(10_000) - await syncSshConfigTargetsPassively() - expect(importConfig).toHaveBeenCalledTimes(2) - }) - it('retries the listing when the import already saved hosts but listing them failed', async () => { importConfig.mockResolvedValueOnce({ targets: [{ id: 'ssh-new', label: 'new-box' }], diff --git a/src/renderer/src/lib/syntax-highlighting/textmate-core.test.ts b/src/renderer/src/lib/syntax-highlighting/textmate-core.test.ts index a390885c50f..49858bb6613 100644 --- a/src/renderer/src/lib/syntax-highlighting/textmate-core.test.ts +++ b/src/renderer/src/lib/syntax-highlighting/textmate-core.test.ts @@ -2,16 +2,6 @@ import { describe, expect, it, vi } from 'vitest' import { tokenizeLineWithinLimits } from './textmate-core' describe('tokenizeLineWithinLimits', () => { - it('retries a line that ran out of time while its grammar warmed up', () => { - const tokenize = vi - .fn() - .mockReturnValueOnce({ stoppedEarly: true }) - .mockReturnValueOnce({ stoppedEarly: false }) - - expect(tokenizeLineWithinLimits('x', tokenize)).toEqual({ stoppedEarly: false }) - expect(tokenize).toHaveBeenCalledTimes(2) - }) - it('gives up on a line that keeps running out of time', () => { const tokenize = vi.fn(() => ({ stoppedEarly: true })) @@ -19,13 +9,6 @@ describe('tokenizeLineWithinLimits', () => { expect(tokenize).toHaveBeenCalledTimes(3) }) - it('allows a cold grammar more attempts to finish compiling', () => { - const tokenize = vi.fn(() => ({ stoppedEarly: tokenize.mock.calls.length < 6 })) - - expect(tokenizeLineWithinLimits('x', tokenize, 10)).toEqual({ stoppedEarly: false }) - expect(tokenize).toHaveBeenCalledTimes(6) - }) - it('skips a line too long to scan without tokenizing it', () => { const tokenize = vi.fn(() => ({ stoppedEarly: false })) From 2103352d1b3521dad2aa6a2ef612652ad3385c29 Mon Sep 17 00:00:00 2001 From: Neil <4138956+nwparker@users.noreply.github.com> Date: Mon, 9 Nov 2026 02:53:35 -0800 Subject: [PATCH 10/90] test(vm): pin file saves in a recipe-created workspace, across server restart (#11762) (#40275) * test(vm): pin file saves in a recipe-created Orca server workspace (#11762) * test(vm): wait for the save round trip, let the app reconnect itself, edit a plain-text file * test(vm): say why the recipe save spec needs a longer timeout --- .../e2e/recipe-orca-server-file-save.spec.ts | 175 ++++++++++++++++++ 1 file changed, 175 insertions(+) create mode 100644 tests/e2e/recipe-orca-server-file-save.spec.ts diff --git a/tests/e2e/recipe-orca-server-file-save.spec.ts b/tests/e2e/recipe-orca-server-file-save.spec.ts new file mode 100644 index 00000000000..220665f968a --- /dev/null +++ b/tests/e2e/recipe-orca-server-file-save.spec.ts @@ -0,0 +1,175 @@ +import { execFileSync } from 'node:child_process' +import { chmodSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs' +import { tmpdir } from 'node:os' +import path from 'node:path' +import { openSidebarWorkspaceComposer } from './helpers/sidebar-project-dialog' +import { expect, test } from './helpers/orca-app' +import { launchHeadlessPairedRuntimeHost } from './helpers/headless-paired-runtime-host' +import { switchToWorktree, waitForSessionReady } from './helpers/store' +import { openFileExplorer } from './helpers/file-explorer' +import { quotePosixShell } from '../../src/shared/shell/launch/shell-argument-quoting' + +// A per-workspace environment recipe that hands Orca an Orca server: files opened in the +// recipe-created workspace must save back to that server (#11762). +test.skip(process.platform === 'win32', 'The recipe scripts are POSIX shell') +test.use({ seedTestRepo: false }) + +test('saves an edited file in a recipe-created Orca server workspace', async ({ orcaPage }) => { + // Boots a second Orca as the environment's server, then restarts it mid-test. + test.setTimeout(300_000) + const host = await launchHeadlessPairedRuntimeHost({ pinnedServePort: true }) + const sourceRepo = mkdtempSync(path.join(tmpdir(), 'orca-recipe-server-source-')) + const vmRoot = mkdtempSync(path.join(tmpdir(), 'orca-recipe-server-vm-')) + try { + seedGitRepo(vmRoot, { 'notes.txt': 'VM notes' }) + seedRecipeRepo(sourceRepo, host.offer.pairingUrl, vmRoot) + await waitForSessionReady(orcaPage) + await orcaPage.evaluate(async (repoPath) => { + const result = await window.api.repos.add({ path: repoPath }) + if ('error' in result) { + throw new Error(result.error) + } + const store = window.__store! + await store.getState().fetchRepos({ runtimeEnvironmentId: null }) + await store.getState().updateSettings({ experimentalEphemeralVms: true }) + store.getState().setActiveRepo(result.repo.id) + }, sourceRepo) + + await openSidebarWorkspaceComposer(orcaPage) + const dialog = orcaPage.getByRole('dialog', { name: /Create (Workspace|Worktree)/i }) + await expect(dialog).toBeVisible() + await dialog.getByRole('combobox', { name: 'Run on' }).click() + await orcaPage.getByRole('option', { name: /Per-Workspace Environment/ }).click() + await orcaPage + .getByRole('listbox', { name: 'Per-Workspace Environment' }) + .getByText('Local Orca server', { exact: true }) + .click() + const workspaceName = `recipe-save-${Date.now()}` + await dialog.getByPlaceholder(/Type a name/i).fill(workspaceName) + await dialog.getByRole('button', { name: /Create (Workspace|Worktree)/i }).click() + const trustDialog = orcaPage.getByRole('dialog', { name: /Run VM recipe/ }) + await expect(trustDialog).toBeVisible() + await trustDialog.getByRole('button', { name: 'Run hooks' }).click() + await expect(dialog).toBeHidden({ timeout: 60_000 }) + + const findWorkspace = () => + orcaPage.evaluate( + ({ name, sourceRepoPath }) => { + const state = window.__store!.getState() + const sourceRepoIds = new Set( + state.repos.filter((repo) => repo.path === sourceRepoPath).map((repo) => repo.id) + ) + return ( + Object.values(state.worktreesByRepo) + .flat() + .find( + (worktree) => + worktree.displayName === name && + !sourceRepoIds.has(worktree.repoId) && + Boolean(worktree.hostId?.startsWith('runtime:')) + ) ?? null + ) + }, + { name: workspaceName, sourceRepoPath: sourceRepo } + ) + await expect.poll(findWorkspace, { timeout: 120_000 }).not.toBeNull() + const workspace = (await findWorkspace())! + await switchToWorktree(orcaPage, workspace.id) + + await openFileExplorer(orcaPage) + const notesRow = orcaPage + .locator('[data-orca-explorer-shell] [data-file-explorer-row]') + .filter({ has: orcaPage.getByText('notes.txt', { exact: true }) }) + await expect(notesRow).toBeVisible({ timeout: 30_000 }) + await notesRow.click() + // The workspace lives on the server, so its model has a host-keyed URI rather than file:. + const editor = orcaPage + .locator('.monaco-editor[data-uri^="vscode-remote:"]') + .filter({ visible: true }) + const editorText = editor.locator('.view-lines') + await expect(editorText).toHaveText('VM notes', { timeout: 30_000 }) + const savedPath = path.join(workspace.path, 'notes.txt') + + const replaceText = async (text: string): Promise => { + await editor.click() + await orcaPage.keyboard.press('ControlOrMeta+A') + await orcaPage.keyboard.type(text) + await expect(editorText).toHaveText(text) + } + const waitForCleanTab = () => + expect + .poll( + () => + orcaPage.evaluate( + () => + window + .__store!.getState() + .openFiles.find((file) => file.relativePath === 'notes.txt')?.isDirty ?? null + ), + { timeout: 15_000 } + ) + .toBe(false) + + const sentinel = `Saved from recipe workspace ${Date.now()}` + await replaceText(sentinel) + await orcaPage.keyboard.press('ControlOrMeta+S') + await expect.poll(() => readFileSync(savedPath, 'utf8'), { timeout: 15_000 }).toBe(sentinel) + // The save round trip must finish before the server goes away. + await waitForCleanTab() + + // A VM that sleeps and wakes restarts its server. The tab opened before must still save + // there once the app reconnects on its own. Retried saves tolerate the reconnect window; + // a tab whose owner can no longer be verified never saves (#11762). + await host.restartServeProcess() + const afterWake = `Saved after wake ${Date.now()}` + await replaceText(afterWake) + await expect(async () => { + await orcaPage.keyboard.press('ControlOrMeta+S') + await expect.poll(() => readFileSync(savedPath, 'utf8'), { timeout: 3_000 }).toBe(afterWake) + }).toPass({ timeout: 60_000 }) + await waitForCleanTab() + } finally { + await host.dispose().catch(() => undefined) + rmSync(sourceRepo, { recursive: true, force: true }) + rmSync(vmRoot, { recursive: true, force: true }) + } +}) + +function seedGitRepo(repoPath: string, files: Record): void { + for (const [name, content] of Object.entries(files)) { + writeFileSync(path.join(repoPath, name), content) + } + execFileSync('git', ['init', '-b', 'main'], { cwd: repoPath }) + execFileSync('git', ['config', 'user.email', 'e2e@test.local'], { cwd: repoPath }) + execFileSync('git', ['config', 'user.name', 'Orca E2E'], { cwd: repoPath }) + execFileSync('git', ['add', '.'], { cwd: repoPath }) + execFileSync('git', ['commit', '-m', 'seed'], { cwd: repoPath }) +} + +function seedRecipeRepo(repoPath: string, pairingUrl: string, vmRoot: string): void { + const createScript = path.join(repoPath, 'create.sh') + writeFileSync( + createScript, + `#!/usr/bin/env bash +set -euo pipefail +node -e 'console.log(JSON.stringify({schemaVersion:1,connection:{type:"orca-server",pairingCode:process.argv[1],projectRoot:process.argv[2]}}))' ${quotePosixShell(pairingUrl)} ${quotePosixShell(vmRoot)} +` + ) + const destroyScript = path.join(repoPath, 'destroy.sh') + writeFileSync(destroyScript, '#!/usr/bin/env bash\ncat >/dev/null\n') + chmodSync(createScript, 0o755) + chmodSync(destroyScript, 0o755) + writeFileSync( + path.join(repoPath, 'orca.yaml'), + `environmentRecipes: + - id: local-orca-server + name: Local Orca server + create: ./create.sh + destroy: ./destroy.sh +` + ) + seedGitRepo(repoPath, {}) + execFileSync('git', ['remote', 'add', 'origin', 'https://github.com/stablyai/orca.git'], { + cwd: repoPath + }) +} From 1d99ac6a02aa3865746978115b59af60c9eb9550 Mon Sep 17 00:00:00 2001 From: Neil <4138956+nwparker@users.noreply.github.com> Date: Mon, 9 Nov 2026 03:03:37 -0800 Subject: [PATCH 11/90] fix(tabs): preserve lastFocusedAt on native chat tabs across host snapshots (#40288) Host session-tab snapshots rebuild native chat tabs without the client-owned focus visit, so Cmd+J recents ranked chats last and showed their creation time. Fixes #39841 --- .../placement/structured-conversation-tab-replacement.test.ts | 2 ++ .../src/runtime/web-session-tabs-sync/terminal-surfaces.ts | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/renderer/src/runtime/web-session-tabs-sync/placement/structured-conversation-tab-replacement.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/placement/structured-conversation-tab-replacement.test.ts index 3e460b74b44..da3cc4ccdb3 100644 --- a/src/renderer/src/runtime/web-session-tabs-sync/placement/structured-conversation-tab-replacement.test.ts +++ b/src/renderer/src/runtime/web-session-tabs-sync/placement/structured-conversation-tab-replacement.test.ts @@ -32,6 +32,7 @@ describe('clear pane identity', () => { color: null, createdAt: 1, sortOrder: 0, + lastFocusedAt: 123, isPinned: true } ] @@ -92,6 +93,7 @@ describe('clear pane identity', () => { entityId: 'new-session', contentType: 'agent-session', groupId: 'local-group', + lastFocusedAt: 123, isPinned: true }) // An omitted groups patch means the snapshot left every group as it was. diff --git a/src/renderer/src/runtime/web-session-tabs-sync/terminal-surfaces.ts b/src/renderer/src/runtime/web-session-tabs-sync/terminal-surfaces.ts index 10f173d1a9d..032b5f05f08 100644 --- a/src/renderer/src/runtime/web-session-tabs-sync/terminal-surfaces.ts +++ b/src/renderer/src/runtime/web-session-tabs-sync/terminal-surfaces.ts @@ -152,6 +152,8 @@ export function buildMirroredAgentTabs( color: tab.color !== undefined ? tab.color : (existing?.color ?? null), sortOrder: sortOffset + index, createdAt: existing?.createdAt ?? now + sortOffset + index, + // Focus visits are client-owned; host snapshots carry none, so rebuilding must not drop them. + ...(existing?.lastFocusedAt !== undefined ? { lastFocusedAt: existing.lastFocusedAt } : {}), isPinned: tab.isPinned !== undefined ? tab.isPinned : existing?.isPinned === true } } From 00f109d9e1f8dbdba04682d1b028f92511765813 Mon Sep 17 00:00:00 2001 From: OrcaWin Date: Mon, 9 Nov 2026 03:10:17 -0800 Subject: [PATCH 12/90] test: remove low-value renderer, chain, and native checks (#40287) Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com> --- .../orcagziputf8codec/StrictUtf8Test.kt | 8 - .../MobileWebShellBridgeTest.kt | 11 -- .../MobileWebShellOriginTest.kt | 8 - ...t-session-status-usage-limit-chain.test.ts | 158 +----------------- ...on-usage-limit-chain-reads-test-support.ts | 71 -------- ...ed-agent-session-usage-limit-chain.test.ts | 25 --- ...ativeChatNoticeRow.model-fallback.test.tsx | 64 ------- .../gitlab-job-trace-client.test.ts | 26 --- .../plugin-language-packs.test.ts | 68 -------- tests/tools/win-update-e2e/README.md | 8 +- tests/tools/win-update-e2e/assertions.mjs | 9 +- tests/tools/win-update-e2e/run.mjs | 25 +-- tests/tools/win-update-e2e/serve-switch.mjs | 1 - 13 files changed, 8 insertions(+), 474 deletions(-) delete mode 100644 src/main/native-chat/agent-session-wire/recovery/structured-agent-session-usage-limit-chain-reads-test-support.ts delete mode 100644 src/renderer/src/components/native-chat/messages/notices/NativeChatNoticeRow.model-fallback.test.tsx delete mode 100644 src/renderer/src/runtime/repository-gitlab/gitlab-job-trace-client.test.ts delete mode 100644 src/renderer/src/store/plugins/localization/plugin-language-packs.test.ts diff --git a/mobile/modules/orca-gzip-utf8-codec/android/src/test/java/expo/modules/orcagziputf8codec/StrictUtf8Test.kt b/mobile/modules/orca-gzip-utf8-codec/android/src/test/java/expo/modules/orcagziputf8codec/StrictUtf8Test.kt index f6c1162898d..b9a381729e5 100644 --- a/mobile/modules/orca-gzip-utf8-codec/android/src/test/java/expo/modules/orcagziputf8codec/StrictUtf8Test.kt +++ b/mobile/modules/orca-gzip-utf8-codec/android/src/test/java/expo/modules/orcagziputf8codec/StrictUtf8Test.kt @@ -1,17 +1,9 @@ package expo.modules.orcagziputf8codec -import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Test class StrictUtf8Test { - @Test - fun `decodes well-formed UTF-8 of every sequence length`() { - val text = "{\"a\":\"xé✓🙂\"}" - assertEquals(text, decodeStrictUtf8(text.toByteArray(Charsets.UTF_8))) - assertEquals("", decodeStrictUtf8(ByteArray(0))) - } - @Test fun `hands back to JS what TextDecoder would repair or strip`() { val refused = listOf( diff --git a/mobile/modules/orca-mobile-web-shell/android/src/test/java/expo/modules/orcamobilewebshell/MobileWebShellBridgeTest.kt b/mobile/modules/orca-mobile-web-shell/android/src/test/java/expo/modules/orcamobilewebshell/MobileWebShellBridgeTest.kt index 3e7d0937dcb..c841d7d6276 100644 --- a/mobile/modules/orca-mobile-web-shell/android/src/test/java/expo/modules/orcamobilewebshell/MobileWebShellBridgeTest.kt +++ b/mobile/modules/orca-mobile-web-shell/android/src/test/java/expo/modules/orcamobilewebshell/MobileWebShellBridgeTest.kt @@ -1,21 +1,10 @@ package expo.modules.orcamobilewebshell -import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test class MobileWebShellBridgeTest { - @Test - fun `caps a message at 640 KiB of raw bytes`() { - val cap = MOBILE_WEB_SHELL_BRIDGE_MAX_MESSAGE_BYTES - assertEquals(640 * 1024, cap) - assertTrue(acceptsMobileWebShellBridgeByteCount(0)) - assertTrue(acceptsMobileWebShellBridgeByteCount(cap - 1)) - assertTrue(acceptsMobileWebShellBridgeByteCount(cap)) - assertFalse(acceptsMobileWebShellBridgeByteCount(cap + 1)) - } - @Test fun `hears only a string message from the main frame of a committed document`() { assertTrue(frame()) diff --git a/mobile/modules/orca-mobile-web-shell/android/src/test/java/expo/modules/orcamobilewebshell/MobileWebShellOriginTest.kt b/mobile/modules/orca-mobile-web-shell/android/src/test/java/expo/modules/orcamobilewebshell/MobileWebShellOriginTest.kt index 080d36b7415..2f4371b7d15 100644 --- a/mobile/modules/orca-mobile-web-shell/android/src/test/java/expo/modules/orcamobilewebshell/MobileWebShellOriginTest.kt +++ b/mobile/modules/orca-mobile-web-shell/android/src/test/java/expo/modules/orcamobilewebshell/MobileWebShellOriginTest.kt @@ -62,14 +62,6 @@ class MobileWebShellOriginTest { assertNull(mobileWebShellOrigin("bad host")) } - @Test - fun `derives a different label for every session and the same one for a repeat`() { - assertEquals(mobileWebShellOriginHost(SESSION), mobileWebShellOriginHost(SESSION)) - assertTrue(mobileWebShellOriginHost(SESSION) != mobileWebShellOriginHost("${SESSION}a")) - // Case matters to the derivation even though the host comparison ignores it. - assertTrue(mobileWebShellOriginHost(SESSION) != mobileWebShellOriginHost(SESSION.uppercase())) - } - @Test fun `serves the document and a declared asset path`() { assertEquals("/", resolve(parts("/"))) diff --git a/src/main/native-chat/agent-session-wire/observations/structured-agent-session-status-usage-limit-chain.test.ts b/src/main/native-chat/agent-session-wire/observations/structured-agent-session-status-usage-limit-chain.test.ts index f7bb5197d1b..69919de597b 100644 --- a/src/main/native-chat/agent-session-wire/observations/structured-agent-session-status-usage-limit-chain.test.ts +++ b/src/main/native-chat/agent-session-wire/observations/structured-agent-session-status-usage-limit-chain.test.ts @@ -1,4 +1,4 @@ -import { beforeEach, expect, it, vi } from 'vitest' +import { expect, it } from 'vitest' import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { agentSessionFailureFact } from '../../../../shared/agent-session/failures/agent-session-failure' import { agentSessionFailureWords } from '../../../../shared/agent-session/failures/agent-session-failure-words' @@ -8,44 +8,13 @@ import { agentJournalItemKey, agentJournalSubmissionKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' -import type * as UsageLimitChain from '../recovery/structured-agent-session-usage-limit-chain' import { - hostUsageLimitCut, usageLimitContinueMessageId, usageLimitContinueTag } from '../recovery/structured-agent-session-usage-limit-chain' -import { - chainReads, - countedItems, - countedSubmissions -} from '../recovery/structured-agent-session-usage-limit-chain-reads-test-support' import { StructuredAgentSessionJournalProjections } from './structured-agent-session-status-journal-projection' -let reads = chainReads() -vi.mock('../recovery/structured-agent-session-usage-limit-chain', async (importOriginal) => { - const actual = await importOriginal() - return { - ...actual, - hostUsageLimitCut: vi.fn((...[snapshot, cut]: Parameters) => - actual.hostUsageLimitCut( - { - items: countedItems(snapshot.items, reads), - submissions: countedSubmissions(snapshot.submissions, reads) - }, - cut - ) - ) - } -}) - const fixture = createFixture() -let measured = 0 -const derivations = () => - vi.mocked(hostUsageLimitCut).mock.calls.filter(([, cut]) => cut !== null).length -beforeEach(() => { - vi.mocked(hostUsageLimitCut).mockClear() - reads = chainReads() -}) async function limitedTurn( journal: AgentSessionJournal, @@ -115,58 +84,9 @@ async function hostContinue( return clientMessageId } -async function personTurn(journal: AgentSessionJournal, name: string) { - const clientMessageId = `person-${name}` - await journal.appendSubmission({ - clientMessageId, - payloadFingerprint: clientMessageId, - body: { kind: 'message', role: 'user', blocks: [] }, - origin: 'client', - fence: 1 - }) - await journal.resolveDispatch({ - clientMessageId, - state: 'accepted', - providerIdentity: null, - fence: 1 - }) - await journal.appendItem( - { provider: 'orca', clientMessageId: `turn-${name}` }, - { - kind: 'turn', - turnId: name, - state: 'completed', - outcome: 'success', - completedAt: 1, - userItemId: agentJournalSubmissionKey(clientMessageId) - }, - { fence: 1, turnScope: AGENT_JOURNAL_THREAD_SCOPE } - ) -} - -/** A person's limited turn of `rows` rows and one automatic continue that hit the limit again after `rows` more. - * `olderRows` puts a long earlier turn first, and the person's turn is then opened by the agent's echo. */ -async function chainOfOne(journal: AgentSessionJournal, rows: number, olderRows?: number) { - let opened: { userItemId?: string } = {} - if (olderRows !== undefined) { - await limitedTurn(journal, 'older', olderRows) - const echo = { provider: 'orca' as const, clientMessageId: 'provider-echo-root' } - await journal.appendSubmission({ - clientMessageId: 'person-root', - payloadFingerprint: 'person-root', - body: { kind: 'message', role: 'user', blocks: [] }, - origin: 'client', - fence: 1 - }) - await journal.resolveDispatch({ - clientMessageId: 'person-root', - state: 'accepted', - providerIdentity: echo, - fence: 1 - }) - opened = { userItemId: agentJournalItemKey(echo) } - } - const first = await limitedTurn(journal, 'first', rows, opened) +/** A limited turn and one automatic continue that hits the limit again. */ +async function chainOfOne(journal: AgentSessionJournal, rows: number) { + const first = await limitedTurn(journal, 'first', rows) const sent = await hostContinue( journal, { turnItemId: first.turnScope.turnItemId, resetsAt: 60_000 }, @@ -184,76 +104,6 @@ async function chainOfOne(journal: AgentSessionJournal, rows: number, olderRows? }) } -it('derives the chain only when the status projection rebuilds', async () => { - const journal = await fixture.open() - const projections = new StructuredAgentSessionJournalProjections() - const cut = await chainOfOne(journal, 0) - expect(projections.read(journal, null).usageLimitCut?.chain).toBe(1) - projections.read(journal, null) - expect(derivations()).toBe(1) - await journal.appendItem( - { provider: 'orca', clientMessageId: 'late' }, - { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'late' }] }, - cut - ) - expect(projections.read(journal, null).usageLimitCut?.chain).toBe(1) - expect(derivations()).toBe(2) -}) - -// Bounds come from what the walk must read: the chain's own turns once each way, never the history before it. -it('reads the chain tail linearly, whatever history precedes it', async () => { - const measure = async (history: number, rows: number, olderRows?: number) => { - const journal = await fixture.open({ - identity: { ...fixture.IDENTITY, sessionId: `measure-${(measured += 1)}` } - }) - for (let index = 0; index < history; index += 1) { - await personTurn(journal, `old-${index}`) - } - await chainOfOne(journal, rows, olderRows) - reads = chainReads() - const chain = new StructuredAgentSessionJournalProjections().read(journal, null).usageLimitCut - ?.chain - return { chain, total: reads.total } - } - const short = await measure(50, 0) - const long = await measure(500, 0) - expect([short.chain, long.chain]).toEqual([1, 1]) - expect(long.total).toBe(short.total) - // An echo-opened root names a key no row carries; its opener is still found without reading the turn before. - const echoed = await measure(0, 0, 50) - const echoedLong = await measure(0, 0, 500) - expect([echoed.chain, echoedLong.chain]).toEqual([1, 1]) - expect(echoedLong.total).toBe(echoed.total) - const rows = await measure(0, 200) - const tenfold = await measure(0, 2_000) - expect([rows.chain, tenfold.chain]).toEqual([1, 1]) - // Each of the two turns' rows is read a few fields at a time on one pass back and one pass forward. - expect(tenfold.total).toBeLessThanOrEqual(10 * 2 * 2_000 + short.total) - expect(tenfold.total - short.total).toBeLessThanOrEqual(10 * (rows.total - short.total) + 50) -}) - -it('scans the sends once when the turn opener matches none of them', async () => { - const measure = async (sends: number) => { - const journal = await fixture.open({ - identity: { ...fixture.IDENTITY, sessionId: `measure-${(measured += 1)}` } - }) - for (let index = 0; index < sends; index += 1) { - await personTurn(journal, `old-${index}`) - } - await limitedTurn(journal, 'unmatched', 0, { userItemId: 'provider-echo-never-attributed' }) - reads = chainReads() - const chain = new StructuredAgentSessionJournalProjections().read(journal, null).usageLimitCut - ?.chain - return { chain, total: reads.total } - } - const few = await measure(50) - const many = await measure(500) - expect([few.chain, many.chain]).toEqual([0, 0]) - // Two fields of each send are compared to the opener, newest first, and nothing is read twice. - expect(many.total).toBeLessThanOrEqual(2 * 500 + 20) - expect(many.total - few.total).toBeLessThanOrEqual(2 * 450) -}) - it('stops counting a link when its earlier usage limit is revised to another reset', async () => { const journal = await fixture.open() const projections = new StructuredAgentSessionJournalProjections() diff --git a/src/main/native-chat/agent-session-wire/recovery/structured-agent-session-usage-limit-chain-reads-test-support.ts b/src/main/native-chat/agent-session-wire/recovery/structured-agent-session-usage-limit-chain-reads-test-support.ts deleted file mode 100644 index c98141d2f98..00000000000 --- a/src/main/native-chat/agent-session-wire/recovery/structured-agent-session-usage-limit-chain-reads-test-support.ts +++ /dev/null @@ -1,71 +0,0 @@ -import type { - AgentJournalRenderItem, - AgentJournalSubmission -} from '../../../../shared/agent-session/journal/agent-session-journal-types' - -type ChainSubmission = Pick - -/** What a chain derivation looked at: distinct rows and submissions, and every field read in total. */ -export type ChainReads = { visited: Set; total: number } - -export const chainReads = (): ChainReads => ({ visited: new Set(), total: 0 }) - -/** Rows the derivation looks at: each read of a row's fields counts, and marks that row visited. */ -export function countedItems( - items: readonly AgentJournalRenderItem[], - reads: ChainReads -): AgentJournalRenderItem[] { - return items.map((item, index) => { - const mark = () => { - reads.visited.add(`item-${index}`) - reads.total += 1 - } - return { - revision: item.revision, - sequence: item.sequence, - observedAt: item.observedAt, - get itemId() { - mark() - return item.itemId - }, - get body() { - mark() - return item.body - }, - get turnScope() { - mark() - return item.turnScope - }, - get agentId() { - mark() - return item.agentId - } - } - }) -} - -export function countedSubmissions( - submissions: readonly ChainSubmission[], - reads: ChainReads -): ChainSubmission[] { - return submissions.map((submission, index) => { - const mark = () => { - reads.visited.add(`submission-${index}`) - reads.total += 1 - } - return { - get clientMessageId() { - mark() - return submission.clientMessageId - }, - get providerItemId() { - mark() - return submission.providerItemId - }, - get origin() { - mark() - return submission.origin - } - } - }) -} diff --git a/src/main/native-chat/agent-session-wire/recovery/structured-agent-session-usage-limit-chain.test.ts b/src/main/native-chat/agent-session-wire/recovery/structured-agent-session-usage-limit-chain.test.ts index 2cd900f2e50..a7acfc1f53f 100644 --- a/src/main/native-chat/agent-session-wire/recovery/structured-agent-session-usage-limit-chain.test.ts +++ b/src/main/native-chat/agent-session-wire/recovery/structured-agent-session-usage-limit-chain.test.ts @@ -11,11 +11,6 @@ import { usageLimitContinueMessageId, usageLimitContinueTag } from './structured-agent-session-usage-limit-chain' -import { - chainReads, - countedItems, - countedSubmissions -} from './structured-agent-session-usage-limit-chain-reads-test-support' type Submission = Pick @@ -69,26 +64,6 @@ function conversation(history: number, links: number) { return { items, submissions, cut } } -it('reads only the chain, never the older conversation, at N and 10N rows of history', () => { - const measure = (history: number) => { - const { items, submissions, cut } = conversation(history, 3) - const reads = chainReads() - const chain = usageLimitContinueChain( - countedItems(items, reads), - countedSubmissions(submissions, reads), - cut - ) - return { chain, reads: reads.visited.size } - } - const small = measure(1_000) - const large = measure(10_000) - expect(small.chain).toBe(3) - expect(large.chain).toBe(3) - // Three links of a send row, a turn and its limit row, plus the person's limited turn before them. - expect(large.reads).toBe(small.reads) - expect(small.reads).toBeLessThanOrEqual(40) -}) - it('counts a continue across a slash-command turn run after the cut it answers', () => { const { items, submissions, cut } = conversation(2, 1) // A /compact between the person's limited turn and the automatic continue, as the latest-turn read skips it. diff --git a/src/renderer/src/components/native-chat/messages/notices/NativeChatNoticeRow.model-fallback.test.tsx b/src/renderer/src/components/native-chat/messages/notices/NativeChatNoticeRow.model-fallback.test.tsx deleted file mode 100644 index 514559dc2ff..00000000000 --- a/src/renderer/src/components/native-chat/messages/notices/NativeChatNoticeRow.model-fallback.test.tsx +++ /dev/null @@ -1,64 +0,0 @@ -// @vitest-environment happy-dom -import '@testing-library/jest-dom/vitest' -import { cleanup, render, screen } from '@testing-library/react' -import { afterEach, expect, it, vi } from 'vitest' -import { projectStructuredItemToNativeChat } from '../../../../../../shared/agent-session/view/structured-agent-session-projection' -import type { AgentJournalStatusItem } from '../../../../../../shared/agent-session/journal/agent-session-journal-types' -import { TooltipProvider } from '@/components/ui/tooltip' -import { MessageRow } from '../rows/NativeChatMessageRow' -import { i18n } from '@/i18n/i18n' - -afterEach(async () => { - cleanup() - await i18n.changeLanguage('en') -}) - -function renderStatus(body: AgentJournalStatusItem) { - const message = projectStructuredItemToNativeChat({ - itemId: 'notice', - sequence: 1, - revision: 1, - observedAt: 1, - body - }) - if (!message) { - throw new Error('expected notice') - } - render( - - - - ) -} - -it.each([ - ['en', 'Claude switched models: Claude Opus 5.5 → Claude Opus 4.8.'], - ['ru', 'Claude переключил модель: Claude Opus 5.5 → Claude Opus 4.8.'] -])( - 'renders the saved fallback as a readable %s notice instead of unknown JSON', - async (locale, words) => { - await i18n.changeLanguage(locale) - const head = JSON.stringify({ - type: 'fallback', - from: { model: 'claude-opus-5-5' }, - to: { model: 'claude-opus-4-8' } - }) - renderStatus({ - kind: 'status', - text: 'Claude sent content Orca cannot display yet', - providerFrame: { - provider: 'claude', - kind: 'message:assistant:content:fallback', - payload: { head, byteLength: head.length, digest: 'fixture', truncated: false } - } - }) - expect(screen.getByText(words)).toBeInTheDocument() - expect(screen.queryByText('Claude sent content Orca cannot display yet')).toBeNull() - expect(screen.queryByText(head)).toBeNull() - } -) diff --git a/src/renderer/src/runtime/repository-gitlab/gitlab-job-trace-client.test.ts b/src/renderer/src/runtime/repository-gitlab/gitlab-job-trace-client.test.ts deleted file mode 100644 index 34a5c84d21e..00000000000 --- a/src/renderer/src/runtime/repository-gitlab/gitlab-job-trace-client.test.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { expect, it, vi } from 'vitest' -const { jobTrace } = vi.hoisted(() => ({ jobTrace: vi.fn() })) -vi.mock('./gitlab-owner-api', () => ({ - JOB_TRACE_TIMEOUT_MS: 30000, - gitLabApiFor: () => ({ jobTrace }) -})) -import { loadGitLabJobLogDetails } from './gitlab-job-trace-client' -it('loads the real job log for an optional failure and keeps manual jobs off the trace API', async () => { - jobTrace.mockResolvedValue({ ok: true, trace: 'Compiler failed: missing module' }) - const check = { - name: 'test', - status: 'completed', - conclusion: 'neutral', - url: null, - gitlabJobId: 7, - gitlabAllowedFailure: true - } as const - const details = await loadGitLabJobLogDetails({ repoPath: '/repo', check }) - expect(jobTrace).toHaveBeenCalledWith(expect.objectContaining({ jobId: 7, logExcerpt: true })) - expect(details?.jobs[0]).toMatchObject({ id: 7, logTail: 'Compiler failed: missing module' }) - await loadGitLabJobLogDetails({ - repoPath: '/repo', - check: { ...check, gitlabAllowedFailure: undefined } - }) - expect(jobTrace).toHaveBeenCalledTimes(1) -}) diff --git a/src/renderer/src/store/plugins/localization/plugin-language-packs.test.ts b/src/renderer/src/store/plugins/localization/plugin-language-packs.test.ts deleted file mode 100644 index 20f1ce24d92..00000000000 --- a/src/renderer/src/store/plugins/localization/plugin-language-packs.test.ts +++ /dev/null @@ -1,68 +0,0 @@ -// @vitest-environment happy-dom - -import { afterEach, describe, expect, it, vi } from 'vitest' -import { i18n, setRendererPluginLanguagePacks } from '../../../i18n/i18n' -import { pluginLanguageResourceId } from '../../../../../shared/plugins/artifacts/plugin-language-pack-artifact' -import { usePluginLanguagePackStore } from './plugin-language-packs' - -afterEach(() => { - vi.restoreAllMocks() - setRendererPluginLanguagePacks([]) - usePluginLanguagePackStore.setState({ entries: [], loaded: false }) - vi.unstubAllGlobals() -}) - -describe('plugin language pack loading', () => { - it('rejects a structured-cloned cyclic catalog before i18next resource installation', async () => { - const id = 'plugin:cyclic' as const - const catalog: Record = { greeting: 'Hello' } - catalog.self = catalog - const response = structuredClone([ - { - id, - resourceLanguage: pluginLanguageResourceId(id), - pluginKey: 'cyclic', - locale: 'en', - catalog - } - ]) - vi.stubGlobal('window', { - api: { plugins: { listLanguagePacks: vi.fn().mockResolvedValue(response) } } - }) - - await usePluginLanguagePackStore.getState().fetchEntries() - const packs = usePluginLanguagePackStore.getState().entries - - expect(() => setRendererPluginLanguagePacks(packs)).not.toThrow() - expect(packs).toEqual([]) - }) - - it('rejects an inconsistent resource language before i18next owns its cleanup', async () => { - vi.stubGlobal('window', { - api: { - plugins: { - listLanguagePacks: vi.fn().mockResolvedValue([ - { - id: 'plugin:bad', - resourceLanguage: 'plugin.bad', - pluginKey: 'bad', - locale: 'en', - catalog: {} - } - ]) - } - } - }) - - await usePluginLanguagePackStore.getState().fetchEntries() - setRendererPluginLanguagePacks(usePluginLanguagePackStore.getState().entries) - const removeResourceBundle = vi - .spyOn(i18n, 'removeResourceBundle') - .mockImplementation((language) => { - throw new Error(`invalid resource language: ${language}`) - }) - - expect(() => setRendererPluginLanguagePacks([])).not.toThrow() - expect(removeResourceBundle).not.toHaveBeenCalled() - }) -}) diff --git a/tests/tools/win-update-e2e/README.md b/tests/tools/win-update-e2e/README.md index b7f83909f24..72bd536deaf 100644 --- a/tests/tools/win-update-e2e/README.md +++ b/tests/tools/win-update-e2e/README.md @@ -60,8 +60,8 @@ Or directly: `node tests/tools/win-update-e2e/run.mjs --from ... --to ... --expe - **`cold-restore`** — **today's** behavior and the baseline that must keep passing against current `main`. The installer's path sweep kills the in-dir - daemon, so: old daemon PID is **dead**, a **fresh** daemon exists, scrollback - is cold-restored (best-effort), a new terminal is interactive, and **zero** + daemon, so: old daemon PID is **dead**, a **fresh** daemon exists, a new + terminal is interactive, and **zero** unexpected console/terminal windows appear. - **`survival`** — the Phase 1 target. Daemon PID **unchanged** across the update, marker process **still alive**, the pre-update session still @@ -210,10 +210,6 @@ powershell -File tests/tools/win-update-e2e/window-enum.ps1 ## Known limitations -- **Scrollback fidelity is best-effort.** A production build renders the - terminal with WebGL, so xterm text is not reliably in the DOM and the e2e - `SerializeAddon` is not exposed. When text cannot be read the check reports - `INFO` (unknown), never a false `FAIL`. - **Daemon file log** does not exist yet in packaged builds (the fork's stdio is suppressed). The "daemon log free of ERROR lines" assertion is `INFO` until Phase 0 daemon logging lands, then it reads `/logs/daemon.log`. diff --git a/tests/tools/win-update-e2e/assertions.mjs b/tests/tools/win-update-e2e/assertions.mjs index debe852f739..9ab71bd908b 100644 --- a/tests/tools/win-update-e2e/assertions.mjs +++ b/tests/tools/win-update-e2e/assertions.mjs @@ -1,4 +1,4 @@ -// Update profiles: cold-restore requires old-daemon death/new daemon, best-effort scrollback, new-terminal input and no flashes. +// Update profiles: cold-restore requires old-daemon death/new daemon, new-terminal input and no flashes. // survival requires unchanged daemon, live marker, original-session echo/Ctrl+C and no flashes. const CONSOLE_HOST_PROCESSES = new Set([ @@ -103,13 +103,6 @@ function coldRestoreAssertions(ctx) { 'new daemon pid, alive', `post pid ${ctx.postDaemonPid} (alive: ${ctx.postDaemonAlive})` ), - // Report null scraped buffer text as informational because WebGL may expose no DOM rows. - assertion( - 'previous terminals show restored scrollback (best-effort)', - ctx.scrollbackRestored === null ? null : ctx.scrollbackRestored, - 'prior output text present after restore', - ctx.scrollbackRestored === null ? 'unknown (renderer opaque)' : String(ctx.scrollbackRestored) - ), assertion( 'new terminal is interactive (typed input echoes)', Boolean(ctx.echoObserved), diff --git a/tests/tools/win-update-e2e/run.mjs b/tests/tools/win-update-e2e/run.mjs index ff58d4f0bf8..59f6c107042 100644 --- a/tests/tools/win-update-e2e/run.mjs +++ b/tests/tools/win-update-e2e/run.mjs @@ -16,7 +16,6 @@ import { createTerminalTab, listTabIds, startMarker, - readTerminalTextBestEffort, closeApp, captureFailureDiagnostics } from './app-driver.mjs' @@ -194,8 +193,6 @@ async function runProof(ctx, args) { log('daemon', `pre-update daemon pid=${preDaemon.pid} appVersion=${preDaemon.appVersion}`) log('daemon', `pre-update daemon exe: ${preDaemon.exePath ?? '(unknown)'}`) - const preScrollback = await readTerminalTextBestEffort(session.page) - // Close app normally; the detached daemon must remain alive. // Allow renderer acknowledgement and teardown; a tree kill invalidates survival evidence. await closeApp(session.app, 45_000, { allowForceKill: false }) @@ -248,7 +245,6 @@ async function runProof(ctx, args) { heartbeatFile, preDaemon, userDataDir, - preScrollback, echoBeforeUpdate }) evidence.postDaemon?.pids?.forEach((p) => created.daemonPids.add(p)) @@ -274,7 +270,7 @@ async function runProof(ctx, args) { } async function gatherEvidence(args) { - const { profile, page, runDir, heartbeatFile, preDaemon, userDataDir, preScrollback } = args + const { profile, page, runDir, heartbeatFile, preDaemon, userDataDir } = args const postDaemon = resolveScopedDaemon(userDataDir) if (profile === 'survival') { @@ -316,8 +312,6 @@ async function gatherEvidence(args) { } } - const postScrollback = await readTerminalTextBestEffort(page) - const scrollbackRestored = scrollbackFidelity(preScrollback, postScrollback) await createTerminalTab(page) const echoObserved = await probeEcho(page, runDir, 'echo-fresh') const ctrlCInterrupted = await probeCtrlCOnFreshLoop(page, runDir) @@ -327,7 +321,6 @@ async function gatherEvidence(args) { postDaemonPid: postDaemon.pid, postDaemonAlive: postDaemon.pid != null && isPidAlive(postDaemon.pid), postDaemon, - scrollbackRestored, echoObserved, ctrlCInterrupted } @@ -400,22 +393,6 @@ async function heartbeatAdvancedSince(heartbeatFile, sinceMs) { return fileMtimeMs(heartbeatFile) > sinceMs } -function scrollbackFidelity(before, after) { - // WebGL renderer can leave both empty; report unknown (null) rather than a - // false failure. When text is available, check a stable prefix survived. - if (!before || !before.trim() || !after || !after.trim()) { - return null - } - const marker = before - .trim() - .split('\n') - .find((l) => l.trim().length > 3) - if (!marker) { - return null - } - return after.includes(marker.trim()) -} - export function readDaemonLog(userDataDir) { // Inspect JSONL by event name: fail fatal/invalid-token records, tolerate suppressed native errors and expected version-skew hello rejections. // For non-JSON lines, retain raw FATAL matching for crash dumps. diff --git a/tests/tools/win-update-e2e/serve-switch.mjs b/tests/tools/win-update-e2e/serve-switch.mjs index bea38abf9f2..a1a71aa9e24 100644 --- a/tests/tools/win-update-e2e/serve-switch.mjs +++ b/tests/tools/win-update-e2e/serve-switch.mjs @@ -157,7 +157,6 @@ async function run(ctx) { const serve = await startOrcaServe(installed.exePath, userDataDir) ctx.serve = serve const daemon = serve.readiness.health?.terminalDaemon - check('orca serve chose orcad', serve.stderr().includes('[serve] running on orcad')) check( 'orcad adopted the relocated daemon', daemon?.state === 'live' && daemon.pid === before.pid, From 1b123a929304042af529c97d19ffac694917c96e Mon Sep 17 00:00:00 2001 From: OrcaWin Date: Mon, 9 Nov 2026 03:12:21 -0800 Subject: [PATCH 13/90] test: remove low-value work budgets and relocation selftest (#40294) Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com> --- .../regex/regex-filter.test.ts | 35 -- .../diffs/native-chat-turn-diffs.test.ts | 23 -- .../NativeChatBackgroundTasksStatus.test.tsx | 54 +-- .../native-chat-row-height-estimate.test.ts | 28 -- ...ace-cleanup-enrichment-performance.test.ts | 341 +----------------- tests/tools/daemon-relocation-spike/README.md | 6 +- tests/tools/daemon-relocation-spike/cli.mjs | 10 +- .../loaded-module-probe.mjs | 2 +- .../daemon-relocation-spike/selftest.mjs | 156 -------- tests/tools/daemon-relocation-spike/spike.mjs | 10 +- .../daemon-relocation-spike/tier-file-set.mjs | 1 - 11 files changed, 7 insertions(+), 659 deletions(-) delete mode 100644 tests/tools/daemon-relocation-spike/selftest.mjs diff --git a/src/main/browser/extensions/declarative-net-request/regex/regex-filter.test.ts b/src/main/browser/extensions/declarative-net-request/regex/regex-filter.test.ts index b84800c3675..b8cbbc796e8 100644 --- a/src/main/browser/extensions/declarative-net-request/regex/regex-filter.test.ts +++ b/src/main/browser/extensions/declarative-net-request/regex/regex-filter.test.ts @@ -145,26 +145,6 @@ describe('translated regex semantics', () => { }) }) -// V8 reruns a runaway regex on its linear-time engine only when that engine can run it: no case -// folding flag or (?i:...) group, and no repetition replicated past 16. -describe('linear-time engine contract', () => { - it.each([ - 'ADS\\.js', - '(?i)ab(?-i:C)|D', - '[[:alpha:]_]+[^x]', - '^https?://[a-z0-9]{3,8}\\.com/[0-9a-f]{17}', - '\\b{50}x{3,}?', - '(a+)+$', - '(?:(?:ab){4}){5}' - ])('%s', (pattern) => { - const { flags, source } = compile(pattern) - expect(flags).toBe('') - expect(source).not.toMatch(/\(\?[a-z-]*i/) - // Counted repetitions without captures are copied out. - expect(source).not.toContain('{') - }) -}) - describe('regexSubstitution', () => { it('accepts only \\0-\\9 within the group count and \\\\', () => { expect(isValidRegexSubstitution('\\1', 1)).toBe(true) @@ -197,18 +177,3 @@ describe('regexSubstitution', () => { ) }) }) - -describe('required literal', () => { - it.each([ - ['^https?://[a-z]+\\.example\\.com/ads/', '.example.com/ads/'], - ['(?:foo|bar)baz', 'baz'], - ['a+bcdef', 'bcdef'], - ['ab?cdefg', 'cdefg'], - ['x*', ''], - ['ABC', 'abc'], - ['(?:https?://)?(tracker\\.net)/', 'tracker.net'] - ])('%s → %s', (pattern, expected) => { - const result = translateDnrRegex(pattern, { caseSensitive: true, requireCapturing: false }) - expect(result.ok && result.requiredLiteral).toBe(expected) - }) -}) diff --git a/src/renderer/src/components/native-chat/tools/diffs/native-chat-turn-diffs.test.ts b/src/renderer/src/components/native-chat/tools/diffs/native-chat-turn-diffs.test.ts index c13467f3274..9be1f94c686 100644 --- a/src/renderer/src/components/native-chat/tools/diffs/native-chat-turn-diffs.test.ts +++ b/src/renderer/src/components/native-chat/tools/diffs/native-chat-turn-diffs.test.ts @@ -1,10 +1,6 @@ import { describe, expect, it } from 'vitest' import type { NativeChatMessage } from '../../../../../../shared/native-chat/native-chat-types' -import { - buildEditSummaries, - buildEditCards -} from '../../../../../../shared/native-chat/tools/native-chat-edit-cards' import { nativeChatTurnDiffs } from '../../../../../../shared/native-chat/tools/native-chat-turn-diffs' function diff(id: string, path: string, patch = '@@ -1 +1 @@\n-old\n+new'): NativeChatMessage { @@ -82,23 +78,4 @@ describe('turn diff rollups', () => { expect(result.get('one')?.added).toBe(1) expect(result.get('two')?.files).toHaveLength(1) }) - - it('caches counts and deferred card models separately and refreshes new results', () => { - const message = diff('a', 'a.ts') - const summary = [...buildEditSummaries(message.blocks).values()][0]!.files - expect([...buildEditSummaries([...message.blocks]).values()][0]!.files).toBe(summary) - expect(summary[0]).not.toHaveProperty('lines') - const first = [...buildEditCards(message.blocks).editCards.values()][0]!.files - expect([...buildEditCards([...message.blocks]).editCards.values()][0]!.files).toBe(first) - message.blocks = [ - message.blocks[0]!, - { type: 'tool-result', output: '@@ -0,0 +1,2 @@\n+one\n+two' } - ] - const updated = [...buildEditCards(message.blocks).editCards.values()][0]!.files - expect(updated).not.toBe(first) - expect(updated[0]?.added).toBe(2) - const updatedSummary = [...buildEditSummaries(message.blocks).values()][0]!.files - expect(updatedSummary).not.toBe(summary) - expect(updatedSummary[0]?.added).toBe(2) - }) }) diff --git a/src/renderer/src/components/native-chat/tools/tasks/NativeChatBackgroundTasksStatus.test.tsx b/src/renderer/src/components/native-chat/tools/tasks/NativeChatBackgroundTasksStatus.test.tsx index d39bcee6f19..311c195e851 100644 --- a/src/renderer/src/components/native-chat/tools/tasks/NativeChatBackgroundTasksStatus.test.tsx +++ b/src/renderer/src/components/native-chat/tools/tasks/NativeChatBackgroundTasksStatus.test.tsx @@ -2,62 +2,12 @@ import '@testing-library/jest-dom/vitest' -import { act, cleanup, fireEvent, render, screen } from '@testing-library/react' -import { Profiler } from 'react' +import { cleanup, fireEvent, render, screen } from '@testing-library/react' import { afterEach, expect, it, vi } from 'vitest' import { NativeChatBackgroundTasksStatus } from './NativeChatBackgroundTasksStatus' -afterEach(() => { - cleanup() - vi.useRealTimers() -}) - -/** Own disclosure outside the strip so temporary roster gaps cannot reset expansion. */ - -it('lets the 1 Hz tick sleep while every row has settled, with each run frozen', () => { - vi.useFakeTimers() - vi.setSystemTime(1_000_000) - const committed = vi.fn() - const finished = (id: string, firstObservedAt: number, settledAt: number) => ({ - id, - providerId: `task-${id}`, - kind: 'agent' as const, - description: `child ${id}`, - state: 'done' as const, - membership: 'settled' as const, - outcome: 'succeeded' as const, - firstObservedAt, - observedAt: settledAt, - settledAt, - stoppable: false, - invocation: { invocationId: `spawn-${id}`, generation: 1 } - }) - render( - - {}} - isVisible - tasks={[]} - settledTasks={[]} - childViews={[finished('a', 400_000, 520_000), finished('b', 700_000, 760_000)]} - indicatorActive - supportsTaskStop - offersStopAll={false} - stoppingTaskIds={new Set()} - stoppingAll={false} - onStop={() => {}} - /> - - ) - const rows = screen.getAllByRole('listitem').map((row) => row.textContent) - expect(rows).toEqual(['child a · Agent2m 0s', 'child b · Agent1m 0s']) - committed.mockClear() - act(() => vi.advanceTimersByTime(5_000)) - expect(committed).not.toHaveBeenCalled() - expect(vi.getTimerCount()).toBe(0) -}) +afterEach(cleanup) it("shows an agent by the provider's id, beside its own Stop, and leaves command rows inert", () => { const running = (id: string, kind: 'agent' | 'command') => ({ diff --git a/src/renderer/src/components/native-chat/viewport/virtualization/native-chat-row-height-estimate.test.ts b/src/renderer/src/components/native-chat/viewport/virtualization/native-chat-row-height-estimate.test.ts index 85ac5842059..dfbeaa8a79e 100644 --- a/src/renderer/src/components/native-chat/viewport/virtualization/native-chat-row-height-estimate.test.ts +++ b/src/renderer/src/components/native-chat/viewport/virtualization/native-chat-row-height-estimate.test.ts @@ -4,7 +4,6 @@ import { buildNativeChatTranscriptSlots } from '../../conversation/slots/native- import { describe, expect, it } from 'vitest' import type { NativeChatMessage } from '../../../../../../shared/native-chat/native-chat-types' import { - DEFAULT_ROW_TYPOGRAPHY, estimateNativeChatRowHeight, nativeChatRowContentMetrics } from './native-chat-row-height-estimate' @@ -32,33 +31,6 @@ describe('transcript row height estimate', () => { }) }) -it('caps a long-text height estimate with either supported line height', () => { - const row = message('x'.repeat(100_000)) - { - const metrics = nativeChatRowContentMetrics(row) - expect( - estimateNativeChatRowHeight(metrics, { - hasReceipt: false, - hasStatus: false, - hasTurnDiff: false - }) - ).toBe(1600) - // The same wrapping width with a different line height needs a fresh capped estimate. - const small = { ...DEFAULT_ROW_TYPOGRAPHY, lineHeightPx: 16 } - expect( - estimateNativeChatRowHeight( - nativeChatRowContentMetrics(row, small), - { - hasReceipt: false, - hasStatus: false, - hasTurnDiff: false - }, - small - ) - ).toBe(1600) - } -}) - it('keeps complete multi-block markdown while estimating a capped row', () => { const row = message('unused') row.blocks = [ diff --git a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-enrichment-performance.test.ts b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-enrichment-performance.test.ts index a9f38825489..b8680922859 100644 --- a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-enrichment-performance.test.ts +++ b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-enrichment-performance.test.ts @@ -1,4 +1,4 @@ -import { afterEach, describe, expect, it, vi } from 'vitest' +import { describe, expect, it, vi } from 'vitest' import type { AppState } from '../../types' import type { WorkspaceCleanupScanArgs, @@ -14,55 +14,6 @@ import { makeCandidate } from './workspace-cleanup-slice-test-harness' -type GlobalCollectionScanCounts = { - openFiles: number - retainedAgents: number - agentStatuses: number -} - -const ALPHA_ID = 'repo-alpha::/workspace/alpha' -const BETA_ID = 'repo-beta::/workspace/beta' -const PROJECTION_CANDIDATE_COUNT = 1_000 - -function countOpenFileScans( - openFiles: AppState['openFiles'], - counts: GlobalCollectionScanCounts -): AppState['openFiles'] { - return new Proxy(openFiles, { - get(target, property, receiver) { - if (property === Symbol.iterator) { - return () => { - counts.openFiles += 1 - return target[Symbol.iterator]() - } - } - if (property === 'filter') { - return (predicate: (file: AppState['openFiles'][number]) => boolean) => { - counts.openFiles += 1 - return target.filter(predicate) - } - } - // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy get trap default forward. - return Reflect.get(target, property, receiver) - } - }) -} - -function countRecordScans(record: T, onScan: () => void): T { - return new Proxy(record, { - ownKeys(target) { - onScan() - return Reflect.ownKeys(target) - } - }) -} - -function resetGlobalCollectionScanCounts(counts: GlobalCollectionScanCounts): void { - counts.openFiles = 0 - counts.retainedAgents = 0 - counts.agentStatuses = 0 -} - function makePerformanceCandidate(index: number, fingerprintSuffix = 'stream') { return makeCandidate({ worktreeId: `repo-${index}::/workspace/${index}`, @@ -74,296 +25,6 @@ function makePerformanceCandidate(index: number, fingerprintSuffix = 'stream') { } describe('workspace cleanup enrichment performance', () => { - afterEach(() => { - vi.restoreAllMocks() - }) - - it('scans global collections once per progress and final pass without changing results', async () => { - vi.spyOn(Date, 'now').mockReturnValue(NOW) - const pending = deferred() - let onProgress: ((progress: WorkspaceCleanupScanProgress) => void) | undefined - const scan = vi.fn( - ( - _args?: WorkspaceCleanupScanArgs, - progressCallback?: (progress: WorkspaceCleanupScanProgress) => void - ) => { - onProgress = progressCallback - return pending.promise - } - ) - installWorkspaceCleanupApi(scan) - - const alphaTab = { id: 'tab-alpha', title: 'shell' } - const betaTab = { id: 'tab-beta', title: 'shell' } - const alphaWorking = { - paneKey: 'tab-alpha:11111111-1111-4111-8111-111111111111', - state: 'working', - connectionId: null, - prompt: '', - updatedAt: NOW, - stateStartedAt: NOW, - stateHistory: [] - } - const betaDone = { - paneKey: 'tab-beta:22222222-2222-4222-8222-222222222222', - state: 'done', - prompt: '', - updatedAt: NOW, - stateStartedAt: NOW, - stateHistory: [] - } - const counts: GlobalCollectionScanCounts = { - openFiles: 0, - retainedAgents: 0, - agentStatuses: 0 - } - const openFiles = countOpenFileScans( - [ - { - id: 'alpha-dirty', - worktreeId: ALPHA_ID, - filePath: '/workspace/alpha/dirty.ts', - relativePath: 'dirty.ts', - language: 'typescript', - isDirty: true - }, - { - id: 'alpha-clean', - worktreeId: ALPHA_ID, - filePath: '/workspace/alpha/clean.ts', - relativePath: 'clean.ts', - language: 'typescript', - isDirty: false - }, - { - id: 'beta-clean', - worktreeId: BETA_ID, - filePath: '/workspace/beta/clean.ts', - relativePath: 'clean.ts', - language: 'typescript', - isDirty: false - } - ] as AppState['openFiles'], - counts - ) - const retainedAgentsByPaneKey = countRecordScans( - { - 'tab-alpha:retained': { - entry: { ...alphaWorking, paneKey: 'tab-alpha:retained', state: 'done' }, - worktreeId: ALPHA_ID, - tab: alphaTab, - agentType: 'codex', - startedAt: NOW - }, - 'tab-beta:retained': { - entry: { ...betaDone, paneKey: 'tab-beta:retained', state: 'working' }, - worktreeId: BETA_ID, - tab: betaTab, - agentType: 'codex', - startedAt: NOW - } - } as unknown as AppState['retainedAgentsByPaneKey'], - () => { - counts.retainedAgents += 1 - } - ) - const agentStatusByPaneKey = countRecordScans( - { - [alphaWorking.paneKey]: alphaWorking, - [betaDone.paneKey]: betaDone - } as AppState['agentStatusByPaneKey'], - () => { - counts.agentStatuses += 1 - } - ) - const candidates = [ - makeCandidate({ - worktreeId: ALPHA_ID, - repoId: 'repo-alpha', - displayName: 'alpha', - path: '/workspace/alpha', - blockers: ['dismissed'], - fingerprint: 'alpha-fingerprint' - }), - makeCandidate({ - worktreeId: BETA_ID, - repoId: 'repo-beta', - displayName: 'beta', - path: '/workspace/beta', - fingerprint: 'beta-fingerprint' - }), - ...Array.from({ length: PROJECTION_CANDIDATE_COUNT - 2 }, (_, index) => - makePerformanceCandidate(index + 2, 'projection') - ) - ] - const tabsByWorktree = Object.fromEntries( - candidates.map((candidate, index) => { - if (index === 0) { - return [candidate.worktreeId, [alphaTab]] - } - if (index === 1) { - return [candidate.worktreeId, [betaTab]] - } - return [candidate.worktreeId, [{ id: `tab-projection-${index}`, title: 'shell' }]] - }) - ) as unknown as AppState['tabsByWorktree'] - const store = createCleanupTestStore() - store.setState({ - activeWorktreeId: BETA_ID, - tabsByWorktree, - openFiles, - browserTabsByWorktree: { - [ALPHA_ID]: [{}] - } as unknown as AppState['browserTabsByWorktree'], - retainedAgentsByPaneKey, - agentStatusByPaneKey, - lastVisitedAtByWorktreeId: { [ALPHA_ID]: NOW - 1 } - } as Partial) - - const scanPromise = store.getState().scanWorkspaceCleanup() - expect(counts).toEqual({ openFiles: 1, retainedAgents: 0, agentStatuses: 1 }) - resetGlobalCollectionScanCounts(counts) - onProgress?.({ - scanId: 'performance-scan', - scannedAt: NOW, - scannedWorktreeCount: candidates.length, - totalWorktreeCount: candidates.length, - candidates, - errors: [], - candidateMode: 'append' - }) - - await vi.waitFor(() => { - expect(store.getState().workspaceCleanupProgress?.scannedWorktreeCount).toBe( - candidates.length - ) - }) - expect(counts).toEqual({ openFiles: 1, retainedAgents: 1, agentStatuses: 1 }) - const progressCandidates = store.getState().workspaceCleanupScan?.candidates - expect(progressCandidates?.[0]).toMatchObject({ - blockers: ['dirty-editor-buffer', 'live-agent', 'recent-visible-context'], - localContext: { - terminalTabCount: 1, - cleanEditorTabCount: 1, - browserTabCount: 1, - retainedDoneAgentCount: 1 - } - }) - expect(progressCandidates?.[1]).toMatchObject({ - blockers: ['active-workspace'], - localContext: { - terminalTabCount: 1, - cleanEditorTabCount: 1, - browserTabCount: 0, - retainedDoneAgentCount: 0 - } - }) - - resetGlobalCollectionScanCounts(counts) - pending.resolve({ scannedAt: NOW, candidates, errors: [] }) - const finalScan = await scanPromise - - expect(counts).toEqual({ openFiles: 1, retainedAgents: 0, agentStatuses: 0 }) - expect(finalScan.candidates).toEqual(progressCandidates) - }) - - it('caps terminal candidate probes for streamed and final enrichment', async () => { - const candidateCount = WORKSPACE_CLEANUP_ENRICHMENT_CONCURRENCY + 3 - const streamCandidates = Array.from({ length: candidateCount }, (_, index) => - makePerformanceCandidate(index) - ) - const finalCandidates = streamCandidates.map((candidate, index) => ({ - ...candidate, - fingerprint: `fingerprint-${index}-final` - })) - const tabsByWorktree = Object.fromEntries( - streamCandidates.map((candidate, index) => [ - candidate.worktreeId, - [{ id: `tab-${index}`, title: 'shell' }] - ]) - ) as AppState['tabsByWorktree'] - const ptyIdsByTabId = Object.fromEntries( - streamCandidates.map((_, index) => [`tab-${index}`, [`pty-${index}`]]) - ) - const pending = deferred() - let onProgress: ((progress: WorkspaceCleanupScanProgress) => void) | undefined - const scan = vi.fn( - ( - _args?: WorkspaceCleanupScanArgs, - progressCallback?: (progress: WorkspaceCleanupScanProgress) => void - ) => { - onProgress = progressCallback - return pending.promise - } - ) - installWorkspaceCleanupApi(scan) - - type ProbePhase = 'stream' | 'final' - let phase: ProbePhase = 'stream' - let probeGate = deferred() - const active: Record = { stream: 0, final: 0 } - const peak: Record = { stream: 0, final: 0 } - const hasChildProcesses = vi.fn(async () => { - const callPhase = phase - const callGate = probeGate - active[callPhase] += 1 - peak[callPhase] = Math.max(peak[callPhase], active[callPhase]) - await callGate.promise - active[callPhase] -= 1 - return false - }) - ;( - globalThis.window as unknown as { - api: { - pty: { - hasChildProcesses: typeof hasChildProcesses - getForegroundProcess: ReturnType - } - } - } - ).api.pty = { - hasChildProcesses, - getForegroundProcess: vi.fn().mockResolvedValue('zsh') - } - const store = createCleanupTestStore() - store.setState({ tabsByWorktree, ptyIdsByTabId } as Partial) - - const scanPromise = store.getState().scanWorkspaceCleanup() - onProgress?.({ - scanId: 'bounded-scan', - scannedAt: NOW, - scannedWorktreeCount: candidateCount, - totalWorktreeCount: candidateCount, - candidates: streamCandidates, - errors: [], - candidateMode: 'append' - }) - - await vi.waitFor(() => { - expect(active.stream).toBe(WORKSPACE_CLEANUP_ENRICHMENT_CONCURRENCY) - }) - probeGate.resolve() - await vi.waitFor(() => { - expect(store.getState().workspaceCleanupProgress?.scannedWorktreeCount).toBe(candidateCount) - }) - expect(peak.stream).toBe(WORKSPACE_CLEANUP_ENRICHMENT_CONCURRENCY) - - phase = 'final' - probeGate = deferred() - pending.resolve({ scannedAt: NOW, candidates: finalCandidates, errors: [] }) - await vi.waitFor(() => { - expect(active.final).toBe(WORKSPACE_CLEANUP_ENRICHMENT_CONCURRENCY) - }) - probeGate.resolve() - const finalScan = await scanPromise - - expect(peak.final).toBe(WORKSPACE_CLEANUP_ENRICHMENT_CONCURRENCY) - expect(hasChildProcesses).toHaveBeenCalledTimes(candidateCount * 2) - expect(finalScan.candidates.map((candidate) => candidate.worktreeId)).toEqual( - finalCandidates.map((candidate) => candidate.worktreeId) - ) - }) - it('drains streamed enrichment before projecting the final scan', async () => { const candidateCount = WORKSPACE_CLEANUP_ENRICHMENT_CONCURRENCY + 3 const candidates = Array.from({ length: candidateCount }, (_, index) => diff --git a/tests/tools/daemon-relocation-spike/README.md b/tests/tools/daemon-relocation-spike/README.md index ac55d9adddf..823e9437f4f 100644 --- a/tests/tools/daemon-relocation-spike/README.md +++ b/tests/tools/daemon-relocation-spike/README.md @@ -39,9 +39,6 @@ node tests/tools/daemon-relocation-spike/spike.mjs \ --work-dir \ [--tier full|no-gpu|minimal] \ [--keep-work-dir] - -# Offline logic validation (any OS, no build, no launch): -node tests/tools/daemon-relocation-spike/spike.mjs --selftest ``` Exit code is `0` only when the run **PASSES**: daemon ready, PTY echo @@ -138,8 +135,7 @@ handles those by construction (they are copied, so nothing opens the originals). ## What remains unverified until CI runs it This session has **no build**, so the launch path is unproven. Verified here: -`node --check` on every `.mjs`, a green `--selftest`, and clean -`pnpm exec oxlint`. Open questions the real CI run must answer: +`node --check` on every `.mjs` and clean `pnpm exec oxlint`. Open questions the real CI run must answer: - Whether `TIER_MINIMAL` (no top-level DLLs) boots `Orca.exe` as node at all, or whether run-as-node still needs `ffmpeg.dll` / others — this is the core diff --git a/tests/tools/daemon-relocation-spike/cli.mjs b/tests/tools/daemon-relocation-spike/cli.mjs index f1f99ab587e..333439c7bb2 100644 --- a/tests/tools/daemon-relocation-spike/cli.mjs +++ b/tests/tools/daemon-relocation-spike/cli.mjs @@ -7,7 +7,6 @@ daemon-relocation-spike — minimal relocated daemon-host file-set probe (Window Usage: node tests/tools/daemon-relocation-spike/spike.mjs --app-dir --work-dir [--tier ] - node tests/tools/daemon-relocation-spike/spike.mjs --selftest Required (launch mode): --app-dir Path to a packaged win-unpacked build (contains Orca.exe) @@ -23,9 +22,6 @@ Options: minimal = Orca.exe + icudtl.dat + both snapshots + daemon bundle + node-pty only (no top-level DLLs) --keep-work-dir Leave --work-dir on disk after the run (for inspection) - --selftest Validate arg parsing, tier defs, and the module-path filter - against synthetic inputs. No real build or launch. Exits - 0 on pass, non-zero on failure. -h, --help Show this help Exit code is 0 only when the run PASSES: daemon ready, PTY echo round-trips the @@ -36,15 +32,11 @@ export function getUsage() { return USAGE } -// Parse sliced argv into help/selftest/launch/error; return usage errors for caller reporting. +// Parse sliced argv into help/launch/error; return usage errors for caller reporting. export function parseArgs(argv) { if (argv.includes('-h') || argv.includes('--help')) { return { help: true } } - if (argv.includes('--selftest')) { - return { selftest: true } - } - let appDir = '' let workDir = '' let tier = 'full' diff --git a/tests/tools/daemon-relocation-spike/loaded-module-probe.mjs b/tests/tools/daemon-relocation-spike/loaded-module-probe.mjs index 956bb4646e4..d95750db123 100644 --- a/tests/tools/daemon-relocation-spike/loaded-module-probe.mjs +++ b/tests/tools/daemon-relocation-spike/loaded-module-probe.mjs @@ -7,7 +7,7 @@ const HERE = import.meta.dirname const POWERSHELL = 'powershell.exe' const PS_ARGS = ['-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass'] -// Always use case-insensitive win32 path semantics so offline selftests handle backslashes on any OS. +// Compare module paths with case-insensitive Windows semantics. function normalizeForCompare(p) { return win32 .normalize(p) diff --git a/tests/tools/daemon-relocation-spike/selftest.mjs b/tests/tools/daemon-relocation-spike/selftest.mjs deleted file mode 100644 index cf835050174..00000000000 --- a/tests/tools/daemon-relocation-spike/selftest.mjs +++ /dev/null @@ -1,156 +0,0 @@ -// Validate args, tier/copy plans and module filters offline; return true on all-pass without a build/copy/launch. - -import { parseArgs, TIERS } from './cli.mjs' -import { TIER_DEFINITIONS, selectTierDlls, resolveTierFileSet, GPU_DLLS } from './tier-file-set.mjs' -import { findAppDirResidentModules } from './loaded-module-probe.mjs' - -function makeSyntheticInventory() { - const unpackedRoot = 'C:\\App\\resources\\app.asar.unpacked' - const f = (path) => ({ path, exists: true, size: 1 }) - return { - appDir: 'C:\\App', - unpackedRoot, - hostExe: { name: 'Orca.exe', ...f('C:\\App\\Orca.exe') }, - runtimeData: [ - { name: 'icudtl.dat', ...f('C:\\App\\icudtl.dat') }, - { name: 'snapshot_blob.bin', ...f('C:\\App\\snapshot_blob.bin') }, - { name: 'v8_context_snapshot.bin', ...f('C:\\App\\v8_context_snapshot.bin') } - ], - topLevelDlls: [ - { name: 'ffmpeg.dll', ...f('C:\\App\\ffmpeg.dll') }, - { name: 'libEGL.dll', ...f('C:\\App\\libEGL.dll') }, - { name: 'libGLESv2.dll', ...f('C:\\App\\libGLESv2.dll') }, - { name: 'vk_swiftshader.dll', ...f('C:\\App\\vk_swiftshader.dll') }, - { name: 'vulkan-1.dll', ...f('C:\\App\\vulkan-1.dll') }, - { name: 'd3dcompiler_47.dll', ...f('C:\\App\\d3dcompiler_47.dll') } - ], - daemonEntry: { - name: 'daemon-entry.js', - path: `${unpackedRoot}\\out\\main\\daemon-entry.js`, - exists: true, - size: 1, - relFromUnpacked: 'out/main/daemon-entry.js' - }, - // Model node-pty at resources/node_modules, sibling to app.asar.unpacked, so copy-plan regressions cannot hide in synthetic layout. - nodePty: { - exists: true, - packageDir: 'C:\\App\\resources\\node_modules\\node-pty', - nativeDir: 'C:\\App\\resources\\node_modules\\node-pty\\build\\Release', - nativeRel: 'build/Release', - conptyNode: { name: 'conpty.node', path: 'x', exists: true, size: 1 } - } - } -} - -function run() { - const failures = [] - const check = (name, cond) => { - if (!cond) { - failures.push(name) - } - } - - check('help flag', parseArgs(['--help']).help === true) - check('selftest flag', parseArgs(['--selftest']).selftest === true) - check('missing app-dir errors', Boolean(parseArgs(['--work-dir', 'w']).error)) - check('missing work-dir errors', Boolean(parseArgs(['--app-dir', 'a']).error)) - check( - 'bad tier errors', - Boolean(parseArgs(['--app-dir', 'a', '--work-dir', 'w', '--tier', 'x']).error) - ) - check('unknown arg errors', Boolean(parseArgs(['--nope']).error)) - const ok = parseArgs(['--app-dir', 'a', '--work-dir', 'w', '--tier', 'no-gpu', '--keep-work-dir']) - check('valid parse launch', Boolean(ok.launch)) - check('valid parse tier', ok.launch?.tier === 'no-gpu') - check('valid parse keep', ok.launch?.keepWorkDir === true) - check( - 'default tier full', - parseArgs(['--app-dir', 'a', '--work-dir', 'w']).launch?.tier === 'full' - ) - - check( - 'all tiers defined', - TIERS.every((t) => Boolean(TIER_DEFINITIONS[t])) - ) - const dlls = makeSyntheticInventory().topLevelDlls - check('full keeps all dlls', selectTierDlls(dlls, 'full').length === 6) - check('minimal keeps no dlls', selectTierDlls(dlls, 'minimal').length === 0) - const noGpu = selectTierDlls(dlls, 'no-gpu').map((d) => d.name) - check('no-gpu keeps ffmpeg', noGpu.includes('ffmpeg.dll')) - check('no-gpu drops libEGL', !noGpu.includes('libEGL.dll')) - check( - 'no-gpu drops all gpu dlls', - noGpu.every((n) => !GPU_DLLS.has(n.toLowerCase())) - ) - check('no-gpu count is 1', noGpu.length === 1) - - const inv = makeSyntheticInventory() - for (const tier of TIERS) { - const plan = resolveTierFileSet(inv, tier) - check(`${tier}: no warnings`, plan.warnings.length === 0) - const dests = plan.ops.map((o) => o.destRel) - check(`${tier}: has exe`, dests.includes('Orca.exe')) - check(`${tier}: has icu`, dests.includes('icudtl.dat')) - // Mirror full win-unpacked paths for require/native resolution from the copy. - check( - `${tier}: has daemon entry`, - dests.includes('resources/app.asar.unpacked/out/main/daemon-entry.js') - ) - check(`${tier}: has node-pty dir`, dests.includes('resources/node_modules/node-pty')) - check( - `${tier}: node-pty op is a dir`, - plan.ops.find((o) => o.destRel === 'resources/node_modules/node-pty')?.kind === 'dir' - ) - } - const fullDests = resolveTierFileSet(inv, 'full').ops.map((o) => o.destRel) - check('full plan includes gpu dll', fullDests.includes('vulkan-1.dll')) - const minimalDests = resolveTierFileSet(inv, 'minimal').ops.map((o) => o.destRel) - check('minimal plan excludes ffmpeg', !minimalDests.includes('ffmpeg.dll')) - check('minimal plan excludes gpu dll', !minimalDests.includes('vulkan-1.dll')) - - // Missing required input surfaces a warning rather than throwing. - const brokenInv = { ...inv, nodePty: { exists: false, conptyNode: null } } - check('missing node-pty warns', resolveTierFileSet(brokenInv, 'full').warnings.length > 0) - - const appDir = 'C:\\Users\\me\\AppData\\Local\\Programs\\orca' - const modules = [ - 'C:\\Users\\me\\AppData\\Local\\Programs\\orca\\Orca.exe', - 'C:\\Windows\\System32\\kernel32.dll', - 'C:\\Users\\me\\AppData\\Local\\orca-daemon-host\\Orca.exe' - ] - const resident = findAppDirResidentModules(modules, appDir) - check('detects app-dir module', resident.length === 1) - check('detects the right module', resident[0].toLowerCase().includes('programs\\orca\\orca.exe')) - // Sibling-prefix must NOT match (C:\...\orca vs C:\...\orca-daemon-host). - check( - 'sibling prefix not matched', - findAppDirResidentModules(['C:\\a\\orca-daemon-host\\x.dll'], 'C:\\a\\orca').length === 0 - ) - // Forward/back-slash + case normalization. - check( - 'slash + case normalized', - findAppDirResidentModules(['c:/a/ORCA/x.dll'], 'C:\\A\\orca').length === 1 - ) - check( - 'relocated host has zero app-dir modules', - findAppDirResidentModules( - ['C:\\work\\daemon-host\\Orca.exe', 'C:\\Windows\\System32\\ntdll.dll'], - appDir - ).length === 0 - ) - - return failures -} - -export function runSelftest() { - const failures = run() - if (failures.length === 0) { - console.log('selftest: PASS (all checks green)') - return true - } - console.error(`selftest: FAIL (${failures.length} check(s))`) - for (const name of failures) { - console.error(` - ${name}`) - } - return false -} diff --git a/tests/tools/daemon-relocation-spike/spike.mjs b/tests/tools/daemon-relocation-spike/spike.mjs index e32a08b9f0f..1bb4b23e07d 100644 --- a/tests/tools/daemon-relocation-spike/spike.mjs +++ b/tests/tools/daemon-relocation-spike/spike.mjs @@ -1,5 +1,4 @@ // Find minimal copied run-as-node Orca files for real ConPTY without install-dir handles; Windows packaged build required. -// --selftest validates pure logic anywhere; see README.md. import { randomUUID } from 'node:crypto' import { existsSync, readFileSync, readdirSync, rmSync } from 'node:fs' @@ -11,7 +10,6 @@ import { copyHost } from './host-copy.mjs' import { launchDaemonHost } from './daemon-launch.mjs' import { runPtyEcho } from './ndjson-client.mjs' import { assessDaemonHandles } from './loaded-module-probe.mjs' -import { runSelftest } from './selftest.mjs' const HERE = import.meta.dirname const FALLBACK_PROTOCOL_VERSION = 18 @@ -273,14 +271,8 @@ async function main() { console.error(getUsage()) return 2 } - if (parsed.selftest) { - return runSelftest() ? 0 : 1 - } - if (process.platform !== 'win32') { - console.error( - 'launch mode requires Windows (ConPTY + loaded-module probe). Use --selftest elsewhere.' - ) + console.error('launch mode requires Windows (ConPTY + loaded-module probe).') return 2 } diff --git a/tests/tools/daemon-relocation-spike/tier-file-set.mjs b/tests/tools/daemon-relocation-spike/tier-file-set.mjs index cb1ee8f793f..1bdcc41743a 100644 --- a/tests/tools/daemon-relocation-spike/tier-file-set.mjs +++ b/tests/tools/daemon-relocation-spike/tier-file-set.mjs @@ -22,7 +22,6 @@ function isGpuDll(name) { return GPU_DLLS.has(name.toLowerCase()) } -// Select tier DLLs purely from inventory for offline selftests. export function selectTierDlls(topLevelDlls, tier) { const def = TIER_DEFINITIONS[tier] if (!def || def.dlls === 'none') { From ae79aaa824d188b009d1b7085a4b217056c581c9 Mon Sep 17 00:00:00 2001 From: jp-liu <79979500+jp-liu@users.noreply.github.com> Date: Mon, 9 Nov 2026 19:25:08 +0800 Subject: [PATCH 14/90] fix(ports): keep sticky External Ports header opaque on hover (#40073) The sticky External Ports header used hover:bg-accent/50, a translucent background that let scrolled port rows show through on hover. Blend the accent into the popover color so the hover state stays opaque. Fixes #40056 --- src/renderer/src/components/status-bar/PortsStatusSegment.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/src/components/status-bar/PortsStatusSegment.tsx b/src/renderer/src/components/status-bar/PortsStatusSegment.tsx index fc404ec208c..5cae8cd1c9b 100644 --- a/src/renderer/src/components/status-bar/PortsStatusSegment.tsx +++ b/src/renderer/src/components/status-bar/PortsStatusSegment.tsx @@ -209,7 +209,7 @@ export function PortsStatusSegment({ iconOnly }: PortsStatusSegmentProps): React
+})) + +import EditorPanel from './EditorPanel' + +afterEach(cleanup) + +it('keeps the side-by-side toggle when the diff panel remounts', async () => { + const file = seedEditorPlacementConsumers() + useAppStore.setState({ + updateSettings: async (updates) => + useAppStore.setState((s) => ({ settings: s.settings && { ...s.settings, ...updates } })) + }) + const first = render() + await act(async () => fireEvent.click(first.getByText('inline'))) + expect(first.getByRole('button').textContent).toBe('side-by-side') + first.unmount() + const second = render() + expect(second.getByRole('button').textContent).toBe('side-by-side') +}) diff --git a/src/renderer/src/components/editor/EditorPanel.tsx b/src/renderer/src/components/editor/EditorPanel.tsx index 6e4948cae53..d920b5c628f 100644 --- a/src/renderer/src/components/editor/EditorPanel.tsx +++ b/src/renderer/src/components/editor/EditorPanel.tsx @@ -89,6 +89,7 @@ function EditorPanelInner({ ) const editorDrafts = useAppStore(editorDraftSelector) const diffDefaultView = useAppStore((s) => s.settings?.diffDefaultView) + const updateSettings = useAppStore((s) => s.updateSettings) const customEditors = useFileCustomEditors(activeFileId, activeFile?.filePath) const markdownReviewNotesEnabled = useAppStore((s) => isMarkdownReviewNotesEnabled(s.settings)) const panelRef = useRef(null) @@ -115,15 +116,7 @@ function EditorPanelInner({ }, [clearCopiedPathToastResetTimer] ) - const [sideBySide, setSideBySide] = useState(diffDefaultView === 'side-by-side') - const [prevDiffView, setPrevDiffView] = useState(diffDefaultView) - - if (diffDefaultView !== prevDiffView) { - setPrevDiffView(diffDefaultView) - if (diffDefaultView !== undefined) { - setSideBySide(diffDefaultView === 'side-by-side') - } - } + const sideBySide = diffDefaultView === 'side-by-side' const requestedChangesMode = !!activeFile && @@ -345,7 +338,9 @@ function EditorPanelInner({ onOpenDiffTargetFile={handleOpenDiffTargetFile} onOpenPreview={handleOpenPreview} onOpenMarkdownPreview={handleOpenMarkdownPreview} - onToggleSideBySide={() => setSideBySide((prev) => !prev)} + onToggleSideBySide={() => + void updateSettings({ diffDefaultView: sideBySide ? 'inline' : 'side-by-side' }) + } onEditorToggleChange={handleEditorToggleChange} onToggleMarkdownTableOfContents={() => setMarkdownTableOfContentsVisible( diff --git a/src/renderer/src/components/editor/combined-diff/CombinedDiffViewer.tsx b/src/renderer/src/components/editor/combined-diff/CombinedDiffViewer.tsx index 4c4a27dee2c..165eebdbb1e 100644 --- a/src/renderer/src/components/editor/combined-diff/CombinedDiffViewer.tsx +++ b/src/renderer/src/components/editor/combined-diff/CombinedDiffViewer.tsx @@ -111,7 +111,6 @@ export default function CombinedDiffViewer({ setGeneration, setSectionHeights, setSections, - setSideBySide: preferences.setSideBySide, succession: buildCombinedDiffViewTabSuccession(file.id, viewStateScopeId), viewStateKey }) @@ -242,7 +241,6 @@ export default function CombinedDiffViewer({ scrollContainerRef, sectionHeights, sections, - sideBySide: preferences.sideBySide, viewStateKey }) useCombinedDiffScrollPersistence({ diff --git a/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-metadata-retention.test.tsx b/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-metadata-retention.test.tsx index d38ed6157d2..4ba6eb94852 100644 --- a/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-metadata-retention.test.tsx +++ b/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-metadata-retention.test.tsx @@ -51,7 +51,6 @@ function useReview(props: Review) { const [sections, setSections] = useState([]) const [sectionHeights, setSectionHeights] = useState>({}) const [generation, setGeneration] = useState(0) - const [sideBySide, setSideBySide] = useState(false) const registry = useCombinedDiffSectionLoadRegistry(sections) const entrySet = useCombinedDiffEntrySet({ file: props.file, @@ -67,7 +66,6 @@ function useReview(props: Review) { setGeneration, setSectionHeights, setSections, - setSideBySide, viewStateKey: props.viewStateKey }) const loader = useCombinedDiffSectionLoader({ @@ -109,7 +107,6 @@ function useReview(props: Review) { scrollContainerRef, sectionHeights, sections, - sideBySide, viewStateKey: props.viewStateKey }) return { diff --git a/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-stale-analysis-work-budget.test.tsx b/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-stale-analysis-work-budget.test.tsx index 09e2a57a626..06de4ab6c35 100644 --- a/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-stale-analysis-work-budget.test.tsx +++ b/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-stale-analysis-work-budget.test.tsx @@ -80,7 +80,6 @@ function useViewer(props: Viewer) { const [sections, setSections] = useState([]) const [sectionHeights, setSectionHeights] = useState>({}) const [generation, setGeneration] = useState(0) - const [, setSideBySide] = useState(false) const registry = useCombinedDiffSectionLoadRegistry(sections) const restore = useCombinedDiffViewRestore({ entrySet: props.entrySet, @@ -90,7 +89,6 @@ function useViewer(props: Viewer) { setGeneration, setSectionHeights, setSections, - setSideBySide, viewStateKey: props.viewStateKey }) const loader = useCombinedDiffSectionLoader({ diff --git a/src/renderer/src/components/editor/combined-diff/remember-view/combined-diff-view-cache-body-budget.test.ts b/src/renderer/src/components/editor/combined-diff/remember-view/combined-diff-view-cache-body-budget.test.ts index 575eb7ace9e..8e0071fa5dd 100644 --- a/src/renderer/src/components/editor/combined-diff/remember-view/combined-diff-view-cache-body-budget.test.ts +++ b/src/renderer/src/components/editor/combined-diff/remember-view/combined-diff-view-cache-body-budget.test.ts @@ -40,8 +40,7 @@ function view(sections: DiffSection[]): CachedCombinedDiffViewState { gitStatusSignature: 'status', sections, sectionHeights: { 0: 320 }, - loadedIndices: sections.map((_, index) => index), - sideBySide: true + loadedIndices: sections.map((_, index) => index) } } diff --git a/src/renderer/src/components/editor/combined-diff/remember-view/combined-diff-view-cache.ts b/src/renderer/src/components/editor/combined-diff/remember-view/combined-diff-view-cache.ts index 516b7f114a4..a3fb978f42f 100644 --- a/src/renderer/src/components/editor/combined-diff/remember-view/combined-diff-view-cache.ts +++ b/src/renderer/src/components/editor/combined-diff/remember-view/combined-diff-view-cache.ts @@ -7,7 +7,6 @@ export type CachedCombinedDiffViewState = { sections: DiffSection[] sectionHeights: Record loadedIndices: number[] - sideBySide: boolean } type CombinedDiffViewMemory = { diff --git a/src/renderer/src/components/editor/combined-diff/remember-view/combined-diff-view-draft-retention.test.ts b/src/renderer/src/components/editor/combined-diff/remember-view/combined-diff-view-draft-retention.test.ts index 0db464bae90..b860cc1b187 100644 --- a/src/renderer/src/components/editor/combined-diff/remember-view/combined-diff-view-draft-retention.test.ts +++ b/src/renderer/src/components/editor/combined-diff/remember-view/combined-diff-view-draft-retention.test.ts @@ -32,8 +32,7 @@ function rememberView(index: number, section: Partial = {}) { gitStatusSignature: '', sections, sectionHeights: {}, - loadedIndices: [0], - sideBySide: false + loadedIndices: [0] } }) return lease diff --git a/src/renderer/src/components/editor/combined-diff/remember-view/combined-diff-view-memory.ts b/src/renderer/src/components/editor/combined-diff/remember-view/combined-diff-view-memory.ts index 2571b01e774..8f8db141656 100644 --- a/src/renderer/src/components/editor/combined-diff/remember-view/combined-diff-view-memory.ts +++ b/src/renderer/src/components/editor/combined-diff/remember-view/combined-diff-view-memory.ts @@ -7,9 +7,8 @@ import { forgetCombinedDiffViewsShowingPath } from './combined-diff-view-cache' // Module state retains toolbar choices across viewer unmounts within this session. export const combinedDiffViewPreferences: { collapsed: boolean | null - sideBySide: boolean | null fileTreeCollapsed: boolean | null -} = { collapsed: null, sideBySide: null, fileTreeCollapsed: null } +} = { collapsed: null, fileTreeCollapsed: null } function handleCombinedDiffExternalFileChange(event: Event): void { const detail = (event as CustomEvent).detail diff --git a/src/renderer/src/components/editor/combined-diff/remember-view/use-combined-diff-view-persist.ts b/src/renderer/src/components/editor/combined-diff/remember-view/use-combined-diff-view-persist.ts index 7379ceb75d1..cdbdf7831da 100644 --- a/src/renderer/src/components/editor/combined-diff/remember-view/use-combined-diff-view-persist.ts +++ b/src/renderer/src/components/editor/combined-diff/remember-view/use-combined-diff-view-persist.ts @@ -16,7 +16,6 @@ export function useCombinedDiffViewPersist({ sectionHeights, sections, loadedIndicesRef, - sideBySide, viewStateKey }: { combinedGitStatusSignature: string @@ -27,7 +26,6 @@ export function useCombinedDiffViewPersist({ sectionHeights: Record sections: DiffSection[] loadedIndicesRef: React.RefObject> - sideBySide: boolean viewStateKey: string }): void { useEffect(() => { @@ -46,8 +44,7 @@ export function useCombinedDiffViewPersist({ sectionHeights, loadedIndices: Array.from(loadedIndicesRef.current).filter( (index) => !sections[index]?.loading - ), - sideBySide + ) } }) }, [ @@ -59,7 +56,6 @@ export function useCombinedDiffViewPersist({ scrollContainerRef, sectionHeights, sections, - sideBySide, viewStateKey ]) } diff --git a/src/renderer/src/components/editor/combined-diff/remember-view/use-combined-diff-view-restore.ts b/src/renderer/src/components/editor/combined-diff/remember-view/use-combined-diff-view-restore.ts index a2d8592580d..7a7ee57b7b8 100644 --- a/src/renderer/src/components/editor/combined-diff/remember-view/use-combined-diff-view-restore.ts +++ b/src/renderer/src/components/editor/combined-diff/remember-view/use-combined-diff-view-restore.ts @@ -43,7 +43,6 @@ export function useCombinedDiffViewRestore({ setGeneration, setSectionHeights, setSections, - setSideBySide, succession, viewStateKey }: { @@ -54,7 +53,6 @@ export function useCombinedDiffViewRestore({ setGeneration: React.Dispatch> setSectionHeights: React.Dispatch>> setSections: React.Dispatch> - setSideBySide: React.Dispatch> /** Set for tab-scoped keys so a reopened tab restores the view its closed predecessor left. */ succession?: CombinedDiffViewSuccession viewStateKey: string @@ -211,7 +209,6 @@ export function useCombinedDiffViewRestore({ sectionsRef.current = restoredSections setSections(restoredSections) setSectionHeights(cached.sectionHeights) - setSideBySide(combinedDiffViewPreferences.sideBySide ?? cached.sideBySide) loadedIndicesRef.current = new Set( cached.loadedIndices.filter((index) => { const section = restoredSections[index] @@ -288,7 +285,6 @@ export function useCombinedDiffViewRestore({ setGeneration, setSectionHeights, setSections, - setSideBySide, shouldAutoReloadFromGitStatus, treeMode, ownerKey, diff --git a/src/renderer/src/components/editor/combined-diff/review-controls/use-combined-diff-view-preferences.ts b/src/renderer/src/components/editor/combined-diff/review-controls/use-combined-diff-view-preferences.ts index b3694397718..ddcafa64296 100644 --- a/src/renderer/src/components/editor/combined-diff/review-controls/use-combined-diff-view-preferences.ts +++ b/src/renderer/src/components/editor/combined-diff/review-controls/use-combined-diff-view-preferences.ts @@ -1,15 +1,20 @@ import { useCallback, useState } from 'react' import type React from 'react' +import type { GlobalSettings } from '../../../../../../shared/global-settings-types' import type { DiffSection } from '../../diff/sections/diff-section-types' import { combinedDiffViewPreferences } from '../remember-view/combined-diff-view-memory' import { getInitialCombinedDiffSectionLoadIndices } from '../load-sections/combined-diff-initial-section-load' import type { CombinedDiffSectionLoadRegistry } from '../load-sections/combined-diff-section-load-registry' +type DiffViewSettings = Pick< + GlobalSettings, + 'diffDefaultView' | 'diffShowWhitespace' | 'diffWordWrap' +> + export type CombinedDiffViewPreferences = { fileTreeCollapsed: boolean setAllSectionsCollapsed: (collapsed: boolean) => void setFileTreeCollapsed: (collapsed: boolean) => void - setSideBySide: React.Dispatch> sideBySide: boolean toggleDiffShowWhitespace: () => void toggleDiffWordWrap: () => void @@ -26,32 +31,21 @@ export function useCombinedDiffViewPreferences({ updateSettings }: { combinedDiffFileTreeVisibleByDefault: boolean | undefined - diffDefaultView: string | undefined + diffDefaultView: DiffViewSettings['diffDefaultView'] | undefined diffShowWhitespace: boolean | undefined diffWordWrap: boolean | undefined registry: CombinedDiffSectionLoadRegistry setSections: React.Dispatch> - updateSettings: (patch: { diffShowWhitespace?: boolean; diffWordWrap?: boolean }) => unknown + updateSettings: (patch: Partial) => unknown }): CombinedDiffViewPreferences { const { loadSchedulerRef, loadedIndicesRef, sectionsRef } = registry - const [sideBySide, setSideBySide] = useState( - () => combinedDiffViewPreferences.sideBySide ?? diffDefaultView === 'side-by-side' - ) + const sideBySide = diffDefaultView === 'side-by-side' const [fileTreeCollapsed, setFileTreeCollapsedState] = useState( () => // While settings load, open the opt-in tree only for an explicit saved preference. combinedDiffViewPreferences.fileTreeCollapsed ?? combinedDiffFileTreeVisibleByDefault !== true ) - // Use settings until the first session toolbar choice, then retain that choice over global defaults. - const [prevDiffDefaultView, setPrevDiffDefaultView] = useState(diffDefaultView) - if (prevDiffDefaultView !== diffDefaultView) { - setPrevDiffDefaultView(diffDefaultView) - if (diffDefaultView !== undefined && combinedDiffViewPreferences.sideBySide === null) { - setSideBySide(diffDefaultView === 'side-by-side') - } - } - const [prevFileTreeVisibleByDefault, setPrevFileTreeVisibleByDefault] = useState( combinedDiffFileTreeVisibleByDefault ) @@ -88,11 +82,8 @@ export function useCombinedDiffViewPreferences({ ) const toggleSideBySide = useCallback(() => { - // Write module preferences outside React updaters, which may replay. - const next = !sideBySide - combinedDiffViewPreferences.sideBySide = next - setSideBySide(next) - }, [sideBySide]) + void updateSettings({ diffDefaultView: sideBySide ? 'inline' : 'side-by-side' }) + }, [sideBySide, updateSettings]) const toggleDiffWordWrap = useCallback(() => { void updateSettings({ diffWordWrap: diffWordWrap !== true }) @@ -106,7 +97,6 @@ export function useCombinedDiffViewPreferences({ fileTreeCollapsed, setAllSectionsCollapsed, setFileTreeCollapsed, - setSideBySide, sideBySide, toggleDiffShowWhitespace, toggleDiffWordWrap, diff --git a/src/renderer/src/hooks/useEditorExternalWatch-switch-back.test.tsx b/src/renderer/src/hooks/useEditorExternalWatch-switch-back.test.tsx index 71f241cca53..0b1bb5973e4 100644 --- a/src/renderer/src/hooks/useEditorExternalWatch-switch-back.test.tsx +++ b/src/renderer/src/hooks/useEditorExternalWatch-switch-back.test.tsx @@ -208,8 +208,7 @@ describe('switching back to a workspace that was not watched', () => { gitStatusSignature: 'g', sections: [section('clean.ts', false), section('dirty.ts', true)], sectionHeights: {}, - loadedIndices: [0, 1], - sideBySide: false + loadedIndices: [0, 1] } }) harness.readRuntimeFileContent.mockResolvedValue({ content: 'v1', isBinary: false }) diff --git a/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-diff-memory.test.ts b/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-diff-memory.test.ts index 2a5908a31a5..df0a23fbfd1 100644 --- a/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-diff-memory.test.ts +++ b/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-diff-memory.test.ts @@ -38,8 +38,7 @@ function mountDiff(worktreeId: string): { key: string; lease: CombinedDiffViewLe } ], sectionHeights: {}, - loadedIndices: [0], - sideBySide: true + loadedIndices: [0] }, scrollTop: 42, scrollAnchor: { key: 'source', offset: 0 } From 00374cc0c2b015cb03c11e7d8e48edfa61779bde Mon Sep 17 00:00:00 2001 From: Franz Felberer Date: Mon, 9 Nov 2026 12:31:33 +0100 Subject: [PATCH 20/90] feat(dashboard): show last messages in agent dialog when no live terminal (#40147) When a dashboard card has no live PTY (e.g. chat-session tabs), the agent dialog previously showed only the "preview unavailable" notice. It now also renders the card's stored last user/agent messages, unclamped and scrollable, below the notice. The rendering is extracted into AgentCardLastMessages and shared with the kanban card, which keeps its line clamps. Fixes #40144 Co-authored-by: Neil --- .../AgentCardLastMessages.tsx | 51 +++++++++++++++++++ .../dashboard-popout/AgentKanbanCard.tsx | 23 ++------- .../AgentTerminalDialog.test.tsx | 21 ++++++++ .../dashboard-popout/AgentTerminalDialog.tsx | 10 +++- 4 files changed, 83 insertions(+), 22 deletions(-) create mode 100644 src/renderer/src/components/dashboard-popout/AgentCardLastMessages.tsx diff --git a/src/renderer/src/components/dashboard-popout/AgentCardLastMessages.tsx b/src/renderer/src/components/dashboard-popout/AgentCardLastMessages.tsx new file mode 100644 index 00000000000..d5b6be31ec1 --- /dev/null +++ b/src/renderer/src/components/dashboard-popout/AgentCardLastMessages.tsx @@ -0,0 +1,51 @@ +import { formatAgentTypeLabel } from '../../../../shared/agent-status/presentation/agent-type-label' +import type { DashboardCard } from '../../../../shared/dashboard-snapshot' +import { useTranslate } from '@/i18n/use-translate' +import { cn } from '@/lib/utils' + +export function hasAgentCardLastMessages(card: DashboardCard): boolean { + return Boolean(card.lastUserMessage || card.lastAgentMessage) +} + +/** Kanban cards clamp to a glance; the dialog shows the stored preview unclamped. */ +export function AgentCardLastMessages({ + card, + clamp, + className +}: { + card: DashboardCard + clamp: boolean + className?: string +}): React.JSX.Element { + const t = useTranslate() + return ( +
+ {card.lastUserMessage ? ( +
+ + {t('dashboardPopout.card.you', 'You')} + {' '} + {card.lastUserMessage} +
+ ) : null} + {card.lastAgentMessage ? ( +
+ + {formatAgentTypeLabel(card.agentType)} + {' '} + {card.lastAgentMessage} +
+ ) : null} +
+ ) +} diff --git a/src/renderer/src/components/dashboard-popout/AgentKanbanCard.tsx b/src/renderer/src/components/dashboard-popout/AgentKanbanCard.tsx index ff51846d4d4..f0b18fa687e 100644 --- a/src/renderer/src/components/dashboard-popout/AgentKanbanCard.tsx +++ b/src/renderer/src/components/dashboard-popout/AgentKanbanCard.tsx @@ -8,7 +8,6 @@ import { GitPullRequestDraft } from 'lucide-react' import { AgentTypeIcon } from '@/lib/agent-type-icon' -import { formatAgentTypeLabel } from '../../../../shared/agent-status/presentation/agent-type-label' import { AgentQuestionIcon } from '@/components/AgentQuestionIcon' import { AgentStateDot } from '@/components/AgentStateDot' import { RepoIconGlyph } from '@/components/repo/repo-icon' @@ -22,6 +21,7 @@ import type { RepoIcon } from '../../../../shared/repo-icon' import { translate } from '@/i18n/i18n' import { useTranslate, type Translate } from '@/i18n/use-translate' import { DashboardHostBadge } from './DashboardHostBadge' +import { AgentCardLastMessages, hasAgentCardLastMessages } from './AgentCardLastMessages' function formatStartedAgo(startedAt: number, now: number, t: Translate = translate): string { const seconds = Math.max(0, Math.floor((now - startedAt) / 1000)) @@ -245,25 +245,8 @@ export const AgentKanbanCard = memo( {card.askSummary ? null : } - {card.lastUserMessage || card.lastAgentMessage ? ( -
- {card.lastUserMessage ? ( -
- - {t('dashboardPopout.card.you', 'You')} - {' '} - {card.lastUserMessage} -
- ) : null} - {card.lastAgentMessage ? ( -
- - {formatAgentTypeLabel(card.agentType)} - {' '} - {card.lastAgentMessage} -
- ) : null} -
+ {hasAgentCardLastMessages(card) ? ( + ) : card.task ? (
{card.task} diff --git a/src/renderer/src/components/dashboard-popout/AgentTerminalDialog.test.tsx b/src/renderer/src/components/dashboard-popout/AgentTerminalDialog.test.tsx index bffc3de2dd0..ed29e67385e 100644 --- a/src/renderer/src/components/dashboard-popout/AgentTerminalDialog.test.tsx +++ b/src/renderer/src/components/dashboard-popout/AgentTerminalDialog.test.tsx @@ -123,3 +123,24 @@ it.each([false, true])( ) } ) + +it('shows last messages when a card has no live terminal', () => { + const { rerender } = render( + {}} + onReveal={() => {}} + /> + ) + expect(screen.getByText('Roll out rc-18')).toBeInTheDocument() + expect(screen.getByText('Rollout finished')).toBeInTheDocument() + + rerender( + {}} onReveal={() => {}} /> + ) + expect(screen.queryByText('Rollout finished')).not.toBeInTheDocument() +}) diff --git a/src/renderer/src/components/dashboard-popout/AgentTerminalDialog.tsx b/src/renderer/src/components/dashboard-popout/AgentTerminalDialog.tsx index cd9c92f07f6..83505a76764 100644 --- a/src/renderer/src/components/dashboard-popout/AgentTerminalDialog.tsx +++ b/src/renderer/src/components/dashboard-popout/AgentTerminalDialog.tsx @@ -11,6 +11,7 @@ import { type DashboardRevealAgentArgs } from '../../../../shared/dashboard-snapshot' import { AgentTerminalPreview } from './AgentTerminalPreview' +import { AgentCardLastMessages, hasAgentCardLastMessages } from './AgentCardLastMessages' import { terminalPreviewUnavailableMessage } from './terminal-preview-unavailable-message' import { useTranslate } from '@/i18n/use-translate' import { cn } from '@/lib/utils' @@ -101,8 +102,13 @@ function AgentTerminalFrame({ onRequestClose={() => onOpenChange(false)} /> ) : ( -
- {terminalPreviewUnavailableMessage({ hostKind: card.hostKind }, t)} +
+
+ {terminalPreviewUnavailableMessage({ hostKind: card.hostKind }, t)} +
+ {hasAgentCardLastMessages(card) ? ( + + ) : null}
)}
From 2dc0df462b8a90d97bc644276bd9ba9617e9d0f2 Mon Sep 17 00:00:00 2001 From: Calvin <35207870+zzz163519@users.noreply.github.com> Date: Mon, 9 Nov 2026 19:36:51 +0800 Subject: [PATCH 21/90] fix(claude): verify model switches when terminal echoes omit vendor prefix (#40064) Claude echoes "Set model to Opus 5.5" without the "Claude" vendor prefix, and never echoes the picker-only " alias" suffix or a raw "claude-" id prefix. The confirmation observer required every picker-label token, so a successful switch resolved to unknown and showed "Could not verify the model change". Normalize the expected label before matching; context tokens such as 1M are still required. Fixes #40058 Co-authored-by: Neil --- .../claude-model-switch-confirmation.test.ts | 32 +++++++++++++++++++ .../claude-model-switch-confirmation.ts | 6 ++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/renderer/src/components/native-chat/session/options/terminal/claude-model-switch-confirmation.test.ts b/src/renderer/src/components/native-chat/session/options/terminal/claude-model-switch-confirmation.test.ts index aa543c8b397..f2879c0d4e6 100644 --- a/src/renderer/src/components/native-chat/session/options/terminal/claude-model-switch-confirmation.test.ts +++ b/src/renderer/src/components/native-chat/session/options/terminal/claude-model-switch-confirmation.test.ts @@ -4,6 +4,38 @@ import { describe, expect, it, vi } from 'vitest' import { createClaudeModelSwitchConfirmationObserver } from './claude-model-switch-confirmation' describe('Claude model switch confirmation detection', () => { + it.each([ + [ + 'quoted model name', + 'Claude Opus 5.5', + 'Set model to `Opus 5.5` and saved as your default for new sessions' + ], + [ + 'matching requested context variant', + 'Claude Opus 5.5 (1M context)', + 'Set model to `Opus 5.5 (1M context)` and saved as your default for new sessions' + ], + ['raw model id fallback', 'claude-opus-5-5', 'Set model to Opus 5.5'], + ['alias picker row', 'Opus alias', 'Set model to Opus 5.5'] + ])('confirms a picker label with %s', async (_name, label, output) => { + const dataObserver = { current: (_data: string): void => {} } + const observer = createClaudeModelSwitchConfirmationObserver({ + ptyId: 'pty-1', + expectedModelLabel: label, + subscribeToData: (watcher) => { + dataObserver.current = watcher + return () => {} + } + }) + + await observer.ready + observer.arm() + observer.startDetection() + dataObserver.current(output) + + await expect(observer.result).resolves.toBe('applied') + }) + it('reports matching success output split across PTY chunks', async () => { const dataObserver = { current: (_data: string): void => {} } const unsubscribe = vi.fn(() => {}) diff --git a/src/renderer/src/components/native-chat/session/options/terminal/claude-model-switch-confirmation.ts b/src/renderer/src/components/native-chat/session/options/terminal/claude-model-switch-confirmation.ts index 3c614586f10..803430cad19 100644 --- a/src/renderer/src/components/native-chat/session/options/terminal/claude-model-switch-confirmation.ts +++ b/src/renderer/src/components/native-chat/session/options/terminal/claude-model-switch-confirmation.ts @@ -33,12 +33,14 @@ function compactTerminalText(buffer: string): string { function hasClaudeModelSwitchSuccess(buffer: string, modelLabel: string): boolean { const text = compactTerminalText(buffer) - const marker = `setmodelto${modelLabel.replace(/\s+/g, '').toLowerCase()}` + // Claude echoes neither the vendor prefix nor Orca's picker-only `alias` suffix. + const label = modelLabel.replace(/^claude[\s-]+/i, '').replace(/\s+alias$/i, '') + const marker = `setmodelto${label.replace(/\s+/g, '').toLowerCase()}` if (text.includes(marker)) { return true } // Match every picker token so a versioned echo cannot confirm the wrong context variant. - const labelTokens = modelLabel.toLowerCase().match(/[a-z]+|\d+[a-z]*/g) ?? [] + const labelTokens = label.toLowerCase().match(/[a-z]+|\d+[a-z]*/g) ?? [] const successStart = text.lastIndexOf('setmodelto') if (successStart === -1 || labelTokens.length === 0) { return false From 9c55e1783a293683fba77c919856196bfcc9796d Mon Sep 17 00:00:00 2001 From: Wenhao Date: Mon, 9 Nov 2026 19:36:59 +0800 Subject: [PATCH 22/90] fix(markdown): lower link underlines below descenders (#40218) Link underlines in Native Chat, the markdown preview and the rich markdown editor sat 2px below the baseline, so descenders (g, y, p, j) crossed them and skip-ink broke the line into dashes. Use a 0.25em offset that scales with font size and zoom, and override the shared renderer's underline-offset-2 in Native Chat. Fixes #40217 Co-authored-by: Neil --- src/renderer/src/assets/markdown-preview.css | 2 +- src/renderer/src/assets/rich-markdown-editor.css | 8 ++++---- .../native-chat/markdown/native-chat-markdown.css | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/renderer/src/assets/markdown-preview.css b/src/renderer/src/assets/markdown-preview.css index c469ce93e0f..43743bcf1ec 100644 --- a/src/renderer/src/assets/markdown-preview.css +++ b/src/renderer/src/assets/markdown-preview.css @@ -582,7 +582,7 @@ cursor: pointer !important; text-decoration: underline; text-decoration-color: color-mix(in srgb, currentColor 40%, transparent); - text-underline-offset: 2px; + text-underline-offset: 0.25em; transition: text-decoration-color 150ms; } diff --git a/src/renderer/src/assets/rich-markdown-editor.css b/src/renderer/src/assets/rich-markdown-editor.css index dda532e0c8d..d8acaf45e86 100644 --- a/src/renderer/src/assets/rich-markdown-editor.css +++ b/src/renderer/src/assets/rich-markdown-editor.css @@ -1143,7 +1143,7 @@ color: var(--text-link, #0969da); text-decoration: underline; text-decoration-color: color-mix(in srgb, currentColor 40%, transparent); - text-underline-offset: 2px; + text-underline-offset: 0.25em; } /* Plain clicks place the caret; RichMarkdownEditor exposes link pointers only while Cmd/Ctrl is held. */ @@ -1164,7 +1164,7 @@ color: var(--text-link, #0969da); text-decoration: underline; text-decoration-color: color-mix(in srgb, currentColor 40%, transparent); - text-underline-offset: 2px; + text-underline-offset: 0.25em; } .dark .rich-markdown-editor .rich-markdown-html-superscript-link { @@ -1462,7 +1462,7 @@ color: var(--text-link, #0969da); text-decoration: underline; text-decoration-color: color-mix(in srgb, currentColor 45%, transparent); - text-underline-offset: 2px; + text-underline-offset: 0.25em; } .dark .rich-markdown-editor .rich-markdown-doc-link { @@ -1489,7 +1489,7 @@ color: var(--text-link, #0969da); text-decoration: underline; text-decoration-color: color-mix(in srgb, currentColor 45%, transparent); - text-underline-offset: 2px; + text-underline-offset: 0.25em; } .dark .rich-markdown-editor .rich-markdown-doc-link-preview { diff --git a/src/renderer/src/components/native-chat/markdown/native-chat-markdown.css b/src/renderer/src/components/native-chat/markdown/native-chat-markdown.css index 6a7047a7f04..fed9e2282a1 100644 --- a/src/renderer/src/components/native-chat/markdown/native-chat-markdown.css +++ b/src/renderer/src/components/native-chat/markdown/native-chat-markdown.css @@ -30,6 +30,8 @@ overflow-wrap: anywhere; color: var(--chat-link); text-decoration-color: color-mix(in srgb, currentColor 40%, transparent); + /* Clears descenders; on file-link code chips it deliberately lands on the bottom border. */ + text-underline-offset: 0.25em; } /* File links wrap inline code, so formatted labels follow the link color. */ From 8d195ef3169594b82de474ef864a13dec2754b53 Mon Sep 17 00:00:00 2001 From: OrcaWin Date: Mon, 9 Nov 2026 03:39:29 -0800 Subject: [PATCH 23/90] test: remove low-value copy suites and manual status benchmark (#40305) Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com> --- .../check-test-file-runners.mjs | 7 - .../agent-status-hot-path-benchmark.ts | 255 ------------------ .../vitest.agent-status-benchmark.config.ts | 14 - .../screen-ruled-agent-transcript-suite.ts | 14 +- .../agent-session-write-notice-text.test.ts | 113 -------- .../keybinding-diagnostic-text.test.ts | 47 ---- .../src/lib/task-provider-error-copy.test.ts | 31 --- .../agent-status-scale.test-fixture.ts | 91 ------- .../agent-session-refusal-notice.test.ts | 27 +- src/shared/model-id-label.test.ts | 19 -- 10 files changed, 3 insertions(+), 615 deletions(-) delete mode 100644 config/scripts/performance/agent-lineage/agent-status-hot-path-benchmark.ts delete mode 100644 config/vitest.agent-status-benchmark.config.ts delete mode 100644 src/renderer/src/components/native-chat/messages/notices/agent-session-write-notice-text.test.ts delete mode 100644 src/renderer/src/components/settings/shortcuts/keybinding-diagnostic-text.test.ts delete mode 100644 src/renderer/src/lib/task-provider-error-copy.test.ts delete mode 100644 src/renderer/src/store/slices/agent-status/agent-status-scale.test-fixture.ts delete mode 100644 src/shared/model-id-label.test.ts diff --git a/config/scripts/ci/unit-selection/check-test-file-runners.mjs b/config/scripts/ci/unit-selection/check-test-file-runners.mjs index 24993494bd6..09f620398b7 100644 --- a/config/scripts/ci/unit-selection/check-test-file-runners.mjs +++ b/config/scripts/ci/unit-selection/check-test-file-runners.mjs @@ -34,13 +34,6 @@ const NON_UNIT_TEST_RUNNERS = [ sources: ['tests/e2e/vitest.config.ts'], mirrors: ["'tests/e2e/computer-*.e2e.ts'"] }, - { - name: 'agent-status benchmark', - manual: true, - include: ['config/scripts/performance/agent-lineage/agent-status-hot-path-benchmark.ts'], - sources: ['config/vitest.agent-status-benchmark.config.ts'], - mirrors: ["'config/scripts/performance/agent-lineage/agent-status-hot-path-benchmark.ts'"] - }, { name: 'mobile', include: ['mobile/src/**/*.test.ts', 'mobile/src/**/*.test.tsx', 'mobile/scripts/**/*.test.ts'], diff --git a/config/scripts/performance/agent-lineage/agent-status-hot-path-benchmark.ts b/config/scripts/performance/agent-lineage/agent-status-hot-path-benchmark.ts deleted file mode 100644 index 774c2411787..00000000000 --- a/config/scripts/performance/agent-lineage/agent-status-hot-path-benchmark.ts +++ /dev/null @@ -1,255 +0,0 @@ -// Compare identical benchmark APIs on baseline/candidate; separate instrumented allocation counts from clean timing to avoid patch-induced deoptimization. -// Run: ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.agent-status-benchmark.config.ts -// Reported-user scale: 423 worktrees/634 tabs, rather than the 100-worktree fixture. -import { writeFileSync } from 'node:fs' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { describe, expect, it } from 'vitest' -import type { AppState } from '@/store/types' -import type { AgentStatusBatchUpdate } from '@/store/slices/agent-status/agent-status-contract' -import '@/store/slices/agent-status/agent-status' -import { MAX_LIVE_AGENT_STATUSES } from '@/store/slices/agent-status/agent-status-capacity-eviction' -import type { createTestStore } from '@/store/testing/app-store-test-fixture' -import { - createAgentStatusPaneRoutingIndex, - resolvePaneKeyFromRoutingIndex -} from '@/hooks/ipc-events/agent-status-pane-routing-index' -import { buildAgentStatusScaleFixture } from '@/store/slices/agent-status/agent-status-scale.test-fixture' -import { resolvePaneKey } from '@/hooks/ipc-events/agent-status-routing' - -const WORKTREES = 423 -const EVENTS = 1_000 -const BATCH_SIZE = 8 -const BASE_TIME = 2_000_000_000 - -const counters = { maps: 0, sets: 0, tabComparisons: 0 } - -const NativeMap = globalThis.Map -const NativeSet = globalThis.Set - -function withAllocationCounting(run: () => T): T { - class CountingMap extends NativeMap { - constructor(entries?: Iterable | null) { - super(entries) - counters.maps += 1 - } - } - class CountingSet extends NativeSet { - constructor(values?: Iterable | null) { - super(values) - counters.sets += 1 - } - } - counters.maps = 0 - counters.sets = 0 - globalThis.Map = CountingMap - globalThis.Set = CountingSet - try { - return run() - } finally { - globalThis.Map = NativeMap - globalThis.Set = NativeSet - } -} - -function buildFixture(countTabIteration: boolean) { - const fixture = buildAgentStatusScaleFixture( - countTabIteration - ? () => { - counters.tabComparisons += 1 - } - : undefined - ) - fixture.store.setState({ setGeneratedTabTitlesFromAgentPrompts: () => {} }) - return fixture -} - -function measure(run: () => void): number { - const start = performance.now() - run() - return performance.now() - start -} - -function per1k(value: number): number { - return Math.round((value / EVENTS) * 1000) -} - -/** One burst-shaped pass: a fresh index per batch, one pane resolution per event. */ -function runIndexedRouting(store: ReturnType, paneKeys: string[]): void { - for (let event = 0; event < EVENTS; event += 1) { - if (event % BATCH_SIZE === 0) { - store.setState({ agentStatusEpoch: event }) - } - const index = createAgentStatusPaneRoutingIndex(store.getState()) - resolvePaneKeyFromRoutingIndex(index, paneKeys[event % paneKeys.length]) - } -} - -function runStandaloneRouting(state: AppState, paneKeys: string[]): void { - for (let event = 0; event < EVENTS; event += 1) { - resolvePaneKey(state, paneKeys[event % paneKeys.length]) - } -} - -function buildBatches( - owners: { tabId: string; worktreeId: string }[], - paneKeys: string[] -): AgentStatusBatchUpdate[][] { - const batches: AgentStatusBatchUpdate[][] = [] - for (let event = 0; event < EVENTS; event += 1) { - const batchIndex = Math.floor(event / BATCH_SIZE) - const owner = owners[event % owners.length] - batches[batchIndex] ??= [] - batches[batchIndex].push({ - paneKey: paneKeys[event % paneKeys.length], - payload: { state: 'working', prompt: `turn ${event}`, agentType: 'claude' }, - timing: { updatedAt: BASE_TIME + event, stateStartedAt: BASE_TIME + event }, - routing: { tabId: owner.tabId, worktreeId: owner.worktreeId } - }) - } - return batches -} - -const nextTick = (): Promise => - new Promise((resolve) => { - queueMicrotask(resolve) - }) - -async function runCommitPass( - store: ReturnType, - batches: AgentStatusBatchUpdate[][], - onBatch?: (elapsed: number) => void -): Promise { - for (const batch of batches) { - const elapsed = measure(() => { - store.getState().setAgentStatuses(batch) - }) - onBatch?.(elapsed) - // Each 33 ms burst is its own tick in production; let the deferred freshness scan run. - await nextTick() - } -} - -describe('agent-status hot path benchmark', () => { - it('reports routing, resolution and commit cost at 423 worktrees', async () => { - const report: Record = {} - const fixture = buildFixture(false) - const index = createAgentStatusPaneRoutingIndex(fixture.store.getState()) - for (const [position, paneKey] of fixture.paneKeys.entries()) { - const resolved = resolvePaneKeyFromRoutingIndex(index, paneKey) - expect(resolved).toMatchObject({ - exists: true, - owningWorktreeId: fixture.owners[position].worktreeId - }) - expect(resolved).toEqual(resolvePaneKey(fixture.store.getState(), paneKey)) - } - - { - const alloc = buildFixture(false) - withAllocationCounting(() => runIndexedRouting(alloc.store, alloc.paneKeys)) - report['routing.indexed.mapAllocationsPer1kEvents'] = per1k(counters.maps) - report['routing.indexed.setAllocationsPer1kEvents'] = per1k(counters.sets) - - const warm = buildFixture(false) - runIndexedRouting(warm.store, warm.paneKeys) - const clean = buildFixture(false) - report['routing.indexed.ms'] = Number( - measure(() => runIndexedRouting(clean.store, clean.paneKeys)).toFixed(2) - ) - } - - { - const alloc = buildFixture(true) - counters.tabComparisons = 0 - withAllocationCounting(() => runStandaloneRouting(alloc.store.getState(), alloc.paneKeys)) - report['routing.standalone.tabComparisonsPer1kEvents'] = per1k(counters.tabComparisons) - report['routing.standalone.mapAllocationsPer1kEvents'] = per1k(counters.maps) - - const warm = buildFixture(false) - runStandaloneRouting(warm.store.getState(), warm.paneKeys) - const clean = buildFixture(false) - report['routing.standalone.ms'] = Number( - measure(() => runStandaloneRouting(clean.store.getState(), clean.paneKeys)).toFixed(2) - ) - } - - { - const alloc = buildFixture(true) - counters.tabComparisons = 0 - runIndexedRouting(alloc.store, alloc.paneKeys) - report['routing.indexed.tabComparisonsPer1kEvents'] = per1k(counters.tabComparisons) - } - - // Store commits: 1,000 updates folded in 125 transactions, one microtask tick per transaction. - { - const counted = buildFixture(false) - const nativeObjectAssign = Object.assign - const nativeObjectValues = Object.values - let objectAssignCalls = 0 - let objectAssignPropertyCopies = 0 - let freshnessEntryVisits = 0 - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: `Object.assign` is an overload set no single arrow can satisfy; this wrapper only counts calls and forwards every argument to the captured native implementation. - Object.assign = (( - target: Record, - ...sources: readonly Record[] - ) => { - objectAssignCalls += 1 - for (const source of sources) { - if (source && typeof source === 'object') { - objectAssignPropertyCopies += Object.keys(source).length - } - } - return nativeObjectAssign(target, ...sources) - }) as typeof Object.assign - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: same overload-set limit as the `Object.assign` wrapper above; this one counts visited entries and returns the native result unchanged. - Object.values = ((value: Record) => { - const result = nativeObjectValues(value) - freshnessEntryVisits += result.length - return result - }) as typeof Object.values - const countedBatches = buildBatches(counted.owners, counted.paneKeys) - try { - await runCommitPass(counted.store, countedBatches) - } finally { - Object.assign = nativeObjectAssign - Object.values = nativeObjectValues - } - report['commit.objectAssignCallsPer1kUpdates'] = per1k(objectAssignCalls) - report['commit.stagedPropertyCopiesPer1kUpdates'] = per1k(objectAssignPropertyCopies) - report['commit.freshnessEntryVisitsPer1kUpdates'] = per1k(freshnessEntryVisits) - report['commit.transactions'] = countedBatches.length - const committed = counted.store.getState().agentStatusByPaneKey - const expected = new Map( - countedBatches - .flat() - .slice(-MAX_LIVE_AGENT_STATUSES) - .map((update) => [update.paneKey, update]) - ) - expect(Object.keys(committed).sort()).toEqual([...expected.keys()].sort()) - for (const [paneKey, update] of expected) { - expect(committed[paneKey]).toMatchObject({ - ...update.payload, - ...update.timing, - ...update.routing - }) - } - - const warm = buildFixture(false) - await runCommitPass(warm.store, buildBatches(warm.owners, warm.paneKeys)) - const clean = buildFixture(false) - let elapsed = 0 - await runCommitPass(clean.store, buildBatches(clean.owners, clean.paneKeys), (batchMs) => { - elapsed += batchMs - }) - report['commit.ms'] = Number(elapsed.toFixed(2)) - } - - const outputPath = - process.env.ORCA_AGENT_STATUS_BENCH_OUTPUT ?? - join(tmpdir(), 'agent-status-hot-path-benchmark.json') - writeFileSync( - outputPath, - `${JSON.stringify({ worktrees: WORKTREES, events: EVENTS, report }, null, 2)}\n` - ) - }) -}) diff --git a/config/vitest.agent-status-benchmark.config.ts b/config/vitest.agent-status-benchmark.config.ts deleted file mode 100644 index 32b047405bb..00000000000 --- a/config/vitest.agent-status-benchmark.config.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { defineConfig } from 'vitest/config' -import baseConfig from './vitest.config' - -export default defineConfig({ - ...baseConfig, - test: { - ...baseConfig.test, - // Project-level includes otherwise override this benchmark-only selection. - projects: undefined, - include: ['config/scripts/performance/agent-lineage/agent-status-hot-path-benchmark.ts'], - fileParallelism: false, - retry: 0 - } -}) diff --git a/src/main/runtime/terminal/wait/screen-ruled-agent-transcript-suite.ts b/src/main/runtime/terminal/wait/screen-ruled-agent-transcript-suite.ts index 21d7b488783..43f4d71c54d 100644 --- a/src/main/runtime/terminal/wait/screen-ruled-agent-transcript-suite.ts +++ b/src/main/runtime/terminal/wait/screen-ruled-agent-transcript-suite.ts @@ -11,7 +11,7 @@ import { readRuntimeFixture, type TranscriptReplayResize } from './agent-transcript-replay-test-harness' -import { isKnownReadyPromptBody, isQuietReadyScreenBody } from './terminal-wait-detection' +import { isQuietReadyScreenBody } from './terminal-wait-detection' import { evaluateAgentStateRules } from '../../agent-state-rules/agent-state-rules-engine' import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent' @@ -246,16 +246,4 @@ export function describeScreenRuledAgentTranscripts(suite: ScreenRuledAgentSuite } }) }) - - it('never reads the screen for another agent', async () => { - const { ruledScreenLines, waitText } = await finalReplayFrame( - firstReady.name, - firstReady.cols, - firstReady.rows - ) - const readScreenLines = vi.fn(() => ruledScreenLines) - isKnownReadyPromptBody(waitText, 'claude', readScreenLines, false) - expect(isQuietReadyScreenBody(waitText, 'claude', readScreenLines)).toBe(false) - expect(readScreenLines).not.toHaveBeenCalled() - }) } diff --git a/src/renderer/src/components/native-chat/messages/notices/agent-session-write-notice-text.test.ts b/src/renderer/src/components/native-chat/messages/notices/agent-session-write-notice-text.test.ts deleted file mode 100644 index 4cf37f9c278..00000000000 --- a/src/renderer/src/components/native-chat/messages/notices/agent-session-write-notice-text.test.ts +++ /dev/null @@ -1,113 +0,0 @@ -import { afterEach, describe, expect, it } from 'vitest' -import { i18n, setRendererPluginLanguagePacks } from '@/i18n/i18n' - -import { pluginLanguageResourceId } from '../../../../../../shared/plugins/artifacts/plugin-language-pack-artifact' -import { agentSessionWriteKindForMethod } from '../../../../../../shared/agent-session/failures/agent-session-write-failure' - -import { - agentSessionWriteFailureText, - agentSessionWriteNoticeText -} from './agent-session-write-notice-text' - -afterEach(async () => { - setRendererPluginLanguagePacks([]) - await i18n.changeLanguage('en') -}) - -describe('desktop words for a write that did not happen', () => { - it('does not promise the old goal survived a refused replacement, including older translations', async () => { - const id = 'plugin:example.older-french/fr' as const - const resourceLanguage = pluginLanguageResourceId(id) - setRendererPluginLanguagePacks([ - { - id, - resourceLanguage, - pluginKey: 'example.older-french', - coverage: 100, - locale: 'fr', - catalog: {} - } - ]) - for (const [language, expected] of [ - ['en', "Couldn't finish changing the goal. Check the chat."], - ['fr', 'Impossible de terminer la modification de l’objectif. Consultez le chat.'], - [resourceLanguage, "Couldn't finish changing the goal. Check the chat."] - ]) { - await i18n.changeLanguage(language) - expect( - agentSessionWriteFailureText( - { - kind: 'refused', - code: 'agent_session_operation_invalid', - details: { reason: 'providerRejected' } - }, - 'goal' - ) - ).toContain(expected) - } - }) - - it("runs on after a plugin language's full stop, and keeps the space after English it left", async () => { - const id = 'plugin:example.chinese/zh-TW' as const - setRendererPluginLanguagePacks([ - { - id, - resourceLanguage: pluginLanguageResourceId(id), - pluginKey: 'example.chinese', - locale: 'zh-TW', - catalog: { - components: { - 'native-chat': { - writeNotice: { - restartFailed: '智能體無法重新啟動。', - notDoneSend: '您的訊息未傳送。' - } - } - } - }, - coverage: 100 - } - ]) - await i18n.changeLanguage(pluginLanguageResourceId(id)) - expect(agentSessionWriteNoticeText(['restartFailed', 'notDoneSend'])).toBe( - '智能體無法重新啟動。您的訊息未傳送。' - ) - // The pack predates the failure words, so they fall back to English. - expect( - agentSessionWriteNoticeText([ - 'notDoneSend', - { failure: { kind: 'startFailed' }, surface: 'rejection', context: { agentName: 'Claude' } } - ]) - ).toBe("您的訊息未傳送。Claude couldn't start. Send your message to try again.") - }) - - it("says a queued card's message wasn't sent only when Orca couldn't confirm its mail", () => { - const send = agentSessionWriteKindForMethod('agentSession.queuedMessageSend', {}) - for (const retryControl of [false, true]) { - expect( - agentSessionWriteFailureText( - { - kind: 'refused', - code: 'execution_owner_reconciling', - details: { reason: 'mailOwnerUnconfirmed' } - }, - send, - { retryControl } - ) - ).toBe( - "Orca couldn't confirm this message is still meant for this chat. Your message was not sent. Try again." - ) - } - // Any other refused Send of a queued card keeps its existing words. - expect( - agentSessionWriteFailureText( - { - kind: 'refused', - code: 'agent_session_checkpoint_stale', - details: { reason: 'fenceStale' } - }, - send - ) - ).toBe("The command didn't run.") - }) -}) diff --git a/src/renderer/src/components/settings/shortcuts/keybinding-diagnostic-text.test.ts b/src/renderer/src/components/settings/shortcuts/keybinding-diagnostic-text.test.ts deleted file mode 100644 index e9aabe0cd0e..00000000000 --- a/src/renderer/src/components/settings/shortcuts/keybinding-diagnostic-text.test.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { afterEach, describe, expect, it } from 'vitest' -import { i18n } from '@/i18n/i18n' -import es from '@/i18n/locales/es.json' -import { keybindingFileDiagnostic } from '../../../../../shared/keybindings/keybinding-diagnostic-copy' -import { keybindingDiagnosticText } from './keybinding-diagnostic-text' - -const originalLanguage = i18n.language - -afterEach(async () => { - await i18n.changeLanguage(originalLanguage) -}) - -describe('keybinding diagnostic text', () => { - it('keeps verbatim reasons and falls back to the English message', async () => { - i18n.addResourceBundle('es', 'translation', es) - await i18n.changeLanguage('es') - const readFailed = keybindingFileDiagnostic({ severity: 'error' }, 'readFailed', { - reason: 'Unexpected token } in JSON' - }) - expect(keybindingDiagnosticText(readFailed)).toBe( - es.settings.shortcuts.diagnostics.readFailed.replace( - '{{reason}}', - 'Unexpected token } in JSON' - ) - ) - const conflict = keybindingFileDiagnostic( - { severity: 'error', actionIds: ['view.tasks'] }, - 'conflictingOverrides', - { actions: 'Open Tasks' } - ) - expect(keybindingDiagnosticText(conflict)).toBe( - es.settings.shortcuts.diagnostics.conflictingOverrides.replace( - '{{actions}}', - es.keybindings.title.viewTasks - ) - ) - expect(keybindingDiagnosticText({ severity: 'error', message: 'Old main text' })).toBe( - 'Old main text' - ) - expect( - keybindingDiagnosticText({ severity: 'error', message: 'Newer', code: 'futureCode' }) - ).toBe('Newer') - expect( - keybindingDiagnosticText({ severity: 'error', message: 'English', code: 'unknownAction' }) - ).toBe('English') - }) -}) diff --git a/src/renderer/src/lib/task-provider-error-copy.test.ts b/src/renderer/src/lib/task-provider-error-copy.test.ts deleted file mode 100644 index f5ed8dc5263..00000000000 --- a/src/renderer/src/lib/task-provider-error-copy.test.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { afterEach, describe, expect, it } from 'vitest' -import { i18n } from '@/i18n/i18n' -import es from '@/i18n/locales/es.json' -import { taskProviderErrorMessage, taskProviderErrorText } from './task-provider-error-copy' - -const originalLanguage = i18n.language - -afterEach(async () => { - await i18n.changeLanguage(originalLanguage) -}) - -describe('task provider error copy', () => { - it('recognizes old hosts and Electron wrappers without rewriting provider errors', async () => { - i18n.addResourceBundle('es', 'translation', es) - await i18n.changeLanguage('es') - expect(taskProviderErrorMessage({ error: 'Not connected to Jira.' })).toBe( - es.taskProviders.errors.jira.notConnected - ) - expect( - taskProviderErrorText( - "Error invoking remote method 'linear:listProjects': Error: Project ID is required" - ) - ).toBe(es.taskProviders.errors.linear.projectIdRequired) - const external = - "Error invoking remote method 'jira:createIssue': Error: custom field is invalid" - expect(taskProviderErrorText(external)).toBe(external) - expect(taskProviderErrorMessage({ errorCode: 'future.code', error: 'New host failure' })).toBe( - 'New host failure' - ) - }) -}) diff --git a/src/renderer/src/store/slices/agent-status/agent-status-scale.test-fixture.ts b/src/renderer/src/store/slices/agent-status/agent-status-scale.test-fixture.ts deleted file mode 100644 index 76cd7f36a36..00000000000 --- a/src/renderer/src/store/slices/agent-status/agent-status-scale.test-fixture.ts +++ /dev/null @@ -1,91 +0,0 @@ -import { tmpdir } from 'node:os' -import type { AppState } from '@/store/types' -import type { AgentStatusEntry } from '../../../../../shared/agent-status/contracts/agent-status-types' -import { createTestStore } from '@/store/testing/app-store-test-fixture' -import { makeTab } from '@/store/terminals/terminal-tab.test-fixture' -import { makeUnifiedTab } from '@/store/slices/tabs/tab-group.test-fixture' -import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' -import { TEST_REPO } from '@/store/repos/repo.test-fixture' -import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id' -import { getDefaultSettings } from '../../../../../shared/constants' - -const LEAF_ID = '11111111-1111-4111-8111-111111111111' - -export function buildAgentStatusScaleFixture( - onTabVisit: (() => void) | undefined = undefined, - worktreeCount = 423 -) { - /** Tab list whose iteration is observable, so the nested-loop resolver's comparisons are countable. */ - class CountingTabList extends Array { - [Symbol.iterator](): ArrayIterator { - const iterator = super[Symbol.iterator]() - const next = iterator.next.bind(iterator) - iterator.next = (...args) => { - const result = next(...args) - if (!result.done) { - onTabVisit?.() - } - return result - } - return iterator - } - } - - const store = createTestStore() - const settings = store.getState().settings ?? getDefaultSettings(tmpdir()) - const tabsByWorktree: AppState['tabsByWorktree'] = {} - const unifiedTabsByWorktree: AppState['unifiedTabsByWorktree'] = {} - const worktrees: ReturnType[] = [] - const paneKeys: string[] = [] - const owners: { tabId: string; worktreeId: string }[] = [] - for (let index = 0; index < worktreeCount; index += 1) { - const worktreeId = `wt-${index}` - worktrees.push(makeWorktree({ id: worktreeId, repoId: TEST_REPO.id })) - const tabs: ReturnType[] = [] - const unified: ReturnType[] = [] - for (let tab = 0; tab < (index % 2 === 0 ? 1 : 2); tab += 1) { - const tabId = `tab-${index}-${tab}` - tabs.push(makeTab({ id: tabId, worktreeId, title: `Terminal ${index}-${tab}` })) - unified.push( - makeUnifiedTab({ - id: tabId, - worktreeId, - groupId: `group-${index}`, - label: `Label ${index}` - }) - ) - paneKeys.push(makePaneKey(tabId, LEAF_ID)) - owners.push({ tabId, worktreeId }) - } - tabsByWorktree[worktreeId] = onTabVisit ? CountingTabList.from(tabs) : tabs - unifiedTabsByWorktree[worktreeId] = unified - } - const state = { - repos: [TEST_REPO], - worktreesByRepo: { [TEST_REPO.id]: worktrees }, - tabsByWorktree, - unifiedTabsByWorktree, - terminalLayoutsByTabId: {}, - settings: { ...settings, tabAutoGenerateTitle: false } - } satisfies Partial - store.setState(state) - const agentStatusByPaneKey = Object.fromEntries( - paneKeys - .map((paneKey, index): [string, AgentStatusEntry] => [ - paneKey, - { - paneKey, - ...owners[index], - state: 'working', - agentType: 'claude', - prompt: 'initial prompt', - updatedAt: 2_000_000_000, - stateStartedAt: 2_000_000_000, - firstStateStartedAt: 2_000_000_000, - stateHistory: [] - } satisfies AgentStatusEntry - ]) - .filter((_, index) => owners[index].tabId.endsWith('-0')) - ) - return { store, state, paneKeys, owners, agentStatusByPaneKey } -} diff --git a/src/shared/agent-session/failures/agent-session-refusal-notice.test.ts b/src/shared/agent-session/failures/agent-session-refusal-notice.test.ts index 176dccfa2fe..80abf36fb91 100644 --- a/src/shared/agent-session/failures/agent-session-refusal-notice.test.ts +++ b/src/shared/agent-session/failures/agent-session-refusal-notice.test.ts @@ -1,33 +1,10 @@ import { describe, expect, it } from 'vitest' -import { - agentSessionRefusalCauseParts, - agentSessionWriteNoticeEnglish -} from './agent-session-refusal-notice' +import { agentSessionRefusalCauseParts } from './agent-session-refusal-notice' import './agent-session-failure-words' import './agent-session-refusal-details' -import { - agentSessionRefusalFailure, - parseAgentSessionWriteFailure -} from './agent-session-write-failure' +import { parseAgentSessionWriteFailure } from './agent-session-write-failure' describe('saved Arguments refusals', () => { - it('keeps the validated cause after durable parsing and names the correction beside Retry', () => { - const refused = agentSessionRefusalFailure({ - code: 'agent_session_operation_invalid', - details: { - reason: 'attachFailed', - argumentProblem: { agent: 'Codex', option: '--remote', problem: 'unsupportedOption' } - } - }) - const parsed = parseAgentSessionWriteFailure(JSON.parse(JSON.stringify(refused))) - if (!parsed) { - throw new Error('saved refusal was not read') - } - expect(agentSessionWriteNoticeEnglish(agentSessionRefusalCauseParts(parsed))).toBe( - "Codex couldn't start. Saved Arguments contain an unsupported option (--remote). Edit them in Settings > Agents > Arguments." - ) - }) - it.each([ { agent: 'Codex', option: '--remote', problem: 'futureProblem' }, { agent: 'Codex', option: '--remote=private', problem: 'unsupportedOption' } diff --git a/src/shared/model-id-label.test.ts b/src/shared/model-id-label.test.ts deleted file mode 100644 index f8a0ba53680..00000000000 --- a/src/shared/model-id-label.test.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { labelFromModelId } from './model-id-label' - -describe('labelFromModelId', () => { - it('dots the version an id spells with dashes, never a date', () => { - expect(labelFromModelId('claude-opus-5-5')).toBe('Claude Opus 5.5') - expect(labelFromModelId('claude-opus-5-5[1m]')).toBe('Claude Opus 5.5 (1M context)') - expect(labelFromModelId('claude-3-5-sonnet-20241022')).toBe('Claude 3.5 Sonnet 20241022') - expect(labelFromModelId('xai/grok-4-1-fast')).toBe('Xai Grok 4.1 Fast') - expect(labelFromModelId('gpt-4o-2024-08-06')).toBe('GPT 4O 2024 08 06') - expect(labelFromModelId('gemini-2.5-flash-preview-05-20')).toBe( - 'Gemini 2.5 Flash Preview 05 20' - ) - expect(labelFromModelId('gemini-2.5-flash-preview-10-20')).toBe( - 'Gemini 2.5 Flash Preview 10 20' - ) - expect(labelFromModelId('llama-3-8b')).toBe('Llama 3 8B') - }) -}) From e3d8e7e9cb4db537a7ea30014c96d61d5177e224 Mon Sep 17 00:00:00 2001 From: Pr1p Date: Mon, 9 Nov 2026 19:42:24 +0800 Subject: [PATCH 24/90] fix(native-chat): group deferred context rows separately in the usage popover (#39917) Claude reports deferred categories (MCP tools, system tools loaded on demand) that sit outside the used total, but summarizeContextUsage dropped the flag, so the popover listed them as window percentages next to real usage and the rows summed to well over 100%. Keep the deferred flag on each summary row and render deferred rows in their own group under a divider, with token counts instead of a share of the window and a note that they are not counted in the used total. Fixes #39878 Co-authored-by: Neil --- .../NativeChatContextUsageRing.fixture.tsx | 32 +++++++++++ .../usage/NativeChatContextUsageRing.test.tsx | 25 ++++++++- .../usage/NativeChatContextUsageRing.tsx | 54 +++++++++++++++---- src/renderer/src/i18n/locales/de.json | 3 +- src/renderer/src/i18n/locales/en.json | 3 +- src/renderer/src/i18n/locales/es.json | 3 +- src/renderer/src/i18n/locales/fr.json | 3 +- src/renderer/src/i18n/locales/ja.json | 3 +- src/renderer/src/i18n/locales/ko.json | 3 +- src/renderer/src/i18n/locales/pt.json | 3 +- src/renderer/src/i18n/locales/ru.json | 3 +- src/renderer/src/i18n/locales/tr.json | 3 +- src/renderer/src/i18n/locales/zh-Hant.json | 3 +- src/renderer/src/i18n/locales/zh.json | 3 +- .../native-chat-context-usage-summary.ts | 7 +-- 15 files changed, 125 insertions(+), 26 deletions(-) create mode 100644 src/renderer/src/components/native-chat/usage/NativeChatContextUsageRing.fixture.tsx diff --git a/src/renderer/src/components/native-chat/usage/NativeChatContextUsageRing.fixture.tsx b/src/renderer/src/components/native-chat/usage/NativeChatContextUsageRing.fixture.tsx new file mode 100644 index 00000000000..7c49175a30d --- /dev/null +++ b/src/renderer/src/components/native-chat/usage/NativeChatContextUsageRing.fixture.tsx @@ -0,0 +1,32 @@ +import { defineFixture } from '../../../component-fixtures/component-fixture' +import { summarizeContextUsage } from '../../../../../shared/native-chat/native-chat-context-usage-summary' +import { NativeChatContextUsageRing } from './NativeChatContextUsageRing' + +const usage = summarizeContextUsage({ + usedTokens: 607_700, + windowTokens: 1_000_000, + percentage: 61, + estimated: false, + categories: [ + { name: 'System prompt', tokens: 4_100 }, + { name: 'System tools', tokens: 8_900 }, + { name: 'MCP tools (deferred)', tokens: 542_000, deferred: true }, + { name: 'System tools (deferred)', tokens: 17_000, deferred: true }, + { name: 'Memory files', tokens: 5_700 }, + { name: 'Messages', tokens: 589_000 }, + { name: 'Free space', tokens: 359_300 }, + { name: 'Autocompact buffer', tokens: 33_000 } + ] +}) + +export const deferredTools = defineFixture({ + width: 360, + render: () => ( +
+ +
+ ), + interact: (frame) => { + frame.querySelector('button[data-native-chat-context-usage]')?.click() + } +}) diff --git a/src/renderer/src/components/native-chat/usage/NativeChatContextUsageRing.test.tsx b/src/renderer/src/components/native-chat/usage/NativeChatContextUsageRing.test.tsx index 6b36475d07e..82a2717fc0c 100644 --- a/src/renderer/src/components/native-chat/usage/NativeChatContextUsageRing.test.tsx +++ b/src/renderer/src/components/native-chat/usage/NativeChatContextUsageRing.test.tsx @@ -3,7 +3,10 @@ import { act } from 'react' import { createRoot, type Root } from 'react-dom/client' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type { NativeChatContextUsageSummary } from '../../../../../shared/native-chat/native-chat-context-usage-summary' +import { + summarizeContextUsage, + type NativeChatContextUsageSummary +} from '../../../../../shared/native-chat/native-chat-context-usage-summary' globalThis.IS_REACT_ACT_ENVIRONMENT = true @@ -95,6 +98,26 @@ function pointer(type: 'pointerover' | 'pointerout', pointerType: string): Point } describe('NativeChatContextUsageRing', () => { + it('lists deferred rows apart from the used total, in tokens rather than a share of the window', async () => { + const usage = summarizeContextUsage({ + usedTokens: 607_700, + windowTokens: 1_000_000, + percentage: 61, + estimated: false, + categories: [ + { name: 'Messages', tokens: 589_000 }, + { name: 'MCP tools (deferred)', tokens: 542_000, deferred: true }, + { name: 'System prompt', tokens: 18_700 } + ] + }) + await click(await renderRing(usage)) + + const groups = [...card()!.querySelectorAll('ul')].map((list) => + [...list.querySelectorAll('li')].map((row) => row.textContent) + ) + expect(groups).toEqual([['Messages58.9%', 'System prompt1.9%'], ['MCP tools (deferred)542k']]) + }) + it('stays open while the pointer crosses the gap from the ring into the card', async () => { const trigger = await renderRing() const hoverTarget = trigger.parentElement! diff --git a/src/renderer/src/components/native-chat/usage/NativeChatContextUsageRing.tsx b/src/renderer/src/components/native-chat/usage/NativeChatContextUsageRing.tsx index 57c26cd143a..02235f722b7 100644 --- a/src/renderer/src/components/native-chat/usage/NativeChatContextUsageRing.tsx +++ b/src/renderer/src/components/native-chat/usage/NativeChatContextUsageRing.tsx @@ -5,6 +5,7 @@ import { useTranslate } from '@/i18n/use-translate' import { cn } from '@/lib/utils' import { contextUsageRingReadout, + formatContextTokenCount, keyContextUsageRows, type NativeChatContextUsageSummary } from '../../../../../shared/native-chat/native-chat-context-usage-summary' @@ -62,6 +63,35 @@ function useContextCardOpen(): { return { open, setOpen, setOpenAfterHover } } +/** Deferred rows sit outside the window, so they show tokens rather than a share of it. */ +function ContextUsageRowList({ + rows, + className +}: { + rows: ReturnType + className: string +}): React.JSX.Element { + return ( +
    + {rows.map(({ key, row }) => ( +
  • + + {row.name} + + + {row.deferred ? formatContextTokenCount(row.tokens) : `${row.percentage}%`} + +
  • + ))} +
+ ) +} + /** Composer ring for context-window usage; hover, click, tap, or Enter shows the provider's breakdown. */ export function NativeChatContextUsageRing({ usage @@ -77,6 +107,8 @@ export function NativeChatContextUsageRing({ ) const { open, setOpen, setOpenAfterHover } = useContextCardOpen() const rows = keyContextUsageRows(usage.rows) + const counted = rows.filter(({ row }) => !row.deferred) + const deferred = rows.filter(({ row }) => row.deferred) return (
- {rows.length > 0 ? ( -
    - {rows.map(({ key, row }) => ( -
  • - {row.name} - - {row.percentage}% - -
  • - ))} -
+ {counted.length > 0 ? : null} + {deferred.length > 0 ? ( +
+

+ {t( + 'components.native-chat.contextUsage.deferredNote', + 'Loaded on demand. Not counted in the used total.' + )} +

+ +
) : null} {usage.estimated ? (

diff --git a/src/renderer/src/i18n/locales/de.json b/src/renderer/src/i18n/locales/de.json index 21f10a7612b..6ef3112131e 100644 --- a/src/renderer/src/i18n/locales/de.json +++ b/src/renderer/src/i18n/locales/de.json @@ -19950,7 +19950,8 @@ "contextUsage": { "label": "Kontext: {{used}} von {{window}} Token, {{percent}} % genutzt", "title": "Kontext", - "estimated": "Anhand der letzten Antwort geschätzt." + "estimated": "Anhand der letzten Antwort geschätzt.", + "deferredNote": "Bei Bedarf geladen. Nicht in der Nutzung enthalten." }, "contextMenu": { "copyOrcaSessionId": "Orca-Sitzungs-ID kopieren", diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json index b192f42c6f7..9a2acc7c060 100644 --- a/src/renderer/src/i18n/locales/en.json +++ b/src/renderer/src/i18n/locales/en.json @@ -20550,7 +20550,8 @@ "contextUsage": { "label": "Context {{used}} of {{window}} tokens, {{percent}}% used", "title": "Context", - "estimated": "Estimated from the last response." + "estimated": "Estimated from the last response.", + "deferredNote": "Loaded on demand. Not counted in the used total." }, "contextMenu": { "noSessionContext": "No chat context is available.", diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json index 24007e63f01..99b87eef29e 100644 --- a/src/renderer/src/i18n/locales/es.json +++ b/src/renderer/src/i18n/locales/es.json @@ -19506,7 +19506,8 @@ "contextUsage": { "label": "Contexto: {{used}} de {{window}} tokens, {{percent}} % usados", "title": "Contexto", - "estimated": "Estimado a partir de la última respuesta." + "estimated": "Estimado a partir de la última respuesta.", + "deferredNote": "Se cargan cuando se necesitan. No cuentan en el total usado." }, "dismissDeliveryNotice": "Descartar", "addSelectionToChat": "Añadir al chat", diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json index fc72f89f67c..1c9b7e6bc21 100644 --- a/src/renderer/src/i18n/locales/fr.json +++ b/src/renderer/src/i18n/locales/fr.json @@ -19949,7 +19949,8 @@ "contextUsage": { "label": "Contexte : {{used}} tokens sur {{window}}, {{percent}} % utilisés", "title": "Contexte", - "estimated": "Estimation basée sur la dernière réponse." + "estimated": "Estimation basée sur la dernière réponse.", + "deferredNote": "Chargé à la demande. Non compté dans le total utilisé." }, "dismissDeliveryNotice": "Ignorer", "addSelectionToChat": "Ajouter au chat", diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json index a161f789437..4b50f6f899b 100644 --- a/src/renderer/src/i18n/locales/ja.json +++ b/src/renderer/src/i18n/locales/ja.json @@ -19217,7 +19217,8 @@ "contextUsage": { "label": "コンテキスト {{used}} / {{window}} トークン、{{percent}}% 使用済み", "title": "コンテキスト", - "estimated": "最後の応答から推定。" + "estimated": "最後の応答から推定。", + "deferredNote": "必要時に読み込まれます。使用量には含まれません。" }, "dismissDeliveryNotice": "閉じる", "addSelectionToChat": "チャットに追加", diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json index 75e6a229e7a..1cb5d7959ad 100644 --- a/src/renderer/src/i18n/locales/ko.json +++ b/src/renderer/src/i18n/locales/ko.json @@ -19217,7 +19217,8 @@ "contextUsage": { "label": "컨텍스트 {{used}}/{{window}} 토큰, {{percent}}% 사용", "title": "컨텍스트", - "estimated": "마지막 응답 기준 추정치입니다." + "estimated": "마지막 응답 기준 추정치입니다.", + "deferredNote": "필요할 때 불러옵니다. 사용량에 포함되지 않습니다." }, "dismissDeliveryNotice": "닫기", "addSelectionToChat": "채팅에 추가", diff --git a/src/renderer/src/i18n/locales/pt.json b/src/renderer/src/i18n/locales/pt.json index fe78ad3d3de..8fd26db8efa 100644 --- a/src/renderer/src/i18n/locales/pt.json +++ b/src/renderer/src/i18n/locales/pt.json @@ -20929,7 +20929,8 @@ "contextUsage": { "label": "Contexto: {{used}} de {{window}} tokens, {{percent}}% usado", "title": "Contexto", - "estimated": "Estimado a partir da última resposta." + "estimated": "Estimado a partir da última resposta.", + "deferredNote": "Carregado sob demanda. Não conta no total usado." }, "contextMenu": { "copyOrcaSessionId": "Copiar ID de sessão do Orca", diff --git a/src/renderer/src/i18n/locales/ru.json b/src/renderer/src/i18n/locales/ru.json index cc61948d8e0..234a841efd0 100644 --- a/src/renderer/src/i18n/locales/ru.json +++ b/src/renderer/src/i18n/locales/ru.json @@ -20616,7 +20616,8 @@ "contextUsage": { "label": "Контекст: {{used}} из {{window}} токенов, использовано {{percent}}%", "title": "Контекст", - "estimated": "Оценка по последнему ответу." + "estimated": "Оценка по последнему ответу.", + "deferredNote": "Загружается по запросу. Не входит в использованный объём." }, "contextMenu": { "copyOrcaSessionId": "Копировать ID сессии Orca", diff --git a/src/renderer/src/i18n/locales/tr.json b/src/renderer/src/i18n/locales/tr.json index b1d069b3554..ff788dba404 100644 --- a/src/renderer/src/i18n/locales/tr.json +++ b/src/renderer/src/i18n/locales/tr.json @@ -19935,7 +19935,8 @@ "contextUsage": { "label": "Bağlam: {{used}} / {{window}} token kullanıldı (%{{percent}})", "title": "Bağlam", - "estimated": "Son yanıta göre tahmin edilmiştir." + "estimated": "Son yanıta göre tahmin edilmiştir.", + "deferredNote": "İhtiyaç olduğunda yüklenir. Kullanılan toplama dahil değildir." }, "contextMenu": { "copyOrcaSessionId": "Orca Oturum Kimliğini Kopyala", diff --git a/src/renderer/src/i18n/locales/zh-Hant.json b/src/renderer/src/i18n/locales/zh-Hant.json index abaa5ff49a0..53ab837158d 100644 --- a/src/renderer/src/i18n/locales/zh-Hant.json +++ b/src/renderer/src/i18n/locales/zh-Hant.json @@ -19644,7 +19644,8 @@ "contextUsage": { "label": "上下文 {{used}}/{{window}} token,已用 {{percent}}%", "title": "上下文", - "estimated": "根據上一次回應的估算值。" + "estimated": "根據上一次回應的估算值。", + "deferredNote": "按需載入,不計入已用總量。" }, "contextMenu": { "copyOrcaSessionId": "複製 Orca 工作階段 ID", diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json index 4f7595734eb..15f85644cfd 100644 --- a/src/renderer/src/i18n/locales/zh.json +++ b/src/renderer/src/i18n/locales/zh.json @@ -19162,7 +19162,8 @@ "contextUsage": { "label": "上下文 {{used}}/{{window}} token,已用 {{percent}}%", "title": "上下文", - "estimated": "根据上一次响应的估算值。" + "estimated": "根据上一次响应的估算值。", + "deferredNote": "按需加载,不计入已用总量。" }, "dismissDeliveryNotice": "关闭", "addSelectionToChat": "添加到聊天", diff --git a/src/shared/native-chat/native-chat-context-usage-summary.ts b/src/shared/native-chat/native-chat-context-usage-summary.ts index ab28bf04688..5357cd94925 100644 --- a/src/shared/native-chat/native-chat-context-usage-summary.ts +++ b/src/shared/native-chat/native-chat-context-usage-summary.ts @@ -6,8 +6,8 @@ export type NativeChatContextUsageSummary = { windowTokens: number percentage: number estimated: boolean - /** Largest first, as a share of the window; empty rows are dropped. */ - rows: readonly { name: string; tokens: number; percentage: number }[] + /** Largest first, as a share of the window; empty rows are dropped, and deferred rows sit outside the used total. */ + rows: readonly { name: string; tokens: number; percentage: number; deferred?: true }[] } /** Past this the window is nearly spent, so the ring turns red to say so. */ @@ -45,7 +45,8 @@ export function summarizeContextUsage( .map((row) => ({ name: row.name, tokens: row.tokens, - percentage: rowPercentage(row.tokens, usage.windowTokens) + percentage: rowPercentage(row.tokens, usage.windowTokens), + ...(row.deferred === true ? { deferred: true as const } : {}) })) .sort((left, right) => right.tokens - left.tokens) } From 715020e8714874f2dc0d222c597e9549280ea92c Mon Sep 17 00:00:00 2001 From: Neil <4138956+nwparker@users.noreply.github.com> Date: Mon, 9 Nov 2026 03:44:32 -0800 Subject: [PATCH 25/90] refactor: group editor browser document and simulator owners (#40273) * refactor: group editor browser document and simulator owners * refactor: update active simulator reliability command links * refactor: preserve upstream editor and emulator test retirements --- config/reliability-gates.jsonc | 32 +++++++-------- .../scripts/ci/sharding/ci-shard-timings.json | 28 ++++++------- .../markdown-note-line-scan-benchmark.mjs | 12 +++--- .../source-routing/pr-e2e-source-routing.mjs | 2 +- .../pr-editor-preview-e2e-source-routes.mjs | 4 +- .../src/app-shell/use-document-appearance.ts | 6 +-- .../attention/notification-subject-owner.ts | 12 ++++-- .../notification-workspace-labels.ts | 6 +-- src/renderer/src/components/FileTypeIcon.tsx | 2 +- .../AutomationEditorPromptEditor.test.tsx | 2 +- .../AutomationEditorPromptEditor.tsx | 4 +- .../automation-editor-prompt-options.ts | 2 +- .../ClientHostedBrowserPagePane.tsx | 3 +- .../assemble-chrome/browser-page-toolbar.tsx | 3 +- .../navigate/navigate-browser-page-url.ts | 2 +- .../workspace-doc-address-submission.ts | 3 +- .../remote-browser-page-pane.tsx | 3 +- .../HtmlDocPreview.toolbar.test.tsx | 2 +- .../workspace-doc/HtmlDocPreview.tsx | 2 +- .../doc-preview-address-edit.tsx | 3 +- .../doc-preview-artifact-share.test.ts | 2 +- .../doc-preview-artifact-share.tsx | 2 +- .../doc-preview-document-actions.ts | 2 +- .../use-visible-worktree-diff-comments.ts | 2 +- .../editor/EditorConflictReviewSurface.tsx | 2 +- .../src/components/editor/EditorPanel.tsx | 4 +- .../components/editor/MonacoCodeExcerpt.tsx | 7 +++- .../MonacoEditor.owner-view-state.test.tsx | 4 +- .../src/components/editor/MonacoEditor.tsx | 4 +- .../editor/closed-unsaved-files-toast.test.ts | 10 +++-- .../editor/closed-unsaved-files-toast.ts | 8 ++-- .../combined-diff/CombinedDiffViewer.tsx | 4 +- .../combined-diff-section-connection.ts | 2 +- .../combined-diff-review-host.test-fixture.ts | 2 +- .../use-combined-diff-notes-actions.ts | 2 +- .../use-combined-diff-section-actions.ts | 4 +- .../useDiffViewerLargeDiffLifecycle.ts | 2 +- .../editor/diff/monaco-view/DiffViewer.tsx | 2 +- .../DiffViewer.word-wrap-lifecycle.test.tsx | 2 +- .../editor/diff/sections/DiffSectionBody.tsx | 5 ++- .../diff/sections/diff-section-preview.ts | 2 +- .../diff/sections/diff-section-types.ts | 2 +- .../use-diff-section-model-lifecycle.ts | 2 +- .../editor/editor-dropped-file-open.ts | 2 +- .../editor/editor-header-file-rename.test.ts | 4 +- .../editor/editor-panel-file-actions.ts | 2 +- ...editor-panel-host-content-recovery.spec.ts | 2 +- .../editor/editor-panel-render-model.ts | 4 +- .../editor/markdown-export-extract.ts | 2 +- .../render-tree/markdown-preview-types.ts | 2 +- .../MarkdownPreviewAnnotationComposer.tsx | 5 ++- .../review/markdown-preview-block-model.ts | 2 +- ...-markdown-preview-annotation-renderers.tsx | 2 +- .../use-markdown-preview-review-actions.ts | 4 +- .../use-markdown-preview-foundation.ts | 2 +- .../use-markdown-preview-source-foundation.ts | 2 +- .../monaco/use-monaco-markdown-annotations.ts | 5 ++- .../documents/MarkdownTemplatePicker.tsx | 4 +- .../documents/useMarkdownDocuments.ts | 2 +- .../migrate-restored-editor-file-owner.ts | 7 ++-- .../buffer-text/editor-buffer-adapter.test.ts | 2 +- .../buffer-text/editor-buffer-adapter.ts | 5 ++- .../editor-shared-record-clean-view.test.ts | 2 +- .../identity/editor-model-owner.ts | 4 +- .../identity/editor-model-rekey-carry.ts | 2 +- .../closed-editor-model-shell.test.tsx | 2 +- .../retention/closed-editor-tab-controller.ts | 2 +- ...closed-editor-view-state-retention.test.ts | 2 +- .../editor-model-lifetime-fixture.ts | 2 +- .../IpynbCellEditor.external-sync.test.tsx | 2 +- .../editor/notebook/cells/IpynbCellEditor.tsx | 4 +- .../notebook/document/IpynbRendering.test.tsx | 2 +- .../editor/notebook/document/IpynbViewer.tsx | 2 +- .../editor/open-editor-html-preview.ts | 4 +- .../images/rich-markdown-image-insert.ts | 2 +- .../instance/RichMarkdownEditorSurface.tsx | 2 +- .../instance/rich-markdown-editor-props.ts | 2 +- .../review/RichMarkdownReviewNoteLayer.tsx | 2 +- .../review/RichMarkdownReviewRailActions.tsx | 2 +- .../useRichMarkdownReviewCopyFeedback.ts | 4 +- .../review/useRichMarkdownReviewData.ts | 2 +- .../flush/removal-unsaved-editor-files.ts | 2 +- .../editor/save/queue/editor-save-slots.ts | 2 +- .../save/queue/editor-save-writer-view.ts | 4 +- .../editor-final-newline-save.test.ts | 2 +- .../save/transforms/editor-final-newline.ts | 2 +- .../editor/setup-contextual-copy.ts | 2 +- ...-monaco-editor-mount.cursor-owner.test.tsx | 3 +- .../editor/useEditorPanelDiffContentLoader.ts | 2 +- .../editor/useEditorPanelFileContentLoader.ts | 2 +- .../editor/useUntitledFileRename.ts | 4 +- .../emulator-device-picker-groups.ts | 2 +- .../emulator-pane/emulator-pane-error-copy.ts | 2 +- .../emulator-pane-session-view.ts | 2 +- .../emulator-pane/emulator-pane-types.ts | 8 +++- .../emulator-pane/use-emulator-input-check.ts | 2 +- .../use-emulator-pane-lifecycle.ts | 2 +- .../use-emulator-pane-manual-launch-events.ts | 4 +- .../use-emulator-pane-session.test.tsx | 6 +-- .../use-emulator-pane-session.ts | 20 +++++----- .../use-floating-terminal-create-actions.ts | 2 +- .../components/github/CommentCodeContext.tsx | 2 +- .../native-chat-appearance-style.ts | 2 +- .../editor/NativeChatFileReferencePill.tsx | 2 +- .../media/visuals/NativeChatInlineVisual.tsx | 2 +- .../plugins/view/plugin-view-host-actions.ts | 2 +- .../view/plugin-view-request-handler.ts | 2 +- .../components/quick-open-file-navigation.ts | 2 +- .../ai-vault-session-log-open.ts | 2 +- .../content-search/search-match-open.ts | 2 +- .../file-explorer-deletion-editors.ts | 2 +- .../mutations/useFileExplorerHandlers.ts | 2 +- .../mutations/useFileExplorerMoveDrop.ts | 2 +- .../panel/file-explorer-row-context-menu.tsx | 4 +- .../tree/use-file-explorer-tree-pane-state.ts | 2 +- .../listing/open-uncommitted-entry.ts | 2 +- .../source-control/listing/use-row-opening.ts | 2 +- .../listing/use-store-actions.ts | 2 +- .../notes/use-diff-comment-notes.ts | 2 +- .../source-control/notes/use-note-opening.ts | 2 +- .../sync/use-git-history-commit-actions.ts | 2 +- .../themes/AppearanceThemeControl.tsx | 2 +- .../editor/EditorTypographySettings.tsx | 7 +++- .../editor/editor-typography-search.ts | 2 +- .../emulator/EmulatorOpeningSettings.tsx | 2 +- .../MobileEmulatorAvailabilityDetails.tsx | 2 +- .../emulator/MobileEmulatorSettingsPane.tsx | 2 +- .../src/components/tab-bar/EditorFileTab.tsx | 2 +- .../src/components/tab-bar/TabBarItemRow.tsx | 2 +- .../tab-bar/open-tab-search-entries.ts | 10 ++--- .../src/components/tab-bar/open-tab-search.ts | 10 ++--- .../tab-bar/open-tab-selection-routing.ts | 2 +- .../components/tab-bar/tab-bar-item-label.ts | 2 +- .../tab-bar/tab-create-entry-absolute-file.ts | 2 +- .../tab-bar/tab-create-entry-action.ts | 2 +- .../tab-bar/tab-create-entry-local-path.ts | 2 +- .../tab-bar/tab-create-entry-preview.test.ts | 2 +- .../components/tab-group/SplitPaneLanding.tsx | 7 +++- .../tab-group/useTabGroupCreationCommands.ts | 7 +++- .../files/terminal-file-link-browser-open.ts | 7 +++- .../files/terminal-file-link-editor-open.ts | 1 - .../terminal-link-file-open-routing.test.ts | 2 +- .../terminal-link-provider-batching.test.ts | 2 +- ...l-link-provider-candidate-failures.test.ts | 4 +- ...minal-link-provider-link-detection.test.ts | 2 +- .../terminal-link-osc-url-routing.test.ts | 2 +- .../terminal-link-click-fallback.test.ts | 2 +- .../terminal-link-open-beside-source.test.ts | 2 +- .../use-terminal-create-actions.test.tsx | 2 +- .../components/use-terminal-create-actions.ts | 2 +- .../workspace-surface-projection.ts | 12 ++++-- .../use-worktree-jump-palette-open-tabs.ts | 28 +++++-------- ...worktree-jump-palette-selection-actions.ts | 4 +- .../worktree-jump-palette-model.ts | 2 +- .../worktree-jump-palette-open-tab-items.ts | 2 +- .../worktree-jump-palette-open-tabs-input.ts | 12 ++++++ ...vents-agent-status-window-test-fixtures.ts | 2 +- .../ipc-events-close-routing-test-harness.ts | 2 +- .../ipc-events/content-creation-ipc-bridge.ts | 4 +- .../mobile-terminal-close-ipc-bridge.ts | 2 +- .../src/hooks/ipc-events/zoom-ipc-bridge.ts | 7 +++- .../src/hooks/use-editor-typography.ts | 2 +- .../useEditorExternalWatch-targets.test.ts | 2 +- .../useIpcEvents-rate-limit-hydration.test.ts | 2 +- ...structured-agent-session-launch-surface.ts | 8 ++-- .../documents}/doc-preview-grants.test.ts | 0 .../documents}/doc-preview-grants.ts | 2 +- .../documents}/doc-preview-web-client.ts | 2 +- .../documents}/file-preview-link-open.test.ts | 8 ++-- .../documents}/file-preview-link-open.ts | 22 +++++----- .../file-preview-page-conversion.ts | 10 ++--- .../{ => browser/documents}/file-preview.ts | 16 ++++---- .../browser-page-conversion-history.ts | 4 +- .../browser-link-open-layout-owner.test.ts | 2 +- .../appearance}/code-editor-theme.test.ts | 4 +- .../appearance}/code-editor-theme.ts | 12 +++--- .../appearance}/code-font-smoothing.ts | 2 +- .../appearance}/editor-font-zoom.ts | 0 .../appearance}/editor-typography.ts | 13 +++--- .../appearance}/markdown-code-font.ts | 2 +- .../create-untitled-markdown.ts | 16 ++++---- .../editor-file-child-owner.ts | 14 +++---- ...ile-operation-owner-interpretation.spec.ts | 7 ++-- .../editor-file-operation-owner.test.ts | 4 +- .../editor-file-operation-owner.ts | 24 ++++------- .../editor-file-operation-provenance.ts | 20 +++++----- .../execute-open-editor-path-move.test.ts | 4 +- .../execute-open-editor-path-move.ts | 15 +++---- .../open-editor-move-owner.ts | 4 +- ...p-open-editor-tabs-for-path-change.test.ts | 7 +++- .../remap-open-editor-tabs-for-path-change.ts | 14 ++++--- .../documents}/markdown-document-templates.ts | 8 ++-- .../markdown-template-picker-request.ts | 0 .../markdown-review-note-copy.ts | 0 .../markdown-review-notes-setting.ts | 6 +-- .../review-notes}/markdown-review-notes.ts | 4 +- .../monaco}/editor-model-registry.ts | 0 .../monaco-delayer-cancellation-guard.ts | 0 .../monaco}/monaco-diff-editor-disposal.ts | 0 .../monaco-diff-viewport-tokenization.ts | 0 .../monaco-editor-gutter-disposal.test.ts | 0 .../monaco}/monaco-peek-preview-options.ts | 0 .../{ => editor/monaco}/monaco-setup-steps.ts | 2 +- .../lib/{ => editor/monaco}/monaco-setup.ts | 32 +++++++-------- .../monaco}/monaco-ts-worker-idle-stop.ts | 0 .../file-type-icon-extension-table.ts | 0 .../file-type-icon-name-table.ts | 0 .../lib/{ => file-icons}/file-type-icons.ts | 2 +- .../lib/floating-workspace-tab-creation.ts | 4 +- src/renderer/src/lib/language-detect.ts | 1 - .../src/lib/markdown-comment-blocks.ts | 40 ------------------- .../monaco-languages/zig-highlighting.test.ts | 2 +- .../open-document-in-floating-workspace.ts | 2 +- .../src/lib/open-html-file-preview.ts | 2 +- src/renderer/src/lib/rename-file.ts | 2 +- .../launch}/emulator-error-copy.ts | 2 +- ...emulator-opening-preferences-capability.ts | 2 +- .../launch}/open-mobile-emulator-tab.test.ts | 8 ++-- .../launch}/open-mobile-emulator-tab.ts | 12 +++--- .../simulator-launch-coordination.test.ts | 0 .../launch}/simulator-launch-coordination.ts | 0 .../launch}/simulator-runtime-label.ts | 0 .../search}/simulator-palette-active-tab.ts | 8 ++-- .../search}/simulator-palette-search-types.ts | 14 +++---- .../search}/simulator-palette-search.test.ts | 14 +++---- .../search}/simulator-palette-search.ts | 29 ++++++-------- .../tabs}/emulator-right-split-target.ts | 2 +- .../ensure-simulator-tab-behavior.test.ts | 8 ++-- .../tabs}/ensure-simulator-tab.ts | 18 ++++----- .../simulator-pane-shutdown-scheduler.test.ts | 0 .../simulator-pane-shutdown-scheduler.ts | 2 +- .../tabs}/simulator-tab-label.ts | 0 .../tabs}/simulator-tab-layout-owner.test.ts | 16 ++++---- .../tabs}/simulator-tab-layout-owner.ts | 6 +-- .../simulator-tab-palette-activation.test.ts | 8 ++-- .../tabs}/simulator-tab-palette-activation.ts | 8 ++-- .../tabs}/simulator-tab-shutdown.ts | 0 .../lib/workspace-doc-address-input.test.ts | 2 +- .../src/lib/workspace-doc-address-input.ts | 2 +- .../workspace-catalog-owner-index.ts | 11 +---- .../ownership/workspace-copy-owner.ts | 2 +- .../search/tabs/workspace-tab-search-types.ts | 4 +- src/renderer/src/popout.tsx | 2 +- ...c-runtime-graph-conversion-publish.test.ts | 2 +- .../server-layout-frames-held-tabs.test.ts | 2 +- .../src/store/appearance/code-editor-theme.ts | 2 +- .../browser/cleanup/browser-close-actions.ts | 2 +- .../pages/browser-page-conversion-actions.ts | 2 +- .../pages/browser-page-conversion.test.ts | 2 +- .../pages/browser-page-create-actions.ts | 2 +- .../browser-workspace-doc-location.test.ts | 2 +- .../diff-comments/diff-comment-owner.ts | 2 +- .../editor-close-document-siblings.test.ts | 2 +- .../slices/editor/git/editor-open-owner.ts | 3 +- .../restored-editor-owner-destination.ts | 2 +- .../restored-editor-owner-reparent.test.ts | 4 +- .../restored-editor-owner-restart.test.ts | 2 +- .../markdown/markdown-preview-actions.ts | 2 +- .../slices/editor/opening/open-file-apply.ts | 2 +- .../editor/opening/open-file-mutations.ts | 4 +- .../editor/opening/untitled-file-creation.ts | 8 ++-- .../tabs/editor-layout-owner-records.test.ts | 7 +++- ...restored-editor-owner-layout-owner.test.ts | 2 +- .../editor/tabs/untitled-file-cleanup.ts | 2 +- .../store/slices/editor/types/open-file.ts | 2 +- .../editor/types/restored-editor-owner.ts | 2 +- .../content-tabs-from-main-frames.test.ts | 2 +- .../removed-workspace-unsaved-files.test.ts | 2 +- ...ve-chat-image-runtime-context.unit.test.ts | 2 +- 269 files changed, 604 insertions(+), 599 deletions(-) create mode 100644 src/renderer/src/components/worktree-jump/worktree-jump-palette-open-tabs-input.ts rename src/renderer/src/lib/{ => browser/documents}/doc-preview-grants.test.ts (100%) rename src/renderer/src/lib/{ => browser/documents}/doc-preview-grants.ts (97%) rename src/renderer/src/lib/{ => browser/documents}/doc-preview-web-client.ts (88%) rename src/renderer/src/lib/{ => browser/documents}/file-preview-link-open.test.ts (97%) rename src/renderer/src/lib/{ => browser/documents}/file-preview-link-open.ts (79%) rename src/renderer/src/lib/{ => browser/documents}/file-preview-page-conversion.ts (90%) rename src/renderer/src/lib/{ => browser/documents}/file-preview.ts (94%) rename src/renderer/src/lib/{ => editor/appearance}/code-editor-theme.test.ts (94%) rename src/renderer/src/lib/{ => editor/appearance}/code-editor-theme.ts (92%) rename src/renderer/src/lib/{ => editor/appearance}/code-font-smoothing.ts (89%) rename src/renderer/src/lib/{ => editor/appearance}/editor-font-zoom.ts (100%) rename src/renderer/src/lib/{ => editor/appearance}/editor-typography.ts (92%) rename src/renderer/src/lib/{ => editor/appearance}/markdown-code-font.ts (86%) rename src/renderer/src/lib/{ => editor/file-operations}/create-untitled-markdown.ts (91%) rename src/renderer/src/lib/{ => editor/file-operations}/editor-file-child-owner.ts (87%) rename src/renderer/src/lib/{ => editor/file-operations}/editor-file-operation-owner-interpretation.spec.ts (97%) rename src/renderer/src/lib/{ => editor/file-operations}/editor-file-operation-owner.test.ts (97%) rename src/renderer/src/lib/{ => editor/file-operations}/editor-file-operation-owner.ts (91%) rename src/renderer/src/lib/{ => editor/file-operations}/editor-file-operation-provenance.ts (93%) rename src/renderer/src/lib/{ => editor/file-operations}/execute-open-editor-path-move.test.ts (97%) rename src/renderer/src/lib/{ => editor/file-operations}/execute-open-editor-path-move.ts (92%) rename src/renderer/src/lib/{ => editor/file-operations}/open-editor-move-owner.ts (97%) rename src/renderer/src/lib/{ => editor/file-operations}/remap-open-editor-tabs-for-path-change.test.ts (98%) rename src/renderer/src/lib/{ => editor/file-operations}/remap-open-editor-tabs-for-path-change.ts (96%) rename src/renderer/src/lib/{ => editor/markdown/documents}/markdown-document-templates.ts (95%) rename src/renderer/src/lib/{ => editor/markdown/documents}/markdown-template-picker-request.ts (100%) rename src/renderer/src/lib/{ => editor/markdown/review-notes}/markdown-review-note-copy.ts (100%) rename src/renderer/src/lib/{ => editor/markdown/review-notes}/markdown-review-notes-setting.ts (72%) rename src/renderer/src/lib/{ => editor/markdown/review-notes}/markdown-review-notes.ts (97%) rename src/renderer/src/lib/{ => editor/monaco}/editor-model-registry.ts (100%) rename src/renderer/src/lib/{ => editor/monaco}/monaco-delayer-cancellation-guard.ts (100%) rename src/renderer/src/lib/{ => editor/monaco}/monaco-diff-editor-disposal.ts (100%) rename src/renderer/src/lib/{ => editor/monaco}/monaco-diff-viewport-tokenization.ts (100%) rename src/renderer/src/lib/{ => editor/monaco}/monaco-editor-gutter-disposal.test.ts (100%) rename src/renderer/src/lib/{ => editor/monaco}/monaco-peek-preview-options.ts (100%) rename src/renderer/src/lib/{ => editor/monaco}/monaco-setup-steps.ts (88%) rename src/renderer/src/lib/{ => editor/monaco}/monaco-setup.ts (78%) rename src/renderer/src/lib/{ => editor/monaco}/monaco-ts-worker-idle-stop.ts (100%) rename src/renderer/src/lib/{ => file-icons}/file-type-icon-extension-table.ts (100%) rename src/renderer/src/lib/{ => file-icons}/file-type-icon-name-table.ts (100%) rename src/renderer/src/lib/{ => file-icons}/file-type-icons.ts (97%) delete mode 100644 src/renderer/src/lib/language-detect.ts delete mode 100644 src/renderer/src/lib/markdown-comment-blocks.ts rename src/renderer/src/lib/{ => simulator/launch}/emulator-error-copy.ts (98%) rename src/renderer/src/lib/{ => simulator/launch}/emulator-opening-preferences-capability.ts (89%) rename src/renderer/src/lib/{ => simulator/launch}/open-mobile-emulator-tab.test.ts (95%) rename src/renderer/src/lib/{ => simulator/launch}/open-mobile-emulator-tab.ts (93%) rename src/renderer/src/lib/{ => simulator/launch}/simulator-launch-coordination.test.ts (100%) rename src/renderer/src/lib/{ => simulator/launch}/simulator-launch-coordination.ts (100%) rename src/renderer/src/lib/{ => simulator/launch}/simulator-runtime-label.ts (100%) rename src/renderer/src/lib/{ => simulator/search}/simulator-palette-active-tab.ts (80%) rename src/renderer/src/lib/{ => simulator/search}/simulator-palette-search-types.ts (79%) rename src/renderer/src/lib/{ => simulator/search}/simulator-palette-search.test.ts (89%) rename src/renderer/src/lib/{ => simulator/search}/simulator-palette-search.ts (90%) rename src/renderer/src/lib/{ => simulator/tabs}/emulator-right-split-target.ts (94%) rename src/renderer/src/lib/{ => simulator/tabs}/ensure-simulator-tab-behavior.test.ts (98%) rename src/renderer/src/lib/{ => simulator/tabs}/ensure-simulator-tab.ts (92%) rename src/renderer/src/lib/{ => simulator/tabs}/simulator-pane-shutdown-scheduler.test.ts (100%) rename src/renderer/src/lib/{ => simulator/tabs}/simulator-pane-shutdown-scheduler.ts (98%) rename src/renderer/src/lib/{ => simulator/tabs}/simulator-tab-label.ts (100%) rename src/renderer/src/lib/{ => simulator/tabs}/simulator-tab-layout-owner.test.ts (94%) rename src/renderer/src/lib/{ => simulator/tabs}/simulator-tab-layout-owner.ts (93%) rename src/renderer/src/lib/{ => simulator/tabs}/simulator-tab-palette-activation.test.ts (95%) rename src/renderer/src/lib/{ => simulator/tabs}/simulator-tab-palette-activation.ts (87%) rename src/renderer/src/lib/{ => simulator/tabs}/simulator-tab-shutdown.ts (100%) diff --git a/config/reliability-gates.jsonc b/config/reliability-gates.jsonc index 00b3edcbd75..8cbb85016c2 100644 --- a/config/reliability-gates.jsonc +++ b/config/reliability-gates.jsonc @@ -2389,13 +2389,13 @@ "commands": [ "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/cmd-j/worktree-checks-review-index.test.ts", "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/worktree-jump/WorktreeJumpPalette.test.tsx", - "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/ensure-simulator-tab-behavior.test.ts", - "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator-palette-search.test.ts", + "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts", + "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts", "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts", - "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator-palette-search.test.ts src/renderer/src/lib/ensure-simulator-tab-behavior.test.ts src/shared/workspace-session/workspace-session-schema.test.ts", - "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator-palette-search.test.ts src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts src/renderer/src/lib/simulator-tab-palette-activation.test.ts src/renderer/src/lib/ensure-simulator-tab-behavior.test.ts src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-mirror-identity.test.ts src/shared/workspace-session/workspace-session-schema.test.ts", - "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/cmd-j/worktree-checks-review-index.test.ts src/renderer/src/components/worktree-jump/WorktreeJumpPalette.test.tsx src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator-palette-search.test.ts src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts src/renderer/src/lib/simulator-tab-palette-activation.test.ts src/renderer/src/lib/ensure-simulator-tab-behavior.test.ts src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-mirror-identity.test.ts src/shared/workspace-session/workspace-session-schema.test.ts", - "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/cmd-j/worktree-checks-review-index.test.ts src/renderer/src/components/worktree-jump/WorktreeJumpPalette.test.tsx src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator-palette-search.test.ts src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts src/renderer/src/lib/simulator-tab-palette-activation.test.ts src/renderer/src/lib/ensure-simulator-tab-behavior.test.ts src/renderer/src/lib/open-mobile-emulator-tab.test.ts src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-mirror-identity.test.ts src/shared/workspace-session/workspace-session-schema.test.ts", + "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts src/shared/workspace-session/workspace-session-schema.test.ts", + "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-mirror-identity.test.ts src/shared/workspace-session/workspace-session-schema.test.ts", + "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/cmd-j/worktree-checks-review-index.test.ts src/renderer/src/components/worktree-jump/WorktreeJumpPalette.test.tsx src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-mirror-identity.test.ts src/shared/workspace-session/workspace-session-schema.test.ts", + "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/cmd-j/worktree-checks-review-index.test.ts src/renderer/src/components/worktree-jump/WorktreeJumpPalette.test.tsx src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts src/renderer/src/lib/simulator/launch/open-mobile-emulator-tab.test.ts src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-mirror-identity.test.ts src/shared/workspace-session/workspace-session-schema.test.ts", "pnpm exec playwright test tests/e2e/paired-cmd-j-host-qualified-tabs.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1", "SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-cmd-j-host-qualified-tabs.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1" ], @@ -2404,11 +2404,11 @@ "src/renderer/src/components/worktree-jump/WorktreeJumpPalette.test.tsx", "src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts", "src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts", - "src/renderer/src/lib/simulator-palette-search.test.ts", + "src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts", "src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts", - "src/renderer/src/lib/simulator-tab-palette-activation.test.ts", - "src/renderer/src/lib/ensure-simulator-tab-behavior.test.ts", - "src/renderer/src/lib/open-mobile-emulator-tab.test.ts", + "src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts", + "src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts", + "src/renderer/src/lib/simulator/launch/open-mobile-emulator-tab.test.ts", "src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-mirror-identity.test.ts", "tests/e2e/paired-cmd-j-host-qualified-tabs.spec.ts", "src/shared/workspace-session/workspace-session-schema.test.ts" @@ -2426,7 +2426,7 @@ ] }, { - "file": "src/renderer/src/lib/ensure-simulator-tab-behavior.test.ts", + "file": "src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts", "assertions": [ "same-id folder simulator reuse selects the active owning host", "inactive local simulator creation remains host-stamped amid a collision", @@ -2486,7 +2486,7 @@ "result": "failed", "durationSeconds": 0.8, "summary": "The final-review oracle failed 4/16 before the follow-up: same-id folder simulator reuse selected no owning tab, inactive local simulator creation was unstamped, the paired SSH/runtime alias resolved local metadata, and an explicit unknown owner fell back locally. Historical command preserved after the test-value audit removed the palette repo resolver suite. currentCommand is an administrative link to a remaining gate command; this historical run has not validated that command or equivalent coverage.", - "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/ensure-simulator-tab-behavior.test.ts" + "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts" }, { "date": "2026-08-20", @@ -2496,7 +2496,7 @@ "result": "failed", "durationSeconds": 0.1, "summary": "The final reviewer repo-label oracle failed 1/6 before the follow-up: a paired SSH worktree resolved the local bare-id repository instead of its runtime-owned repository. Historical command preserved after the test-value audit removed the palette repo resolver suite. currentCommand is an administrative link to a remaining gate command; this historical run has not validated that command or equivalent coverage.", - "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/ensure-simulator-tab-behavior.test.ts" + "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts" }, { "date": "2026-08-20", @@ -2506,7 +2506,7 @@ "result": "failed", "durationSeconds": 0.1, "summary": "The final clean-round fail-closed oracle failed 1/7 before the follow-up: an unavailable explicit runtime owner borrowed physical SSH repository metadata. Historical command preserved after the test-value audit removed the palette repo resolver suite. currentCommand is an administrative link to a remaining gate command; this historical run has not validated that command or equivalent coverage.", - "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/ensure-simulator-tab-behavior.test.ts" + "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts" }, { @@ -4451,7 +4451,7 @@ "oracle": "Audit2133 current-parent preparation: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2095 current-parent preparation2126: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2090 (sources2088/2089): Current reduced suites intentionally retire the alarms listed in knownGaps; prior dated execution and replacement claims do not validate changed source bytes or selectors. Historical prior account (preserved verbatim): Audit2086 (sources2082/2083): Current reduced suites intentionally retire the alarms listed in knownGaps; prior dated execution and replacement claims do not validate changed source bytes or selectors. Historical prior account (preserved verbatim): Audit2076 (sources2073/2074): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime-tests/terminal-handles-part-02.spec.ts: recovers a moved SSH pane through the tab it now sits in, not the one its lease froze; reports a plain expired orphan; does not report a pane whose only recent lease was superseded; does not report a pane whose only recent lease had its relay id recycled; picks the eligible orphan over a superseded predecessor that matches first; collects the same tabs the per-tab reader reports, in one sweep of the leases; reports no candidate when no lease names any of the worktree tabs. src/main/runtime/orca-runtime-tests/runtime-availability.spec.ts: starts unavailable with no authoritative window; reports the configured Windows terminal shell on status; reports floating workspace availability from settings on status; polls floating tabs with targeted PTY liveness and no repo/provider inventory; hydrates persisted tabs when the store cannot report repos; advertises browser screencast only when a renderer window is available; routes mobile Codex reset consumption through the account mutation coordinator; maps a definite pre-provider rejection into an authoritative current snapshot. Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Frozen current literal-import graph reaches these changed test bytes; unresolved local and computed edges remain debt, and current reachability is not historical execution or equivalent replacement evidence. Historical prior account (preserved verbatim): Audit2043: Remove the registration-wait, webview-security, preview-authorization, guest-lifecycle and grant-IPC unit suites and the sibling-directory assertion reference. Runtime and browser capability consumers also lose removed imported examples. Remaining document-policy, file-reader and grant-registry assertions do not replace those alarms. Preserve the 27 independent dated receipts at their original unchanged selectors; reduced prospective unit selectors have no fresh result or equivalent replacement claim. Historical prior account (preserved verbatim): Audit1973: Delete the browser RPC forwarding/schema/scalar suite and its prospective selector. Preserve all27 unrelated dated receipts; no actual browser operation alarm is replaced. Whole original changed dated receipts are retired, never narrowed or transferred. This metadata review claims no fresh execution, equivalent replacement, provider/PTY, live remote/mobile, rendered, cross-platform, soak or measured-budget result. Historical prior account (preserved verbatim): Audit1925 (sources1922/1923): The complete terminal-file-link-actions suite is removed. Lose supplied local/remote menu-row inventories, browser label/order/download/reveal callback forwarding, platform-copy and source-group pinning examples. No OS reveal/download, real remote preview or browser navigation was exercised; the other real document-preview sources are not equivalent replacements. Preserve meaningful remaining selectors/assertions and unchanged dated receipts within their original scope. Reduced selectors have no fresh gate execution evidence in this metadata packet. No equivalent replacement, physical watcher/PTY/provider, live SSH/remote/mobile, rendered, cross-platform, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Audit1709 retires changed-source assertion and execution scope without equivalent replacement coverage. Existing unchanged-selector receipts remain scoped to their original sources. Historical prior-source oracle: Audit1687 retires changed-source assertion and execution scope without equivalent replacement coverage. Existing unchanged-selector receipts remain scoped to their original sources. Historical prior-source oracle: Audit1421 narrows renderer unit coverage as recorded in coverageNotes. Prior oracle descriptions are historical for the changed suite. The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): Retained unchanged-selector receipts are the only current execution evidence. Reduced-source assertions await validation. Historical prior oracle: The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): In paired Electron, write an HTML fixture that declares its own title on the host, invoke the Explorer preview action on the client, and require the document text to be readable out of the orca-preview guest before judging any absence. With that presence established, require the client to hold exactly one browser workspace more than its baseline and that workspace to be the document one: page and tab url blank, the document path mirrored onto both, the tab named by the document's title, the chip naming the file, no editor row of the retired preview species anywhere, and the guest URL carrying the orca-preview scheme. Ask the host through its own page registry as well as through the tab snapshot, and in the same run open an ordinary URL browser tab from the same client and require that one to arrive in both — the presence precondition without which “the host gained nothing” is satisfied just as well by an oracle that cannot see browser pages at all. Require the preview to sit in a group other than the source editor's while the active group and tab remain the source editor's. Then click away to the terminal, click the preview tab, require it to reactivate and still render, close it with its own X, and require the document tab to be gone while the host still holds only the URL tab and the source group, source editor and terminal survive. Quit the client with a document tab open and relaunch it on the same profile: require the same workspace row to come back, blank and named by the document, rendering the document again over a grant URL that differs from the one that was quit, with no preview-scheme or document-named page anywhere in what the host holds. Prove the halves are live by flipping one product property at a time and requiring the run to fail: publish document workspaces to the host like ordinary ones, and stop mirroring the document onto the workspace row. Have the fixture document attempt its own egress on every load — an unattended window.open and location.href to an off-machine URL, plus an inline ICE gathering probe — and require the same baseline counts and a candidate count of zero, so the document's own attempts are measured rather than assumed. Then, as a separate phase after the close oracle has already run, bring the client window to the front, press the document's heading with a real mouse event, and require the document to report that the same press drove it to attempt a second window.open and location.href while both browser counts stay at that phase's baseline and nothing routes — the case a recent-input gate cannot distinguish from the press's own effect. Only then press the target=_blank link with a real mouse event and require both a recorded routing call that returned success and a browser count above that baseline, with the preview tab still open. Drive the preload's click policy as a unit oracle over a real document: a dispatched click, a trusted press on an external anchor, an anchor reached through what it wraps, an SVG animated href, a sibling preview link, fragment and percent-encoded fragment targets, a bare hash, and a middle click. Create a browser page located by a workspace document, handing creation a live grant URL, and require its stored url, its mirrored tab url and the written session payload all to be blank with no orca-preview string anywhere in what was written, while an ordinary page created the same way keeps the URL it was given and asks for the address bar the document page never does. Parse the written page and tab through the session schema and require the document to survive both halves. Hydrate them back and require the document page to return blank and still named — including when its page row was salvaged away and only the tab's own copy remains, and when a foreign session carried a grant URL into both rows. Drive the mirror across a page switch out of the document and back, and across a repair in which the document is the only mirrored field that differs. Name a document page from its document and require the tab to take that name, name it with an empty title and require the file, name it with a live grant URL and require the file again with no preview scheme anywhere in the written session, and require an ordinary blank browser tab beside it to still be called New Tab. Dispatch a title update out of a rendered preview's own guest and require it to reach the page state while the identity chip still reads the document's workspace-relative path. Attach a browsing guest and a workspace-document guest through the same method in one run and require the browsing one to take clicked-link routing, popup handling and auth-identity detach tracking while the document guest takes none of them, stays inside the grant it is showing, denies every window it asks for, and is dropped from the page-keyed document registry by the same teardown that frees its id for a later attach. Register a browsing guest and attach a workspace-document guest in one run against the real manager, require the one door to answer each page with the guest of its own half, and require the document page to be absent from the browsing map and from its enumeration. Drive both browsing registration entry points with a page the document half already holds and require them to register nothing, and drive the mint channel with a page the browsing half already holds and require it to refuse; and drive the offscreen one with a guest that is missing and with one already destroyed, requiring the same refusal. Arm a grab on a live preview target, drive the unregister channel at that same target in the window before the queued operation runs, and require the grab to reach the guest anyway — then drive the same sequence for an ordinary browser page and require its grab state to be disposed after all. Hold one viewport-bridge op open, queue a second behind it, swap the page's guest while that second op waits, and require the injection to land in the guest the page has then. Revoke a grant after a tool has run against its page and require that page's grab state to be cancelled and disposed. Ask a tool for a document page whose guest has not attached, require the request to park in the registration wait, attach the guest, and require the same request to arm on it; require a page nothing ever renders to answer not-ready once that wait elapses. With a document open, ask a tool for a browsing page id and require it to be answered by the browsing half or not at all, with the same channel reaching the document guest under the page it really renders. Drive open-externally for a document whose per-file owner is remote while the workspace-scoped owner is unresolved, for a runtime-owned worktree whose preview tab carries no runtime id of its own, and for a worktree that resolves no runtime owner while the tab still carries one, requiring the download route in each; and for an owner that cannot be resolved at all, and for an unknown workspace root while nothing names another host, requiring a refusal that neither opens nor downloads. Drive the headless backend with a page the document half already holds and require it to reject, destroy the window, and unregister nothing — then shut the backend down and require it still to have unregistered nothing. Navigate a bound preview guest at a second grant through both latch events and require it to stay on the grant it bound to. Mount a preview while a renderer drag is already in flight and require its guest to be click-through at the moment it is appended, not a turn later. Render the editor panel shell in each remaining tab mode and require the path header exactly where the surface does not already name itself. Drive the preview action and require a browser tab located by the document rather than an editor tab, require a second open of the same document to activate the tab it is already in, and require closing that tab to revoke its grant while a URL tab closed beside it revokes none. Publish a worktree holding a document tab and a URL tab and require only the URL tab to reach the mobile snapshot. Install the shared partition policies for a preview partition and for an ordinary browsing partition in the same run, fire each one's own will-download listener, and require the preview's to cancel while the browsing one still reaches the download router — then require the preview protocol installer to be what asks for that deny. In the same run, require the cancelled download to raise a reader-facing notice and the routed one to raise none. require the guest registry to name the bound grant for a live preview guest and nothing for a contents that is not one, has committed no document, or is gone. Drive the shell with a refusal and require one fixed sentence, still one row after three more refusals, standing beside an asset failure rather than being counted with it, gone behind the failure panel, and ignored when it names another preview's grant. Drive the main-side report gate directly for a sender that is no preview guest, a guest with no bound or a revoked grant, a genuine press Electron's webview focus flag misreports as unfocused, and non-web URLs; drive the reader-facing confirmation for accept, cancel, and a confirmed tab the browser refuses; and drive will-attach-webview in both preload directions. Run the per-owner reader, grant-containment, scheme-admission, guest-policy, and plan-routing contracts as unit oracles, including a host-reported truncation, an over-cap binary, and an out-of-worktree paired path. Drive the reader-facing component with the payloads the reader can actually produce — the entry document fails only as truncated or unreadable, a subresource additionally as a refused format — and require the asset case to leave the guest mounted. Drive the closed-tab cleanup hook, the window installer, and the grant IPC handlers directly, requiring the grant to be released when the preview tab closes, cleared at window creation and on a cross-document main-frame navigation, and refused to any sender that is not the trusted renderer. For the browser creations this gate still owns, run the unchanged contract oracle for direct create and side-preview callers with absent status, unknown capabilities, and a mixed-version host, requiring the original unsupported error or visible toast, zero RPCs, and no retained new split; hold a real navigation response beyond the 15-second client deadline after host creation and require the first RPC to return the exact host inventory page ID, one host page, and no retry; repeat reconciliation faults against headless serve and retain the separate exact-page reconciliation rollback oracle. Audit2452 removes the whole fake-effect browser-close routing suite. Active selectors and assertion references no longer select it. Its requested-worktree default close, sibling-page close and explicit missing-page typed reply alarms are intentionally retired without equivalent replacement. Prior dated receipts remain unchanged and scoped to their original sources; no fresh execution of the reduced gate, rendered browser, live remote, mobile or cross-platform validation is claimed.", "commands": [ "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/browser/client-pages/orca-runtime-browser.test.ts src/renderer/src/runtime/web-session-tabs-sync/navigation/web-session-tabs-sync-focus-intent.test.ts src/renderer/src/runtime/web-session-tabs-sync/placement/web-session-tabs-sync-browser-tabs.test.ts", - "pnpm exec vitest run --config config/vitest.config.ts src/main/browser/document-preview/doc-preview-grant-registry.test.ts src/main/browser/document-preview/doc-preview-file-reader.test.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts src/main/browser/document-preview/doc-preview-failure-notice.test.ts src/shared/document-preview/doc-preview-scheme.test.ts src/renderer/src/lib/doc-preview-grants.test.ts src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.test.ts", + "pnpm exec vitest run --config config/vitest.config.ts src/main/browser/document-preview/doc-preview-grant-registry.test.ts src/main/browser/document-preview/doc-preview-file-reader.test.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts src/main/browser/document-preview/doc-preview-failure-notice.test.ts src/shared/document-preview/doc-preview-scheme.test.ts src/renderer/src/lib/browser/documents/doc-preview-grants.test.ts src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.test.ts", "pnpm exec vitest run --config config/vitest.config.ts src/main/browser/sessions/partition-policies/browser-session-partition-policies.test.ts", "pnpm exec vitest run --config config/vitest.config.ts src/main/browser/sessions/partition-policies/browser-session-partition-policies.test.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts", "pnpm exec vitest run --config config/vitest.config.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts", @@ -4490,7 +4490,7 @@ "src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.test.ts", "src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx", "src/shared/document-preview/doc-preview-scheme.test.ts", - "src/renderer/src/lib/doc-preview-grants.test.ts", + "src/renderer/src/lib/browser/documents/doc-preview-grants.test.ts", "src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.test.ts", "src/renderer/src/components/link-actions/LinkActionPopover.test.tsx", "src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts", diff --git a/config/scripts/ci/sharding/ci-shard-timings.json b/config/scripts/ci/sharding/ci-shard-timings.json index 0414e12b969..6daa0ea2ed4 100644 --- a/config/scripts/ci/sharding/ci-shard-timings.json +++ b/config/scripts/ci/sharding/ci-shard-timings.json @@ -6451,7 +6451,7 @@ "src/renderer/src/lib/clipboard-image-copy.test.ts": 243, "src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts": 526, "src/renderer/src/lib/cmd-j-linear-issue-intent.test.ts": 42, - "src/renderer/src/lib/code-editor-theme.test.ts": 101, + "src/renderer/src/lib/editor/appearance/code-editor-theme.test.ts": 101, "src/renderer/src/lib/code-host-error-copy.test.ts": 297, "src/renderer/src/lib/codex-pane-selection-lane.test.ts": 543, "src/renderer/src/lib/agent-session/accounts/codex/codex-session-restart-shell-flap.test.ts": 1745, @@ -6468,17 +6468,17 @@ "src/renderer/src/lib/workspace/ownership/direct-ssh-target-scope.test.ts": 48, "src/renderer/src/lib/workspace/creation/work-item/direct-work-item-setup-callers.test.tsx": 2436, "src/renderer/src/lib/workspace/creation/work-item/direct-work-item-setup.test.ts": 2072, - "src/renderer/src/lib/doc-preview-grants.test.ts": 2094, - "src/renderer/src/lib/editor-file-operation-owner.test.ts": 2848, + "src/renderer/src/lib/browser/documents/doc-preview-grants.test.ts": 2094, + "src/renderer/src/lib/editor/file-operations/editor-file-operation-owner.test.ts": 2848, "src/renderer/src/lib/workspace/activation/initial-surface/empty-workspace-default-agent-chat.test.ts": 1895, "src/renderer/src/lib/emulator-error-copy.test.ts": 415, "src/renderer/src/lib/ensure-hooks-confirmed.test.ts": 799, - "src/renderer/src/lib/ensure-simulator-tab-behavior.test.ts": 3601, - "src/renderer/src/lib/execute-open-editor-path-move.test.ts": 2458, + "src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts": 3601, + "src/renderer/src/lib/editor/file-operations/execute-open-editor-path-move.test.ts": 2458, "src/renderer/src/runtime/hosts/platform/execution-host-facts.test.ts": 1796, "src/renderer/src/lib/feature-education-telemetry.test.ts": 52, "src/renderer/src/lib/feedback-image-attachments.test.ts": 557, - "src/renderer/src/lib/file-preview-link-open.test.ts": 2311, + "src/renderer/src/lib/browser/documents/file-preview-link-open.test.ts": 2311, "src/renderer/src/lib/file-search-selection.test.ts": 51, "src/renderer/src/lib/find-query-bounds.test.ts": 45, "src/renderer/src/lib/finished-agent-resume-resurrection.test.ts": 1872, @@ -6521,7 +6521,7 @@ "src/renderer/src/lib/work-items/linear/linear-issue-workspace-attachment.test.ts": 99, "src/renderer/src/lib/link-source-local-open-owner.test.ts": 433, "src/renderer/src/lib/linked-work-item-context.test.ts": 64, - "src/renderer/src/lib/monaco-editor-gutter-disposal.test.ts": 295, + "src/renderer/src/lib/editor/monaco/monaco-editor-gutter-disposal.test.ts": 295, "src/renderer/src/lib/monaco-languages/markdown-heading-outline.test.ts": 70, "src/renderer/src/lib/monaco-languages/monarch-embed-entry-recursion.test.ts": 697, "src/renderer/src/lib/monaco-languages/plugin-grammar-tokenization.test.ts": 282, @@ -6540,7 +6540,7 @@ "src/renderer/src/lib/non-secure-context-crypto.repro.test.ts": 1691, "src/renderer/src/lib/onboarding-folder-cancellation.test.ts": 2486, "src/renderer/src/lib/open-agent-message-sender.test.ts": 1497, - "src/renderer/src/lib/open-mobile-emulator-tab.test.ts": 545, + "src/renderer/src/lib/simulator/launch/open-mobile-emulator-tab.test.ts": 545, "src/renderer/src/lib/orca-yaml-trust-prompt-slot-eviction.test.ts": 884, "src/renderer/src/lib/order-empty-query-worktrees.test.ts": 62, "src/renderer/src/lib/os-file-drop-cancellation-guard.test.ts": 204, @@ -6620,7 +6620,7 @@ "src/renderer/src/lib/react-commit-cascade-observer.test.ts": 189, "src/renderer/src/lib/react-commit-cascade-telemetry.test.ts": 159, "src/renderer/src/lib/react-error-boundary-reporting.test.ts": 55, - "src/renderer/src/lib/remap-open-editor-tabs-for-path-change.test.ts": 2178, + "src/renderer/src/lib/editor/file-operations/remap-open-editor-tabs-for-path-change.test.ts": 2178, "src/renderer/src/lib/rename-user-named-tab-access.test.ts": 2804, "src/renderer/src/lib/renderer-agent-status-observation-ingress.test.ts": 81, "src/renderer/src/lib/renderer-app-platform.test.ts": 197, @@ -6651,11 +6651,11 @@ "src/renderer/src/lib/sidebar-ended-creations.test.ts": 1889, "src/renderer/src/lib/sidebar-pending-layer.test.ts": 338, "src/renderer/src/lib/sidebar-shadow/workspace-activity-shadow.test.ts": 1728, - "src/renderer/src/lib/simulator-launch-coordination.test.ts": 43, - "src/renderer/src/lib/simulator-palette-search.test.ts": 515, - "src/renderer/src/lib/simulator-pane-shutdown-scheduler.test.ts": 1679, - "src/renderer/src/lib/simulator-tab-layout-owner.test.ts": 2398, - "src/renderer/src/lib/simulator-tab-palette-activation.test.ts": 1903, + "src/renderer/src/lib/simulator/launch/simulator-launch-coordination.test.ts": 43, + "src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts": 515, + "src/renderer/src/lib/simulator/tabs/simulator-pane-shutdown-scheduler.test.ts": 1679, + "src/renderer/src/lib/simulator/tabs/simulator-tab-layout-owner.test.ts": 2398, + "src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts": 1903, "src/renderer/src/lib/sleeping-agent-session-launch-windows-quoting.test.ts": 547, "src/renderer/src/lib/source-control/remote/source-control-remote-error.test.ts": 340, "src/renderer/src/lib/ssh-config-passive-sync.test.ts": 1513, diff --git a/config/scripts/performance/session-transcripts/markdown-note-line-scan-benchmark.mjs b/config/scripts/performance/session-transcripts/markdown-note-line-scan-benchmark.mjs index 1cbb8c3b037..811fa997a3b 100644 --- a/config/scripts/performance/session-transcripts/markdown-note-line-scan-benchmark.mjs +++ b/config/scripts/performance/session-transcripts/markdown-note-line-scan-benchmark.mjs @@ -6,11 +6,12 @@ import { performance } from 'node:perf_hooks' import { build } from 'esbuild' import { buildCounterbalancedSchedule } from '../measurement/counterbalanced-benchmark-schedule.mjs' -const sourcePath = 'src/renderer/src/lib/markdown-review-notes.ts' +const sourcePath = 'src/renderer/src/lib/editor/markdown/review-notes/markdown-review-notes.ts' +const baselineSourcePath = 'src/renderer/src/lib/markdown-review-notes.ts' const baseline = process.argv[2] ?? '20ab9950654' -async function load(contents) { +async function load(contents, inputPath) { const result = await build({ - stdin: { contents, loader: 'ts', resolveDir: dirname(resolve(sourcePath)) }, + stdin: { contents, loader: 'ts', resolveDir: dirname(resolve(inputPath)) }, bundle: true, platform: 'node', format: 'esm', @@ -21,9 +22,10 @@ async function load(contents) { ) } const before = await load( - execFileSync('git', ['show', `${baseline}:${sourcePath}`], { encoding: 'utf8' }) + execFileSync('git', ['show', `${baseline}:${baselineSourcePath}`], { encoding: 'utf8' }), + baselineSourcePath ) -const after = await load(readFileSync(sourcePath, 'utf8')) +const after = await load(readFileSync(sourcePath, 'utf8'), sourcePath) const results = [] for (const [name, lineCount, width, count, iterations] of [ ['small', 20, 40, 1, 1000], diff --git a/config/scripts/workflow/source-routing/pr-e2e-source-routing.mjs b/config/scripts/workflow/source-routing/pr-e2e-source-routing.mjs index 2a6f6e58bac..7da6a6823ae 100644 --- a/config/scripts/workflow/source-routing/pr-e2e-source-routing.mjs +++ b/config/scripts/workflow/source-routing/pr-e2e-source-routing.mjs @@ -259,7 +259,7 @@ export const PR_E2E_SOURCE_ROUTES = [ MANAGED_SSH_HARNESS.test(file) || /^tests\/e2e\/helpers\/browser-split-(?:guest-probes|page-server)\.ts$/.test(file) || (isProductSource(file) && - /^src\/renderer\/src\/(?:lib\/(?:file-preview|workspace-file-drag|worktree-runtime-owner)\.ts|lib\/workspace\/ownership\/connection-context\.ts|components\/(?:right-sidebar\/file-explorer\/panel\/FileExplorer(?:Row|VirtualRows)\.tsx|browser-pane\/(?:navigate\/use-browser-page-navigation-downloads\.ts|host-guest\/attach-browser-page-webview\.ts)))$/.test( + /^src\/renderer\/src\/(?:lib\/(?:browser\/documents\/file-preview|workspace-file-drag|worktree-runtime-owner)\.ts|lib\/workspace\/ownership\/connection-context\.ts|components\/(?:right-sidebar\/file-explorer\/panel\/FileExplorer(?:Row|VirtualRows)\.tsx|browser-pane\/(?:navigate\/use-browser-page-navigation-downloads\.ts|host-guest\/attach-browser-page-webview\.ts)))$/.test( file )) }, diff --git a/config/scripts/workflow/source-routing/pr-editor-preview-e2e-source-routes.mjs b/config/scripts/workflow/source-routing/pr-editor-preview-e2e-source-routes.mjs index 20e97e8d2f9..22ff77e7998 100644 --- a/config/scripts/workflow/source-routing/pr-editor-preview-e2e-source-routes.mjs +++ b/config/scripts/workflow/source-routing/pr-editor-preview-e2e-source-routes.mjs @@ -25,8 +25,8 @@ export const PR_EDITOR_PREVIEW_E2E_SOURCE_ROUTES = [ (file.startsWith('src/renderer/src/components/editor/model-lifetime/identity/') || [ 'src/renderer/src/components/editor/useEditorPanelFileContentLoader.ts', - 'src/renderer/src/lib/editor-file-operation-owner.ts', - 'src/renderer/src/lib/editor-file-operation-provenance.ts' + 'src/renderer/src/lib/editor/file-operations/editor-file-operation-owner.ts', + 'src/renderer/src/lib/editor/file-operations/editor-file-operation-provenance.ts' ].includes(file)) }, { diff --git a/src/renderer/src/app-shell/use-document-appearance.ts b/src/renderer/src/app-shell/use-document-appearance.ts index f726af1c036..53863ec5cfc 100644 --- a/src/renderer/src/app-shell/use-document-appearance.ts +++ b/src/renderer/src/app-shell/use-document-appearance.ts @@ -1,8 +1,8 @@ import { useEffect, useMemo, useRef } from 'react' import { useShallow } from 'zustand/react/shallow' import { buildAppFontFamily } from '@/lib/app-font-family' -import { applyCodeFontSmoothing } from '@/lib/code-font-smoothing' -import { applyMarkdownCodeFontFamily } from '@/lib/markdown-code-font' +import { applyCodeFontSmoothing } from '@/lib/editor/appearance/code-font-smoothing' +import { applyMarkdownCodeFontFamily } from '@/lib/editor/appearance/markdown-code-font' import { useSplitDividerSetting } from '@/hooks/use-split-divider-setting' import { rebuildAllTerminalWebglRenderers } from '@/lib/pane-manager/pane-manager-registry' import { applyDocumentTheme, applyPluginAppTheme } from '../lib/document-theme' @@ -15,7 +15,7 @@ import { findCodeEditorTheme, paintCodeEditorColors, resolveCodeEditorTheme -} from '../lib/code-editor-theme' +} from '../lib/editor/appearance/code-editor-theme' import { browserColorProbe } from '../lib/plugin-theme-tokens' import { TINTED_HOST_PILL_OUTLINE_MIX_TOKEN, diff --git a/src/renderer/src/attention/notification-subject-owner.ts b/src/renderer/src/attention/notification-subject-owner.ts index d36737df226..2658f034f30 100644 --- a/src/renderer/src/attention/notification-subject-owner.ts +++ b/src/renderer/src/attention/notification-subject-owner.ts @@ -1,4 +1,8 @@ -import { parseExecutionHostId, type ExecutionHostId } from '../../../shared/execution-host' +import { + getRepoExecutionHostId, + parseExecutionHostId, + type ExecutionHostId +} from '../../../shared/execution-host' import type { NotificationWorkspaceOwner } from '../../../shared/notification-source' import { parsePaneKey } from '../../../shared/workspace-layout/stable-pane-id' import { parseWorkspaceKey } from '../../../shared/workspace-scope' @@ -18,7 +22,7 @@ import { findIndexedProjectGroupOwner } from '@/lib/workspace/ownership/worktree-runtime-owner-index' import { findIndexedRepoOwner } from '@/lib/workspace/ownership/repo-owner-index' -import { getCatalogOwnerHostId } from '@/lib/workspace/ownership/workspace-catalog-owner-index' +import '@/lib/workspace/ownership/workspace-catalog-owner-index' import type { WorktreeRuntimeOwnerState } from '@/lib/workspace/ownership/worktree-runtime-owner-state' type SubjectOwnerState = WorktreeRuntimeOwnerState & @@ -50,7 +54,7 @@ export function resolveNotificationTabOwner( } const group = findIndexedProjectGroupOwner(state.projectGroups, folder.projectGroupId, hostId) return routeForOwner({ - hostId: getCatalogOwnerHostId({ + hostId: getRepoExecutionHostId({ executionHostId: folder.executionHostId ?? group?.executionHostId, connectionId: folder.connectionId ?? group?.connectionId }) @@ -66,7 +70,7 @@ export function resolveNotificationTabOwner( const repo = !owner.hostId ? findIndexedRepoOwner(state.repos, owner.repoId) : null const resolution = resolveExactWorktreeRoute(state, { ...owner, - hostId: owner.hostId ?? (repo ? getCatalogOwnerHostId(repo) : hostId) + hostId: owner.hostId ?? (repo ? getRepoExecutionHostId(repo) : hostId) }) return resolution.kind === 'resolved' ? resolution.route : null } diff --git a/src/renderer/src/attention/notification-workspace-labels.ts b/src/renderer/src/attention/notification-workspace-labels.ts index cd93d8455da..b86c6836f1a 100644 --- a/src/renderer/src/attention/notification-workspace-labels.ts +++ b/src/renderer/src/attention/notification-workspace-labels.ts @@ -15,8 +15,8 @@ import { findIndexedRepoOwnerForHost, resolveIndexedRepoOwner } from '../lib/workspace/ownership/repo-owner-index' -import { getCatalogOwnerHostId } from '../lib/workspace/ownership/workspace-catalog-owner-index' -import type { ExecutionHostId } from '../../../shared/execution-host' +import '../lib/workspace/ownership/workspace-catalog-owner-index' +import { getRepoExecutionHostId, type ExecutionHostId } from '../../../shared/execution-host' import type { Repo } from '../../../shared/repo-types' import type { Worktree } from '../../../shared/worktree/types' import { parseWorkspaceKey } from '../../../shared/workspace-scope' @@ -83,7 +83,7 @@ export function getNotificationWorkspaceLabels( findIndexedProjectGroupOwner( state.projectGroups, folder.projectGroupId, - getCatalogOwnerHostId(folder) + getRepoExecutionHostId(folder) ) return { repoLabel: group?.name, worktreeLabel: folder?.name || fallback } } diff --git a/src/renderer/src/components/FileTypeIcon.tsx b/src/renderer/src/components/FileTypeIcon.tsx index 1b4f7be889f..1451101b0fe 100644 --- a/src/renderer/src/components/FileTypeIcon.tsx +++ b/src/renderer/src/components/FileTypeIcon.tsx @@ -4,7 +4,7 @@ import { getFileTypeIcon, getPluginFileTypeIconIndex, getPluginFolderIconIndex -} from '@/lib/file-type-icons' +} from '@/lib/file-icons/file-type-icons' import { PLUGIN_ICON_ATTRIBUTE, useActivePluginIconTheme diff --git a/src/renderer/src/components/automations/AutomationEditorPromptEditor.test.tsx b/src/renderer/src/components/automations/AutomationEditorPromptEditor.test.tsx index e50ae15e367..4db710ee4f4 100644 --- a/src/renderer/src/components/automations/AutomationEditorPromptEditor.test.tsx +++ b/src/renderer/src/components/automations/AutomationEditorPromptEditor.test.tsx @@ -14,7 +14,7 @@ vi.mock('@monaco-editor/react', () => ({ }, loader: { config: vi.fn() } })) -vi.mock('@/lib/monaco-setup', () => ({ monaco: {} })) +vi.mock('@/lib/editor/monaco/monaco-setup', () => ({ monaco: {} })) vi.mock('@/store', () => ({ useAppStore: (selector: (state: Record) => unknown) => selector({ diff --git a/src/renderer/src/components/automations/AutomationEditorPromptEditor.tsx b/src/renderer/src/components/automations/AutomationEditorPromptEditor.tsx index 5535d225d40..15bf790323d 100644 --- a/src/renderer/src/components/automations/AutomationEditorPromptEditor.tsx +++ b/src/renderer/src/components/automations/AutomationEditorPromptEditor.tsx @@ -4,9 +4,9 @@ import type { editor } from 'monaco-editor' import { installMonacoEditorFindShortcut } from '@/components/editor/editor-shortcuts' import { syncContentOnMount, syncContentUpdate } from '@/components/editor/monaco-content-sync' import { isMonacoFindWidgetOpen } from '@/components/editor/monaco-find-widget' -import { monacoTypographyOptions } from '@/lib/editor-typography' +import { monacoTypographyOptions } from '@/lib/editor/appearance/editor-typography' import { useEditorTypography } from '@/hooks/use-editor-typography' -import '@/lib/monaco-setup' +import '@/lib/editor/monaco/monaco-setup' import { cn } from '@/lib/utils' import { buildAutomationPromptEditorOptions } from './automation-editor-prompt-options' import { useMonacoTheme } from '@/hooks/use-monaco-theme' diff --git a/src/renderer/src/components/automations/automation-editor-prompt-options.ts b/src/renderer/src/components/automations/automation-editor-prompt-options.ts index ecf32efc959..ce01e95b45b 100644 --- a/src/renderer/src/components/automations/automation-editor-prompt-options.ts +++ b/src/renderer/src/components/automations/automation-editor-prompt-options.ts @@ -1,6 +1,6 @@ import type { editor } from 'monaco-editor' import { monacoFindOptions } from '@/components/editor/monaco-find-options' -import type { MonacoTypographyOptions } from '@/lib/editor-typography' +import type { MonacoTypographyOptions } from '@/lib/editor/appearance/editor-typography' export function buildAutomationPromptEditorOptions(args: { ariaLabel: string diff --git a/src/renderer/src/components/browser-pane/ClientHostedBrowserPagePane.tsx b/src/renderer/src/components/browser-pane/ClientHostedBrowserPagePane.tsx index a977be24d13..d2f5727e213 100644 --- a/src/renderer/src/components/browser-pane/ClientHostedBrowserPagePane.tsx +++ b/src/renderer/src/components/browser-pane/ClientHostedBrowserPagePane.tsx @@ -35,7 +35,8 @@ import { useBrowserPageZoomFeedback } from './host-guest/use-browser-page-zoom-f import { isPageDocumentNavigationStart } from './host-guest/browser-page-webview-navigation-handlers' import { ClientHostedBrowserLoadFailure } from './client-hosted-browser-load-failure' import { useClientHostedPageUrlSubmission } from './navigate/use-client-hosted-page-url-submission' -import { convertBrowserPageToWorkspaceDoc } from '@/lib/file-preview' +import '@/lib/browser/documents/file-preview' +import { convertBrowserPageToWorkspaceDoc } from '@/lib/browser/documents/file-preview-page-conversion' import { isBlankBrowserUrl } from '@/lib/browser/palette/browser-palette-search' import { BrowserNewTabPage } from './new-tab/BrowserNewTabPage' import { useBrowserPageReloadActions } from './navigate/use-browser-page-reload-actions' diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-toolbar.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-toolbar.tsx index b27f69749c2..e34c92860ec 100644 --- a/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-toolbar.tsx +++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-toolbar.tsx @@ -31,7 +31,8 @@ import { advanceAcrossBrowserPageConversion, returnAcrossBrowserPageConversion } from '@/lib/browser/history/browser-page-conversion-history' -import { convertBrowserPageToWorkspaceDoc } from '@/lib/file-preview' +import '@/lib/browser/documents/file-preview' +import { convertBrowserPageToWorkspaceDoc } from '@/lib/browser/documents/file-preview-page-conversion' import type { GrabIntent } from '../../../../../shared/browser/element-grab/browser-grab-types' /** Binds the shared browser chrome to a browsing page: an editable address bar and session tools. */ diff --git a/src/renderer/src/components/browser-pane/navigate/navigate-browser-page-url.ts b/src/renderer/src/components/browser-pane/navigate/navigate-browser-page-url.ts index 094a88f116a..17b2bcd10fa 100644 --- a/src/renderer/src/components/browser-pane/navigate/navigate-browser-page-url.ts +++ b/src/renderer/src/components/browser-pane/navigate/navigate-browser-page-url.ts @@ -1,4 +1,4 @@ -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../../shared/editor-language/editor-language-detect' import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { isPathInsideWorktree, diff --git a/src/renderer/src/components/browser-pane/navigate/workspace-doc-address-submission.ts b/src/renderer/src/components/browser-pane/navigate/workspace-doc-address-submission.ts index 56358dd9f89..19f103e6932 100644 --- a/src/renderer/src/components/browser-pane/navigate/workspace-doc-address-submission.ts +++ b/src/renderer/src/components/browser-pane/navigate/workspace-doc-address-submission.ts @@ -1,5 +1,6 @@ import type { BrowserLoadError } from '../../../../../shared/browser-workspace-types' -import { convertBrowserPageToWorkspaceDoc } from '@/lib/file-preview' +import '@/lib/browser/documents/file-preview' +import { convertBrowserPageToWorkspaceDoc } from '@/lib/browser/documents/file-preview-page-conversion' import { resolveWorkspaceDocAddressTarget } from '@/lib/workspace-doc-address-input' import { useAppStore } from '@/store' diff --git a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-pane.tsx b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-pane.tsx index 7dcf52af51f..893eda43de7 100644 --- a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-pane.tsx +++ b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-pane.tsx @@ -4,7 +4,8 @@ import '../../../../../shared/protocol-version' import { BROWSER_CERTIFICATE_TRUST_RUNTIME_CAPABILITY } from '../../../../../shared/browser/runtime/browser-runtime-capabilities' import type { BrowserPage as BrowserPageState } from '../../../../../shared/browser-workspace-types' import { runtimeEnvironmentSupportsCapability } from '@/runtime/rpc/compatibility/runtime-capability-proof' -import { convertBrowserPageToWorkspaceDoc } from '@/lib/file-preview' +import '@/lib/browser/documents/file-preview' +import { convertBrowserPageToWorkspaceDoc } from '@/lib/browser/documents/file-preview-page-conversion' import { openWorkspaceBrowserTab } from '@/lib/browser/workspace/workspace-browser-tab-open' import { resolveBrowserSourceUnifiedTab } from '@/lib/browser/workspace/browser-workspace-source-resolution' import { useBrowserPageChromeFocus } from '../assemble-chrome/use-browser-page-chrome-focus' diff --git a/src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx b/src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx index 503b00bbfe8..73bcbb6b6fe 100644 --- a/src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx +++ b/src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx @@ -36,7 +36,7 @@ const grants = vi.hoisted(() => { return { mintedLocation, requestLocation: mintedLocation, shareControlCalls } }) -vi.mock('@/lib/doc-preview-grants', () => ({ +vi.mock('@/lib/browser/documents/doc-preview-grants', () => ({ buildDocPreviewGrantRequest: () => grants.requestLocation, // The real cache keeps the first mint's handle for the tab, whatever a later request says. ensureDocPreviewGrant: () => diff --git a/src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.tsx b/src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.tsx index 8e8f02c2e65..c56fe70029f 100644 --- a/src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.tsx +++ b/src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.tsx @@ -16,7 +16,7 @@ import { ensureDocPreviewGrant, releaseDocPreviewGrant, type DocPreviewGrantHandle -} from '@/lib/doc-preview-grants' +} from '@/lib/browser/documents/doc-preview-grants' import { selectWorktreeHostDisplayLabel } from '@/runtime/hosts/display/execution-host-display-label' import { translate } from '@/i18n/i18n' import { useTranslate } from '@/i18n/use-translate' diff --git a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-address-edit.tsx b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-address-edit.tsx index 21d71b6f7ff..40e4486f5ff 100644 --- a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-address-edit.tsx +++ b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-address-edit.tsx @@ -3,7 +3,8 @@ import { toast } from 'sonner' import BrowserAddressBar from '@/components/browser-pane/assemble-chrome/BrowserAddressBar' import { resolveBrowserAddressBarSubmission } from '@/components/browser-pane/navigate/browser-address-bar-navigation' import { translate } from '@/i18n/i18n' -import { convertBrowserPageToWorkspaceDoc } from '@/lib/file-preview' +import '@/lib/browser/documents/file-preview' +import { convertBrowserPageToWorkspaceDoc } from '@/lib/browser/documents/file-preview-page-conversion' import { resolveWorkspaceDocAddressTarget } from '@/lib/workspace-doc-address-input' import { useAppStore } from '@/store' import { DocPreviewDocumentChip } from './doc-preview-document-chip' diff --git a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-artifact-share.test.ts b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-artifact-share.test.ts index c05a56db34c..739b8babcab 100644 --- a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-artifact-share.test.ts +++ b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-artifact-share.test.ts @@ -1,5 +1,5 @@ import { beforeEach, expect, it, vi } from 'vitest' -import type { DocPreviewGrantLocation } from '@/lib/doc-preview-grants' +import type { DocPreviewGrantLocation } from '@/lib/browser/documents/doc-preview-grants' import type { TerminalArtifactGrantTarget } from '@/runtime/files/grants/runtime-terminal-artifact-grant' import { readDocPreviewArtifactRequest } from './doc-preview-artifact-share' diff --git a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-artifact-share.tsx b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-artifact-share.tsx index b84b0492ba1..9b541834160 100644 --- a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-artifact-share.tsx +++ b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-artifact-share.tsx @@ -8,7 +8,7 @@ import { ArtifactPublishButton } from '@/components/artifacts/ArtifactPublishBut import { ArtifactPublishPreparationError } from '@/components/artifacts/artifact-publish-flow' import type { BrowserChromeShareControl } from '@/components/browser-pane/assemble-chrome/browser-chrome-toolbar' import { isShareableHtmlPath } from '@/components/editor/editor-artifact-upload' -import type { DocPreviewGrantLocation } from '@/lib/doc-preview-grants' +import type { DocPreviewGrantLocation } from '@/lib/browser/documents/doc-preview-grants' import { fileArtifactSourceKey, type FileArtifactOwner } from '@/lib/file-artifact-source-key' import { basename } from '@/lib/path' import { readRuntimeFilePreview } from '@/runtime/files/reads/runtime-file-read-client' diff --git a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.ts b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.ts index c024e712359..72385fc8cd8 100644 --- a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.ts +++ b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.ts @@ -4,7 +4,7 @@ import { translate } from '@/i18n/i18n' import { getConnectionIdForFileFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner' import { isTwinWorkspace } from '@/lib/workspace/ownership/resolve-owner' -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../../shared/editor-language/editor-language-detect' import { buildWorkspaceFileContextForFile, canClientOsOpenWorkspaceFile diff --git a/src/renderer/src/components/diff-comments/use-visible-worktree-diff-comments.ts b/src/renderer/src/components/diff-comments/use-visible-worktree-diff-comments.ts index f467437b15b..e27370983a8 100644 --- a/src/renderer/src/components/diff-comments/use-visible-worktree-diff-comments.ts +++ b/src/renderer/src/components/diff-comments/use-visible-worktree-diff-comments.ts @@ -6,7 +6,7 @@ import { useMemo } from 'react' import { isMarkdownReviewNotesEnabled, withoutMarkdownReviewNotes -} from '@/lib/markdown-review-notes-setting' +} from '@/lib/editor/markdown/review-notes/markdown-review-notes-setting' import type { DiffComment } from '../../../../shared/diff-comment-types' const NO_COMMENTS: DiffComment[] = [] diff --git a/src/renderer/src/components/editor/EditorConflictReviewSurface.tsx b/src/renderer/src/components/editor/EditorConflictReviewSurface.tsx index 9868d8bd97f..492624e8f1d 100644 --- a/src/renderer/src/components/editor/EditorConflictReviewSurface.tsx +++ b/src/renderer/src/components/editor/EditorConflictReviewSurface.tsx @@ -1,6 +1,6 @@ import React from 'react' import { conflictOverviewView } from '@/store/slices/editor/buffers/editor-buffer-conflict-overview' -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../shared/editor-language/editor-language-detect' import { joinPath } from '@/lib/path' import { useAppStore } from '@/store' import type { OpenFile } from '@/store/slices/editor/types/open-file' diff --git a/src/renderer/src/components/editor/EditorPanel.tsx b/src/renderer/src/components/editor/EditorPanel.tsx index d920b5c628f..252570c45c0 100644 --- a/src/renderer/src/components/editor/EditorPanel.tsx +++ b/src/renderer/src/components/editor/EditorPanel.tsx @@ -3,7 +3,7 @@ import { useAppStore } from '@/store' import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { formatClipboardFilePath } from '@/lib/clipboard-file-path' import { getOpenFileRevealOwner } from '@/lib/reveal-in-file-manager' -import { canShowWorkspaceFileBrowserAction } from '@/lib/file-preview' +import { canShowWorkspaceFileBrowserAction } from '@/lib/browser/documents/file-preview' import { openEditorHtmlPreview } from './open-editor-html-preview' import { getEditorHeaderCopyState } from './editor-header' import { getRuntimeTargetForFileOwner } from '@/lib/file-owner-runtime-target' @@ -30,7 +30,7 @@ import { editorArtifactContentType } from './editor-artifact-upload' import { useEditorPanelSave } from './save/commands/useEditorPanelSave' -import { isMarkdownReviewNotesEnabled } from '@/lib/markdown-review-notes-setting' +import { isMarkdownReviewNotesEnabled } from '@/lib/editor/markdown/review-notes/markdown-review-notes-setting' import { useFileCustomEditors } from '@/store/plugins/file-editors/plugin-custom-editors' import { applyCustomEditorToggle } from './view-mode/custom-editor-toggle' import { editorPanelFileActions } from './editor-panel-file-actions' diff --git a/src/renderer/src/components/editor/MonacoCodeExcerpt.tsx b/src/renderer/src/components/editor/MonacoCodeExcerpt.tsx index 7d023efb7ef..17ea73dd547 100644 --- a/src/renderer/src/components/editor/MonacoCodeExcerpt.tsx +++ b/src/renderer/src/components/editor/MonacoCodeExcerpt.tsx @@ -1,6 +1,9 @@ import React, { useEffect, useMemo, useState } from 'react' -import { monaco } from '@/lib/monaco-setup' -import { EDITOR_TYPOGRAPHY_SURFACE_CLASS, editorTypographyTextStyle } from '@/lib/editor-typography' +import { monaco } from '@/lib/editor/monaco/monaco-setup' +import { + EDITOR_TYPOGRAPHY_SURFACE_CLASS, + editorTypographyTextStyle +} from '@/lib/editor/appearance/editor-typography' import { useEditorTypography } from '@/hooks/use-editor-typography' import { cn } from '@/lib/utils' import { useMonacoTheme } from '@/hooks/use-monaco-theme' diff --git a/src/renderer/src/components/editor/MonacoEditor.owner-view-state.test.tsx b/src/renderer/src/components/editor/MonacoEditor.owner-view-state.test.tsx index f599ae45e03..5fe29c1c11c 100644 --- a/src/renderer/src/components/editor/MonacoEditor.owner-view-state.test.tsx +++ b/src/renderer/src/components/editor/MonacoEditor.owner-view-state.test.tsx @@ -31,12 +31,12 @@ vi.mock('@/store', () => { ) } }) -vi.mock('@/lib/monaco-setup', async () => { +vi.mock('@/lib/editor/monaco/monaco-setup', async () => { const { loader } = await import('@monaco-editor/react') // Why: the real setup installs this guard; without it a disposed editor's pending word // highlight rejects with Monaco's "Canceled" and the run reports unhandled errors. const { installMonacoDelayerCancellationGuard } = - await import('@/lib/monaco-delayer-cancellation-guard') + await import('@/lib/editor/monaco/monaco-delayer-cancellation-guard') installMonacoDelayerCancellationGuard() loader.config({ monaco }) return {} diff --git a/src/renderer/src/components/editor/MonacoEditor.tsx b/src/renderer/src/components/editor/MonacoEditor.tsx index 54ecb6ca889..f14c078a460 100644 --- a/src/renderer/src/components/editor/MonacoEditor.tsx +++ b/src/renderer/src/components/editor/MonacoEditor.tsx @@ -3,8 +3,8 @@ import Editor from '@monaco-editor/react' import type { editor, IRange } from 'monaco-editor' import type { MarkdownDocument } from '../../../../shared/file-listing/file-document' import { useAppStore } from '@/store' -import '@/lib/monaco-setup' -import { monacoTypographyOptions } from '@/lib/editor-typography' +import '@/lib/editor/monaco/monaco-setup' +import { monacoTypographyOptions } from '@/lib/editor/appearance/editor-typography' import { useEditorTypography } from '@/hooks/use-editor-typography' import { useContextualCopySetup } from './useContextualCopySetup' import { MonacoGutterContextMenu } from './MonacoGutterContextMenu' diff --git a/src/renderer/src/components/editor/closed-unsaved-files-toast.test.ts b/src/renderer/src/components/editor/closed-unsaved-files-toast.test.ts index d1aa4528c9e..1ea2e5ed7eb 100644 --- a/src/renderer/src/components/editor/closed-unsaved-files-toast.test.ts +++ b/src/renderer/src/components/editor/closed-unsaved-files-toast.test.ts @@ -38,10 +38,14 @@ vi.mock('@/store', () => ({ useAppStore: { getState: () => mocks.state } })) vi.mock('sonner', () => ({ toast: { warning: mocks.warning, error: mocks.error, dismiss: mocks.dismiss } })) -vi.mock('@/lib/create-untitled-markdown', () => ({ createUntitledMarkdownFile: mocks.create })) -vi.mock('@/lib/editor-file-operation-owner', () => ({ +vi.mock('@/lib/editor/file-operations/create-untitled-markdown', () => ({ + createUntitledMarkdownFile: mocks.create +})) +vi.mock('@/lib/editor/file-operations/editor-file-operation-owner', () => ({ + getEditorFileOperationContext: mocks.context +})) +vi.mock('@/lib/editor/file-operations/editor-file-operation-provenance', () => ({ captureEditorFileOperationProvenance: mocks.capture, - getEditorFileOperationContext: mocks.context, assertEditorFileOperationCurrent: mocks.assertCurrent })) import { reopenClosedUnsavedFiles, showClosedUnsavedFilesToast } from './closed-unsaved-files-toast' diff --git a/src/renderer/src/components/editor/closed-unsaved-files-toast.ts b/src/renderer/src/components/editor/closed-unsaved-files-toast.ts index 523983b4945..a56138b5119 100644 --- a/src/renderer/src/components/editor/closed-unsaved-files-toast.ts +++ b/src/renderer/src/components/editor/closed-unsaved-files-toast.ts @@ -1,12 +1,12 @@ import { toast } from 'sonner' import { useAppStore } from '@/store' import type { ClosedUnsavedFile } from '@/store/slices/worktrees/teardown/removed-workspace-unsaved-files' +import { getEditorFileOperationContext } from '@/lib/editor/file-operations/editor-file-operation-owner' import { assertEditorFileOperationCurrent, - captureEditorFileOperationProvenance, - getEditorFileOperationContext -} from '@/lib/editor-file-operation-owner' -import { createUntitledMarkdownFile } from '@/lib/create-untitled-markdown' + captureEditorFileOperationProvenance +} from '@/lib/editor/file-operations/editor-file-operation-provenance' +import { createUntitledMarkdownFile } from '@/lib/editor/file-operations/create-untitled-markdown' import { translate } from '@/i18n/i18n' function closedUnsavedFilesToastTitle(count: number, workspace: string): string { diff --git a/src/renderer/src/components/editor/combined-diff/CombinedDiffViewer.tsx b/src/renderer/src/components/editor/combined-diff/CombinedDiffViewer.tsx index 165eebdbb1e..74ae2a9ad7e 100644 --- a/src/renderer/src/components/editor/combined-diff/CombinedDiffViewer.tsx +++ b/src/renderer/src/components/editor/combined-diff/CombinedDiffViewer.tsx @@ -2,10 +2,10 @@ import { editorViewPlacement } from '@/store/slices/editor/tabs/editor-view-plac import React, { useCallback, useRef, useState } from 'react' import { useAppStore } from '@/store' import { createProgrammaticScrollMarks } from '@/hooks/programmatic-scroll-marks' -import { useWorkspaceFileBrowserActionPredicate } from '@/lib/file-preview' +import { useWorkspaceFileBrowserActionPredicate } from '@/lib/browser/documents/file-preview' import { useVisibleWorktreeDiffComments } from '../../diff-comments/use-visible-worktree-diff-comments' import type { OpenFile } from '@/store/slices/editor/types/open-file' -import '@/lib/monaco-setup' +import '@/lib/editor/monaco/monaco-setup' import type { DiffSection } from '../diff/sections/diff-section-types' import { EMPTY_GIT_BRANCH_ENTRIES, diff --git a/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-section-connection.ts b/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-section-connection.ts index b18569e9552..9d67215d6ec 100644 --- a/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-section-connection.ts +++ b/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-section-connection.ts @@ -1,7 +1,7 @@ import { getConnectionIdForFile } from '@/lib/workspace/ownership/connection-context' import { joinPath } from '@/lib/path' import { useAppStore } from '@/store' -import { acquireEditorFileOperation } from '@/lib/editor-file-operation-owner' +import { acquireEditorFileOperation } from '@/lib/editor/file-operations/editor-file-operation-owner' import type { OpenFile } from '@/store/slices/editor/types/open-file' export function acquireCombinedDiffSectionOperation(file: OpenFile, sectionPath: string) { diff --git a/src/renderer/src/components/editor/combined-diff/review-controls/combined-diff-review-host.test-fixture.ts b/src/renderer/src/components/editor/combined-diff/review-controls/combined-diff-review-host.test-fixture.ts index b32984df104..64f541289bb 100644 --- a/src/renderer/src/components/editor/combined-diff/review-controls/combined-diff-review-host.test-fixture.ts +++ b/src/renderer/src/components/editor/combined-diff/review-controls/combined-diff-review-host.test-fixture.ts @@ -52,7 +52,7 @@ vi.mock('@/store/index', () => ({ }) })) vi.mock('@/hooks/use-document-dark-theme', () => ({ useDocumentDarkTheme: () => false })) -vi.mock('@/lib/monaco-setup', async () => ({ +vi.mock('@/lib/editor/monaco/monaco-setup', async () => ({ monaco: await import('monaco-editor/esm/vs/editor/editor.api.js') })) vi.mock('../../../diff-comments/useDiffCommentDecorator', () => ({ diff --git a/src/renderer/src/components/editor/combined-diff/review-controls/use-combined-diff-notes-actions.ts b/src/renderer/src/components/editor/combined-diff/review-controls/use-combined-diff-notes-actions.ts index 76263d456b7..32715254740 100644 --- a/src/renderer/src/components/editor/combined-diff/review-controls/use-combined-diff-notes-actions.ts +++ b/src/renderer/src/components/editor/combined-diff/review-controls/use-combined-diff-notes-actions.ts @@ -1,7 +1,7 @@ import type { AppState } from '@/store/types' import type { DiffCommentOwner } from '@/store/slices/diff-comments/diff-comment-owner' import { useOwnedDiffComments } from '@/components/diff-comments/use-diff-comment-owner' -import { withoutMarkdownReviewNotes } from '@/lib/markdown-review-notes-setting' +import { withoutMarkdownReviewNotes } from '@/lib/editor/markdown/review-notes/markdown-review-notes-setting' import React, { useCallback, useEffect, useRef, useState } from 'react' import { toast } from 'sonner' import { formatDiffComments } from '@/lib/diff-comments-format' diff --git a/src/renderer/src/components/editor/combined-diff/review-controls/use-combined-diff-section-actions.ts b/src/renderer/src/components/editor/combined-diff/review-controls/use-combined-diff-section-actions.ts index af6f1152b8f..e2b751179b2 100644 --- a/src/renderer/src/components/editor/combined-diff/review-controls/use-combined-diff-section-actions.ts +++ b/src/renderer/src/components/editor/combined-diff/review-controls/use-combined-diff-section-actions.ts @@ -3,9 +3,9 @@ import { useCallback } from 'react' import { useCombinedDiffSectionSave } from './use-combined-diff-section-save' import type React from 'react' import { useAppStore } from '@/store' -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../../../shared/editor-language/editor-language-detect' import { joinPath } from '@/lib/path' -import { openFilePreviewToSide } from '@/lib/file-preview' +import { openFilePreviewToSide } from '@/lib/browser/documents/file-preview' import type { AppState } from '@/store/types' import type { OpenFile } from '@/store/slices/editor/types/open-file' import type { GitBranchChangeEntry } from '../../../../../../shared/git/diff/git-diff-compare-types' diff --git a/src/renderer/src/components/editor/diff/large-files/useDiffViewerLargeDiffLifecycle.ts b/src/renderer/src/components/editor/diff/large-files/useDiffViewerLargeDiffLifecycle.ts index e7ca20385f2..c2e53f3f5f3 100644 --- a/src/renderer/src/components/editor/diff/large-files/useDiffViewerLargeDiffLifecycle.ts +++ b/src/renderer/src/components/editor/diff/large-files/useDiffViewerLargeDiffLifecycle.ts @@ -1,7 +1,7 @@ import { useEffect, useMemo, useRef, useState } from 'react' import type { RefObject } from 'react' import type { editor } from 'monaco-editor' -import { monaco } from '@/lib/monaco-setup' +import { monaco } from '@/lib/editor/monaco/monaco-setup' import { disposeUnattachedDiffViewerMonacoModels, disposeUnattachedMonacoModelPaths, diff --git a/src/renderer/src/components/editor/diff/monaco-view/DiffViewer.tsx b/src/renderer/src/components/editor/diff/monaco-view/DiffViewer.tsx index d78217fcab7..e02d1627e37 100644 --- a/src/renderer/src/components/editor/diff/monaco-view/DiffViewer.tsx +++ b/src/renderer/src/components/editor/diff/monaco-view/DiffViewer.tsx @@ -5,7 +5,7 @@ import { DiffEditor, type DiffOnMount } from '@monaco-editor/react' import type { editor } from 'monaco-editor' import { useAppStore } from '@/store/index' import { diffViewStateCache, setWithLRU } from '@/lib/scroll-cache' -import { monacoTypographyOptions } from '@/lib/editor-typography' +import { monacoTypographyOptions } from '@/lib/editor/appearance/editor-typography' import { useEditorTypography } from '@/hooks/use-editor-typography' import { useContextualCopySetup } from '../../useContextualCopySetup' import { useDiffCommentDecorator } from '../../../diff-comments/useDiffCommentDecorator' diff --git a/src/renderer/src/components/editor/diff/monaco-view/DiffViewer.word-wrap-lifecycle.test.tsx b/src/renderer/src/components/editor/diff/monaco-view/DiffViewer.word-wrap-lifecycle.test.tsx index 958825d6c1e..a09d10641ae 100644 --- a/src/renderer/src/components/editor/diff/monaco-view/DiffViewer.word-wrap-lifecycle.test.tsx +++ b/src/renderer/src/components/editor/diff/monaco-view/DiffViewer.word-wrap-lifecycle.test.tsx @@ -79,7 +79,7 @@ vi.mock('@/store/slices/diff-comments/diff-comment-owner', () => ({ selectDiffCommentView: () => ({ owner: null, comments: undefined }), diffCommentOwnerKey: () => '' })) -vi.mock('@/lib/monaco-setup', () => ({ +vi.mock('@/lib/editor/monaco/monaco-setup', () => ({ monaco: { Uri: { parse: (path: string) => path }, editor: { getModel: () => null } } })) vi.mock('../../useContextualCopySetup', () => ({ diff --git a/src/renderer/src/components/editor/diff/sections/DiffSectionBody.tsx b/src/renderer/src/components/editor/diff/sections/DiffSectionBody.tsx index 9c1f7af768a..cb755f699c9 100644 --- a/src/renderer/src/components/editor/diff/sections/DiffSectionBody.tsx +++ b/src/renderer/src/components/editor/diff/sections/DiffSectionBody.tsx @@ -28,7 +28,10 @@ import { } from '@/lib/monaco-languages/plugin-syntax-editor-options' import { useMonacoTheme } from '@/hooks/use-monaco-theme' import { wholeFileDiffTintClass } from '../monaco-view/whole-file-diff-tint' -import { monacoTypographyOptions, type EditorTypography } from '@/lib/editor-typography' +import { + monacoTypographyOptions, + type EditorTypography +} from '@/lib/editor/appearance/editor-typography' const ImageDiffViewer = lazy(() => import('../large-files/ImageDiffViewer')) diff --git a/src/renderer/src/components/editor/diff/sections/diff-section-preview.ts b/src/renderer/src/components/editor/diff/sections/diff-section-preview.ts index 86d8d13192b..c3a1fa695c7 100644 --- a/src/renderer/src/components/editor/diff/sections/diff-section-preview.ts +++ b/src/renderer/src/components/editor/diff/sections/diff-section-preview.ts @@ -1,5 +1,5 @@ import { detectLanguage } from '../../../../../../shared/editor-language/editor-language-detect' -import { canPreviewLanguage } from '@/lib/file-preview' +import { canPreviewLanguage } from '@/lib/browser/documents/file-preview' // Preview reads the working file on disk; exclude deleted files and historical snapshots that may differ from it. export function canOpenDiffSectionPreviewToSide(params: { diff --git a/src/renderer/src/components/editor/diff/sections/diff-section-types.ts b/src/renderer/src/components/editor/diff/sections/diff-section-types.ts index f1839c3fa80..ccdd55f2b5f 100644 --- a/src/renderer/src/components/editor/diff/sections/diff-section-types.ts +++ b/src/renderer/src/components/editor/diff/sections/diff-section-types.ts @@ -1,7 +1,7 @@ import type { GitDiffResult } from '../../../../../../shared/git/diff/git-diff-compare-types' import type { GitStatusEntry } from '../../../../../../shared/git/status/git-status-types' import type { LargeDiffRenderLimit } from '../../../../../../shared/large-diff-render-limit' -import type { acquireEditorFileOperation } from '@/lib/editor-file-operation-owner' +import type { acquireEditorFileOperation } from '@/lib/editor/file-operations/editor-file-operation-owner' export type DiffSection = { key: string diff --git a/src/renderer/src/components/editor/diff/sections/use-diff-section-model-lifecycle.ts b/src/renderer/src/components/editor/diff/sections/use-diff-section-model-lifecycle.ts index 7b0bb9f9c3a..35735dda361 100644 --- a/src/renderer/src/components/editor/diff/sections/use-diff-section-model-lifecycle.ts +++ b/src/renderer/src/components/editor/diff/sections/use-diff-section-model-lifecycle.ts @@ -1,5 +1,5 @@ import { useCallback, useEffect, useRef } from 'react' -import { monaco } from '@/lib/monaco-setup' +import { monaco } from '@/lib/editor/monaco/monaco-setup' import { disposeUnattachedMonacoModelPaths } from '../monaco-view/diff-monaco-model-disposal' // Dispose virtualized rows’ models on unmount/collapse so remounts cannot leak detached models. diff --git a/src/renderer/src/components/editor/editor-dropped-file-open.ts b/src/renderer/src/components/editor/editor-dropped-file-open.ts index 491ee1cc509..3710cedf3ec 100644 --- a/src/renderer/src/components/editor/editor-dropped-file-open.ts +++ b/src/renderer/src/components/editor/editor-dropped-file-open.ts @@ -1,6 +1,6 @@ import type { EditorFileDropDestination } from './editor-file-drop-destination' import { toast } from 'sonner' -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../shared/editor-language/editor-language-detect' import { isPathInsideWorktree, toWorktreeRelativePath diff --git a/src/renderer/src/components/editor/editor-header-file-rename.test.ts b/src/renderer/src/components/editor/editor-header-file-rename.test.ts index e7e0b6f5dd0..141c8b15a5b 100644 --- a/src/renderer/src/components/editor/editor-header-file-rename.test.ts +++ b/src/renderer/src/components/editor/editor-header-file-rename.test.ts @@ -28,7 +28,9 @@ vi.mock('./autosave/editor-autosave', async (original) => ({ requestEditorSaveQuiesce: renameIO.quiesce, requestEditorFileSave: renameIO.save })) -vi.mock('@/lib/execute-open-editor-path-move', () => ({ executeOpenEditorPathMove: renameIO.move })) +vi.mock('@/lib/editor/file-operations/execute-open-editor-path-move', () => ({ + executeOpenEditorPathMove: renameIO.move +})) vi.mock('@/store/workspaces/selection/use-selected-worktree', () => ({ useWorktreeById: () => ({ path: '/repo', repoId: 'repo-1' }) diff --git a/src/renderer/src/components/editor/editor-panel-file-actions.ts b/src/renderer/src/components/editor/editor-panel-file-actions.ts index 4245c452be6..6f81ff78092 100644 --- a/src/renderer/src/components/editor/editor-panel-file-actions.ts +++ b/src/renderer/src/components/editor/editor-panel-file-actions.ts @@ -1,6 +1,6 @@ import { useAppStore } from '@/store' import { editorViewPlacement } from '@/store/slices/editor/tabs/editor-view-placement' -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../shared/editor-language/editor-language-detect' import type { OpenFile } from '@/store/slices/editor/types/open-file' import type { getEditorPanelRenderModel } from './editor-panel-render-model' diff --git a/src/renderer/src/components/editor/editor-panel-host-content-recovery.spec.ts b/src/renderer/src/components/editor/editor-panel-host-content-recovery.spec.ts index 20267797e77..be700c40671 100644 --- a/src/renderer/src/components/editor/editor-panel-host-content-recovery.spec.ts +++ b/src/renderer/src/components/editor/editor-panel-host-content-recovery.spec.ts @@ -4,7 +4,7 @@ import type { OpenFile } from '@/store/slices/editor/types/open-file' import { createTestStore } from '@/store/testing/app-store-test-fixture' import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' import { TEST_REPO } from '@/store/repos/repo.test-fixture' -import { acquireEditorFileOperation } from '@/lib/editor-file-operation-owner' +import { acquireEditorFileOperation } from '@/lib/editor/file-operations/editor-file-operation-owner' import { createCompatibleRuntimeStatusResponse } from '@/runtime/rpc/testing/runtime-compatibility-test-fixture' import { editorSaveWriterView } from './save/queue/editor-save-writer-view' import { ORCA_EDITOR_EXTERNAL_FILE_CHANGE_EVENT } from './autosave/editor-autosave' diff --git a/src/renderer/src/components/editor/editor-panel-render-model.ts b/src/renderer/src/components/editor/editor-panel-render-model.ts index 218944c98b6..c424da1f119 100644 --- a/src/renderer/src/components/editor/editor-panel-render-model.ts +++ b/src/renderer/src/components/editor/editor-panel-render-model.ts @@ -1,5 +1,5 @@ -import { detectLanguage } from '@/lib/language-detect' -import { canPreviewLanguage } from '@/lib/file-preview' +import { detectLanguage } from '../../../../shared/editor-language/editor-language-detect' +import { canPreviewLanguage } from '@/lib/browser/documents/file-preview' import type { useAppStore } from '@/store' import type { MarkdownViewMode, OpenFile } from '@/store/slices/editor/types/open-file' import type { MarkdownDefaultViewMode } from '../../../../shared/markdown-default-view-mode' diff --git a/src/renderer/src/components/editor/markdown-export-extract.ts b/src/renderer/src/components/editor/markdown-export-extract.ts index 969d577847e..470a6cfb28e 100644 --- a/src/renderer/src/components/editor/markdown-export-extract.ts +++ b/src/renderer/src/components/editor/markdown-export-extract.ts @@ -1,5 +1,5 @@ import { useAppStore } from '@/store' -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../shared/editor-language/editor-language-detect' import { buildMarkdownExportHtml } from './markdown-export-html' export type MarkdownExportPayload = { diff --git a/src/renderer/src/components/editor/markdown-preview/render-tree/markdown-preview-types.ts b/src/renderer/src/components/editor/markdown-preview/render-tree/markdown-preview-types.ts index 42ec4540d41..f7e3685d82d 100644 --- a/src/renderer/src/components/editor/markdown-preview/render-tree/markdown-preview-types.ts +++ b/src/renderer/src/components/editor/markdown-preview/render-tree/markdown-preview-types.ts @@ -1,5 +1,5 @@ import type { MarkdownDocument } from '../../../../../../shared/file-listing/file-document' -import type { EditorFileOperationProvenance } from '@/lib/editor-file-operation-provenance' +import type { EditorFileOperationProvenance } from '@/lib/editor/file-operations/editor-file-operation-provenance' export type MarkdownPreviewProps = { content: string diff --git a/src/renderer/src/components/editor/markdown-preview/review/MarkdownPreviewAnnotationComposer.tsx b/src/renderer/src/components/editor/markdown-preview/review/MarkdownPreviewAnnotationComposer.tsx index c232e8a39a7..18b945c93a9 100644 --- a/src/renderer/src/components/editor/markdown-preview/review/MarkdownPreviewAnnotationComposer.tsx +++ b/src/renderer/src/components/editor/markdown-preview/review/MarkdownPreviewAnnotationComposer.tsx @@ -5,7 +5,10 @@ import { CornerDownLeft } from 'lucide-react' import { Button } from '@/components/ui/button' import { useMountedRef } from '@/hooks/useMountedRef' import { useTranslate } from '@/i18n/use-translate' -import { formatMarkdownReviewNotes, type MarkdownReviewNote } from '@/lib/markdown-review-notes' +import { + formatMarkdownReviewNotes, + type MarkdownReviewNote +} from '@/lib/editor/markdown/review-notes/markdown-review-notes' import { installOpenDraftAddReviewNoteGuard } from '../../editor-shortcuts' import { NotesSendMenu } from '../../review-note-delivery/NotesSendMenu' diff --git a/src/renderer/src/components/editor/markdown-preview/review/markdown-preview-block-model.ts b/src/renderer/src/components/editor/markdown-preview/review/markdown-preview-block-model.ts index 83752f739d3..092e30f8ce3 100644 --- a/src/renderer/src/components/editor/markdown-preview/review/markdown-preview-block-model.ts +++ b/src/renderer/src/components/editor/markdown-preview/review/markdown-preview-block-model.ts @@ -1,5 +1,5 @@ import React from 'react' -import { formatMarkdownReviewCardQuote } from '@/lib/markdown-review-notes' +import { formatMarkdownReviewCardQuote } from '@/lib/editor/markdown/review-notes/markdown-review-notes' import type { MarkdownPreviewBlockRange, MarkdownPreviewPositionNode diff --git a/src/renderer/src/components/editor/markdown-preview/review/use-markdown-preview-annotation-renderers.tsx b/src/renderer/src/components/editor/markdown-preview/review/use-markdown-preview-annotation-renderers.tsx index 22984eaa20d..e8891b98e6f 100644 --- a/src/renderer/src/components/editor/markdown-preview/review/use-markdown-preview-annotation-renderers.tsx +++ b/src/renderer/src/components/editor/markdown-preview/review/use-markdown-preview-annotation-renderers.tsx @@ -7,7 +7,7 @@ import { formatMarkdownReviewCardQuote, getMarkdownReviewCardQuote, type MarkdownReviewNote -} from '@/lib/markdown-review-notes' +} from '@/lib/editor/markdown/review-notes/markdown-review-notes' import { DiffCommentCard } from '../../../diff-comments/DiffCommentCard' import { MarkdownPreviewAnnotationComposer, diff --git a/src/renderer/src/components/editor/markdown-preview/review/use-markdown-preview-review-actions.ts b/src/renderer/src/components/editor/markdown-preview/review/use-markdown-preview-review-actions.ts index 2bc2d74acee..adadc181228 100644 --- a/src/renderer/src/components/editor/markdown-preview/review/use-markdown-preview-review-actions.ts +++ b/src/renderer/src/components/editor/markdown-preview/review/use-markdown-preview-review-actions.ts @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { copyMarkdownReviewNotesForAgent } from '@/lib/markdown-review-note-copy' -import type { MarkdownReviewNote } from '@/lib/markdown-review-notes' +import { copyMarkdownReviewNotesForAgent } from '@/lib/editor/markdown/review-notes/markdown-review-note-copy' +import type { MarkdownReviewNote } from '@/lib/editor/markdown/review-notes/markdown-review-notes' import type { DiffComment } from '../../../../../../shared/diff-comment-types' import type { MarkdownPreviewBlockRange } from '../render-tree/markdown-preview-types' import { requestMarkdownPreviewEditorRevealFrame } from '../links/markdown-preview-editor-reveal' diff --git a/src/renderer/src/components/editor/markdown-preview/surface/use-markdown-preview-foundation.ts b/src/renderer/src/components/editor/markdown-preview/surface/use-markdown-preview-foundation.ts index 0dfabf4cd0a..cac19ed04a7 100644 --- a/src/renderer/src/components/editor/markdown-preview/surface/use-markdown-preview-foundation.ts +++ b/src/renderer/src/components/editor/markdown-preview/surface/use-markdown-preview-foundation.ts @@ -5,7 +5,7 @@ import { formatMarkdownReviewNotes, sortMarkdownReviewNotes, type MarkdownReviewNote -} from '@/lib/markdown-review-notes' +} from '@/lib/editor/markdown/review-notes/markdown-review-notes' import type { MarkdownDocument } from '../../../../../../shared/file-listing/file-document' import { createMarkdownDocumentIndex } from '../../markdown/documents/markdown-doc-links' import { exceedsMarkdownRichModeSizeLimit } from '../../markdown/render-mode/markdown-rich-size-limit' diff --git a/src/renderer/src/components/editor/markdown-preview/surface/use-markdown-preview-source-foundation.ts b/src/renderer/src/components/editor/markdown-preview/surface/use-markdown-preview-source-foundation.ts index 212d5dd8b11..7da3e2aa8b2 100644 --- a/src/renderer/src/components/editor/markdown-preview/surface/use-markdown-preview-source-foundation.ts +++ b/src/renderer/src/components/editor/markdown-preview/surface/use-markdown-preview-source-foundation.ts @@ -1,7 +1,7 @@ import { useDiffCommentView } from '../../../diff-comments/use-diff-comment-owner' import { useCallback, useEffect, useMemo, useRef, useState } from 'react' import { createConnectionIdForFileSelector } from '@/lib/workspace/ownership/connection-owner-resolution' -import { computeEditorFontSize } from '@/lib/editor-font-zoom' +import { computeEditorFontSize } from '@/lib/editor/appearance/editor-font-zoom' import type { HttpLinkSourceOwner } from '@/lib/browser/navigation/http-link-routing' import { isMarkdownComment } from '@/lib/diff-comment-compat' import { useFileOwnerRuntimeTarget } from '@/runtime/rpc/targets/use-worktree-runtime-target' diff --git a/src/renderer/src/components/editor/markdown-source-tools/monaco/use-monaco-markdown-annotations.ts b/src/renderer/src/components/editor/markdown-source-tools/monaco/use-monaco-markdown-annotations.ts index 5cf049fafaa..1aaf08c391b 100644 --- a/src/renderer/src/components/editor/markdown-source-tools/monaco/use-monaco-markdown-annotations.ts +++ b/src/renderer/src/components/editor/markdown-source-tools/monaco/use-monaco-markdown-annotations.ts @@ -19,7 +19,10 @@ import { toast } from 'sonner' import { useTranslate } from '@/i18n/use-translate' import { useAppStore } from '@/store/index' import { isMarkdownComment } from '@/lib/diff-comment-compat' -import { formatMarkdownReviewNotes, type MarkdownReviewNote } from '@/lib/markdown-review-notes' +import { + formatMarkdownReviewNotes, + type MarkdownReviewNote +} from '@/lib/editor/markdown/review-notes/markdown-review-notes' import { useDiffCommentDecorator } from '../../../diff-comments/useDiffCommentDecorator' import { getDiffCommentPopoverLeft, diff --git a/src/renderer/src/components/editor/markdown/documents/MarkdownTemplatePicker.tsx b/src/renderer/src/components/editor/markdown/documents/MarkdownTemplatePicker.tsx index 045de69af1f..311a8722cd3 100644 --- a/src/renderer/src/components/editor/markdown/documents/MarkdownTemplatePicker.tsx +++ b/src/renderer/src/components/editor/markdown/documents/MarkdownTemplatePicker.tsx @@ -11,8 +11,8 @@ import { import type { MarkdownTemplatePickerRequest, MarkdownTemplateSelection -} from '@/lib/markdown-template-picker-request' -import { subscribeMarkdownTemplatePicker } from '@/lib/markdown-template-picker-request' +} from '@/lib/editor/markdown/documents/markdown-template-picker-request' +import { subscribeMarkdownTemplatePicker } from '@/lib/editor/markdown/documents/markdown-template-picker-request' import { useTranslate } from '@/i18n/use-translate' export function MarkdownTemplatePicker(): JSX.Element { diff --git a/src/renderer/src/components/editor/markdown/documents/useMarkdownDocuments.ts b/src/renderer/src/components/editor/markdown/documents/useMarkdownDocuments.ts index d7100516fda..04a0f9151ac 100644 --- a/src/renderer/src/components/editor/markdown/documents/useMarkdownDocuments.ts +++ b/src/renderer/src/components/editor/markdown/documents/useMarkdownDocuments.ts @@ -6,7 +6,7 @@ import { translate } from '@/i18n/i18n' import '@/lib/workspace/ownership/connection-context' import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { statRuntimePath } from '@/runtime/files/metadata/runtime-file-metadata-client' -import { acquireEditorFileOperation } from '@/lib/editor-file-operation-owner' +import { acquireEditorFileOperation } from '@/lib/editor/file-operations/editor-file-operation-owner' import { getRuntimeTargetForFileOwner } from '@/lib/file-owner-runtime-target' import type { MarkdownViewMode, OpenFile } from '@/store/slices/editor/types/open-file' import { diff --git a/src/renderer/src/components/editor/migrate-restored-editor-file-owner.ts b/src/renderer/src/components/editor/migrate-restored-editor-file-owner.ts index 7a63f0c44c1..d984b9a0487 100644 --- a/src/renderer/src/components/editor/migrate-restored-editor-file-owner.ts +++ b/src/renderer/src/components/editor/migrate-restored-editor-file-owner.ts @@ -4,11 +4,12 @@ import { findWorkspaceFileRoute, type RuntimeWorkspaceFileRoute } from '@/lib/runtime-workspace-file-route' +import '@/lib/editor/file-operations/editor-file-operation-owner' import { assertEditorFileOperationCurrent, - captureEditorFileOperationProvenance, - type EditorFileOperationProvenance -} from '@/lib/editor-file-operation-owner' + captureEditorFileOperationProvenance +} from '@/lib/editor/file-operations/editor-file-operation-provenance' +import type { EditorFileOperationProvenance } from '@/lib/editor/file-operations/editor-file-operation-provenance' import { requestEditorSaveQuiesce } from './autosave/editor-autosave' import type { RestoredEditorOwnerResult } from '@/store/slices/editor/types/restored-editor-owner' import { contentRekeyOutcome } from '@/runtime/workspace-layout/intents/layout-owner-content-rekeys' diff --git a/src/renderer/src/components/editor/model-lifetime/buffer-text/editor-buffer-adapter.test.ts b/src/renderer/src/components/editor/model-lifetime/buffer-text/editor-buffer-adapter.test.ts index 7f9faf24dd3..56c7866a8e8 100644 --- a/src/renderer/src/components/editor/model-lifetime/buffer-text/editor-buffer-adapter.test.ts +++ b/src/renderer/src/components/editor/model-lifetime/buffer-text/editor-buffer-adapter.test.ts @@ -3,7 +3,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js' import type { StoreApi } from 'zustand' import type { AppState } from '@/store/types' -import { createEditorModelRegistry } from '@/lib/editor-model-registry' +import { createEditorModelRegistry } from '@/lib/editor/monaco/editor-model-registry' import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' import { createEditorStore } from '../../autosave/editor-autosave-controller-test-fixture' import { applyEditorBufferText } from './editor-buffer-adapter' diff --git a/src/renderer/src/components/editor/model-lifetime/buffer-text/editor-buffer-adapter.ts b/src/renderer/src/components/editor/model-lifetime/buffer-text/editor-buffer-adapter.ts index f84af1f56e5..37f538d8910 100644 --- a/src/renderer/src/components/editor/model-lifetime/buffer-text/editor-buffer-adapter.ts +++ b/src/renderer/src/components/editor/model-lifetime/buffer-text/editor-buffer-adapter.ts @@ -1,6 +1,9 @@ import type { AppState } from '@/store/types' import type { OpenFile } from '@/store/slices/editor/types/open-file' -import { editorModelRegistry, type EditorModelRegistryBridge } from '@/lib/editor-model-registry' +import { + editorModelRegistry, + type EditorModelRegistryBridge +} from '@/lib/editor/monaco/editor-model-registry' import { editorBufferSiblingViewIds } from '@/store/slices/editor/buffers/editor-buffer-views' import { editorModelSiblingTabs, diff --git a/src/renderer/src/components/editor/model-lifetime/buffer-text/editor-shared-record-clean-view.test.ts b/src/renderer/src/components/editor/model-lifetime/buffer-text/editor-shared-record-clean-view.test.ts index 43d6c1e6508..bea35aa3783 100644 --- a/src/renderer/src/components/editor/model-lifetime/buffer-text/editor-shared-record-clean-view.test.ts +++ b/src/renderer/src/components/editor/model-lifetime/buffer-text/editor-shared-record-clean-view.test.ts @@ -6,7 +6,7 @@ import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js' import type { editor } from 'monaco-editor' import type { StoreApi } from 'zustand' import type { AppState } from '@/store/types' -import { editorModelRegistry } from '@/lib/editor-model-registry' +import { editorModelRegistry } from '@/lib/editor/monaco/editor-model-registry' import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' import { createEditorStore } from '../../autosave/editor-autosave-controller-test-fixture' import { editorTabModelUri } from '../../save/queue/editor-save-disk-precondition' diff --git a/src/renderer/src/components/editor/model-lifetime/identity/editor-model-owner.ts b/src/renderer/src/components/editor/model-lifetime/identity/editor-model-owner.ts index 28ddcf7d607..d38bc403f1e 100644 --- a/src/renderer/src/components/editor/model-lifetime/identity/editor-model-owner.ts +++ b/src/renderer/src/components/editor/model-lifetime/identity/editor-model-owner.ts @@ -1,7 +1,7 @@ import type { OpenFile } from '@/store/slices/editor/types/open-file' import type { WorktreeOperationRouteState } from '@/lib/workspace/ownership/worktree-operation-route' -import '@/lib/editor-file-operation-owner' -import { resolveEditorOwnerRoute } from '@/lib/editor-file-operation-provenance' +import '@/lib/editor/file-operations/editor-file-operation-owner' +import { resolveEditorOwnerRoute } from '@/lib/editor/file-operations/editor-file-operation-provenance' import { isDetachedEditorBufferId, type EditorBufferViewIndex diff --git a/src/renderer/src/components/editor/model-lifetime/identity/editor-model-rekey-carry.ts b/src/renderer/src/components/editor/model-lifetime/identity/editor-model-rekey-carry.ts index 49a68ee5d64..93464a9baf8 100644 --- a/src/renderer/src/components/editor/model-lifetime/identity/editor-model-rekey-carry.ts +++ b/src/renderer/src/components/editor/model-lifetime/identity/editor-model-rekey-carry.ts @@ -1,6 +1,6 @@ import { useLayoutEffect, useRef } from 'react' import { useAppStore } from '@/store/index' -import { editorModelRegistry } from '@/lib/editor-model-registry' +import { editorModelRegistry } from '@/lib/editor/monaco/editor-model-registry' type ModelRegistry = NonNullable> diff --git a/src/renderer/src/components/editor/model-lifetime/retention/closed-editor-model-shell.test.tsx b/src/renderer/src/components/editor/model-lifetime/retention/closed-editor-model-shell.test.tsx index c079e42fe05..e47810f2fb8 100644 --- a/src/renderer/src/components/editor/model-lifetime/retention/closed-editor-model-shell.test.tsx +++ b/src/renderer/src/components/editor/model-lifetime/retention/closed-editor-model-shell.test.tsx @@ -7,7 +7,7 @@ import { afterEach, expect, it, vi } from 'vitest' import type { AppState } from '@/store/types' import type { TerminalController } from '../../../use-terminal-controller' import { TerminalLegacyEditorSurface } from '../../../TerminalLegacyEditorSurface' -import { editorModelRegistry } from '@/lib/editor-model-registry' +import { editorModelRegistry } from '@/lib/editor/monaco/editor-model-registry' import { useClosedEditorTabCleanup } from './useClosedEditorTabCleanup' import { createModelLifetimeFixture, diff --git a/src/renderer/src/components/editor/model-lifetime/retention/closed-editor-tab-controller.ts b/src/renderer/src/components/editor/model-lifetime/retention/closed-editor-tab-controller.ts index 42d29da24d9..02123b8d0d3 100644 --- a/src/renderer/src/components/editor/model-lifetime/retention/closed-editor-tab-controller.ts +++ b/src/renderer/src/components/editor/model-lifetime/retention/closed-editor-tab-controller.ts @@ -2,7 +2,7 @@ import { disposeGitGraphHistory } from '../../git-graph/git-graph-tab-controller import type { StoreApi } from 'zustand' import type { editor } from 'monaco-editor' import type { OpenFile } from '@/store/slices/editor/types/open-file' -import { editorModelRegistry } from '@/lib/editor-model-registry' +import { editorModelRegistry } from '@/lib/editor/monaco/editor-model-registry' import { disposeClosedEditorModels, disposeClosedCheckDetailsReadingCache, diff --git a/src/renderer/src/components/editor/model-lifetime/retention/closed-editor-view-state-retention.test.ts b/src/renderer/src/components/editor/model-lifetime/retention/closed-editor-view-state-retention.test.ts index 4e316bcbe21..22c96ca76ab 100644 --- a/src/renderer/src/components/editor/model-lifetime/retention/closed-editor-view-state-retention.test.ts +++ b/src/renderer/src/components/editor/model-lifetime/retention/closed-editor-view-state-retention.test.ts @@ -3,7 +3,7 @@ import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js' import { createStore } from 'zustand/vanilla' import { afterEach, expect, it } from 'vitest' import type { OpenFile } from '@/store/slices/editor/types/open-file' -import { createEditorModelRegistry } from '@/lib/editor-model-registry' +import { createEditorModelRegistry } from '@/lib/editor/monaco/editor-model-registry' import { attachClosedEditorTabCleanup } from '@/components/editor/model-lifetime/retention/closed-editor-tab-controller' import { toEditorModelUri } from '@/components/editor/model-lifetime/identity/editor-model-uri' import { scrollTopCache, editorSelectionCache, pdfViewPositionCache } from '@/lib/scroll-cache' diff --git a/src/renderer/src/components/editor/model-lifetime/retention/editor-model-lifetime-fixture.ts b/src/renderer/src/components/editor/model-lifetime/retention/editor-model-lifetime-fixture.ts index 99d78a916eb..c1564d6759e 100644 --- a/src/renderer/src/components/editor/model-lifetime/retention/editor-model-lifetime-fixture.ts +++ b/src/renderer/src/components/editor/model-lifetime/retention/editor-model-lifetime-fixture.ts @@ -1,6 +1,6 @@ import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js' import { vi } from 'vitest' -import { createEditorModelRegistry } from '@/lib/editor-model-registry' +import { createEditorModelRegistry } from '@/lib/editor/monaco/editor-model-registry' import { createEditorTabsStore } from '@/store/slices/editor/editor-slice-test-harness' import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' import { TEST_REPO } from '@/store/repos/repo.test-fixture' diff --git a/src/renderer/src/components/editor/notebook/cells/IpynbCellEditor.external-sync.test.tsx b/src/renderer/src/components/editor/notebook/cells/IpynbCellEditor.external-sync.test.tsx index f4f59a83000..461c7a317ac 100644 --- a/src/renderer/src/components/editor/notebook/cells/IpynbCellEditor.external-sync.test.tsx +++ b/src/renderer/src/components/editor/notebook/cells/IpynbCellEditor.external-sync.test.tsx @@ -38,7 +38,7 @@ vi.mock('@/store/index', () => { vi.mock('@/hooks/use-document-dark-theme', () => ({ useDocumentDarkTheme: () => true })) vi.mock('../../MonacoCodeExcerpt', () => ({ useMonacoColorizedLines: () => [] })) vi.mock('../../editor-shortcuts', () => ({ installMonacoEditorFindShortcut: () => () => {} })) -vi.mock('@/lib/monaco-setup', async () => { +vi.mock('@/lib/editor/monaco/monaco-setup', async () => { const actual = await import('monaco-editor/esm/vs/editor/editor.api.js') for (const id of ['python', 'javascript', 'markdown']) { actual.languages.register({ id }) diff --git a/src/renderer/src/components/editor/notebook/cells/IpynbCellEditor.tsx b/src/renderer/src/components/editor/notebook/cells/IpynbCellEditor.tsx index 507544c5dc6..f9aef8b6d7e 100644 --- a/src/renderer/src/components/editor/notebook/cells/IpynbCellEditor.tsx +++ b/src/renderer/src/components/editor/notebook/cells/IpynbCellEditor.tsx @@ -1,12 +1,12 @@ import { useLayoutEffect, useMemo, useRef, useState } from 'react' import type { Components } from 'react-markdown' import type { editor } from 'monaco-editor' -import { monaco } from '@/lib/monaco-setup' +import { monaco } from '@/lib/editor/monaco/monaco-setup' import { EDITOR_TYPOGRAPHY_SURFACE_CLASS, editorTypographyTextStyle, monacoTypographyOptions -} from '@/lib/editor-typography' +} from '@/lib/editor/appearance/editor-typography' import { useEditorTypography } from '@/hooks/use-editor-typography' import { cn } from '@/lib/utils' import { installMonacoEditorFindShortcut } from '../../editor-shortcuts' diff --git a/src/renderer/src/components/editor/notebook/document/IpynbRendering.test.tsx b/src/renderer/src/components/editor/notebook/document/IpynbRendering.test.tsx index 7b68fe96de1..8d5dea34034 100644 --- a/src/renderer/src/components/editor/notebook/document/IpynbRendering.test.tsx +++ b/src/renderer/src/components/editor/notebook/document/IpynbRendering.test.tsx @@ -10,7 +10,7 @@ vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback })) vi.mock('@/hooks/use-document-dark-theme', () => ({ useDocumentDarkTheme: () => true })) -vi.mock('@/lib/monaco-setup', () => ({ monaco: {} })) +vi.mock('@/lib/editor/monaco/monaco-setup', () => ({ monaco: {} })) vi.mock('../../MonacoCodeExcerpt', () => ({ useMonacoColorizedLines: () => [] })) diff --git a/src/renderer/src/components/editor/notebook/document/IpynbViewer.tsx b/src/renderer/src/components/editor/notebook/document/IpynbViewer.tsx index c2ff47106fc..5f538ade877 100644 --- a/src/renderer/src/components/editor/notebook/document/IpynbViewer.tsx +++ b/src/renderer/src/components/editor/notebook/document/IpynbViewer.tsx @@ -1,7 +1,7 @@ import { isImeOwnedKeyboardEvent } from '@/lib/ime-composition-keyboard-event' import { useCallback, useMemo, useState } from 'react' import { AlertCircle, Save } from 'lucide-react' -import { computeEditorFontSize } from '@/lib/editor-font-zoom' +import { computeEditorFontSize } from '@/lib/editor/appearance/editor-font-zoom' import { useAppStore } from '@/store/index' import { Button } from '@/components/ui/button' import { diff --git a/src/renderer/src/components/editor/open-editor-html-preview.ts b/src/renderer/src/components/editor/open-editor-html-preview.ts index 961faee6361..320351d3638 100644 --- a/src/renderer/src/components/editor/open-editor-html-preview.ts +++ b/src/renderer/src/components/editor/open-editor-html-preview.ts @@ -4,8 +4,8 @@ import { editorViewPlacement, editorViewTab } from '@/store/slices/editor/tabs/editor-view-placement' -import { openFileInBrowserTab } from '@/lib/file-preview' -import { resolveFileBrowserLinkExecutionHostId } from '@/lib/file-preview-link-open' +import { openFileInBrowserTab } from '@/lib/browser/documents/file-preview' +import { resolveFileBrowserLinkExecutionHostId } from '@/lib/browser/documents/file-preview-link-open' import { captureBrowserLinkReveal } from '@/lib/browser/navigation/browser-link-reveal' import { createBrowserLinkHostMatcher } from '@/lib/browser/navigation/browser-link-owner' import { beginLinkOpenRequest, subscribeLinkOpenRequests } from '@/lib/link-open-request' diff --git a/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-insert.ts b/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-insert.ts index bf4d7556ca7..faaea3b6d6f 100644 --- a/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-insert.ts +++ b/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-insert.ts @@ -7,7 +7,7 @@ import { importExternalPathsToRuntime } from '@/runtime/files/imports/runtime-fi import { acquireEditorFileOperation, getEditorFileOperationContext -} from '@/lib/editor-file-operation-owner' +} from '@/lib/editor/file-operations/editor-file-operation-owner' import { editorTabDocumentFolderAccess } from '@/lib/local-file-access' import { requireRuntimeTargetForFileOwner } from '@/lib/file-owner-runtime-target' import { captureDirectSshMutationExpectation } from '@/lib/ssh-mutation-expectation' diff --git a/src/renderer/src/components/editor/rich-markdown/instance/RichMarkdownEditorSurface.tsx b/src/renderer/src/components/editor/rich-markdown/instance/RichMarkdownEditorSurface.tsx index 67cb45d8d25..8ff7e4f5494 100644 --- a/src/renderer/src/components/editor/rich-markdown/instance/RichMarkdownEditorSurface.tsx +++ b/src/renderer/src/components/editor/rich-markdown/instance/RichMarkdownEditorSurface.tsx @@ -20,7 +20,7 @@ import type { } from '../commands/rich-markdown-slash-command-primitives' import type { MarkdownTocItem } from '../../markdown/navigation/markdown-table-of-contents' import type { NotesSendMenuScope } from '../../review-note-delivery/NotesSendMenu' -import type { MarkdownReviewNote } from '@/lib/markdown-review-notes' +import type { MarkdownReviewNote } from '@/lib/editor/markdown/review-notes/markdown-review-notes' import type { RichMarkdownAnnotationTarget } from '../review/rich-markdown-review-annotations' import type { RichMarkdownReviewNotePosition } from '../review/rich-markdown-review-note-layout' import type { DiffComment } from '../../../../../../shared/diff-comment-types' diff --git a/src/renderer/src/components/editor/rich-markdown/instance/rich-markdown-editor-props.ts b/src/renderer/src/components/editor/rich-markdown/instance/rich-markdown-editor-props.ts index f953ad38baa..0375c397f69 100644 --- a/src/renderer/src/components/editor/rich-markdown/instance/rich-markdown-editor-props.ts +++ b/src/renderer/src/components/editor/rich-markdown/instance/rich-markdown-editor-props.ts @@ -1,6 +1,6 @@ import type React from 'react' import type { MarkdownDocument } from '../../../../../../shared/file-listing/file-document' -import type { EditorFileOperationProvenance } from '@/lib/editor-file-operation-provenance' +import type { EditorFileOperationProvenance } from '@/lib/editor/file-operations/editor-file-operation-provenance' export type RichMarkdownEditorProps = { fileId: string diff --git a/src/renderer/src/components/editor/rich-markdown/review/RichMarkdownReviewNoteLayer.tsx b/src/renderer/src/components/editor/rich-markdown/review/RichMarkdownReviewNoteLayer.tsx index 51b0befbc10..f78a0fe83d2 100644 --- a/src/renderer/src/components/editor/rich-markdown/review/RichMarkdownReviewNoteLayer.tsx +++ b/src/renderer/src/components/editor/rich-markdown/review/RichMarkdownReviewNoteLayer.tsx @@ -10,7 +10,7 @@ import { formatMarkdownReviewNotes, getMarkdownReviewCardQuote, type MarkdownReviewNote -} from '@/lib/markdown-review-notes' +} from '@/lib/editor/markdown/review-notes/markdown-review-notes' import type { RichMarkdownReviewNotePosition } from './rich-markdown-review-note-layout' import { useTranslate } from '@/i18n/use-translate' diff --git a/src/renderer/src/components/editor/rich-markdown/review/RichMarkdownReviewRailActions.tsx b/src/renderer/src/components/editor/rich-markdown/review/RichMarkdownReviewRailActions.tsx index 012a98d676e..be3089f9ca1 100644 --- a/src/renderer/src/components/editor/rich-markdown/review/RichMarkdownReviewRailActions.tsx +++ b/src/renderer/src/components/editor/rich-markdown/review/RichMarkdownReviewRailActions.tsx @@ -1,7 +1,7 @@ import type { DiffCommentOwner } from '@/store/slices/diff-comments/diff-comment-owner' import { Check, Copy, MessageSquare } from 'lucide-react' import { NotesSendMenu, type NotesSendMenuScope } from '../../review-note-delivery/NotesSendMenu' -import type { MarkdownReviewNote } from '@/lib/markdown-review-notes' +import type { MarkdownReviewNote } from '@/lib/editor/markdown/review-notes/markdown-review-notes' import { useTranslate } from '@/i18n/use-translate' type RichMarkdownReviewRailActionsProps = { diff --git a/src/renderer/src/components/editor/rich-markdown/review/useRichMarkdownReviewCopyFeedback.ts b/src/renderer/src/components/editor/rich-markdown/review/useRichMarkdownReviewCopyFeedback.ts index 1916954e6f3..0201186570e 100644 --- a/src/renderer/src/components/editor/rich-markdown/review/useRichMarkdownReviewCopyFeedback.ts +++ b/src/renderer/src/components/editor/rich-markdown/review/useRichMarkdownReviewCopyFeedback.ts @@ -1,7 +1,7 @@ import { useCallback, useRef, useState } from 'react' import type { MutableRefObject } from 'react' -import { copyMarkdownReviewNotesForAgent } from '@/lib/markdown-review-note-copy' -import type { MarkdownReviewNote } from '@/lib/markdown-review-notes' +import { copyMarkdownReviewNotesForAgent } from '@/lib/editor/markdown/review-notes/markdown-review-note-copy' +import type { MarkdownReviewNote } from '@/lib/editor/markdown/review-notes/markdown-review-notes' type UseRichMarkdownReviewCopyFeedbackOptions = { markdownReviewContent: string diff --git a/src/renderer/src/components/editor/rich-markdown/review/useRichMarkdownReviewData.ts b/src/renderer/src/components/editor/rich-markdown/review/useRichMarkdownReviewData.ts index 8df381e56ed..5c1f52edfd5 100644 --- a/src/renderer/src/components/editor/rich-markdown/review/useRichMarkdownReviewData.ts +++ b/src/renderer/src/components/editor/rich-markdown/review/useRichMarkdownReviewData.ts @@ -6,7 +6,7 @@ import { formatMarkdownReviewNotes, sortMarkdownReviewNotes, type MarkdownReviewNote -} from '@/lib/markdown-review-notes' +} from '@/lib/editor/markdown/review-notes/markdown-review-notes' import type { NotesSendMenuScope } from '../../review-note-delivery/NotesSendMenu' import type { DiffComment } from '../../../../../../shared/diff-comment-types' import { useTranslate } from '@/i18n/use-translate' diff --git a/src/renderer/src/components/editor/save/flush/removal-unsaved-editor-files.ts b/src/renderer/src/components/editor/save/flush/removal-unsaved-editor-files.ts index 2b6901c1752..d39f9f10b5a 100644 --- a/src/renderer/src/components/editor/save/flush/removal-unsaved-editor-files.ts +++ b/src/renderer/src/components/editor/save/flush/removal-unsaved-editor-files.ts @@ -9,7 +9,7 @@ import { worktreePurgeClosedFileIds } from '@/store/slices/worktrees/teardown/wo import { canAutoSaveOpenFile } from '../../autosave/editor-autosave' import { flushClosingEditorBuffers } from './editor-pending-flush' import { editorTabModelUri, isCodeViewTab } from '../queue/editor-save-disk-precondition' -import { editorModelRegistry } from '@/lib/editor-model-registry' +import { editorModelRegistry } from '@/lib/editor/monaco/editor-model-registry' /** Prompt once per writable dirty record only when every view of it is closing. */ export function lastViewUnsavedFiles(state: AppState, closedIds: ReadonlySet): OpenFile[] { diff --git a/src/renderer/src/components/editor/save/queue/editor-save-slots.ts b/src/renderer/src/components/editor/save/queue/editor-save-slots.ts index 71dbc2f19ae..7b796312202 100644 --- a/src/renderer/src/components/editor/save/queue/editor-save-slots.ts +++ b/src/renderer/src/components/editor/save/queue/editor-save-slots.ts @@ -1,4 +1,4 @@ -import type { acquireEditorFileOperation } from '@/lib/editor-file-operation-owner' +import type { acquireEditorFileOperation } from '@/lib/editor/file-operations/editor-file-operation-owner' import type { LocalFileAccess } from '../../../../../../shared/file-access/local-file-access' import type { EditorSaveResult, EditorSaveTrigger } from './editor-save-disk-precondition' diff --git a/src/renderer/src/components/editor/save/queue/editor-save-writer-view.ts b/src/renderer/src/components/editor/save/queue/editor-save-writer-view.ts index 12b4c7f1f59..cbc680c8225 100644 --- a/src/renderer/src/components/editor/save/queue/editor-save-writer-view.ts +++ b/src/renderer/src/components/editor/save/queue/editor-save-writer-view.ts @@ -1,8 +1,8 @@ import { editorSaveResourceKey } from '@/store/slices/editor/buffers/editor-buffer-identity' import type { AppState } from '@/store/types' import type { OpenFile } from '@/store/slices/editor/types/open-file' -import { acquireEditorFileOperation } from '@/lib/editor-file-operation-owner' -import { captureEditorFileOperationForOwner } from '@/lib/editor-file-child-owner' +import { acquireEditorFileOperation } from '@/lib/editor/file-operations/editor-file-operation-owner' +import { captureEditorFileOperationForOwner } from '@/lib/editor/file-operations/editor-file-child-owner' import { editorTabFileAccess } from '@/lib/local-file-access' import type { AppStoreApi } from './editor-save-queue-contract' import type { EditorSaveAcquisition, EditorSaveRequest } from './editor-save-slots' diff --git a/src/renderer/src/components/editor/save/transforms/editor-final-newline-save.test.ts b/src/renderer/src/components/editor/save/transforms/editor-final-newline-save.test.ts index 4efc583d593..20954ea6abb 100644 --- a/src/renderer/src/components/editor/save/transforms/editor-final-newline-save.test.ts +++ b/src/renderer/src/components/editor/save/transforms/editor-final-newline-save.test.ts @@ -4,7 +4,7 @@ import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js' import type { StoreApi } from 'zustand' import type { AppState } from '@/store/types' import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' -import { editorModelRegistry } from '@/lib/editor-model-registry' +import { editorModelRegistry } from '@/lib/editor/monaco/editor-model-registry' import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' import { usePluginPanelsStore } from '@/store/plugins/catalog/plugin-contribution-catalog' import { requestEditorFileSave } from '../../autosave/editor-autosave' diff --git a/src/renderer/src/components/editor/save/transforms/editor-final-newline.ts b/src/renderer/src/components/editor/save/transforms/editor-final-newline.ts index a42a9dd4602..f8225d6e5fe 100644 --- a/src/renderer/src/components/editor/save/transforms/editor-final-newline.ts +++ b/src/renderer/src/components/editor/save/transforms/editor-final-newline.ts @@ -1,6 +1,6 @@ import type { AppState } from '@/store/types' import type { OpenFile } from '@/store/slices/editor/types/open-file' -import { editorModelRegistry } from '@/lib/editor-model-registry' +import { editorModelRegistry } from '@/lib/editor/monaco/editor-model-registry' import { editorTabModelUri } from '../queue/editor-save-disk-precondition' import { hasPendingEditorBufferChange } from '../flush/editor-pending-flush' import { normalizeToModelEol } from '../../monaco-content-sync' diff --git a/src/renderer/src/components/editor/setup-contextual-copy.ts b/src/renderer/src/components/editor/setup-contextual-copy.ts index 4adae5c4ad0..4b10cf8e6bf 100644 --- a/src/renderer/src/components/editor/setup-contextual-copy.ts +++ b/src/renderer/src/components/editor/setup-contextual-copy.ts @@ -1,6 +1,6 @@ import type { editor } from 'monaco-editor' import { formatShortcutLabel } from '@/hooks/useShortcutLabel' -import { monaco } from '@/lib/monaco-setup' +import { monaco } from '@/lib/editor/monaco/monaco-setup' import { useAppStore } from '@/store' import { editorShortcutMatches } from './editor-shortcuts' import { diff --git a/src/renderer/src/components/editor/use-monaco-editor-mount.cursor-owner.test.tsx b/src/renderer/src/components/editor/use-monaco-editor-mount.cursor-owner.test.tsx index 8dae32d8eb4..5f66a377961 100644 --- a/src/renderer/src/components/editor/use-monaco-editor-mount.cursor-owner.test.tsx +++ b/src/renderer/src/components/editor/use-monaco-editor-mount.cursor-owner.test.tsx @@ -7,7 +7,8 @@ import type { OnMount } from '@monaco-editor/react' import type { StoreApi } from 'zustand' import type { AppState } from '@/store/types' import { createEditorTabsStore } from '@/store/slices/editor/editor-slice-test-harness' -import { captureEditorFileOperationProvenance } from '@/lib/editor-file-operation-owner' +import '@/lib/editor/file-operations/editor-file-operation-owner' +import { captureEditorFileOperationProvenance } from '@/lib/editor/file-operations/editor-file-operation-provenance' import type { MonacoEditorMountParams } from './monaco-editor-mount-params' import { useMonacoEditorMount } from './use-monaco-editor-mount' import { MonacoGutterContextMenu } from './MonacoGutterContextMenu' diff --git a/src/renderer/src/components/editor/useEditorPanelDiffContentLoader.ts b/src/renderer/src/components/editor/useEditorPanelDiffContentLoader.ts index 52ac77a3a5d..a6c216f8173 100644 --- a/src/renderer/src/components/editor/useEditorPanelDiffContentLoader.ts +++ b/src/renderer/src/components/editor/useEditorPanelDiffContentLoader.ts @@ -1,5 +1,5 @@ import { useCallback, type Dispatch, type MutableRefObject, type SetStateAction } from 'react' -import { getEditorFileReadContext } from '@/lib/editor-file-operation-owner' +import { getEditorFileReadContext } from '@/lib/editor/file-operations/editor-file-operation-owner' import type { OpenFile } from '@/store/slices/editor/types/open-file' import { useAppStore } from '@/store' import { diff --git a/src/renderer/src/components/editor/useEditorPanelFileContentLoader.ts b/src/renderer/src/components/editor/useEditorPanelFileContentLoader.ts index b2519124877..5d342546add 100644 --- a/src/renderer/src/components/editor/useEditorPanelFileContentLoader.ts +++ b/src/renderer/src/components/editor/useEditorPanelFileContentLoader.ts @@ -38,7 +38,7 @@ import { import { acquireEditorFileOperation, isSameEditorFileOperationIdentity -} from '@/lib/editor-file-operation-owner' +} from '@/lib/editor/file-operations/editor-file-operation-owner' export function useEditorPanelFileContentLoader({ fileLoadRetryAttemptsRef, diff --git a/src/renderer/src/components/editor/useUntitledFileRename.ts b/src/renderer/src/components/editor/useUntitledFileRename.ts index 8b7134319f9..1c5897647ab 100644 --- a/src/renderer/src/components/editor/useUntitledFileRename.ts +++ b/src/renderer/src/components/editor/useUntitledFileRename.ts @@ -5,8 +5,8 @@ import { useAppStore } from '@/store' import type { OpenFile } from '@/store/slices/editor/types/open-file' import { createRuntimePath } from '@/runtime/files/mutations/runtime-file-mutation-client' import { runtimePathExists } from '@/runtime/files/metadata/runtime-file-metadata-client' -import { executeOpenEditorPathMove } from '@/lib/execute-open-editor-path-move' -import { acquireEditorFileOperation } from '@/lib/editor-file-operation-owner' +import { executeOpenEditorPathMove } from '@/lib/editor/file-operations/execute-open-editor-path-move' +import { acquireEditorFileOperation } from '@/lib/editor/file-operations/editor-file-operation-owner' import { requestEditorFileSave, requestEditorSaveQuiesce } from './autosave/editor-autosave' import { getUntitledFileRoot } from './untitled-file-rename-path' diff --git a/src/renderer/src/components/emulator-pane/emulator-device-picker-groups.ts b/src/renderer/src/components/emulator-pane/emulator-device-picker-groups.ts index 6de74367bca..ea4fdd6cdf3 100644 --- a/src/renderer/src/components/emulator-pane/emulator-device-picker-groups.ts +++ b/src/renderer/src/components/emulator-pane/emulator-device-picker-groups.ts @@ -1,4 +1,4 @@ -import { simulatorRuntimeLabel } from '@/lib/simulator-runtime-label' +import { simulatorRuntimeLabel } from '@/lib/simulator/launch/simulator-runtime-label' import type { SimulatorDeviceRow } from './emulator-pane-types' export function groupEmulatorDevices(devices: SimulatorDeviceRow[], selected: string | null) { diff --git a/src/renderer/src/components/emulator-pane/emulator-pane-error-copy.ts b/src/renderer/src/components/emulator-pane/emulator-pane-error-copy.ts index 284598efd16..840dbe53901 100644 --- a/src/renderer/src/components/emulator-pane/emulator-pane-error-copy.ts +++ b/src/renderer/src/components/emulator-pane/emulator-pane-error-copy.ts @@ -1,5 +1,5 @@ import { translate } from '@/i18n/i18n' -import { emulatorErrorText } from '@/lib/emulator-error-copy' +import { emulatorErrorText } from '@/lib/simulator/launch/emulator-error-copy' export function emulatorListDevicesErrorText(error: unknown): string { return emulatorErrorText( diff --git a/src/renderer/src/components/emulator-pane/emulator-pane-session-view.ts b/src/renderer/src/components/emulator-pane/emulator-pane-session-view.ts index 9f2a01d721c..33d58471e1c 100644 --- a/src/renderer/src/components/emulator-pane/emulator-pane-session-view.ts +++ b/src/renderer/src/components/emulator-pane/emulator-pane-session-view.ts @@ -1,4 +1,4 @@ -import { SIMULATOR_DEFAULT_TAB_LABEL } from '@/lib/simulator-tab-label' +import { SIMULATOR_DEFAULT_TAB_LABEL } from '@/lib/simulator/tabs/simulator-tab-label' import { simulatorPreviewStreamUrl, type EmulatorPaneSession, diff --git a/src/renderer/src/components/emulator-pane/emulator-pane-types.ts b/src/renderer/src/components/emulator-pane/emulator-pane-types.ts index 0e60de62b02..c7de9e2480a 100644 --- a/src/renderer/src/components/emulator-pane/emulator-pane-types.ts +++ b/src/renderer/src/components/emulator-pane/emulator-pane-types.ts @@ -1,4 +1,4 @@ -import { SIMULATOR_DEFAULT_TAB_LABEL } from '@/lib/simulator-tab-label' +import { SIMULATOR_DEFAULT_TAB_LABEL } from '@/lib/simulator/tabs/simulator-tab-label' export type SimulatorDeviceRow = { name: string @@ -28,6 +28,12 @@ export type EmulatorPaneSession = { info?: EmulatorStreamInfo } +export type UseEmulatorPaneSessionArgs = { + worktreeId: string + tabId?: string + autoAttachOnMount: boolean +} + export function deviceLabel( device: SimulatorDeviceRow | EmulatorStreamInfo | string | undefined ): string { diff --git a/src/renderer/src/components/emulator-pane/use-emulator-input-check.ts b/src/renderer/src/components/emulator-pane/use-emulator-input-check.ts index 7ba69bceabe..4944fc02e6b 100644 --- a/src/renderer/src/components/emulator-pane/use-emulator-input-check.ts +++ b/src/renderer/src/components/emulator-pane/use-emulator-input-check.ts @@ -1,6 +1,6 @@ import { useCallback, useEffect, useRef, useState } from 'react' import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' -import { emulatorErrorText } from '@/lib/emulator-error-copy' +import { emulatorErrorText } from '@/lib/simulator/launch/emulator-error-copy' import { hasRuntimeRpcErrorCode } from '../../../../shared/runtime-rpc-error-code' import { EMULATOR_FAILURE_COPY } from '../../../../shared/emulator-failure-copy' diff --git a/src/renderer/src/components/emulator-pane/use-emulator-pane-lifecycle.ts b/src/renderer/src/components/emulator-pane/use-emulator-pane-lifecycle.ts index 6070cc5f378..35e0b1c5d07 100644 --- a/src/renderer/src/components/emulator-pane/use-emulator-pane-lifecycle.ts +++ b/src/renderer/src/components/emulator-pane/use-emulator-pane-lifecycle.ts @@ -2,7 +2,7 @@ import { useEffect } from 'react' import { cancelPendingSimulatorPaneShutdown, scheduleSimulatorPaneManagedShutdown -} from '@/lib/simulator-pane-shutdown-scheduler' +} from '@/lib/simulator/tabs/simulator-pane-shutdown-scheduler' import type { SimulatorDeviceRow } from './emulator-pane-types' type UseEmulatorPaneLifecycleArgs = { diff --git a/src/renderer/src/components/emulator-pane/use-emulator-pane-manual-launch-events.ts b/src/renderer/src/components/emulator-pane/use-emulator-pane-manual-launch-events.ts index 938d8beb51d..1059cc5c6ba 100644 --- a/src/renderer/src/components/emulator-pane/use-emulator-pane-manual-launch-events.ts +++ b/src/renderer/src/components/emulator-pane/use-emulator-pane-manual-launch-events.ts @@ -4,8 +4,8 @@ import type { EmulatorPaneSession } from './emulator-pane-types' import { EMULATOR_MANUAL_LAUNCH_FAILED_EVENT, EMULATOR_MANUAL_LAUNCH_STARTED_EVENT -} from '@/lib/simulator-launch-coordination' -import { SIMULATOR_DEFAULT_TAB_LABEL } from '@/lib/simulator-tab-label' +} from '@/lib/simulator/launch/simulator-launch-coordination' +import { SIMULATOR_DEFAULT_TAB_LABEL } from '@/lib/simulator/tabs/simulator-tab-label' type UseEmulatorPaneManualLaunchEventsArgs = { worktreeId: string diff --git a/src/renderer/src/components/emulator-pane/use-emulator-pane-session.test.tsx b/src/renderer/src/components/emulator-pane/use-emulator-pane-session.test.tsx index 1e86fb6c484..2c4368a3fa7 100644 --- a/src/renderer/src/components/emulator-pane/use-emulator-pane-session.test.tsx +++ b/src/renderer/src/components/emulator-pane/use-emulator-pane-session.test.tsx @@ -1,4 +1,4 @@ -import * as emulatorPreferences from '@/lib/emulator-opening-preferences-capability' +import * as emulatorPreferences from '@/lib/simulator/launch/emulator-opening-preferences-capability' import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/hosts/capabilities/local-runtime-capabilities' // @vitest-environment happy-dom @@ -9,8 +9,8 @@ import { useAppStore } from '@/store' import { consumePrelaunchedSimulatorSession, rememberPrelaunchedSimulatorSession -} from '@/lib/simulator-launch-coordination' -import { cancelPendingSimulatorPaneShutdown } from '@/lib/simulator-pane-shutdown-scheduler' +} from '@/lib/simulator/launch/simulator-launch-coordination' +import { cancelPendingSimulatorPaneShutdown } from '@/lib/simulator/tabs/simulator-pane-shutdown-scheduler' import { useEmulatorPaneSession } from './use-emulator-pane-session' import type { SimulatorDeviceRow } from './emulator-pane-types' diff --git a/src/renderer/src/components/emulator-pane/use-emulator-pane-session.ts b/src/renderer/src/components/emulator-pane/use-emulator-pane-session.ts index ba1a11f75ad..ce7cd214c72 100644 --- a/src/renderer/src/components/emulator-pane/use-emulator-pane-session.ts +++ b/src/renderer/src/components/emulator-pane/use-emulator-pane-session.ts @@ -3,14 +3,15 @@ import { getEmulatorOpeningMode, type EmulatorSelectionRequired } from '../../../../shared/emulator-opening-preferences' -import { supportsEmulatorOpeningPreferences } from '@/lib/emulator-opening-preferences-capability' +import { supportsEmulatorOpeningPreferences } from '@/lib/simulator/launch/emulator-opening-preferences-capability' import { useCallback, useEffect, useRef, useState } from 'react' import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' import { useAppStore } from '@/store' import { deviceLabel, simulatorPreviewStreamUrl, - type EmulatorPaneSession + type EmulatorPaneSession, + type UseEmulatorPaneSessionArgs } from './emulator-pane-types' import { markSimulatorDeviceShutdown } from './emulator-device-state' import { useEmulatorPaneControls } from './use-emulator-pane-controls' @@ -18,8 +19,8 @@ import { useEmulatorPaneSessionEvents } from './use-emulator-pane-session-events import { consumePrelaunchedSimulatorSession, isManualSimulatorLaunchPending -} from '@/lib/simulator-launch-coordination' -import { shutdownManagedSimulatorIfNoPane } from '@/lib/simulator-pane-shutdown-scheduler' +} from '@/lib/simulator/launch/simulator-launch-coordination' +import { shutdownManagedSimulatorIfNoPane } from '@/lib/simulator/tabs/simulator-pane-shutdown-scheduler' import { buildPrelaunchedEmulatorSessionState } from './emulator-prelaunched-session' import { useEmulatorPaneManualLaunchEvents } from './use-emulator-pane-manual-launch-events' import { buildEmulatorPaneSessionView } from './emulator-pane-session-view' @@ -27,15 +28,12 @@ import { attachWithAvdFallback } from './emulator-attach-target' import { useEmulatorPaneLifecycle } from './use-emulator-pane-lifecycle' import { useEmulatorPaneShutdown } from './use-emulator-pane-shutdown' import { emulatorStartErrorText, noEmulatorDevicesError } from './emulator-pane-error-copy' -import { SIMULATOR_DEFAULT_TAB_LABEL, formatSimulatorTabLabel } from '@/lib/simulator-tab-label' +import { + SIMULATOR_DEFAULT_TAB_LABEL, + formatSimulatorTabLabel +} from '@/lib/simulator/tabs/simulator-tab-label' import { useTranslate } from '@/i18n/use-translate' -type UseEmulatorPaneSessionArgs = { - worktreeId: string - tabId?: string - autoAttachOnMount: boolean -} - export function useEmulatorPaneSession({ worktreeId, tabId, diff --git a/src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts b/src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts index 80e496e4628..faa1c0de455 100644 --- a/src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts +++ b/src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts @@ -2,7 +2,7 @@ import { useCallback } from 'react' import { toast } from 'sonner' import { resolveGroupTabFromVisibleId } from '@/components/tab-group/tab-group-visible-id' import { getConnectionId } from '@/lib/workspace/ownership/connection-context' -import { createUntitledMarkdownFileWithTemplateSelection } from '@/lib/create-untitled-markdown' +import { createUntitledMarkdownFileWithTemplateSelection } from '@/lib/editor/file-operations/create-untitled-markdown' import { ensureClientCreationActionAllowed } from '@/lib/client-creation-action-error' import { openDocumentInFloatingWorkspace } from '@/lib/open-document-in-floating-workspace' import { extractIpcErrorMessage } from '@/lib/ipc-error' diff --git a/src/renderer/src/components/github/CommentCodeContext.tsx b/src/renderer/src/components/github/CommentCodeContext.tsx index 61a29502f2b..d667ffafbed 100644 --- a/src/renderer/src/components/github/CommentCodeContext.tsx +++ b/src/renderer/src/components/github/CommentCodeContext.tsx @@ -4,7 +4,7 @@ import { ArrowDown, ArrowUp, Braces, LoaderCircle, UndoDot } from 'lucide-react' import { Button } from '@/components/ui/button' import { ButtonGroup } from '@/components/ui/button-group' import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip' -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../shared/editor-language/editor-language-detect' import { cn } from '@/lib/utils' import { useTranslate } from '@/i18n/use-translate' import { diff --git a/src/renderer/src/components/native-chat/appearance/native-chat-appearance-style.ts b/src/renderer/src/components/native-chat/appearance/native-chat-appearance-style.ts index 5513a7df51c..87f861438a3 100644 --- a/src/renderer/src/components/native-chat/appearance/native-chat-appearance-style.ts +++ b/src/renderer/src/components/native-chat/appearance/native-chat-appearance-style.ts @@ -7,7 +7,7 @@ import { resolveConfiguredTerminalColors } from '../../../../../shared/terminal- import { MATCH_TERMINAL_APP_THEME } from '../../../../../shared/plugin-theme-settings' import { buildFontFamily } from '@/lib/monospace-font-family' import { buildAppFontFamily } from '@/lib/app-font-family' -import { resolveEditorFontStack } from '@/lib/editor-typography' +import { resolveEditorFontStack } from '@/lib/editor/appearance/editor-typography' import { getSystemPrefersDark } from '@/lib/terminal-theme' import { isTerminalBackgroundLight } from '../../../../../shared/terminal-themes/terminal-title-contrast' import { useSystemPrefersDark } from '../../../hooks/theme/use-system-prefers-dark' diff --git a/src/renderer/src/components/native-chat/composer/editor/NativeChatFileReferencePill.tsx b/src/renderer/src/components/native-chat/composer/editor/NativeChatFileReferencePill.tsx index c6e880390b2..870d72f681f 100644 --- a/src/renderer/src/components/native-chat/composer/editor/NativeChatFileReferencePill.tsx +++ b/src/renderer/src/components/native-chat/composer/editor/NativeChatFileReferencePill.tsx @@ -9,7 +9,7 @@ import { NodeViewWrapper, type NodeViewProps } from '@tiptap/react' import { FileX, Hourglass } from 'lucide-react' import { useTranslate } from '@/i18n/use-translate' import { basename } from '@/lib/path' -import { getFileTypeIcon } from '@/lib/file-type-icons' +import { getFileTypeIcon } from '@/lib/file-icons/file-type-icons' import { NativeChatPromptPill } from './NativeChatPromptPill' import { isNativeChatPastedTextPath } from '../../../../../../shared/native-chat/native-chat-image-label' import { diff --git a/src/renderer/src/components/native-chat/media/visuals/NativeChatInlineVisual.tsx b/src/renderer/src/components/native-chat/media/visuals/NativeChatInlineVisual.tsx index 1e733282a7d..31b9ab781f7 100644 --- a/src/renderer/src/components/native-chat/media/visuals/NativeChatInlineVisual.tsx +++ b/src/renderer/src/components/native-chat/media/visuals/NativeChatInlineVisual.tsx @@ -11,7 +11,7 @@ import { Button } from '@/components/ui/button' import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip' import { useTranslate } from '@/i18n/use-translate' import { fileArtifactSourceKey } from '@/lib/file-artifact-source-key' -import { openFileInBrowserTab } from '@/lib/file-preview' +import { openFileInBrowserTab } from '@/lib/browser/documents/file-preview' import { basename } from '@/lib/path' import { getRuntimeTargetHostId, diff --git a/src/renderer/src/components/plugins/view/plugin-view-host-actions.ts b/src/renderer/src/components/plugins/view/plugin-view-host-actions.ts index c2ae6563b4b..2a45aa1b6fb 100644 --- a/src/renderer/src/components/plugins/view/plugin-view-host-actions.ts +++ b/src/renderer/src/components/plugins/view/plugin-view-host-actions.ts @@ -2,7 +2,7 @@ import type { PluginViewReply, PluginViewRequest } from '../../../../../shared/plugins/view/plugin-view-protocol' -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../../shared/editor-language/editor-language-detect' import { dispatchAppCommand } from '@/lib/app-command-dispatch' import { useAppStore } from '@/store' import { getIndexedWorktreeMap } from '@/store/slices/worktrees/listing/worktree-catalog-index' diff --git a/src/renderer/src/components/plugins/view/plugin-view-request-handler.ts b/src/renderer/src/components/plugins/view/plugin-view-request-handler.ts index 3cf0fc936ca..335ead0288d 100644 --- a/src/renderer/src/components/plugins/view/plugin-view-request-handler.ts +++ b/src/renderer/src/components/plugins/view/plugin-view-request-handler.ts @@ -7,7 +7,7 @@ import { type PluginViewRequest } from '../../../../../shared/plugins/view/plugin-view-protocol' import { LOCAL_EXECUTION_HOST_ID } from '../../../../../shared/execution-host' -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../../shared/editor-language/editor-language-detect' import { activateAndRevealWorkspace } from '@/lib/workspace/activation/worktree-activation' import { canShowRightSidebarForView } from '@/lib/right-sidebar-visibility' import { useAppStore } from '@/store' diff --git a/src/renderer/src/components/quick-open-file-navigation.ts b/src/renderer/src/components/quick-open-file-navigation.ts index e26b4e94141..23ce14f8cd5 100644 --- a/src/renderer/src/components/quick-open-file-navigation.ts +++ b/src/renderer/src/components/quick-open-file-navigation.ts @@ -3,7 +3,7 @@ import { rankQuickOpenFiles } from '../../../shared/quick-open/quick-open-path-search' import { statUserOpenedPath } from '@/lib/user-opened-local-path' -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../shared/editor-language/editor-language-detect' import { joinPath, getRelativePathInsideRoot } from '@/lib/path' import { useAppStore } from '@/store' import { isMissingRuntimePathError } from '@/runtime/files/metadata/runtime-file-metadata-client' diff --git a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-log-open.ts b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-log-open.ts index 22b1ae51c05..5f54089dbde 100644 --- a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-log-open.ts +++ b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-log-open.ts @@ -1,7 +1,7 @@ import { toast } from 'sonner' import { useAppStore } from '@/store/index' import type { AppState } from '@/store/types' -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../../../shared/editor-language/editor-language-detect' import { findFirstIndexedWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner-index' import { translate } from '@/i18n/i18n' import { folderWorkspaceKey } from '../../../../../../shared/workspace-scope' diff --git a/src/renderer/src/components/right-sidebar/file-explorer/content-search/search-match-open.ts b/src/renderer/src/components/right-sidebar/file-explorer/content-search/search-match-open.ts index a5c6c7ad4b2..84d19ae07de 100644 --- a/src/renderer/src/components/right-sidebar/file-explorer/content-search/search-match-open.ts +++ b/src/renderer/src/components/right-sidebar/file-explorer/content-search/search-match-open.ts @@ -1,4 +1,4 @@ -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../../../shared/editor-language/editor-language-detect' import type { FileSearchResultOwner } from '@/lib/file-search-result-owner' import type { SearchFileResult, diff --git a/src/renderer/src/components/right-sidebar/file-explorer/mutations/file-explorer-deletion-editors.ts b/src/renderer/src/components/right-sidebar/file-explorer/mutations/file-explorer-deletion-editors.ts index b5236c51678..3ba0c55af21 100644 --- a/src/renderer/src/components/right-sidebar/file-explorer/mutations/file-explorer-deletion-editors.ts +++ b/src/renderer/src/components/right-sidebar/file-explorer/mutations/file-explorer-deletion-editors.ts @@ -1,6 +1,6 @@ import type { AppState } from '@/store/types' import type { OpenFile } from '@/store/slices/editor/types/open-file' -import { getEditorFileOperationContext } from '@/lib/editor-file-operation-owner' +import { getEditorFileOperationContext } from '@/lib/editor/file-operations/editor-file-operation-owner' import type { FileExplorerOperationRoute } from '../navigation/file-explorer-operation-owner' import { isPathEqualOrDescendant } from '../navigation/file-explorer-paths' import { runtimeTargetEnvironmentId } from '@/runtime/rpc/targets/runtime-client-target' diff --git a/src/renderer/src/components/right-sidebar/file-explorer/mutations/useFileExplorerHandlers.ts b/src/renderer/src/components/right-sidebar/file-explorer/mutations/useFileExplorerHandlers.ts index 0ff92259521..1b499754d40 100644 --- a/src/renderer/src/components/right-sidebar/file-explorer/mutations/useFileExplorerHandlers.ts +++ b/src/renderer/src/components/right-sidebar/file-explorer/mutations/useFileExplorerHandlers.ts @@ -1,7 +1,7 @@ import { useCallback } from 'react' import type React from 'react' import type { RefObject } from 'react' -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../../../shared/editor-language/editor-language-detect' import { toast } from 'sonner' import type { TreeNode } from '../tree/file-explorer-types' import { FILE_EXPLORER_DRAGGABLE_SELECTOR } from './file-explorer-drag-scroll-marker' diff --git a/src/renderer/src/components/right-sidebar/file-explorer/mutations/useFileExplorerMoveDrop.ts b/src/renderer/src/components/right-sidebar/file-explorer/mutations/useFileExplorerMoveDrop.ts index 615bfd1fa69..d581935b2ef 100644 --- a/src/renderer/src/components/right-sidebar/file-explorer/mutations/useFileExplorerMoveDrop.ts +++ b/src/renderer/src/components/right-sidebar/file-explorer/mutations/useFileExplorerMoveDrop.ts @@ -1,7 +1,7 @@ import { useCallback } from 'react' import { toast } from 'sonner' import { basename, dirname, joinPath } from '@/lib/path' -import { executeOpenEditorPathMove } from '@/lib/execute-open-editor-path-move' +import { executeOpenEditorPathMove } from '@/lib/editor/file-operations/execute-open-editor-path-move' import { commitFileExplorerOp } from './fileExplorerUndoRedo' import type { FileExplorerOperationOwner } from '../tree/file-explorer-types' import { captureFileExplorerOperationGuard } from '../navigation/file-explorer-operation-owner' diff --git a/src/renderer/src/components/right-sidebar/file-explorer/panel/file-explorer-row-context-menu.tsx b/src/renderer/src/components/right-sidebar/file-explorer/panel/file-explorer-row-context-menu.tsx index 694c3820cc1..ffeed794e48 100644 --- a/src/renderer/src/components/right-sidebar/file-explorer/panel/file-explorer-row-context-menu.tsx +++ b/src/renderer/src/components/right-sidebar/file-explorer/panel/file-explorer-row-context-menu.tsx @@ -25,8 +25,8 @@ import { } from '@/components/ui/context-menu' import { useAppStore } from '@/store/index' import { useShortcutLabel } from '@/hooks/useShortcutLabel' -import { detectLanguage } from '@/lib/language-detect' -import { openFileInBrowserTab } from '@/lib/file-preview' +import { detectLanguage } from '../../../../../../shared/editor-language/editor-language-detect' +import { openFileInBrowserTab } from '@/lib/browser/documents/file-preview' import { useTranslate } from '@/i18n/use-translate' import { LocalOnlyMenuHint } from '@/components/local-only-menu-hint' import { diff --git a/src/renderer/src/components/right-sidebar/file-explorer/tree/use-file-explorer-tree-pane-state.ts b/src/renderer/src/components/right-sidebar/file-explorer/tree/use-file-explorer-tree-pane-state.ts index a6398fa1216..96f040e7da1 100644 --- a/src/renderer/src/components/right-sidebar/file-explorer/tree/use-file-explorer-tree-pane-state.ts +++ b/src/renderer/src/components/right-sidebar/file-explorer/tree/use-file-explorer-tree-pane-state.ts @@ -2,7 +2,7 @@ import type { Dispatch, RefObject, SetStateAction } from 'react' import { useEffect, useMemo, useRef } from 'react' import { useAppStore } from '@/store/index' import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner' -import { useWorkspaceFileBrowserActionPredicate } from '@/lib/file-preview' +import { useWorkspaceFileBrowserActionPredicate } from '@/lib/browser/documents/file-preview' import type { RuntimeFileOperationArgs } from '@/runtime/files/runtime-file-client-types' import type { OpenFile } from '@/store/slices/editor/types/open-file' import type { Repo } from '../../../../../../shared/repo-types' diff --git a/src/renderer/src/components/right-sidebar/source-control/listing/open-uncommitted-entry.ts b/src/renderer/src/components/right-sidebar/source-control/listing/open-uncommitted-entry.ts index 5d322b58343..8c53e780b50 100644 --- a/src/renderer/src/components/right-sidebar/source-control/listing/open-uncommitted-entry.ts +++ b/src/renderer/src/components/right-sidebar/source-control/listing/open-uncommitted-entry.ts @@ -1,6 +1,6 @@ import type { GitStatusEntry } from '../../../../../../shared/git/status/git-status-types' import type { AppState } from '@/store/types' -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../../../shared/editor-language/editor-language-detect' import { joinPath } from '@/lib/path' export function openUncommittedEntry( diff --git a/src/renderer/src/components/right-sidebar/source-control/listing/use-row-opening.ts b/src/renderer/src/components/right-sidebar/source-control/listing/use-row-opening.ts index c603539782b..32145fed493 100644 --- a/src/renderer/src/components/right-sidebar/source-control/listing/use-row-opening.ts +++ b/src/renderer/src/components/right-sidebar/source-control/listing/use-row-opening.ts @@ -4,7 +4,7 @@ import { useSourceControlScope } from '../panel/worktree-scope' import { useCallback, useMemo } from 'react' -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../../../shared/editor-language/editor-language-detect' import { openUncommittedEntry } from './open-uncommitted-entry' import { useAppStore } from '@/store' import { openFileIndex } from '@/store/slices/editor/tabs/workspace-editor-files' diff --git a/src/renderer/src/components/right-sidebar/source-control/listing/use-store-actions.ts b/src/renderer/src/components/right-sidebar/source-control/listing/use-store-actions.ts index 99d0d72d56d..20d37b59288 100644 --- a/src/renderer/src/components/right-sidebar/source-control/listing/use-store-actions.ts +++ b/src/renderer/src/components/right-sidebar/source-control/listing/use-store-actions.ts @@ -1,5 +1,5 @@ import { basename, getRelativePathInsideRoot } from '@/lib/path' -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../../../shared/editor-language/editor-language-detect' import type { AppState } from '@/store/types' import { sourceControlScopeRuntimeEnvironmentId, diff --git a/src/renderer/src/components/right-sidebar/source-control/notes/use-diff-comment-notes.ts b/src/renderer/src/components/right-sidebar/source-control/notes/use-diff-comment-notes.ts index 6d1d991d9fe..a496b59310a 100644 --- a/src/renderer/src/components/right-sidebar/source-control/notes/use-diff-comment-notes.ts +++ b/src/renderer/src/components/right-sidebar/source-control/notes/use-diff-comment-notes.ts @@ -1,6 +1,6 @@ import type { AppState } from '@/store/types' import { useOwnedDiffComments } from '../../../diff-comments/use-diff-comment-owner' -import { withoutMarkdownReviewNotes } from '@/lib/markdown-review-notes-setting' +import { withoutMarkdownReviewNotes } from '@/lib/editor/markdown/review-notes/markdown-review-notes-setting' import { useCallback, useMemo, useState } from 'react' import { toast } from 'sonner' import { translate } from '@/i18n/i18n' diff --git a/src/renderer/src/components/right-sidebar/source-control/notes/use-note-opening.ts b/src/renderer/src/components/right-sidebar/source-control/notes/use-note-opening.ts index 57647095173..e1e86bdd797 100644 --- a/src/renderer/src/components/right-sidebar/source-control/notes/use-note-opening.ts +++ b/src/renderer/src/components/right-sidebar/source-control/notes/use-note-opening.ts @@ -1,5 +1,5 @@ import { useCallback, useRef, type RefObject } from 'react' -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../../../shared/editor-language/editor-language-detect' import { getDiffCommentSource } from '@/lib/diff-comment-compat' import { joinPath } from '@/lib/path' import { useAppStore } from '@/store' diff --git a/src/renderer/src/components/right-sidebar/source-control/sync/use-git-history-commit-actions.ts b/src/renderer/src/components/right-sidebar/source-control/sync/use-git-history-commit-actions.ts index 13083590b0d..81e3e0ad429 100644 --- a/src/renderer/src/components/right-sidebar/source-control/sync/use-git-history-commit-actions.ts +++ b/src/renderer/src/components/right-sidebar/source-control/sync/use-git-history-commit-actions.ts @@ -6,7 +6,7 @@ import { useAppStore } from '@/store' import { getRuntimeGitCommitCompare } from '@/runtime/source-control/git/runtime-git-diff-client' import { getRuntimeGitRemoteCommitUrl } from '@/runtime/source-control/git/runtime-git-working-tree-client' import { sourceControlConnectionId, useSourceControlScope } from '../panel/worktree-scope' -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../../../shared/editor-language/editor-language-detect' import { launchAgentInNewTab } from '@/lib/agent-session/launch/new-tab/launch-agent-in-new-tab' import { newAgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agent-launch-request-id' import { resolveDefaultAgentForWorktreeNewTab } from '@/lib/agent-tab-shortcuts' diff --git a/src/renderer/src/components/settings/appearance/themes/AppearanceThemeControl.tsx b/src/renderer/src/components/settings/appearance/themes/AppearanceThemeControl.tsx index b3d7b8c8d51..84577af521c 100644 --- a/src/renderer/src/components/settings/appearance/themes/AppearanceThemeControl.tsx +++ b/src/renderer/src/components/settings/appearance/themes/AppearanceThemeControl.tsx @@ -22,7 +22,7 @@ import { isPluginTerminalThemeSelected, terminalThemeUpdate } from '../../../plugins/state/plugin-theme-apply' -import { findCodeEditorTheme } from '@/lib/code-editor-theme' +import { findCodeEditorTheme } from '@/lib/editor/appearance/code-editor-theme' import { isWebClientLocation } from '@/lib/web-client-location' import { requestPluginBrowse } from '@/store/plugins/navigation/plugin-preview-request' import { useCatalogAppThemes, type CatalogAppTheme } from './use-catalog-app-themes' diff --git a/src/renderer/src/components/settings/editor/EditorTypographySettings.tsx b/src/renderer/src/components/settings/editor/EditorTypographySettings.tsx index feb503e36ed..001732e7bf4 100644 --- a/src/renderer/src/components/settings/editor/EditorTypographySettings.tsx +++ b/src/renderer/src/components/settings/editor/EditorTypographySettings.tsx @@ -13,8 +13,11 @@ import { resolveEditorFontFamily, resolveEditorLigaturesMode, type EditorLigaturesMode -} from '@/lib/editor-typography' -import { supportsCodeFontSmoothing, type CodeFontSmoothing } from '@/lib/code-font-smoothing' +} from '@/lib/editor/appearance/editor-typography' +import { + supportsCodeFontSmoothing, + type CodeFontSmoothing +} from '@/lib/editor/appearance/code-font-smoothing' import { useTranslate } from '@/i18n/use-translate' import { SearchableSetting } from '../section-layout/SearchableSetting' import { diff --git a/src/renderer/src/components/settings/editor/editor-typography-search.ts b/src/renderer/src/components/settings/editor/editor-typography-search.ts index 846960a4c5a..2e4a4323965 100644 --- a/src/renderer/src/components/settings/editor/editor-typography-search.ts +++ b/src/renderer/src/components/settings/editor/editor-typography-search.ts @@ -1,7 +1,7 @@ import { translate } from '@/i18n/i18n' import { translateSearchKeyword } from '../search/settings-search-keywords' import { createLocalizedCatalog } from '@/i18n/localized-catalog' -import { supportsCodeFontSmoothing } from '@/lib/code-font-smoothing' +import { supportsCodeFontSmoothing } from '@/lib/editor/appearance/code-font-smoothing' import type { SettingsSearchEntry } from '../search/settings-search' function editorTypographyKeywords(): string[] { diff --git a/src/renderer/src/components/settings/mobile/emulator/EmulatorOpeningSettings.tsx b/src/renderer/src/components/settings/mobile/emulator/EmulatorOpeningSettings.tsx index 7755f004a70..033afa76a92 100644 --- a/src/renderer/src/components/settings/mobile/emulator/EmulatorOpeningSettings.tsx +++ b/src/renderer/src/components/settings/mobile/emulator/EmulatorOpeningSettings.tsx @@ -3,7 +3,7 @@ import { getEmulatorOpeningMode } from '../../../../../../shared/emulator-openin import { SettingsRow } from '../../form-controls/SettingsFormControls' import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../../../ui/select' import { useTranslate } from '@/i18n/use-translate' -import { simulatorRuntimeLabel } from '@/lib/simulator-runtime-label' +import { simulatorRuntimeLabel } from '@/lib/simulator/launch/simulator-runtime-label' type Device = { name: string; udid: string; runtime?: string; isAvailable?: boolean } type Props = { diff --git a/src/renderer/src/components/settings/mobile/emulator/MobileEmulatorAvailabilityDetails.tsx b/src/renderer/src/components/settings/mobile/emulator/MobileEmulatorAvailabilityDetails.tsx index fdb001de2f8..8343be8c0fe 100644 --- a/src/renderer/src/components/settings/mobile/emulator/MobileEmulatorAvailabilityDetails.tsx +++ b/src/renderer/src/components/settings/mobile/emulator/MobileEmulatorAvailabilityDetails.tsx @@ -3,7 +3,7 @@ import type React from 'react' import { toast } from 'sonner' import { Button } from '../../../ui/button' import { useTranslate } from '@/i18n/use-translate' -import { emulatorMessageText } from '@/lib/emulator-error-copy' +import { emulatorMessageText } from '@/lib/simulator/launch/emulator-error-copy' import { openAppHttpLink } from '@/lib/browser/navigation/app-http-link-open' type CodedMessage = { message?: string; messageCode?: unknown; messageParams?: unknown } diff --git a/src/renderer/src/components/settings/mobile/emulator/MobileEmulatorSettingsPane.tsx b/src/renderer/src/components/settings/mobile/emulator/MobileEmulatorSettingsPane.tsx index 4f6e7150848..e43ebaa7963 100644 --- a/src/renderer/src/components/settings/mobile/emulator/MobileEmulatorSettingsPane.tsx +++ b/src/renderer/src/components/settings/mobile/emulator/MobileEmulatorSettingsPane.tsx @@ -15,7 +15,7 @@ import { SettingsSwitchRow } from '../../form-controls/SettingsFormControls' import { getMobileEmulatorSearchEntries } from './mobile-emulator-search' import { translate } from '@/i18n/i18n' import { useTranslate, type Translate } from '@/i18n/use-translate' -import { emulatorErrorText, emulatorMessageText } from '@/lib/emulator-error-copy' +import { emulatorErrorText, emulatorMessageText } from '@/lib/simulator/launch/emulator-error-copy' import { useUiLanguageRevision } from '@/i18n/use-ui-language-revision' type SimulatorDeviceRow = { diff --git a/src/renderer/src/components/tab-bar/EditorFileTab.tsx b/src/renderer/src/components/tab-bar/EditorFileTab.tsx index 77d856bc48d..6340f891aa1 100644 --- a/src/renderer/src/components/tab-bar/EditorFileTab.tsx +++ b/src/renderer/src/components/tab-bar/EditorFileTab.tsx @@ -10,7 +10,7 @@ import { basename } from '@/lib/path' import { getEditorDisplayLabel } from '@/components/editor/editor-labels' import { renameFileOnDisk } from '@/lib/rename-file' import { isImeCompositionKeyDown } from '@/lib/ime-composition-keyboard-event' -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../shared/editor-language/editor-language-detect' import { FileTypeIcon } from '@/components/FileTypeIcon' import { useWorktreeById } from '@/store/workspaces/selection/use-selected-worktree' import { getOpenFileExecutionHostId } from '@/lib/workspace/ownership/unified-tab-host-ownership' diff --git a/src/renderer/src/components/tab-bar/TabBarItemRow.tsx b/src/renderer/src/components/tab-bar/TabBarItemRow.tsx index 6cba4a2a45b..e8d00cef2c3 100644 --- a/src/renderer/src/components/tab-bar/TabBarItemRow.tsx +++ b/src/renderer/src/components/tab-bar/TabBarItemRow.tsx @@ -16,7 +16,7 @@ import { useStructuredChatTabNamingFailure } from '@/runtime/native-chat/naming/structured-conversation-name' import { agentTypeToIconAgent } from '../../../../shared/agent-status/presentation/agent-type-icon-agent' -import { formatSimulatorTabLabel } from '@/lib/simulator-tab-label' +import { formatSimulatorTabLabel } from '@/lib/simulator/tabs/simulator-tab-label' import { useTranslate } from '@/i18n/use-translate' // Why only values and `actions`: anything a tab draws must be a compared prop, or a skipped render shows it stale. diff --git a/src/renderer/src/components/tab-bar/open-tab-search-entries.ts b/src/renderer/src/components/tab-bar/open-tab-search-entries.ts index 50c685a5b32..ae7aa8a90bd 100644 --- a/src/renderer/src/components/tab-bar/open-tab-search-entries.ts +++ b/src/renderer/src/components/tab-bar/open-tab-search-entries.ts @@ -2,12 +2,10 @@ import type { Repo } from '../../../../shared/repo-types' import type { Worktree } from '../../../../shared/worktree/types' import { buildSearchableBrowserPages } from '@/lib/browser/palette/browser-palette-page-entries' import type { SearchableBrowserPage } from '@/lib/browser/palette/browser-palette-search' -import { - buildSearchableSimulatorTabs, - type SearchableSimulatorTab -} from '@/lib/simulator-palette-search' +import { buildSearchableSimulatorTabs } from '@/lib/simulator/search/simulator-palette-search' +import type { SearchableSimulatorTab } from '@/lib/simulator/search/simulator-palette-search-types' import '@/lib/workspace/search/tabs/workspace-tab-search-types' -import { buildSearchableWorkspaceTabEntries as buildSearchableWorkspaceTabs } from '@/lib/workspace/search/tabs/workspace-tab-palette-entry-builder' +import { buildSearchableWorkspaceTabEntries } from '@/lib/workspace/search/tabs/workspace-tab-palette-entry-builder' import type { SearchableWorkspaceTab } from '@/lib/workspace/search/tabs/workspace-tab-search-types' import type { AppState } from '@/store/types' import { @@ -213,7 +211,7 @@ export function buildOpenTabSearchEntries( const scope = openTabSearchScope(state) return { - workspaceTabs: buildSearchableWorkspaceTabs({ + workspaceTabs: buildSearchableWorkspaceTabEntries({ ...scope, unifiedTabsByWorktree: state.unifiedTabsByWorktree, tabsByWorktree: state.tabsByWorktree, diff --git a/src/renderer/src/components/tab-bar/open-tab-search.ts b/src/renderer/src/components/tab-bar/open-tab-search.ts index e58668df704..988a182da0d 100644 --- a/src/renderer/src/components/tab-bar/open-tab-search.ts +++ b/src/renderer/src/components/tab-bar/open-tab-search.ts @@ -16,11 +16,11 @@ import { type BrowserPaletteSearchResult, type SearchableBrowserPage } from '@/lib/browser/palette/browser-palette-search' -import { - searchSimulatorTabs, - type SearchableSimulatorTab, - type SimulatorPaletteSearchResult -} from '@/lib/simulator-palette-search' +import { searchSimulatorTabs } from '@/lib/simulator/search/simulator-palette-search' +import type { + SearchableSimulatorTab, + SimulatorPaletteSearchResult +} from '@/lib/simulator/search/simulator-palette-search-types' import { getUnifiedTabPaletteExecutionHostId } from '@/lib/workspace/ownership/unified-tab-host-ownership' import type { TerminalAgent } from '../../../../shared/agent-status/identity/terminal-agent' import '@/lib/workspace/search/tabs/workspace-tab-search-types' diff --git a/src/renderer/src/components/tab-bar/open-tab-selection-routing.ts b/src/renderer/src/components/tab-bar/open-tab-selection-routing.ts index 8fe26586c53..ae44e084ee3 100644 --- a/src/renderer/src/components/tab-bar/open-tab-selection-routing.ts +++ b/src/renderer/src/components/tab-bar/open-tab-selection-routing.ts @@ -4,7 +4,7 @@ import { requestBrowserFocus } from '@/components/browser-pane/host-guest/browse import { translate } from '@/i18n/i18n' import { activateBrowserPagePaletteResult } from '@/lib/browser/palette/browser-page-palette-activation' import { focusTerminalTabSurface } from '@/lib/focus-terminal-tab-surface' -import { activateSimulatorTabPaletteResult } from '@/lib/simulator-tab-palette-activation' +import { activateSimulatorTabPaletteResult } from '@/lib/simulator/tabs/simulator-tab-palette-activation' import { activateWorkspaceTabPaletteResult } from '@/lib/workspace/search/tabs/workspace-tab-palette-activation' import type { OpenTabSearchResult } from './open-tab-search' diff --git a/src/renderer/src/components/tab-bar/tab-bar-item-label.ts b/src/renderer/src/components/tab-bar/tab-bar-item-label.ts index 633768e81b1..80dc4af4a92 100644 --- a/src/renderer/src/components/tab-bar/tab-bar-item-label.ts +++ b/src/renderer/src/components/tab-bar/tab-bar-item-label.ts @@ -2,7 +2,7 @@ import type { TabBarItem } from './tab-bar-item-model' import { resolveTerminalTabTitle } from '../../../../shared/tab-title-resolution' import { getEditorDisplayLabel } from '@/components/editor/editor-labels' import { getBrowserTabLabel } from './BrowserTab' -import { formatSimulatorTabLabel } from '@/lib/simulator-tab-label' +import { formatSimulatorTabLabel } from '@/lib/simulator/tabs/simulator-tab-label' import type { Translate } from '@/i18n/use-translate' export function tabItemLabel( diff --git a/src/renderer/src/components/tab-bar/tab-create-entry-absolute-file.ts b/src/renderer/src/components/tab-bar/tab-create-entry-absolute-file.ts index f5e280feca6..bd9bce67cb8 100644 --- a/src/renderer/src/components/tab-bar/tab-create-entry-absolute-file.ts +++ b/src/renderer/src/components/tab-bar/tab-create-entry-absolute-file.ts @@ -1,4 +1,4 @@ -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../shared/editor-language/editor-language-detect' import { getTabEntryCannotOpenDirectoryMessage, getTabEntryFileNotFoundMessage diff --git a/src/renderer/src/components/tab-bar/tab-create-entry-action.ts b/src/renderer/src/components/tab-bar/tab-create-entry-action.ts index a2a77fe4c5c..ac1f0b60b45 100644 --- a/src/renderer/src/components/tab-bar/tab-create-entry-action.ts +++ b/src/renderer/src/components/tab-bar/tab-create-entry-action.ts @@ -55,7 +55,7 @@ import { selectFileListWorktree } from '@/store/workspaces/selection/known-workt import { assertEditorFileOperationCurrent, captureEditorFileOperationProvenance -} from '@/lib/editor-file-operation-provenance' +} from '@/lib/editor/file-operations/editor-file-operation-provenance' export type TabCreateEntryArgs = { classification?: TabEntryActionClassification diff --git a/src/renderer/src/components/tab-bar/tab-create-entry-local-path.ts b/src/renderer/src/components/tab-bar/tab-create-entry-local-path.ts index 9c2a6be4006..3029baeb85b 100644 --- a/src/renderer/src/components/tab-bar/tab-create-entry-local-path.ts +++ b/src/renderer/src/components/tab-bar/tab-create-entry-local-path.ts @@ -1,4 +1,4 @@ -import { getEditorFileOperationContext } from '@/lib/editor-file-operation-owner' +import { getEditorFileOperationContext } from '@/lib/editor/file-operations/editor-file-operation-owner' import { getFolderWorkspaceConnectionId } from '@/lib/workspace/ownership/folder-workspace-connection' import { getLocalPathOpenOwnerForRoute, isLocalPathOpenBlocked } from '@/lib/local-path-open-guard' import { getResolvedExecutionHostIdForWorktree } from '@/lib/resolved-worktree-execution-host' diff --git a/src/renderer/src/components/tab-bar/tab-create-entry-preview.test.ts b/src/renderer/src/components/tab-bar/tab-create-entry-preview.test.ts index f1c443e2647..6ff65b3963c 100644 --- a/src/renderer/src/components/tab-bar/tab-create-entry-preview.test.ts +++ b/src/renderer/src/components/tab-bar/tab-create-entry-preview.test.ts @@ -3,7 +3,7 @@ import { openTabBarEntry } from './tab-create-entry-action' const preview = vi.hoisted(() => vi.fn()) vi.mock('@/lib/open-html-file-preview', () => ({ openHtmlFilePreview: preview })) -vi.mock('@/lib/editor-file-operation-owner', () => ({ +vi.mock('@/lib/editor/file-operations/editor-file-operation-owner', () => ({ getEditorFileOperationContext: () => { throw new Error('A preview must not require file mutation authorization') } diff --git a/src/renderer/src/components/tab-group/SplitPaneLanding.tsx b/src/renderer/src/components/tab-group/SplitPaneLanding.tsx index 9abe02a5a42..b8675b5aefe 100644 --- a/src/renderer/src/components/tab-group/SplitPaneLanding.tsx +++ b/src/renderer/src/components/tab-group/SplitPaneLanding.tsx @@ -18,8 +18,11 @@ import { } from '@/lib/client-creation-action-error' import { openNewTerminalTabInWorkspace } from '@/store/terminals/terminal-active-workspace-creation' import { getWorkspaceClientCreationActionPolicy } from '@/lib/client-creation-action-policy' -import { openMobileEmulatorTab } from '@/lib/open-mobile-emulator-tab' -import { ensureSimulatorTab, getSimulatorTabForWorktree } from '@/lib/ensure-simulator-tab' +import { openMobileEmulatorTab } from '@/lib/simulator/launch/open-mobile-emulator-tab' +import { + ensureSimulatorTab, + getSimulatorTabForWorktree +} from '@/lib/simulator/tabs/ensure-simulator-tab' import { SplitPaneLandingAgentRow } from './SplitPaneLandingAgentRow' import { LANDING_ROW_CLASS, diff --git a/src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts b/src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts index d9f5bc36ac4..577ce98f645 100644 --- a/src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts +++ b/src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts @@ -6,8 +6,11 @@ import { createWebRuntimeSessionBrowserTab } from '../../runtime/browser/creatio import { createWebRuntimeSessionTerminal } from '../../runtime/hosted-terminals/creation/web-runtime-terminal-creation' import { isWebRuntimeSessionActive } from '../../runtime/web-session-tabs-sync/identity/web-runtime-session-environment' import { openTabBarEntry, type TabCreateEntryArgs } from '../tab-bar/tab-create-entry-action' -import { openMobileEmulatorTab } from '@/lib/open-mobile-emulator-tab' -import { ensureSimulatorTab, getSimulatorTabForWorktree } from '@/lib/ensure-simulator-tab' +import { openMobileEmulatorTab } from '@/lib/simulator/launch/open-mobile-emulator-tab' +import { + ensureSimulatorTab, + getSimulatorTabForWorktree +} from '@/lib/simulator/tabs/ensure-simulator-tab' import { buildDuplicatedBrowserTabOptions } from '@/lib/duplicate-browser-tab-options' import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner' import { browserWorkspaceHasRemoteOwner } from '@/runtime/browser/ownership/remote-browser-tab-ownership' diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-browser-open.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-browser-open.ts index dafda9688b7..d6d3057d115 100644 --- a/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-browser-open.ts +++ b/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-browser-open.ts @@ -4,13 +4,16 @@ import { useAppStore } from '@/store/index' import { openPlannedFileBrowserLink, type FileBrowserLinkTarget -} from '@/lib/file-preview-link-open' +} from '@/lib/browser/documents/file-preview-link-open' import type { BrowserLinkOpenContext, BrowserOpenOutcome } from '@/lib/browser/navigation/browser-link-destination' import { activateAndRevealWorkspace } from '@/lib/workspace/activation/worktree-activation' -import { getWorkspaceFilePreviewPlan, openFileInBrowserTab } from '@/lib/file-preview' +import { + getWorkspaceFilePreviewPlan, + openFileInBrowserTab +} from '@/lib/browser/documents/file-preview' export async function openResolvedHtmlFileInBrowser( params: FileBrowserLinkTarget & { diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-editor-open.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-editor-open.ts index 0ed1f2b2501..4a92ecaa3b7 100644 --- a/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-editor-open.ts +++ b/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-editor-open.ts @@ -1,4 +1,3 @@ -import '@/lib/language-detect' import { detectLanguage } from '../../../../../../shared/editor-language/editor-language-detect' import { useAppStore } from '@/store/index' import { scheduleEditorLineReveal } from '@/store/slices/editor/focus/editor-focus-reveal' diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-link-file-open-routing.test.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-link-file-open-routing.test.ts index d7875f97c56..d63ad3d46fc 100644 --- a/src/renderer/src/components/terminal-pane/links/files/terminal-link-file-open-routing.test.ts +++ b/src/renderer/src/components/terminal-pane/links/files/terminal-link-file-open-routing.test.ts @@ -21,7 +21,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/language-detect', () => ({ +vi.mock('../../../../../../shared/editor-language/editor-language-detect', () => ({ detectLanguage: (filePath: string) => (filePath.endsWith('.md') ? 'markdown' : 'plaintext') })) diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-batching.test.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-batching.test.ts index 942e6cdbf77..907d155509d 100644 --- a/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-batching.test.ts +++ b/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-batching.test.ts @@ -21,7 +21,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/language-detect', () => ({ +vi.mock('../../../../../../shared/editor-language/editor-language-detect', () => ({ detectLanguage: (filePath: string) => (filePath.endsWith('.md') ? 'markdown' : 'plaintext') })) diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-candidate-failures.test.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-candidate-failures.test.ts index 546f5a8f6a4..757c5473086 100644 --- a/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-candidate-failures.test.ts +++ b/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-candidate-failures.test.ts @@ -19,7 +19,9 @@ import { const doubles = createTerminalLinkTestDoubles() const { storeState, fsPathExistsMock, runtimeEnvironmentCallMock, statMock } = doubles vi.mock('@/store/index', () => ({ useAppStore: { getState: () => storeState } })) -vi.mock('@/lib/language-detect', () => ({ detectLanguage: () => 'plaintext' })) +vi.mock('../../../../../../shared/editor-language/editor-language-detect', () => ({ + detectLanguage: () => 'plaintext' +})) vi.mock('@/lib/workspace/activation/worktree-activation', () => ({ activateAndRevealWorkspace: vi.fn(), activateAndRevealWorktree: vi.fn() diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-link-detection.test.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-link-detection.test.ts index ae74e67e526..cb869d54708 100644 --- a/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-link-detection.test.ts +++ b/src/renderer/src/components/terminal-pane/links/files/terminal-link-provider-link-detection.test.ts @@ -30,7 +30,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/language-detect', () => ({ +vi.mock('../../../../../../shared/editor-language/editor-language-detect', () => ({ detectLanguage: (filePath: string) => (filePath.endsWith('.md') ? 'markdown' : 'plaintext') })) diff --git a/src/renderer/src/components/terminal-pane/links/http/terminal-link-osc-url-routing.test.ts b/src/renderer/src/components/terminal-pane/links/http/terminal-link-osc-url-routing.test.ts index e3fb3c5b195..93abb6de3bf 100644 --- a/src/renderer/src/components/terminal-pane/links/http/terminal-link-osc-url-routing.test.ts +++ b/src/renderer/src/components/terminal-pane/links/http/terminal-link-osc-url-routing.test.ts @@ -17,7 +17,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/language-detect', () => ({ +vi.mock('../../../../../../shared/editor-language/editor-language-detect', () => ({ detectLanguage: (filePath: string) => (filePath.endsWith('.md') ? 'markdown' : 'plaintext') })) diff --git a/src/renderer/src/components/terminal-pane/links/terminal-link-click-fallback.test.ts b/src/renderer/src/components/terminal-pane/links/terminal-link-click-fallback.test.ts index 2c2ca6325f7..183527a4a3a 100644 --- a/src/renderer/src/components/terminal-pane/links/terminal-link-click-fallback.test.ts +++ b/src/renderer/src/components/terminal-pane/links/terminal-link-click-fallback.test.ts @@ -26,7 +26,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/language-detect', () => ({ +vi.mock('../../../../../shared/editor-language/editor-language-detect', () => ({ detectLanguage: (filePath: string) => (filePath.endsWith('.md') ? 'markdown' : 'plaintext') })) diff --git a/src/renderer/src/components/terminal-pane/links/terminal-link-open-beside-source.test.ts b/src/renderer/src/components/terminal-pane/links/terminal-link-open-beside-source.test.ts index 5c0fe053e6e..d461a089500 100644 --- a/src/renderer/src/components/terminal-pane/links/terminal-link-open-beside-source.test.ts +++ b/src/renderer/src/components/terminal-pane/links/terminal-link-open-beside-source.test.ts @@ -33,7 +33,7 @@ vi.mock('@/store/index', () => ({ vi.mock('sonner', () => ({ toast: { error: toastErrorMock } })) -vi.mock('@/lib/language-detect', () => ({ +vi.mock('../../../../../shared/editor-language/editor-language-detect', () => ({ detectLanguage: () => 'plaintext' })) diff --git a/src/renderer/src/components/use-terminal-create-actions.test.tsx b/src/renderer/src/components/use-terminal-create-actions.test.tsx index d39e3313f90..5846b8fd97b 100644 --- a/src/renderer/src/components/use-terminal-create-actions.test.tsx +++ b/src/renderer/src/components/use-terminal-create-actions.test.tsx @@ -43,7 +43,7 @@ vi.mock('@/runtime/hosted-terminals/creation/web-runtime-terminal-creation', () vi.mock('@/runtime/web-session-tabs-sync/identity/web-runtime-session-environment', () => ({ isWebRuntimeSessionActive: () => false })) -vi.mock('@/lib/open-mobile-emulator-tab', () => ({ +vi.mock('@/lib/simulator/launch/open-mobile-emulator-tab', () => ({ openMobileEmulatorTab: (...args: unknown[]) => mocks.openMobileEmulatorTab(...args) })) vi.mock('@/lib/agent-session/launch/new-tab/launch-agent-in-new-tab', () => ({ diff --git a/src/renderer/src/components/use-terminal-create-actions.ts b/src/renderer/src/components/use-terminal-create-actions.ts index c99dbd74e23..d854a2778cb 100644 --- a/src/renderer/src/components/use-terminal-create-actions.ts +++ b/src/renderer/src/components/use-terminal-create-actions.ts @@ -6,7 +6,7 @@ import { createNonSecureContextUuid as createBrowserUuid } from '../../../shared import { createWebRuntimeSessionBrowserTab } from '@/runtime/browser/creation/web-runtime-browser-creation' import { createWebRuntimeSessionTerminal } from '@/runtime/hosted-terminals/creation/web-runtime-terminal-creation' import { isWebRuntimeSessionActive } from '@/runtime/web-session-tabs-sync/identity/web-runtime-session-environment' -import { openMobileEmulatorTab } from '@/lib/open-mobile-emulator-tab' +import { openMobileEmulatorTab } from '@/lib/simulator/launch/open-mobile-emulator-tab' import { persistAgentLaunchTabOrder } from '@/lib/agent-session/launch/pane/launch-agent-tab-order' import { buildDuplicatedBrowserTabOptions } from '@/lib/duplicate-browser-tab-options' import { browserWorkspaceHasRemoteOwner } from '@/runtime/browser/ownership/remote-browser-tab-ownership' diff --git a/src/renderer/src/components/workspace-surface-projection.ts b/src/renderer/src/components/workspace-surface-projection.ts index cc53d35f8c0..ed80b49223e 100644 --- a/src/renderer/src/components/workspace-surface-projection.ts +++ b/src/renderer/src/components/workspace-surface-projection.ts @@ -1,9 +1,13 @@ -import { parseExecutionHostId, type ExecutionHostId } from '../../../shared/execution-host' +import { + getRepoExecutionHostId, + parseExecutionHostId, + type ExecutionHostId +} from '../../../shared/execution-host' import type { FolderWorkspace } from '../../../shared/folder-workspaces/folder-workspace-types' import type { Worktree } from '../../../shared/worktree/types' import { folderWorkspaceKey } from '../../../shared/workspace-scope' import '../lib/workspace/ownership/worktree-runtime-owner-index' -import { getCatalogOwnerHostId } from '../lib/workspace/ownership/workspace-catalog-owner-index' +import '../lib/workspace/ownership/workspace-catalog-owner-index' export type WorkspaceSurface = { id: string; path: string } @@ -19,7 +23,7 @@ function getStampedFolderWorkspaceHostId( const namesOwnHost = Boolean( parseExecutionHostId(workspace.executionHostId) ?? workspace.connectionId?.trim() ) - return namesOwnHost ? getCatalogOwnerHostId(workspace) : null + return namesOwnHost ? getRepoExecutionHostId(workspace) : null } /** Workbench state/keys support one surface per bare workspace ID, unlike host-qualified listing catalogs (STA-4343). Collapse only here; Git IDs encode repo/path so first-wins is lossless. */ @@ -63,7 +67,7 @@ export function projectWorkspaceSurfaces({ id, kept: surfaces[existingIndex].path, dropped: surface.path, - droppedHost: getCatalogOwnerHostId(workspace) + droppedHost: getRepoExecutionHostId(workspace) }) } } diff --git a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-open-tabs.ts b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-open-tabs.ts index b6af5e97118..0ccc8e629b6 100644 --- a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-open-tabs.ts +++ b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-open-tabs.ts @@ -4,10 +4,13 @@ import { searchBrowserPages, type SearchableBrowserPage } from '@/lib/browser/palette/browser-palette-search' -import { buildSearchableSimulatorTabs, searchSimulatorTabs } from '@/lib/simulator-palette-search' -import type { SearchableSimulatorTab } from '@/lib/simulator-palette-search-types' +import { + buildSearchableSimulatorTabs, + searchSimulatorTabs +} from '@/lib/simulator/search/simulator-palette-search' +import type { SearchableSimulatorTab } from '@/lib/simulator/search/simulator-palette-search-types' import '@/lib/workspace/search/tabs/workspace-tab-search-types' -import { buildSearchableWorkspaceTabEntries as buildSearchableWorkspaceTabs } from '@/lib/workspace/search/tabs/workspace-tab-palette-entry-builder' +import { buildSearchableWorkspaceTabEntries } from '@/lib/workspace/search/tabs/workspace-tab-palette-entry-builder' import type { SearchableWorkspaceTab } from '@/lib/workspace/search/tabs/workspace-tab-search-types' import { searchWorkspaceTabs } from '@/lib/workspace/search/tabs/workspace-tab-palette-results' import { comparePaletteRankedItems } from '@/lib/cmd-j-section-leadership' @@ -19,14 +22,8 @@ import type { WorkspaceTabPaletteItem, WorktreePaletteItem } from './worktree-jump-palette-model' -import type { WorktreeJumpPaletteFilter } from './use-worktree-jump-palette-filter' -import type { WorktreeJumpPaletteLocalState } from './use-worktree-jump-palette-local-state' -import type { WorktreeJumpPaletteStoreState } from './use-worktree-jump-palette-store-state' -import type { WorktreeJumpPaletteWorktrees } from './use-worktree-jump-palette-worktrees' -import { - encodePaletteIdentity, - type PaletteSearchContext -} from '../../../../shared/palette-match/palette-ranking' +import type { WorktreeJumpPaletteOpenTabsInput } from './worktree-jump-palette-open-tabs-input' +import { encodePaletteIdentity } from '../../../../shared/palette-match/palette-ranking' import { buildBrowserPaletteItems, buildOpenTabPaletteItems, @@ -41,13 +38,6 @@ const EMPTY_BROWSER_PAGE_ENTRIES: SearchableBrowserPage[] = [] const EMPTY_SIMULATOR_TAB_ENTRIES: SearchableSimulatorTab[] = [] const EMPTY_WORKSPACE_TAB_ENTRIES: SearchableWorkspaceTab[] = [] -type WorktreeJumpPaletteOpenTabsInput = WorktreeJumpPaletteStoreState & - WorktreeJumpPaletteWorktrees & - Pick & - Pick & { - paletteSearchContext: PaletteSearchContext - } - export function useWorktreeJumpPaletteOpenTabs({ paletteStatusInputsActive, browserSortedWorktrees, @@ -174,7 +164,7 @@ export function useWorktreeJumpPaletteOpenTabs({ if (!paletteStatusInputsActive) { return EMPTY_WORKSPACE_TAB_ENTRIES } - return buildSearchableWorkspaceTabs({ + return buildSearchableWorkspaceTabEntries({ worktrees: browserSortedWorktrees, ownershipWorktrees: workspaces, repoMap, diff --git a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-selection-actions.ts b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-selection-actions.ts index 71056cd61b4..696ecf321f2 100644 --- a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-selection-actions.ts +++ b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-selection-actions.ts @@ -4,12 +4,12 @@ import type { WorktreeJumpPaletteTaskSearch } from './use-worktree-jump-palette- import { useCallback } from 'react' import { toast } from 'sonner' import { activateBrowserPagePaletteResult } from '@/lib/browser/palette/browser-page-palette-activation' -import { activateSimulatorTabPaletteResult } from '@/lib/simulator-tab-palette-activation' +import { activateSimulatorTabPaletteResult } from '@/lib/simulator/tabs/simulator-tab-palette-activation' import { activateWorkspaceTabPaletteResult } from '@/lib/workspace/search/tabs/workspace-tab-palette-activation' import { activateAndRevealWorkspace } from '@/lib/workspace/activation/worktree-activation' import { queueWorkspaceActivationTerminalFocus } from '@/lib/workspace/activation/workspace-activation-terminal-focus' import type { BrowserPaletteSearchResult } from '@/lib/browser/palette/browser-palette-search' -import type { SimulatorPaletteSearchResult } from '@/lib/simulator-palette-search-types' +import type { SimulatorPaletteSearchResult } from '@/lib/simulator/search/simulator-palette-search-types' import type { WorkspaceTabPaletteSearchResult } from '@/lib/workspace/search/tabs/workspace-tab-palette-results' import type { CmdJActionResult, CmdJSettingsResult } from '@/components/cmd-j/palette-results' import type { CmdJProjectSearchResult } from '@/components/cmd-j/palette-project-results' diff --git a/src/renderer/src/components/worktree-jump/worktree-jump-palette-model.ts b/src/renderer/src/components/worktree-jump/worktree-jump-palette-model.ts index 2bdbb854ca4..76824aaf63d 100644 --- a/src/renderer/src/components/worktree-jump/worktree-jump-palette-model.ts +++ b/src/renderer/src/components/worktree-jump/worktree-jump-palette-model.ts @@ -1,6 +1,6 @@ import type { BrowserPaletteSearchResult } from '@/lib/browser/palette/browser-palette-search' import type { PaletteSearchResult } from '@/lib/workspace/search/worktrees/worktree-palette-search' -import type { SimulatorPaletteSearchResult } from '@/lib/simulator-palette-search-types' +import type { SimulatorPaletteSearchResult } from '@/lib/simulator/search/simulator-palette-search-types' import type { WorkspaceTabPaletteSearchResult } from '@/lib/workspace/search/tabs/workspace-tab-palette-results' import type { CmdJActionResult, diff --git a/src/renderer/src/components/worktree-jump/worktree-jump-palette-open-tab-items.ts b/src/renderer/src/components/worktree-jump/worktree-jump-palette-open-tab-items.ts index 1e963b99704..0340fee5632 100644 --- a/src/renderer/src/components/worktree-jump/worktree-jump-palette-open-tab-items.ts +++ b/src/renderer/src/components/worktree-jump/worktree-jump-palette-open-tab-items.ts @@ -1,6 +1,6 @@ import { comparePaletteRankedItems } from '@/lib/cmd-j-section-leadership' import type { BrowserPaletteSearchResult } from '@/lib/browser/palette/browser-palette-search' -import type { SimulatorPaletteSearchResult } from '@/lib/simulator-palette-search-types' +import type { SimulatorPaletteSearchResult } from '@/lib/simulator/search/simulator-palette-search-types' import type { WorkspaceTabPaletteSearchResult } from '@/lib/workspace/search/tabs/workspace-tab-palette-results' import type { BrowserPaletteItem, diff --git a/src/renderer/src/components/worktree-jump/worktree-jump-palette-open-tabs-input.ts b/src/renderer/src/components/worktree-jump/worktree-jump-palette-open-tabs-input.ts new file mode 100644 index 00000000000..de3d51c1442 --- /dev/null +++ b/src/renderer/src/components/worktree-jump/worktree-jump-palette-open-tabs-input.ts @@ -0,0 +1,12 @@ +import type { PaletteSearchContext } from '../../../../shared/palette-match/palette-ranking' +import type { WorktreeJumpPaletteFilter } from './use-worktree-jump-palette-filter' +import type { WorktreeJumpPaletteLocalState } from './use-worktree-jump-palette-local-state' +import type { WorktreeJumpPaletteStoreState } from './use-worktree-jump-palette-store-state' +import type { WorktreeJumpPaletteWorktrees } from './use-worktree-jump-palette-worktrees' + +export type WorktreeJumpPaletteOpenTabsInput = WorktreeJumpPaletteStoreState & + WorktreeJumpPaletteWorktrees & + Pick & + Pick & { + paletteSearchContext: PaletteSearchContext + } diff --git a/src/renderer/src/hooks/ipc-events-agent-status-window-test-fixtures.ts b/src/renderer/src/hooks/ipc-events-agent-status-window-test-fixtures.ts index 6acae390313..c9b188163a0 100644 --- a/src/renderer/src/hooks/ipc-events-agent-status-window-test-fixtures.ts +++ b/src/renderer/src/hooks/ipc-events-agent-status-window-test-fixtures.ts @@ -168,7 +168,7 @@ export function stubAuxiliaryModules(): void { vi.doMock('@/components/sidebar/worktree-list/listing/visible-worktrees', () => ({ getVisibleWorktreeIds: () => [] })) - vi.doMock('@/lib/editor-font-zoom', () => ({ + vi.doMock('@/lib/editor/appearance/editor-font-zoom', () => ({ nextEditorFontZoomLevel: vi.fn(() => 0), computeEditorFontSize: vi.fn(() => 13) })) diff --git a/src/renderer/src/hooks/ipc-events-close-routing-test-harness.ts b/src/renderer/src/hooks/ipc-events-close-routing-test-harness.ts index 8ee024aecf7..70aca370baa 100644 --- a/src/renderer/src/hooks/ipc-events-close-routing-test-harness.ts +++ b/src/renderer/src/hooks/ipc-events-close-routing-test-harness.ts @@ -130,7 +130,7 @@ export async function useIpcEventsForCloseRouting({ vi.doMock('@/components/sidebar/worktree-list/listing/visible-worktrees', () => ({ getVisibleWorktreeIds: () => [] })) - vi.doMock('@/lib/editor-font-zoom', () => ({ + vi.doMock('@/lib/editor/appearance/editor-font-zoom', () => ({ nextEditorFontZoomLevel: vi.fn(() => 0), computeEditorFontSize: vi.fn(() => 13) })) diff --git a/src/renderer/src/hooks/ipc-events/content-creation-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/content-creation-ipc-bridge.ts index 9b782b5c707..bbd1b6cf268 100644 --- a/src/renderer/src/hooks/ipc-events/content-creation-ipc-bridge.ts +++ b/src/renderer/src/hooks/ipc-events/content-creation-ipc-bridge.ts @@ -1,8 +1,8 @@ -import { ensureSimulatorTab } from '@/lib/ensure-simulator-tab' +import { ensureSimulatorTab } from '@/lib/simulator/tabs/ensure-simulator-tab' import { isManualSimulatorLaunchPending, rememberPrelaunchedSimulatorSession -} from '@/lib/simulator-launch-coordination' +} from '@/lib/simulator/launch/simulator-launch-coordination' import { LOCAL_EXECUTION_HOST_ID } from '../../../../shared/execution-host' export function registerContentCreationIpcBridge( diff --git a/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts index 40fe84e4a69..cee10a49f5c 100644 --- a/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts +++ b/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts @@ -1,7 +1,7 @@ import { createRuntimeFilePositionQueue } from './runtime-file-position' import { applyClosedTerminalLeafNotice } from '@/components/terminal-pane/layout/close/closed-terminal-leaf-notice' import { closeTerminalTab } from '@/components/terminal/terminal-tab-actions' -import { detectLanguage } from '@/lib/language-detect' +import { detectLanguage } from '../../../../shared/editor-language/editor-language-detect' import { followWorkspaceSleep } from '@/components/sidebar/workspace-actions/sleep/workspace-sleep-follower' import { createProjectMovePauseFollower } from '@/components/sidebar/project-move-pause-follower' import { buildWorkspaceSessionPayload } from '@/lib/workspace/persistence/workspace-session' diff --git a/src/renderer/src/hooks/ipc-events/zoom-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/zoom-ipc-bridge.ts index ed3b021c693..f8335eede68 100644 --- a/src/renderer/src/hooks/ipc-events/zoom-ipc-bridge.ts +++ b/src/renderer/src/hooks/ipc-events/zoom-ipc-bridge.ts @@ -1,7 +1,10 @@ import { writeNativeChatFontSize } from '@/components/native-chat/appearance/native-chat-font-size-write' import { applyUIZoom } from '@/lib/ui-zoom' -import { computeEditorFontSize, nextEditorFontZoomLevel } from '@/lib/editor-font-zoom' -import { resolveEditorBaseFontSize } from '@/lib/editor-typography' +import { + computeEditorFontSize, + nextEditorFontZoomLevel +} from '@/lib/editor/appearance/editor-font-zoom' +import { resolveEditorBaseFontSize } from '@/lib/editor/appearance/editor-typography' import { zoomLevelToPercent, stepUIZoomLevel } from '../../../../shared/ui-zoom-level' import { dispatchZoomLevelChanged } from '@/lib/zoom-events' diff --git a/src/renderer/src/hooks/use-editor-typography.ts b/src/renderer/src/hooks/use-editor-typography.ts index cdf79b40f3c..d77eb7dc645 100644 --- a/src/renderer/src/hooks/use-editor-typography.ts +++ b/src/renderer/src/hooks/use-editor-typography.ts @@ -5,7 +5,7 @@ import { resolveEditorTypography, type EditorTypography, type EditorTypographySurface -} from '@/lib/editor-typography' +} from '@/lib/editor/appearance/editor-typography' type ResolvedEditorTypography = { settings: AppState['settings'] diff --git a/src/renderer/src/hooks/useEditorExternalWatch-targets.test.ts b/src/renderer/src/hooks/useEditorExternalWatch-targets.test.ts index a6f4a9f1174..f80793ca2e9 100644 --- a/src/renderer/src/hooks/useEditorExternalWatch-targets.test.ts +++ b/src/renderer/src/hooks/useEditorExternalWatch-targets.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest' import { captureWorktreeOperationGenerationSnapshot } from '@/lib/workspace/ownership/worktree-operation-generation' -import type { EditorFileOperationProvenance } from '@/lib/editor-file-operation-provenance' +import type { EditorFileOperationProvenance } from '@/lib/editor/file-operations/editor-file-operation-provenance' import { selectEditorExternalWatchTargets as getEditorExternalWatchTargets, type EditorExternalWatchTargetState diff --git a/src/renderer/src/hooks/useIpcEvents-rate-limit-hydration.test.ts b/src/renderer/src/hooks/useIpcEvents-rate-limit-hydration.test.ts index 643046405df..662222ea2d4 100644 --- a/src/renderer/src/hooks/useIpcEvents-rate-limit-hydration.test.ts +++ b/src/renderer/src/hooks/useIpcEvents-rate-limit-hydration.test.ts @@ -106,7 +106,7 @@ describe('useIpcEvents rate-limit hydration', () => { vi.doMock('@/components/sidebar/worktree-list/listing/visible-worktrees', () => ({ getVisibleWorktreeIds: () => [] })) - vi.doMock('@/lib/editor-font-zoom', () => ({ + vi.doMock('@/lib/editor/appearance/editor-font-zoom', () => ({ nextEditorFontZoomLevel: vi.fn(() => 0), computeEditorFontSize: vi.fn(() => 13) })) diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-surface.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-surface.ts index 8f34b45c955..064325213ac 100644 --- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-surface.ts +++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-surface.ts @@ -2,11 +2,11 @@ import { findIndexedProjectGroupOwner, findIndexedWorktreeOwner } from '../../workspace/ownership/worktree-runtime-owner-index' -import { getCatalogOwnerHostId } from '../../workspace/ownership/workspace-catalog-owner-index' +import '../../workspace/ownership/workspace-catalog-owner-index' import { findIndexedRepoOwner } from '../../workspace/ownership/repo-owner-index' import { folderWorkspaceToWorktree } from '../../../../../shared/folder-workspaces/folder-workspace-worktree' import type { Tab } from '../../../../../shared/tab-types' -import type { ExecutionHostId } from '../../../../../shared/execution-host' +import { getRepoExecutionHostId, type ExecutionHostId } from '../../../../../shared/execution-host' import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent' import { defaultAgentChatLabel } from '../../../../../shared/agent-session/agent-session-chat-label' import { structuredAgentSessionTabId } from '../../../../../shared/agent-session/view/structured-agent-session-projection' @@ -257,7 +257,7 @@ export function restoreStructuredLaunchSurfaces(): void { ...selectFolderWorkspaces(state).flatMap((workspace) => { const group = findIndexedProjectGroupOwner(state.projectGroups, workspace.projectGroupId) const host = workspace.executionHostId || workspace.connectionId ? workspace : group - const owned = host && { ...workspace, executionHostId: getCatalogOwnerHostId(host) } + const owned = host && { ...workspace, executionHostId: getRepoExecutionHostId(host) } return owned ? [folderWorkspaceToWorktree(owned)] : [] }) ] @@ -275,7 +275,7 @@ export function restoreStructuredLaunchSurfaces(): void { continue } const repo = findIndexedRepoOwner(state.repos, workspace.repoId) - const host = workspace.hostId ?? (repo ? getCatalogOwnerHostId(repo) : undefined) + const host = workspace.hostId ?? (repo ? getRepoExecutionHostId(repo) : undefined) if (host !== getStructuredAgentSessionLaunchOwner(record.sessionId)) { continue } diff --git a/src/renderer/src/lib/doc-preview-grants.test.ts b/src/renderer/src/lib/browser/documents/doc-preview-grants.test.ts similarity index 100% rename from src/renderer/src/lib/doc-preview-grants.test.ts rename to src/renderer/src/lib/browser/documents/doc-preview-grants.test.ts diff --git a/src/renderer/src/lib/doc-preview-grants.ts b/src/renderer/src/lib/browser/documents/doc-preview-grants.ts similarity index 97% rename from src/renderer/src/lib/doc-preview-grants.ts rename to src/renderer/src/lib/browser/documents/doc-preview-grants.ts index 34a8599c56d..e20899afd22 100644 --- a/src/renderer/src/lib/doc-preview-grants.ts +++ b/src/renderer/src/lib/browser/documents/doc-preview-grants.ts @@ -1,4 +1,4 @@ -import type { DocPreviewGrantRequest } from '../../../preload/api/doc-preview-api' +import type { DocPreviewGrantRequest } from '../../../../../preload/api/doc-preview-api' import { basename, dirname, getRelativePathInsideRoot } from '@/lib/path' import { getConnectionIdForFileFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner' diff --git a/src/renderer/src/lib/doc-preview-web-client.ts b/src/renderer/src/lib/browser/documents/doc-preview-web-client.ts similarity index 88% rename from src/renderer/src/lib/doc-preview-web-client.ts rename to src/renderer/src/lib/browser/documents/doc-preview-web-client.ts index 9fc50e02db4..0e31683f439 100644 --- a/src/renderer/src/lib/doc-preview-web-client.ts +++ b/src/renderer/src/lib/browser/documents/doc-preview-web-client.ts @@ -1,5 +1,5 @@ import { translate } from '@/i18n/i18n' -import { isPairedWebClientWindow } from './desktop-window-chrome' +import { isPairedWebClientWindow } from '../../desktop-window-chrome' /** The document preview is a desktop webview; a paired web client has no window to host it in. */ export function webClientDocPreviewRefusal(): { diff --git a/src/renderer/src/lib/file-preview-link-open.test.ts b/src/renderer/src/lib/browser/documents/file-preview-link-open.test.ts similarity index 97% rename from src/renderer/src/lib/file-preview-link-open.test.ts rename to src/renderer/src/lib/browser/documents/file-preview-link-open.test.ts index 465ce6f6637..ce90e028e61 100644 --- a/src/renderer/src/lib/file-preview-link-open.test.ts +++ b/src/renderer/src/lib/browser/documents/file-preview-link-open.test.ts @@ -8,15 +8,15 @@ import { createBrowserLinkTestStore, WORKSPACE, type BrowserLinkTestStore -} from './browser/navigation/browser-link-open.test-fixture' +} from '../navigation/browser-link-open.test-fixture' import { openFileInBrowserTab } from './file-preview' -import { captureLinkOpenIntent } from './link-open-intent' +import { captureLinkOpenIntent } from '../../link-open-intent' import { buildDocPreviewGrantRequest, ensureDocPreviewGrant, releaseDocPreviewGrant } from './doc-preview-grants' -import type { BrowserOpenOutcome } from './browser/navigation/browser-link-destination' +import type { BrowserOpenOutcome } from '../navigation/browser-link-destination' import { openResolvedHtmlFileInBrowser } from '@/components/terminal-pane/links/files/terminal-file-link-browser-open' import { detectedListingFixture, @@ -25,7 +25,7 @@ import { import { openPlannedFileBrowserLink } from './file-preview-link-open' const mocks = vi.hoisted(() => ({ getState: vi.fn(), mint: vi.fn(), revoke: vi.fn() })) -vi.mock('@/store', () => ({ useAppStore: { getState: () => mocks.getState() } })) +vi.mock('@/store/index', () => ({ useAppStore: { getState: () => mocks.getState() } })) vi.mock('@/components/browser-pane/host-guest/browser-focus', async (importOriginal) => ({ ...(await importOriginal()), requestBrowserFocus: vi.fn() diff --git a/src/renderer/src/lib/file-preview-link-open.ts b/src/renderer/src/lib/browser/documents/file-preview-link-open.ts similarity index 79% rename from src/renderer/src/lib/file-preview-link-open.ts rename to src/renderer/src/lib/browser/documents/file-preview-link-open.ts index 1cbed3ee4fc..48891689534 100644 --- a/src/renderer/src/lib/file-preview-link-open.ts +++ b/src/renderer/src/lib/browser/documents/file-preview-link-open.ts @@ -1,20 +1,20 @@ -import { resolveBrowserLinkSession } from './browser/navigation/browser-link-session' -import { activateAndRevealWorkspace } from './workspace/activation/worktree-activation' +import { resolveBrowserLinkSession } from '../navigation/browser-link-session' +import { activateAndRevealWorkspace } from '../../workspace/activation/worktree-activation' import type { AppState } from '@/store/types' -import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../shared/execution-host' -import '../../../shared/constants' -import { ORCA_BROWSER_BLANK_URL } from '../../../shared/browser/browser-blank-page' +import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../../../shared/execution-host' +import '../../../../../shared/constants' +import { ORCA_BROWSER_BLANK_URL } from '../../../../../shared/browser/browser-blank-page' import type { WorkspaceFilePreviewPlan } from './file-preview' import type { BrowserLinkOpenContext, BrowserOpenOutcome -} from './browser/navigation/browser-link-destination' -import { openLocalBrowserLink } from './browser/navigation/browser-link-open' -import { getResolvedExecutionHostIdForWorktree } from './resolved-worktree-execution-host' -import { createBrowserLinkHostMatcher } from './browser/navigation/browser-link-owner' -import { resolveWorktreeOperationRoute } from './workspace/ownership/worktree-operation-route' +} from '../navigation/browser-link-destination' +import { openLocalBrowserLink } from '../navigation/browser-link-open' +import { getResolvedExecutionHostIdForWorktree } from '../../resolved-worktree-execution-host' +import { createBrowserLinkHostMatcher } from '../navigation/browser-link-owner' +import { resolveWorktreeOperationRoute } from '../../workspace/ownership/worktree-operation-route' import { selectDetectedWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields' -import { hasIndexedDetectedWorktree } from './workspace/ownership/worktree-runtime-owner-index' +import { hasIndexedDetectedWorktree } from '../../workspace/ownership/worktree-runtime-owner-index' export type FileBrowserLinkTarget = { filePath: string diff --git a/src/renderer/src/lib/file-preview-page-conversion.ts b/src/renderer/src/lib/browser/documents/file-preview-page-conversion.ts similarity index 90% rename from src/renderer/src/lib/file-preview-page-conversion.ts rename to src/renderer/src/lib/browser/documents/file-preview-page-conversion.ts index 01e58b7a78b..4967bad86b4 100644 --- a/src/renderer/src/lib/file-preview-page-conversion.ts +++ b/src/renderer/src/lib/browser/documents/file-preview-page-conversion.ts @@ -1,14 +1,14 @@ import { toast } from 'sonner' -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import type { AppState } from '@/store/types' -import { activateBrowserWorkspaceTab } from './browser/workspace/browser-workspace-tab-activation' -import { selectWorkspaceSurface } from './workspace/activation/workspace-surface-reveal' +import { activateBrowserWorkspaceTab } from '../workspace/browser-workspace-tab-activation' +import { selectWorkspaceSurface } from '../../workspace/activation/workspace-surface-reveal' import { webClientDocPreviewRefusal } from './doc-preview-web-client' import { openFileInBrowserTab } from './file-preview' import { findPage } from '@/store/slices/browser/pages/browser-page-records' import type { BrowserPageConversionLeg } from '@/store/slices/browser/pages/browser-page-conversion' -import type { BrowserPageDocLocation } from '../../../shared/browser-workspace-types' -import { browserPageDocLocationsEqual } from '../../../shared/browser-page-doc-location' +import type { BrowserPageDocLocation } from '../../../../../shared/browser-workspace-types' +import { browserPageDocLocationsEqual } from '../../../../../shared/browser-page-doc-location' /** The tab a document is already open in, found by every PAGE's docLocation and not just the * workspace mirror — a mixed workspace whose doc page is inactive mirrors null. */ diff --git a/src/renderer/src/lib/file-preview.ts b/src/renderer/src/lib/browser/documents/file-preview.ts similarity index 94% rename from src/renderer/src/lib/file-preview.ts rename to src/renderer/src/lib/browser/documents/file-preview.ts index 26aae6e2c31..a4670d5ae36 100644 --- a/src/renderer/src/lib/file-preview.ts +++ b/src/renderer/src/lib/browser/documents/file-preview.ts @@ -1,13 +1,13 @@ -import { browserPageDocLocationsEqual } from '../../../shared/browser-page-doc-location' +import { browserPageDocLocationsEqual } from '../../../../../shared/browser-page-doc-location' import { openPlannedFileBrowserLink, type FileBrowserLinkTarget } from './file-preview-link-open' import type { BrowserLinkOpenContext, BrowserOpenOutcome -} from './browser/navigation/browser-link-destination' +} from '../navigation/browser-link-destination' import { toast } from 'sonner' import { absolutePathToFileUri } from '@/components/editor/markdown/link-routing/markdown-internal-links' import { getWorkspaceClientCreationActionPolicy } from '@/lib/client-creation-action-policy' -import { webClientDocPreviewRefusal } from '@/lib/doc-preview-web-client' +import { webClientDocPreviewRefusal } from '@/lib/browser/documents/doc-preview-web-client' import { useCallback } from 'react' import { useShallow } from 'zustand/react/shallow' import { basename } from '@/lib/path' @@ -19,20 +19,18 @@ import { REMOTE_FILE_BROWSER_UNSUPPORTED_MESSAGE, TWIN_FILE_BROWSER_UNSUPPORTED_MESSAGE } from '@/lib/workspace-file-browser-open-target' -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import type { AppState } from '@/store/types' -import { findSiblingGroupId } from '../../../shared/workspace-layout/tab-group-layout-tree' +import { findSiblingGroupId } from '../../../../../shared/workspace-layout/tab-group-layout-tree' import type { CreateBrowserTabOptions } from '@/store/slices/browser/browser-slice-contract' -import '../../../shared/constants' -import { ORCA_BROWSER_BLANK_URL } from '../../../shared/browser/browser-blank-page' +import '../../../../../shared/constants' +import { ORCA_BROWSER_BLANK_URL } from '../../../../../shared/browser/browser-blank-page' import { selectFolderWorkspaces, selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields' import { findWorkspaceShowingDoc } from './file-preview-page-conversion' -export { convertBrowserPageToWorkspaceDoc } from './file-preview-page-conversion' - export type PreviewableLanguage = 'html' function getLocalFilePreviewPlan( diff --git a/src/renderer/src/lib/browser/history/browser-page-conversion-history.ts b/src/renderer/src/lib/browser/history/browser-page-conversion-history.ts index 159562154cb..463b71963ad 100644 --- a/src/renderer/src/lib/browser/history/browser-page-conversion-history.ts +++ b/src/renderer/src/lib/browser/history/browser-page-conversion-history.ts @@ -1,7 +1,7 @@ import type { BrowserPageConversionOrigin } from '../../../../../shared/browser-workspace-types' import type { BrowserPageConversionLeg } from '@/store/slices/browser/pages/browser-page-conversion' -import '@/lib/file-preview' -import { convertBrowserPageToWorkspaceDoc } from '@/lib/file-preview-page-conversion' +import '@/lib/browser/documents/file-preview' +import { convertBrowserPageToWorkspaceDoc } from '@/lib/browser/documents/file-preview-page-conversion' import { useAppStore } from '@/store/index' function crossBrowserPageConversion( diff --git a/src/renderer/src/lib/browser/navigation/browser-link-open-layout-owner.test.ts b/src/renderer/src/lib/browser/navigation/browser-link-open-layout-owner.test.ts index 81d7e2e6c80..0475aaaff8a 100644 --- a/src/renderer/src/lib/browser/navigation/browser-link-open-layout-owner.test.ts +++ b/src/renderer/src/lib/browser/navigation/browser-link-open-layout-owner.test.ts @@ -18,7 +18,7 @@ import { import { captureLinkOpenIntent } from '../../link-open-intent' import { beginLinkOpenRequest } from '../../link-open-request' import { openWorkspaceBrowserTabForLink } from '../workspace/workspace-browser-tab-open' -import { openFileInBrowserTab } from '../../file-preview' +import { openFileInBrowserTab } from '../documents/file-preview' import { openEditorHtmlPreview } from '@/components/editor/open-editor-html-preview' import type { BrowserOpenOutcome } from './browser-link-destination' diff --git a/src/renderer/src/lib/code-editor-theme.test.ts b/src/renderer/src/lib/editor/appearance/code-editor-theme.test.ts similarity index 94% rename from src/renderer/src/lib/code-editor-theme.test.ts rename to src/renderer/src/lib/editor/appearance/code-editor-theme.test.ts index 219d155d722..bdc59acdf5c 100644 --- a/src/renderer/src/lib/code-editor-theme.test.ts +++ b/src/renderer/src/lib/editor/appearance/code-editor-theme.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from 'vitest' -import type { PluginThemeRegistration } from '../../../shared/plugins/artifacts/plugin-theme-artifact' +import type { PluginThemeRegistration } from '../../../../../shared/plugins/artifacts/plugin-theme-artifact' import { resolveCodeEditorTheme } from './code-editor-theme' -import type { ColorProbe } from './plugin-theme-tokens' +import type { ColorProbe } from '../../plugin-theme-tokens' // Parses #rrggbb, which is all these tests feed it. const probe: ColorProbe = (value) => { diff --git a/src/renderer/src/lib/code-editor-theme.ts b/src/renderer/src/lib/editor/appearance/code-editor-theme.ts similarity index 92% rename from src/renderer/src/lib/code-editor-theme.ts rename to src/renderer/src/lib/editor/appearance/code-editor-theme.ts index 3eee157f1d4..1375059f101 100644 --- a/src/renderer/src/lib/code-editor-theme.ts +++ b/src/renderer/src/lib/editor/appearance/code-editor-theme.ts @@ -1,9 +1,9 @@ -import type { CodeEditorThemeChoice } from '../../../shared/plugin-appearance-settings-types' -import type { PluginThemeRegistration } from '../../../shared/plugins/artifacts/plugin-theme-artifact' -import { pluginAppThemeCssFallback } from '../../../shared/plugins/artifacts/plugin-theme-css-fallbacks' -import { derivePluginMonacoTheme, type PluginMonacoTheme } from './plugin-monaco-theme' -import type { AppThemePaint } from './document-theme' -import { safePluginThemeTokens, type ColorProbe } from './plugin-theme-tokens' +import type { CodeEditorThemeChoice } from '../../../../../shared/plugin-appearance-settings-types' +import type { PluginThemeRegistration } from '../../../../../shared/plugins/artifacts/plugin-theme-artifact' +import { pluginAppThemeCssFallback } from '../../../../../shared/plugins/artifacts/plugin-theme-css-fallbacks' +import { derivePluginMonacoTheme, type PluginMonacoTheme } from '../../plugin-monaco-theme' +import type { AppThemePaint } from '../../document-theme' +import { safePluginThemeTokens, type ColorProbe } from '../../plugin-theme-tokens' type ThemeBase = 'light' | 'dark' diff --git a/src/renderer/src/lib/code-font-smoothing.ts b/src/renderer/src/lib/editor/appearance/code-font-smoothing.ts similarity index 89% rename from src/renderer/src/lib/code-font-smoothing.ts rename to src/renderer/src/lib/editor/appearance/code-font-smoothing.ts index 7b077444c23..6b605796068 100644 --- a/src/renderer/src/lib/code-font-smoothing.ts +++ b/src/renderer/src/lib/editor/appearance/code-font-smoothing.ts @@ -1,4 +1,4 @@ -import type { EditorTypographySettings } from '../../../shared/editor-typography-settings-types' +import type { EditorTypographySettings } from '../../../../../shared/editor-typography-settings-types' import { isMacUserAgent } from '@/lib/user-agent-platform' export type CodeFontSmoothing = NonNullable diff --git a/src/renderer/src/lib/editor-font-zoom.ts b/src/renderer/src/lib/editor/appearance/editor-font-zoom.ts similarity index 100% rename from src/renderer/src/lib/editor-font-zoom.ts rename to src/renderer/src/lib/editor/appearance/editor-font-zoom.ts diff --git a/src/renderer/src/lib/editor-typography.ts b/src/renderer/src/lib/editor/appearance/editor-typography.ts similarity index 92% rename from src/renderer/src/lib/editor-typography.ts rename to src/renderer/src/lib/editor/appearance/editor-typography.ts index 99318fe9c0e..8b668688703 100644 --- a/src/renderer/src/lib/editor-typography.ts +++ b/src/renderer/src/lib/editor/appearance/editor-typography.ts @@ -1,10 +1,13 @@ import type { CSSProperties } from 'react' import type { editor } from 'monaco-editor' -import type { EditorTypographySettings } from '../../../shared/editor-typography-settings-types' -import type { GlobalSettings } from '../../../shared/global-settings-types' -import { normalizeFontWeight } from '../../../shared/terminal/appearance/terminal-fonts' -import { resolveTerminalLigaturesEnabled } from '../../../shared/terminal/appearance/terminal-ligatures' -import { computeDiffEditorFontSize, computeEditorFontSize } from '@/lib/editor-font-zoom' +import type { EditorTypographySettings } from '../../../../../shared/editor-typography-settings-types' +import type { GlobalSettings } from '../../../../../shared/global-settings-types' +import { normalizeFontWeight } from '../../../../../shared/terminal/appearance/terminal-fonts' +import { resolveTerminalLigaturesEnabled } from '../../../../../shared/terminal/appearance/terminal-ligatures' +import { + computeDiffEditorFontSize, + computeEditorFontSize +} from '@/lib/editor/appearance/editor-font-zoom' import { buildFontFamily } from '@/lib/monospace-font-family' export const EDITOR_FONT_SIZE_MIN = 10 diff --git a/src/renderer/src/lib/markdown-code-font.ts b/src/renderer/src/lib/editor/appearance/markdown-code-font.ts similarity index 86% rename from src/renderer/src/lib/markdown-code-font.ts rename to src/renderer/src/lib/editor/appearance/markdown-code-font.ts index 6669d38becd..fe1e30f3ff8 100644 --- a/src/renderer/src/lib/markdown-code-font.ts +++ b/src/renderer/src/lib/editor/appearance/markdown-code-font.ts @@ -1,4 +1,4 @@ -import { resolveEditorFontStack } from '@/lib/editor-typography' +import { resolveEditorFontStack } from '@/lib/editor/appearance/editor-typography' /** * Markdown code follows only an explicitly chosen editor font, so an unset one keeps diff --git a/src/renderer/src/lib/create-untitled-markdown.ts b/src/renderer/src/lib/editor/file-operations/create-untitled-markdown.ts similarity index 91% rename from src/renderer/src/lib/create-untitled-markdown.ts rename to src/renderer/src/lib/editor/file-operations/create-untitled-markdown.ts index 7e9dc4f2cc0..29f6df3c613 100644 --- a/src/renderer/src/lib/create-untitled-markdown.ts +++ b/src/renderer/src/lib/editor/file-operations/create-untitled-markdown.ts @@ -1,22 +1,22 @@ -import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' +import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target' import { createRuntimePath, deleteRuntimePath, writeRuntimeFile -} from '../runtime/files/mutations/runtime-file-mutation-client' -import { runtimePathExists } from '../runtime/files/metadata/runtime-file-metadata-client' -import { detectLanguage } from '../../../shared/editor-language/editor-language-detect' +} from '../../../runtime/files/mutations/runtime-file-mutation-client' +import { runtimePathExists } from '../../../runtime/files/metadata/runtime-file-metadata-client' +import { detectLanguage } from '../../../../../shared/editor-language/editor-language-detect' import { applyMarkdownTemplatePlaceholders, getMarkdownTemplateTitleForFileName, listMarkdownDocumentTemplates, readMarkdownDocumentTemplateContent, type MarkdownDocumentTemplate -} from './markdown-document-templates' -import { requestMarkdownTemplateSelection } from './markdown-template-picker-request' -import { basename, joinPath } from './path' +} from '../markdown/documents/markdown-document-templates' +import { requestMarkdownTemplateSelection } from '../markdown/documents/markdown-template-picker-request' +import { basename, joinPath } from '../../path' import type { EditorFileOperationProvenance } from './editor-file-operation-provenance' -import { getDiskBaselineSignature } from '../../../shared/file-write/disk-baseline-signature' +import { getDiskBaselineSignature } from '../../../../../shared/file-write/disk-baseline-signature' export type UntitledMarkdownFileInfo = { filePath: string diff --git a/src/renderer/src/lib/editor-file-child-owner.ts b/src/renderer/src/lib/editor/file-operations/editor-file-child-owner.ts similarity index 87% rename from src/renderer/src/lib/editor-file-child-owner.ts rename to src/renderer/src/lib/editor/file-operations/editor-file-child-owner.ts index 1a8a87867d4..41b336b7d19 100644 --- a/src/renderer/src/lib/editor-file-child-owner.ts +++ b/src/renderer/src/lib/editor/file-operations/editor-file-child-owner.ts @@ -1,13 +1,13 @@ import type { AppState } from '@/store/types' -import type { Repo } from '../../../shared/repo-types' -import type { HostAuthority } from '../../../shared/host-authority' +import type { Repo } from '../../../../../shared/repo-types' +import type { HostAuthority } from '../../../../../shared/host-authority' import { getRepoExecutionHostId, getRepoSshConnectionId, parseExecutionHostId -} from '../../../shared/execution-host' -import { getFolderFileConnectionOwnerFromState } from './workspace/ownership/connection-owner-resolution' -import { parseWorkspaceKey } from '../../../shared/workspace-scope' +} from '../../../../../shared/execution-host' +import { getFolderFileConnectionOwnerFromState } from '../../workspace/ownership/connection-owner-resolution' +import { parseWorkspaceKey } from '../../../../../shared/workspace-scope' import { assertEditorFileOperationCurrent, getExpectedSshConnectionGeneration, @@ -17,8 +17,8 @@ import { import { assertWorktreeOperationGenerationSnapshotCurrent, captureWorktreeOperationGenerationSnapshot -} from './workspace/ownership/worktree-operation-generation' -import type { WorktreeOperationRoute } from './workspace/ownership/worktree-operation-route' +} from '../../workspace/ownership/worktree-operation-generation' +import type { WorktreeOperationRoute } from '../../workspace/ownership/worktree-operation-route' import { resolveContinuedRuntimeEnvironmentRevision } from '@/runtime/rpc/environment-revisions/runtime-environment-revision' /** A tab retains its owner; a new operation uses that paired host's current session. */ diff --git a/src/renderer/src/lib/editor-file-operation-owner-interpretation.spec.ts b/src/renderer/src/lib/editor/file-operations/editor-file-operation-owner-interpretation.spec.ts similarity index 97% rename from src/renderer/src/lib/editor-file-operation-owner-interpretation.spec.ts rename to src/renderer/src/lib/editor/file-operations/editor-file-operation-owner-interpretation.spec.ts index 82820016807..eae8a22adef 100644 --- a/src/renderer/src/lib/editor-file-operation-owner-interpretation.spec.ts +++ b/src/renderer/src/lib/editor/file-operations/editor-file-operation-owner-interpretation.spec.ts @@ -1,15 +1,16 @@ import { describe, expect, it, vi } from 'vitest' -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import { resolveEditorModelOwner } from '@/components/editor/model-lifetime/identity/editor-model-owner' -import { folderWorkspaceKey } from '../../../shared/workspace-scope' +import { folderWorkspaceKey } from '../../../../../shared/workspace-scope' import { makeDetectedResult } from '@/store/slices/worktrees/listing/worktrees-detected-listing-fixtures' import { makeFolderWorkspace } from '@/components/sidebar/workspace-creation/folder/folder-workspace-composer-submit-fixtures' import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' import { TEST_REPO } from '@/store/repos/repo.test-fixture' +import './editor-file-operation-owner' import { assertEditorFileOperationCurrent, captureEditorFileOperationProvenance -} from './editor-file-operation-owner' +} from './editor-file-operation-provenance' const worktreeId = 'repo::/remote/repo' diff --git a/src/renderer/src/lib/editor-file-operation-owner.test.ts b/src/renderer/src/lib/editor/file-operations/editor-file-operation-owner.test.ts similarity index 97% rename from src/renderer/src/lib/editor-file-operation-owner.test.ts rename to src/renderer/src/lib/editor/file-operations/editor-file-operation-owner.test.ts index 37cfe7142c7..7d9dcea8c5a 100644 --- a/src/renderer/src/lib/editor-file-operation-owner.test.ts +++ b/src/renderer/src/lib/editor/file-operations/editor-file-operation-owner.test.ts @@ -6,14 +6,14 @@ import { // @vitest-environment happy-dom import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import { assertEditorFileOperationCurrent, captureEditorFileOperationProvenance } from './editor-file-operation-provenance' import { getEditorFileOperationContext } from './editor-file-operation-owner' -vi.mock('../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true })) +vi.mock('../../../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true })) const worktreeId = 'repo::/remote/repo' diff --git a/src/renderer/src/lib/editor-file-operation-owner.ts b/src/renderer/src/lib/editor/file-operations/editor-file-operation-owner.ts similarity index 91% rename from src/renderer/src/lib/editor-file-operation-owner.ts rename to src/renderer/src/lib/editor/file-operations/editor-file-operation-owner.ts index 3c6f1c2299b..6d7cf5a710f 100644 --- a/src/renderer/src/lib/editor-file-operation-owner.ts +++ b/src/renderer/src/lib/editor/file-operations/editor-file-operation-owner.ts @@ -4,31 +4,23 @@ import { OWNER_CHANGED_MESSAGE, type EditorFileOperationProvenance } from './editor-file-operation-provenance' -export { - captureEditorFileOperationProvenance, - assertEditorFileOperationCurrent, - resolveEditorOwnerRoute, - type EditorFileOperationProvenance -} from './editor-file-operation-provenance' -import { parseExecutionHostId, toSshExecutionHostId } from '../../../shared/execution-host' -import { parseWorkspaceKey } from '../../../shared/workspace-scope' + +import { parseExecutionHostId, toSshExecutionHostId } from '../../../../../shared/execution-host' +import { parseWorkspaceKey } from '../../../../../shared/workspace-scope' import type { AppState } from '@/store/types' import type { OpenFile } from '@/store/slices/editor/types/open-file' import { runtimeTargetForOwnerEnvironment } from '@/runtime/rpc/targets/runtime-client-target' -import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' -import { resolveWorkspaceDirectory } from './workspace-directory' -import { getFileConnectionOwnerFromState } from './workspace/ownership/connection-owner-resolution' -import { captureWorktreeOperationGenerationSnapshot } from './workspace/ownership/worktree-operation-generation' +import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target' +import { resolveWorkspaceDirectory } from '../../workspace-directory' +import { getFileConnectionOwnerFromState } from '../../workspace/ownership/connection-owner-resolution' +import { captureWorktreeOperationGenerationSnapshot } from '../../workspace/ownership/worktree-operation-generation' import { editorFileChildRoute, editorFileChildAuthority, assertEditorFileOwnerCurrent, captureEditorFileOperationForOwner } from './editor-file-child-owner' -export { - assertEditorFileOwnerCurrent, - captureEditorFileOperationForOwner -} from './editor-file-child-owner' + import { selectDetectedWorktreesByRepo, selectFolderWorkspaces, diff --git a/src/renderer/src/lib/editor-file-operation-provenance.ts b/src/renderer/src/lib/editor/file-operations/editor-file-operation-provenance.ts similarity index 93% rename from src/renderer/src/lib/editor-file-operation-provenance.ts rename to src/renderer/src/lib/editor/file-operations/editor-file-operation-provenance.ts index 8db6495ba26..a9ef6e018ad 100644 --- a/src/renderer/src/lib/editor-file-operation-provenance.ts +++ b/src/renderer/src/lib/editor/file-operations/editor-file-operation-provenance.ts @@ -1,16 +1,16 @@ -import { parseExecutionHostId, type ExecutionHostId } from '../../../shared/execution-host' -import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants' -import { parseWorkspaceKey } from '../../../shared/workspace-scope' +import { parseExecutionHostId, type ExecutionHostId } from '../../../../../shared/execution-host' +import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../shared/constants' +import { parseWorkspaceKey } from '../../../../../shared/workspace-scope' import type { AppState } from '@/store/types' -import type { HostAuthority } from '../../../shared/host-authority' -import { findFolderWorkspaceOwner } from './workspace/ownership/folder-workspace-runtime-owner' -import { resolveOwner } from './workspace/ownership/resolve-owner' -import { captureDirectSshMutationExpectation } from './ssh-mutation-expectation' +import type { HostAuthority } from '../../../../../shared/host-authority' +import { findFolderWorkspaceOwner } from '../../workspace/ownership/folder-workspace-runtime-owner' +import { resolveOwner } from '../../workspace/ownership/resolve-owner' +import { captureDirectSshMutationExpectation } from '../../ssh-mutation-expectation' import { assertWorktreeOperationGenerationSnapshotCurrent, captureWorktreeOperationGenerationSnapshot, type WorktreeOperationGenerationSnapshot -} from './workspace/ownership/worktree-operation-generation' +} from '../../workspace/ownership/worktree-operation-generation' import { getFloatingWorkspaceOperationRoute, resolveWorktreeOperationRoute, @@ -18,8 +18,8 @@ import { type WorktreeOperationRoute, type WorktreeOperationRouteResolution, type WorktreeOperationRouteState -} from './workspace/ownership/worktree-operation-route' -import { resolveExplicitWorktreeOperationRouteResult } from './workspace/ownership/worktree-operation-catalog-route' +} from '../../workspace/ownership/worktree-operation-route' +import { resolveExplicitWorktreeOperationRouteResult } from '../../workspace/ownership/worktree-operation-catalog-route' import { resolveQualifiedIndexedFolderWorkspace } from '@/store/folder-workspaces/folder-workspace-record-index' import { selectFolderWorkspaces, diff --git a/src/renderer/src/lib/execute-open-editor-path-move.test.ts b/src/renderer/src/lib/editor/file-operations/execute-open-editor-path-move.test.ts similarity index 97% rename from src/renderer/src/lib/execute-open-editor-path-move.test.ts rename to src/renderer/src/lib/editor/file-operations/execute-open-editor-path-move.test.ts index 81b59443a45..5e609c454c3 100644 --- a/src/renderer/src/lib/execute-open-editor-path-move.test.ts +++ b/src/renderer/src/lib/editor/file-operations/execute-open-editor-path-move.test.ts @@ -24,10 +24,10 @@ vi.mock('@/components/editor/autosave/editor-autosave', async (importOriginal) = return { ...actual, requestEditorSaveQuiesce: vi.fn().mockResolvedValue(undefined) } }) -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import { executeOpenEditorPathMove } from './execute-open-editor-path-move' -import { captureWorktreeOperationGenerationSnapshot } from './workspace/ownership/worktree-operation-generation' +import { captureWorktreeOperationGenerationSnapshot } from '../../workspace/ownership/worktree-operation-generation' import { drawTabsFromMain, diff --git a/src/renderer/src/lib/execute-open-editor-path-move.ts b/src/renderer/src/lib/editor/file-operations/execute-open-editor-path-move.ts similarity index 92% rename from src/renderer/src/lib/execute-open-editor-path-move.ts rename to src/renderer/src/lib/editor/file-operations/execute-open-editor-path-move.ts index b4336b09d05..e80a82cdb14 100644 --- a/src/renderer/src/lib/execute-open-editor-path-move.ts +++ b/src/renderer/src/lib/editor/file-operations/execute-open-editor-path-move.ts @@ -1,4 +1,4 @@ -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import { renameRuntimePath } from '@/runtime/files/mutations/runtime-file-mutation-client' import type { RuntimeFileOperationArgs } from '@/runtime/files/runtime-file-client-types' import { requestEditorSaveQuiesce } from '@/components/editor/autosave/editor-autosave' @@ -6,17 +6,18 @@ import { beginEditorPathMove, settleEditorPathMove } from '@/components/editor/editor-path-move-inflight' -import { - isPathInsideOrEqual, - remapOpenEditorTabsForPathChange -} from '@/lib/remap-open-editor-tabs-for-path-change' +import { remapOpenEditorTabsForPathChange } from '@/lib/editor/file-operations/remap-open-editor-tabs-for-path-change' +import { isPathInsideOrEqual } from '../../../../../shared/cross-platform-path' import { verifyLatchedMoveDestinations } from '@/hooks/useEditorExternalWatch' import { notifyHostOfMirroredEditorClose } from '@/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab' import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner' -import { editorMoveOwnerFromContext, isOpenFileOnMoveOwner } from '@/lib/open-editor-move-owner' +import { + editorMoveOwnerFromContext, + isOpenFileOnMoveOwner +} from '@/lib/editor/file-operations/open-editor-move-owner' import { documentFolderAccess } from '@/lib/local-file-access' import { contentRekeyOutcome } from '@/runtime/workspace-layout/intents/layout-owner-content-rekeys' -import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch' +import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch' let moveOperationCounter = 0 diff --git a/src/renderer/src/lib/open-editor-move-owner.ts b/src/renderer/src/lib/editor/file-operations/open-editor-move-owner.ts similarity index 97% rename from src/renderer/src/lib/open-editor-move-owner.ts rename to src/renderer/src/lib/editor/file-operations/open-editor-move-owner.ts index f92f5c27346..8fef695eed2 100644 --- a/src/renderer/src/lib/open-editor-move-owner.ts +++ b/src/renderer/src/lib/editor/file-operations/open-editor-move-owner.ts @@ -1,11 +1,11 @@ import type { OpenFile } from '@/store/slices/editor/types/open-file' import type { RuntimeFileOperationArgs } from '@/runtime/files/runtime-file-client-types' -import { parseExecutionHostId, toSshExecutionHostId } from '../../../shared/execution-host' +import { parseExecutionHostId, toSshExecutionHostId } from '../../../../../shared/execution-host' import { getFileExplorerOperationOwnerFromState, type FileExplorerOwnerState } from '@/components/right-sidebar/file-explorer/navigation/file-explorer-operation-owner' -import { resolveOwner } from './workspace/ownership/resolve-owner' +import { resolveOwner } from '../../workspace/ownership/resolve-owner' /** Track server owner (null for this app) and nested SSH owner (null for server-local, undefined for unknown). */ type FileOwner = { runtimeEnvironmentId: string | null; sshHostId: string | null | undefined } diff --git a/src/renderer/src/lib/remap-open-editor-tabs-for-path-change.test.ts b/src/renderer/src/lib/editor/file-operations/remap-open-editor-tabs-for-path-change.test.ts similarity index 98% rename from src/renderer/src/lib/remap-open-editor-tabs-for-path-change.test.ts rename to src/renderer/src/lib/editor/file-operations/remap-open-editor-tabs-for-path-change.test.ts index 198262723d2..89aac875b9a 100644 --- a/src/renderer/src/lib/remap-open-editor-tabs-for-path-change.test.ts +++ b/src/renderer/src/lib/editor/file-operations/remap-open-editor-tabs-for-path-change.test.ts @@ -2,13 +2,16 @@ // @vitest-environment happy-dom import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import { remapOpenEditorTabsForPathChange } from './remap-open-editor-tabs-for-path-change' import { drawTabsFromMain, type TabsDrawnFromMain } from '@/store/slices/tabs/tabs-drawn-from-main.test-fixture' -import { editorMoveOwnerFromContext, type EditorMoveOwner } from '@/lib/open-editor-move-owner' +import { + editorMoveOwnerFromContext, + type EditorMoveOwner +} from '@/lib/editor/file-operations/open-editor-move-owner' // Switch on: main renames the tabs, and its frame rekeys the content (T1 transport, apply mode). vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) => diff --git a/src/renderer/src/lib/remap-open-editor-tabs-for-path-change.ts b/src/renderer/src/lib/editor/file-operations/remap-open-editor-tabs-for-path-change.ts similarity index 96% rename from src/renderer/src/lib/remap-open-editor-tabs-for-path-change.ts rename to src/renderer/src/lib/editor/file-operations/remap-open-editor-tabs-for-path-change.ts index 9f9ef539f85..acbd0a16775 100644 --- a/src/renderer/src/lib/remap-open-editor-tabs-for-path-change.ts +++ b/src/renderer/src/lib/editor/file-operations/remap-open-editor-tabs-for-path-change.ts @@ -1,7 +1,10 @@ -import { useAppStore } from '@/store' -import { detectLanguage } from '@/lib/language-detect' +import { useAppStore } from '@/store/index' +import { detectLanguage } from '../../../../../shared/editor-language/editor-language-detect' import { basename } from '@/lib/path' -import { isOpenFileOnMoveOwner, type EditorMoveOwner } from '@/lib/open-editor-move-owner' +import { + isOpenFileOnMoveOwner, + type EditorMoveOwner +} from '@/lib/editor/file-operations/open-editor-move-owner' import { buildDiffEditorFileId, buildOwnedEditorFileId, @@ -16,11 +19,10 @@ import { isWindowsAbsolutePathLike, normalizeRuntimePathSeparators, relativePathInsideRoot -} from '../../../shared/cross-platform-path' -import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants' +} from '../../../../../shared/cross-platform-path' +import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../shared/constants' // Share flavor-aware containment so Windows/UNC/WSL case/separator variants retarget instead of stranding tabs on renamed paths. -export { isPathInsideOrEqual } function isAbsolutePathLike(path: string): boolean { return path.startsWith('/') || /^[A-Za-z]:[\\/]/.test(path) || path.startsWith('\\\\') diff --git a/src/renderer/src/lib/markdown-document-templates.ts b/src/renderer/src/lib/editor/markdown/documents/markdown-document-templates.ts similarity index 95% rename from src/renderer/src/lib/markdown-document-templates.ts rename to src/renderer/src/lib/editor/markdown/documents/markdown-document-templates.ts index d18d0da1ec9..47e6054e594 100644 --- a/src/renderer/src/lib/markdown-document-templates.ts +++ b/src/renderer/src/lib/editor/markdown/documents/markdown-document-templates.ts @@ -1,11 +1,11 @@ -import type { DirEntry } from '../../../shared/file-listing/directory-entry' -import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' +import type { DirEntry } from '../../../../../../shared/file-listing/directory-entry' +import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target' import type { RuntimeFileOperationArgs } from '@/runtime/files/runtime-file-client-types' import { readRuntimeDirectory } from '@/runtime/files/reads/runtime-directory-read' import { readRuntimeFileContent } from '@/runtime/files/reads/runtime-file-read-client' import { runtimePathExists } from '@/runtime/files/metadata/runtime-file-metadata-client' -import { basename, joinPath } from './path' -import { normalizeRelativePath } from '../../../shared/cross-platform-path' +import { basename, joinPath } from '../../../path' +import { normalizeRelativePath } from '../../../../../../shared/cross-platform-path' const MARKDOWN_TEMPLATE_ROOT = '.orca/templates' const MARKDOWN_TEMPLATE_MAX_DEPTH = 8 diff --git a/src/renderer/src/lib/markdown-template-picker-request.ts b/src/renderer/src/lib/editor/markdown/documents/markdown-template-picker-request.ts similarity index 100% rename from src/renderer/src/lib/markdown-template-picker-request.ts rename to src/renderer/src/lib/editor/markdown/documents/markdown-template-picker-request.ts diff --git a/src/renderer/src/lib/markdown-review-note-copy.ts b/src/renderer/src/lib/editor/markdown/review-notes/markdown-review-note-copy.ts similarity index 100% rename from src/renderer/src/lib/markdown-review-note-copy.ts rename to src/renderer/src/lib/editor/markdown/review-notes/markdown-review-note-copy.ts diff --git a/src/renderer/src/lib/markdown-review-notes-setting.ts b/src/renderer/src/lib/editor/markdown/review-notes/markdown-review-notes-setting.ts similarity index 72% rename from src/renderer/src/lib/markdown-review-notes-setting.ts rename to src/renderer/src/lib/editor/markdown/review-notes/markdown-review-notes-setting.ts index 989a76e52b4..faa7884330b 100644 --- a/src/renderer/src/lib/markdown-review-notes-setting.ts +++ b/src/renderer/src/lib/editor/markdown/review-notes/markdown-review-notes-setting.ts @@ -1,6 +1,6 @@ -import type { DiffComment } from '../../../shared/diff-comment-types' -import type { GlobalSettings } from '../../../shared/global-settings-types' -import { isMarkdownComment } from './diff-comment-compat' +import type { DiffComment } from '../../../../../../shared/diff-comment-types' +import type { GlobalSettings } from '../../../../../../shared/global-settings-types' +import { isMarkdownComment } from '../../../diff-comment-compat' export function isMarkdownReviewNotesEnabled( settings: Pick | null | undefined diff --git a/src/renderer/src/lib/markdown-review-notes.ts b/src/renderer/src/lib/editor/markdown/review-notes/markdown-review-notes.ts similarity index 97% rename from src/renderer/src/lib/markdown-review-notes.ts rename to src/renderer/src/lib/editor/markdown/review-notes/markdown-review-notes.ts index 956a7931450..66c1dcfd10c 100644 --- a/src/renderer/src/lib/markdown-review-notes.ts +++ b/src/renderer/src/lib/editor/markdown/review-notes/markdown-review-notes.ts @@ -1,5 +1,5 @@ -import type { DiffComment } from '../../../shared/diff-comment-types' -import { getDiffCommentLineLabel } from './diff-comment-compat' +import type { DiffComment } from '../../../../../../shared/diff-comment-types' +import { getDiffCommentLineLabel } from '../../../diff-comment-compat' const MAX_EXCERPT_LINES = 8 const MAX_CARD_QUOTE_LENGTH = 60 diff --git a/src/renderer/src/lib/editor-model-registry.ts b/src/renderer/src/lib/editor/monaco/editor-model-registry.ts similarity index 100% rename from src/renderer/src/lib/editor-model-registry.ts rename to src/renderer/src/lib/editor/monaco/editor-model-registry.ts diff --git a/src/renderer/src/lib/monaco-delayer-cancellation-guard.ts b/src/renderer/src/lib/editor/monaco/monaco-delayer-cancellation-guard.ts similarity index 100% rename from src/renderer/src/lib/monaco-delayer-cancellation-guard.ts rename to src/renderer/src/lib/editor/monaco/monaco-delayer-cancellation-guard.ts diff --git a/src/renderer/src/lib/monaco-diff-editor-disposal.ts b/src/renderer/src/lib/editor/monaco/monaco-diff-editor-disposal.ts similarity index 100% rename from src/renderer/src/lib/monaco-diff-editor-disposal.ts rename to src/renderer/src/lib/editor/monaco/monaco-diff-editor-disposal.ts diff --git a/src/renderer/src/lib/monaco-diff-viewport-tokenization.ts b/src/renderer/src/lib/editor/monaco/monaco-diff-viewport-tokenization.ts similarity index 100% rename from src/renderer/src/lib/monaco-diff-viewport-tokenization.ts rename to src/renderer/src/lib/editor/monaco/monaco-diff-viewport-tokenization.ts diff --git a/src/renderer/src/lib/monaco-editor-gutter-disposal.test.ts b/src/renderer/src/lib/editor/monaco/monaco-editor-gutter-disposal.test.ts similarity index 100% rename from src/renderer/src/lib/monaco-editor-gutter-disposal.test.ts rename to src/renderer/src/lib/editor/monaco/monaco-editor-gutter-disposal.test.ts diff --git a/src/renderer/src/lib/monaco-peek-preview-options.ts b/src/renderer/src/lib/editor/monaco/monaco-peek-preview-options.ts similarity index 100% rename from src/renderer/src/lib/monaco-peek-preview-options.ts rename to src/renderer/src/lib/editor/monaco/monaco-peek-preview-options.ts diff --git a/src/renderer/src/lib/monaco-setup-steps.ts b/src/renderer/src/lib/editor/monaco/monaco-setup-steps.ts similarity index 88% rename from src/renderer/src/lib/monaco-setup-steps.ts rename to src/renderer/src/lib/editor/monaco/monaco-setup-steps.ts index bff4b5dac9c..ceb49fdab0b 100644 --- a/src/renderer/src/lib/monaco-setup-steps.ts +++ b/src/renderer/src/lib/editor/monaco/monaco-setup-steps.ts @@ -1,4 +1,4 @@ -import { recordRendererCrashBreadcrumb } from './crash-breadcrumb-recorder' +import { recordRendererCrashBreadcrumb } from '../../crash-breadcrumb-recorder' export type MonacoSetupStep = readonly [name: string, setup: () => void] diff --git a/src/renderer/src/lib/monaco-setup.ts b/src/renderer/src/lib/editor/monaco/monaco-setup.ts similarity index 78% rename from src/renderer/src/lib/monaco-setup.ts rename to src/renderer/src/lib/editor/monaco/monaco-setup.ts index 7ade435dc0f..fbe14dcb63a 100644 --- a/src/renderer/src/lib/monaco-setup.ts +++ b/src/renderer/src/lib/editor/monaco/monaco-setup.ts @@ -8,22 +8,22 @@ import jsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker' import cssWorker from 'monaco-editor/esm/vs/language/css/css.worker?worker' import htmlWorker from 'monaco-editor/esm/vs/language/html/html.worker?worker' import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker' -import { registerAstroLanguage } from './monaco-languages/register-astro' -import { registerCMakeLanguage } from './monaco-languages/register-cmake' -import { registerCudaLanguage } from './monaco-languages/register-cuda' -import { registerDotenvLanguage } from './monaco-languages/register-dotenv' -import { registerGlimmerLanguages } from './monaco-languages/register-glimmer' -import { registerGroovyLanguage } from './monaco-languages/register-groovy' -import { registerJsonlLanguage } from './monaco-languages/register-jsonl' -import { registerLeanLanguage } from './monaco-languages/register-lean' -import { registerMarkdownLanguage } from './monaco-languages/register-markdown' -import { registerNimLanguage } from './monaco-languages/register-nim' -import { registerQuartoLanguage } from './monaco-languages/register-quarto' -import { registerShellMarkdownAliases } from './monaco-languages/register-shell-markdown-aliases' -import { registerSvelteLanguage } from './monaco-languages/register-svelte' -import { registerTypstLanguage } from './monaco-languages/register-typst' -import { registerVueLanguage } from './monaco-languages/register-vue' -import { registerZigLanguage } from './monaco-languages/register-zig' +import { registerAstroLanguage } from '../../monaco-languages/register-astro' +import { registerCMakeLanguage } from '../../monaco-languages/register-cmake' +import { registerCudaLanguage } from '../../monaco-languages/register-cuda' +import { registerDotenvLanguage } from '../../monaco-languages/register-dotenv' +import { registerGlimmerLanguages } from '../../monaco-languages/register-glimmer' +import { registerGroovyLanguage } from '../../monaco-languages/register-groovy' +import { registerJsonlLanguage } from '../../monaco-languages/register-jsonl' +import { registerLeanLanguage } from '../../monaco-languages/register-lean' +import { registerMarkdownLanguage } from '../../monaco-languages/register-markdown' +import { registerNimLanguage } from '../../monaco-languages/register-nim' +import { registerQuartoLanguage } from '../../monaco-languages/register-quarto' +import { registerShellMarkdownAliases } from '../../monaco-languages/register-shell-markdown-aliases' +import { registerSvelteLanguage } from '../../monaco-languages/register-svelte' +import { registerTypstLanguage } from '../../monaco-languages/register-typst' +import { registerVueLanguage } from '../../monaco-languages/register-vue' +import { registerZigLanguage } from '../../monaco-languages/register-zig' import { installMonacoDelayerCancellationGuard } from './monaco-delayer-cancellation-guard' import { installMonacoDiffEditorDisposalGuard } from './monaco-diff-editor-disposal' import { installMonacoDiffViewportTokenization } from './monaco-diff-viewport-tokenization' diff --git a/src/renderer/src/lib/monaco-ts-worker-idle-stop.ts b/src/renderer/src/lib/editor/monaco/monaco-ts-worker-idle-stop.ts similarity index 100% rename from src/renderer/src/lib/monaco-ts-worker-idle-stop.ts rename to src/renderer/src/lib/editor/monaco/monaco-ts-worker-idle-stop.ts diff --git a/src/renderer/src/lib/file-type-icon-extension-table.ts b/src/renderer/src/lib/file-icons/file-type-icon-extension-table.ts similarity index 100% rename from src/renderer/src/lib/file-type-icon-extension-table.ts rename to src/renderer/src/lib/file-icons/file-type-icon-extension-table.ts diff --git a/src/renderer/src/lib/file-type-icon-name-table.ts b/src/renderer/src/lib/file-icons/file-type-icon-name-table.ts similarity index 100% rename from src/renderer/src/lib/file-type-icon-name-table.ts rename to src/renderer/src/lib/file-icons/file-type-icon-name-table.ts diff --git a/src/renderer/src/lib/file-type-icons.ts b/src/renderer/src/lib/file-icons/file-type-icons.ts similarity index 97% rename from src/renderer/src/lib/file-type-icons.ts rename to src/renderer/src/lib/file-icons/file-type-icons.ts index 75e64936626..2ba89f940a8 100644 --- a/src/renderer/src/lib/file-type-icons.ts +++ b/src/renderer/src/lib/file-icons/file-type-icons.ts @@ -1,7 +1,7 @@ import { File, FileCog, FileLock, FileTerminal, type LucideIcon } from 'lucide-react' import { COMPOUND_EXTENSIONS, FILE_ICON_BY_EXTENSION } from './file-type-icon-extension-table' import { FILE_ICON_BY_NAME } from './file-type-icon-name-table' -import type { ActivePluginIconTheme } from '../store/plugins/appearance/plugin-icon-themes' +import type { ActivePluginIconTheme } from '../../store/plugins/appearance/plugin-icon-themes' function getFilename(filePath: string | undefined | null): string { if (!filePath) { diff --git a/src/renderer/src/lib/floating-workspace-tab-creation.ts b/src/renderer/src/lib/floating-workspace-tab-creation.ts index 57802f8d22f..bebb8e4093c 100644 --- a/src/renderer/src/lib/floating-workspace-tab-creation.ts +++ b/src/renderer/src/lib/floating-workspace-tab-creation.ts @@ -1,7 +1,7 @@ import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants' -import { createUntitledMarkdownFileWithTemplateSelection } from './create-untitled-markdown' +import { createUntitledMarkdownFileWithTemplateSelection } from './editor/file-operations/create-untitled-markdown' import { getConnectionId } from './workspace/ownership/connection-context' -import { detectLanguage } from './language-detect' +import { detectLanguage } from '../../../shared/editor-language/editor-language-detect' import type { AppState } from '@/store/types' import { focusTerminalTabSurface } from './focus-terminal-tab-surface' import { createNonSecureContextUuid as createBrowserUuid } from '../../../shared/non-secure-context-uuid' diff --git a/src/renderer/src/lib/language-detect.ts b/src/renderer/src/lib/language-detect.ts deleted file mode 100644 index abd6f8cb743..00000000000 --- a/src/renderer/src/lib/language-detect.ts +++ /dev/null @@ -1 +0,0 @@ -export { detectLanguage } from '../../../shared/editor-language/editor-language-detect' diff --git a/src/renderer/src/lib/markdown-comment-blocks.ts b/src/renderer/src/lib/markdown-comment-blocks.ts deleted file mode 100644 index 6d12ac6d2c2..00000000000 --- a/src/renderer/src/lib/markdown-comment-blocks.ts +++ /dev/null @@ -1,40 +0,0 @@ -import type { DiffComment } from '../../../shared/diff-comment-types' - -export type MarkdownCommentBlock = { - key: string - startLine: number - endLine: number -} - -export type MarkdownCommentBlockMapping = { - byBlockKey: Map - unresolved: DiffComment[] -} - -export function mapMarkdownCommentsToBlocks( - comments: DiffComment[], - blocks: MarkdownCommentBlock[] -): MarkdownCommentBlockMapping { - const byBlockKey = new Map() - const unresolved: DiffComment[] = [] - - for (const comment of comments) { - const block = blocks.find( - (candidate) => - candidate.startLine <= comment.lineNumber && comment.lineNumber <= candidate.endLine - ) - if (!block) { - unresolved.push(comment) - continue - } - const list = byBlockKey.get(block.key) ?? [] - list.push(comment) - byBlockKey.set(block.key, list) - } - - for (const list of byBlockKey.values()) { - list.sort((a, b) => a.lineNumber - b.lineNumber) - } - - return { byBlockKey, unresolved } -} diff --git a/src/renderer/src/lib/monaco-languages/zig-highlighting.test.ts b/src/renderer/src/lib/monaco-languages/zig-highlighting.test.ts index 8b3022e6335..24228c1cec0 100644 --- a/src/renderer/src/lib/monaco-languages/zig-highlighting.test.ts +++ b/src/renderer/src/lib/monaco-languages/zig-highlighting.test.ts @@ -1,7 +1,7 @@ // @vitest-environment happy-dom import { describe, expect, it, vi } from 'vitest' import { loadNodeOniguruma } from '../syntax-highlighting/oniguruma-test-harness' -import { monaco } from '../monaco-setup' +import { monaco } from '../editor/monaco/monaco-setup' vi.mock('../syntax-highlighting/oniguruma', () => ({ loadOniguruma: loadNodeOniguruma })) diff --git a/src/renderer/src/lib/open-document-in-floating-workspace.ts b/src/renderer/src/lib/open-document-in-floating-workspace.ts index 420a0811a34..e9437c94774 100644 --- a/src/renderer/src/lib/open-document-in-floating-workspace.ts +++ b/src/renderer/src/lib/open-document-in-floating-workspace.ts @@ -1,7 +1,7 @@ import type { FileDocument } from '../../../shared/file-listing/file-document' import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants' import type { EditorFilesSlice } from '@/store/slices/editor/types/editor-files-slice' -import { detectLanguage } from './language-detect' +import { detectLanguage } from '../../../shared/editor-language/editor-language-detect' /** Open picker/shell-resolved absolute local files in the floating workspace; focused runtime routing would read the wrong machine. */ export function openDocumentInFloatingWorkspace( diff --git a/src/renderer/src/lib/open-html-file-preview.ts b/src/renderer/src/lib/open-html-file-preview.ts index 43c996961a2..3407bc75697 100644 --- a/src/renderer/src/lib/open-html-file-preview.ts +++ b/src/renderer/src/lib/open-html-file-preview.ts @@ -1,4 +1,4 @@ -import { openFileInBrowserTab } from './file-preview' +import { openFileInBrowserTab } from './browser/documents/file-preview' import { resolveWorkspaceDocAddressTarget } from './workspace-doc-address-input' import { selectWorkspaceSurface } from './workspace/activation/workspace-surface-reveal' import { useAppStore } from '@/store' diff --git a/src/renderer/src/lib/rename-file.ts b/src/renderer/src/lib/rename-file.ts index 99e96b23e96..4b99de39d32 100644 --- a/src/renderer/src/lib/rename-file.ts +++ b/src/renderer/src/lib/rename-file.ts @@ -1,7 +1,7 @@ import { toast } from 'sonner' import { basename, dirname, joinPath } from '@/lib/path' import { commitFileExplorerOp } from '@/components/right-sidebar/file-explorer/mutations/fileExplorerUndoRedo' -import { executeOpenEditorPathMove } from '@/lib/execute-open-editor-path-move' +import { executeOpenEditorPathMove } from '@/lib/editor/file-operations/execute-open-editor-path-move' import { captureFileExplorerOperationGuard, getFileExplorerOperationOwner diff --git a/src/renderer/src/lib/emulator-error-copy.ts b/src/renderer/src/lib/simulator/launch/emulator-error-copy.ts similarity index 98% rename from src/renderer/src/lib/emulator-error-copy.ts rename to src/renderer/src/lib/simulator/launch/emulator-error-copy.ts index 5cd562ce2f6..181bc828001 100644 --- a/src/renderer/src/lib/emulator-error-copy.ts +++ b/src/renderer/src/lib/simulator/launch/emulator-error-copy.ts @@ -3,7 +3,7 @@ import { EMULATOR_FAILURE_COPY as EN, matchEmulatorErrorCopy, type EmulatorFailureCode -} from '../../../shared/emulator-failure-copy' +} from '../../../../../shared/emulator-failure-copy' type Param = string | null diff --git a/src/renderer/src/lib/emulator-opening-preferences-capability.ts b/src/renderer/src/lib/simulator/launch/emulator-opening-preferences-capability.ts similarity index 89% rename from src/renderer/src/lib/emulator-opening-preferences-capability.ts rename to src/renderer/src/lib/simulator/launch/emulator-opening-preferences-capability.ts index 4dcca3dfba6..34c40428037 100644 --- a/src/renderer/src/lib/emulator-opening-preferences-capability.ts +++ b/src/renderer/src/lib/simulator/launch/emulator-opening-preferences-capability.ts @@ -1,4 +1,4 @@ -import { EMULATOR_OPENING_PREFERENCES_CAPABILITY } from '../../../shared/emulator-runtime-capabilities' +import { EMULATOR_OPENING_PREFERENCES_CAPABILITY } from '../../../../../shared/emulator-runtime-capabilities' import { ensureLocalRuntimeCapabilities } from '@/runtime/hosts/capabilities/local-runtime-capabilities' export async function supportsEmulatorOpeningPreferences(): Promise { return ( diff --git a/src/renderer/src/lib/open-mobile-emulator-tab.test.ts b/src/renderer/src/lib/simulator/launch/open-mobile-emulator-tab.test.ts similarity index 95% rename from src/renderer/src/lib/open-mobile-emulator-tab.test.ts rename to src/renderer/src/lib/simulator/launch/open-mobile-emulator-tab.test.ts index 338b62eead1..f12836ca1df 100644 --- a/src/renderer/src/lib/open-mobile-emulator-tab.test.ts +++ b/src/renderer/src/lib/simulator/launch/open-mobile-emulator-tab.test.ts @@ -7,8 +7,8 @@ import { isManualSimulatorLaunchPending, resetSimulatorLaunchCoordinationForTests } from './simulator-launch-coordination' -import { cancelPendingSimulatorPaneShutdown } from './simulator-pane-shutdown-scheduler' -import { ensureSimulatorTab, getSimulatorTabForWorktree } from './ensure-simulator-tab' +import { cancelPendingSimulatorPaneShutdown } from '../tabs/simulator-pane-shutdown-scheduler' +import { ensureSimulatorTab, getSimulatorTabForWorktree } from '../tabs/ensure-simulator-tab' const mockStoreState = vi.hoisted(() => ({ activeGroupIdByWorktree: { 'wt-1': 'group-1' } as Record, @@ -21,7 +21,7 @@ const mockStoreState = vi.hoisted(() => ({ runtimeStatusByEnvironmentId: new Map() })) -vi.mock('@/store', () => ({ +vi.mock('@/store/index', () => ({ useAppStore: { getState: () => mockStoreState } @@ -37,7 +37,7 @@ vi.mock('sonner', () => ({ } })) -vi.mock('./ensure-simulator-tab', () => ({ +vi.mock('../tabs/ensure-simulator-tab', () => ({ ensureSimulatorTab: vi.fn(), getSimulatorTabForWorktree: vi.fn() })) diff --git a/src/renderer/src/lib/open-mobile-emulator-tab.ts b/src/renderer/src/lib/simulator/launch/open-mobile-emulator-tab.ts similarity index 93% rename from src/renderer/src/lib/open-mobile-emulator-tab.ts rename to src/renderer/src/lib/simulator/launch/open-mobile-emulator-tab.ts index 59a95f9488f..4d5ce16a621 100644 --- a/src/renderer/src/lib/open-mobile-emulator-tab.ts +++ b/src/renderer/src/lib/simulator/launch/open-mobile-emulator-tab.ts @@ -1,13 +1,13 @@ import { readLocalRuntimeCapabilitiesOrUnknown } from '@/runtime/hosts/capabilities/local-runtime-capabilities' -import { EMULATOR_OPENING_PREFERENCES_CAPABILITY } from '../../../shared/emulator-runtime-capabilities' +import { EMULATOR_OPENING_PREFERENCES_CAPABILITY } from '../../../../../shared/emulator-runtime-capabilities' import { supportsEmulatorOpeningPreferences } from './emulator-opening-preferences-capability' import { toast } from 'sonner' import type { EmulatorStreamInfo } from '@/components/emulator-pane/emulator-pane-types' import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import { translate } from '@/i18n/i18n' import { emulatorErrorText } from './emulator-error-copy' -import { ensureSimulatorTab, getSimulatorTabForWorktree } from './ensure-simulator-tab' +import { ensureSimulatorTab, getSimulatorTabForWorktree } from '../tabs/ensure-simulator-tab' import { beginManualSimulatorLaunch, dispatchManualSimulatorLaunchFailed, @@ -19,9 +19,9 @@ import { import { cancelPendingSimulatorPaneShutdown, shutdownManagedSimulatorIfNoPane -} from './simulator-pane-shutdown-scheduler' -import { assertClientCreationActionAvailable } from './client-creation-action-policy' -import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host' +} from '../tabs/simulator-pane-shutdown-scheduler' +import { assertClientCreationActionAvailable } from '../../client-creation-action-policy' +import { LOCAL_EXECUTION_HOST_ID } from '../../../../../shared/execution-host' type OpenMobileEmulatorTabOptions = { targetGroupId?: string diff --git a/src/renderer/src/lib/simulator-launch-coordination.test.ts b/src/renderer/src/lib/simulator/launch/simulator-launch-coordination.test.ts similarity index 100% rename from src/renderer/src/lib/simulator-launch-coordination.test.ts rename to src/renderer/src/lib/simulator/launch/simulator-launch-coordination.test.ts diff --git a/src/renderer/src/lib/simulator-launch-coordination.ts b/src/renderer/src/lib/simulator/launch/simulator-launch-coordination.ts similarity index 100% rename from src/renderer/src/lib/simulator-launch-coordination.ts rename to src/renderer/src/lib/simulator/launch/simulator-launch-coordination.ts diff --git a/src/renderer/src/lib/simulator-runtime-label.ts b/src/renderer/src/lib/simulator/launch/simulator-runtime-label.ts similarity index 100% rename from src/renderer/src/lib/simulator-runtime-label.ts rename to src/renderer/src/lib/simulator/launch/simulator-runtime-label.ts diff --git a/src/renderer/src/lib/simulator-palette-active-tab.ts b/src/renderer/src/lib/simulator/search/simulator-palette-active-tab.ts similarity index 80% rename from src/renderer/src/lib/simulator-palette-active-tab.ts rename to src/renderer/src/lib/simulator/search/simulator-palette-active-tab.ts index a7bb5425890..9986b40c30d 100644 --- a/src/renderer/src/lib/simulator-palette-active-tab.ts +++ b/src/renderer/src/lib/simulator/search/simulator-palette-active-tab.ts @@ -1,7 +1,7 @@ -import type { ExecutionHostId } from '../../../shared/execution-host' -import type { TabGroup, WorkspaceVisibleTabType } from '../../../shared/tab-types' -import type { Worktree } from '../../../shared/worktree/types' -import { isPaletteCurrentWorktree } from './workspace/search/palette-repo-resolution' +import type { ExecutionHostId } from '../../../../../shared/execution-host' +import type { TabGroup, WorkspaceVisibleTabType } from '../../../../../shared/tab-types' +import type { Worktree } from '../../../../../shared/worktree/types' +import { isPaletteCurrentWorktree } from '../../workspace/search/palette-repo-resolution' export function getActiveSimulatorTabId({ worktreeId, diff --git a/src/renderer/src/lib/simulator-palette-search-types.ts b/src/renderer/src/lib/simulator/search/simulator-palette-search-types.ts similarity index 79% rename from src/renderer/src/lib/simulator-palette-search-types.ts rename to src/renderer/src/lib/simulator/search/simulator-palette-search-types.ts index bbe5a0f3ac8..f7bd740715e 100644 --- a/src/renderer/src/lib/simulator-palette-search-types.ts +++ b/src/renderer/src/lib/simulator/search/simulator-palette-search-types.ts @@ -1,13 +1,13 @@ -import type { ExecutionHostId } from '../../../shared/execution-host' -import type { Tab, TabGroup, WorkspaceVisibleTabType } from '../../../shared/tab-types' -import type { Worktree } from '../../../shared/worktree/types' -import type { MatchRange } from '../../../shared/palette-match/normalized-text' +import type { ExecutionHostId } from '../../../../../shared/execution-host' +import type { Tab, TabGroup, WorkspaceVisibleTabType } from '../../../../../shared/tab-types' +import type { Worktree } from '../../../../../shared/worktree/types' +import type { MatchRange } from '../../../../../shared/palette-match/normalized-text' import type { PaletteDocument, PaletteDocumentRank -} from '../../../shared/palette-match/palette-document' -import type { PaletteResultQualityClass } from '../../../shared/palette-match/match-quality' -import type { PaletteActivityRank } from '../../../shared/palette-match/palette-ranking' +} from '../../../../../shared/palette-match/palette-document' +import type { PaletteResultQualityClass } from '../../../../../shared/palette-match/match-quality' +import type { PaletteActivityRank } from '../../../../../shared/palette-match/palette-ranking' export type SearchableSimulatorTab = { tab: Tab diff --git a/src/renderer/src/lib/simulator-palette-search.test.ts b/src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts similarity index 89% rename from src/renderer/src/lib/simulator-palette-search.test.ts rename to src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts index e6f6d114c4f..a5043c36b8c 100644 --- a/src/renderer/src/lib/simulator-palette-search.test.ts +++ b/src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts @@ -1,17 +1,17 @@ import { describe, expect, it } from 'vitest' -import type { Tab } from '../../../shared/tab-types' -import type { Worktree } from '../../../shared/worktree/types' -import { getWorktreeHostIdentity } from '../../../shared/worktree/host-qualified-identity' -import { buildPaletteTabDocument } from '../../../shared/palette-match/tab-document' -import '../../../shared/palette-match/palette-query' +import type { Tab } from '../../../../../shared/tab-types' +import type { Worktree } from '../../../../../shared/worktree/types' +import { getWorktreeHostIdentity } from '../../../../../shared/worktree/host-qualified-identity' +import { buildPaletteTabDocument } from '../../../../../shared/palette-match/tab-document' +import '../../../../../shared/palette-match/palette-query' import { SIMULATOR_PALETTE_QUERY_MAX_BYTES, SIMULATOR_TYPE_SEARCH_ALIASES, buildSearchableSimulatorTabs, - searchSimulatorTabs, - type SearchableSimulatorTab + searchSimulatorTabs } from './simulator-palette-search' +import type { SearchableSimulatorTab } from './simulator-palette-search-types' function makeWorktree(overrides: Partial = {}): Worktree { return { diff --git a/src/renderer/src/lib/simulator-palette-search.ts b/src/renderer/src/lib/simulator/search/simulator-palette-search.ts similarity index 90% rename from src/renderer/src/lib/simulator-palette-search.ts rename to src/renderer/src/lib/simulator/search/simulator-palette-search.ts index 094307cdb3f..67d934b7ef1 100644 --- a/src/renderer/src/lib/simulator-palette-search.ts +++ b/src/renderer/src/lib/simulator/search/simulator-palette-search.ts @@ -1,50 +1,45 @@ -import type { Tab } from '../../../shared/tab-types' +import type { Tab } from '../../../../../shared/tab-types' import { getPaletteWorktreeIdentity, isPaletteCurrentWorktree, resolvePaletteRepoForWorktree -} from './workspace/search/palette-repo-resolution' +} from '../../workspace/search/palette-repo-resolution' import { getActiveSimulatorTabId } from './simulator-palette-active-tab' -import { isClipboardTextByteLengthOverLimit } from '../../../shared/clipboard-text' -import { compareBaseSensitivityLocaleText } from '../../../shared/locale-text-collators' +import { isClipboardTextByteLengthOverLimit } from '../../../../../shared/clipboard-text' +import { compareBaseSensitivityLocaleText } from '../../../../../shared/locale-text-collators' import { comparePaletteTabResults, isOmniboxPaletteTabFieldAllowed, matchPaletteTabDocument, preparePaletteTabQuery -} from '../../../shared/palette-match/tab-match' -import { buildPaletteTabDocument } from '../../../shared/palette-match/tab-document' +} from '../../../../../shared/palette-match/tab-match' +import { buildPaletteTabDocument } from '../../../../../shared/palette-match/tab-document' import { resolveWorktreeBranchLabel, resolveWorktreeDisplayName -} from './worktree-default-display-name' -import type { MatchRange } from '../../../shared/palette-match/normalized-text' +} from '../../worktree-default-display-name' +import type { MatchRange } from '../../../../../shared/palette-match/normalized-text' import { createPaletteSearchContext, encodePaletteIdentity, maxValidPaletteActivityTimestamp, preparePaletteActivity, type PaletteSearchContext -} from '../../../shared/palette-match/palette-ranking' +} from '../../../../../shared/palette-match/palette-ranking' import { findAmbiguousWorktreeIds, findDuplicateIds, getUnifiedTabPaletteExecutionHostId, isUnifiedTabOwnedByWorktree -} from './workspace/ownership/unified-tab-host-ownership' +} from '../../workspace/ownership/unified-tab-host-ownership' import type { BuildSearchableSimulatorTabsOptions, SearchableSimulatorTab, SimulatorPaletteSearchResult } from './simulator-palette-search-types' -export type { - BuildSearchableSimulatorTabsOptions, - SearchableSimulatorTab, - SimulatorPaletteSearchResult -} from './simulator-palette-search-types' -import { formatSimulatorTabLabel } from './simulator-tab-label' -import type { Translate } from '../i18n/use-translate' +import { formatSimulatorTabLabel } from '../tabs/simulator-tab-label' +import type { Translate } from '../../../i18n/use-translate' const NO_RANGES: readonly MatchRange[] = [] diff --git a/src/renderer/src/lib/emulator-right-split-target.ts b/src/renderer/src/lib/simulator/tabs/emulator-right-split-target.ts similarity index 94% rename from src/renderer/src/lib/emulator-right-split-target.ts rename to src/renderer/src/lib/simulator/tabs/emulator-right-split-target.ts index f173a2e155f..985cdd28eb4 100644 --- a/src/renderer/src/lib/emulator-right-split-target.ts +++ b/src/renderer/src/lib/simulator/tabs/emulator-right-split-target.ts @@ -1,4 +1,4 @@ -import type { TabGroupLayoutNode } from '../../../shared/tab-types' +import type { TabGroupLayoutNode } from '../../../../../shared/tab-types' type SearchResult = { containsSource: boolean diff --git a/src/renderer/src/lib/ensure-simulator-tab-behavior.test.ts b/src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts similarity index 98% rename from src/renderer/src/lib/ensure-simulator-tab-behavior.test.ts rename to src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts index 0560f47d8be..dd2ba4ccaa4 100644 --- a/src/renderer/src/lib/ensure-simulator-tab-behavior.test.ts +++ b/src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts @@ -1,7 +1,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch' -import type { Tab, TabGroup } from '../../../shared/tab-types' -import type { ExecutionHostId } from '../../../shared/execution-host' +import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch' +import type { Tab, TabGroup } from '../../../../../shared/tab-types' +import type { ExecutionHostId } from '../../../../../shared/execution-host' import type { AppState } from '@/store/types' import { drawTabsFromMain, @@ -205,7 +205,7 @@ function createdSimulatorTabId(): string { return mockStoreState.createUnifiedTab.mock.calls[0][2].id } -vi.mock('@/store', () => ({ +vi.mock('@/store/index', () => ({ useAppStore: { getState: () => drawn.store?.getState() ?? mockStoreState } diff --git a/src/renderer/src/lib/ensure-simulator-tab.ts b/src/renderer/src/lib/simulator/tabs/ensure-simulator-tab.ts similarity index 92% rename from src/renderer/src/lib/ensure-simulator-tab.ts rename to src/renderer/src/lib/simulator/tabs/ensure-simulator-tab.ts index 1bdccff4c78..d4b251b44a6 100644 --- a/src/renderer/src/lib/ensure-simulator-tab.ts +++ b/src/renderer/src/lib/simulator/tabs/ensure-simulator-tab.ts @@ -1,17 +1,17 @@ -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import { findReusableRightSplitGroupId } from './emulator-right-split-target' import { cancelPendingSimulatorPaneShutdown } from './simulator-pane-shutdown-scheduler' -import { shouldShutdownSimulatorForPaneUnmountFromTabs } from './simulator-tab-shutdown' -import { createNonSecureContextUuid as createBrowserUuid } from '../../../shared/non-secure-context-uuid' -import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../shared/execution-host' +import './simulator-tab-shutdown' +import { createNonSecureContextUuid as createBrowserUuid } from '../../../../../shared/non-secure-context-uuid' +import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../../../shared/execution-host' import { findAmbiguousWorktreeIds, getActiveExecutionHostIdForWorktree, isUnifiedTabOwnedByWorktree -} from './workspace/ownership/unified-tab-host-ownership' -import { isExecutionHostAliasForWorktree } from './workspace/ownership/worktree-execution-host-alias' -import { folderWorkspaceToWorktree } from '../../../shared/folder-workspaces/folder-workspace-worktree' -import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch' +} from '../../workspace/ownership/unified-tab-host-ownership' +import { isExecutionHostAliasForWorktree } from '../../workspace/ownership/worktree-execution-host-alias' +import { folderWorkspaceToWorktree } from '../../../../../shared/folder-workspaces/folder-workspace-worktree' +import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch' import { frameDrawnServerOfSimulatorTab, noteSimulatorTabCreatedHere, @@ -214,5 +214,3 @@ function surfaceCreatedSimulatorTab(worktreeId: string, tabId: string): void { store.focusGroup(worktreeId, groupId) } } - -export { shouldShutdownSimulatorForPaneUnmountFromTabs } diff --git a/src/renderer/src/lib/simulator-pane-shutdown-scheduler.test.ts b/src/renderer/src/lib/simulator/tabs/simulator-pane-shutdown-scheduler.test.ts similarity index 100% rename from src/renderer/src/lib/simulator-pane-shutdown-scheduler.test.ts rename to src/renderer/src/lib/simulator/tabs/simulator-pane-shutdown-scheduler.test.ts diff --git a/src/renderer/src/lib/simulator-pane-shutdown-scheduler.ts b/src/renderer/src/lib/simulator/tabs/simulator-pane-shutdown-scheduler.ts similarity index 98% rename from src/renderer/src/lib/simulator-pane-shutdown-scheduler.ts rename to src/renderer/src/lib/simulator/tabs/simulator-pane-shutdown-scheduler.ts index 3ba592c0123..c1387ea785e 100644 --- a/src/renderer/src/lib/simulator-pane-shutdown-scheduler.ts +++ b/src/renderer/src/lib/simulator/tabs/simulator-pane-shutdown-scheduler.ts @@ -1,5 +1,5 @@ import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import { shouldShutdownSimulatorForPaneUnmountFromTabs } from './simulator-tab-shutdown' type SimulatorTabReference = { diff --git a/src/renderer/src/lib/simulator-tab-label.ts b/src/renderer/src/lib/simulator/tabs/simulator-tab-label.ts similarity index 100% rename from src/renderer/src/lib/simulator-tab-label.ts rename to src/renderer/src/lib/simulator/tabs/simulator-tab-label.ts diff --git a/src/renderer/src/lib/simulator-tab-layout-owner.test.ts b/src/renderer/src/lib/simulator/tabs/simulator-tab-layout-owner.test.ts similarity index 94% rename from src/renderer/src/lib/simulator-tab-layout-owner.test.ts rename to src/renderer/src/lib/simulator/tabs/simulator-tab-layout-owner.test.ts index a870b1a5bc1..b0211c8ff91 100644 --- a/src/renderer/src/lib/simulator-tab-layout-owner.test.ts +++ b/src/renderer/src/lib/simulator/tabs/simulator-tab-layout-owner.test.ts @@ -3,12 +3,12 @@ // With ORCA_LAYOUT_OWNER=main, a simulator tab's open and close reach main as commands first and // the window draws them from main's frames, so its next save changes nothing in main's model. import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host' -import type { Tab, TabGroup, TabGroupLayoutNode } from '../../../shared/tab-types' -import type { LayoutCommand } from '../../../shared/workspace-layout/workspace-layout-command-types' -import { loadWorkspaceLayoutWithoutReport } from '../../../shared/workspace-layout/workspace-layout-load' -import { nameBasedLoadContext } from '../../../shared/workspace-layout/workspace-layout-minted-ids' -import type { WorkspaceLayout } from '../../../shared/workspace-layout/workspace-layout-model' +import { LOCAL_EXECUTION_HOST_ID } from '../../../../../shared/execution-host' +import type { Tab, TabGroup, TabGroupLayoutNode } from '../../../../../shared/tab-types' +import type { LayoutCommand } from '../../../../../shared/workspace-layout/workspace-layout-command-types' +import { loadWorkspaceLayoutWithoutReport } from '../../../../../shared/workspace-layout/workspace-layout-load' +import { nameBasedLoadContext } from '../../../../../shared/workspace-layout/workspace-layout-minted-ids' +import type { WorkspaceLayout } from '../../../../../shared/workspace-layout/workspace-layout-model' import { buildWorkspaceSessionPayload } from '@/lib/workspace/persistence/workspace-session' import { createTestStore, seedStore } from '@/store/testing/app-store-test-fixture' import { makeRuntimeOwnedWorktree } from '@/store/slices/worktrees/worktree-owner.test-fixture' @@ -31,12 +31,12 @@ type Mocks = { const mocks = vi.hoisted((): Mocks => ({ layoutOwnerIsMain: true, store: null })) let main: TabsDrawnFromMain -vi.mock('../../../shared/layout-owner-switch', () => ({ +vi.mock('../../../../../shared/layout-owner-switch', () => ({ get ORCA_LAYOUT_OWNER_IS_MAIN() { return mocks.layoutOwnerIsMain } })) -vi.mock('@/store', () => ({ +vi.mock('@/store/index', () => ({ get useAppStore() { return mocks.store } diff --git a/src/renderer/src/lib/simulator-tab-layout-owner.ts b/src/renderer/src/lib/simulator/tabs/simulator-tab-layout-owner.ts similarity index 93% rename from src/renderer/src/lib/simulator-tab-layout-owner.ts rename to src/renderer/src/lib/simulator/tabs/simulator-tab-layout-owner.ts index 7be4759e4af..61832487baa 100644 --- a/src/renderer/src/lib/simulator-tab-layout-owner.ts +++ b/src/renderer/src/lib/simulator/tabs/simulator-tab-layout-owner.ts @@ -1,6 +1,6 @@ // Send opens under proposed tab IDs used by emulator attach; surface only after main’s frame draws the tab. -import { createNonSecureContextUuid as createBrowserUuid } from '../../../shared/non-secure-context-uuid' +import { createNonSecureContextUuid as createBrowserUuid } from '../../../../../shared/non-secure-context-uuid' import { openContentTabThroughLayoutOwner } from '@/runtime/workspace-layout/intents/layout-owner-content-tab-open' import { afterPendingTab, @@ -8,8 +8,8 @@ import { } from '@/runtime/workspace-layout/intents/layout-owner-pending-tabs' import type { AppState } from '@/store/types' import { isFrameDrawnServerWorkspace } from '@/runtime/web-session-tabs-sync/frame-drawn-server-workspace-set' -import { runtimeEnvironmentIdUnlessTwin } from './workspace/ownership/resolve-owner' -import { noteDesktopCreatedServerTab } from './desktop-created-server-tabs' +import { runtimeEnvironmentIdUnlessTwin } from '../../workspace/ownership/resolve-owner' +import { noteDesktopCreatedServerTab } from '../../desktop-created-server-tabs' export type SimulatorTabOpen = { worktreeId: string diff --git a/src/renderer/src/lib/simulator-tab-palette-activation.test.ts b/src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts similarity index 95% rename from src/renderer/src/lib/simulator-tab-palette-activation.test.ts rename to src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts index 359973d73d3..f4cadfea872 100644 --- a/src/renderer/src/lib/simulator-tab-palette-activation.test.ts +++ b/src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts @@ -1,14 +1,14 @@ // @vitest-environment happy-dom import { beforeEach, describe, expect, it, vi } from 'vitest' -import type { Tab, TabGroup } from '../../../shared/tab-types' -import type { Worktree } from '../../../shared/worktree/types' -import { useAppStore } from '@/store' +import type { Tab, TabGroup } from '../../../../../shared/tab-types' +import type { Worktree } from '../../../../../shared/worktree/types' +import { useAppStore } from '@/store/index' import type { AppState } from '@/store/types' const mocks = vi.hoisted(() => ({ activateAndRevealWorkspace: vi.fn() })) -vi.mock('./workspace/activation/worktree-activation', () => ({ +vi.mock('../../workspace/activation/worktree-activation', () => ({ activateAndRevealWorkspace: mocks.activateAndRevealWorkspace })) diff --git a/src/renderer/src/lib/simulator-tab-palette-activation.ts b/src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.ts similarity index 87% rename from src/renderer/src/lib/simulator-tab-palette-activation.ts rename to src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.ts index 61f6a14a3f5..bd600c905f4 100644 --- a/src/renderer/src/lib/simulator-tab-palette-activation.ts +++ b/src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.ts @@ -1,11 +1,11 @@ -import { useAppStore } from '@/store' -import type { ExecutionHostId } from '../../../shared/execution-host' -import { activateAndRevealWorkspace } from './workspace/activation/worktree-activation' +import { useAppStore } from '@/store/index' +import type { ExecutionHostId } from '../../../../../shared/execution-host' +import { activateAndRevealWorkspace } from '../../workspace/activation/worktree-activation' import { findAmbiguousWorktreeIds, getPaletteOwnershipWorktreeIds, isUnifiedTabOwnedByWorktree -} from './workspace/ownership/unified-tab-host-ownership' +} from '../../workspace/ownership/unified-tab-host-ownership' export type SimulatorTabPaletteActivationFailure = 'missing-tab' | 'missing-worktree' diff --git a/src/renderer/src/lib/simulator-tab-shutdown.ts b/src/renderer/src/lib/simulator/tabs/simulator-tab-shutdown.ts similarity index 100% rename from src/renderer/src/lib/simulator-tab-shutdown.ts rename to src/renderer/src/lib/simulator/tabs/simulator-tab-shutdown.ts diff --git a/src/renderer/src/lib/workspace-doc-address-input.test.ts b/src/renderer/src/lib/workspace-doc-address-input.test.ts index b7e6fc6a2b1..663cf417273 100644 --- a/src/renderer/src/lib/workspace-doc-address-input.test.ts +++ b/src/renderer/src/lib/workspace-doc-address-input.test.ts @@ -25,7 +25,7 @@ vi.mock('./workspace/ownership/resolve-owner', () => ({ : { kind: 'ambiguous' } } })) -vi.mock('@/lib/file-preview', () => ({ +vi.mock('@/lib/browser/documents/file-preview', () => ({ getWorkspaceFilePreviewPlan: (_state: unknown, worktreeId: string, filePath: string) => { plan.calls.push({ worktreeId, filePath }) return plan.result diff --git a/src/renderer/src/lib/workspace-doc-address-input.ts b/src/renderer/src/lib/workspace-doc-address-input.ts index 1fe29df9942..785bbfdc1d9 100644 --- a/src/renderer/src/lib/workspace-doc-address-input.ts +++ b/src/renderer/src/lib/workspace-doc-address-input.ts @@ -2,7 +2,7 @@ import { isAbsoluteFilesystemPathInput } from '../../../shared/browser-url' import { folderWorkspaceKey } from '../../../shared/workspace-scope' import type { BrowserPageDocLocation } from '../../../shared/browser-workspace-types' import { getRelativePathInsideRoot, joinPath } from '@/lib/path' -import { getWorkspaceFilePreviewPlan } from '@/lib/file-preview' +import { getWorkspaceFilePreviewPlan } from '@/lib/browser/documents/file-preview' import type { AppState } from '@/store/types' import { htmlFilePathFromUrl } from '../../../shared/file-links/html-file-url' import { authorityKey } from '../../../shared/host-authority' diff --git a/src/renderer/src/lib/workspace/ownership/workspace-catalog-owner-index.ts b/src/renderer/src/lib/workspace/ownership/workspace-catalog-owner-index.ts index fae5fef4be1..ff43943a6a2 100644 --- a/src/renderer/src/lib/workspace/ownership/workspace-catalog-owner-index.ts +++ b/src/renderer/src/lib/workspace/ownership/workspace-catalog-owner-index.ts @@ -7,13 +7,6 @@ import { type ExecutionHostId } from '../../../../../shared/execution-host' -export function getCatalogOwnerHostId(owner: { - connectionId?: string | null - executionHostId?: string | null -}): ExecutionHostId { - return getRepoExecutionHostId(owner) -} - export function buildCatalogOwnerIndex< T extends { id: string; connectionId?: string | null; executionHostId?: string | null } >( @@ -22,11 +15,11 @@ export function buildCatalogOwnerIndex< const next = new Map() for (const record of records) { const id = record.id - const hostId = getCatalogOwnerHostId(record) + const hostId = getRepoExecutionHostId(record) const current = next.get(id) if (!current) { next.set(id, { kind: 'resolved', owner: record }) - } else if (current.kind === 'resolved' && getCatalogOwnerHostId(current.owner) !== hostId) { + } else if (current.kind === 'resolved' && getRepoExecutionHostId(current.owner) !== hostId) { next.set(id, { kind: 'ambiguous' }) } next.set(`${id}\0${hostId}`, { diff --git a/src/renderer/src/lib/workspace/ownership/workspace-copy-owner.ts b/src/renderer/src/lib/workspace/ownership/workspace-copy-owner.ts index a5fd185fa50..87d75f182b8 100644 --- a/src/renderer/src/lib/workspace/ownership/workspace-copy-owner.ts +++ b/src/renderer/src/lib/workspace/ownership/workspace-copy-owner.ts @@ -24,7 +24,7 @@ import { } from '@/store/workspaces/catalog/workspace-record-fields' import { selectFolderWorkspaceCopies } from '@/store/folder-workspaces/folder-workspace-record-index' import type { OpenFile } from '@/store/slices/editor/types/open-file' -import { focusFreeRouteStateOf } from '../../editor-file-operation-provenance' +import { focusFreeRouteStateOf } from '../../editor/file-operations/editor-file-operation-provenance' import { namedHostForOwnerRef, resolveOwner, resolveOwnerOfRoute } from './resolve-owner' import { resolveUnstampedRecordHost } from './worktree-operation-catalog-route' import { resolveExactWorktreeRoute, routeForOwner } from './worktree-owner-route' diff --git a/src/renderer/src/lib/workspace/search/tabs/workspace-tab-search-types.ts b/src/renderer/src/lib/workspace/search/tabs/workspace-tab-search-types.ts index e2edf0b02f7..9cb1e1d366d 100644 --- a/src/renderer/src/lib/workspace/search/tabs/workspace-tab-search-types.ts +++ b/src/renderer/src/lib/workspace/search/tabs/workspace-tab-search-types.ts @@ -16,7 +16,7 @@ import type { Worktree } from '../../../../../../shared/worktree/types' import type { ExecutionHostId } from '../../../../../../shared/execution-host' import type { AgentMetadata, WorkspaceTabAgentMetadataState } from './workspace-tab-agent-metadata' import type { StructuredChatTabNames } from '@/runtime/native-chat/naming/structured-chat-tab-name' -import { buildSearchableWorkspaceTabEntries } from './workspace-tab-palette-entry-builder' +import './workspace-tab-palette-entry-builder' import './workspace-tab-palette-results' export type WorkspaceTabContentType = Exclude @@ -76,5 +76,3 @@ export type BuildSearchableWorkspaceTabsOptions = WorkspaceTabAgentMetadataState terminalLayoutsByTabId?: Record paneForegroundAgentByPaneKey?: Record } - -export const buildSearchableWorkspaceTabs = buildSearchableWorkspaceTabEntries diff --git a/src/renderer/src/popout.tsx b/src/renderer/src/popout.tsx index 985506d7343..71e9e6d55f3 100644 --- a/src/renderer/src/popout.tsx +++ b/src/renderer/src/popout.tsx @@ -14,7 +14,7 @@ import { import { applyDocumentTheme } from './lib/document-theme' import { resolvePaintedTheme } from './lib/terminal-app-theme' import { buildAppFontFamily } from './lib/app-font-family' -import { applyCodeFontSmoothing } from './lib/code-font-smoothing' +import { applyCodeFontSmoothing } from './lib/editor/appearance/code-font-smoothing' import { I18nProvider } from './i18n/I18nProvider' import { useTranslate } from './i18n/use-translate' import { useAppStore } from './store' diff --git a/src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-conversion-publish.test.ts b/src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-conversion-publish.test.ts index bcc73f5a5d0..2b153bf933f 100644 --- a/src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-conversion-publish.test.ts +++ b/src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-conversion-publish.test.ts @@ -8,7 +8,7 @@ import { type TabsDrawnFromMain } from '../../store/slices/tabs/tabs-drawn-from-main.test-fixture' -vi.mock('@/lib/doc-preview-grants', () => ({ +vi.mock('@/lib/browser/documents/doc-preview-grants', () => ({ releaseDocPreviewGrant: vi.fn(), ensureDocPreviewGrant: vi.fn(), buildDocPreviewGrantRequest: vi.fn() diff --git a/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-held-tabs.test.ts b/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-held-tabs.test.ts index e4d33816445..b4e93eb24c1 100644 --- a/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-held-tabs.test.ts +++ b/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-held-tabs.test.ts @@ -24,7 +24,7 @@ import { _resetStagedBrowserFrameHandoversForTests, wasStagedBrowserTabHandedToFrames } from '@/lib/staged-browser-frame-handover' -import { ensureSimulatorTab } from '@/lib/ensure-simulator-tab' +import { ensureSimulatorTab } from '@/lib/simulator/tabs/ensure-simulator-tab' import type { DragEndEvent } from '@dnd-kit/core' import { commitTabDragDrop } from '@/components/tab-group/tab-drag-drop-commit' import '@/components/tab-bar/tab-move-to-pane-column' diff --git a/src/renderer/src/store/appearance/code-editor-theme.ts b/src/renderer/src/store/appearance/code-editor-theme.ts index b539057bd2d..aceb3a2f7d5 100644 --- a/src/renderer/src/store/appearance/code-editor-theme.ts +++ b/src/renderer/src/store/appearance/code-editor-theme.ts @@ -1,5 +1,5 @@ import { create } from 'zustand' -import type { CodeEditorTheme } from '@/lib/code-editor-theme' +import type { CodeEditorTheme } from '@/lib/editor/appearance/code-editor-theme' /** The theme every Monaco surface uses; resolved from the editor and app theme settings. */ export const useCodeEditorThemeStore = create()(() => ({ diff --git a/src/renderer/src/store/slices/browser/cleanup/browser-close-actions.ts b/src/renderer/src/store/slices/browser/cleanup/browser-close-actions.ts index ae040a9efac..e13a742377b 100644 --- a/src/renderer/src/store/slices/browser/cleanup/browser-close-actions.ts +++ b/src/renderer/src/store/slices/browser/cleanup/browser-close-actions.ts @@ -11,7 +11,7 @@ import { getRecentlyClosedTabPosition } from '../../tabs/recently-closed-tab-pos import { pushRecentlyClosedTabKind } from '../../tabs/recently-closed-tabs' import { getFallbackTabTypeForWorktree, isLocalBrowserPageOwner } from '../hosts/browser-host-state' import { closeRemoteBrowserPageInOwningEnvironment } from '../hosts/browser-remote-close' -import { releaseDocPreviewGrant } from '@/lib/doc-preview-grants' +import { releaseDocPreviewGrant } from '@/lib/browser/documents/doc-preview-grants' import { destroyWorkspaceWebviews } from './browser-webview-cleanup' import { omitRecordKeys } from '../../worktrees/teardown/record-key-omission' import { landOnEmptiedWorktree } from '../../tabs/tabs-empty-workspace' diff --git a/src/renderer/src/store/slices/browser/pages/browser-page-conversion-actions.ts b/src/renderer/src/store/slices/browser/pages/browser-page-conversion-actions.ts index f3f7819605b..917e58c6122 100644 --- a/src/renderer/src/store/slices/browser/pages/browser-page-conversion-actions.ts +++ b/src/renderer/src/store/slices/browser/pages/browser-page-conversion-actions.ts @@ -10,7 +10,7 @@ import { findPage, findWorkspace, mirrorWorkspaceFromActivePage } from './browse import { assertManagedBrowserMaterializationAllowed } from '@/lib/client-creation-action-policy' import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner' import { closeRemoteBrowserPageInOwningEnvironment } from '../hosts/browser-remote-close' -import { releaseDocPreviewGrant } from '@/lib/doc-preview-grants' +import { releaseDocPreviewGrant } from '@/lib/browser/documents/doc-preview-grants' import { isLocalBrowserPageOwner } from '../hosts/browser-host-state' import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch' import { sendBrowserLayoutCommand } from '../tabs/browser-layout-owner-commands' diff --git a/src/renderer/src/store/slices/browser/pages/browser-page-conversion.test.ts b/src/renderer/src/store/slices/browser/pages/browser-page-conversion.test.ts index 118ebf8998f..0d341ef281d 100644 --- a/src/renderer/src/store/slices/browser/pages/browser-page-conversion.test.ts +++ b/src/renderer/src/store/slices/browser/pages/browser-page-conversion.test.ts @@ -11,7 +11,7 @@ import { } from '../../tabs/tabs-drawn-from-main.test-fixture' const mocks = vi.hoisted(() => ({ releaseDocPreviewGrant: vi.fn(), callRuntimeRpc: vi.fn() })) -vi.mock('@/lib/doc-preview-grants', () => ({ +vi.mock('@/lib/browser/documents/doc-preview-grants', () => ({ releaseDocPreviewGrant: mocks.releaseDocPreviewGrant, ensureDocPreviewGrant: vi.fn(), buildDocPreviewGrantRequest: vi.fn() diff --git a/src/renderer/src/store/slices/browser/pages/browser-page-create-actions.ts b/src/renderer/src/store/slices/browser/pages/browser-page-create-actions.ts index 5dfba944c10..8fd9839f846 100644 --- a/src/renderer/src/store/slices/browser/pages/browser-page-create-actions.ts +++ b/src/renderer/src/store/slices/browser/pages/browser-page-create-actions.ts @@ -13,7 +13,7 @@ import { import '../../../../../../shared/constants' import { ORCA_BROWSER_BLANK_URL } from '../../../../../../shared/browser/browser-blank-page' import { closeRemoteBrowserPageInOwningEnvironment } from '../hosts/browser-remote-close' -import { releaseDocPreviewGrant } from '@/lib/doc-preview-grants' +import { releaseDocPreviewGrant } from '@/lib/browser/documents/doc-preview-grants' import { admitBrowserPageMount } from '@/components/browser-pane/host-guest/browser-page-mount-admission' import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch' import { sendBrowserLayoutCommand } from '../tabs/browser-layout-owner-commands' diff --git a/src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts b/src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts index 7ff6f5b1dc6..8a9462f6074 100644 --- a/src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts +++ b/src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts @@ -10,7 +10,7 @@ import { } from '../../tabs/tabs-drawn-from-main.test-fixture' const mocks = vi.hoisted(() => ({ releaseDocPreviewGrant: vi.fn() })) -vi.mock('@/lib/doc-preview-grants', () => ({ +vi.mock('@/lib/browser/documents/doc-preview-grants', () => ({ releaseDocPreviewGrant: mocks.releaseDocPreviewGrant, ensureDocPreviewGrant: vi.fn(), buildDocPreviewGrantRequest: vi.fn() diff --git a/src/renderer/src/store/slices/diff-comments/diff-comment-owner.ts b/src/renderer/src/store/slices/diff-comments/diff-comment-owner.ts index 89696476dd9..c597019945d 100644 --- a/src/renderer/src/store/slices/diff-comments/diff-comment-owner.ts +++ b/src/renderer/src/store/slices/diff-comments/diff-comment-owner.ts @@ -14,7 +14,7 @@ import { readCopyNotes, type DiffCommentSelectorState } from './worktree-diff-comments-selector' -import { focusFreeRouteStateOf } from '@/lib/editor-file-operation-provenance' +import { focusFreeRouteStateOf } from '@/lib/editor/file-operations/editor-file-operation-provenance' import { resolveSourceCopy, resolveSourceFolderHost, diff --git a/src/renderer/src/store/slices/editor/closing/editor-close-document-siblings.test.ts b/src/renderer/src/store/slices/editor/closing/editor-close-document-siblings.test.ts index 09396ef0080..94a19942aea 100644 --- a/src/renderer/src/store/slices/editor/closing/editor-close-document-siblings.test.ts +++ b/src/renderer/src/store/slices/editor/closing/editor-close-document-siblings.test.ts @@ -7,7 +7,7 @@ import type { AppState } from '../../../types' import type { OpenFile } from '../types/open-file' import { createEditorTabsStore } from '../editor-slice-test-harness' import { dispatchWorkspaceTabCommand } from '@/lib/workspace/tabs/workspace-tab-commands' -import { captureEditorFileOperationProvenance } from '@/lib/editor-file-operation-provenance' +import { captureEditorFileOperationProvenance } from '@/lib/editor/file-operations/editor-file-operation-provenance' import { drawTabsFromMain, type TabsDrawnFromMain diff --git a/src/renderer/src/store/slices/editor/git/editor-open-owner.ts b/src/renderer/src/store/slices/editor/git/editor-open-owner.ts index cbace245ae5..00468ca261b 100644 --- a/src/renderer/src/store/slices/editor/git/editor-open-owner.ts +++ b/src/renderer/src/store/slices/editor/git/editor-open-owner.ts @@ -1,6 +1,7 @@ import type { AppState } from '../../../types' import type { EditorOpenTargetOptions } from '../types/open-file' -import { captureEditorFileOperationProvenance } from '@/lib/editor-file-operation-owner' +import '@/lib/editor/file-operations/editor-file-operation-owner' +import { captureEditorFileOperationProvenance } from '@/lib/editor/file-operations/editor-file-operation-provenance' import { resolveDiffRuntimeEnvironmentId } from './diff-runtime-owner' export function editorOpenOwner( diff --git a/src/renderer/src/store/slices/editor/hydration/restored-editor-owner-destination.ts b/src/renderer/src/store/slices/editor/hydration/restored-editor-owner-destination.ts index 43ab0d7e74d..11a6fc53e8a 100644 --- a/src/renderer/src/store/slices/editor/hydration/restored-editor-owner-destination.ts +++ b/src/renderer/src/store/slices/editor/hydration/restored-editor-owner-destination.ts @@ -1,5 +1,5 @@ import type { AppState } from '../../../types' -import { assertEditorFileOperationCurrent } from '@/lib/editor-file-operation-provenance' +import { assertEditorFileOperationCurrent } from '@/lib/editor/file-operations/editor-file-operation-provenance' import { buildOwnedEditorFileId } from '../file-ids/editor-file-ids' import type { OpenFile } from '../types/open-file' import { writeEditorBuffer } from '../buffers/editor-buffer-record' diff --git a/src/renderer/src/store/slices/editor/hydration/restored-editor-owner-reparent.test.ts b/src/renderer/src/store/slices/editor/hydration/restored-editor-owner-reparent.test.ts index d99c5bb677e..d9254db97ac 100644 --- a/src/renderer/src/store/slices/editor/hydration/restored-editor-owner-reparent.test.ts +++ b/src/renderer/src/store/slices/editor/hydration/restored-editor-owner-reparent.test.ts @@ -11,8 +11,8 @@ import { EXTERNAL_MUTATION_DEBOUNCE_MS } from '@/hooks/editor-external-watch-event-reconciliation' import '@/hooks/editor-external-watch-targets' -import { captureEditorFileOperationProvenance } from '@/lib/editor-file-operation-provenance' -import { getEditorFileOperationContext } from '@/lib/editor-file-operation-owner' +import { captureEditorFileOperationProvenance } from '@/lib/editor/file-operations/editor-file-operation-provenance' +import { getEditorFileOperationContext } from '@/lib/editor/file-operations/editor-file-operation-owner' import type { AppState } from '@/store/types' import type { WorkspaceSessionState } from '../../../../../../shared/workspace-session/workspace-session-state-types' import { diff --git a/src/renderer/src/store/slices/editor/hydration/restored-editor-owner-restart.test.ts b/src/renderer/src/store/slices/editor/hydration/restored-editor-owner-restart.test.ts index 215a56e6570..50d7946e37c 100644 --- a/src/renderer/src/store/slices/editor/hydration/restored-editor-owner-restart.test.ts +++ b/src/renderer/src/store/slices/editor/hydration/restored-editor-owner-restart.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it, vi } from 'vitest' import { useAppStore } from '@/store/index' -import { captureEditorFileOperationProvenance } from '@/lib/editor-file-operation-provenance' +import { captureEditorFileOperationProvenance } from '@/lib/editor/file-operations/editor-file-operation-provenance' import type { AppState } from '@/store/types' import { buildWorkspaceSessionPayload } from '../../../../lib/workspace/persistence/workspace-session' import { diff --git a/src/renderer/src/store/slices/editor/markdown/markdown-preview-actions.ts b/src/renderer/src/store/slices/editor/markdown/markdown-preview-actions.ts index b52f722ebd4..4d514cd72ec 100644 --- a/src/renderer/src/store/slices/editor/markdown/markdown-preview-actions.ts +++ b/src/renderer/src/store/slices/editor/markdown/markdown-preview-actions.ts @@ -1,7 +1,7 @@ import { editorPlacementIntent } from '../tabs/editor-placement-intent' import type { EditorGet, EditorSet } from '../types/editor-set-get' import type { EditorSlice } from '../types/editor-slice' -import { createUntitledMarkdownFileWithTemplateSelection } from '@/lib/create-untitled-markdown' +import { createUntitledMarkdownFileWithTemplateSelection } from '@/lib/editor/file-operations/create-untitled-markdown' import { createUntitledFileInActiveWorkspace } from '../opening/untitled-file-creation' import type { OpenFile } from '../types/open-file' import { resolveEditorFileIdForOwner } from '../file-ids/editor-file-ids' diff --git a/src/renderer/src/store/slices/editor/opening/open-file-apply.ts b/src/renderer/src/store/slices/editor/opening/open-file-apply.ts index 036360e9e63..df6f97cdacb 100644 --- a/src/renderer/src/store/slices/editor/opening/open-file-apply.ts +++ b/src/renderer/src/store/slices/editor/opening/open-file-apply.ts @@ -1,7 +1,7 @@ import { editorOpenTabBarOrder } from '../tabs/workspace-editor-files' import { toast } from 'sonner' import { extractIpcErrorMessage } from '@/lib/ipc-error' -import { captureEditorFileOperationProvenance } from '@/lib/editor-file-operation-provenance' +import { captureEditorFileOperationProvenance } from '@/lib/editor/file-operations/editor-file-operation-provenance' import { getRecentlyClosedTabPosition } from '../../tabs/recently-closed-tab-position' import { pushRecentlyClosedTabKind } from '../../tabs/recently-closed-tabs' import type { AppState } from '../../../types' diff --git a/src/renderer/src/store/slices/editor/opening/open-file-mutations.ts b/src/renderer/src/store/slices/editor/opening/open-file-mutations.ts index f4332e2f925..121dec6501d 100644 --- a/src/renderer/src/store/slices/editor/opening/open-file-mutations.ts +++ b/src/renderer/src/store/slices/editor/opening/open-file-mutations.ts @@ -15,8 +15,8 @@ import { writeEditorBuffer } from '../buffers/editor-buffer-record' import { getDiskBaselineSignature } from '../../../../../../shared/file-write/disk-baseline-signature' -import { captureEditorFileOperationProvenance } from '@/lib/editor-file-operation-provenance' -import { isSameEditorFileOperationIdentity } from '@/lib/editor-file-operation-owner' +import { captureEditorFileOperationProvenance } from '@/lib/editor/file-operations/editor-file-operation-provenance' +import { isSameEditorFileOperationIdentity } from '@/lib/editor/file-operations/editor-file-operation-owner' import { editorBufferSiblingViewIds } from '../buffers/editor-buffer-views' function withoutKeys(record: Record, keys: readonly string[]): Record { diff --git a/src/renderer/src/store/slices/editor/opening/untitled-file-creation.ts b/src/renderer/src/store/slices/editor/opening/untitled-file-creation.ts index 26faab68454..bf2f8bbaa3f 100644 --- a/src/renderer/src/store/slices/editor/opening/untitled-file-creation.ts +++ b/src/renderer/src/store/slices/editor/opening/untitled-file-creation.ts @@ -5,14 +5,14 @@ import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../../shared/constant import { assertEditorFileOperationCurrent, captureEditorFileOperationProvenance -} from '@/lib/editor-file-operation-provenance' -import { getEditorFileOperationContext } from '@/lib/editor-file-operation-owner' +} from '@/lib/editor/file-operations/editor-file-operation-provenance' +import { getEditorFileOperationContext } from '@/lib/editor/file-operations/editor-file-operation-owner' import { createUntitledMarkdownFile, type UntitledMarkdownFileInfo -} from '@/lib/create-untitled-markdown' +} from '@/lib/editor/file-operations/create-untitled-markdown' import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target' -import type { EditorFileOperationProvenance } from '@/lib/editor-file-operation-provenance' +import type { EditorFileOperationProvenance } from '@/lib/editor/file-operations/editor-file-operation-provenance' import { findGroupForTab } from '../../tabs/tab-group-state' import type { EditorGet, EditorSet } from '../types/editor-set-get' import type { EditorSlice } from '../types/editor-slice' diff --git a/src/renderer/src/store/slices/editor/tabs/editor-layout-owner-records.test.ts b/src/renderer/src/store/slices/editor/tabs/editor-layout-owner-records.test.ts index 9fd9ca10ee9..05156f035fc 100644 --- a/src/renderer/src/store/slices/editor/tabs/editor-layout-owner-records.test.ts +++ b/src/renderer/src/store/slices/editor/tabs/editor-layout-owner-records.test.ts @@ -3,12 +3,15 @@ // Main frames draw editor tabs; opens carry view data for diff/preview/conflict in layout-owner builds. import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { useAppStore } from '@/store/index' -import { remapOpenEditorTabsForPathChange } from '@/lib/remap-open-editor-tabs-for-path-change' +import { remapOpenEditorTabsForPathChange } from '@/lib/editor/file-operations/remap-open-editor-tabs-for-path-change' import type { AppState } from '@/store/types' import type { LayoutCommand } from '../../../../../../shared/workspace-layout/workspace-layout-command-types' import { layoutApplyTestTransport } from '@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture' import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch' -import { editorMoveOwnerFromContext, type EditorMoveOwner } from '@/lib/open-editor-move-owner' +import { + editorMoveOwnerFromContext, + type EditorMoveOwner +} from '@/lib/editor/file-operations/open-editor-move-owner' import { drawTabsFromMain, type TabsDrawnFromMain diff --git a/src/renderer/src/store/slices/editor/tabs/restored-editor-owner-layout-owner.test.ts b/src/renderer/src/store/slices/editor/tabs/restored-editor-owner-layout-owner.test.ts index 130112d51c2..53c5d57a76f 100644 --- a/src/renderer/src/store/slices/editor/tabs/restored-editor-owner-layout-owner.test.ts +++ b/src/renderer/src/store/slices/editor/tabs/restored-editor-owner-layout-owner.test.ts @@ -3,7 +3,7 @@ // With main layout ownership, restored-file moves and content rekeys must arrive together in main’s frame. import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { useAppStore } from '@/store/index' -import { captureEditorFileOperationProvenance } from '@/lib/editor-file-operation-provenance' +import { captureEditorFileOperationProvenance } from '@/lib/editor/file-operations/editor-file-operation-provenance' import type { AppState } from '@/store/types' import { layoutApplyTestTransport } from '@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture' import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch' diff --git a/src/renderer/src/store/slices/editor/tabs/untitled-file-cleanup.ts b/src/renderer/src/store/slices/editor/tabs/untitled-file-cleanup.ts index b2d5a28515d..b1619d1abb8 100644 --- a/src/renderer/src/store/slices/editor/tabs/untitled-file-cleanup.ts +++ b/src/renderer/src/store/slices/editor/tabs/untitled-file-cleanup.ts @@ -2,7 +2,7 @@ import type { AppState } from '../../../types' import type { OpenFile } from '../types/open-file' import { mayShareEditorBackingFile } from '../file-ids/editor-file-ids' import { findFirstIndexedWorktree } from '../../../../lib/workspace/ownership/worktree-runtime-owner-index' -import { getEditorFileOperationContext } from '@/lib/editor-file-operation-owner' +import { getEditorFileOperationContext } from '@/lib/editor/file-operations/editor-file-operation-owner' import { getDiskBaselineSignature } from '../../../../../../shared/file-write/disk-baseline-signature' import { deleteRuntimePath, diff --git a/src/renderer/src/store/slices/editor/types/open-file.ts b/src/renderer/src/store/slices/editor/types/open-file.ts index 86c9f2e39d6..5f7ae0b00f7 100644 --- a/src/renderer/src/store/slices/editor/types/open-file.ts +++ b/src/renderer/src/store/slices/editor/types/open-file.ts @@ -1,6 +1,6 @@ import type { ExecutionHostId } from '../../../../../../shared/execution-host' import type { RecentlyClosedTabPosition } from '../../tabs/recently-closed-tab-position' -import type { EditorFileOperationProvenance } from '@/lib/editor-file-operation-owner' +import type { EditorFileOperationProvenance } from '@/lib/editor/file-operations/editor-file-operation-provenance' import type { GitBranchChangeEntry, GitBranchCompareSummary, diff --git a/src/renderer/src/store/slices/editor/types/restored-editor-owner.ts b/src/renderer/src/store/slices/editor/types/restored-editor-owner.ts index 8c3782c02bf..922d47a8439 100644 --- a/src/renderer/src/store/slices/editor/types/restored-editor-owner.ts +++ b/src/renderer/src/store/slices/editor/types/restored-editor-owner.ts @@ -1,5 +1,5 @@ import type { ExecutionHostId } from '../../../../../../shared/execution-host' -import type { EditorFileOperationProvenance } from '@/lib/editor-file-operation-owner' +import type { EditorFileOperationProvenance } from '@/lib/editor/file-operations/editor-file-operation-provenance' export type RestoredEditorOwnerMigration = { fileId: string diff --git a/src/renderer/src/store/slices/tabs/content-tabs-from-main-frames.test.ts b/src/renderer/src/store/slices/tabs/content-tabs-from-main-frames.test.ts index 62927c256a6..c2e41238c11 100644 --- a/src/renderer/src/store/slices/tabs/content-tabs-from-main-frames.test.ts +++ b/src/renderer/src/store/slices/tabs/content-tabs-from-main-frames.test.ts @@ -37,7 +37,7 @@ vi.mock('@/lib/agent-status', async (importOriginal) => { createStoreCascadesMockApi() -import { ensureSimulatorTab } from '@/lib/ensure-simulator-tab' +import { ensureSimulatorTab } from '@/lib/simulator/tabs/ensure-simulator-tab' import { openStructuredAgentSessionProvisionalTab } from '@/lib/agent-session/launch/structured-agent-session-launch-surface' import '@/runtime/local-structured-session-tabs-sync/snapshot-apply' import { resetLocalStructuredSessionVersionForTests } from '@/runtime/local-structured-session-tabs-sync/inventory-generation-fence' diff --git a/src/renderer/src/store/slices/worktrees/teardown/removed-workspace-unsaved-files.test.ts b/src/renderer/src/store/slices/worktrees/teardown/removed-workspace-unsaved-files.test.ts index 157d629ffb9..86cc759cf4f 100644 --- a/src/renderer/src/store/slices/worktrees/teardown/removed-workspace-unsaved-files.test.ts +++ b/src/renderer/src/store/slices/worktrees/teardown/removed-workspace-unsaved-files.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { registerPendingEditorFlush } from '@/components/editor/save/flush/editor-pending-flush' -import { editorModelRegistry } from '@/lib/editor-model-registry' +import { editorModelRegistry } from '@/lib/editor/monaco/editor-model-registry' import { hostWorktreeTarget } from '../../../../../../shared/worktree/host-qualified-identity' import { toRuntimeExecutionHostId } from '../../../../../../shared/execution-host' import { createHostTwinFixture } from '../../../workspaces/host-isolation/host-twin.test-fixture' diff --git a/tests/e2e/native-chat-image-runtime-context.unit.test.ts b/tests/e2e/native-chat-image-runtime-context.unit.test.ts index 3bcd299464c..42f260eeee8 100644 --- a/tests/e2e/native-chat-image-runtime-context.unit.test.ts +++ b/tests/e2e/native-chat-image-runtime-context.unit.test.ts @@ -24,7 +24,7 @@ import { resolveNativeChatSkillDiscoveryContext, selectNativeChatSkillStateInputs } from '../../src/renderer/src/components/native-chat/composer/pickers/native-chat-skill-discovery-context' -import { getEditorFileOperationContext } from '@/lib/editor-file-operation-owner' +import { getEditorFileOperationContext } from '@/lib/editor/file-operations/editor-file-operation-owner' import { captureWorktreeSshMutationExpectation } from '@/lib/ssh-mutation-expectation' import { adoptFromEndpoint } from '@/store/host-catalog/endpoint-catalog-adoption' import { assertRuntimeFileMutationExpectation } from '../../src/main/runtime/files/file-mutation-expectation' From 9d4840bad06a6a5a163b49a6e57776a1bffd929d Mon Sep 17 00:00:00 2001 From: Wooseong Kim <2222333+innocarpe@users.noreply.github.com> Date: Mon, 9 Nov 2026 20:48:08 +0900 Subject: [PATCH 26/90] fix(codex): close TOML multiline strings on runs of four or five quotes (#40089) The Codex config line scanner only treated exactly three quotes as the multiline closer, so a value like '''printf 'ok'''' left the scanner inside the string and later tables (e.g. [projects."..."]) were missed when writing project trust. Match toml_parser: a run of 3-5 quotes closes the string, with up to two quotes belonging to the content. Co-authored-by: Neil --- .../toml/config-toml-line-scan.ts | 23 +++++++++--- ...onfig-toml-project-trust-spellings.test.ts | 36 +++++++++++++++++++ 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/src/main/codex/configuration/toml/config-toml-line-scan.ts b/src/main/codex/configuration/toml/config-toml-line-scan.ts index c065bb7aa1d..a76e3ad999f 100644 --- a/src/main/codex/configuration/toml/config-toml-line-scan.ts +++ b/src/main/codex/configuration/toml/config-toml-line-scan.ts @@ -33,18 +33,20 @@ export function updateTomlLineScanState(state: TomlLineScanState, line: string): index += 2 continue } - if (line.startsWith('"""', index)) { + const closing = getTomlMultilineCloserLength(line, index, '"') + if (closing !== null) { mode = null - index += 3 + index += closing continue } index += 1 continue } if (mode === 'literal') { - if (line.startsWith("'''", index)) { + const closing = getTomlMultilineCloserLength(line, index, "'") + if (closing !== null) { mode = null - index += 3 + index += closing continue } index += 1 @@ -199,6 +201,19 @@ export function parseTomlStringValue(source: string, offset: number): ParsedToml return null } +// Up to two content quotes may sit against the closer, so a run of 3-5 quotes ends the string. +function getTomlMultilineCloserLength( + line: string, + index: number, + quote: '"' | "'" +): number | null { + let run = 0 + while (line[index + run] === quote) { + run += 1 + } + return run < 3 ? null : Math.min(run, 5) +} + function skipTomlBasicString(line: string, startIndex: number): number { let index = startIndex while (index < line.length) { diff --git a/src/main/codex/trust/toml/config-toml-project-trust-spellings.test.ts b/src/main/codex/trust/toml/config-toml-project-trust-spellings.test.ts index 7f8eb5844cb..d90d03efd92 100644 --- a/src/main/codex/trust/toml/config-toml-project-trust-spellings.test.ts +++ b/src/main/codex/trust/toml/config-toml-project-trust-spellings.test.ts @@ -47,6 +47,42 @@ describe('project trust writes recognise every spelling of the project table', ( expect(updated).toBe([header, 'trust_level = "trusted"', ''].join('\n')) }) + + it.each([ + { + label: 'a literal string ending in four quotes', + argsLine: `args = ["-c", '''printf 'ok'''']` + }, + { + label: 'a basic string ending in four quotes', + argsLine: `args = ["-c", """printf "ok""""]` + } + ])('updates the project table after $label', ({ argsLine }) => { + const project = '/tmp/orca-toml-repro' + const original = [ + '[mcp_servers.repro]', + 'command = "sh"', + argsLine, + '', + `[projects."${project}"]`, + 'trust_level = "untrusted"', + '' + ].join('\n') + + const updated = upsertTrusted(original, project) + + expect(updated).toBe( + [ + '[mcp_servers.repro]', + 'command = "sh"', + argsLine, + '', + `[projects."${project}"]`, + 'trust_level = "trusted"', + '' + ].join('\n') + ) + }) }) describe('the config mirror treats every spelling as one project table', () => { From d3cf5f70587642337227badbcfd888861a5c6f2a Mon Sep 17 00:00:00 2001 From: Yeji Han Date: Mon, 9 Nov 2026 20:48:17 +0900 Subject: [PATCH 27/90] fix(linear): include project in Linear issue list and search results (#40194) Request the project on the shared issue node fields and map it in mapRawIssueForWorkspace, so list/search rows carry the project the same way issue detail already did. Detail now reuses the shared mapping. Co-authored-by: Neil --- src/main/linear/linear-issue-detail.ts | 9 ---- src/main/linear/linear-issue-listing.test.ts | 49 +++++++++++++++++++ .../linear/linear-issue-query-documents.ts | 12 +++++ src/main/linear/linear-issue-query-support.ts | 8 +++ 4 files changed, 69 insertions(+), 9 deletions(-) create mode 100644 src/main/linear/linear-issue-listing.test.ts diff --git a/src/main/linear/linear-issue-detail.ts b/src/main/linear/linear-issue-detail.ts index 8b5137754a7..9bcd6d107c6 100644 --- a/src/main/linear/linear-issue-detail.ts +++ b/src/main/linear/linear-issue-detail.ts @@ -7,7 +7,6 @@ import { mapRawIssueForWorkspace } from './linear-issue-query-support' import { loadLinearSdk } from './linear-sdk' type LinearIssueDetailNode = LinearIssueNode & { - project?: { id: string; name: string; url?: string | null; color?: string | null } | null children?: { nodes?: NonNullable } | null } type LinearIssueDetailResponse = { issue?: LinearIssueDetailNode | null } @@ -66,14 +65,6 @@ export async function readLinearIssueDetail( return { ...mapRawIssueForWorkspace(entry, issue), updatedAt: new Date(issue.updatedAt).toISOString(), - project: issue.project - ? { - id: issue.project.id, - name: issue.project.name, - url: issue.project.url ?? undefined, - color: issue.project.color ?? undefined - } - : undefined, subIssues: issue.children?.nodes } } diff --git a/src/main/linear/linear-issue-listing.test.ts b/src/main/linear/linear-issue-listing.test.ts new file mode 100644 index 00000000000..f29c88d3acd --- /dev/null +++ b/src/main/linear/linear-issue-listing.test.ts @@ -0,0 +1,49 @@ +import { beforeEach, expect, it, vi } from 'vitest' +import { listIssues } from './linear-issue-listing' + +const { getClients, rawRequest } = vi.hoisted(() => ({ + getClients: vi.fn(), + rawRequest: vi.fn() +})) + +vi.mock('./client', () => ({ getClients, isAuthError: () => false })) +vi.mock('./linear-token-store', () => ({ clearToken: vi.fn() })) +vi.mock('./linear-request-concurrency', () => ({ acquire: vi.fn(), release: vi.fn() })) + +const issue = { + id: 'issue-1', + identifier: 'ENG-1', + title: 'Task', + url: 'https://linear.app/acme/issue/ENG-1/task', + priority: 0, + updatedAt: '2026-11-09T00:00:00.000Z', + state: { name: 'In Progress', type: 'started', color: '#f2c94c' }, + team: { id: 'team-1', name: 'Engineering', key: 'ENG' }, + project: { id: 'project-1', name: 'Hardware verification', url: null, color: '#f7c8c1' } +} + +beforeEach(() => { + vi.clearAllMocks() + getClients.mockReturnValue([ + { + workspace: { id: 'workspace-1', organizationName: 'Workspace' }, + client: { client: { rawRequest } } + } + ]) + rawRequest.mockResolvedValue({ + data: { issues: { nodes: [issue], pageInfo: { hasNextPage: false } } } + }) +}) + +it('requests and preserves the project on open issue rows', async () => { + const result = await listIssues('open', 20, 'workspace-1') + + expect(result.items).toHaveLength(1) + expect(result.items[0].project).toStrictEqual({ + id: 'project-1', + name: 'Hardware verification', + url: undefined, + color: '#f7c8c1' + }) + expect(rawRequest.mock.calls[0][0]).toMatch(/project \{\s*id\s+name\s+url\s+color\s*\}/) +}) diff --git a/src/main/linear/linear-issue-query-documents.ts b/src/main/linear/linear-issue-query-documents.ts index 11f4d410d74..54eacb6ac2a 100644 --- a/src/main/linear/linear-issue-query-documents.ts +++ b/src/main/linear/linear-issue-query-documents.ts @@ -28,6 +28,12 @@ export type LinearIssueNode = { name?: string | null key?: string | null } | null + project?: { + id: string + name: string + url?: string | null + color?: string | null + } | null assignee?: { id: string displayName: string @@ -85,6 +91,12 @@ export const LINEAR_ISSUE_NODE_FIELDS = ` name key } + project { + id + name + url + color + } assignee { id displayName diff --git a/src/main/linear/linear-issue-query-support.ts b/src/main/linear/linear-issue-query-support.ts index 2c4b3a4479d..b2daf98f271 100644 --- a/src/main/linear/linear-issue-query-support.ts +++ b/src/main/linear/linear-issue-query-support.ts @@ -67,6 +67,14 @@ export function mapRawIssueForWorkspace( name: issue.team?.name ?? '', key: issue.team?.key ?? '' }, + project: issue.project + ? { + id: issue.project.id, + name: issue.project.name, + url: issue.project.url ?? undefined, + color: issue.project.color ?? undefined + } + : undefined, labels: labelNodes.map((label) => label.name), // Full-replace writes need all label IDs, even when display nodes are paginated. labelIds: issue.labelIds ?? labelNodes.map((label) => label.id), From 4bb808e650309d9686d4f8a39effc27b76441f42 Mon Sep 17 00:00:00 2001 From: Pr1p Date: Mon, 9 Nov 2026 19:48:28 +0800 Subject: [PATCH 28/90] fix(build): bundle browser-extension-preload as a standalone sandboxed script (#39884) The browser-extension preload was a main-build Rollup input, so it could be split into shared CJS chunks that a sandboxed preload cannot require. Build it with the other guest preloads as a self-contained bundle, and share the one-byte unminified output options between the preload build and sandboxed bundles so the extension preload stays one-byte in V8. Co-authored-by: Neil --- config/build-plugins/main-build-entry-points.ts | 1 - config/build-plugins/sandboxed-script-bundles.ts | 9 ++++++++- electron.vite.config.ts | 10 +++++----- src/preload/browser-extension-preload.ts | 1 - src/preload/browser-extension-web-store-bridge.ts | 1 - 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/config/build-plugins/main-build-entry-points.ts b/config/build-plugins/main-build-entry-points.ts index 1521adc3dc3..819c08e1680 100644 --- a/config/build-plugins/main-build-entry-points.ts +++ b/config/build-plugins/main-build-entry-points.ts @@ -5,7 +5,6 @@ import { CLI_MAIN_ENTRY_NAMES } from './cli-main-entry-names' /** Main-build Rollup inputs: output file name (without .js) to its source entry. */ export const MAIN_BUILD_ENTRY_POINTS: Record = { index: resolve('src/main/index.ts'), - 'browser-extension-preload': resolve('src/preload/browser-extension-preload.ts'), 'browser-extension-native-host-supervisor-entry': resolve( 'src/main/browser/extensions/native-messaging/browser-extension-native-host-supervisor-entry.ts' ), diff --git a/config/build-plugins/sandboxed-script-bundles.ts b/config/build-plugins/sandboxed-script-bundles.ts index 9b1bd0e1f21..3bef5c5c96e 100644 --- a/config/build-plugins/sandboxed-script-bundles.ts +++ b/config/build-plugins/sandboxed-script-bundles.ts @@ -8,7 +8,14 @@ import { type BundledScript = { code: string; moduleIds: string[] } +// Unminified preload keeps dependency JSDoc whose em dashes would force two-byte storage in every renderer. +export const ONE_BYTE_UNMINIFIED_OUTPUT = { + charset: 'ascii', + comments: { legal: true, annotation: true, jsdoc: false } +} as const + const GUEST_PRELOADS = [ + { entry: 'src/preload/browser-extension-preload.ts', fileName: 'browser-extension-preload.js' }, { entry: 'src/preload/browser-guest.ts', fileName: 'browser-guest-preload.js' }, { entry: 'src/preload/doc-preview-link.ts', fileName: 'doc-preview-link-preload.js' }, { entry: 'src/preload/plugin-frame-guest.ts', fileName: 'plugin-frame-guest-preload.js' } @@ -46,7 +53,7 @@ async function bundleScript( name: 'orcaBrowserExtensionScript', fileName: () => fileName }, - rollupOptions: { external: ['electron'] } + rollupOptions: { external: ['electron'], output: ONE_BYTE_UNMINIFIED_OUTPUT } } }) for (const output of Array.isArray(result) ? result : [result]) { diff --git a/electron.vite.config.ts b/electron.vite.config.ts index 0a2e110aca1..6f3700a4962 100644 --- a/electron.vite.config.ts +++ b/electron.vite.config.ts @@ -6,7 +6,10 @@ import type { Plugin, Rollup } from 'vite' import react from '@vitejs/plugin-react' import tailwindcss from '@tailwindcss/vite' import { createBootstrapFatalExitBanner } from './config/build-plugins/bootstrap-fatal-exit-banner' -import { createSandboxedScriptBundlesPlugin } from './config/build-plugins/sandboxed-script-bundles' +import { + createSandboxedScriptBundlesPlugin, + ONE_BYTE_UNMINIFIED_OUTPUT +} from './config/build-plugins/sandboxed-script-bundles' import { createMainLocaleSubsetPlugin } from './config/build-plugins/main-locale-subset' import { createSucraseUnusedTransformersPlugin } from './config/build-plugins/sucrase-unused-transformers' import { createPdfjsViewerAssetsPlugin } from './config/build-plugins/pdfjs-viewer-assets' @@ -264,10 +267,7 @@ export const electronViteConfig: UserConfig = { preload: { build: { externalizeDeps: false, - rollupOptions: { - // Unminified preload keeps dependency JSDoc whose em dashes would force two-byte storage in every renderer. - output: { charset: 'ascii', comments: { legal: true, annotation: true, jsdoc: false } } - } + rollupOptions: { output: ONE_BYTE_UNMINIFIED_OUTPUT } } }, renderer: { diff --git a/src/preload/browser-extension-preload.ts b/src/preload/browser-extension-preload.ts index d0f28a68532..43aa35d0415 100644 --- a/src/preload/browser-extension-preload.ts +++ b/src/preload/browser-extension-preload.ts @@ -28,7 +28,6 @@ import { installChromeWebStoreBridge } from './browser-extension-web-store-bridge' -// Why: raw require keeps the sandboxed preload standalone in the main-process CJS build. const electron: { contextBridge: ContextBridge; ipcRenderer: IpcRenderer } = require('electron') const { contextBridge, ipcRenderer } = electron diff --git a/src/preload/browser-extension-web-store-bridge.ts b/src/preload/browser-extension-web-store-bridge.ts index cddc88fcd0d..08266d7138c 100644 --- a/src/preload/browser-extension-web-store-bridge.ts +++ b/src/preload/browser-extension-web-store-bridge.ts @@ -20,7 +20,6 @@ export const PRELOAD_WEB_STORE_EVENT_CHANNEL = 'browserExtension:webStoreEvent' * Orca browser tab in a local profile) on every call; this side only relays. */ export function installChromeWebStoreBridge(): void { - // Why: raw require keeps the sandboxed preload standalone in the main-process CJS build. const electron: { contextBridge: ContextBridge; ipcRenderer: IpcRenderer } = require('electron') const { contextBridge, ipcRenderer } = electron let dispatch: ((event: string, args: unknown[]) => void) | null = null From f637498b34dc5ce8e13c5ceac34d78f6b1458bee Mon Sep 17 00:00:00 2001 From: OrcaWin Date: Mon, 9 Nov 2026 03:57:10 -0800 Subject: [PATCH 29/90] test: remove obsolete manual tools and duplicate launch coverage (#40317) Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com> --- ...laude-usage-cache-representation-check.mjs | 162 ---------- .../native-chat-live-session-benchmark.ts | 291 ------------------ .../codex-capacity-status-benchmark.ts | 137 --------- ...t-session-create-selection.test-fixture.ts | 70 ----- 4 files changed, 660 deletions(-) delete mode 100644 config/scripts/performance/claude-usage/claude-usage-cache-representation-check.mjs delete mode 100644 config/scripts/performance/native-chat/native-chat-live-session-benchmark.ts delete mode 100644 config/scripts/performance/terminal-stream/codex-capacity-status-benchmark.ts diff --git a/config/scripts/performance/claude-usage/claude-usage-cache-representation-check.mjs b/config/scripts/performance/claude-usage/claude-usage-cache-representation-check.mjs deleted file mode 100644 index 212ec5a974b..00000000000 --- a/config/scripts/performance/claude-usage/claude-usage-cache-representation-check.mjs +++ /dev/null @@ -1,162 +0,0 @@ -#!/usr/bin/env node -import assert from 'node:assert/strict' -import { appendFile, mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises' -import { createHash } from 'node:crypto' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { fileURLToPath } from 'node:url' -import { parseArgs } from 'node:util' -import { runProcessSync } from '@orca/process-host' -import { - loadClaudeUsageBenchmarkScanner, - readClaudeUsageBenchmarkBaselineSources -} from './claude-usage-benchmark-scanner.mjs' - -const ROOT = fileURLToPath(new URL('../../../..', import.meta.url)) -const STORE_PATH = 'src/main/claude-usage/store.ts' -const { values } = parseArgs({ - options: { - 'baseline-ref': { type: 'string', default: '51e7181850b022bae2d41091fe1229accef4bd50' }, - 'usage-keys': { type: 'string', default: '16384' }, - output: { type: 'string' } - } -}) -const usageKeys = Number(values['usage-keys']) -assert( - Number.isSafeInteger(usageKeys) && usageKeys > 7, - 'usage-keys must be an integer above seven' -) -process.env.ORCA_CLAUDE_USAGE_APPEND_BENCH_BASELINE = values['baseline-ref'] - -function serializationIndent(source) { - const indent = /jsonIndent:\s*(\d+)/.exec(source) - return indent ? Number(indent[1]) : undefined -} - -function sourceHash(source) { - return createHash('sha256').update(source).digest('hex') -} - -function persistedState(result) { - return { - schemaVersion: 6, - worktreeFingerprint: '[]', - processedFiles: result.processedFiles, - sessions: result.sessions, - dailyAggregates: result.dailyAggregates, - scanState: { - enabled: true, - lastScanStartedAt: 1, - lastScanCompletedAt: 2, - lastScanError: null - } - } -} - -function usageRecord(cwd, index, inputTokens = 100) { - return `${JSON.stringify({ - type: 'assistant', - sessionId: 'active-session', - timestamp: new Date(Date.UTC(2026, 9, 9, 12, 0, index)).toISOString(), - requestId: `request-${index}`, - cwd, - gitBranch: 'benchmark', - message: { - id: `message-${index}`, - model: 'claude-sonnet-4-6', - usage: { - input_tokens: inputTokens, - output_tokens: 10, - cache_read_input_tokens: 0, - cache_creation_input_tokens: 20, - cache_creation: { ephemeral_1h_input_tokens: 5 } - } - } - })}\n` -} - -const home = await mkdtemp(join(tmpdir(), 'orca-claude-cache-representation-')) -try { - const project = join(home, '.claude', 'projects', 'benchmark') - const cwd = join(home, 'repo') - await mkdir(project, { recursive: true }) - await mkdir(cwd) - const transcriptPath = join(project, 'active-session.jsonl') - const history = Array.from({ length: usageKeys }, (_, index) => usageRecord(cwd, index)).join('') - const baseline = await readClaudeUsageBenchmarkBaselineSources() - const storeRead = runProcessSync({ - program: 'git', - args: ['show', `${baseline.baselineCommit}:${STORE_PATH}`], - cwd: ROOT, - timeoutMs: 10_000, - maxOutputBytes: 1024 * 1024, - env: { ...process.env, ORCA_BACKGROUND_LAUNCH: '1' } - }) - assert.equal(storeRead.code, 0, storeRead.stderr) - const currentStore = await readFile(join(ROOT, ...STORE_PATH.split('/')), 'utf8') - const stores = { baseline: storeRead.stdout, current: currentStore } - const loaded = await Promise.all([ - loadClaudeUsageBenchmarkScanner(home, baseline.sources, new Map(), baseline.baselineCommit), - loadClaudeUsageBenchmarkScanner(home) - ]) - const arms = {} - const results = [] - for (const [index, arm] of ['baseline', 'current'].entries()) { - const { scanner, bundleSha256, sourceFingerprints } = loaded[index] - await writeFile(transcriptPath, history) - const cold = await scanner.scanClaudeUsageFiles([], [], undefined, []) - await appendFile(transcriptPath, usageRecord(cwd, 7, 2_000)) - const result = await scanner.scanClaudeUsageFiles( - [], - JSON.parse(JSON.stringify(cold.processedFiles)), - undefined, - [] - ) - const fresh = await scanner.scanClaudeUsageFiles([], [], undefined, []) - assert.deepEqual(result, fresh, `${arm} resume differs from a fresh scan`) - assert.equal(result.processedFiles[0].ownedDedupeKeys.length, usageKeys) - assert.equal(result.sessions[0].totalInputTokens, usageKeys * 100 + 1_900) - const state = persistedState(result) - const compact = JSON.stringify(state) - const indented = JSON.stringify(state, null, 2) - const indent = serializationIndent(stores[arm]) - assert.deepEqual(JSON.parse(compact), JSON.parse(indented)) - assert.deepEqual(structuredClone(state), state) - arms[arm] = { - compactFullStateBytes: Buffer.byteLength(compact), - indentedFullStateBytes: Buffer.byteLength(indented), - productionFullStateBytes: Buffer.byteLength(JSON.stringify(state, null, indent)), - productionIndent: indent ?? null, - storeSha256: sourceHash(stores[arm]), - ownedKeys: result.processedFiles[0].ownedDedupeKeys.length, - bundleSha256, - sourceFingerprints - } - results.push(result) - } - assert.deepEqual(results[0].sessions, results[1].sessions) - assert.deepEqual(results[0].dailyAggregates, results[1].dailyAggregates) - const report = { - purpose: 'Actual scanner cache representation byte counts; no timing or peak-memory claim.', - node: process.version, - platform: process.platform, - arch: process.arch, - baselineRef: baseline.baselineRef, - baselineCommit: baseline.baselineCommit, - usageKeys, - historyBytes: Buffer.byteLength(history), - stateFields: 'schema v6; source cache, session/daily projections and fixed scan-state metadata', - exactColdParity: true, - crossArmProjectionParity: true, - serializationParity: true, - structuredCloneParity: true, - toolingSha256: sourceHash(await readFile(import.meta.filename)), - arms - } - if (values.output) { - await writeFile(values.output, `${JSON.stringify(report, null, 2)}\n`) - } - console.log(JSON.stringify(report)) -} finally { - await rm(home, { recursive: true, force: true }) -} diff --git a/config/scripts/performance/native-chat/native-chat-live-session-benchmark.ts b/config/scripts/performance/native-chat/native-chat-live-session-benchmark.ts deleted file mode 100644 index bb1db7cef21..00000000000 --- a/config/scripts/performance/native-chat/native-chat-live-session-benchmark.ts +++ /dev/null @@ -1,291 +0,0 @@ -// Run pnpm exec tsx config/scripts/native-chat-live-session-benchmark.ts. Synthetic 2KB messages stress fallback-key normalization. -// Excludes parsing, IPC/remote latency, React/DOM; results are not average production size or end-to-end frame latency. - -import { deepStrictEqual, strictEqual } from 'node:assert' -import { performance } from 'node:perf_hooks' -import type { - NativeChatMessage, - NativeChatSession -} from '../../../../src/shared/native-chat/native-chat-types' -import { getVerifiedNativeChatCommands } from '../../../../src/shared/native-chat/native-chat-agent-profiles' -import { surfaceSkillInvocationUserTurns } from '../../../../src/shared/native-chat/native-chat-command-envelope' -import { prepareNativeChatLiveMessages } from '../../../../src/renderer/src/components/native-chat/session/terminal/assembly/native-chat-live-message-preparation' -import { mergeNativeChatLiveSession } from '../../../../src/shared/native-chat/native-chat-live-status' -import { assembleNativeChatSession } from '../../../../src/renderer/src/components/native-chat/session/terminal/assembly/native-chat-session-assembler' - -type Operation = (index: number) => number -type ExpectedChecksum = (iterations: number) => number -type Calibration = { iterations: number; elapsedMs: number; capped: boolean } - -const TARGET_SAMPLE_MS = 50 -const MAX_ITERATIONS = 16_777_216 -const ROUNDS = 10 -let checksum = 0 -let expectedChecksum = 0 -let validatedCases = 0 -let cappedCalibrations = 0 -const sessionSink: { value: NativeChatSession | null } = { value: null } -let messageArraySink: NativeChatMessage[] | null = null -let contentSink = '' -const benchmarkStartedAt = performance.now() - -function proseFixture(count: number, bytes: number, withTurnId: boolean): NativeChatMessage[] { - const payload = 'Ab Cd '.repeat(Math.ceil(bytes / 7)).slice(0, bytes) - return Array.from({ length: count }, (_, index) => ({ - id: `message-${index}`, - role: index % 2 === 0 ? ('user' as const) : ('assistant' as const), - blocks: [{ type: 'text' as const, text: `${payload}-${index}` }], - timestamp: index, - source: 'transcript' as const, - ...(withTurnId ? { turnId: `turn-${index}` } : {}) - })) -} - -function toolFixture(count: number): NativeChatMessage[] { - return Array.from({ length: count }, (_, index) => ({ - id: `tool-${index}`, - role: index % 2 === 0 ? ('assistant' as const) : ('tool' as const), - blocks: - index % 2 === 0 - ? [ - { - type: 'tool-call' as const, - name: 'read', - input: { path: `${index}.txt`, context: 'x'.repeat(512) } - } - ] - : [{ type: 'tool-result' as const, output: `result-${index}-${'x'.repeat(512)}` }], - timestamp: index, - source: 'transcript' as const - })) -} - -function legacySession(messages: NativeChatMessage[]): NativeChatSession { - return assembleNativeChatSession({ - sources: { transcript: messages }, - sessionId: 'benchmark', - agent: 'claude' - }) -} - -function legacyMessageUpdateSession(messages: NativeChatMessage[]): NativeChatSession { - const commandNames = new Set( - getVerifiedNativeChatCommands('claude').map((command) => command.name) - ) - return legacySession(surfaceSkillInvocationUserTurns(messages, commandNames)) -} - -function directMessageUpdateSession(messages: NativeChatMessage[]): NativeChatSession { - return mergeNativeChatLiveSession({ - messages: prepareNativeChatLiveMessages(messages, 'claude'), - sessionId: 'benchmark', - agent: 'claude', - hookState: null - }) -} - -function blockContent(message: NativeChatMessage): string { - const block = message.blocks[0] - if (!block) { - return '' - } - if (block.type === 'text') { - return block.text - } - if (block.type === 'tool-call') { - return block.name - } - if (block.type === 'tool-result') { - return block.output - } - if (block.type === 'image-ref') { - return block.path ?? block.url ?? block.alt ?? '' - } - return block.type === 'background-task' ? block.taskId : block.groupId -} - -function messageWeight(message: NativeChatMessage, content: string): number { - const idTail = message.id.length > 0 ? message.id.charCodeAt(message.id.length - 1) : 0 - const contentTail = content.length > 0 ? content.charCodeAt(content.length - 1) : 0 - return message.id.length + idTail + message.role.charCodeAt(0) + content.length + contentTail -} - -function consumeSession(session: NativeChatSession, index: number): number { - sessionSink.value = session - messageArraySink = session.messages - const message = session.messages[index % session.messages.length] - if (!message) { - contentSink = '' - return session.status.charCodeAt(0) - } - contentSink = blockContent(message) - return session.status.charCodeAt(0) + messageWeight(message, contentSink) -} - -function cyclicChecksum(values: readonly number[], iterations: number): number { - if (values.length === 0) { - return 0 - } - const cycle = values.reduce((sum, value) => sum + value, 0) - const fullCycles = Math.floor(iterations / values.length) - let total = cycle * fullCycles - for (let index = 0; index < iterations % values.length; index += 1) { - total += values[index]! - } - return total -} - -function sessionExpectedChecksum(session: NativeChatSession): ExpectedChecksum { - const statusWeight = session.status.charCodeAt(0) - const weights = session.messages.map((message) => { - const content = blockContent(message) - return messageWeight(message, content) - }) - return (iterations) => statusWeight * iterations + cyclicChecksum(weights, iterations) -} - -function runSample(operation: Operation, expected: ExpectedChecksum, iterations: number): number { - let sampleChecksum = 0 - const startedAt = performance.now() - for (let index = 0; index < iterations; index += 1) { - sampleChecksum += operation(index) - } - const elapsedMs = performance.now() - startedAt - checksum += sampleChecksum - expectedChecksum += expected(iterations) - return elapsedMs -} - -function median(samples: number[]): number { - return [...samples].sort((left, right) => left - right)[Math.floor(samples.length / 2)]! -} - -function calibrate(operation: Operation, expected: ExpectedChecksum): Calibration { - let iterations = 1 - let reachedTarget = false - while (true) { - const elapsedMs = runSample(operation, expected, iterations) - if (elapsedMs >= TARGET_SAMPLE_MS) { - if (reachedTarget) { - return { iterations, elapsedMs, capped: false } - } - reachedTarget = true - continue - } - if (iterations >= MAX_ITERATIONS) { - return { iterations, elapsedMs, capped: true } - } - reachedTarget = false - iterations = Math.min(iterations * 2, MAX_ITERATIONS) - } -} - -function benchmark( - name: string, - baseline: Operation, - optimized: Operation, - expected: ExpectedChecksum -): void { - const baselineValue = baseline(0) - const optimizedValue = optimized(0) - strictEqual(optimizedValue, baselineValue, `${name}: timed arms returned different checksums`) - validatedCases += 1 - const baselineCalibration = calibrate(baseline, expected) - const optimizedCalibration = calibrate(optimized, expected) - cappedCalibrations += Number(baselineCalibration.capped) + Number(optimizedCalibration.capped) - const baselineSamples: number[] = [] - const optimizedSamples: number[] = [] - for (let round = 0; round < ROUNDS; round += 1) { - if (round % 2 === 0) { - baselineSamples.push( - runSample(baseline, expected, baselineCalibration.iterations) / - baselineCalibration.iterations - ) - optimizedSamples.push( - runSample(optimized, expected, optimizedCalibration.iterations) / - optimizedCalibration.iterations - ) - } else { - optimizedSamples.push( - runSample(optimized, expected, optimizedCalibration.iterations) / - optimizedCalibration.iterations - ) - baselineSamples.push( - runSample(baseline, expected, baselineCalibration.iterations) / - baselineCalibration.iterations - ) - } - } - const baselineMs = median(baselineSamples) - const optimizedMs = median(optimizedSamples) - const speedup = baselineMs / Math.max(optimizedMs, Number.EPSILON) - console.log( - `${name}\t${baselineCalibration.iterations}\t${optimizedCalibration.iterations}\t${baselineCalibration.elapsedMs.toFixed(1)}\t${optimizedCalibration.elapsedMs.toFixed(1)}\t${baselineMs.toFixed(6)}\t${optimizedMs.toFixed(6)}\t${speedup.toFixed(1)}x` - ) -} - -function benchmarkSessionArms( - name: string, - baselineSession: () => NativeChatSession, - optimizedSession: () => NativeChatSession -): void { - const expectedSession = baselineSession() - deepStrictEqual(optimizedSession(), expectedSession, `${name}: session mismatch`) - const expected = sessionExpectedChecksum(expectedSession) - benchmark( - name, - (index) => consumeSession(baselineSession(), index), - (index) => consumeSession(optimizedSession(), index), - expected - ) -} - -function benchmarkMessageUpdate(name: string, messages: NativeChatMessage[]): void { - benchmarkSessionArms( - name, - () => legacyMessageUpdateSession(messages), - () => directMessageUpdateSession(messages) - ) -} - -const prose300 = proseFixture(300, 2_048, false) -const fixtures = [ - ['300 x 2KB prose, no turnId', prose300], - ['300 x 2KB prose, with turnId', proseFixture(300, 2_048, true)], - ['300 tool-heavy, no turnId', toolFixture(300)], - ['100 x 2KB prose, no turnId', proseFixture(100, 2_048, false)], - ['500 x 2KB prose, no turnId', proseFixture(500, 2_048, false)] -] as const - -console.log( - `Node ${process.version}; ${ROUNDS} alternating interleaved median rounds; ${TARGET_SAMPLE_MS} ms calibration target; ${MAX_ITERATIONS} iteration cap` -) -console.log( - 'case\tbaseline iters\toptimized iters\tbaseline cal ms\toptimized cal ms\tbaseline ms/op\toptimized ms/op\tspeedup' -) - -for (const [name, messages] of fixtures) { - benchmarkMessageUpdate(name, messages) -} - -benchmarkSessionArms( - '300 x 2KB status-only frame', - () => legacySession(prose300), - () => - mergeNativeChatLiveSession({ - messages: prose300, - sessionId: 'benchmark', - agent: 'claude', - hookState: null - }) -) - -strictEqual(checksum, expectedChecksum, 'benchmark checksum accounting drifted') -strictEqual(sessionSink.value?.sessionId, 'benchmark', 'session outputs did not escape') -strictEqual(Array.isArray(messageArraySink), true, 'message arrays did not escape') -strictEqual(contentSink.length > 0, true, 'message content did not escape') -console.log( - `validated=${validatedCases} cases, checksum=${checksum}, capped calibrations=${cappedCalibrations}, runtime=${( - performance.now() - benchmarkStartedAt - ).toFixed(0)} ms` -) diff --git a/config/scripts/performance/terminal-stream/codex-capacity-status-benchmark.ts b/config/scripts/performance/terminal-stream/codex-capacity-status-benchmark.ts deleted file mode 100644 index 006dcc785a1..00000000000 --- a/config/scripts/performance/terminal-stream/codex-capacity-status-benchmark.ts +++ /dev/null @@ -1,137 +0,0 @@ -// Run: ORCA_BACKGROUND_LAUNCH=1 node --import tsx config/scripts/codex-capacity-status-benchmark.ts -import { readFileSync } from 'node:fs' -import { performance } from 'node:perf_hooks' -import { createCodexCapacityNoticeTracker } from '../../../../src/shared/codex-native-notice' -import { HeadlessEmulator } from '../../../../src/main/daemon/emulation/headless-emulator' -import { observeCodexCapacityTerminalStatus } from '../../../../src/main/runtime/terminal/output/codex-notice-terminal-status' - -const fixture = readFileSync( - new URL( - '../../../../src/main/runtime/__fixtures__/codex-model-capacity-fullscreen.txt', - import.meta.url - ), - 'utf8' -) -const notice = fixture.indexOf('■ Selected model') -if (notice === -1) { - throw new Error('Capacity notice missing from benchmark fixture') -} -const redraw = fixture.slice(0, fixture.lastIndexOf('\x1b[?2026h', notice)) -const scenarios = [ - { name: 'plain-4K', data: 'x'.repeat(4096), iterations: 30_000 }, - { name: 'captured-TUI', data: redraw, iterations: 30_000 }, - { - name: 'warning-footer', - data: '\x1b[?2026h\x1b[21;1H⚠ 1 warning · f2 to view\x1b[?2026l', - iterations: 30_000 - }, - { name: 'tiny-typing', data: 'a', iterations: 30_000 }, - { name: 'marker-flood', data: '■'.repeat(4096), iterations: 1000 }, - { - name: 'large-after-warning', - data: `⚠ unrelated\n${'x'.repeat(1024 * 1024)}`, - iterations: 128 - } -] - -function measure(iterations: number, observe: () => void): number { - const start = performance.now() - for (let index = 0; index < iterations; index++) { - observe() - } - return performance.now() - start -} - -for (const scenario of scenarios) { - const run = () => { - const tracker = createCodexCapacityNoticeTracker() - let screenReads = 0 - const readScreen = () => { - screenReads++ - return [] - } - const elapsedMs = measure(scenario.iterations, () => tracker.observe(scenario.data, readScreen)) - if (screenReads !== 0) { - throw new Error(`${scenario.name} read the screen ${screenReads} times`) - } - return elapsedMs - } - run() - const samples = Array.from({ length: 5 }, run).sort((left, right) => left - right) - const elapsedMs = samples[2] - textResult(scenario.name, elapsedMs, scenario.iterations, scenario.data.length) -} - -for (const launchAgent of [undefined, 'codex'] as const) { - const emulator = new HeadlessEmulator({ cols: 80, rows: 24 }) - const data = 'x'.repeat(4096) - const iterations = 30_000 - let statusReads = 0 - const readStatus = () => { - statusReads++ - return undefined - } - try { - const observe = () => - observeCodexCapacityTerminalStatus( - emulator, - data, - 'node /some/wrapper.cjs', - launchAgent, - readStatus, - 1 - ) - measure(iterations, observe) - const samples = Array.from({ length: 5 }, () => measure(iterations, observe)).sort( - (left, right) => left - right - ) - if (statusReads !== 0) { - throw new Error(`Ordinary output read status ${statusReads} times`) - } - textResult(launchAgent ?? 'unrelated-terminal', samples[2], iterations, data.length) - } finally { - emulator.dispose() - } -} - -async function measureScreenRead(): Promise { - const emulator = new HeadlessEmulator({ cols: 40, rows: 24 }) - try { - await emulator.write(fixture) - for (const name of ['screen-only', 'capacity-parse-and-screen']) { - const observe = () => { - if (name === 'screen-only') { - emulator.getVisibleLines() - } else if ( - !createCodexCapacityNoticeTracker().observe(fixture, () => emulator.getVisibleLines()) - ) { - throw new Error('Captured capacity notice was not detected') - } - } - measure(1000, observe) - const samples = Array.from({ length: 5 }, () => measure(1000, observe)).sort( - (left, right) => left - right - ) - textResult(name, samples[2], 1000, fixture.length) - } - } finally { - emulator.dispose() - } -} - -void measureScreenRead().catch((error: unknown) => { - console.error(error) - process.exitCode = 1 -}) - -function textResult(name: string, elapsedMs: number, iterations: number, chars: number): void { - console.log( - JSON.stringify({ - name, - chars, - iterations, - microsecondsPerChunk: Number(((elapsedMs * 1000) / iterations).toFixed(3)), - millisecondsPerMiB: Number((elapsedMs / ((chars * iterations) / 1048576)).toFixed(3)) - }) - ) -} diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-create-selection.test-fixture.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-create-selection.test-fixture.ts index aaee7d53210..1f0ba092534 100644 --- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-create-selection.test-fixture.ts +++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-create-selection.test-fixture.ts @@ -1,22 +1,14 @@ -import { structuredAgentSessionStopControl } from '../../../../../shared/agent-session/view/structured-agent-session-stop-control' -import { isStructuredAgentSessionMainAgentWorking } from '../../../../../shared/agent-session/view/structured-agent-session-main-agent-working' import { expect, it, vi } from 'vitest' import { startStructuredAgentLaunch } from './structured-agent-session-launch' import { holdStructuredAgentSessionLaunchOption } from './structured-agent-session-launch-options' -import { recordHostModelCatalogSnapshot } from '@/runtime/native-chat/model-catalogs/host-model-catalog-snapshots' import { newAgentLaunchRequestId } from './routing/agent-launch-request-id' import { mocks, deferred, - start, createParams, - target, created, draft } from './structured-agent-session-launch-create-message.test-fixture' -import { structuredAgentSessionCreateFingerprint } from '../../../../../shared/agent-session/lifecycle/structured-agent-session-mutation' -import { getStructuredAgentSessionReadOwner } from '@/components/native-chat/session/structured/read/structured-agent-session-read-owner' -import { getStructuredAgentSessionPendingSends } from '@/components/native-chat/session/structured/delivery/structured-agent-session-pending-sends' import { readStructuredAgentLaunchRecord } from './structured-agent-session-launch-persistence' import { getStructuredLaunchStateBySessionId } from './structured-agent-session-launch-registry' import { structuredSessionSelectionController } from '../options/structured-agent-session-selection-controller' @@ -24,68 +16,6 @@ import { setRuntimeEnvironmentConnectionGenerationForTests } from '@/store/slice import { replaceRuntimeEnvironmentRevisions } from '@/runtime/rpc/environment-revisions/runtime-environment-revision' export function registerCreateSelectionTests(): void { - it('freezes the message and held options in create and publishes without another read or send', async () => { - mocks.exactSupport.mockResolvedValue(true) - recordHostModelCatalogSnapshot(target, 'codex', null, { - origin: 'probe', - fetchedAt: 1, - defaultHoldsInEveryWorkspace: true, - models: [ - { - id: 'picked-model', - label: 'Picked', - isDefault: false, - efforts: [ - { value: 'low', label: 'Low' }, - { value: 'high', label: 'High' } - ] - } - ] - }) - const create = deferred() - mocks.call.mockReturnValue(create.promise) - const launch = start() - holdStructuredAgentSessionLaunchOption(launch.sessionId, 'model', 'picked-model') - holdStructuredAgentSessionLaunchOption(launch.sessionId, 'effort', 'high') - await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce()) - const params = createParams() - expect(params.firstMessage?.body.blocks).toEqual([{ type: 'text', text: 'opening text' }]) - expect(params.options).toEqual({ model: 'picked-model', effort: 'high' }) - expect(params.firstMessage?.selection).toEqual({ model: 'picked-model', effort: 'high' }) - expect(params.envelope.payloadFingerprint).toBe( - structuredAgentSessionCreateFingerprint({ sessionId: launch.sessionId, ...params }) - ) - expect(getStructuredAgentSessionPendingSends(launch.sessionId)[0]?.phase).toBe('sending') - const stop = vi.fn(async () => null) - expect( - structuredAgentSessionStopControl({ - published: false, - host: { stopsConversation: true, stop }, - transportState: { turnId: null, isWorking: false }, - sends: { sending: true, stopSends: vi.fn() } - }).canStop - ).toBe(false) - create.resolve(created()) - await launch.launchResult - await expect(launch.promptDeliveryResult).resolves.toMatchObject({ delivered: true }) - const state = getStructuredAgentSessionReadOwner(launch.sessionId, target).getSnapshot().state - expect(state.fence).toBe(1) - const isWorking = isStructuredAgentSessionMainAgentWorking(null, state.submissions, state.fence) - expect(isWorking).toBe(true) - const control = structuredAgentSessionStopControl({ - published: true, - host: { stopsConversation: true, stop }, - transportState: { turnId: null, isWorking }, - sends: { sending: false, stopSends: vi.fn() } - }) - expect(control.canStop).toBe(true) - await control.stop() - expect(stop).toHaveBeenCalledWith(null, expect.any(Function)) - expect(draft(launch.sessionId)).toBe('') - expect(mocks.inventory).not.toHaveBeenCalled() - expect(mocks.call.mock.calls.map(([, method]) => method)).toEqual(['agentSession.create']) - }) - it('keeps frozen selection completed when exact create proof arrives after the deadline', async () => { const create = deferred() mocks.call.mockReturnValue(create.promise) From e41e84e5d7f46a267042ab87352299a961d4ee52 Mon Sep 17 00:00:00 2001 From: Wooseong Kim <2222333+innocarpe@users.noreply.github.com> Date: Mon, 9 Nov 2026 21:04:01 +0900 Subject: [PATCH 30/90] fix(terminal): ignore the inverse caret glyph in an empty Claude composer (#40225) Claude paints the caret over the first glyph of a dim composer suggestion as an undimmed inverse cell. The typed-text read kept that glyph, so an empty composer reported a one-character draft and the stock Try "..." placeholder was never recognized. Treat a lone inverse caret glyph ahead of a longer dim suggestion as untyped, while keeping a real typed last glyph that sits before a dim argument hint (e.g. /commit [message]). Fixes #40195 Co-authored-by: Neil <4138956+nwparker@users.noreply.github.com> --- .../terminal-cursor-line-context.test.ts | 26 +++++++++++++++++++ .../terminal/input/terminal-composer-draft.ts | 18 ++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/src/main/daemon/emulation/testing/terminal-cursor-line-context.test.ts b/src/main/daemon/emulation/testing/terminal-cursor-line-context.test.ts index a6e056b27f6..117079bad27 100644 --- a/src/main/daemon/emulation/testing/terminal-cursor-line-context.test.ts +++ b/src/main/daemon/emulation/testing/terminal-cursor-line-context.test.ts @@ -118,6 +118,32 @@ describe('readTerminalCursorLineContext', () => { } }) + it.each([ + { typed: '', caret: 'T', dim: 'ry "how do I log an error?"', draft: null, typedText: '' }, + { typed: '', caret: 'f', dim: 'ix the login bug', draft: 'fix the login bug', typedText: '' }, + { typed: '', caret: 'a', dim: ' quick fix', draft: 'a quick fix', typedText: '' }, + { typed: '/mo', caret: 'd', dim: 'el', draft: '/model', typedText: '/mo' }, + { typed: '/commi', caret: 't', dim: ' [message]', draft: '/commit', typedText: '/commit' } + ])( + "reads Claude's caret glyph $caret after '$typed' before dim '$dim'", + ({ typed, caret, dim, draft, typedText }) => { + const cols = 80 + const terminal = new Terminal({ cols, rows: 8, allowProposedApi: true }) + try { + writeSync( + terminal, + `\x1b[?25l${'─'.repeat(cols)}\r\n❯ ${typed}\x1b7\x1b[7m${caret}\x1b[27m\x1b[2m${dim}\x1b[22m\r\n${'─'.repeat(cols)}\x1b8` + ) + const context = readTerminalCursorLineContext(terminal, terminal.rows) + expect(context).toMatchObject({ cursorHidden: true, cursorInverse: true }) + expect(detectTerminalComposerDraft(context)?.text ?? null).toBe(draft) + expect(readTerminalComposerTypedText(context)).toBe(typedText) + } finally { + terminal.dispose() + } + } + ) + it.each([ { cols: 19, cursorRowTail: 'proceed with the ', continuation: 'release' }, { cols: 18, cursorRowTail: 'proceed with the', continuation: ' release' } diff --git a/src/shared/terminal/input/terminal-composer-draft.ts b/src/shared/terminal/input/terminal-composer-draft.ts index 8e140b440b5..0ac60854c3e 100644 --- a/src/shared/terminal/input/terminal-composer-draft.ts +++ b/src/shared/terminal/input/terminal-composer-draft.ts @@ -148,6 +148,21 @@ function isHiddenComposerCaret( ) } +// Why: Claude paints its caret over a suggestion's first glyph undimmed and dims the rest (#40195). +function isCaretOverDimSuggestion(context: TerminalCursorContext): boolean { + const painted = context.afterCursor + const raw = context.rawAfterCursor + return ( + context.cursorInverse === true && + [...painted].length === 1 && + raw.length > painted.length && + raw.startsWith(painted) && + // Why: on a typed word's last glyph the caret sits before a dim hint and the glyph is real. + (!context.beforeCursor.replace(COMPOSER_PROMPT_PREFIX, '').trim() || + !/\s/.test(raw[painted.length] ?? '')) + ) +} + function detectTerminalComposer( context: TerminalCursorContext | null | undefined, typedOnly = false @@ -157,7 +172,8 @@ function detectTerminalComposer( } const cursorIndex = context.rows.length - 1 const codexFooterIndex = findCodexFooterIndex(context) - let afterCursor = typedOnly ? context.afterCursor : context.afterCursor || context.rawAfterCursor + const typedAfter = isCaretOverDimSuggestion(context) ? '' : context.afterCursor + let afterCursor = typedOnly ? typedAfter : typedAfter || context.rawAfterCursor let continuationRows = composerContinuationRows(context, afterCursor, codexFooterIndex, typedOnly) // Why: the continuation walk stops at the row that would close the frame; typed-only walks also // stop at dim suggestion rows, which still sit inside the frame. From 0ad972974f9710b6cb7d0270792c58c42c888bda Mon Sep 17 00:00:00 2001 From: Neil <4138956+nwparker@users.noreply.github.com> Date: Mon, 9 Nov 2026 04:04:24 -0800 Subject: [PATCH 31/90] test(e2e): give the provisioned-root VM a reachable git remote (#40318) * test(e2e): give the provisioned-root VM a reachable git remote VM creates now run the environment checks before creating the workspace (#40152). The fixture VM's origin pointed at a GitHub URL it cannot push to, so the git push check failed and the create paused on the build sheet; the spec then read the VM's primary checkout before it was adopted. Point the VM checkout at a local bare repo so the checks pass. * test(e2e): wait for the provisioned root's adoption, not its listing The VM's primary checkout appears under its branch name once its project is set up, before the environment checks finish and adoption writes ephemeralVmCheckoutMode. Poll for the adopted row instead. --- tests/e2e/ssh-orcad-vm-provisioned-root.spec.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tests/e2e/ssh-orcad-vm-provisioned-root.spec.ts b/tests/e2e/ssh-orcad-vm-provisioned-root.spec.ts index c5615fd7416..f436745acea 100644 --- a/tests/e2e/ssh-orcad-vm-provisioned-root.spec.ts +++ b/tests/e2e/ssh-orcad-vm-provisioned-root.spec.ts @@ -60,6 +60,8 @@ test('adopts a recipe-provisioned SSH root without creating a linked worktree', timeout: 240_000 }) + // Why: the VM's primary checkout is listed (named after its branch) as soon as its project is + // set up, while the environment checks still run; only adoption stamps the checkout mode. const findAdopted = () => orcaPage.evaluate( ({ sourceRepoId, workspaceName }) => @@ -67,7 +69,9 @@ test('adopts a recipe-provisioned SSH root without creating a linked worktree', .flat() .find( (worktree) => - worktree.displayName === workspaceName && worktree.repoId !== sourceRepoId + worktree.displayName === workspaceName && + worktree.repoId !== sourceRepoId && + worktree.ephemeralVmCheckoutMode === 'provisioned-root' ) ?? null, { sourceRepoId, workspaceName } ) @@ -212,5 +216,12 @@ ${docker} rm -f ${quotePosixShell(target.containerName)} >/dev/null target, `chown -R root:root ${quotePosixShell(DOCKER_SSH_HOST_REMOTE_REPO_PATH)}` ) + // Why: VM creates run the environment checks first, and a VM that cannot fetch or push its + // remote pauses the create. Give the VM a remote it can reach so the create proceeds unattended. + const vmOrigin = '/tmp/provisioned-root-origin.git' + execDockerSshHostTargetCommand( + target, + `git init --bare -q ${quotePosixShell(vmOrigin)} && git -C ${quotePosixShell(DOCKER_SSH_HOST_REMOTE_REPO_PATH)} remote set-url origin ${quotePosixShell(vmOrigin)}` + ) return expectedRefHead } From c3a429880d7fc8436dba2ca2585f4dc7279f8565 Mon Sep 17 00:00:00 2001 From: Neil <4138956+nwparker@users.noreply.github.com> Date: Mon, 9 Nov 2026 04:11:36 -0800 Subject: [PATCH 32/90] refactor(environment-providers): add EnvironmentProviderDriver, contract test kit and ShellRecipeDriver (#40315) One lifecycle seam (create/resume/suspend/destroy/status + capability flags and a catalogued error type) that every environment provider implements, a shared vitest contract any driver runs from its own test, and ShellRecipeDriver, which wraps today's orca.yaml / plugin VM recipe runner and passes the contract. No production callers yet. --- ...t-provider-driver-contract.test-support.ts | 105 +++++++ .../environment-provider-driver.ts | 125 ++++++++ .../shell-recipe-driver.test.ts | 68 +++++ .../shell-recipe-driver.ts | 286 ++++++++++++++++++ 4 files changed, 584 insertions(+) create mode 100644 src/main/environment-providers/environment-provider-driver-contract.test-support.ts create mode 100644 src/main/environment-providers/environment-provider-driver.ts create mode 100644 src/main/environment-providers/shell-recipe-driver.test.ts create mode 100644 src/main/environment-providers/shell-recipe-driver.ts diff --git a/src/main/environment-providers/environment-provider-driver-contract.test-support.ts b/src/main/environment-providers/environment-provider-driver-contract.test-support.ts new file mode 100644 index 00000000000..0ca2c695584 --- /dev/null +++ b/src/main/environment-providers/environment-provider-driver-contract.test-support.ts @@ -0,0 +1,105 @@ +// Shared lifecycle contract every EnvironmentProviderDriver must pass; drivers call it from their test. +import { describe, expect, it } from 'vitest' +import { + getEphemeralVmRecipeResultConnection, + getEphemeralVmRecipeResultProjectRoot, + isAbsoluteRuntimePath +} from '../../shared/ephemeral-vm-recipes' +import { + ENVIRONMENT_PROVIDER_ERROR_CODES, + isEnvironmentProviderError, + type EnvironmentCreateSpec, + type EnvironmentProviderDriver, + type EnvironmentReady +} from './environment-provider-driver' + +export type EnvironmentProviderDriverContractHarness = { + driver: EnvironmentProviderDriver + /** Ids the backing provider still holds; destroy must leave none behind. */ + liveEnvironmentIds: () => Promise + /** A fresh driver over the same backing provider, as after an Orca restart. */ + reopenDriver: () => EnvironmentProviderDriver +} + +// Handles are persisted with the runtime record, so later calls only ever see the JSON form. +function reload(handle: T): T { + return JSON.parse(JSON.stringify(handle)) +} + +export function runEnvironmentProviderDriverContract( + name: string, + makeHarness: () => Promise, + spec: (workspaceId: string) => EnvironmentCreateSpec = (workspaceId) => ({ workspaceId }) +): void { + describe(`${name} satisfies the environment provider driver contract`, () => { + function expectReady(driver: EnvironmentProviderDriver, ready: EnvironmentReady): void { + expect(ready.handle.driverId).toBe(driver.id) + expect(ready.handle.environmentId).not.toBe('') + expect(['orca-server', 'ssh']).toContain( + getEphemeralVmRecipeResultConnection(ready.result).type + ) + expect(isAbsoluteRuntimePath(getEphemeralVmRecipeResultProjectRoot(ready.result))).toBe(true) + if (driver.capabilities.maxSessionMs !== null) { + expect(ready.session.deadlineAt).not.toBeNull() + expect(ready.session.deadlineAt! - ready.session.startedAt).toBeLessThanOrEqual( + driver.capabilities.maxSessionMs + ) + } + } + + it('creates, suspends, resumes and destroys one environment without leaking it', async () => { + const { driver, liveEnvironmentIds, reopenDriver } = await makeHarness() + const phases: string[] = [] + const created = await driver.create(spec('ws-contract-1'), { + onProgress: ({ phase }) => phases.push(phase) + }) + expectReady(driver, created) + expect(phases.length).toBeGreaterThan(0) + expect(await liveEnvironmentIds()).toContain(created.handle.environmentId) + expect((await driver.status(created.handle)).status).toBe('running') + + const suspended = await driver.suspend(created.handle) + expect(suspended.status).toBe('suspended') + expect((await driver.status(created.handle)).status).toBe('suspended') + + const resumed = await driver.resume(created.handle) + expectReady(driver, resumed) + expect(resumed.handle.environmentId).toBe(created.handle.environmentId) + expect((await driver.status(created.handle)).status).toBe('running') + + await driver.destroy(created.handle) + expect(await liveEnvironmentIds()).not.toContain(created.handle.environmentId) + // Idempotent: cleanup retries after a lost response or a restart must not fail. + await reopenDriver().destroy(reload(created.handle)) + }) + + it('refuses to bring back a destroyed environment, even after a restart', async () => { + const { driver, liveEnvironmentIds, reopenDriver } = await makeHarness() + const created = await driver.create(spec('ws-contract-2')) + await driver.destroy(created.handle) + const error = await reopenDriver() + .resume(reload(created.handle)) + .then( + () => null, + (caught: unknown) => caught + ) + expect(isEnvironmentProviderError(error)).toBe(true) + expect(await liveEnvironmentIds()).not.toContain(created.handle.environmentId) + }) + + it('rejects a cancelled create with a catalogued error and leaks nothing', async () => { + const { driver, liveEnvironmentIds } = await makeHarness() + const controller = new AbortController() + controller.abort() + const error = await driver.create(spec('ws-contract-3'), { signal: controller.signal }).then( + () => null, + (caught: unknown) => caught + ) + expect(isEnvironmentProviderError(error)).toBe(true) + expect(ENVIRONMENT_PROVIDER_ERROR_CODES).toContain( + isEnvironmentProviderError(error) ? error.code : null + ) + expect(await liveEnvironmentIds()).toEqual([]) + }) + }) +} diff --git a/src/main/environment-providers/environment-provider-driver.ts b/src/main/environment-providers/environment-provider-driver.ts new file mode 100644 index 00000000000..7edfb2d1310 --- /dev/null +++ b/src/main/environment-providers/environment-provider-driver.ts @@ -0,0 +1,125 @@ +// One lifecycle seam for VM-backed workspaces: every environment provider answers the same calls, +// and capability flags (not provider ids) decide what the UI offers. +import type { EphemeralVmRecipeResult, JsonValue } from '../../shared/ephemeral-vm-recipes' + +export type EnvironmentProviderCapabilities = Readonly<{ + /** Suspend keeps memory and processes; false means suspend/resume is a reboot from disk. */ + memoryPause: boolean + /** Hard per-session cap enforced by the provider; null when sessions are unbounded. */ + maxSessionMs: number | null + /** The filesystem (worktree, auth homes, orcad identity) survives suspend. */ + fsPersistOnStop: boolean + /** Orca-owned idle stop; null when the provider has none. */ + idleStopMs: number | null +}> + +export type EnvironmentProviderPhase = + | 'provisioning' + | 'booting' + | 'connecting' + | 'suspending' + | 'resuming' + | 'destroying' + +export type EnvironmentProviderCallContext = { + signal?: AbortSignal + onProgress?: (progress: { phase: EnvironmentProviderPhase; message?: string }) => void +} + +export type EnvironmentCreateSpec = { + /** Orca's workspace id; one environment per workspace. */ + workspaceId: string + workspaceName?: string + projectId?: string + machineSize?: string + region?: string + repo?: { url: string; ref?: string } +} + +/** Persisted with the runtime record; `driverState` is opaque to everything but the driver. */ +export type EnvironmentHandle = { + driverId: string + environmentId: string + driverState: Record +} + +export type EnvironmentSessionInfo = { + startedAt: number + /** When the provider will end this session regardless of activity. */ + deadlineAt: number | null +} + +export type EnvironmentStatus = + | 'provisioning' + | 'running' + | 'suspending' + | 'suspended' + | 'resuming' + | 'destroying' + | 'destroyed' + | 'failed' + +export type EnvironmentStatusSnapshot = { + status: EnvironmentStatus + session: EnvironmentSessionInfo | null +} + +export type EnvironmentReady = { + handle: EnvironmentHandle + /** Same document a shell recipe prints, so runtime records, pairing and resume keep one path. */ + result: EphemeralVmRecipeResult + session: EnvironmentSessionInfo +} + +export type EnvironmentProviderDriver = { + readonly id: string + readonly capabilities: EnvironmentProviderCapabilities + create( + spec: EnvironmentCreateSpec, + ctx?: EnvironmentProviderCallContext + ): Promise + resume(handle: EnvironmentHandle, ctx?: EnvironmentProviderCallContext): Promise + suspend( + handle: EnvironmentHandle, + ctx?: EnvironmentProviderCallContext + ): Promise + /** Idempotent: an environment that is already gone resolves. */ + destroy(handle: EnvironmentHandle, ctx?: EnvironmentProviderCallContext): Promise + status( + handle: EnvironmentHandle, + ctx?: EnvironmentProviderCallContext + ): Promise +} + +export const ENVIRONMENT_PROVIDER_ERROR_CODES = [ + 'unauthorized', + 'not_found', + 'conflict', + 'invalid_request', + 'unavailable', + 'timeout', + 'aborted', + 'invalid_response' +] as const + +export type EnvironmentProviderErrorCode = (typeof ENVIRONMENT_PROVIDER_ERROR_CODES)[number] + +export class EnvironmentProviderError extends Error { + readonly code: EnvironmentProviderErrorCode + /** Machine-readable provider detail, e.g. the Orca failure-copy code behind the message. */ + readonly reason: string | null + + constructor(code: EnvironmentProviderErrorCode, message: string, reason: string | null = null) { + super(message) + this.name = 'EnvironmentProviderError' + this.code = code + this.reason = reason + } +} + +export function isEnvironmentProviderError( + error: unknown, + code?: EnvironmentProviderErrorCode +): error is EnvironmentProviderError { + return error instanceof EnvironmentProviderError && (code === undefined || error.code === code) +} diff --git a/src/main/environment-providers/shell-recipe-driver.test.ts b/src/main/environment-providers/shell-recipe-driver.test.ts new file mode 100644 index 00000000000..d7cafb409b5 --- /dev/null +++ b/src/main/environment-providers/shell-recipe-driver.test.ts @@ -0,0 +1,68 @@ +import { mkdirSync, mkdtempSync, readdirSync, rmSync, writeFileSync } from 'node:fs' +import { tmpdir } from 'node:os' +import { join } from 'node:path' +import { afterEach } from 'vitest' +import { encodePairingOffer } from '../../shared/remote-runtime/pairing/pairing' +import { PAIRING_OFFER_VERSION } from '../../shared/remote-runtime/pairing/mobile-relay-pairing-offer' +import type { OrcaVmRecipe } from '../../shared/orca-yaml-hook-types' +import { runEnvironmentProviderDriverContract } from './environment-provider-driver-contract.test-support' +import { ShellRecipeDriver } from './shell-recipe-driver' + +const tmpRoots: string[] = [] + +afterEach(() => { + for (const root of tmpRoots.splice(0)) { + rmSync(root, { recursive: true, force: true }) + } +}) + +// A recipe whose "VMs" are files in a state dir, so the contract can see what destroy left behind. +function makeFileBackedRecipe(): { repoPath: string; stateDir: string; recipe: OrcaVmRecipe } { + const repoPath = mkdtempSync(join(tmpdir(), 'orca-shell-recipe-driver-')) + tmpRoots.push(repoPath) + const stateDir = join(repoPath, 'vms') + mkdirSync(stateDir) + const pairingCode = encodePairingOffer({ + v: PAIRING_OFFER_VERSION, + endpoint: 'wss://vm.example.com', + deviceToken: 'token', + publicKeyB64: 'public-key' + }) + const vmFile = `require('node:path').join(${JSON.stringify(stateDir)}, process.env.ORCA_VM_INSTANCE_ID)` + const printResult = `console.log(JSON.stringify({ schemaVersion: 1, pairingCode: ${JSON.stringify(pairingCode)}, projectRoot: '/workspace/repo' }))` + const scripts = { + create: `require('node:fs').writeFileSync(${vmFile}, 'running'); ${printResult}`, + suspend: `require('node:fs').writeFileSync(${vmFile}, 'suspended')`, + // Like a real provider: a destroyed VM cannot be woken. + resume: `const fs = require('node:fs'); if (!fs.existsSync(${vmFile})) process.exit(1); fs.writeFileSync(${vmFile}, 'running'); ${printResult}`, + destroy: `require('node:fs').rmSync(${vmFile}, { force: true })` + } + const commands = Object.fromEntries( + Object.entries(scripts).map(([mode, source]) => { + const scriptPath = join(repoPath, `${mode}.js`) + writeFileSync(scriptPath, source) + return [mode, `"${process.execPath}" "${scriptPath}"`] + }) + ) + return { + repoPath, + stateDir, + recipe: { + id: 'file-backed', + name: 'File-backed VM', + create: commands.create, + suspend: commands.suspend, + resume: commands.resume, + destroy: commands.destroy + } + } +} + +runEnvironmentProviderDriverContract('ShellRecipeDriver', async () => { + const { repoPath, stateDir, recipe } = makeFileBackedRecipe() + return { + driver: new ShellRecipeDriver(recipe, repoPath), + liveEnvironmentIds: async () => readdirSync(stateDir), + reopenDriver: () => new ShellRecipeDriver(recipe, repoPath) + } +}) diff --git a/src/main/environment-providers/shell-recipe-driver.ts b/src/main/environment-providers/shell-recipe-driver.ts new file mode 100644 index 00000000000..4d962fbc744 --- /dev/null +++ b/src/main/environment-providers/shell-recipe-driver.ts @@ -0,0 +1,286 @@ +// orca.yaml environment recipes and plugin VM recipes as an environment provider: each lifecycle +// call runs the recipe's shell step, exactly as the runtime service did before the driver seam. +import { z } from 'zod' +import type { OrcaVmRecipe } from '../../shared/orca-yaml-hook-types' +import { + EphemeralVmRecipeResultSchema, + type EphemeralVmRecipeResult, + type JsonValue +} from '../../shared/ephemeral-vm-recipes' +import { + runEphemeralVmRecipeCleanup, + runEphemeralVmRecipeResume, + runEphemeralVmRecipeStart, + runEphemeralVmRecipeSuspend, + type EphemeralVmRecipeCleanupArgs, + type EphemeralVmRecipeContext, + type EphemeralVmRecipeLifecycleArgs, + type EphemeralVmRecipeStartArgs +} from '../../shared/ephemeral-vm-recipe-runner' +import { EPHEMERAL_VM_FAILURE_COPY } from '../../shared/ephemeral-vm-failure-copy' +import { getProvisionedRootResumeIntegrityError } from '../ephemeral-vm/resume-integrity' +import { + EnvironmentProviderError, + isEnvironmentProviderError, + type EnvironmentCreateSpec, + type EnvironmentHandle, + type EnvironmentProviderCallContext, + type EnvironmentProviderCapabilities, + type EnvironmentProviderDriver, + type EnvironmentReady, + type EnvironmentStatus, + type EnvironmentStatusSnapshot +} from './environment-provider-driver' + +export const SHELL_RECIPE_DRIVER_ID = 'shell-recipe' + +type RecipeStepArgs = Omit + +type RecipeStepFailure = { + error?: string + errorCode?: string + exitCode: number | null + aborted?: true + timedOut?: true +} + +const DriverStateSchema = z.object({ + recipeResult: EphemeralVmRecipeResultSchema, + projectId: z.string().optional(), + workspaceId: z.string().optional(), + workspaceName: z.string().optional() +}) + +export class ShellRecipeDriver implements EnvironmentProviderDriver { + readonly id = SHELL_RECIPE_DRIVER_ID + readonly capabilities: EnvironmentProviderCapabilities + // Recipes have no status step, so status only covers calls this instance ran; the runtime + // record stays the persisted source of truth. + private readonly statuses = new Map() + + constructor( + private readonly recipe: OrcaVmRecipe, + private readonly repoPath: string + ) { + this.capabilities = { + memoryPause: false, + maxSessionMs: null, + fsPersistOnStop: Boolean(recipe.suspend && recipe.resume), + idleStopMs: null + } + } + + // Recipe-shaped steps keep stdout/stderr and failure copy for runtime records and diagnostics. + runCreate(args: RecipeStepArgs) { + return runEphemeralVmRecipeStart({ ...args, recipe: this.recipe, repoPath: this.repoPath }) + } + + runSuspend(args: RecipeStepArgs) { + return runEphemeralVmRecipeSuspend({ ...args, recipe: this.recipe, repoPath: this.repoPath }) + } + + runResume(args: RecipeStepArgs) { + return runEphemeralVmRecipeResume({ ...args, recipe: this.recipe, repoPath: this.repoPath }) + } + + runDestroy(args: RecipeStepArgs) { + return runEphemeralVmRecipeCleanup({ ...args, recipe: this.recipe, repoPath: this.repoPath }) + } + + create(spec: EnvironmentCreateSpec, ctx: EnvironmentProviderCallContext = {}) { + return catalogued(() => this.createOnce(spec, ctx)) + } + + suspend(handle: EnvironmentHandle, ctx: EnvironmentProviderCallContext = {}) { + return catalogued(() => this.suspendOnce(handle, ctx)) + } + + resume(handle: EnvironmentHandle, ctx: EnvironmentProviderCallContext = {}) { + return catalogued(() => this.resumeOnce(handle, ctx)) + } + + destroy(handle: EnvironmentHandle, ctx: EnvironmentProviderCallContext = {}) { + return catalogued(() => this.destroyOnce(handle, ctx)) + } + + private async createOnce( + spec: EnvironmentCreateSpec, + ctx: EnvironmentProviderCallContext + ): Promise { + ctx.onProgress?.({ phase: 'provisioning' }) + const start = await this.runCreate({ + context: { + projectId: spec.projectId, + workspaceId: spec.workspaceId, + workspaceName: spec.workspaceName, + repoUrl: spec.repo?.url, + ref: spec.repo?.ref + }, + signal: ctx.signal + }) + if (!start.ok) { + const error = toProviderError(start) + if (start.recipeResult) { + // The VM exists even though Orca rejected its result; release it rather than leak it. + const cleanup = await this.runDestroy({ + context: start.context, + recipeResult: start.recipeResult + }) + if (!cleanup.ok || cleanup.skipped) { + const detail = cleanup.error ?? EPHEMERAL_VM_FAILURE_COPY.destroyDisabled + throw new EnvironmentProviderError(error.code, `${error.message} ${detail}`, error.reason) + } + } + throw error + } + const handle = toHandle(start.context, start.result) + this.statuses.set(handle.environmentId, 'running') + return toReady(handle, start.result) + } + + private async suspendOnce( + handle: EnvironmentHandle, + ctx: EnvironmentProviderCallContext + ): Promise { + const { context, recipeResult } = this.readHandle(handle) + ctx.onProgress?.({ phase: 'suspending' }) + const suspend = await this.runSuspend({ context, recipeResult, signal: ctx.signal }) + if (!suspend.ok) { + throw toProviderError(suspend) + } + // No suspend step: the VM keeps running. + const status = suspend.skipped ? 'running' : 'suspended' + this.statuses.set(handle.environmentId, status) + return { status, session: null } + } + + private async resumeOnce( + handle: EnvironmentHandle, + ctx: EnvironmentProviderCallContext + ): Promise { + const { context, recipeResult } = this.readHandle(handle) + ctx.onProgress?.({ phase: 'resuming' }) + const resume = await this.runResume({ context, recipeResult, signal: ctx.signal }) + if (!resume.ok) { + throw toProviderError(resume) + } + const result = resume.skipped ? recipeResult : resume.result + const integrityError = getProvisionedRootResumeIntegrityError(recipeResult, result) + if (integrityError) { + throw new EnvironmentProviderError('conflict', integrityError) + } + this.statuses.set(handle.environmentId, 'running') + return toReady(toHandle(context, result), result) + } + + private async destroyOnce( + handle: EnvironmentHandle, + ctx: EnvironmentProviderCallContext + ): Promise { + if (this.statuses.get(handle.environmentId) === 'destroyed') { + return + } + const { context, recipeResult } = this.readHandle(handle) + ctx.onProgress?.({ phase: 'destroying' }) + const cleanup = await this.runDestroy({ context, recipeResult, signal: ctx.signal }) + if (!cleanup.ok) { + throw toProviderError(cleanup) + } + if (cleanup.skipped) { + throw new EnvironmentProviderError( + 'invalid_request', + EPHEMERAL_VM_FAILURE_COPY.destroyDisabled, + 'destroyDisabled' + ) + } + this.statuses.set(handle.environmentId, 'destroyed') + } + + async status(handle: EnvironmentHandle): Promise { + const status = this.statuses.get(handle.environmentId) + if (!status) { + throw new EnvironmentProviderError('not_found', 'This driver has not run that environment.') + } + return { status, session: null } + } + + private readHandle(handle: EnvironmentHandle): { + context: EphemeralVmRecipeContext + recipeResult: EphemeralVmRecipeResult + } { + if (handle.driverId !== this.id) { + throw new EnvironmentProviderError('invalid_request', 'Handle belongs to another driver.') + } + if (this.statuses.get(handle.environmentId) === 'destroyed') { + throw new EnvironmentProviderError('not_found', 'Environment was destroyed.') + } + const state = DriverStateSchema.safeParse(handle.driverState) + if (!state.success) { + throw new EnvironmentProviderError('invalid_request', 'Handle has no recipe result.') + } + const { recipeResult, ...fields } = state.data + return { + context: { + ...fields, + instanceId: handle.environmentId, + recipeId: this.recipe.id, + repoPath: this.repoPath + }, + recipeResult + } + } +} + +function toHandle( + context: EphemeralVmRecipeContext, + recipeResult: EphemeralVmRecipeResult +): EnvironmentHandle { + const { instanceId, projectId, workspaceId, workspaceName } = context + if (!instanceId) { + throw new EnvironmentProviderError('invalid_response', 'Recipe run has no instance id.') + } + // Round-trip through JSON so the persisted state is plain data (drops undefined fields). + const driverState: Record = JSON.parse( + JSON.stringify({ recipeResult, projectId, workspaceId, workspaceName }) + ) + return { + driverId: SHELL_RECIPE_DRIVER_ID, + environmentId: instanceId, + driverState + } +} + +function toReady(handle: EnvironmentHandle, result: EphemeralVmRecipeResult): EnvironmentReady { + return { handle, result, session: { startedAt: Date.now(), deadlineAt: null } } +} + +// Spawn errors and a missing repo dir surface as plain errors; the contract promises catalogued ones. +async function catalogued(run: () => Promise): Promise { + try { + return await run() + } catch (error) { + if (isEnvironmentProviderError(error)) { + throw error + } + throw new EnvironmentProviderError( + 'unavailable', + error instanceof Error ? error.message : String(error) + ) + } +} + +function toProviderError(failure: RecipeStepFailure): EnvironmentProviderError { + const code = failure.aborted + ? 'aborted' + : failure.timedOut + ? 'timeout' + : // The step exited cleanly but Orca rejected what it printed. + failure.exitCode === 0 + ? 'invalid_response' + : 'unavailable' + return new EnvironmentProviderError( + code, + failure.error ?? 'Recipe step failed.', + failure.errorCode ?? null + ) +} From ef27841e290e4a6706f194abc78abebeec1018a5 Mon Sep 17 00:00:00 2001 From: Neil <4138956+nwparker@users.noreply.github.com> Date: Mon, 9 Nov 2026 04:24:18 -0800 Subject: [PATCH 33/90] refactor: group agent launch, status, and messaging owners (#40313) * refactor: group agent launch, status, and messaging owners * refactor: consolidate direct owner imports * refactor: import pane ownership directly in status listeners --- config/reliability-gates.jsonc | 8 +- .../scripts/ci/sharding/ci-shard-timings.json | 20 +- .../app-shell/startup-window-parity.test.ts | 4 +- .../ClaudeAccountSwitchSessionTree.tsx | 2 +- .../NativeChatResumeOnRestartAgentRow.tsx | 2 +- .../components/NewWorkspaceComposerCard.tsx | 2 +- .../activity/activity-event-state.ts | 9 +- .../activity/activity-thread-detail-pane.tsx | 2 +- .../activity-thread-hover-card-summary.tsx | 2 +- .../activity/activity-thread-presentation.ts | 2 +- .../activity/activity-thread-row.tsx | 2 +- .../activity/useActivityUnreadCount.ts | 2 +- .../AgentSessionContinuationDialog.tsx | 4 +- .../src/components/agent/AgentCombobox.tsx | 5 +- .../components/agent/AgentLaunchPicker.tsx | 3 +- .../agent/AgentLaunchPickerMenu.tsx | 2 +- .../agent/AgentLaunchPickerMenuRow.tsx | 2 +- .../agent/agent-combobox-surface-items.tsx | 7 +- .../agent/icons/AgentIcon.tsx} | 30 +-- .../agent/icons/agent-favicon-assets.ts | 70 ++++++ .../agent/icons}/agent-icon-glyphs.tsx | 2 +- .../agent/icons}/agent-type-icon.tsx | 6 +- .../AgentDefaultSurfacePreviews.tsx | 2 +- .../AutomationAgentLaunchPicker.tsx | 2 +- .../automations/AutomationDetail.tsx | 3 +- .../automations/AutomationEditorDialog.tsx | 2 +- .../AutomationEditorSettingsSidebar.test.tsx | 2 +- .../AutomationEditorSettingsSidebar.tsx | 2 +- .../automations/AutomationListFilterMenu.tsx | 5 +- .../automations/AutomationListLocalRow.tsx | 2 +- .../automations/automation-draft-model.ts | 2 +- .../use-automation-agent-picker-entries.ts | 2 +- .../use-automations-page-store-state.ts | 2 +- .../components/cmd-j/palette-live-status.tsx | 8 +- .../dashboard-popout/AgentKanbanCard.tsx | 2 +- .../dashboard-popout/AgentTerminalDialog.tsx | 2 +- .../dashboard/DashboardAgentRow.tsx | 21 +- .../components/dashboard/useRetainedAgents.ts | 9 +- .../ReviewNotesSendMenuContent.tsx | 16 +- .../review-notes-send-target-order.ts | 2 +- .../MobileEmulatorAgentSetupGuideSteps.tsx | 2 +- .../use-mobile-emulator-agent-setup-state.ts | 2 +- .../ChatUiHereFeatureTipVisual.tsx | 2 +- .../feature-tips/CliSkillSetupPanel.tsx | 5 +- .../feature-tips/CliSkillSetupTerminal.tsx | 2 +- .../feature-tip-session-panel-demo.tsx | 2 +- .../AgentCapabilitiesSetupAction.tsx | 2 +- .../feature-wall/BrowserUseSkillSetupCard.tsx | 2 +- .../feature-wall/FeatureWallBrowserAction.tsx | 4 +- .../feature-wall/OrchestrationSetupCard.tsx | 2 +- .../agent-capability-setup-status.ts | 2 +- .../agents-orchestration/StatusesPage.tsx | 3 +- .../ai-commit-pr-settings-helpers.ts | 2 +- .../use-feature-wall-tour-skills.ts | 5 +- .../feature-wall/useAiCommitPrSettings.ts | 2 +- .../FloatingTerminalOrchestrationDialog.tsx | 2 +- .../FloatingTerminalWindowControls.tsx | 3 +- ...ating-terminal-orchestration-visibility.ts | 2 +- ...se-native-chat-structured-composer-send.ts | 2 +- .../host-access/NativeChatInstallTile.tsx | 2 +- ...native-chat-agent-message-sender-source.ts | 2 +- .../rows/NativeChatAgentMessageCard.tsx | 2 +- .../pane/actions/use-native-chat-hand-off.tsx | 2 +- ...se-native-chat-session-context-actions.tsx | 2 +- .../native-chat-workspace-selection.ts | 6 +- .../serialized-screen-background-rows.test.ts | 2 +- ...se-structured-session-child-row-context.ts | 9 +- .../usage/NativeChatUsageLimitActions.tsx | 2 +- .../onboarding/AgentPickerButton.tsx | 3 +- .../src/components/onboarding/AgentStep.tsx | 2 +- .../onboarding/TerminalLaunchDemo.tsx | 3 +- .../onboarding/YoloPermissionsControl.tsx | 2 +- .../onboarding-completion-agent-launch.ts | 2 +- .../onboarding-feature-setup.test.ts | 2 +- .../onboarding/onboarding-feature-setup.ts | 2 +- .../use-onboarding-agent-surface.ts | 5 +- .../use-onboarding-flow-actions.test.tsx | 4 +- .../onboarding/use-onboarding-flow.ts | 2 +- .../orchestration-crew/CrewAgentIcons.tsx | 6 +- .../src/components/pet/PetOverlay.tsx | 2 +- .../src/components/pet/pet-agent-state.ts | 4 +- .../pull-request-page/checks/fix-launch.ts | 5 +- .../ai-vault/panel/AiVaultPanelControls.tsx | 2 +- .../scanning/AiVaultScanProgressStrip.tsx | 2 +- .../ai-vault-original-pane-index.ts | 2 +- .../session-actions/ai-vault-original-pane.ts | 2 +- .../ai-vault-session-continuation.ts | 2 +- .../ai-vault-session-launch-actions.ts | 2 +- .../ai-vault-session-row-display.tsx | 2 +- .../use-checks-panel-controller-state.tsx | 2 +- .../ai/SourceControlAgentActionDialogForm.tsx | 2 +- .../source-control/ai/controller-types.ts | 2 +- .../source-control/ai/recovery-launch.ts | 2 +- .../ai/runSourceControlAgentActionStart.ts | 2 +- .../ai/source-control-action-model-copy.ts | 2 +- ...urce-control-agent-action-dialog-result.ts | 2 +- ...rce-control-agent-action-dialog-support.ts | 4 +- .../ai/text-generation-dialog-form.tsx | 2 +- .../use-saved-source-control-action-start.ts | 2 +- .../use-source-control-action-agent-choice.ts | 2 +- .../use-source-control-launchable-agents.ts | 2 +- .../ai/useSourceControlAgentActionStart.ts | 2 +- .../sync/use-git-history-commit-actions.ts | 4 +- .../AntigravityAccountsSection.test.tsx | 4 +- .../providers/AntigravityAccountsSection.tsx | 2 +- .../providers/CursorAccountsSection.tsx | 2 +- .../providers/GrokAccountsSection.test.tsx | 2 +- .../providers/GrokAccountsSection.tsx | 2 +- .../usage/ZcodePlanAccountsSection.tsx | 2 +- .../settings/agents/agents-search.ts | 2 +- .../agents/launch/AgentCatalogRow.tsx | 2 +- .../agents/launch/AgentDefaultSetting.tsx | 3 +- .../agents/launch/AgentDetectionCatalog.tsx | 2 +- .../launch/AgentLaunchSettingsCatalog.tsx | 7 +- .../launch/AgentLaunchSettingsSection.tsx | 2 +- .../agent-permission-override-notice.tsx | 2 +- .../surfaces/AgentDefaultSurfaceSection.tsx | 2 +- .../settings/browser/use/BrowserUsePane.tsx | 2 +- .../browser/use/BrowserUseSkillStep.tsx | 2 +- .../settings/chat/ChatAgentLaunchSettings.tsx | 8 +- .../settings/chat/ChatNamingSetting.tsx | 2 +- .../settings/cli/install/CliSection.tsx | 2 +- .../ComputerUseSkillSetupPanel.tsx | 2 +- .../MobileEmulatorAgentControlRow.tsx | 2 +- .../agent-skill-nav-install-status.ts | 10 +- .../use-settings-navigation-model.ts | 7 +- .../orchestration/OrchestrationPane.tsx | 4 +- .../OrchestrationSkillAgentCoverage.tsx | 7 +- .../settings/page/use-settings-store-model.ts | 2 +- .../quick-commands/QuickCommandsList.tsx | 3 +- .../skills/linear/LinearAgentSkillPane.tsx | 2 +- .../SourceControlActionArguments.tsx | 2 +- .../source-control-action-recipe-options.ts | 2 +- .../settings/tasks/TaskSourceLinearSetup.tsx | 2 +- .../use-task-source-provider-readiness.ts | 2 +- .../recipes/EphemeralVmsPane.tsx | 2 +- .../setup-guide/use-setup-guide-progress.ts | 2 +- .../sidebar/LinearAgentSkillSetupDialog.tsx | 2 +- .../sidebar/LinearAgentSkillSetupPrompt.tsx | 4 +- .../sleep/use-worktree-sleep-state.ts | 2 +- ...e-visible-workspace-kanban-worktree-ids.ts | 2 +- .../activity/WorktreeCardAgents.tsx | 6 +- .../activity/title-derived-agent-row-input.ts | 17 ++ .../worktree-agent-activity-summary.ts | 9 +- .../worktree-agent-freshness-selector.ts | 9 +- .../activity/worktree-agent-rows.ts | 11 +- .../activity/worktree-card-agent-summary.ts | 2 +- .../worktree-card-compact-agent-line-order.ts | 4 +- .../worktree-card-compact-agent-row.tsx | 12 +- .../activity/worktree-card-compact-agents.tsx | 2 +- .../worktree-card-idle-child-agents.tsx | 2 +- .../worktree-card-send-target-inputs.ts | 2 +- .../worktree-title-derived-agent-rows.ts | 21 +- .../folder-workspace-composer-submit-input.ts | 2 +- .../folder-workspace-composer-submit.ts | 2 +- .../listing/sleeping-sweep-visibility.ts | 2 +- .../listing/use-agent-send-target.ts | 2 +- .../listing/use-visible-worktrees.ts | 2 +- .../skills/SkillFreshnessStatusPill.tsx | 2 +- .../skills/setup/AgentSkillSetupPanel.tsx | 2 +- .../skills/setup/WslAgentSkillSetupPanel.tsx | 2 +- .../setup/WslLinearAgentSkillInstallCta.tsx | 9 +- .../setup/linear-agent-skill-install-cta.tsx | 7 +- .../src/components/stats/StatsPane.tsx | 2 +- .../status-bar/StatusBarUsageEmptyCta.tsx | 2 +- .../status-bar/StatusBarVisibilityMenu.tsx | 2 +- .../provider-segment-monthly-window.test.tsx | 2 +- .../status-bar-pool-countdown.test.tsx | 4 +- .../src/components/status-bar/tooltip.tsx | 2 +- .../status-bar/usage-pool-label.test.ts | 4 +- ...use-workspace-space-decision-projection.ts | 2 +- .../workspace-space-presentation.ts | 14 +- .../components/tab-bar/QuickLaunchButton.tsx | 5 +- .../src/components/tab-bar/SortableTab.tsx | 2 +- .../tab-bar/TabBarCreateEntryRow.tsx | 2 +- .../tab-bar/TabBarQuickCommandItem.test.tsx | 6 +- .../tab-bar/TabBarQuickCommandItem.tsx | 3 +- .../tab-bar/TabBarQuickCommandsMenu.tsx | 2 +- ...rQuickCommandsMenu.virtualization.test.tsx | 6 +- .../src/components/tab-bar/TabDragPreview.tsx | 2 +- .../tab-bar/TerminalTabLeadingIcon.tsx | 2 +- .../tab-bar/native-chat-tab-agent-evidence.ts | 6 +- .../tab-bar/tab-agent-launch-options.ts | 2 +- .../tab-bar/tab-agent-row-presentation.ts | 2 +- .../tab-bar/terminal-tab-activity-status.ts | 9 +- ...use-new-tab-agent-menu-rows-owner.test.tsx | 2 +- .../tab-bar/use-new-tab-agent-menu-rows.ts | 8 +- .../tab-group/SplitPaneLandingAgentRow.tsx | 5 +- .../tab-moves-drawn-from-frames.test.ts | 4 +- .../components/terminal-agent-tab-shortcut.ts | 4 +- .../agent-status}/agent-idle-edge.ts | 8 +- .../terminal-agent-session-context-copy.ts | 2 +- .../terminal-pane-context-menu-types.ts | 2 +- ...erminal-pane-menu-agent-session-actions.ts | 2 +- .../use-terminal-pane-foundation.ts | 2 +- .../input/keyboard/terminal-ctrl-enter.ts | 4 +- .../keyboard/terminal-windows-shift-enter.ts | 4 +- .../claude-side-question-completion.test.ts | 4 +- .../parked-terminal-byte-watcher.ts | 2 +- .../parked-terminal-command-status.test.ts | 2 +- .../parked-terminal-command-status.ts | 2 +- .../command-inferred-pane-agent.ts | 4 +- .../pane-agent-status-routing.ts | 2 +- .../pane-agent-title-lifecycle.ts | 5 +- .../agent-identity/pane-title-observation.ts | 4 +- ...tion-command-code-status-inference.spec.ts | 35 +-- ...onnection-command-finished-cleanup.spec.ts | 55 +++-- ...nection-command-finished-late-done.test.ts | 12 +- ...onnection-foreground-agent-routing.spec.ts | 40 ++-- ...nnection-foreground-agent-sampling.spec.ts | 15 +- ...connection-foreground-process-exit.spec.ts | 5 +- ...on-foreground-routing-confirmation.spec.ts | 5 +- ...connection-process-exit-row-retire.test.ts | 12 +- ...ty-connection-typed-agent-identity.spec.ts | 90 +++++--- .../renderer-owned-pane-status.ts | 2 +- .../pty-connection/connect-pane-pty.ts | 4 +- ...connection-agent-idle-cursor-reset.spec.ts | 35 +-- ...ty-connection-hidden-codex-queries.spec.ts | 40 ++-- ...-connection-hidden-query-admission.spec.ts | 45 ++-- ...ion-hidden-startup-query-admission.spec.ts | 30 ++- ...nection-main-side-effect-authority.spec.ts | 35 +-- ...connection-mode-2031-subscriptions.spec.ts | 15 +- ...connection-hidden-resize-authority.spec.ts | 5 +- ...-connection-visibility-resume-size.spec.ts | 55 +++-- ...ote-reconnect-unimaged-pane-redraw.test.ts | 6 +- ...-owner-hydration-backend-retention.test.ts | 11 +- ...ection-runtime-owner-spawn-routing.spec.ts | 20 +- ...ion-runtime-pane-transport-routing.spec.ts | 55 +++-- ...and-finished-interrupt-arbitration.spec.ts | 5 +- ...ty-connection-hibernation-activity.spec.ts | 10 +- ...pty-connection-interrupt-inference.spec.ts | 65 +++--- ...nection-native-query-reply-routing.spec.ts | 10 +- ...tion-remote-new-terminal-typeahead.test.ts | 6 +- ...y-connection-terminal-input-gating.spec.ts | 85 ++++--- ...ion-terminal-input-session-listing.spec.ts | 5 +- ...ion-windows-focus-report-authority.spec.ts | 25 ++- ...-connection-deliberate-sleep-guard.spec.ts | 45 ++-- ...nnection-git-bash-console-capacity.test.ts | 12 +- ...-hibernation-kill-shell-foreground.test.ts | 6 +- .../pty-connection-hibernation-wake.spec.ts | 55 +++-- ...-connection-hidden-sleeping-resume.spec.ts | 56 +++-- ...n-provider-rebind-callback-fencing.spec.ts | 15 +- .../pty-connection-pty-exit-teardown.spec.ts | 85 ++++--- ...nection-pty-shutdown-exit-deferral.spec.ts | 16 +- .../pty-connection-session-liveness.spec.ts | 60 +++-- ...ction-hook-completion-side-effects.spec.ts | 20 +- ...y-connection-hook-idle-arbitration.test.ts | 22 +- ...ction-notification-settings-gating.spec.ts | 15 +- ...-connection-task-complete-dispatch.spec.ts | 15 +- ...-output-restore-unavailable-banner.test.ts | 6 +- ...ry-carry-osc-introducer-leak.repro.test.ts | 4 +- ...tion-hidden-backlog-reconciliation.spec.ts | 5 +- ...connection-hidden-backlog-snapshot.test.ts | 26 ++- ...ty-connection-hidden-delivery-gate.spec.ts | 5 +- ...y-connection-hidden-output-restore.spec.ts | 30 ++- ...on-hidden-query-snapshot-authority.spec.ts | 30 ++- ...ection-hidden-restore-fit-overflow.test.ts | 7 +- ...ion-hidden-restore-loss-disclosure.test.ts | 11 +- ...tion-hidden-restore-marker-handoff.test.ts | 6 +- ...connection-hidden-runtime-snapshot.test.ts | 10 +- ...ction-hidden-snapshot-live-overlap.spec.ts | 15 +- ...ion-hidden-snapshot-resize-signals.spec.ts | 25 ++- ...n-post-dispose-restore-termination.test.ts | 6 +- ...onnection-remote-pause-drop-notice.spec.ts | 5 +- ...connection-replay-payload-handling.spec.ts | 70 +++--- ...ection-restored-baseline-shortfall.test.ts | 6 +- ...-connection-stalled-hidden-restore.spec.ts | 55 +++-- ...on-visible-pane-output-pause-latch.test.ts | 6 +- ...ote-park-reveal-unverifiable-retry.test.ts | 6 +- ...y-connection-foreground-write-path.spec.ts | 50 +++-- ...onnection-hidden-output-scheduling.spec.ts | 45 ++-- ...ty-connection-agent-session-resume.spec.ts | 25 ++- ...nnection-cold-restore-agent-resume.spec.ts | 30 ++- ...ty-connection-cold-restore-repaint.spec.ts | 20 +- ...ection-cold-restore-resume-command.spec.ts | 20 +- ...-connection-daemon-snapshot-replay.spec.ts | 211 ++++-------------- ...tion-deferred-reattach-live-output.spec.ts | 45 ++-- .../pty-connection-owner-error-retry.spec.ts | 15 +- ...nection-park-reveal-model-snapshot.spec.ts | 5 +- .../pty-connection-reattach-binding.test.ts | 73 ++++-- ...pty-connection-reattach-mode-reset.spec.ts | 70 +++--- ...y-connection-remote-runtime-attach.spec.ts | 20 +- ...ection-remote-snapshot-image-title.test.ts | 6 +- ...tion-restored-runtime-pane-binding.spec.ts | 10 +- ...ction-stale-daemon-snapshot-replay.spec.ts | 188 ++++++++++++++++ .../pty-connection-fresh-spawn-guards.spec.ts | 85 ++++--- ...connection-main-pane-restore-start.test.ts | 4 +- .../pty-connection-main-pane-start.test.ts | 8 +- .../pty-connection-pending-spawn.spec.ts | 10 +- ...ion-restart-replacement-stop-claim.spec.ts | 5 +- ...-connection-sleeping-resume-banner.spec.ts | 25 ++- ...ty-connection-spawn-deferred-sleep.test.ts | 30 ++- .../spawn/pty-connection-split-spawn.spec.ts | 50 +++-- .../agent-pre-ready-typed-draft.test.ts | 14 +- .../startup/agent-pre-ready-typed-draft.ts | 4 +- .../startup/cold-restore-resume-startup.ts | 2 +- ...-agent-startup-launch-registration.spec.ts | 10 +- ...-connection-queued-startup-consume.test.ts | 14 +- ...ty-connection-split-cwd-resolution.test.ts | 6 +- ...onnection-startup-command-delivery.spec.ts | 15 +- ...-connection-startup-draft-delivery.spec.ts | 21 +- .../startup/sleeping-record-access.ts | 2 +- .../startup/startup-draft-paste.ts | 2 +- .../pty-connection-mocks.spec.ts | 2 +- .../pty-connection-test-environment.ts | 4 +- ...ty-connection-test-hidden-restore-flood.ts | 4 +- ...-connection-kitty-keyboard-restore.spec.ts | 10 +- .../ipc/pty-transport-connect-spawn.test.ts | 5 +- .../remote-runtime-pty-transport.ts | 2 +- .../TerminalQuickCommandsSubmenu.tsx | 2 +- .../terminal-agent-session-continuation.ts | 2 +- .../terminal-agent-session-fork.ts | 2 +- ...ote-snapshot-alt-screen-host-chain.test.ts | 6 +- .../remote-snapshot-alt-screen-replay.test.ts | 6 +- .../TerminalQuickCommandDialog.tsx | 2 +- .../terminal-quick-command-agent-options.ts | 2 +- .../components/terminal-workspace-keydown.ts | 2 +- ...orktree-jump-palette-workspace-tab-row.tsx | 2 +- .../hooks/agent-hook-turn-end-ownership.ts | 4 +- .../composer-state/host-runtime-effects.ts | 2 +- .../composer-state/quick-creation-request.ts | 2 +- .../composer-state/quick-startup-plan.ts | 2 +- .../workspace-identity-state.ts | 2 +- .../agent-status-event-applicator.ts | 2 +- .../ipc-events/agent-status-listeners.ts | 2 +- .../hooks/ipc-events/agent-status-routing.ts | 2 - ...minal-request-ipc-bridge-placement.test.ts | 4 +- .../src/hooks/use-linear-agent-skill-setup.ts | 4 +- .../use-local-cli-skill-freshness-name.ts | 2 +- .../src/hooks/use-onboarding-skill-runtime.ts | 5 +- .../src/hooks/useInstalledAgentSkills.ts | 4 +- .../src/lib/activity-thread-display.ts | 4 +- .../agent-catalog-entries-primary.ts | 4 +- .../agent-catalog-entries-secondary.ts | 0 .../agent-catalog-entries.ts | 2 +- .../agent-catalog-platform.ts | 0 .../src/lib/agent-catalog/agent-catalog.ts | 31 +++ .../agent-picker-search.ts | 4 +- src/renderer/src/lib/agent-favicon-assets.ts | 70 ------ .../agent-account-restart-startup.test.ts | 4 +- .../accounts/agent-account-restart-startup.ts | 2 +- .../context}/agent-session-continuation.ts | 8 +- .../context}/agent-session-fork-context.ts | 2 +- .../context}/copy-agent-session-context.ts | 0 .../launch-agent-session-continuation.ts | 6 +- .../launch/failure}/agent-launch-failure.ts | 6 +- .../agent-detection-target-inventory.ts | 14 +- .../native-chat-provider-choice.test.tsx | 2 +- .../launch/native-chat-provider-choice.ts | 2 +- ...ent-launch-caller-prompt-transport.test.ts | 4 +- .../agent-launch-caller-routing.test.ts | 8 +- .../agent-tab-launch-outcome.test-fixture.ts | 2 +- ...unch-agent-in-new-tab-main-surface.test.ts | 2 +- .../launch-agent-in-new-tab-test-fixture.ts | 8 +- ...h-agent-in-new-tab-windows-quoting.test.ts | 2 +- .../launch-agent-in-new-tab.test-fixture.ts | 4 +- .../new-tab/launch-agent-in-new-tab.test.ts | 2 +- .../launch/new-tab/launch-agent-in-new-tab.ts | 2 +- ...agent-new-tab-host-route-readiness.test.ts | 5 +- ...unch-agent-structured-chat-test-fixture.ts | 10 +- .../new-tab/launch-agent-tab-refusal.ts | 5 +- ...nt-launch-pane-verdict-application.test.ts | 4 +- .../agent-launch-tab-main-written.test.ts | 4 +- .../pane/agent-launch-tab-publication.test.ts | 4 +- .../pane/agent-launch-through-host.test.ts | 4 +- .../prompt/agent-launch-prompt-delivery.ts | 4 +- .../agent-launch-prompt-failure-notice.ts | 4 +- .../launch/routing}/agent-menu-selection.ts | 12 +- .../routing/agent-session-launch-plan.ts | 5 +- .../routing}/new-tab-agent-menu-rows.ts | 4 +- .../launch/shortcuts}/agent-tab-shortcuts.ts | 20 +- ...gent-startup-delayed-delivery-perf.test.ts | 2 +- .../agent-startup-delayed-delivery.ts | 6 +- .../startup}/agent-startup-delivery-guards.ts | 0 ...ructured-agent-session-launch-admission.ts | 2 +- ...agent-session-launch-after-failure.test.ts | 2 +- ...ed-agent-session-launch-close-race.test.ts | 2 +- ...-session-launch-completion.test-fixture.ts | 2 +- ...t-session-launch-different-request.test.ts | 2 +- ...-agent-session-launch-exited-owner.test.ts | 2 +- ...agent-session-launch-join-delivery.test.ts | 2 +- .../structured-agent-session-launch-label.ts | 2 +- ...tured-agent-session-launch-options.test.ts | 2 +- ...d-agent-session-launch-outcome-tracking.ts | 2 +- ...ent-session-launch-resume-identity.test.ts | 2 +- ...launch-selection-admission.test-fixture.ts | 2 +- ...sion-launch-unconfirmed-or-retried.test.ts | 2 +- ...tured-agent-session-launch.test-fixture.ts | 2 +- ...-agent-session-new-chat-own-launch.test.ts | 2 +- .../messaging}/agent-message-send.test.ts | 12 +- .../messaging}/agent-message-send.ts | 16 +- .../messaging}/agent-message-target.ts | 0 .../agent-send-disabled-reason-label.ts | 0 .../messaging}/agent-send-title-status.ts | 11 +- .../messaging}/notes-send-agent-targets.ts | 15 +- .../paste}/agent-draft-paste-content.ts | 8 +- .../messaging/paste}/agent-draft-readiness.ts | 6 +- .../paste}/agent-followup-delivery.ts | 8 +- .../paste}/agent-native-draft-prefill.ts | 4 +- .../agent-paste-draft-submit-retry.test.ts | 23 +- .../paste}/agent-paste-draft.test.ts | 26 ++- .../messaging/paste}/agent-paste-draft.ts | 26 +-- .../messaging/paste}/agent-ready-wait.ts | 10 +- .../messaging}/running-agent-targets.ts | 14 +- .../active-agent-note-send-delivery.ts | 8 +- .../active-agent-note-send-diagnostics.ts | 2 +- ...ve-agent-note-send-explicit-target.test.ts | 2 +- ...ve-agent-note-send-focused-session.test.ts | 2 +- .../active-agent-note-send-result.ts | 2 +- .../active-agent-note-send-test-harness.ts | 4 +- .../terminal}/active-agent-note-send.ts | 20 +- .../terminal}/active-agent-note-target.ts | 32 +-- .../active-agent-terminal-send-readiness.ts | 6 +- .../navigation}/claude-agent-row-view.ts | 12 +- .../agent-resume-launch-target.test.ts | 0 .../resume}/agent-resume-launch-target.ts | 14 +- .../resume/sleeping-agent-session-launch.ts | 2 +- .../aggregation/worktree-agent-status.ts} | 35 +-- .../evidence}/agent-status-epoch-clock.ts | 0 .../evidence}/agent-status-epoch-selector.ts | 0 .../evidence}/agent-status-terminal-title.ts | 8 +- .../evidence}/pane-agent-evidence.ts | 45 +--- .../agent-status-connection-ownership.ts | 6 +- .../ownership}/agent-status-pane-ownership.ts | 10 +- .../presentation}/agent-row-dot-state.ts | 8 +- .../presentation}/agent-row-stopping-label.ts | 6 +- .../presentation}/agent-row-tool-preview.ts | 8 +- .../agent-verdict-status-line.ts | 6 +- .../lib/command-code-prompt-status-seed.ts | 2 +- .../lib/desktop-created-server-tabs.test.ts | 4 +- .../src/lib/environment-setup-agent-launch.ts | 2 +- .../src/lib/fix-checks-agent-launch.ts | 2 +- .../src/lib/host-chat-program-acquisition.ts | 2 +- .../src/lib/host-chat-program.test.ts | 2 +- src/renderer/src/lib/host-chat-program.ts | 2 +- .../lib/launch-agent-hosted-prompt.test.ts | 4 +- src/renderer/src/lib/linear-usage-examples.ts | 2 +- .../src/lib/new-agent-prompt-outcome.ts | 2 +- src/renderer/src/lib/new-workspace.test.ts | 4 +- src/renderer/src/lib/new-workspace.ts | 6 +- .../src/lib/onboarding-folder-agent-launch.ts | 5 +- .../src/lib/recent-workspace-tab-rows.ts | 9 +- .../lib/{ => skills}/agent-skill-coverage.ts | 6 +- .../agent-feature-install-commands.ts | 2 +- .../agent-feature-skill-names.ts | 0 .../agent-skill-cli-prerequisite.test.ts | 2 +- .../agent-skill-cli-prerequisite.ts | 2 +- .../linear-agent-skill-update-target.ts | 7 +- .../orchestration-skill-coverage.ts | 10 +- .../skill-freshness-display-status.ts | 4 +- .../ai/source-control-agent-picker.ts | 2 +- .../src/lib/text-generation-error-copy.ts | 2 +- .../agent-output-error-copy.ts | 2 +- .../lib/web-host-agent-launch-completion.ts | 2 +- .../active-worktree-removal-successor.test.ts | 4 +- .../empty-workspace-default-agent-chat.ts | 2 +- .../launch-work-item-direct-agent-routing.ts | 4 +- .../launch-work-item-direct-messages.ts | 4 +- .../launch-work-item-direct-preflight.ts | 4 +- ...unch-work-item-direct-route-preparation.ts | 2 +- .../launch-work-item-direct-setup.test.tsx | 2 +- .../launch-work-item-direct-test-fixture.ts | 2 +- .../launch-work-item-direct-types.ts | 2 +- .../work-item/launch-work-item-direct.ts | 2 +- .../workspace-terminal-host-authority.test.ts | 4 +- .../src/lib/worktree-activity-state.ts | 2 +- src/renderer/src/lib/worktree-status.ts | 6 +- ...b-runtime-terminal-prompt-delivery.test.ts | 4 +- .../agent-catalogs}/chat-provider-agents.ts | 4 +- .../legacy-chat-rename-migration.test.tsx | 2 +- ...c-runtime-graph-conversion-publish.test.ts | 4 +- .../mirrored-agent-status-clock-skew.test.ts | 9 +- ...tabs-sync-remote-status-title-flap.test.ts | 9 +- .../frames/divider-ratio-refusal.test.ts | 4 +- ...ayout-changes-during-stream-outage.test.ts | 4 +- .../pane-titles-drawn-from-frames.test.ts | 4 +- .../workspace-layout-frame-binding.test.ts | 4 +- ...orkspace-layout-frame-editor-views.test.ts | 4 +- .../workspace-layout-frame-held-tabs.test.ts | 4 +- .../workspace-layout-frame-sync.test.ts | 4 +- .../workspace-layout-frame-tab-props.test.ts | 4 +- .../server/server-held-panes.test.tsx | 4 +- .../server/server-layout-apply.test.ts | 4 +- .../server-layout-editor-handover.test.ts | 4 +- .../server-layout-frames-handover.test.ts | 4 +- .../server-layout-frames-held-tabs.test.ts | 4 +- .../server/server-layout-frames.test.ts | 4 +- .../repos/store-session-cascades.test.ts | 4 +- .../agent-status/agent-status-live-actions.ts | 2 +- .../agent-status-worktree-purge-leak.test.ts | 4 +- .../cleanup/browser-cleanup-close.test.ts | 4 +- .../browser-close-focused-group.test.ts | 4 +- .../browser-close-mru-selection.test.ts | 4 +- .../browser-mount-admission-removal.test.ts | 4 +- .../store-session-browser-hydration.test.ts | 4 +- .../pages/browser-page-conversion.test.ts | 4 +- .../browser-workspace-doc-location.test.ts | 4 +- .../browser-background-tab-creation.test.ts | 4 +- .../browser-tab-creation-placement.test.ts | 4 +- .../slices/diff-comments/diffComments.test.ts | 2 +- .../editor-session-duplicate-restore.test.ts | 4 +- .../store-session-editor-hydration.test.ts | 4 +- .../editor-state-worktree-purge-leak.test.ts | 4 +- .../tabs/editor-tab-layout-owner.test.ts | 4 +- .../store/slices/settings/settings.test.ts | 2 +- .../content-tabs-from-main-frames.test.ts | 4 +- .../tabs/recently-closed-tab-position.test.ts | 4 +- .../slices/tabs/recently-closed-tabs.test.ts | 4 +- .../store-open-to-side-layout-owner.test.ts | 4 +- .../tabs/tabs-label-and-pin-state.test.ts | 4 +- .../tabs/tabs-model-reconciliation.test.ts | 4 +- .../tabs/tabs-open-close-lifecycle.test.ts | 4 +- .../tabs/tabs-pane-layout-operations.test.ts | 4 +- .../slices/tabs/tabs-split-create.test.ts | 4 +- .../slices/tabs/tabs-unread-and-focus.test.ts | 4 +- .../slices/ui/ui-agent-send-target.test.ts | 8 +- .../slices/ui/ui-feature-interactions.test.ts | 8 +- .../store/slices/ui/ui-slice-agent-actions.ts | 11 +- .../workspace-cleanup-local-evidence.ts | 4 +- .../store-active-worktree-selection.test.ts | 4 +- ...wner-warning-worktree-removal-leak.test.ts | 4 +- ...-worktree-purge-terminal-maps-leak.test.ts | 4 +- ...tion-records-worktree-removal-leak.test.ts | 4 +- .../native-chat-launch-draft-teardown.test.ts | 4 +- .../removed-worktree-renderer-teardown.ts | 2 +- .../store-worktree-removal-cascade.test.ts | 4 +- ...tab-worktree-orphan-map-purge-leak.test.ts | 6 +- .../workspace-chat-draft-removal.test.ts | 4 +- .../teardown/worktree-purge-doomed-ids.ts | 2 +- .../recently-closed-terminal-tabs.test.ts | 4 +- .../retired-terminal-tab-state-sweep.ts | 2 +- .../store-create-tab-start-in-main.test.ts | 4 +- .../store-session-terminal-reconnect.test.ts | 4 +- .../store-session-workspace-hydration.test.ts | 4 +- ...store-sleep-agent-status-retention.test.ts | 4 +- .../store-sleep-exact-runtime-stop.test.ts | 4 +- .../store-sleep-pane-hibernation.test.ts | 4 +- .../store-sleep-runtime-convergence.test.ts | 4 +- .../store-sleep-twin-host-owner.test.ts | 4 +- ...terminal-active-workspace-creation.test.ts | 4 +- ...terminal-creation-orphan-retention.test.ts | 4 +- .../terminals/terminal-ephemeral-state.ts | 4 +- ...erminal-input-activity-store-write.test.ts | 4 +- .../terminals/terminal-last-tab-close.test.ts | 4 +- ...minal-pty-release-orphan-retention.test.ts | 4 +- .../terminal-tab-close-intent.test.ts | 4 +- .../terminals/terminal-tab-presentation.ts | 6 +- .../terminals/terminal-transient-state.ts | 4 +- ...workspace-layout-frame-store-patch.test.ts | 4 +- .../agent-status-evidence-clock.test.ts | 14 +- .../title/agent-title-tracker.test.ts} | 2 +- tests/e2e/claude-agent-row-view.unit.test.ts | 5 +- ...nch-settings-hook-bookkeeping.unit.test.ts | 2 +- ...-agent-in-new-tab-web-runtime.unit.test.ts | 4 +- .../launch-agent-web-terminal.test-fixture.ts | 4 +- ...-tabs-decorative-title-fanout.unit.test.ts | 17 +- ...al-agent-fork-draft-ownership.unit.test.ts | 4 +- .../terminal-agent-pane-launch.unit.test.ts | 4 +- .../omp-picker-search-rendered/fixture.tsx | 2 +- 559 files changed, 2828 insertions(+), 2099 deletions(-) rename src/renderer/src/{lib/agent-catalog.tsx => components/agent/icons/AgentIcon.tsx} (68%) create mode 100644 src/renderer/src/components/agent/icons/agent-favicon-assets.ts rename src/renderer/src/{lib => components/agent/icons}/agent-icon-glyphs.tsx (99%) rename src/renderer/src/{lib => components/agent/icons}/agent-type-icon.tsx (80%) rename src/renderer/src/{lib => components/settings/navigation}/agent-skill-nav-install-status.ts (65%) create mode 100644 src/renderer/src/components/sidebar/workspace-card/activity/title-derived-agent-row-input.ts rename src/renderer/src/{lib => components/terminal-pane/agent-status}/agent-idle-edge.ts (56%) create mode 100644 src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-stale-daemon-snapshot-replay.spec.ts rename src/renderer/src/lib/{ => agent-catalog}/agent-catalog-entries-primary.ts (97%) rename src/renderer/src/lib/{ => agent-catalog}/agent-catalog-entries-secondary.ts (100%) rename src/renderer/src/lib/{ => agent-catalog}/agent-catalog-entries.ts (82%) rename src/renderer/src/lib/{ => agent-catalog}/agent-catalog-platform.ts (100%) create mode 100644 src/renderer/src/lib/agent-catalog/agent-catalog.ts rename src/renderer/src/lib/{ => agent-catalog}/agent-picker-search.ts (97%) delete mode 100644 src/renderer/src/lib/agent-favicon-assets.ts rename src/renderer/src/lib/{ => agent-session/context}/agent-session-continuation.ts (95%) rename src/renderer/src/lib/{ => agent-session/context}/agent-session-fork-context.ts (97%) rename src/renderer/src/lib/{ => agent-session/context}/copy-agent-session-context.ts (100%) rename src/renderer/src/lib/{ => agent-session/launch/failure}/agent-launch-failure.ts (86%) rename src/renderer/src/lib/{ => agent-session/launch/inventory}/agent-detection-target-inventory.ts (93%) rename src/renderer/src/lib/{ => agent-session/launch/new-tab}/agent-tab-launch-outcome.test-fixture.ts (65%) rename src/renderer/src/lib/{ => agent-session/launch/prompt}/agent-launch-prompt-failure-notice.ts (79%) rename src/renderer/src/lib/{ => agent-session/launch/routing}/agent-menu-selection.ts (78%) rename src/renderer/src/lib/{ => agent-session/launch/routing}/new-tab-agent-menu-rows.ts (81%) rename src/renderer/src/lib/{ => agent-session/launch/shortcuts}/agent-tab-shortcuts.ts (86%) rename src/renderer/src/lib/{ => agent-session/launch/startup}/agent-startup-delayed-delivery-perf.test.ts (98%) rename src/renderer/src/lib/{ => agent-session/launch/startup}/agent-startup-delayed-delivery.ts (97%) rename src/renderer/src/lib/{ => agent-session/launch/startup}/agent-startup-delivery-guards.ts (100%) rename src/renderer/src/lib/{ => agent-session/messaging}/agent-message-send.test.ts (88%) rename src/renderer/src/lib/{ => agent-session/messaging}/agent-message-send.ts (85%) rename src/renderer/src/lib/{ => agent-session/messaging}/agent-message-target.ts (100%) rename src/renderer/src/lib/{ => agent-session/messaging}/agent-send-disabled-reason-label.ts (100%) rename src/renderer/src/lib/{ => agent-session/messaging}/agent-send-title-status.ts (64%) rename src/renderer/src/lib/{ => agent-session/messaging}/notes-send-agent-targets.ts (92%) rename src/renderer/src/lib/{ => agent-session/messaging/paste}/agent-draft-paste-content.ts (95%) rename src/renderer/src/lib/{ => agent-session/messaging/paste}/agent-draft-readiness.ts (90%) rename src/renderer/src/lib/{ => agent-session/messaging/paste}/agent-followup-delivery.ts (85%) rename src/renderer/src/lib/{ => agent-session/messaging/paste}/agent-native-draft-prefill.ts (70%) rename src/renderer/src/lib/{ => agent-session/messaging/paste}/agent-paste-draft-submit-retry.test.ts (89%) rename src/renderer/src/lib/{ => agent-session/messaging/paste}/agent-paste-draft.test.ts (92%) rename src/renderer/src/lib/{ => agent-session/messaging/paste}/agent-paste-draft.ts (91%) rename src/renderer/src/lib/{ => agent-session/messaging/paste}/agent-ready-wait.ts (86%) rename src/renderer/src/lib/{ => agent-session/messaging}/running-agent-targets.ts (92%) rename src/renderer/src/lib/{ => agent-session/messaging/terminal}/active-agent-note-send-delivery.ts (94%) rename src/renderer/src/lib/{ => agent-session/messaging/terminal}/active-agent-note-send-diagnostics.ts (96%) rename src/renderer/src/lib/{ => agent-session/messaging/terminal}/active-agent-note-send-explicit-target.test.ts (99%) rename src/renderer/src/lib/{ => agent-session/messaging/terminal}/active-agent-note-send-focused-session.test.ts (99%) rename src/renderer/src/lib/{ => agent-session/messaging/terminal}/active-agent-note-send-result.ts (95%) rename src/renderer/src/lib/{ => agent-session/messaging/terminal}/active-agent-note-send-test-harness.ts (86%) rename src/renderer/src/lib/{ => agent-session/messaging/terminal}/active-agent-note-send.ts (91%) rename src/renderer/src/lib/{ => agent-session/messaging/terminal}/active-agent-note-target.ts (85%) rename src/renderer/src/lib/{ => agent-session/messaging/terminal}/active-agent-terminal-send-readiness.ts (92%) rename src/renderer/src/lib/{ => agent-session/navigation}/claude-agent-row-view.ts (92%) rename src/renderer/src/lib/{ => agent-session/resume}/agent-resume-launch-target.test.ts (100%) rename src/renderer/src/lib/{ => agent-session/resume}/agent-resume-launch-target.ts (92%) rename src/renderer/src/lib/{agent-status.ts => agent-status/aggregation/worktree-agent-status.ts} (75%) rename src/renderer/src/lib/{ => agent-status/evidence}/agent-status-epoch-clock.ts (100%) rename src/renderer/src/lib/{ => agent-status/evidence}/agent-status-epoch-selector.ts (100%) rename src/renderer/src/lib/{ => agent-status/evidence}/agent-status-terminal-title.ts (77%) rename src/renderer/src/lib/{ => agent-status/evidence}/pane-agent-evidence.ts (51%) rename src/renderer/src/lib/{ => agent-status/ownership}/agent-status-connection-ownership.ts (93%) rename src/renderer/src/lib/{ => agent-status/ownership}/agent-status-pane-ownership.ts (90%) rename src/renderer/src/lib/{ => agent-status/presentation}/agent-row-dot-state.ts (73%) rename src/renderer/src/lib/{ => agent-status/presentation}/agent-row-stopping-label.ts (65%) rename src/renderer/src/lib/{ => agent-status/presentation}/agent-row-tool-preview.ts (73%) rename src/renderer/src/lib/{ => agent-status/presentation}/agent-verdict-status-line.ts (82%) rename src/renderer/src/lib/{ => skills}/agent-skill-coverage.ts (79%) rename src/renderer/src/lib/{ => skills/installation}/agent-feature-install-commands.ts (92%) rename src/renderer/src/lib/{ => skills/installation}/agent-feature-skill-names.ts (100%) rename src/renderer/src/lib/{ => skills/installation}/agent-skill-cli-prerequisite.test.ts (95%) rename src/renderer/src/lib/{ => skills/installation}/agent-skill-cli-prerequisite.ts (98%) rename src/renderer/src/lib/{ => skills/installation}/linear-agent-skill-update-target.ts (83%) rename src/renderer/src/lib/{ => skills}/orchestration-skill-coverage.ts (83%) rename src/renderer/src/lib/{ => skills/presentation}/skill-freshness-display-status.ts (92%) rename src/renderer/src/lib/{ => text-generation}/agent-output-error-copy.ts (99%) rename src/renderer/src/{lib => runtime/native-chat/agent-catalogs}/chat-provider-agents.ts (85%) rename src/{renderer/src/lib => shared/agent-status/contracts}/agent-status-evidence-clock.test.ts (70%) rename src/{renderer/src/lib/agent-status.test.ts => shared/agent-status/title/agent-title-tracker.test.ts} (95%) diff --git a/config/reliability-gates.jsonc b/config/reliability-gates.jsonc index 8cbb85016c2..8ede8e6f99d 100644 --- a/config/reliability-gates.jsonc +++ b/config/reliability-gates.jsonc @@ -459,10 +459,10 @@ "invariant": "A prompt occurrence leaves the input region only when an accepted reply answers it (a current host's provider acknowledgment, or an older host's whole-write acceptance as before) or the user collapses it to a strip above the composer, which writes nothing and keeps the card mounted with its partial answer; status-backed occurrences are told apart by the host wait's start, so view toggles and remounts preserve them while real clear/replacement supersedes them, and a transcript-only one is dropped when the view stops observing it; obsolete results cannot change replacements; selector groups wait for complete writes before pacing; refusal or unknown handoff never causes replay; a card retires an unsubmitted composer send without writing under it or losing its text, and the hidden composer cannot send or interrupt; Collapse or Escape folds a card without writing, never during an in-flight answer, and a new occurrence shows expanded again; the phone blocks only Send while a card is expanded and shows one card per occurrence; cancellation stops unsent groups and active dictation can stop.", "oracle": "Audit2251 narrows agent-paste-draft.test.ts from 25 authored cases (26 literal cases) to four. Retained cases cover buffered readiness on PTY binding, separate spawn/composer lifetimes, real per-PTY paste/Enter serialization against a competing paste, and frame closure/no Enter after a rejected content chunk. Intentionally lost alarms include agent marker and fallback examples, direct-write failure/rejection, missing-PTY and Codex process-only timeout paths, exact nonprimary-PTY routing, full large-body chunk reconstruction, escaping/CRLF samples, internal laziness/yield work assertions, oversized preflight refusal, and exact configured delay/budget counts. No equivalent replacement, new execution, real PTY/provider delivery, rendered/native UI, deployment, measured performance or cross-platform result is claimed. Historical prior account (preserved verbatim): Mobile owner-layout policy retires whole tests and mixed registrations without equivalent replacement coverage. Retained callbacks and reduced selectors need fresh execution at their stated scope; prior measurements do not validate them. Historical oracle: Audit2003: Remove agent-prompt absence routing, throwing/live/missing-probe and cached-probe-count examples from the stale-leaf source. Controller-proven absence, unknown-liveness admission, obsolete-absence clearing and same-ID respawn fences remain at a supplied provider/row seam. Preserve the independent wire-codec receipt only in its original scope. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, physical provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1991: Remove partial-runtime terminal-send guard/status/floor/query projection and argument-inventory samples. Retained RPC viewport admission, authenticated-client spoof refusal, text admission and stale-binding fences remain bounded mock-boundary behavior. The unchanged wire-codec receipt remains valid only for its original command; it does not validate this reduced RPC selector. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, physical provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1908 removes the complete prompt-presentation hook and literal interactive-protocol mapping suites and narrows the interactive card and prompt-card input suites. Lost alarms include replacement approval A settling after answered B; collapse/expand composer ownership and partial-answer presentation; identical new waits after an unmounted view; collapsed transcript re-reads; answered/dismissed status-backed persistence and retirement; and literal answer-to-PTY byte arrays. The retained stale-PTY acknowledgment, cancellation/answer retry, and answered-approval remount/rebind assertions remain meaningful but are not equivalent replacement coverage. No fresh reduced-selector result, physical provider, rendered/native-focus, mixed-version deployment, soak, or measured-budget validation is claimed. The unchanged wire-codec receipt remains valid only for its exact command. Historical prior account (preserved verbatim): Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Historical pre-audit oracle account for changed sources: Existing exact unchanged-selector receipts remain the only current execution evidence. Changed source selectors have no fresh execution result. Historical prior-source oracle account: Existing exact unchanged-selector receipts remain the only current execution evidence. Changed source selectors have no fresh execution result. Historical prior-source oracle account: Retained unchanged-selector receipts are the only current execution evidence. Reduced-source assertions await validation. Historical prior oracle: The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): After acknowledged phone replies with stale host status, the exact card disappears and Send is enabled; unknown, refused or unverifiable-settlement replies retain enabled choices, while an older host's accepted reply dismisses like an acknowledged one; a same-occurrence view toggle retains pending acknowledgment and real replacements discard it. A slow 32 KiB SSH answer completes all chunks before Enter; cancellation preserves issued bytes but omits remaining groups. Paired settlement invokes the actual provider and lost callbacks remain unknown; older hosts deliver ordinary messages, launch and selector groups once and their accepted answers dismiss as before. An answered card stays hidden across a view remount; a collapsed card is a strip that frees the composer and expands back; an identical question in a new wait shows again; a composer send caught by a new card keeps its bubble without submitting or clearing the line under it. Audit2450 removes the MobileNativeChatView failure-banner callback-only example whose old banner is supplied unchanged by its props. Retain fatal-read gating and the ordering test that preserves a new delivery notice. The removed false-send/old-banner combination has no equivalent replacement; prior raw receipts and budgets retain their original source scope. No new soak, platform, performance or red/green claim.", "commands": [ - "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/renderer/src/components/native-chat/prompts/NativeChatInteractiveCard.test.tsx src/renderer/src/components/native-chat/prompts/NativeChatResolvedView.prompt-card-input.test.tsx src/renderer/src/components/native-chat/surfaces/integration/NativeChatResolvedView.prompt-card-composer.test.tsx src/renderer/src/components/native-chat/conversation/turns/NativeChatResolvedView.turn-status.test.tsx src/renderer/src/runtime/hosted-terminals/inspection/runtime-terminal-inspection.test.ts src/renderer/src/lib/agent-paste-draft.test.ts src/renderer/src/lib/agent-paste-draft-submit-retry.test.ts src/main/ipc/pty/ipc/write-input-user-input.test.ts src/main/ipc/pty/pty-write-ipc-validation.test.ts src/main/runtime/terminal/input/runtime-terminal-writer.test.ts src/main/runtime/rpc/terminal-send.test.ts src/main/runtime/terminal/input/terminal-send-stale-leaf-liveness.test.ts --maxWorkers=2", + "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/renderer/src/components/native-chat/prompts/NativeChatInteractiveCard.test.tsx src/renderer/src/components/native-chat/prompts/NativeChatResolvedView.prompt-card-input.test.tsx src/renderer/src/components/native-chat/surfaces/integration/NativeChatResolvedView.prompt-card-composer.test.tsx src/renderer/src/components/native-chat/conversation/turns/NativeChatResolvedView.turn-status.test.tsx src/renderer/src/runtime/hosted-terminals/inspection/runtime-terminal-inspection.test.ts src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft.test.ts src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft-submit-retry.test.ts src/main/ipc/pty/ipc/write-input-user-input.test.ts src/main/ipc/pty/pty-write-ipc-validation.test.ts src/main/runtime/terminal/input/runtime-terminal-writer.test.ts src/main/runtime/rpc/terminal-send.test.ts src/main/runtime/terminal/input/terminal-send-stale-leaf-liveness.test.ts --maxWorkers=2", "ORCA_BACKGROUND_LAUNCH=1 mobile/node_modules/.bin/vitest run --config mobile/vitest.config.ts mobile/src/session/native-chat/MobileNativeChatView.prompt-presentation.test.ts mobile/src/session/native-chat/MobileNativeChatView.failure-banner.test.ts mobile/src/session/mobile-prompt-controller.test.ts --maxWorkers=2", "ORCA_BACKGROUND_LAUNCH=1 pnpm test tests/e2e/cross-version-wire/cross-version-terminal-wire.unit.test.ts --maxWorkers=1", - "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/renderer/src/components/native-chat/prompts/NativeChatInteractiveCard.test.tsx src/renderer/src/components/native-chat/prompts/NativeChatResolvedView.prompt-card-input.test.tsx src/renderer/src/components/native-chat/conversation/turns/NativeChatResolvedView.turn-status.test.tsx src/renderer/src/runtime/hosted-terminals/inspection/runtime-terminal-inspection.test.ts src/renderer/src/lib/agent-paste-draft.test.ts src/renderer/src/lib/agent-paste-draft-submit-retry.test.ts src/main/ipc/pty/ipc/write-input-user-input.test.ts src/main/ipc/pty/pty-write-ipc-validation.test.ts --maxWorkers=2", + "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/renderer/src/components/native-chat/prompts/NativeChatInteractiveCard.test.tsx src/renderer/src/components/native-chat/prompts/NativeChatResolvedView.prompt-card-input.test.tsx src/renderer/src/components/native-chat/conversation/turns/NativeChatResolvedView.turn-status.test.tsx src/renderer/src/runtime/hosted-terminals/inspection/runtime-terminal-inspection.test.ts src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft.test.ts src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft-submit-retry.test.ts src/main/ipc/pty/ipc/write-input-user-input.test.ts src/main/ipc/pty/pty-write-ipc-validation.test.ts --maxWorkers=2", "ORCA_BACKGROUND_LAUNCH=1 mobile/node_modules/.bin/vitest run --config mobile/vitest.config.ts mobile/src/session/native-chat/MobileNativeChatView.prompt-presentation.test.ts mobile/src/session/native-chat/MobileNativeChatView.failure-banner.test.ts --maxWorkers=2" ], "testFiles": [ @@ -471,8 +471,8 @@ "src/renderer/src/components/native-chat/surfaces/integration/NativeChatResolvedView.prompt-card-composer.test.tsx", "src/renderer/src/components/native-chat/conversation/turns/NativeChatResolvedView.turn-status.test.tsx", "src/renderer/src/runtime/hosted-terminals/inspection/runtime-terminal-inspection.test.ts", - "src/renderer/src/lib/agent-paste-draft.test.ts", - "src/renderer/src/lib/agent-paste-draft-submit-retry.test.ts", + "src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft.test.ts", + "src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft-submit-retry.test.ts", "src/main/ipc/pty/ipc/write-input-user-input.test.ts", "src/main/ipc/pty/pty-write-ipc-validation.test.ts", "src/main/runtime/terminal/input/runtime-terminal-writer.test.ts", diff --git a/config/scripts/ci/sharding/ci-shard-timings.json b/config/scripts/ci/sharding/ci-shard-timings.json index 6daa0ea2ed4..5d34bd9557e 100644 --- a/config/scripts/ci/sharding/ci-shard-timings.json +++ b/config/scripts/ci/sharding/ci-shard-timings.json @@ -6377,8 +6377,8 @@ "src/renderer/src/lib/activate-ai-vault-structured-session-host.test.ts": 589, "src/renderer/src/lib/activate-ai-vault-structured-session-reveal.test.ts": 2099, "src/renderer/src/lib/workspace/tabs/activate-tab-and-focus-pane.test.ts": 54, - "src/renderer/src/lib/active-agent-note-send-explicit-target.test.ts": 980, - "src/renderer/src/lib/active-agent-note-send-focused-session.test.ts": 536, + "src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-explicit-target.test.ts": 980, + "src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-focused-session.test.ts": 536, "src/renderer/src/lib/activity-thread-display.test.ts": 134, "src/renderer/src/lib/agent-account-restart-startup.test.ts": 1780, "src/renderer/src/lib/agent-session/launch/background/agent-background-session-launch-host.test.ts": 1910, @@ -6395,10 +6395,10 @@ "src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-main-written.test.ts": 2084, "src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-publication.test.ts": 1855, "src/renderer/src/lib/agent-session/launch/pane/agent-launch-through-host.test.ts": 1975, - "src/renderer/src/lib/agent-message-send.test.ts": 182, - "src/renderer/src/lib/agent-paste-draft-submit-retry.test.ts": 315, - "src/renderer/src/lib/agent-paste-draft.test.ts": 445, - "src/renderer/src/lib/agent-resume-launch-target.test.ts": 3911, + "src/renderer/src/lib/agent-session/messaging/agent-message-send.test.ts": 182, + "src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft-submit-retry.test.ts": 315, + "src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft.test.ts": 445, + "src/renderer/src/lib/agent-session/resume/agent-resume-launch-target.test.ts": 3911, "src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-after-failure.test.ts": 870, "src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-close-race.test.ts": 983, "src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-message.test.ts": 2521, @@ -6417,10 +6417,10 @@ "src/renderer/src/lib/agent-session/structured-agent-session-draft-position-lifetime.test.tsx": 3166, "src/renderer/src/lib/agent-session/structured-agent-session-ordinary-draft.test.tsx": 9907, "src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.test.ts": 3672, - "src/renderer/src/lib/agent-skill-cli-prerequisite.test.ts": 219, - "src/renderer/src/lib/agent-startup-delayed-delivery-perf.test.ts": 1708, - "src/renderer/src/lib/agent-status-evidence-clock.test.ts": 88, - "src/renderer/src/lib/agent-status.test.ts": 172, + "src/renderer/src/lib/skills/installation/agent-skill-cli-prerequisite.test.ts": 219, + "src/renderer/src/lib/agent-session/launch/startup/agent-startup-delayed-delivery-perf.test.ts": 1708, + "src/shared/agent-status/contracts/agent-status-evidence-clock.test.ts": 88, + "src/shared/agent-status/title/agent-title-tracker.test.ts": 172, "src/renderer/src/lib/agent-session/resume/history/ai-vault-antigravity-reference-host.test.ts": 678, "src/renderer/src/lib/agent-session/resume/history/ai-vault-resume-command.drop-repin.test.ts": 541, "src/renderer/src/lib/agent-session/resume/history/ai-vault-resume-command.test.ts": 665, diff --git a/src/renderer/src/app-shell/startup-window-parity.test.ts b/src/renderer/src/app-shell/startup-window-parity.test.ts index e06ff4428af..ad55364b52d 100644 --- a/src/renderer/src/app-shell/startup-window-parity.test.ts +++ b/src/renderer/src/app-shell/startup-window-parity.test.ts @@ -1,7 +1,7 @@ // Compare window startup from disk with the Loader round trip. Enumerate each divergence as a known defect or accepted difference with its reason. import { describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type { ExecutionHostId } from '../../../shared/execution-host' import type { WorkspaceSessionState } from '../../../shared/workspace-session/workspace-session-state-types' import { LEGACY_WORKSPACE_LAYOUT_PROFILES } from '../../../shared/workspace-layout/workspace-layout-legacy-profile.test-fixture' @@ -24,7 +24,7 @@ vi.mock('../../../shared/layout-owner-switch', () => ({ } })) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/components/ClaudeAccountSwitchSessionTree.tsx b/src/renderer/src/components/ClaudeAccountSwitchSessionTree.tsx index be5f1670689..8b712f06a6a 100644 --- a/src/renderer/src/components/ClaudeAccountSwitchSessionTree.tsx +++ b/src/renderer/src/components/ClaudeAccountSwitchSessionTree.tsx @@ -2,7 +2,7 @@ import { Fragment, useLayoutEffect, useRef, useState } from 'react' import { Folder, GitBranch } from 'lucide-react' import { translate } from '@/i18n/i18n' import { useTranslate, type Translate } from '@/i18n/use-translate' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { formatAgentTypeLabel } from '../../../shared/agent-status/presentation/agent-type-label' import type { ClaudeAccountSwitchPromptSessions } from '@/lib/provider-accounts/claude-account-switch-sessions' import { diff --git a/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx b/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx index f60e94e8c8c..b1ebf752d87 100644 --- a/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx +++ b/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx @@ -1,5 +1,5 @@ import { useContext } from 'react' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { agentTypeToIconAgent } from '../../../shared/agent-status/presentation/agent-type-icon-agent' import { formatAgentTypeLabel } from '../../../shared/agent-status/presentation/agent-type-label' import { formatShortTimeAgo } from '@/lib/short-time-ago' diff --git a/src/renderer/src/components/NewWorkspaceComposerCard.tsx b/src/renderer/src/components/NewWorkspaceComposerCard.tsx index b3214247197..514a3b90408 100644 --- a/src/renderer/src/components/NewWorkspaceComposerCard.tsx +++ b/src/renderer/src/components/NewWorkspaceComposerCard.tsx @@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next' import { toast } from 'sonner' import { useAppStore } from '@/store' import { cn } from '@/lib/utils' -import { getAgentCatalog } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' import { getScreenSubmitModifierLabel } from '@/lib/screen-submit-shortcut' import { resolveProjectCloneUrlPrefill } from '@/lib/project-clone-url-prefill' import { useContextualTour } from '@/components/contextual-tours/use-contextual-tour' diff --git a/src/renderer/src/components/activity/activity-event-state.ts b/src/renderer/src/components/activity/activity-event-state.ts index 63768a14a61..0c6242dba7c 100644 --- a/src/renderer/src/components/activity/activity-event-state.ts +++ b/src/renderer/src/components/activity/activity-event-state.ts @@ -1,5 +1,8 @@ -import { isExplicitAgentStatusFresh } from '@/lib/pane-agent-evidence' -import { AGENT_STATUS_STALE_AFTER_MS } from '../../../../shared/agent-status/contracts/agent-status-freshness' +import { + isAgentStatusFresh, + AGENT_STATUS_STALE_AFTER_MS +} from '../../../../shared/agent-status/contracts/agent-status-freshness' + import type { AgentStatusEntry, AgentStatusState, @@ -20,7 +23,7 @@ export function freshActivityLiveAgentState( ): ActivityLiveAgentState | null { if ( !isActivityHookLiveAgentState(entry.state) || - !isExplicitAgentStatusFresh(entry, now, AGENT_STATUS_STALE_AFTER_MS) + !isAgentStatusFresh(entry, now, AGENT_STATUS_STALE_AFTER_MS) ) { return null } diff --git a/src/renderer/src/components/activity/activity-thread-detail-pane.tsx b/src/renderer/src/components/activity/activity-thread-detail-pane.tsx index 8b4b8b28c67..db2fab50f99 100644 --- a/src/renderer/src/components/activity/activity-thread-detail-pane.tsx +++ b/src/renderer/src/components/activity/activity-thread-detail-pane.tsx @@ -1,6 +1,6 @@ import React from 'react' import { MessageSquareText, TerminalSquare } from 'lucide-react' -import { AgentTypeIcon } from '@/lib/agent-type-icon' +import { AgentTypeIcon } from '@/components/agent/icons/agent-type-icon' import { cn } from '@/lib/utils' import { useTranslate } from '@/i18n/use-translate' import { EventRepoBadge, ThreadAgentStateIndicator } from './activity-thread-controls' diff --git a/src/renderer/src/components/activity/activity-thread-hover-card-summary.tsx b/src/renderer/src/components/activity/activity-thread-hover-card-summary.tsx index 743d8d6247c..f62405cbfa1 100644 --- a/src/renderer/src/components/activity/activity-thread-hover-card-summary.tsx +++ b/src/renderer/src/components/activity/activity-thread-hover-card-summary.tsx @@ -3,7 +3,7 @@ import { Cloud, Copy, FolderGit2, GitBranch, Laptop, LocateFixed, Server } from import { toast } from 'sonner' import { useAppStore } from '@/store' import { RepoBadgeMark } from '@/components/repo/RepoBadgeLabel' -import { AgentTypeIcon } from '@/lib/agent-type-icon' +import { AgentTypeIcon } from '@/components/agent/icons/agent-type-icon' import { formatAgentTypeLabel } from '../../../../shared/agent-status/presentation/agent-type-label' import { getWorktreeGitIdentityDisplay } from '../../../../shared/worktree/git-identity-display' import { jumpToWorktreeFromSidebar } from '@/lib/workspace/activation/worktree-jump-navigation' diff --git a/src/renderer/src/components/activity/activity-thread-presentation.ts b/src/renderer/src/components/activity/activity-thread-presentation.ts index aa37ffe17ee..92913fa6841 100644 --- a/src/renderer/src/components/activity/activity-thread-presentation.ts +++ b/src/renderer/src/components/activity/activity-thread-presentation.ts @@ -1,7 +1,7 @@ import type { AgentDotState } from '@/components/AgentStateDot' import { formatAgentTypeLabel } from '../../../../shared/agent-status/presentation/agent-type-label' import { getAgentRowPrimaryText } from '../../../../shared/agent-status/presentation/agent-row-primary-text' -import { showsAgentToolPreview } from '@/lib/agent-row-tool-preview' +import { showsAgentToolPreview } from '@/lib/agent-status/presentation/agent-row-tool-preview' import { agentMainAgentVerdict, agentVerdictDisplayMark diff --git a/src/renderer/src/components/activity/activity-thread-row.tsx b/src/renderer/src/components/activity/activity-thread-row.tsx index ce64868966e..ef6e21f58fa 100644 --- a/src/renderer/src/components/activity/activity-thread-row.tsx +++ b/src/renderer/src/components/activity/activity-thread-row.tsx @@ -1,6 +1,6 @@ import React from 'react' import { Bell, ExternalLink, X } from 'lucide-react' -import { AgentTypeIcon } from '@/lib/agent-type-icon' +import { AgentTypeIcon } from '@/components/agent/icons/agent-type-icon' import { formatAgentTypeLabel } from '../../../../shared/agent-status/presentation/agent-type-label' import { Button } from '@/components/ui/button' import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip' diff --git a/src/renderer/src/components/activity/useActivityUnreadCount.ts b/src/renderer/src/components/activity/useActivityUnreadCount.ts index 613e0941836..df3761ab0b0 100644 --- a/src/renderer/src/components/activity/useActivityUnreadCount.ts +++ b/src/renderer/src/components/activity/useActivityUnreadCount.ts @@ -2,7 +2,7 @@ import { useState } from 'react' import { migrationUnsupportedToAgentStatusEntry } from '../../../../shared/migration-unsupported-agent-entry' import { useAppStore } from '@/store' -import { createAgentStatusEpochSelector } from '@/lib/agent-status-epoch-selector' +import { createAgentStatusEpochSelector } from '@/lib/agent-status/evidence/agent-status-epoch-selector' import type { AppState } from '@/store/types' import type { AgentStatusEntry } from '../../../../shared/agent-status/contracts/agent-status-types' diff --git a/src/renderer/src/components/agent-session-continuation/AgentSessionContinuationDialog.tsx b/src/renderer/src/components/agent-session-continuation/AgentSessionContinuationDialog.tsx index 0d860a215e8..73eae33015f 100644 --- a/src/renderer/src/components/agent-session-continuation/AgentSessionContinuationDialog.tsx +++ b/src/renderer/src/components/agent-session-continuation/AgentSessionContinuationDialog.tsx @@ -29,13 +29,13 @@ import { SelectValue } from '@/components/ui/select' import { useTranslate } from '@/i18n/use-translate' -import { getAgentCatalog, getAgentLabel } from '@/lib/agent-catalog' +import { getAgentCatalog, getAgentLabel } from '@/lib/agent-catalog/agent-catalog' import { buildAgentSessionContinuationPrompt, hasFullAgentSessionContext, type AgentSessionContinuationContextMode, type AgentSessionContinuationRequest -} from '@/lib/agent-session-continuation' +} from '@/lib/agent-session/context/agent-session-continuation' import { launchAgentSessionContinuation } from '@/lib/agent-session/launch/continuation/launch-agent-session-continuation' import { useAppStore } from '@/store' import { isTuiAgentEnabled } from '../../../../shared/agent-launch/catalog/tui-agent-selection' diff --git a/src/renderer/src/components/agent/AgentCombobox.tsx b/src/renderer/src/components/agent/AgentCombobox.tsx index 64d98889abe..a91dbaf4751 100644 --- a/src/renderer/src/components/agent/AgentCombobox.tsx +++ b/src/renderer/src/components/agent/AgentCombobox.tsx @@ -4,12 +4,13 @@ import { Button } from '@/components/ui/button' import { Command, CommandEmpty, CommandInput, CommandList } from '@/components/ui/command' import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover' import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip' -import { AgentIcon, type AgentCatalogEntry } from '@/lib/agent-catalog' +import type { AgentCatalogEntry } from '@/lib/agent-catalog/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { agentPickerBlankTerminalMatches, getAgentPickerCommandValue, searchAgentPickerEntries -} from '@/lib/agent-picker-search' +} from '@/lib/agent-catalog/agent-picker-search' import { cn } from '@/lib/utils' import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent' import * as state from './agent-combobox-command-state' diff --git a/src/renderer/src/components/agent/AgentLaunchPicker.tsx b/src/renderer/src/components/agent/AgentLaunchPicker.tsx index a27d05e6cce..4c28231b0b6 100644 --- a/src/renderer/src/components/agent/AgentLaunchPicker.tsx +++ b/src/renderer/src/components/agent/AgentLaunchPicker.tsx @@ -21,7 +21,8 @@ import { DropdownMenuItem, DropdownMenuTrigger } from '@/components/ui/dropdown-menu' -import { AgentIcon, getAgentLabel } from '@/lib/agent-catalog' +import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { useTranslate } from '@/i18n/use-translate' import { rowLabel } from '../tab-bar/tab-agent-row-presentation' import type { NewTabAgentMenuModel } from '../tab-bar/use-new-tab-agent-menu-rows' diff --git a/src/renderer/src/components/agent/AgentLaunchPickerMenu.tsx b/src/renderer/src/components/agent/AgentLaunchPickerMenu.tsx index 31b1804db26..90bf546b321 100644 --- a/src/renderer/src/components/agent/AgentLaunchPickerMenu.tsx +++ b/src/renderer/src/components/agent/AgentLaunchPickerMenu.tsx @@ -7,7 +7,7 @@ import { useAppStore } from '@/store/index' import { parseExecutionHostId } from '../../../../shared/execution-host' import { Input } from '@/components/ui/input' import { Terminal } from 'lucide-react' -import { agentPickerBlankTerminalMatches } from '@/lib/agent-picker-search' +import { agentPickerBlankTerminalMatches } from '@/lib/agent-catalog/agent-picker-search' import { AgentDefaultContextMenu } from './agent-combobox-items' import { AgentPickerMenuRow, type AgentPickerMenuLaunch } from './AgentLaunchPickerMenuRow' import { DropdownMenuItem } from '@/components/ui/dropdown-menu' diff --git a/src/renderer/src/components/agent/AgentLaunchPickerMenuRow.tsx b/src/renderer/src/components/agent/AgentLaunchPickerMenuRow.tsx index 18b9adfe0a1..614d48ae472 100644 --- a/src/renderer/src/components/agent/AgentLaunchPickerMenuRow.tsx +++ b/src/renderer/src/components/agent/AgentLaunchPickerMenuRow.tsx @@ -6,7 +6,7 @@ import { DropdownMenuShortcut, useDropdownMenuClose } from '@/components/ui/dropdown-menu' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { useUiLanguageRevision } from '@/i18n/use-ui-language-revision' import { AgentDefaultContextMenu } from './agent-combobox-items' import { AgentLaunchSetupButton, type AgentPickerSetupIdentity } from './AgentLaunchSetupButton' diff --git a/src/renderer/src/components/agent/agent-combobox-surface-items.tsx b/src/renderer/src/components/agent/agent-combobox-surface-items.tsx index afb2c99c53c..0749ff09194 100644 --- a/src/renderer/src/components/agent/agent-combobox-surface-items.tsx +++ b/src/renderer/src/components/agent/agent-combobox-surface-items.tsx @@ -1,8 +1,9 @@ import { terminalPendingLabel, terminalPendingReason } from '../tab-bar/new-tab-agent-menu-model' import React, { useState } from 'react' import { CommandItem, CommandSeparator } from '@/components/ui/command' -import { AgentIcon, getAgentCatalog, type AgentCatalogEntry } from '@/lib/agent-catalog' -import { searchAgentPickerEntries } from '@/lib/agent-picker-search' +import { getAgentCatalog, type AgentCatalogEntry } from '@/lib/agent-catalog/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' +import { searchAgentPickerEntries } from '@/lib/agent-catalog/agent-picker-search' import type { AgentLaunchSurface } from '@/lib/agent-session/launch/routing/agent-session-launch-plan' import type { NewTabAgentMenuRow } from '../../../../shared/agent-launch/picker/agent-launch-picker-rows' import type { NewTabAgentMenuModel } from '@/components/tab-bar/use-new-tab-agent-menu-rows' @@ -16,7 +17,7 @@ import { cn } from '@/lib/utils' import { translate } from '@/i18n/i18n' import { useTranslate, type Translate } from '@/i18n/use-translate' import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent' -import type { resolveAgentMenuSelection } from '@/lib/agent-menu-selection' +import type { resolveAgentMenuSelection } from '@/lib/agent-session/launch/routing/agent-menu-selection' import { renderAgentComboboxItem } from './agent-combobox-items' import { AgentSurfaceLaunchButton } from './AgentSurfaceLaunchButton' diff --git a/src/renderer/src/lib/agent-catalog.tsx b/src/renderer/src/components/agent/icons/AgentIcon.tsx similarity index 68% rename from src/renderer/src/lib/agent-catalog.tsx rename to src/renderer/src/components/agent/icons/AgentIcon.tsx index 9a18e6f075f..38189616d4d 100644 --- a/src/renderer/src/lib/agent-catalog.tsx +++ b/src/renderer/src/components/agent/icons/AgentIcon.tsx @@ -1,8 +1,7 @@ import type React from 'react' +import { getAgentCatalog, getAgentLabel } from '../../../lib/agent-catalog/agent-catalog' import { ClaudeIcon, DroidIcon, OpenAIIcon } from '@/components/status-bar/icons' -import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' -import type { TerminalAgent } from '../../../shared/agent-status/identity/terminal-agent' -import { formatAgentTypeLabel } from '../../../shared/agent-status/presentation/agent-type-label' +import type { TerminalAgent } from '../../../../../shared/agent-status/identity/terminal-agent' import { AgentLetterIcon, AiderIcon, @@ -12,32 +11,7 @@ import { OpenCodeIcon, PiIcon } from './agent-icon-glyphs' -import { createLocalizedCatalog } from '@/i18n/localized-catalog' import { AGENT_FAVICON_ASSETS } from './agent-favicon-assets' -import { buildAgentCatalogEntries } from './agent-catalog-entries' - -export type AgentCatalogEntry = { - id: TuiAgent - label: string - /** Default CLI binary name used for PATH detection. */ - cmd: string - searchAliases?: readonly string[] - /** Direct or bundled image URL for agents whose project identity is not represented by a favicon service. */ - iconUrl?: string - /** Domain for Google's favicon service — used for agents without an SVG icon. */ - faviconDomain?: string - /** Homepage/install docs URL, sourced from the README agent badge list. */ - homepageUrl: string -} - -export const getAgentCatalog = createLocalizedCatalog(buildAgentCatalogEntries) - -// Why: tests and a few legacy call sites still import a catalog snapshot. -export const AGENT_CATALOG: AgentCatalogEntry[] = getAgentCatalog() - -export function getAgentLabel(agent: TerminalAgent): string { - return getAgentCatalog().find((entry) => entry.id === agent)?.label ?? formatAgentTypeLabel(agent) -} export function AgentIcon({ agent, diff --git a/src/renderer/src/components/agent/icons/agent-favicon-assets.ts b/src/renderer/src/components/agent/icons/agent-favicon-assets.ts new file mode 100644 index 00000000000..87ce603600c --- /dev/null +++ b/src/renderer/src/components/agent/icons/agent-favicon-assets.ts @@ -0,0 +1,70 @@ +import qoderUrl from '../../../../../shared/agent-icons/qoder.png?url' +import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent' +import grokUrl from '../../../../../shared/agent-icons/grok.png?url' +import mimoCodeUrl from '../../../../../shared/agent-icons/mimo-code.png?url' +import anteUrl from '../../../../../shared/agent-icons/ante.png?url' +import traeUrl from '../../../../../shared/agent-icons/trae.png?url' +import primeAgentUrl from '../../../../../shared/agent-icons/prime-agent.png?url' +import geminiUrl from '../../../../../shared/agent-icons/gemini.png?url' +import antigravityUrl from '../../../../../shared/agent-icons/antigravity.png?url' +import gooseUrl from '../../../../../shared/agent-icons/goose.png?url' +import ampUrl from '../../../../../shared/agent-icons/amp.png?url' +import kiroUrl from '../../../../../shared/agent-icons/kiro.png?url' +import crushUrl from '../../../../../shared/agent-icons/crush.png?url' +import augUrl from '../../../../../shared/agent-icons/aug.png?url' +import autohandUrl from '../../../../../shared/agent-icons/autohand.png?url' +import clineUrl from '../../../../../shared/agent-icons/cline.png?url' +import freebuffUrl from '../../../../../shared/agent-icons/freebuff.png?url' +import codebuffUrl from '../../../../../shared/agent-icons/codebuff.png?url' +import commandCodeUrl from '../../../../../shared/agent-icons/command-code.png?url' +import continueUrl from '../../../../../shared/agent-icons/continue.png?url' +import cursorUrl from '../../../../../shared/agent-icons/cursor.png?url' +import kimiUrl from '../../../../../shared/agent-icons/kimi.png?url' +import mistralVibeUrl from '../../../../../shared/agent-icons/mistral-vibe.png?url' +import qwenCodeUrl from '../../../../../shared/agent-icons/qwen-code.png?url' +import rovoUrl from '../../../../../shared/agent-icons/rovo.png?url' +import hermesUrl from '../../../../../shared/agent-icons/hermes.png?url' +import devinUrl from '../../../../../shared/agent-icons/devin.png?url' +import museUrl from '../../../../../shared/agent-icons/muse.png?url' +import zcodeUrl from '../../../../../shared/agent-icons/zcode.png?url' +import openclawUrl from '../../../../../shared/agent-icons/openclaw.png?url' +import dshUrl from '../../../../../shared/agent-icons/dsh.png?url' +import jcodeUrl from '../../../../../shared/agent-icons/jcode.png?url' +import codebuddyUrl from '../../../../../shared/agent-icons/codebuddy.png?url' + +// Bundle favicons for offline/Google-blocked regions (#8451); shared/agent-icons also supplies mobile-agent-icon-assets.ts. +export const AGENT_FAVICON_ASSETS: Partial> = { + grok: grokUrl, + 'mimo-code': mimoCodeUrl, + ante: anteUrl, + trae: traeUrl, + 'prime-agent': primeAgentUrl, + qoder: qoderUrl, + 'qoder-cn': qoderUrl, + gemini: geminiUrl, + antigravity: antigravityUrl, + goose: gooseUrl, + amp: ampUrl, + kiro: kiroUrl, + crush: crushUrl, + aug: augUrl, + autohand: autohandUrl, + cline: clineUrl, + codebuff: codebuffUrl, + freebuff: freebuffUrl, + 'command-code': commandCodeUrl, + continue: continueUrl, + cursor: cursorUrl, + kimi: kimiUrl, + 'mistral-vibe': mistralVibeUrl, + 'qwen-code': qwenCodeUrl, + rovo: rovoUrl, + hermes: hermesUrl, + devin: devinUrl, + muse: museUrl, + dsh: dshUrl, + zcode: zcodeUrl, + openclaw: openclawUrl, + jcode: jcodeUrl, + codebuddy: codebuddyUrl +} diff --git a/src/renderer/src/lib/agent-icon-glyphs.tsx b/src/renderer/src/components/agent/icons/agent-icon-glyphs.tsx similarity index 99% rename from src/renderer/src/lib/agent-icon-glyphs.tsx rename to src/renderer/src/components/agent/icons/agent-icon-glyphs.tsx index 66c3aa786ed..be70a55196e 100644 --- a/src/renderer/src/lib/agent-icon-glyphs.tsx +++ b/src/renderer/src/components/agent/icons/agent-icon-glyphs.tsx @@ -1,5 +1,5 @@ import React from 'react' -import { cn } from './utils' +import { cn } from '../../../lib/utils' export function PiIcon({ size = 14, diff --git a/src/renderer/src/lib/agent-type-icon.tsx b/src/renderer/src/components/agent/icons/agent-type-icon.tsx similarity index 80% rename from src/renderer/src/lib/agent-type-icon.tsx rename to src/renderer/src/components/agent/icons/agent-type-icon.tsx index 1b98492d56c..b12412deb72 100644 --- a/src/renderer/src/lib/agent-type-icon.tsx +++ b/src/renderer/src/components/agent/icons/agent-type-icon.tsx @@ -1,8 +1,8 @@ import type React from 'react' -import type { AgentType } from '../../../shared/agent-status/contracts/agent-status-types' -import { AgentIcon } from './agent-catalog' +import type { AgentType } from '../../../../../shared/agent-status/contracts/agent-status-types' +import { AgentIcon } from './AgentIcon' import { AgentLetterIcon } from './agent-icon-glyphs' -import { agentTypeToIconAgent } from '../../../shared/agent-status/presentation/agent-type-icon-agent' +import { agentTypeToIconAgent } from '../../../../../shared/agent-status/presentation/agent-type-icon-agent' /** Status-row icon: known agents get their brand icon, any other OSC 7501 program its first letter. */ export function AgentTypeIcon({ diff --git a/src/renderer/src/components/agent/launch-settings/AgentDefaultSurfacePreviews.tsx b/src/renderer/src/components/agent/launch-settings/AgentDefaultSurfacePreviews.tsx index c3d5bf943cc..b47f494f994 100644 --- a/src/renderer/src/components/agent/launch-settings/AgentDefaultSurfacePreviews.tsx +++ b/src/renderer/src/components/agent/launch-settings/AgentDefaultSurfacePreviews.tsx @@ -16,7 +16,7 @@ import { import { composeActiveTerminalTheme } from '@/components/terminal-pane/appearance/terminal-appearance' import { useSystemPrefersDark } from '@/hooks/theme/use-system-prefers-dark' import { useIntlLocale, useTranslate } from '@/i18n/use-translate' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { buildFontFamily } from '@/lib/monospace-font-family' import { resolveEffectiveTerminalAppearance } from '@/lib/terminal-theme' import { cn } from '@/lib/utils' diff --git a/src/renderer/src/components/automations/AutomationAgentLaunchPicker.tsx b/src/renderer/src/components/automations/AutomationAgentLaunchPicker.tsx index c84bc199de9..beee205e96a 100644 --- a/src/renderer/src/components/automations/AutomationAgentLaunchPicker.tsx +++ b/src/renderer/src/components/automations/AutomationAgentLaunchPicker.tsx @@ -10,7 +10,7 @@ import { resolveHostCapabilities, type ProspectiveWorkspace } from '@/lib/agent-session/launch/routing/agent-launch-route-input' -import type { AgentCatalogEntry } from '@/lib/agent-catalog' +import type { AgentCatalogEntry } from '@/lib/agent-catalog/agent-catalog' import { parseExecutionHostId } from '../../../../shared/execution-host' import { AUTOMATION_LAUNCH_SETUP_RUNTIME_CAPABILITY } from '../../../../shared/automations/automation-runtime-capabilities' import { automationLegacyArguments } from '../../../../shared/automations/launch/automation-legacy-arguments' diff --git a/src/renderer/src/components/automations/AutomationDetail.tsx b/src/renderer/src/components/automations/AutomationDetail.tsx index 82213b9e4b5..cb8f9f992e3 100644 --- a/src/renderer/src/components/automations/AutomationDetail.tsx +++ b/src/renderer/src/components/automations/AutomationDetail.tsx @@ -3,7 +3,8 @@ import { Pencil, Pause, Play, Trash2 } from 'lucide-react' import { Button } from '@/components/ui/button' import { Badge } from '@/components/ui/badge' import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip' -import { getAgentCatalog, AgentIcon } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import type { Automation } from '../../../../shared/automations/automation-definition' import type { AutomationRun } from '../../../../shared/automations/history/automation-run' import { formatUiAutomationSchedule } from './automation-schedule-label' diff --git a/src/renderer/src/components/automations/AutomationEditorDialog.tsx b/src/renderer/src/components/automations/AutomationEditorDialog.tsx index 3d57e56bce5..9a8b4ac659e 100644 --- a/src/renderer/src/components/automations/AutomationEditorDialog.tsx +++ b/src/renderer/src/components/automations/AutomationEditorDialog.tsx @@ -9,7 +9,7 @@ import { automationLaunchWorkspace } from './automation-launch-surface' import { Dialog, DialogContent } from '@/components/ui/dialog' -import { getAgentCatalog } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' import { filterEnabledTuiAgents } from '../../../../shared/agent-launch/catalog/tui-agent-selection' import type { AutomationLaunchPreferences, diff --git a/src/renderer/src/components/automations/AutomationEditorSettingsSidebar.test.tsx b/src/renderer/src/components/automations/AutomationEditorSettingsSidebar.test.tsx index ced6fef4624..6e083b2ebcd 100644 --- a/src/renderer/src/components/automations/AutomationEditorSettingsSidebar.test.tsx +++ b/src/renderer/src/components/automations/AutomationEditorSettingsSidebar.test.tsx @@ -3,7 +3,7 @@ import { act, cleanup, fireEvent, render, screen } from '@testing-library/react' import { useState } from 'react' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { AGENT_CATALOG } from '@/lib/agent-catalog' +import { AGENT_CATALOG } from '@/lib/agent-catalog/agent-catalog' import { TooltipProvider } from '@/components/ui/tooltip' import { useAppStore } from '@/store' import { createCompatibleRuntimeStatusResponse } from '@/runtime/rpc/testing/runtime-compatibility-test-fixture' diff --git a/src/renderer/src/components/automations/AutomationEditorSettingsSidebar.tsx b/src/renderer/src/components/automations/AutomationEditorSettingsSidebar.tsx index 51f95c09d7d..6c89609af50 100644 --- a/src/renderer/src/components/automations/AutomationEditorSettingsSidebar.tsx +++ b/src/renderer/src/components/automations/AutomationEditorSettingsSidebar.tsx @@ -8,7 +8,7 @@ import type { OrcaHooks } from '../../../../shared/orca-yaml-hook-types' import type { ProjectHostSetup } from '../../../../shared/project-types' import type { Repo } from '../../../../shared/repo-types' import type { Worktree } from '../../../../shared/worktree/types' -import type { AgentCatalogEntry } from '@/lib/agent-catalog' +import type { AgentCatalogEntry } from '@/lib/agent-catalog/agent-catalog' import { AUTOMATION_EDITOR_SECTION_LABEL_CLASS, Field } from './automation-page-parts' import { AutomationMissedRunGraceField } from './AutomationMissedRunGraceField' import { AutomationPrecheckFields } from './AutomationPrecheckFields' diff --git a/src/renderer/src/components/automations/AutomationListFilterMenu.tsx b/src/renderer/src/components/automations/AutomationListFilterMenu.tsx index e8d472695db..cc11fbcad2f 100644 --- a/src/renderer/src/components/automations/AutomationListFilterMenu.tsx +++ b/src/renderer/src/components/automations/AutomationListFilterMenu.tsx @@ -16,8 +16,9 @@ import { DropdownMenuSubTrigger, DropdownMenuTrigger } from '@/components/ui/dropdown-menu' -import { AgentIcon, getAgentCatalog } from '@/lib/agent-catalog' -import { searchAgentPickerEntries } from '@/lib/agent-picker-search' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' +import { searchAgentPickerEntries } from '@/lib/agent-catalog/agent-picker-search' import { useTranslate } from '@/i18n/use-translate' import { useBoundedHostRows } from '@/components/host-picker/use-bounded-host-rows' import { HostListSearchField } from '@/components/host-picker/HostListSearchField' diff --git a/src/renderer/src/components/automations/AutomationListLocalRow.tsx b/src/renderer/src/components/automations/AutomationListLocalRow.tsx index 0682e16c3cc..8c0bd693100 100644 --- a/src/renderer/src/components/automations/AutomationListLocalRow.tsx +++ b/src/renderer/src/components/automations/AutomationListLocalRow.tsx @@ -19,7 +19,7 @@ import { } from '@/components/ui/dropdown-menu' import { Button } from '@/components/ui/button' import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { cn } from '@/lib/utils' import type { AutomationRun } from '../../../../shared/automations/history/automation-run' import { getAutomationRunRepoId } from '../../../../shared/automations/history/automation-run-identity' diff --git a/src/renderer/src/components/automations/automation-draft-model.ts b/src/renderer/src/components/automations/automation-draft-model.ts index 9b2f2fda161..cf776994c35 100644 --- a/src/renderer/src/components/automations/automation-draft-model.ts +++ b/src/renderer/src/components/automations/automation-draft-model.ts @@ -1,6 +1,6 @@ import { buildAutomationRrule } from '../../../../shared/automations/scheduling/automation-schedule-occurrences' import { automationLaunchInputs } from '../../../../shared/automations/launch/automation-launch-choices' -import { getAgentCatalog } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' import type { AutomationPrecheck } from '../../../../shared/automations/automation-definition' import type { Worktree } from '../../../../shared/worktree/types' import { diff --git a/src/renderer/src/components/automations/use-automation-agent-picker-entries.ts b/src/renderer/src/components/automations/use-automation-agent-picker-entries.ts index fd9f85b3892..fb7d2ba5a49 100644 --- a/src/renderer/src/components/automations/use-automation-agent-picker-entries.ts +++ b/src/renderer/src/components/automations/use-automation-agent-picker-entries.ts @@ -1,6 +1,6 @@ import { useCallback, useMemo } from 'react' import { shallow } from 'zustand/shallow' -import type { AgentCatalogEntry } from '@/lib/agent-catalog' +import type { AgentCatalogEntry } from '@/lib/agent-catalog/agent-catalog' import type { AgentLaunchRouteStore, ProspectiveWorkspace diff --git a/src/renderer/src/components/automations/use-automations-page-store-state.ts b/src/renderer/src/components/automations/use-automations-page-store-state.ts index 798b9dc13f7..4528ee6ea98 100644 --- a/src/renderer/src/components/automations/use-automations-page-store-state.ts +++ b/src/renderer/src/components/automations/use-automations-page-store-state.ts @@ -5,7 +5,7 @@ import { } from '../../../../shared/agent-launch/catalog/tui-agent-selection' import type { Repo } from '../../../../shared/repo-types' import type { Worktree } from '../../../../shared/worktree/types' -import { getAgentCatalog } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' import { useAppStore } from '@/store' import { useRepoMap } from '@/store/repos/use-repository-catalog' import { useWorktreeMap } from '@/store/slices/worktrees/listing/use-worktree-catalog' diff --git a/src/renderer/src/components/cmd-j/palette-live-status.tsx b/src/renderer/src/components/cmd-j/palette-live-status.tsx index 5bd08054f6f..bebe0cfe96f 100644 --- a/src/renderer/src/components/cmd-j/palette-live-status.tsx +++ b/src/renderer/src/components/cmd-j/palette-live-status.tsx @@ -11,7 +11,10 @@ import { buildExplicitEntriesByTabId, type TabPaneInputSources } from '../../../../shared/sidebar-list/smart-attention' -import { isExplicitAgentStatusFresh } from '@/lib/pane-agent-evidence' +import { + isAgentStatusFresh, + AGENT_STATUS_STALE_AFTER_MS +} from '../../../../shared/agent-status/contracts/agent-status-freshness' import { getLiveAgentStatusByWorktreeId, type LiveAgentWorktreeStatus @@ -32,7 +35,6 @@ import { } from '@/components/tab-bar/terminal-tab-activity-status' import { useTranslate } from '@/i18n/use-translate' -import { AGENT_STATUS_STALE_AFTER_MS } from '../../../../shared/agent-status/contracts/agent-status-freshness' import type { AgentStatusEntry } from '../../../../shared/agent-status/contracts/agent-status-types' import { parsePaneKey } from '../../../../shared/workspace-layout/stable-pane-id' import type { BrowserWorkspace } from '../../../../shared/browser-workspace-types' @@ -162,7 +164,7 @@ function buildLiveAgentStatusPaneIdsByTabId( } if ( entry.restoredUnconfirmed !== true && - !isExplicitAgentStatusFresh(entry, now, AGENT_STATUS_STALE_AFTER_MS) + !isAgentStatusFresh(entry, now, AGENT_STATUS_STALE_AFTER_MS) ) { stalePaneIds.add(paneId) continue diff --git a/src/renderer/src/components/dashboard-popout/AgentKanbanCard.tsx b/src/renderer/src/components/dashboard-popout/AgentKanbanCard.tsx index f0b18fa687e..dc46ed8d2d5 100644 --- a/src/renderer/src/components/dashboard-popout/AgentKanbanCard.tsx +++ b/src/renderer/src/components/dashboard-popout/AgentKanbanCard.tsx @@ -7,7 +7,7 @@ import { GitPullRequestClosed, GitPullRequestDraft } from 'lucide-react' -import { AgentTypeIcon } from '@/lib/agent-type-icon' +import { AgentTypeIcon } from '@/components/agent/icons/agent-type-icon' import { AgentQuestionIcon } from '@/components/AgentQuestionIcon' import { AgentStateDot } from '@/components/AgentStateDot' import { RepoIconGlyph } from '@/components/repo/repo-icon' diff --git a/src/renderer/src/components/dashboard-popout/AgentTerminalDialog.tsx b/src/renderer/src/components/dashboard-popout/AgentTerminalDialog.tsx index 83505a76764..560c0e3459a 100644 --- a/src/renderer/src/components/dashboard-popout/AgentTerminalDialog.tsx +++ b/src/renderer/src/components/dashboard-popout/AgentTerminalDialog.tsx @@ -1,6 +1,6 @@ import { useEffect, useId, useRef } from 'react' import { SquareArrowOutUpRight, XIcon } from 'lucide-react' -import { AgentTypeIcon } from '@/lib/agent-type-icon' +import { AgentTypeIcon } from '@/components/agent/icons/agent-type-icon' import { formatAgentTypeLabel } from '../../../../shared/agent-status/presentation/agent-type-label' import { agentStateLabel } from '@/components/AgentStateDot' import { Dialog, DialogContent, DialogTitle } from '@/components/ui/dialog' diff --git a/src/renderer/src/components/dashboard/DashboardAgentRow.tsx b/src/renderer/src/components/dashboard/DashboardAgentRow.tsx index 1a61fa91825..7d676e65533 100644 --- a/src/renderer/src/components/dashboard/DashboardAgentRow.tsx +++ b/src/renderer/src/components/dashboard/DashboardAgentRow.tsx @@ -1,6 +1,9 @@ import React, { useState, useCallback } from 'react' import { cn } from '@/lib/utils' -import { opensClaudeParentConversation, viewClaudeAgentFromRow } from '@/lib/claude-agent-row-view' +import { + opensClaudeParentConversation, + viewClaudeAgentFromRow +} from '@/lib/agent-session/navigation/claude-agent-row-view' import { useClaudeAgentRowView } from './use-claude-agent-row-view' import { AgentStateDot, @@ -8,26 +11,32 @@ import { agentStateProgressLabel, type AgentDotState } from '@/components/AgentStateDot' -import { AgentTypeIcon } from '@/lib/agent-type-icon' +import { AgentTypeIcon } from '@/components/agent/icons/agent-type-icon' import { formatAgentTypeLabel } from '../../../../shared/agent-status/presentation/agent-type-label' import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip' import { DashboardAgentRowMessage } from './DashboardAgentRowMessage' import { DashboardAgentRowTrailingControls } from './DashboardAgentRowTrailingControls' import { DashboardAgentRowToolStep } from './DashboardAgentRowToolStep' import { programStatusAttentionLine } from '../../../../shared/program-status/presentation' -import { agentRowToolInput, showsAgentToolPreview } from '@/lib/agent-row-tool-preview' +import { + agentRowToolInput, + showsAgentToolPreview +} from '@/lib/agent-status/presentation/agent-row-tool-preview' import { resolveRowProgramStatus } from '@/lib/program-status/agent-row-presentation' -import { agentRowStoppingLabel } from '@/lib/agent-row-stopping-label' +import { agentRowStoppingLabel } from '@/lib/agent-status/presentation/agent-row-stopping-label' import { agentNoUpdateLabel, formatCompactDuration } from '../../../../shared/agent-status/presentation/agent-row-decay-state' -import { agentRowDisplayDotState, agentRowDotState as asDotState } from '@/lib/agent-row-dot-state' +import { + agentRowDisplayDotState, + agentRowDotState as asDotState +} from '@/lib/agent-status/presentation/agent-row-dot-state' import { agentMainAgentVerdict, agentVerdictDisplayMark } from '../../../../shared/agent-status/lifecycle/agent-main-agent-verdict' -import { agentVerdictStatusLine } from '@/lib/agent-verdict-status-line' +import { agentVerdictStatusLine } from '@/lib/agent-status/presentation/agent-verdict-status-line' import type { DashboardAgentRow as DashboardAgentRowData } from './useDashboardData' import { getAgentRowPrimaryText } from '../../../../shared/agent-status/presentation/agent-row-primary-text' import { useAgentRowConversationName } from './use-agent-row-conversation-name' diff --git a/src/renderer/src/components/dashboard/useRetainedAgents.ts b/src/renderer/src/components/dashboard/useRetainedAgents.ts index 8bae0d6d7e1..fa75f806fa6 100644 --- a/src/renderer/src/components/dashboard/useRetainedAgents.ts +++ b/src/renderer/src/components/dashboard/useRetainedAgents.ts @@ -2,7 +2,10 @@ import { agentEntrySessionStartedAt } from '../../../../shared/agent-session/lif import { useEffect, useRef } from 'react' import { useShallow } from 'zustand/react/shallow' import { useAppStore } from '@/store' -import { isExplicitAgentStatusFresh } from '@/lib/pane-agent-evidence' +import { + isAgentStatusFresh, + AGENT_STATUS_STALE_AFTER_MS +} from '../../../../shared/agent-status/contracts/agent-status-freshness' import type { DashboardAgentRow } from './useDashboardData' import type { RetainedAgentEntry } from '@/store/slices/agent-status/agent-status-contract' import type { FolderWorkspace } from '../../../../shared/folder-workspaces/folder-workspace-types' @@ -11,7 +14,7 @@ import type { TerminalTab } from '../../../../shared/workspace-layout/terminal-t import type { Worktree } from '../../../../shared/worktree/types' import { folderWorkspaceKey } from '../../../../shared/workspace-scope' import { resolveAgentPaneAuthorityKey } from '@/store/slices/agent-status/agent-pane-authority' -import { AGENT_STATUS_STALE_AFTER_MS } from '../../../../shared/agent-status/contracts/agent-status-freshness' + import type { AgentStatusEntry } from '../../../../shared/agent-status/contracts/agent-status-types' import { parsePaneKey } from '../../../../shared/workspace-layout/stable-pane-id' import { agentTurnEndedOnPurpose } from '../../../../shared/agent-status/lifecycle/agent-main-agent-verdict' @@ -116,7 +119,7 @@ export function buildRetainedAgentsSyncSnapshot(args: RetainedAgentsSyncSnapshot if (!owner) { continue } - const isFresh = isExplicitAgentStatusFresh(entry, args.now, AGENT_STATUS_STALE_AFTER_MS) + const isFresh = isAgentStatusFresh(entry, args.now, AGENT_STATUS_STALE_AFTER_MS) const shouldDecay = !isFresh && (entry.state === 'working' || entry.state === 'blocked' || entry.state === 'waiting') diff --git a/src/renderer/src/components/editor/review-note-delivery/ReviewNotesSendMenuContent.tsx b/src/renderer/src/components/editor/review-note-delivery/ReviewNotesSendMenuContent.tsx index 027468d1b0a..6612ba225c7 100644 --- a/src/renderer/src/components/editor/review-note-delivery/ReviewNotesSendMenuContent.tsx +++ b/src/renderer/src/components/editor/review-note-delivery/ReviewNotesSendMenuContent.tsx @@ -22,24 +22,24 @@ import { } from '@/runtime/native-chat/naming/structured-chat-name-observation' import { QuickLaunchAgentMenuItems } from '@/components/tab-bar/QuickLaunchButton' import { AgentStateDot, agentStateLabel } from '@/components/AgentStateDot' -import { AgentTypeIcon } from '@/lib/agent-type-icon' +import { AgentTypeIcon } from '@/components/agent/icons/agent-type-icon' import { DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator } from '@/components/ui/dropdown-menu' import { focusTerminalTabSurface } from '@/lib/focus-terminal-tab-surface' -import '@/lib/active-agent-note-send' +import '@/lib/agent-session/messaging/terminal/active-agent-note-send' import { activeAgentNotesSendFailureMessage, type ActiveAgentNotesSendResult -} from '@/lib/active-agent-note-send-result' -import { sendMessageToAgent } from '@/lib/agent-message-send' +} from '@/lib/agent-session/messaging/terminal/active-agent-note-send-result' +import { sendMessageToAgent } from '@/lib/agent-session/messaging/agent-message-send' import { deriveNotesSendAgentTargets, type NotesSendAgentTarget -} from '@/lib/notes-send-agent-targets' -import { agentKindForAgentType } from '@/lib/agent-status' +} from '@/lib/agent-session/messaging/notes-send-agent-targets' +import { agentKindForAgentType } from '@/lib/agent-status/aggregation/worktree-agent-status' import { formatAgentTypeLabel } from '../../../../../shared/agent-status/presentation/agent-type-label' import { track } from '@/lib/telemetry' import { useNow } from '@/hooks/use-now' @@ -49,10 +49,10 @@ import { useWorktreeAgentRows } from '@/components/sidebar/workspace-card/activi import { useAgentRowConversationName } from '@/components/dashboard/use-agent-row-conversation-name' import { getAgentRowPrimaryText } from '../../../../../shared/agent-status/presentation/agent-row-primary-text' import type { LaunchSource } from '../../../../../shared/telemetry-property-schemas' -import { agentRowDisplayDotState } from '@/lib/agent-row-dot-state' +import { agentRowDisplayDotState } from '@/lib/agent-status/presentation/agent-row-dot-state' import { translate } from '@/i18n/i18n' import { useTranslate, type Translate } from '@/i18n/use-translate' -import { agentSendDisabledReasonLabel } from '@/lib/agent-send-disabled-reason-label' +import { agentSendDisabledReasonLabel } from '@/lib/agent-session/messaging/agent-send-disabled-reason-label' import { addQuoteToAgent } from '@/components/native-chat/selection-quotes/native-chat-workspace-selection' import React, { useCallback, useMemo } from 'react' import { orderSendTargetsByWorktreeAgentRows } from './review-notes-send-target-order' diff --git a/src/renderer/src/components/editor/review-note-delivery/review-notes-send-target-order.ts b/src/renderer/src/components/editor/review-note-delivery/review-notes-send-target-order.ts index d7a498d62a1..274d678fc80 100644 --- a/src/renderer/src/components/editor/review-note-delivery/review-notes-send-target-order.ts +++ b/src/renderer/src/components/editor/review-note-delivery/review-notes-send-target-order.ts @@ -1,5 +1,5 @@ import type { DashboardAgentRow as DashboardAgentRowData } from '@/components/dashboard/useDashboardData' -import type { NotesSendAgentTarget } from '@/lib/notes-send-agent-targets' +import type { NotesSendAgentTarget } from '@/lib/agent-session/messaging/notes-send-agent-targets' export type OrderedSendTarget = { target: NotesSendAgentTarget diff --git a/src/renderer/src/components/emulator-pane/MobileEmulatorAgentSetupGuideSteps.tsx b/src/renderer/src/components/emulator-pane/MobileEmulatorAgentSetupGuideSteps.tsx index 9e061859f0b..23ce5fbfadd 100644 --- a/src/renderer/src/components/emulator-pane/MobileEmulatorAgentSetupGuideSteps.tsx +++ b/src/renderer/src/components/emulator-pane/MobileEmulatorAgentSetupGuideSteps.tsx @@ -1,5 +1,5 @@ import { useAppStore } from '@/store' -import { ORCA_CLI_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { ORCA_CLI_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' import { AgentSkillSetupPanel } from '../skills/setup/AgentSkillSetupPanel' import type { useMobileEmulatorAgentSetupState } from './use-mobile-emulator-agent-setup-state' import { useTranslate } from '@/i18n/use-translate' diff --git a/src/renderer/src/components/emulator-pane/use-mobile-emulator-agent-setup-state.ts b/src/renderer/src/components/emulator-pane/use-mobile-emulator-agent-setup-state.ts index 8182008b6c7..35d7b3e1e7c 100644 --- a/src/renderer/src/components/emulator-pane/use-mobile-emulator-agent-setup-state.ts +++ b/src/renderer/src/components/emulator-pane/use-mobile-emulator-agent-setup-state.ts @@ -1,7 +1,7 @@ import { useActiveProjectSkillRuntime } from '@/hooks/useActiveProjectSkillRuntime' import { useCallback, useEffect, useState } from 'react' import { toast } from 'sonner' -import { ORCA_CLI_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { ORCA_CLI_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' import { GLOBAL_AGENT_SKILL_SOURCE_KINDS, useInstalledAgentSkill diff --git a/src/renderer/src/components/feature-tips/ChatUiHereFeatureTipVisual.tsx b/src/renderer/src/components/feature-tips/ChatUiHereFeatureTipVisual.tsx index 8843b4abca0..504ce6f3b20 100644 --- a/src/renderer/src/components/feature-tips/ChatUiHereFeatureTipVisual.tsx +++ b/src/renderer/src/components/feature-tips/ChatUiHereFeatureTipVisual.tsx @@ -5,7 +5,7 @@ import { usePrefersReducedMotion } from '@/components/feature-wall/feature-wall- import { nativeChatPermissionModeLabel } from '@/components/native-chat/session/options/controls/native-chat-permission-mode-labels' import { nativeChatToolRowVerb } from '@/components/native-chat/tools/lines/native-chat-tool-line-label' import { useIntlLocale, useTranslate } from '@/i18n/use-translate' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { cn } from '@/lib/utils' import { CHAT_DEMO_FILE, diff --git a/src/renderer/src/components/feature-tips/CliSkillSetupPanel.tsx b/src/renderer/src/components/feature-tips/CliSkillSetupPanel.tsx index 973778d798a..29e6bc84d87 100644 --- a/src/renderer/src/components/feature-tips/CliSkillSetupPanel.tsx +++ b/src/renderer/src/components/feature-tips/CliSkillSetupPanel.tsx @@ -1,6 +1,9 @@ import { CliSkillSetupTerminal } from './CliSkillSetupTerminal' import { AgentSkillSetupPanel } from '@/components/skills/setup/AgentSkillSetupPanel' -import { ORCA_CLI_SKILL_NAME, ORCHESTRATION_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { + ORCA_CLI_SKILL_NAME, + ORCHESTRATION_SKILL_NAME +} from '@/lib/skills/installation/agent-feature-skill-names' import { useActiveProjectSkillRuntime } from '@/hooks/useActiveProjectSkillRuntime' import { GLOBAL_AGENT_SKILL_SOURCE_KINDS, diff --git a/src/renderer/src/components/feature-tips/CliSkillSetupTerminal.tsx b/src/renderer/src/components/feature-tips/CliSkillSetupTerminal.tsx index a8ed33a815b..66dba756e26 100644 --- a/src/renderer/src/components/feature-tips/CliSkillSetupTerminal.tsx +++ b/src/renderer/src/components/feature-tips/CliSkillSetupTerminal.tsx @@ -8,7 +8,7 @@ import { buildSkillCommandForRuntime, buildSkillSetupTerminalCommand } from '@/lib/skill-runtime-command' -import { ORCA_CLI_ORCHESTRATION_SKILL_INSTALL_COMMAND } from '@/lib/agent-feature-install-commands' +import { ORCA_CLI_ORCHESTRATION_SKILL_INSTALL_COMMAND } from '@/lib/skills/installation/agent-feature-install-commands' import { useActiveProjectSkillRuntime } from '@/hooks/useActiveProjectSkillRuntime' import { useTranslate } from '@/i18n/use-translate' diff --git a/src/renderer/src/components/feature-tips/feature-tip-session-panel-demo.tsx b/src/renderer/src/components/feature-tips/feature-tip-session-panel-demo.tsx index 31241c22cd8..a555cebaa37 100644 --- a/src/renderer/src/components/feature-tips/feature-tip-session-panel-demo.tsx +++ b/src/renderer/src/components/feature-tips/feature-tip-session-panel-demo.tsx @@ -16,7 +16,7 @@ import { DEFAULT_AI_VAULT_GROUP, DEFAULT_AI_VAULT_HIDE_EMPTY_SESSIONS } from '@/components/right-sidebar/ai-vault/scope/ai-vault-view-defaults' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { useTranslate } from '@/i18n/use-translate' import type { SessionSearchDemoRow } from './session-search-feature-tip-demo' diff --git a/src/renderer/src/components/feature-wall/AgentCapabilitiesSetupAction.tsx b/src/renderer/src/components/feature-wall/AgentCapabilitiesSetupAction.tsx index 37296243aeb..d9c96a59896 100644 --- a/src/renderer/src/components/feature-wall/AgentCapabilitiesSetupAction.tsx +++ b/src/renderer/src/components/feature-wall/AgentCapabilitiesSetupAction.tsx @@ -5,7 +5,7 @@ import { import { bundledSkillSetupActionLabel } from '../skills/setup/bundled-skill-setup-copy' import { useOnboardingSkillRuntime } from '@/hooks/use-onboarding-skill-runtime' import { FeatureSetupInlineTerminal } from '../onboarding/FeatureSetupInlineTerminal' -import { buildAgentFeatureSkillInstallCommand } from '@/lib/agent-feature-install-commands' +import { buildAgentFeatureSkillInstallCommand } from '@/lib/skills/installation/agent-feature-install-commands' import { buildSkillCommandForRuntime } from '../../lib/skill-runtime-command' import type { OnboardingFeatureSetupRuntimeContext } from '../onboarding/onboarding-feature-setup-runtime' import { useCallback, useEffect, useRef, useState } from 'react' diff --git a/src/renderer/src/components/feature-wall/BrowserUseSkillSetupCard.tsx b/src/renderer/src/components/feature-wall/BrowserUseSkillSetupCard.tsx index 79117be2416..50ba20b0691 100644 --- a/src/renderer/src/components/feature-wall/BrowserUseSkillSetupCard.tsx +++ b/src/renderer/src/components/feature-wall/BrowserUseSkillSetupCard.tsx @@ -1,5 +1,5 @@ import type { JSX } from 'react' -import { ORCA_CLI_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { ORCA_CLI_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' import { BROWSER_USE_ENABLED_STORAGE_KEY } from '@/lib/browser/browser-use-setup-state' import type { InstalledAgentSkillState } from '@/hooks/useInstalledAgentSkills' import { useActiveProjectSkillRuntime } from '@/hooks/useActiveProjectSkillRuntime' diff --git a/src/renderer/src/components/feature-wall/FeatureWallBrowserAction.tsx b/src/renderer/src/components/feature-wall/FeatureWallBrowserAction.tsx index 2e5dacb6e21..c75a4e6cde8 100644 --- a/src/renderer/src/components/feature-wall/FeatureWallBrowserAction.tsx +++ b/src/renderer/src/components/feature-wall/FeatureWallBrowserAction.tsx @@ -1,9 +1,9 @@ import { useBundledSkillInstallAction } from '@/hooks/use-bundled-skill-install-action' import { bundledSkillSetupActionLabel } from '../skills/setup/bundled-skill-setup-copy' -import { ORCA_CLI_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { ORCA_CLI_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' import { useOnboardingSkillRuntime } from '@/hooks/use-onboarding-skill-runtime' import { FeatureSetupInlineTerminal } from '../onboarding/FeatureSetupInlineTerminal' -import { buildAgentFeatureSkillInstallCommand } from '@/lib/agent-feature-install-commands' +import { buildAgentFeatureSkillInstallCommand } from '@/lib/skills/installation/agent-feature-install-commands' import { buildSkillCommandForRuntime } from '../../lib/skill-runtime-command' import type { OnboardingFeatureSetupRuntimeContext } from '../onboarding/onboarding-feature-setup-runtime' import { useCallback, useState } from 'react' diff --git a/src/renderer/src/components/feature-wall/OrchestrationSetupCard.tsx b/src/renderer/src/components/feature-wall/OrchestrationSetupCard.tsx index 587853da0a9..b4414b55fd4 100644 --- a/src/renderer/src/components/feature-wall/OrchestrationSetupCard.tsx +++ b/src/renderer/src/components/feature-wall/OrchestrationSetupCard.tsx @@ -1,5 +1,5 @@ import type { JSX } from 'react' -import { ORCHESTRATION_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { ORCHESTRATION_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' import type { InstalledAgentSkillState } from '@/hooks/useInstalledAgentSkills' import { useActiveProjectSkillRuntime } from '@/hooks/useActiveProjectSkillRuntime' import { AgentSkillSetupPanel } from '../skills/setup/AgentSkillSetupPanel' diff --git a/src/renderer/src/components/feature-wall/agent-capability-setup-status.ts b/src/renderer/src/components/feature-wall/agent-capability-setup-status.ts index 192f3010d2e..102ccf8ac71 100644 --- a/src/renderer/src/components/feature-wall/agent-capability-setup-status.ts +++ b/src/renderer/src/components/feature-wall/agent-capability-setup-status.ts @@ -7,7 +7,7 @@ import { COMPUTER_USE_SKILL_NAME, ORCA_CLI_SKILL_NAME, ORCHESTRATION_SKILL_NAME -} from '@/lib/agent-feature-skill-names' +} from '@/lib/skills/installation/agent-feature-skill-names' import { GLOBAL_AGENT_SKILL_SOURCE_KINDS, useInstalledAgentSkill diff --git a/src/renderer/src/components/feature-wall/agents-orchestration/StatusesPage.tsx b/src/renderer/src/components/feature-wall/agents-orchestration/StatusesPage.tsx index d5a4de1475b..2fa39d369e2 100644 --- a/src/renderer/src/components/feature-wall/agents-orchestration/StatusesPage.tsx +++ b/src/renderer/src/components/feature-wall/agents-orchestration/StatusesPage.tsx @@ -2,7 +2,8 @@ import { useEffect, useRef, useState } from 'react' import type { JSX, ReactNode } from 'react' import { Wrench } from 'lucide-react' import { AgentStateDot } from '@/components/AgentStateDot' -import { getAgentCatalog, AgentIcon, type AgentCatalogEntry } from '@/lib/agent-catalog' +import { getAgentCatalog, type AgentCatalogEntry } from '@/lib/agent-catalog/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { ClaudeIcon, OpenAIIcon } from '../../status-bar/icons' import { installWindowVisibilityInterval } from '@/lib/window-visibility-interval' import { cn } from '@/lib/utils' diff --git a/src/renderer/src/components/feature-wall/ai-commit-pr-settings-helpers.ts b/src/renderer/src/components/feature-wall/ai-commit-pr-settings-helpers.ts index 7a5f4046b7c..53e37a5f95d 100644 --- a/src/renderer/src/components/feature-wall/ai-commit-pr-settings-helpers.ts +++ b/src/renderer/src/components/feature-wall/ai-commit-pr-settings-helpers.ts @@ -8,7 +8,7 @@ import { type CommitMessageAgentChoice, type CommitMessageModelCapability } from '../../../../shared/source-control/ai/generation/commit-message-agent-spec' -import { getAgentCatalog } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' export const EMPTY_COMMIT_MESSAGE_AI_SETTINGS: CommitMessageAiSettings = { enabled: false, diff --git a/src/renderer/src/components/feature-wall/use-feature-wall-tour-skills.ts b/src/renderer/src/components/feature-wall/use-feature-wall-tour-skills.ts index 4545f81db62..1185bf0b6cf 100644 --- a/src/renderer/src/components/feature-wall/use-feature-wall-tour-skills.ts +++ b/src/renderer/src/components/feature-wall/use-feature-wall-tour-skills.ts @@ -1,4 +1,7 @@ -import { ORCA_CLI_SKILL_NAME, ORCHESTRATION_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { + ORCA_CLI_SKILL_NAME, + ORCHESTRATION_SKILL_NAME +} from '@/lib/skills/installation/agent-feature-skill-names' import { GLOBAL_AGENT_SKILL_SOURCE_KINDS, useInstalledAgentSkill diff --git a/src/renderer/src/components/feature-wall/useAiCommitPrSettings.ts b/src/renderer/src/components/feature-wall/useAiCommitPrSettings.ts index 1ab62151757..719167987c6 100644 --- a/src/renderer/src/components/feature-wall/useAiCommitPrSettings.ts +++ b/src/renderer/src/components/feature-wall/useAiCommitPrSettings.ts @@ -11,7 +11,7 @@ import { LOCAL_COMMIT_MESSAGE_HOST_KEY } from '../../../../shared/source-control import { getDefaultSourceControlAiSettings } from '../../../../shared/source-control/ai/settings/source-control-ai-settings' import { getTextGenerationModels } from '../../../../shared/source-control/ai/settings/source-control-ai-model-selection' import { isTuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent-config' -import { getAgentCatalog } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' import { useAppStore } from '@/store/index' import type { AgentPickerDraft, diff --git a/src/renderer/src/components/floating-terminal/FloatingTerminalOrchestrationDialog.tsx b/src/renderer/src/components/floating-terminal/FloatingTerminalOrchestrationDialog.tsx index 0140259f836..39bc18b48cf 100644 --- a/src/renderer/src/components/floating-terminal/FloatingTerminalOrchestrationDialog.tsx +++ b/src/renderer/src/components/floating-terminal/FloatingTerminalOrchestrationDialog.tsx @@ -9,7 +9,7 @@ import { import { AgentSkillSetupPanel } from '@/components/skills/setup/AgentSkillSetupPanel' import { IntegrationStatusPill } from '@/components/integration-status-pill' import { SkillFreshnessStatusPill } from '@/components/skills/SkillFreshnessStatusPill' -import { ORCHESTRATION_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { ORCHESTRATION_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' import { GLOBAL_AGENT_SKILL_SOURCE_KINDS, useInstalledAgentSkill diff --git a/src/renderer/src/components/floating-terminal/FloatingTerminalWindowControls.tsx b/src/renderer/src/components/floating-terminal/FloatingTerminalWindowControls.tsx index d31dda2e7ae..32d7b8bb2f7 100644 --- a/src/renderer/src/components/floating-terminal/FloatingTerminalWindowControls.tsx +++ b/src/renderer/src/components/floating-terminal/FloatingTerminalWindowControls.tsx @@ -2,7 +2,8 @@ import { useCallback, useMemo } from 'react' import { Maximize2, Minimize2, Minus } from 'lucide-react' import { Button } from '@/components/ui/button' import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip' -import { getAgentCatalog, AgentIcon } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { focusTerminalTabSurface } from '@/lib/focus-terminal-tab-surface' import { launchAgentInNewTab } from '@/lib/agent-session/launch/new-tab/launch-agent-in-new-tab' import { newAgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agent-launch-request-id' diff --git a/src/renderer/src/components/floating-terminal/use-floating-terminal-orchestration-visibility.ts b/src/renderer/src/components/floating-terminal/use-floating-terminal-orchestration-visibility.ts index fdfadb6fbc8..dd730267828 100644 --- a/src/renderer/src/components/floating-terminal/use-floating-terminal-orchestration-visibility.ts +++ b/src/renderer/src/components/floating-terminal/use-floating-terminal-orchestration-visibility.ts @@ -1,5 +1,5 @@ import { useCallback, useEffect } from 'react' -import { isOrcaCliAvailableOnPath } from '@/lib/agent-skill-cli-prerequisite' +import { isOrcaCliAvailableOnPath } from '@/lib/skills/installation/agent-skill-cli-prerequisite' import { ORCHESTRATION_SETUP_STATE_EVENT, hasOrchestrationSetupMarker, diff --git a/src/renderer/src/components/native-chat/composer/submit/use-native-chat-structured-composer-send.ts b/src/renderer/src/components/native-chat/composer/submit/use-native-chat-structured-composer-send.ts index 3eed84ab13a..da38e3036ca 100644 --- a/src/renderer/src/components/native-chat/composer/submit/use-native-chat-structured-composer-send.ts +++ b/src/renderer/src/components/native-chat/composer/submit/use-native-chat-structured-composer-send.ts @@ -4,7 +4,7 @@ import { captureNativeChatStagedInput } from '../../drafts/native-chat-draft-attachment-staging' import { mayHoldAgentReferences } from '../../../../../../shared/orchestration/mailbox/orchestration-agent-reference' -import { getAgentLabel } from '@/lib/agent-catalog' +import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog' import { formatAgentTypeLabel } from '../../../../../../shared/agent-status/presentation/agent-type-label' import { isTuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent-config' import { MAX_SKILL_REFS } from '../../../../../../shared/rpc-contract/structured-agent-session-message-params' diff --git a/src/renderer/src/components/native-chat/host-access/NativeChatInstallTile.tsx b/src/renderer/src/components/native-chat/host-access/NativeChatInstallTile.tsx index cf9e2268acf..582e358c220 100644 --- a/src/renderer/src/components/native-chat/host-access/NativeChatInstallTile.tsx +++ b/src/renderer/src/components/native-chat/host-access/NativeChatInstallTile.tsx @@ -1,5 +1,5 @@ import { TriangleAlert } from 'lucide-react' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { agentTypeToIconAgent } from '../../../../../shared/agent-status/presentation/agent-type-icon-agent' import { cn } from '@/lib/utils' import type { AgentType } from '../../../../../shared/agent-status/contracts/agent-status-types' diff --git a/src/renderer/src/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-source.ts b/src/renderer/src/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-source.ts index 3686d1c0929..010560ee33f 100644 --- a/src/renderer/src/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-source.ts +++ b/src/renderer/src/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-source.ts @@ -9,7 +9,7 @@ import { import { createWorktreeAgentFreshnessSelector } from '@/components/sidebar/workspace-card/activity/worktree-agent-freshness-selector' import '@/components/sidebar/workspace-card/activity/worktree-agent-row-selectors' import { selectWorktreeAgentOrchestration as selectRuntimeAgentOrchestrationForWorktree } from '@/components/sidebar/workspace-card/activity/worktree-agent-orchestration-index' -import { agentRowDisplayDotState } from '@/lib/agent-row-dot-state' +import { agentRowDisplayDotState } from '@/lib/agent-status/presentation/agent-row-dot-state' import { resolveRowProgramStatus } from '@/lib/program-status/agent-row-presentation' import { agentMessageSenderView, diff --git a/src/renderer/src/components/native-chat/messages/rows/NativeChatAgentMessageCard.tsx b/src/renderer/src/components/native-chat/messages/rows/NativeChatAgentMessageCard.tsx index 8bdcbfb653b..0e07ae67a6a 100644 --- a/src/renderer/src/components/native-chat/messages/rows/NativeChatAgentMessageCard.tsx +++ b/src/renderer/src/components/native-chat/messages/rows/NativeChatAgentMessageCard.tsx @@ -1,7 +1,7 @@ import { useId } from 'react' import { ChevronDown } from 'lucide-react' import { AgentStateDot } from '@/components/AgentStateDot' -import { AgentTypeIcon } from '@/lib/agent-type-icon' +import { AgentTypeIcon } from '@/components/agent/icons/agent-type-icon' import { translate } from '@/i18n/i18n' import { useTranslate, type Translate } from '@/i18n/use-translate' import { cn } from '@/lib/utils' diff --git a/src/renderer/src/components/native-chat/pane/actions/use-native-chat-hand-off.tsx b/src/renderer/src/components/native-chat/pane/actions/use-native-chat-hand-off.tsx index 20880d307d1..f02a53bffa8 100644 --- a/src/renderer/src/components/native-chat/pane/actions/use-native-chat-hand-off.tsx +++ b/src/renderer/src/components/native-chat/pane/actions/use-native-chat-hand-off.tsx @@ -9,7 +9,7 @@ import { AgentSessionContinuationDialog } from '@/components/agent-session-conti import { buildAgentSessionContinuationPrompt, type AgentSessionContinuationRequest -} from '@/lib/agent-session-continuation' +} from '@/lib/agent-session/context/agent-session-continuation' import { isTuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent-config' import { callStructuredAgentSession } from '@/runtime/native-chat/requests/structured-agent-session-call' import { supportsStructuredAgentSessionContinuationContext } from '@/runtime/native-chat/host-capabilities/structured-agent-session-host-support' diff --git a/src/renderer/src/components/native-chat/pane/actions/use-native-chat-session-context-actions.tsx b/src/renderer/src/components/native-chat/pane/actions/use-native-chat-session-context-actions.tsx index ba947924b33..9e009550ee2 100644 --- a/src/renderer/src/components/native-chat/pane/actions/use-native-chat-session-context-actions.tsx +++ b/src/renderer/src/components/native-chat/pane/actions/use-native-chat-session-context-actions.tsx @@ -2,7 +2,7 @@ import { useCallback, useLayoutEffect, useRef, useState } from 'react' import { executionHostIdForStructuredTarget } from '@/runtime/native-chat/session-ownership/structured-agent-session-owner' import { useTranslate } from '@/i18n/use-translate' import type { AgentType } from '../../../../../../shared/agent-status/contracts/agent-status-types' -import { copyAgentSessionContext } from '@/lib/copy-agent-session-context' +import { copyAgentSessionContext } from '@/lib/agent-session/context/copy-agent-session-context' import { resolveNativeChatSessionContext, type NativeChatSessionContextSource diff --git a/src/renderer/src/components/native-chat/selection-quotes/native-chat-workspace-selection.ts b/src/renderer/src/components/native-chat/selection-quotes/native-chat-workspace-selection.ts index ecf19717574..3dc5e65160c 100644 --- a/src/renderer/src/components/native-chat/selection-quotes/native-chat-workspace-selection.ts +++ b/src/renderer/src/components/native-chat/selection-quotes/native-chat-workspace-selection.ts @@ -7,9 +7,9 @@ import { } from '../../../../../shared/workspace-layout/stable-pane-id' import type { AppState } from '@/store/types' import { useAppStore } from '@/store' -import type { AgentMessageTarget } from '@/lib/agent-message-target' -import { sendMessageToAgent } from '@/lib/agent-message-send' -import type { ActiveAgentNotesSendResult } from '@/lib/active-agent-note-send-result' +import type { AgentMessageTarget } from '@/lib/agent-session/messaging/agent-message-target' +import { sendMessageToAgent } from '@/lib/agent-session/messaging/agent-message-send' +import type { ActiveAgentNotesSendResult } from '@/lib/agent-session/messaging/terminal/active-agent-note-send-result' import { activateStructuredAgentSessionTab } from '@/lib/agent-session/structured-agent-session-tab-activation' import { activateTabAndFocusPane } from '@/lib/workspace/tabs/activate-tab-and-focus-pane' import { activateTerminalTabOnOwner } from '@/lib/workspace/tabs/terminal-tab-owner-activation' diff --git a/src/renderer/src/components/native-chat/session/options/terminal/serialized-screen-background-rows.test.ts b/src/renderer/src/components/native-chat/session/options/terminal/serialized-screen-background-rows.test.ts index a4549bc9abe..ff50d589d04 100644 --- a/src/renderer/src/components/native-chat/session/options/terminal/serialized-screen-background-rows.test.ts +++ b/src/renderer/src/components/native-chat/session/options/terminal/serialized-screen-background-rows.test.ts @@ -3,7 +3,7 @@ import { describe, expect, it } from 'vitest' import { Terminal } from '@xterm/headless' import { SerializeAddon } from '@xterm/addon-serialize' import { readClaudeSessionOptionsFromTerminalScreen } from './claude-terminal-session-options' -import { buildBoundedSessionTranscript } from '@/lib/agent-session-fork-context' +import { buildBoundedSessionTranscript } from '@/lib/agent-session/context/agent-session-fork-context' const CLAUDE_FRAME = [ '╭─ Claude Code ───╮', diff --git a/src/renderer/src/components/native-chat/tools/tasks/use-structured-session-child-row-context.ts b/src/renderer/src/components/native-chat/tools/tasks/use-structured-session-child-row-context.ts index 22930f93360..a8d6e7b4fca 100644 --- a/src/renderer/src/components/native-chat/tools/tasks/use-structured-session-child-row-context.ts +++ b/src/renderer/src/components/native-chat/tools/tasks/use-structured-session-child-row-context.ts @@ -3,10 +3,13 @@ import { agentChildRowContextForParent, type AgentChildRowContext } from '../../../../../../shared/agent-status/presentation/agent-child-row-model' -import { AGENT_STATUS_STALE_AFTER_MS } from '../../../../../../shared/agent-status/contracts/agent-status-freshness' +import { + AGENT_STATUS_STALE_AFTER_MS, + isAgentStatusFresh +} from '../../../../../../shared/agent-status/contracts/agent-status-freshness' import type { AgentStatusEntry } from '../../../../../../shared/agent-status/contracts/agent-status-types' import { useNow } from '@/hooks/use-now' -import { isExplicitAgentStatusFresh } from '@/lib/pane-agent-evidence' + import { useAppStore } from '@/store' /** The verdict a session's status row gives its children, exactly as the sidebar derives it. */ @@ -16,7 +19,7 @@ export function structuredSessionChildRowContext( ): AgentChildRowContext { return agentChildRowContextForParent( parent, - isExplicitAgentStatusFresh(parent, now, AGENT_STATUS_STALE_AFTER_MS) + isAgentStatusFresh(parent, now, AGENT_STATUS_STALE_AFTER_MS) ) } diff --git a/src/renderer/src/components/native-chat/usage/NativeChatUsageLimitActions.tsx b/src/renderer/src/components/native-chat/usage/NativeChatUsageLimitActions.tsx index 41b38c61586..5621382fb1a 100644 --- a/src/renderer/src/components/native-chat/usage/NativeChatUsageLimitActions.tsx +++ b/src/renderer/src/components/native-chat/usage/NativeChatUsageLimitActions.tsx @@ -18,7 +18,7 @@ import { AgentSessionContinuationDialog } from '@/components/agent-session-conti import { buildAgentSessionContinuationPrompt, type AgentSessionContinuationRequest -} from '@/lib/agent-session-continuation' +} from '@/lib/agent-session/context/agent-session-continuation' import { ClaudeSwitcherMenu } from '@/components/status-bar/ClaudeSwitcherMenu' import { ProviderAccountChatButton } from '@/components/status-bar/ProviderAccountChatButton' import { isTuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent-config' diff --git a/src/renderer/src/components/onboarding/AgentPickerButton.tsx b/src/renderer/src/components/onboarding/AgentPickerButton.tsx index 089ad0ba33f..d322c3c9149 100644 --- a/src/renderer/src/components/onboarding/AgentPickerButton.tsx +++ b/src/renderer/src/components/onboarding/AgentPickerButton.tsx @@ -1,5 +1,6 @@ import { Check } from 'lucide-react' -import { AgentIcon, type AgentCatalogEntry } from '@/lib/agent-catalog' +import type { AgentCatalogEntry } from '@/lib/agent-catalog/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { cn } from '@/lib/utils' export function AgentSectionHeader({ diff --git a/src/renderer/src/components/onboarding/AgentStep.tsx b/src/renderer/src/components/onboarding/AgentStep.tsx index f7dde2a9ae5..ab6249cf734 100644 --- a/src/renderer/src/components/onboarding/AgentStep.tsx +++ b/src/renderer/src/components/onboarding/AgentStep.tsx @@ -1,7 +1,7 @@ import { useState } from 'react' import { ExternalLink } from 'lucide-react' import { Trans } from 'react-i18next' -import { getAgentCatalog, type AgentCatalogEntry } from '@/lib/agent-catalog' +import { getAgentCatalog, type AgentCatalogEntry } from '@/lib/agent-catalog/agent-catalog' import { Button } from '@/components/ui/button' import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible' import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent' diff --git a/src/renderer/src/components/onboarding/TerminalLaunchDemo.tsx b/src/renderer/src/components/onboarding/TerminalLaunchDemo.tsx index 7fa3f1da2e7..cd73e0da8b0 100644 --- a/src/renderer/src/components/onboarding/TerminalLaunchDemo.tsx +++ b/src/renderer/src/components/onboarding/TerminalLaunchDemo.tsx @@ -1,5 +1,6 @@ import { MessagesSquare, SquareTerminal } from 'lucide-react' -import { AgentIcon, getAgentLabel } from '@/lib/agent-catalog' +import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { useTranslate } from '@/i18n/use-translate' // Shell text, not prose: what a terminal shows when the agent's CLI starts. diff --git a/src/renderer/src/components/onboarding/YoloPermissionsControl.tsx b/src/renderer/src/components/onboarding/YoloPermissionsControl.tsx index 5a7d43e9fc6..84c33613b30 100644 --- a/src/renderer/src/components/onboarding/YoloPermissionsControl.tsx +++ b/src/renderer/src/components/onboarding/YoloPermissionsControl.tsx @@ -2,7 +2,7 @@ import { useId, useState } from 'react' import { Button } from '@/components/ui/button' import { Switch } from '@/components/ui/switch' import { useTranslate } from '@/i18n/use-translate' -import { getAgentLabel } from '@/lib/agent-catalog' +import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog' import { useAppStore } from '@/store' import { applyAgentPermissionOverrides, diff --git a/src/renderer/src/components/onboarding/onboarding-completion-agent-launch.ts b/src/renderer/src/components/onboarding/onboarding-completion-agent-launch.ts index 22f6e3aec81..ac04cb947ed 100644 --- a/src/renderer/src/components/onboarding/onboarding-completion-agent-launch.ts +++ b/src/renderer/src/components/onboarding/onboarding-completion-agent-launch.ts @@ -1,5 +1,5 @@ import { useAppStore } from '@/store' -import { resolveDefaultAgentForWorktree } from '@/lib/agent-tab-shortcuts' +import { resolveDefaultAgentForWorktree } from '@/lib/agent-session/launch/shortcuts/agent-tab-shortcuts' import { agentTabLaunchStore } from '@/lib/agent-session/launch/new-tab/launch-agent-execution-context' import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent' import type { ExecutionHostId } from '../../../../shared/execution-host' diff --git a/src/renderer/src/components/onboarding/onboarding-feature-setup.test.ts b/src/renderer/src/components/onboarding/onboarding-feature-setup.test.ts index 8b3c9095065..0c32da19e6f 100644 --- a/src/renderer/src/components/onboarding/onboarding-feature-setup.test.ts +++ b/src/renderer/src/components/onboarding/onboarding-feature-setup.test.ts @@ -3,7 +3,7 @@ import type { ComputerUsePermissionSetupResult, ComputerUsePermissionStatusResult } from '../../../../shared/computer-use-permissions-types' -import { ORCHESTRATION_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { ORCHESTRATION_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' import { BROWSER_USE_ENABLED_STORAGE_KEY } from '@/lib/browser/browser-use-setup-state' import { ORCHESTRATION_ENABLED_STORAGE_KEY } from '@/lib/orchestration-setup-state' import { diff --git a/src/renderer/src/components/onboarding/onboarding-feature-setup.ts b/src/renderer/src/components/onboarding/onboarding-feature-setup.ts index fb7b19c77b5..6b76c79d9ee 100644 --- a/src/renderer/src/components/onboarding/onboarding-feature-setup.ts +++ b/src/renderer/src/components/onboarding/onboarding-feature-setup.ts @@ -7,7 +7,7 @@ import { ORCA_LINEAR_SKILL_NAME, ORCA_CLI_SKILL_NAME, ORCHESTRATION_SKILL_NAME -} from '@/lib/agent-feature-skill-names' +} from '@/lib/skills/installation/agent-feature-skill-names' import { BROWSER_USE_ENABLED_STORAGE_KEY } from '@/lib/browser/browser-use-setup-state' import { e2eConfig } from '@/lib/e2e-config' import { diff --git a/src/renderer/src/components/onboarding/use-onboarding-agent-surface.ts b/src/renderer/src/components/onboarding/use-onboarding-agent-surface.ts index e62a29467e0..a7058d3b74f 100644 --- a/src/renderer/src/components/onboarding/use-onboarding-agent-surface.ts +++ b/src/renderer/src/components/onboarding/use-onboarding-agent-surface.ts @@ -3,7 +3,10 @@ import { LOCAL_EXECUTION_HOST_ID } from '../../../../shared/execution-host' import type { GlobalSettings } from '../../../../shared/global-settings-types' import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent' import { nativeChatPreferenceFor } from '../../../../shared/structured-native-chat-launch-route' -import { chatProviderAgents, useHostStructuredAgentsVersion } from '@/lib/chat-provider-agents' +import { + chatProviderAgents, + useHostStructuredAgentsVersion +} from '@/runtime/native-chat/agent-catalogs/chat-provider-agents' import { recomputeOn } from '@/lib/recompute-on' import type { ProspectiveWorkspace } from '@/lib/agent-session/launch/routing/agent-launch-route-input' import { readChatProgram, resolveChatProgramContext } from '@/lib/host-chat-program' diff --git a/src/renderer/src/components/onboarding/use-onboarding-flow-actions.test.tsx b/src/renderer/src/components/onboarding/use-onboarding-flow-actions.test.tsx index 8263d8ab3cc..b72da1b96bd 100644 --- a/src/renderer/src/components/onboarding/use-onboarding-flow-actions.test.tsx +++ b/src/renderer/src/components/onboarding/use-onboarding-flow-actions.test.tsx @@ -54,7 +54,9 @@ vi.mock('@/components/agent-tab-launch-context', () => ({ captureAgentTabLaunchContext: () => ({ groupId: 'group', focusIntent }) })) vi.mock('@/lib/telemetry', () => ({ track })) -vi.mock('@/lib/agent-detection-target-inventory', () => ({ loadDetectedAgentsForWorktree: detect })) +vi.mock('@/lib/agent-session/launch/inventory/agent-detection-target-inventory', () => ({ + loadDetectedAgentsForWorktree: detect +})) vi.mock('@/lib/host-chat-program-acquisition', () => ({ acquireAgentLaunchChoices: acquireChoices })) diff --git a/src/renderer/src/components/onboarding/use-onboarding-flow.ts b/src/renderer/src/components/onboarding/use-onboarding-flow.ts index e857b677a56..d4c7a541b92 100644 --- a/src/renderer/src/components/onboarding/use-onboarding-flow.ts +++ b/src/renderer/src/components/onboarding/use-onboarding-flow.ts @@ -1,6 +1,6 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react' import { toast } from 'sonner' -import { getAgentCatalog } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' import { useAppStore } from '@/store' import { selectOnboardingWorkspaceId } from './onboarding-workspace-selection' import { applyDocumentTheme } from '@/lib/document-theme' diff --git a/src/renderer/src/components/orchestration-crew/CrewAgentIcons.tsx b/src/renderer/src/components/orchestration-crew/CrewAgentIcons.tsx index 4989c9688cd..7c29826bfec 100644 --- a/src/renderer/src/components/orchestration-crew/CrewAgentIcons.tsx +++ b/src/renderer/src/components/orchestration-crew/CrewAgentIcons.tsx @@ -1,10 +1,10 @@ import { useMemo } from 'react' import StatusIndicator from '@/components/sidebar/workspace-card/surface/StatusIndicator' import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip' -import { AgentTypeIcon } from '@/lib/agent-type-icon' +import { AgentTypeIcon } from '@/components/agent/icons/agent-type-icon' import { cn } from '@/lib/utils' -import { getAgentLabel } from '@/lib/agent-catalog' -import { mapAgentStatusStateToVisualStatus } from '@/lib/agent-status' +import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog' +import { mapAgentStatusStateToVisualStatus } from '@/lib/agent-status/aggregation/worktree-agent-status' import { getWorktreeStatusLabel, type WorktreeStatus } from '@/lib/worktree-status' import { useAgentMessageSenderViews, diff --git a/src/renderer/src/components/pet/PetOverlay.tsx b/src/renderer/src/components/pet/PetOverlay.tsx index c647ef28f20..223534ddae5 100644 --- a/src/renderer/src/components/pet/PetOverlay.tsx +++ b/src/renderer/src/components/pet/PetOverlay.tsx @@ -4,7 +4,7 @@ import { usePetUrl } from './usePetUrl' import type { DetectedSpriteCacheEntry } from './pet-blob-cache' import type { CustomPet } from '../../../../shared/pet-types' import { useAppStore } from '../../store' -import { getAgentStatusEpochNow } from '@/lib/agent-status-epoch-clock' +import { getAgentStatusEpochNow } from '@/lib/agent-status/evidence/agent-status-epoch-clock' import { AGENT_STATUS_STALE_AFTER_MS } from '../../../../shared/agent-status/contracts/agent-status-freshness' import { selectPetAnimationName, diff --git a/src/renderer/src/components/pet/pet-agent-state.ts b/src/renderer/src/components/pet/pet-agent-state.ts index ad1899be9a0..f56d61562a0 100644 --- a/src/renderer/src/components/pet/pet-agent-state.ts +++ b/src/renderer/src/components/pet/pet-agent-state.ts @@ -1,5 +1,5 @@ import type { AgentStatusEntry } from '../../../../shared/agent-status/contracts/agent-status-types' -import { isExplicitAgentStatusFresh } from '@/lib/pane-agent-evidence' +import { isAgentStatusFresh } from '../../../../shared/agent-status/contracts/agent-status-freshness' export type PetAnimationName = | 'idle' @@ -46,7 +46,7 @@ function agentStateAnimation( let hasDone = false for (const entry of entries) { - if (!isExplicitAgentStatusFresh(entry, now, staleAfterMs)) { + if (!isAgentStatusFresh(entry, now, staleAfterMs)) { continue } if (entry.state === 'blocked' || entry.state === 'waiting') { diff --git a/src/renderer/src/components/pull-request-page/checks/fix-launch.ts b/src/renderer/src/components/pull-request-page/checks/fix-launch.ts index be9111f5aab..05b033b6298 100644 --- a/src/renderer/src/components/pull-request-page/checks/fix-launch.ts +++ b/src/renderer/src/components/pull-request-page/checks/fix-launch.ts @@ -1,4 +1,7 @@ -import { agentLaunchRecoveryMessage, notifyAgentLaunchFailure } from '@/lib/agent-launch-failure' +import { + agentLaunchRecoveryMessage, + notifyAgentLaunchFailure +} from '@/lib/agent-session/launch/failure/agent-launch-failure' import type { DirectWorkItemLaunchResult } from '@/lib/workspace/creation/work-item/direct-work-item-setup' import { toast } from 'sonner' import { useAppStore } from '@/store' diff --git a/src/renderer/src/components/right-sidebar/ai-vault/panel/AiVaultPanelControls.tsx b/src/renderer/src/components/right-sidebar/ai-vault/panel/AiVaultPanelControls.tsx index 98792d4671a..d3a60d25c55 100644 --- a/src/renderer/src/components/right-sidebar/ai-vault/panel/AiVaultPanelControls.tsx +++ b/src/renderer/src/components/right-sidebar/ai-vault/panel/AiVaultPanelControls.tsx @@ -21,7 +21,7 @@ import { DropdownMenuTrigger } from '@/components/ui/dropdown-menu' import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { cn } from '@/lib/utils' import { AI_VAULT_AGENTS, diff --git a/src/renderer/src/components/right-sidebar/ai-vault/scanning/AiVaultScanProgressStrip.tsx b/src/renderer/src/components/right-sidebar/ai-vault/scanning/AiVaultScanProgressStrip.tsx index 9f7a198be66..5d7ca2c40eb 100644 --- a/src/renderer/src/components/right-sidebar/ai-vault/scanning/AiVaultScanProgressStrip.tsx +++ b/src/renderer/src/components/right-sidebar/ai-vault/scanning/AiVaultScanProgressStrip.tsx @@ -6,7 +6,7 @@ import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/component import { useNow } from '@/hooks/use-now' import { getIntlLocale, translate } from '@/i18n/i18n' import { useIntlLocale, useTranslate, type Translate } from '@/i18n/use-translate' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { cn } from '@/lib/utils' import type { AiVaultScanAgentProgress, diff --git a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-original-pane-index.ts b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-original-pane-index.ts index 04a3a62bf86..cfbb981f08a 100644 --- a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-original-pane-index.ts +++ b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-original-pane-index.ts @@ -1,4 +1,4 @@ -import { agentRowDisplayDotState } from '@/lib/agent-row-dot-state' +import { agentRowDisplayDotState } from '@/lib/agent-status/presentation/agent-row-dot-state' import type { AgentDotState } from '@/components/AgentStateDot' import type { AiVaultSession } from '../../../../../../shared/ai-vault/contracts/ai-vault-types' import { diff --git a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-original-pane.ts b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-original-pane.ts index 41a1d04bf9c..d16b87dc528 100644 --- a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-original-pane.ts +++ b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-original-pane.ts @@ -1,4 +1,4 @@ -import { agentRowDisplayDotState } from '@/lib/agent-row-dot-state' +import { agentRowDisplayDotState } from '@/lib/agent-status/presentation/agent-row-dot-state' import type { AppState } from '@/store/types' import { resolveRuntimePaneTitleLeafId } from '../../../../../../shared/runtime-pane-title-leaf-id' import type { AgentDotState } from '@/components/AgentStateDot' diff --git a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-continuation.ts b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-continuation.ts index 9f0e6ff07bc..c122fb22950 100644 --- a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-continuation.ts +++ b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-continuation.ts @@ -1,4 +1,4 @@ -import type { AgentSessionContinuationRequest } from '@/lib/agent-session-continuation' +import type { AgentSessionContinuationRequest } from '@/lib/agent-session/context/agent-session-continuation' import type { AiVaultSession } from '../../../../../../shared/ai-vault/contracts/ai-vault-types' export function canContinueAiVaultSessionInNewSession( diff --git a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-launch-actions.ts b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-launch-actions.ts index 4730e607073..b7312cb9b42 100644 --- a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-launch-actions.ts +++ b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-launch-actions.ts @@ -34,7 +34,7 @@ import { translate } from '@/i18n/i18n' import { describeAiVaultCliForkFailure } from './ai-vault-session-cli-fork' import type { AiVaultSessionResumeTargetState } from './ai-vault-session-resume' import { prepareAiVaultSessionContinuation } from './ai-vault-session-continuation' -import type { AgentSessionContinuationRequest } from '@/lib/agent-session-continuation' +import type { AgentSessionContinuationRequest } from '@/lib/agent-session/context/agent-session-continuation' import { activateAiVaultStructuredSession } from '@/lib/activate-ai-vault-structured-session' import { adoptsCliConversations } from '../../../../../../shared/structured-agent-cli-conversation-adoption' import { newAgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agent-launch-request-id' diff --git a/src/renderer/src/components/right-sidebar/ai-vault/session-list/ai-vault-session-row-display.tsx b/src/renderer/src/components/right-sidebar/ai-vault/session-list/ai-vault-session-row-display.tsx index 7b7c152c34b..95897712ebf 100644 --- a/src/renderer/src/components/right-sidebar/ai-vault/session-list/ai-vault-session-row-display.tsx +++ b/src/renderer/src/components/right-sidebar/ai-vault/session-list/ai-vault-session-row-display.tsx @@ -7,7 +7,7 @@ import { Badge } from '@/components/ui/badge' import { WorktreeHostContextBadge } from '@/components/sidebar/workspace-card/host/WorktreeHostContextBadge' import RepoBadgeLabel from '@/components/repo/RepoBadgeLabel' import { AgentStateDot, type AgentDotState } from '@/components/AgentStateDot' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { useRepoById } from '@/store/repos/use-repository-catalog' import { resolveRepoBadgeColor } from '../../../../../../shared/repo-badge-color' diff --git a/src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-controller-state.tsx b/src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-controller-state.tsx index 3a31a6049e5..61fa4ba4d1b 100644 --- a/src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-controller-state.tsx +++ b/src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-controller-state.tsx @@ -7,7 +7,7 @@ import { useActiveWorktree } from '@/store/workspaces/selection/use-selected-wor import { selectReviewRepositoryForWorkspace } from '@/store/slices/hosted-review/workspace-review-repository' import { useChecksPanelTerminalWorktree } from './refresh/use-checks-panel-terminal-worktree' import { getConnectionId } from '@/lib/workspace/ownership/connection-context' -import { readDetectedAgentsForWorktree } from '@/lib/agent-detection-target-inventory' +import { readDetectedAgentsForWorktree } from '@/lib/agent-session/launch/inventory/agent-detection-target-inventory' import { useMountedRef } from '@/hooks/useMountedRef' import { useConfirmationDialog } from '@/components/confirmation-dialog-context' import { getWorktreeGitIdentityDisplay } from '../../../../../shared/worktree/git-identity-display' diff --git a/src/renderer/src/components/right-sidebar/source-control/ai/SourceControlAgentActionDialogForm.tsx b/src/renderer/src/components/right-sidebar/source-control/ai/SourceControlAgentActionDialogForm.tsx index 89bf718a569..6ae245fbef6 100644 --- a/src/renderer/src/components/right-sidebar/source-control/ai/SourceControlAgentActionDialogForm.tsx +++ b/src/renderer/src/components/right-sidebar/source-control/ai/SourceControlAgentActionDialogForm.tsx @@ -17,7 +17,7 @@ import { SelectTrigger, SelectValue } from '@/components/ui/select' -import type { AgentCatalogEntry } from '@/lib/agent-catalog' +import type { AgentCatalogEntry } from '@/lib/agent-catalog/agent-catalog' import { cn } from '@/lib/utils' import type { SourceControlLaunchActionId } from '../../../../../../shared/source-control/ai/recipes/source-control-ai-actions' import type { SourceControlAiWriteTarget } from '../../../../../../shared/source-control/ai/settings/source-control-ai-recipe-save' diff --git a/src/renderer/src/components/right-sidebar/source-control/ai/controller-types.ts b/src/renderer/src/components/right-sidebar/source-control/ai/controller-types.ts index 041293a431e..33414bd7515 100644 --- a/src/renderer/src/components/right-sidebar/source-control/ai/controller-types.ts +++ b/src/renderer/src/components/right-sidebar/source-control/ai/controller-types.ts @@ -1,5 +1,5 @@ import type { AppState } from '@/store/types' -import type { WorktreeAgentInventoryState } from '@/lib/agent-detection-target-inventory' +import type { WorktreeAgentInventoryState } from '@/lib/agent-session/launch/inventory/agent-detection-target-inventory' import type { GitConflictOperation, GitStatusEntry diff --git a/src/renderer/src/components/right-sidebar/source-control/ai/recovery-launch.ts b/src/renderer/src/components/right-sidebar/source-control/ai/recovery-launch.ts index a8dbca5179f..1fbb3965fc6 100644 --- a/src/renderer/src/components/right-sidebar/source-control/ai/recovery-launch.ts +++ b/src/renderer/src/components/right-sidebar/source-control/ai/recovery-launch.ts @@ -22,7 +22,7 @@ import { getConnectionId } from '@/lib/workspace/ownership/connection-context' import { ensureDetectedAgentsForWorktree, type WorktreeAgentInventoryState -} from '@/lib/agent-detection-target-inventory' +} from '@/lib/agent-session/launch/inventory/agent-detection-target-inventory' import { pickSourceControlLaunchAgent, readSourceControlLaunchRecipeAgentId diff --git a/src/renderer/src/components/right-sidebar/source-control/ai/runSourceControlAgentActionStart.ts b/src/renderer/src/components/right-sidebar/source-control/ai/runSourceControlAgentActionStart.ts index 6159328fe9b..ea8ae87cfc9 100644 --- a/src/renderer/src/components/right-sidebar/source-control/ai/runSourceControlAgentActionStart.ts +++ b/src/renderer/src/components/right-sidebar/source-control/ai/runSourceControlAgentActionStart.ts @@ -17,7 +17,7 @@ import { newAgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agen import type { RuntimeGitContext } from '@/runtime/source-control/git/runtime-git-client-context' import type { Repo } from '../../../../../../shared/repo-types' import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' -import type { AgentLaunchChoice } from '@/lib/agent-menu-selection' +import type { AgentLaunchChoice } from '@/lib/agent-session/launch/routing/agent-menu-selection' import type { LaunchSource } from '../../../../../../shared/telemetry-property-schemas' import { normalizeSourceControlActionRecipe, diff --git a/src/renderer/src/components/right-sidebar/source-control/ai/source-control-action-model-copy.ts b/src/renderer/src/components/right-sidebar/source-control/ai/source-control-action-model-copy.ts index 0e7636a2b6e..3fd6a47de9e 100644 --- a/src/renderer/src/components/right-sidebar/source-control/ai/source-control-action-model-copy.ts +++ b/src/renderer/src/components/right-sidebar/source-control/ai/source-control-action-model-copy.ts @@ -10,7 +10,7 @@ import { } from '../../../../../../shared/source-control/ai/recipes/source-control-action-options' import { sourceControlActionSelectedPreferences } from '../../../../../../shared/source-control/ai/recipes/source-control-action-launch-preferences' import { translate } from '@/i18n/i18n' -import { AGENT_CATALOG } from '@/lib/agent-catalog' +import { AGENT_CATALOG } from '@/lib/agent-catalog/agent-catalog' import { agentPermissionChoiceLabel } from '../../../agent/launch-settings/agent-permission-choice-label' import { sourceControlActionRouteHint } from '../../../agent/launch-settings/agent-choice-route-hint' diff --git a/src/renderer/src/components/right-sidebar/source-control/ai/source-control-agent-action-dialog-result.ts b/src/renderer/src/components/right-sidebar/source-control/ai/source-control-agent-action-dialog-result.ts index f30456fb8e0..d4de6d7985d 100644 --- a/src/renderer/src/components/right-sidebar/source-control/ai/source-control-agent-action-dialog-result.ts +++ b/src/renderer/src/components/right-sidebar/source-control/ai/source-control-agent-action-dialog-result.ts @@ -6,7 +6,7 @@ import type { CurrentActionSelection, SelectedSourceControlActionRecipe } from '../../../../../../shared/source-control/ai/recipes/source-control-action-selection' -import type { getAgentCatalog } from '@/lib/agent-catalog' +import type { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' import type { useAppStore } from '@/store/index' import type { useRepoById } from '@/store/repos/use-repository-catalog' import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' diff --git a/src/renderer/src/components/right-sidebar/source-control/ai/source-control-agent-action-dialog-support.ts b/src/renderer/src/components/right-sidebar/source-control/ai/source-control-agent-action-dialog-support.ts index f9d919177eb..b9717605481 100644 --- a/src/renderer/src/components/right-sidebar/source-control/ai/source-control-agent-action-dialog-support.ts +++ b/src/renderer/src/components/right-sidebar/source-control/ai/source-control-agent-action-dialog-support.ts @@ -1,6 +1,6 @@ import { useAppStore } from '@/store/index' -import { ensureDetectedAgentsForWorktree } from '@/lib/agent-detection-target-inventory' -import { getAgentCatalog } from '@/lib/agent-catalog' +import { ensureDetectedAgentsForWorktree } from '@/lib/agent-session/launch/inventory/agent-detection-target-inventory' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' import { isTuiAgentEnabled } from '../../../../../../shared/agent-launch/catalog/tui-agent-selection' import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' import type { SourceControlAiWriteTarget } from '../../../../../../shared/source-control/ai/settings/source-control-ai-recipe-save' diff --git a/src/renderer/src/components/right-sidebar/source-control/ai/text-generation-dialog-form.tsx b/src/renderer/src/components/right-sidebar/source-control/ai/text-generation-dialog-form.tsx index a5c3067f883..2448d683637 100644 --- a/src/renderer/src/components/right-sidebar/source-control/ai/text-generation-dialog-form.tsx +++ b/src/renderer/src/components/right-sidebar/source-control/ai/text-generation-dialog-form.tsx @@ -12,7 +12,7 @@ import { SelectTrigger, SelectValue } from '@/components/ui/select' -import { getAgentCatalog } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' import { AgentLaunchPicker } from '@/components/agent/AgentLaunchPicker' import { DropdownMenuItem } from '@/components/ui/dropdown-menu' import { commitMessagePickerModel } from '@/components/feature-wall/ai-commit-pr-picker' diff --git a/src/renderer/src/components/right-sidebar/source-control/ai/use-saved-source-control-action-start.ts b/src/renderer/src/components/right-sidebar/source-control/ai/use-saved-source-control-action-start.ts index 5e5926f218e..12ce5c77466 100644 --- a/src/renderer/src/components/right-sidebar/source-control/ai/use-saved-source-control-action-start.ts +++ b/src/renderer/src/components/right-sidebar/source-control/ai/use-saved-source-control-action-start.ts @@ -14,7 +14,7 @@ import { parseExecutionHostId } from '../../../../../../shared/execution-host' import { useRef, useState } from 'react' import { toast } from 'sonner' import { useAppStore } from '@/store/index' -import { ensureDetectedAgentsForWorktree } from '@/lib/agent-detection-target-inventory' +import { ensureDetectedAgentsForWorktree } from '@/lib/agent-session/launch/inventory/agent-detection-target-inventory' import { isTuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent-config' import { projectSelectedSourceControlActionLaunch } from '../../../../../../shared/source-control/ai/recipes/source-control-action-launch-preferences' import { sourceControlLaunchAppliesAgentArgs } from './source-control-launch-agent-args-applicability' diff --git a/src/renderer/src/components/right-sidebar/source-control/ai/use-source-control-action-agent-choice.ts b/src/renderer/src/components/right-sidebar/source-control/ai/use-source-control-action-agent-choice.ts index 8c86228744e..2b22ad64702 100644 --- a/src/renderer/src/components/right-sidebar/source-control/ai/use-source-control-action-agent-choice.ts +++ b/src/renderer/src/components/right-sidebar/source-control/ai/use-source-control-action-agent-choice.ts @@ -9,7 +9,7 @@ import type { SelectedSourceControlActionRecipe } from '../../../../../../shared import type { Repo } from '../../../../../../shared/repo-types' import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' import { isTuiAgentEnabled } from '../../../../../../shared/agent-launch/catalog/tui-agent-selection' -import { getAgentCatalog } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' import type { AgentLaunchSurface } from '@/lib/agent-session/launch/routing/agent-session-launch-plan' import { useAgentDetectionTargetForWorktree } from '@/hooks/useAgentDetectionTarget' import { useAgentMenuObservation } from '@/components/tab-bar/use-new-tab-agent-menu-rows' diff --git a/src/renderer/src/components/right-sidebar/source-control/ai/use-source-control-launchable-agents.ts b/src/renderer/src/components/right-sidebar/source-control/ai/use-source-control-launchable-agents.ts index 96b4a6fbaa8..c845afccedd 100644 --- a/src/renderer/src/components/right-sidebar/source-control/ai/use-source-control-launchable-agents.ts +++ b/src/renderer/src/components/right-sidebar/source-control/ai/use-source-control-launchable-agents.ts @@ -5,7 +5,7 @@ import { ensureDetectedAgentsForWorktree, readAgentInventoryForWorktree, readAgentInventoryForTarget -} from '@/lib/agent-detection-target-inventory' +} from '@/lib/agent-session/launch/inventory/agent-detection-target-inventory' import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' import { sourceControlLaunchWorkspace } from './source-control-launch-agent-args-applicability' import { acquireAgentLaunchChoices, useChatProgramFacts } from '@/lib/host-chat-program-acquisition' diff --git a/src/renderer/src/components/right-sidebar/source-control/ai/useSourceControlAgentActionStart.ts b/src/renderer/src/components/right-sidebar/source-control/ai/useSourceControlAgentActionStart.ts index 9e84b203cef..d49687e9fb3 100644 --- a/src/renderer/src/components/right-sidebar/source-control/ai/useSourceControlAgentActionStart.ts +++ b/src/renderer/src/components/right-sidebar/source-control/ai/useSourceControlAgentActionStart.ts @@ -12,7 +12,7 @@ import type { import type { SourceControlAiWriteTarget } from '../../../../../../shared/source-control/ai/settings/source-control-ai-recipe-save' import type { Repo } from '../../../../../../shared/repo-types' import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' -import type { AgentLaunchChoice } from '@/lib/agent-menu-selection' +import type { AgentLaunchChoice } from '@/lib/agent-session/launch/routing/agent-menu-selection' import { buildSourceControlAgentDeliveryPlan } from './buildSourceControlAgentDeliveryPlan' import type { SourceControlAgentActionDeliveryPlanState } from './SourceControlAgentActionDialogForm' import { diff --git a/src/renderer/src/components/right-sidebar/source-control/sync/use-git-history-commit-actions.ts b/src/renderer/src/components/right-sidebar/source-control/sync/use-git-history-commit-actions.ts index 81e3e0ad429..79307304571 100644 --- a/src/renderer/src/components/right-sidebar/source-control/sync/use-git-history-commit-actions.ts +++ b/src/renderer/src/components/right-sidebar/source-control/sync/use-git-history-commit-actions.ts @@ -9,8 +9,8 @@ import { sourceControlConnectionId, useSourceControlScope } from '../panel/workt import { detectLanguage } from '../../../../../../shared/editor-language/editor-language-detect' import { launchAgentInNewTab } from '@/lib/agent-session/launch/new-tab/launch-agent-in-new-tab' import { newAgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agent-launch-request-id' -import { resolveDefaultAgentForWorktreeNewTab } from '@/lib/agent-tab-shortcuts' -import { getDetectionTargetIdentityForWorktree } from '@/lib/agent-detection-target-inventory' +import { resolveDefaultAgentForWorktreeNewTab } from '@/lib/agent-session/launch/shortcuts/agent-tab-shortcuts' +import { getDetectionTargetIdentityForWorktree } from '@/lib/agent-session/launch/inventory/agent-detection-target-inventory' import { translate } from '@/i18n/i18n' import type { GitHistoryItem } from '../../../../../../shared/git/history/git-history-types' import type { diff --git a/src/renderer/src/components/settings/accounts/providers/AntigravityAccountsSection.test.tsx b/src/renderer/src/components/settings/accounts/providers/AntigravityAccountsSection.test.tsx index d98a7879cef..287ead6b52b 100644 --- a/src/renderer/src/components/settings/accounts/providers/AntigravityAccountsSection.test.tsx +++ b/src/renderer/src/components/settings/accounts/providers/AntigravityAccountsSection.test.tsx @@ -17,7 +17,9 @@ vi.mock('@/runtime/provider-accounts/sign-in/runtime-antigravity-accounts-client vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({ callRuntimeRpc: vi.fn() })) -vi.mock('@/lib/agent-catalog', () => ({ AgentIcon: () => null })) +vi.mock('@/components/agent/icons/AgentIcon', () => ({ + AgentIcon: () => null +})) const state: AntigravityAccountState = { accounts: [ diff --git a/src/renderer/src/components/settings/accounts/providers/AntigravityAccountsSection.tsx b/src/renderer/src/components/settings/accounts/providers/AntigravityAccountsSection.tsx index 0b963470af2..96d0fb51956 100644 --- a/src/renderer/src/components/settings/accounts/providers/AntigravityAccountsSection.tsx +++ b/src/renderer/src/components/settings/accounts/providers/AntigravityAccountsSection.tsx @@ -2,7 +2,7 @@ import { useEffect, useRef, useState } from 'react' import { Loader2 } from 'lucide-react' import { translate } from '@/i18n/i18n' import { useTranslate, type Translate } from '@/i18n/use-translate' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { callAntigravityAccounts } from '@/runtime/provider-accounts/sign-in/runtime-antigravity-accounts-client' import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' import { useManagedRuntimeInstall } from '@/runtime/hosts/installation/use-managed-runtime-install' diff --git a/src/renderer/src/components/settings/accounts/providers/CursorAccountsSection.tsx b/src/renderer/src/components/settings/accounts/providers/CursorAccountsSection.tsx index 35ea269ce80..0bea435b99e 100644 --- a/src/renderer/src/components/settings/accounts/providers/CursorAccountsSection.tsx +++ b/src/renderer/src/components/settings/accounts/providers/CursorAccountsSection.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect, useRef, useState } from 'react' import { ExternalLink, Loader2, RefreshCw, ShieldCheck } from 'lucide-react' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { translate } from '@/i18n/i18n' import { useTranslate, type Translate } from '@/i18n/use-translate' import { cn } from '@/lib/utils' diff --git a/src/renderer/src/components/settings/accounts/providers/GrokAccountsSection.test.tsx b/src/renderer/src/components/settings/accounts/providers/GrokAccountsSection.test.tsx index 87491d30d31..d4724a8e77d 100644 --- a/src/renderer/src/components/settings/accounts/providers/GrokAccountsSection.test.tsx +++ b/src/renderer/src/components/settings/accounts/providers/GrokAccountsSection.test.tsx @@ -12,7 +12,7 @@ const mocks = vi.hoisted(() => ({ grokUsage: vi.fn<() => unknown>(() => null) })) -vi.mock('@/lib/agent-catalog', () => ({ +vi.mock('@/components/agent/icons/AgentIcon', () => ({ AgentIcon: () => React.createElement('span', { 'data-testid': 'grok-icon' }) })) diff --git a/src/renderer/src/components/settings/accounts/providers/GrokAccountsSection.tsx b/src/renderer/src/components/settings/accounts/providers/GrokAccountsSection.tsx index b050f77a584..03ef79148d8 100644 --- a/src/renderer/src/components/settings/accounts/providers/GrokAccountsSection.tsx +++ b/src/renderer/src/components/settings/accounts/providers/GrokAccountsSection.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect, useState } from 'react' import { ExternalLink, Loader2, RefreshCw, ShieldCheck } from 'lucide-react' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { useTranslate } from '@/i18n/use-translate' import { cn } from '@/lib/utils' import { useAppStore } from '../../../../store/index' diff --git a/src/renderer/src/components/settings/accounts/usage/ZcodePlanAccountsSection.tsx b/src/renderer/src/components/settings/accounts/usage/ZcodePlanAccountsSection.tsx index 70a7c255970..92525b8062b 100644 --- a/src/renderer/src/components/settings/accounts/usage/ZcodePlanAccountsSection.tsx +++ b/src/renderer/src/components/settings/accounts/usage/ZcodePlanAccountsSection.tsx @@ -1,7 +1,7 @@ import { useState } from 'react' import { isWebClientLocation } from '@/lib/web-client-location' import { ExternalLink, Loader2, Lock, LockOpen, RefreshCw, ShieldCheck } from 'lucide-react' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { translate } from '@/i18n/i18n' import { useTranslate, type Translate } from '@/i18n/use-translate' import { diff --git a/src/renderer/src/components/settings/agents/agents-search.ts b/src/renderer/src/components/settings/agents/agents-search.ts index 784f5a41b36..1c1f55248d5 100644 --- a/src/renderer/src/components/settings/agents/agents-search.ts +++ b/src/renderer/src/components/settings/agents/agents-search.ts @@ -3,7 +3,7 @@ import { getClaudeSubagentNavigationDescription, getClaudeSubagentNavigationSearchKeywords } from './behavior/claude-subagent-navigation-copy' -import { getAgentCatalog } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' import { getAgentAwakeDescription, getAgentAwakeSearchKeywords, diff --git a/src/renderer/src/components/settings/agents/launch/AgentCatalogRow.tsx b/src/renderer/src/components/settings/agents/launch/AgentCatalogRow.tsx index 414878167e2..2a7060fc14b 100644 --- a/src/renderer/src/components/settings/agents/launch/AgentCatalogRow.tsx +++ b/src/renderer/src/components/settings/agents/launch/AgentCatalogRow.tsx @@ -1,7 +1,7 @@ import { useRef, useState } from 'react' import { Check, ChevronDown, ExternalLink } from 'lucide-react' import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { cn } from '@/lib/utils' import { useTranslate } from '@/i18n/use-translate' import { Button } from '../../../ui/button' diff --git a/src/renderer/src/components/settings/agents/launch/AgentDefaultSetting.tsx b/src/renderer/src/components/settings/agents/launch/AgentDefaultSetting.tsx index b8b54123c39..d88a43fb56e 100644 --- a/src/renderer/src/components/settings/agents/launch/AgentDefaultSetting.tsx +++ b/src/renderer/src/components/settings/agents/launch/AgentDefaultSetting.tsx @@ -1,7 +1,8 @@ import { Check } from 'lucide-react' import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' -import { type AgentCatalogEntry, AgentIcon } from '@/lib/agent-catalog' +import type { AgentCatalogEntry } from '@/lib/agent-catalog/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { cn } from '@/lib/utils' import { useTranslate } from '@/i18n/use-translate' import { SettingsGroup } from '../../section-layout/SettingsGroup' diff --git a/src/renderer/src/components/settings/agents/launch/AgentDetectionCatalog.tsx b/src/renderer/src/components/settings/agents/launch/AgentDetectionCatalog.tsx index 20bbacf2fd3..857a46f9d91 100644 --- a/src/renderer/src/components/settings/agents/launch/AgentDetectionCatalog.tsx +++ b/src/renderer/src/components/settings/agents/launch/AgentDetectionCatalog.tsx @@ -1,6 +1,6 @@ import { Fragment } from 'react' import { AlertTriangle, RefreshCw } from 'lucide-react' -import type { AgentCatalogEntry } from '@/lib/agent-catalog' +import type { AgentCatalogEntry } from '@/lib/agent-catalog/agent-catalog' import { cn } from '@/lib/utils' import { useTranslate } from '@/i18n/use-translate' import { Button } from '../../../ui/button' diff --git a/src/renderer/src/components/settings/agents/launch/AgentLaunchSettingsCatalog.tsx b/src/renderer/src/components/settings/agents/launch/AgentLaunchSettingsCatalog.tsx index ec8218f5abe..334809388b3 100644 --- a/src/renderer/src/components/settings/agents/launch/AgentLaunchSettingsCatalog.tsx +++ b/src/renderer/src/components/settings/agents/launch/AgentLaunchSettingsCatalog.tsx @@ -38,7 +38,7 @@ import { resolveTuiAgentLaunchEnv } from '../../../../../../shared/agent-launch/choices/tui-agent-launch-defaults' import { isTuiAgentEnabled } from '../../../../../../shared/agent-launch/catalog/tui-agent-selection' -import { getAgentCatalog } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' import { agentChoiceOpensAsChat, readChatProgram, @@ -56,7 +56,10 @@ import { AgentChatRuntimeArea, chatUnavailableOnThisDesktop } from '@/components/agent/launch-settings/AgentChatChoiceControls' -import { chatProviderAgents, useHostStructuredAgentsVersion } from '@/lib/chat-provider-agents' +import { + chatProviderAgents, + useHostStructuredAgentsVersion +} from '@/runtime/native-chat/agent-catalogs/chat-provider-agents' import { readHostStructuredAgents } from '@/runtime/native-chat/agent-catalogs/host-structured-agents' import { LOCAL_EXECUTION_HOST_ID } from '../../../../../../shared/execution-host' import { useTranslate } from '@/i18n/use-translate' diff --git a/src/renderer/src/components/settings/agents/launch/AgentLaunchSettingsSection.tsx b/src/renderer/src/components/settings/agents/launch/AgentLaunchSettingsSection.tsx index 71ac0d4de37..b073122cdf5 100644 --- a/src/renderer/src/components/settings/agents/launch/AgentLaunchSettingsSection.tsx +++ b/src/renderer/src/components/settings/agents/launch/AgentLaunchSettingsSection.tsx @@ -1,7 +1,7 @@ import { useAppStateValue } from '@/store/retained-views/app-state-view' import { useChatSettingsOwnPermissions } from '@/runtime/native-chat/host-capabilities/structured-agent-session-host-capability' import { toast } from 'sonner' -import { getAgentLabel } from '@/lib/agent-catalog' +import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog' import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' import { wholeAgentEnvironmentUpdates } from '../../../../../../shared/agent-launch/choices/agent-launch-permission-updates' import { useRef } from 'react' diff --git a/src/renderer/src/components/settings/agents/permissions/agent-permission-override-notice.tsx b/src/renderer/src/components/settings/agents/permissions/agent-permission-override-notice.tsx index 2e2c72f4209..5d6d17686a9 100644 --- a/src/renderer/src/components/settings/agents/permissions/agent-permission-override-notice.tsx +++ b/src/renderer/src/components/settings/agents/permissions/agent-permission-override-notice.tsx @@ -1,6 +1,6 @@ import { useEffect, useId, useRef } from 'react' import { toast } from 'sonner' -import { getAgentLabel } from '@/lib/agent-catalog' +import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog' import { translate } from '@/i18n/i18n' import { useTranslate } from '@/i18n/use-translate' import { useMountedRef } from '@/hooks/useMountedRef' diff --git a/src/renderer/src/components/settings/agents/surfaces/AgentDefaultSurfaceSection.tsx b/src/renderer/src/components/settings/agents/surfaces/AgentDefaultSurfaceSection.tsx index 64650664606..da1605ff9da 100644 --- a/src/renderer/src/components/settings/agents/surfaces/AgentDefaultSurfaceSection.tsx +++ b/src/renderer/src/components/settings/agents/surfaces/AgentDefaultSurfaceSection.tsx @@ -10,7 +10,7 @@ import { useMountedRef } from '@/hooks/useMountedRef' import { motionSafeScrollBehavior } from '@/hooks/usePrefersReducedMotion' import { translate } from '@/i18n/i18n' import { useIntlLocale, useTranslate } from '@/i18n/use-translate' -import { getAgentLabel } from '@/lib/agent-catalog' +import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog' import { cn } from '@/lib/utils' import { useAppStore } from '@/store/index' import { trackAgentDefaultSurfaceChanged } from '../../../feature-tips/feature-tip-telemetry' diff --git a/src/renderer/src/components/settings/browser/use/BrowserUsePane.tsx b/src/renderer/src/components/settings/browser/use/BrowserUsePane.tsx index 9f841ad6936..d13a352232d 100644 --- a/src/renderer/src/components/settings/browser/use/BrowserUsePane.tsx +++ b/src/renderer/src/components/settings/browser/use/BrowserUsePane.tsx @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react' -import { ORCA_CLI_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { ORCA_CLI_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' import { BROWSER_USE_ENABLED_STORAGE_KEY } from '@/lib/browser/browser-use-setup-state' import { GLOBAL_AGENT_SKILL_SOURCE_KINDS, diff --git a/src/renderer/src/components/settings/browser/use/BrowserUseSkillStep.tsx b/src/renderer/src/components/settings/browser/use/BrowserUseSkillStep.tsx index be145e93722..36eca952eda 100644 --- a/src/renderer/src/components/settings/browser/use/BrowserUseSkillStep.tsx +++ b/src/renderer/src/components/settings/browser/use/BrowserUseSkillStep.tsx @@ -1,4 +1,4 @@ -import { ORCA_CLI_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { ORCA_CLI_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' import { AgentSkillSetupPanel } from '../../../skills/setup/AgentSkillSetupPanel' import { StepBadge } from '../../setup-guide/SetupStepBadge' import { useTranslate } from '@/i18n/use-translate' diff --git a/src/renderer/src/components/settings/chat/ChatAgentLaunchSettings.tsx b/src/renderer/src/components/settings/chat/ChatAgentLaunchSettings.tsx index fde5228e1ae..328ae92d705 100644 --- a/src/renderer/src/components/settings/chat/ChatAgentLaunchSettings.tsx +++ b/src/renderer/src/components/settings/chat/ChatAgentLaunchSettings.tsx @@ -1,8 +1,12 @@ import type { GlobalSettings } from '../../../../../shared/global-settings-types' import { useEffect } from 'react' import { LOCAL_EXECUTION_HOST_ID } from '../../../../../shared/execution-host' -import { AgentIcon, getAgentCatalog } from '@/lib/agent-catalog' -import { chatProviderAgents, useHostStructuredAgentsVersion } from '@/lib/chat-provider-agents' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' +import { + chatProviderAgents, + useHostStructuredAgentsVersion +} from '@/runtime/native-chat/agent-catalogs/chat-provider-agents' import { recomputeOn } from '@/lib/recompute-on' import { readChatProgram, resolveChatProgramContext } from '@/lib/host-chat-program' import { useChatProgramFacts } from '@/lib/host-chat-program-acquisition' diff --git a/src/renderer/src/components/settings/chat/ChatNamingSetting.tsx b/src/renderer/src/components/settings/chat/ChatNamingSetting.tsx index 99967dc1832..824f6c2ef1f 100644 --- a/src/renderer/src/components/settings/chat/ChatNamingSetting.tsx +++ b/src/renderer/src/components/settings/chat/ChatNamingSetting.tsx @@ -10,7 +10,7 @@ import { } from '../../../../../shared/source-control/ai/recipes/source-control-ai-actions' import { CUSTOM_AGENT_ID } from '../../../../../shared/source-control/ai/generation/commit-message-agent-spec' import { isTuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent-config' -import { getAgentLabel } from '@/lib/agent-catalog' +import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog' import { useTranslate } from '@/i18n/use-translate' import { Switch } from '../../ui/switch' import { Card, CardContent } from '../../ui/card' diff --git a/src/renderer/src/components/settings/cli/install/CliSection.tsx b/src/renderer/src/components/settings/cli/install/CliSection.tsx index 5e947ec0ebe..a99015c781b 100644 --- a/src/renderer/src/components/settings/cli/install/CliSection.tsx +++ b/src/renderer/src/components/settings/cli/install/CliSection.tsx @@ -4,7 +4,7 @@ import { FolderOpen, RefreshCw } from 'lucide-react' import { toast } from 'sonner' import type { CliInstallStatus } from '../../../../../../shared/cli-install-types' import type { GlobalSettings } from '../../../../../../shared/global-settings-types' -import { ORCA_CLI_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { ORCA_CLI_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' import { GLOBAL_AGENT_SKILL_SOURCE_KINDS, useInstalledAgentSkill diff --git a/src/renderer/src/components/settings/computer-use/ComputerUseSkillSetupPanel.tsx b/src/renderer/src/components/settings/computer-use/ComputerUseSkillSetupPanel.tsx index c5da6073fdb..2a22ab96d7a 100644 --- a/src/renderer/src/components/settings/computer-use/ComputerUseSkillSetupPanel.tsx +++ b/src/renderer/src/components/settings/computer-use/ComputerUseSkillSetupPanel.tsx @@ -1,5 +1,5 @@ import { MonitorCog } from 'lucide-react' -import { COMPUTER_USE_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { COMPUTER_USE_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' import { GLOBAL_AGENT_SKILL_SOURCE_KINDS, useInstalledAgentSkill diff --git a/src/renderer/src/components/settings/mobile/emulator/MobileEmulatorAgentControlRow.tsx b/src/renderer/src/components/settings/mobile/emulator/MobileEmulatorAgentControlRow.tsx index ed696c8855a..83724edad2f 100644 --- a/src/renderer/src/components/settings/mobile/emulator/MobileEmulatorAgentControlRow.tsx +++ b/src/renderer/src/components/settings/mobile/emulator/MobileEmulatorAgentControlRow.tsx @@ -1,5 +1,5 @@ import { Import } from 'lucide-react' -import { ORCA_CLI_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { ORCA_CLI_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' import { useMobileEmulatorAgentSetupState } from '../../../emulator-pane/use-mobile-emulator-agent-setup-state' import { AgentSkillSetupPanel } from '../../../skills/setup/AgentSkillSetupPanel' import { MobileEmulatorExamples } from './MobileEmulatorExamples' diff --git a/src/renderer/src/lib/agent-skill-nav-install-status.ts b/src/renderer/src/components/settings/navigation/agent-skill-nav-install-status.ts similarity index 65% rename from src/renderer/src/lib/agent-skill-nav-install-status.ts rename to src/renderer/src/components/settings/navigation/agent-skill-nav-install-status.ts index 6574a507f1e..1daeb563597 100644 --- a/src/renderer/src/lib/agent-skill-nav-install-status.ts +++ b/src/renderer/src/components/settings/navigation/agent-skill-nav-install-status.ts @@ -1,8 +1,8 @@ -import type { BundledSkillPlan } from '../../../shared/bundled-skill-plan' -import type { DiscoveredSkill } from '../../../shared/skills' -import type { SettingsNavInstallStatus } from './settings-navigation-types' -import { getLinearAgentSkillUpdateTarget } from './linear-agent-skill-update-target' -import { getSkillFreshnessDisplayStatus } from './skill-freshness-display-status' +import type { BundledSkillPlan } from '../../../../../shared/bundled-skill-plan' +import type { DiscoveredSkill } from '../../../../../shared/skills' +import type { SettingsNavInstallStatus } from '../../../lib/settings-navigation-types' +import { getLinearAgentSkillUpdateTarget } from '../../../lib/skills/installation/linear-agent-skill-update-target' +import { getSkillFreshnessDisplayStatus } from '../../../lib/skills/presentation/skill-freshness-display-status' type AgentSkillNavInstallStatusInput = { name: string diff --git a/src/renderer/src/components/settings/navigation/use-settings-navigation-model.ts b/src/renderer/src/components/settings/navigation/use-settings-navigation-model.ts index c6c682e7426..54c5daf53c9 100644 --- a/src/renderer/src/components/settings/navigation/use-settings-navigation-model.ts +++ b/src/renderer/src/components/settings/navigation/use-settings-navigation-model.ts @@ -3,11 +3,14 @@ import { applyDocumentTheme } from '@/lib/document-theme' import { resolvePaintedTheme } from '@/lib/terminal-app-theme' import { useSettingsNavigationMetadata } from '@/hooks/useSettingsNavigationMetadata' import type { SettingsNavInstallStatus } from '@/lib/settings-navigation-types' -import { COMPUTER_USE_SKILL_NAME, ORCHESTRATION_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { + COMPUTER_USE_SKILL_NAME, + ORCHESTRATION_SKILL_NAME +} from '@/lib/skills/installation/agent-feature-skill-names' import { getAgentSkillNavInstallStatus, getLinearAgentSkillNavInstallStatus -} from '@/lib/agent-skill-nav-install-status' +} from '@/components/settings/navigation/agent-skill-nav-install-status' import { getProjectHostSetupProjectionFromState } from '../../../store/projects/project-host-setup-selector' import { getSettingsSectionSearchEntries, rankSettingsSearchItems } from '../search/settings-search' import { deriveNeededSectionIds } from '../page/settings-load-performance' diff --git a/src/renderer/src/components/settings/orchestration/OrchestrationPane.tsx b/src/renderer/src/components/settings/orchestration/OrchestrationPane.tsx index 76c35f0dd4a..9c03161af50 100644 --- a/src/renderer/src/components/settings/orchestration/OrchestrationPane.tsx +++ b/src/renderer/src/components/settings/orchestration/OrchestrationPane.tsx @@ -2,9 +2,9 @@ import type { BundledSkillPlan } from '../../../../../shared/bundled-skill-plan' import { useCallback, useState } from 'react' import { OrchestrationSkillPromptDialog } from './OrchestrationSkillPromptDialog' import { buildSkillCommandForRuntime } from '../../../lib/skill-runtime-command' -import { ORCHESTRATION_SKILL_INSTALL_COMMAND } from '@/lib/agent-feature-install-commands' +import { ORCHESTRATION_SKILL_INSTALL_COMMAND } from '@/lib/skills/installation/agent-feature-install-commands' import { ArrowRightLeft, GitBranch, ListChecks, Workflow, type LucideIcon } from 'lucide-react' -import { ORCHESTRATION_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { ORCHESTRATION_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' import type { SkillUsageExample } from '@/lib/skill-usage-example' import { getOrchestrationUsageExamples } from '@/lib/orchestration-usage-examples' import { diff --git a/src/renderer/src/components/settings/orchestration/OrchestrationSkillAgentCoverage.tsx b/src/renderer/src/components/settings/orchestration/OrchestrationSkillAgentCoverage.tsx index f11098215ad..b6a079783a6 100644 --- a/src/renderer/src/components/settings/orchestration/OrchestrationSkillAgentCoverage.tsx +++ b/src/renderer/src/components/settings/orchestration/OrchestrationSkillAgentCoverage.tsx @@ -4,14 +4,15 @@ import type { } from '../../../../../shared/bundled-skill-plan' import type { DiscoveredSkill, SkillDiscoverySource } from '../../../../../shared/skills' -import { AgentIcon, getAgentLabel } from '@/lib/agent-catalog' +import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { useDetectedAgents } from '@/hooks/useDetectedAgents' import { type OrchestrationSkillAgentStatus, getOrchestrationSkillAgentStatuses, sortOrchestrationAgents -} from '@/lib/orchestration-skill-coverage' -import { ORCHESTRATION_SKILL_NAME } from '@/lib/agent-feature-skill-names' +} from '@/lib/skills/orchestration-skill-coverage' +import { ORCHESTRATION_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' import { cn } from '@/lib/utils' import { translate } from '@/i18n/i18n' import { useTranslate, type Translate } from '@/i18n/use-translate' diff --git a/src/renderer/src/components/settings/page/use-settings-store-model.ts b/src/renderer/src/components/settings/page/use-settings-store-model.ts index 1ba484f9d9d..f60a1c5afb5 100644 --- a/src/renderer/src/components/settings/page/use-settings-store-model.ts +++ b/src/renderer/src/components/settings/page/use-settings-store-model.ts @@ -13,7 +13,7 @@ import { COMPUTER_USE_SKILL_NAME, LINEAR_AGENT_SKILL_NAMES, ORCHESTRATION_SKILL_NAME -} from '@/lib/agent-feature-skill-names' +} from '@/lib/skills/installation/agent-feature-skill-names' import { GLOBAL_AGENT_SKILL_SOURCE_KINDS, useInstalledAgentSkill, diff --git a/src/renderer/src/components/settings/quick-commands/QuickCommandsList.tsx b/src/renderer/src/components/settings/quick-commands/QuickCommandsList.tsx index 3b57d836aa5..6685b17acc7 100644 --- a/src/renderer/src/components/settings/quick-commands/QuickCommandsList.tsx +++ b/src/renderer/src/components/settings/quick-commands/QuickCommandsList.tsx @@ -9,7 +9,8 @@ import { getTerminalQuickCommandScope, isTerminalAgentQuickCommand } from '../../../../../shared/terminal/quick-commands/terminal-quick-commands' -import { AgentIcon, getAgentLabel } from '@/lib/agent-catalog' +import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { useClipboardTextCopyFeedback } from '@/hooks/use-clipboard-text-copy-feedback' import { cn } from '@/lib/utils' import { translate } from '@/i18n/i18n' diff --git a/src/renderer/src/components/settings/skills/linear/LinearAgentSkillPane.tsx b/src/renderer/src/components/settings/skills/linear/LinearAgentSkillPane.tsx index 86f57bd479b..3e987ae496d 100644 --- a/src/renderer/src/components/settings/skills/linear/LinearAgentSkillPane.tsx +++ b/src/renderer/src/components/settings/skills/linear/LinearAgentSkillPane.tsx @@ -12,7 +12,7 @@ import { LinearApiKeyDialog } from '@/components/linear-api-key-dialog' import { LinearIcon } from '@/components/icons/LinearIcon' import { Button } from '@/components/ui/button' import { useAppStore } from '@/store/index' -import { ORCA_LINEAR_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { ORCA_LINEAR_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' import { getLinearUsageExamples } from '@/lib/linear-usage-examples' import type { SkillUsageExample } from '@/lib/skill-usage-example' import { useLinearProviderConnected } from '@/hooks/useLinearProviderConnected' diff --git a/src/renderer/src/components/settings/source-control/SourceControlActionArguments.tsx b/src/renderer/src/components/settings/source-control/SourceControlActionArguments.tsx index 86d23419198..8d98e546942 100644 --- a/src/renderer/src/components/settings/source-control/SourceControlActionArguments.tsx +++ b/src/renderer/src/components/settings/source-control/SourceControlActionArguments.tsx @@ -22,7 +22,7 @@ import type { AgentLaunchChoices } from '../../../../../shared/agent-launch/choices/agent-launch-choices' import { SourceControlActionModelPicker } from './SourceControlActionModelPicker' -import { AGENT_CATALOG } from '@/lib/agent-catalog' +import { AGENT_CATALOG } from '@/lib/agent-catalog/agent-catalog' import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent' import { useAppStore } from '@/store/index' import { useTranslate } from '@/i18n/use-translate' diff --git a/src/renderer/src/components/settings/source-control/source-control-action-recipe-options.ts b/src/renderer/src/components/settings/source-control/source-control-action-recipe-options.ts index 3e4d9f52fe5..1d6d04b032c 100644 --- a/src/renderer/src/components/settings/source-control/source-control-action-recipe-options.ts +++ b/src/renderer/src/components/settings/source-control/source-control-action-recipe-options.ts @@ -11,7 +11,7 @@ import { isCustomAgentId, listCommitMessageAgentCapabilities } from '../../../../../shared/source-control/ai/generation/commit-message-agent-spec' -import { getAgentCatalog, type AgentCatalogEntry } from '@/lib/agent-catalog' +import { getAgentCatalog, type AgentCatalogEntry } from '@/lib/agent-catalog/agent-catalog' import { createLocalizedCatalog } from '@/i18n/localized-catalog' import { translate } from '@/i18n/i18n' import type { Translate } from '@/i18n/use-translate' diff --git a/src/renderer/src/components/settings/tasks/TaskSourceLinearSetup.tsx b/src/renderer/src/components/settings/tasks/TaskSourceLinearSetup.tsx index 1f7560d1562..802d33ccb6a 100644 --- a/src/renderer/src/components/settings/tasks/TaskSourceLinearSetup.tsx +++ b/src/renderer/src/components/settings/tasks/TaskSourceLinearSetup.tsx @@ -2,7 +2,7 @@ import { useState } from 'react' import { LinearApiKeyDialog } from '@/components/linear-api-key-dialog' import { Button } from '@/components/ui/button' import { useAppStore } from '@/store/index' -import { ORCA_LINEAR_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { ORCA_LINEAR_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' import { AgentSkillSetupPanel } from '../../skills/setup/AgentSkillSetupPanel' import { TaskSourceShowInTasksStep } from './TaskSourceShowInTasksStep' import { TaskSourceStepRow } from './TaskSourceStepRow' diff --git a/src/renderer/src/components/settings/tasks/use-task-source-provider-readiness.ts b/src/renderer/src/components/settings/tasks/use-task-source-provider-readiness.ts index 805ca4ebbea..758b491c601 100644 --- a/src/renderer/src/components/settings/tasks/use-task-source-provider-readiness.ts +++ b/src/renderer/src/components/settings/tasks/use-task-source-provider-readiness.ts @@ -6,7 +6,7 @@ import { } from '@/hooks/useInstalledAgentSkills' import { useActiveProjectSkillRuntime } from '@/hooks/useActiveProjectSkillRuntime' import { useLinearProviderConnected } from '@/hooks/useLinearProviderConnected' -import { LINEAR_AGENT_SKILL_NAMES } from '@/lib/agent-feature-skill-names' +import { LINEAR_AGENT_SKILL_NAMES } from '@/lib/skills/installation/agent-feature-skill-names' import { getLocalPreflightContext } from '@/lib/local-preflight-context' import { localPreflightContextKey } from '@/lib/local-preflight-context-key' import { getProviderRuntimeContextKey } from '@/runtime/hosts/observations/provider-runtime-context' diff --git a/src/renderer/src/components/settings/virtual-machines/recipes/EphemeralVmsPane.tsx b/src/renderer/src/components/settings/virtual-machines/recipes/EphemeralVmsPane.tsx index f648c44f51a..f02ffa2d649 100644 --- a/src/renderer/src/components/settings/virtual-machines/recipes/EphemeralVmsPane.tsx +++ b/src/renderer/src/components/settings/virtual-machines/recipes/EphemeralVmsPane.tsx @@ -9,7 +9,7 @@ import { AgentSkillSetupPanel } from '../../../skills/setup/AgentSkillSetupPanel import { EphemeralVmRecipeRow } from './EphemeralVmRecipeRow' import { translate } from '@/i18n/i18n' import { useTranslate } from '@/i18n/use-translate' -import { EPHEMERAL_VMS_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { EPHEMERAL_VMS_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' import { GLOBAL_AGENT_SKILL_SOURCE_KINDS, useInstalledAgentSkill diff --git a/src/renderer/src/components/setup-guide/use-setup-guide-progress.ts b/src/renderer/src/components/setup-guide/use-setup-guide-progress.ts index 83f7f921614..7ecad0c2cf1 100644 --- a/src/renderer/src/components/setup-guide/use-setup-guide-progress.ts +++ b/src/renderer/src/components/setup-guide/use-setup-guide-progress.ts @@ -10,7 +10,7 @@ import { COMPUTER_USE_SKILL_NAME, ORCA_CLI_SKILL_NAME, ORCHESTRATION_SKILL_NAME -} from '@/lib/agent-feature-skill-names' +} from '@/lib/skills/installation/agent-feature-skill-names' import { GLOBAL_AGENT_SKILL_SOURCE_KINDS, useInstalledAgentSkill diff --git a/src/renderer/src/components/sidebar/LinearAgentSkillSetupDialog.tsx b/src/renderer/src/components/sidebar/LinearAgentSkillSetupDialog.tsx index 4ef217b6640..f4cd809d3de 100644 --- a/src/renderer/src/components/sidebar/LinearAgentSkillSetupDialog.tsx +++ b/src/renderer/src/components/sidebar/LinearAgentSkillSetupDialog.tsx @@ -12,7 +12,7 @@ import { DialogHeader, DialogTitle } from '@/components/ui/dialog' -import { ORCA_LINEAR_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { ORCA_LINEAR_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' import { useTranslate } from '@/i18n/use-translate' type AgentSkillSetupPanelProps = ComponentProps diff --git a/src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.tsx b/src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.tsx index 1055d30c418..2a61934e03f 100644 --- a/src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.tsx +++ b/src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.tsx @@ -6,8 +6,8 @@ import { GLOBAL_AGENT_SKILL_SOURCE_KINDS, useInstalledAgentSkillNames } from '@/hooks/useInstalledAgentSkills' -import { LINEAR_AGENT_SKILL_NAMES } from '@/lib/agent-feature-skill-names' -import { getLinearAgentSkillUpdateTarget } from '@/lib/linear-agent-skill-update-target' +import { LINEAR_AGENT_SKILL_NAMES } from '@/lib/skills/installation/agent-feature-skill-names' +import { getLinearAgentSkillUpdateTarget } from '@/lib/skills/installation/linear-agent-skill-update-target' import { lazyWithRetry } from '@/lib/lazy-with-retry' import { cn } from '@/lib/utils' import { diff --git a/src/renderer/src/components/sidebar/workspace-actions/sleep/use-worktree-sleep-state.ts b/src/renderer/src/components/sidebar/workspace-actions/sleep/use-worktree-sleep-state.ts index 3e5e98d160a..f60b120aefa 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/sleep/use-worktree-sleep-state.ts +++ b/src/renderer/src/components/sidebar/workspace-actions/sleep/use-worktree-sleep-state.ts @@ -1,5 +1,5 @@ import { useAppStore } from '@/store' -import { getAgentStatusEpochNow } from '@/lib/agent-status-epoch-clock' +import { getAgentStatusEpochNow } from '@/lib/agent-status/evidence/agent-status-epoch-clock' import { getWorktreeIdsWithLiveAgent, isInactiveWorkspace } from '@/lib/worktree-activity-state' import { getWorktreeIdsWithStructuredChat } from '../../worktree-list/listing/visible-worktree-activity-inputs' import type { AgentStatusEntry } from '../../../../../../shared/agent-status/contracts/agent-status-types' diff --git a/src/renderer/src/components/sidebar/workspace-board/surface/use-visible-workspace-kanban-worktree-ids.ts b/src/renderer/src/components/sidebar/workspace-board/surface/use-visible-workspace-kanban-worktree-ids.ts index 6907bdda386..936433e3ba7 100644 --- a/src/renderer/src/components/sidebar/workspace-board/surface/use-visible-workspace-kanban-worktree-ids.ts +++ b/src/renderer/src/components/sidebar/workspace-board/surface/use-visible-workspace-kanban-worktree-ids.ts @@ -1,6 +1,6 @@ import { useMemo, useState } from 'react' import { useAppStore } from '@/store' -import { getAgentStatusEpochNow } from '@/lib/agent-status-epoch-clock' +import { getAgentStatusEpochNow } from '@/lib/agent-status/evidence/agent-status-epoch-clock' import type { Repo } from '../../../../../../shared/repo-types' import type { Worktree } from '../../../../../../shared/worktree/types' import '../../worktree-list/listing/visible-worktrees' diff --git a/src/renderer/src/components/sidebar/workspace-card/activity/WorktreeCardAgents.tsx b/src/renderer/src/components/sidebar/workspace-card/activity/WorktreeCardAgents.tsx index 5d11eff6b69..684084c951a 100644 --- a/src/renderer/src/components/sidebar/workspace-card/activity/WorktreeCardAgents.tsx +++ b/src/renderer/src/components/sidebar/workspace-card/activity/WorktreeCardAgents.tsx @@ -4,7 +4,7 @@ import { useShallow } from 'zustand/react/shallow' import { useAppStore } from '@/store' import DashboardAgentRow from '@/components/dashboard/DashboardAgentRow' import { useNow } from '@/hooks/use-now' -import { deriveRunningAgentSendTargets } from '@/lib/running-agent-targets' +import { deriveRunningAgentSendTargets } from '@/lib/agent-session/messaging/running-agent-targets' import { selectSendTargetControlInputs, selectSendTargetInputs @@ -20,11 +20,11 @@ import { buildAgentRowLineageTree } from '@/components/dashboard/agent-row-linea import { revealCompactAgentCard } from '../../worktree-list/navigation/worktree-sidebar-reveal' import { useWorktreeAgentExpansionState } from './worktree-card-agents-expansion-state' import { useTranslate } from '@/i18n/use-translate' -import { agentSendDisabledReasonLabel } from '@/lib/agent-send-disabled-reason-label' +import { agentSendDisabledReasonLabel } from '@/lib/agent-session/messaging/agent-send-disabled-reason-label' import { useUiLanguageRevision } from '@/i18n/use-ui-language-revision' import { activateRetainedAgentRow } from './activate-retained-agent-row' import { selectAgentRowsUnread } from './worktree-card-agent-ack-inputs' -import { opensClaudeParentConversation } from '@/lib/claude-agent-row-view' +import { opensClaudeParentConversation } from '@/lib/agent-session/navigation/claude-agent-row-view' import { lineageAncestorPaneKeys } from './worktree-card-agent-lineage-disclosure' import { ChildAgentsWithIdleGroup, diff --git a/src/renderer/src/components/sidebar/workspace-card/activity/title-derived-agent-row-input.ts b/src/renderer/src/components/sidebar/workspace-card/activity/title-derived-agent-row-input.ts new file mode 100644 index 00000000000..12a08d2e71b --- /dev/null +++ b/src/renderer/src/components/sidebar/workspace-card/activity/title-derived-agent-row-input.ts @@ -0,0 +1,17 @@ +import type { AgentStatusOrchestrationContext } from '../../../../../../shared/agent-status/contracts/agent-status-types' +import type { + TerminalLayoutSnapshot, + TerminalTab +} from '../../../../../../shared/workspace-layout/terminal-tab-types' +import type { TitleDerivedPaneForeground } from './title-derived-pane-agent-identity' + +export type TitleDerivedAgentRowsInput = { + tabs: TerminalTab[] + runtimePaneTitlesByTabId?: Record> + ptyIdsByTabId?: Record + terminalLayoutsByTabId?: Record + runtimeAgentOrchestrationByPaneKey?: Record + paneForegroundAgentByPaneKey?: Record + seenPaneKeys: Set + now: number +} diff --git a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-agent-activity-summary.ts b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-agent-activity-summary.ts index 5b1fdbb62fa..65dd3bcf182 100644 --- a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-agent-activity-summary.ts +++ b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-agent-activity-summary.ts @@ -4,14 +4,17 @@ import { type VisibleOrchestrationState } from '@/runtime/agent-orchestration/visible-agent-orchestration' import type { AppState } from '@/store/types' -import { isExplicitAgentStatusFresh } from '@/lib/pane-agent-evidence' +import { + isAgentStatusFresh, + AGENT_STATUS_STALE_AFTER_MS +} from '../../../../../../shared/agent-status/contracts/agent-status-freshness' import { migrationUnsupportedToAgentStatusEntry } from '../../../../../../shared/migration-unsupported-agent-entry' import { mergeAgentStatusOrchestration, parseAgentStatusPaneIdentity, resolveAgentStatusWorktreeId } from '../../../../../../shared/agent-status/identity/agent-status-worktree-attribution' -import { AGENT_STATUS_STALE_AFTER_MS } from '../../../../../../shared/agent-status/contracts/agent-status-freshness' + import type { AgentStatusOrchestrationContext } from '../../../../../../shared/agent-status/contracts/agent-status-types' import { agentVerdictDisplayMark } from '../../../../../../shared/agent-status/lifecycle/agent-main-agent-verdict' import { applyAgentPaneActivityFlags } from '../../../../../../shared/worktree-status-rollup' @@ -144,7 +147,7 @@ function getWorktreeAgentActivitySummaries( addAgentStatusPaneId(summary, paneIdentity.tabId, paneIdentity.paneId) continue } - if (!isExplicitAgentStatusFresh(entry, now, AGENT_STATUS_STALE_AFTER_MS)) { + if (!isAgentStatusFresh(entry, now, AGENT_STATUS_STALE_AFTER_MS)) { // Retain stale pane identity to suppress generated permission titles after the row loses authority. addStalePaneId(summary, paneIdentity.tabId, paneIdentity.paneId) continue diff --git a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-agent-freshness-selector.ts b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-agent-freshness-selector.ts index 668cded7c1a..2176358613c 100644 --- a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-agent-freshness-selector.ts +++ b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-agent-freshness-selector.ts @@ -1,6 +1,9 @@ -import { isExplicitAgentStatusFresh } from '@/lib/pane-agent-evidence' +import { + isAgentStatusFresh, + AGENT_STATUS_STALE_AFTER_MS +} from '../../../../../../shared/agent-status/contracts/agent-status-freshness' import type { AppState } from '@/store/types' -import { AGENT_STATUS_STALE_AFTER_MS } from '../../../../../../shared/agent-status/contracts/agent-status-freshness' + import { selectLiveAgentStatusEntriesForWorktree } from './worktree-agent-row-selectors' export const EMPTY_WORKTREE_AGENT_FRESHNESS_SIGNATURE = '' @@ -25,7 +28,7 @@ function buildWorktreeAgentFreshnessSignature( continue } signature += `${entry.paneKey}\0${ - isExplicitAgentStatusFresh(entry, now, AGENT_STATUS_STALE_AFTER_MS) ? '1' : '0' + isAgentStatusFresh(entry, now, AGENT_STATUS_STALE_AFTER_MS) ? '1' : '0' }\0` } return signature diff --git a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-agent-rows.ts b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-agent-rows.ts index c77921f99f2..93de8572c23 100644 --- a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-agent-rows.ts +++ b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-agent-rows.ts @@ -1,9 +1,12 @@ import type { Tab } from '../../../../../../shared/tab-types' import { parseAgentStatusPaneIdentity } from '../../../../../../shared/agent-status/identity/agent-status-worktree-attribution' import type { DashboardAgentRow } from '@/components/dashboard/useDashboardData' -import { isExplicitAgentStatusFresh } from '@/lib/pane-agent-evidence' +import { + isAgentStatusFresh, + AGENT_STATUS_STALE_AFTER_MS +} from '../../../../../../shared/agent-status/contracts/agent-status-freshness' import type { RetainedAgentEntry } from '@/store/slices/agent-status/agent-status-contract' -import { AGENT_STATUS_STALE_AFTER_MS } from '../../../../../../shared/agent-status/contracts/agent-status-freshness' + import type { AgentStatusEntry, AgentStatusOrchestrationContext @@ -176,7 +179,7 @@ export function buildWorktreeAgentRows(args: { const hasLivePty = tabHasLivePty(ptyIdsByTabId, tab.id) for (const entry of explicitEntries) { const rowEntry = entryWithRuntimeOrchestration(entry, args.runtimeAgentOrchestrationByPaneKey) - const isFresh = isExplicitAgentStatusFresh(rowEntry, args.now, AGENT_STATUS_STALE_AFTER_MS) + const isFresh = isAgentStatusFresh(rowEntry, args.now, AGENT_STATUS_STALE_AFTER_MS) const shouldDecay = !isFresh && (rowEntry.state === 'working' || @@ -223,7 +226,7 @@ export function buildWorktreeAgentRows(args: { if (!tab) { continue } - const isFresh = isExplicitAgentStatusFresh(rowEntry, args.now, AGENT_STATUS_STALE_AFTER_MS) + const isFresh = isAgentStatusFresh(rowEntry, args.now, AGENT_STATUS_STALE_AFTER_MS) const shouldDecay = !isFresh && (rowEntry.state === 'working' || rowEntry.state === 'blocked' || rowEntry.state === 'waiting') diff --git a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-agent-summary.ts b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-agent-summary.ts index 62175c5f8ff..2b224f17832 100644 --- a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-agent-summary.ts +++ b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-agent-summary.ts @@ -1,7 +1,7 @@ import type { AgentDotState } from '@/components/AgentStateDot' import type { DashboardAgentRow as DashboardAgentRowData } from '@/components/dashboard/useDashboardData' import { formatAgentTypeLabel } from '../../../../../../shared/agent-status/presentation/agent-type-label' -import { agentRowDisplayDotState as getAgentDotState } from '@/lib/agent-row-dot-state' +import { agentRowDisplayDotState as getAgentDotState } from '@/lib/agent-status/presentation/agent-row-dot-state' import { translate } from '@/i18n/i18n' import type { Translate } from '@/i18n/use-translate' diff --git a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-compact-agent-line-order.ts b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-compact-agent-line-order.ts index efe74c6a7b8..8f5af83fbf4 100644 --- a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-compact-agent-line-order.ts +++ b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-compact-agent-line-order.ts @@ -1,6 +1,6 @@ import type { DashboardAgentRow as DashboardAgentRowData } from '@/components/dashboard/useDashboardData' -import { agentRowStoppingLabel } from '@/lib/agent-row-stopping-label' -import type { agentRowDisplayDotState as getAgentDotState } from '../../../../lib/agent-row-dot-state' +import { agentRowStoppingLabel } from '@/lib/agent-status/presentation/agent-row-stopping-label' +import type { agentRowDisplayDotState as getAgentDotState } from '../../../../lib/agent-status/presentation/agent-row-dot-state' import type { Translate } from '@/i18n/use-translate' /** Lead with statuses the dot cannot express so truncation cuts the prompt instead. */ diff --git a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-compact-agent-row.tsx b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-compact-agent-row.tsx index 1d69333031e..372e2a9dfc8 100644 --- a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-compact-agent-row.tsx +++ b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-compact-agent-row.tsx @@ -3,22 +3,22 @@ import { DashboardAgentChildDisclosure } from '@/components/dashboard/DashboardA import { AgentStateDot, agentStateLabel, type AgentDotState } from '@/components/AgentStateDot' import { AgentChildRowContent } from '@/components/AgentChildRowContent' import type { DashboardAgentRow as DashboardAgentRowData } from '@/components/dashboard/useDashboardData' -import { AgentTypeIcon } from '@/lib/agent-type-icon' +import { AgentTypeIcon } from '@/components/agent/icons/agent-type-icon' import { formatAgentTypeLabel } from '../../../../../../shared/agent-status/presentation/agent-type-label' import { cn } from '@/lib/utils' -import { viewClaudeAgentFromRow } from '@/lib/claude-agent-row-view' +import { viewClaudeAgentFromRow } from '@/lib/agent-session/navigation/claude-agent-row-view' import { useClaudeAgentRowView } from '@/components/dashboard/use-claude-agent-row-view' import './worktree-card-agent-summary' -import { agentRowDisplayDotState as getAgentDotState } from '../../../../lib/agent-row-dot-state' +import { agentRowDisplayDotState as getAgentDotState } from '../../../../lib/agent-status/presentation/agent-row-dot-state' import { getAgentRowPrimaryText } from '../../../../../../shared/agent-status/presentation/agent-row-primary-text' -import { formatAgentToolPreview } from '@/lib/agent-row-tool-preview' +import { formatAgentToolPreview } from '@/lib/agent-status/presentation/agent-row-tool-preview' import { agentNoUpdateLabel } from '../../../../../../shared/agent-status/presentation/agent-row-decay-state' import { useAgentRowConversationName } from '@/components/dashboard/use-agent-row-conversation-name' import { lastEnteredDoneAt } from '@/components/dashboard/agent-finished-timestamp' import CacheTimer, { usePromptCacheCountdownForPane } from './CacheTimer' import { formatShortTimeAgo } from '@/lib/short-time-ago' -import { agentVerdictStatusLine } from '@/lib/agent-verdict-status-line' -import { agentRowStoppingLabel } from '@/lib/agent-row-stopping-label' +import { agentVerdictStatusLine } from '@/lib/agent-status/presentation/agent-verdict-status-line' +import { agentRowStoppingLabel } from '@/lib/agent-status/presentation/agent-row-stopping-label' import { getCompactAgentLineOrder } from './worktree-card-compact-agent-line-order' import { programStatusAttentionLine, diff --git a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-compact-agents.tsx b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-compact-agents.tsx index ee3d1ed03ae..354535ba5fa 100644 --- a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-compact-agents.tsx +++ b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-compact-agents.tsx @@ -2,7 +2,7 @@ import React, { useCallback, useRef } from 'react' import { ChevronDown } from 'lucide-react' import { AgentStateDot } from '@/components/AgentStateDot' import type { DashboardAgentRow as DashboardAgentRowData } from '@/components/dashboard/useDashboardData' -import { AgentTypeIcon } from '@/lib/agent-type-icon' +import { AgentTypeIcon } from '@/components/agent/icons/agent-type-icon' import { cn } from '@/lib/utils' import { buildSummaryAgentGroups, diff --git a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-idle-child-agents.tsx b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-idle-child-agents.tsx index 145a673b097..766a8fb5696 100644 --- a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-idle-child-agents.tsx +++ b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-idle-child-agents.tsx @@ -6,7 +6,7 @@ import { cn } from '@/lib/utils' import { useTranslate } from '@/i18n/use-translate' import { CompactAgentExpansion } from './worktree-card-compact-agents' import { SUMMARY_STATE_ORDER } from './worktree-card-agent-summary' -import { agentRowDisplayDotState as getAgentDotState } from '../../../../lib/agent-row-dot-state' +import { agentRowDisplayDotState as getAgentDotState } from '../../../../lib/agent-status/presentation/agent-row-dot-state' import type { AgentDotState } from '@/components/AgentStateDot' // A lone idle child costs the same row as its group, so only fold two or more. diff --git a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-send-target-inputs.ts b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-send-target-inputs.ts index 47e1aaf554d..98d7aa0f179 100644 --- a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-send-target-inputs.ts +++ b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-send-target-inputs.ts @@ -1,5 +1,5 @@ import type { AppState } from '@/store/types' -import type { RunningAgentTargetState } from '@/lib/running-agent-targets' +import type { RunningAgentTargetState } from '@/lib/agent-session/messaging/running-agent-targets' export type SendTargetInputsState = Pick< AppState, diff --git a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-title-derived-agent-rows.ts b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-title-derived-agent-rows.ts index da944bd9ad6..c3b5296cf45 100644 --- a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-title-derived-agent-rows.ts +++ b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-title-derived-agent-rows.ts @@ -1,3 +1,4 @@ +import type { TitleDerivedAgentRowsInput } from './title-derived-agent-row-input' import type { DashboardAgentRow } from '@/components/dashboard/useDashboardData' import { formatAgentTypeLabel } from '../../../../../../shared/agent-status/presentation/agent-type-label' import { @@ -5,7 +6,8 @@ import { isCursorAgentTitle } from '../../../../../../shared/agent-status/title/agent-title-core' -import { classifyTitleActivity, resolveTitleActivityLabel } from '@/lib/pane-agent-evidence' +import { detectAgentStatusFromTitle } from '../../../../../../shared/agent-status/title/agent-title-status' +import { getAgentLabel } from '../../../../../../shared/agent-status/title/agent-title-identity' import { tabHasLivePty } from '../../../../../../shared/tab-has-live-pty' import type { AgentStatusEntry, @@ -49,16 +51,7 @@ const EMPTY_LIVE_PTY_IDS: Record = {} const EMPTY_TERMINAL_LAYOUTS: Record = {} const EMPTY_PANE_FOREGROUND: Record = {} -export function buildTitleDerivedAgentRows(args: { - tabs: TerminalTab[] - runtimePaneTitlesByTabId?: Record> - ptyIdsByTabId?: Record - terminalLayoutsByTabId?: Record - runtimeAgentOrchestrationByPaneKey?: Record - paneForegroundAgentByPaneKey?: Record - seenPaneKeys: Set - now: number -}): DashboardAgentRow[] { +export function buildTitleDerivedAgentRows(args: TitleDerivedAgentRowsInput): DashboardAgentRow[] { const rows: DashboardAgentRow[] = [] const runtimePaneTitlesByTabId = args.runtimePaneTitlesByTabId ?? EMPTY_RUNTIME_TITLES const ptyIdsByTabId = args.ptyIdsByTabId ?? EMPTY_LIVE_PTY_IDS @@ -163,8 +156,8 @@ function buildTitleDerivedAgentRow(args: { // Claude management and Cursor’s status-less native titles still identify idle panes without claiming active work. const titleStatus = isClaudeAgentsTitle ? 'idle' - : (classifyTitleActivity(title) ?? (isCursorAgentTitle(title) ? 'idle' : null)) - const label = isClaudeAgentsTitle ? 'Claude Code' : resolveTitleActivityLabel(title) + : (detectAgentStatusFromTitle(title) ?? (isCursorAgentTitle(title) ? 'idle' : null)) + const label = isClaudeAgentsTitle ? 'Claude Code' : getAgentLabel(title) if (!isTerminalLeafId(args.leafId)) { return null } @@ -259,7 +252,7 @@ export function resolveAgentTypeFromTerminalTitle( return null } const normalizedTitle = normalizeCompatibleAgentTitleForOwner(title, ownerAgentType, options) - const label = resolveTitleActivityLabel(normalizedTitle) + const label = getAgentLabel(normalizedTitle) return label ? (resolveCompatibleAgentTypeForOwner( resolveTitleDerivedAgentType(normalizedTitle, label, ownerAgentType), diff --git a/src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-composer-submit-input.ts b/src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-composer-submit-input.ts index e0a0fc2d235..c7d59a529ed 100644 --- a/src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-composer-submit-input.ts +++ b/src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-composer-submit-input.ts @@ -1,4 +1,4 @@ -import type { AgentLaunchChoice } from '@/lib/agent-menu-selection' +import type { AgentLaunchChoice } from '@/lib/agent-session/launch/routing/agent-menu-selection' import type { LinkedWorkItemSummary } from '@/lib/new-workspace' import type { AgentStartupSettings } from '../../../../../../shared/agent-launch/startup/agent-startup-plan-inputs' import type { AgentLaunchInputViews } from '../../../../../../shared/agent-launch/choices/agent-launch-choices' diff --git a/src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-composer-submit.ts b/src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-composer-submit.ts index 49e3d80bff1..5df1d7f3bfa 100644 --- a/src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-composer-submit.ts +++ b/src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-composer-submit.ts @@ -29,7 +29,7 @@ import { } from './folder-workspace-agent-startup' import { translate } from '@/i18n/i18n' -import { getAgentLabel } from '@/lib/agent-catalog' +import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog' import type { SubmitFolderWorkspaceCreateParams } from './folder-workspace-composer-submit-input' export async function submitFolderWorkspaceCreate({ diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/sleeping-sweep-visibility.ts b/src/renderer/src/components/sidebar/worktree-list/listing/sleeping-sweep-visibility.ts index e120f504a3e..dbb9ad4bcf6 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/sleeping-sweep-visibility.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/sleeping-sweep-visibility.ts @@ -1,7 +1,7 @@ import type { AppState } from '@/store/types' import type { Worktree } from '../../../../../../shared/worktree/types' import { isSleepingSweepExempt } from '../../../../../../shared/workspace-view/workspace-row-filters' -import { getAgentStatusEpochNow } from '@/lib/agent-status-epoch-clock' +import { getAgentStatusEpochNow } from '@/lib/agent-status/evidence/agent-status-epoch-clock' import { getWorktreeIdsWithLiveAgent, isInactiveWorkspace } from '@/lib/worktree-activity-state' import { getVisibleWorktreeBrowserActivityTabs, diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-agent-send-target.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-agent-send-target.ts index d6c5adac6a1..e88f5dc656a 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/use-agent-send-target.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-agent-send-target.ts @@ -1,7 +1,7 @@ import { useMemo } from 'react' import { useAppStore } from '@/store' import type { AppState } from '@/store/types' -import { deriveRunningAgentSendTargets } from '@/lib/running-agent-targets' +import { deriveRunningAgentSendTargets } from '@/lib/agent-session/messaging/running-agent-targets' import { recomputeOn } from '@/lib/recompute-on' // Why: selectors that opt out of a slice must return one stable reference, or every store tick looks like a change. diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.ts index 1e74831b26e..8917a0d2b3e 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.ts @@ -3,7 +3,7 @@ import { useMemo, useState } from 'react' import { shallow } from 'zustand/shallow' import type { AppState } from '@/store/types' import { useAppStore } from '@/store' -import { getAgentStatusEpochNow } from '@/lib/agent-status-epoch-clock' +import { getAgentStatusEpochNow } from '@/lib/agent-status/evidence/agent-status-epoch-clock' import { createLiveAgentWorktreeIdsSelector } from '@/lib/worktree-activity-state' import type { Repo } from '../../../../../../shared/repo-types' import type { WorktreeLineage } from '../../../../../../shared/worktree/lineage-types' diff --git a/src/renderer/src/components/skills/SkillFreshnessStatusPill.tsx b/src/renderer/src/components/skills/SkillFreshnessStatusPill.tsx index e879f4dd335..c773de28661 100644 --- a/src/renderer/src/components/skills/SkillFreshnessStatusPill.tsx +++ b/src/renderer/src/components/skills/SkillFreshnessStatusPill.tsx @@ -14,7 +14,7 @@ import { hasSkillCopyNeedingAttention, skillPlanHasDetails, type SkillFreshnessDisplayStatus -} from '@/lib/skill-freshness-display-status' +} from '@/lib/skills/presentation/skill-freshness-display-status' import { requestSkillFreshnessUpdateDialog } from './skill-freshness-update-dialog' function statusPill( diff --git a/src/renderer/src/components/skills/setup/AgentSkillSetupPanel.tsx b/src/renderer/src/components/skills/setup/AgentSkillSetupPanel.tsx index 971d85c262c..d3ae1396723 100644 --- a/src/renderer/src/components/skills/setup/AgentSkillSetupPanel.tsx +++ b/src/renderer/src/components/skills/setup/AgentSkillSetupPanel.tsx @@ -1,6 +1,6 @@ import { bundledSkillSetupActionLabel } from './bundled-skill-setup-copy' import { useActiveProjectSkillRuntime } from '@/hooks/useActiveProjectSkillRuntime' -import { buildAgentFeatureSkillInstallCommand } from '@/lib/agent-feature-install-commands' +import { buildAgentFeatureSkillInstallCommand } from '@/lib/skills/installation/agent-feature-install-commands' import { buildSkillCommandForRuntime } from '../../../lib/skill-runtime-command' import { WslAgentSkillSetupPanel } from './WslAgentSkillSetupPanel' import { useCallback } from 'react' diff --git a/src/renderer/src/components/skills/setup/WslAgentSkillSetupPanel.tsx b/src/renderer/src/components/skills/setup/WslAgentSkillSetupPanel.tsx index 51e2c7fe26c..dced7d29f32 100644 --- a/src/renderer/src/components/skills/setup/WslAgentSkillSetupPanel.tsx +++ b/src/renderer/src/components/skills/setup/WslAgentSkillSetupPanel.tsx @@ -15,7 +15,7 @@ import { recheckSurfacesAfterAgentSkillInstall, syncSurfacesAfterAgentSkillRecheck } from '../../../hooks/agent-skill-recheck-surface-sync' -import { isOrcaCliAvailableOnPath } from '@/lib/agent-skill-cli-prerequisite' +import { isOrcaCliAvailableOnPath } from '@/lib/skills/installation/agent-skill-cli-prerequisite' import { cn } from '@/lib/utils' import { useTranslate } from '@/i18n/use-translate' diff --git a/src/renderer/src/components/skills/setup/WslLinearAgentSkillInstallCta.tsx b/src/renderer/src/components/skills/setup/WslLinearAgentSkillInstallCta.tsx index 0c01ce50947..2b197e27e76 100644 --- a/src/renderer/src/components/skills/setup/WslLinearAgentSkillInstallCta.tsx +++ b/src/renderer/src/components/skills/setup/WslLinearAgentSkillInstallCta.tsx @@ -9,12 +9,15 @@ import { GLOBAL_AGENT_SKILL_SOURCE_KINDS, useInstalledAgentSkillNames } from '@/hooks/useInstalledAgentSkills' -import { LINEAR_AGENT_SKILL_NAMES, ORCA_LINEAR_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { + LINEAR_AGENT_SKILL_NAMES, + ORCA_LINEAR_SKILL_NAME +} from '@/lib/skills/installation/agent-feature-skill-names' import { ORCA_LINEAR_SKILL_INSTALL_COMMAND, buildAgentFeatureSkillInstallCommand -} from '@/lib/agent-feature-install-commands' -import { getLinearAgentSkillUpdateTarget } from '@/lib/linear-agent-skill-update-target' +} from '@/lib/skills/installation/agent-feature-install-commands' +import { getLinearAgentSkillUpdateTarget } from '@/lib/skills/installation/linear-agent-skill-update-target' import { cn } from '@/lib/utils' import { getLinearAgentSkillSetupInlineRuntimeCopy } from '../../sidebar/linear-agent-skill-setup-copy' diff --git a/src/renderer/src/components/skills/setup/linear-agent-skill-install-cta.tsx b/src/renderer/src/components/skills/setup/linear-agent-skill-install-cta.tsx index 0351fec3ed8..c65ab31085d 100644 --- a/src/renderer/src/components/skills/setup/linear-agent-skill-install-cta.tsx +++ b/src/renderer/src/components/skills/setup/linear-agent-skill-install-cta.tsx @@ -15,8 +15,11 @@ import { bundledSkillInstallNeedsAttention, useBundledSkillInstall } from '@/hooks/use-bundled-skill-install' -import { LINEAR_AGENT_SKILL_NAMES, ORCA_LINEAR_SKILL_NAME } from '@/lib/agent-feature-skill-names' -import { getLinearAgentSkillUpdateTarget } from '@/lib/linear-agent-skill-update-target' +import { + LINEAR_AGENT_SKILL_NAMES, + ORCA_LINEAR_SKILL_NAME +} from '@/lib/skills/installation/agent-feature-skill-names' +import { getLinearAgentSkillUpdateTarget } from '@/lib/skills/installation/linear-agent-skill-update-target' import { cn } from '@/lib/utils' import { getLinearAgentSkillSetupInlineRuntimeCopy } from '../../sidebar/linear-agent-skill-setup-copy' import type { LinearAgentSkillPromptSettings } from '../../sidebar/linear-agent-skill-runtime' diff --git a/src/renderer/src/components/stats/StatsPane.tsx b/src/renderer/src/components/stats/StatsPane.tsx index aec97843477..55d79b17e64 100644 --- a/src/renderer/src/components/stats/StatsPane.tsx +++ b/src/renderer/src/components/stats/StatsPane.tsx @@ -15,7 +15,7 @@ import { DropdownMenuItem, DropdownMenuTrigger } from '../ui/dropdown-menu' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { getIntlLocale, translate } from '@/i18n/i18n' import { useIntlLocale, useTranslate, type Translate } from '@/i18n/use-translate' export { getStatsPaneSearchEntries } from './stats-search' diff --git a/src/renderer/src/components/status-bar/StatusBarUsageEmptyCta.tsx b/src/renderer/src/components/status-bar/StatusBarUsageEmptyCta.tsx index 1e2cb49d1c0..782fea7c99e 100644 --- a/src/renderer/src/components/status-bar/StatusBarUsageEmptyCta.tsx +++ b/src/renderer/src/components/status-bar/StatusBarUsageEmptyCta.tsx @@ -3,7 +3,7 @@ import { BarChart3 } from 'lucide-react' import { Button } from '@/components/ui/button' import { EyeOffDismissButton } from '@/components/dismiss/EyeOffDismissButton' import { HoverCard, HoverCardContent, HoverCardTrigger } from '@/components/ui/hover-card' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { useAppStore } from '../../store' import { ClaudeIcon, GeminiIcon, OpenAIIcon, OpenCodeGoIcon } from './icons' import { useTranslate } from '@/i18n/use-translate' diff --git a/src/renderer/src/components/status-bar/StatusBarVisibilityMenu.tsx b/src/renderer/src/components/status-bar/StatusBarVisibilityMenu.tsx index 1deff4c914f..45f619e118d 100644 --- a/src/renderer/src/components/status-bar/StatusBarVisibilityMenu.tsx +++ b/src/renderer/src/components/status-bar/StatusBarVisibilityMenu.tsx @@ -6,7 +6,7 @@ import { DropdownMenuContent, DropdownMenuTrigger } from '@/components/ui/dropdown-menu' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { ClaudeIcon, GeminiIcon, MiniMaxIcon, OpenAIIcon, OpenCodeGoIcon } from './icons' import { useTranslate } from '@/i18n/use-translate' import { isStatusBarItemAvailable } from './status-bar-agent-gating' diff --git a/src/renderer/src/components/status-bar/provider-segment-monthly-window.test.tsx b/src/renderer/src/components/status-bar/provider-segment-monthly-window.test.tsx index 5574989a0c1..641182d1d89 100644 --- a/src/renderer/src/components/status-bar/provider-segment-monthly-window.test.tsx +++ b/src/renderer/src/components/status-bar/provider-segment-monthly-window.test.tsx @@ -13,7 +13,7 @@ vi.mock('@/i18n/i18n', () => ({ } })) -vi.mock('@/lib/agent-catalog', () => ({ +vi.mock('@/components/agent/icons/AgentIcon', () => ({ AgentIcon: () => null })) diff --git a/src/renderer/src/components/status-bar/status-bar-pool-countdown.test.tsx b/src/renderer/src/components/status-bar/status-bar-pool-countdown.test.tsx index 78b493a107e..c7bb483dbe7 100644 --- a/src/renderer/src/components/status-bar/status-bar-pool-countdown.test.tsx +++ b/src/renderer/src/components/status-bar/status-bar-pool-countdown.test.tsx @@ -13,7 +13,9 @@ vi.mock('@/i18n/i18n', () => ({ fallback ) })) -vi.mock('@/lib/agent-catalog', () => ({ AgentIcon: () => null })) +vi.mock('@/components/agent/icons/AgentIcon', () => ({ + AgentIcon: () => null +})) const START = Date.UTC(2026, 9, 8, 12) const MINUTE = 60_000 diff --git a/src/renderer/src/components/status-bar/tooltip.tsx b/src/renderer/src/components/status-bar/tooltip.tsx index 22e5018ab73..b2a741d02ba 100644 --- a/src/renderer/src/components/status-bar/tooltip.tsx +++ b/src/renderer/src/components/status-bar/tooltip.tsx @@ -3,7 +3,7 @@ import { formatResetCountdown, formatResetDuration } from '../../../../shared/rate-limit-reset-format' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { ClaudeIcon, GeminiIcon, MiniMaxIcon, OpenAIIcon, OpenCodeGoIcon } from './icons' import { translate } from '@/i18n/i18n' import { useTranslate } from '@/i18n/use-translate' diff --git a/src/renderer/src/components/status-bar/usage-pool-label.test.ts b/src/renderer/src/components/status-bar/usage-pool-label.test.ts index 0028e5ea023..52c4b8856c5 100644 --- a/src/renderer/src/components/status-bar/usage-pool-label.test.ts +++ b/src/renderer/src/components/status-bar/usage-pool-label.test.ts @@ -14,7 +14,9 @@ vi.mock('@/i18n/i18n', () => ({ fallback ) })) -vi.mock('@/lib/agent-catalog', () => ({ AgentIcon: () => null })) +vi.mock('@/components/agent/icons/AgentIcon', () => ({ + AgentIcon: () => null +})) vi.mock('@/hooks/useResetCountdownClock', () => ({ useResetCountdownClock: () => 0 })) vi.mock('@/components/ui/dropdown-menu', () => ({ DropdownMenuItem: () => null })) vi.mock('@/components/settings/form-controls/SettingsFormControls', () => ({ diff --git a/src/renderer/src/components/status-bar/use-workspace-space-decision-projection.ts b/src/renderer/src/components/status-bar/use-workspace-space-decision-projection.ts index a66dcd2bf11..e7fcc587015 100644 --- a/src/renderer/src/components/status-bar/use-workspace-space-decision-projection.ts +++ b/src/renderer/src/components/status-bar/use-workspace-space-decision-projection.ts @@ -1,6 +1,6 @@ import { useCallback, useMemo } from 'react' import { groupWorkspaceSpaceDecisionInputs } from './workspace-space-decision-inputs' -import { getAgentStatusEpochNow } from '@/lib/agent-status-epoch-clock' +import { getAgentStatusEpochNow } from '@/lib/agent-status/evidence/agent-status-epoch-clock' import { getWorkspaceDecisionDetails, type WorkspaceDecisionDetails diff --git a/src/renderer/src/components/status-bar/workspace-space-presentation.ts b/src/renderer/src/components/status-bar/workspace-space-presentation.ts index 72dad17b787..f8ac72c1bb1 100644 --- a/src/renderer/src/components/status-bar/workspace-space-presentation.ts +++ b/src/renderer/src/components/status-bar/workspace-space-presentation.ts @@ -1,6 +1,10 @@ -import { classifyTitleActivity, isExplicitAgentStatusFresh } from '@/lib/pane-agent-evidence' +import { detectAgentStatusFromTitle } from '../../../../shared/agent-status/title/agent-title-status' +import { + isAgentStatusFresh, + AGENT_STATUS_STALE_AFTER_MS +} from '../../../../shared/agent-status/contracts/agent-status-freshness' import { tabHasLivePty } from '../../../../shared/tab-has-live-pty' -import { AGENT_STATUS_STALE_AFTER_MS } from '../../../../shared/agent-status/contracts/agent-status-freshness' + import type { AgentStatusEntry } from '../../../../shared/agent-status/contracts/agent-status-types' import type { MigrationUnsupportedPtyEntry } from '../../../../shared/agent-status/contracts/agent-status-ipc-payload' import { parsePaneKey } from '../../../../shared/workspace-layout/stable-pane-id' @@ -80,12 +84,12 @@ function countTitleActiveAgentsForTab( const paneTitles = runtimePaneTitlesByTabId[tab.id] if (paneTitles && Object.keys(paneTitles).length > 0) { return Object.values(paneTitles).filter((title) => { - const status = classifyTitleActivity(title) + const status = detectAgentStatusFromTitle(title) return status === 'working' || status === 'permission' }).length } - const status = classifyTitleActivity(tab.title) + const status = detectAgentStatusFromTitle(tab.title) return status === 'working' || status === 'permission' ? 1 : 0 } @@ -106,7 +110,7 @@ export function countWorkspaceSpaceActiveAgents({ if (!isActiveAgentState(entry)) { continue } - if (!isExplicitAgentStatusFresh(entry, now, AGENT_STATUS_STALE_AFTER_MS)) { + if (!isAgentStatusFresh(entry, now, AGENT_STATUS_STALE_AFTER_MS)) { continue } const tabId = getPaneKeyTabId(entry.paneKey || paneKey) diff --git a/src/renderer/src/components/tab-bar/QuickLaunchButton.tsx b/src/renderer/src/components/tab-bar/QuickLaunchButton.tsx index 75f872d915a..a99202ec1f2 100644 --- a/src/renderer/src/components/tab-bar/QuickLaunchButton.tsx +++ b/src/renderer/src/components/tab-bar/QuickLaunchButton.tsx @@ -14,7 +14,7 @@ import { launchAgentInNewTab } from '@/lib/agent-session/launch/new-tab/launch-a import { newAgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agent-launch-request-id' import { captureNativeChatComposerFocusIntent } from '@/components/native-chat/composer/focus/native-chat-composer-focus-intent' import { agentLaunchPromptOwnership, newAgentPromptOutcome } from '@/lib/new-agent-prompt-outcome' -import { activeAgentNotesSendFailureMessage } from '@/lib/active-agent-note-send-result' +import { activeAgentNotesSendFailureMessage } from '@/lib/agent-session/messaging/terminal/active-agent-note-send-result' import { AgentSettingsMenuItem } from '@/components/agent/AgentSettingsMenuItem' import { TabAgentSurfaceChoiceRow } from './TabAgentSurfaceChoiceRow' import { @@ -22,7 +22,8 @@ import { DropdownMenuSeparator, DropdownMenuShortcut } from '@/components/ui/dropdown-menu' -import { getAgentCatalog, AgentIcon } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { useOptionalShortcutLabel } from '@/hooks/useShortcutLabel' import { useAgentMenuShortcutLabels } from './agent-menu-shortcut-labels' import type { AgentPickerInventorySource } from '../agent/use-agent-launch-picker-inventory' diff --git a/src/renderer/src/components/tab-bar/SortableTab.tsx b/src/renderer/src/components/tab-bar/SortableTab.tsx index 75ed642f9ba..e0a86fb3ddd 100644 --- a/src/renderer/src/components/tab-bar/SortableTab.tsx +++ b/src/renderer/src/components/tab-bar/SortableTab.tsx @@ -3,7 +3,7 @@ import { useCallback, useEffect } from 'react' import { useSortable } from '@dnd-kit/sortable' import { X, Minimize2, Pin } from 'lucide-react' import { stripLeadingAgentTitleDecoration } from '../../../../shared/agent-status/title/agent-title-decoration' -import { getAgentLabel } from '@/lib/agent-catalog' +import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog' import { basename } from '@/lib/path' import { Input } from '@/components/ui/input' import { TabHoverCard } from './TabHoverCard' diff --git a/src/renderer/src/components/tab-bar/TabBarCreateEntryRow.tsx b/src/renderer/src/components/tab-bar/TabBarCreateEntryRow.tsx index 8d42dd4a39e..31305c1f9ab 100644 --- a/src/renderer/src/components/tab-bar/TabBarCreateEntryRow.tsx +++ b/src/renderer/src/components/tab-bar/TabBarCreateEntryRow.tsx @@ -12,7 +12,7 @@ import { Smartphone, TerminalSquare } from 'lucide-react' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { PluginContributionIcon } from '../plugins/PluginContributionIcon' import { cn } from '@/lib/utils' import { FilePathCursorTooltip, FilenameFirstPath } from '@/components/file-path-cursor-tooltip' diff --git a/src/renderer/src/components/tab-bar/TabBarQuickCommandItem.test.tsx b/src/renderer/src/components/tab-bar/TabBarQuickCommandItem.test.tsx index bb3f0ea05ba..350a8d3a7e9 100644 --- a/src/renderer/src/components/tab-bar/TabBarQuickCommandItem.test.tsx +++ b/src/renderer/src/components/tab-bar/TabBarQuickCommandItem.test.tsx @@ -22,8 +22,10 @@ vi.mock('@/i18n/i18n', () => ({ } })) -vi.mock('@/lib/agent-catalog', () => ({ - AgentIcon: () => null, +vi.mock('@/components/agent/icons/AgentIcon', () => ({ + AgentIcon: () => null +})) +vi.mock('@/lib/agent-catalog/agent-catalog', () => ({ getAgentLabel: (agent: string) => agent })) diff --git a/src/renderer/src/components/tab-bar/TabBarQuickCommandItem.tsx b/src/renderer/src/components/tab-bar/TabBarQuickCommandItem.tsx index 42f91ef9ea7..34dbd47a878 100644 --- a/src/renderer/src/components/tab-bar/TabBarQuickCommandItem.tsx +++ b/src/renderer/src/components/tab-bar/TabBarQuickCommandItem.tsx @@ -4,7 +4,8 @@ import { getTerminalQuickCommandBody, isTerminalAgentQuickCommand } from '../../../../shared/terminal/quick-commands/terminal-quick-commands' -import { AgentIcon, getAgentLabel } from '@/lib/agent-catalog' +import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { useTranslate } from '@/i18n/use-translate' import { useClipboardTextCopyFeedback } from '@/hooks/use-clipboard-text-copy-feedback' import type { HostedTerminalQuickCommand } from '@/hooks/use-terminal-quick-command-hosts' diff --git a/src/renderer/src/components/tab-bar/TabBarQuickCommandsMenu.tsx b/src/renderer/src/components/tab-bar/TabBarQuickCommandsMenu.tsx index c1f5d6a89dd..4f097749ad7 100644 --- a/src/renderer/src/components/tab-bar/TabBarQuickCommandsMenu.tsx +++ b/src/renderer/src/components/tab-bar/TabBarQuickCommandsMenu.tsx @@ -13,7 +13,7 @@ import { getTerminalQuickCommandBody, isTerminalAgentQuickCommand } from '../../../../shared/terminal/quick-commands/terminal-quick-commands' -import { getAgentLabel } from '@/lib/agent-catalog' +import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog' import { TabBarQuickCommandItem } from './TabBarQuickCommandItem' import { cn } from '@/lib/utils' import { useTranslate } from '@/i18n/use-translate' diff --git a/src/renderer/src/components/tab-bar/TabBarQuickCommandsMenu.virtualization.test.tsx b/src/renderer/src/components/tab-bar/TabBarQuickCommandsMenu.virtualization.test.tsx index 1f40fe9a519..b7c4bd696cd 100644 --- a/src/renderer/src/components/tab-bar/TabBarQuickCommandsMenu.virtualization.test.tsx +++ b/src/renderer/src/components/tab-bar/TabBarQuickCommandsMenu.virtualization.test.tsx @@ -10,8 +10,10 @@ vi.mock('@/hooks/useShortcutLabel', () => ({ useShortcutKeyComboDetails: () => [ vi.mock('./tab-bar-quick-commands-shortcut', () => ({ useTabBarQuickCommandsShortcut: () => undefined })) -vi.mock('@/lib/agent-catalog', () => ({ - AgentIcon: () => null, +vi.mock('@/components/agent/icons/AgentIcon', () => ({ + AgentIcon: () => null +})) +vi.mock('@/lib/agent-catalog/agent-catalog', () => ({ getAgentLabel: (agent: string) => agent })) vi.mock('@/i18n/i18n', () => ({ diff --git a/src/renderer/src/components/tab-bar/TabDragPreview.tsx b/src/renderer/src/components/tab-bar/TabDragPreview.tsx index a975957bdbf..023134f7001 100644 --- a/src/renderer/src/components/tab-bar/TabDragPreview.tsx +++ b/src/renderer/src/components/tab-bar/TabDragPreview.tsx @@ -1,7 +1,7 @@ import { createElement } from 'react' import { Globe, Terminal as TerminalIcon } from 'lucide-react' import { FileTypeIcon } from '@/components/FileTypeIcon' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import type { TabDragItemData } from '../tab-group/useTabDragSplit' // Match the resting tab’s agent identity in the drag overlay. diff --git a/src/renderer/src/components/tab-bar/TerminalTabLeadingIcon.tsx b/src/renderer/src/components/tab-bar/TerminalTabLeadingIcon.tsx index d976d5416a7..3666cdbbd59 100644 --- a/src/renderer/src/components/tab-bar/TerminalTabLeadingIcon.tsx +++ b/src/renderer/src/components/tab-bar/TerminalTabLeadingIcon.tsx @@ -1,5 +1,5 @@ import { AgentStateDot } from '@/components/AgentStateDot' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { cn } from '@/lib/utils' import type { TerminalTab } from '../../../../shared/workspace-layout/terminal-tab-types' import type { TerminalAgent } from '../../../../shared/agent-status/identity/terminal-agent' diff --git a/src/renderer/src/components/tab-bar/native-chat-tab-agent-evidence.ts b/src/renderer/src/components/tab-bar/native-chat-tab-agent-evidence.ts index 4557431073f..74029c20348 100644 --- a/src/renderer/src/components/tab-bar/native-chat-tab-agent-evidence.ts +++ b/src/renderer/src/components/tab-bar/native-chat-tab-agent-evidence.ts @@ -2,7 +2,7 @@ import type { Tab } from '../../../../shared/tab-types' import type { TerminalTab } from '../../../../shared/workspace-layout/terminal-tab-types' import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent' import { isTuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent-config' -import { resolveCommittedTitleAgentType } from '@/lib/pane-agent-evidence' +import { resolveExplicitTerminalTitleAgentType } from '../../../../shared/agent-status/title/terminal-title-agent-type' /** Resolve durable tab metadata used before a live pane status arrives. */ export function resolveNativeChatTabAgentEvidence( @@ -10,8 +10,8 @@ export function resolveNativeChatTabAgentEvidence( unifiedTab?: Pick ): TuiAgent | null { const agent = - resolveCommittedTitleAgentType(unifiedTab?.label ?? '') ?? - resolveCommittedTitleAgentType(tab.title) ?? + resolveExplicitTerminalTitleAgentType(unifiedTab?.label ?? '') ?? + resolveExplicitTerminalTitleAgentType(tab.title) ?? unifiedTab?.aiVaultTitle?.agent ?? tab.aiVaultTitle?.agent ?? null diff --git a/src/renderer/src/components/tab-bar/tab-agent-launch-options.ts b/src/renderer/src/components/tab-bar/tab-agent-launch-options.ts index 9cfa21c8eca..98a233b28ca 100644 --- a/src/renderer/src/components/tab-bar/tab-agent-launch-options.ts +++ b/src/renderer/src/components/tab-bar/tab-agent-launch-options.ts @@ -6,7 +6,7 @@ import type { } from '../../../../shared/agent-launch/picker/agent-launch-picker' import type { AgentPickerSetupIdentity } from '../agent/agent-launch-picker-drafts' import { rowLabel, rowId, chatUnavailableLabel } from './tab-agent-row-presentation' -import { getAgentCatalog } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' import { orderAgentLaunchPickerAgents, type NewTabAgentMenuRow diff --git a/src/renderer/src/components/tab-bar/tab-agent-row-presentation.ts b/src/renderer/src/components/tab-bar/tab-agent-row-presentation.ts index 812f66be86d..e7366e91edc 100644 --- a/src/renderer/src/components/tab-bar/tab-agent-row-presentation.ts +++ b/src/renderer/src/components/tab-bar/tab-agent-row-presentation.ts @@ -1,6 +1,6 @@ import { translate } from '@/i18n/i18n' import type { Translate } from '@/i18n/use-translate' -import { getAgentCatalog } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' import type { ChatUnavailableReason, NewTabAgentMenuRow diff --git a/src/renderer/src/components/tab-bar/terminal-tab-activity-status.ts b/src/renderer/src/components/tab-bar/terminal-tab-activity-status.ts index eb103a60cc3..0f260688996 100644 --- a/src/renderer/src/components/tab-bar/terminal-tab-activity-status.ts +++ b/src/renderer/src/components/tab-bar/terminal-tab-activity-status.ts @@ -2,9 +2,12 @@ import { readAgentAttentionUnreadReason, type ReadableAgentAttentionUnread } from '@/attention/agent-attention-contract' -import { isExplicitAgentStatusFresh } from '@/lib/pane-agent-evidence' +import { + isAgentStatusFresh, + AGENT_STATUS_STALE_AFTER_MS +} from '../../../../shared/agent-status/contracts/agent-status-freshness' import { resolveWorktreeStatus, type WorktreeStatus } from '@/lib/worktree-status' -import { AGENT_STATUS_STALE_AFTER_MS } from '../../../../shared/agent-status/contracts/agent-status-freshness' + import type { AgentStatusEntry } from '../../../../shared/agent-status/contracts/agent-status-types' import { agentVerdictDisplayMark } from '../../../../shared/agent-status/lifecycle/agent-main-agent-verdict' import { resolveProgramStatusPresentation } from '../../../../shared/program-status/presentation' @@ -71,7 +74,7 @@ export function getTerminalTabActivityFlags( continue } // Apply sidebar freshness rules so abandoned/slept panes cannot keep tab spinners alive. - if (!isExplicitAgentStatusFresh(entry, now, AGENT_STATUS_STALE_AFTER_MS)) { + if (!isAgentStatusFresh(entry, now, AGENT_STATUS_STALE_AFTER_MS)) { // Stale identity suppresses Orca's one-shot permission label without suppressing native titles. getOrCreateTerminalTabActivityFlags(flagsByTabId, identity.tabId).stalePaneIds.add( identity.paneId diff --git a/src/renderer/src/components/tab-bar/use-new-tab-agent-menu-rows-owner.test.tsx b/src/renderer/src/components/tab-bar/use-new-tab-agent-menu-rows-owner.test.tsx index 0ded459a3da..e7df911e774 100644 --- a/src/renderer/src/components/tab-bar/use-new-tab-agent-menu-rows-owner.test.tsx +++ b/src/renderer/src/components/tab-bar/use-new-tab-agent-menu-rows-owner.test.tsx @@ -3,7 +3,7 @@ import { act, cleanup, render, renderHook, screen } from '@testing-library/react' import AgentCombobox from '@/components/agent/AgentCombobox' import { TooltipProvider } from '@/components/ui/tooltip' -import { AGENT_CATALOG } from '@/lib/agent-catalog' +import { AGENT_CATALOG } from '@/lib/agent-catalog/agent-catalog' import { afterEach, expect, it, vi } from 'vitest' import { useAppStore } from '@/store' diff --git a/src/renderer/src/components/tab-bar/use-new-tab-agent-menu-rows.ts b/src/renderer/src/components/tab-bar/use-new-tab-agent-menu-rows.ts index e7b5147ad50..2036f5abbe8 100644 --- a/src/renderer/src/components/tab-bar/use-new-tab-agent-menu-rows.ts +++ b/src/renderer/src/components/tab-bar/use-new-tab-agent-menu-rows.ts @@ -19,7 +19,7 @@ import { isTuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent-co import { useAgentPickerRefusedWake } from './use-agent-picker-refused-wake' import { buildAgentLaunchRouteInput } from '@/lib/agent-session/launch/routing/agent-launch-route-input' import { workspaceKindForWorktreeId } from '../../../../shared/agent-launch/contracts/workspace-launch-kind' -import { useHostStructuredAgentsVersion } from '@/lib/chat-provider-agents' +import { useHostStructuredAgentsVersion } from '@/runtime/native-chat/agent-catalogs/chat-provider-agents' import { structuredAgentSessionTargetForHost } from '@/runtime/native-chat/session-ownership/structured-agent-session-owner' import { readHostStructuredAgents, @@ -30,16 +30,16 @@ import { buildNewTabAgentMenuRows, type HostChatAnswer } from '../../../../shared/agent-launch/picker/agent-launch-picker-rows' -import { hostChatAnswer } from '@/lib/new-tab-agent-menu-rows' +import { hostChatAnswer } from '@/lib/agent-session/launch/routing/new-tab-agent-menu-rows' import { readLocalRuntimeCapabilityObservation, subscribeLocalRuntimeCapabilityObservation } from '@/runtime/hosts/capabilities/local-runtime-capabilities' import { useDetectedAgents, type AgentDetectionTarget } from '@/hooks/useDetectedAgents' -import { readDetectedAgentsForTarget } from '@/lib/agent-detection-target-inventory' +import { readDetectedAgentsForTarget } from '@/lib/agent-session/launch/inventory/agent-detection-target-inventory' import { useChatProgramFacts } from '@/lib/host-chat-program-acquisition' import { readChatProgram } from '@/lib/host-chat-program' -import { resolveAgentMenuSelection } from '@/lib/agent-menu-selection' +import { resolveAgentMenuSelection } from '@/lib/agent-session/launch/routing/agent-menu-selection' import { useHostAgentMenuSettings } from '@/runtime/agent-launch-settings/use-host-agent-launch-preferences' import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent' import type { AgentLaunchSurface } from '@/lib/agent-session/launch/routing/agent-session-launch-plan' diff --git a/src/renderer/src/components/tab-group/SplitPaneLandingAgentRow.tsx b/src/renderer/src/components/tab-group/SplitPaneLandingAgentRow.tsx index 0ed980ad35c..5f3be9f4759 100644 --- a/src/renderer/src/components/tab-group/SplitPaneLandingAgentRow.tsx +++ b/src/renderer/src/components/tab-group/SplitPaneLandingAgentRow.tsx @@ -3,9 +3,10 @@ import { useAppStore } from '../../store' import { useShortcutKeyDetails } from '@/hooks/useShortcutLabel' import { useTranslate } from '@/i18n/use-translate' import { cn } from '@/lib/utils' -import { AgentIcon, getAgentCatalog } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { focusTerminalTabSurface } from '@/lib/focus-terminal-tab-surface' -import { getDetectionTargetIdentityForWorktree } from '@/lib/agent-detection-target-inventory' +import { getDetectionTargetIdentityForWorktree } from '@/lib/agent-session/launch/inventory/agent-detection-target-inventory' import { DropdownMenu, DropdownMenuContent, diff --git a/src/renderer/src/components/tab-group/tab-moves-drawn-from-frames.test.ts b/src/renderer/src/components/tab-group/tab-moves-drawn-from-frames.test.ts index ea2c17b4802..84d351f3fe8 100644 --- a/src/renderer/src/components/tab-group/tab-moves-drawn-from-frames.test.ts +++ b/src/renderer/src/components/tab-group/tab-moves-drawn-from-frames.test.ts @@ -1,7 +1,7 @@ // Exercise main-owned moves through the real frame transport and its full-build parity check. import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { useAppStore } from '@/store' import { localDesktopSession } from '../../../../shared/workspace-layout/workspace-layout-profile.test-fixture' import { GIT_KEY } from '../../../../shared/workspace-layout/workspace-layout-session.test-fixture' @@ -35,7 +35,7 @@ vi.mock( }) ) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/components/terminal-agent-tab-shortcut.ts b/src/renderer/src/components/terminal-agent-tab-shortcut.ts index 73d4022cdfa..cd63dc8e7ec 100644 --- a/src/renderer/src/components/terminal-agent-tab-shortcut.ts +++ b/src/renderer/src/components/terminal-agent-tab-shortcut.ts @@ -2,13 +2,13 @@ import type { KeybindingActionId, KeybindingOverrides } from '../../../shared/ke import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' import { useAppStore } from '../store' import type { AppState } from '../store/types' -import { readDetectedAgentsForWorktree } from '@/lib/agent-detection-target-inventory' +import { readDetectedAgentsForWorktree } from '@/lib/agent-session/launch/inventory/agent-detection-target-inventory' import { readAgentLaunchPreferencesForWorktree } from '@/runtime/agent-launch-settings/use-host-agent-launch-preferences' import { listBoundAgentTabActions, resolveDefaultAgentForNewTab, resolveDefaultAgentForWorktreeNewTab -} from '@/lib/agent-tab-shortcuts' +} from '@/lib/agent-session/launch/shortcuts/agent-tab-shortcuts' import { chosenAgentChatUnlearned } from '@/lib/host-chat-program' import { worktreeLaunchWorkspace } from '@/lib/agent-session/launch/routing/agent-launch-route-input' diff --git a/src/renderer/src/lib/agent-idle-edge.ts b/src/renderer/src/components/terminal-pane/agent-status/agent-idle-edge.ts similarity index 56% rename from src/renderer/src/lib/agent-idle-edge.ts rename to src/renderer/src/components/terminal-pane/agent-status/agent-idle-edge.ts index e5e2c1dc0f5..bcdf8ccec83 100644 --- a/src/renderer/src/lib/agent-idle-edge.ts +++ b/src/renderer/src/components/terminal-pane/agent-status/agent-idle-edge.ts @@ -1,7 +1,7 @@ -import { detectAgentStatusFromTitle } from '../../../shared/agent-status/title/agent-title-status' -import { isClaudeAgent } from '../../../shared/agent-status/title/agent-title-identity' -import type { AgentStatusEntry } from '../../../shared/agent-status/contracts/agent-status-types' -import type { AgentIdleEdgeMeta } from '../../../shared/terminal/output/terminal-output-side-effects' +import { detectAgentStatusFromTitle } from '../../../../../shared/agent-status/title/agent-title-status' +import { isClaudeAgent } from '../../../../../shared/agent-status/title/agent-title-identity' +import type { AgentStatusEntry } from '../../../../../shared/agent-status/contracts/agent-status-types' +import type { AgentIdleEdgeMeta } from '../../../../../shared/terminal/output/terminal-output-side-effects' /** Claude owns the edge: its title says so, or its status row does once the title drops its glyph. */ export function isClaudeIdleEdge(title: string, entry: AgentStatusEntry | undefined): boolean { diff --git a/src/renderer/src/components/terminal-pane/clipboard/terminal-agent-session-context-copy.ts b/src/renderer/src/components/terminal-pane/clipboard/terminal-agent-session-context-copy.ts index c10cc336d6c..b245ac50a31 100644 --- a/src/renderer/src/components/terminal-pane/clipboard/terminal-agent-session-context-copy.ts +++ b/src/renderer/src/components/terminal-pane/clipboard/terminal-agent-session-context-copy.ts @@ -1,5 +1,5 @@ import type { ManagedPane } from '../../../lib/pane-manager/pane-manager-types' -import { copyAgentSessionContext } from '../../../lib/copy-agent-session-context' +import { copyAgentSessionContext } from '../../../lib/agent-session/context/copy-agent-session-context' import { translate } from '../../../i18n/i18n' // Standalone Copy Context omits the dialog’s fork instructions so it can be pasted into another tool. diff --git a/src/renderer/src/components/terminal-pane/context-menu/terminal-pane-context-menu-types.ts b/src/renderer/src/components/terminal-pane/context-menu/terminal-pane-context-menu-types.ts index d0c2b63b195..76b5723bb54 100644 --- a/src/renderer/src/components/terminal-pane/context-menu/terminal-pane-context-menu-types.ts +++ b/src/renderer/src/components/terminal-pane/context-menu/terminal-pane-context-menu-types.ts @@ -3,7 +3,7 @@ import type { PaneManager } from '@/lib/pane-manager/pane-manager' import type { PtyTransport } from '../pty-transport/pty-transport-types' import type { PaneCwdMap } from '../layout/split/resolve-split-cwd' import type { PreparedAgentSessionFork } from '../session-fork/terminal-agent-session-fork' -import type { AgentSessionContinuationRequest } from '@/lib/agent-session-continuation' +import type { AgentSessionContinuationRequest } from '@/lib/agent-session/context/agent-session-continuation' export type UseTerminalPaneContextMenuDeps = { managerRef: React.RefObject diff --git a/src/renderer/src/components/terminal-pane/context-menu/terminal-pane-menu-agent-session-actions.ts b/src/renderer/src/components/terminal-pane/context-menu/terminal-pane-menu-agent-session-actions.ts index 23b8d5f9b7b..fbda92f1aed 100644 --- a/src/renderer/src/components/terminal-pane/context-menu/terminal-pane-menu-agent-session-actions.ts +++ b/src/renderer/src/components/terminal-pane/context-menu/terminal-pane-menu-agent-session-actions.ts @@ -6,7 +6,7 @@ import { type PreparedAgentSessionFork } from '../session-fork/terminal-agent-session-fork' import { prepareAgentSessionContinuationFromPane } from '../session-continuation/terminal-agent-session-continuation' -import type { AgentSessionContinuationRequest } from '@/lib/agent-session-continuation' +import type { AgentSessionContinuationRequest } from '@/lib/agent-session/context/agent-session-continuation' export type TerminalPaneMenuAgentSessionContext = { paneCwdRef: React.RefObject diff --git a/src/renderer/src/components/terminal-pane/controller/use-terminal-pane-foundation.ts b/src/renderer/src/components/terminal-pane/controller/use-terminal-pane-foundation.ts index d44d64151c4..3ffdec3cc73 100644 --- a/src/renderer/src/components/terminal-pane/controller/use-terminal-pane-foundation.ts +++ b/src/renderer/src/components/terminal-pane/controller/use-terminal-pane-foundation.ts @@ -13,7 +13,7 @@ import type { CloseTerminalDialogCopyKind } from '../layout/close/CloseTerminalD import type { TerminalLinkActionRequest } from '../links/terminal-link-action-request' import { closeLinkActionRequest as closeTerminalLinkActionRequest } from '@/components/link-actions/link-action-request' import type { PreparedAgentSessionFork } from '../session-fork/terminal-agent-session-fork' -import type { AgentSessionContinuationRequest } from '@/lib/agent-session-continuation' +import type { AgentSessionContinuationRequest } from '@/lib/agent-session/context/agent-session-continuation' import { createTerminalQuickCommandDraft } from '@/components/terminal-quick-commands/TerminalQuickCommandDialog' import { useDaemonActions } from '@/components/shared/useDaemonActions' import { useMobileOverlayTicks } from '../mobile-driver/use-mobile-overlay-ticks' diff --git a/src/renderer/src/components/terminal-pane/input/keyboard/terminal-ctrl-enter.ts b/src/renderer/src/components/terminal-pane/input/keyboard/terminal-ctrl-enter.ts index a5f171867c9..f295a48c374 100644 --- a/src/renderer/src/components/terminal-pane/input/keyboard/terminal-ctrl-enter.ts +++ b/src/renderer/src/components/terminal-pane/input/keyboard/terminal-ctrl-enter.ts @@ -2,7 +2,7 @@ import { isTuiAgent, TUI_AGENT_CONFIG } from '../../../../../../shared/agent-launch/catalog/tui-agent-config' -import { resolveCommittedTitleAgentType } from '../../../../lib/pane-agent-evidence' +import { resolveExplicitTerminalTitleAgentType } from '../../../../../../shared/agent-status/title/terminal-title-agent-type' import type { PaneForegroundAgentEntry } from '@/store/slices/agent-status/pane-foreground-agent' type CtrlEnterPaneState = { @@ -26,7 +26,7 @@ export function hasCtrlEnterCsiUAuthorityForPane( if (foreground?.routingTrusted === true) { return agentAcceptsCtrlEnterCsiU(foreground.agent) } - const titleAgent = terminalTitle ? resolveCommittedTitleAgentType(terminalTitle) : null + const titleAgent = terminalTitle ? resolveExplicitTerminalTitleAgentType(terminalTitle) : null if (foreground?.agent != null && foreground.agent !== titleAgent) { return false } diff --git a/src/renderer/src/components/terminal-pane/input/keyboard/terminal-windows-shift-enter.ts b/src/renderer/src/components/terminal-pane/input/keyboard/terminal-windows-shift-enter.ts index 6c7c7cafc05..c4792deef5b 100644 --- a/src/renderer/src/components/terminal-pane/input/keyboard/terminal-windows-shift-enter.ts +++ b/src/renderer/src/components/terminal-pane/input/keyboard/terminal-windows-shift-enter.ts @@ -3,7 +3,7 @@ import { isTuiAgent, TUI_AGENT_CONFIG } from '../../../../../../shared/agent-launch/catalog/tui-agent-config' -import { resolveCommittedTitleAgentType } from '../../../../lib/pane-agent-evidence' +import { resolveExplicitTerminalTitleAgentType } from '../../../../../../shared/agent-status/title/terminal-title-agent-type' import type { PaneForegroundAgentEntry } from '@/store/slices/agent-status/pane-foreground-agent' export type WindowsShiftEnterEncoding = 'alt-enter' | 'csi-u' @@ -58,7 +58,7 @@ export function resolveWindowsShiftEnterEncodingForPane( return encoding } // Why: strict pane-local titles recover Pi/Droid through process-scan gaps without overriding process or shell proof. - const titleAgent = resolveCommittedTitleAgentType(terminalTitle) + const titleAgent = resolveExplicitTerminalTitleAgentType(terminalTitle) // Why: pending confirmation retains the foreground identity; a stale title cannot switch agents. if ( foreground?.routingConfirmationPending === true && diff --git a/src/renderer/src/components/terminal-pane/notifications/claude-side-question-completion.test.ts b/src/renderer/src/components/terminal-pane/notifications/claude-side-question-completion.test.ts index ef4357eb019..d9e95e38930 100644 --- a/src/renderer/src/components/terminal-pane/notifications/claude-side-question-completion.test.ts +++ b/src/renderer/src/components/terminal-pane/notifications/claude-side-question-completion.test.ts @@ -169,7 +169,9 @@ describe('Claude completion banners through the real pane and hook lanes', () => dispatchNotification: (event: Parameters[1]) => dispatchTerminalNotification('wt-1', event) }) - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) await connectMockPanePty( createPane(1), diff --git a/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-byte-watcher.ts b/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-byte-watcher.ts index 7daa579d780..8f751e7d3ca 100644 --- a/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-byte-watcher.ts +++ b/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-byte-watcher.ts @@ -1,5 +1,5 @@ /** Keep mounted-pane bell/title/completion/PR-link policy active while parking unmounts TerminalPane. */ -import { isClaudeIdleEdge } from '@/lib/agent-idle-edge' +import { isClaudeIdleEdge } from '@/components/terminal-pane/agent-status/agent-idle-edge' import type { AgentIdleEdgeMeta } from '../../../../../../shared/terminal/output/terminal-output-side-effects' import { resolveTerminalNotificationOwner } from '@/attention/notification-subject-owner' import type { NotificationWorkspaceOwner } from '../../../../../../shared/notification-source' diff --git a/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-command-status.test.ts b/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-command-status.test.ts index 7a84c0f22fd..41688a997a6 100644 --- a/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-command-status.test.ts +++ b/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-command-status.test.ts @@ -40,7 +40,7 @@ vi.mock('@/store/index', () => ({ vi.mock('@/hooks/terminal-command-finished-event', () => ({ dispatchTerminalCommandFinishedEvent })) -vi.mock('@/lib/agent-status-connection-ownership', () => ({ +vi.mock('@/lib/agent-status/ownership/agent-status-connection-ownership', () => ({ resolveLiveAgentStatusConnectionRouting })) vi.mock('@/lib/workspace/ownership/connection-owner-resolution', () => ({ diff --git a/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-command-status.ts b/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-command-status.ts index 7442862a40d..1e38c1ef0fc 100644 --- a/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-command-status.ts +++ b/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-command-status.ts @@ -4,7 +4,7 @@ import { resolvePaneAgentOwner } from '../../../../../../shared/agent-status/ide import { parseAppSshPtyId } from '../../../../../../shared/ssh-pty-id' import { isShellProcess } from '../../../../../../shared/agent-status/process/shell-process-detection' import { dispatchTerminalCommandFinishedEvent } from '@/hooks/terminal-command-finished-event' -import { resolveLiveAgentStatusConnectionRouting } from '@/lib/agent-status-connection-ownership' +import { resolveLiveAgentStatusConnectionRouting } from '@/lib/agent-status/ownership/agent-status-connection-ownership' import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' import { rendererAgentStatusObservations } from '@/lib/renderer-agent-status-observations' import { isRetainedProgramResult } from '@/lib/program-status/row' diff --git a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/command-inferred-pane-agent.ts b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/command-inferred-pane-agent.ts index 3694b3ced25..7244c0755c9 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/command-inferred-pane-agent.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/command-inferred-pane-agent.ts @@ -9,7 +9,7 @@ import type { import { registerAgentHookTerminalLifecycleHandler } from '../../agent-completion/agent-hook-terminal-lifecycle' import type { AgentCompletionStatusSnapshot } from '../../agent-completion/agent-completion-coordinator-types' import { resolveCompatibleAgentTypeForOwner } from '../../../../../../shared/agent-status/title/agent-title-owner' -import { resolveCommittedTitleAgentType } from '@/lib/pane-agent-evidence' +import { resolveExplicitTerminalTitleAgentType } from '../../../../../../shared/agent-status/title/terminal-title-agent-type' import { recognizeAgentLaunchCommand } from '../../../../../../shared/agent-launch/startup/agent-command-line-intent' import type { TerminalAgent } from '../../../../../../shared/agent-status/identity/terminal-agent' import { isTuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent-config' @@ -178,7 +178,7 @@ export function installCommandInferredPaneAgent(session: ConnectPanePtySession): ) { return false } - const explicitTitleAgentType = resolveCommittedTitleAgentType(title) + const explicitTitleAgentType = resolveExplicitTerminalTitleAgentType(title) const activeHookAgentForTitle = resolveCompatibleAgentTypeForOwner( activeHookStatus?.agentType, explicitTitleAgentType diff --git a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pane-agent-status-routing.ts b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pane-agent-status-routing.ts index e9cd183431f..1d8928cf725 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pane-agent-status-routing.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pane-agent-status-routing.ts @@ -1,4 +1,4 @@ -import { resolveLiveAgentStatusConnectionRouting } from '@/lib/agent-status-connection-ownership' +import { resolveLiveAgentStatusConnectionRouting } from '@/lib/agent-status/ownership/agent-status-connection-ownership' import { useAppStore } from '@/store' import type { ConnectPanePtySession } from '../connect-pane-pty-session' diff --git a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pane-agent-title-lifecycle.ts b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pane-agent-title-lifecycle.ts index 3c7e17a71e3..12f9b0866c5 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pane-agent-title-lifecycle.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pane-agent-title-lifecycle.ts @@ -1,6 +1,9 @@ import type { ConnectPanePtySession } from '../connect-pane-pty-session' import type { AgentIdleEdgeMeta } from '../../../../../../shared/terminal/output/terminal-output-side-effects' -import { idleEdgeSettledAtRest, isClaudeIdleEdge } from '@/lib/agent-idle-edge' +import { + idleEdgeSettledAtRest, + isClaudeIdleEdge +} from '@/components/terminal-pane/agent-status/agent-idle-edge' import { useAppStore } from '@/store/index' export function installPaneAgentTitleLifecycle(session: ConnectPanePtySession): void { diff --git a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pane-title-observation.ts b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pane-title-observation.ts index 5f087507e4f..6b63d342a76 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pane-title-observation.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pane-title-observation.ts @@ -1,7 +1,7 @@ import { resolvePaneTitleDecision } from '../../titles/terminal-title-evidence' import { useAppStore } from '@/store' import { shouldSeedCacheTimerOnInitialTitle } from '../../titles/cache-timer-seeding' -import { resolveCommittedTitleAgentType } from '@/lib/pane-agent-evidence' +import { resolveExplicitTerminalTitleAgentType } from '../../../../../../shared/agent-status/title/terminal-title-agent-type' import type { ConnectPanePtySession } from '../connect-pane-pty-session' export function installPaneTitleObservation(session: ConnectPanePtySession): void { @@ -10,7 +10,7 @@ export function installPaneTitleObservation(session: ConnectPanePtySession): voi rawTitle: string, meta?: { staleWorkingTitleClear?: boolean } ): void => { - if (!meta?.staleWorkingTitleClear && resolveCommittedTitleAgentType(rawTitle)) { + if (!meta?.staleWorkingTitleClear && resolveExplicitTerminalTitleAgentType(rawTitle)) { session.paneForegroundAgentTracker.onAgentStartupObserved() } // Share owner-aware display/title/completion/GPU decisions so raw title text cannot override stronger pane identity (#7428/#7447). diff --git a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-command-code-status-inference.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-command-code-status-inference.spec.ts index 39aae49a0ae..7841d3e0d0a 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-command-code-status-inference.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-command-code-status-inference.spec.ts @@ -57,8 +57,9 @@ export function registerPtyConnectionCommandCodeStatusInferenceTests(): void { it('seeds a working status for Command Code startup prompts after spawn', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const ptyId = 'pty-command-code' const transport = createMockTransport(ptyId) transportFactoryQueue.push(transport) @@ -105,8 +106,9 @@ export function registerPtyConnectionCommandCodeStatusInferenceTests(): void { it('seeds a working status from Command Code thinking output without a startup prompt', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } const ptyId = 'pty-command-code' const transport = createMockTransport(ptyId) @@ -154,8 +156,9 @@ export function registerPtyConnectionCommandCodeStatusInferenceTests(): void { it('ignores delayed Command Code output after the leaf rebinds to another SSH host', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } const oldPtyId = toAppSshPtyId('ssh-a', 'pty-command-code') const newPtyId = toAppSshPtyId('ssh-b', 'pty-command-code') @@ -192,8 +195,9 @@ export function registerPtyConnectionCommandCodeStatusInferenceTests(): void { it('marks a Command Code no-tool turn done after the idle prompt settles', async () => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } const transport = createMockTransport('pty-command-code') transport.connect.mockImplementation( @@ -250,8 +254,9 @@ export function registerPtyConnectionCommandCodeStatusInferenceTests(): void { it('keeps Command Code working when an active repaint follows the idle prompt before settle', async () => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } const transport = createMockTransport('pty-command-code') transport.connect.mockImplementation( @@ -295,8 +300,9 @@ export function registerPtyConnectionCommandCodeStatusInferenceTests(): void { it('does not downgrade a completed Command Code turn back to working from stale TUI output', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } const transport = createMockTransport('pty-command-code') transport.connect.mockImplementation( @@ -344,8 +350,9 @@ export function registerPtyConnectionCommandCodeStatusInferenceTests(): void { it('starts a new Command Code turn after done when TUI output carries a different prompt', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } const transport = createMockTransport('pty-command-code') transport.connect.mockImplementation( diff --git a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-command-finished-cleanup.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-command-finished-cleanup.spec.ts index 127b4ef51f0..66dadacf42a 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-command-finished-cleanup.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-command-finished-cleanup.spec.ts @@ -64,8 +64,9 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void { it('keeps Droid routing visible through command-finished foreground confirmation', async () => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const getForegroundProcess = vi.mocked(window.api.pty.confirmForegroundProcess) getForegroundProcess.mockResolvedValue('droid') const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null } @@ -123,8 +124,9 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void { it('retires pane launch routing after one fresh scan confirms shell', async () => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('powershell.exe') const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null } const ptyId = 'pty-droid-confirmed-shell' @@ -177,8 +179,9 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void { ])('%s', async (_label, stoppingOnPurpose) => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('zsh') const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null } const ptyId = 'pty-sleeping-confirmed-shell' @@ -241,8 +244,9 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void { it('keeps sleeping identity when the foreground check still sees the agent', async () => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) // Why both: the pane's process monitor reads the same foreground the confirm read sees. vi.mocked(window.api.pty.getForegroundProcess).mockResolvedValue('codex') const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null } @@ -296,8 +300,9 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void { // Use an accepted row to exercise deferred-drop bookkeeping before reconcile; the no-row path returns early. vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) // Import dynamically to share pty-connection’s live registry; a static import can be a stale instance. const { createCommandFinishedStatusStore } = await import('./command-finished-status-store-test-fixture') @@ -350,8 +355,9 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void { it('does NOT reconcile when the process check could not confirm a shell', async () => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue(null) vi.mocked(window.api.agentStatus.reconcileEndedProcess).mockClear() const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null } @@ -399,8 +405,9 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void { it('disarms stale TUI modes in the emulator after a confirmed return to shell', async () => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('bash') const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null } const ptyId = 'pty-stale-mode-disarm' @@ -449,8 +456,9 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void { it('grounds xterm and the input mirror in stream order when output is still queued', async () => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const confirmRead = createDeferred() vi.mocked(window.api.pty.confirmForegroundProcess).mockReturnValue(confirmRead.promise) const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null } @@ -500,8 +508,9 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void { it('keeps armed modes while the agent still owns the foreground after a leaked 133;D', async () => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) // Why both: the pane's process monitor reads the same foreground the confirm read sees. vi.mocked(window.api.pty.getForegroundProcess).mockResolvedValue('droid') const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null } @@ -542,8 +551,9 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void { it('retires stale routing after unavailable command-finish reads without asserting shell', async () => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks12 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks12 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue(null) const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null } const ptyId = 'pty-droid-unavailable-finish' @@ -593,8 +603,9 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void { it('cancels deferred cleanup on a new command and retires identity at its later shell', async () => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks13 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks13 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('powershell.exe') const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null } const ptyId = 'pty-droid-superseded-confirmation' diff --git a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-command-finished-late-done.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-command-finished-late-done.test.ts index 5a666f3c5a8..76a14461e1c 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-command-finished-late-done.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-command-finished-late-done.test.ts @@ -64,7 +64,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -156,7 +156,9 @@ describe('command-finished drop and a Done that lands after it', () => { }> { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { createTestStore } = await import('@/store/testing/app-store-test-fixture') vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('zsh') const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null } @@ -179,7 +181,11 @@ describe('command-finished drop and a Done that lands after it', () => { await vi.advanceTimersByTimeAsync(20) await flushAsyncTicks() const realStore = createTestStore( - (await vi.importMock('@/lib/agent-status')).isClaudeAgent + ( + await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) + ).isClaudeAgent ) mockStoreState.dropAgentStatus.mockImplementation((key: string) => { delete mockStoreState.agentStatusByPaneKey[key] diff --git a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-foreground-agent-routing.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-foreground-agent-routing.spec.ts index 8a63e2f4201..30d46d366be 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-foreground-agent-routing.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-foreground-agent-routing.spec.ts @@ -68,8 +68,9 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void { it('routes a manually typed Droid only after foreground enrichment confirms it', async () => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null } const pane = createPane(1) const ptyId = 'pty-manually-typed-droid' @@ -120,8 +121,9 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void { it('confirms a manually typed Droid without OSC command boundaries', async () => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('droid') const pane = createPane(1) const ptyId = 'pty-manual-droid-no-osc' @@ -161,8 +163,9 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void { // Retry across Droid boot while early foreground reads still see its shell. vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const foregroundResults = ['bash.exe', 'bash.exe', 'droid'] vi.mocked(window.api.pty.confirmForegroundProcess).mockImplementation( async () => foregroundResults.shift() ?? 'droid' @@ -208,8 +211,9 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void { // A slow-boot miss must remain recoverable; latching shell would erase launch identity and poison later routing. vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) let foreground = 'bash.exe' // Why both: the pane's process monitor reads the same foreground the confirm read sees. vi.mocked(window.api.pty.getForegroundProcess).mockImplementation(async () => foreground) @@ -266,8 +270,9 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void { it('confirms a delayed Claude from fresh startup output after the first read window expires', async () => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) let foreground = 'sleep' vi.mocked(window.api.pty.getForegroundProcess).mockImplementation(async () => foreground) vi.mocked(window.api.pty.confirmForegroundProcess).mockImplementation(async () => foreground) @@ -307,8 +312,9 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void { it('revokes trusted Droid after accepted no-OSC exit input until shell confirmation', async () => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('cmd.exe') const pane = createPane(1) const ptyId = 'pty-droid-exit-no-osc' @@ -355,8 +361,9 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void { it('trusts Pi in a no-OSC shell and retires routing after accepted exit input', async () => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) let foreground = 'pi' vi.mocked(window.api.pty.getForegroundProcess).mockResolvedValue('pi') vi.mocked(window.api.pty.confirmForegroundProcess).mockImplementation(async () => foreground) @@ -416,8 +423,9 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void { it('never promotes typed Droid text when foreground enrichment is unavailable', async () => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) vi.mocked(window.api.pty.confirmForegroundProcess) .mockResolvedValueOnce(null) .mockRejectedValueOnce(new Error('inspection unavailable')) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-foreground-agent-sampling.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-foreground-agent-sampling.spec.ts index 6aa8ee78103..8a95f9efba1 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-foreground-agent-sampling.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-foreground-agent-sampling.spec.ts @@ -91,8 +91,9 @@ export function registerPtyConnectionForegroundAgentSamplingTests(): void { cacheKey: string }> { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const ptyId = args.ptyId ?? 'tab-pty' const tabId = args.tabId ?? `tab-${ptyId}` const hasReattachMetadata = @@ -506,8 +507,9 @@ export function registerPtyConnectionForegroundAgentSamplingTests(): void { // Why: a cached visible read has no routing authority; on a racing command boundary, trust the shell marker over stale identity. vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const getForegroundProcess = vi.mocked(window.api.pty.getForegroundProcess) getForegroundProcess.mockResolvedValue('codex') const ptyId = 'pty-reattach-idle-codex-leaked-d' @@ -555,8 +557,9 @@ export function registerPtyConnectionForegroundAgentSamplingTests(): void { it('re-confirms leaked 133;D after detach moved pane-scoped Droid identity', async () => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const getForegroundProcess = vi.mocked(window.api.pty.getForegroundProcess) getForegroundProcess.mockResolvedValue('droid') const ptyId = 'pty-detached-droid-leaked-d' diff --git a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-foreground-process-exit.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-foreground-process-exit.spec.ts index c74629b2120..79a04c20708 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-foreground-process-exit.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-foreground-process-exit.spec.ts @@ -64,8 +64,9 @@ export function registerPtyConnectionForegroundProcessExitTests(): void { deps: ReturnType }> { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const tabId = `tab-${ptyId}` const transport = createMockTransport(ptyId) transport.getPtyId.mockImplementation(() => ptyId) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-foreground-routing-confirmation.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-foreground-routing-confirmation.spec.ts index b83558fc4ab..636ac624a8f 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-foreground-routing-confirmation.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-foreground-routing-confirmation.spec.ts @@ -88,8 +88,9 @@ export function registerPtyConnectionForegroundRoutingConfirmationTests(): void cacheKey: string }> { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const ptyId = args.ptyId ?? 'tab-pty' const tabId = args.tabId ?? `tab-${ptyId}` const hasReattachMetadata = diff --git a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-process-exit-row-retire.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-process-exit-row-retire.test.ts index 7b8f34f30da..841944d4a55 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-process-exit-row-retire.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-process-exit-row-retire.test.ts @@ -72,7 +72,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -142,7 +142,9 @@ async function connectAgentPane(args: { terminal: ReturnType['terminal'] }> { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null } const transport = createMockTransport(args.ptyId) transport.connect.mockImplementation(async ({ callbacks }: { callbacks: ConnectCallbacks }) => { @@ -189,7 +191,11 @@ async function seedHookRow( // Why the real slice: the row must carry the acceptedStatusSeq a real accepted hook stamps. const { createTestStore } = await import('@/store/testing/app-store-test-fixture') const realStore = createTestStore( - (await vi.importMock('@/lib/agent-status')).isClaudeAgent + ( + await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) + ).isClaudeAgent ) realStore.getState().setAgentStatus(paneKey, { state, prompt: 'ship it', agentType }) const row = realStore.getState().agentStatusByPaneKey[paneKey] diff --git a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-typed-agent-identity.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-typed-agent-identity.spec.ts index e64386c7447..92f81eaa8f7 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-typed-agent-identity.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-typed-agent-identity.spec.ts @@ -66,8 +66,9 @@ export function registerPtyConnectionTypedAgentIdentityTests(): void { it('normalizes Pi-compatible remote runtime status to OMP after typed omp command', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) enableActiveRuntimeEnvironment() const paneKey = makePaneKey('tab-1', LEAF_1) const pane = createPane(1) @@ -110,8 +111,9 @@ export function registerPtyConnectionTypedAgentIdentityTests(): void { it('drives runtime title, tab title, and renderer policy from one title decision', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const pane = createPane(1) const transport = createMockTransport('pty-gemini') transportFactoryQueue.push(transport) @@ -141,8 +143,9 @@ export function registerPtyConnectionTypedAgentIdentityTests(): void { it('keeps GPU enabled when a pane-scoped OMP owner emits a Gemini-looking title', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const paneKey = makePaneKey('tab-1', LEAF_1) mockStoreState = { ...mockStoreState, @@ -185,8 +188,9 @@ export function registerPtyConnectionTypedAgentIdentityTests(): void { it('does not let one split pane title change another pane GPU state', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const pane1 = createPane(1) const pane2 = createPane(2) const transport1 = createMockTransport('pty-split-1') @@ -220,8 +224,9 @@ export function registerPtyConnectionTypedAgentIdentityTests(): void { it('DOM-gates a genuine Gemini split pane even when the tab launched a non-Gemini agent', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) // The shared tab.launchAgent must not veto the renderer for a sibling pane. mockStoreState = { ...mockStoreState, @@ -260,8 +265,9 @@ export function registerPtyConnectionTypedAgentIdentityTests(): void { it('DOM-gates a genuine Gemini title in a pane whose launch agent was non-Gemini', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const pane = createPane(1) const transport = createMockTransport('pty-reused-gemini') transportFactoryQueue.push(transport) @@ -288,8 +294,9 @@ export function registerPtyConnectionTypedAgentIdentityTests(): void { it('DOM-gates a genuine Gemini title when the only pane row is a done non-Gemini agent', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const paneKey = makePaneKey('tab-1', LEAF_1) mockStoreState = { ...mockStoreState, @@ -331,8 +338,9 @@ export function registerPtyConnectionTypedAgentIdentityTests(): void { it('DOM-gates a genuine Gemini title when the only pane row is a stale non-Gemini agent', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const paneKey = makePaneKey('tab-1', LEAF_1) const staleAt = Date.now() - 60 * 60 * 1000 mockStoreState = { @@ -375,8 +383,9 @@ export function registerPtyConnectionTypedAgentIdentityTests(): void { it('normalizes after shell word deletion edits a typed command to omp', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) enableActiveRuntimeEnvironment() const paneKey = makePaneKey('tab-1', LEAF_1) const pane = createPane(1) @@ -418,8 +427,9 @@ export function registerPtyConnectionTypedAgentIdentityTests(): void { it('keeps Pi-compatible remote runtime status as Pi after typed pi command', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) enableActiveRuntimeEnvironment() const paneKey = makePaneKey('tab-1', LEAF_1) const pane = createPane(1) @@ -462,8 +472,9 @@ export function registerPtyConnectionTypedAgentIdentityTests(): void { it('does not infer shell ownership from prompts typed inside an existing Pi session', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) enableActiveRuntimeEnvironment() const paneKey = makePaneKey('tab-1', LEAF_1) const now = Date.now() @@ -518,8 +529,9 @@ export function registerPtyConnectionTypedAgentIdentityTests(): void { it('does not infer shell ownership from prompts typed in a title-only Pi session', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks12 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks12 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) enableActiveRuntimeEnvironment() const paneKey = makePaneKey('tab-1', LEAF_1) mockStoreState.runtimePaneTitlesByTabId = { 'tab-1': { 1: 'Pi ready' } } @@ -563,8 +575,9 @@ export function registerPtyConnectionTypedAgentIdentityTests(): void { it('lets a new typed omp command override a stale retained done status', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks13 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks13 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) enableActiveRuntimeEnvironment() const paneKey = makePaneKey('tab-1', LEAF_1) const now = Date.now() @@ -616,8 +629,9 @@ export function registerPtyConnectionTypedAgentIdentityTests(): void { it('tracks cursor edits when inferring a typed omp command', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks14 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks14 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) enableActiveRuntimeEnvironment() const paneKey = makePaneKey('tab-1', LEAF_1) const pane = createPane(1) @@ -658,8 +672,9 @@ export function registerPtyConnectionTypedAgentIdentityTests(): void { it('tracks delete-key cursor edits when inferring a typed omp command', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks15 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks15 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) enableActiveRuntimeEnvironment() const paneKey = makePaneKey('tab-1', LEAF_1) const pane = createPane(1) @@ -699,8 +714,9 @@ export function registerPtyConnectionTypedAgentIdentityTests(): void { it('skips manual agent inference for large paste chunks', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks16 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks16 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) enableActiveRuntimeEnvironment() const paneKey = makePaneKey('tab-1', LEAF_1) const pane = createPane(1) @@ -740,8 +756,9 @@ export function registerPtyConnectionTypedAgentIdentityTests(): void { it('resumes manual agent inference when large paste input is cancelled', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks17 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks17 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) enableActiveRuntimeEnvironment() const paneKey = makePaneKey('tab-1', LEAF_1) const pane = createPane(1) @@ -783,8 +800,9 @@ export function registerPtyConnectionTypedAgentIdentityTests(): void { it('preserves typed shell ownership through same-chunk command-finished side effects', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks18 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks18 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) enableActiveRuntimeEnvironment() const paneKey = makePaneKey('tab-1', LEAF_1) const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null } diff --git a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/renderer-owned-pane-status.ts b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/renderer-owned-pane-status.ts index 59a12a94bb5..45411a1398c 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/renderer-owned-pane-status.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/renderer-owned-pane-status.ts @@ -1,5 +1,5 @@ import { useAppStore } from '@/store' -import { resolveAgentStatusTerminalTitle } from '@/lib/agent-status-terminal-title' +import { resolveAgentStatusTerminalTitle } from '@/lib/agent-status/evidence/agent-status-terminal-title' import { normalizeCompatibleAgentTitleForOwner, resolveCompatibleAgentTypeForOwner diff --git a/src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty.ts b/src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty.ts index 7a9db79d87e..eda17e99774 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty.ts @@ -19,7 +19,7 @@ import { writeTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-sch import { createTerminalStructuralReplayCoordinator } from '@/lib/pane-manager/terminal-structural-replay-coordinator' import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id' import type { AgentType } from '../../../../../shared/agent-status/contracts/agent-status-types' -import { resolveCommittedTitleAgentType } from '@/lib/pane-agent-evidence' +import { resolveExplicitTerminalTitleAgentType } from '../../../../../shared/agent-status/title/terminal-title-agent-type' import { shouldWritePtyOutputForeground } from './output/foreground-output-visibility' import { exposeE2eTerminalPtyOutputDebug } from './instrumentation/e2e-terminal-pty-harness' @@ -152,7 +152,7 @@ export function connectPanePty( title: string | undefined, agentType: AgentType | undefined ): void => { - const titleAgentType = resolveCommittedTitleAgentType(title ?? '') + const titleAgentType = resolveExplicitTerminalTitleAgentType(title ?? '') session.suppressNativeWindowsIdleCodexFocusReports = agentType && agentType !== 'unknown' ? agentType === 'codex' : titleAgentType === 'codex' } diff --git a/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-agent-idle-cursor-reset.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-agent-idle-cursor-reset.spec.ts index cbee922763a..588cab8c923 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-agent-idle-cursor-reset.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-agent-idle-cursor-reset.spec.ts @@ -61,8 +61,9 @@ export function registerPtyConnectionAgentIdleCursorResetTests(): void { it('resets renderer cursor style when an agent becomes idle', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) @@ -97,8 +98,9 @@ export function registerPtyConnectionAgentIdleCursorResetTests(): void { ) await loadFreshTerminalModules() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) @@ -182,8 +184,9 @@ export function registerPtyConnectionWindowsCompletedTurnCursorResetTests(): voi ) await loadFreshTerminalModules() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) @@ -238,8 +241,9 @@ export function registerPtyConnectionWindowsCompletedTurnCursorResetTests(): voi ) await loadFreshTerminalModules() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) @@ -298,8 +302,9 @@ export function registerPtyConnectionWindowsCompletedTurnCursorResetTests(): voi ) await loadFreshTerminalModules() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) @@ -356,8 +361,9 @@ export function registerPtyConnectionWindowsCompletedTurnCursorResetTests(): voi ) await loadFreshTerminalModules() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) @@ -455,8 +461,9 @@ export function registerPtyConnectionWindowsCursorResetDisposalTests(): void { ) await loadFreshTerminalModules() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks12 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks12 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-hidden-codex-queries.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-hidden-codex-queries.spec.ts index 0bec885d8e7..6c18925997b 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-hidden-codex-queries.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-hidden-codex-queries.spec.ts @@ -55,8 +55,9 @@ export function registerPtyConnectionHiddenCodexQueriesTests(): void { it('keeps hidden Codex redraw floods off the live xterm path', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -103,8 +104,9 @@ export function registerPtyConnectionHiddenCodexQueriesTests(): void { 'keeps hidden %s terminal query chunks on the live xterm path', async (command) => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -142,8 +144,9 @@ export function registerPtyConnectionHiddenCodexQueriesTests(): void { it('keeps only coalesced hidden Codex terminal queries on the live xterm path', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -182,8 +185,9 @@ export function registerPtyConnectionHiddenCodexQueriesTests(): void { it('answers hidden OSC color queries directly inside a mixed capability-query burst', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -227,8 +231,9 @@ export function registerPtyConnectionHiddenCodexQueriesTests(): void { it('answers adjacent hidden Codex OSC color queries directly', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -272,8 +277,9 @@ export function registerPtyConnectionHiddenCodexQueriesTests(): void { it('keeps split hidden Codex terminal queries on the live xterm path', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -315,8 +321,9 @@ export function registerPtyConnectionHiddenCodexQueriesTests(): void { it('keeps hidden Codex terminal queries split after ESC on the live xterm path', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -358,8 +365,9 @@ export function registerPtyConnectionHiddenCodexQueriesTests(): void { it('flushes pending hidden Codex query prefixes when the pane becomes visible', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( diff --git a/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-hidden-query-admission.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-hidden-query-admission.spec.ts index d0705bc079a..af23a469a94 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-hidden-query-admission.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-hidden-query-admission.spec.ts @@ -54,8 +54,9 @@ export function registerPtyConnectionHiddenEscapeAdmissionTests(): void { it('keeps all visible bytes after a pending hidden ESC becomes non-query output', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -139,8 +140,9 @@ export function registerPtyConnectionHiddenQueryAdmissionTests(): void { it('keeps split stateful Codex queries live after becoming visible', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -190,8 +192,9 @@ export function registerPtyConnectionHiddenQueryAdmissionTests(): void { it('drops pending hidden Codex query prefixes when the PTY changes', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -235,8 +238,9 @@ export function registerPtyConnectionHiddenQueryAdmissionTests(): void { it('does not live-render split hidden Codex non-query CSI output', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -277,8 +281,9 @@ export function registerPtyConnectionHiddenQueryAdmissionTests(): void { it('answers split hidden Codex OSC color queries directly', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -319,8 +324,9 @@ export function registerPtyConnectionHiddenQueryAdmissionTests(): void { it('answers hidden Codex OSC color queries split before the prefix directly', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -361,8 +367,9 @@ export function registerPtyConnectionHiddenQueryAdmissionTests(): void { it('keeps later hidden Codex stateless terminal queries on the live xterm path', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -404,8 +411,9 @@ export function registerPtyConnectionHiddenQueryAdmissionTests(): void { it('keeps clean hidden Codex stateful cursor-position queries on the live xterm path', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -441,8 +449,9 @@ export function registerPtyConnectionHiddenQueryAdmissionTests(): void { it('does not answer dirty hidden Codex stateful queries from stale xterm state', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( diff --git a/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-hidden-startup-query-admission.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-hidden-startup-query-admission.spec.ts index 638fed57ea2..93cbbe54f8a 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-hidden-startup-query-admission.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-hidden-startup-query-admission.spec.ts @@ -55,8 +55,9 @@ export function registerPtyConnectionHiddenStartupQueryAdmissionTests(): void { it('keeps hidden Codex telemetry startup output parsing briefly', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -107,8 +108,9 @@ export function registerPtyConnectionHiddenStartupQueryAdmissionTests(): void { it('does not answer hidden Jcode startup color queries (composer-text leak guard)', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -155,8 +157,9 @@ export function registerPtyConnectionHiddenStartupQueryAdmissionTests(): void { it('keeps hidden Grok telemetry startup output parsing briefly', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks12 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks12 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -207,8 +210,9 @@ export function registerPtyConnectionHiddenStartupQueryAdmissionTests(): void { it('keeps hidden bare Codex startup commands parsing briefly', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks13 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks13 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -252,8 +256,9 @@ export function registerPtyConnectionHiddenStartupQueryAdmissionTests(): void { it('keeps hidden bare Grok startup commands parsing briefly', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks14 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks14 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -297,8 +302,9 @@ export function registerPtyConnectionHiddenStartupQueryAdmissionTests(): void { it('skips arbitrary hidden startup output parsing', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks15 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks15 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( diff --git a/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts index d464fa40703..3d9c714a463 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-main-side-effect-authority.spec.ts @@ -81,8 +81,9 @@ export function registerPtyConnectionMainSideEffectAuthorityTests(): void { it('stops consuming facts after the pane binding is disposed', async () => { enableMainAuthority() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const handler = await import('../../pty-transport/output/terminal-side-effect-facts-handler') const transport = createMockTransport() @@ -110,8 +111,9 @@ export function registerPtyConnectionMainSideEffectAuthorityTests(): void { it('clears state without completion attention for stale-derived facts', async () => { enableMainAuthority() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const handler = await import('../../pty-transport/output/terminal-side-effect-facts-handler') const transport = createMockTransport() @@ -163,8 +165,9 @@ export function registerPtyConnectionMainSideEffectAuthorityTests(): void { it('does not byte-scan PR links or OSC 133 — facts are the only consumer', async () => { enableMainAuthority() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -205,8 +208,9 @@ export function registerPtyConnectionMainSideEffectAuthorityTests(): void { it('rejects Command Code facts when Claude owns the pane', async () => { enableMainAuthority() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const handler = await import('../../pty-transport/output/terminal-side-effect-facts-handler') const transport = createMockTransport() @@ -257,8 +261,9 @@ export function registerPtyConnectionMainSideEffectAuthorityTests(): void { it('rejects Command Code facts when retained Claude identity owns the pane', async () => { enableMainAuthority() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks12 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks12 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const handler = await import('../../pty-transport/output/terminal-side-effect-facts-handler') const transport = createMockTransport() @@ -303,8 +308,9 @@ export function registerPtyConnectionMainSideEffectAuthorityTests(): void { it('keeps Command Code working when a working fact lands before the done settles', async () => { enableMainAuthority() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks13 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks13 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const handler = await import('../../pty-transport/output/terminal-side-effect-facts-handler') const transport = createMockTransport() @@ -352,8 +358,9 @@ export function registerPtyConnectionMainSideEffectAuthorityTests(): void { getSync: vi.fn(() => ({ terminalMainSideEffectAuthority: false })) } const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks15 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks15 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const handler = await import('../../pty-transport/output/terminal-side-effect-facts-handler') const transport = createMockTransport() diff --git a/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-mode-2031-subscriptions.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-mode-2031-subscriptions.spec.ts index 82d33a849a2..00f51c81ff3 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-mode-2031-subscriptions.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-mode-2031-subscriptions.spec.ts @@ -62,8 +62,9 @@ export function registerPtyConnectionMode2031SubscriptionsTests(): void { dispose: () => void }> { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const captured: { current: ((data: string, meta?: { droppedOutput?: boolean }) => void) | null @@ -269,8 +270,9 @@ export function registerPtyConnectionMode2031SubscriptionsTests(): void { it('records hidden Codex mode 2031 subscribes split across becoming visible', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -320,8 +322,9 @@ export function registerPtyConnectionMode2031SubscriptionsTests(): void { it('does not keep mode 2031 subscribed when a skipped hidden chunk unsubscribes last', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( diff --git a/src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-connection-hidden-resize-authority.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-connection-hidden-resize-authority.spec.ts index 107c5e9a46a..d9433796eed 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-connection-hidden-resize-authority.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-connection-hidden-resize-authority.spec.ts @@ -52,8 +52,9 @@ export function registerPtyConnectionHiddenResizeAuthorityTests(): void { it('does not forward terminal resizes while the pane is hidden', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') transportFactoryQueue.push(transport) const pane = createPane(1) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-connection-visibility-resume-size.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-connection-visibility-resume-size.spec.ts index 6fc6faf68f9..cbdfc7fdd10 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-connection-visibility-resume-size.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-connection-visibility-resume-size.spec.ts @@ -64,8 +64,9 @@ export function registerPtyConnectionVisibilityResumeSizeTests(): void { pane: ReturnType }> { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const manager = createManager(2) @@ -176,8 +177,9 @@ export function registerPtyConnectionVisibilityResumeSizeTests(): void { try { vi.mocked(window.api.pty.getSize).mockResolvedValue({ cols: 200, rows: 40 }) const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const manager = createManager(2) @@ -207,8 +209,9 @@ export function registerPtyConnectionVisibilityResumeSizeTests(): void { it('repairs stale xterm grid drift on foreground output even without a pane resize', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -263,8 +266,9 @@ export function registerPtyConnectionVisibilityResumeSizeTests(): void { emitFrame: (data: string) => void }> { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -402,8 +406,9 @@ export function registerPtyConnectionVisibilityResumeSizeTests(): void { it('skips foreground grid drift repair while mobile owns the PTY without a fit override', async () => { const { setDriverForPty } = await import('@/lib/pane-manager/mobile-driver-state') const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -460,8 +465,9 @@ export function registerPtyConnectionVisibilityResumeSizeTests(): void { const observer = installObservedPane(pane) try { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const manager = createManager(2) @@ -510,8 +516,9 @@ export function registerPtyConnectionVisibilityResumeSizeTests(): void { const observer = installObservedPane(pane) try { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const manager = createManager(2) @@ -566,8 +573,9 @@ export function registerPtyConnectionVisibilityResumeSizeTests(): void { const observer = installObservedPane(pane) try { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const manager = createManager(2) @@ -614,8 +622,9 @@ export function registerPtyConnectionVisibilityResumeSizeTests(): void { const observer = installObservedPane(pane) try { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const manager = createManager(2) @@ -723,8 +732,9 @@ export function registerPtyConnectionVisibilityResumeSizeTests(): void { const getSize = vi.mocked(window.api.pty.getSize) getSize.mockClear() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('remote:env-1@@terminal-2') transport.getConnectionId.mockReturnValue(null) transportFactoryQueue.push(transport) @@ -759,8 +769,9 @@ export function registerPtyConnectionVisibilityResumeSizeTests(): void { } as unknown as Document const { setFitOverride } = await import('@/lib/pane-manager/mobile-fit-overrides') const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const ptyId = 'remote:env-1@@terminal-visible' const transport = createMockTransport(ptyId) transportFactoryQueue.push(transport) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/geometry/remote-reconnect-unimaged-pane-redraw.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/geometry/remote-reconnect-unimaged-pane-redraw.test.ts index 6076e7fa67d..5876b6a2b14 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/geometry/remote-reconnect-unimaged-pane-redraw.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/geometry/remote-reconnect-unimaged-pane-redraw.test.ts @@ -31,7 +31,7 @@ vi.mock('@/runtime/sync-runtime-graph/graph-sync-scheduler', () => ({ scheduleRu vi.mock('@/store/index', () => ({ useAppStore: { getState: () => mockStoreState, subscribe: () => () => {} } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -93,7 +93,9 @@ async function connectVisibleRemotePane( opts: { visible?: boolean } = {} ): Promise { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport(REMOTE_PTY_ID) transport.serializeBuffer = vi.fn() transport.serializeBufferOutcome = vi.fn( diff --git a/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-connection-owner-hydration-backend-retention.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-connection-owner-hydration-backend-retention.test.ts index d8607b45955..bfc2bff7ef3 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-connection-owner-hydration-backend-retention.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-connection-owner-hydration-backend-retention.test.ts @@ -61,7 +61,7 @@ vi.mock('@/store', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -129,7 +129,9 @@ describe('connectPanePty owner hydration and backend retention', () => { it('parks an unknown owner until hydration, then retains the acquired backend on refresh', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport') const { createRemoteRuntimePtyTransport } = await import('../../pty-transport/remote-runtime/remote-runtime-pty-transport') @@ -200,8 +202,9 @@ describe('connectPanePty owner hydration and backend retention', () => { 'retains the connect owner through focus changes ($rowless, $remote)', async ({ rowless, remote }) => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { createTerminalPaneManagerOptions } = await import('../../mounting/terminal-pane-manager-options') vi.stubGlobal('navigator', { userAgent: 'Windows' }) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-connection-runtime-owner-spawn-routing.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-connection-runtime-owner-spawn-routing.spec.ts index 1735db54b2c..87d3f23222c 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-connection-runtime-owner-spawn-routing.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-connection-runtime-owner-spawn-routing.spec.ts @@ -54,8 +54,9 @@ export function registerPtyConnectionRuntimeOwnerSpawnRoutingTests(): void { it('fails closed when the same SSH worktree id is projected by two HUBs', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { createRemoteRuntimePtyTransport } = await import('../../pty-transport/remote-runtime/remote-runtime-pty-transport') const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport') @@ -104,8 +105,9 @@ export function registerPtyConnectionRuntimeOwnerSpawnRoutingTests(): void { it('fails a missing paired-client owner closed instead of creating a local PTY', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { createRemoteRuntimePtyTransport } = await import('../../pty-transport/remote-runtime/remote-runtime-pty-transport') const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport') @@ -137,8 +139,9 @@ export function registerPtyConnectionRuntimeOwnerSpawnRoutingTests(): void { it('spawns fresh PTYs through the worktree owner runtime when focus differs', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { createRemoteRuntimePtyTransport } = await import('../../pty-transport/remote-runtime/remote-runtime-pty-transport') const transport = createMockTransport('remote:owner-runtime@@terminal-1') @@ -191,8 +194,9 @@ export function registerPtyConnectionRuntimeOwnerSpawnRoutingTests(): void { it('spawns fresh PTYs locally for explicitly local worktrees while a runtime is focused', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { createRemoteRuntimePtyTransport } = await import('../../pty-transport/remote-runtime/remote-runtime-pty-transport') const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport') diff --git a/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-connection-runtime-pane-transport-routing.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-connection-runtime-pane-transport-routing.spec.ts index 0057ee1d9b5..73351df8de2 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-connection-runtime-pane-transport-routing.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-connection-runtime-pane-transport-routing.spec.ts @@ -54,8 +54,9 @@ export function registerPtyConnectionRuntimePaneTransportRoutingTests(): void { it('does not let a restored encoded PTY override the current worktree owner', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { createRemoteRuntimePtyTransport } = await import('../../pty-transport/remote-runtime/remote-runtime-pty-transport') const transport = createMockTransport() @@ -102,8 +103,9 @@ export function registerPtyConnectionRuntimePaneTransportRoutingTests(): void { it('routes a paired-web mirrored pane through its session-scoped HUB owner', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { createRemoteRuntimePtyTransport } = await import('../../pty-transport/remote-runtime/remote-runtime-pty-transport') const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport') @@ -150,8 +152,9 @@ export function registerPtyConnectionRuntimePaneTransportRoutingTests(): void { it('uses a paired-web pane owner to disambiguate duplicate HUB projections', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { createRemoteRuntimePtyTransport } = await import('../../pty-transport/remote-runtime/remote-runtime-pty-transport') const transport = createMockTransport() @@ -193,8 +196,9 @@ export function registerPtyConnectionRuntimePaneTransportRoutingTests(): void { it('ignores a stale runtime PTY on an explicitly local non-web pane', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { createRemoteRuntimePtyTransport } = await import('../../pty-transport/remote-runtime/remote-runtime-pty-transport') const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport') @@ -223,8 +227,9 @@ export function registerPtyConnectionRuntimePaneTransportRoutingTests(): void { it('spawns an unstamped local worktree locally while a single server is focused', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { createRemoteRuntimePtyTransport } = await import('../../pty-transport/remote-runtime/remote-runtime-pty-transport') const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport') @@ -254,8 +259,9 @@ export function registerPtyConnectionRuntimePaneTransportRoutingTests(): void { it('runs an inline setup terminal locally instead of failing its host closed', async () => { // Synthetic setup IDs have no catalog row; they must resolve locally instead of failing strict ownership as ambiguous (#9994). const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { createRemoteRuntimePtyTransport } = await import('../../pty-transport/remote-runtime/remote-runtime-pty-transport') const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport') @@ -287,8 +293,9 @@ export function registerPtyConnectionRuntimePaneTransportRoutingTests(): void { it('runs an inline setup terminal on the single active runtime for remote skill installs', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks12 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks12 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { createRemoteRuntimePtyTransport } = await import('../../pty-transport/remote-runtime/remote-runtime-pty-transport') const transport = createMockTransport() @@ -321,8 +328,9 @@ export function registerPtyConnectionRuntimePaneTransportRoutingTests(): void { it('still spawns locally when the worktree row itself proves a local host', async () => { // A local-stamped worktree already names its host before its repo hydrates. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks13 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks13 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport') const transport = createMockTransport() transportFactoryQueue.push(transport) @@ -350,8 +358,9 @@ export function registerPtyConnectionRuntimePaneTransportRoutingTests(): void { it('withholds a local spawn while a repo-backed worktree has no hydrated host', async () => { // Missing SSH repo metadata must defer resolution rather than spawn remote cwd paths on the local daemon. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks14 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks14 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport') const { createRemoteRuntimePtyTransport } = await import('../../pty-transport/remote-runtime/remote-runtime-pty-transport') @@ -384,8 +393,9 @@ export function registerPtyConnectionRuntimePaneTransportRoutingTests(): void { it('keeps the floating terminal local even while a runtime is active', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks15 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks15 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { createRemoteRuntimePtyTransport } = await import('../../pty-transport/remote-runtime/remote-runtime-pty-transport') const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport') @@ -417,8 +427,9 @@ export function registerPtyConnectionRuntimePaneTransportRoutingTests(): void { it('routes a HUB-owned SSH PTY wake hint through the HUB without direct SSH', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks16 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks16 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { createRemoteRuntimePtyTransport } = await import('../../pty-transport/remote-runtime/remote-runtime-pty-transport') const transport = createMockTransport() diff --git a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-command-finished-interrupt-arbitration.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-command-finished-interrupt-arbitration.spec.ts index eee12960498..bd8b982d4d9 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-command-finished-interrupt-arbitration.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-command-finished-interrupt-arbitration.spec.ts @@ -60,8 +60,9 @@ export function registerPtyConnectionCommandFinishedInterruptArbitrationTests(): 'pins %s interrupt policy before acknowledged input and command exit cleanup', async (agentType) => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks14 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks14 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } const transport = createMockTransport() diff --git a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-hibernation-activity.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-hibernation-activity.spec.ts index 685143b73ba..8ad9ebb0934 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-hibernation-activity.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-hibernation-activity.spec.ts @@ -59,8 +59,9 @@ export function registerPtyConnectionHibernationActivityTests(): void { it('records hibernation activity from the core user-input signal, not synthetic onData replies', async () => { // Regression: xterm auto-replies share the onData stream with typing; recording them as input made the planner see "input after done" and never hibernate. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks13 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks13 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const manager = createManager(1) @@ -106,8 +107,9 @@ export function registerPtyConnectionHibernationActivityTests(): void { it('falls back to onData hibernation recording when the core user-input signal is unavailable', async () => { // If an xterm upgrade removes the internal signal, activity recording must degrade to the historical onData behavior — never to no tracking at all. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks14 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks14 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const manager = createManager(1) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-interrupt-inference.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-interrupt-inference.spec.ts index aa34cbe098f..c05d48603c0 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-interrupt-inference.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-interrupt-inference.spec.ts @@ -65,8 +65,9 @@ export function registerPtyConnectionInterruptInferenceTests(): void { 'handles focused Ctrl+C for %s without guessing Codex cancellation', async (agentType) => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) vi.useFakeTimers() @@ -146,8 +147,9 @@ export function registerPtyConnectionInterruptInferenceTests(): void { it('clears stale working pane title after inferred interrupt applies', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { resolveWorktreeStatus } = await import('@/lib/worktree-status') vi.mocked(window.api.agentStatus.inferInterrupt).mockResolvedValue(true) const transport = createMockTransport() @@ -224,8 +226,9 @@ export function registerPtyConnectionInterruptInferenceTests(): void { it('clears unchanged title-only working indicators after acknowledged interrupt input', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) vi.useFakeTimers() @@ -278,8 +281,9 @@ export function registerPtyConnectionInterruptInferenceTests(): void { it('does not clear title-only working indicators when interrupt writes are unacknowledged', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() delete transport.sendInputAccepted transportFactoryQueue.push(transport) @@ -322,8 +326,9 @@ export function registerPtyConnectionInterruptInferenceTests(): void { it('infers exact Ctrl+C terminal input when keydown capture misses the press', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) vi.useFakeTimers() @@ -371,8 +376,9 @@ export function registerPtyConnectionInterruptInferenceTests(): void { it('marks bracketed paste as stale after acknowledged Ctrl+C input', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { pasteTerminalText } = await import('../../input/paste/terminal-bracketed-paste') const transport = createMockTransport() transportFactoryQueue.push(transport) @@ -406,8 +412,9 @@ export function registerPtyConnectionInterruptInferenceTests(): void { it('infers captured Ctrl+C even when xterm emits an enhanced keyboard sequence', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) vi.useFakeTimers() @@ -459,8 +466,9 @@ export function registerPtyConnectionInterruptInferenceTests(): void { it('infers interrupt for an explicit working status even if the title is already non-agent', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) vi.useFakeTimers() @@ -522,8 +530,9 @@ export function registerPtyConnectionInterruptInferenceTests(): void { it('keeps inferred interrupted status after the pane settles on a non-agent title', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) vi.useFakeTimers() @@ -601,8 +610,9 @@ export function registerPtyConnectionInterruptInferenceTests(): void { it('does not infer exact interrupt input when the transport cannot acknowledge writes', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() delete transport.sendInputAccepted transportFactoryQueue.push(transport) @@ -644,8 +654,9 @@ export function registerPtyConnectionInterruptInferenceTests(): void { it('removes agent status and pane title on PTY exit after inferred interrupt', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) vi.mocked(window.api.agentStatus.inferInterrupt).mockResolvedValue(true) const transport = createMockTransport('tab-pty') transportFactoryQueue.push(transport) @@ -717,8 +728,9 @@ export function registerPtyConnectionInterruptInferenceTests(): void { const restoreUserAgent = temporarilySetNavigatorUserAgent('Mozilla/5.0 (X11; Linux x86_64)') try { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks12 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks12 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) vi.useFakeTimers() @@ -785,8 +797,9 @@ export function registerPtyConnectionInterruptInferenceTests(): void { it('removes the terminal key listener on dispose before a remount adds another', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks13 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks13 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const firstTransport = createMockTransport() const secondTransport = createMockTransport() transportFactoryQueue.push(firstTransport, secondTransport) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-native-query-reply-routing.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-native-query-reply-routing.spec.ts index c58059baa76..5f7f6893027 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-native-query-reply-routing.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-native-query-reply-routing.spec.ts @@ -65,8 +65,9 @@ export function registerPtyConnectionNativeQueryReplyRoutingTests(): void { it('answers cursor queries while an account notice blocks user input', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-live') transportFactoryQueue.push(transport) mockStoreState.codexRestartNoticeByPtyId = { @@ -91,8 +92,9 @@ export function registerPtyConnectionNativeQueryReplyRoutingTests(): void { it('routes native onData query replies through sendInputImmediate, typed input through sendInput (#7329)', async () => { // Why this test: the mock aliases sendInputImmediate to sendInput, so other tests can't tell them apart; this pins the routing decision. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) enableActiveRuntimeEnvironment() const pane = createPane(1) const transport = createMockTransport('remote:web-env-1@@pty-7329') diff --git a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-remote-new-terminal-typeahead.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-remote-new-terminal-typeahead.test.ts index 5f78c935920..922f38eb12c 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-remote-new-terminal-typeahead.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-remote-new-terminal-typeahead.test.ts @@ -67,7 +67,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -139,7 +139,9 @@ async function connectNewRemotePane() { } }) const connectArgs = [pane, createManager(1), buildPaneConnectionDeps(() => mockStoreState)] - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) bindPaneAgentTitleMocks(connectArgs[2], agentTitleMocks) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-terminal-input-gating.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-terminal-input-gating.spec.ts index 8ae74df5e24..5a0e76b1955 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-terminal-input-gating.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-terminal-input-gating.spec.ts @@ -65,8 +65,9 @@ export function registerPtyConnectionTerminalInputGatingTests(): void { it('restores input to a Codex pane whose restart notice the user dismissed', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-live') transportFactoryQueue.push(transport) @@ -106,8 +107,9 @@ export function registerPtyConnectionTerminalInputGatingTests(): void { it('restores input through the tab fallback when the dismissed pane has no live PTY binding', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport(null) transportFactoryQueue.push(transport) @@ -146,8 +148,9 @@ export function registerPtyConnectionTerminalInputGatingTests(): void { it('keeps a dismissed split pane typing while a sibling still holds the prompt', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-dismissed') transportFactoryQueue.push(transport) @@ -192,8 +195,9 @@ export function registerPtyConnectionTerminalInputGatingTests(): void { it('keeps blocking a pane with its own unanswered notice next to a dismissed sibling', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-stale') transportFactoryQueue.push(transport) @@ -236,8 +240,9 @@ export function registerPtyConnectionTerminalInputGatingTests(): void { it('keeps a bound pane with no notice typing while a sibling holds a queued restart', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-plain-shell') transportFactoryQueue.push(transport) @@ -284,8 +289,9 @@ export function registerPtyConnectionTerminalInputGatingTests(): void { it('keeps blocking input on a pane whose restart is requested but not yet run', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-live') transportFactoryQueue.push(transport) @@ -325,8 +331,9 @@ export function registerPtyConnectionTerminalInputGatingTests(): void { it('blocks input to stale Codex panes until they restart', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) vi.useFakeTimers() vi.setSystemTime(1_100) @@ -388,8 +395,9 @@ export function registerPtyConnectionTerminalInputGatingTests(): void { it('blocks terminal writes while mobile presence lock owns the PTY', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { setDriverForPty } = await import('@/lib/pane-manager/mobile-driver-state') vi.useFakeTimers() @@ -450,8 +458,9 @@ export function registerPtyConnectionTerminalInputGatingTests(): void { it('drops xterm protocol replies from live TUI output while mobile presence lock is active', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks12 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks12 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { setDriverForPty } = await import('@/lib/pane-manager/mobile-driver-state') const ptyId = 'pty-mobile-tui-query' @@ -504,8 +513,9 @@ export function registerPtyConnectionTerminalInputGatingTests(): void { it('blocks remote locked terminal input before it reaches the runtime transport', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks13 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks13 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { setDriverForPty } = await import('@/lib/pane-manager/mobile-driver-state') const ptyId = 'remote:env-1@@terminal-1' @@ -547,8 +557,9 @@ export function registerPtyConnectionTerminalInputGatingTests(): void { it('does not infer interrupts when the transport rejects terminal input', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks14 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks14 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) vi.useFakeTimers() vi.setSystemTime(1_100) @@ -596,8 +607,9 @@ export function registerPtyConnectionTerminalInputGatingTests(): void { it('does not infer interrupts when the main process rejects acknowledged input', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks15 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks15 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) vi.useFakeTimers() vi.setSystemTime(1_100) @@ -646,8 +658,9 @@ export function registerPtyConnectionTerminalInputGatingTests(): void { it('requests a connected pane remount when main reports its daemon write unavailable', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks16 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks16 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { _resetTerminalPaneRecoveryForTests } = await import('../../render-health/recovery/terminal-pane-recovery') _resetTerminalPaneRecoveryForTests() @@ -679,8 +692,9 @@ export function registerPtyConnectionTerminalInputGatingTests(): void { it('quarantines the interrupted line after a write-unavailable remount, but never device replies', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks17 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks17 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { _resetTerminalPaneRecoveryForTests } = await import('../../render-health/recovery/terminal-pane-recovery') _resetTerminalPaneRecoveryForTests() @@ -723,8 +737,9 @@ export function registerPtyConnectionTerminalInputGatingTests(): void { it('recovers a wedged write pipeline after accepted input without renderer output', async () => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks18 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks18 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { settleTerminalWriteStallWatch, WRITE_PIPELINE_STALL_CHECK_MS } = await import('@/lib/pane-manager/terminal-write-pipeline-health') const remountTerminalTabForRecovery = vi.fn(() => REMOUNTED) @@ -755,8 +770,9 @@ export function registerPtyConnectionTerminalInputGatingTests(): void { it('does not arm the wedge probe when acknowledged input is rejected', async () => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks19 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks19 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { WRITE_PIPELINE_STALL_CHECK_MS } = await import('@/lib/pane-manager/terminal-write-pipeline-health') const transport = createMockTransport('pty-rejected') @@ -784,8 +800,9 @@ export function registerPtyConnectionTerminalInputGatingTests(): void { it('blocks input when tab-level ptyId is stale even if panePtyId is null', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks20 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks20 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport(null) transportFactoryQueue.push(transport) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-terminal-input-session-listing.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-terminal-input-session-listing.spec.ts index b310f3d3b7c..79342fc08e1 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-terminal-input-session-listing.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-terminal-input-session-listing.spec.ts @@ -61,8 +61,9 @@ export function registerPtyConnectionTerminalInputSessionListingTests(): void { typeKeystroke: (data?: string) => void }> { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks16 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks16 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const manager = createManager(2) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-windows-focus-report-authority.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-windows-focus-report-authority.spec.ts index 32aa2aeb59a..4607564cbd8 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-windows-focus-report-authority.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-windows-focus-report-authority.spec.ts @@ -89,8 +89,9 @@ export function registerPtyConnectionRemoteWindowsFocusReportTests(): void { ) await loadFreshTerminalModules() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) @@ -170,8 +171,9 @@ export function registerPtyConnectionWindowsFocusReportAuthorityTests(): void { ) await loadFreshTerminalModules() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) @@ -245,8 +247,9 @@ export function registerPtyConnectionWindowsFocusReportAuthorityTests(): void { ) await loadFreshTerminalModules() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) @@ -291,8 +294,9 @@ export function registerPtyConnectionWindowsFocusReportAuthorityTests(): void { ) await loadFreshTerminalModules() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) @@ -364,8 +368,9 @@ export function registerPtyConnectionWindowsFocusReportAuthorityTests(): void { ) await loadFreshTerminalModules() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-deliberate-sleep-guard.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-deliberate-sleep-guard.spec.ts index f612b48a4d3..13972df30e6 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-deliberate-sleep-guard.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-deliberate-sleep-guard.spec.ts @@ -58,8 +58,9 @@ export function registerPtyConnectionDeliberateSleepGuardTests(): void { // Manual sleep retains tab.ptyId as a wake hint; unguarded remount would reattach and respawn its dead shell (#10205). it('does not reattach a slept pane through its retained session id', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { markWorktreeSleepIntent } = await import('@/lib/worktree-sleep-intent') const transport = createMockTransport() transportFactoryQueue.push(transport) @@ -88,8 +89,9 @@ export function registerPtyConnectionDeliberateSleepGuardTests(): void { it('does not fresh-spawn a slept pane that has no session id', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { markWorktreeSleepIntent } = await import('@/lib/worktree-sleep-intent') const transport = createMockTransport() transportFactoryQueue.push(transport) @@ -109,8 +111,9 @@ export function registerPtyConnectionDeliberateSleepGuardTests(): void { it('connects a waiting pane once the workspace is woken', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { clearWorktreeSleepIntent, markWorktreeSleepIntent } = await import('@/lib/worktree-sleep-intent') const transport = createMockTransport() @@ -144,8 +147,9 @@ export function registerPtyConnectionDeliberateSleepGuardTests(): void { it('does not connect a waiting pane whose tab was remounted by the wake', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { clearWorktreeSleepIntent, markWorktreeSleepIntent } = await import('@/lib/worktree-sleep-intent') const transport = createMockTransport() @@ -182,8 +186,9 @@ export function registerPtyConnectionDeliberateSleepGuardTests(): void { it('resumes a waiting pane mounted under a unified tab id', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { clearWorktreeSleepIntent, markWorktreeSleepIntent } = await import('@/lib/worktree-sleep-intent') const transport = createMockTransport() @@ -214,8 +219,9 @@ export function registerPtyConnectionDeliberateSleepGuardTests(): void { it('re-arms after a wake so a second sleep can hold the pane again', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { clearWorktreeSleepIntent, markWorktreeSleepIntent } = await import('@/lib/worktree-sleep-intent') const transport = createMockTransport() @@ -265,8 +271,9 @@ export function registerPtyConnectionDeliberateSleepGuardTests(): void { ) try { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) sleepIntent.markWorktreeSleepIntent('wt-1') @@ -295,8 +302,9 @@ export function registerPtyConnectionDeliberateSleepGuardTests(): void { it('still connects a slept pane that carries a queued startup', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { markWorktreeSleepIntent } = await import('@/lib/worktree-sleep-intent') const transport = createMockTransport() transportFactoryQueue.push(transport) @@ -319,8 +327,9 @@ export function registerPtyConnectionDeliberateSleepGuardTests(): void { it('connects normally once the marker is released', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) const deps = createDeps({ diff --git a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-git-bash-console-capacity.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-git-bash-console-capacity.test.ts index 0f1b7bcdab0..749a7eec5de 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-git-bash-console-capacity.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-git-bash-console-capacity.test.ts @@ -80,7 +80,9 @@ async function startPane({ startup, cwdPromise }) - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) await connectMockPanePty(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks)) await flushAsyncTicks() @@ -134,7 +136,7 @@ async function heldLaunch({ install(session) captured.session = session }) - const readiness = await import('@/lib/agent-draft-readiness') + const readiness = await import('@/lib/agent-session/messaging/paste/agent-draft-readiness') vi.spyOn(readiness, 'waitForAgentDraftInputReady').mockReturnValue(new Promise(() => {})) const cwd = Promise.withResolvers() const key = makePaneKey('tab-1', createPane(1).leafId) @@ -235,7 +237,9 @@ async function heldLaunch({ }) } const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const binding = connectPanePty( typedPane, typedManager, @@ -405,7 +409,7 @@ describe('Git Bash console-capacity pane retention', () => { }) it('keeps a pre-connect input attempt with the first process while cwd is pending', async () => { - const readiness = await import('@/lib/agent-draft-readiness') + const readiness = await import('@/lib/agent-session/messaging/paste/agent-draft-readiness') vi.spyOn(readiness, 'waitForAgentDraftInputReady').mockReturnValue(new Promise(() => {})) const cwd = Promise.withResolvers() const started = await startPane({ startup: null, cwdPromise: cwd.promise }) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-hibernation-kill-shell-foreground.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-hibernation-kill-shell-foreground.test.ts index febf3c535a8..fe82eb9fb79 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-hibernation-kill-shell-foreground.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-hibernation-kill-shell-foreground.test.ts @@ -64,7 +64,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -155,7 +155,9 @@ describe('shell showing through a hibernation kill', () => { }> { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('zsh') const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null } const ptyId = 'pty-hibernating' diff --git a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-hibernation-wake.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-hibernation-wake.spec.ts index d875a7a9184..f60564c0352 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-hibernation-wake.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-hibernation-wake.spec.ts @@ -70,8 +70,9 @@ export function registerPtyConnectionHibernationWakeTests(): void { it('disarms input modes and resumes a hibernated agent session on visibility reveal', async () => { // Regression: hibernation suppresses its kill's PTY exit while hidden; before the wake fix onExit permanently latched handledExitPtyId, leaving a frozen inert ghost pane on reveal. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const manager = createManager(1) @@ -154,8 +155,9 @@ export function registerPtyConnectionHibernationWakeTests(): void { // A suppressed exit over a finished turn’s live anchor still arms reveal resume despite its worktree-sleep note (#16308). it('arms an in-place resume from a finished turn idle anchor on a suppressed exit', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const deps = createDeps({ @@ -215,8 +217,9 @@ export function registerPtyConnectionHibernationWakeTests(): void { it('resumes a hibernated agent from a navigation-free wake without a visibility reveal', async () => { // Mobile wakes hidden panes without visibility changes; duplicate wake events must resume exactly once (INV-1). const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const manager = createManager(1) @@ -295,8 +298,9 @@ export function registerPtyConnectionHibernationWakeTests(): void { it('names the replaced PTY on the restart spawn only, never on a later wake of the same pane', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-restarted') transportFactoryQueue.push(transport) const deps = createDeps({ @@ -375,8 +379,9 @@ export function registerPtyConnectionHibernationWakeTests(): void { it('keeps an established split pane mounted when main labels its exit as a restart replacement', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { deliverPtyExitToHandlers } = await import('../../pty-transport/delivery/pty-exit-delivery') let onData: ((data: string) => void) | undefined @@ -456,8 +461,9 @@ export function registerPtyConnectionHibernationWakeClaimTests(): void { it('latches a navigation-free wake that lands before the hibernation kill arms the pane', async () => { // Latch wake events between recording sleep and arming the kill’s PTY ID, or the frozen pane remains stranded (#7906). const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const manager = createManager(1) @@ -525,8 +531,9 @@ export function registerPtyConnectionHibernationWakeClaimTests(): void { it('keeps an in-place provider claim until the replacement PTY spawn settles', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const deps = createDeps({ @@ -596,8 +603,9 @@ export function registerPtyConnectionHibernationWakeClaimTests(): void { it('re-arms the exact hibernation target after a replacement spawn fails', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const paneKey = `tab-1:${leafIdForPane(2)}` @@ -660,8 +668,9 @@ export function registerPtyConnectionHibernationWakeClaimTests(): void { it('does not latch a stale sleeping record beside an unsuppressed live PTY', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const paneKey = `tab-1:${leafIdForPane(2)}` @@ -695,8 +704,9 @@ export function registerPtyConnectionHibernationWakeClaimTests(): void { it('auto-resumes a hibernated pane when its kill lands after the pane is already revealed', async () => { // If reveal precedes wake arming, the arm-time visibility check must resume the pane immediately. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const manager = createManager(1) @@ -766,8 +776,9 @@ export function registerPtyConnectionHibernationWakeClaimTests(): void { it('invalidates the hibernation wake when another flow rebinds the pane before reveal', async () => { // A hidden restart’s rebind permanently invalidates the old armed wake, including after a later PTY death. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks12 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks12 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const manager = createManager(1) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-hidden-sleeping-resume.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-hidden-sleeping-resume.spec.ts index c12eff7bfe6..66217274299 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-hidden-sleeping-resume.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-hidden-sleeping-resume.spec.ts @@ -174,7 +174,9 @@ export function registerPtyConnectionHiddenSleepingResumeTests(): void { seedSleepingPane(null) const { transport, binding, isVisibleRef } = connectHiddenPane( null, - await vi.importMock('@/lib/agent-status') + await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) ) await flushAsyncTicks(10) @@ -198,7 +200,9 @@ export function registerPtyConnectionHiddenSleepingResumeTests(): void { setHostLiveness(false) const { transport, binding, isVisibleRef } = connectHiddenPane( DEAD_SESSION_ID, - await vi.importMock('@/lib/agent-status') + await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) ) await flushAsyncTicks(10) @@ -227,7 +231,9 @@ export function registerPtyConnectionHiddenSleepingResumeTests(): void { setHostLiveness(isLive) const { transport } = connectHiddenPane( DEAD_SESSION_ID, - await vi.importMock('@/lib/agent-status') + await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) ) await flushAsyncTicks(10) @@ -241,7 +247,9 @@ export function registerPtyConnectionHiddenSleepingResumeTests(): void { requestSleepingAgentWakeOnMount('wt-1', ['tab-1']) const { transport } = connectHiddenPane( null, - await vi.importMock('@/lib/agent-status') + await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) ) await flushAsyncTicks(10) @@ -261,7 +269,9 @@ export function registerPtyConnectionHiddenSleepingResumeTests(): void { requestSleepingAgentWakeOnMount('wt-1', ['tab-1']) connectHiddenPane( null, - await vi.importMock('@/lib/agent-status') + await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) ) await flushAsyncTicks(20) expect(resumeSleptPane).toHaveBeenCalledWith( @@ -275,7 +285,9 @@ export function registerPtyConnectionHiddenSleepingResumeTests(): void { setHostLiveness(false) const { transport, binding } = connectHiddenPane( DEAD_SESSION_ID, - await vi.importMock('@/lib/agent-status') + await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) ) await flushAsyncTicks(10) expect(transport.connect).not.toHaveBeenCalled() @@ -294,7 +306,9 @@ export function registerPtyConnectionHiddenSleepingResumeTests(): void { const { isPaneSpawnDeferred } = await import('@/lib/pane-spawn-deferral-registry') const { binding, isVisibleRef } = connectHiddenPane( null, - await vi.importMock('@/lib/agent-status') + await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) ) await flushAsyncTicks(10) expect(isPaneSpawnDeferred(PANE_KEY)).toBe(true) @@ -320,7 +334,9 @@ export function registerPtyConnectionHiddenSleepingResumeTests(): void { restoredPtyIdByLeafId: { [LEAF_2]: DEAD_SESSION_ID }, isVisibleRef: { current: false } }), - await vi.importMock('@/lib/agent-status') + await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) ) await flushAsyncTicks(20) @@ -338,7 +354,9 @@ export function registerPtyConnectionHiddenSleepingResumeTests(): void { const spawn = createDeferred() const { transport, binding, isVisibleRef } = connectHiddenPane( null, - await vi.importMock('@/lib/agent-status') + await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) ) transport.connect.mockImplementation(() => spawn.promise.then((ptyId) => { @@ -372,7 +390,9 @@ export function registerPtyConnectionHiddenSleepingResumeTests(): void { consumeSuppressedPtyExit: vi.fn(() => true), isVisibleRef }), - await vi.importMock('@/lib/agent-status') + await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) ) await flushAsyncTicks(10) isVisibleRef.current = true @@ -408,7 +428,9 @@ export function registerPtyConnectionHiddenSleepingResumeTests(): void { seedSleepingPane(null) const { transport, binding, isVisibleRef } = connectHiddenPane( null, - await vi.importMock('@/lib/agent-status') + await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) ) await flushAsyncTicks(10) const held = mockStoreState.sleepingAgentSessionsByPaneKey[PANE_KEY]! @@ -429,7 +451,9 @@ export function registerPtyConnectionHiddenSleepingResumeTests(): void { seedSleepingPane(null) const { transport, binding, isVisibleRef } = connectHiddenPane( null, - await vi.importMock('@/lib/agent-status') + await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) ) await flushAsyncTicks(10) const held = mockStoreState.sleepingAgentSessionsByPaneKey[PANE_KEY]! @@ -451,7 +475,9 @@ export function registerPtyConnectionHiddenSleepingResumeTests(): void { const { isPaneSpawnDeferred } = await import('@/lib/pane-spawn-deferral-registry') const { transport, binding, isVisibleRef } = connectHiddenPane( DEAD_SESSION_ID, - await vi.importMock('@/lib/agent-status') + await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) ) await flushAsyncTicks(10) const fallback = createDeferred() @@ -479,7 +505,9 @@ export function registerPtyConnectionHiddenSleepingResumeTests(): void { const { isPaneSpawnDeferred } = await import('@/lib/pane-spawn-deferral-registry') connectHiddenPane( null, - await vi.importMock('@/lib/agent-status') + await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) ) await flushAsyncTicks(10) const onPtyExit = createdTransportOptions[0]?.onPtyExit diff --git a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-provider-rebind-callback-fencing.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-provider-rebind-callback-fencing.spec.ts index 3939f6a18d2..00a1bf01974 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-provider-rebind-callback-fencing.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-provider-rebind-callback-fencing.spec.ts @@ -59,8 +59,9 @@ export function registerPtyConnectionProviderRebindCallbackFencingTests(): void it('ignores a late spawn callback after the pane adopted a provider replacement', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks18 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks18 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) let transportPtyId = 'terminal-old' const transport = createMockTransport(transportPtyId) transport.getPtyId = vi.fn(() => transportPtyId) @@ -103,8 +104,9 @@ export function registerPtyConnectionProviderRebindCallbackFencingTests(): void it('ignores a late split-pane spawn callback when the tab identity belongs to pane one', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks19 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks19 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) let transportPtyId = 'terminal-old' const transport = createMockTransport(transportPtyId) transport.getPtyId = vi.fn(() => transportPtyId) @@ -159,8 +161,9 @@ export function registerPtyConnectionProviderRebindCallbackFencingTests(): void it('accepts a fresh spawn when the persisted pane still names the retired PTY', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks20 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks20 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) let transportPtyId = 'terminal-new' const transport = createMockTransport(transportPtyId) transport.getPtyId = vi.fn(() => transportPtyId) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-pty-exit-teardown.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-pty-exit-teardown.spec.ts index 7af644c2ef5..91e634dbf0b 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-pty-exit-teardown.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-pty-exit-teardown.spec.ts @@ -117,8 +117,9 @@ export function registerPtyConnectionPtyExitTeardownTests(): void { it('keeps a fresh split pane mounted when its newborn PTY exits before output or input', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const manager = createManager(2, 2) @@ -169,8 +170,9 @@ export function registerPtyConnectionPtyExitTeardownTests(): void { it('closes a hidden split pane whose PTY exits before output instead of keeping a ghost', async () => { // Hidden delivery withholds bytes, so no output cannot justify retaining an exited ghost pane. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const manager = createManager(2, 2) @@ -204,8 +206,9 @@ export function registerPtyConnectionPtyExitTeardownTests(): void { it('keeps a worktree sole terminal mounted when its freshly-spawned PTY exits before input (direnv failure)', async () => { // Keep an unused shell mounted after startup failure so direnv errors do not close the tab and return to Landing. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transportFactoryQueue.push(transport) const manager = createManager(1) @@ -236,8 +239,9 @@ export function registerPtyConnectionPtyExitTeardownTests(): void { it('keeps a worktree sole terminal mounted when only a captured shortcut preceded the exit', async () => { // Shortcut-driven redraw activity is not typed input; Shift+Enter must not turn startup failure into tab closure. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transportFactoryQueue.push(transport) const manager = createManager(1) @@ -265,8 +269,9 @@ export function registerPtyConnectionPtyExitTeardownTests(): void { it('forwards a synthetic host-loss exit code to the tab-level handler', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transportFactoryQueue.push(transport) const manager = createManager(1) @@ -293,8 +298,9 @@ export function registerPtyConnectionPtyExitTeardownTests(): void { it('keeps a mounted split pane binding across a synthetic host-loss exit', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const manager = createManager(2) @@ -324,8 +330,9 @@ export function registerPtyConnectionPtyExitTeardownTests(): void { it('tears down the sole terminal when a freshly-spawned PTY exits after the user typed input', async () => { // Why: an explicit `exit` (or any typed input) is a deliberate close, not a failed-startup shell, so the worktree should deactivate as before. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const pane = createPane(1) const transport = createMockTransport('tab-pty') transportFactoryQueue.push(transport) @@ -356,8 +363,9 @@ export function registerPtyConnectionPtyExitTeardownTests(): void { it('tears down a failed local terminal after user input', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks12 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks12 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const pane = createPane(1) const transport = createMockTransport('tab-pty') transportFactoryQueue.push(transport) @@ -383,8 +391,9 @@ export function registerPtyConnectionPtyExitTeardownTests(): void { it('does not claim a capacity overlay for a failed local split pane', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks13 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks13 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transportFactoryQueue.push(transport) const manager = createManager(2) @@ -410,8 +419,9 @@ export function registerPtyConnectionPtyExitTeardownTests(): void { ) await loadFreshTerminalModules() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks14 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks14 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const callbacks: ConnectCallbacks[] = [] const transport = createMockTransport('resume-pty') transport.connect.mockImplementation(async (options: { callbacks: ConnectCallbacks }) => { @@ -462,8 +472,9 @@ export function registerPtyConnectionPtyExitTeardownTests(): void { ) await loadFreshTerminalModules() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks15 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks15 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const callbacks: ConnectCallbacks[] = [] let currentPtyId = 'lost-pty' const transport = createMockTransport(currentPtyId) @@ -516,8 +527,9 @@ export function registerPtyConnectionPtyExitTeardownTests(): void { it('tears down the sole terminal when a reattached (not freshly spawned) PTY exits', async () => { // Reattach skips onPtySpawn; the unused-new-shell guard must not retain a dead previously-live session. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks16 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks16 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transportFactoryQueue.push(transport) const manager = createManager(1) @@ -542,8 +554,9 @@ export function registerPtyConnectionPtyExitTeardownTests(): void { it('rebinds a provider replacement without granting fresh-spawn exit protection', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks17 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks17 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) let transportPtyId = 'terminal-old' const transport = createMockTransport(transportPtyId) transport.getPtyId = vi.fn(() => transportPtyId) @@ -623,8 +636,9 @@ export function registerPtyConnectionEstablishedPtyExitTests(): void { it('closes a split pane when an established PTY exits after output', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks21 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks21 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } const transport = createMockTransport('pty-pane-2') transport.connect.mockImplementation( @@ -663,8 +677,9 @@ export function registerPtyConnectionEstablishedPtyExitTests(): void { it('removes the agent row when an established PTY exits through EOF (#12907)', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks22 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks22 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const manager = createManager(2) @@ -690,8 +705,9 @@ export function registerPtyConnectionEstablishedPtyExitTests(): void { it('closes a split pane when an established PTY exits after terminal input', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks23 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks23 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const pane = createPane(2) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) @@ -728,8 +744,9 @@ export function registerPtyConnectionEstablishedPtyExitTests(): void { it('ignores a late exit from a transport that no longer owns the pane', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const oldTransport = createMockTransport('old-pty') const replacementTransport = createMockTransport('new-pty') transportFactoryQueue.push(oldTransport) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-pty-shutdown-exit-deferral.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-pty-shutdown-exit-deferral.spec.ts index 749d509a808..9bbc7f18c57 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-pty-shutdown-exit-deferral.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-pty-shutdown-exit-deferral.spec.ts @@ -22,7 +22,9 @@ export function registerPtyConnectionShutdownExitDeferralTests( ): void { it('keeps the surviving split pane mounted when an intentional pane-close PTY exit arrives', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') fixture.transportQueue.push(transport) const manager = createManager(1) @@ -53,7 +55,9 @@ export function registerPtyConnectionShutdownExitDeferralTests( it('defers all exit-side state mutation while worktree shutdown verification is pending', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { settleDeferredPtyShutdownExits } = await import('../../pty-transport/shutdown/pty-shutdown-exit-deferral') const transport = createMockTransport('pty-pane-2') @@ -92,7 +96,9 @@ export function registerPtyConnectionShutdownExitDeferralTests( it('keeps renderer state intact for an exit deferred through rollback', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { settleDeferredPtyShutdownExits } = await import('../../pty-transport/shutdown/pty-shutdown-exit-deferral') const transport = createMockTransport('pty-pane-2') @@ -127,7 +133,9 @@ export function registerPtyConnectionShutdownExitDeferralTests( it('preserves wake identifiers when exit arrives after a committed shutdown', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { markCommittedPtyShutdowns } = await import('../../pty-transport/shutdown/pty-shutdown-exit-deferral') const transport = createMockTransport('pty-pane-2') diff --git a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-session-liveness.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-session-liveness.spec.ts index 2981ea548b5..185dc08e2c1 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-session-liveness.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-session-liveness.spec.ts @@ -67,8 +67,9 @@ export function registerPtyConnectionSessionLivenessTests(): void { describe('reconcileIfSessionMissing', () => { it('closes a split pane when targeted liveness says its local session is missing', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } const transport = createMockTransport('pty-pane-2') transport.connect.mockImplementation( @@ -104,8 +105,9 @@ export function registerPtyConnectionSessionLivenessTests(): void { it('does not close when targeted liveness is live or unknown', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const manager = createManager(2) @@ -132,8 +134,9 @@ export function registerPtyConnectionSessionLivenessTests(): void { it('does not apply a stale targeted liveness result after reattach', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) let resolveHasPty: (value: boolean) => void = () => { throw new Error('hasPty promise resolver was not initialized') } @@ -170,8 +173,9 @@ export function registerPtyConnectionSessionLivenessTests(): void { it('does NOT tear down a newborn pane when liveness was requested before it bound', async () => { // Liveness requested before binding cannot prove the fresh PTY dead. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } const transport = createMockTransport('pty-pane-2') transport.connect.mockImplementation( @@ -215,8 +219,9 @@ export function registerPtyConnectionSessionLivenessTests(): void { it('tears down the pane when liveness was requested after it bound', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } const transport = createMockTransport('pty-pane-2') transport.connect.mockImplementation( @@ -262,8 +267,9 @@ export function registerPtyConnectionSessionLivenessTests(): void { it('routes the last pane through onPtyExitRef when its session is dead', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-1') transportFactoryQueue.push(transport) const manager = createManager(1) @@ -288,8 +294,9 @@ export function registerPtyConnectionSessionLivenessTests(): void { it('is a no-op for remote: web-runtime ids', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) enableActiveRuntimeEnvironment('env-1') const transport = createMockTransport('remote:env-1:pane-2') transport.getConnectionId.mockReturnValue(null) @@ -317,8 +324,9 @@ export function registerPtyConnectionSessionLivenessTests(): void { it('is a no-op for SSH/non-local ids (non-null connectionId)', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transport.getConnectionId.mockReturnValue('ssh-target-1') transportFactoryQueue.push(transport) @@ -345,8 +353,9 @@ export function registerPtyConnectionSessionLivenessTests(): void { it('respects suppression: a suppressed dead session keeps the pane mounted', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-pane-2') transportFactoryQueue.push(transport) const manager = createManager(2) @@ -375,8 +384,9 @@ export function registerPtyConnectionSessionLivenessTests(): void { it('still closes the replacement PTY after a suppressed restart rebinds the pane', async () => { // Scope exit guards by PTY ID so a rebound replacement’s later exit still tears down. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } const transport = createMockTransport('pty-pane-2') transport.connect.mockImplementation( @@ -426,8 +436,9 @@ export function registerPtyConnectionSessionLivenessTests(): void { it('closes a split pane exactly once across reconcile + a racing real exit', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } const transport = createMockTransport('pty-pane-2') transport.connect.mockImplementation( @@ -472,8 +483,9 @@ export function registerPtyConnectionSessionLivenessTests(): void { it('closes a genuinely-dead non-suppressed pane once (not misread as suppressed)', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks12 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks12 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } const transport = createMockTransport('pty-pane-2') transport.connect.mockImplementation( diff --git a/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-hook-completion-side-effects.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-hook-completion-side-effects.spec.ts index c9842a1bc74..c1df505f42f 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-hook-completion-side-effects.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-hook-completion-side-effects.spec.ts @@ -80,8 +80,9 @@ export function registerPtyConnectionHookCompletionSideEffectsTests(): void { // The completion settings subscription is shared per module load. await loadFreshTerminalModules() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-hook') transportFactoryQueue.push(transport) enableActiveRuntimeEnvironment() @@ -188,8 +189,9 @@ export function registerPtyConnectionHookCompletionSideEffectsTests(): void { ) await loadFreshTerminalModules() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-crashed-codex') transportFactoryQueue.push(transport) vi.useFakeTimers() @@ -282,8 +284,9 @@ export function registerPtyConnectionHookCompletionSideEffectsTests(): void { it('drops an exited agent completion when a replacement agent hook row is active', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-replaced-codex') transportFactoryQueue.push(transport) vi.useFakeTimers() @@ -355,8 +358,9 @@ export function registerPtyConnectionHookCompletionSideEffectsTests(): void { const { dispatchAgentHookTerminalLifecycle } = await import('../../agent-completion/agent-hook-terminal-lifecycle') const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-replaced-codex') transportFactoryQueue.push(transport) vi.useFakeTimers() diff --git a/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-hook-idle-arbitration.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-hook-idle-arbitration.test.ts index f9c77639cbe..9612737f831 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-hook-idle-arbitration.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-hook-idle-arbitration.test.ts @@ -65,7 +65,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -150,7 +150,9 @@ describe('connectPanePty', () => { it('dispatches agent-task-complete on working→idle and raises tab/worktree unread', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { useNotificationDispatch } = await vi.importActual( '../../notifications/use-notification-dispatch' ) @@ -240,7 +242,9 @@ describe('connectPanePty', () => { it('ignores title-only idle while fresh hook status is still working', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) const paneKey = makePaneKey('tab-1', LEAF_1) @@ -286,7 +290,9 @@ describe('connectPanePty', () => { { title: '✳ Claude Code', completion: true } ])('requires replacement identity over a fresh hook: $title', async ({ title, completion }) => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) vi.useFakeTimers() @@ -345,7 +351,9 @@ describe('connectPanePty', () => { it('ignores an explicit idle title while fresh hook identity is unknown', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) const paneKey = makePaneKey('tab-1', LEAF_1) @@ -388,7 +396,9 @@ describe('connectPanePty', () => { it('ignores a Pi idle title while compatible OMP hook status is active', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) const paneKey = makePaneKey('tab-1', LEAF_1) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-notification-settings-gating.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-notification-settings-gating.spec.ts index 079130b0947..e6aeac4846a 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-notification-settings-gating.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-notification-settings-gating.spec.ts @@ -68,8 +68,9 @@ export function registerPtyConnectionNotificationSettingsGatingTests(): void { it('lets concurrent agent-complete notifications win over terminal bell notifications', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { useNotificationDispatch } = await vi.importActual< typeof UseNotificationDispatchModule >('../../notifications/use-notification-dispatch') @@ -127,8 +128,9 @@ export function registerPtyConnectionNotificationSettingsGatingTests(): void { it('keeps an in-flight generic completion when desktop completion banners are enabled', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-codex') transportFactoryQueue.push(transport) @@ -198,8 +200,9 @@ export function registerPtyConnectionNotificationSettingsGatingTests(): void { it('restores a suppressed terminal bell when disabling pending agent completion', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-codex') transportFactoryQueue.push(transport) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-task-complete-dispatch.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-task-complete-dispatch.spec.ts index 09c14093eaf..e88eef8c7b3 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-task-complete-dispatch.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-task-complete-dispatch.spec.ts @@ -61,8 +61,9 @@ export function registerPtyConnectionTaskCompleteDispatchTests(): void { it('does not dispatch generic spinner completions when process inspection finds no agent', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-shell') transportFactoryQueue.push(transport) @@ -101,8 +102,9 @@ export function registerPtyConnectionTaskCompleteDispatchTests(): void { it('queues the idle cursor reset behind hidden agent output', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -142,8 +144,9 @@ export function registerPtyConnectionTaskCompleteDispatchTests(): void { it('does not use stale agent status from an earlier turn in task-complete notifications', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { useNotificationDispatch } = await vi.importActual< typeof UseNotificationDispatchModule >('../../notifications/use-notification-dispatch') diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/direct-ssh-hidden-output-restore-unavailable-banner.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/direct-ssh-hidden-output-restore-unavailable-banner.test.ts index 48fa382871e..6a5c7e67d33 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/direct-ssh-hidden-output-restore-unavailable-banner.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/direct-ssh-hidden-output-restore-unavailable-banner.test.ts @@ -48,7 +48,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -144,7 +144,9 @@ function stubMainBufferSnapshot( async function connectHiddenDirectSshPane(): Promise { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport(SSH_PTY_ID) const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-query-carry-osc-introducer-leak.repro.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-query-carry-osc-introducer-leak.repro.test.ts index cd662e91b6a..08ae80193ab 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-query-carry-osc-introducer-leak.repro.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-query-carry-osc-introducer-leak.repro.test.ts @@ -63,7 +63,9 @@ describe('hidden query carry vs a following OSC', () => { it('does not paint an OSC payload after the reveal restore when a hidden chunk ended mid-CSI', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const dataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-reconciliation.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-reconciliation.spec.ts index b7898e0094e..7e06273e42c 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-reconciliation.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-reconciliation.spec.ts @@ -73,8 +73,9 @@ export function registerPtyConnectionHiddenBacklogReconciliationTests(): void { binding: { syncProcessTracking: () => void; dispose: () => void } }> { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts index 599993bd510..9e2bd77fd64 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts @@ -78,7 +78,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -161,7 +161,9 @@ describe('connectPanePty', () => { // Use a real alt-screen pane so a stubbed normal-buffer check cannot pass without emitting the missing ?1049l reset. it('emits the alt-screen unstick when the pane is on alt and the model is not', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null @@ -213,7 +215,9 @@ describe('connectPanePty', () => { // Why: pins the switch-off hidden fallback chain — 2MB lossy cap drops the backlog, latches restore, and reveal repaints from the model snapshot. it('restores hidden backlog overflow from the main terminal snapshot on foreground output', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null @@ -267,7 +271,9 @@ describe('connectPanePty', () => { it('rebuilds normal and alternate buffers from an authoritative alternate snapshot', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null @@ -342,7 +348,9 @@ describe('connectPanePty', () => { it('keeps a hidden-output alt frame at the capture grid below the fit floor', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') let onData: ConnectCallbacks['onData'] transport.connect.mockImplementation(async ({ callbacks }: { callbacks: ConnectCallbacks }) => { @@ -404,7 +412,9 @@ describe('connectPanePty', () => { it('drains foreground output after a renderer-sourced hidden-backlog snapshot without seq', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null @@ -456,7 +466,9 @@ describe('connectPanePty', () => { it('slices abandoned pending chunks against a replay that already painted', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-delivery-gate.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-delivery-gate.spec.ts index 7c055aee351..67cf40344a0 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-delivery-gate.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-delivery-gate.spec.ts @@ -80,8 +80,9 @@ export function registerPtyConnectionHiddenDeliveryGateTests(): void { binding: { syncProcessTracking: () => void; dispose: () => void } }> { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-output-restore.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-output-restore.spec.ts index 710a04b98ea..a80fd6f8a27 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-output-restore.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-output-restore.spec.ts @@ -77,8 +77,9 @@ export function registerPtyConnectionHiddenOutputRestoreTests(): void { } as unknown as Document const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: @@ -174,8 +175,9 @@ export function registerPtyConnectionHiddenOutputRestoreTests(): void { it('restores hidden Codex output after a suppressed exit revives the same ptyId with a restarted seq counter', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: @@ -276,8 +278,9 @@ export function registerPtyConnectionHiddenOutputRestoreTests(): void { it('restores hidden Codex output when the pty seq counter restarts without an observed exit', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: @@ -355,8 +358,9 @@ export function registerPtyConnectionHiddenOutputRestoreTests(): void { it('writes ordinary hidden output live instead of proactively restoring a snapshot', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null @@ -409,8 +413,9 @@ export function registerPtyConnectionHiddenOutputRestoreTests(): void { it('pauses capable paired output while hidden and restores exactly on reveal', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const remotePtyId = 'remote:env-1@@terminal-1' const transport = createMockTransport(remotePtyId) let callbacks: ConnectCallbacks = {} @@ -554,8 +559,9 @@ export function registerPtyConnectionHiddenOutputRestoreTests(): void { it('locally gates hidden paired output when a legacy host cannot pause it', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const remotePtyId = 'remote:legacy-env@@terminal-1' const transport = createMockTransport(remotePtyId) let callbacks: ConnectCallbacks = {} diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-query-snapshot-authority.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-query-snapshot-authority.spec.ts index 23d3cba40cf..89222c2c16f 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-query-snapshot-authority.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-query-snapshot-authority.spec.ts @@ -64,8 +64,9 @@ export function registerPtyConnectionHiddenQuerySnapshotAuthorityTests(): void { it('keeps split hidden-to-visible Codex stateful queries behind snapshot restore', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -120,8 +121,9 @@ export function registerPtyConnectionHiddenQuerySnapshotAuthorityTests(): void { it('preserves live agent cursor and focus modes on hidden-to-visible snapshot restore', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -197,8 +199,9 @@ export function registerPtyConnectionHiddenQuerySnapshotAuthorityTests(): void { it('lets fresh host shell proof outrank stale live-agent metadata on reveal', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -265,8 +268,9 @@ export function registerPtyConnectionHiddenQuerySnapshotAuthorityTests(): void { it('preserves current behavior when a snapshot has no host ownership proof', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks12 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks12 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -329,8 +333,9 @@ export function registerPtyConnectionHiddenQuerySnapshotAuthorityTests(): void { it('keeps a live alternate-screen pane interactive when a legacy snapshot omits its mode flag', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks13 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks13 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -389,8 +394,9 @@ export function registerPtyConnectionHiddenQuerySnapshotAuthorityTests(): void { it('grounds a stale alternate-screen snapshot when the host proves shell ownership', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks14 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks14 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-fit-overflow.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-fit-overflow.test.ts index 3666589ab65..5d9fa2bfc9a 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-fit-overflow.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-fit-overflow.test.ts @@ -66,7 +66,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -171,8 +171,9 @@ describe('connectPanePty', () => { 'recovers $name live output when the deadline interrupts an answered snapshot', async ({ name, pending, repaint, covered }) => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') let onData: ConnectCallbacks['onData'] transport.connect.mockImplementation( diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-loss-disclosure.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-loss-disclosure.test.ts index a06040a4936..9b8cb6d1a7a 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-loss-disclosure.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-loss-disclosure.test.ts @@ -69,7 +69,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -191,7 +191,9 @@ async function connectHiddenPane( const deps = buildPaneConnectionDeps(() => mockStoreState, { isVisibleRef: { current: false } }) - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const disposable = await connectMockPanePty( pane, @@ -523,8 +525,9 @@ describe('hidden-output restore loss disclosure (STA-4869)', () => { isVisibleRef: { current: false }, startup: { command: 'codex' } }) - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const disposable = await connectMockPanePty( pane, diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-marker-handoff.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-marker-handoff.test.ts index 987669ca6cc..255e6c52abb 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-marker-handoff.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-marker-handoff.test.ts @@ -63,7 +63,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -225,7 +225,9 @@ async function connectPane(visible: boolean): Promise { const deps = buildPaneConnectionDeps(() => mockStoreState, { isVisibleRef: { current: visible } }) - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const binding = await connectMockPanePty( pane, diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts index 0c998a4b8c4..61d02388f2e 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts @@ -75,7 +75,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -157,7 +157,9 @@ describe('connectPanePty', () => { it('restores overflowed hidden remote runtime output from its serialized snapshot', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('remote:env-1@@terminal-1') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null @@ -217,7 +219,9 @@ describe('connectPanePty', () => { it('preserves the painted normal buffer when a successful hidden restore has no image', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('remote:env-1@@terminal-1') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-snapshot-live-overlap.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-snapshot-live-overlap.spec.ts index ca71b2a24f8..4120dd69407 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-snapshot-live-overlap.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-snapshot-live-overlap.spec.ts @@ -55,8 +55,9 @@ export function registerPtyConnectionHiddenSnapshotLiveOverlapTests(): void { it('writes foreground chunks that are newer than the restored main snapshot', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null @@ -110,8 +111,9 @@ export function registerPtyConnectionHiddenSnapshotLiveOverlapTests(): void { it('writes only the live chunk suffix not covered by the restored main snapshot', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null @@ -169,8 +171,9 @@ export function registerPtyConnectionHiddenSnapshotLiveOverlapTests(): void { it('re-snapshots instead of duplicating partially overlapped chunks with stripped OSC bytes', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-snapshot-resize-signals.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-snapshot-resize-signals.spec.ts index d49c6ac331f..f6288555994 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-snapshot-resize-signals.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-snapshot-resize-signals.spec.ts @@ -78,8 +78,9 @@ export function registerPtyConnectionHiddenSnapshotResizeSignalsTests(): void { } as unknown as Document const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null @@ -171,8 +172,9 @@ export function registerPtyConnectionHiddenSnapshotResizeSignalsTests(): void { it('does not signal SIGWINCH after hidden-backlog snapshot replay when dimensions are unchanged', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null @@ -227,8 +229,9 @@ export function registerPtyConnectionHiddenSnapshotResizeSignalsTests(): void { it('writes a background-origin alternate-screen repaint that arrives after the reveal restore', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) vi.useFakeTimers({ toFake: [ 'setTimeout', @@ -321,8 +324,9 @@ export function registerPtyConnectionHiddenSnapshotResizeSignalsTests(): void { it('re-restores a skipped alt frame from the model when the fit lands back on the capture grid', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) vi.useFakeTimers({ toFake: [ 'setTimeout', @@ -399,8 +403,9 @@ export function registerPtyConnectionHiddenSnapshotResizeSignalsTests(): void { it('restores a dropped daemon alt frame from the model when the fit lands back on the capture grid', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => sessionId diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-post-dispose-restore-termination.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-post-dispose-restore-termination.test.ts index 6fd629f2b36..300e74cc669 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-post-dispose-restore-termination.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-post-dispose-restore-termination.test.ts @@ -49,7 +49,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -94,7 +94,9 @@ describe('connectPanePty', () => { // Disposed restore tasks must not re-arm from finally: instant exits otherwise create an unbounded promise chain that exhausts the heap. it('stops re-arming the hidden output restore once the pane binding is disposed', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-remote-pause-drop-notice.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-remote-pause-drop-notice.spec.ts index 61bb9964124..36bbbbe7929 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-remote-pause-drop-notice.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-remote-pause-drop-notice.spec.ts @@ -53,8 +53,9 @@ export function registerPtyConnectionRemotePauseDropNoticeTests(): void { async function connectRemotePane(dropsReported: boolean) { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const remotePtyId = 'remote:env-1@@terminal-1' const transport = createMockTransport(remotePtyId) const callbacks: { current: ConnectCallbacks } = { current: {} } diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-replay-payload-handling.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-replay-payload-handling.spec.ts index 94df5711e4f..892c4db0ddb 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-replay-payload-handling.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-replay-payload-handling.spec.ts @@ -85,8 +85,9 @@ export function registerPtyConnectionReplayPayloadHandlingTests(): void { it('preserves a scrolled-up viewport after hidden-backlog snapshot replay', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null @@ -146,8 +147,9 @@ export function registerPtyConnectionReplayPayloadHandlingTests(): void { it('cancels a delayed snapshot scroll restore when the pane binding is disposed', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { isTerminalScrollIntentRebuildInFlight } = await import('@/lib/pane-manager/terminal-scroll-intent-rebuild') const transport = createMockTransport('pty-id') @@ -212,8 +214,9 @@ export function registerPtyConnectionReplayPayloadHandlingTests(): void { it('does not apply a delayed snapshot restore after newer user intent', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { markTerminalFollowOutput } = await import('@/lib/pane-manager/terminal-scroll-intent') const transport = createMockTransport('pty-id') const capturedDataCallback: { @@ -275,8 +278,9 @@ export function registerPtyConnectionReplayPayloadHandlingTests(): void { it('rebuilds WebGL after remote buffered replay arrives on an already-open pane', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) enableActiveRuntimeEnvironment() const transport = createMockTransport('remote:env-1@@terminal-1') const capturedReplayCallback: { @@ -338,8 +342,9 @@ export function registerPtyConnectionReplayPayloadHandlingTests(): void { const manager = createManager(1) const deps = createDeps() const disposable = await withMockedDocumentActiveElement(textarea, async () => { - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const connection = connectPanePty( pane as never, @@ -384,8 +389,9 @@ export function registerPtyConnectionReplayPayloadHandlingTests(): void { const manager = createManager(1) const deps = createDeps() const disposable = await withMockedDocumentActiveElement(textarea, async () => { - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const connection = connectPanePty( pane as never, @@ -431,8 +437,9 @@ export function registerPtyConnectionReplayPayloadHandlingTests(): void { const manager = createManager(1) const deps = createDeps() const disposable = await withMockedDocumentActiveElement(textarea, async () => { - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const connection = connectPanePty( pane as never, @@ -479,8 +486,9 @@ export function registerPtyConnectionReplayPayloadHandlingTests(): void { const manager = createManager(1) const deps = createDeps() const disposable = await withMockedDocumentActiveElement(textarea, async () => { - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const connection = connectPanePty( pane as never, @@ -509,8 +517,9 @@ export function registerPtyConnectionReplayPayloadHandlingTests(): void { it('does not clear restored scrollback when eager metadata replay opts out', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedReplayCallback: { current: ((data: string, meta?: { clearBeforeReplay?: boolean }) => void) | null @@ -552,8 +561,9 @@ export function registerPtyConnectionReplayPayloadHandlingTests(): void { it('does not write a clear or reset for empty eager metadata replay', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedReplayCallback: { current: ((data: string, meta?: { clearBeforeReplay?: boolean }) => void) | null @@ -588,8 +598,9 @@ export function registerPtyConnectionReplayPayloadHandlingTests(): void { it('coalesces remote replay payloads that overlap before parsing starts', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) enableActiveRuntimeEnvironment() const transport = createMockTransport('remote:env-1@@terminal-1') const capturedReplayCallback: { @@ -643,8 +654,9 @@ export function registerPtyConnectionReplayPayloadHandlingTests(): void { it('holds newer live bytes until a later replay frame has fully parsed', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks12 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks12 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { deliverTerminalDataWithDeferredCredit } = await import('@/lib/pane-manager/terminal-delivery-credit') enableActiveRuntimeEnvironment() @@ -707,8 +719,9 @@ export function registerPtyConnectionReplayPayloadHandlingTests(): void { it('drops a queued relay replay instead of retagging it for a replacement PTY', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks13 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks13 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) enableActiveRuntimeEnvironment() const transport = createMockTransport('remote:env-1@@terminal-old') const replayCallback: { current: ((data: string) => void) | null } = { current: null } @@ -745,8 +758,9 @@ export function registerPtyConnectionReplayPayloadHandlingTests(): void { it('requests snapshot recovery for one oversized live frame deferred by replay', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks14 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks14 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { deliverTerminalDataWithDeferredCredit } = await import('@/lib/pane-manager/terminal-delivery-credit') const transport = createMockTransport('pty-large-live') diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-restored-baseline-shortfall.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-restored-baseline-shortfall.test.ts index a93de97c9c4..98086ad58b6 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-restored-baseline-shortfall.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-restored-baseline-shortfall.test.ts @@ -58,7 +58,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -153,7 +153,9 @@ describe('restored snapshot baseline shortfall (STA-5179)', () => { terminalMainSideEffectAuthority: true } as StoreState['settings'] const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-stalled-hidden-restore.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-stalled-hidden-restore.spec.ts index 57502b90265..e6ebf41d056 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-stalled-hidden-restore.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-stalled-hidden-restore.spec.ts @@ -64,8 +64,9 @@ export function registerPtyConnectionStalledHiddenRestoreTests(): void { it('abandons a stalled hidden restore with reset, warning, then pending foreground', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null @@ -157,8 +158,9 @@ export function registerPtyConnectionStalledHiddenRestoreTests(): void { // A dropped span can swallow bold reset; abandonment must ground the pen when no snapshot will restore it (STA-4042). it('clears the SGR pen before draining abandoned foreground chunks', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null @@ -217,8 +219,9 @@ export function registerPtyConnectionStalledHiddenRestoreTests(): void { it('grounds byte-gap state before a remote restore re-arms', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const remotePtyId = 'remote:env-1@@terminal-rearm' const transport = createMockTransport(remotePtyId) const capturedDataCallback: { @@ -271,8 +274,9 @@ export function registerPtyConnectionStalledHiddenRestoreTests(): void { it('falls back after repeated null hidden restore retries and drains blocked foreground', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null @@ -337,8 +341,9 @@ export function registerPtyConnectionStalledHiddenRestoreTests(): void { it('drops pending foreground overflow when a stalled hidden restore falls back', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null @@ -395,8 +400,9 @@ export function registerPtyConnectionStalledHiddenRestoreTests(): void { it('coalesces tiny pending foreground chunks when stalled hidden restore falls back', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null @@ -507,8 +513,9 @@ export function registerPtyConnectionStalledHiddenRestoreTests(): void { let disposable: { dispose: () => void } | null = null try { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null @@ -578,8 +585,9 @@ export function registerPtyConnectionStalledHiddenRestoreTests(): void { it('keeps a newer same-PTY hidden restore after a timed-out snapshot resolves late', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null @@ -686,8 +694,9 @@ export function registerPtyConnectionStalledHiddenRestoreTests(): void { it('ignores an async hidden-backlog snapshot if the pane changes PTYs first', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('old-pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null @@ -746,8 +755,9 @@ export function registerPtyConnectionStalledHiddenRestoreTests(): void { it('does not recover stale hidden backlog state after the pane switches PTYs', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('old-pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null @@ -802,8 +812,9 @@ export function registerPtyConnectionStalledHiddenRestoreTests(): void { // The serializer subscribes to window.api once per module load. await loadFreshTerminalModules() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-visible-pane-output-pause-latch.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-visible-pane-output-pause-latch.test.ts index f5e14dbc6be..1d9d1c8edba 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-visible-pane-output-pause-latch.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-visible-pane-output-pause-latch.test.ts @@ -46,7 +46,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -108,7 +108,9 @@ async function connectVisibleRemotePane(): Promise<{ pauseCalls: () => boolean[] }> { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport(REMOTE_PTY_ID) transport.setOutputPaused = vi.fn(() => true) transport.serializeBuffer = vi.fn() diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/remote-park-reveal-unverifiable-retry.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/remote-park-reveal-unverifiable-retry.test.ts index 05158a5dea5..ae7ce1a6c4e 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/remote-park-reveal-unverifiable-retry.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/remote-park-reveal-unverifiable-retry.test.ts @@ -69,7 +69,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -163,7 +163,9 @@ async function revealParkedRemotePane( } const pane = createPane(1) const { writes } = captureCallbackTerminalWrites(pane) - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) // Why the active pane: an inactive split defers its restore to the frame scheduler. const binding = await connectMockPanePty( diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output/pty-connection-foreground-write-path.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/output/pty-connection-foreground-write-path.spec.ts index fc171b25900..e0192924160 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output/pty-connection-foreground-write-path.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output/pty-connection-foreground-write-path.spec.ts @@ -60,8 +60,9 @@ export function registerPtyConnectionForegroundBulkAndInteractiveOutputTests(): it('queues visible bulk output off the synchronous xterm write path', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const pane = createPane(1) const transport = createMockTransport('pty-1') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } @@ -93,8 +94,9 @@ export function registerPtyConnectionForegroundBulkAndInteractiveOutputTests(): it('keeps ANSI redraws after terminal input on the immediate xterm write path', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const pane = createPane(1) const transport = createMockTransport('pty-1') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } @@ -129,8 +131,9 @@ export function registerPtyConnectionForegroundBulkAndInteractiveOutputTests(): it('keeps large ANSI redraws after terminal input on the immediate xterm write path', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const pane = createPane(1) const transport = createMockTransport('pty-1') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } @@ -201,8 +204,9 @@ export function registerPtyConnectionForegroundFrameSchedulingTests(): void { it('keeps large ANSI redraws after captured shortcut input on the immediate path', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const pane = createPane(1) const transport = createMockTransport('pty-1') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } @@ -233,8 +237,9 @@ export function registerPtyConnectionForegroundFrameSchedulingTests(): void { it('does not let OpenTUI-style small ANSI redraw bursts monopolize foreground writes', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const pane = createPane(1) const transport = createMockTransport('pty-1') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } @@ -287,8 +292,9 @@ export function registerPtyConnectionForegroundFrameSchedulingTests(): void { await loadFreshTerminalModules() try { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -340,8 +346,9 @@ export function registerPtyConnectionForegroundFrameSchedulingTests(): void { await loadFreshTerminalModules() try { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -391,8 +398,9 @@ export function registerPtyConnectionForegroundFrameSchedulingTests(): void { await loadFreshTerminalModules() try { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -442,8 +450,9 @@ export function registerPtyConnectionForegroundFrameSchedulingTests(): void { await loadFreshTerminalModules() try { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -502,8 +511,9 @@ export function registerPtyConnectionForegroundFrameSchedulingTests(): void { await loadFreshTerminalModules() try { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks12 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks12 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output/pty-connection-hidden-output-scheduling.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/output/pty-connection-hidden-output-scheduling.spec.ts index 0b6e3dfb0e7..202ccea87fa 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output/pty-connection-hidden-output-scheduling.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output/pty-connection-hidden-output-scheduling.spec.ts @@ -68,8 +68,9 @@ export function registerPtyConnectionHiddenOutputSchedulingTests(): void { it('keeps hidden synchronized output off the global atlas recovery path', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -121,8 +122,9 @@ export function registerPtyConnectionHiddenOutputSchedulingTests(): void { it('keeps split hidden synchronized output off the global atlas recovery path', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -170,8 +172,9 @@ export function registerPtyConnectionHiddenOutputSchedulingTests(): void { it('does not schedule hidden atlas recovery for ordinary rich text or metadata output', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -217,8 +220,9 @@ export function registerPtyConnectionHiddenOutputSchedulingTests(): void { it('keeps hidden TUI redraw output off the global atlas recovery path', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -261,8 +265,9 @@ export function registerPtyConnectionHiddenOutputSchedulingTests(): void { it('keeps hidden rewrite frames on the pane-local output path', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -313,8 +318,9 @@ export function registerPtyConnectionHiddenOutputSchedulingTests(): void { it('keeps a background-origin alternate-screen chunk in the stream, pane-local', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string, meta?: { background?: boolean }) => void) | null @@ -373,8 +379,9 @@ export function registerPtyConnectionHiddenOutputSchedulingTests(): void { it('queues visible split-pane PTY bytes when the pane is not active', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -409,8 +416,9 @@ export function registerPtyConnectionHiddenOutputSchedulingTests(): void { it('queues visible ANSI redraws when only another split pane is active', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -451,8 +459,9 @@ export function registerPtyConnectionHiddenOutputSchedulingTests(): void { visibilityState: 'hidden' } const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-agent-session-resume.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-agent-session-resume.spec.ts index 6b765c044d0..b8a07584357 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-agent-session-resume.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-agent-session-resume.spec.ts @@ -69,8 +69,9 @@ export function registerPtyConnectionSleepingRecordResumeTests(): void { it('uses sleeping-record launch config for pane cold restore after settings change', async () => { vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] }) const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('fresh-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { if (sessionId) { @@ -218,8 +219,9 @@ export function registerPtyConnectionLiveResumeIdentityTests(): void { it('prefers live-entry launch config for pane cold restore when status survived PTY loss', async () => { vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] }) const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('fresh-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { if (sessionId) { @@ -311,8 +313,9 @@ export function registerPtyConnectionLiveResumeIdentityTests(): void { async (kind) => { vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] }) const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const retainedPtyId = 'wt-1@@lost-pty' const transport = createMockTransport() transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => @@ -401,8 +404,9 @@ export function registerPtyConnectionLiveResumeIdentityTests(): void { it('ignores stale live launch config when cold restore identity lookup rejects it', async () => { vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] }) const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('fresh-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { if (sessionId) { @@ -512,8 +516,9 @@ export function registerPtyConnectionLiveResumeIdentityTests(): void { it('shows the restored banner when a sleeping resume falls back to a fresh shell', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const staleSessionId = 'wt-1@@stale-session' const transport = createMockTransport() transport.connect.mockImplementation(async (opts: { sessionId?: string }) => { diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-cold-restore-agent-resume.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-cold-restore-agent-resume.spec.ts index 6be0d7e8804..4b4f0d23fbd 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-cold-restore-agent-resume.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-cold-restore-agent-resume.spec.ts @@ -68,8 +68,9 @@ export function registerPtyConnectionColdRestoreAgentResumeTests(): void { it('resumes the provider agent session when daemon reattach cold-restores a fresh shell', async () => { vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] }) const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('fresh-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { if (sessionId) { @@ -162,8 +163,9 @@ export function registerPtyConnectionColdRestoreAgentResumeTests(): void { it('uses WSL quoting for cold-restored agent resume in Windows-path WSL projects', async () => { vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] }) const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('fresh-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { if (sessionId) { @@ -260,8 +262,9 @@ export function registerPtyConnectionColdRestoreAgentResumeTests(): void { it('resumes the same agent after consecutive daemon losses before another status arrives', async () => { vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] }) const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('fresh-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { if (sessionId) { @@ -396,8 +399,9 @@ export function registerPtyConnectionColdRestoreAgentResumeTests(): void { it('marks the pane as freshly started when main declined an unverifiable resume', async () => { vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] }) const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('fresh-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { if (sessionId) { @@ -475,8 +479,9 @@ export function registerPtyConnectionColdRestoreAgentResumeTests(): void { it('resumes from an unambiguous legacy sleeping record when cold-restoring a preserved pane', async () => { vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] }) const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('fresh-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { if (sessionId) { @@ -575,8 +580,9 @@ export function registerPtyConnectionColdRestoreAgentResumeTests(): void { it('does not choose a non-exact legacy record when same-tab provider sessions differ', async () => { vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] }) const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('fresh-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { if (sessionId) { diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-cold-restore-repaint.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-cold-restore-repaint.spec.ts index f774071bd02..f1053261fda 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-cold-restore-repaint.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-cold-restore-repaint.spec.ts @@ -70,8 +70,9 @@ export function registerPtyConnectionColdRestoreRepaintTests(): void { }) it('paints only the daemon snapshot when reattach result includes both snapshot and replay', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { if (sessionId) { @@ -116,8 +117,9 @@ export function registerPtyConnectionColdRestoreRepaintTests(): void { it('paints only relay replay when reattach result has replay and coldRestore but no snapshot', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { if (sessionId) { @@ -169,8 +171,9 @@ export function registerPtyConnectionColdRestoreRepaintTests(): void { it('blanks restored scrollback before fresh shell output', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('fresh-pty') const written: string[] = [] transport.connect.mockImplementation( @@ -230,8 +233,9 @@ export function registerPtyConnectionColdRestoreRepaintTests(): void { it('cold-restores at the recovered grid and clears only the dirty viewport before blanking', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('fresh-pty') const written: string[] = [] const operations: ( diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-cold-restore-resume-command.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-cold-restore-resume-command.spec.ts index eca4181b98e..3deb14afb0e 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-cold-restore-resume-command.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-cold-restore-resume-command.spec.ts @@ -76,8 +76,9 @@ export function registerPtyConnectionColdRestoreResumeCommandTests(): void { try { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const paneKey = makePaneKey('tab-1', LEAF_2) let activePtyId: string | null = 'restored-session' const transport = createMockTransport('restored-session') @@ -203,8 +204,9 @@ export function registerPtyConnectionColdRestoreResumeCommandTests(): void { try { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const paneKey = makePaneKey('tab-1', LEAF_2) let activePtyId: string | null = 'restored-session' const transport = createMockTransport('restored-session') @@ -317,8 +319,9 @@ export function registerPtyConnectionColdRestoreResumeCommandTests(): void { state: 'working' | 'done' ): Promise { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const paneKey = makePaneKey('tab-1', LEAF_2) const transport = createMockTransport('restored-session') transport.connect.mockResolvedValue({ @@ -375,8 +378,9 @@ export function registerPtyConnectionColdRestoreResumeCommandTests(): void { it('keeps a contentless reattach when a live status supersedes passive sleep evidence', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const paneKey = makePaneKey('tab-1', LEAF_2) const transport = createMockTransport('restored-session') transport.connect.mockResolvedValue({ diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-daemon-snapshot-replay.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-daemon-snapshot-replay.spec.ts index 51ba9a09bc6..2a5abf5ae40 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-daemon-snapshot-replay.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-daemon-snapshot-replay.spec.ts @@ -1,3 +1,4 @@ +import { registerStaleDaemonSnapshotReplayTests } from './pty-connection-stale-daemon-snapshot-replay.spec' import { bindPtyConnectionTestMocks } from '../test-fixtures/pty-connection-mocks.spec' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { @@ -9,11 +10,7 @@ import { } from '../../../../../../shared/terminal/protocol/input-modes/terminal-mode-reset-profiles' import { replayEpilogue } from '../test-fixtures/pty-connection-test-replay-epilogue' import { Terminal } from '@xterm/headless' -import { - flushAsyncTicks, - createDeferred, - writeHeadlessTerminal -} from '../test-fixtures/pty-connection-test-async' +import { flushAsyncTicks, writeHeadlessTerminal } from '../test-fixtures/pty-connection-test-async' import { createRect } from '../test-fixtures/pty-connection-test-dom' import { LEAF_1, @@ -71,7 +68,9 @@ export function registerPtyConnectionDaemonSnapshotReplayTests(): void { it('clears the captured pen for a normal-buffer fallback reattach', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') const snapshot = 'ORCA-SGR-REPRO \x1b[1mBOLD-RUN-LEFT-OPEN\x1b[1;34H' transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { @@ -145,7 +144,9 @@ export function registerPtyConnectionDaemonSnapshotReplayTests(): void { it('returns a shell-owned daemon snapshot to the normal buffer on reattach', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => sessionId @@ -186,7 +187,9 @@ export function registerPtyConnectionDaemonSnapshotReplayTests(): void { it('drops a too-wide daemon alt frame and keeps the scrollback prefix', async () => { // Why: fixed-grid alt rows clip at a narrower viewport until the owner repaints. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { if (sessionId) { @@ -232,7 +235,9 @@ export function registerPtyConnectionDaemonSnapshotReplayTests(): void { it('keeps a daemon alt frame at its capture grid while the target grid is unknown', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => sessionId @@ -278,7 +283,9 @@ export function registerPtyConnectionDaemonSnapshotReplayTests(): void { it('falls back to the merged daemon snapshot when split metadata is incomplete', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => sessionId @@ -321,7 +328,9 @@ export function registerPtyConnectionDaemonSnapshotReplayTests(): void { it('keeps a daemon alt frame when the pane is not narrower than the capture', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { if (sessionId) { @@ -366,7 +375,9 @@ export function registerPtyConnectionDaemonSnapshotReplayTests(): void { it('drops a too-wide daemon alt frame on cold restore and keeps its history', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { if (sessionId) { @@ -416,7 +427,9 @@ export function registerPtyConnectionDaemonSnapshotReplayTests(): void { it('resizes the pane to the snapshot grid before replaying daemon snapshot bytes (bug #7279)', async () => { // Why: the daemon serializes soft-wrapped lines flat, so reattach must resize xterm to the snapshot grid before writing, or rows rewrap wrong. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { if (sessionId) { @@ -471,7 +484,9 @@ export function registerPtyConnectionDaemonSnapshotReplayTests(): void { it('waits for a recovered destination fit before forwarding its grid or live output', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { safeFit } = await import('@/lib/pane-manager/pane-tree-ops') const transport = createMockTransport('tab-pty') let deliverLiveData = (_data: string): void => {} @@ -537,7 +552,9 @@ export function registerPtyConnectionDaemonSnapshotReplayTests(): void { it('forwards the destination grid on reveal when the reattach fit was deferred by a display:none pane', async () => { // Hidden floating panels cannot fit during replay; deferred fit must restore the client grid and signal SIGWINCH before reveal reflows a live TUI. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { safeFit } = await import('@/lib/pane-manager/pane-tree-ops') const transport = createMockTransport('tab-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => @@ -593,7 +610,9 @@ export function registerPtyConnectionDaemonSnapshotReplayTests(): void { it('suppresses the deferred reattach grid push when mobile claims the PTY while hidden', async () => { // Recheck mobile takeover after the hidden pane gains a box; direct transport.resize bypasses the usual suppression. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { safeFit } = await import('@/lib/pane-manager/pane-tree-ops') const { setFitOverride } = await import('@/lib/pane-manager/mobile-fit-overrides') const transport = createMockTransport('tab-pty') @@ -656,7 +675,9 @@ export function registerPtyConnectionDaemonSnapshotReplayTests(): void { it('restores a pinned viewport only after a same-size reattach snapshot finishes parsing', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks12 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks12 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { markTerminalFollowOutput, markTerminalPinnedViewport } = await import('@/lib/pane-manager/terminal-scroll-intent') const transport = createMockTransport('tab-pty') @@ -706,160 +727,6 @@ export function registerPtyConnectionDaemonSnapshotReplayTests(): void { markTerminalFollowOutput(pane.terminal) }) - it('does not apply a queued reattach snapshot after the PTY is replaced', async () => { - const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks13 = await vi.importMock('@/lib/agent-status') - const transport = createMockTransport('tab-pty') - const reattachResult = createDeferred<{ - id: string - snapshot: string - }>() - const replayCallback: { current: ((data: string) => void) | null } = { current: null } - transport.connect.mockImplementation( - async ({ sessionId, callbacks }: { sessionId?: string; callbacks?: ConnectCallbacks }) => { - if (!sessionId) { - return null - } - replayCallback.current = callbacks?.onReplayData ?? null - return reattachResult.promise - } - ) - transportFactoryQueue.push(transport) - const pane = createPane(1) - const { writes, parseCallbacks } = captureCallbackTerminalWrites(pane) - const deps = createDeps({ - restoredLeafId: LEAF_1, - restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' } - }) - - connectPanePty( - pane as never, - createManager(1) as never, - bindPaneAgentTitleMocks(deps as never, agentTitleMocks13) - ) - await flushAsyncTicks(8) - replayCallback.current?.('blocking replay') - await flushAsyncTicks(12) - expect(writes).toEqual(['\x1b[?2026l\x1b[2J\x1b[3J\x1b[H']) - reattachResult.resolve({ id: 'tab-pty', snapshot: 'stale authoritative snapshot' }) - await flushAsyncTicks(12) - const resizeCallsBeforeReplacement = transport.resize.mock.calls.length - vi.mocked(transport.getPtyId).mockReturnValue('replacement-pty') - while (parseCallbacks.length > 0) { - parseCallbacks.shift()?.() - await flushAsyncTicks(4) - } - await flushAsyncTicks(12) - - expect(writes).not.toContain('stale authoritative snapshot') - expect(transport.resize).toHaveBeenCalledTimes(resizeCallsBeforeReplacement) - expect(window.api.pty.signal).not.toHaveBeenCalledWith('tab-pty', 'SIGWINCH') - }) - - it('does not apply a queued reattach snapshot after its PTY exits', async () => { - const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks14 = await vi.importMock('@/lib/agent-status') - const transport = createMockTransport('tab-pty') - const reattachResult = createDeferred<{ id: string; snapshot: string }>() - const replayCallback: { current: ((data: string) => void) | null } = { current: null } - transport.connect.mockImplementation( - async ({ callbacks }: { callbacks?: ConnectCallbacks }) => { - replayCallback.current = callbacks?.onReplayData ?? null - return reattachResult.promise - } - ) - transportFactoryQueue.push(transport) - const pane = createPane(1) - const { writes, parseCallbacks } = captureCallbackTerminalWrites(pane) - const deps = createDeps({ - restoredLeafId: LEAF_1, - restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' } - }) - - connectPanePty( - pane as never, - createManager(1) as never, - bindPaneAgentTitleMocks(deps as never, agentTitleMocks14) - ) - await flushAsyncTicks(8) - replayCallback.current?.('blocking replay') - await flushAsyncTicks(12) - reattachResult.resolve({ id: 'tab-pty', snapshot: 'dead authoritative snapshot' }) - await flushAsyncTicks(12) - const resizeCallsBeforeExit = transport.resize.mock.calls.length - vi.mocked(transport.getPtyId).mockReturnValue(null) - while (parseCallbacks.length > 0) { - parseCallbacks.shift()?.() - await flushAsyncTicks(4) - } - await flushAsyncTicks(12) - - expect(writes).not.toContain('dead authoritative snapshot') - expect(transport.resize).toHaveBeenCalledTimes(resizeCallsBeforeExit) - expect(window.api.pty.signal).not.toHaveBeenCalledWith('tab-pty', 'SIGWINCH') - expect(transport.sendInput).not.toHaveBeenCalledWith('\x1b[I') - }) - - it('drops stale callbacks but delivers fresh replacement output after an old replay clear', async () => { - const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks15 = await vi.importMock('@/lib/agent-status') - const { getTerminalScrollIntentKind, markTerminalPinnedViewport } = - await import('@/lib/pane-manager/terminal-scroll-intent') - const transport = createMockTransport('tab-pty') - const oldResult = createDeferred() - const oldCallbacks: { current: ConnectCallbacks | null } = { current: null } - const replacementCallbacks: { current: ConnectCallbacks | null } = { current: null } - let connectCount = 0 - transport.connect.mockImplementation( - async ({ callbacks }: { sessionId?: string; callbacks?: ConnectCallbacks }) => { - connectCount += 1 - if (connectCount === 1) { - oldCallbacks.current = callbacks ?? null - return oldResult.promise - } - vi.mocked(transport.getPtyId).mockReturnValue('replacement-pty') - replacementCallbacks.current = callbacks ?? null - return 'replacement-pty' - } - ) - transportFactoryQueue.push(transport) - const pane = createPane(1) - pane.terminal.buffer.active.viewportY = 80 - pane.terminal.buffer.active.baseY = 100 - markTerminalPinnedViewport(pane.terminal) - const { writes, parseCallbacks } = captureCallbackTerminalWrites(pane) - const deps = createDeps({ - restoredLeafId: LEAF_1, - restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' } - }) - - connectPanePty( - pane as never, - createManager(1) as never, - bindPaneAgentTitleMocks(deps as never, agentTitleMocks15) - ) - await flushAsyncTicks(8) - oldCallbacks.current?.onReplayData?.('old replay') - await flushAsyncTicks(8) - parseCallbacks.shift()?.() - await flushAsyncTicks(8) - oldCallbacks.current?.onError?.('SSH_SESSION_EXPIRED: tab-pty') - oldResult.resolve(undefined) - await flushAsyncTicks(20) - expect(replacementCallbacks.current).not.toBeNull() - - replacementCallbacks.current?.onData?.('B-PROMPT') - oldCallbacks.current?.onData?.('STALE-A') - while (parseCallbacks.length > 0) { - parseCallbacks.shift()?.() - await flushAsyncTicks(4) - } - await flushAsyncTicks(20) - - expect(writes).toContain('B-PROMPT') - expect(writes).not.toContain('STALE-A') - expect(pane.terminal.scrollToBottom).toHaveBeenCalled() - expect(getTerminalScrollIntentKind(pane.terminal)).toBe('followOutput') - }) + registerStaleDaemonSnapshotReplayTests(() => ({ transportFactoryQueue, createDeps })) }) } diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-deferred-reattach-live-output.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-deferred-reattach-live-output.spec.ts index 5a09893a2d5..dbe0b241d49 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-deferred-reattach-live-output.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-deferred-reattach-live-output.spec.ts @@ -60,8 +60,9 @@ export function registerPtyConnectionDeferredReattachLiveOutputTests(): void { it('does not consume the sleeping record when daemon reattach returns a live snapshot', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { if (sessionId) { @@ -109,8 +110,9 @@ export function registerPtyConnectionDeferredReattachLiveOutputTests(): void { it('does not resume the provider session when daemon reattach returns a live snapshot', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { if (sessionId) { @@ -163,8 +165,9 @@ export function registerPtyConnectionDeferredReattachLiveOutputTests(): void { 'preserves output while reconciling $kind on daemon adoption', async ({ snapshot, seq, count }) => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transport.connect.mockImplementation( async ({ @@ -204,8 +207,9 @@ export function registerPtyConnectionDeferredReattachLiveOutputTests(): void { it('drains live bytes after transport confirms an explicit reattach', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { deliverTerminalDataWithDeferredCredit } = await import('@/lib/pane-manager/terminal-delivery-credit') const transport = createMockTransport('tab-pty') @@ -253,8 +257,9 @@ export function registerPtyConnectionDeferredReattachLiveOutputTests(): void { it('re-enforces follow intent after deferred reattach live output parses', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { markTerminalFollowOutput } = await import('@/lib/pane-manager/terminal-scroll-intent') const transport = createMockTransport('tab-pty') transport.connect.mockImplementation( @@ -306,8 +311,9 @@ export function registerPtyConnectionDeferredReattachLiveOutputTests(): void { it('does not steal a newer user pin while deferred reattach output settles', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { markTerminalFollowOutput, markTerminalPinnedViewport } = await import('@/lib/pane-manager/terminal-scroll-intent') const transport = createMockTransport('tab-pty') @@ -368,8 +374,9 @@ export function registerPtyConnectionDeferredReattachLiveOutputTests(): void { it('does not enforce a deferred viewport after the pane becomes hidden', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { markTerminalFollowOutput } = await import('@/lib/pane-manager/terminal-scroll-intent') const transport = createMockTransport('tab-pty') transport.connect.mockImplementation( @@ -429,8 +436,9 @@ export function registerPtyConnectionDeferredReattachLiveOutputTests(): void { it('does not fresh-spawn after a dead deferred session delivers its buffered exit', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transport.connect.mockImplementation( async ({ sessionId, callbacks }: { sessionId?: string; callbacks?: ConnectCallbacks }) => { @@ -464,8 +472,9 @@ export function registerPtyConnectionDeferredReattachLiveOutputTests(): void { // All hidden chunks use the background scheduler without content scanning. it('queues hidden PTY bytes on the background scheduler without per-chunk scanning', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-id') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-owner-error-retry.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-owner-error-retry.spec.ts index e80c92caa79..8d16e068006 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-owner-error-retry.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-owner-error-retry.spec.ts @@ -76,8 +76,9 @@ export function registerPtyConnectionOwnerErrorRetryTests(): void { it('preserves an owner-unverified restored pane after an empty reattach result', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks13 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks13 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transport.connect.mockImplementation(async (opts: { callbacks?: ConnectCallbacks }) => { opts.callbacks?.onError?.('terminal_pane_owner_unverified') @@ -109,8 +110,9 @@ export function registerPtyConnectionOwnerErrorRetryTests(): void { it('preserves an owner-unverified restored pane after a rejected reattach', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks14 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks14 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transport.connect.mockRejectedValueOnce(new Error('terminal_pane_owner_unverified')) transportFactoryQueue.push(transport) @@ -139,8 +141,9 @@ export function registerPtyConnectionOwnerErrorRetryTests(): void { 'preserves an exhausted pane until explicit Retry and clears only the current owner error (fresh: %s)', async (fresh) => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks15 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks15 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transport.connect.mockImplementation(async (opts: { callbacks?: ConnectCallbacks }) => { opts.callbacks?.onError?.('terminal_pane_owner_changed') diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-park-reveal-model-snapshot.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-park-reveal-model-snapshot.spec.ts index 6442071e376..0996bf17556 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-park-reveal-model-snapshot.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-park-reveal-model-snapshot.spec.ts @@ -57,8 +57,9 @@ export function registerPtyConnectionParkRevealModelSnapshotTests(): void { it('keeps a parked main-model alt frame at its capture grid while hidden', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const localPtyId = 'global-floating-terminal@@terminal-1' const transport = createMockTransport(localPtyId) transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-reattach-binding.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-reattach-binding.test.ts index f5122ed7493..5231037c633 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-reattach-binding.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-reattach-binding.test.ts @@ -77,7 +77,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -161,7 +161,9 @@ describe('connectPanePty', () => { it('reattaches a remounted split pane to its restored leaf PTY instead of the tab-level PTY', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) mockStoreState = { @@ -196,7 +198,9 @@ describe('connectPanePty', () => { it('publishes async layout bindings by the pane leaf, not a remapped numeric id', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) const syncPanePtyLayoutBindingForLeaf = vi.fn() @@ -219,7 +223,9 @@ describe('connectPanePty', () => { it('does not publish a stale layout callback after a successor transport takes the pane slot', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const reattach = createDeferred<{ id: string; isReattach: true }>() const staleTransport = createMockTransport('terminal-old') staleTransport.connect.mockImplementation(async () => reattach.promise) @@ -251,7 +257,9 @@ describe('connectPanePty', () => { it('does not clear a successor pane error from a stale stream callback', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const staleTransport = createMockTransport('terminal-old') let callbacks: ConnectCallbacks | undefined staleTransport.connect.mockImplementation(async (options) => { @@ -282,7 +290,9 @@ describe('connectPanePty', () => { it('does not clear a successor pane error when a stale binding is disposed', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const staleTransport = createMockTransport('terminal-old') transportFactoryQueue.push(staleTransport) const paneTransportsRef = { current: new Map() } @@ -307,7 +317,9 @@ describe('connectPanePty', () => { it('does not spend queued startup from a stale spawn callback', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const staleTransport = createMockTransport() transportFactoryQueue.push(staleTransport) const paneTransportsRef = { current: new Map() } @@ -333,7 +345,9 @@ describe('connectPanePty', () => { it('resizes a reattached PTY to the current grid when the pane narrows before reattach resolves', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const reattach = createDeferred() let currentPtyId: string | null = null const transport = createMockTransport() @@ -382,7 +396,9 @@ describe('connectPanePty', () => { it('does not let a stale pane transport publish a completed reattach', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const reattach = createDeferred<{ id: string; isReattach: true }>() const staleTransport = createMockTransport() let stalePtyId: string | null = 'terminal-old' @@ -424,7 +440,9 @@ describe('connectPanePty', () => { it('accepts an explicit reattach id before the transport publishes its id', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const reattach = createDeferred<{ id: string; isReattach: true }>() const transport = createMockTransport() let transportPtyId: string | null = null @@ -454,8 +472,9 @@ describe('connectPanePty', () => { it('does not replace a split sibling with the tab-level source PTY', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) // A split spawn can report reattach while the source pane remains mounted and this leaf has no stale session ID. const sourceTransport = createMockTransport('tab-pty') const splitTransport = createMockTransport('split-pty') @@ -505,8 +524,9 @@ describe('connectPanePty', () => { it('infers a replacement when the tab PTY is bound to this leaf', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const splitTransport = createMockTransport('replacement-pty') splitTransport.connect.mockResolvedValue({ id: 'replacement-pty', isReattach: true }) transportFactoryQueue.push(splitTransport) @@ -550,8 +570,9 @@ describe('connectPanePty', () => { 'does not let a stale pane transport clear ownership on %s', async (_label, result) => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks12 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks12 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const reattach = createDeferred< { id: string; isReattach: true; sessionExpired?: boolean } | undefined >() @@ -601,8 +622,9 @@ describe('connectPanePty', () => { ptyId === eagerPtyId ? { flush: () => '', dispose: () => {} } : undefined ) const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks13 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks13 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) mockStoreState = { @@ -662,8 +684,9 @@ describe('connectPanePty', () => { ptyId === otherTabPtyId ? { flush: () => '', dispose: () => {} } : undefined ) const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks14 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks14 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transport.connect.mockImplementation(async (opts: { sessionId?: string }) => { if (opts.sessionId) { @@ -709,8 +732,9 @@ describe('connectPanePty', () => { it('fresh-spawns a shell into any PTY-less tab, so agent launches must never publish one', async () => { // Why: #2989 depends on PTY-less tabs taking this legitimate fresh-shell path. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks15 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks15 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transport.connect.mockImplementation(async (opts: { sessionId?: string }) => { if (opts.sessionId) { @@ -761,8 +785,9 @@ describe('connectPanePty', () => { it('spawns a fresh PTY when a restored daemon split session cannot reattach', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks16 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks16 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transport.connect.mockImplementation(async (opts: { sessionId?: string }) => { if (opts.sessionId) { diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-reattach-mode-reset.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-reattach-mode-reset.spec.ts index 75ea9226cb3..72aa77c68cb 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-reattach-mode-reset.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-reattach-mode-reset.spec.ts @@ -88,8 +88,9 @@ export function registerPtyConnectionDaemonPendingEscapeTailTests(): void { it('writes the daemon pendingEscapeTailAnsi after the reset on local reattach (#7329)', async () => { // Why: re-arm the mid-escape tail LAST, after the reattach reset whose ESC would abort it, so a live continuation completes it. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { if (sessionId) { @@ -179,8 +180,9 @@ export function registerPtyConnectionReattachModeResetTests(): void { it('writes the onReplayData pendingEscapeTailAnsi meta last, after the replayed bytes (#7329)', async () => { // Why this test: the onReplayData meta pass-through had no failing test — severing it kept the suite green. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) enableActiveRuntimeEnvironment() const pane = createPane(1) const writes: string[] = [] @@ -249,8 +251,9 @@ export function registerPtyConnectionReattachModeResetTests(): void { restoredLeafId: LEAF_1, restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' } }) - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) connectPanePty( ...mockPanePtyArgs(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks6)) @@ -272,8 +275,9 @@ export function registerPtyConnectionReattachModeResetTests(): void { it('lets fresh host shell proof outrank stale live-agent metadata on reattach', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => { if (sessionId) { @@ -343,8 +347,9 @@ export function registerPtyConnectionReattachModeResetTests(): void { restoredLeafId: LEAF_1, restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' } }) - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) connectPanePty( ...mockPanePtyArgs(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks8)) @@ -408,8 +413,9 @@ export function registerPtyConnectionReattachModeResetTests(): void { bind: bindsPaneInStore(() => mockStoreState, 'tab-1', LEAF_1) }) } - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) connectPanePty( ...mockPanePtyArgs(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks9)) @@ -466,8 +472,9 @@ export function registerPtyConnectionReattachModeResetTests(): void { restoredLeafId: LEAF_1, restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' } }) - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) connectPanePty( ...mockPanePtyArgs(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks10)) @@ -503,8 +510,9 @@ export function registerPtyConnectionReattachModeResetTests(): void { restoredLeafId: LEAF_1, restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' } }) - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) connectPanePty( ...mockPanePtyArgs(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks11)) @@ -543,8 +551,9 @@ export function registerPtyConnectionReattachModeResetTests(): void { restoredLeafId: LEAF_1, restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' } }) - const agentTitleMocks12 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks12 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) connectPanePty( ...mockPanePtyArgs(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks12)) @@ -582,8 +591,9 @@ export function registerPtyConnectionReattachModeResetTests(): void { restoredLeafId: LEAF_1, restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' } }) - const agentTitleMocks13 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks13 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) connectPanePty( ...mockPanePtyArgs(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks13)) @@ -636,8 +646,9 @@ export function registerPtyConnectionReattachModeResetTests(): void { restoredLeafId: LEAF_1, restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' } }) - const agentTitleMocks14 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks14 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) connectPanePty( ...mockPanePtyArgs(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks14)) @@ -678,8 +689,9 @@ export function registerPtyConnectionReattachModeResetTests(): void { restoredLeafId: LEAF_1, restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' } }) - const agentTitleMocks15 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks15 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) connectPanePty( ...mockPanePtyArgs(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks15)) @@ -723,8 +735,9 @@ export function registerPtyConnectionReattachModeResetTests(): void { restoredLeafId: LEAF_1, restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' } }) - const agentTitleMocks16 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks16 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) connectPanePty( ...mockPanePtyArgs(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks16)) @@ -745,8 +758,9 @@ export function registerPtyConnectionReattachModeResetTests(): void { it('resets an already-idle agent cursor again after reattach SIGWINCH repaint', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks17 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks17 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) vi.useFakeTimers({ toFake: [ 'setTimeout', diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-remote-runtime-attach.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-remote-runtime-attach.spec.ts index 098d1e7d1e4..82bcfff3a14 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-remote-runtime-attach.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-remote-runtime-attach.spec.ts @@ -66,8 +66,9 @@ export function registerPtyConnectionRemoteRuntimeAttachTests(): void { it('reattaches via daemon sessionId when an in-session PTY is live', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) @@ -101,8 +102,9 @@ export function registerPtyConnectionRemoteRuntimeAttachTests(): void { it('attaches remote runtime PTY handles instead of creating a replacement terminal', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transport.attach.mockImplementation(({ callbacks }: { callbacks?: ConnectCallbacks }) => { transport.getPtyId.mockReturnValue('remote:env-1@@terminal-1') @@ -151,8 +153,9 @@ export function registerPtyConnectionRemoteRuntimeAttachTests(): void { it('reports remote renderer readiness only after delayed restore output is parsed', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() let remoteCallbacks: ConnectCallbacks | undefined transport.attach.mockImplementation(({ callbacks }: { callbacks?: ConnectCallbacks }) => { @@ -204,8 +207,9 @@ export function registerPtyConnectionRemoteRuntimeAttachTests(): void { it('cold-spawns slept remote runtime PTYs instead of reattaching the preserved handle', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) enableActiveRuntimeEnvironment('env-1') const restoredPtyId = 'remote:env-1@@terminal-1' const freshPtyId = 'remote:env-1@@terminal-2' diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-remote-snapshot-image-title.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-remote-snapshot-image-title.test.ts index f13c386ebde..f93b6b67fc3 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-remote-snapshot-image-title.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-remote-snapshot-image-title.test.ts @@ -68,7 +68,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -144,7 +144,9 @@ async function connectRemotePane(): Promise<{ dispose: () => void }> { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) mockStoreState = buildActiveRuntimeEnvironmentState(mockStoreState, 'env-1') const transport = createMockTransport('remote:env-1@@terminal-1') const captured: { current: ConnectCallbacks['onReplayData'] | null } = { current: null } diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-restored-runtime-pane-binding.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-restored-runtime-pane-binding.spec.ts index 3d524e53ac0..489befe2c9f 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-restored-runtime-pane-binding.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-restored-runtime-pane-binding.spec.ts @@ -55,8 +55,9 @@ export function registerPtyConnectionRestoredRuntimePaneBindingTests(): void { it('attaches restored remote PTYs for later split panes instead of spawning host tabs', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const existingTransport = createMockTransport('remote:env-1@@terminal-1') const transport = createMockTransport() transportFactoryQueue.push(transport) @@ -98,8 +99,9 @@ export function registerPtyConnectionRestoredRuntimePaneBindingTests(): void { it('publishes a restarted pane PTY id and reuses its restored hint on remount', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const restartedTransport = createMockTransport() let spawnedPtyId: string | null = null diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-stale-daemon-snapshot-replay.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-stale-daemon-snapshot-replay.spec.ts new file mode 100644 index 00000000000..f746f753d96 --- /dev/null +++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-stale-daemon-snapshot-replay.spec.ts @@ -0,0 +1,188 @@ +import { expect, it, vi } from 'vitest' +import { flushAsyncTicks, createDeferred } from '../test-fixtures/pty-connection-test-async' +import { + LEAF_1, + createMockTransport, + createPane, + captureCallbackTerminalWrites, + createManager, + type ConnectCallbacks, + type MockTransport +} from '../test-fixtures/pty-connection-test-pane-fixtures' +import { + type PtyConnectionAgentTitleMocks as AgentTitleMocks, + bindPaneAgentTitleMocks, + type buildPaneConnectionDeps +} from '../test-fixtures/pty-connection-test-deps' + +export function registerStaleDaemonSnapshotReplayTests( + getContext: () => { + transportFactoryQueue: MockTransport[] + createDeps: (overrides?: Record) => ReturnType + } +): void { + it('does not apply a queued reattach snapshot after the PTY is replaced', async () => { + const { transportFactoryQueue, createDeps } = getContext() + const { connectPanePty } = await import('../connect-pane-pty') + const agentTitleMocks13 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) + const transport = createMockTransport('tab-pty') + const reattachResult = createDeferred<{ + id: string + snapshot: string + }>() + const replayCallback: { current: ((data: string) => void) | null } = { current: null } + transport.connect.mockImplementation( + async ({ sessionId, callbacks }: { sessionId?: string; callbacks?: ConnectCallbacks }) => { + if (!sessionId) { + return null + } + replayCallback.current = callbacks?.onReplayData ?? null + return reattachResult.promise + } + ) + transportFactoryQueue.push(transport) + const pane = createPane(1) + const { writes, parseCallbacks } = captureCallbackTerminalWrites(pane) + const deps = createDeps({ + restoredLeafId: LEAF_1, + restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' } + }) + + connectPanePty( + pane as never, + createManager(1) as never, + bindPaneAgentTitleMocks(deps as never, agentTitleMocks13) + ) + await flushAsyncTicks(8) + replayCallback.current?.('blocking replay') + await flushAsyncTicks(12) + expect(writes).toEqual(['\x1b[?2026l\x1b[2J\x1b[3J\x1b[H']) + reattachResult.resolve({ id: 'tab-pty', snapshot: 'stale authoritative snapshot' }) + await flushAsyncTicks(12) + const resizeCallsBeforeReplacement = transport.resize.mock.calls.length + vi.mocked(transport.getPtyId).mockReturnValue('replacement-pty') + while (parseCallbacks.length > 0) { + parseCallbacks.shift()?.() + await flushAsyncTicks(4) + } + await flushAsyncTicks(12) + + expect(writes).not.toContain('stale authoritative snapshot') + expect(transport.resize).toHaveBeenCalledTimes(resizeCallsBeforeReplacement) + expect(window.api.pty.signal).not.toHaveBeenCalledWith('tab-pty', 'SIGWINCH') + }) + + it('does not apply a queued reattach snapshot after its PTY exits', async () => { + const { transportFactoryQueue, createDeps } = getContext() + const { connectPanePty } = await import('../connect-pane-pty') + const agentTitleMocks14 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) + const transport = createMockTransport('tab-pty') + const reattachResult = createDeferred<{ id: string; snapshot: string }>() + const replayCallback: { current: ((data: string) => void) | null } = { current: null } + transport.connect.mockImplementation( + async ({ callbacks }: { callbacks?: ConnectCallbacks }) => { + replayCallback.current = callbacks?.onReplayData ?? null + return reattachResult.promise + } + ) + transportFactoryQueue.push(transport) + const pane = createPane(1) + const { writes, parseCallbacks } = captureCallbackTerminalWrites(pane) + const deps = createDeps({ + restoredLeafId: LEAF_1, + restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' } + }) + + connectPanePty( + pane as never, + createManager(1) as never, + bindPaneAgentTitleMocks(deps as never, agentTitleMocks14) + ) + await flushAsyncTicks(8) + replayCallback.current?.('blocking replay') + await flushAsyncTicks(12) + reattachResult.resolve({ id: 'tab-pty', snapshot: 'dead authoritative snapshot' }) + await flushAsyncTicks(12) + const resizeCallsBeforeExit = transport.resize.mock.calls.length + vi.mocked(transport.getPtyId).mockReturnValue(null) + while (parseCallbacks.length > 0) { + parseCallbacks.shift()?.() + await flushAsyncTicks(4) + } + await flushAsyncTicks(12) + + expect(writes).not.toContain('dead authoritative snapshot') + expect(transport.resize).toHaveBeenCalledTimes(resizeCallsBeforeExit) + expect(window.api.pty.signal).not.toHaveBeenCalledWith('tab-pty', 'SIGWINCH') + expect(transport.sendInput).not.toHaveBeenCalledWith('\x1b[I') + }) + + it('drops stale callbacks but delivers fresh replacement output after an old replay clear', async () => { + const { transportFactoryQueue, createDeps } = getContext() + const { connectPanePty } = await import('../connect-pane-pty') + const agentTitleMocks15 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) + const { getTerminalScrollIntentKind, markTerminalPinnedViewport } = + await import('@/lib/pane-manager/terminal-scroll-intent') + const transport = createMockTransport('tab-pty') + const oldResult = createDeferred() + const oldCallbacks: { current: ConnectCallbacks | null } = { current: null } + const replacementCallbacks: { current: ConnectCallbacks | null } = { current: null } + let connectCount = 0 + transport.connect.mockImplementation( + async ({ callbacks }: { sessionId?: string; callbacks?: ConnectCallbacks }) => { + connectCount += 1 + if (connectCount === 1) { + oldCallbacks.current = callbacks ?? null + return oldResult.promise + } + vi.mocked(transport.getPtyId).mockReturnValue('replacement-pty') + replacementCallbacks.current = callbacks ?? null + return 'replacement-pty' + } + ) + transportFactoryQueue.push(transport) + const pane = createPane(1) + pane.terminal.buffer.active.viewportY = 80 + pane.terminal.buffer.active.baseY = 100 + markTerminalPinnedViewport(pane.terminal) + const { writes, parseCallbacks } = captureCallbackTerminalWrites(pane) + const deps = createDeps({ + restoredLeafId: LEAF_1, + restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' } + }) + + connectPanePty( + pane as never, + createManager(1) as never, + bindPaneAgentTitleMocks(deps as never, agentTitleMocks15) + ) + await flushAsyncTicks(8) + oldCallbacks.current?.onReplayData?.('old replay') + await flushAsyncTicks(8) + parseCallbacks.shift()?.() + await flushAsyncTicks(8) + oldCallbacks.current?.onError?.('SSH_SESSION_EXPIRED: tab-pty') + oldResult.resolve(undefined) + await flushAsyncTicks(20) + expect(replacementCallbacks.current).not.toBeNull() + + replacementCallbacks.current?.onData?.('B-PROMPT') + oldCallbacks.current?.onData?.('STALE-A') + while (parseCallbacks.length > 0) { + parseCallbacks.shift()?.() + await flushAsyncTicks(4) + } + await flushAsyncTicks(20) + + expect(writes).toContain('B-PROMPT') + expect(writes).not.toContain('STALE-A') + expect(pane.terminal.scrollToBottom).toHaveBeenCalled() + expect(getTerminalScrollIntentKind(pane.terminal)).toBe('followOutput') + }) +} diff --git a/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-fresh-spawn-guards.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-fresh-spawn-guards.spec.ts index 7c97a1767d7..f049cc73115 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-fresh-spawn-guards.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-fresh-spawn-guards.spec.ts @@ -57,8 +57,9 @@ export function registerPtyConnectionFreshSpawnGuardsTests(): void { it('does not surface the zero-dimensions diagnostic for a hidden pane', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) const pane = createPane(1) @@ -78,8 +79,9 @@ export function registerPtyConnectionFreshSpawnGuardsTests(): void { it('still surfaces the zero-dimensions diagnostic for a visible pane', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) const pane = createPane(1) @@ -103,8 +105,9 @@ export function registerPtyConnectionFreshSpawnGuardsTests(): void { // Do not race PTY respawn into worktree deletion; main’s removal fence must not flash a raw error before unmount. it('skips a fresh spawn while the pane worktree is being deleted', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) mockStoreState = { @@ -128,8 +131,9 @@ export function registerPtyConnectionFreshSpawnGuardsTests(): void { // A queued row may still fail its own delete and stay; a new terminal there must still start. it('still spawns while the pane worktree is only queued for deletion', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) mockStoreState = { @@ -151,8 +155,9 @@ export function registerPtyConnectionFreshSpawnGuardsTests(): void { // Read the live store before retiring a disposed spawn, or a remounted pane’s shell could be killed. it('lets a disposed spawn survive while the pane surface still exists in the store', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) const deps = createDeps({ tabId: 'tab-retain-disposed-spawn' }) @@ -193,8 +198,9 @@ export function registerPtyConnectionFreshSpawnGuardsTests(): void { it('carries the pane placement onto its transport', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) transportFactoryQueue.push(createMockTransport()) const placement = { kind: 'new-tab' } as const const deps = createDeps({ tabId: 'tab-placement', placement }) @@ -211,8 +217,9 @@ export function registerPtyConnectionFreshSpawnGuardsTests(): void { it('fresh-spawns normally when the pane worktree is not being deleted', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) // Use a unique tab ID to force fresh spawn, matching the skip control. @@ -231,8 +238,9 @@ export function registerPtyConnectionFreshSpawnGuardsTests(): void { // A racing spawn, including under a removing parent worktree, must swallow main’s removal fence instead of flashing its raw banner. it('swallows a worktree-removal fence error instead of surfacing it', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { TERMINAL_REMOVAL_IN_PROGRESS_MESSAGE } = await import('../../../../../../shared/worktree/removal-fence-error') const transport = createMockTransport() @@ -264,8 +272,9 @@ export function registerPtyConnectionFreshSpawnGuardsTests(): void { it('still surfaces non-fence spawn errors through the pane error sink', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() const capturedOnError: { current: ((message: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -291,8 +300,9 @@ export function registerPtyConnectionFreshSpawnGuardsTests(): void { it('threads the resolved local project runtime into IPC terminal transport options', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) mockStoreState = { @@ -327,8 +337,9 @@ export function registerPtyConnectionFreshSpawnGuardsTests(): void { it('keeps an explicit host fallback out of the project runtime', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks11 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks11 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) mockStoreState = { @@ -354,8 +365,9 @@ export function registerPtyConnectionFreshSpawnGuardsTests(): void { it('spawns a Floating agent on native Windows beside an active WSL project', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks12 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks12 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport') const { createRemoteRuntimePtyTransport } = await import('../../pty-transport/remote-runtime/remote-runtime-pty-transport') @@ -408,8 +420,9 @@ export function registerPtyConnectionFreshSpawnGuardsTests(): void { it('observes live terminal GitHub PR URLs before agent completion', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks13 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks13 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -442,8 +455,9 @@ export function registerPtyConnectionFreshSpawnGuardsTests(): void { it('surfaces an actionable error when a Codex backfill timeout drops to the shell', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks14 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks14 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } transport.connect.mockImplementation( @@ -476,8 +490,9 @@ export function registerPtyConnectionFreshSpawnGuardsTests(): void { it('drops keystrokes while the replay guard is engaged, then forwards once it releases', async () => { // A stuck replay guard caused reconnect input lockout; verify suppression while armed and forwarding after release. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks15 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks15 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const pane = createPane(1) const transport = createMockTransport('ssh:ssh-1@@pty-1') transportFactoryQueue.push(transport) @@ -502,8 +517,9 @@ export function registerPtyConnectionFreshSpawnGuardsTests(): void { it('preserves classified user input during replay while suppressing synthetic replies', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks16 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks16 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const pane = createPane(1) const userInputListeners = new Set<() => void>() Object.assign(pane.terminal, { @@ -584,8 +600,9 @@ export function registerPtyConnectionFreshSpawnGuardsTests(): void { it('settles a queued startup only after the pane binds its spawned PTY', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks17 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks17 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-resume') transportFactoryQueue.push(transport) const onStartupBound = vi.fn() diff --git a/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-main-pane-restore-start.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-main-pane-restore-start.test.ts index 6862e23c33b..aa451e1ea3f 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-main-pane-restore-start.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-main-pane-restore-start.test.ts @@ -82,7 +82,9 @@ async function connectBound( transport = createMockTransport() ) { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) transportFactoryQueue.push(transport) setStore({ tabsByWorktree: { 'wt-1': [{ id: TAB, ptyId: 'pty-old' }] }, diff --git a/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-main-pane-start.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-main-pane-start.test.ts index f68cd1774ff..7f9a3ac06b1 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-main-pane-start.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-main-pane-start.test.ts @@ -64,7 +64,9 @@ function startLeaf1(ptyId: string): void { async function connectWithStart(start: TerminalPaneStart | undefined) { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) setStore({ @@ -134,7 +136,9 @@ describe('a pane main is starting a terminal for', () => { it('attaches a split pane to the terminal main bound it to, not its tab’s', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) const newLeaf = leafIdForPane(2) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-pending-spawn.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-pending-spawn.spec.ts index 9189e8561d1..8bfc81d765c 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-pending-spawn.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-pending-spawn.spec.ts @@ -58,8 +58,9 @@ export function registerPtyConnectionPendingSpawnTests(): void { it('does not hold a successor behind a canceled spawn serializer declaration', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { pendingSpawnByPaneKey } = await import('./pending-pane-spawn') const declaration = createDeferred() const spawn = createDeferred() @@ -100,8 +101,9 @@ export function registerPtyConnectionPendingSpawnTests(): void { it('joins a successful pending spawn across a StrictMode remount', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const pendingSpawn = createDeferred() const firstTransport = createMockTransport() firstTransport.connect.mockReturnValueOnce(pendingSpawn.promise) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-restart-replacement-stop-claim.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-restart-replacement-stop-claim.spec.ts index f38a559ab57..febcc4f377d 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-restart-replacement-stop-claim.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-restart-replacement-stop-claim.spec.ts @@ -57,8 +57,9 @@ export function registerPtyConnectionRestartReplacementDisposeTests(): void { it('stops the replaced PTY itself when the pane is disposed before a spawn carried the stop', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) transportFactoryQueue.push(createMockTransport('pty-restarted')) const deps = createDeps({ tabId: 'tab-restart-closed', diff --git a/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-sleeping-resume-banner.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-sleeping-resume-banner.spec.ts index 3e1634ea14a..b3baace618c 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-sleeping-resume-banner.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-sleeping-resume-banner.spec.ts @@ -67,8 +67,9 @@ export function registerPtyConnectionSleepingResumeBannerTests(): void { it('resumes a local sleeping pane in place when the restored PTY hint is missing', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const spawn = createDeferred() const transport = createMockTransport() transport.connect.mockImplementation(() => spawn.promise) @@ -201,8 +202,9 @@ export function registerPtyConnectionSleepingResumeBannerTests(): void { it('says the fresh-spawn resume started fresh when main declined it', async () => { // Sidebar resume creates a fresh tab without a restored PTY; it still needs a resume banner (#10757). const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const spawn = createDeferred<{ id: string; agentResumeUnavailable: true }>() const transport = createMockTransport() transport.connect.mockImplementation(() => spawn.promise) @@ -294,8 +296,9 @@ export function registerPtyConnectionSleepingResumeBannerTests(): void { it('lets a declined resume replace an already-shown restored banner', async () => { // A later declined resume must clear an earlier restored-banner latch. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() let connectCount = 0 transport.connect.mockImplementation(async () => { @@ -396,8 +399,9 @@ export function registerPtyConnectionSleepingResumeBannerTests(): void { it('keeps sleeping resume record when fresh cold-restore spawn fails', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const staleSessionId = 'wt-1@@stale-session' const transport = createMockTransport() transport.connect.mockResolvedValue(undefined) @@ -455,8 +459,9 @@ export function registerPtyConnectionSleepingResumeBannerTests(): void { it('forwards one sidebar resume spawn without writing the restored banner through xterm', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-1') transportFactoryQueue.push(transport) const pane = createPane(1) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-spawn-deferred-sleep.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-spawn-deferred-sleep.test.ts index 02d5277a76d..c611fa95762 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-spawn-deferred-sleep.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-spawn-deferred-sleep.test.ts @@ -77,7 +77,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -250,7 +250,9 @@ describe('connectPanePty: a restore the host kept asleep', () => { async function mainOwnedResumeFixture() { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const pane = createPane(1) const paneKey = makePaneKey('tab-1', pane.leafId) const record = { @@ -462,7 +464,9 @@ describe('connectPanePty: a restore the host kept asleep', () => { it('keeps the pane sleeping with its resume handle and resumes it when opened', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { getPaneSpawnDeferral } = await import('@/lib/pane-spawn-deferral-registry') const transport = deferringTransport() transportFactoryQueue.push(transport) @@ -514,7 +518,9 @@ describe('connectPanePty: a restore the host kept asleep', () => { it('resumes a hidden pane in the background once the host has room, as an automatic restore', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { getPaneSpawnDeferral } = await import('@/lib/pane-spawn-deferral-registry') const transport = deferringTransport() transportFactoryQueue.push(transport) @@ -558,7 +564,9 @@ describe('connectPanePty: a restore the host kept asleep', () => { it('does not resume a session that meanwhile started in another tab', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { getPaneSpawnDeferral } = await import('@/lib/pane-spawn-deferral-registry') const transport = deferringTransport() transportFactoryQueue.push(transport) @@ -614,7 +622,9 @@ describe('connectPanePty: a restore the host kept asleep', () => { it('stays the owner while its retry is in flight, then hands over to the PTY', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { getPaneSpawnDeferral, isPaneSpawnDeferred } = await import('@/lib/pane-spawn-deferral-registry') const transport = deferringTransport() @@ -661,7 +671,9 @@ describe('connectPanePty: a restore the host kept asleep', () => { it('does not resume a session another tab has already queued', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = deferringTransport() transportFactoryQueue.push(transport) const pane = createPane(1) @@ -696,7 +708,9 @@ describe('connectPanePty: a restore the host kept asleep', () => { it('offers to clear a crash pause on the host, then resumes the pane', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { getPaneSpawnDeferral } = await import('@/lib/pane-spawn-deferral-registry') const transport = deferringTransport('paused') transportFactoryQueue.push(transport) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-split-spawn.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-split-spawn.spec.ts index dd9d5dddc05..06b6c501298 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-split-spawn.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-split-spawn.spec.ts @@ -67,8 +67,9 @@ export function registerPtyConnectionSplitSpawnTests(): void { it('clears the mobile-fit pane binding when the pane connection is disposed', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { getFitOverrideForPane, setFitOverride } = await import('@/lib/pane-manager/mobile-fit-overrides') const transport = createMockTransport() @@ -101,8 +102,9 @@ export function registerPtyConnectionSplitSpawnTests(): void { it('refits immediately when binding to a PTY with an active mobile-fit override', async () => { const { setFitOverride } = await import('@/lib/pane-manager/mobile-fit-overrides') const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) const pane = createPane(1) @@ -160,8 +162,9 @@ export function registerPtyConnectionSplitSpawnTests(): void { } const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { setDriverForPty } = await import('@/lib/pane-manager/mobile-driver-state') const ptyId = 'pty-post-spawn-transient-lock' @@ -235,8 +238,9 @@ export function registerPtyConnectionSplitSpawnTests(): void { vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] }) const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { applyOrDeferPaneMetricOptions } = await import('@/lib/pane-manager/pane-metric-options-deferral') const transport = createMockTransport() @@ -336,8 +340,9 @@ export function registerPtyConnectionSplitSpawnTests(): void { it('spawns the delayed primary pane of an issue-command split when its sibling owns the tab PTY fallback', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks5 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks5 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) let mainPtyId: string | null = null const mainTransport = createMockTransport() mainTransport.getPtyId.mockImplementation(() => mainPtyId) @@ -432,8 +437,9 @@ export function registerPtyConnectionSplitSpawnTests(): void { it('does not reuse a sibling split pane pending spawn after remount', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks6 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks6 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const mainSpawn = createDeferred() const setupSpawn = createDeferred() @@ -502,8 +508,9 @@ export function registerPtyConnectionSplitSpawnTests(): void { it('binds a fresh spawn that resolves as a daemon reattach', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks7 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks7 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) let currentPtyId: string | null = null const transport = createMockTransport() transport.getPtyId.mockImplementation(() => currentPtyId) @@ -535,8 +542,9 @@ export function registerPtyConnectionSplitSpawnTests(): void { it('replays a stable-pane adoption without submitting the resume command', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks8 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks8 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const stablePtyId = 'stable-pane-session' const transport = createMockTransport() transport.connect.mockImplementation(async ({ callbacks }) => { @@ -594,8 +602,9 @@ export function registerPtyConnectionSplitSpawnTests(): void { it('drops xterm onData while pane is replaying restored bytes', async () => { // Guard replay query replies from leaking through onData into fresh-shell stdin (replay-guard.ts). const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-live') transportFactoryQueue.push(transport) @@ -642,8 +651,9 @@ export function registerPtyConnectionSplitSpawnTests(): void { it('forwards focus and hover reports without claiming a parked mirror (#26469)', async () => { // SIGWINCH can re-arm focus reporting; focus replies must not make different-grid mirrors steal PTY ownership from each other. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('pty-live') transportFactoryQueue.push(transport) mockStoreState = { diff --git a/src/renderer/src/components/terminal-pane/pty-connection/startup/agent-pre-ready-typed-draft.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/startup/agent-pre-ready-typed-draft.test.ts index be31b23739c..6c003bb5e01 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/startup/agent-pre-ready-typed-draft.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/startup/agent-pre-ready-typed-draft.test.ts @@ -22,7 +22,9 @@ import { import { createInitialStoreState } from '../test-fixtures/pty-connection-test-store-fixtures' import type { StoreState } from '../test-fixtures/pty-connection-test-store-state' import type * as TerminalWorktreeRouteModule from '@/lib/terminal-worktree-route' -const agentTitleMocks = await vi.importMock('@/lib/agent-status') +const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' +) const { notifyCodexPaneBoundForStaleSweep, @@ -59,7 +61,9 @@ vi.mock('../../../../../../shared/layout-owner-switch', () => ({ vi.mock('@/runtime/sync-runtime-graph/graph-sync-scheduler', () => ({ scheduleRuntimeGraphSync })) -vi.mock('@/lib/agent-draft-readiness', () => ({ waitForAgentDraftInputReady })) +vi.mock('@/lib/agent-session/messaging/paste/agent-draft-readiness', () => ({ + waitForAgentDraftInputReady +})) const { requestTerminalPaneRecovery } = vi.hoisted(() => ({ requestTerminalPaneRecovery: vi.fn(async () => undefined) @@ -101,7 +105,9 @@ vi.mock('../../pty-transport/remote-runtime/remote-runtime-pty-transport', () => ) })) -vi.mock('@/lib/agent-draft-paste-content', () => ({ sendAgentDraftPasteContent })) +vi.mock('@/lib/agent-session/messaging/paste/agent-draft-paste-content', () => ({ + sendAgentDraftPasteContent +})) vi.mock('@/lib/agent-session/launch/prompt/launch-agent-paste-timeout-notice', () => ({ createPasteReadinessTimeoutNotice: (args: unknown) => { @@ -122,7 +128,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/startup/agent-pre-ready-typed-draft.ts b/src/renderer/src/components/terminal-pane/pty-connection/startup/agent-pre-ready-typed-draft.ts index ffee67bc744..24345f1ada7 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/startup/agent-pre-ready-typed-draft.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/startup/agent-pre-ready-typed-draft.ts @@ -4,8 +4,8 @@ import { useAppStore } from '@/store/index' import { TUI_AGENT_CONFIG } from '../../../../../../shared/agent-launch/catalog/tui-agent-config' import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' import { resolveDraftPasteReadyTimeoutMs } from '../../../../../../shared/draft-paste-ready-timeout' -import { waitForAgentDraftInputReady } from '@/lib/agent-draft-readiness' -import { sendAgentDraftPasteContent } from '@/lib/agent-draft-paste-content' +import { waitForAgentDraftInputReady } from '@/lib/agent-session/messaging/paste/agent-draft-readiness' +import { sendAgentDraftPasteContent } from '@/lib/agent-session/messaging/paste/agent-draft-paste-content' import { createPasteReadinessTimeoutNotice } from '@/lib/agent-session/launch/prompt/launch-agent-paste-timeout-notice' import { PTY_PRECONNECT_INPUT_MAX_CODE_UNITS } from '../../pty-transport/input/pty-preconnect-input-buffer' import { writeTerminalPastePtyInput } from '../../input/paste/terminal-pty-paste-writer' diff --git a/src/renderer/src/components/terminal-pane/pty-connection/startup/cold-restore-resume-startup.ts b/src/renderer/src/components/terminal-pane/pty-connection/startup/cold-restore-resume-startup.ts index af9ebe9c833..983d4b9c96f 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/startup/cold-restore-resume-startup.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/startup/cold-restore-resume-startup.ts @@ -12,7 +12,7 @@ import { resolveRuntimeHostTerminalWindowsShell, resolveSshHostReportedPlatform, resolveAgentResumeLaunchTarget -} from '@/lib/agent-resume-launch-target' +} from '@/lib/agent-session/resume/agent-resume-launch-target' import { agentResumeOriginNamesAnotherExecutionHost, sleepingRecordNamesAnotherExecutionHost diff --git a/src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-agent-startup-launch-registration.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-agent-startup-launch-registration.spec.ts index ed3bdda0fe2..8b0cd403a44 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-agent-startup-launch-registration.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-agent-startup-launch-registration.spec.ts @@ -59,8 +59,9 @@ export function registerPtyConnectionNonAgentLaunchRegistrationTests(): void { it('clears stale launch config when a pane consumes a non-agent startup command', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) const paneKey = makePaneKey('tab-1', LEAF_1) @@ -116,8 +117,9 @@ export function registerPtyConnectionUnboundAgentLaunchRegistrationTests(): void it('clears launch config when an agent startup spawn produces no PTY', async () => { vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] }) const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() transportFactoryQueue.push(transport) const paneKey = makePaneKey('tab-1', LEAF_1) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-queued-startup-consume.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-queued-startup-consume.test.ts index 4c1bbf33038..4b06dddc58f 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-queued-startup-consume.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-queued-startup-consume.test.ts @@ -57,7 +57,7 @@ vi.mock('@/store', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -133,7 +133,9 @@ describe('connectPanePty queued startup consume', () => { it('spends the queued startup only after the pty is bound to the tab', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() spawnOnConnect(transport, 'fresh-pty') transportFactoryQueue.push(transport) @@ -165,7 +167,9 @@ describe('connectPanePty queued startup consume', () => { it('leaves the queued startup unspent when the spawn never reaches onPtySpawn', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() // A retired/reattached spawn resolves without ever announcing a fresh pty. transport.connect.mockImplementation(async () => undefined) @@ -190,7 +194,9 @@ describe('connectPanePty queued startup consume', () => { it('keeps a throwing consume from escaping into the spawn', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks4 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks4 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport() // onPtySpawn runs inside connect; callback throws would reject spawn and strand the pane, so cleanup must not throw. let escapedIntoSpawn = false diff --git a/src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-split-cwd-resolution.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-split-cwd-resolution.test.ts index f08a7e21194..ec52f7c6901 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-split-cwd-resolution.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-split-cwd-resolution.test.ts @@ -50,7 +50,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -99,7 +99,9 @@ describe('connectPanePty split cwd resolution', () => { const cwd = createDeferred() const transport = createMockTransport('pty-1') transportFactoryQueue.push(transport) - const agentTitleMocks2 = await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const binding = connectPanePty( createPane(1) as never, diff --git a/src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-startup-command-delivery.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-startup-command-delivery.spec.ts index 9c38a3ef630..057a5ee4945 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-startup-command-delivery.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-startup-command-delivery.spec.ts @@ -59,8 +59,9 @@ export function registerPtyConnectionLocalStartupCommandDeliveryTests(): void { it('does not send startup command via sendInput for local connections', async () => { // Why: the local PTY provider already writes the command via writeStartupCommandWhenShellReady; re-sending from the renderer would double it in the terminal. const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } const transport = createMockTransport() @@ -139,8 +140,9 @@ export function registerPtyConnectionTerminalPasteStartupCommandDeliveryTests(): try { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks9 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks9 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } const transport = createMockTransport('pty-id') @@ -202,8 +204,9 @@ export function registerPtyConnectionTerminalPasteStartupCommandDeliveryTests(): try { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks10 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks10 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } const transport = createMockTransport('pty-id') diff --git a/src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-startup-draft-delivery.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-startup-draft-delivery.spec.ts index 18447526cb9..fb44e98eaaa 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-startup-draft-delivery.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/startup/pty-connection-startup-draft-delivery.spec.ts @@ -1,7 +1,7 @@ import { bindPtyConnectionTestMocks } from '../test-fixtures/pty-connection-mocks.spec' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { makePaneKey } from '../../../../../../shared/workspace-layout/stable-pane-id' -import { beginAgentStartupDeliveryAttempt } from '@/lib/agent-startup-delayed-delivery' +import { beginAgentStartupDeliveryAttempt } from '@/lib/agent-session/launch/startup/agent-startup-delayed-delivery' import { flushAsyncTicks } from '../test-fixtures/pty-connection-test-async' import { VISIBLE_PTY_SETTLE_MS } from '../test-fixtures/pty-connection-test-constants' import { @@ -61,10 +61,11 @@ export function registerPtyConnectionStartupDraftDeliveryTests(): void { it.each([10_000, 20_000])('keeps Codex draft delivery bounded after %d ms', async (waitMs) => { vi.useFakeTimers() const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { beginAgentStartupDeliveryAttempt: claimStartupDelivery } = - await import('@/lib/agent-startup-delayed-delivery') + await import('@/lib/agent-session/launch/startup/agent-startup-delayed-delivery') const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null } const transport = createMockTransport('pty-codex') @@ -152,10 +153,11 @@ export function registerPtyConnectionStartupDraftDeliveryTests(): void { it('keeps startup draft ownership while deferred connect waits through setup', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const { beginAgentStartupDeliveryAttempt: claimStartupDelivery } = - await import('@/lib/agent-startup-delayed-delivery') + await import('@/lib/agent-session/launch/startup/agent-startup-delayed-delivery') const deferredFrames: FrameRequestCallback[] = [] globalThis.requestAnimationFrame = vi.fn((callback: FrameRequestCallback) => { @@ -226,8 +228,9 @@ export function registerPtyConnectionStartupDraftDeliveryTests(): void { it('releases startup draft delivery when disposed before deferred connect starts', async () => { const { connectPanePty } = await import('../connect-pane-pty') - const agentTitleMocks3 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks3 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) globalThis.requestAnimationFrame = vi.fn(() => 1) const transport = createMockTransport('pty-codex') transportFactoryQueue.push(transport) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/startup/sleeping-record-access.ts b/src/renderer/src/components/terminal-pane/pty-connection/startup/sleeping-record-access.ts index 54c095e1a7a..21abb44140e 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/startup/sleeping-record-access.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/startup/sleeping-record-access.ts @@ -15,7 +15,7 @@ import { TUI_AGENT_CONFIG } from '../../../../../../shared/agent-launch/catalog/ import { beginAgentStartupDeliveryAttempt, releaseAgentStartupDeliveryAttempt -} from '@/lib/agent-startup-delayed-delivery' +} from '@/lib/agent-session/launch/startup/agent-startup-delayed-delivery' import type { ConnectPanePtySession } from '../connect-pane-pty-session' diff --git a/src/renderer/src/components/terminal-pane/pty-connection/startup/startup-draft-paste.ts b/src/renderer/src/components/terminal-pane/pty-connection/startup/startup-draft-paste.ts index 48bdff6523b..ad642a757fd 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/startup/startup-draft-paste.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/startup/startup-draft-paste.ts @@ -2,7 +2,7 @@ import { inspectRuntimeTerminalProcess } from '@/runtime/hosted-terminals/inspec import { isExpectedAgentProcess } from '../../../../../../shared/agent-status/process/agent-process-recognition' import { resolveDraftPasteReadyTimeoutMs } from '../../../../../../shared/draft-paste-ready-timeout' import { createDraftPasteReadyScanner } from '../../../../../../shared/draft-paste-ready-scanner' -import { sendAgentDraftPasteContent } from '@/lib/agent-draft-paste-content' +import { sendAgentDraftPasteContent } from '@/lib/agent-session/messaging/paste/agent-draft-paste-content' import { writeTerminalPastePtyInput } from '../../input/paste/terminal-pty-paste-writer' import { createPasteReadinessTimeoutNotice } from '@/lib/agent-session/launch/prompt/launch-agent-paste-timeout-notice' import type { ConnectPanePtySession } from '../connect-pane-pty-session' diff --git a/src/renderer/src/components/terminal-pane/pty-connection/test-fixtures/pty-connection-mocks.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/test-fixtures/pty-connection-mocks.spec.ts index 089090ac617..2127b7630b4 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/test-fixtures/pty-connection-mocks.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/test-fixtures/pty-connection-mocks.spec.ts @@ -87,7 +87,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('./pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) }) diff --git a/src/renderer/src/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-environment.ts b/src/renderer/src/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-environment.ts index 2e68f2eae1b..2d53abce03a 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-environment.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-environment.ts @@ -190,8 +190,8 @@ async function resetSharedTerminalModuleState(): Promise { paneRecovery ] = await Promise.all([ import('@/lib/pane-manager/pane-terminal-output-queue-registry'), - import('@/lib/agent-startup-delayed-delivery'), - import('@/lib/agent-startup-delivery-guards'), + import('@/lib/agent-session/launch/startup/agent-startup-delayed-delivery'), + import('@/lib/agent-session/launch/startup/agent-startup-delivery-guards'), import('@/lib/hook-command-delayed-delivery'), import('../../agent-completion/agent-completion-identity-store'), import('../../agent-completion/command-code/command-code-done-settle'), diff --git a/src/renderer/src/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-hidden-restore-flood.ts b/src/renderer/src/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-hidden-restore-flood.ts index f76da4e182a..4f6722472f7 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-hidden-restore-flood.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-hidden-restore-flood.ts @@ -97,7 +97,9 @@ export async function connectVisiblePane(): Promise { const deps = buildPaneConnectionDeps(() => mockStoreState, { isVisibleRef: { current: true } }) - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const disposable = await connectMockPanePty( pane, diff --git a/src/renderer/src/components/terminal-pane/pty-connection/tests/input-modes/pty-connection-kitty-keyboard-restore.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/tests/input-modes/pty-connection-kitty-keyboard-restore.spec.ts index 067ea954df7..55e68dbfc4a 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/tests/input-modes/pty-connection-kitty-keyboard-restore.spec.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/tests/input-modes/pty-connection-kitty-keyboard-restore.spec.ts @@ -64,8 +64,9 @@ export function registerPtyConnectionKittyKeyboardRestoreTests(): void { async function reattachWithSnapshotFlags(kittyKeyboard: boolean) { const { connectPanePty } = await import('../../connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('tab-pty') transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => sessionId @@ -114,8 +115,9 @@ export function registerPtyConnectionKittyKeyboardRestoreTests(): void { it('grounds xterm and the mirror with one scanned write before a restart-in-place spawns', async () => { const { connectPanePty } = await import('../../connect-pane-pty') - const agentTitleMocks2 = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks2 = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) transportFactoryQueue.push(createMockTransport()) const pane = createPane(91) // Use a unique tab ID to avoid other tests’ pending-spawn entries and force fresh spawn. diff --git a/src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-connect-spawn.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-connect-spawn.test.ts index 25866b80bbf..91ffb9b5cca 100644 --- a/src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-connect-spawn.test.ts +++ b/src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-connect-spawn.test.ts @@ -512,8 +512,9 @@ describe('createIpcPtyTransport', () => { await installTerminalTestGlobals() try { const { connectPanePty } = await import('../../pty-connection/connect-pane-pty') - const agentTitleMocks = - await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) for (const proof of ['interleaved', 'covered', 'no-flags'] as const) { state = createInitialStoreState(() => state) const result = provenSpawnResponse( diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport.ts index 8bcc18152a5..7d9b3a08f37 100644 --- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport.ts +++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport.ts @@ -7,7 +7,7 @@ import { agentSessionCreateRequest, createAgentSessionTrustWorktreeOptions } from '@/runtime/hosted-terminals/creation/agent-launch/agent-session-create-request' -import { beginAgentStartupDeliveryAttempt } from '@/lib/agent-startup-delayed-delivery' +import { beginAgentStartupDeliveryAttempt } from '@/lib/agent-session/launch/startup/agent-startup-delayed-delivery' import { planHostedAgentPrompt, hostedAgentPromptHostFacts, diff --git a/src/renderer/src/components/terminal-pane/quick-commands/TerminalQuickCommandsSubmenu.tsx b/src/renderer/src/components/terminal-pane/quick-commands/TerminalQuickCommandsSubmenu.tsx index de332ca28d9..f8b22f5e170 100644 --- a/src/renderer/src/components/terminal-pane/quick-commands/TerminalQuickCommandsSubmenu.tsx +++ b/src/renderer/src/components/terminal-pane/quick-commands/TerminalQuickCommandsSubmenu.tsx @@ -11,7 +11,7 @@ import { import type { TerminalQuickCommand } from '../../../../../shared/terminal/quick-commands/terminal-quick-command-types' import type { ExecutionHostId } from '../../../../../shared/execution-host' import { isTerminalAgentQuickCommand } from '../../../../../shared/terminal/quick-commands/terminal-quick-commands' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { useTranslate } from '@/i18n/use-translate' import { getHostedTerminalQuickCommandKey, diff --git a/src/renderer/src/components/terminal-pane/session-continuation/terminal-agent-session-continuation.ts b/src/renderer/src/components/terminal-pane/session-continuation/terminal-agent-session-continuation.ts index 0880bd52128..096ae49f504 100644 --- a/src/renderer/src/components/terminal-pane/session-continuation/terminal-agent-session-continuation.ts +++ b/src/renderer/src/components/terminal-pane/session-continuation/terminal-agent-session-continuation.ts @@ -4,7 +4,7 @@ import { buildAgentSessionContinuationPrompt, resolveAgentSessionContinuationTranscriptPath, type AgentSessionContinuationRequest -} from '@/lib/agent-session-continuation' +} from '@/lib/agent-session/context/agent-session-continuation' import { useAppStore } from '@/store/index' import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id' import { isTuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent-config' diff --git a/src/renderer/src/components/terminal-pane/session-fork/terminal-agent-session-fork.ts b/src/renderer/src/components/terminal-pane/session-fork/terminal-agent-session-fork.ts index 9dfd2eb353a..fb1282278bc 100644 --- a/src/renderer/src/components/terminal-pane/session-fork/terminal-agent-session-fork.ts +++ b/src/renderer/src/components/terminal-pane/session-fork/terminal-agent-session-fork.ts @@ -3,7 +3,7 @@ import type { ManagedPane } from '@/lib/pane-manager/pane-manager-types' import { launchAgentInNewTab } from '@/lib/agent-session/launch/new-tab/launch-agent-in-new-tab' import { settleAgentTabLaunch } from '@/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-host-agents' import { newAgentPromptOutcome } from '@/lib/new-agent-prompt-outcome' -import { buildAgentSessionForkPrompt } from '@/lib/agent-session-fork-context' +import { buildAgentSessionForkPrompt } from '@/lib/agent-session/context/agent-session-fork-context' import { activateAndRevealWorktree } from '@/lib/workspace/activation/worktree-activation' import { resolveOwner } from '@/lib/workspace/ownership/resolve-owner' import { diff --git a/src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-alt-screen-host-chain.test.ts b/src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-alt-screen-host-chain.test.ts index 3b0d464ccf5..ea7a4b630ae 100644 --- a/src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-alt-screen-host-chain.test.ts +++ b/src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-alt-screen-host-chain.test.ts @@ -62,7 +62,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../pty-connection/test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -364,7 +364,9 @@ describe('host-published recovery snapshot onto a live alt screen', () => { meta: PtyReplayDataMeta ): Promise { const { connectPanePty } = await import('../pty-connection/connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('agent-pty') const replay: { current: ConnectCallbacks['onReplayData'] | null } = { current: null } transport.connect.mockImplementation(async ({ callbacks }: { callbacks: ConnectCallbacks }) => { diff --git a/src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-alt-screen-replay.test.ts b/src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-alt-screen-replay.test.ts index e4eddf0f2d8..5563a7414e9 100644 --- a/src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-alt-screen-replay.test.ts +++ b/src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-alt-screen-replay.test.ts @@ -55,7 +55,7 @@ vi.mock('@/store/index', () => ({ } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const { buildAgentStatusModuleMock } = await import('../pty-connection/test-fixtures/pty-connection-test-environment') return buildAgentStatusModuleMock(await importOriginal>()) @@ -156,7 +156,9 @@ describe('remote snapshot replay onto a live alt screen', () => { paneBuffer: 'normal' | 'alternate' | 'alternate-queued' = 'alternate' ): Promise { const { connectPanePty } = await import('../pty-connection/connect-pane-pty') - const agentTitleMocks = await vi.importMock('@/lib/agent-status') + const agentTitleMocks = await vi.importMock( + '@/lib/agent-status/aggregation/worktree-agent-status' + ) const transport = createMockTransport('agent-pty') const replay: { current: ConnectCallbacks['onReplayData'] | null } = { current: null } transport.connect.mockImplementation(async ({ callbacks }: { callbacks: ConnectCallbacks }) => { diff --git a/src/renderer/src/components/terminal-quick-commands/TerminalQuickCommandDialog.tsx b/src/renderer/src/components/terminal-quick-commands/TerminalQuickCommandDialog.tsx index 1cf6312cafa..47587948685 100644 --- a/src/renderer/src/components/terminal-quick-commands/TerminalQuickCommandDialog.tsx +++ b/src/renderer/src/components/terminal-quick-commands/TerminalQuickCommandDialog.tsx @@ -21,7 +21,7 @@ import { DialogTitle } from '@/components/ui/dialog' import { Label } from '@/components/ui/label' -import { getAgentCatalog } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' import { getScreenSubmitShortcutLabel, isScreenSubmitShortcut } from '@/lib/screen-submit-shortcut' import { isSelectAllShortcut } from '@/lib/editable-target' import { TerminalQuickCommandActionToggle } from './TerminalQuickCommandActionToggle' diff --git a/src/renderer/src/components/terminal-quick-commands/terminal-quick-command-agent-options.ts b/src/renderer/src/components/terminal-quick-commands/terminal-quick-command-agent-options.ts index 316b9899795..a471d3ca1e4 100644 --- a/src/renderer/src/components/terminal-quick-commands/terminal-quick-command-agent-options.ts +++ b/src/renderer/src/components/terminal-quick-commands/terminal-quick-command-agent-options.ts @@ -1,4 +1,4 @@ -import { type AgentCatalogEntry, getAgentCatalog } from '@/lib/agent-catalog' +import { type AgentCatalogEntry, getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' import { supportsTerminalAgentQuickCommand } from '../../../../shared/terminal/quick-commands/terminal-quick-commands' import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent' diff --git a/src/renderer/src/components/terminal-workspace-keydown.ts b/src/renderer/src/components/terminal-workspace-keydown.ts index fa5c6039ae4..672baf61dc7 100644 --- a/src/renderer/src/components/terminal-workspace-keydown.ts +++ b/src/renderer/src/components/terminal-workspace-keydown.ts @@ -22,7 +22,7 @@ import { translate } from '@/i18n/i18n' import { getKeybindingContext } from './terminal-workspace-model' import { isAgentTerminalPreviewTarget } from './dashboard-popout/agent-terminal-preview-target' import { resolveTerminalAgentTabShortcut } from './terminal-agent-tab-shortcut' -import { getDetectionTargetIdentityForWorktree } from '@/lib/agent-detection-target-inventory' +import { getDetectionTargetIdentityForWorktree } from '@/lib/agent-session/launch/inventory/agent-detection-target-inventory' import { launchAgentTabShortcut, launchFloatingWorkspaceAgentShortcut diff --git a/src/renderer/src/components/worktree-jump/worktree-jump-palette-workspace-tab-row.tsx b/src/renderer/src/components/worktree-jump/worktree-jump-palette-workspace-tab-row.tsx index fd355b6d121..797d19131ca 100644 --- a/src/renderer/src/components/worktree-jump/worktree-jump-palette-workspace-tab-row.tsx +++ b/src/renderer/src/components/worktree-jump/worktree-jump-palette-workspace-tab-row.tsx @@ -1,6 +1,6 @@ import type React from 'react' import { FileText, MessageSquare, SquareTerminal } from 'lucide-react' -import { AgentIcon } from '@/lib/agent-catalog' +import { AgentIcon } from '@/components/agent/icons/AgentIcon' import { CommandItem } from '@/components/ui/command' import { PaletteRecentTabStatusDot } from '@/components/cmd-j/palette-live-status' import { getPaletteHostBadge } from '@/components/cmd-j/palette-host-badge' diff --git a/src/renderer/src/hooks/agent-hook-turn-end-ownership.ts b/src/renderer/src/hooks/agent-hook-turn-end-ownership.ts index 324e0721816..8bd916ba5b6 100644 --- a/src/renderer/src/hooks/agent-hook-turn-end-ownership.ts +++ b/src/renderer/src/hooks/agent-hook-turn-end-ownership.ts @@ -1,5 +1,5 @@ import { useAppStore } from '@/store' -import { resolveCommittedTitleAgentType } from '@/lib/pane-agent-evidence' +import { resolveExplicitTerminalTitleAgentType } from '../../../shared/agent-status/title/terminal-title-agent-type' import { resolveCompatibleAgentTypeForOwner } from '../../../shared/agent-status/title/agent-title-owner' import { isAgentStatusHooksEnabledForAgent } from '../../../shared/agent-hook-listener/configuration/agent-status-hooks-setting' import { isTuiAgent } from '../../../shared/agent-launch/catalog/tui-agent-config' @@ -45,6 +45,6 @@ export function hookLaneTitleTurnEndEvidence( title: string | null, foregroundAgent: TerminalAgent | null ): 'identified' | 'ambiguous' | null { - const agent = (title ? resolveCommittedTitleAgentType(title) : null) ?? foregroundAgent + const agent = (title ? resolveExplicitTerminalTitleAgentType(title) : null) ?? foregroundAgent return hookLaneTurnEndEvidence(paneKey, ptyId, agent) } diff --git a/src/renderer/src/hooks/composer-state/host-runtime-effects.ts b/src/renderer/src/hooks/composer-state/host-runtime-effects.ts index df460e35790..43c74065ecc 100644 --- a/src/renderer/src/hooks/composer-state/host-runtime-effects.ts +++ b/src/renderer/src/hooks/composer-state/host-runtime-effects.ts @@ -35,7 +35,7 @@ import { filterEnabledTuiAgents, isTuiAgentEnabled } from '../../../../shared/agent-launch/catalog/tui-agent-selection' -import { getAgentCatalog } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' import { useAppStore } from '@/store' import { isSshConnectInProgress } from '@/lib/new-workspace-ssh-gate' import { diff --git a/src/renderer/src/hooks/composer-state/quick-creation-request.ts b/src/renderer/src/hooks/composer-state/quick-creation-request.ts index 87e07d9a649..dbd6c3abfef 100644 --- a/src/renderer/src/hooks/composer-state/quick-creation-request.ts +++ b/src/renderer/src/hooks/composer-state/quick-creation-request.ts @@ -4,7 +4,7 @@ import type { AgentStartupPlan } from '../../../../shared/agent-launch/startup/t import type { LinkedWorkItemSummary } from '@/lib/new-workspace' import type { TaskSourceContext } from '../../../../shared/work-items/task-source-context' import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent' -import type { AgentLaunchChoice } from '@/lib/agent-menu-selection' +import type { AgentLaunchChoice } from '@/lib/agent-session/launch/routing/agent-menu-selection' import type { GitPushTarget } from '../../../../shared/worktree/types' import type { SetupDecision } from '../../../../shared/worktree/create-types' import '@/components/sidebar/workspace-creation/folder/folder-workspace-source-repos' diff --git a/src/renderer/src/hooks/composer-state/quick-startup-plan.ts b/src/renderer/src/hooks/composer-state/quick-startup-plan.ts index 27c045aa7d3..195355aac43 100644 --- a/src/renderer/src/hooks/composer-state/quick-startup-plan.ts +++ b/src/renderer/src/hooks/composer-state/quick-startup-plan.ts @@ -18,7 +18,7 @@ import type { AgentStartupPlan } from '../../../../shared/agent-launch/startup/t import { resolveAgentStartupPlanInputs } from '../../../../shared/agent-launch/startup/agent-startup-plan-inputs' import { tuiAgentToAgentKind } from '@/lib/telemetry' -import { getAgentLabel } from '@/lib/agent-catalog' +import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog' import { translate } from '@/i18n/i18n' import { requireExecutionHostPlatform } from '@/runtime/hosts/platform/execution-host-facts' import type { ExecutionHostPlatformFact } from '@/runtime/hosts/platform/execution-host-platform-fact' diff --git a/src/renderer/src/hooks/composer-state/workspace-identity-state.ts b/src/renderer/src/hooks/composer-state/workspace-identity-state.ts index 27d7fc7a9f7..f3e2f50ad42 100644 --- a/src/renderer/src/hooks/composer-state/workspace-identity-state.ts +++ b/src/renderer/src/hooks/composer-state/workspace-identity-state.ts @@ -29,7 +29,7 @@ import { filterEnabledTuiAgents, isTuiAgentEnabled } from '../../../../shared/agent-launch/catalog/tui-agent-selection' -import { getAgentCatalog } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' import { useAppStore } from '@/store' /** Older drafts lack naming intent; restore baseBranch as the branch pick it represented when saved. */ diff --git a/src/renderer/src/hooks/ipc-events/agent-status-event-applicator.ts b/src/renderer/src/hooks/ipc-events/agent-status-event-applicator.ts index 1ad486aab67..35fbfff141b 100644 --- a/src/renderer/src/hooks/ipc-events/agent-status-event-applicator.ts +++ b/src/renderer/src/hooks/ipc-events/agent-status-event-applicator.ts @@ -5,7 +5,7 @@ import type { AgentStatusIpcPayload } from '../../../../shared/agent-status/cont import { isDecorativeAgentTitleFrameChange } from '../../../../shared/agent-status/title/agent-decorative-title-signature' import { parsePaneKey } from '../../../../shared/workspace-layout/stable-pane-id' import { normalizeProgramStatusFacet } from '../../../../shared/program-status/facet' -import { resolveAgentStatusTerminalTitle } from '@/lib/agent-status-terminal-title' +import { resolveAgentStatusTerminalTitle } from '@/lib/agent-status/evidence/agent-status-terminal-title' import { track } from '@/lib/telemetry' import { resolveAgentPaneAuthorityKey } from '@/store/slices/agent-status/agent-pane-authority' import type { AgentStatusUpdate } from '@/store/slices/agent-status/agent-status-contract' diff --git a/src/renderer/src/hooks/ipc-events/agent-status-listeners.ts b/src/renderer/src/hooks/ipc-events/agent-status-listeners.ts index c66e49626cd..5783ac2fd25 100644 --- a/src/renderer/src/hooks/ipc-events/agent-status-listeners.ts +++ b/src/renderer/src/hooks/ipc-events/agent-status-listeners.ts @@ -11,7 +11,7 @@ import { import { useAppStore } from '../../store' import { forgetRefusedPaneResume, namesRefusedResume } from '@/lib/forget-refused-pane-resume' import { resolveAgentPaneAuthorityKey } from '@/store/slices/agent-status/agent-pane-authority' -import { resolvePaneKey } from './agent-status-routing' +import { resolvePaneKey } from '../../lib/agent-status/ownership/agent-status-pane-ownership' import type { PendingAgentStatusEvent } from './agent-status-bridge-types' /** An already delivered event for the pane naming a refused conversation would restore it. */ diff --git a/src/renderer/src/hooks/ipc-events/agent-status-routing.ts b/src/renderer/src/hooks/ipc-events/agent-status-routing.ts index 9455045feea..311ca5cedc1 100644 --- a/src/renderer/src/hooks/ipc-events/agent-status-routing.ts +++ b/src/renderer/src/hooks/ipc-events/agent-status-routing.ts @@ -159,5 +159,3 @@ export function isInheritedFromActivePane( }).inheritedFromActivePane ) } - -export { resolvePaneKey } from '../../lib/agent-status-pane-ownership' diff --git a/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts b/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts index 951d370b3d7..6493b15922a 100644 --- a/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts +++ b/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts @@ -1,10 +1,10 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { createTabsSliceMockApi } from '../../store/slices/tabs/tabs-slice-test-harness' import { createTestStore } from '../../store/testing/app-store-test-fixture' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => ({ +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => ({ ...(await importOriginal()), detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) })) diff --git a/src/renderer/src/hooks/use-linear-agent-skill-setup.ts b/src/renderer/src/hooks/use-linear-agent-skill-setup.ts index eb18a2e1766..043a4af7b9b 100644 --- a/src/renderer/src/hooks/use-linear-agent-skill-setup.ts +++ b/src/renderer/src/hooks/use-linear-agent-skill-setup.ts @@ -1,6 +1,6 @@ import { useMemo } from 'react' -import { LINEAR_AGENT_SKILL_NAMES } from '@/lib/agent-feature-skill-names' -import { getLinearAgentSkillUpdateTarget } from '@/lib/linear-agent-skill-update-target' +import { LINEAR_AGENT_SKILL_NAMES } from '@/lib/skills/installation/agent-feature-skill-names' +import { getLinearAgentSkillUpdateTarget } from '@/lib/skills/installation/linear-agent-skill-update-target' import { GLOBAL_AGENT_SKILL_SOURCE_KINDS, useInstalledAgentSkillNames diff --git a/src/renderer/src/hooks/use-local-cli-skill-freshness-name.ts b/src/renderer/src/hooks/use-local-cli-skill-freshness-name.ts index 9385dcb3e84..407168fc36f 100644 --- a/src/renderer/src/hooks/use-local-cli-skill-freshness-name.ts +++ b/src/renderer/src/hooks/use-local-cli-skill-freshness-name.ts @@ -1,4 +1,4 @@ -import { ORCA_CLI_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { ORCA_CLI_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' import { useActiveProjectSkillRuntime } from '@/hooks/useActiveProjectSkillRuntime' import type { LocalAgentRuntime } from '../lib/skill-runtime-command' diff --git a/src/renderer/src/hooks/use-onboarding-skill-runtime.ts b/src/renderer/src/hooks/use-onboarding-skill-runtime.ts index e6beb5f02f9..6ef94d15ab0 100644 --- a/src/renderer/src/hooks/use-onboarding-skill-runtime.ts +++ b/src/renderer/src/hooks/use-onboarding-skill-runtime.ts @@ -1,7 +1,10 @@ import { useMemo } from 'react' import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host' import { nativeChatPreferenceFor } from '../../../shared/structured-native-chat-launch-route' -import { chatProviderAgents, useHostStructuredAgentsVersion } from '@/lib/chat-provider-agents' +import { + chatProviderAgents, + useHostStructuredAgentsVersion +} from '@/runtime/native-chat/agent-catalogs/chat-provider-agents' import { recomputeOn } from '@/lib/recompute-on' import { getNativeChatAgentProfile } from '../../../shared/native-chat/native-chat-agent-profiles' import { isSkillInstallProviderId } from '../../../shared/skill-install-providers' diff --git a/src/renderer/src/hooks/useInstalledAgentSkills.ts b/src/renderer/src/hooks/useInstalledAgentSkills.ts index 65506bc4f3d..908006f662d 100644 --- a/src/renderer/src/hooks/useInstalledAgentSkills.ts +++ b/src/renderer/src/hooks/useInstalledAgentSkills.ts @@ -1,5 +1,5 @@ import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' -import { agentReadsSkill } from '@/lib/agent-skill-coverage' +import { agentReadsSkill } from '@/lib/skills/agent-skill-coverage' import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' import { useCallback, useEffect, useMemo, useRef, useState } from 'react' import type { @@ -9,7 +9,7 @@ import type { SkillDiscoveryTarget, SkillSourceKind } from '../../../shared/skills' -import { ORCHESTRATION_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { ORCHESTRATION_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' import { markOrchestrationSetupComplete } from '@/lib/orchestration-setup-state' import { discoverInstalledAgentSkills, diff --git a/src/renderer/src/lib/activity-thread-display.ts b/src/renderer/src/lib/activity-thread-display.ts index 8ae24edd67d..b3386b56112 100644 --- a/src/renderer/src/lib/activity-thread-display.ts +++ b/src/renderer/src/lib/activity-thread-display.ts @@ -10,8 +10,8 @@ import { isOrcaDispatchPrompt, orchestrationLabelsMatchLiveDispatch } from '../../../shared/agent-status/presentation/agent-row-primary-text' -import { formatAgentToolPreview } from './agent-row-tool-preview' -import { agentVerdictStatusLine } from './agent-verdict-status-line' +import { formatAgentToolPreview } from './agent-status/presentation/agent-row-tool-preview' +import { agentVerdictStatusLine } from './agent-status/presentation/agent-verdict-status-line' // Terse follow-ups such as “yes” are valid prompts but poor cross-worktree task labels. const TERSE_FOLLOW_UP_PATTERN = diff --git a/src/renderer/src/lib/agent-catalog-entries-primary.ts b/src/renderer/src/lib/agent-catalog/agent-catalog-entries-primary.ts similarity index 97% rename from src/renderer/src/lib/agent-catalog-entries-primary.ts rename to src/renderer/src/lib/agent-catalog/agent-catalog-entries-primary.ts index 99ac9c94ac1..aed7cf288b0 100644 --- a/src/renderer/src/lib/agent-catalog-entries-primary.ts +++ b/src/renderer/src/lib/agent-catalog/agent-catalog-entries-primary.ts @@ -1,9 +1,9 @@ import { getCatalogPlatform } from './agent-catalog-platform' -import openClaudeLogoUrl from '../../../../resources/openclaude-logo.png?url' +import openClaudeLogoUrl from '../../../../../resources/openclaude-logo.png?url' import { getTuiAgentLaunchCommand, TUI_AGENT_CONFIG -} from '../../../shared/agent-launch/catalog/tui-agent-config' +} from '../../../../shared/agent-launch/catalog/tui-agent-config' import { translate } from '@/i18n/i18n' import type { AgentCatalogEntry } from './agent-catalog' diff --git a/src/renderer/src/lib/agent-catalog-entries-secondary.ts b/src/renderer/src/lib/agent-catalog/agent-catalog-entries-secondary.ts similarity index 100% rename from src/renderer/src/lib/agent-catalog-entries-secondary.ts rename to src/renderer/src/lib/agent-catalog/agent-catalog-entries-secondary.ts diff --git a/src/renderer/src/lib/agent-catalog-entries.ts b/src/renderer/src/lib/agent-catalog/agent-catalog-entries.ts similarity index 82% rename from src/renderer/src/lib/agent-catalog-entries.ts rename to src/renderer/src/lib/agent-catalog/agent-catalog-entries.ts index b3f5e0576e7..7ddf0ccb4d5 100644 --- a/src/renderer/src/lib/agent-catalog-entries.ts +++ b/src/renderer/src/lib/agent-catalog/agent-catalog-entries.ts @@ -1,4 +1,4 @@ -import { TUI_AGENT_FAVICON_DOMAINS } from '../../../shared/agent-launch/catalog/tui-agent-favicon-domains' +import { TUI_AGENT_FAVICON_DOMAINS } from '../../../../shared/agent-launch/catalog/tui-agent-favicon-domains' import { primaryAgentCatalogEntries } from './agent-catalog-entries-primary' import { secondaryAgentCatalogEntries } from './agent-catalog-entries-secondary' import type { AgentCatalogEntry } from './agent-catalog' diff --git a/src/renderer/src/lib/agent-catalog-platform.ts b/src/renderer/src/lib/agent-catalog/agent-catalog-platform.ts similarity index 100% rename from src/renderer/src/lib/agent-catalog-platform.ts rename to src/renderer/src/lib/agent-catalog/agent-catalog-platform.ts diff --git a/src/renderer/src/lib/agent-catalog/agent-catalog.ts b/src/renderer/src/lib/agent-catalog/agent-catalog.ts new file mode 100644 index 00000000000..a4b2aefa8d5 --- /dev/null +++ b/src/renderer/src/lib/agent-catalog/agent-catalog.ts @@ -0,0 +1,31 @@ +import '@/components/status-bar/icons' +import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent' +import type { TerminalAgent } from '../../../../shared/agent-status/identity/terminal-agent' +import { formatAgentTypeLabel } from '../../../../shared/agent-status/presentation/agent-type-label' +import '../../components/agent/icons/agent-icon-glyphs' +import { createLocalizedCatalog } from '@/i18n/localized-catalog' +import '../../components/agent/icons/agent-favicon-assets' +import { buildAgentCatalogEntries } from './agent-catalog-entries' + +export type AgentCatalogEntry = { + id: TuiAgent + label: string + /** Default CLI binary name used for PATH detection. */ + cmd: string + searchAliases?: readonly string[] + /** Direct or bundled image URL for agents whose project identity is not represented by a favicon service. */ + iconUrl?: string + /** Domain for Google's favicon service — used for agents without an SVG icon. */ + faviconDomain?: string + /** Homepage/install docs URL, sourced from the README agent badge list. */ + homepageUrl: string +} + +export const getAgentCatalog = createLocalizedCatalog(buildAgentCatalogEntries) + +// Why: tests and a few legacy call sites still import a catalog snapshot. +export const AGENT_CATALOG: AgentCatalogEntry[] = getAgentCatalog() + +export function getAgentLabel(agent: TerminalAgent): string { + return getAgentCatalog().find((entry) => entry.id === agent)?.label ?? formatAgentTypeLabel(agent) +} diff --git a/src/renderer/src/lib/agent-picker-search.ts b/src/renderer/src/lib/agent-catalog/agent-picker-search.ts similarity index 97% rename from src/renderer/src/lib/agent-picker-search.ts rename to src/renderer/src/lib/agent-catalog/agent-picker-search.ts index b3129feb8cc..9c03d11446d 100644 --- a/src/renderer/src/lib/agent-picker-search.ts +++ b/src/renderer/src/lib/agent-catalog/agent-picker-search.ts @@ -1,5 +1,5 @@ -import type { AgentCatalogEntry } from '@/lib/agent-catalog' -import { isClipboardTextByteLengthOverLimit } from '../../../shared/clipboard-text' +import type { AgentCatalogEntry } from '@/lib/agent-catalog/agent-catalog' +import { isClipboardTextByteLengthOverLimit } from '../../../../shared/clipboard-text' type RankedAgent = { agent: AgentCatalogEntry diff --git a/src/renderer/src/lib/agent-favicon-assets.ts b/src/renderer/src/lib/agent-favicon-assets.ts deleted file mode 100644 index 718fbbdad6e..00000000000 --- a/src/renderer/src/lib/agent-favicon-assets.ts +++ /dev/null @@ -1,70 +0,0 @@ -import qoderUrl from '../../../shared/agent-icons/qoder.png?url' -import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' -import grokUrl from '../../../shared/agent-icons/grok.png?url' -import mimoCodeUrl from '../../../shared/agent-icons/mimo-code.png?url' -import anteUrl from '../../../shared/agent-icons/ante.png?url' -import traeUrl from '../../../shared/agent-icons/trae.png?url' -import primeAgentUrl from '../../../shared/agent-icons/prime-agent.png?url' -import geminiUrl from '../../../shared/agent-icons/gemini.png?url' -import antigravityUrl from '../../../shared/agent-icons/antigravity.png?url' -import gooseUrl from '../../../shared/agent-icons/goose.png?url' -import ampUrl from '../../../shared/agent-icons/amp.png?url' -import kiroUrl from '../../../shared/agent-icons/kiro.png?url' -import crushUrl from '../../../shared/agent-icons/crush.png?url' -import augUrl from '../../../shared/agent-icons/aug.png?url' -import autohandUrl from '../../../shared/agent-icons/autohand.png?url' -import clineUrl from '../../../shared/agent-icons/cline.png?url' -import freebuffUrl from '../../../shared/agent-icons/freebuff.png?url' -import codebuffUrl from '../../../shared/agent-icons/codebuff.png?url' -import commandCodeUrl from '../../../shared/agent-icons/command-code.png?url' -import continueUrl from '../../../shared/agent-icons/continue.png?url' -import cursorUrl from '../../../shared/agent-icons/cursor.png?url' -import kimiUrl from '../../../shared/agent-icons/kimi.png?url' -import mistralVibeUrl from '../../../shared/agent-icons/mistral-vibe.png?url' -import qwenCodeUrl from '../../../shared/agent-icons/qwen-code.png?url' -import rovoUrl from '../../../shared/agent-icons/rovo.png?url' -import hermesUrl from '../../../shared/agent-icons/hermes.png?url' -import devinUrl from '../../../shared/agent-icons/devin.png?url' -import museUrl from '../../../shared/agent-icons/muse.png?url' -import zcodeUrl from '../../../shared/agent-icons/zcode.png?url' -import openclawUrl from '../../../shared/agent-icons/openclaw.png?url' -import dshUrl from '../../../shared/agent-icons/dsh.png?url' -import jcodeUrl from '../../../shared/agent-icons/jcode.png?url' -import codebuddyUrl from '../../../shared/agent-icons/codebuddy.png?url' - -// Bundle favicons for offline/Google-blocked regions (#8451); shared/agent-icons also supplies mobile-agent-icon-assets.ts. -export const AGENT_FAVICON_ASSETS: Partial> = { - grok: grokUrl, - 'mimo-code': mimoCodeUrl, - ante: anteUrl, - trae: traeUrl, - 'prime-agent': primeAgentUrl, - qoder: qoderUrl, - 'qoder-cn': qoderUrl, - gemini: geminiUrl, - antigravity: antigravityUrl, - goose: gooseUrl, - amp: ampUrl, - kiro: kiroUrl, - crush: crushUrl, - aug: augUrl, - autohand: autohandUrl, - cline: clineUrl, - codebuff: codebuffUrl, - freebuff: freebuffUrl, - 'command-code': commandCodeUrl, - continue: continueUrl, - cursor: cursorUrl, - kimi: kimiUrl, - 'mistral-vibe': mistralVibeUrl, - 'qwen-code': qwenCodeUrl, - rovo: rovoUrl, - hermes: hermesUrl, - devin: devinUrl, - muse: museUrl, - dsh: dshUrl, - zcode: zcodeUrl, - openclaw: openclawUrl, - jcode: jcodeUrl, - codebuddy: codebuddyUrl -} diff --git a/src/renderer/src/lib/agent-session/accounts/agent-account-restart-startup.test.ts b/src/renderer/src/lib/agent-session/accounts/agent-account-restart-startup.test.ts index 5338f2f8dc3..4f163da4f5a 100644 --- a/src/renderer/src/lib/agent-session/accounts/agent-account-restart-startup.test.ts +++ b/src/renderer/src/lib/agent-session/accounts/agent-account-restart-startup.test.ts @@ -5,7 +5,7 @@ import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane- import { getDefaultSettings } from '../../../../../shared/constants' import type { ProjectExecutionRuntimeResolution } from '../../../../../shared/execution-host/project-execution-runtime' import type * as localPreflightContext from '@/lib/local-preflight-context' -import { resolveAgentResumeLaunchTarget } from '@/lib/agent-resume-launch-target' +import { resolveAgentResumeLaunchTarget } from '@/lib/agent-session/resume/agent-resume-launch-target' import { makeTerminalTab } from '@/store/terminals/terminal-row.test-fixture' import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' import { TEST_REPO } from '@/store/repos/repo.test-fixture' @@ -16,7 +16,7 @@ import { let projectRuntimeContext: ProjectExecutionRuntimeResolution | undefined -vi.mock('@/lib/agent-resume-launch-target', { spy: true }) +vi.mock('@/lib/agent-session/resume/agent-resume-launch-target', { spy: true }) vi.mock('@/lib/local-preflight-context', async (importOriginal) => ({ ...(await importOriginal()), diff --git a/src/renderer/src/lib/agent-session/accounts/agent-account-restart-startup.ts b/src/renderer/src/lib/agent-session/accounts/agent-account-restart-startup.ts index 94e06a73411..de459f5ae58 100644 --- a/src/renderer/src/lib/agent-session/accounts/agent-account-restart-startup.ts +++ b/src/renderer/src/lib/agent-session/accounts/agent-account-restart-startup.ts @@ -8,7 +8,7 @@ import { resolveSshHostReportedPlatform, resolveAgentResumeLaunchTarget, type AgentResumeLaunchTarget -} from '@/lib/agent-resume-launch-target' +} from '@/lib/agent-session/resume/agent-resume-launch-target' import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner' import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context' diff --git a/src/renderer/src/lib/agent-session-continuation.ts b/src/renderer/src/lib/agent-session/context/agent-session-continuation.ts similarity index 95% rename from src/renderer/src/lib/agent-session-continuation.ts rename to src/renderer/src/lib/agent-session/context/agent-session-continuation.ts index 6aa59263e40..a365e4d1b92 100644 --- a/src/renderer/src/lib/agent-session-continuation.ts +++ b/src/renderer/src/lib/agent-session/context/agent-session-continuation.ts @@ -1,7 +1,7 @@ -import { splitOpenCodeSqliteCandidate } from '../../../shared/opencode-sqlite-session-path' -import { buildBoundedSessionTranscript } from '@/lib/agent-session-fork-context' -import type { LaunchSource } from '../../../shared/telemetry-events' -import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' +import { splitOpenCodeSqliteCandidate } from '../../../../../shared/opencode-sqlite-session-path' +import { buildBoundedSessionTranscript } from '@/lib/agent-session/context/agent-session-fork-context' +import type { LaunchSource } from '../../../../../shared/telemetry-property-schemas' +import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent' export type AgentSessionContinuationContextMode = 'focused' | 'full' diff --git a/src/renderer/src/lib/agent-session-fork-context.ts b/src/renderer/src/lib/agent-session/context/agent-session-fork-context.ts similarity index 97% rename from src/renderer/src/lib/agent-session-fork-context.ts rename to src/renderer/src/lib/agent-session/context/agent-session-fork-context.ts index 650c3d153ad..5837113f3f5 100644 --- a/src/renderer/src/lib/agent-session-fork-context.ts +++ b/src/renderer/src/lib/agent-session/context/agent-session-fork-context.ts @@ -1,4 +1,4 @@ -import { trimAgentSessionContext } from '../../../shared/agent-session/requests/agent-session-context-budget' +import { trimAgentSessionContext } from '../../../../../shared/agent-session/requests/agent-session-context-budget' const MAX_FORK_CONTEXT_CHARS = 36_000 const MAX_FORK_CAPTURE_SANITIZE_CHARS = MAX_FORK_CONTEXT_CHARS * 4 const ESCAPE_CODE = 27 diff --git a/src/renderer/src/lib/copy-agent-session-context.ts b/src/renderer/src/lib/agent-session/context/copy-agent-session-context.ts similarity index 100% rename from src/renderer/src/lib/copy-agent-session-context.ts rename to src/renderer/src/lib/agent-session/context/copy-agent-session-context.ts diff --git a/src/renderer/src/lib/agent-session/launch/continuation/launch-agent-session-continuation.ts b/src/renderer/src/lib/agent-session/launch/continuation/launch-agent-session-continuation.ts index 5c4f1f7ceb2..86cfa89a60c 100644 --- a/src/renderer/src/lib/agent-session/launch/continuation/launch-agent-session-continuation.ts +++ b/src/renderer/src/lib/agent-session/launch/continuation/launch-agent-session-continuation.ts @@ -1,6 +1,6 @@ import { toast } from 'sonner' -import { getAgentLabel } from '@/lib/agent-catalog' -import { ensureDetectedAgentsForWorktree } from '@/lib/agent-detection-target-inventory' +import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog' +import { ensureDetectedAgentsForWorktree } from '@/lib/agent-session/launch/inventory/agent-detection-target-inventory' import { launchAgentInNewTab } from '@/lib/agent-session/launch/new-tab/launch-agent-in-new-tab' import { newAgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agent-launch-request-id' import { useAppStore } from '@/store/index' @@ -17,7 +17,7 @@ import { adoptAgentSessionLaunchVerdict, planAgentSessionLaunch } from '@/lib/agent-session/launch/routing/agent-session-launch-plan' -import type { AgentLaunchChoice } from '@/lib/agent-menu-selection' +import type { AgentLaunchChoice } from '@/lib/agent-session/launch/routing/agent-menu-selection' import type { AgentLaunchRoute } from '@/lib/agent-session/launch/routing/agent-launch-routing' import { translate } from '@/i18n/i18n' import { resolveWorktreeDisplayName } from '@/lib/worktree-default-display-name' diff --git a/src/renderer/src/lib/agent-launch-failure.ts b/src/renderer/src/lib/agent-session/launch/failure/agent-launch-failure.ts similarity index 86% rename from src/renderer/src/lib/agent-launch-failure.ts rename to src/renderer/src/lib/agent-session/launch/failure/agent-launch-failure.ts index 180933738bf..c8b635b8639 100644 --- a/src/renderer/src/lib/agent-launch-failure.ts +++ b/src/renderer/src/lib/agent-session/launch/failure/agent-launch-failure.ts @@ -1,8 +1,8 @@ import { toast } from 'sonner' import { translate } from '@/i18n/i18n' -import { getAgentLabel } from '@/lib/agent-catalog' -import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' -import type { ExecutionHostPlatformFact } from '../runtime/hosts/platform/execution-host-platform-fact' +import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog' +import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' +import type { ExecutionHostPlatformFact } from '../../../../runtime/hosts/platform/execution-host-platform-fact' type Recovery = Extract['recovery'] diff --git a/src/renderer/src/lib/agent-detection-target-inventory.ts b/src/renderer/src/lib/agent-session/launch/inventory/agent-detection-target-inventory.ts similarity index 93% rename from src/renderer/src/lib/agent-detection-target-inventory.ts rename to src/renderer/src/lib/agent-session/launch/inventory/agent-detection-target-inventory.ts index 3009c221e1f..0e1b3e5c3f8 100644 --- a/src/renderer/src/lib/agent-detection-target-inventory.ts +++ b/src/renderer/src/lib/agent-session/launch/inventory/agent-detection-target-inventory.ts @@ -1,9 +1,10 @@ import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' import { runtimeEnvironmentSupportsCapability } from '@/runtime/rpc/compatibility/runtime-capability-proof' import { ensureLocalRuntimeCapabilities } from '@/runtime/hosts/capabilities/local-runtime-capabilities' -import { PREFLIGHT_PROJECT_LAUNCH_CONTEXT_RUNTIME_CAPABILITY } from '../../../shared/protocol-version' -import type { ProjectLaunchContext } from '../../../shared/rpc-contract/preflight-params' -import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' +import '../../../../../../shared/delegated-mobile-device-contract' +import { PREFLIGHT_PROJECT_LAUNCH_CONTEXT_RUNTIME_CAPABILITY } from '../../../../../../shared/preflight-runtime-capabilities' +import type { ProjectLaunchContext } from '../../../../../../shared/rpc-contract/preflight-params' +import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target' import type { AppState } from '@/store/types' import type { AgentDetectionTarget } from '@/hooks/useDetectedAgents' import { @@ -12,8 +13,11 @@ import { type AgentDetectionOwnerState } from '@/hooks/useAgentDetectionTarget' import { getRuntimeAgentInventoryKey } from '@/store/slices/agent-inventory/runtime-agent-inventory-key' -import { getRepoExecutionHostId, parseExecutionHostId } from '../../../shared/execution-host' -import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' +import { + getRepoExecutionHostId, + parseExecutionHostId +} from '../../../../../../shared/execution-host' +import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' type DetectionReadState = Pick< AppState, diff --git a/src/renderer/src/lib/agent-session/launch/native-chat-provider-choice.test.tsx b/src/renderer/src/lib/agent-session/launch/native-chat-provider-choice.test.tsx index 815e93a2caf..353a8a3d079 100644 --- a/src/renderer/src/lib/agent-session/launch/native-chat-provider-choice.test.tsx +++ b/src/renderer/src/lib/agent-session/launch/native-chat-provider-choice.test.tsx @@ -40,7 +40,7 @@ vi.mock('../../../store/index', () => ({ getState: () => store }) })) -vi.mock('@/lib/chat-provider-agents', () => ({ +vi.mock('@/runtime/native-chat/agent-catalogs/chat-provider-agents', () => ({ chatProviderAgents: () => ['claude', 'codex', 'antigravity'], useHostStructuredAgentsVersion: () => 0 })) diff --git a/src/renderer/src/lib/agent-session/launch/native-chat-provider-choice.ts b/src/renderer/src/lib/agent-session/launch/native-chat-provider-choice.ts index 0a3d7dc2351..6dbb52e8984 100644 --- a/src/renderer/src/lib/agent-session/launch/native-chat-provider-choice.ts +++ b/src/renderer/src/lib/agent-session/launch/native-chat-provider-choice.ts @@ -9,7 +9,7 @@ import { import { nativeChatPreferenceFor } from '../../../../../shared/structured-native-chat-launch-route' import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent' import { isTuiAgentEnabled } from '../../../../../shared/agent-launch/catalog/tui-agent-selection' -import { chatProviderAgents } from '@/lib/chat-provider-agents' +import { chatProviderAgents } from '@/runtime/native-chat/agent-catalogs/chat-provider-agents' import { useAppStore } from '../../../store/index' import { createAgentSettingsUpdateQueue } from './agent-settings-update-queue' diff --git a/src/renderer/src/lib/agent-session/launch/new-tab/agent-launch-caller-prompt-transport.test.ts b/src/renderer/src/lib/agent-session/launch/new-tab/agent-launch-caller-prompt-transport.test.ts index b331c0db77e..5132d1280e1 100644 --- a/src/renderer/src/lib/agent-session/launch/new-tab/agent-launch-caller-prompt-transport.test.ts +++ b/src/renderer/src/lib/agent-session/launch/new-tab/agent-launch-caller-prompt-transport.test.ts @@ -50,10 +50,10 @@ vi.mock('../../../../../../shared/agent-kind', async (importOriginal) => ({ vi.mock('../../../../../../shared/native-chat/input/native-chat-session-option-cache', () => ({ seedNativeChatAppliedSessionOptions: vi.fn() })) -vi.mock('@/lib/agent-paste-draft', () => ({ +vi.mock('@/lib/agent-session/messaging/paste/agent-paste-draft', () => ({ pasteDraftWhenAgentReady: mockPasteDraftWhenAgentReady })) -vi.mock('@/lib/agent-ready-wait', () => ({ +vi.mock('@/lib/agent-session/messaging/paste/agent-ready-wait', () => ({ waitForAgentReady: vi.fn(async () => ({ ready: true, reason: 'foreground-match' })) })) vi.mock('@/runtime/hosts/capabilities/local-runtime-capabilities', () => ({ diff --git a/src/renderer/src/lib/agent-session/launch/new-tab/agent-launch-caller-routing.test.ts b/src/renderer/src/lib/agent-session/launch/new-tab/agent-launch-caller-routing.test.ts index e05b76b008e..ac27d959f1e 100644 --- a/src/renderer/src/lib/agent-session/launch/new-tab/agent-launch-caller-routing.test.ts +++ b/src/renderer/src/lib/agent-session/launch/new-tab/agent-launch-caller-routing.test.ts @@ -1,4 +1,4 @@ -import { nonRefusedAgentLaunch } from '@/lib/agent-tab-launch-outcome.test-fixture' +import { nonRefusedAgentLaunch } from '@/lib/agent-session/launch/new-tab/agent-tab-launch-outcome.test-fixture' import { EVERY_AGENT_CHAT } from '../../../../../../shared/native-chat/every-agent-chat.test-fixture' import { beforeEach, describe, expect, it, vi } from 'vitest' import { @@ -63,8 +63,10 @@ vi.mock('../../../../../../shared/agent-kind', async (importOriginal) => ({ vi.mock('../../../../../../shared/native-chat/input/native-chat-session-option-cache', () => ({ seedNativeChatAppliedSessionOptions: vi.fn() })) -vi.mock('@/lib/agent-paste-draft', () => ({ pasteDraftWhenAgentReady: vi.fn(async () => true) })) -vi.mock('@/lib/agent-ready-wait', () => ({ +vi.mock('@/lib/agent-session/messaging/paste/agent-paste-draft', () => ({ + pasteDraftWhenAgentReady: vi.fn(async () => true) +})) +vi.mock('@/lib/agent-session/messaging/paste/agent-ready-wait', () => ({ waitForAgentReady: vi.fn(async () => ({ ready: true, reason: 'foreground-match' })) })) // Mock structured execution while retaining real route selection; callers must still reach the correct surface. diff --git a/src/renderer/src/lib/agent-tab-launch-outcome.test-fixture.ts b/src/renderer/src/lib/agent-session/launch/new-tab/agent-tab-launch-outcome.test-fixture.ts similarity index 65% rename from src/renderer/src/lib/agent-tab-launch-outcome.test-fixture.ts rename to src/renderer/src/lib/agent-session/launch/new-tab/agent-tab-launch-outcome.test-fixture.ts index a73ac1d3408..c2640c42c58 100644 --- a/src/renderer/src/lib/agent-tab-launch-outcome.test-fixture.ts +++ b/src/renderer/src/lib/agent-session/launch/new-tab/agent-tab-launch-outcome.test-fixture.ts @@ -1,4 +1,4 @@ -import type { AgentTabLaunchOutcome } from './agent-session/launch/new-tab/launch-agent-in-new-tab-host-agents' +import type { AgentTabLaunchOutcome } from './launch-agent-in-new-tab-host-agents' export function nonRefusedAgentLaunch(outcome: AgentTabLaunchOutcome | undefined) { if (outcome && 'refused' in outcome) { diff --git a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-main-surface.test.ts b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-main-surface.test.ts index 7e2f654fc3f..c558d5dff24 100644 --- a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-main-surface.test.ts +++ b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-main-surface.test.ts @@ -1,4 +1,4 @@ -import { nonRefusedAgentLaunch } from '@/lib/agent-tab-launch-outcome.test-fixture' +import { nonRefusedAgentLaunch } from '@/lib/agent-session/launch/new-tab/agent-tab-launch-outcome.test-fixture' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { FLOATING_TERMINAL_WORKTREE_ID, diff --git a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-test-fixture.ts b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-test-fixture.ts index 224a8a839a4..db515cc375b 100644 --- a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-test-fixture.ts +++ b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-test-fixture.ts @@ -2,8 +2,8 @@ import { settleAgentLaunchPaneStart } from '../pane/agent-launch-pane-start' import { beforeEach, vi } from 'vitest' import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/hosts/capabilities/local-runtime-capabilities' import type { AppState } from '@/store/types' -import type { pasteDraftWhenAgentReady } from '../../../agent-paste-draft' -import type { waitForAgentReady } from '../../../agent-ready-wait' +import type { pasteDraftWhenAgentReady } from '../../messaging/paste/agent-paste-draft' +import type { waitForAgentReady } from '../../messaging/paste/agent-ready-wait' import type { track } from '../../../telemetry' import type { toast } from 'sonner' import type { createWebRuntimeSessionTerminal } from '@/runtime/hosted-terminals/creation/web-runtime-terminal-creation' @@ -139,11 +139,11 @@ vi.mock('@/components/tab-bar/reconcile-order', () => ({ ) })) -vi.mock('@/lib/agent-paste-draft', () => ({ +vi.mock('@/lib/agent-session/messaging/paste/agent-paste-draft', () => ({ pasteDraftWhenAgentReady: mockPasteDraftWhenAgentReady })) -vi.mock('@/lib/agent-ready-wait', () => ({ +vi.mock('@/lib/agent-session/messaging/paste/agent-ready-wait', () => ({ waitForAgentReady: mockWaitForAgentReady })) diff --git a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-windows-quoting.test.ts b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-windows-quoting.test.ts index d93bf6dab8b..efa0eb55487 100644 --- a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-windows-quoting.test.ts +++ b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-windows-quoting.test.ts @@ -94,7 +94,7 @@ vi.mock('@/components/tab-bar/reconcile-order', () => ({ ) })) -vi.mock('@/lib/agent-paste-draft', () => ({ +vi.mock('@/lib/agent-session/messaging/paste/agent-paste-draft', () => ({ pasteDraftWhenAgentReady: mockPasteDraftWhenAgentReady })) diff --git a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab.test-fixture.ts b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab.test-fixture.ts index 72d533ca098..6717f9308f6 100644 --- a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab.test-fixture.ts +++ b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab.test-fixture.ts @@ -124,11 +124,11 @@ vi.mock('@/components/tab-bar/reconcile-order', () => ({ ) })) -vi.mock('@/lib/agent-paste-draft', () => ({ +vi.mock('@/lib/agent-session/messaging/paste/agent-paste-draft', () => ({ pasteDraftWhenAgentReady: mockPasteDraftWhenAgentReady })) -vi.mock('@/lib/agent-ready-wait', () => ({ +vi.mock('@/lib/agent-session/messaging/paste/agent-ready-wait', () => ({ waitForAgentReady: mockWaitForAgentReady })) diff --git a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab.test.ts b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab.test.ts index 60287d34d0f..a0160a1175a 100644 --- a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab.test.ts +++ b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab.test.ts @@ -1,4 +1,4 @@ -import { nonRefusedAgentLaunch } from '@/lib/agent-tab-launch-outcome.test-fixture' +import { nonRefusedAgentLaunch } from '@/lib/agent-session/launch/new-tab/agent-tab-launch-outcome.test-fixture' import { afterEach, describe, expect, it, vi } from 'vitest' import { mockCreateTab, diff --git a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab.ts b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab.ts index a68b478d53f..638ea12394e 100644 --- a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab.ts +++ b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab.ts @@ -10,7 +10,7 @@ import { invalidTerminalArgsMessage } from '../../../workspace/creation/work-ite import { agentLaunchCheckSettingsMessage, notifyAgentLaunchFailure -} from '@/lib/agent-launch-failure' +} from '@/lib/agent-session/launch/failure/agent-launch-failure' import { planLaunchAgentStartupPrompt } from '@/lib/agent-session/launch/prompt/launch-agent-startup-prompt-plan' import { persistAgentLaunchTabOrder } from '@/lib/agent-session/launch/pane/launch-agent-tab-order' import '@/lib/telemetry' diff --git a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-new-tab-host-route-readiness.test.ts b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-new-tab-host-route-readiness.test.ts index d3e2c681736..5ce864e3fc6 100644 --- a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-new-tab-host-route-readiness.test.ts +++ b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-new-tab-host-route-readiness.test.ts @@ -61,7 +61,7 @@ vi.mock('@/runtime/hosted-terminals/input/runtime-terminal-verified-input', () = vi.mock('@/runtime/hosted-terminals/streams/runtime-terminal-data-subscription', () => ({ subscribeToRuntimeTerminalData: vi.fn() })) -vi.mock('../../../agent-ready-wait', () => ({ +vi.mock('../../messaging/paste/agent-ready-wait', () => ({ waitForAgentReady: vi.fn(async () => ({ ready: false })) })) vi.mock('@/lib/telemetry', () => ({ track: vi.fn(), tuiAgentToAgentKind: mockLaunchAgentKind })) @@ -238,7 +238,8 @@ describe('an AI button whose agent is ready before the host answers', () => { expect(testState.writes.filter(({ data }) => data.includes('task'))).toHaveLength(1) }) it('does not paste into a cancelled hosted launch after its composer becomes ready', async () => { - const { pasteDraftWhenAgentReady } = await import('@/lib/agent-paste-draft') + const { pasteDraftWhenAgentReady } = + await import('@/lib/agent-session/messaging/paste/agent-paste-draft') let cancelled = false const delivery = pasteDraftWhenAgentReady({ tabId: TAB, diff --git a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-structured-chat-test-fixture.ts b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-structured-chat-test-fixture.ts index 413a7ea81f8..30980cc52ba 100644 --- a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-structured-chat-test-fixture.ts +++ b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-structured-chat-test-fixture.ts @@ -11,8 +11,8 @@ import { createGlobalSettingsFixture } from '../../../../../../shared/global-set import type { GlobalSettings } from '../../../../../../shared/global-settings-types' import { registerStructuredSelectionCatalogStore } from '../../options/structured-agent-session-selection-controller' import type { AppState } from '@/store/types' -import type { pasteDraftWhenAgentReady } from '../../../agent-paste-draft' -import type { waitForAgentReady } from '../../../agent-ready-wait' +import type { pasteDraftWhenAgentReady } from '../../messaging/paste/agent-paste-draft' +import type { waitForAgentReady } from '../../messaging/paste/agent-ready-wait' import type { createStructuredAgentSessionLaunchIntent as create } from '../../../launch-structured-agent-session' import type { launchStructuredAgentSession as launch } from '../structured-agent-session-launch-create-call' import type { refreshLocalStructuredSessionTabs as refreshTabs } from '@/runtime/local-structured-session-tabs-sync/inventory-refresh' @@ -95,10 +95,12 @@ vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (origin ) vi.mock('sonner', () => ({ toast: { message: vi.fn(), error: mockToastError } })) vi.mock('@/components/tab-bar/reconcile-order', () => ({ reconcileTabOrder: vi.fn(() => []) })) -vi.mock('@/lib/agent-paste-draft', () => ({ +vi.mock('@/lib/agent-session/messaging/paste/agent-paste-draft', () => ({ pasteDraftWhenAgentReady: mockPasteDraftWhenAgentReady })) -vi.mock('@/lib/agent-ready-wait', () => ({ waitForAgentReady: mockWaitForAgentReady })) +vi.mock('@/lib/agent-session/messaging/paste/agent-ready-wait', () => ({ + waitForAgentReady: mockWaitForAgentReady +})) vi.mock('@/lib/telemetry', () => ({ track: vi.fn(), tuiAgentToAgentKind: mockLaunchAgentKind diff --git a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-tab-refusal.ts b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-tab-refusal.ts index 13a73aa6a6c..576b4d1090e 100644 --- a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-tab-refusal.ts +++ b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-tab-refusal.ts @@ -1,4 +1,7 @@ -import { agentLaunchRecoveryMessage, notifyAgentLaunchFailure } from '@/lib/agent-launch-failure' +import { + agentLaunchRecoveryMessage, + notifyAgentLaunchFailure +} from '@/lib/agent-session/launch/failure/agent-launch-failure' import type { ExecutionHostPlatformFact } from '@/runtime/hosts/platform/execution-host-platform-fact' import type { LaunchAgentInNewTabArgs } from './launch-agent-in-new-tab-args' import type { AgentTabLaunchOutcome } from './launch-agent-in-new-tab-host-agents' diff --git a/src/renderer/src/lib/agent-session/launch/pane/agent-launch-pane-verdict-application.test.ts b/src/renderer/src/lib/agent-session/launch/pane/agent-launch-pane-verdict-application.test.ts index b1fe28e345d..e7cfc7dad8a 100644 --- a/src/renderer/src/lib/agent-session/launch/pane/agent-launch-pane-verdict-application.test.ts +++ b/src/renderer/src/lib/agent-session/launch/pane/agent-launch-pane-verdict-application.test.ts @@ -1,5 +1,5 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type { AgentLaunchPaneVerdict } from '../../../../../../shared/agent-launch/contracts/agent-launch-pane-verdict' import { createTabsSliceMockApi } from '../../../../store/slices/tabs/tabs-slice-test-harness' import { createTestStore } from '../../../../store/testing/app-store-test-fixture' @@ -12,7 +12,7 @@ vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) => ) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => ({ +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => ({ ...(await importOriginal()), detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) })) diff --git a/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-main-written.test.ts b/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-main-written.test.ts index a0f39e6d9d9..9433b300158 100644 --- a/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-main-written.test.ts +++ b/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-main-written.test.ts @@ -1,11 +1,11 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type { AgentLaunchTabPublishRequest } from '../../../../../../shared/agent-launch/contracts/agent-launch-tab-publication' import { createTabsSliceMockApi } from '../../../../store/slices/tabs/tabs-slice-test-harness' import { createTestStore } from '../../../../store/testing/app-store-test-fixture' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => ({ +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => ({ ...(await importOriginal()), detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) })) diff --git a/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-publication.test.ts b/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-publication.test.ts index 8146a4edae1..37dc23030bf 100644 --- a/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-publication.test.ts +++ b/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-publication.test.ts @@ -1,11 +1,11 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type { AgentLaunchTabPublishRequest } from '../../../../../../shared/agent-launch/contracts/agent-launch-tab-publication' import { createTabsSliceMockApi } from '../../../../store/slices/tabs/tabs-slice-test-harness' import { createTestStore } from '../../../../store/testing/app-store-test-fixture' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => ({ +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => ({ ...(await importOriginal()), detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) })) diff --git a/src/renderer/src/lib/agent-session/launch/pane/agent-launch-through-host.test.ts b/src/renderer/src/lib/agent-session/launch/pane/agent-launch-through-host.test.ts index 477ddad7c6b..7c73959c67a 100644 --- a/src/renderer/src/lib/agent-session/launch/pane/agent-launch-through-host.test.ts +++ b/src/renderer/src/lib/agent-session/launch/pane/agent-launch-through-host.test.ts @@ -1,10 +1,10 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { createTabsSliceMockApi } from '../../../../store/slices/tabs/tabs-slice-test-harness' import { createTestStore } from '../../../../store/testing/app-store-test-fixture' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => ({ +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => ({ ...(await importOriginal()), detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) })) diff --git a/src/renderer/src/lib/agent-session/launch/prompt/agent-launch-prompt-delivery.ts b/src/renderer/src/lib/agent-session/launch/prompt/agent-launch-prompt-delivery.ts index dfc33660d6b..c57947ab5b4 100644 --- a/src/renderer/src/lib/agent-session/launch/prompt/agent-launch-prompt-delivery.ts +++ b/src/renderer/src/lib/agent-session/launch/prompt/agent-launch-prompt-delivery.ts @@ -1,5 +1,5 @@ -import { agentDeliversDraftViaNativePrefill } from '@/lib/agent-native-draft-prefill' -import { pasteDraftWhenAgentReady } from '@/lib/agent-paste-draft' +import { agentDeliversDraftViaNativePrefill } from '@/lib/agent-session/messaging/paste/agent-native-draft-prefill' +import { pasteDraftWhenAgentReady } from '@/lib/agent-session/messaging/paste/agent-paste-draft' import { canMirrorLaunchDraftToNativeChat } from '../../../../../../shared/native-chat/input/native-chat-launch-draft-mirrorability' import { isNativeChatSupportedAgent } from '../../../../../../shared/native-chat/native-chat-agent-support' import { useAppStore } from '@/store/index' diff --git a/src/renderer/src/lib/agent-launch-prompt-failure-notice.ts b/src/renderer/src/lib/agent-session/launch/prompt/agent-launch-prompt-failure-notice.ts similarity index 79% rename from src/renderer/src/lib/agent-launch-prompt-failure-notice.ts rename to src/renderer/src/lib/agent-session/launch/prompt/agent-launch-prompt-failure-notice.ts index 5fb6fd9f664..0117a018f6b 100644 --- a/src/renderer/src/lib/agent-launch-prompt-failure-notice.ts +++ b/src/renderer/src/lib/agent-session/launch/prompt/agent-launch-prompt-failure-notice.ts @@ -1,7 +1,7 @@ import { toast } from 'sonner' import { translate } from '@/i18n/i18n' -import { structuredAgentLabel } from './agent-session/launch/structured-agent-session-launch-label' -import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' +import { structuredAgentLabel } from '../structured-agent-session-launch-label' +import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' export function notifyAgentLaunchPromptNotSent(agent: TuiAgent, content?: string): void { const message = translate( diff --git a/src/renderer/src/lib/agent-menu-selection.ts b/src/renderer/src/lib/agent-session/launch/routing/agent-menu-selection.ts similarity index 78% rename from src/renderer/src/lib/agent-menu-selection.ts rename to src/renderer/src/lib/agent-session/launch/routing/agent-menu-selection.ts index 6a308167ead..e4a2a403e36 100644 --- a/src/renderer/src/lib/agent-menu-selection.ts +++ b/src/renderer/src/lib/agent-session/launch/routing/agent-menu-selection.ts @@ -1,12 +1,12 @@ -import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' -import type { ExecutionHostId } from '../../../shared/execution-host' -import { nativeChatPreferenceFor } from '../../../shared/structured-native-chat-launch-route' -import type { AgentLaunchSurface } from './agent-session/launch/routing/agent-session-launch-plan' -import type { AgentLaunchRoute } from './agent-session/launch/routing/agent-launch-routing' +import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' +import type { ExecutionHostId } from '../../../../../../shared/execution-host' +import { nativeChatPreferenceFor } from '../../../../../../shared/structured-native-chat-launch-route' +import type { AgentLaunchSurface } from './agent-session-launch-plan' +import type { AgentLaunchRoute } from './agent-launch-routing' import type { HostChatAnswer, NewTabAgentMenuSettings -} from '../../../shared/agent-launch/picker/agent-launch-picker-rows' +} from '../../../../../../shared/agent-launch/picker/agent-launch-picker-rows' /** Accepted renderer intent; route and explicitness remain distinct through admission. */ export type AgentLaunchChoice = { diff --git a/src/renderer/src/lib/agent-session/launch/routing/agent-session-launch-plan.ts b/src/renderer/src/lib/agent-session/launch/routing/agent-session-launch-plan.ts index 9bcee4a6731..de3c6094008 100644 --- a/src/renderer/src/lib/agent-session/launch/routing/agent-session-launch-plan.ts +++ b/src/renderer/src/lib/agent-session/launch/routing/agent-session-launch-plan.ts @@ -1,4 +1,7 @@ -import { notifyAgentLaunchFailure, agentLaunchRecoveryMessage } from '@/lib/agent-launch-failure' +import { + notifyAgentLaunchFailure, + agentLaunchRecoveryMessage +} from '@/lib/agent-session/launch/failure/agent-launch-failure' import type { StructuredLaunchSurfaceAddress } from '../structured-agent-session-launch-record' import type { StructuredAgentSessionForkSource, diff --git a/src/renderer/src/lib/new-tab-agent-menu-rows.ts b/src/renderer/src/lib/agent-session/launch/routing/new-tab-agent-menu-rows.ts similarity index 81% rename from src/renderer/src/lib/new-tab-agent-menu-rows.ts rename to src/renderer/src/lib/agent-session/launch/routing/new-tab-agent-menu-rows.ts index 8450cc7f442..738f6c8acaf 100644 --- a/src/renderer/src/lib/new-tab-agent-menu-rows.ts +++ b/src/renderer/src/lib/agent-session/launch/routing/new-tab-agent-menu-rows.ts @@ -2,8 +2,8 @@ import { structuredAgentLaunchSupport, type AgentLaunchRoutingInput } from '@/lib/agent-session/launch/routing/agent-launch-routing' -import { STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY as CATALOG } from '../../../shared/agent-session/structured-agent-session-surface-capabilities' -import type { HostChatAnswer } from '../../../shared/agent-launch/picker/agent-launch-picker-rows' +import { STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY as CATALOG } from '../../../../../../shared/agent-session/structured-agent-session-surface-capabilities' +import type { HostChatAnswer } from '../../../../../../shared/agent-launch/picker/agent-launch-picker-rows' export function hostChatAnswer(input: AgentLaunchRoutingInput): HostChatAnswer { const support = structuredAgentLaunchSupport(input) diff --git a/src/renderer/src/lib/agent-tab-shortcuts.ts b/src/renderer/src/lib/agent-session/launch/shortcuts/agent-tab-shortcuts.ts similarity index 86% rename from src/renderer/src/lib/agent-tab-shortcuts.ts rename to src/renderer/src/lib/agent-session/launch/shortcuts/agent-tab-shortcuts.ts index 7b5b2b046d3..7819d763499 100644 --- a/src/renderer/src/lib/agent-tab-shortcuts.ts +++ b/src/renderer/src/lib/agent-session/launch/shortcuts/agent-tab-shortcuts.ts @@ -1,17 +1,17 @@ -import { acquireAgentLaunchChoices } from './host-chat-program-acquisition' -import { - agentTabActionId, - type AgentTabActionId, - type KeybindingOverrides -} from '../../../shared/keybindings' -import { ALL_TUI_AGENTS } from '../../../shared/agent-launch/catalog/tui-agent-display-names' +import { acquireAgentLaunchChoices } from '../../../host-chat-program-acquisition' +import { agentTabActionId } from '../../../../../../shared/keybindings/definitions' +import type { + AgentTabActionId, + KeybindingOverrides +} from '../../../../../../shared/keybindings/types' +import { ALL_TUI_AGENTS } from '../../../../../../shared/agent-launch/catalog/tui-agent-display-names' import { normalizeDisabledTuiAgents, pickTuiAgent -} from '../../../shared/agent-launch/catalog/tui-agent-selection' -import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' +} from '../../../../../../shared/agent-launch/catalog/tui-agent-selection' +import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' import type { AppState } from '@/store/types' -import { loadDetectedAgentsForWorktree } from '@/lib/agent-detection-target-inventory' +import { loadDetectedAgentsForWorktree } from '@/lib/agent-session/launch/inventory/agent-detection-target-inventory' import { type AgentLaunchRouteStore, type ProspectiveWorkspace, diff --git a/src/renderer/src/lib/agent-startup-delayed-delivery-perf.test.ts b/src/renderer/src/lib/agent-session/launch/startup/agent-startup-delayed-delivery-perf.test.ts similarity index 98% rename from src/renderer/src/lib/agent-startup-delayed-delivery-perf.test.ts rename to src/renderer/src/lib/agent-session/launch/startup/agent-startup-delayed-delivery-perf.test.ts index 38ba53079f8..48e3eff6c29 100644 --- a/src/renderer/src/lib/agent-startup-delayed-delivery-perf.test.ts +++ b/src/renderer/src/lib/agent-session/launch/startup/agent-startup-delayed-delivery-perf.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import { queuePendingAgentStartupDelivery, resetAgentStartupDelayedDeliveryForTests diff --git a/src/renderer/src/lib/agent-startup-delayed-delivery.ts b/src/renderer/src/lib/agent-session/launch/startup/agent-startup-delayed-delivery.ts similarity index 97% rename from src/renderer/src/lib/agent-startup-delayed-delivery.ts rename to src/renderer/src/lib/agent-session/launch/startup/agent-startup-delayed-delivery.ts index 2637ef3b4b5..793caa5df31 100644 --- a/src/renderer/src/lib/agent-startup-delayed-delivery.ts +++ b/src/renderer/src/lib/agent-session/launch/startup/agent-startup-delayed-delivery.ts @@ -1,6 +1,6 @@ -import { useAppStore } from '@/store' -import type { AgentStartupPlan } from '../../../shared/agent-launch/startup/tui-agent-startup' -import { parsePaneKey } from '../../../shared/workspace-layout/stable-pane-id' +import { useAppStore } from '@/store/index' +import type { AgentStartupPlan } from '../../../../../../shared/agent-launch/startup/tui-agent-startup' +import { parsePaneKey } from '../../../../../../shared/workspace-layout/stable-pane-id' import { agentStartupDeliveryKey as deliveryKey, clearConsumedAgentStartupDeliveriesForTests, diff --git a/src/renderer/src/lib/agent-startup-delivery-guards.ts b/src/renderer/src/lib/agent-session/launch/startup/agent-startup-delivery-guards.ts similarity index 100% rename from src/renderer/src/lib/agent-startup-delivery-guards.ts rename to src/renderer/src/lib/agent-session/launch/startup/agent-startup-delivery-guards.ts diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-admission.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-admission.ts index e58cc14b796..2d320739e19 100644 --- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-admission.ts +++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-admission.ts @@ -28,7 +28,7 @@ import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-t import { toRuntimeWorktreeSelector } from '@/runtime/rpc/targets/runtime-worktree-selector' import { readStructuredChatHostPermissionVerdict } from '@/runtime/native-chat/host-capabilities/structured-chat-host-permission' import { notifyHostPermissionRefused } from '@/lib/agent-session/launch/structured-agent-session-launch-permission-notice' -import { readAgentInventoryForTarget } from '@/lib/agent-detection-target-inventory' +import { readAgentInventoryForTarget } from '@/lib/agent-session/launch/inventory/agent-detection-target-inventory' import type { WebRuntimeTerminalCreateOutcome } from '@/runtime/hosted-terminals/creation/terminal-create-contracts' import { structuredLaunchTerminalFromOutcome } from './structured-launch-terminal-outcome' diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-after-failure.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-after-failure.test.ts index a0750936eff..c95c13a7cf5 100644 --- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-after-failure.test.ts +++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-after-failure.test.ts @@ -81,7 +81,7 @@ vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback })) -vi.mock('@/lib/agent-catalog', () => ({ +vi.mock('@/lib/agent-catalog/agent-catalog', () => ({ getAgentLabel: () => 'Codex', getAgentCatalog: () => [{ id: 'codex', label: 'Codex' }] })) diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-close-race.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-close-race.test.ts index 91b9da02928..1889792d8bf 100644 --- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-close-race.test.ts +++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-close-race.test.ts @@ -100,7 +100,7 @@ vi.mock('@/i18n/i18n', () => ({ fallback.replace('{{value0}}', options?.value0 ?? '') })) -vi.mock('@/lib/agent-catalog', () => ({ +vi.mock('@/lib/agent-catalog/agent-catalog', () => ({ getAgentLabel: (agent: string) => (agent === 'codex' ? 'Codex' : 'Claude'), getAgentCatalog: () => [ { id: 'claude', label: 'Claude' }, diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-completion.test-fixture.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-completion.test-fixture.ts index 86a41c25e44..aa4daef61c9 100644 --- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-completion.test-fixture.ts +++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-completion.test-fixture.ts @@ -1,5 +1,5 @@ import { expect, it, vi } from 'vitest' -import { sendMessageToAgent } from '../../agent-message-send' +import { sendMessageToAgent } from '../messaging/agent-message-send' import { SendParams } from '../../../../../shared/rpc-contract/structured-agent-session-params' import type { Tab } from '../../../../../shared/tab-types' import { beginStructuredAgentLaunchSettlement } from './continuation/structured-agent-launch-settlement' diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-different-request.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-different-request.test.ts index 2617313924c..abf123e89b8 100644 --- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-different-request.test.ts +++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-different-request.test.ts @@ -85,7 +85,7 @@ vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback })) -vi.mock('@/lib/agent-catalog', () => ({ +vi.mock('@/lib/agent-catalog/agent-catalog', () => ({ getAgentLabel: () => 'Codex', getAgentCatalog: () => [{ id: 'codex', label: 'Codex' }] })) diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-exited-owner.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-exited-owner.test.ts index fdb7138e1c8..a562ee2bb10 100644 --- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-exited-owner.test.ts +++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-exited-owner.test.ts @@ -38,7 +38,7 @@ vi.mock('@/store/index', () => ({ } })) vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback })) -vi.mock('@/lib/agent-catalog', () => ({ +vi.mock('@/lib/agent-catalog/agent-catalog', () => ({ getAgentLabel: () => 'Codex', getAgentCatalog: () => [{ id: 'codex', label: 'Codex' }] })) diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-join-delivery.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-join-delivery.test.ts index 1f6bb2cab8d..90b6e41dfe5 100644 --- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-join-delivery.test.ts +++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-join-delivery.test.ts @@ -91,7 +91,7 @@ vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback })) -vi.mock('@/lib/agent-catalog', () => ({ +vi.mock('@/lib/agent-catalog/agent-catalog', () => ({ getAgentLabel: () => 'Codex', getAgentCatalog: () => [{ id: 'codex', label: 'Codex' }] })) diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-label.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-label.ts index c9b3fef0d02..e1a7798a531 100644 --- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-label.ts +++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-label.ts @@ -1,5 +1,5 @@ import type { AgentType } from '../../../../../shared/agent-status/contracts/agent-status-types' -import { getAgentCatalog } from '@/lib/agent-catalog' +import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog' export function structuredAgentLabel(agent: AgentType): string { return getAgentCatalog().find((entry) => entry.id === agent)?.label ?? agent diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-options.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-options.test.ts index 742da475f63..2759c14d142 100644 --- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-options.test.ts +++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-options.test.ts @@ -82,7 +82,7 @@ vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback })) -vi.mock('@/lib/agent-catalog', () => ({ +vi.mock('@/lib/agent-catalog/agent-catalog', () => ({ getAgentLabel: () => 'Codex', getAgentCatalog: () => [{ id: 'codex', label: 'Codex' }] })) diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-outcome-tracking.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-outcome-tracking.ts index ac9f91c35ff..331bcaad405 100644 --- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-outcome-tracking.ts +++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-outcome-tracking.ts @@ -4,7 +4,7 @@ import { retireStructuredAgentSessionReadOwner } from '@/components/native-chat/ import { useAppStore } from '@/store/index' import { publishStructuredAgentSessionSends } from '@/components/native-chat/session/structured/delivery/structured-agent-session-pending-sends' import { agentSessionWriteFailureText } from '@/components/native-chat/messages/notices/agent-session-write-notice-text' -import { getAgentLabel } from '@/lib/agent-catalog' +import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog' import { removeStructuredLaunchSlot } from './structured-agent-session-launch-slot' import { materializeStructuredLaunchSurface, diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-resume-identity.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-resume-identity.test.ts index 3b02d5dc1b6..eec4a76ac60 100644 --- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-resume-identity.test.ts +++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-resume-identity.test.ts @@ -20,7 +20,7 @@ vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback })) -vi.mock('@/lib/agent-catalog', () => ({ +vi.mock('@/lib/agent-catalog/agent-catalog', () => ({ getAgentCatalog: () => [{ id: 'codex', label: 'Codex' }] })) diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-selection-admission.test-fixture.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-selection-admission.test-fixture.ts index b78adb7fca2..91774c43d3c 100644 --- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-selection-admission.test-fixture.ts +++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-selection-admission.test-fixture.ts @@ -10,7 +10,7 @@ import { structuredAgentSessionSendOut } from '@/components/native-chat/session/structured/delivery/structured-agent-session-pending-sends' import { structuredConversationCommandRunner } from '@/components/native-chat/session/structured/writes/structured-conversation-command-send' -import { sendMessageToAgent } from '../../agent-message-send' +import { sendMessageToAgent } from '../messaging/agent-message-send' import { recordHostModelCatalogSnapshot } from '@/runtime/native-chat/model-catalogs/host-model-catalog-snapshots' import { getStructuredLaunchStateBySessionId } from './structured-agent-session-launch-registry' import { structuredSessionSelectionController } from '../options/structured-agent-session-selection-controller' diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-unconfirmed-or-retried.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-unconfirmed-or-retried.test.ts index 666b6f77ec7..67da66add19 100644 --- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-unconfirmed-or-retried.test.ts +++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-unconfirmed-or-retried.test.ts @@ -71,7 +71,7 @@ vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback })) -vi.mock('@/lib/agent-catalog', () => ({ +vi.mock('@/lib/agent-catalog/agent-catalog', () => ({ getAgentLabel: () => 'Codex', getAgentCatalog: () => [{ id: 'codex', label: 'Codex' }] })) diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch.test-fixture.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch.test-fixture.ts index 7c88cdd8e70..1fbf4fe56ad 100644 --- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch.test-fixture.ts +++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch.test-fixture.ts @@ -119,7 +119,7 @@ vi.mock('@/i18n/i18n', () => ({ fallback.replace('{{value0}}', options?.value0 ?? '') })) -vi.mock('@/lib/agent-catalog', () => ({ +vi.mock('@/lib/agent-catalog/agent-catalog', () => ({ getAgentLabel: (agent: string) => (agent === 'codex' ? 'Codex' : 'Claude'), getAgentCatalog: () => [ { id: 'claude', label: 'Claude' }, diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-new-chat-own-launch.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-new-chat-own-launch.test.ts index 19e189fdc75..e532d4a7685 100644 --- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-new-chat-own-launch.test.ts +++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-new-chat-own-launch.test.ts @@ -56,7 +56,7 @@ const owner = vi.hoisted((): { store: ReturnType | null vi.mock('sonner', () => ({ toast: { error: vi.fn(), info: vi.fn(), message: vi.fn() } })) vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback })) -vi.mock('@/lib/agent-catalog', () => ({ +vi.mock('@/lib/agent-catalog/agent-catalog', () => ({ getAgentLabel: () => 'Codex', getAgentCatalog: () => [{ id: 'codex', label: 'Codex' }] })) diff --git a/src/renderer/src/lib/agent-message-send.test.ts b/src/renderer/src/lib/agent-session/messaging/agent-message-send.test.ts similarity index 88% rename from src/renderer/src/lib/agent-message-send.test.ts rename to src/renderer/src/lib/agent-session/messaging/agent-message-send.test.ts index 3d5484a24e4..639cbff3777 100644 --- a/src/renderer/src/lib/agent-message-send.test.ts +++ b/src/renderer/src/lib/agent-session/messaging/agent-message-send.test.ts @@ -10,7 +10,7 @@ const mocks = vi.hoisted(() => { } }) -vi.mock('@/store', () => ({ +vi.mock('@/store/index', () => ({ useAppStore: { getState: () => ({ unifiedTabsByWorktree: { @@ -22,14 +22,16 @@ vi.mock('@/store', () => ({ vi.mock('@/runtime/native-chat/session-ownership/structured-agent-session-owner', () => ({ structuredAgentSessionTargetForTab: () => ({ kind: 'local' }) })) -vi.mock('./agent-session/launch/structured-agent-session-launch-message', () => ({ +vi.mock('../launch/structured-agent-session-launch-message', () => ({ relaunchFailedStructuredAgentSessionWithMessage: mocks.relaunch })) -vi.mock('./agent-session/launch/structured-agent-session-launch-registry', () => ({ - getStructuredAgentSessionLaunchLifecycle: () => mocks.launch.lifecycle, +vi.mock('../launch/structured-agent-session-launch-registry', () => ({ + getStructuredAgentSessionLaunchLifecycle: () => mocks.launch.lifecycle +})) +vi.mock('../launch/structured-agent-session-launch-input', () => ({ structuredAgentSessionLaunchHasRetainedInput: () => false })) -vi.mock('./active-agent-note-send', () => ({ sendNotesToActiveAgentSession: vi.fn() })) +vi.mock('./terminal/active-agent-note-send', () => ({ sendNotesToActiveAgentSession: vi.fn() })) vi.mock( '@/components/native-chat/session/structured/delivery/structured-agent-session-message-sender', () => ({ diff --git a/src/renderer/src/lib/agent-message-send.ts b/src/renderer/src/lib/agent-session/messaging/agent-message-send.ts similarity index 85% rename from src/renderer/src/lib/agent-message-send.ts rename to src/renderer/src/lib/agent-session/messaging/agent-message-send.ts index fc57a4838a9..b9987271851 100644 --- a/src/renderer/src/lib/agent-message-send.ts +++ b/src/renderer/src/lib/agent-session/messaging/agent-message-send.ts @@ -1,16 +1,12 @@ -import type { ActiveAgentNotesSendResult } from './active-agent-note-send-result' +import type { ActiveAgentNotesSendResult } from './terminal/active-agent-note-send-result' import type { AgentMessageTarget } from './agent-message-target' -import { sendNotesToActiveAgentSession } from './active-agent-note-send' -import { relaunchFailedStructuredAgentSessionWithMessage } from './agent-session/launch/structured-agent-session-launch-message' -import { - getStructuredAgentSessionLaunchLifecycle, - structuredAgentSessionLaunchHasRetainedInput -} from './agent-session/launch/structured-agent-session-launch-registry' +import { sendNotesToActiveAgentSession } from './terminal/active-agent-note-send' +import { relaunchFailedStructuredAgentSessionWithMessage } from '../launch/structured-agent-session-launch-message' +import { getStructuredAgentSessionLaunchLifecycle } from '../launch/structured-agent-session-launch-registry' +import { structuredAgentSessionLaunchHasRetainedInput } from '../launch/structured-agent-session-launch-input' import { sendStructuredAgentSessionMessage } from '@/components/native-chat/session/structured/delivery/structured-agent-session-message-sender' import { structuredAgentSessionTargetForTab } from '@/runtime/native-chat/session-ownership/structured-agent-session-owner' -import { useAppStore } from '@/store' - -export type { AgentMessageTarget } from './agent-message-target' +import { useAppStore } from '@/store/index' export async function sendMessageToAgent(args: { worktreeId: string diff --git a/src/renderer/src/lib/agent-message-target.ts b/src/renderer/src/lib/agent-session/messaging/agent-message-target.ts similarity index 100% rename from src/renderer/src/lib/agent-message-target.ts rename to src/renderer/src/lib/agent-session/messaging/agent-message-target.ts diff --git a/src/renderer/src/lib/agent-send-disabled-reason-label.ts b/src/renderer/src/lib/agent-session/messaging/agent-send-disabled-reason-label.ts similarity index 100% rename from src/renderer/src/lib/agent-send-disabled-reason-label.ts rename to src/renderer/src/lib/agent-session/messaging/agent-send-disabled-reason-label.ts diff --git a/src/renderer/src/lib/agent-send-title-status.ts b/src/renderer/src/lib/agent-session/messaging/agent-send-title-status.ts similarity index 64% rename from src/renderer/src/lib/agent-send-title-status.ts rename to src/renderer/src/lib/agent-session/messaging/agent-send-title-status.ts index d5a769d6e1b..dc003cfda22 100644 --- a/src/renderer/src/lib/agent-send-title-status.ts +++ b/src/renderer/src/lib/agent-session/messaging/agent-send-title-status.ts @@ -1,6 +1,7 @@ -import type { AgentStatus } from '../../../shared/agent-status/title/agent-title-core' -import { isOpenCodeNativeTitle } from '../../../shared/agent-status/title/providers/opencode-terminal-title' -import { classifyTitleActivity, resolveTitleActivityLabel } from '@/lib/pane-agent-evidence' +import type { AgentStatus } from '../../../../../shared/agent-status/title/agent-title-core' +import { isOpenCodeNativeTitle } from '../../../../../shared/agent-status/title/providers/opencode-terminal-title' +import { detectAgentStatusFromTitle } from '../../../../../shared/agent-status/title/agent-title-status' +import { getAgentLabel } from '../../../../../shared/agent-status/title/agent-title-identity' const EXPLICIT_IDLE_SEND_TITLE_RE = /(^|\s)(ready|idle|done)(\s|$|[.!?])/i const CLAUDE_IDLE_PREFIX = '\u2733' @@ -8,11 +9,11 @@ const GEMINI_IDLE_PREFIX = '\u25c7' const PI_IDLE_PREFIX = '\u03c0 - ' export function detectAgentSendTitleStatus(title: string | null | undefined): AgentStatus | null { - if (!title || resolveTitleActivityLabel(title) === null) { + if (!title || getAgentLabel(title) === null) { return null } - const status = classifyTitleActivity(title) + const status = detectAgentStatusFromTitle(title) if (status !== 'idle') { return status } diff --git a/src/renderer/src/lib/notes-send-agent-targets.ts b/src/renderer/src/lib/agent-session/messaging/notes-send-agent-targets.ts similarity index 92% rename from src/renderer/src/lib/notes-send-agent-targets.ts rename to src/renderer/src/lib/agent-session/messaging/notes-send-agent-targets.ts index 20c56ddca7a..f3e1ba270a6 100644 --- a/src/renderer/src/lib/notes-send-agent-targets.ts +++ b/src/renderer/src/lib/agent-session/messaging/notes-send-agent-targets.ts @@ -2,17 +2,20 @@ import { projectedStructuredChatTabName, type StructuredChatTabNames } from '@/runtime/native-chat/naming/structured-chat-tab-name' -import { structuredChatTabById } from './structured-chat-tab-index' -import type { AgentType } from '../../../shared/agent-status/contracts/agent-status-types' +import { structuredChatTabById } from '../../structured-chat-tab-index' +import type { AgentType } from '../../../../../shared/agent-status/contracts/agent-status-types' import type { AppState } from '@/store/types' -import { isTerminalLeafId, makePaneKey } from '../../../shared/workspace-layout/stable-pane-id' -import { resolveTerminalTitleAgentType } from '../../../shared/agent-status/title/terminal-title-agent-type' -import type { TerminalTab } from '../../../shared/workspace-layout/terminal-tab-types' +import { + isTerminalLeafId, + makePaneKey +} from '../../../../../shared/workspace-layout/stable-pane-id' +import { resolveTerminalTitleAgentType } from '../../../../../shared/agent-status/title/terminal-title-agent-type' +import type { TerminalTab } from '../../../../../shared/workspace-layout/terminal-tab-types' import { detectAgentSendTitleStatus } from './agent-send-title-status' import { resolveRuntimePaneTitleLeafResolution, type RuntimePaneTitleLeafResolution -} from '../../../shared/runtime-pane-title-leaf-id' +} from '../../../../../shared/runtime-pane-title-leaf-id' import { deriveRunningAgentSendTargets, deriveStatuslessStructuredAgentSendTargets, diff --git a/src/renderer/src/lib/agent-draft-paste-content.ts b/src/renderer/src/lib/agent-session/messaging/paste/agent-draft-paste-content.ts similarity index 95% rename from src/renderer/src/lib/agent-draft-paste-content.ts rename to src/renderer/src/lib/agent-session/messaging/paste/agent-draft-paste-content.ts index 457f9aa298b..f24122366b3 100644 --- a/src/renderer/src/lib/agent-draft-paste-content.ts +++ b/src/renderer/src/lib/agent-session/messaging/paste/agent-draft-paste-content.ts @@ -1,18 +1,18 @@ -import { yieldToEventLoop } from '../../../shared/event-loop-yield' +import { yieldToEventLoop } from '../../../../../../shared/event-loop-yield' import { getUtf8ByteLengthForCodePoint, readUtf8CodePointAt -} from '../../../shared/utf8-byte-limits' +} from '../../../../../../shared/utf8-byte-limits' import '@/components/terminal-pane/input/paste/terminal-bracketed-paste' import { BRACKETED_PASTE_END, BRACKETED_PASTE_START, normalizeTerminalPasteLineEndings, wrapTerminalBracketedPasteText -} from '../../../shared/terminal/input/terminal-bracketed-paste-text' +} from '../../../../../../shared/terminal/input/terminal-bracketed-paste-text' import { runTerminalPtyInputTransaction } from '@/components/terminal-pane/input/paste/terminal-pty-input-transaction' import { sendRuntimePtyInputVerified } from '@/runtime/hosted-terminals/input/runtime-terminal-verified-input' -import type { TerminalInputKind } from '../../../shared/terminal/input/terminal-input-kind' +import type { TerminalInputKind } from '../../../../../../shared/terminal/input/terminal-input-kind' // Bracketed paste keeps generated prompts together without triggering per-character TUI edits. export const AGENT_DRAFT_PASTE_DIRECT_MAX_BYTES = 64 * 1024 diff --git a/src/renderer/src/lib/agent-draft-readiness.ts b/src/renderer/src/lib/agent-session/messaging/paste/agent-draft-readiness.ts similarity index 90% rename from src/renderer/src/lib/agent-draft-readiness.ts rename to src/renderer/src/lib/agent-session/messaging/paste/agent-draft-readiness.ts index e1703faa7b3..a8c4cdb169b 100644 --- a/src/renderer/src/lib/agent-draft-readiness.ts +++ b/src/renderer/src/lib/agent-session/messaging/paste/agent-draft-readiness.ts @@ -1,9 +1,9 @@ -import type { DraftPasteReadySignal } from '../../../shared/agent-launch/catalog/tui-agent-config-types' +import type { DraftPasteReadySignal } from '../../../../../../shared/agent-launch/catalog/tui-agent-config-types' import { subscribeToPtyData } from '@/components/terminal-pane/pty-transport/delivery/pty-data-sidecar-subscriptions' import { replayPreHandlerPtyData } from '@/components/terminal-pane/pty-transport/delivery/pty-pre-handler-buffer' -import { isRemoteRuntimePtyId } from '../../../shared/remote-runtime/remote-runtime-pty-id' +import { isRemoteRuntimePtyId } from '../../../../../../shared/remote-runtime/remote-runtime-pty-id' import { subscribeToRuntimeTerminalData } from '@/runtime/hosted-terminals/streams/runtime-terminal-data-subscription' -import { createDraftPasteReadyScanner } from '../../../shared/draft-paste-ready-scanner' +import { createDraftPasteReadyScanner } from '../../../../../../shared/draft-paste-ready-scanner' const BRACKETED_PASTE_QUIET_MS = 1500 diff --git a/src/renderer/src/lib/agent-followup-delivery.ts b/src/renderer/src/lib/agent-session/messaging/paste/agent-followup-delivery.ts similarity index 85% rename from src/renderer/src/lib/agent-followup-delivery.ts rename to src/renderer/src/lib/agent-session/messaging/paste/agent-followup-delivery.ts index f74759bad76..5980ce00649 100644 --- a/src/renderer/src/lib/agent-followup-delivery.ts +++ b/src/renderer/src/lib/agent-session/messaging/paste/agent-followup-delivery.ts @@ -1,11 +1,11 @@ import { inspectRuntimeTerminalProcess } from '@/runtime/hosted-terminals/inspection/runtime-terminal-process-inspection' -import { pasteDraftToAgentPtyWhenReady } from '@/lib/agent-paste-draft' -import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' +import { pasteDraftToAgentPtyWhenReady } from '@/lib/agent-session/messaging/paste/agent-paste-draft' +import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' import { isAgentForegroundWrapperProcess, isExpectedAgentProcess -} from '../../../shared/agent-status/process/agent-process-recognition' -import { isShellProcess } from '../../../shared/agent-status/process/shell-process-detection' +} from '../../../../../../shared/agent-status/process/agent-process-recognition' +import { isShellProcess } from '../../../../../../shared/agent-status/process/shell-process-detection' export async function sendFollowupPromptWhenAgentReady(args: { ptyId: string diff --git a/src/renderer/src/lib/agent-native-draft-prefill.ts b/src/renderer/src/lib/agent-session/messaging/paste/agent-native-draft-prefill.ts similarity index 70% rename from src/renderer/src/lib/agent-native-draft-prefill.ts rename to src/renderer/src/lib/agent-session/messaging/paste/agent-native-draft-prefill.ts index b45b7c8925d..38589cec0b5 100644 --- a/src/renderer/src/lib/agent-native-draft-prefill.ts +++ b/src/renderer/src/lib/agent-session/messaging/paste/agent-native-draft-prefill.ts @@ -1,5 +1,5 @@ -import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' -import { TUI_AGENT_CONFIG } from '../../../shared/agent-launch/catalog/tui-agent-config' +import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' +import { TUI_AGENT_CONFIG } from '../../../../../../shared/agent-launch/catalog/tui-agent-config' // Native flag/env prefill intentionally skips paste unless forcePaste is set; false then means delivered natively, not paste failure. export function agentDeliversDraftViaNativePrefill( diff --git a/src/renderer/src/lib/agent-paste-draft-submit-retry.test.ts b/src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft-submit-retry.test.ts similarity index 89% rename from src/renderer/src/lib/agent-paste-draft-submit-retry.test.ts rename to src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft-submit-retry.test.ts index 2a4f1885c9a..df082ab9708 100644 --- a/src/renderer/src/lib/agent-paste-draft-submit-retry.test.ts +++ b/src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft-submit-retry.test.ts @@ -1,12 +1,12 @@ import { beforeEach, afterEach, describe, expect, it, vi } from 'vitest' +import { pasteDraftWhenAgentReady } from './agent-paste-draft' import { AGENT_DRAFT_PASTE_DIRECT_MAX_BYTES, - pasteDraftWhenAgentReady, sendAgentDraftPasteContent -} from './agent-paste-draft' -import { AGENT_PROMPT_POST_PASTE_SUBMIT_DELAY_MS as POST_PASTE_SUBMIT_DELAY_MS } from '../../../shared/agent-launch/startup/agent-prompt-injection' -import { TUI_AGENT_CONFIG } from '../../../shared/agent-launch/catalog/tui-agent-config' -import type * as RemoteRuntimePtyIdModule from '../../../shared/remote-runtime/remote-runtime-pty-id' +} from './agent-draft-paste-content' +import { AGENT_PROMPT_POST_PASTE_SUBMIT_DELAY_MS as POST_PASTE_SUBMIT_DELAY_MS } from '../../../../../../shared/agent-launch/startup/agent-prompt-injection' +import { TUI_AGENT_CONFIG } from '../../../../../../shared/agent-launch/catalog/tui-agent-config' +import type * as RemoteRuntimePtyIdModule from '../../../../../../shared/remote-runtime/remote-runtime-pty-id' const testState = vi.hoisted(() => ({ appState: { @@ -27,7 +27,7 @@ const testState = vi.hoisted(() => ({ subscribeToRuntimeTerminalData: vi.fn() })) -vi.mock('@/store', () => ({ +vi.mock('@/store/index', () => ({ useAppStore: { getState: () => testState.appState, subscribe: () => () => {} @@ -45,10 +45,13 @@ vi.mock('@/components/terminal-pane/pty-transport/delivery/pty-pre-handler-buffe vi.mock('@/runtime/hosted-terminals/inspection/runtime-terminal-process-inspection', () => ({ inspectRuntimeTerminalProcess: testState.inspectRuntimeTerminalProcess })) -vi.mock('../../../shared/remote-runtime/remote-runtime-pty-id', async (importOriginal) => ({ - ...(await importOriginal()), - isRemoteRuntimePtyId: testState.isRemoteRuntimePtyId -})) +vi.mock( + '../../../../../../shared/remote-runtime/remote-runtime-pty-id', + async (importOriginal) => ({ + ...(await importOriginal()), + isRemoteRuntimePtyId: testState.isRemoteRuntimePtyId + }) +) vi.mock('@/runtime/hosted-terminals/input/runtime-terminal-verified-input', () => ({ sendRuntimePtyInputVerified: testState.sendRuntimePtyInputVerified })) diff --git a/src/renderer/src/lib/agent-paste-draft.test.ts b/src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft.test.ts similarity index 92% rename from src/renderer/src/lib/agent-paste-draft.test.ts rename to src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft.test.ts index 4224f495e8f..d3000306ce9 100644 --- a/src/renderer/src/lib/agent-paste-draft.test.ts +++ b/src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft.test.ts @@ -1,14 +1,13 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import { pasteDraftWhenAgentReady, sendBracketedPasteToRunningAgent } from './agent-paste-draft' import { AGENT_DRAFT_PASTE_CHUNK_MAX_BYTES, AGENT_DRAFT_PASTE_DIRECT_MAX_BYTES, - pasteDraftWhenAgentReady, - sendAgentDraftPasteContent, - sendBracketedPasteToRunningAgent -} from './agent-paste-draft' -import { AGENT_PROMPT_POST_PASTE_SUBMIT_DELAY_MS as POST_PASTE_SUBMIT_DELAY_MS } from '../../../shared/agent-launch/startup/agent-prompt-injection' -import { TUI_AGENT_CONFIG } from '../../../shared/agent-launch/catalog/tui-agent-config' -import type * as RemoteRuntimePtyIdModule from '../../../shared/remote-runtime/remote-runtime-pty-id' + sendAgentDraftPasteContent +} from './agent-draft-paste-content' +import { AGENT_PROMPT_POST_PASTE_SUBMIT_DELAY_MS as POST_PASTE_SUBMIT_DELAY_MS } from '../../../../../../shared/agent-launch/startup/agent-prompt-injection' +import { TUI_AGENT_CONFIG } from '../../../../../../shared/agent-launch/catalog/tui-agent-config' +import type * as RemoteRuntimePtyIdModule from '../../../../../../shared/remote-runtime/remote-runtime-pty-id' const testState = vi.hoisted(() => ({ appState: { @@ -30,7 +29,7 @@ const testState = vi.hoisted(() => ({ subscribeToRuntimeTerminalData: vi.fn() })) -vi.mock('@/store', () => ({ +vi.mock('@/store/index', () => ({ useAppStore: { getState: () => testState.appState, subscribe: ( @@ -53,10 +52,13 @@ vi.mock('@/components/terminal-pane/pty-transport/delivery/pty-pre-handler-buffe vi.mock('@/runtime/hosted-terminals/inspection/runtime-terminal-process-inspection', () => ({ inspectRuntimeTerminalProcess: testState.inspectRuntimeTerminalProcess })) -vi.mock('../../../shared/remote-runtime/remote-runtime-pty-id', async (importOriginal) => ({ - ...(await importOriginal()), - isRemoteRuntimePtyId: testState.isRemoteRuntimePtyId -})) +vi.mock( + '../../../../../../shared/remote-runtime/remote-runtime-pty-id', + async (importOriginal) => ({ + ...(await importOriginal()), + isRemoteRuntimePtyId: testState.isRemoteRuntimePtyId + }) +) vi.mock('@/runtime/hosted-terminals/input/runtime-terminal-verified-input', () => ({ sendRuntimePtyInputVerified: (ptyId: string, data: string) => testState.sendRuntimePtyInputVerified(ptyId, data) diff --git a/src/renderer/src/lib/agent-paste-draft.ts b/src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft.ts similarity index 91% rename from src/renderer/src/lib/agent-paste-draft.ts rename to src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft.ts index f448a2e773d..a235dae9b95 100644 --- a/src/renderer/src/lib/agent-paste-draft.ts +++ b/src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft.ts @@ -1,28 +1,20 @@ -import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' -import type { TerminalInputKind } from '../../../shared/terminal/input/terminal-input-kind' -import { TUI_AGENT_CONFIG } from '../../../shared/agent-launch/catalog/tui-agent-config' -import { AGENT_PROMPT_POST_PASTE_SUBMIT_DELAY_MS } from '../../../shared/agent-launch/startup/agent-prompt-injection' -import { resolveDraftPasteReadyTimeoutMs } from '../../../shared/draft-paste-ready-timeout' -import { resolvePasteReadySignal } from '../../../shared/draft-paste-ready-scanner' -import { useAppStore } from '@/store' +import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' +import type { TerminalInputKind } from '../../../../../../shared/terminal/input/terminal-input-kind' +import { TUI_AGENT_CONFIG } from '../../../../../../shared/agent-launch/catalog/tui-agent-config' +import { AGENT_PROMPT_POST_PASTE_SUBMIT_DELAY_MS } from '../../../../../../shared/agent-launch/startup/agent-prompt-injection' +import { resolveDraftPasteReadyTimeoutMs } from '../../../../../../shared/draft-paste-ready-timeout' +import { resolvePasteReadySignal } from '../../../../../../shared/draft-paste-ready-scanner' +import { useAppStore } from '@/store/index' import { inspectRuntimeTerminalProcess } from '@/runtime/hosted-terminals/inspection/runtime-terminal-process-inspection' import { sendRuntimePtyInputVerified } from '@/runtime/hosted-terminals/input/runtime-terminal-verified-input' import '@/components/terminal-pane/input/paste/terminal-bracketed-paste' -import '../../../shared/terminal/input/terminal-bracketed-paste-text' +import '../../../../../../shared/terminal/input/terminal-bracketed-paste-text' import { runTerminalPtyInputTransaction } from '@/components/terminal-pane/input/paste/terminal-pty-input-transaction' import { waitForAgentReady } from './agent-ready-wait' import { sendAgentDraftPasteContentNow } from './agent-draft-paste-content' import { agentDeliversDraftViaNativePrefill } from './agent-native-draft-prefill' import { waitForAgentDraftInputReady } from './agent-draft-readiness' -import { isExpectedAgentProcess } from '../../../shared/agent-status/process/agent-process-recognition' -export { - AGENT_DRAFT_PASTE_CHUNK_MAX_BYTES, - AGENT_DRAFT_PASTE_DIRECT_MAX_BYTES, - AGENT_DRAFT_PASTE_MAX_BYTES, - chunkAgentDraftPasteContent, - iterateAgentDraftPasteContentChunks, - sendAgentDraftPasteContent -} from './agent-draft-paste-content' +import { isExpectedAgentProcess } from '../../../../../../shared/agent-status/process/agent-process-recognition' // Bracketed paste keeps prompt insertion atomic; callers separately choose whether to submit with Enter. diff --git a/src/renderer/src/lib/agent-ready-wait.ts b/src/renderer/src/lib/agent-session/messaging/paste/agent-ready-wait.ts similarity index 86% rename from src/renderer/src/lib/agent-ready-wait.ts rename to src/renderer/src/lib/agent-session/messaging/paste/agent-ready-wait.ts index 07269f9c95f..89748204434 100644 --- a/src/renderer/src/lib/agent-ready-wait.ts +++ b/src/renderer/src/lib/agent-session/messaging/paste/agent-ready-wait.ts @@ -1,7 +1,7 @@ -import { classifyTitleActivity } from '@/lib/pane-agent-evidence' -import { isExpectedAgentProcess } from '../../../shared/agent-status/process/agent-process-recognition' -import { isShellProcess } from '../../../shared/agent-status/process/shell-process-detection' -import { useAppStore } from '@/store' +import { detectAgentStatusFromTitle } from '../../../../../../shared/agent-status/title/agent-title-status' +import { isExpectedAgentProcess } from '../../../../../../shared/agent-status/process/agent-process-recognition' +import { isShellProcess } from '../../../../../../shared/agent-status/process/shell-process-detection' +import { useAppStore } from '@/store/index' import { inspectRuntimeTerminalProcess } from '@/runtime/hosted-terminals/inspection/runtime-terminal-process-inspection' // Prefer idle titles, then matching foreground process, then a non-shell child after grace; bound waiting so missing binaries cannot hang Use. @@ -42,7 +42,7 @@ function titleSuggestsReady(tabId: string): boolean { } } } - return titles.some((title) => classifyTitleActivity(title) === 'idle') + return titles.some((title) => detectAgentStatusFromTitle(title) === 'idle') } /** Resolve readiness by idle title, matching process or non-shell child after grace. Timeout resolves ready:false; never rejects. */ diff --git a/src/renderer/src/lib/running-agent-targets.ts b/src/renderer/src/lib/agent-session/messaging/running-agent-targets.ts similarity index 92% rename from src/renderer/src/lib/running-agent-targets.ts rename to src/renderer/src/lib/agent-session/messaging/running-agent-targets.ts index 1a5a1b7110f..732995ec265 100644 --- a/src/renderer/src/lib/running-agent-targets.ts +++ b/src/renderer/src/lib/agent-session/messaging/running-agent-targets.ts @@ -2,15 +2,15 @@ import type { AppState } from '@/store/types' import type { AgentStatusEntry, AgentType -} from '../../../shared/agent-status/contracts/agent-status-types' -import type { TerminalTab } from '../../../shared/workspace-layout/terminal-tab-types' -import { parsePaneKey } from '../../../shared/workspace-layout/stable-pane-id' -import { structuredAgentSessionPaneKey } from '../../../shared/agent-session/view/structured-agent-session-projection' -import { isStructuredTab } from '../../../shared/agent-session/view/structured-agent-session-tab' -import { resolvePaneAgentActivity } from '@/lib/pane-agent-evidence' +} from '../../../../../shared/agent-status/contracts/agent-status-types' +import type { TerminalTab } from '../../../../../shared/workspace-layout/terminal-tab-types' +import { parsePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id' +import { structuredAgentSessionPaneKey } from '../../../../../shared/agent-session/view/structured-agent-session-projection' +import { isStructuredTab } from '../../../../../shared/agent-session/view/structured-agent-session-tab' +import { resolvePaneAgentActivity } from '@/lib/agent-status/evidence/pane-agent-evidence' import type { AgentMessageTarget } from './agent-message-target' import { detectAgentSendTitleStatus } from './agent-send-title-status' -import { resolveRuntimePaneTitleLeafResolution } from '../../../shared/runtime-pane-title-leaf-id' +import { resolveRuntimePaneTitleLeafResolution } from '../../../../../shared/runtime-pane-title-leaf-id' export type RunningAgentTargetState = Pick< AppState, diff --git a/src/renderer/src/lib/active-agent-note-send-delivery.ts b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-delivery.ts similarity index 94% rename from src/renderer/src/lib/active-agent-note-send-delivery.ts rename to src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-delivery.ts index 282cdbf1e35..7e1d7422250 100644 --- a/src/renderer/src/lib/active-agent-note-send-delivery.ts +++ b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-delivery.ts @@ -1,12 +1,12 @@ -import type { RuntimeTerminalSend } from '../../../shared/runtime-types' +import type { RuntimeTerminalSend } from '../../../../../../shared/runtime-terminal-send-contract' import { sanitizeBracketedPasteText as sanitizeTerminalPasteText, BRACKETED_PASTE_START as BRACKETED_PASTE_BEGIN, BRACKETED_PASTE_END -} from '../../../shared/terminal/input/terminal-bracketed-paste-text' +} from '../../../../../../shared/terminal/input/terminal-bracketed-paste-text' import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' -import './agent-paste-draft' -import { AGENT_PROMPT_POST_PASTE_SUBMIT_DELAY_MS as POST_PASTE_SUBMIT_DELAY_MS } from '../../../shared/agent-launch/startup/agent-prompt-injection' +import '../paste/agent-paste-draft' +import { AGENT_PROMPT_POST_PASTE_SUBMIT_DELAY_MS as POST_PASTE_SUBMIT_DELAY_MS } from '../../../../../../shared/agent-launch/startup/agent-prompt-injection' import type { ActiveAgentNotesSendResult } from './active-agent-note-send-result' import { ACTIVE_AGENT_SEND_RPC_TIMEOUT_MS, diff --git a/src/renderer/src/lib/active-agent-note-send-diagnostics.ts b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-diagnostics.ts similarity index 96% rename from src/renderer/src/lib/active-agent-note-send-diagnostics.ts rename to src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-diagnostics.ts index 28146783400..f5ffe401eb8 100644 --- a/src/renderer/src/lib/active-agent-note-send-diagnostics.ts +++ b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-diagnostics.ts @@ -3,7 +3,7 @@ import type { ActiveAgentNotesSendFailureCode, ActiveAgentNotesSendResult } from './active-agent-note-send-result' -import { hasRuntimeRpcErrorCode } from '../../../shared/runtime-rpc-error-code' +import { hasRuntimeRpcErrorCode } from '../../../../../../shared/runtime-rpc-error-code' export const TERMINAL_RUNTIME_FAILURE_CODES = [ 'terminal_handle_stale', diff --git a/src/renderer/src/lib/active-agent-note-send-explicit-target.test.ts b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-explicit-target.test.ts similarity index 99% rename from src/renderer/src/lib/active-agent-note-send-explicit-target.test.ts rename to src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-explicit-target.test.ts index e6b0cd2cecb..8e4811078ec 100644 --- a/src/renderer/src/lib/active-agent-note-send-explicit-target.test.ts +++ b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-explicit-target.test.ts @@ -22,7 +22,7 @@ const testState = vi.hoisted(() => ({ } })) -vi.mock('@/store', () => ({ +vi.mock('@/store/index', () => ({ useAppStore: Object.assign( (selector: (state: NoteSendAppState) => unknown) => selector(testState.appState), { diff --git a/src/renderer/src/lib/active-agent-note-send-focused-session.test.ts b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-focused-session.test.ts similarity index 99% rename from src/renderer/src/lib/active-agent-note-send-focused-session.test.ts rename to src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-focused-session.test.ts index b971afa48ef..5b71c3a0b94 100644 --- a/src/renderer/src/lib/active-agent-note-send-focused-session.test.ts +++ b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-focused-session.test.ts @@ -22,7 +22,7 @@ const testState = vi.hoisted(() => ({ } })) -vi.mock('@/store', () => ({ +vi.mock('@/store/index', () => ({ useAppStore: Object.assign( (selector: (state: NoteSendAppState) => unknown) => selector(testState.appState), { diff --git a/src/renderer/src/lib/active-agent-note-send-result.ts b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-result.ts similarity index 95% rename from src/renderer/src/lib/active-agent-note-send-result.ts rename to src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-result.ts index a739ebd71d4..c3edee7dd03 100644 --- a/src/renderer/src/lib/active-agent-note-send-result.ts +++ b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-result.ts @@ -1,4 +1,4 @@ -import { agentSessionWriteNoticeEnglish } from '../../../shared/agent-session/failures/agent-session-refusal-notice' +import { agentSessionWriteNoticeEnglish } from '../../../../../../shared/agent-session/failures/agent-session-refusal-notice' export type ActiveAgentNotesSendStatus = | 'sent' diff --git a/src/renderer/src/lib/active-agent-note-send-test-harness.ts b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-test-harness.ts similarity index 86% rename from src/renderer/src/lib/active-agent-note-send-test-harness.ts rename to src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-test-harness.ts index 0717fa37c9d..bee7f0e56cb 100644 --- a/src/renderer/src/lib/active-agent-note-send-test-harness.ts +++ b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-test-harness.ts @@ -1,5 +1,5 @@ -import type { AgentStatusEntry } from '../../../shared/agent-status/contracts/agent-status-types' -import type { TerminalLayoutSnapshot } from '../../../shared/workspace-layout/terminal-tab-types' +import type { AgentStatusEntry } from '../../../../../../shared/agent-status/contracts/agent-status-types' +import type { TerminalLayoutSnapshot } from '../../../../../../shared/workspace-layout/terminal-tab-types' export const LEAF_ID = '11111111-1111-4111-8111-111111111111' export const OTHER_LEAF_ID = '22222222-2222-4222-8222-222222222222' diff --git a/src/renderer/src/lib/active-agent-note-send.ts b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send.ts similarity index 91% rename from src/renderer/src/lib/active-agent-note-send.ts rename to src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send.ts index 662031c2925..ba72320e0cd 100644 --- a/src/renderer/src/lib/active-agent-note-send.ts +++ b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send.ts @@ -1,7 +1,7 @@ -import type { RuntimeTerminalWait } from '../../../shared/runtime-types' +import type { RuntimeTerminalWait } from '../../../../../../shared/runtime-terminal-contracts' import { runtimeTargetForOwnerEnvironment } from '@/runtime/rpc/targets/runtime-client-target' -import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' -import { useAppStore } from '@/store' +import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target' +import { useAppStore } from '@/store/index' import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner' import { findActiveRuntimeTerminal, getActiveTerminalNoteTarget } from './active-agent-note-target' @@ -24,18 +24,8 @@ import { sendPromptWithLegacyCombinedSend } from './active-agent-note-send-delivery' -export { - getActiveAgentNoteTarget, - getActiveAgentRuntimeProbeDescriptor, - getActiveTerminalNoteTarget, - probeActiveAgentNoteTarget, - type ActiveTerminalNoteTarget -} from './active-agent-note-target' -export { - activeAgentNotesSendFailureMessage, - type ActiveAgentNotesSendResult, - type ActiveAgentNotesSendStatus -} from './active-agent-note-send-result' +import './active-agent-note-send-result' + const ACTIVE_AGENT_SEND_TIMEOUT_MS = 8000 export async function sendNotesToActiveAgentSession(args: { diff --git a/src/renderer/src/lib/active-agent-note-target.ts b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-target.ts similarity index 85% rename from src/renderer/src/lib/active-agent-note-target.ts rename to src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-target.ts index 396c7d159ed..20c8655e208 100644 --- a/src/renderer/src/lib/active-agent-note-target.ts +++ b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-target.ts @@ -1,22 +1,26 @@ -import type { RuntimeTerminalListResult } from '../../../shared/runtime-types' +import type { RuntimeTerminalListResult } from '../../../../../../shared/runtime-terminal-contracts' import { runtimeTargetForOwnerEnvironment } from '@/runtime/rpc/targets/runtime-client-target' -import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' -import { toHostSessionTabId } from '../../../shared/workspace-layout/terminal-surface-id' -import { AGENT_STATUS_STALE_AFTER_MS } from '../../../shared/agent-status/contracts/agent-status-freshness' -import type { AgentStatusEntry } from '../../../shared/agent-status/contracts/agent-status-types' +import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target' +import { toHostSessionTabId } from '../../../../../../shared/workspace-layout/terminal-surface-id' +import { + AGENT_STATUS_STALE_AFTER_MS, + isAgentStatusFresh +} from '../../../../../../shared/agent-status/contracts/agent-status-freshness' +import type { AgentStatusEntry } from '../../../../../../shared/agent-status/contracts/agent-status-types' import type { AppState } from '@/store/types' import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner' import type { WorktreeRuntimeOwnerState } from '@/lib/workspace/ownership/worktree-runtime-owner-state' import { toRuntimeWorktreeSelector } from '@/runtime/rpc/targets/runtime-worktree-selector' -import { isTerminalLeafId, makePaneKey } from '../../../shared/workspace-layout/stable-pane-id' -import type { TerminalLayoutSnapshot } from '../../../shared/workspace-layout/terminal-tab-types' import { - classifyTitleActivity, - isExplicitAgentStatusFresh, - resolveTitleActivityLabel -} from '@/lib/pane-agent-evidence' -import { resolveRuntimePaneTitleForLeaf } from '../../../shared/runtime-pane-title-leaf-id' + isTerminalLeafId, + makePaneKey +} from '../../../../../../shared/workspace-layout/stable-pane-id' +import type { TerminalLayoutSnapshot } from '../../../../../../shared/workspace-layout/terminal-tab-types' +import { detectAgentStatusFromTitle } from '../../../../../../shared/agent-status/title/agent-title-status' + +import { getAgentLabel } from '../../../../../../shared/agent-status/title/agent-title-identity' +import { resolveRuntimePaneTitleForLeaf } from '../../../../../../shared/runtime-pane-title-leaf-id' const ACTIVE_AGENT_PROBE_RPC_TIMEOUT_MS = 3000 const ACTIVE_AGENT_TERMINAL_LIST_LIMIT = 200 @@ -92,7 +96,7 @@ export function getActiveAgentNoteTarget( } const entry = state.agentStatusByPaneKey?.[makePaneKey(noteTarget.tabId, noteTarget.leafId)] - if (entry && isExplicitAgentStatusFresh(entry, now, AGENT_STATUS_STALE_AFTER_MS)) { + if (entry && isAgentStatusFresh(entry, now, AGENT_STATUS_STALE_AFTER_MS)) { return noteTarget } // Idle-before-first-hook hints only expose the option; runtime still verifies the focused agent is idle before Enter. @@ -232,5 +236,5 @@ function getFocusedRuntimePaneTitle( } function isRecognizedAgentTitle(title: string): boolean { - return classifyTitleActivity(title) !== null && resolveTitleActivityLabel(title) !== null + return detectAgentStatusFromTitle(title) !== null && getAgentLabel(title) !== null } diff --git a/src/renderer/src/lib/active-agent-terminal-send-readiness.ts b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-terminal-send-readiness.ts similarity index 92% rename from src/renderer/src/lib/active-agent-terminal-send-readiness.ts rename to src/renderer/src/lib/agent-session/messaging/terminal/active-agent-terminal-send-readiness.ts index a2342bc38d5..a7955465711 100644 --- a/src/renderer/src/lib/active-agent-terminal-send-readiness.ts +++ b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-terminal-send-readiness.ts @@ -1,9 +1,9 @@ -import type { RuntimeTerminalAgentStatus } from '../../../shared/runtime-types' -import { hasRuntimeRpcErrorCode } from '../../../shared/runtime-rpc-error-code' +import type { RuntimeTerminalAgentStatus } from '../../../../../../shared/runtime-terminal-contracts' +import { hasRuntimeRpcErrorCode } from '../../../../../../shared/runtime-rpc-error-code' import type { ActiveAgentNotesSendFailureCode } from './active-agent-note-send-result' import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' import { RuntimeRpcCallError } from '@/runtime/rpc/calls/runtime-rpc-result' -import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' +import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target' import { runtimeFailureCode, TERMINAL_RUNTIME_FAILURE_CODES diff --git a/src/renderer/src/lib/claude-agent-row-view.ts b/src/renderer/src/lib/agent-session/navigation/claude-agent-row-view.ts similarity index 92% rename from src/renderer/src/lib/claude-agent-row-view.ts rename to src/renderer/src/lib/agent-session/navigation/claude-agent-row-view.ts index 6ca2ac46196..2adf21654c5 100644 --- a/src/renderer/src/lib/claude-agent-row-view.ts +++ b/src/renderer/src/lib/agent-session/navigation/claude-agent-row-view.ts @@ -1,15 +1,15 @@ import { toast } from 'sonner' import { translate } from '@/i18n/i18n' import type { DashboardAgentRow } from '@/components/dashboard/useDashboardData' -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' import { hostRouteForAuthority } from '@/runtime/rpc/targets/runtime-client-target' import { getRuntimeEnvironmentRevision } from '@/runtime/rpc/environment-revisions/runtime-environment-revision' -import { resolveOwnerOrLocal } from './workspace/ownership/worktree-runtime-owner' -import { findActiveRuntimeTerminal } from './active-agent-note-target' -import { parsePaneKey } from '../../../shared/workspace-layout/stable-pane-id' -import { authorityKey } from '../../../shared/host-authority' -import type { ClaudeAgentViewResult } from '../../../shared/claude-agent-view' +import { resolveOwnerOrLocal } from '../../workspace/ownership/worktree-runtime-owner' +import { findActiveRuntimeTerminal } from '../messaging/terminal/active-agent-note-target' +import { parsePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id' +import { authorityKey } from '../../../../../shared/host-authority' +import type { ClaudeAgentViewResult } from '../../../../../shared/claude-agent-view' const pendingViews = new Map() diff --git a/src/renderer/src/lib/agent-resume-launch-target.test.ts b/src/renderer/src/lib/agent-session/resume/agent-resume-launch-target.test.ts similarity index 100% rename from src/renderer/src/lib/agent-resume-launch-target.test.ts rename to src/renderer/src/lib/agent-session/resume/agent-resume-launch-target.test.ts diff --git a/src/renderer/src/lib/agent-resume-launch-target.ts b/src/renderer/src/lib/agent-session/resume/agent-resume-launch-target.ts similarity index 92% rename from src/renderer/src/lib/agent-resume-launch-target.ts rename to src/renderer/src/lib/agent-session/resume/agent-resume-launch-target.ts index 33931d8bb5b..8ff1a7e73a2 100644 --- a/src/renderer/src/lib/agent-resume-launch-target.ts +++ b/src/renderer/src/lib/agent-session/resume/agent-resume-launch-target.ts @@ -1,13 +1,13 @@ import { CLIENT_PLATFORM } from '@/lib/new-workspace' import { REMOTE_RUNTIME_PTY_HONOURS_TAB_SHELL_OVERRIDE } from '@/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-shell' -import { parseExecutionHostId } from '../../../shared/execution-host' -import { lastVerifiedRuntimeStatus } from '../../../shared/remote-runtime/host-status/runtime-host-status' -import { isWslUncPath } from '../../../shared/wsl-paths' -import { isWindowsAbsolutePathLike } from '../../../shared/cross-platform-path' -import { resolveHostAgentStartupShell } from '../../../shared/windows-terminal-shell' +import { parseExecutionHostId } from '../../../../../shared/execution-host' +import { lastVerifiedRuntimeStatus } from '../../../../../shared/remote-runtime/host-status/runtime-host-status' +import { isWslUncPath } from '../../../../../shared/wsl-paths' +import { isWindowsAbsolutePathLike } from '../../../../../shared/cross-platform-path' +import { resolveHostAgentStartupShell } from '../../../../../shared/windows-terminal-shell' import type { AppState } from '@/store/types' -import type { ProjectExecutionRuntimeResolution } from '../../../shared/execution-host/project-execution-runtime' -import type { AgentStartupShell } from '../../../shared/agent-launch/startup/tui-agent-startup-shell' +import type { ProjectExecutionRuntimeResolution } from '../../../../../shared/execution-host/project-execution-runtime' +import type { AgentStartupShell } from '../../../../../shared/agent-launch/startup/tui-agent-startup-shell' export type AgentResumeLaunchTarget = { platform: NodeJS.Platform diff --git a/src/renderer/src/lib/agent-session/resume/sleeping-agent-session-launch.ts b/src/renderer/src/lib/agent-session/resume/sleeping-agent-session-launch.ts index f12128c935d..1800abbfff3 100644 --- a/src/renderer/src/lib/agent-session/resume/sleeping-agent-session-launch.ts +++ b/src/renderer/src/lib/agent-session/resume/sleeping-agent-session-launch.ts @@ -11,7 +11,7 @@ import { resolveSshHostReportedPlatform, resolveAgentResumeLaunchTarget, type AgentResumeLaunchTarget -} from '@/lib/agent-resume-launch-target' +} from '@/lib/agent-session/resume/agent-resume-launch-target' import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner' import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner' import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context' diff --git a/src/renderer/src/lib/agent-status.ts b/src/renderer/src/lib/agent-status/aggregation/worktree-agent-status.ts similarity index 75% rename from src/renderer/src/lib/agent-status.ts rename to src/renderer/src/lib/agent-status/aggregation/worktree-agent-status.ts index b7e21c0d15a..40629809ac2 100644 --- a/src/renderer/src/lib/agent-status.ts +++ b/src/renderer/src/lib/agent-status/aggregation/worktree-agent-status.ts @@ -1,18 +1,19 @@ -import type { TerminalTab } from '../../../shared/workspace-layout/terminal-tab-types' -import { isTuiAgent } from '../../../shared/agent-launch/catalog/tui-agent-config' -import type { Worktree } from '../../../shared/worktree/types' +import type { TerminalTab } from '../../../../../shared/workspace-layout/terminal-tab-types' +import { isTuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent-config' +import type { Worktree } from '../../../../../shared/worktree/types' import type { AgentStatusState, AgentType -} from '../../../shared/agent-status/contracts/agent-status-types' -import { tabHasLivePty } from '../../../shared/tab-has-live-pty' -import type { WorktreeStatus } from './worktree-status' -import { tuiAgentToAgentKind } from '../../../shared/agent-kind' -import { agentTypeToIconAgent } from '../../../shared/agent-status/presentation/agent-type-icon-agent' -import type { AgentKind } from '../../../shared/telemetry-events' +} from '../../../../../shared/agent-status/contracts/agent-status-types' +import { tabHasLivePty } from '../../../../../shared/tab-has-live-pty' +import type { WorktreeStatus } from '../../../../../shared/worktree-status-rollup' +import { tuiAgentToAgentKind } from '../../../../../shared/agent-kind' +import { agentTypeToIconAgent } from '../../../../../shared/agent-status/presentation/agent-type-icon-agent' +import type { AgentKind } from '../../../../../shared/telemetry-property-schemas' -import type { AgentStatus } from '../../../shared/agent-status/title/agent-title-core' -import { classifyTitleActivity, resolveTitleActivityLabel } from './pane-agent-evidence' +import type { AgentStatus } from '../../../../../shared/agent-status/title/agent-title-core' +import { detectAgentStatusFromTitle } from '../../../../../shared/agent-status/title/agent-title-status' +import { getAgentLabel } from '../../../../../shared/agent-status/title/agent-title-identity' type AgentQueryArgs = { tabsByWorktree: Record @@ -57,8 +58,8 @@ export function getWorkingAgentsPerWorktree({ const paneTitles = runtimePaneTitlesByTabId[tab.id] if (paneTitles && Object.keys(paneTitles).length > 0) { for (const [paneIdStr, title] of Object.entries(paneTitles)) { - if (classifyTitleActivity(title) === 'working') { - const label = resolveTitleActivityLabel(title) + if (detectAgentStatusFromTitle(title) === 'working') { + const label = getAgentLabel(title) if (label) { agents.push({ label, @@ -69,8 +70,8 @@ export function getWorkingAgentsPerWorktree({ } } } - } else if (classifyTitleActivity(tab.title) === 'working') { - const label = resolveTitleActivityLabel(tab.title) + } else if (detectAgentStatusFromTitle(tab.title) === 'working') { + const label = getAgentLabel(tab.title) if (label) { agents.push({ label, status: 'working', tabId: tab.id, paneId: null }) } @@ -148,13 +149,13 @@ function countWorkingAgentsForTab( // Why: split-pane tabs host multiple agents; the tab title only shows the last pane update, so prefer pane titles when mounted. if (paneTitles && Object.keys(paneTitles).length > 0) { for (const title of Object.values(paneTitles)) { - if (classifyTitleActivity(title) === 'working') { + if (detectAgentStatusFromTitle(title) === 'working') { count += 1 } } return count } - if (classifyTitleActivity(tab.title) === 'working') { + if (detectAgentStatusFromTitle(tab.title) === 'working') { count += 1 } return count diff --git a/src/renderer/src/lib/agent-status-epoch-clock.ts b/src/renderer/src/lib/agent-status/evidence/agent-status-epoch-clock.ts similarity index 100% rename from src/renderer/src/lib/agent-status-epoch-clock.ts rename to src/renderer/src/lib/agent-status/evidence/agent-status-epoch-clock.ts diff --git a/src/renderer/src/lib/agent-status-epoch-selector.ts b/src/renderer/src/lib/agent-status/evidence/agent-status-epoch-selector.ts similarity index 100% rename from src/renderer/src/lib/agent-status-epoch-selector.ts rename to src/renderer/src/lib/agent-status/evidence/agent-status-epoch-selector.ts diff --git a/src/renderer/src/lib/agent-status-terminal-title.ts b/src/renderer/src/lib/agent-status/evidence/agent-status-terminal-title.ts similarity index 77% rename from src/renderer/src/lib/agent-status-terminal-title.ts rename to src/renderer/src/lib/agent-status/evidence/agent-status-terminal-title.ts index 40d2e5a4ce8..87ddb76833b 100644 --- a/src/renderer/src/lib/agent-status-terminal-title.ts +++ b/src/renderer/src/lib/agent-status/evidence/agent-status-terminal-title.ts @@ -1,9 +1,9 @@ -import { classifyTitleActivity } from './pane-agent-evidence' -import type { ParsedAgentStatusPayload } from '../../../shared/agent-status/contracts/agent-status-types' +import { detectAgentStatusFromTitle } from '../../../../../shared/agent-status/title/agent-title-status' +import type { ParsedAgentStatusPayload } from '../../../../../shared/agent-status/contracts/agent-status-types' import { getSyntheticAgentTerminalTitle, getSyntheticAgentTitleProfile -} from '../../../shared/agent-status/title/synthetic-agent-title' +} from '../../../../../shared/agent-status/title/synthetic-agent-title' export function resolveAgentStatusTerminalTitle( payload: Pick, @@ -26,7 +26,7 @@ function shouldReplaceCurrentTitle( if (!currentTitle?.trim()) { return true } - const currentStatus = classifyTitleActivity(currentTitle) + const currentStatus = detectAgentStatusFromTitle(currentTitle) if (currentStatus === 'working') { return true } diff --git a/src/renderer/src/lib/pane-agent-evidence.ts b/src/renderer/src/lib/agent-status/evidence/pane-agent-evidence.ts similarity index 51% rename from src/renderer/src/lib/pane-agent-evidence.ts rename to src/renderer/src/lib/agent-status/evidence/pane-agent-evidence.ts index a927fe28ba8..eaebf4ba64a 100644 --- a/src/renderer/src/lib/pane-agent-evidence.ts +++ b/src/renderer/src/lib/agent-status/evidence/pane-agent-evidence.ts @@ -1,48 +1,15 @@ -import type { AgentStatus } from '../../../shared/agent-status/title/agent-title-core' -import { detectAgentStatusFromTitle } from '../../../shared/agent-status/title/agent-title-status' -import { getAgentLabel } from '../../../shared/agent-status/title/agent-title-identity' -import { resolveExplicitTerminalTitleAgentType } from '../../../shared/agent-status/title/terminal-title-agent-type' -import type { TerminalAgent } from '../../../shared/agent-status/identity/terminal-agent' +import type { AgentStatus } from '../../../../../shared/agent-status/title/agent-title-core' +import { detectAgentStatusFromTitle } from '../../../../../shared/agent-status/title/agent-title-status' + import { AGENT_STATUS_STALE_AFTER_MS, isAgentStatusFresh -} from '../../../shared/agent-status/contracts/agent-status-freshness' +} from '../../../../../shared/agent-status/contracts/agent-status-freshness' import type { AgentStatusEntry, AgentStatusState, AgentType -} from '../../../shared/agent-status/contracts/agent-status-types' - -// Hook status can outlive exited agents; share one configurable-TTL freshness gate without aggregate/resolver import cycles. -export function isExplicitAgentStatusFresh( - entry: Pick< - AgentStatusEntry, - | 'updatedAt' - | 'evidenceObservedAt' - | 'mirroredEvidenceReceivedAt' - | 'restoredUnconfirmed' - | 'structuredHostOwned' - >, - now: number, - staleAfterMs: number -): boolean { - return isAgentStatusFresh(entry, now, staleAfterMs) -} - -/** Title-only consumers (timers, readiness, sorting, synthetic writes) intentionally ignore hook/liveness evidence. */ -export function classifyTitleActivity(title: string): AgentStatus | null { - return detectAgentStatusFromTitle(title) -} - -/** Activity may treat bare Claude status prefixes as a label; committed identity requires agent proof. Choose the facet matching the product rule. */ -export function resolveTitleActivityLabel(title: string): string | null { - return getAgentLabel(title) -} - -/** See resolveTitleActivityLabel — the strict facet for identity decisions. */ -export function resolveCommittedTitleAgentType(title: string): TerminalAgent | null { - return resolveExplicitTerminalTitleAgentType(title) -} +} from '../../../../../shared/agent-status/contracts/agent-status-types' /** Expose hook/title layers separately: send menus and workspace dots combine them differently, so merging would change behavior. */ export type AgentActivityDecision = { @@ -71,7 +38,7 @@ export function resolvePaneAgentActivity( ): AgentActivityDecision { const freshEntry = input.explicitEntry && - isExplicitAgentStatusFresh(input.explicitEntry, input.now, AGENT_STATUS_STALE_AFTER_MS) + isAgentStatusFresh(input.explicitEntry, input.now, AGENT_STATUS_STALE_AFTER_MS) ? input.explicitEntry : null const titleStatus = input.liveTitle !== null ? detectAgentStatusFromTitle(input.liveTitle) : null diff --git a/src/renderer/src/lib/agent-status-connection-ownership.ts b/src/renderer/src/lib/agent-status/ownership/agent-status-connection-ownership.ts similarity index 93% rename from src/renderer/src/lib/agent-status-connection-ownership.ts rename to src/renderer/src/lib/agent-status/ownership/agent-status-connection-ownership.ts index ecf95fe0110..1f33b436299 100644 --- a/src/renderer/src/lib/agent-status-connection-ownership.ts +++ b/src/renderer/src/lib/agent-status/ownership/agent-status-connection-ownership.ts @@ -1,9 +1,9 @@ import { isRemoteRuntimePtyId, parseRemoteRuntimePtyId -} from '../../../shared/remote-runtime/remote-runtime-pty-id' -import { parseAppSshPtyId } from '../../../shared/ssh-pty-id' -import { parsePaneKey } from '../../../shared/workspace-layout/stable-pane-id' +} from '../../../../../shared/remote-runtime/remote-runtime-pty-id' +import { parseAppSshPtyId } from '../../../../../shared/ssh-pty-id' +import { parsePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id' export type AgentStatusConnectionRouting = { connectionId: string | null } diff --git a/src/renderer/src/lib/agent-status-pane-ownership.ts b/src/renderer/src/lib/agent-status/ownership/agent-status-pane-ownership.ts similarity index 90% rename from src/renderer/src/lib/agent-status-pane-ownership.ts rename to src/renderer/src/lib/agent-status/ownership/agent-status-pane-ownership.ts index be93e5f281f..927a85a9631 100644 --- a/src/renderer/src/lib/agent-status-pane-ownership.ts +++ b/src/renderer/src/lib/agent-status/ownership/agent-status-pane-ownership.ts @@ -1,8 +1,8 @@ -import type { AppState } from '../store/types' -import { parsePaneKey } from '../../../shared/workspace-layout/stable-pane-id' -import { collectLeafIdsInOrder } from '../components/terminal-pane/layout/terminal-layout-leaf-traversal' -import { getIndexedRepoMap } from '../store/repos/repository-catalog-index' -import { getIndexedWorktreeMap } from '../store/slices/worktrees/listing/worktree-catalog-index' +import type { AppState } from '../../../store/types' +import { parsePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id' +import { collectLeafIdsInOrder } from '../../../components/terminal-pane/layout/terminal-layout-leaf-traversal' +import { getIndexedRepoMap } from '../../../store/repos/repository-catalog-index' +import { getIndexedWorktreeMap } from '../../../store/slices/worktrees/listing/worktree-catalog-index' import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields' /** Resolve pane liveness, title and owner to reject torn-down tabs or events from retired SSH connections. */ diff --git a/src/renderer/src/lib/agent-row-dot-state.ts b/src/renderer/src/lib/agent-status/presentation/agent-row-dot-state.ts similarity index 73% rename from src/renderer/src/lib/agent-row-dot-state.ts rename to src/renderer/src/lib/agent-status/presentation/agent-row-dot-state.ts index c628afb9711..c0647057b3e 100644 --- a/src/renderer/src/lib/agent-row-dot-state.ts +++ b/src/renderer/src/lib/agent-status/presentation/agent-row-dot-state.ts @@ -1,11 +1,11 @@ import type { AgentDotState } from '@/components/AgentStateDot' -import type { AgentChildRowModel } from '../../../shared/agent-status/presentation/agent-child-row-model' -import { agentVerdictDisplayMark } from '../../../shared/agent-status/lifecycle/agent-main-agent-verdict' +import type { AgentChildRowModel } from '../../../../../shared/agent-status/presentation/agent-child-row-model' +import { agentVerdictDisplayMark } from '../../../../../shared/agent-status/lifecycle/agent-main-agent-verdict' import type { AgentStatusEntry, AgentWorkingMode -} from '../../../shared/agent-status/contracts/agent-status-types' -import type { AgentRowState } from '../../../shared/agent-status/presentation/agent-row-decay-state' +} from '../../../../../shared/agent-status/contracts/agent-status-types' +import type { AgentRowState } from '../../../../../shared/agent-status/presentation/agent-row-decay-state' /** Share row-state mapping across sidebar, dashboard and notes so new states cannot diverge. */ export function agentRowDotState( diff --git a/src/renderer/src/lib/agent-row-stopping-label.ts b/src/renderer/src/lib/agent-status/presentation/agent-row-stopping-label.ts similarity index 65% rename from src/renderer/src/lib/agent-row-stopping-label.ts rename to src/renderer/src/lib/agent-status/presentation/agent-row-stopping-label.ts index 35d3d43a0eb..c1f4aca7796 100644 --- a/src/renderer/src/lib/agent-row-stopping-label.ts +++ b/src/renderer/src/lib/agent-status/presentation/agent-row-stopping-label.ts @@ -1,8 +1,8 @@ -import { agentStopDisplayStatus } from '../../../shared/agent-status/lifecycle/agent-stop-display-status' -import type { AgentStatusEntry } from '../../../shared/agent-status/contracts/agent-status-types' +import { agentStopDisplayStatus } from '../../../../../shared/agent-status/lifecycle/agent-stop-display-status' +import type { AgentStatusEntry } from '../../../../../shared/agent-status/contracts/agent-status-types' import { translate } from '@/i18n/i18n' import type { Translate } from '@/i18n/use-translate' -import type { AgentRowState } from '../../../shared/agent-status/presentation/agent-row-decay-state' +import type { AgentRowState } from '../../../../../shared/agent-status/presentation/agent-row-decay-state' /** Replace the last tool line with Stopping… while a user-requested stop ends a working turn. */ export function agentRowStoppingLabel( diff --git a/src/renderer/src/lib/agent-row-tool-preview.ts b/src/renderer/src/lib/agent-status/presentation/agent-row-tool-preview.ts similarity index 73% rename from src/renderer/src/lib/agent-row-tool-preview.ts rename to src/renderer/src/lib/agent-status/presentation/agent-row-tool-preview.ts index c45bc074ede..7dec4183838 100644 --- a/src/renderer/src/lib/agent-row-tool-preview.ts +++ b/src/renderer/src/lib/agent-status/presentation/agent-row-tool-preview.ts @@ -1,10 +1,10 @@ -import type { AgentStatusEntry } from '../../../shared/agent-status/contracts/agent-status-types' -import type { AgentRowState } from '../../../shared/agent-status/presentation/agent-row-decay-state' -import { isProgramStatusRow } from './program-status/row' +import type { AgentStatusEntry } from '../../../../../shared/agent-status/contracts/agent-status-types' +import type { AgentRowState } from '../../../../../shared/agent-status/presentation/agent-row-decay-state' +import { isProgramStatusRow } from '../../program-status/row' import { agentToolPreviewInput, formatAgentToolPreviewLine -} from '../../../shared/agent-status/presentation/agent-tool-preview' +} from '../../../../../shared/agent-status/presentation/agent-tool-preview' type ToolPreviewEntry = Pick & Partial> diff --git a/src/renderer/src/lib/agent-verdict-status-line.ts b/src/renderer/src/lib/agent-status/presentation/agent-verdict-status-line.ts similarity index 82% rename from src/renderer/src/lib/agent-verdict-status-line.ts rename to src/renderer/src/lib/agent-status/presentation/agent-verdict-status-line.ts index 47739fd03e8..6744be596f9 100644 --- a/src/renderer/src/lib/agent-verdict-status-line.ts +++ b/src/renderer/src/lib/agent-status/presentation/agent-verdict-status-line.ts @@ -2,9 +2,9 @@ import { agentMainAgentVerdict, agentVerdictDisplayMark, type AgentMainAgentVerdictSource -} from '../../../shared/agent-status/lifecycle/agent-main-agent-verdict' -import type { AgentStatusEntry } from '../../../shared/agent-status/contracts/agent-status-types' -import { isProgramStatusRow } from './program-status/row' +} from '../../../../../shared/agent-status/lifecycle/agent-main-agent-verdict' +import type { AgentStatusEntry } from '../../../../../shared/agent-status/contracts/agent-status-types' +import { isProgramStatusRow } from '../../program-status/row' type VerdictLineSource = AgentMainAgentVerdictSource & Partial< diff --git a/src/renderer/src/lib/command-code-prompt-status-seed.ts b/src/renderer/src/lib/command-code-prompt-status-seed.ts index 74fd84f7b84..217e1aa1177 100644 --- a/src/renderer/src/lib/command-code-prompt-status-seed.ts +++ b/src/renderer/src/lib/command-code-prompt-status-seed.ts @@ -1,7 +1,7 @@ import { useAppStore } from '@/store' import { makePaneKey } from '../../../shared/workspace-layout/stable-pane-id' import { getConnectionIdFromState } from './workspace/ownership/connection-owner-resolution' -import { resolveLiveAgentStatusConnectionRouting } from './agent-status-connection-ownership' +import { resolveLiveAgentStatusConnectionRouting } from './agent-status/ownership/agent-status-connection-ownership' import { rendererAgentStatusObservations } from './renderer-agent-status-observations' // Command Code lacks prompt-submit hooks; seed working when generated input is delivered so rows do not stay idle until its next hook. diff --git a/src/renderer/src/lib/desktop-created-server-tabs.test.ts b/src/renderer/src/lib/desktop-created-server-tabs.test.ts index c578d62d5ff..42e9c34056d 100644 --- a/src/renderer/src/lib/desktop-created-server-tabs.test.ts +++ b/src/renderer/src/lib/desktop-created-server-tabs.test.ts @@ -1,5 +1,5 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' vi.mock('../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true })) vi.mock('sonner', () => ({ @@ -11,7 +11,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus restorePtyDataHandlersAfterFailedShutdown: vi.fn(), unregisterPtyDataHandlers: vi.fn() })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/lib/environment-setup-agent-launch.ts b/src/renderer/src/lib/environment-setup-agent-launch.ts index 60cc37865c2..1cf1d1acba4 100644 --- a/src/renderer/src/lib/environment-setup-agent-launch.ts +++ b/src/renderer/src/lib/environment-setup-agent-launch.ts @@ -1,7 +1,7 @@ import { toast } from 'sonner' import { useAppStore } from '@/store' import { translate } from '@/i18n/i18n' -import { resolveDefaultAgentForWorktree } from '@/lib/agent-tab-shortcuts' +import { resolveDefaultAgentForWorktree } from '@/lib/agent-session/launch/shortcuts/agent-tab-shortcuts' import { launchAgentInNewTabWithOutcome } from '@/lib/agent-session/launch/new-tab/launch-agent-in-new-tab' import { newAgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agent-launch-request-id' import { captureAgentTabLaunchContext } from '@/components/agent-tab-launch-context' diff --git a/src/renderer/src/lib/fix-checks-agent-launch.ts b/src/renderer/src/lib/fix-checks-agent-launch.ts index 5a61b917c81..c5cf9674edf 100644 --- a/src/renderer/src/lib/fix-checks-agent-launch.ts +++ b/src/renderer/src/lib/fix-checks-agent-launch.ts @@ -15,7 +15,7 @@ import { ensureDetectedAgentsForRepo, ensureDetectedAgentsForWorktree, type RepoHostFields -} from '@/lib/agent-detection-target-inventory' +} from '@/lib/agent-session/launch/inventory/agent-detection-target-inventory' import { focusTerminalTabSurface } from '@/lib/focus-terminal-tab-surface' import type { ProspectiveWorkspace } from '@/lib/agent-session/launch/routing/agent-launch-route-input' import { worktreeLaunchWorkspace } from '@/lib/agent-session/launch/routing/agent-launch-route-input' diff --git a/src/renderer/src/lib/host-chat-program-acquisition.ts b/src/renderer/src/lib/host-chat-program-acquisition.ts index db085191441..abe59f741be 100644 --- a/src/renderer/src/lib/host-chat-program-acquisition.ts +++ b/src/renderer/src/lib/host-chat-program-acquisition.ts @@ -26,7 +26,7 @@ import { isTuiAgent } from '../../../shared/agent-launch/catalog/tui-agent-confi import { getDetectionTargetIdentityForWorktree, readAgentInventoryForWorktree -} from './agent-detection-target-inventory' +} from './agent-session/launch/inventory/agent-detection-target-inventory' export const useChatProgramFactsVersion = (): number => useAppViewExternalStore( diff --git a/src/renderer/src/lib/host-chat-program.test.ts b/src/renderer/src/lib/host-chat-program.test.ts index 918b44c005d..ae39be3f79f 100644 --- a/src/renderer/src/lib/host-chat-program.test.ts +++ b/src/renderer/src/lib/host-chat-program.test.ts @@ -1,6 +1,6 @@ import { agentTabLaunchStore } from './agent-session/launch/new-tab/launch-agent-execution-context' import { getRuntimeAgentInventoryKey } from '@/store/slices/agent-inventory/runtime-agent-inventory-key' -import { resolveDefaultAgentForWorkspace } from './agent-tab-shortcuts' +import { resolveDefaultAgentForWorkspace } from './agent-session/launch/shortcuts/agent-tab-shortcuts' import { EVERY_AGENT_CHAT } from '../../../shared/native-chat/every-agent-chat.test-fixture' import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' diff --git a/src/renderer/src/lib/host-chat-program.ts b/src/renderer/src/lib/host-chat-program.ts index f5b49b3b982..52c2440b6b1 100644 --- a/src/renderer/src/lib/host-chat-program.ts +++ b/src/renderer/src/lib/host-chat-program.ts @@ -8,7 +8,7 @@ import { import { lastVerifiedRuntimeStatus } from '../../../shared/remote-runtime/host-status/runtime-host-status' import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' import type { AgentSessionChatProgram } from '../../../shared/agent-session/agent-session-agent-availability' -import { chatProviderAgents } from './chat-provider-agents' +import { chatProviderAgents } from '../runtime/native-chat/agent-catalogs/chat-provider-agents' import { resolveAgentLaunchRoute, structuredAgentLaunchSupport diff --git a/src/renderer/src/lib/launch-agent-hosted-prompt.test.ts b/src/renderer/src/lib/launch-agent-hosted-prompt.test.ts index 2b31d7dce0b..2519190d235 100644 --- a/src/renderer/src/lib/launch-agent-hosted-prompt.test.ts +++ b/src/renderer/src/lib/launch-agent-hosted-prompt.test.ts @@ -38,7 +38,9 @@ vi.mock('@/runtime/agent-launch-settings/agent-launch-settings-transport', async vi.mock('@/runtime/hosted-terminals/creation/web-runtime-terminal-create-operation', () => ({ createWebRuntimeSessionTerminalResult: mocks.create })) -vi.mock('@/lib/agent-paste-draft', () => ({ pasteDraftWhenAgentReady: mocks.paste })) +vi.mock('@/lib/agent-session/messaging/paste/agent-paste-draft', () => ({ + pasteDraftWhenAgentReady: mocks.paste +})) beforeEach(() => { vi.clearAllMocks() diff --git a/src/renderer/src/lib/linear-usage-examples.ts b/src/renderer/src/lib/linear-usage-examples.ts index a12728d0fd4..4c8baff3e47 100644 --- a/src/renderer/src/lib/linear-usage-examples.ts +++ b/src/renderer/src/lib/linear-usage-examples.ts @@ -1,6 +1,6 @@ import { translate } from '@/i18n/i18n' import { createLocalizedCatalog } from '@/i18n/localized-catalog' -import { ORCA_LINEAR_SKILL_NAME } from './agent-feature-skill-names' +import { ORCA_LINEAR_SKILL_NAME } from './skills/installation/agent-feature-skill-names' import type { SkillUsageExample } from './skill-usage-example' const LINEAR_SLASH_COMMAND = `/${ORCA_LINEAR_SKILL_NAME}` diff --git a/src/renderer/src/lib/new-agent-prompt-outcome.ts b/src/renderer/src/lib/new-agent-prompt-outcome.ts index 7340cc7b9e0..8ca58e5ca5b 100644 --- a/src/renderer/src/lib/new-agent-prompt-outcome.ts +++ b/src/renderer/src/lib/new-agent-prompt-outcome.ts @@ -1,4 +1,4 @@ -import type { ActiveAgentNotesSendResult } from './active-agent-note-send-result' +import type { ActiveAgentNotesSendResult } from './agent-session/messaging/terminal/active-agent-note-send-result' import type { StructuredPromptDeliveryResult } from './agent-session/launch/structured-agent-session-launch-prompt' /** Delivered releases notes once host/composer owns the text; failure is omitted when the chat already reports startup/cancellation. */ diff --git a/src/renderer/src/lib/new-workspace.test.ts b/src/renderer/src/lib/new-workspace.test.ts index 26f1696fd36..d6447d19024 100644 --- a/src/renderer/src/lib/new-workspace.test.ts +++ b/src/renderer/src/lib/new-workspace.test.ts @@ -74,7 +74,7 @@ vi.mock('@/runtime/hosted-terminals/inspection/runtime-terminal-process-inspecti inspectRuntimeTerminalProcess: mockInspectRuntimeTerminalProcess })) -vi.mock('@/lib/agent-paste-draft', () => ({ +vi.mock('@/lib/agent-session/messaging/paste/agent-paste-draft', () => ({ pasteDraftToAgentPtyWhenReady: mockPasteDraftToAgentPtyWhenReady })) @@ -92,7 +92,7 @@ vi.mock('@/lib/agent-session/launch/background/agent-background-session-timeout- })) import { ensureAgentStartupInTerminal } from './new-workspace' -import { resetAgentStartupDelayedDeliveryForTests } from './agent-startup-delayed-delivery' +import { resetAgentStartupDelayedDeliveryForTests } from './agent-session/launch/startup/agent-startup-delayed-delivery' describe('ensureAgentStartupInTerminal prompt delivery', () => { beforeEach(() => { diff --git a/src/renderer/src/lib/new-workspace.ts b/src/renderer/src/lib/new-workspace.ts index 16964ae8145..0d75895aa06 100644 --- a/src/renderer/src/lib/new-workspace.ts +++ b/src/renderer/src/lib/new-workspace.ts @@ -1,6 +1,6 @@ import { useAppStore } from '@/store' -import { pasteDraftToAgentPtyWhenReady } from '@/lib/agent-paste-draft' -import { sendFollowupPromptWhenAgentReady } from '@/lib/agent-followup-delivery' +import { pasteDraftToAgentPtyWhenReady } from '@/lib/agent-session/messaging/paste/agent-paste-draft' +import { sendFollowupPromptWhenAgentReady } from '@/lib/agent-session/messaging/paste/agent-followup-delivery' import { showAutomationPromptNotSentToast } from '@/lib/agent-session/launch/background/agent-background-session-timeout-toast' import type { AgentStartupPlan } from '../../../shared/agent-launch/startup/tui-agent-startup' import type { LinkedWorkItemContext } from '@/lib/linked-work-item-context' @@ -9,7 +9,7 @@ import { getAgentStartupTabPtyId, queuePendingAgentStartupDelivery, resolveAgentStartupTabId -} from '@/lib/agent-startup-delayed-delivery' +} from '@/lib/agent-session/launch/startup/agent-startup-delayed-delivery' import type { WorkspaceLinkedItem as FolderWorkspaceLinkedTask } from '../../../shared/worktree/types' import { slugifyForWorkspaceName } from '../../../shared/workspace-name' import { createNonSecureContextUuid as createBrowserUuid } from '../../../shared/non-secure-context-uuid' diff --git a/src/renderer/src/lib/onboarding-folder-agent-launch.ts b/src/renderer/src/lib/onboarding-folder-agent-launch.ts index 271d816e1ff..d3a58472c16 100644 --- a/src/renderer/src/lib/onboarding-folder-agent-launch.ts +++ b/src/renderer/src/lib/onboarding-folder-agent-launch.ts @@ -4,7 +4,10 @@ import type { ExecutionHostId } from '../../../shared/execution-host' import type { OnboardingState } from '../../../shared/onboarding-state-types' import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' import type { useAppStore } from '@/store' -import { notifyAgentLaunchFailure, agentLaunchRecoveryMessage } from './agent-launch-failure' +import { + notifyAgentLaunchFailure, + agentLaunchRecoveryMessage +} from './agent-session/launch/failure/agent-launch-failure' import { resolveAgentLaunchExecutionContext } from '@/lib/agent-session/launch/new-tab/launch-agent-execution-context' import { planAgentSessionLaunch, diff --git a/src/renderer/src/lib/recent-workspace-tab-rows.ts b/src/renderer/src/lib/recent-workspace-tab-rows.ts index bc3543624fd..c73be15e0b1 100644 --- a/src/renderer/src/lib/recent-workspace-tab-rows.ts +++ b/src/renderer/src/lib/recent-workspace-tab-rows.ts @@ -6,11 +6,13 @@ import { } from '../../../shared/sidebar-list/smart-attention' import { tabHasLivePty } from '../../../shared/tab-has-live-pty' import { agentVerdictDisplayMark } from '../../../shared/agent-status/lifecycle/agent-main-agent-verdict' -import { isExplicitAgentStatusFresh } from './pane-agent-evidence' +import { + isAgentStatusFresh, + AGENT_STATUS_STALE_AFTER_MS +} from '../../../shared/agent-status/contracts/agent-status-freshness' import type { WorktreeStatus } from './worktree-status' import type { TerminalTab } from '../../../shared/workspace-layout/terminal-tab-types' import type { ExecutionHostId } from '../../../shared/execution-host' -import { AGENT_STATUS_STALE_AFTER_MS } from '../../../shared/agent-status/contracts/agent-status-freshness' /** Row model for Cmd+J's empty-query recent tabs section. */ export type RecentWorkspaceTabRow = { @@ -58,8 +60,7 @@ export function resolveRecentWorkspaceTabStatus( } const verdicts = new Set( panes.flatMap((pane) => - pane.kind === 'hook' && - isExplicitAgentStatusFresh(pane.entry, now, AGENT_STATUS_STALE_AFTER_MS) + pane.kind === 'hook' && isAgentStatusFresh(pane.entry, now, AGENT_STATUS_STALE_AFTER_MS) ? [agentVerdictDisplayMark(pane.entry)] : [] ) diff --git a/src/renderer/src/lib/agent-skill-coverage.ts b/src/renderer/src/lib/skills/agent-skill-coverage.ts similarity index 79% rename from src/renderer/src/lib/agent-skill-coverage.ts rename to src/renderer/src/lib/skills/agent-skill-coverage.ts index 0526fa4310b..9e9b2da8fae 100644 --- a/src/renderer/src/lib/agent-skill-coverage.ts +++ b/src/renderer/src/lib/skills/agent-skill-coverage.ts @@ -1,9 +1,9 @@ -import type { DiscoveredSkill, SkillDiscoverySource } from '../../../shared/skills' -import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' +import type { DiscoveredSkill, SkillDiscoverySource } from '../../../../shared/skills' +import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent' import { getNativeChatAgentProfile, readsSkillSource -} from '../../../shared/native-chat/native-chat-agent-profiles' +} from '../../../../shared/native-chat/native-chat-agent-profiles' export function agentReadsSkill( agent: TuiAgent, diff --git a/src/renderer/src/lib/agent-feature-install-commands.ts b/src/renderer/src/lib/skills/installation/agent-feature-install-commands.ts similarity index 92% rename from src/renderer/src/lib/agent-feature-install-commands.ts rename to src/renderer/src/lib/skills/installation/agent-feature-install-commands.ts index 086bad5b361..5181248e329 100644 --- a/src/renderer/src/lib/agent-feature-install-commands.ts +++ b/src/renderer/src/lib/skills/installation/agent-feature-install-commands.ts @@ -1,5 +1,5 @@ // COMPAT(wsl-bridge): removed when WSL runs as an orcad host. -import { buildAgentFeatureSkillInstallCommand as buildPinnedSkillInstallCommand } from '../../../shared/agent-feature-install-commands' +import { buildAgentFeatureSkillInstallCommand as buildPinnedSkillInstallCommand } from '../../../../../shared/agent-feature-install-commands' import { ORCA_CLI_SKILL_NAME, ORCA_LINEAR_SKILL_NAME, diff --git a/src/renderer/src/lib/agent-feature-skill-names.ts b/src/renderer/src/lib/skills/installation/agent-feature-skill-names.ts similarity index 100% rename from src/renderer/src/lib/agent-feature-skill-names.ts rename to src/renderer/src/lib/skills/installation/agent-feature-skill-names.ts diff --git a/src/renderer/src/lib/agent-skill-cli-prerequisite.test.ts b/src/renderer/src/lib/skills/installation/agent-skill-cli-prerequisite.test.ts similarity index 95% rename from src/renderer/src/lib/agent-skill-cli-prerequisite.test.ts rename to src/renderer/src/lib/skills/installation/agent-skill-cli-prerequisite.test.ts index a89650a6e45..fd54f1e8101 100644 --- a/src/renderer/src/lib/agent-skill-cli-prerequisite.test.ts +++ b/src/renderer/src/lib/skills/installation/agent-skill-cli-prerequisite.test.ts @@ -1,6 +1,6 @@ import { afterEach, describe, expect, it, vi } from 'vitest' import { toast } from 'sonner' -import type { CliInstallStatus } from '../../../shared/cli-install-types' +import type { CliInstallStatus } from '../../../../../shared/cli-install-types' import { ensureOrcaCliAvailableForAgentSkillTerminal } from './agent-skill-cli-prerequisite' vi.mock('sonner', () => ({ diff --git a/src/renderer/src/lib/agent-skill-cli-prerequisite.ts b/src/renderer/src/lib/skills/installation/agent-skill-cli-prerequisite.ts similarity index 98% rename from src/renderer/src/lib/agent-skill-cli-prerequisite.ts rename to src/renderer/src/lib/skills/installation/agent-skill-cli-prerequisite.ts index 45752d05584..b2b855dc230 100644 --- a/src/renderer/src/lib/agent-skill-cli-prerequisite.ts +++ b/src/renderer/src/lib/skills/installation/agent-skill-cli-prerequisite.ts @@ -1,5 +1,5 @@ import { toast } from 'sonner' -import type { CliInstallStatus } from '../../../shared/cli-install-types' +import type { CliInstallStatus } from '../../../../../shared/cli-install-types' import { translate } from '@/i18n/i18n' type EnsureOrcaCliAvailableOptions = { diff --git a/src/renderer/src/lib/linear-agent-skill-update-target.ts b/src/renderer/src/lib/skills/installation/linear-agent-skill-update-target.ts similarity index 83% rename from src/renderer/src/lib/linear-agent-skill-update-target.ts rename to src/renderer/src/lib/skills/installation/linear-agent-skill-update-target.ts index b59e3a160fc..e696737337e 100644 --- a/src/renderer/src/lib/linear-agent-skill-update-target.ts +++ b/src/renderer/src/lib/skills/installation/linear-agent-skill-update-target.ts @@ -1,9 +1,12 @@ -import type { DiscoveredSkill } from '../../../shared/skills' +import type { DiscoveredSkill } from '../../../../../shared/skills' import { GLOBAL_AGENT_SKILL_SOURCE_KINDS, hasInstalledAgentSkill } from '@/hooks/useInstalledAgentSkills' -import { LINEAR_TICKETS_SKILL_NAME, ORCA_LINEAR_SKILL_NAME } from '@/lib/agent-feature-skill-names' +import { + LINEAR_TICKETS_SKILL_NAME, + ORCA_LINEAR_SKILL_NAME +} from '@/lib/skills/installation/agent-feature-skill-names' export type LinearAgentSkillUpdateTarget = { skillName: typeof ORCA_LINEAR_SKILL_NAME | typeof LINEAR_TICKETS_SKILL_NAME diff --git a/src/renderer/src/lib/orchestration-skill-coverage.ts b/src/renderer/src/lib/skills/orchestration-skill-coverage.ts similarity index 83% rename from src/renderer/src/lib/orchestration-skill-coverage.ts rename to src/renderer/src/lib/skills/orchestration-skill-coverage.ts index 61f2387979e..c6ee777b7af 100644 --- a/src/renderer/src/lib/orchestration-skill-coverage.ts +++ b/src/renderer/src/lib/skills/orchestration-skill-coverage.ts @@ -1,9 +1,9 @@ -import type { DiscoveredSkill, SkillDiscoverySource } from '../../../shared/skills' -import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' +import type { DiscoveredSkill, SkillDiscoverySource } from '../../../../shared/skills' +import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent' import { agentReadsSkill } from './agent-skill-coverage' -import { ORCHESTRATION_SKILL_NAME } from '@/lib/agent-feature-skill-names' -import { getAgentLabel } from '@/lib/agent-catalog' -import { TUI_AGENT_AUTO_PICK_ORDER } from '../../../shared/agent-launch/catalog/tui-agent-selection' +import { ORCHESTRATION_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names' +import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog' +import { TUI_AGENT_AUTO_PICK_ORDER } from '../../../../shared/agent-launch/catalog/tui-agent-selection' export type OrchestrationSkillAgentStatus = { agent: TuiAgent diff --git a/src/renderer/src/lib/skill-freshness-display-status.ts b/src/renderer/src/lib/skills/presentation/skill-freshness-display-status.ts similarity index 92% rename from src/renderer/src/lib/skill-freshness-display-status.ts rename to src/renderer/src/lib/skills/presentation/skill-freshness-display-status.ts index 58df730bfee..6e1857abd82 100644 --- a/src/renderer/src/lib/skill-freshness-display-status.ts +++ b/src/renderer/src/lib/skills/presentation/skill-freshness-display-status.ts @@ -1,8 +1,8 @@ -import type { BundledSkillPlan } from '../../../shared/bundled-skill-plan' +import type { BundledSkillPlan } from '../../../../../shared/bundled-skill-plan' import { bundledSkillPlanState, type BundledSkillPlanState -} from '../../../shared/bundled-skill-summary' +} from '../../../../../shared/bundled-skill-summary' export type SkillFreshnessDisplayStatus = | 'installed' diff --git a/src/renderer/src/lib/source-control/ai/source-control-agent-picker.ts b/src/renderer/src/lib/source-control/ai/source-control-agent-picker.ts index 099798ec0d5..83e783df930 100644 --- a/src/renderer/src/lib/source-control/ai/source-control-agent-picker.ts +++ b/src/renderer/src/lib/source-control/ai/source-control-agent-picker.ts @@ -21,7 +21,7 @@ import type { AgentMenuRowsTarget, NewTabAgentMenuModel } from '@/components/tab-bar/new-tab-agent-menu-model' -import type { resolveAgentMenuSelection } from '@/lib/agent-menu-selection' +import type { resolveAgentMenuSelection } from '@/lib/agent-session/launch/routing/agent-menu-selection' import type { AgentPickerEntry } from '../../../../../shared/agent-launch/picker/agent-launch-picker' import type { AgentLaunchSurface } from '@/lib/agent-session/launch/routing/agent-session-launch-plan' import { resolveSourceControlActionPreferredSurface } from '../../../../../shared/source-control/ai/recipes/source-control-action-launch-preferences' diff --git a/src/renderer/src/lib/text-generation-error-copy.ts b/src/renderer/src/lib/text-generation-error-copy.ts index 4699f3c27f2..228a1eb4960 100644 --- a/src/renderer/src/lib/text-generation-error-copy.ts +++ b/src/renderer/src/lib/text-generation-error-copy.ts @@ -3,7 +3,7 @@ import { TEXT_GENERATION_FAILURE_COPY as EN, type TextGenerationFailureCode } from '../../../shared/text-generation-failure-copy' -import { AGENT_OUTPUT_ERROR_COPY } from './agent-output-error-copy' +import { AGENT_OUTPUT_ERROR_COPY } from './text-generation/agent-output-error-copy' type CopyValues = Record diff --git a/src/renderer/src/lib/agent-output-error-copy.ts b/src/renderer/src/lib/text-generation/agent-output-error-copy.ts similarity index 99% rename from src/renderer/src/lib/agent-output-error-copy.ts rename to src/renderer/src/lib/text-generation/agent-output-error-copy.ts index 261c543ba45..d5dab5ac750 100644 --- a/src/renderer/src/lib/agent-output-error-copy.ts +++ b/src/renderer/src/lib/text-generation/agent-output-error-copy.ts @@ -2,7 +2,7 @@ import { translate } from '@/i18n/i18n' import { AGENT_OUTPUT_FAILURE_COPY as EN, type AgentOutputFailureCode -} from '../../../shared/agent-output-failure-copy' +} from '../../../../shared/agent-output-failure-copy' type CopyValues = Record diff --git a/src/renderer/src/lib/web-host-agent-launch-completion.ts b/src/renderer/src/lib/web-host-agent-launch-completion.ts index 1365840260a..5fbe9176ba1 100644 --- a/src/renderer/src/lib/web-host-agent-launch-completion.ts +++ b/src/renderer/src/lib/web-host-agent-launch-completion.ts @@ -5,7 +5,7 @@ import type { WebRuntimeTerminalCreateOutcome } from '@/runtime/hosted-terminals import type { AgentTerminalLaunchCompletion } from './agent-session/launch/structured-agent-session-launch-admission' import { webTerminalPlacementParentTabId } from '@/runtime/hosted-terminals/placement/web-session-terminal-placement' import { toWebTerminalSurfaceTabId } from '../../../shared/workspace-layout/terminal-surface-id' -import { notifyAgentLaunchPromptNotSent } from './agent-launch-prompt-failure-notice' +import { notifyAgentLaunchPromptNotSent } from './agent-session/launch/prompt/agent-launch-prompt-failure-notice' export function completeWebHostAgentLaunch(args: { agent: TuiAgent diff --git a/src/renderer/src/lib/workspace/activation/active-worktree-removal-successor.test.ts b/src/renderer/src/lib/workspace/activation/active-worktree-removal-successor.test.ts index 64adc6088de..3abb60a5a0a 100644 --- a/src/renderer/src/lib/workspace/activation/active-worktree-removal-successor.test.ts +++ b/src/renderer/src/lib/workspace/activation/active-worktree-removal-successor.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { installActiveWorktreeRemovalSuccessor, pickActiveWorktreeSuccessor @@ -27,7 +27,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus restorePtyDataHandlersAfterFailedShutdown: vi.fn(), unregisterPtyDataHandlers: vi.fn(() => []) })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/lib/workspace/activation/initial-surface/empty-workspace-default-agent-chat.ts b/src/renderer/src/lib/workspace/activation/initial-surface/empty-workspace-default-agent-chat.ts index 8850c475088..dee4d15b21e 100644 --- a/src/renderer/src/lib/workspace/activation/initial-surface/empty-workspace-default-agent-chat.ts +++ b/src/renderer/src/lib/workspace/activation/initial-surface/empty-workspace-default-agent-chat.ts @@ -11,7 +11,7 @@ import type { AgentDetectionTarget } from '@/hooks/useDetectedAgents' import { ensureDetectedAgentsForTarget, readDetectedAgentsForTarget -} from '@/lib/agent-detection-target-inventory' +} from '@/lib/agent-session/launch/inventory/agent-detection-target-inventory' import { workspaceKindForWorktreeId } from '../../../../../../shared/agent-launch/contracts/workspace-launch-kind' import { worktreeLaunchWorkspace } from '@/lib/agent-session/launch/routing/agent-launch-route-input' import { chosenAgentChatUnlearned, agentChoiceOpensAsChat } from '@/lib/host-chat-program' diff --git a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-agent-routing.ts b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-agent-routing.ts index e8939699302..61cde6a3158 100644 --- a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-agent-routing.ts +++ b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-agent-routing.ts @@ -17,7 +17,7 @@ import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui import type { AppState } from '@/store/types' import { isTuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent-config' import { isTuiAgentEnabled } from '../../../../../../shared/agent-launch/catalog/tui-agent-selection' -import { resolveDefaultAgentForWorkspace } from '../../../agent-tab-shortcuts' +import { resolveDefaultAgentForWorkspace } from '../../../agent-session/launch/shortcuts/agent-tab-shortcuts' import { worktreeLaunchWorkspace } from '@/lib/agent-session/launch/routing/agent-launch-route-input' import { agentChoiceMayOpenAsChat } from '@/lib/host-chat-program' import type { AgentSessionLaunchPlan } from '@/lib/agent-session/launch/routing/agent-session-launch-plan' @@ -30,7 +30,7 @@ import type { DeclinedStructuredLaunchTerminalOptions } from '@/lib/agent-sessio import { ensureDetectedAgentsForNewWorktree, type RepoHostFields -} from '@/lib/agent-detection-target-inventory' +} from '@/lib/agent-session/launch/inventory/agent-detection-target-inventory' export function buildDirectWorkItemStartup(args: { agent: TuiAgent | null diff --git a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-messages.ts b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-messages.ts index deeece20efa..bc6396ca4b1 100644 --- a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-messages.ts +++ b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-messages.ts @@ -1,10 +1,10 @@ import { toast } from 'sonner' -import { notifyAgentLaunchFailure } from '@/lib/agent-launch-failure' +import { notifyAgentLaunchFailure } from '@/lib/agent-session/launch/failure/agent-launch-failure' import { planAgentCliArgsSuffix, type AgentStartupShell } from '../../../../../../shared/agent-launch/startup/tui-agent-startup-shell' -import { getAgentLabel } from '../../../agent-catalog' +import { getAgentLabel } from '../../../agent-catalog/agent-catalog' import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' import '@/lib/new-workspace' diff --git a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-preflight.ts b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-preflight.ts index 82a4d45dce0..b220349ba93 100644 --- a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-preflight.ts +++ b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-preflight.ts @@ -10,7 +10,7 @@ import type { AppState } from '@/store/types' import { ensureDetectedAgentsForRepo, loadProjectLaunchContext -} from '../../../agent-detection-target-inventory' +} from '../../../agent-session/launch/inventory/agent-detection-target-inventory' import { CLIENT_PLATFORM } from '../../../new-workspace' import { getLocalRepoProjectExecutionRuntimeContext } from '../../../local-preflight-context' import { @@ -18,7 +18,7 @@ import { resolveRepoExecutionHostPlatform } from '../../../../runtime/hosts/platform/execution-host-facts' import { isTuiAgentEnabled } from '../../../../../../shared/agent-launch/catalog/tui-agent-selection' -import { resolveDefaultAgentForWorkspace } from '../../../agent-tab-shortcuts' +import { resolveDefaultAgentForWorkspace } from '../../../agent-session/launch/shortcuts/agent-tab-shortcuts' import { isTuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent-config' import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' import type { ProjectLaunchContext } from '../../../../../../shared/rpc-contract/preflight-params' diff --git a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-route-preparation.ts b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-route-preparation.ts index 764edf5ac28..8cfd7c1b835 100644 --- a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-route-preparation.ts +++ b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-route-preparation.ts @@ -2,7 +2,7 @@ import { ensureAgentLaunchPreferences } from '@/runtime/agent-launch-settings/us import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' import type { AppState } from '@/store/types' import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution' -import type { RepoHostFields } from '@/lib/agent-detection-target-inventory' +import type { RepoHostFields } from '@/lib/agent-session/launch/inventory/agent-detection-target-inventory' import type { ProjectExecutionRuntimeResolution } from '../../../../../../shared/execution-host/project-execution-runtime' import { refineLocalLaunchPlatform, diff --git a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-setup.test.tsx b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-setup.test.tsx index d80c6e3a125..8d8e5ce69b5 100644 --- a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-setup.test.tsx +++ b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-setup.test.tsx @@ -4,7 +4,7 @@ import { readDirectSetupRequest } from '@/lib/workspace/creation/work-item/direc import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { act, cleanup, fireEvent, render, screen } from '@testing-library/react' import * as preflight from './launch-work-item-direct-preflight' -import * as inventory from '../../../agent-detection-target-inventory' +import * as inventory from '../../../agent-session/launch/inventory/agent-detection-target-inventory' import { useAppStore } from '@/store/index' import { createUIStore } from '@/store/slices/ui/ui-slice-test-harness' diff --git a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-test-fixture.ts b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-test-fixture.ts index 45e8b90cb0b..af9479f7fff 100644 --- a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-test-fixture.ts +++ b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-test-fixture.ts @@ -78,7 +78,7 @@ vi.mock('sonner', () => ({ toast: { error: mocks.toastError, message: vi.fn(), success: vi.fn() } })) -vi.mock('@/lib/agent-paste-draft', () => ({ +vi.mock('@/lib/agent-session/messaging/paste/agent-paste-draft', () => ({ pasteDraftWhenAgentReady: mocks.pasteDraftWhenAgentReady })) diff --git a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-types.ts b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-types.ts index b86e248b8b2..f5b1f8b7cc6 100644 --- a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-types.ts +++ b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-types.ts @@ -5,7 +5,7 @@ import type { TaskProvider } from '../../../../../../shared/work-items/task-prov import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent' import type { WorkspaceSource as WorkspaceCreateTelemetrySource } from '../../../../../../shared/workspace-source' import type { LaunchSource } from '../../../../../../shared/telemetry-property-schemas' -import type { AgentLaunchChoice } from '@/lib/agent-menu-selection' +import type { AgentLaunchChoice } from '@/lib/agent-session/launch/routing/agent-menu-selection' import type { AgentSessionLaunchRequest } from '../../../agent-session/launch/routing/agent-session-launch-plan' export type DirectWorkItemLaunchInputs = AgentLaunchInputViews & diff --git a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct.ts b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct.ts index bd6c860b325..c6fda4e6826 100644 --- a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct.ts +++ b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct.ts @@ -1,5 +1,5 @@ import { pickApprovedSetupHashes } from '../../../../../../shared/worktree/approved-setup-hashes' -import { agentLaunchRecoveryMessage } from '@/lib/agent-launch-failure' +import { agentLaunchRecoveryMessage } from '@/lib/agent-session/launch/failure/agent-launch-failure' import { prepareDirectWorkItemSetup } from './direct-work-item-setup' import type { DirectWorkItemLaunchResult } from './direct-work-item-setup' import { useAppStore } from '@/store/index' diff --git a/src/renderer/src/lib/workspace/ownership/workspace-terminal-host-authority.test.ts b/src/renderer/src/lib/workspace/ownership/workspace-terminal-host-authority.test.ts index c48ab04c49a..dab14a46146 100644 --- a/src/renderer/src/lib/workspace/ownership/workspace-terminal-host-authority.test.ts +++ b/src/renderer/src/lib/workspace/ownership/workspace-terminal-host-authority.test.ts @@ -1,6 +1,6 @@ /** Use one remote-authority question for seeding/resume: only none authorizes local terminal creation, never unverifiable. */ import { afterEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { createTestStore } from '@/store/testing/app-store-test-fixture' import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' import { ensureWorktreeHasInitialTerminal } from '@/lib/workspace/activation/initial-surface/worktree-initial-terminal-seeding' @@ -14,7 +14,7 @@ vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) => ) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/lib/worktree-activity-state.ts b/src/renderer/src/lib/worktree-activity-state.ts index 968f13d09c3..1a2c77300ce 100644 --- a/src/renderer/src/lib/worktree-activity-state.ts +++ b/src/renderer/src/lib/worktree-activity-state.ts @@ -1,5 +1,5 @@ import type { AppState } from '@/store/types' -import { createAgentStatusEpochSelector } from './agent-status-epoch-selector' +import { createAgentStatusEpochSelector } from './agent-status/evidence/agent-status-epoch-selector' import { tabHasLivePty } from '../../../shared/tab-has-live-pty' import type { TerminalTab } from '../../../shared/workspace-layout/terminal-tab-types' import { isFreshNonDoneAgentStatus } from '../../../shared/agent-status/contracts/agent-status-freshness' diff --git a/src/renderer/src/lib/worktree-status.ts b/src/renderer/src/lib/worktree-status.ts index 793c0814e46..15f033f11c4 100644 --- a/src/renderer/src/lib/worktree-status.ts +++ b/src/renderer/src/lib/worktree-status.ts @@ -1,6 +1,6 @@ import { translate } from '@/i18n/i18n' import { resolveAgentTypeFromTerminalTitle } from '@/components/sidebar/workspace-card/activity/worktree-title-derived-agent-rows' -import { classifyTitleActivity } from '@/lib/pane-agent-evidence' +import { detectAgentStatusFromTitle } from '../../../shared/agent-status/title/agent-title-status' import { tabHasLivePty } from '../../../shared/tab-has-live-pty' import { collectRuntimePaneLeafIds, @@ -128,7 +128,7 @@ function tabHasStatus( continue } if ( - classifyTitleActivity(title) === status && + detectAgentStatusFromTitle(title) === status && titleStatusIsAgentAttributable(title, tab.launchAgent) ) { return true @@ -147,7 +147,7 @@ function tabHasStatus( return false } return ( - classifyTitleActivity(tab.title) === status && + detectAgentStatusFromTitle(tab.title) === status && titleStatusIsAgentAttributable(tab.title, tab.launchAgent) ) } diff --git a/src/renderer/src/runtime/hosted-terminals/creation/web-runtime-terminal-prompt-delivery.test.ts b/src/renderer/src/runtime/hosted-terminals/creation/web-runtime-terminal-prompt-delivery.test.ts index 20960172c63..7deb6cfa246 100644 --- a/src/renderer/src/runtime/hosted-terminals/creation/web-runtime-terminal-prompt-delivery.test.ts +++ b/src/renderer/src/runtime/hosted-terminals/creation/web-runtime-terminal-prompt-delivery.test.ts @@ -7,7 +7,9 @@ const mocks = vi.hoisted(() => ({ write: vi.fn<(_pty: string, _data: string) => Promise>(), draft: vi.fn() })) -vi.mock('@/lib/agent-draft-readiness', () => ({ waitForAgentDraftInputReady: mocks.ready })) +vi.mock('@/lib/agent-session/messaging/paste/agent-draft-readiness', () => ({ + waitForAgentDraftInputReady: mocks.ready +})) vi.mock('@/runtime/hosted-terminals/input/runtime-terminal-verified-input', () => ({ sendRuntimePtyInputVerified: mocks.write })) diff --git a/src/renderer/src/lib/chat-provider-agents.ts b/src/renderer/src/runtime/native-chat/agent-catalogs/chat-provider-agents.ts similarity index 85% rename from src/renderer/src/lib/chat-provider-agents.ts rename to src/renderer/src/runtime/native-chat/agent-catalogs/chat-provider-agents.ts index 38e45869072..97e6df633c2 100644 --- a/src/renderer/src/lib/chat-provider-agents.ts +++ b/src/renderer/src/runtime/native-chat/agent-catalogs/chat-provider-agents.ts @@ -1,6 +1,6 @@ import { useAppViewExternalStore } from '@/store/retained-views/app-state-view' -import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' -import { isTuiAgent } from '../../../shared/agent-launch/catalog/tui-agent-config' +import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent' +import { isTuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent-config' import { hostStructuredAgentsVersion, readHostStructuredAgents, diff --git a/src/renderer/src/runtime/native-chat/naming/legacy-chat-rename-migration.test.tsx b/src/renderer/src/runtime/native-chat/naming/legacy-chat-rename-migration.test.tsx index c6f13efb56c..dd339731367 100644 --- a/src/renderer/src/runtime/native-chat/naming/legacy-chat-rename-migration.test.tsx +++ b/src/renderer/src/runtime/native-chat/naming/legacy-chat-rename-migration.test.tsx @@ -38,7 +38,7 @@ import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-t import { fetchWorkspaceSessionWithRuntimeHostOwners } from '@/lib/workspace/persistence/workspace-session-host-hydration' import { buildPersistedUnifiedTabSessionData } from '@/lib/workspace/persistence/workspace-session-unified-tabs' import { persistWorkspaceSessionByHost } from '@/lib/workspace/persistence/workspace-session-host-persistence' -import { sendMessageToAgent } from '@/lib/agent-message-send' +import { sendMessageToAgent } from '@/lib/agent-session/messaging/agent-message-send' import type { WorkspaceSessionState } from '../../../../../shared/workspace-session/workspace-session-state-types' import '../../web-session-tabs-sync/snapshot-api' diff --git a/src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-conversion-publish.test.ts b/src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-conversion-publish.test.ts index 2b153bf933f..71d5824c6e4 100644 --- a/src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-conversion-publish.test.ts +++ b/src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-conversion-publish.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '../../lib/agent-status' +import type * as AgentStatusModule from '../../lib/agent-status/aggregation/worktree-agent-status' import { buildMobileSessionTabSnapshots } from './mobile-session-snapshots' import { createTestStore } from '../../store/testing/app-store-test-fixture' import { makeWorktree } from '../../store/slices/worktrees/worktree.test-fixture' @@ -14,7 +14,7 @@ vi.mock('@/lib/browser/documents/doc-preview-grants', () => ({ buildDocPreviewGrantRequest: vi.fn() })) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/runtime/web-session-tabs-sync/agent-status/mirrored-agent-status-clock-skew.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/agent-status/mirrored-agent-status-clock-skew.test.ts index 61e9809768a..0b7aca42250 100644 --- a/src/renderer/src/runtime/web-session-tabs-sync/agent-status/mirrored-agent-status-clock-skew.test.ts +++ b/src/renderer/src/runtime/web-session-tabs-sync/agent-status/mirrored-agent-status-clock-skew.test.ts @@ -1,11 +1,14 @@ // Age mirrored evidence by client receipt time: rendererNow minus hostStamp gains clock skew and makes remote rows immediately stale or permanently fresh. Inject separate host/client clocks. Published freshness verdicts cannot decay during silence; exact repaints must not renew receipt time. import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts' -import { AGENT_STATUS_STALE_AFTER_MS } from '../../../../../shared/agent-status/contracts/agent-status-freshness' +import { + AGENT_STATUS_STALE_AFTER_MS, + isAgentStatusFresh +} from '../../../../../shared/agent-status/contracts/agent-status-freshness' import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id' import { toWebTerminalSurfaceTabId } from '../../../../../shared/workspace-layout/terminal-surface-id' import { getDefaultSettings } from '../../../../../shared/constants' -import { isExplicitAgentStatusFresh } from '../../../lib/pane-agent-evidence' + import type { AppState } from '../../../store/types' import { createTestStore, seedStore } from '../../../store/testing/app-store-test-fixture' import { makeWorktree } from '../../../store/slices/worktrees/worktree.test-fixture' @@ -111,7 +114,7 @@ function applyChangedHostSnapshot( function mirroredRowIsFreshAt(store: TestStore, clientNow: number): boolean { const row = store.getState().agentStatusByPaneKey[MIRROR_PANE_KEY] expect(row, 'the mirrored row must exist for freshness to mean anything').toBeDefined() - return isExplicitAgentStatusFresh(row, clientNow, AGENT_STATUS_STALE_AFTER_MS) + return isAgentStatusFresh(row, clientNow, AGENT_STATUS_STALE_AFTER_MS) } describe('a mirrored remote row decays on the replica clock, not the host clock', () => { diff --git a/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-remote-status-title-flap.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-remote-status-title-flap.test.ts index b5d51b113e1..459de5fee60 100644 --- a/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-remote-status-title-flap.test.ts +++ b/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-remote-status-title-flap.test.ts @@ -1,9 +1,12 @@ /** Paired panes receive both client byte-derived status/titles and host snapshot echoes. Proven client ownership must fence stale echoes despite cross-machine clocks; teardown returns authority and host-only states pierce the fence. Drive real mirror/store logic with controlled clocks and assert transition order/count, including generatedLabel and epoch stability. */ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts' -import { AGENT_STATUS_STALE_AFTER_MS } from '../../../../../shared/agent-status/contracts/agent-status-freshness' +import { + AGENT_STATUS_STALE_AFTER_MS, + isAgentStatusFresh +} from '../../../../../shared/agent-status/contracts/agent-status-freshness' import type { AgentStatusEntry } from '../../../../../shared/agent-status/contracts/agent-status-types' -import { isExplicitAgentStatusFresh } from '@/lib/pane-agent-evidence' + import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id' import { toWebTerminalSurfaceTabId } from '../../../../../shared/workspace-layout/terminal-surface-id' import { deriveGeneratedTabTitle } from '../../../../../shared/agent-status/presentation/agent-tab-title' @@ -324,7 +327,7 @@ describe('remote-paired pane: host snapshot mirror vs client byte-derived status const entry = store.getState().agentStatusByPaneKey[MIRROR_PANE_KEY] expect(entry).toBeDefined() expect( - isExplicitAgentStatusFresh(entry!, afterStale, AGENT_STATUS_STALE_AFTER_MS), + isAgentStatusFresh(entry!, afterStale, AGENT_STATUS_STALE_AFTER_MS), 'the retained entry must read as stale so consumers render it idle' ).toBe(false) }) diff --git a/src/renderer/src/runtime/workspace-layout/frames/divider-ratio-refusal.test.ts b/src/renderer/src/runtime/workspace-layout/frames/divider-ratio-refusal.test.ts index 42670aa38a2..be63f36e322 100644 --- a/src/renderer/src/runtime/workspace-layout/frames/divider-ratio-refusal.test.ts +++ b/src/renderer/src/runtime/workspace-layout/frames/divider-ratio-refusal.test.ts @@ -1,7 +1,7 @@ // A stale divider path is refused by main; the window restores main’s unchanged ratios when its tab hold ends. import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { useAppStore } from '@/store/index' import type { WorkspaceLayoutModel } from '../../../../../shared/workspace-layout/workspace-layout-model' import { localDesktopSession } from '../../../../../shared/workspace-layout/workspace-layout-profile.test-fixture' @@ -34,7 +34,7 @@ vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (import ).runtimeLayoutClientWithTestFrames(await importOriginal()) ) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/runtime/workspace-layout/frames/layout-changes-during-stream-outage.test.ts b/src/renderer/src/runtime/workspace-layout/frames/layout-changes-during-stream-outage.test.ts index d63c93aa1bb..b0290960bcf 100644 --- a/src/renderer/src/runtime/workspace-layout/frames/layout-changes-during-stream-outage.test.ts +++ b/src/renderer/src/runtime/workspace-layout/frames/layout-changes-during-stream-outage.test.ts @@ -1,7 +1,7 @@ // During local stream outage, main applies intents and reconnect snapshot draws them. Local main shares this build, so window fallback drawing is unnecessary. import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { useAppStore } from '@/store/index' import { applyLayoutCommand, @@ -43,7 +43,7 @@ vi.mock('./workspace-layout-frame-sync', async (importOriginal) => ({ showStartupLayoutFrames: () => {} })) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/runtime/workspace-layout/frames/pane-titles-drawn-from-frames.test.ts b/src/renderer/src/runtime/workspace-layout/frames/pane-titles-drawn-from-frames.test.ts index 3749f9dafa3..dab9b50dc8e 100644 --- a/src/renderer/src/runtime/workspace-layout/frames/pane-titles-drawn-from-frames.test.ts +++ b/src/renderer/src/runtime/workspace-layout/frames/pane-titles-drawn-from-frames.test.ts @@ -1,7 +1,7 @@ // Main applies renames and frames draw titles without a second window write. Shared transport checks each flush against full-build behavior. import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { useAppStore } from '@/store/index' import { localDesktopSession } from '../../../../../shared/workspace-layout/workspace-layout-profile.test-fixture' import { leaf } from '../../../../../shared/workspace-layout/workspace-layout-session.test-fixture' @@ -31,7 +31,7 @@ vi.mock('./workspace-layout-frame-sync', async (importOriginal) => ({ showStartupLayoutFrames: () => {} })) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-binding.test.ts b/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-binding.test.ts index 2bbbab68dce..867b1b757a1 100644 --- a/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-binding.test.ts +++ b/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-binding.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type { WorkspaceSessionState } from '../../../../../shared/workspace-session/workspace-session-state-types' import { loadWorkspaceLayoutWithoutReport } from '../../../../../shared/workspace-layout/workspace-layout-load' import { nameBasedLoadContext } from '../../../../../shared/workspace-layout/workspace-layout-minted-ids' @@ -25,7 +25,7 @@ import { installLayoutFrameApplyCheck } from '../testing/workspace-layout-frame- import { mainLayoutFrameSender } from '../testing/main-loaded-layout-frames.test-fixture' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-editor-views.test.ts b/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-editor-views.test.ts index 0afde82954a..61abea3ed1a 100644 --- a/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-editor-views.test.ts +++ b/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-editor-views.test.ts @@ -1,7 +1,7 @@ // Frame views reconstruct main-owned diff tabs after window reload, from both records frames and initial snapshots. import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type { LayoutEditorView } from '../../../../../shared/workspace-layout/layout-editor-view' import { applyLayoutCommand } from '../../../../../shared/workspace-layout/workspace-layout-commands' import type { CommandOf } from '../../../../../shared/workspace-layout/workspace-layout-command-types' @@ -24,7 +24,7 @@ import { installLayoutFrameApplyCheck } from '../testing/workspace-layout-frame- import { openWorkspaceLayoutFrameSync } from './workspace-layout-frame-sync' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-held-tabs.test.ts b/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-held-tabs.test.ts index 686016ecd24..fefdd3de4d8 100644 --- a/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-held-tabs.test.ts +++ b/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-held-tabs.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type { Tab } from '../../../../../shared/tab-types' import type { WorkspaceSessionState } from '../../../../../shared/workspace-session/workspace-session-state-types' import type { LayoutApplyReply } from '../../../../../shared/workspace-layout/workspace-layout-command-types' @@ -29,7 +29,7 @@ import { vi.mock('../../../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true })) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-sync.test.ts b/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-sync.test.ts index a183f41b9a5..501b0448a41 100644 --- a/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-sync.test.ts +++ b/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-sync.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type { ExecutionHostId } from '../../../../../shared/execution-host' import type { WorkspaceSessionState } from '../../../../../shared/workspace-session/workspace-session-state-types' import { LEGACY_WORKSPACE_LAYOUT_PROFILES } from '../../../../../shared/workspace-layout/workspace-layout-legacy-profile.test-fixture' @@ -32,7 +32,7 @@ import { import { installLayoutFrameApplyCheck } from '../testing/workspace-layout-frame-apply-check.test-fixture' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-tab-props.test.ts b/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-tab-props.test.ts index 5500c7b2216..828d968e969 100644 --- a/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-tab-props.test.ts +++ b/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-tab-props.test.ts @@ -1,7 +1,7 @@ // Main’s frame-drawn pin/color/rename must match current window actions and survive restart in layout-owner builds. import { afterEach, beforeEach, describe, expect, it, onTestFinished, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type { WorkspaceSessionState } from '../../../../../shared/workspace-session/workspace-session-state-types' import { applyLayoutCommand } from '../../../../../shared/workspace-layout/workspace-layout-commands' import type { LayoutCommand } from '../../../../../shared/workspace-layout/workspace-layout-command-types' @@ -43,7 +43,7 @@ vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) => ) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/runtime/workspace-layout/server/server-held-panes.test.tsx b/src/renderer/src/runtime/workspace-layout/server/server-held-panes.test.tsx index f7b31577feb..08c43962271 100644 --- a/src/renderer/src/runtime/workspace-layout/server/server-held-panes.test.tsx +++ b/src/renderer/src/runtime/workspace-layout/server/server-held-panes.test.tsx @@ -4,7 +4,7 @@ import { act } from 'react' import { createRoot, type Root } from 'react-dom/client' import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type * as FrameDrawnModule from '../../web-session-tabs-sync/frame-drawn-server-workspaces' import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id' import { toWebTerminalSurfaceTabId } from '../../../../../shared/workspace-layout/terminal-surface-id' @@ -52,7 +52,7 @@ const hoisted = vi.hoisted( vi.mock('../../../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true })) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/runtime/workspace-layout/server/server-layout-apply.test.ts b/src/renderer/src/runtime/workspace-layout/server/server-layout-apply.test.ts index 660dd41ff4f..9b563614554 100644 --- a/src/renderer/src/runtime/workspace-layout/server/server-layout-apply.test.ts +++ b/src/renderer/src/runtime/workspace-layout/server/server-layout-apply.test.ts @@ -1,6 +1,6 @@ import type * as RuntimeRpcCallModule from '@/runtime/rpc/calls/runtime-rpc-call' import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type * as ResolveOwnerModule from '@/lib/workspace/ownership/resolve-owner' import type * as FrameDrawnModule from '../../web-session-tabs-sync/frame-drawn-server-workspaces' @@ -63,7 +63,7 @@ const hoisted = vi.hoisted( vi.mock('../../../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true })) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/runtime/workspace-layout/server/server-layout-editor-handover.test.ts b/src/renderer/src/runtime/workspace-layout/server/server-layout-editor-handover.test.ts index 86b810f2f56..33c43ced8d2 100644 --- a/src/renderer/src/runtime/workspace-layout/server/server-layout-editor-handover.test.ts +++ b/src/renderer/src/runtime/workspace-layout/server/server-layout-editor-handover.test.ts @@ -1,6 +1,6 @@ import type * as RuntimeRpcCallModule from '@/runtime/rpc/calls/runtime-rpc-call' import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type * as ResolveOwnerModule from '@/lib/workspace/ownership/resolve-owner' import type * as RuntimeFileMutationClient from '../../files/mutations/runtime-file-mutation-client' @@ -67,7 +67,7 @@ const hoisted = vi.hoisted( vi.mock('../../../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true })) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-handover.test.ts b/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-handover.test.ts index 293d00849f1..e71fca0a5af 100644 --- a/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-handover.test.ts +++ b/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-handover.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type * as FrameDrawnModule from '../../web-session-tabs-sync/frame-drawn-server-workspaces' import type { AppState } from '@/store/types' import { buildWorkspaceSessionPayload } from '@/lib/workspace/persistence/workspace-session' @@ -58,7 +58,7 @@ const hoisted = vi.hoisted( vi.mock('../../../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true })) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-held-tabs.test.ts b/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-held-tabs.test.ts index b4e93eb24c1..62409cd8b04 100644 --- a/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-held-tabs.test.ts +++ b/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-held-tabs.test.ts @@ -1,6 +1,6 @@ import type * as RuntimeRpcCallModule from '@/runtime/rpc/calls/runtime-rpc-call' import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type * as ResolveOwnerModule from '@/lib/workspace/ownership/resolve-owner' import type * as WorktreeRuntimeOwnerModule from '@/lib/workspace/ownership/worktree-runtime-owner' @@ -68,7 +68,7 @@ const hoisted = vi.hoisted( vi.mock('../../../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true })) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/runtime/workspace-layout/server/server-layout-frames.test.ts b/src/renderer/src/runtime/workspace-layout/server/server-layout-frames.test.ts index 5126ab119f7..5ec8f77b0c8 100644 --- a/src/renderer/src/runtime/workspace-layout/server/server-layout-frames.test.ts +++ b/src/renderer/src/runtime/workspace-layout/server/server-layout-frames.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type * as FrameDrawnModule from '../../web-session-tabs-sync/frame-drawn-server-workspaces' import type { AppState } from '@/store/types' import { toWebTerminalSurfaceTabId } from '../../../../../shared/workspace-layout/terminal-surface-id' @@ -51,7 +51,7 @@ const hoisted = vi.hoisted( vi.mock('../../../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true })) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/repos/store-session-cascades.test.ts b/src/renderer/src/store/repos/store-session-cascades.test.ts index e08e7e5497e..4f20d41111f 100644 --- a/src/renderer/src/store/repos/store-session-cascades.test.ts +++ b/src/renderer/src/store/repos/store-session-cascades.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { createTestStore } from '../testing/app-store-test-fixture' import { makeWorktree } from '../slices/worktrees/worktree.test-fixture' import { makeTab, makeLayout } from '../terminals/terminal-tab.test-fixture' @@ -7,7 +7,7 @@ import { createStoreSessionMockApi } from '../testing/app-store-session-api.test vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/slices/agent-status/agent-status-live-actions.ts b/src/renderer/src/store/slices/agent-status/agent-status-live-actions.ts index 8e631abfe70..10dfdca7c57 100644 --- a/src/renderer/src/store/slices/agent-status/agent-status-live-actions.ts +++ b/src/renderer/src/store/slices/agent-status/agent-status-live-actions.ts @@ -1,4 +1,4 @@ -import { resolvePaneKey } from '../../../lib/agent-status-pane-ownership' +import { resolvePaneKey } from '../../../lib/agent-status/ownership/agent-status-pane-ownership' import type { AgentStatusSlice } from './agent-status-slice-contract' import type { AgentStatusRuntime } from './agent-status-runtime' import type { diff --git a/src/renderer/src/store/slices/agent-status/agent-status-worktree-purge-leak.test.ts b/src/renderer/src/store/slices/agent-status/agent-status-worktree-purge-leak.test.ts index 37d0707856c..f417613339f 100644 --- a/src/renderer/src/store/slices/agent-status/agent-status-worktree-purge-leak.test.ts +++ b/src/renderer/src/store/slices/agent-status/agent-status-worktree-purge-leak.test.ts @@ -3,7 +3,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' import type { AgentStatusEntry } from '../../../../../shared/agent-status/contracts/agent-status-types' import type { AppState } from '../../types' import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session/lifecycle/agent-session-resume' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() } @@ -16,7 +16,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: vi.fn() })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/slices/browser/cleanup/browser-cleanup-close.test.ts b/src/renderer/src/store/slices/browser/cleanup/browser-cleanup-close.test.ts index 7f2fe92ea43..db83c822f7b 100644 --- a/src/renderer/src/store/slices/browser/cleanup/browser-cleanup-close.test.ts +++ b/src/renderer/src/store/slices/browser/cleanup/browser-cleanup-close.test.ts @@ -1,6 +1,6 @@ import type * as RuntimeRpcCallModule from '@/runtime/rpc/calls/runtime-rpc-call' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { createTestStore, seedStore } from '../../../testing/app-store-test-fixture' import { makeWorktree } from '../../worktrees/worktree.test-fixture' @@ -24,7 +24,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: vi.fn(() => []) })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/slices/browser/cleanup/browser-close-focused-group.test.ts b/src/renderer/src/store/slices/browser/cleanup/browser-close-focused-group.test.ts index d2ccc72b60c..2f254821ba6 100644 --- a/src/renderer/src/store/slices/browser/cleanup/browser-close-focused-group.test.ts +++ b/src/renderer/src/store/slices/browser/cleanup/browser-close-focused-group.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { createTestStore, seedStore } from '../../../testing/app-store-test-fixture' import { makeTab } from '../../../terminals/terminal-tab.test-fixture' import { makeTabGroup, makeUnifiedTab } from '../../tabs/tab-group.test-fixture' @@ -25,7 +25,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: mockUnregisterPtyDataHandlers })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/slices/browser/cleanup/browser-close-mru-selection.test.ts b/src/renderer/src/store/slices/browser/cleanup/browser-close-mru-selection.test.ts index 209f77c4534..2ae9b728a19 100644 --- a/src/renderer/src/store/slices/browser/cleanup/browser-close-mru-selection.test.ts +++ b/src/renderer/src/store/slices/browser/cleanup/browser-close-mru-selection.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { createTestStore, seedStore } from '../../../testing/app-store-test-fixture' import { makeWorktree } from '../../worktrees/worktree.test-fixture' @@ -23,7 +23,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: mockUnregisterPtyDataHandlers })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/slices/browser/cleanup/browser-mount-admission-removal.test.ts b/src/renderer/src/store/slices/browser/cleanup/browser-mount-admission-removal.test.ts index 990bb6c28f9..1e536b5709f 100644 --- a/src/renderer/src/store/slices/browser/cleanup/browser-mount-admission-removal.test.ts +++ b/src/renderer/src/store/slices/browser/cleanup/browser-mount-admission-removal.test.ts @@ -1,6 +1,6 @@ /** Release background-page start admission on every removal, including bulk purge; exercise the same sweep as useTerminalWindowLifecycle (STA-7436). */ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { createTestStore, seedStore } from '../../../testing/app-store-test-fixture' import { makeWorktree } from '../../worktrees/worktree.test-fixture' import { createStoreCascadesMockApi } from '../../../testing/app-store-cascade-api.test-fixture' @@ -20,7 +20,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: vi.fn(() => []) })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/slices/browser/hydration/store-session-browser-hydration.test.ts b/src/renderer/src/store/slices/browser/hydration/store-session-browser-hydration.test.ts index 6a9ba48b8a8..d42b446678f 100644 --- a/src/renderer/src/store/slices/browser/hydration/store-session-browser-hydration.test.ts +++ b/src/renderer/src/store/slices/browser/hydration/store-session-browser-hydration.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type { BrowserPage } from '../../../../../../shared/browser-workspace-types' import '../../../../../../shared/constants' import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch' @@ -16,7 +16,7 @@ import { makeBrowserTab } from '../browser-tab.test-fixture' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/slices/browser/pages/browser-page-conversion.test.ts b/src/renderer/src/store/slices/browser/pages/browser-page-conversion.test.ts index 0d341ef281d..d1b3a070cee 100644 --- a/src/renderer/src/store/slices/browser/pages/browser-page-conversion.test.ts +++ b/src/renderer/src/store/slices/browser/pages/browser-page-conversion.test.ts @@ -1,6 +1,6 @@ import type * as RuntimeRpcCallModule from '@/runtime/rpc/calls/runtime-rpc-call' import { afterEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { browserPageSchema } from '../../../../../../shared/workspace-session/workspace-session-browser-schema' import { createTestStore } from '../../../testing/app-store-test-fixture' @@ -32,7 +32,7 @@ vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (import ).runtimeLayoutClientWithTestFrames(await importOriginal()) ) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts b/src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts index 8a9462f6074..1019981fc91 100644 --- a/src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts +++ b/src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { buildBrowserSessionData } from '@/lib/workspace/persistence/workspace-session-browser-tabs' import { browserPageSchema } from '../../../../../../shared/workspace-session/workspace-session-browser-schema' import { createTestStore } from '../../../testing/app-store-test-fixture' @@ -16,7 +16,7 @@ vi.mock('@/lib/browser/documents/doc-preview-grants', () => ({ buildDocPreviewGrantRequest: vi.fn() })) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/slices/browser/tabs/browser-background-tab-creation.test.ts b/src/renderer/src/store/slices/browser/tabs/browser-background-tab-creation.test.ts index d7cff2387e9..184d20ba096 100644 --- a/src/renderer/src/store/slices/browser/tabs/browser-background-tab-creation.test.ts +++ b/src/renderer/src/store/slices/browser/tabs/browser-background-tab-creation.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { createTestStore, seedStore } from '../../../testing/app-store-test-fixture' import { makeTab } from '../../../terminals/terminal-tab.test-fixture' import { makeWorktree } from '../../worktrees/worktree.test-fixture' @@ -23,7 +23,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: mockUnregisterPtyDataHandlers })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/slices/browser/tabs/browser-tab-creation-placement.test.ts b/src/renderer/src/store/slices/browser/tabs/browser-tab-creation-placement.test.ts index af0dcd00a4c..81831aebc18 100644 --- a/src/renderer/src/store/slices/browser/tabs/browser-tab-creation-placement.test.ts +++ b/src/renderer/src/store/slices/browser/tabs/browser-tab-creation-placement.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type { Tab, TabGroup } from '../../../../../../shared/tab-types' import type { ExecutionHostId } from '../../../../../../shared/execution-host' @@ -21,7 +21,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus restorePtyDataHandlersAfterFailedShutdown: vi.fn(), unregisterPtyDataHandlers: vi.fn(() => []) })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/slices/diff-comments/diffComments.test.ts b/src/renderer/src/store/slices/diff-comments/diffComments.test.ts index d6c1f357e7f..b4e0c781b3b 100644 --- a/src/renderer/src/store/slices/diff-comments/diffComments.test.ts +++ b/src/renderer/src/store/slices/diff-comments/diffComments.test.ts @@ -11,7 +11,7 @@ import { import { clearRuntimeCompatibilityCache as clearRuntimeCompatibilityCacheForTests } from '../../../runtime/rpc/compatibility/runtime-compatibility-cache' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal>() return { ...actual, diff --git a/src/renderer/src/store/slices/editor/hydration/editor-session-duplicate-restore.test.ts b/src/renderer/src/store/slices/editor/hydration/editor-session-duplicate-restore.test.ts index de2c07f2a26..3246e557648 100644 --- a/src/renderer/src/store/slices/editor/hydration/editor-session-duplicate-restore.test.ts +++ b/src/renderer/src/store/slices/editor/hydration/editor-session-duplicate-restore.test.ts @@ -1,5 +1,5 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type { WorkspaceSessionState } from '../../../../../../shared/workspace-session/workspace-session-state-types' import { folderWorkspaceKey } from '../../../../../../shared/workspace-scope' import { buildWorkspaceSessionPayload } from '../../../../lib/workspace/persistence/workspace-session' @@ -19,7 +19,7 @@ vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (import ).runtimeLayoutClientWithTestFrames(await importOriginal()) ) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/slices/editor/hydration/store-session-editor-hydration.test.ts b/src/renderer/src/store/slices/editor/hydration/store-session-editor-hydration.test.ts index 4d4186af5f7..ef5681a3f34 100644 --- a/src/renderer/src/store/slices/editor/hydration/store-session-editor-hydration.test.ts +++ b/src/renderer/src/store/slices/editor/hydration/store-session-editor-hydration.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../../shared/constants' import { createTestStore } from '../../../testing/app-store-test-fixture' import { makeWorktree } from '../../worktrees/worktree.test-fixture' @@ -7,7 +7,7 @@ import { createStoreSessionMockApi } from '../../../testing/app-store-session-ap vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/slices/editor/tabs/editor-state-worktree-purge-leak.test.ts b/src/renderer/src/store/slices/editor/tabs/editor-state-worktree-purge-leak.test.ts index e8ea01eb1c5..3da246c43e4 100644 --- a/src/renderer/src/store/slices/editor/tabs/editor-state-worktree-purge-leak.test.ts +++ b/src/renderer/src/store/slices/editor/tabs/editor-state-worktree-purge-leak.test.ts @@ -1,6 +1,6 @@ /** Both single/bulk worktree removal must evict editorCursorLine/editorViewMode by file and gitStatusHugeByWorktree; missed keys leak per removed file/worktree for renderer lifetime. */ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() } @@ -13,7 +13,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: vi.fn() })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/slices/editor/tabs/editor-tab-layout-owner.test.ts b/src/renderer/src/store/slices/editor/tabs/editor-tab-layout-owner.test.ts index 8d902dde082..85c8f3b024e 100644 --- a/src/renderer/src/store/slices/editor/tabs/editor-tab-layout-owner.test.ts +++ b/src/renderer/src/store/slices/editor/tabs/editor-tab-layout-owner.test.ts @@ -1,6 +1,6 @@ // Layout-owner editor opens/closes/promotions draw only from main frames; switch-off cases draw locally without main. import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch' import type { Tab } from '../../../../../../shared/tab-types' import { layoutApplyTestTransport } from '@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture' @@ -24,7 +24,7 @@ vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (import ).runtimeLayoutClientWithTestFrames(await importOriginal()) ) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/slices/settings/settings.test.ts b/src/renderer/src/store/slices/settings/settings.test.ts index 7d2ddfe9be0..64c88b8b55d 100644 --- a/src/renderer/src/store/slices/settings/settings.test.ts +++ b/src/renderer/src/store/slices/settings/settings.test.ts @@ -17,7 +17,7 @@ import { } from '../runtime-status/runtime-status-hydration' vi.mock('sonner', () => ({ toast: { error: vi.fn(), success: vi.fn(), info: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal>() return { ...actual, diff --git a/src/renderer/src/store/slices/tabs/content-tabs-from-main-frames.test.ts b/src/renderer/src/store/slices/tabs/content-tabs-from-main-frames.test.ts index c2e41238c11..c380d8040a3 100644 --- a/src/renderer/src/store/slices/tabs/content-tabs-from-main-frames.test.ts +++ b/src/renderer/src/store/slices/tabs/content-tabs-from-main-frames.test.ts @@ -1,6 +1,6 @@ // Layout-owner browser/chat/simulator commands draw only from main’s answers; refusals preserve tabs. With switch off, window draws without sending main. import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch' import '../../../../../shared/agent-session/view/structured-agent-session-projection' @@ -30,7 +30,7 @@ vi.mock('@/store/index', () => ({ vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/slices/tabs/recently-closed-tab-position.test.ts b/src/renderer/src/store/slices/tabs/recently-closed-tab-position.test.ts index 904bec02964..024e3ca8c99 100644 --- a/src/renderer/src/store/slices/tabs/recently-closed-tab-position.test.ts +++ b/src/renderer/src/store/slices/tabs/recently-closed-tab-position.test.ts @@ -1,6 +1,6 @@ // Reopen terminal/browser/editor snapshots in true cross-type MRU order via Cmd/Ctrl+Shift+T. import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() } @@ -13,7 +13,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: vi.fn() })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/slices/tabs/recently-closed-tabs.test.ts b/src/renderer/src/store/slices/tabs/recently-closed-tabs.test.ts index fa9a870840d..9b6f6fa23f4 100644 --- a/src/renderer/src/store/slices/tabs/recently-closed-tabs.test.ts +++ b/src/renderer/src/store/slices/tabs/recently-closed-tabs.test.ts @@ -1,6 +1,6 @@ // Reopen terminal/browser/editor snapshots in true cross-type MRU order via Cmd/Ctrl+Shift+T. import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() } @@ -13,7 +13,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: vi.fn() })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/slices/tabs/store-open-to-side-layout-owner.test.ts b/src/renderer/src/store/slices/tabs/store-open-to-side-layout-owner.test.ts index 4e5025c7b8e..b2c66ea20e6 100644 --- a/src/renderer/src/store/slices/tabs/store-open-to-side-layout-owner.test.ts +++ b/src/renderer/src/store/slices/tabs/store-open-to-side-layout-owner.test.ts @@ -1,6 +1,6 @@ // With main layout ownership, each split and tab must reach main together; drawn frames must preserve group parity. import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { createTestStore, seedStore } from '../../testing/app-store-test-fixture' import { makeWorktree } from '../worktrees/worktree.test-fixture' import { createStoreCascadesMockApi } from '../../testing/app-store-cascade-api.test-fixture' @@ -26,7 +26,7 @@ vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (import vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/slices/tabs/tabs-label-and-pin-state.test.ts b/src/renderer/src/store/slices/tabs/tabs-label-and-pin-state.test.ts index d06266b63fc..2f4c8a37b20 100644 --- a/src/renderer/src/store/slices/tabs/tabs-label-and-pin-state.test.ts +++ b/src/renderer/src/store/slices/tabs/tabs-label-and-pin-state.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, beforeEach, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { createTabsSliceMockApi } from './tabs-slice-test-harness' import { createTestStore } from '../../testing/app-store-test-fixture' import { makeOpenFile } from '../editor/types/open-file.test-fixture' @@ -10,7 +10,7 @@ import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-sw vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/slices/tabs/tabs-model-reconciliation.test.ts b/src/renderer/src/store/slices/tabs/tabs-model-reconciliation.test.ts index 91016939c8f..18ce743ade8 100644 --- a/src/renderer/src/store/slices/tabs/tabs-model-reconciliation.test.ts +++ b/src/renderer/src/store/slices/tabs/tabs-model-reconciliation.test.ts @@ -1,11 +1,11 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { createTabsSliceMockApi } from './tabs-slice-test-harness' import { createTestStore } from '../../testing/app-store-test-fixture' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/slices/tabs/tabs-open-close-lifecycle.test.ts b/src/renderer/src/store/slices/tabs/tabs-open-close-lifecycle.test.ts index 0143a736bd8..62ae5a0cf80 100644 --- a/src/renderer/src/store/slices/tabs/tabs-open-close-lifecycle.test.ts +++ b/src/renderer/src/store/slices/tabs/tabs-open-close-lifecycle.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import '../../../../../shared/constants' import { buildMobileSessionTabSnapshots } from '../../../runtime/sync-runtime-graph/mobile-session-snapshots' import { closeMobileSessionTabInStore } from '../../../runtime/web-session-tabs-sync/closing/mobile-session-tab-close' @@ -25,7 +25,7 @@ vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (import vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/slices/tabs/tabs-pane-layout-operations.test.ts b/src/renderer/src/store/slices/tabs/tabs-pane-layout-operations.test.ts index d3cbd368171..89825e8834f 100644 --- a/src/renderer/src/store/slices/tabs/tabs-pane-layout-operations.test.ts +++ b/src/renderer/src/store/slices/tabs/tabs-pane-layout-operations.test.ts @@ -1,11 +1,11 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { createTabsSliceMockApi } from './tabs-slice-test-harness' import { createTestStore } from '../../testing/app-store-test-fixture' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/slices/tabs/tabs-split-create.test.ts b/src/renderer/src/store/slices/tabs/tabs-split-create.test.ts index 8dd87fdfe74..5207055ee99 100644 --- a/src/renderer/src/store/slices/tabs/tabs-split-create.test.ts +++ b/src/renderer/src/store/slices/tabs/tabs-split-create.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type { AppState } from '../../types' import { createTabsSliceMockApi } from './tabs-slice-test-harness' import { createTestStore, seedStore } from '../../testing/app-store-test-fixture' @@ -7,7 +7,7 @@ import { makeWorktree } from '../worktrees/worktree.test-fixture' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/slices/tabs/tabs-unread-and-focus.test.ts b/src/renderer/src/store/slices/tabs/tabs-unread-and-focus.test.ts index 05be8dfb080..3d99b48c477 100644 --- a/src/renderer/src/store/slices/tabs/tabs-unread-and-focus.test.ts +++ b/src/renderer/src/store/slices/tabs/tabs-unread-and-focus.test.ts @@ -1,6 +1,6 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' import { resolveAutoAckTabTargets } from '@/hooks/agent-auto-ack-targets' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { createTabsSliceMockApi } from './tabs-slice-test-harness' import { createTestStore } from '../../testing/app-store-test-fixture' import { makeOpenFile } from '../editor/types/open-file.test-fixture' @@ -10,7 +10,7 @@ import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-sw vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/slices/ui/ui-agent-send-target.test.ts b/src/renderer/src/store/slices/ui/ui-agent-send-target.test.ts index 17ad4cea94d..6e381974823 100644 --- a/src/renderer/src/store/slices/ui/ui-agent-send-target.test.ts +++ b/src/renderer/src/store/slices/ui/ui-agent-send-target.test.ts @@ -20,12 +20,14 @@ const mocks = vi.hoisted(() => ({ toastError: vi.fn() })) -vi.mock('@/lib/active-agent-note-send', () => ({ +vi.mock('@/lib/agent-session/messaging/terminal/active-agent-note-send', () => ({ + sendNotesToActiveAgentSession: mocks.sendNotesToActiveAgentSession +})) +vi.mock('@/lib/agent-session/messaging/terminal/active-agent-note-send-result', () => ({ activeAgentNotesSendFailureMessage: ( status: string, options: { explicitTarget?: boolean } = {} - ) => (options.explicitTarget ? `selected:${status}` : status), - sendNotesToActiveAgentSession: mocks.sendNotesToActiveAgentSession + ) => (options.explicitTarget ? `selected:${status}` : status) })) vi.mock( diff --git a/src/renderer/src/store/slices/ui/ui-feature-interactions.test.ts b/src/renderer/src/store/slices/ui/ui-feature-interactions.test.ts index 4f3a9fb4dce..668babba9a8 100644 --- a/src/renderer/src/store/slices/ui/ui-feature-interactions.test.ts +++ b/src/renderer/src/store/slices/ui/ui-feature-interactions.test.ts @@ -11,12 +11,14 @@ const mocks = vi.hoisted(() => ({ toastError: vi.fn() })) -vi.mock('@/lib/active-agent-note-send', () => ({ +vi.mock('@/lib/agent-session/messaging/terminal/active-agent-note-send', () => ({ + sendNotesToActiveAgentSession: mocks.sendNotesToActiveAgentSession +})) +vi.mock('@/lib/agent-session/messaging/terminal/active-agent-note-send-result', () => ({ activeAgentNotesSendFailureMessage: ( status: string, options: { explicitTarget?: boolean } = {} - ) => (options.explicitTarget ? `selected:${status}` : status), - sendNotesToActiveAgentSession: mocks.sendNotesToActiveAgentSession + ) => (options.explicitTarget ? `selected:${status}` : status) })) vi.mock('@/lib/telemetry', () => ({ diff --git a/src/renderer/src/store/slices/ui/ui-slice-agent-actions.ts b/src/renderer/src/store/slices/ui/ui-slice-agent-actions.ts index 8df16e5a40b..572c9948da5 100644 --- a/src/renderer/src/store/slices/ui/ui-slice-agent-actions.ts +++ b/src/renderer/src/store/slices/ui/ui-slice-agent-actions.ts @@ -1,12 +1,12 @@ import type { UISlice, UISliceGet, UISliceSet } from './ui-slice-contract' import { formatAgentTypeLabel } from '../../../../../shared/agent-status/presentation/agent-type-label' -import { agentKindForAgentType } from '../../../lib/agent-status' +import { agentKindForAgentType } from '../../../lib/agent-status/aggregation/worktree-agent-status' import { deriveRunningAgentSendTargets, resolveRunningAgentSendTarget, runningAgentMessageTarget, runningAgentSendTargetAgentType -} from '../../../lib/running-agent-targets' +} from '../../../lib/agent-session/messaging/running-agent-targets' import { translate } from '@/i18n/i18n' import { createUiActivityActions } from './ui-slice-activity-actions' @@ -154,9 +154,10 @@ export function createUiAgentActions( const agentType = runningAgentSendTargetAgentType(target) const label = formatAgentTypeLabel(agentType) - const [{ activeAgentNotesSendFailureMessage }, { sendMessageToAgent }] = await Promise.all([ - import('@/lib/active-agent-note-send'), - import('@/lib/agent-message-send') + const [, { activeAgentNotesSendFailureMessage }, { sendMessageToAgent }] = await Promise.all([ + import('@/lib/agent-session/messaging/terminal/active-agent-note-send'), + import('@/lib/agent-session/messaging/terminal/active-agent-note-send-result'), + import('@/lib/agent-session/messaging/agent-message-send') ]) const sending = sendMessageToAgent({ worktreeId: mode.worktreeId, diff --git a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-local-evidence.ts b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-local-evidence.ts index 946ae7a43c6..f3a54741829 100644 --- a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-local-evidence.ts +++ b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-local-evidence.ts @@ -1,5 +1,5 @@ import type { AppState } from '../../types' -import { classifyTitleActivity } from '@/lib/pane-agent-evidence' +import { detectAgentStatusFromTitle } from '../../../../../shared/agent-status/title/agent-title-status' import { getWorktreeIdsWithLiveAgent } from '@/lib/worktree-activity-state' import type { WorkspaceCleanupCandidate } from '../../../../../shared/workspace-cleanup/workspace-cleanup' import { getWorktreeVisitTimestamp } from '@/lib/workspace/activation/worktree-visit-recency' @@ -163,7 +163,7 @@ function hasIdleAgentTitleForPty( } function isIdleAgentTitle(title: string): boolean { - return classifyTitleActivity(title) === 'idle' + return detectAgentStatusFromTitle(title) === 'idle' } function normalizeProcessName(value: string | null): string | null { diff --git a/src/renderer/src/store/slices/worktrees/session/store-active-worktree-selection.test.ts b/src/renderer/src/store/slices/worktrees/session/store-active-worktree-selection.test.ts index 34bd185d7a0..dd48af07e5f 100644 --- a/src/renderer/src/store/slices/worktrees/session/store-active-worktree-selection.test.ts +++ b/src/renderer/src/store/slices/worktrees/session/store-active-worktree-selection.test.ts @@ -1,6 +1,6 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' import '../../workspace-attention/workspace-unread-characterization-fixture' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { buildWorktreeComparator } from '../../../../../../shared/sidebar-list/smart-sort' import '../../../../../../shared/workspace-scope' import { createTestStore, seedStore } from '../../../testing/app-store-test-fixture' @@ -24,7 +24,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: mockUnregisterPtyDataHandlers })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/slices/worktrees/teardown/ambiguous-owner-warning-worktree-removal-leak.test.ts b/src/renderer/src/store/slices/worktrees/teardown/ambiguous-owner-warning-worktree-removal-leak.test.ts index 6c95e11fd9c..d8f03948ee5 100644 --- a/src/renderer/src/store/slices/worktrees/teardown/ambiguous-owner-warning-worktree-removal-leak.test.ts +++ b/src/renderer/src/store/slices/worktrees/teardown/ambiguous-owner-warning-worktree-removal-leak.test.ts @@ -1,6 +1,6 @@ /** Purge module-level ambiguous-owner warning keys on both removal paths. Otherwise IDs leak forever and recreated workspaces cannot report newly ambiguous ownership. */ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() } @@ -13,7 +13,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: vi.fn() })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/slices/worktrees/teardown/bulk-worktree-purge-terminal-maps-leak.test.ts b/src/renderer/src/store/slices/worktrees/teardown/bulk-worktree-purge-terminal-maps-leak.test.ts index 98391454edc..354cf68eff7 100644 --- a/src/renderer/src/store/slices/worktrees/teardown/bulk-worktree-purge-terminal-maps-leak.test.ts +++ b/src/renderer/src/store/slices/worktrees/teardown/bulk-worktree-purge-terminal-maps-leak.test.ts @@ -1,6 +1,6 @@ /** Bulk purge runs no terminal teardown; evict tab maps and PTY maps from live/durable bindings like single removal. External scans/project removal/hydration otherwise leak ephemeral terminal/agent keys for renderer lifetime. */ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type * as RemoteRuntimePtyIdModule from '../../../../../../shared/remote-runtime/remote-runtime-pty-id' vi.mock('sonner', () => ({ @@ -14,7 +14,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: vi.fn() })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/slices/worktrees/teardown/generation-records-worktree-removal-leak.test.ts b/src/renderer/src/store/slices/worktrees/teardown/generation-records-worktree-removal-leak.test.ts index f6ecba093b9..520f0fef35d 100644 --- a/src/renderer/src/store/slices/worktrees/teardown/generation-records-worktree-removal-leak.test.ts +++ b/src/renderer/src/store/slices/worktrees/teardown/generation-records-worktree-removal-leak.test.ts @@ -1,6 +1,6 @@ /** Worktree removal must call both generation pruners; PR title/body and commit-message records otherwise leak text under ephemeral worktree/branch keys for renderer lifetime. */ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() } @@ -13,7 +13,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: vi.fn() })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/slices/worktrees/teardown/native-chat-launch-draft-teardown.test.ts b/src/renderer/src/store/slices/worktrees/teardown/native-chat-launch-draft-teardown.test.ts index 23826658657..fba83e07b1c 100644 --- a/src/renderer/src/store/slices/worktrees/teardown/native-chat-launch-draft-teardown.test.ts +++ b/src/renderer/src/store/slices/worktrees/teardown/native-chat-launch-draft-teardown.test.ts @@ -1,6 +1,6 @@ /** Evict nativeChatLaunchDraftByTabId wherever launch prompt retires (close, orphan sweep, bulk/single purge); stranded drafts otherwise keep publishing to mobile. */ import { afterEach, describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { drawTabsFromMain, @@ -18,7 +18,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: vi.fn() })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-renderer-teardown.ts b/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-renderer-teardown.ts index d811997dffe..7f156859b6f 100644 --- a/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-renderer-teardown.ts +++ b/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-renderer-teardown.ts @@ -4,7 +4,7 @@ import type { WorktreeCatalogVersion } from '../../../../../../shared/worktree/c import { getRepoIdFromWorktreeId } from '../../../../../../shared/worktree/id' import { appliedWorktreeCatalogVersionPatch } from '../listing/worktree-catalog-version-state' import { cleanupEphemeralVmRuntimesForDeleted } from '@/lib/ephemeral-vm-runtime-cleanup' -import { forgetAgentStartupDeliveriesForTabs } from '@/lib/agent-startup-delivery-guards' +import { forgetAgentStartupDeliveriesForTabs } from '@/lib/agent-session/launch/startup/agent-startup-delivery-guards' import { forgetForegroundTerminalTabs } from '@/lib/foreground-terminal-tabs' import { requestVirtualizedScrollAnchorRecord } from '@/hooks/requestVirtualizedScrollAnchorRecord' import { disposeRemovedWorktreeParkedTerminalWatchers } from '../../../../components/terminal-pane/parking/output-watchers/terminal-parked-watcher-registry' diff --git a/src/renderer/src/store/slices/worktrees/teardown/store-worktree-removal-cascade.test.ts b/src/renderer/src/store/slices/worktrees/teardown/store-worktree-removal-cascade.test.ts index 90f6bcbfcd7..6a461cb9e45 100644 --- a/src/renderer/src/store/slices/worktrees/teardown/store-worktree-removal-cascade.test.ts +++ b/src/renderer/src/store/slices/worktrees/teardown/store-worktree-removal-cascade.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { getDefaultSettings } from '../../../../../../shared/constants' import { createCompatibleRuntimeStatusResponseIfNeeded } from '../../../../runtime/rpc/testing/runtime-compatibility-test-fixture' import { clearRuntimeCompatibilityCache as clearRuntimeCompatibilityCacheForTests } from '../../../../runtime/rpc/compatibility/runtime-compatibility-cache' @@ -25,7 +25,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: mockUnregisterPtyDataHandlers })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/slices/worktrees/teardown/tab-worktree-orphan-map-purge-leak.test.ts b/src/renderer/src/store/slices/worktrees/teardown/tab-worktree-orphan-map-purge-leak.test.ts index fafb84df9af..47f1bfb0b94 100644 --- a/src/renderer/src/store/slices/worktrees/teardown/tab-worktree-orphan-map-purge-leak.test.ts +++ b/src/renderer/src/store/slices/worktrees/teardown/tab-worktree-orphan-map-purge-leak.test.ts @@ -1,6 +1,6 @@ /** Removal must evict detached-name, foreground-last-seen and consumed-startup guards; fresh tab/worktree IDs cannot reclaim leaked module entries. */ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { getForegroundTerminalTabLastSeenAtById, resetForegroundTerminalTabIdsForTests, @@ -9,7 +9,7 @@ import { import { beginAgentStartupDeliveryAttempt, resetAgentStartupDelayedDeliveryForTests -} from '@/lib/agent-startup-delayed-delivery' +} from '@/lib/agent-session/launch/startup/agent-startup-delayed-delivery' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() } @@ -22,7 +22,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: vi.fn() })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/slices/worktrees/teardown/workspace-chat-draft-removal.test.ts b/src/renderer/src/store/slices/worktrees/teardown/workspace-chat-draft-removal.test.ts index eca0caeae25..1713e1fb2ae 100644 --- a/src/renderer/src/store/slices/worktrees/teardown/workspace-chat-draft-removal.test.ts +++ b/src/renderer/src/store/slices/worktrees/teardown/workspace-chat-draft-removal.test.ts @@ -1,6 +1,6 @@ /** User deletion clears drafts using pre-RPC keys; host removal announcements may purge listings before reply, while non-user purges must retain drafts. */ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type { FolderWorkspace } from '../../../../../../shared/folder-workspaces/folder-workspace-types' import '../../../../../../shared/execution-host' @@ -15,7 +15,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus restorePtyDataHandlersAfterFailedShutdown: vi.fn(), unregisterPtyDataHandlers: vi.fn() })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/slices/worktrees/teardown/worktree-purge-doomed-ids.ts b/src/renderer/src/store/slices/worktrees/teardown/worktree-purge-doomed-ids.ts index ad7fe2fee68..87d2f56e950 100644 --- a/src/renderer/src/store/slices/worktrees/teardown/worktree-purge-doomed-ids.ts +++ b/src/renderer/src/store/slices/worktrees/teardown/worktree-purge-doomed-ids.ts @@ -1,7 +1,7 @@ import type { AppState } from '../../../types' import { forgetAgentHibernationTabOutput } from '@/lib/agent-session/hibernation/agent-hibernation-output-activity' import { forgetForegroundTerminalTabs } from '@/lib/foreground-terminal-tabs' -import { forgetAgentStartupDeliveriesForTabs } from '@/lib/agent-startup-delivery-guards' +import { forgetAgentStartupDeliveriesForTabs } from '@/lib/agent-session/launch/startup/agent-startup-delivery-guards' import { forgetAgentPaneAuthorityAliasesByTabIds } from '../../agent-status/agent-pane-authority' import { forgetDetachedHeadAutoDerivedDisplayName } from '../metadata/detached-head-display-name' diff --git a/src/renderer/src/store/terminals/recently-closed-terminal-tabs.test.ts b/src/renderer/src/store/terminals/recently-closed-terminal-tabs.test.ts index 12eb030ef42..21b156b63c7 100644 --- a/src/renderer/src/store/terminals/recently-closed-terminal-tabs.test.ts +++ b/src/renderer/src/store/terminals/recently-closed-terminal-tabs.test.ts @@ -1,6 +1,6 @@ // Reopen terminal/browser/editor snapshots in true cross-type MRU order via Cmd/Ctrl+Shift+T. import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { getDefaultSettings } from '../../../../shared/constants' vi.mock('sonner', () => ({ @@ -14,7 +14,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: vi.fn() })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/terminals/retired-terminal-tab-state-sweep.ts b/src/renderer/src/store/terminals/retired-terminal-tab-state-sweep.ts index 40783549fb1..b68c748bd27 100644 --- a/src/renderer/src/store/terminals/retired-terminal-tab-state-sweep.ts +++ b/src/renderer/src/store/terminals/retired-terminal-tab-state-sweep.ts @@ -2,7 +2,7 @@ import { removePaneKeys } from '../slices/agent-status/agent-status-pane-keyed-r import type { AppState } from '../types' import { forgetAgentHibernationTabOutput } from '@/lib/agent-session/hibernation/agent-hibernation-output-activity' import { forgetForegroundTerminalTabs } from '@/lib/foreground-terminal-tabs' -import { forgetAgentStartupDeliveriesForTabs } from '@/lib/agent-startup-delivery-guards' +import { forgetAgentStartupDeliveriesForTabs } from '@/lib/agent-session/launch/startup/agent-startup-delivery-guards' // Use store-free registry to avoid a slice-evaluation cycle through terminal-parked-tab-watchers. import { retireParkedTerminalTab } from '@/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-registry' import { forgetNativeChatPromptDismissalsForTab } from '@/components/native-chat/prompts/native-chat-prompt-dismissals' diff --git a/src/renderer/src/store/terminals/store-create-tab-start-in-main.test.ts b/src/renderer/src/store/terminals/store-create-tab-start-in-main.test.ts index 91e2155df8f..46c66ee78c7 100644 --- a/src/renderer/src/store/terminals/store-create-tab-start-in-main.test.ts +++ b/src/renderer/src/store/terminals/store-create-tab-start-in-main.test.ts @@ -1,5 +1,5 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { createTestStore, seedStore } from '../testing/app-store-test-fixture' import { makeWorktree } from '../slices/worktrees/worktree.test-fixture' import { createStoreCascadesMockApi } from '../testing/app-store-cascade-api.test-fixture' @@ -32,7 +32,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus restorePtyDataHandlersAfterFailedShutdown: vi.fn(), unregisterPtyDataHandlers: vi.fn(() => []) })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/terminals/store-session-terminal-reconnect.test.ts b/src/renderer/src/store/terminals/store-session-terminal-reconnect.test.ts index f8d2d5f85b9..a737c5d6f2d 100644 --- a/src/renderer/src/store/terminals/store-session-terminal-reconnect.test.ts +++ b/src/renderer/src/store/terminals/store-session-terminal-reconnect.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { isTerminalLeafId } from '../../../../shared/workspace-layout/stable-pane-id' import { createTestStore } from '../testing/app-store-test-fixture' import { makeWorktree } from '../slices/worktrees/worktree.test-fixture' @@ -11,7 +11,7 @@ import { LOCAL_EXECUTION_HOST_ID } from '../../../../shared/execution-host' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/terminals/store-session-workspace-hydration.test.ts b/src/renderer/src/store/terminals/store-session-workspace-hydration.test.ts index ecd96b390d9..d8e1856b6db 100644 --- a/src/renderer/src/store/terminals/store-session-workspace-hydration.test.ts +++ b/src/renderer/src/store/terminals/store-session-workspace-hydration.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type { DetectedWorktreeListResult, Worktree } from '../../../../shared/worktree/types' import { getDefaultWorkspaceSession } from '../../../../shared/constants' import { folderWorkspaceKey } from '../../../../shared/workspace-scope' @@ -10,7 +10,7 @@ import { makeBrowserTab } from '../slices/browser/browser-tab.test-fixture' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/terminals/store-sleep-agent-status-retention.test.ts b/src/renderer/src/store/terminals/store-sleep-agent-status-retention.test.ts index 58bfd627d40..a3fe23ddccf 100644 --- a/src/renderer/src/store/terminals/store-sleep-agent-status-retention.test.ts +++ b/src/renderer/src/store/terminals/store-sleep-agent-status-retention.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { clearRuntimeCompatibilityCache as clearRuntimeCompatibilityCacheForTests } from '../../runtime/rpc/compatibility/runtime-compatibility-cache' import { createTestStore, seedStore } from '../testing/app-store-test-fixture' import { makeTab } from './terminal-tab.test-fixture' @@ -22,7 +22,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: mockUnregisterPtyDataHandlers })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/terminals/store-sleep-exact-runtime-stop.test.ts b/src/renderer/src/store/terminals/store-sleep-exact-runtime-stop.test.ts index 239d3d72f46..bf6c1586b36 100644 --- a/src/renderer/src/store/terminals/store-sleep-exact-runtime-stop.test.ts +++ b/src/renderer/src/store/terminals/store-sleep-exact-runtime-stop.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { getDefaultSettings } from '../../../../shared/constants' import { createCompatibleRuntimeStatusResponseIfNeeded } from '../../runtime/rpc/testing/runtime-compatibility-test-fixture' import { clearRuntimeCompatibilityCache as clearRuntimeCompatibilityCacheForTests } from '../../runtime/rpc/compatibility/runtime-compatibility-cache' @@ -24,7 +24,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: mockUnregisterPtyDataHandlers })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/terminals/store-sleep-pane-hibernation.test.ts b/src/renderer/src/store/terminals/store-sleep-pane-hibernation.test.ts index 6ed496886a7..3322852185e 100644 --- a/src/renderer/src/store/terminals/store-sleep-pane-hibernation.test.ts +++ b/src/renderer/src/store/terminals/store-sleep-pane-hibernation.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { getDefaultSettings } from '../../../../shared/constants' import { createCompatibleRuntimeStatusResponseIfNeeded } from '../../runtime/rpc/testing/runtime-compatibility-test-fixture' import { clearRuntimeCompatibilityCache as clearRuntimeCompatibilityCacheForTests } from '../../runtime/rpc/compatibility/runtime-compatibility-cache' @@ -25,7 +25,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: mockUnregisterPtyDataHandlers })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/terminals/store-sleep-runtime-convergence.test.ts b/src/renderer/src/store/terminals/store-sleep-runtime-convergence.test.ts index e82c391f8d5..12ac0314bc8 100644 --- a/src/renderer/src/store/terminals/store-sleep-runtime-convergence.test.ts +++ b/src/renderer/src/store/terminals/store-sleep-runtime-convergence.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import '../../../../shared/constants' import { clearRuntimeCompatibilityCache as clearRuntimeCompatibilityCacheForTests } from '../../runtime/rpc/compatibility/runtime-compatibility-cache' import { createTestStore, seedStore } from '../testing/app-store-test-fixture' @@ -23,7 +23,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: mockUnregisterPtyDataHandlers })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/terminals/store-sleep-twin-host-owner.test.ts b/src/renderer/src/store/terminals/store-sleep-twin-host-owner.test.ts index cb8dec87a26..404d7c15730 100644 --- a/src/renderer/src/store/terminals/store-sleep-twin-host-owner.test.ts +++ b/src/renderer/src/store/terminals/store-sleep-twin-host-owner.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { createCompatibleRuntimeStatusResponseIfNeeded } from '../../runtime/rpc/testing/runtime-compatibility-test-fixture' import { clearRuntimeCompatibilityCache as clearRuntimeCompatibilityCacheForTests } from '../../runtime/rpc/compatibility/runtime-compatibility-cache' import { createTestStore, seedStore } from '../testing/app-store-test-fixture' @@ -23,7 +23,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: mockUnregisterPtyDataHandlers })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/terminals/terminal-active-workspace-creation.test.ts b/src/renderer/src/store/terminals/terminal-active-workspace-creation.test.ts index 15a325634b0..02a82ac0363 100644 --- a/src/renderer/src/store/terminals/terminal-active-workspace-creation.test.ts +++ b/src/renderer/src/store/terminals/terminal-active-workspace-creation.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { getDefaultSettings } from '../../../../shared/constants' import { createTestStore, seedStore } from '../testing/app-store-test-fixture' @@ -25,7 +25,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: mockUnregisterPtyDataHandlers })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/terminals/terminal-creation-orphan-retention.test.ts b/src/renderer/src/store/terminals/terminal-creation-orphan-retention.test.ts index 451094ff168..61bf1a4c5b4 100644 --- a/src/renderer/src/store/terminals/terminal-creation-orphan-retention.test.ts +++ b/src/renderer/src/store/terminals/terminal-creation-orphan-retention.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { createTestStore, seedStore } from '../testing/app-store-test-fixture' import { makeLayout, makeTab } from './terminal-tab.test-fixture' import { makeTabGroup, makeUnifiedTab } from '../slices/tabs/tab-group.test-fixture' @@ -21,7 +21,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: mockUnregisterPtyDataHandlers })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/terminals/terminal-ephemeral-state.ts b/src/renderer/src/store/terminals/terminal-ephemeral-state.ts index 0c7478bdcb3..92e0bdac894 100644 --- a/src/renderer/src/store/terminals/terminal-ephemeral-state.ts +++ b/src/renderer/src/store/terminals/terminal-ephemeral-state.ts @@ -1,6 +1,6 @@ import { isClaudeAgent as isClaudeAgentDefault } from '../../../../shared/agent-status/title/agent-title-identity' import { recordTerminalInputActivity } from '@/lib/terminal-input-activity-coalescing' -import { classifyTitleActivity } from '@/lib/pane-agent-evidence' +import { detectAgentStatusFromTitle } from '../../../../shared/agent-status/title/agent-title-status' import type { TerminalSlice, TerminalStoreGet, TerminalStoreSet } from './terminal-state' export function createTerminalEphemeralActions( @@ -202,7 +202,7 @@ export function createTerminalEphemeralActions( if (!tab.title || !isClaudeAgent(tab.title)) { continue } - const status = classifyTitleActivity(tab.title) + const status = detectAgentStatusFromTitle(tab.title) if (status === null || status === 'working') { continue } diff --git a/src/renderer/src/store/terminals/terminal-input-activity-store-write.test.ts b/src/renderer/src/store/terminals/terminal-input-activity-store-write.test.ts index 447447b1fe2..276e79f5519 100644 --- a/src/renderer/src/store/terminals/terminal-input-activity-store-write.test.ts +++ b/src/renderer/src/store/terminals/terminal-input-activity-store-write.test.ts @@ -4,7 +4,7 @@ * flush per window. These tests pin the properties that make that safe. */ import { beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() } @@ -17,7 +17,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: vi.fn() })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/store/terminals/terminal-last-tab-close.test.ts b/src/renderer/src/store/terminals/terminal-last-tab-close.test.ts index 9a17a2c5de3..caf6a1a2c2d 100644 --- a/src/renderer/src/store/terminals/terminal-last-tab-close.test.ts +++ b/src/renderer/src/store/terminals/terminal-last-tab-close.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { createTestStore, seedStore } from '../testing/app-store-test-fixture' import { makeTab } from './terminal-tab.test-fixture' import { makeTabGroup, makeUnifiedTab } from '../slices/tabs/tab-group.test-fixture' @@ -21,7 +21,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: mockUnregisterPtyDataHandlers })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/terminals/terminal-pty-release-orphan-retention.test.ts b/src/renderer/src/store/terminals/terminal-pty-release-orphan-retention.test.ts index 6bc22155ef3..ecfcde7431b 100644 --- a/src/renderer/src/store/terminals/terminal-pty-release-orphan-retention.test.ts +++ b/src/renderer/src/store/terminals/terminal-pty-release-orphan-retention.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { createTestStore, seedStore } from '../testing/app-store-test-fixture' import { makeTab } from './terminal-tab.test-fixture' @@ -21,7 +21,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: mockUnregisterPtyDataHandlers })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/renderer/src/store/terminals/terminal-tab-close-intent.test.ts b/src/renderer/src/store/terminals/terminal-tab-close-intent.test.ts index ad740f83555..e7c5b290e74 100644 --- a/src/renderer/src/store/terminals/terminal-tab-close-intent.test.ts +++ b/src/renderer/src/store/terminals/terminal-tab-close-intent.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import { TEST_REPO } from '../repos/repo.test-fixture' import { createTestStore, seedStore } from '../testing/app-store-test-fixture' import { makeTab } from './terminal-tab.test-fixture' @@ -47,7 +47,7 @@ vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-sus unregisterPtyDataHandlers: vi.fn<() => unknown[]>(() => []) })) -vi.mock('@/lib/agent-status', async (importOriginal) => ({ +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => ({ ...(await importOriginal()), detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) })) diff --git a/src/renderer/src/store/terminals/terminal-tab-presentation.ts b/src/renderer/src/store/terminals/terminal-tab-presentation.ts index e6bbd9f6d11..c13adbfad85 100644 --- a/src/renderer/src/store/terminals/terminal-tab-presentation.ts +++ b/src/renderer/src/store/terminals/terminal-tab-presentation.ts @@ -1,6 +1,6 @@ import { isDecorativeAgentTitleFrameChange } from '../../../../shared/agent-status/title/agent-decorative-title-signature' import { scheduleRuntimeGraphSync } from '@/runtime/sync-runtime-graph/graph-sync-scheduler' -import { classifyTitleActivity } from '@/lib/pane-agent-evidence' +import { detectAgentStatusFromTitle } from '../../../../shared/agent-status/title/agent-title-status' import { applyGeneratedTabTitleUpdates, applyTerminalTabTitleUpdates @@ -151,7 +151,7 @@ export function createTerminalTabPresentationActions( } // Why: re-sort hookless title changes only when their activity classification changes. const classificationChanged = - classifyTitleActivity(prevTitle ?? '') !== classifyTitleActivity(title) + detectAgentStatusFromTitle(prevTitle ?? '') !== detectAgentStatusFromTitle(title) // Why: skip active-worktree remount side effects and orphaned panes. const ownerWorktreeId = classificationChanged ? getTerminalTabOwnerWorktreeId(s.tabsByWorktree, tabId) @@ -183,7 +183,7 @@ export function createTerminalTabPresentationActions( delete next[tabId] } // Clearing a classified title changes smart-sort’s verdict, like setRuntimePaneTitle. - const hadClassification = classifyTitleActivity(prevTitle ?? '') !== null + const hadClassification = detectAgentStatusFromTitle(prevTitle ?? '') !== null // Click-driven teardown must not re-rank active worktrees; skip orphaned owners too. const ownerWorktreeId = hadClassification ? getTerminalTabOwnerWorktreeId(s.tabsByWorktree, tabId) diff --git a/src/renderer/src/store/terminals/terminal-transient-state.ts b/src/renderer/src/store/terminals/terminal-transient-state.ts index 542b77b6ae4..1b03593290d 100644 --- a/src/renderer/src/store/terminals/terminal-transient-state.ts +++ b/src/renderer/src/store/terminals/terminal-transient-state.ts @@ -1,5 +1,5 @@ import type { TerminalTab } from '../../../../shared/workspace-layout/terminal-tab-types' -import { classifyTitleActivity } from '@/lib/pane-agent-evidence' +import { detectAgentStatusFromTitle } from '../../../../shared/agent-status/title/agent-title-status' export function clearTransientTerminalState(tab: TerminalTab, index: number): TerminalTab { return { @@ -13,5 +13,5 @@ function getResetTitle(tab: TerminalTab, index: number): string { const fallbackTitle = tab.customTitle?.trim() || tab.defaultTitle?.trim() || `Terminal ${index + 1}` // After restart, prior-session done/spinner titles would falsely imply a running agent. - return classifyTitleActivity(tab.title) ? fallbackTitle : tab.title + return detectAgentStatusFromTitle(tab.title) ? fallbackTitle : tab.title } diff --git a/src/renderer/src/store/workspace-layout/frames/workspace-layout-frame-store-patch.test.ts b/src/renderer/src/store/workspace-layout/frames/workspace-layout-frame-store-patch.test.ts index 836ab05fff6..c9c79a1152f 100644 --- a/src/renderer/src/store/workspace-layout/frames/workspace-layout-frame-store-patch.test.ts +++ b/src/renderer/src/store/workspace-layout/frames/workspace-layout-frame-store-patch.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it, vi } from 'vitest' -import type * as AgentStatusModule from '@/lib/agent-status' +import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status' import type { WorkspaceSessionState } from '../../../../../shared/workspace-session/workspace-session-state-types' import { loadWorkspaceLayoutWithoutReport } from '../../../../../shared/workspace-layout/workspace-layout-load' import { nameBasedLoadContext } from '../../../../../shared/workspace-layout/workspace-layout-minted-ids' @@ -32,7 +32,7 @@ vi.mock('../../../../../shared/layout-owner-switch', () => ({ } })) vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) -vi.mock('@/lib/agent-status', async (importOriginal) => { +vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => { const actual = await importOriginal() return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) } }) diff --git a/src/renderer/src/lib/agent-status-evidence-clock.test.ts b/src/shared/agent-status/contracts/agent-status-evidence-clock.test.ts similarity index 70% rename from src/renderer/src/lib/agent-status-evidence-clock.test.ts rename to src/shared/agent-status/contracts/agent-status-evidence-clock.test.ts index 51830479795..de5515bea97 100644 --- a/src/renderer/src/lib/agent-status-evidence-clock.test.ts +++ b/src/shared/agent-status/contracts/agent-status-evidence-clock.test.ts @@ -1,10 +1,10 @@ import { describe, expect, it } from 'vitest' import { AGENT_STATUS_STALE_AFTER_MS, - isFreshNonDoneAgentStatus -} from '../../../shared/agent-status/contracts/agent-status-freshness' -import type { AgentStatusEntry } from '../../../shared/agent-status/contracts/agent-status-types' -import { isExplicitAgentStatusFresh } from './pane-agent-evidence' + isFreshNonDoneAgentStatus, + isAgentStatusFresh +} from './agent-status-freshness' +import type { AgentStatusEntry } from './agent-status-types' const NOW = new Date('2026-04-09T12:00:00.000Z').getTime() const OBSERVED_AT = NOW - AGENT_STATUS_STALE_AFTER_MS - 60_000 @@ -27,7 +27,7 @@ describe('staleness measures when evidence was observed, not when it was deliver it('keeps a live row fresh when its evidence was just observed', () => { const row = workingRow({ evidenceObservedAt: NOW }) expect(isFreshNonDoneAgentStatus(row, NOW)).toBe(true) - expect(isExplicitAgentStatusFresh(row, NOW, AGENT_STATUS_STALE_AFTER_MS)).toBe(true) + expect(isAgentStatusFresh(row, NOW, AGENT_STATUS_STALE_AFTER_MS)).toBe(true) const mirrored = workingRow({ updatedAt: OBSERVED_AT, @@ -35,13 +35,13 @@ describe('staleness measures when evidence was observed, not when it was deliver mirroredEvidenceReceivedAt: NOW }) expect(isFreshNonDoneAgentStatus(mirrored, NOW)).toBe(true) - expect(isExplicitAgentStatusFresh(mirrored, NOW, AGENT_STATUS_STALE_AFTER_MS)).toBe(true) + expect(isAgentStatusFresh(mirrored, NOW, AGENT_STATUS_STALE_AFTER_MS)).toBe(true) const expiredMirror = workingRow({ evidenceObservedAt: NOW, mirroredEvidenceReceivedAt: OBSERVED_AT }) expect(isFreshNonDoneAgentStatus(expiredMirror, NOW)).toBe(false) - expect(isExplicitAgentStatusFresh(expiredMirror, NOW, AGENT_STATUS_STALE_AFTER_MS)).toBe(false) + expect(isAgentStatusFresh(expiredMirror, NOW, AGENT_STATUS_STALE_AFTER_MS)).toBe(false) }) }) diff --git a/src/renderer/src/lib/agent-status.test.ts b/src/shared/agent-status/title/agent-title-tracker.test.ts similarity index 95% rename from src/renderer/src/lib/agent-status.test.ts rename to src/shared/agent-status/title/agent-title-tracker.test.ts index fd4c21adffa..466dd55c8ce 100644 --- a/src/renderer/src/lib/agent-status.test.ts +++ b/src/shared/agent-status/title/agent-title-tracker.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it, vi } from 'vitest' -import { createAgentStatusTracker } from '../../../shared/agent-status/title/agent-title-status' +import { createAgentStatusTracker } from './agent-title-status' describe('createAgentStatusTracker', () => { // Claude Code v2.1.86 emits task descriptions; only ✳ identifies idle in this captured sequence. diff --git a/tests/e2e/claude-agent-row-view.unit.test.ts b/tests/e2e/claude-agent-row-view.unit.test.ts index 97113bff5eb..4479c706c6c 100644 --- a/tests/e2e/claude-agent-row-view.unit.test.ts +++ b/tests/e2e/claude-agent-row-view.unit.test.ts @@ -20,7 +20,10 @@ import { buildSubagentChildRows } from '@/components/sidebar/workspace-card/acti import { TooltipProvider } from '@/components/ui/tooltip' import { CompactAgentRow } from '@/components/sidebar/workspace-card/activity/worktree-card-compact-agent-row' import FullAgentRow from '@/components/dashboard/DashboardAgentRow' -import { opensClaudeParentConversation, viewClaudeAgentFromRow } from '@/lib/claude-agent-row-view' +import { + opensClaudeParentConversation, + viewClaudeAgentFromRow +} from '@/lib/agent-session/navigation/claude-agent-row-view' import type * as WorktreeRuntimeOwner from '@/lib/workspace/ownership/worktree-runtime-owner' import '@/store/slices/worktrees/worktree.test-fixture' import '@/store/repos/repo.test-fixture' diff --git a/tests/e2e/host-agent-launch-settings-hook-bookkeeping.unit.test.ts b/tests/e2e/host-agent-launch-settings-hook-bookkeeping.unit.test.ts index cd3f0791522..48d1840b19b 100644 --- a/tests/e2e/host-agent-launch-settings-hook-bookkeeping.unit.test.ts +++ b/tests/e2e/host-agent-launch-settings-hook-bookkeeping.unit.test.ts @@ -9,7 +9,7 @@ import { import { RuntimeClientSettingsController } from '../../src/main/runtime/client/settings/runtime-client-settings' import { HostAgentLaunchSettings } from '../../src/renderer/src/components/settings/agents/launch/HostAgentLaunchSettings' import { TooltipProvider } from '../../src/renderer/src/components/ui/tooltip' -import { getAgentCatalog } from '../../src/renderer/src/lib/agent-catalog' +import { getAgentCatalog } from '../../src/renderer/src/lib/agent-catalog/agent-catalog' const transport = vi.hoisted(() => ({ read: vi.fn(), mutate: vi.fn() })) const hooks = vi.hoisted(() => ({ apply: vi.fn(async () => {}) })) diff --git a/tests/e2e/launch-agent-in-new-tab-web-runtime.unit.test.ts b/tests/e2e/launch-agent-in-new-tab-web-runtime.unit.test.ts index 42e967c65fb..ed590378077 100644 --- a/tests/e2e/launch-agent-in-new-tab-web-runtime.unit.test.ts +++ b/tests/e2e/launch-agent-in-new-tab-web-runtime.unit.test.ts @@ -6,10 +6,10 @@ import { act, fireEvent, render, screen } from '@testing-library/react' import { useTabAgentMenuLaunch } from '@/components/tab-bar/QuickLaunchButton' import { STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY } from '../../src/shared/agent-session/structured-agent-session-surface-capabilities' import { AGENT_SESSION_AGENTS_METHOD } from '../../src/shared/agent-session/agent-session-registered-agents' -import { pasteDraftWhenAgentReady } from '@/lib/agent-paste-draft' +import { pasteDraftWhenAgentReady } from '@/lib/agent-session/messaging/paste/agent-paste-draft' import { newAgentPromptOutcome } from '@/lib/new-agent-prompt-outcome' import { newAgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agent-launch-request-id' -import { nonRefusedAgentLaunch } from '@/lib/agent-tab-launch-outcome.test-fixture' +import { nonRefusedAgentLaunch } from '@/lib/agent-session/launch/new-tab/agent-tab-launch-outcome.test-fixture' import { stubRuntimeEnvironmentBridge } from '@/runtime/rpc/testing/runtime-environment-bridge-fixture' import { AGENT_LAUNCH_CHOICES_CAPABILITY } from '../../src/shared/agent-launch/contracts/agent-launch-runtime-capability' import { OrcaRuntimeService } from '../../src/main/runtime/orca-runtime' diff --git a/tests/e2e/launch-agent-web-terminal.test-fixture.ts b/tests/e2e/launch-agent-web-terminal.test-fixture.ts index 6e45d9705d0..353055f7090 100644 --- a/tests/e2e/launch-agent-web-terminal.test-fixture.ts +++ b/tests/e2e/launch-agent-web-terminal.test-fixture.ts @@ -115,7 +115,9 @@ vi.mock('@/lib/workspace/activation/worktree-activation', () => ({ activateAndRevealWorktree: mocks.reveal })) vi.mock('@/components/tab-bar/reconcile-order', () => ({ reconcileTabOrder: vi.fn(() => []) })) -vi.mock('@/lib/agent-paste-draft', () => ({ pasteDraftWhenAgentReady: vi.fn() })) +vi.mock('@/lib/agent-session/messaging/paste/agent-paste-draft', () => ({ + pasteDraftWhenAgentReady: vi.fn() +})) vi.mock('@/lib/telemetry', () => ({ track: vi.fn(), tuiAgentToAgentKind: mockLaunchAgentKind diff --git a/tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts b/tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts index 448b0d18992..ad42c061d52 100644 --- a/tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts +++ b/tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts @@ -4,8 +4,11 @@ import type { RuntimeMobileSessionTabsSnapshot } from '../../src/shared/runtime-types' import '../../src/shared/agent-status/title/agent-title-status' -import { AGENT_STATUS_STALE_AFTER_MS } from '../../src/shared/agent-status/contracts/agent-status-freshness' -import { isExplicitAgentStatusFresh } from '../../src/renderer/src/lib/pane-agent-evidence' +import { + AGENT_STATUS_STALE_AFTER_MS, + isAgentStatusFresh +} from '../../src/shared/agent-status/contracts/agent-status-freshness' + import { OrcaRuntimeService } from '../../src/main/runtime/orca-runtime' import { SESSION_TABS_AGENT_STATUS_HEARTBEAT_INTERVAL_MS } from '../../src/main/runtime/session-lifecycle/publication/mobile-session-tabs-agent-status-heartbeat' import { applyFreshWebSessionTabsSnapshot } from '../../src/renderer/src/runtime/web-session-tabs-sync/snapshot-api' @@ -204,9 +207,9 @@ describe('real PTY decorative session-tabs fanout', () => { expect(Date.now() - firstWorkingTitleAt).toBeGreaterThan(AGENT_STATUS_STALE_AFTER_MS) const viewerAgentStatus = Object.values(viewerState.agentStatusByPaneKey)[0] expect(viewerAgentStatus?.state).toBe('working') - expect( - isExplicitAgentStatusFresh(viewerAgentStatus!, Date.now(), AGENT_STATUS_STALE_AFTER_MS) - ).toBe(true) + expect(isAgentStatusFresh(viewerAgentStatus!, Date.now(), AGENT_STATUS_STALE_AFTER_MS)).toBe( + true + ) publications.length = 0 vi.advanceTimersByTime(1) @@ -442,9 +445,7 @@ describe('real PTY decorative session-tabs fanout', () => { expect(Date.now() - initialStatus!.updatedAt).toBeGreaterThan(AGENT_STATUS_STALE_AFTER_MS) const viewerStatus = Object.values(viewerState.agentStatusByPaneKey)[0] expect(viewerStatus?.prompt).toBe('') - expect(isExplicitAgentStatusFresh(viewerStatus!, Date.now(), AGENT_STATUS_STALE_AFTER_MS)).toBe( - true - ) + expect(isAgentStatusFresh(viewerStatus!, Date.now(), AGENT_STATUS_STALE_AFTER_MS)).toBe(true) unsubscribe() uninstallStatusRepublish() statusWiring.statusStore.stop() diff --git a/tests/e2e/terminal-agent-fork-draft-ownership.unit.test.ts b/tests/e2e/terminal-agent-fork-draft-ownership.unit.test.ts index d384628e1c0..ba02072b3dc 100644 --- a/tests/e2e/terminal-agent-fork-draft-ownership.unit.test.ts +++ b/tests/e2e/terminal-agent-fork-draft-ownership.unit.test.ts @@ -1,9 +1,9 @@ // @vitest-environment happy-dom import { mocks, store } from './launch-agent-web-terminal.test-fixture' import { expect, it, vi } from 'vitest' -import { buildAgentSessionForkPrompt } from '@/lib/agent-session-fork-context' +import { buildAgentSessionForkPrompt } from '@/lib/agent-session/context/agent-session-fork-context' import { isWebRuntimeSessionActive } from '@/runtime/web-session-tabs-sync/identity/web-runtime-session-environment' -import { pasteDraftWhenAgentReady } from '@/lib/agent-paste-draft' +import { pasteDraftWhenAgentReady } from '@/lib/agent-session/messaging/paste/agent-paste-draft' import { newAgentPromptOutcome } from '@/lib/new-agent-prompt-outcome' import { projectAgentLaunchSettings } from '../../src/shared/agent-launch/choices/agent-launch-settings' import { retainedPrefillHost } from './terminal-agent-fork-retained-prefill.test-fixture' diff --git a/tests/e2e/terminal-agent-pane-launch.unit.test.ts b/tests/e2e/terminal-agent-pane-launch.unit.test.ts index 0667445774a..d1e00b1da0a 100644 --- a/tests/e2e/terminal-agent-pane-launch.unit.test.ts +++ b/tests/e2e/terminal-agent-pane-launch.unit.test.ts @@ -65,7 +65,9 @@ vi.mock('@/runtime/hosted-terminals/input/runtime-terminal-verified-input', () = vi.mock('@/runtime/hosted-terminals/streams/runtime-terminal-data-subscription', () => ({ subscribeToRuntimeTerminalData: vi.fn() })) -vi.mock('@/lib/agent-ready-wait', () => ({ waitForAgentReady: async () => ({ ready: false }) })) +vi.mock('@/lib/agent-session/messaging/paste/agent-ready-wait', () => ({ + waitForAgentReady: async () => ({ ready: false }) +})) vi.mock('@/lib/telemetry', () => ({ track: vi.fn(), tuiAgentToAgentKind: mockLaunchAgentKind })) const mockLaunchAgentKind = vi.hoisted(() => () => 'claude') vi.mock('../../src/shared/agent-kind', async (importOriginal) => ({ diff --git a/tests/tools/omp-picker-search-rendered/fixture.tsx b/tests/tools/omp-picker-search-rendered/fixture.tsx index 6fbb57f339a..d8417ac27d3 100644 --- a/tests/tools/omp-picker-search-rendered/fixture.tsx +++ b/tests/tools/omp-picker-search-rendered/fixture.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react' import { createRoot } from 'react-dom/client' import AgentCombobox from '../../../src/renderer/src/components/agent/AgentCombobox' -import { getAgentCatalog } from '../../../src/renderer/src/lib/agent-catalog' +import { getAgentCatalog } from '../../../src/renderer/src/lib/agent-catalog/agent-catalog' import type { TuiAgent } from '../../../src/shared/agent-launch/catalog/tui-agent' import './fixture.css' const baseline = new URLSearchParams(window.location.search).get('baseline') === '1' From 577a1f1fd15e8b71d2dfc6254e745f2752407984 Mon Sep 17 00:00:00 2001 From: "buf0-bot[bot]" <252831055+buf0-bot[bot]@users.noreply.github.com> Date: Mon, 9 Nov 2026 12:26:40 +0000 Subject: [PATCH 34/90] Update README downloads badge (#40336) Co-authored-by: buf0-bot[bot] <252831055+buf0-bot[bot]@users.noreply.github.com> --- docs/assets/readme-downloads.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/assets/readme-downloads.svg b/docs/assets/readme-downloads.svg index 844b8971f54..09cf785735c 100644 --- a/docs/assets/readme-downloads.svg +++ b/docs/assets/readme-downloads.svg @@ -1,5 +1,5 @@ - - downloads: 160m + + downloads: 161m @@ -15,7 +15,7 @@ downloads downloads - 160m - 160m + 161m + 161m From 32fc2393acd06b16e5a0990e99a3c5c0c3bc4842 Mon Sep 17 00:00:00 2001 From: Neil <4138956+nwparker@users.noreply.github.com> Date: Mon, 9 Nov 2026 04:29:19 -0800 Subject: [PATCH 35/90] refactor(environment-providers): run shell recipes through ShellRecipeDriver (#40332) The runtime service and failed-start cleanup now reach orca.yaml environment recipes and plugin VM recipes through ShellRecipeDriver's recipe-shaped steps. Same arguments, same runner, same results: records, failure copy and diagnostics are unchanged. --- src/main/ephemeral-vm/failed-start-cleanup.ts | 10 ++----- src/main/ephemeral-vm/runtime-service.ts | 29 ++++++------------- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/src/main/ephemeral-vm/failed-start-cleanup.ts b/src/main/ephemeral-vm/failed-start-cleanup.ts index 7a1eaf9921d..129c03caac3 100644 --- a/src/main/ephemeral-vm/failed-start-cleanup.ts +++ b/src/main/ephemeral-vm/failed-start-cleanup.ts @@ -16,10 +16,8 @@ import { type EphemeralVmFailure } from '../../shared/ephemeral-vm-failure-copy' import type { ProvisionEphemeralVmRuntimeArgs } from './runtime-service' -import { - runEphemeralVmRecipeCleanup, - type EphemeralVmRecipeContext -} from '../../shared/ephemeral-vm-recipe-runner' +import type { EphemeralVmRecipeContext } from '../../shared/ephemeral-vm-recipe-runner' +import { ShellRecipeDriver } from '../environment-providers/shell-recipe-driver' type FailedStart = { context: EphemeralVmRecipeContext @@ -74,9 +72,7 @@ async function getCleanupError( start: FailedStart ): Promise { try { - const cleanup = await runEphemeralVmRecipeCleanup({ - repoPath: args.repoPath, - recipe: args.recipe, + const cleanup = await new ShellRecipeDriver(args.recipe, args.repoPath).runDestroy({ context: start.context, recipeResult: start.recipeResult, signal: args.signal, diff --git a/src/main/ephemeral-vm/runtime-service.ts b/src/main/ephemeral-vm/runtime-service.ts index 4eba637eea1..d2a41304b06 100644 --- a/src/main/ephemeral-vm/runtime-service.ts +++ b/src/main/ephemeral-vm/runtime-service.ts @@ -4,15 +4,12 @@ import { updateEphemeralVmRuntimeStatus } from '../../shared/ephemeral-vm-runtime-store' import type { EphemeralVmRuntimeRecord } from '../../shared/ephemeral-vm-runtimes' -import { - runEphemeralVmRecipeCleanup, - runEphemeralVmRecipeResume, - runEphemeralVmRecipeSuspend, - runEphemeralVmRecipeStart, - type EphemeralVmRecipeContext, - type EphemeralVmRecipeStartFailure, - type EphemeralVmRecipeStartSuccess +import type { + EphemeralVmRecipeContext, + EphemeralVmRecipeStartFailure, + EphemeralVmRecipeStartSuccess } from '../../shared/ephemeral-vm-recipe-runner' +import { ShellRecipeDriver } from '../environment-providers/shell-recipe-driver' import { beginEphemeralVmProvisioning, endEphemeralVmProvisioning, @@ -109,9 +106,7 @@ export async function provisionEphemeralVmRuntime( ): Promise { const writeAhead = beginEphemeralVmProvisioning(args) try { - const start = await runEphemeralVmRecipeStart({ - repoPath: args.repoPath, - recipe: args.recipe, + const start = await new ShellRecipeDriver(args.recipe, args.repoPath).runCreate({ context: { projectId: args.projectId, workspaceId: args.workspaceId, @@ -183,9 +178,7 @@ async function cleanupEphemeralVmRuntimeOnce( cleanupLastError: null, updatedAt: now }) - const cleanup = await runEphemeralVmRecipeCleanup({ - repoPath: args.repoPath, - recipe: args.recipe, + const cleanup = await new ShellRecipeDriver(args.recipe, args.repoPath).runDestroy({ context: contextFromRuntime(args.repoPath, running), recipeResult: running.recipeResult, signal: args.signal, @@ -227,9 +220,7 @@ export async function suspendEphemeralVmRuntime( if (!existing.recipeResult) { throw new Error(`Ephemeral VM runtime never finished provisioning: ${args.runtimeId}`) } - const suspend = await runEphemeralVmRecipeSuspend({ - repoPath: args.repoPath, - recipe: args.recipe, + const suspend = await new ShellRecipeDriver(args.recipe, args.repoPath).runSuspend({ context: contextFromRuntime(args.repoPath, existing), recipeResult: existing.recipeResult, signal: args.signal, @@ -264,9 +255,7 @@ export async function resumeEphemeralVmRuntime( if (!existing.recipeResult) { throw new Error(`Ephemeral VM runtime never finished provisioning: ${args.runtimeId}`) } - const resume = await runEphemeralVmRecipeResume({ - repoPath: args.repoPath, - recipe: args.recipe, + const resume = await new ShellRecipeDriver(args.recipe, args.repoPath).runResume({ context: contextFromRuntime(args.repoPath, existing), recipeResult: existing.recipeResult, signal: args.signal, From 9636b4454bd5c18fd0945a3ba2515027d60aa777 Mon Sep 17 00:00:00 2001 From: OrcaWin Date: Mon, 9 Nov 2026 04:30:48 -0800 Subject: [PATCH 36/90] test: remove low-value hook and mirror tests and search benchmarks (#40335) * test: remove private hook checks and manual search benchmarks * test: remove masked mirror hydration case and exclusive scaffolding --------- Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com> --- .../session-search-pass-benchmark.ts | 87 ----------- .../session-search-retention-benchmark.ts | 143 ------------------ ...ed-hook-script-refresh-main-thread.test.ts | 37 +---- .../http/server-hook-http-ingest.test.ts | 42 ----- .../server-hook-session-binding.test.ts | 5 +- ...ivation-preserved-pane-replacement.test.ts | 93 ------------ 6 files changed, 4 insertions(+), 403 deletions(-) delete mode 100644 config/scripts/performance/session-search/session-search-pass-benchmark.ts delete mode 100644 config/scripts/performance/session-search/session-search-retention-benchmark.ts diff --git a/config/scripts/performance/session-search/session-search-pass-benchmark.ts b/config/scripts/performance/session-search/session-search-pass-benchmark.ts deleted file mode 100644 index 143ab0b6eda..00000000000 --- a/config/scripts/performance/session-search/session-search-pass-benchmark.ts +++ /dev/null @@ -1,87 +0,0 @@ -import assert from 'node:assert/strict' -import { mkdir, mkdtemp, rename, rm } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { basename, join } from 'node:path' -import { isolatedScanRoots } from '../../../../src/main/ai-vault/session-scanner-test-fixtures' -import { resetSessionParseCacheForTests } from '../../../../src/main/ai-vault/parse-cache/session-parse-cache-store' -import { resetTranscriptConsumersForTests } from '../../../../src/main/ai-vault/transcripts/session-transcript-consumers' -import { SessionSearchIndexer } from '../../../../src/main/ai-vault-search/session-search-indexer' -import { writeSyntheticTranscriptCorpus } from '../../../../src/main/ai-vault-search/session-search-synthetic-corpus' - -// Bundle with esbuild --bundle --platform=node and run on target host over synthetic corpus only; never use real transcripts. -// Price warm stat-only cycle/sweep used to choose reconcile interval, without setting it or reading already-current content. - -const SESSIONS = 5_000 -const TURNS_PER_SESSION = 4 -const PROJECTS = 40 - -const corpus = await writeSyntheticTranscriptCorpus({ - sessions: SESSIONS, - turnsPerSession: TURNS_PER_SESSION -}) -const root = await mkdtemp(join(tmpdir(), 'orca-search-pass-')) -const roots = isolatedScanRoots(root) -const databasePath = join(root, 'index', 'session-search.sqlite') - -try { - // Spread synthetic corpus over project dirs to model discovery’s readdir cost instead of one flat listing. - for (let index = 0; index < PROJECTS; index++) { - await mkdir(join(roots.claudeProjectsDir, `project-${index}`), { recursive: true }) - } - await Promise.all( - corpus.files.map((path, index) => - rename(path, join(roots.claudeProjectsDir, `project-${index % PROJECTS}`, basename(path))) - ) - ) - - resetSessionParseCacheForTests() - resetTranscriptConsumersForTests() - const errors: unknown[] = [] - const indexer = new SessionSearchIndexer({ - databasePath, - roots, - historyDays: null, - // Finish cold indexing before warm measurement; deadline would contaminate timings with backlog. - passDeadlineMs: Number.MAX_SAFE_INTEGER, - onError: (error) => errors.push(error) - }) - try { - const coldStarted = performance.now() - await indexer.start() - const coldMs = performance.now() - coldStarted - assert.deepEqual(errors, []) - assert.equal(indexer.status().filesIndexed, SESSIONS, 'indexed file count') - - const sweepStarted = performance.now() - await indexer.reconcile({ full: true }) - const sweepMs = performance.now() - sweepStarted - - const cycleStarted = performance.now() - await indexer.reconcile({ full: false }) - const cycleMs = performance.now() - cycleStarted - - assert.deepEqual(errors, []) - assert.equal(indexer.status().filesDue, 0, 'nothing owed after a warm sweep') - console.log( - JSON.stringify( - { - transcripts: SESSIONS, - projectDirectories: PROJECTS, - transcriptMb: Math.round((corpus.transcriptBytes / (1024 * 1024)) * 100) / 100, - coldBuildMs: Math.round(coldMs), - warmSweepMs: Math.round(sweepMs), - warmCycleMs: Math.round(cycleMs) - }, - null, - 2 - ) - ) - } finally { - indexer.close() - resetTranscriptConsumersForTests() - resetSessionParseCacheForTests() - } -} finally { - await rm(corpus.root, { recursive: true, force: true }) - await rm(root, { recursive: true, force: true }) -} diff --git a/config/scripts/performance/session-search/session-search-retention-benchmark.ts b/config/scripts/performance/session-search/session-search-retention-benchmark.ts deleted file mode 100644 index 7ad77f618ae..00000000000 --- a/config/scripts/performance/session-search/session-search-retention-benchmark.ts +++ /dev/null @@ -1,143 +0,0 @@ -import assert from 'node:assert/strict' -import { mkdtemp, rm, stat } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { setImmediate as yieldToEventLoop } from 'node:timers/promises' -import { - syntheticCandidate, - syntheticSession, - userMessages -} from '../../../../src/main/ai-vault-search/session-search-index-test-fixture' -import { SessionSearchStore } from '../../../../src/main/ai-vault-search/session-search-store' -import SyncDatabase from '../../../../src/main/sqlite/sync-database' - -// Bundle with esbuild --bundle --platform=node and run on target host. All arms seed through store; only whole-file baseline bypasses shipped purge. - -const ROWS = 60_000 - -/** The purge yields with `setImmediate` between chunks, so a peer chain samples each gap. */ -async function sampleLoopStalls(running: () => boolean, intervals: number[]): Promise { - let previous = performance.now() - while (running()) { - await yieldToEventLoop() - const now = performance.now() - intervals.push(now - previous) - previous = now - } -} - -/** What a search would still return: rows whose session row is still there. */ -function visibleRows(db: SyncDatabase): number { - return ( - db - .prepare(`SELECT count(*) AS n FROM messages m JOIN sessions s ON s.id = m.session_row_id`) - .get() as { n: number } - ).n -} - -const root = await mkdtemp(join(tmpdir(), 'orca-search-retention-bench-')) -try { - for (const mode of ['whole-file', 'batched', 'batched-pinned-reader']) { - const path = join(root, `${mode}.sqlite`) - const errors: unknown[] = [] - const store = new SessionSearchStore(path, (error) => errors.push(error)) - let reader: SyncDatabase | null = null - try { - const write = store.beginWrite(syntheticCandidate(), 'replace', 0)! - for (const message of userMessages( - 'synthetic benchmark needle repeated context for a representative coding conversation with commands and paths src/example.ts', - ROWS - )) { - write.add(message) - } - assert.equal( - write.commit({ - session: syntheticSession(), - byteOffset: 4096, - incomplete: false - }), - true - ) - assert.deepEqual(errors, []) - // Truncating first is what makes walBytes below the purge's own growth. - const checkpoint = new SyncDatabase(path) - checkpoint.pragma('wal_checkpoint(TRUNCATE)') - checkpoint.close() - if (mode === 'batched-pinned-reader') { - reader = new SyncDatabase(path, { readonly: true }) - reader.exec('BEGIN') - reader.prepare('SELECT count(*) FROM messages').get() - } - const probe = new SyncDatabase(path, { readonly: true }) - const intervals: number[] = [] - const started = performance.now() - if (mode === 'whole-file') { - const raw = new SyncDatabase(path) - try { - raw.exec('BEGIN IMMEDIATE') - const ids = raw.prepare('SELECT id FROM messages').all() as { - id: number - }[] - for (const { id } of ids) { - raw.prepare('DELETE FROM messages_fts WHERE rowid=?').run(id) - } - raw.exec('DELETE FROM messages; DELETE FROM sessions; DELETE FROM files; COMMIT') - } finally { - raw.close() - } - intervals.push(performance.now() - started) - } else { - let purging = true - const purge = store.purgeOlderThan(Date.now() + 60_000) - // First transaction cuts session from file, hiding search results immediately before chunked deletion finishes. - const hiddenEarly = yieldToEventLoop().then(() => visibleRows(probe)) - const sampler = sampleLoopStalls(() => purging, intervals) - await purge - purging = false - await sampler - assert.equal(await hiddenEarly, 0) - assert.deepEqual(errors, []) - } - const wallMs = performance.now() - started - probe.close() - reader?.exec('COMMIT') - reader?.close() - reader = null - const after = new SyncDatabase(path, { readonly: true }) - try { - for (const table of ['messages_fts']) { - assert.equal( - ( - after.prepare(`SELECT count(*) AS n FROM ${table}`).get() as { - n: number - } - ).n, - 0 - ) - } - } finally { - after.close() - } - const walBytes = (await stat(`${path}-wal`)).size - intervals.sort((a, b) => a - b) - console.log( - JSON.stringify({ - mode, - platform: process.platform, - node: process.version, - rows: ROWS, - wallMs: Math.round(wallMs), - samples: intervals.length, - maxStepMs: Math.round(intervals.at(-1) ?? 0), - p95StepMs: Math.round(intervals[Math.floor(intervals.length * 0.95)] ?? 0), - walBytes - }) - ) - } finally { - reader?.close() - store.close() - } - } -} finally { - await rm(root, { recursive: true, force: true }) -} diff --git a/src/main/agent-hooks/installation/scripts/managed-hook-script-refresh-main-thread.test.ts b/src/main/agent-hooks/installation/scripts/managed-hook-script-refresh-main-thread.test.ts index 24fcba35e5a..c7df1a46ab8 100644 --- a/src/main/agent-hooks/installation/scripts/managed-hook-script-refresh-main-thread.test.ts +++ b/src/main/agent-hooks/installation/scripts/managed-hook-script-refresh-main-thread.test.ts @@ -1,4 +1,3 @@ -import type * as NodeFsModule from 'node:fs' import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises' import { tmpdir } from 'node:os' import type * as NodeOsModule from 'node:os' @@ -6,28 +5,7 @@ import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { installFakeAppEnvironment } from '../../../../../config/scripts/test-runtime/environment/vitest-host-ports-setup' -const state = vi.hoisted((): { home: string; syncCalls: { name: string; target: string }[] } => ({ - home: '', - syncCalls: [] -})) - -vi.mock('node:fs', async (importOriginal) => { - const actual = await importOriginal() - const wrapped: Record = { ...actual } - for (const [name, value] of Object.entries(actual)) { - if (!name.endsWith('Sync') || typeof value !== 'function') { - continue - } - const original = value as ((...args: unknown[]) => unknown) & Record - const recorder = (...args: unknown[]): unknown => { - state.syncCalls.push({ name, target: typeof args[0] === 'string' ? args[0] : '' }) - return original(...args) - } - Object.assign(recorder, original) - wrapped[name] = recorder - } - return { ...wrapped, default: wrapped } -}) +const state = vi.hoisted(() => ({ home: '' })) vi.mock('node:os', async (importOriginal) => { const actual = await importOriginal() @@ -38,13 +16,7 @@ vi.mock('electron', () => ({ app: { getPath: () => '/tmp/orca-user-data' } })) import { MANAGED_AGENT_HOOK_SCRIPT_REFRESHERS } from '../managed-agent-hook-registry' -function syncCallsUnderHome(): string[] { - return state.syncCalls - .filter((call) => call.target.startsWith(state.home)) - .map((call) => `${call.name}(${call.target})`) -} - -describe('managed hook script refresh stays off the main thread', () => { +describe('managed hook script refresh and owned profile cleanup', () => { beforeEach(async () => { state.home = await mkdtemp(join(tmpdir(), 'orca-hook-refresh-main-thread-')) vi.stubEnv('CLAUDE_CONFIG_DIR', join(state.home, '.claude')) @@ -53,7 +25,6 @@ describe('managed hook script refresh stays off the main thread', () => { vi.stubEnv('GROK_HOME', undefined) vi.stubEnv('KIMI_CODE_HOME', undefined) vi.stubEnv('XDG_CONFIG_HOME', undefined) - state.syncCalls = [] }) afterEach(async () => { @@ -61,7 +32,7 @@ describe('managed hook script refresh stays off the main thread', () => { vi.unstubAllEnvs() }) - it('uses no synchronous HOME filesystem calls for missing or stale scripts', async () => { + it('refreshes stale scripts and removes owned profile plugins while preserving unowned files', async () => { const hooksDir = join(state.home, '.orca', 'agent-hooks') const claudeScript = join( hooksDir, @@ -107,13 +78,11 @@ describe('managed hook script refresh stays off the main thread', () => { await mkdir(join(unowned, 'hooks')) await writeFile(join(unowned, '.claude-plugin', 'orca-managed.json'), '{"owner":"someone"}') await writeFile(join(unowned, 'hooks', 'register.js'), 'user-owned') - state.syncCalls = [] for (const [, refresh] of MANAGED_AGENT_HOOK_SCRIPT_REFRESHERS) { await refresh() } - expect(syncCallsUnderHome()).toEqual([]) const refreshed = await readFile(claudeScript, 'utf8') expect(refreshed).not.toBe('stale') expect(refreshed).toContain( diff --git a/src/main/agent-hooks/server/testing/http/server-hook-http-ingest.test.ts b/src/main/agent-hooks/server/testing/http/server-hook-http-ingest.test.ts index 0d12cee0e50..55bfc705f66 100644 --- a/src/main/agent-hooks/server/testing/http/server-hook-http-ingest.test.ts +++ b/src/main/agent-hooks/server/testing/http/server-hook-http-ingest.test.ts @@ -118,48 +118,6 @@ describe('AgentHookServer listener replay', () => { } }) - it('does not apply Claude background evidence from a rejected local status', async () => { - const server = new AgentHookServer() - await server.start({ env: 'production' }) - try { - const env = server.buildPtyEnv() - const postClaudeHook = async (payload: Record): Promise => { - const response = await fetch(`http://127.0.0.1:${env.ORCA_AGENT_HOOK_PORT}/hook/claude`, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - 'X-Orca-Agent-Hook-Token': env.ORCA_AGENT_HOOK_TOKEN - }, - body: JSON.stringify(buildBody(payload)) - }) - expect(response.status).toBe(204) - } - - await postClaudeHook({ - hook_event_name: 'PermissionRequest', - prompt: 'approve shell', - tool_name: 'Bash', - background_tasks: [{ id: 'shell-1', type: 'shell', status: 'running' }], - session_crons: [{ id: 'cron-1', status: 'running' }] - }) - const waiting = server.getStatusSnapshot()[0] - - await postClaudeHook({ - hook_event_name: 'PreToolUse', - prompt: 'approve shell', - tool_name: 'OtherTool', - background_tasks: [], - session_crons: [] - }) - - expect(server.getStatusSnapshot()[0]).toEqual(waiting) - expect(server._getStateForTests().claudeRunningNonAgentTaskPaneKeys.has(PANE)).toBe(true) - expect(server._getStateForTests().claudeActiveSessionCronPaneKeys.has(PANE)).toBe(true) - } finally { - server.stop() - } - }) - it('accepts form-encoded hook posts from Unix managed scripts', async () => { const server = new AgentHookServer() await server.start({ env: 'production' }) diff --git a/src/main/agent-hooks/server/testing/identity/server-hook-session-binding.test.ts b/src/main/agent-hooks/server/testing/identity/server-hook-session-binding.test.ts index 072fd90e027..46de0765a95 100644 --- a/src/main/agent-hooks/server/testing/identity/server-hook-session-binding.test.ts +++ b/src/main/agent-hooks/server/testing/identity/server-hook-session-binding.test.ts @@ -352,7 +352,7 @@ it('forwards a cold host comparison to the retained canonical binding without cr expect(frame().paneOwner).toBeUndefined() }) -it('rejects before mutating provider folds and validates scoped IDs with the locator parser', () => { +it('rejects an inherited hook and malformed scoped session IDs', () => { const now = 1_700_000_000_000 vi.spyOn(Date, 'now').mockReturnValue(now) const state = createHookListenerState() @@ -377,9 +377,6 @@ it('rejects before mutating provider folds and validates scoped IDs with the loc user_message: 'poison' }) expect(normalizeHookPayload(state, 'hermes', body, 'production')).toBeNull() - expect(state.lastPromptByPaneKey.size).toBe(0) - expect(state.lastToolByPaneKey.size).toBe(0) - expect(state.hermesTurnByPaneKey.size).toBe(0) for (const session of ['x'.repeat(513), '-option', 'bad\nidentity']) { expect(readAgentProcessPresence({ agent: 'hermes', session })?.session).toBeUndefined() expect(readAgentProcessPresence({ agent: 'antigravity', session })?.session).toBeUndefined() diff --git a/src/renderer/src/lib/workspace/activation/worktree-reactivation-preserved-pane-replacement.test.ts b/src/renderer/src/lib/workspace/activation/worktree-reactivation-preserved-pane-replacement.test.ts index 24b1ded4539..daec5f4a8b8 100644 --- a/src/renderer/src/lib/workspace/activation/worktree-reactivation-preserved-pane-replacement.test.ts +++ b/src/renderer/src/lib/workspace/activation/worktree-reactivation-preserved-pane-replacement.test.ts @@ -7,12 +7,6 @@ import { activateAndRevealWorktree } from './worktree-activation' import { waitForWorktreeAgentActivationGateForTests } from './worktree-agent-activation-gate' import { makeCreatedAgentWorktree as makeWorktree } from '@/lib/workspace/activation/worktree-activation-created-agent.test-fixture' import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id' -import type { ExecutionHostId } from '../../../../../shared/execution-host' -import { runtimeEnvironmentIdOrLocalUnlessTwin } from '../ownership/worktree-runtime-owner' -import { - markHostSessionMirrorHydrated, - resetHostSessionMirrorHydrationForTests -} from '@/runtime/web-session-tabs-sync/hydration/host-session-mirror-hydration' // Main's answer to the window's layout commands, as a switch-on build sends them. vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) => @@ -27,8 +21,6 @@ const initialAppStoreState = useAppStore.getState() const LEAF_ID = '22222222-2222-4222-8222-222222222222' const HUSK_TAB_ID = 'husk-tab-1' -const RUNTIME_ENV_ID = 'env-4f0a8c21' -const RUNTIME_HOST_ID = `runtime:${encodeURIComponent(RUNTIME_ENV_ID)}` as ExecutionHostId function baseState(worktree: ReturnType): Partial { return { @@ -137,7 +129,6 @@ function seedSleepingRecord(worktreeId: string, sessionId: string): void { afterEach(() => { useAppStore.setState(initialAppStoreState, true) - resetHostSessionMirrorHydrationForTests() }) describe('preserved-pane replacement contract on workspace activation', () => { @@ -227,88 +218,4 @@ describe('preserved-pane replacement contract on workspace activation', () => { // Keep the record with its cold-restoring pane or pane and replacement both resume it. expect(after.sleepingAgentSessionsByPaneKey[makePaneKey(HUSK_TAB_ID, LEAF_ID)]).toBeDefined() }) - - // Published mirror tabs remain host-owned before hydration. Client replacement once relaunched codex against an active writer, stranding a shell and orphaning the live agent (aug20 windows 2). - it('does not replace a still-published web-mirror tab after hydration settles', async () => { - const webTabId = 'web-terminal-host-tab' - // Paired runtime ownership is required or deferral’s no-host return makes this test vacuous. - const worktree = { ...makeWorktree(), createdWithAgent: undefined, hostId: RUNTIME_HOST_ID } - const state = baseState(worktree) - state.tabsByWorktree = { - [worktree.id]: [{ id: webTabId, title: 'Codex', ptyId: null } as never] - } - state.unifiedTabsByWorktree = { - [worktree.id]: [ - { - id: `unified-${webTabId}`, - contentType: 'terminal', - entityId: webTabId, - groupId: 'group-1' - } as never - ] - } - state.groupsByWorktree = { - [worktree.id]: [ - { - id: 'group-1', - activeTabId: `unified-${webTabId}`, - tabOrder: [`unified-${webTabId}`], - recentTabIds: [] - } as never - ] - } - state.activeGroupIdByWorktree = { [worktree.id]: 'group-1' } - state.terminalLayoutsByTabId = { - [webTabId]: { - root: { type: 'leaf', leafId: LEAF_ID }, - activeLeafId: LEAF_ID, - ptyIdsByLeafId: { [LEAF_ID]: 'pty-old-1' } - } as never - } - useAppStore.setState(state) - const paneKey = makePaneKey(webTabId, LEAF_ID) - useAppStore.setState((s) => ({ - sleepingAgentSessionsByPaneKey: { - ...s.sleepingAgentSessionsByPaneKey, - [paneKey]: { - paneKey, - tabId: webTabId, - worktreeId: worktree.id, - agent: 'codex' as const, - providerSession: { key: 'session_id' as const, id: 'codex-session-E' }, - prompt: 'resume prior task', - state: 'working' as const, - origin: 'quit' as const, - capturedAt: 1000, - updatedAt: 1000, - terminalTitle: 'Codex' - } - } - })) - - expect(runtimeEnvironmentIdOrLocalUnlessTwin(useAppStore.getState(), worktree.id)).toBe( - RUNTIME_ENV_ID - ) - - activateAndRevealWorktree(worktree.id, { notifyHostRuntime: false }) - await waitForWorktreeAgentActivationGateForTests(worktree.id) - - const after = useAppStore.getState() - expect(after.tabsByWorktree[worktree.id]?.map((tab) => tab.id)).toEqual([webTabId]) - // The record is the only recovery evidence, so deferral must retain it. - expect(after.sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined() - expect(Object.keys(after.automaticAgentResumeClaimsByTabId)).toHaveLength(0) - - // Hydration settles inventory delivery, not whether the host's process exited. - markHostSessionMirrorHydrated(RUNTIME_ENV_ID) - - const replayed = useAppStore.getState() - const replacementIds = (replayed.tabsByWorktree[worktree.id] ?? []) - .map((tab) => tab.id) - .filter((id) => id !== webTabId) - expect(replacementIds).toHaveLength(0) - expect(replayed.sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined() - expect(replayed.automaticAgentResumeClaimsByTabId).toEqual({}) - expect(replayed.pendingStartupByTabId).toEqual({}) - }) }) From 49e79c049827a0afa5945b2c8aa467b825afcc62 Mon Sep 17 00:00:00 2001 From: Sean876-alt Date: Mon, 9 Nov 2026 07:45:08 -0500 Subject: [PATCH 37/90] fix(native-chat): show approved Codex automatic reviews as neutral notices (#40161) Codex reports both approved and denied automatic approval reviews on the guardianWarning channel. Orca rendered every one as a yellow "safety review warning", so routine approvals looked like problems. Approved reviews now render as a neutral "approved this action" notice on desktop and mobile; denials and timeouts keep the warning tone. Co-authored-by: Sean876-alt <224890246+Sean876-alt@users.noreply.github.com> Co-authored-by: Neil --- mobile/src/i18n/locales/de.json | 1 + mobile/src/i18n/locales/en.json | 1 + mobile/src/i18n/locales/es.json | 1 + mobile/src/i18n/locales/fr.json | 1 + mobile/src/i18n/locales/ja.json | 1 + mobile/src/i18n/locales/ko.json | 1 + mobile/src/i18n/locales/pt.json | 1 + mobile/src/i18n/locales/ru.json | 1 + mobile/src/i18n/locales/tr.json | 1 + mobile/src/i18n/locales/zh-Hant.json | 1 + mobile/src/i18n/locales/zh.json | 1 + .../transcript/MobileNativeChatNoticeRow.tsx | 20 +++++--- .../notices/NativeChatNoticeRow.fixture.tsx | 49 +++++++++++++++++++ .../messages/notices/NativeChatNoticeRow.tsx | 42 ++++++++++------ src/renderer/src/i18n/locales/de.json | 1 + src/renderer/src/i18n/locales/en.json | 1 + src/renderer/src/i18n/locales/es.json | 1 + src/renderer/src/i18n/locales/fr.json | 1 + src/renderer/src/i18n/locales/ja.json | 1 + src/renderer/src/i18n/locales/ko.json | 1 + src/renderer/src/i18n/locales/pt.json | 1 + src/renderer/src/i18n/locales/ru.json | 1 + src/renderer/src/i18n/locales/tr.json | 1 + src/renderer/src/i18n/locales/zh-Hant.json | 1 + src/renderer/src/i18n/locales/zh.json | 1 + .../native-chat/native-chat-notice.test.ts | 37 ++++++++++++++ src/shared/native-chat/native-chat-notice.ts | 10 ++-- 27 files changed, 152 insertions(+), 28 deletions(-) create mode 100644 src/renderer/src/components/native-chat/messages/notices/NativeChatNoticeRow.fixture.tsx create mode 100644 src/shared/native-chat/native-chat-notice.test.ts diff --git a/mobile/src/i18n/locales/de.json b/mobile/src/i18n/locales/de.json index 8fdd8ecc62b..677b6b1da26 100644 --- a/mobile/src/i18n/locales/de.json +++ b/mobile/src/i18n/locales/de.json @@ -300,6 +300,7 @@ "plan": "Plan", "stoppedManually": "Manuell gestoppt", "permissionDenied": "{{agent}} hat die Berechtigung verweigert. Details anzeigen.", + "safetyReviewApproved": "{{agent}} hat diese Aktion genehmigt. Details anzeigen.", "safetyReview": "{{agent}} hat eine Warnung zur Sicherheitsprüfung gemeldet. Details anzeigen.", "truncatedResponse": "Anbieterantwort gekürzt (ursprüngliche Größe: {{bytes}} Bytes).", "modelFallback": "Claude hat das Modell gewechselt: {{from}} → {{to}}.", diff --git a/mobile/src/i18n/locales/en.json b/mobile/src/i18n/locales/en.json index df763bf71c0..aad31677cef 100644 --- a/mobile/src/i18n/locales/en.json +++ b/mobile/src/i18n/locales/en.json @@ -3054,6 +3054,7 @@ "contextCleared": "Context cleared", "plan": "Plan", "permissionDenied": "{{agent}} denied permission. View details.", + "safetyReviewApproved": "{{agent}} approved this action. View details.", "safetyReview": "{{agent}} reported a safety review warning. View details.", "truncatedResponse": "Provider response truncated (original size: {{bytes}} bytes).", "modelFallback": "Claude switched models: {{from}} → {{to}}.", diff --git a/mobile/src/i18n/locales/es.json b/mobile/src/i18n/locales/es.json index 93db73377e9..81c97fa7594 100644 --- a/mobile/src/i18n/locales/es.json +++ b/mobile/src/i18n/locales/es.json @@ -304,6 +304,7 @@ "plan": "Plan", "stoppedManually": "Detenido manualmente", "permissionDenied": "{{agent}} denegó el permiso. Ver detalles.", + "safetyReviewApproved": "{{agent}} aprobó esta acción. Ver detalles.", "safetyReview": "{{agent}} notificó una advertencia de revisión de seguridad. Ver detalles.", "truncatedResponse": "Respuesta del proveedor truncada (tamaño original: {{bytes}} bytes).", "modelFallback": "Claude cambió de modelo: {{from}} → {{to}}.", diff --git a/mobile/src/i18n/locales/fr.json b/mobile/src/i18n/locales/fr.json index 30c9e9c2b4c..4b8d3387e69 100644 --- a/mobile/src/i18n/locales/fr.json +++ b/mobile/src/i18n/locales/fr.json @@ -304,6 +304,7 @@ "plan": "Plan", "stoppedManually": "Arrêté manuellement", "permissionDenied": "{{agent}} a refusé la permission. Voir les détails.", + "safetyReviewApproved": "{{agent}} a approuvé cette action. Voir les détails.", "safetyReview": "{{agent}} a signalé un avertissement de sécurité. Voir les détails.", "truncatedResponse": "Réponse du fournisseur tronquée (taille d’origine : {{bytes}} octets).", "modelFallback": "Claude a changé de modèle : {{from}} → {{to}}.", diff --git a/mobile/src/i18n/locales/ja.json b/mobile/src/i18n/locales/ja.json index 7af42d5c585..b2df4b4100f 100644 --- a/mobile/src/i18n/locales/ja.json +++ b/mobile/src/i18n/locales/ja.json @@ -300,6 +300,7 @@ "plan": "プラン", "stoppedManually": "手動で停止しました", "permissionDenied": "{{agent}} が権限を拒否しました。詳細を表示。", + "safetyReviewApproved": "{{agent}} がこの操作を承認しました。詳細を表示。", "safetyReview": "{{agent}} が安全性レビューの警告を報告しました。詳細を表示。", "truncatedResponse": "プロバイダーの応答は切り詰められています(元のサイズ:{{bytes}} バイト)。", "modelFallback": "Claudeがモデルを切り替えました: {{from}} → {{to}}。", diff --git a/mobile/src/i18n/locales/ko.json b/mobile/src/i18n/locales/ko.json index 5f34699729a..651e6299635 100644 --- a/mobile/src/i18n/locales/ko.json +++ b/mobile/src/i18n/locales/ko.json @@ -300,6 +300,7 @@ "plan": "계획", "stoppedManually": "수동으로 중지됨", "permissionDenied": "{{agent}}이(가) 권한을 거부했습니다. 세부 정보 보기.", + "safetyReviewApproved": "{{agent}}이(가) 이 작업을 승인했습니다. 세부 정보 보기.", "safetyReview": "{{agent}}이(가) 안전 검토 경고를 보고했습니다. 세부 정보 보기.", "truncatedResponse": "공급자 응답이 잘렸습니다(원래 크기: {{bytes}}바이트).", "modelFallback": "Claude가 모델을 변경했습니다: {{from}} → {{to}}.", diff --git a/mobile/src/i18n/locales/pt.json b/mobile/src/i18n/locales/pt.json index 5ecd4f2b77d..78cabffb482 100644 --- a/mobile/src/i18n/locales/pt.json +++ b/mobile/src/i18n/locales/pt.json @@ -304,6 +304,7 @@ "plan": "Plano", "stoppedManually": "Interrompido manualmente", "permissionDenied": "{{agent}} negou a permissão. Ver detalhes.", + "safetyReviewApproved": "{{agent}} aprovou esta ação. Ver detalhes.", "safetyReview": "{{agent}} relatou um aviso de revisão de segurança. Ver detalhes.", "truncatedResponse": "Resposta do provedor truncada (tamanho original: {{bytes}} bytes).", "modelFallback": "Claude mudou de modelo: {{from}} → {{to}}.", diff --git a/mobile/src/i18n/locales/ru.json b/mobile/src/i18n/locales/ru.json index fc5ba8b987e..7e346cf127f 100644 --- a/mobile/src/i18n/locales/ru.json +++ b/mobile/src/i18n/locales/ru.json @@ -308,6 +308,7 @@ "plan": "План", "stoppedManually": "Остановлено вручную", "permissionDenied": "{{agent}} отказал в разрешении. Подробнее.", + "safetyReviewApproved": "{{agent}} одобрил это действие. Подробнее.", "safetyReview": "{{agent}} сообщил о предупреждении проверки безопасности. Подробнее.", "truncatedResponse": "Ответ поставщика обрезан (исходный размер: {{bytes}} байт).", "modelFallback": "Claude переключил модель: {{from}} → {{to}}.", diff --git a/mobile/src/i18n/locales/tr.json b/mobile/src/i18n/locales/tr.json index 1648a819495..d5d99988cce 100644 --- a/mobile/src/i18n/locales/tr.json +++ b/mobile/src/i18n/locales/tr.json @@ -300,6 +300,7 @@ "plan": "Plan", "stoppedManually": "Elle durduruldu", "permissionDenied": "{{agent}} izin vermedi. Ayrıntıları görüntüleyin.", + "safetyReviewApproved": "{{agent}} bu işleme onay verdi. Ayrıntıları görüntüleyin.", "safetyReview": "{{agent}} bir güvenlik incelemesi uyarısı bildirdi. Ayrıntıları görüntüleyin.", "truncatedResponse": "Sağlayıcı yanıtı kısaltıldı (özgün boyut: {{bytes}} bayt).", "modelFallback": "Claude model değiştirdi: {{from}} → {{to}}.", diff --git a/mobile/src/i18n/locales/zh-Hant.json b/mobile/src/i18n/locales/zh-Hant.json index c9c3df04598..0204f96b001 100644 --- a/mobile/src/i18n/locales/zh-Hant.json +++ b/mobile/src/i18n/locales/zh-Hant.json @@ -300,6 +300,7 @@ "plan": "計畫", "stoppedManually": "已手動停止", "permissionDenied": "{{agent}} 拒絕了權限。查看詳細資訊。", + "safetyReviewApproved": "{{agent}} 已核准此操作。查看詳細資訊。", "safetyReview": "{{agent}} 回報了安全審查警告。查看詳細資訊。", "truncatedResponse": "供應商回應已截斷(原始大小:{{bytes}} 位元組)。", "modelFallback": "Claude 已切換模型:{{from}} → {{to}}。", diff --git a/mobile/src/i18n/locales/zh.json b/mobile/src/i18n/locales/zh.json index 611e00ec678..a9132df8dac 100644 --- a/mobile/src/i18n/locales/zh.json +++ b/mobile/src/i18n/locales/zh.json @@ -300,6 +300,7 @@ "plan": "计划", "stoppedManually": "已手动停止", "permissionDenied": "{{agent}} 拒绝了权限。查看详情。", + "safetyReviewApproved": "{{agent}} 已批准此操作。查看详情。", "safetyReview": "{{agent}} 报告了安全审查警告。查看详情。", "truncatedResponse": "提供方响应已截断(原始大小:{{bytes}} 字节)。", "modelFallback": "Claude 已切换模型:{{from}} → {{to}}。", diff --git a/mobile/src/session/native-chat/transcript/MobileNativeChatNoticeRow.tsx b/mobile/src/session/native-chat/transcript/MobileNativeChatNoticeRow.tsx index 82d76d12e10..b849b08da44 100644 --- a/mobile/src/session/native-chat/transcript/MobileNativeChatNoticeRow.tsx +++ b/mobile/src/session/native-chat/transcript/MobileNativeChatNoticeRow.tsx @@ -157,17 +157,21 @@ export function MobileNativeChatNoticeRow({ case 'settled-permission': { const agent = names.agentName ?? look.agent const summary = - look.decision === 'denied' - ? t('chat.notice.permissionDenied', '{{agent}} denied permission. View details.', { + look.decision === 'approved' + ? t('chat.notice.safetyReviewApproved', '{{agent}} approved this action. View details.', { agent }) - : t( - 'chat.notice.safetyReview', - '{{agent}} reported a safety review warning. View details.', - { + : look.decision === 'denied' + ? t('chat.notice.permissionDenied', '{{agent}} denied permission. View details.', { agent - } - ) + }) + : t( + 'chat.notice.safetyReview', + '{{agent}} reported a safety review warning. View details.', + { + agent + } + ) return ( + {reviews.map((block) => ( + + ))} +

+ ) +} + +export const guardianReviewsCollapsed = defineFixture({ + width: 720, + render: () => +}) + +export const guardianReviewsExpanded = defineFixture({ + width: 720, + render: () => , + interact: (frame) => { + frame.querySelectorAll('summary').forEach((summary) => summary.click()) + } +}) diff --git a/src/renderer/src/components/native-chat/messages/notices/NativeChatNoticeRow.tsx b/src/renderer/src/components/native-chat/messages/notices/NativeChatNoticeRow.tsx index 80ec2ef8e3a..e24e3385ffe 100644 --- a/src/renderer/src/components/native-chat/messages/notices/NativeChatNoticeRow.tsx +++ b/src/renderer/src/components/native-chat/messages/notices/NativeChatNoticeRow.tsx @@ -24,7 +24,8 @@ import { import type { NativeChatTextBlock } from '../../../../../../shared/native-chat/native-chat-types' import { NATIVE_CHAT_NOTICE_COPY, - nativeChatNoticeLook + nativeChatNoticeLook, + type NativeChatNoticeTone } from '../../../../../../shared/native-chat/native-chat-notice' import { useNativeChatOrcaStopView } from './native-chat-orca-stop-context' import { NativeChatInterruptedContinueButton } from '../../usage/NativeChatInterruptedContinue' @@ -65,6 +66,14 @@ const HOST_STATUS_WORDS: Record string ) } +function toneClass(tone: NativeChatNoticeTone): string { + return tone === 'warning' + ? 'text-chat-warning' + : tone === 'error' + ? 'text-destructive' + : 'text-chat-foreground-faint' +} + export function NativeChatNoticeRow({ block, messageId, @@ -176,23 +185,26 @@ export function NativeChatNoticeRow({ if (look.kind === 'settled-permission') { const agent = agentName ?? look.agent const summary = - look.decision === 'denied' + look.decision === 'approved' ? t( - 'components.native-chat.notices.permissionDenied', - '{{agent}} denied permission. View details.', - { agent } - ) - : t( - 'components.native-chat.notices.safetyReview', - '{{agent}} reported a safety review warning. View details.', + 'components.native-chat.notices.safetyReviewApproved', + '{{agent}} approved this action. View details.', { agent } ) + : look.decision === 'denied' + ? t( + 'components.native-chat.notices.permissionDenied', + '{{agent}} denied permission. View details.', + { agent } + ) + : t( + 'components.native-chat.notices.safetyReview', + '{{agent}} reported a safety review warning. View details.', + { agent } + ) const payload = block.providerFrame?.payload return ( - + {block.text} {payload ? '\n\n' : ''} {payload?.truncated @@ -289,9 +301,7 @@ export function NativeChatNoticeRow({ className={cn( 'space-y-2 text-sm text-chat-foreground', Icon && 'rounded-md border border-border bg-muted/20 p-3', - tone === 'warning' && 'text-chat-warning', - tone === 'error' && 'text-destructive', - tone === 'notice' && 'text-chat-foreground-faint' + tone && toneClass(tone) )} >
diff --git a/src/renderer/src/i18n/locales/de.json b/src/renderer/src/i18n/locales/de.json index 6ef3112131e..42212a6bf5a 100644 --- a/src/renderer/src/i18n/locales/de.json +++ b/src/renderer/src/i18n/locales/de.json @@ -19470,6 +19470,7 @@ "orcaStopCanContinue": "Die Unterhaltung kann fortgesetzt werden.", "orcaStopUnnamedServer": "dem entfernten Server", "permissionDenied": "{{agent}} hat die Berechtigung verweigert. Details anzeigen.", + "safetyReviewApproved": "{{agent}} hat diese Aktion genehmigt. Details anzeigen.", "safetyReview": "{{agent}} hat eine Warnung zur Sicherheitsprüfung gemeldet. Details anzeigen.", "truncatedResponse": "Anbieterantwort gekürzt (ursprüngliche Größe: {{bytes}} Bytes).", "forkedFrom": "Abgezweigt von" diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json index 9a2acc7c060..4a7fd6ebb5c 100644 --- a/src/renderer/src/i18n/locales/en.json +++ b/src/renderer/src/i18n/locales/en.json @@ -20063,6 +20063,7 @@ "orcaStopCanContinue": "You can continue in this conversation.", "orcaStopUnnamedServer": "the remote server", "permissionDenied": "{{agent}} denied permission. View details.", + "safetyReviewApproved": "{{agent}} approved this action. View details.", "safetyReview": "{{agent}} reported a safety review warning. View details.", "truncatedResponse": "Provider response truncated (original size: {{bytes}} bytes).", "modelFallback": "Claude switched models: {{from}} → {{to}}.", diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json index 99b87eef29e..a44fc6490cd 100644 --- a/src/renderer/src/i18n/locales/es.json +++ b/src/renderer/src/i18n/locales/es.json @@ -19713,6 +19713,7 @@ "orcaStopCanContinue": "Puedes continuar en esta conversación.", "orcaStopUnnamedServer": "el servidor remoto", "permissionDenied": "{{agent}} denegó el permiso. Ver detalles.", + "safetyReviewApproved": "{{agent}} aprobó esta acción. Ver detalles.", "safetyReview": "{{agent}} notificó una advertencia de revisión de seguridad. Ver detalles.", "truncatedResponse": "Respuesta del proveedor truncada (tamaño original: {{bytes}} bytes).", "forkedFrom": "Rama creada desde" diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json index 1c9b7e6bc21..ff96d61fa05 100644 --- a/src/renderer/src/i18n/locales/fr.json +++ b/src/renderer/src/i18n/locales/fr.json @@ -19775,6 +19775,7 @@ "orcaStopCanContinue": "Vous pouvez continuer dans cette conversation.", "orcaStopUnnamedServer": "le serveur distant", "permissionDenied": "{{agent}} a refusé la permission. Voir les détails.", + "safetyReviewApproved": "{{agent}} a approuvé cette action. Voir les détails.", "safetyReview": "{{agent}} a signalé un avertissement de sécurité. Voir les détails.", "truncatedResponse": "Réponse du fournisseur tronquée (taille d’origine : {{bytes}} octets).", "forkedFrom": "Branche créée à partir de" diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json index 4b50f6f899b..2d54a6de93d 100644 --- a/src/renderer/src/i18n/locales/ja.json +++ b/src/renderer/src/i18n/locales/ja.json @@ -19087,6 +19087,7 @@ "orcaStopCanContinue": "この会話で続行できます。", "orcaStopUnnamedServer": "リモートサーバー", "permissionDenied": "{{agent}} が権限を拒否しました。詳細を表示。", + "safetyReviewApproved": "{{agent}} がこの操作を承認しました。詳細を表示。", "safetyReview": "{{agent}} が安全性レビューの警告を報告しました。詳細を表示。", "truncatedResponse": "プロバイダーの応答は切り詰められています(元のサイズ:{{bytes}} バイト)。", "forkedFrom": "分岐元" diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json index 1cb5d7959ad..d0871a613a4 100644 --- a/src/renderer/src/i18n/locales/ko.json +++ b/src/renderer/src/i18n/locales/ko.json @@ -19087,6 +19087,7 @@ "orcaStopCanContinue": "이 대화에서 계속할 수 있습니다.", "orcaStopUnnamedServer": "원격 서버", "permissionDenied": "{{agent}}이(가) 권한을 거부했습니다. 세부 정보 보기.", + "safetyReviewApproved": "{{agent}}이(가) 이 작업을 승인했습니다. 세부 정보 보기.", "safetyReview": "{{agent}}이(가) 안전 검토 경고를 보고했습니다. 세부 정보 보기.", "truncatedResponse": "공급자 응답이 잘렸습니다(원래 크기: {{bytes}}바이트).", "forkedFrom": "분기 원본" diff --git a/src/renderer/src/i18n/locales/pt.json b/src/renderer/src/i18n/locales/pt.json index 8fd26db8efa..58e8008d452 100644 --- a/src/renderer/src/i18n/locales/pt.json +++ b/src/renderer/src/i18n/locales/pt.json @@ -20207,6 +20207,7 @@ "orcaStopCanContinue": "Você pode continuar nesta conversa.", "orcaStopUnnamedServer": "o servidor remoto", "permissionDenied": "{{agent}} negou a permissão. Ver detalhes.", + "safetyReviewApproved": "{{agent}} aprovou esta ação. Ver detalhes.", "safetyReview": "{{agent}} relatou um aviso de revisão de segurança. Ver detalhes.", "truncatedResponse": "Resposta do provedor truncada (tamanho original: {{bytes}} bytes).", "forkedFrom": "Ramificado de" diff --git a/src/renderer/src/i18n/locales/ru.json b/src/renderer/src/i18n/locales/ru.json index 234a841efd0..fffad2be785 100644 --- a/src/renderer/src/i18n/locales/ru.json +++ b/src/renderer/src/i18n/locales/ru.json @@ -20045,6 +20045,7 @@ "orcaStopCanContinue": "Вы можете продолжить этот разговор.", "orcaStopUnnamedServer": "удалённом сервере", "permissionDenied": "{{agent}} отказал в разрешении. Подробнее.", + "safetyReviewApproved": "{{agent}} одобрил это действие. Подробнее.", "safetyReview": "{{agent}} сообщил о предупреждении проверки безопасности. Подробнее.", "truncatedResponse": "Ответ поставщика обрезан (исходный размер: {{bytes}} байт).", "modelFallback": "Claude переключил модель: {{from}} → {{to}}.", diff --git a/src/renderer/src/i18n/locales/tr.json b/src/renderer/src/i18n/locales/tr.json index ff788dba404..ec6a8214a38 100644 --- a/src/renderer/src/i18n/locales/tr.json +++ b/src/renderer/src/i18n/locales/tr.json @@ -19455,6 +19455,7 @@ "orcaStopCanContinue": "Bu konuşmada devam edebilirsiniz.", "orcaStopUnnamedServer": "uzak sunucu", "permissionDenied": "{{agent}} izin vermedi. Ayrıntıları görüntüleyin.", + "safetyReviewApproved": "{{agent}} bu işleme onay verdi. Ayrıntıları görüntüleyin.", "safetyReview": "{{agent}} bir güvenlik incelemesi uyarısı bildirdi. Ayrıntıları görüntüleyin.", "truncatedResponse": "Sağlayıcı yanıtı kısaltıldı (özgün boyut: {{bytes}} bayt).", "forkedFrom": "Çatallandığı kaynak" diff --git a/src/renderer/src/i18n/locales/zh-Hant.json b/src/renderer/src/i18n/locales/zh-Hant.json index 53ab837158d..b7800265326 100644 --- a/src/renderer/src/i18n/locales/zh-Hant.json +++ b/src/renderer/src/i18n/locales/zh-Hant.json @@ -19209,6 +19209,7 @@ "orcaStopCanContinue": "你可以在此對話中繼續。", "orcaStopUnnamedServer": "遠端伺服器", "permissionDenied": "{{agent}} 拒絕了權限。查看詳細資訊。", + "safetyReviewApproved": "{{agent}} 已核准此操作。查看詳細資訊。", "safetyReview": "{{agent}} 回報了安全審查警告。查看詳細資訊。", "truncatedResponse": "供應商回應已截斷(原始大小:{{bytes}} 位元組)。", "forkedFrom": "分支來源" diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json index 15f85644cfd..25b54e7fcb6 100644 --- a/src/renderer/src/i18n/locales/zh.json +++ b/src/renderer/src/i18n/locales/zh.json @@ -19032,6 +19032,7 @@ "orcaStopCanContinue": "你可以在此对话中继续。", "orcaStopUnnamedServer": "远程服务器", "permissionDenied": "{{agent}} 拒绝了权限。查看详情。", + "safetyReviewApproved": "{{agent}} 已批准此操作。查看详情。", "safetyReview": "{{agent}} 报告了安全审查警告。查看详情。", "truncatedResponse": "提供方响应已截断(原始大小:{{bytes}} 字节)。", "forkedFrom": "分支来源" diff --git a/src/shared/native-chat/native-chat-notice.test.ts b/src/shared/native-chat/native-chat-notice.test.ts new file mode 100644 index 00000000000..d7c4f10149f --- /dev/null +++ b/src/shared/native-chat/native-chat-notice.test.ts @@ -0,0 +1,37 @@ +import { expect, it } from 'vitest' +import { nativeChatNoticeLook } from './native-chat-notice' +import type { NativeChatTextBlock } from './native-chat-types' + +function guardianReview(text: string): NativeChatTextBlock { + return { + type: 'text', + text, + tone: 'warning', + providerFrame: { + provider: 'codex', + kind: 'notification:guardianWarning', + payload: { head: '{}', byteLength: 2, digest: 'synthetic', truncated: false } + } + } +} + +it('reads only approved Codex automatic reviews as neutral notices', () => { + expect( + nativeChatNoticeLook( + guardianReview( + 'Automatic approval review approved (risk: medium, authorization: high): Read-only status query.' + ) + ) + ).toEqual({ kind: 'settled-permission', decision: 'approved', agent: 'Codex', tone: 'notice' }) + for (const text of [ + 'Automatic approval review denied (risk: high, authorization: low): Outside scope.', + 'Automatic approval review timed out while evaluating the requested approval.' + ]) { + expect(nativeChatNoticeLook(guardianReview(text))).toEqual({ + kind: 'settled-permission', + decision: 'safety-review', + agent: 'Codex', + tone: 'warning' + }) + } +}) diff --git a/src/shared/native-chat/native-chat-notice.ts b/src/shared/native-chat/native-chat-notice.ts index 0a3afef61cd..2f979fb76d3 100644 --- a/src/shared/native-chat/native-chat-notice.ts +++ b/src/shared/native-chat/native-chat-notice.ts @@ -35,9 +35,9 @@ export type NativeChatNoticeLook = | { kind: 'aside' } | { kind: 'settled-permission' - decision: 'safety-review' | 'denied' + decision: 'approved' | 'safety-review' | 'denied' agent: 'Codex' | 'Claude' - tone: 'warning' | 'error' + tone: NativeChatNoticeTone } /** A boxed line with its icon when it has a tone; plain text when it has none. */ | { kind: 'line'; tone: NativeChatNoticeTone | null } @@ -97,11 +97,13 @@ export function nativeChatNoticeLook(block: NativeChatTextBlock): NativeChatNoti if (presentation === undefined && !block.failure && !block.orcaStop) { const frame = block.providerFrame if (frame?.provider === 'codex' && frame.kind === 'notification:guardianWarning') { + // Codex also reports approvals here; its own TUI hides them by this prefix. + const approved = block.text.startsWith('Automatic approval review approved (') return { kind: 'settled-permission', - decision: 'safety-review', + decision: approved ? 'approved' : 'safety-review', agent: 'Codex', - tone: 'warning' + tone: approved ? 'notice' : 'warning' } } if (frame?.provider === 'claude' && frame.kind === 'message:system:permission_denied') { From 12b2ad25366a6647e4269bbb6d32715d0e6726ce Mon Sep 17 00:00:00 2001 From: OrcaWin Date: Mon, 9 Nov 2026 04:47:20 -0800 Subject: [PATCH 38/90] test: remove low-value composer activation provider and layout coverage (#40342) Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com> --- config/flaky-test-pattern-baseline.txt | 1 - .../scripts/ci/sharding/ci-shard-timings.json | 1 - ...x-rate-limit-window-classification.test.ts | 45 ----- .../codex-rate-limit-wsl-home-gate.test.ts | 16 -- .../providers/grok/grok-auth.test.ts | 29 --- .../EditorPanel.diff-view-preference.test.tsx | 50 ----- .../use-native-chat-mention-files.test.tsx | 84 --------- .../use-native-chat-picker-state.test.tsx | 37 +--- .../use-native-chat-pasted-text-file.test.tsx | 113 ------------ .../runs/NativeChatToolRunCallCounts.test.tsx | 70 ------- ...ktree-activation-automation-filter.test.ts | 89 --------- ...live-surface-adoption-layout-owner.test.ts | 172 ------------------ ...worktree-reactivation-tab-forkbomb.test.ts | 167 ----------------- .../tabs/activate-tab-and-focus-pane.test.ts | 90 --------- .../editor-buffer-dirty-readers.test.ts | 24 +-- .../closing/close-mirrored-editor-tab.test.ts | 92 ---------- .../commands/layout-owner-command.test.ts | 80 -------- 17 files changed, 2 insertions(+), 1158 deletions(-) delete mode 100644 src/renderer/src/components/editor/EditorPanel.diff-view-preference.test.tsx delete mode 100644 src/renderer/src/components/native-chat/composer/pickers/use-native-chat-mention-files.test.tsx delete mode 100644 src/renderer/src/components/native-chat/paste/use-native-chat-pasted-text-file.test.tsx delete mode 100644 src/renderer/src/components/native-chat/tools/runs/NativeChatToolRunCallCounts.test.tsx delete mode 100644 src/renderer/src/lib/workspace/activation/worktree-agent-live-surface-adoption-layout-owner.test.ts delete mode 100644 src/renderer/src/lib/workspace/tabs/activate-tab-and-focus-pane.test.ts delete mode 100644 src/renderer/src/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab.test.ts delete mode 100644 src/renderer/src/runtime/workspace-layout/commands/layout-owner-command.test.ts diff --git a/config/flaky-test-pattern-baseline.txt b/config/flaky-test-pattern-baseline.txt index d2a8360f020..50352f31001 100644 --- a/config/flaky-test-pattern-baseline.txt +++ b/config/flaky-test-pattern-baseline.txt @@ -659,7 +659,6 @@ 1 test-no-wall-clock:src/renderer/src/lib/workspace/ownership/workspace-terminal-host-authority.test.ts 1 test-no-wall-clock:src/renderer/src/lib/workspace/activation/worktree-activation-emptied-workspace-reseed.test.ts 2 test-no-wall-clock:src/renderer/src/runtime/native-chat/tab-retirement/structured-agent-session-tab-retirement.test.ts -1 test-no-wall-clock:src/renderer/src/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab.test.ts 2 test-no-wall-clock:src/renderer/src/store/github/pull-requests/github-pr-branch-linked-pr-divergence.test.ts 6 test-no-wall-clock:src/renderer/src/store/slices/jira/jira.test.ts 5 test-no-wall-clock:src/renderer/src/store/slices/worktrees/metadata/worktree-meta-hosted-review.test.ts diff --git a/config/scripts/ci/sharding/ci-shard-timings.json b/config/scripts/ci/sharding/ci-shard-timings.json index 5d34bd9557e..e249ac44631 100644 --- a/config/scripts/ci/sharding/ci-shard-timings.json +++ b/config/scripts/ci/sharding/ci-shard-timings.json @@ -6709,7 +6709,6 @@ "src/renderer/src/lib/workspace/activation/worktree-activation-structured-chat-surface.test.ts": 2043, "src/renderer/src/lib/workspace/activation/worktree-activation-web-runtime.test.ts": 2768, "src/renderer/src/lib/workspace/activation/worktree-agent-activation-seam.test.ts": 3440, - "src/renderer/src/lib/workspace/activation/worktree-agent-live-surface-adoption-layout-owner.test.ts": 1898, "src/renderer/src/lib/workspace/creation/worktree-creation-backend-startup-focus.test.ts": 2267, "src/renderer/src/lib/workspace/creation/worktree-creation-initial-surface.test.ts": 5258, "src/renderer/src/lib/workspace/creation/worktree-creation-structured-session-lifecycle.test.ts": 2633, diff --git a/src/main/rate-limits/providers/codex/codex-rate-limit-window-classification.test.ts b/src/main/rate-limits/providers/codex/codex-rate-limit-window-classification.test.ts index 826f1844ebe..25238ec9690 100644 --- a/src/main/rate-limits/providers/codex/codex-rate-limit-window-classification.test.ts +++ b/src/main/rate-limits/providers/codex/codex-rate-limit-window-classification.test.ts @@ -17,11 +17,6 @@ function usedPercentByWindow(result: CodexRateLimitWindowsSnapshot | null): { describe('classifyCodexRateLimitWindows', () => { it.each([ - { - name: 'null windows', - result: null, - expected: { session: null, weekly: null } - }, { name: 'reordered known windows', result: { @@ -30,22 +25,6 @@ describe('classifyCodexRateLimitWindows', () => { }, expected: { session: 21, weekly: 81 } }, - { - name: 'weekly-only primary window', - result: { - primary: { usedPercent: 22, windowDurationMins: 10080 }, - secondary: null - }, - expected: { session: null, weekly: 22 } - }, - { - name: 'session-only secondary window', - result: { - primary: null, - secondary: { usedPercent: 31, windowDurationMins: 300 } - }, - expected: { session: 31, weekly: null } - }, { name: 'duplicate session windows', result: { @@ -70,14 +49,6 @@ describe('classifyCodexRateLimitWindows', () => { }, expected: { session: null, weekly: 61 } }, - { - name: 'malformed duration with positional fallback', - result: { - primary: { usedPercent: 71, windowDurationMins: '300' }, - secondary: null - }, - expected: { session: 71, weekly: null } - }, { name: 'reordered near-canonical windows', result: { @@ -94,22 +65,6 @@ describe('classifyCodexRateLimitWindows', () => { }, expected: { session: 84, weekly: 83 } }, - { - name: 'outside-tolerance unknown windows', - result: { - primary: { usedPercent: 91, windowDurationMins: 302 }, - secondary: { usedPercent: 92, windowDurationMins: 10082 } - }, - expected: { session: 91, weekly: 92 } - }, - { - name: 'unknown windows without durations', - result: { - primary: { usedPercent: 101 }, - secondary: { usedPercent: 102 } - }, - expected: { session: 101, weekly: 102 } - }, { name: 'known session wins over unknown primary fallback', result: { diff --git a/src/main/rate-limits/providers/codex/codex-rate-limit-wsl-home-gate.test.ts b/src/main/rate-limits/providers/codex/codex-rate-limit-wsl-home-gate.test.ts index e4dbe1245d0..c4667e40ead 100644 --- a/src/main/rate-limits/providers/codex/codex-rate-limit-wsl-home-gate.test.ts +++ b/src/main/rate-limits/providers/codex/codex-rate-limit-wsl-home-gate.test.ts @@ -81,22 +81,6 @@ describe('Codex quota poll home for a WSL account (E9)', () => { expect(resolution).toEqual({ kind: 'skip' }) }) - it('prepares the home when the targeted distro runs, and leaves host targets alone', async () => { - const h = harness(['orca-w'], () => homeIn('orca-w')) - - await expect( - resolveCodexRateLimitHomeUnlessStopped( - h.source, - { runtime: 'wsl', wslDistro: 'orca-w' }, - h.deps - ) - ).resolves.toEqual({ kind: 'ready', codexHomePath: homeIn('orca-w') }) - await resolveCodexRateLimitHomeUnlessStopped(h.source, { runtime: 'host' }, h.deps) - - expect(h.prepareForRateLimitFetch).toHaveBeenLastCalledWith({ runtime: 'host' }) - expect(h.deps.isRunning).toHaveBeenCalledOnce() - }) - it('skips when no distro can be named', async () => { const h = harness([], () => null) h.deps.defaultDistro.mockResolvedValue(null) diff --git a/src/main/rate-limits/providers/grok/grok-auth.test.ts b/src/main/rate-limits/providers/grok/grok-auth.test.ts index ccff545612a..646519c9f54 100644 --- a/src/main/rate-limits/providers/grok/grok-auth.test.ts +++ b/src/main/rate-limits/providers/grok/grok-auth.test.ts @@ -76,35 +76,6 @@ describe('readGrokAuthSession', () => { } ) - it('falls back to the first tokenized entry when no auth.x.ai key exists', async () => { - vi.doMock('node:fs', () => ({ - existsSync: vi.fn(() => true), - readFileSync: vi.fn(() => - JSON.stringify({ - 'https://alternate.example.com::client': { - key: 'alt-token', - user_id: 'alt-user', - email: 'alt@example.com', - expires_at: '2099-01-01T00:00:00.000Z' - } - }) - ) - })) - const { readGrokAuthSession } = await import('./grok-auth') - - expect(readGrokAuthSession()).toEqual({ - status: 'ok', - session: { - accessToken: 'alt-token', - userId: 'alt-user', - email: 'alt@example.com', - teamId: null, - expiresAtMs: Date.parse('2099-01-01T00:00:00.000Z'), - oidcClientId: null - } - }) - }) - it('skips an expired auth.x.ai client entry when a fresh one follows it', async () => { vi.doMock('node:fs', () => ({ existsSync: vi.fn(() => true), diff --git a/src/renderer/src/components/editor/EditorPanel.diff-view-preference.test.tsx b/src/renderer/src/components/editor/EditorPanel.diff-view-preference.test.tsx deleted file mode 100644 index 5a4866e7552..00000000000 --- a/src/renderer/src/components/editor/EditorPanel.diff-view-preference.test.tsx +++ /dev/null @@ -1,50 +0,0 @@ -// @vitest-environment happy-dom -import { act, cleanup, fireEvent, render } from '@testing-library/react' -import { afterEach, expect, it, vi } from 'vitest' -import { useAppStore } from '@/store' -import { seedEditorPlacementConsumers } from '@/store/slices/editor/tabs/editor-placement-consumers.test-fixture' - -vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (original) => - ( - await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture') - ).runtimeRpcClientWithLayoutApply(await original()) -) -vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (original) => - ( - await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture') - ).runtimeLayoutClientWithTestFrames(await original()) -) -vi.mock('./useEditorPanelContentState', () => ({ - useEditorPanelContentState: () => ({ - fileContents: {}, - diffContents: {}, - reloadContent: () => {} - }) -})) -vi.mock('./EditorPanelShell', () => ({ - EditorPanelShell: ({ - sideBySide, - onToggleSideBySide - }: { - sideBySide: boolean - onToggleSideBySide: () => void - }) => -})) - -import EditorPanel from './EditorPanel' - -afterEach(cleanup) - -it('keeps the side-by-side toggle when the diff panel remounts', async () => { - const file = seedEditorPlacementConsumers() - useAppStore.setState({ - updateSettings: async (updates) => - useAppStore.setState((s) => ({ settings: s.settings && { ...s.settings, ...updates } })) - }) - const first = render() - await act(async () => fireEvent.click(first.getByText('inline'))) - expect(first.getByRole('button').textContent).toBe('side-by-side') - first.unmount() - const second = render() - expect(second.getByRole('button').textContent).toBe('side-by-side') -}) diff --git a/src/renderer/src/components/native-chat/composer/pickers/use-native-chat-mention-files.test.tsx b/src/renderer/src/components/native-chat/composer/pickers/use-native-chat-mention-files.test.tsx deleted file mode 100644 index 1d8d09eaa9d..00000000000 --- a/src/renderer/src/components/native-chat/composer/pickers/use-native-chat-mention-files.test.tsx +++ /dev/null @@ -1,84 +0,0 @@ -// @vitest-environment happy-dom -import { renderHook } from '@testing-library/react' -import { afterEach, describe, expect, it, vi } from 'vitest' -import * as fileList from '../../../quick-open-file-list' -import * as fileHistory from '@/lib/quick-open-file-history' -import { flushEffects, seedRemoteWorktree } from '../../../quick-open-file-list-test-harness' -import { listRuntimeFilesMock } from '../../../__mocks__/quick-open-runtime-file-client' -import { useNativeChatMentionFiles } from './use-native-chat-mention-files' - -vi.mock('@/runtime/files/search/runtime-file-search-client', async () => { - const mocks = await import('../../../__mocks__/quick-open-runtime-file-client') - return { - listRuntimeFiles: mocks.listRuntimeFilesMock, - cancelRuntimeFileList: mocks.cancelRuntimeFileListMock, - searchRuntimeFilePaths: mocks.searchRuntimeFilePathsMock - } -}) - -describe('useNativeChatMentionFiles', () => { - afterEach(() => vi.restoreAllMocks()) - - it('lists nothing and asks the host for nothing while no token is open', async () => { - seedRemoteWorktree() - const { result, unmount } = renderHook(() => - useNativeChatMentionFiles({ - query: null, - terminalTabId: 'tab-1', - structuredWorktreeId: 'wt-remote' - }) - ) - await flushEffects() - expect(result.current.files).toEqual([]) - expect(listRuntimeFilesMock).not.toHaveBeenCalled() - unmount() - }) - - it('returns the first 20 history-first matches through edits and listing/history replacement', () => { - seedRemoteWorktree() - const needles = Array.from({ length: 25 }, (_, index) => `src/needle-${index}.ts`) - const added = 'src/needle-added.ts' - const list = vi.spyOn(fileList, 'useRuntimeFileListForWorktree').mockReturnValue({ - files: [...needles, 'src/new.ts'], - loading: false, - loadError: null - }) - const history = vi - .spyOn(fileHistory, 'useQuickOpenHistory') - .mockReturnValue(['src/new.ts', added, needles[24], needles[23], 'missing.ts']) - const initialProps: { query: string | null } = { query: null } - const { result, rerender, unmount } = renderHook( - ({ query }: { query: string | null }) => - useNativeChatMentionFiles({ - query, - terminalTabId: 'tab-1', - structuredWorktreeId: 'wt-remote' - }), - { initialProps } - ) - expect(result.current.files).toEqual([]) - rerender({ query: 'n' }) - const broad = ['src/new.ts', needles[24], needles[23], ...needles.slice(0, 17)] - expect(result.current.files).toEqual(broad) - rerender({ query: 'needle' }) - expect(result.current.files).toEqual([needles[24], needles[23], ...needles.slice(0, 18)]) - rerender({ query: 'n' }) - expect(result.current.files).toEqual(broad) - - rerender({ query: 'needle' }) - list.mockReturnValue({ - files: [...needles.slice(0, 24), added], - loading: false, - loadError: null - }) - rerender({ query: 'needle' }) - expect(result.current.files).toEqual([added, needles[23], ...needles.slice(0, 18)]) - history.mockReturnValue([needles[3], 'missing.ts']) - rerender({ query: 'needle' }) - expect(result.current.files).toEqual([ - needles[3], - ...needles.slice(0, 20).filter((path) => path !== needles[3]) - ]) - unmount() - }) -}) diff --git a/src/renderer/src/components/native-chat/composer/pickers/use-native-chat-picker-state.test.tsx b/src/renderer/src/components/native-chat/composer/pickers/use-native-chat-picker-state.test.tsx index eceb210dd65..960f83ef07a 100644 --- a/src/renderer/src/components/native-chat/composer/pickers/use-native-chat-picker-state.test.tsx +++ b/src/renderer/src/components/native-chat/composer/pickers/use-native-chat-picker-state.test.tsx @@ -1,5 +1,5 @@ // @vitest-environment happy-dom -import { act, renderHook } from '@testing-library/react' +import { renderHook } from '@testing-library/react' import { describe, expect, it, vi } from 'vitest' import { useNativeChatPickerState } from './use-native-chat-picker-state' @@ -54,38 +54,3 @@ describe('useNativeChatPickerState', () => { expect(pickerMode(draft, true)).toBe('none') }) }) - -it('owns demand for the actual slash-menu lifetime, including dismissal and unmount', () => { - const onPickerDemand = vi.fn() - const { result, rerender, unmount } = renderHook( - (draft: string) => - useNativeChatPickerState({ - agent: 'claude', - terminalTabId: 'tab-1', - draftScopeKey: 'pane-1', - draft, - caret: draft.length, - agentCommands: [{ name: 'clear' }], - recalledFromHistory: false, - disabled: false, - isComposing: () => false, - textareaRef: { current: null }, - setDraft: vi.fn(), - setCaret: vi.fn(), - setActiveSuggestion: vi.fn(), - onPickerDemand - }), - { initialProps: '' } - ) - expect(onPickerDemand).toHaveBeenLastCalledWith(false) - rerender('/cl') - expect(onPickerDemand).toHaveBeenLastCalledWith(true) - const autocomplete = result.current.autocomplete - if (autocomplete.mode !== 'slash') { - throw new Error('Expected the slash menu') - } - act(() => result.current.dismiss(autocomplete.triggerKey)) - expect(onPickerDemand).toHaveBeenLastCalledWith(false) - unmount() - expect(onPickerDemand).toHaveBeenLastCalledWith(false) -}) diff --git a/src/renderer/src/components/native-chat/paste/use-native-chat-pasted-text-file.test.tsx b/src/renderer/src/components/native-chat/paste/use-native-chat-pasted-text-file.test.tsx deleted file mode 100644 index c3aa7833bca..00000000000 --- a/src/renderer/src/components/native-chat/paste/use-native-chat-pasted-text-file.test.tsx +++ /dev/null @@ -1,113 +0,0 @@ -// @vitest-environment happy-dom -import { useRef } from 'react' -import { act, cleanup, render } from '@testing-library/react' -import { afterEach, expect, it, vi } from 'vitest' -import { useAppStore } from '@/store' -import { NativeChatPromptEditor } from '../composer/editor/NativeChatPromptEditor' -import { - insertNativeChatPastedText, - type NativeChatComposerInput -} from '../composer/editor/native-chat-composer-input' -import { useNativeChatPastedTextFile } from './use-native-chat-pasted-text-file' -import { clearNativeChatComposerDraftsForTests } from '../drafts/native-chat-draft-reset' -import { updateNativeChatComposerDraft } from '../drafts/native-chat-composer-draft-store' -import { - promptEditor, - promptValue -} from '../composer/editor/native-chat-prompt-editor.test-support' -import { - nativeChatPastedTextOperations, - nativeChatPastedTextToken -} from './native-chat-pasted-text-reference' -import { imageReferencesToPromptMarkers } from '../../../../../shared/native-chat/transcript/native-chat-image-transcript-markers' -import { structuredAgentSessionSendBody } from '../../../../../shared/agent-session/requests/structured-agent-session-send-mutation' -import { structuredAgentSessionBlocksTooLarge } from '../../../../../shared/rpc-contract/structured-agent-session-message-params' - -const save = vi.fn(() => new Promise(() => {})) -const notice = vi.fn() -let paste: (text: string) => boolean -const SCOPE = 'agent-session:sizing' -const ID = '00000000-0000-4000-8000-000000000000' -function Composer({ text }: { text: string }) { - const input = useRef(null) - paste = useNativeChatPastedTextFile({ - scopeKey: SCOPE, - scopeEditor: () => input.current, - resolveAttachmentOwner: () => ({ - kind: 'runtime-session', - environmentId: 'e1', - sessionId: 's1', - pairingRevision: 7 - }), - insertTypedText: (value) => insertNativeChatPastedText(input.current, value), - setNotice: notice - }) - return ( - {}} - onSelect={() => {}} - /> - ) -} -afterEach(() => { - cleanup() - clearNativeChatComposerDraftsForTests() - nativeChatPastedTextOperations.clear() - vi.clearAllMocks() -}) -it.each([ - { draft: 'a'.repeat(200 * 1024), text: '"'.repeat(30 * 1024) }, - { draft: 'z'.repeat(240 * 1024), text: 'q'.repeat(50 * 1024), replace: 200 * 1024 }, - { draft: '', text: 'é'.repeat(16 * 1024 + 1) }, - { draft: '', text: "$& $$ $` $'".repeat(4000) }, - { draft: '', text: 'c'.repeat(20 * 1024), image: 'p'.repeat(240 * 1024) }, - { - draft: nativeChatPastedTextToken(ID), - text: 'q', - path: `/p/${'a'.repeat(256 * 1024 - 32)}` - } -])( - 'matches the actual JSON/UTF-8 send body, including selection and path bytes', - ({ draft, text, replace = 0, image = '', path = '' }) => { - useAppStore.setState({ runtimeStatusByEnvironmentId: new Map() }) - vi.stubGlobal('api', { ui: { savePastedTextAsFile: save } }) - updateNativeChatComposerDraft( - SCOPE, - { - text: draft, - images: image ? [{ id: 'i1', path: image }] : [], - pastedTextFiles: path ? { [ID]: path } : {} - }, - 'immediate' - ) - const view = render() - const editor = promptEditor(view.getByRole('textbox')) - act(() => { - if (replace) { - editor.commands.setTextSelection({ from: 1, to: replace + 1 }) - } else { - editor.commands.focus('end') - } - }) - const input = promptValue(view.getByRole('textbox')) - const candidate = replace ? text + input.slice(replace) : input + text - const projected = path - ? candidate.replace(nativeChatPastedTextToken(ID), () => `@${path} `) - : candidate - const body = structuredAgentSessionSendBody( - imageReferencesToPromptMarkers(projected, ['i1']), - image ? [{ path: image, previewUri: '' }] : [] - ) - const tooLarge = structuredAgentSessionBlocksTooLarge(body.blocks) - expect(tooLarge).toBe(Buffer.byteLength(JSON.stringify(body.blocks), 'utf8') > 256 * 1024) - act(() => void paste(text)) - expect(promptValue(view.getByRole('textbox'))).toBe(tooLarge ? input : candidate) - expect(save).not.toHaveBeenCalled() - expect(notice).toHaveBeenCalledTimes(tooLarge ? 1 : 0) - } -) diff --git a/src/renderer/src/components/native-chat/tools/runs/NativeChatToolRunCallCounts.test.tsx b/src/renderer/src/components/native-chat/tools/runs/NativeChatToolRunCallCounts.test.tsx deleted file mode 100644 index c7f2247c142..00000000000 --- a/src/renderer/src/components/native-chat/tools/runs/NativeChatToolRunCallCounts.test.tsx +++ /dev/null @@ -1,70 +0,0 @@ -// @vitest-environment happy-dom - -import '@testing-library/jest-dom/vitest' - -import { cleanup, render } from '@testing-library/react' -import { afterEach, describe, expect, it } from 'vitest' -import type { AgentJournalToolCallItem } from '../../../../../../shared/agent-session/journal/agent-session-journal-types' -import { interruptedAgentJournalToolCall } from '../../../../../../shared/agent-journal-tool-call-lifecycle' -import type { NativeChatBlock } from '../../../../../../shared/native-chat/native-chat-types' -import { projectStructuredItemToNativeChat } from '../../../../../../shared/agent-session/view/structured-agent-session-projection' -import { NativeChatToolRun } from './NativeChatToolRun' - -afterEach(cleanup) - -function runHeader(container: HTMLElement): HTMLElement { - const header = container.querySelector('button') - if (!header) { - throw new Error('run header did not render') - } - return header -} - -function projected(itemId: string, body: AgentJournalToolCallItem): NativeChatBlock[] { - return ( - projectStructuredItemToNativeChat({ itemId, sequence: 1, revision: 1, observedAt: 1, body }) - ?.blocks ?? [] - ) -} - -const output = (head: string) => ({ head, digest: 'd', byteLength: head.length, truncated: false }) - -function shell( - command: string, - state: AgentJournalToolCallItem['state'] -): AgentJournalToolCallItem { - return { kind: 'tool-call', name: 'shell', input: { command }, state } -} - -describe('NativeChatToolRun call counts', () => { - it('says a call a stop cut short was interrupted, not failed, and marks no success', () => { - const blocks = projected( - 'sleep', - interruptedAgentJournalToolCall({ - ...shell('sleep 20', 'running'), - output: output('partial') - }) - ) - const { container } = render( - - ) - const header = runHeader(container) - expect(header).toHaveTextContent('1 interrupted') - expect(header).not.toHaveTextContent('failed') - expect(header).toHaveAccessibleName(/Interrupted tool calls: 1/) - expect(header.querySelector('.lucide-check')).toBeNull() - }) - - it('names a failure and an interruption in one quiet mark', () => { - const blocks = [ - ...projected('false', { ...shell('false', 'failed'), output: output('exit 1') }), - ...projected('sleep', interruptedAgentJournalToolCall(shell('sleep 20', 'running'))) - ] - const { container } = render( - - ) - const header = runHeader(container) - expect(header).toHaveTextContent('1 failed, 1 interrupted') - expect(header).toHaveAccessibleName(/Failed tool calls: 1, Interrupted tool calls: 1/) - }) -}) diff --git a/src/renderer/src/lib/workspace/activation/worktree-activation-automation-filter.test.ts b/src/renderer/src/lib/workspace/activation/worktree-activation-automation-filter.test.ts index e51f999e112..b6f0953cec8 100644 --- a/src/renderer/src/lib/workspace/activation/worktree-activation-automation-filter.test.ts +++ b/src/renderer/src/lib/workspace/activation/worktree-activation-automation-filter.test.ts @@ -2,22 +2,12 @@ import { afterEach, describe, expect, it, vi } from 'vitest' import { useAppStore } from '@/store' import { activateAndRevealWorkspace, - activateAndRevealWorktree, activateAndRevealWorkspaceWithOutcome } from './worktree-activation' import { reportAgentWorkspaceActivation } from '@/lib/workspace/activation/worktree-activation-outcome' const { toastError } = vi.hoisted(() => ({ toastError: vi.fn() })) vi.mock('sonner', () => ({ toast: { error: toastError } })) -import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' -import './workspace-switch-user-act' - -// Main's answer to the window's layout commands, as a switch-on build sends them. -vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) => - ( - await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture') - ).runtimeRpcClientWithLayoutApply(await importOriginal()) -) const initialAppStoreState = useAppStore.getState() @@ -26,57 +16,6 @@ afterEach(() => { vi.clearAllMocks() }) -function makeAutomationWorktree() { - return makeWorktree({ - id: 'repo-1::/workspace/automation-run', - repoId: 'repo-1', - automationProvenance: { - kind: 'created-by-automation', - automationId: 'automation-1', - automationNameSnapshot: 'Nightly review', - automationRunId: 'run-1', - automationRunTitleSnapshot: 'Nightly review run', - createdAt: 123, - executionTargetType: 'local', - executionTargetId: 'local', - projectId: 'repo-1', - repoId: 'repo-1', - hostId: 'local' - } - }) -} - -function seedAutomationWorktreeState( - worktree: ReturnType, - overrides: Partial> = {} -): void { - useAppStore.setState({ - repos: [ - { - id: worktree.repoId, - path: '/workspace/repo', - displayName: 'repo', - badgeColor: '#000000', - addedAt: 0 - } - ], - worktreesByRepo: { [worktree.repoId]: [worktree] }, - activeRepoId: worktree.repoId, - activeView: 'terminal', - activeWorktreeId: worktree.id, - activeTabId: 'tab-1', - activeTabType: 'terminal', - tabsByWorktree: { [worktree.id]: [] }, - ptyIdsByTabId: {}, - everActivatedWorktreeIds: new Set([worktree.id]), - hideAutomationGeneratedWorkspaces: true, - markWorktreeVisited: vi.fn(), - recordWorktreeVisit: vi.fn(), - refreshGitHubForWorktreeIfStale: vi.fn(), - ...overrides - }) -} - describe('activateAndRevealWorktree automation filters', () => { it.each(['folder:removed', 'removed-worktree'])( 'returns an unreported refusal for missing %s and leaves existing selection alone', @@ -92,34 +31,6 @@ describe('activateAndRevealWorktree automation filters', () => { } ) - it('keeps workspace-list filters while the activity view is showing', () => { - const worktree = makeAutomationWorktree() - seedAutomationWorktreeState(worktree, { - sidebarBody: 'agents', - filterRepoIds: ['other-repo'] - }) - - activateAndRevealWorktree(worktree.id) - - const state = useAppStore.getState() - expect(state.hideAutomationGeneratedWorkspaces).toBe(true) - expect(state.filterRepoIds).toEqual(['other-repo']) - expect(state.sidebarBody).toBe('agents') - expect(state.pendingRevealWorktree).toBeNull() - }) - - it('leaves the activity view to lift filters and reveal when the caller asks for the list', () => { - const worktree = makeAutomationWorktree() - seedAutomationWorktreeState(worktree, { sidebarBody: 'agents' }) - - activateAndRevealWorktree(worktree.id, { showWorkspaceList: true }) - - const state = useAppStore.getState() - expect(state.sidebarBody).toBe('workspaces') - expect(state.hideAutomationGeneratedWorkspaces).toBe(false) - expect(state.pendingRevealWorktree?.worktreeId).toBe(worktree.id) - }) - it('stays in the activity view when a blocked folder activation fails', () => { const getFreshFolderWorkspacePathStatus = vi.fn(() => ({ path: '/gone', diff --git a/src/renderer/src/lib/workspace/activation/worktree-agent-live-surface-adoption-layout-owner.test.ts b/src/renderer/src/lib/workspace/activation/worktree-agent-live-surface-adoption-layout-owner.test.ts deleted file mode 100644 index 28af5f1408a..00000000000 --- a/src/renderer/src/lib/workspace/activation/worktree-agent-live-surface-adoption-layout-owner.test.ts +++ /dev/null @@ -1,172 +0,0 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest' -import type { WorkspaceSessionState } from '../../../../../shared/workspace-session/workspace-session-state-types' -import { loadWorkspaceLayoutWithoutReport } from '../../../../../shared/workspace-layout/workspace-layout-load' -import { nameBasedLoadContext } from '../../../../../shared/workspace-layout/workspace-layout-minted-ids' -import { publishWorkspaceLayout } from '../../../../../shared/workspace-layout/workspace-layout-published' -import { - addWorkspace, - emptySession, - GIT_KEY, - leaf -} from '../../../../../shared/workspace-layout/workspace-layout-session.test-fixture' -import type { WorkspaceLayoutChangeFrame } from '../../../../../shared/workspace-layout/workspace-layout-stream-frames' -import { bootWindowFromPartitions } from '../../../app-shell/startup-window-view.test-fixture' -import { provideLayoutFrameTerminalPanes } from '../../../runtime/workspace-layout/frames/layout-frame-terminal-panes' -import { - openWorkspaceLayoutFrameSync, - type WorkspaceLayoutFrameSync -} from '../../../runtime/workspace-layout/frames/workspace-layout-frame-sync' - -import { createStoreSessionMockApi } from '../../../store/testing/app-store-session-api.test-fixture' -import { createTestStore } from '../../../store/testing/app-store-test-fixture' -import { adoptLiveWorkspacePtySurfaces } from './worktree-agent-live-surface-adoption' -import type { LiveTerminalSurfaceOwnerIndex } from '../ownership/worktree-live-terminal-surface-owners' - -vi.mock('../../../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true })) -vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } })) - -type FrameDouble = { onFrame: ((frame: WorkspaceLayoutChangeFrame) => void) | null } -const frames = vi.hoisted((): FrameDouble => ({ onFrame: null })) -vi.mock('../../../runtime/workspace-layout/frames/runtime-layout-client', () => ({ - subscribeRuntimeLayout: ( - _target: unknown, - _params: unknown, - onFrame: (frame: WorkspaceLayoutChangeFrame) => void - ) => { - frames.onFrame = onFrame - return { close: () => {} } - } -})) - -createStoreSessionMockApi() - -const OTHER_PTY = `${GIT_KEY}@@aaaa0001` -const LEFT_PTY = `${GIT_KEY}@@aaaa0002` -const RIGHT_PTY = `${GIT_KEY}@@aaaa0003` - -type TerminalSpec = { - id: string - entityId?: string - leaves: [string, string?][] - split?: 'vertical' -} - -/** The window's copy: one shell tab. Main's: that tab and a split agent tab the window lacks, - * whose tab-bar id differs from its terminal id, as for a tab adopted from another window. */ -function sessions(splitPtyIds: [string?, string?] = [LEFT_PTY, RIGHT_PTY]): { - window: WorkspaceSessionState - main: WorkspaceSessionState -} { - const other: TerminalSpec = { id: 'tab-other', leaves: [[leaf(1), OTHER_PTY]] } - const split: TerminalSpec = { - id: 'entry-split', - entityId: 'tab-split', - leaves: [ - [leaf(2), splitPtyIds[0]], - [leaf(3), splitPtyIds[1]] - ], - split: 'vertical' - } - return { - window: addWorkspace(emptySession(), GIT_KEY, [{ id: 'group-a', tabs: [other] }]), - main: addWorkspace(emptySession(), GIT_KEY, [{ id: 'group-a', tabs: [other, split] }]) - } -} - -function snapshotOf(session: WorkspaceSessionState): WorkspaceLayoutChangeFrame { - const { layout } = loadWorkspaceLayoutWithoutReport('local', session, nameBasedLoadContext()) - return { - type: 'snapshot', - workspaces: Object.entries(layout.workspaces).map(([key, workspace]) => ({ - key, - layout: publishWorkspaceLayout(workspace, 'local') - })) - } -} - -const owners: LiveTerminalSurfaceOwnerIndex = new Map([ - [LEFT_PTY, { tabId: 'tab-split', paneKey: `tab-split:${leaf(2)}`, ptyId: LEFT_PTY }], - [RIGHT_PTY, { tabId: 'tab-split', paneKey: `tab-split:${leaf(3)}`, ptyId: RIGHT_PTY }] -]) - -const flushMicrotasks = () => new Promise((resolve) => setTimeout(resolve, 0)) - -describe('adopting live terminals in a layout-owner build', () => { - let sync: WorkspaceLayoutFrameSync | null = null - - beforeEach(() => { - sync?.close() - sync = null - provideLayoutFrameTerminalPanes({ - holdsTerminalPane: () => false, - terminalTab: () => undefined - }) - }) - - it('makes no tab or pane of its own before frames draw; the frame then draws the bound tab', async () => { - const { window: windowSession, main } = sessions() - const store = createTestStore() - await bootWindowFromPartitions(store, [{ hostId: 'local', session: windowSession }]) - sync = openWorkspaceLayoutFrameSync(store) - provideLayoutFrameTerminalPanes(sync) - // Main's snapshot is in, but the window has not started drawing from frames yet. - frames.onFrame!(snapshotOf(main)) - await flushMicrotasks() - const createTab = vi.spyOn(store.getState(), 'createTab') - const setTabLayout = vi.spyOn(store.getState(), 'setTabLayout') - - const adoption = await adoptLiveWorkspacePtySurfaces( - store.getState, - GIT_KEY, - [LEFT_PTY, RIGHT_PTY], - async () => owners - ) - - expect(adoption).toEqual({ surfaced: true, declinedPtyIds: [] }) - expect(createTab).not.toHaveBeenCalled() - expect(setTabLayout).not.toHaveBeenCalled() - expect(store.getState().tabsByWorktree[GIT_KEY]!.map((tab) => tab.id)).toEqual(['tab-other']) - - sync.start() - await flushMicrotasks() - const layout = store.getState().terminalLayoutsByTabId['tab-split'] - expect(layout?.root).toMatchObject({ - type: 'split', - direction: 'vertical', - first: { type: 'leaf', leafId: leaf(2) }, - second: { type: 'leaf', leafId: leaf(3) } - }) - expect(layout?.ptyIdsByLeafId).toEqual({ [leaf(2)]: LEFT_PTY, [leaf(3)]: RIGHT_PTY }) - // A later sweep finds both terminals owned. - await expect( - adoptLiveWorkspacePtySurfaces(store.getState, GIT_KEY, [LEFT_PTY, RIGHT_PTY], async () => { - throw new Error('not asked: nothing is unbound') - }) - ).resolves.toEqual({ surfaced: true, declinedPtyIds: [] }) - }) - - it('counts a terminal shown, then the snapshot arriving after the sweep draws its tab with no new sweep', async () => { - const { window: windowSession, main } = sessions() - const store = createTestStore() - await bootWindowFromPartitions(store, [{ hostId: 'local', session: windowSession }]) - sync = openWorkspaceLayoutFrameSync(store) - provideLayoutFrameTerminalPanes(sync) - sync.start() - const createTab = vi.spyOn(store.getState(), 'createTab') - const readOwners = vi.fn(async () => owners) - - await expect( - adoptLiveWorkspacePtySurfaces(store.getState, GIT_KEY, [LEFT_PTY, RIGHT_PTY], readOwners) - ).resolves.toEqual({ surfaced: true, declinedPtyIds: [] }) - - frames.onFrame!(snapshotOf(main)) - await flushMicrotasks() - - expect(store.getState().terminalLayoutsByTabId['tab-split']?.ptyIdsByLeafId).toEqual({ - [leaf(2)]: LEFT_PTY, - [leaf(3)]: RIGHT_PTY - }) - expect(createTab).not.toHaveBeenCalled() - expect(readOwners).toHaveBeenCalledOnce() - }) -}) diff --git a/src/renderer/src/lib/workspace/activation/worktree-reactivation-tab-forkbomb.test.ts b/src/renderer/src/lib/workspace/activation/worktree-reactivation-tab-forkbomb.test.ts index 6735f6f43b9..e50840c3a0e 100644 --- a/src/renderer/src/lib/workspace/activation/worktree-reactivation-tab-forkbomb.test.ts +++ b/src/renderer/src/lib/workspace/activation/worktree-reactivation-tab-forkbomb.test.ts @@ -8,33 +8,7 @@ import { waitForWorktreeAgentActivationGateForTests } from './worktree-agent-act import { makeCreatedAgentWorktree as makeWorktree } from '@/lib/workspace/activation/worktree-activation-created-agent.test-fixture' import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts' import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch' -import { loadWorkspaceLayoutWithoutReport } from '../../../../../shared/workspace-layout/workspace-layout-load' -import { nameBasedLoadContext } from '../../../../../shared/workspace-layout/workspace-layout-minted-ids' -import { publishWorkspaceLayout } from '../../../../../shared/workspace-layout/workspace-layout-published' -import { - addWorkspace, - emptySession -} from '../../../../../shared/workspace-layout/workspace-layout-session.test-fixture' -import type { WorkspaceLayoutChangeFrame } from '../../../../../shared/workspace-layout/workspace-layout-stream-frames' -import { provideLayoutFrameTerminalPanes } from '@/runtime/workspace-layout/frames/layout-frame-terminal-panes' import { layoutApplyTestDouble } from '@/runtime/workspace-layout/testing/layout-apply-test-double' -import { - openWorkspaceLayoutFrameSync, - type WorkspaceLayoutFrameSync -} from '@/runtime/workspace-layout/frames/workspace-layout-frame-sync' - -type FrameDouble = { onFrame: ((frame: WorkspaceLayoutChangeFrame) => void) | null } -const frames = vi.hoisted((): FrameDouble => ({ onFrame: null })) -vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', () => ({ - subscribeRuntimeLayout: ( - _target: unknown, - _params: unknown, - onFrame: (frame: WorkspaceLayoutChangeFrame) => void - ) => { - frames.onFrame = onFrame - return { close: () => {} } - } -})) const initialAppStoreState = useAppStore.getState() @@ -94,153 +68,12 @@ function baseState(worktree: ReturnType): Partial } } -let sync: WorkspaceLayoutFrameSync | null = null - -/** Main's snapshot: the restored pane it placed at window load, still bound to its live PTY. */ -function mainSnapshot(worktreeId: string, tabId: string, leafId: string, ptyId: string) { - const session = addWorkspace(emptySession(), worktreeId, [ - { id: 'group-main', tabs: [{ id: tabId, leaves: [[leafId, ptyId]] }] } - ]) - const { layout } = loadWorkspaceLayoutWithoutReport('local', session, nameBasedLoadContext()) - return { - type: 'snapshot' as const, - workspaces: Object.entries(layout.workspaces).map(([key, workspace]) => ({ - key, - layout: publishWorkspaceLayout(workspace, 'local') - })) - } -} - afterEach(() => { - sync?.close() - sync = null - provideLayoutFrameTerminalPanes({ holdsTerminalPane: () => false, terminalTab: () => undefined }) vi.unstubAllGlobals() useAppStore.setState(initialAppStoreState, true) }) describe('STA-1111 worktree reopen does not fork-bomb tabs', () => { - it('defers packaged-startup resume until restored PTYs finish reconnecting', async () => { - const worktree = { ...makeWorktree(), createdWithAgent: undefined } - useAppStore.setState({ - ...baseState(worktree), - workspaceSessionReady: false, - terminalStartupRestorationReady: false - }) - const leafId = '11111111-1111-4111-8111-111111111111' - const paneKey = `packaged-restart-pane:${leafId}` - const livePtyId = `${worktree.id}@@daemon-live` - useAppStore.setState({ - sleepingAgentSessionsByPaneKey: { - [paneKey]: { - paneKey, - tabId: 'packaged-restart-pane', - worktreeId: worktree.id, - agent: 'codex', - providerSession: { key: 'session_id', id: 'packaged-session' }, - prompt: 'resume prior task', - state: 'working', - origin: 'quit', - capturedAt: 1000, - updatedAt: 1000, - terminalTitle: 'Codex' - } - }, - terminalLayoutsByTabId: { - 'packaged-restart-pane': { - root: { type: 'leaf', leafId }, - activeLeafId: leafId, - expandedLeafId: null, - ptyIdsByLeafId: { [leafId]: livePtyId } - } - } - }) - const layoutApply = layoutApplyTestDouble() - vi.stubGlobal('window', { - api: { - runtime: { - call: vi.fn(async (request: { method: string; params?: unknown }) => - request.method === 'layout.apply' - ? layoutApply.call(request) - : request.method === 'terminal.list' - ? { - ok: true, - result: { - // The host still binds the restored PTY to its original pane. - terminals: [ - { - handle: 'restored-1', - ptyId: livePtyId, - worktreeId: worktree.id, - worktreePath: worktree.path, - branch: 'main', - tabId: 'packaged-restart-pane', - leafId, - title: 'Codex', - connected: true, - writable: true, - lastOutputAt: null, - preview: '' - } - ], - truncated: false, - hostScope: { hostIds: ['local'], omittedHostIds: [] } - } - } - : { ok: true, result: emptySessionTabsSnapshot(worktree.id) } - ) - }, - pty: { - listSessions: vi.fn(async () => [ - { - id: livePtyId, - cwd: worktree.path, - title: 'Codex', - agentOwnership: 'present' as const - } - ]) - } - } - }) - - if (ORCA_LAYOUT_OWNER_IS_MAIN) { - useAppStore.setState({ unifiedTabsByWorktree: { [worktree.id]: [] } }) - sync = openWorkspaceLayoutFrameSync(useAppStore) - provideLayoutFrameTerminalPanes(sync) - frames.onFrame!(mainSnapshot(worktree.id, 'packaged-restart-pane', leafId, livePtyId)) - } - - activateAndRevealWorktree(worktree.id) - const gate = waitForWorktreeAgentActivationGateForTests(worktree.id) - await Promise.resolve() - expect(useAppStore.getState().tabsByWorktree[worktree.id] ?? []).toHaveLength(0) - - useAppStore.setState({ - workspaceSessionReady: true, - terminalStartupRestorationReady: true - }) - await gate - if (sync) { - // The window asked main for nothing: main's frame draws the pane it placed. - expect(layoutApply.commands).toEqual([]) - sync.start() - await new Promise((resolve) => setTimeout(resolve, 0)) - } - const restored = useAppStore.getState() - expect(restored.tabsByWorktree[worktree.id]).toHaveLength(1) - expect(restored.terminalLayoutsByTabId['packaged-restart-pane']?.ptyIdsByLeafId?.[leafId]).toBe( - livePtyId - ) - // A frame-drawn row is a restored row: its pane, not the row, carries the binding until mount. - expect(restored.tabsByWorktree[worktree.id]?.[0]?.ptyId).toBe( - ORCA_LAYOUT_OWNER_IS_MAIN ? null : livePtyId - ) - // The host's pane, not a freshly minted duplicate surface. - expect(restored.tabsByWorktree[worktree.id]?.[0]?.id).toBe('packaged-restart-pane') - expect(restored.automaticAgentResumeClaimsByTabId).toEqual({}) - expect(restored.sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined() - }) - it('re-captured sleeping codex session resumes once, not once per reopen', async () => { const worktree = { ...makeWorktree(), createdWithAgent: undefined } useAppStore.setState(baseState(worktree)) diff --git a/src/renderer/src/lib/workspace/tabs/activate-tab-and-focus-pane.test.ts b/src/renderer/src/lib/workspace/tabs/activate-tab-and-focus-pane.test.ts deleted file mode 100644 index 14b76318150..00000000000 --- a/src/renderer/src/lib/workspace/tabs/activate-tab-and-focus-pane.test.ts +++ /dev/null @@ -1,90 +0,0 @@ -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { activateTabAndFocusPane } from './activate-tab-and-focus-pane' - -const setActiveTab = vi.hoisted(() => vi.fn()) -const setActiveTabType = vi.hoisted(() => vi.fn()) -const worktreeState = vi.hoisted(() => { - const state: { - activeWorktreeId: string | null - tabsByWorktree: Record - } = { activeWorktreeId: 'wt-1', tabsByWorktree: {} } - return state -}) - -vi.mock('@/store/index', () => ({ - useAppStore: { - getState: () => ({ - setActiveTab, - setActiveTabType, - activeWorktreeId: worktreeState.activeWorktreeId, - tabsByWorktree: worktreeState.tabsByWorktree - }) - } -})) - -describe('activateTabAndFocusPane', () => { - beforeEach(() => { - worktreeState.activeWorktreeId = 'wt-1' - worktreeState.tabsByWorktree = { 'wt-1': [{ id: 'tab-1' }], 'wt-2': [{ id: 'tab-2' }] } - setActiveTab.mockImplementation(() => undefined) - setActiveTabType.mockImplementation(() => undefined) - }) - - afterEach(() => { - vi.unstubAllGlobals() - vi.clearAllMocks() - }) - - it('cancels a pending pane focus frame when a newer activation starts', () => { - const frames = new Map() - let frameId = 0 - const cancelAnimationFrame = vi.fn((id: number) => frames.delete(id)) - const dispatchEvent = vi.fn() - vi.stubGlobal( - 'requestAnimationFrame', - vi.fn((callback: FrameRequestCallback) => { - frames.set(++frameId, callback) - return frameId - }) - ) - vi.stubGlobal('cancelAnimationFrame', cancelAnimationFrame) - vi.stubGlobal('window', { dispatchEvent }) - - activateTabAndFocusPane('tab-1', 'leaf-1') - activateTabAndFocusPane('tab-2', 'leaf-2', { - ackPaneKeyOnSuccess: 'tab-2:leaf-2', - flashFocusedPane: true, - scrollToBottomIfOutputSinceLastView: true - }) - - expect(setActiveTab).toHaveBeenNthCalledWith(1, 'tab-1') - expect(setActiveTab).toHaveBeenNthCalledWith(2, 'tab-2') - expect(cancelAnimationFrame).toHaveBeenCalledWith(1) - expect(dispatchEvent).not.toHaveBeenCalled() - for (const callback of frames.values()) { - callback(0) - } - expect(dispatchEvent).toHaveBeenCalledExactlyOnceWith( - expect.objectContaining({ - type: 'orca-focus-terminal-pane', - detail: { - tabId: 'tab-2', - leafId: 'leaf-2', - ackPaneKeyOnSuccess: 'tab-2:leaf-2', - flashFocusedPane: true, - scrollToBottomIfOutputSinceLastView: true - } - }) - ) - }) - - it("scopes the terminal reveal to the tab's own worktree, not the one the main window shows", () => { - vi.stubGlobal('requestAnimationFrame', vi.fn()) - vi.stubGlobal('cancelAnimationFrame', vi.fn()) - vi.stubGlobal('window', { dispatchEvent: vi.fn() }) - - activateTabAndFocusPane('tab-2', null) - - expect(setActiveTabType).toHaveBeenCalledExactlyOnceWith('terminal', 'wt-2') - }) -}) diff --git a/src/renderer/src/runtime/sync-runtime-graph/editor-buffer-dirty-readers.test.ts b/src/renderer/src/runtime/sync-runtime-graph/editor-buffer-dirty-readers.test.ts index b6ef1603d28..fb3ead0d0fa 100644 --- a/src/renderer/src/runtime/sync-runtime-graph/editor-buffer-dirty-readers.test.ts +++ b/src/renderer/src/runtime/sync-runtime-graph/editor-buffer-dirty-readers.test.ts @@ -2,9 +2,6 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { useAppStore } from '../../store/index' import type { AppState } from '../../store/types' import { buildEditorSessionData } from '../../lib/workspace/persistence/workspace-session' -import { buildRuntimeMobileOpenFilesProjection } from './sync-projections' -import { buildMobileSessionTabSnapshots } from './mobile-session-snapshots' -import { makeState } from './testing/sync-runtime-graph-test-harness' import type { Tab } from '../../../../shared/tab-types' vi.mock('@/lib/workspace/ownership/connection-context', () => ({ @@ -49,7 +46,7 @@ function dirtyThroughRecord(): { before: AppState; after: AppState } { return { before, after } } -describe('a dirty change on the buffer record reaches every openFiles reader', () => { +describe('dirty buffer records in saved editor sessions', () => { beforeEach(() => { resetEditorState() openMarkdownFile() @@ -71,23 +68,4 @@ describe('a dirty change on the buffer record reaches every openFiles reader', ( expect(save(before)).toBeUndefined() expect(save(after)).toBe('# edited\n') }) - - it('mobile session projections publish the dirty flag', () => { - const { before, after } = dirtyThroughRecord() - const markdownTab = (state: AppState) => - buildMobileSessionTabSnapshots( - makeState({ - openFiles: state.openFiles, - editorDrafts: state.editorDrafts, - unifiedTabsByWorktree: state.unifiedTabsByWorktree, - tabBarOrderByWorktree: { 'wt-1': [FILE_ID] } - }) - )[0]?.tabs.find((tab) => tab.type === 'markdown') - - expect(buildRuntimeMobileOpenFilesProjection(after.openFiles)).not.toBe( - buildRuntimeMobileOpenFilesProjection(before.openFiles) - ) - expect(markdownTab(before)).toMatchObject({ isDirty: false }) - expect(markdownTab(after)).toMatchObject({ isDirty: true }) - }) }) diff --git a/src/renderer/src/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab.test.ts deleted file mode 100644 index 838f96a207d..00000000000 --- a/src/renderer/src/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab.test.ts +++ /dev/null @@ -1,92 +0,0 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest' -import type * as ResolveOwnerModule from '@/lib/workspace/ownership/resolve-owner' - -const closeWebRuntimeSessionTabMock = vi.fn() -const ownerLookup = vi.hoisted(() => ({ calls: 0 })) - -vi.mock('../actions/web-runtime-session-tab-lifecycle', () => ({ - closeWebRuntimeSessionTab: (args: unknown) => closeWebRuntimeSessionTabMock(args) -})) - -vi.mock('@/lib/workspace/ownership/resolve-owner', async (importOriginal) => { - const actual = await importOriginal() - return { - ...actual, - runtimeEnvironmentIdUnlessTwin: ( - ...args: Parameters - ) => { - ownerLookup.calls += 1 - return actual.runtimeEnvironmentIdUnlessTwin(...args) - } - } -}) - -import { - notifyHostOfMirroredEditorClose, - type MirroredEditorCloseState -} from './close-mirrored-editor-tab' -import { - isWebSessionCloseIntentPending, - resetWebSessionCloseIntentForTests -} from './web-session-close-intent' -import { toHostSessionTabId } from '../../../../../shared/workspace-layout/terminal-surface-id' - -type OwnerHost = 'local' | 'runtime:env-1' - -function ownerRows(...hostIds: OwnerHost[]): Partial { - return { - repos: hostIds.map((hostId) => ({ id: 'repo', executionHostId: hostId })), - worktreesByRepo: { - repo: hostIds.map((hostId) => ({ - id: 'wt-1', - repoId: 'repo', - hostId, - ...(hostId === 'local' ? {} : { runtimeOwnerEnvironmentId: 'env-1' }) - })) - } - } -} - -function buildState(overrides: Partial = {}): MirroredEditorCloseState { - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: fixture rows carry only the fields notifyHostOfMirroredEditorClose and the owner resolver read. - return { - ...ownerRows('runtime:env-1'), - openFiles: [{ id: 'file-1', worktreeId: 'wt-1', mirroredFromRuntimeSession: true }], - unifiedTabsByWorktree: { - 'wt-1': [{ id: 'host-tab-1', entityId: 'file-1', contentType: 'editor' }] - }, - ...overrides - } as unknown as MirroredEditorCloseState -} - -describe('notifyHostOfMirroredEditorClose', () => { - beforeEach(() => { - closeWebRuntimeSessionTabMock.mockReset() - ownerLookup.calls = 0 - resetWebSessionCloseIntentForTests() - }) - - it('routes to the captured file owner when the workspace catalog disagrees', async () => { - const state = buildState() - state.openFiles = state.openFiles.map((file) => ({ ...file, runtimeEnvironmentId: 'env-2' })) - - expect(notifyHostOfMirroredEditorClose(state, 'wt-1', 'file-1')).toBe(true) - expect( - isWebSessionCloseIntentPending( - { environmentId: 'env-2' }, - 'wt-1', - toHostSessionTabId('host-tab-1'), - Date.now() - ) - ).toBe(true) - await vi.waitFor(() => - expect(closeWebRuntimeSessionTabMock).toHaveBeenCalledWith({ - worktreeId: 'wt-1', - tabId: 'host-tab-1', - environmentId: 'env-2', - reason: 'user' - }) - ) - expect(ownerLookup.calls).toBe(0) - }) -}) diff --git a/src/renderer/src/runtime/workspace-layout/commands/layout-owner-command.test.ts b/src/renderer/src/runtime/workspace-layout/commands/layout-owner-command.test.ts deleted file mode 100644 index 9c2ede77df3..00000000000 --- a/src/renderer/src/runtime/workspace-layout/commands/layout-owner-command.test.ts +++ /dev/null @@ -1,80 +0,0 @@ -import { - _resetLayoutOwnerPaneTreeHoldsForTests, - isTabPaneTreeHeld -} from '../intents/layout-owner-pane-tree-holds' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import '../server/server-layout-apply-routes' -import { endLayoutFramePositions, noteLayoutFramePosition } from '../frames/layout-frame-position' -import { sendLayoutCommandToOwner } from './layout-owner-command' -import { _resetLayoutOwnerPaneIntentsForTests } from '../intents/layout-owner-pane-intents' - -const mocks = vi.hoisted( - (): { - callRuntimeRpc: ReturnType - ownerEnvironmentId: string | null - } => ({ - callRuntimeRpc: vi.fn(), - ownerEnvironmentId: null - }) -) - -vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({ - callRuntimeRpc: mocks.callRuntimeRpc -})) -vi.mock('@/store/index', () => ({ useAppStore: { getState: () => ({}) } })) -vi.mock('@/lib/workspace/ownership/resolve-owner', () => ({ - runtimeEnvironmentIdUnlessTwin: () => mocks.ownerEnvironmentId, - runtimeEnvironmentIdForWorkspaceOwner: () => ({ - kind: 'resolved', - environmentId: mocks.ownerEnvironmentId - }) -})) - -const SPLIT = { - type: 'splitPane', - tabId: 'tab-1', - leafId: 'leaf-1', - direction: 'vertical' -} as const - -function handlers() { - return { apply: vi.fn(), asToday: vi.fn(), refused: vi.fn() } -} - -describe('sendLayoutCommandToOwner', () => { - afterEach(() => { - endLayoutFramePositions() - _resetLayoutOwnerPaneIntentsForTests() - _resetLayoutOwnerPaneTreeHoldsForTests() - }) - - beforeEach(() => { - mocks.callRuntimeRpc.mockReset() - mocks.ownerEnvironmentId = null - vi.spyOn(console, 'warn').mockImplementation(() => {}) - }) - - it('keeps the tab’s drawn tree from frames until its answer, and what awaits it, has run', async () => { - noteLayoutFramePosition(4) - mocks.callRuntimeRpc.mockResolvedValue({ ok: true, result: {}, frameSeq: 5 }) - const on = handlers() - const heldInCaller = Promise.withResolvers() - on.apply.mockImplementation(() => { - void Promise.resolve() - .then(() => undefined) - .then(() => heldInCaller.resolve(isTabPaneTreeHeld('tab-1'))) - throw new Error('handler failed') - }) - - sendLayoutCommandToOwner('worktree-1', SPLIT, on) - expect(isTabPaneTreeHeld('tab-1')).toBe(true) - await vi.waitFor(() => expect(mocks.callRuntimeRpc).toHaveBeenCalled()) - await new Promise((resolve) => setTimeout(resolve, 0)) - expect(isTabPaneTreeHeld('tab-1')).toBe(true) - - noteLayoutFramePosition(5) - expect(on.apply).toHaveBeenCalledOnce() - await expect(heldInCaller.promise).resolves.toBe(true) - await vi.waitFor(() => expect(isTabPaneTreeHeld('tab-1')).toBe(false)) - }) -}) From 3f829c851775fb7b1b7d9b60b90af22027794454 Mon Sep 17 00:00:00 2001 From: OrcaWin Date: Mon, 9 Nov 2026 05:02:05 -0800 Subject: [PATCH 39/90] test: remove low-value draft and editor save coverage (#40350) Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com> --- .../scripts/ci/sharding/ci-shard-timings.json | 3 - ...tor-save-queue-closed-view-records.test.ts | 47 ------- .../editor-save-queue-closed-view.test.ts | 15 --- .../queue/editor-save-queue-records.test.ts | 108 ---------------- .../queue/editor-save-shared-model.test.ts | 122 ------------------ .../native-chat-draft-retention.test.ts | 86 ------------ ...native-chat-launch-draft-adoption.test.tsx | 8 -- ...-native-chat-terminal-draft-pickup.test.ts | 99 -------------- .../use-native-chat-send-lifecycle.test.tsx | 62 --------- .../editor-close-pinned-sibling.test.ts | 6 - ...oating-editor-file-id-layout-owner.test.ts | 87 ------------- 11 files changed, 643 deletions(-) delete mode 100644 src/renderer/src/components/editor/save/queue/editor-save-queue-closed-view-records.test.ts delete mode 100644 src/renderer/src/components/editor/save/queue/editor-save-queue-records.test.ts delete mode 100644 src/renderer/src/components/editor/save/queue/editor-save-shared-model.test.ts delete mode 100644 src/renderer/src/components/native-chat/drafts/native-chat-draft-retention.test.ts delete mode 100644 src/renderer/src/components/native-chat/drafts/use-native-chat-terminal-draft-pickup.test.ts delete mode 100644 src/renderer/src/components/native-chat/session/terminal/send/use-native-chat-send-lifecycle.test.tsx delete mode 100644 src/renderer/src/store/slices/editor/file-ids/floating-editor-file-id-layout-owner.test.ts diff --git a/config/scripts/ci/sharding/ci-shard-timings.json b/config/scripts/ci/sharding/ci-shard-timings.json index e249ac44631..0df9e76c876 100644 --- a/config/scripts/ci/sharding/ci-shard-timings.json +++ b/config/scripts/ci/sharding/ci-shard-timings.json @@ -5001,13 +5001,10 @@ "src/renderer/src/components/editor/save/queue/editor-save-lossless-baseline.test.ts": 1990, "src/renderer/src/components/editor/save/transforms/editor-save-plugin-hook.test.ts": 2122, "src/renderer/src/components/editor/save/queue/editor-save-queue-bytes-owner.test.ts": 1667, - "src/renderer/src/components/editor/save/queue/editor-save-queue-closed-view-records.test.ts": 2137, "src/renderer/src/components/editor/save/queue/editor-save-queue-closed-view.test.ts": 2075, - "src/renderer/src/components/editor/save/queue/editor-save-queue-records.test.ts": 2036, "src/renderer/src/components/editor/save/queue/editor-save-queue-shared-records.test.ts": 2043, "src/renderer/src/components/editor/save/queue/editor-save-queue.test.ts": 1814, "src/renderer/src/components/editor/save/queue/editor-save-shared-model-dirty.test.ts": 1250, - "src/renderer/src/components/editor/save/queue/editor-save-shared-model.test.ts": 1239, "src/renderer/src/components/editor/model-lifetime/buffer-text/editor-shared-record-clean-view.test.ts": 1998, "src/renderer/src/components/editor/save/commands/editor-untitled-save-lifecycle.test.ts": 1485, "src/renderer/src/components/editor/image-png-export.chromium.test.ts": 212, diff --git a/src/renderer/src/components/editor/save/queue/editor-save-queue-closed-view-records.test.ts b/src/renderer/src/components/editor/save/queue/editor-save-queue-closed-view-records.test.ts deleted file mode 100644 index 7d63b2d7e44..00000000000 --- a/src/renderer/src/components/editor/save/queue/editor-save-queue-closed-view-records.test.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' - -import { - closedViewTab, - createClosedViewHarness, - type ClosedViewHarness -} from './editor-save-closed-view.test-fixture' - -vi.mock('@/lib/workspace/ownership/connection-context', () => ({ - getConnectionIdForFile: () => undefined -})) - -// A view opened before a reconnect: its captured connection generation no longer matches. - -describe('editor save queue: closed saving view, record changes', () => { - let h: ClosedViewHarness - - beforeEach(() => { - h = createClosedViewHarness() - }) - - afterEach(() => h.dispose()) - - // Wrap the save promise so this async function does not await the held write. - const startHeldSave = async (): Promise<{ saved: Promise }> => { - h.holdNextWrite() - const saved = h.queue.queueSave(h.view('A'), 'edit') - await vi.advanceTimersByTimeAsync(0) - return { saved } - } - - it('marks the record clean when only a read-only view is left', async () => { - h.store.setState({ openFiles: [] }) - h.store.setState({ - openFiles: [closedViewTab('A', 'wt-1'), { ...closedViewTab('log', 'wt-2'), readOnly: true }] - }) - h.type('A', 'edit') - expect(h.view('log').isDirty).toBe(true) - const { saved } = await startHeldSave() - h.closeView('A') - h.release() - await expect(saved).resolves.toBe('written') - - expect(h.view('log').isDirty).toBe(false) - expect(h.store.getState().editorDrafts.log).toBeUndefined() - }) -}) diff --git a/src/renderer/src/components/editor/save/queue/editor-save-queue-closed-view.test.ts b/src/renderer/src/components/editor/save/queue/editor-save-queue-closed-view.test.ts index 105bf28df59..69eb7cc2d3f 100644 --- a/src/renderer/src/components/editor/save/queue/editor-save-queue-closed-view.test.ts +++ b/src/renderer/src/components/editor/save/queue/editor-save-queue-closed-view.test.ts @@ -17,25 +17,10 @@ describe('editor save queue: the saving view closes mid-write', () => { beforeEach(() => { h = createClosedViewHarness() - expect(h.recordOf('A')).toBe(h.recordOf('B')) }) afterEach(() => h.dispose()) - it('a refused write banners the view left', async () => { - h.type('A', 'edit') - h.holdNextWrite(true) - const saved = h.queue.queueSave(h.view('A'), 'edit') - await vi.advanceTimersByTimeAsync(0) - h.closeView('A') - h.release() - await expect(saved).resolves.toBe('blocked-stale') - - expect(h.view('B').externalMutation).toBe('changed') - expect(h.view('B').isDirty).toBe(true) - expect(h.store.getState().editorDrafts.B).toBe('edit') - }) - it('writes through the view left when the writer closes while another record holds the file', async () => { // Divergent dirty drafts keep C off the A+B record, but both write the same file. h.store.setState({ openFiles: [] }) diff --git a/src/renderer/src/components/editor/save/queue/editor-save-queue-records.test.ts b/src/renderer/src/components/editor/save/queue/editor-save-queue-records.test.ts deleted file mode 100644 index 1688f46b784..00000000000 --- a/src/renderer/src/components/editor/save/queue/editor-save-queue-records.test.ts +++ /dev/null @@ -1,108 +0,0 @@ -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type { OpenFile } from '@/store/slices/editor/types/open-file' -import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' -import { createEditorSaveQueue } from './editor-save-queue' -import type { EditorSaveQueue } from './editor-save-queue-contract' -import { __clearSelfWriteRegistryForTests } from '../../external-changes/editor-self-write-registry' -import { - createEditorStore, - createFakeEditorDisk, - stubEditorWindowWithDisk, - withLoadedBaselines, - type FakeEditorDisk -} from '../../autosave/editor-autosave-controller-test-fixture' - -vi.mock('@/lib/workspace/ownership/connection-context', () => ({ - getConnectionIdForFile: () => undefined -})) - -const PATH = '/repo/a.ts' -const DELAY_MS = 1000 - -function tab(id: string, patch: Partial = {}): OpenFile { - return { - id, - filePath: PATH, - relativePath: 'a.ts', - worktreeId: 'wt-1', - language: 'typescript', - isDirty: false, - mode: 'edit', - ...patch - } -} - -describe('editor save queue: one autosave timer per record across its views', () => { - let disk: FakeEditorDisk - let store: ReturnType - let queue: EditorSaveQueue - - // Use the real middleware to join same-file views by identity. - const share = (views: OpenFile[]): void => { - store.setState({ openFiles: views }) - const recordIds = new Set(views.map((open) => store.getState().editorBufferIdOf[open.id])) - expect(recordIds.size).toBe(1) - } - const type = (viewId: string, text: string): void => { - store.getState().setEditorDraft(viewId, text) - store.getState().markFileDirty(viewId, true) - queue.syncAutoSave() - } - const view = (id: string): OpenFile => { - const found = store.getState().openFiles.find((openFile) => openFile.id === id) - if (!found) { - throw new Error(`no view ${id}`) - } - return found - } - const writtenContents = (): string[] => disk.fs.writeFile.mock.calls.map(([args]) => args.content) - - beforeEach(() => { - vi.useFakeTimers() - disk = stubEditorWindowWithDisk(createFakeEditorDisk({ [PATH]: '' })) - store = createEditorStore() - store.setState({ - worktreesByRepo: { - 'repo-1': [ - makeWorktree({ id: 'wt-1', repoId: 'repo-1', path: '/repo', hostId: 'local' }), - makeWorktree({ id: 'wt-2', repoId: 'repo-1', path: '/repo', hostId: 'local' }) - ] - } - }) - share([tab('w1'), tab('w2', { worktreeId: 'wt-2' })]) - withLoadedBaselines(store, disk) - queue = createEditorSaveQueue(store) - }) - - afterEach(() => { - queue.dispose() - __clearSelfWriteRegistryForTests() - vi.useRealTimers() - vi.unstubAllGlobals() - }) - - it('keeps the timer when the view that scheduled it closes', async () => { - type('w1', 'abc') - await vi.advanceTimersByTimeAsync(DELAY_MS / 2) - share([view('w2')]) - queue.syncAutoSave() - await vi.advanceTimersByTimeAsync(DELAY_MS) - - expect(writtenContents()).toEqual(['abc']) - expect(view('w2').isDirty).toBe(false) - }) - - it.each(['w1', 'w2'])( - 'schedules nothing for a conflicted record, whichever view (%s) typed', - async (typist) => { - store.getState().setExternalMutation('w2', 'changed') - expect(view('w1').externalMutation).toBe('changed') - type(typist, 'abc') - await vi.advanceTimersByTimeAsync(DELAY_MS * 2) - - expect(writtenContents()).toEqual([]) - expect(view('w1').isDirty).toBe(true) - expect(view('w2').isDirty).toBe(true) - } - ) -}) diff --git a/src/renderer/src/components/editor/save/queue/editor-save-shared-model.test.ts b/src/renderer/src/components/editor/save/queue/editor-save-shared-model.test.ts deleted file mode 100644 index 80898b0c226..00000000000 --- a/src/renderer/src/components/editor/save/queue/editor-save-shared-model.test.ts +++ /dev/null @@ -1,122 +0,0 @@ -// Keep text, disk baseline and conflict state synchronized across workspaces sharing one Monaco model. -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' - -import { __clearSelfWriteRegistryForTests } from '../../external-changes/editor-self-write-registry' -import { createEditorStore } from '../../autosave/editor-autosave-controller-test-fixture' -import { reloadTabContentFromDisk } from '../../external-changes/ExternalFileChangeBanner' -import { getDiskBaselineSignature } from '../../../../../../shared/file-write/disk-baseline-signature' - -import { GUARDED_PATH } from './editor-save-guarded-disk-fixture' -import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' -import { toast } from 'sonner' - -const mocks = vi.hoisted(() => ({ readRuntimeFileContent: vi.fn() })) -const storeRef = vi.hoisted((): { current: ReturnType | null } => ({ - current: null -})) - -vi.mock('sonner', () => ({ toast: Object.assign(vi.fn(), { error: vi.fn() }) })) -vi.mock('@/lib/workspace/ownership/connection-context', () => ({ - getConnectionIdForFile: () => undefined -})) -vi.mock('@/store/index', () => ({ useAppStore: { getState: () => storeRef.current?.getState() } })) -vi.mock('@/lib/file-owner-runtime-target', () => ({ - getRuntimeTargetForFileOwner: () => ({ kind: 'local' }) -})) -vi.mock('@/runtime/files/reads/runtime-file-read-client', async (importOriginal) => ({ - ...(await importOriginal()), - readRuntimeFileContent: mocks.readRuntimeFileContent -})) - -function openSharedTabs(disk: string) { - const store = createEditorStore() - storeRef.current = store - store.setState({ - worktreesByRepo: { - 'repo-1': [ - makeWorktree({ id: 'wt-1', repoId: 'repo-1', path: '/repo', hostId: 'local' }), - makeWorktree({ id: 'wt-2', repoId: 'repo-1', path: '/repo', hostId: 'local' }) - ] - } - }) - for (const worktreeId of ['wt-1', 'wt-2']) { - store.getState().openFile({ - filePath: GUARDED_PATH, - relativePath: 'file.ts', - worktreeId, - language: 'typescript', - mode: 'edit' - }) - } - const [a, b] = store.getState().openFiles - for (const tab of [a, b]) { - store.getState().setLastKnownDiskSignature(tab.id, getDiskBaselineSignature(disk)) - } - const edit = (id: string, text: string): void => { - store.getState().setEditorDraft(id, text) - store.getState().markFileDirty(id, true) - } - const tab = (id: string) => store.getState().openFiles.find((file) => file.id === id) - return { store, a, b, edit, tab } -} - -type ClickAction = { onClick: () => void } - -function isClickAction(value: unknown): value is ClickAction { - return ( - typeof value === 'object' && - value !== null && - 'onClick' in value && - typeof value.onClick === 'function' - ) -} - -describe('two tabs sharing one model', () => { - beforeEach(() => { - vi.useFakeTimers() - }) - - afterEach(() => { - vi.useRealTimers() - vi.unstubAllGlobals() - __clearSelfWriteRegistryForTests() - }) - - it('Reload discards both drafts and reloads both tabs', () => { - const { store, a, b, edit, tab } = openSharedTabs('A') - edit(a.id, 'mine') - edit(b.id, 'mine') - for (const id of [a.id, b.id]) { - store.getState().setExternalMutation(id, 'changed') - } - const reloadContent = vi.fn() - - reloadTabContentFromDisk(store.getState().openFiles[0], reloadContent) - - expect(reloadContent.mock.calls.map(([file]) => file.id).sort()).toEqual([a.id, b.id].sort()) - for (const id of [a.id, b.id]) { - expect(store.getState().editorDrafts[id]).toBeUndefined() - expect(tab(id)?.externalMutation).toBeUndefined() - } - }) - - it("Reload from a clean tab offers Undo of the sibling's discarded edits", () => { - const { store, a, b, edit } = openSharedTabs('A') - edit(b.id, 'mine') - for (const id of [a.id, b.id]) { - store.getState().setExternalMutation(id, 'changed') - } - const toastMock = vi.mocked(toast) - toastMock.mockClear() - reloadTabContentFromDisk(store.getState().openFiles[0], vi.fn()) - expect(store.getState().editorDrafts[b.id]).toBeUndefined() - - const undo: unknown = toastMock.mock.calls[0]?.[1]?.action - expect(isClickAction(undo)).toBe(true) - if (isClickAction(undo)) { - undo.onClick() - } - - expect(store.getState().editorDrafts[b.id]).toBe('mine') - }) -}) diff --git a/src/renderer/src/components/native-chat/drafts/native-chat-draft-retention.test.ts b/src/renderer/src/components/native-chat/drafts/native-chat-draft-retention.test.ts deleted file mode 100644 index 1ee21faf2e1..00000000000 --- a/src/renderer/src/components/native-chat/drafts/native-chat-draft-retention.test.ts +++ /dev/null @@ -1,86 +0,0 @@ -// @vitest-environment happy-dom -import { afterEach, expect, it, vi } from 'vitest' -import { clearNativeChatComposerDraftsForTests } from './native-chat-draft-reset' -import { - readNativeChatComposerDraft, - subscribeToNativeChatComposerDraft -} from './native-chat-composer-draft-store' -import { hydrateNativeChatComposerDrafts } from './native-chat-composer-draft-load' -import { nativeChatComposerDraftWritesSettled } from './native-chat-composer-draft-persistence' -import { - createMemoryNativeChatComposerDraftStorage, - setNativeChatComposerDraftStorageForTests, - type StoredNativeChatComposerDraft -} from './native-chat-composer-draft-storage' -import { records } from './native-chat-composer-draft-memory' -import { deleteWorkspaceChatDrafts } from '@/store/slices/worktrees/teardown/removed-worktree-chat-drafts' - -afterEach(() => { - vi.restoreAllMocks() - clearNativeChatComposerDraftsForTests() -}) -it('hydrates and explicitly deletes retained closed drafts with linear saved-record work at N and 10N', async () => { - for (const count of [100, 1000]) { - clearNativeChatComposerDraftsForTests() - localStorage.clear() - const storage = createMemoryNativeChatComposerDraftStorage() - for (let i = 0; i < count; i++) { - storage.drafts.set(`agent-session:closed-${i}`, { - text: `retained context ${i}\n${'text '.repeat(40)}`, - images: [], - owner: { - workspaceId: 'folder-workspace:kept', - executionHostId: i % 2 ? 'ssh:other' : 'local' - }, - savedAt: i + 1 - }) - } - let visits = 0 - class SavedRecords extends Map { - override *[Symbol.iterator](): Generator< - [string, StoredNativeChatComposerDraft], - undefined, - unknown - > { - for (const entry of super[Symbol.iterator]()) { - visits++ - yield entry - } - return undefined - } - } - const load = vi.fn(async () => new SavedRecords(storage.drafts)) - const write = vi.fn(storage.write) - const remove = vi.fn(storage.remove) - setNativeChatComposerDraftStorageForTests({ ...storage, loadAll: load, write, remove }) - await hydrateNativeChatComposerDrafts() - expect(load).toHaveBeenCalledOnce() - expect(visits).toBe(count) - expect(records.size).toBe(count) - const gets = vi.spyOn(records, 'get') - const affected = vi.fn(), - otherHost = vi.fn() - const off = subscribeToNativeChatComposerDraft('agent-session:closed-0', affected) - const offOther = subscribeToNativeChatComposerDraft('agent-session:closed-1', otherHost) - deleteWorkspaceChatDrafts({ - owners: [{ workspaceId: 'folder-workspace:kept', executionHostId: 'local' }], - conversations: [], - terminalTabIds: [] - }) - // Owner selection reads each saved record once; persistence may read the selected keys again. - expect(gets.mock.calls.length).toBeLessThanOrEqual(count * 2) - await nativeChatComposerDraftWritesSettled() - expect(records.size).toBe(count / 2) - expect(storage.drafts.size).toBe(count / 2) - expect(remove.mock.calls.flatMap(([keys]) => keys)).toHaveLength(count / 2) - expect(write).not.toHaveBeenCalled() - expect(affected).toHaveBeenCalledOnce() - expect(otherHost).not.toHaveBeenCalled() - expect(readNativeChatComposerDraft('agent-session:closed-1').text).toBe( - `retained context 1\n${'text '.repeat(40)}` - ) - off() - offOther() - gets.mockRestore() - } -}) diff --git a/src/renderer/src/components/native-chat/drafts/use-native-chat-launch-draft-adoption.test.tsx b/src/renderer/src/components/native-chat/drafts/use-native-chat-launch-draft-adoption.test.tsx index 5e5b75a909d..5d45218606a 100644 --- a/src/renderer/src/components/native-chat/drafts/use-native-chat-launch-draft-adoption.test.tsx +++ b/src/renderer/src/components/native-chat/drafts/use-native-chat-launch-draft-adoption.test.tsx @@ -110,12 +110,4 @@ describe('useNativeChatLaunchDraftSignal', () => { rerender({ messages: [turn], transcriptLoading: false }) expect(result.current.launchDraftResolved).toBe(true) }) - - it('does not resolve from an in-flight transcript that still shows recent turns', () => { - // In-flight reads may still show the previous generation’s tail. - const { result } = renderSignal([userTurn('u1', SEEDED_AT)], true) - - expect(result.current.launchDraftResolved).toBe(false) - expect(result.current.launchDraft).not.toBeNull() - }) }) diff --git a/src/renderer/src/components/native-chat/drafts/use-native-chat-terminal-draft-pickup.test.ts b/src/renderer/src/components/native-chat/drafts/use-native-chat-terminal-draft-pickup.test.ts deleted file mode 100644 index f0d8385c0ab..00000000000 --- a/src/renderer/src/components/native-chat/drafts/use-native-chat-terminal-draft-pickup.test.ts +++ /dev/null @@ -1,99 +0,0 @@ -// @vitest-environment happy-dom - -import { renderHook } from '@testing-library/react' -import { beforeEach, describe, expect, it, vi } from 'vitest' -import type { NativeChatLaunchDraft } from '@/components/native-chat/drafts/native-chat-launch-prompt' -import { useNativeChatTerminalDraftPickup } from './use-native-chat-terminal-draft-pickup' - -const mocks = vi.hoisted(() => { - const launchDrafts: Record = {} - return { - seedNativeChatLaunchDraft: vi.fn(), - resolveNativeChatLaunchDraft: vi.fn(), - launchDrafts - } -}) - -vi.mock('../../../store/index', () => ({ - useAppStore: { - getState: () => ({ - nativeChatLaunchDraftByTabId: mocks.launchDrafts, - seedNativeChatLaunchDraft: mocks.seedNativeChatLaunchDraft, - resolveNativeChatLaunchDraft: mocks.resolveNativeChatLaunchDraft - }) - } -})) - -function seed(overrides: Partial = {}): NativeChatLaunchDraft { - return { - tabId: 'tab-1', - agent: 'claude', - text: 'look at the flaky retry test', - createdAt: 1_000, - fromTerminal: true, - ...overrides - } -} - -describe('useNativeChatTerminalDraftPickup', () => { - beforeEach(() => { - vi.clearAllMocks() - mocks.launchDrafts = {} - }) - - type Props = { - launchDraft: NativeChatLaunchDraft | null - resolved: boolean - transcriptReady: boolean - } - - function render(initialProps: Props) { - const readTerminalDraft = vi.fn(() => 'typed in the terminal') - const hook = renderHook( - (props: Props) => - useNativeChatTerminalDraftPickup({ - terminalTabId: 'tab-1', - agent: 'claude', - launchSeed: { - launchDraft: props.launchDraft, - launchDraftResolved: props.resolved, - transcriptReady: props.transcriptReady, - ownsTabWideLaunchDraft: true, - readTerminalDraft - } - }), - { initialProps } - ) - return { hook, readTerminalDraft } - } - - const orcaDraft = seed({ fromTerminal: undefined }) - - it('reads the line once the transcript shows a draft Orca typed was already sent', () => { - const { hook, readTerminalDraft } = render({ - launchDraft: orcaDraft, - resolved: false, - transcriptReady: false - }) - expect(readTerminalDraft).not.toHaveBeenCalled() - - hook.rerender({ launchDraft: orcaDraft, resolved: true, transcriptReady: true }) - expect(readTerminalDraft).toHaveBeenCalledTimes(1) - expect(mocks.seedNativeChatLaunchDraft).toHaveBeenCalledWith( - expect.objectContaining({ text: 'typed in the terminal', fromTerminal: true }) - ) - }) - - it('never reads after a chat send takes the Orca draft before the transcript is ready', () => { - const { hook, readTerminalDraft } = render({ - launchDraft: orcaDraft, - resolved: false, - transcriptReady: false - }) - // The send drops the seed at once, while its clear may not have reached the terminal yet. - hook.rerender({ launchDraft: null, resolved: false, transcriptReady: false }) - hook.rerender({ launchDraft: null, resolved: false, transcriptReady: true }) - - expect(readTerminalDraft).not.toHaveBeenCalled() - }) -}) diff --git a/src/renderer/src/components/native-chat/session/terminal/send/use-native-chat-send-lifecycle.test.tsx b/src/renderer/src/components/native-chat/session/terminal/send/use-native-chat-send-lifecycle.test.tsx deleted file mode 100644 index 5b0eaee8290..00000000000 --- a/src/renderer/src/components/native-chat/session/terminal/send/use-native-chat-send-lifecycle.test.tsx +++ /dev/null @@ -1,62 +0,0 @@ -// @vitest-environment happy-dom - -import { act, renderHook } from '@testing-library/react' -import { afterEach, describe, expect, it, vi } from 'vitest' -import { useNativeChatSendLifecycle } from './use-native-chat-send-lifecycle' - -function handle(settleAfterMs = 500) { - return { cancel: vi.fn<() => void>(), settleAfterMs } -} - -describe('useNativeChatSendLifecycle', () => { - afterEach(() => { - vi.useRealTimers() - }) - - it('cancels owned writes when the PTY target changes and when the composer unmounts', () => { - vi.useFakeTimers() - const first = handle() - const second = handle() - const onPendingSendCanceled = vi.fn() - const { result, rerender, unmount } = renderHook( - ({ targetPtyId }) => useNativeChatSendLifecycle('tab-1', targetPtyId, onPendingSendCanceled), - { initialProps: { targetPtyId: 'pty-1' as string | null } } - ) - - act(() => result.current.trackPendingSend(first, 'pending-1')) - rerender({ targetPtyId: 'pty-2' }) - expect(first.cancel).toHaveBeenCalledOnce() - expect(onPendingSendCanceled).toHaveBeenCalledWith('pending-1') - - act(() => result.current.trackPendingSend(second, 'pending-2')) - unmount() - expect(second.cancel).toHaveBeenCalledOnce() - expect(onPendingSendCanceled).toHaveBeenCalledWith('pending-2') - }) - - it('keeps a renderer-stalled send cancelable past its nominal schedule', async () => { - vi.useFakeTimers() - let resolveSettled!: () => void - const stalled = { - ...handle(640), - settled: new Promise((resolve) => { - resolveSettled = resolve - }) - } - const onPendingSendCanceled = vi.fn() - const { result, rerender } = renderHook( - ({ targetPtyId }) => useNativeChatSendLifecycle('tab-1', targetPtyId, onPendingSendCanceled), - { initialProps: { targetPtyId: 'pty-1' as string | null } } - ) - - act(() => result.current.trackPendingSend(stalled, 'pending-1')) - act(() => vi.advanceTimersByTime(stalled.settleAfterMs + 1_000)) - rerender({ targetPtyId: 'pty-2' }) - - expect(stalled.cancel).toHaveBeenCalledOnce() - expect(onPendingSendCanceled).toHaveBeenCalledWith('pending-1') - await act(async () => { - resolveSettled() - }) - }) -}) diff --git a/src/renderer/src/store/slices/editor/closing/editor-close-pinned-sibling.test.ts b/src/renderer/src/store/slices/editor/closing/editor-close-pinned-sibling.test.ts index 57aae1a56a4..4dd3ce47f7c 100644 --- a/src/renderer/src/store/slices/editor/closing/editor-close-pinned-sibling.test.ts +++ b/src/renderer/src/store/slices/editor/closing/editor-close-pinned-sibling.test.ts @@ -55,12 +55,6 @@ function addPinnedSibling(): OpenFile { } describe('case 7: closing a document with a pinned clean sibling', () => { - it('keeps the pinned sibling record open', () => { - const sibling = addPinnedSibling() - store.getState().closeFile(file.id) - expect(store.getState().openFiles).toEqual([sibling]) - }) - it('keeps the pinned sibling tab and closes only the named tab', () => { addPinnedSibling() store.getState().closeFile(file.id) diff --git a/src/renderer/src/store/slices/editor/file-ids/floating-editor-file-id-layout-owner.test.ts b/src/renderer/src/store/slices/editor/file-ids/floating-editor-file-id-layout-owner.test.ts deleted file mode 100644 index 7566d1658cb..00000000000 --- a/src/renderer/src/store/slices/editor/file-ids/floating-editor-file-id-layout-owner.test.ts +++ /dev/null @@ -1,87 +0,0 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest' -import { createEditorTabsStore } from '../editor-slice-test-harness' -import { buildHydratedEditorSessionState } from '../hydration/hydrated-editor-session-state' -import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../../shared/constants' -import { LOCAL_EXECUTION_HOST_ID } from '../../../../../../shared/execution-host' -import { applyLayoutCommand } from '../../../../../../shared/workspace-layout/workspace-layout-commands' -import type { LayoutCommand } from '../../../../../../shared/workspace-layout/workspace-layout-command-types' -import type { WorkspaceLayoutModel } from '../../../../../../shared/workspace-layout/workspace-layout-model' -import { saveWorkspaceLayout } from '../../../../../../shared/workspace-layout/workspace-layout-save' -import { asLoaded } from '../../../../../../shared/workspace-layout/workspace-layout-command.test-fixture' - -const mocks = vi.hoisted(() => ({ - layoutOwnerIsMain: true, - callRuntimeRpc: vi.fn( - async (_target: unknown, _method: string, _params: { command: LayoutCommand }) => ({ - ok: true, - result: {} - }) - ) -})) - -vi.mock('../../../../../../shared/layout-owner-switch', () => ({ - get ORCA_LAYOUT_OWNER_IS_MAIN() { - return mocks.layoutOwnerIsMain - } -})) -vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({ - callRuntimeRpc: mocks.callRuntimeRpc -})) - -const WT = FLOATING_TERMINAL_WORKTREE_ID - -function openFloatingFile(): string { - const store = createEditorTabsStore() - store.setState({ - activeWorktreeId: WT, - groupsByWorktree: { [WT]: [{ id: 'g1', worktreeId: WT, activeTabId: null, tabOrder: [] }] }, - activeGroupIdByWorktree: { [WT]: 'g1' }, - unifiedTabsByWorktree: { [WT]: [] } - }) - return store.getState().openFile( - { - filePath: '/notes/a.md', - relativePath: 'a.md', - worktreeId: WT, - language: 'md', - mode: 'edit' - }, - { preview: false } - ) -} - -beforeEach(() => { - mocks.callRuntimeRpc.mockClear() -}) - -describe('floating workspace editor file ids', () => { - it('opens a floating file under the id restoring main’s copy gives it, with the switch on', () => { - mocks.layoutOwnerIsMain = true - const fileId = openFloatingFile() - - let main: WorkspaceLayoutModel = { - hostId: LOCAL_EXECUTION_HOST_ID, - workspaces: { [WT]: { worktreeId: WT, tabs: [], groups: [{ id: 'g1', tabOrder: [] }] } }, - records: {}, - legacy: { terminalRowOwners: {} } - } - for (const call of mocks.callRuntimeRpc.mock.calls) { - const applied = applyLayoutCommand(main, call[2].command, { - mintId: () => 'main-id', - mintLeafId: () => 'leaf-id', - now: () => 1 - }) - if (!applied.ok) { - throw new Error(applied.code) - } - main = applied.model - } - expect(main.workspaces[WT]!.tabs.map((tab) => tab.entityId)).toEqual([fileId]) - - // Every frame restores main's copy this way; the id must come back unchanged. - const saved = saveWorkspaceLayout(asLoaded(main)) - const restored = buildHydratedEditorSessionState(saved, new Set([WT]), null) - expect(restored.state.openFiles.map((file) => file.id)).toEqual([fileId]) - expect(saved.unifiedTabs?.[WT]?.map((tab) => tab.entityId)).toEqual([fileId]) - }) -}) From 0a7ce6e78f91cbf838bbdc6bc447979d2b59f316 Mon Sep 17 00:00:00 2001 From: OrcaWin Date: Mon, 9 Nov 2026 05:29:01 -0800 Subject: [PATCH 40/90] test: remove low-value bridge speech and lineage checks (#40356) Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com> --- .../scripts/ci/sharding/ci-shard-timings.json | 1 - ...-inspection-cadence-batching-benchmark.mjs | 141 ------------------ .../agent-lineage-cycle-cleanup-benchmark.mjs | 90 ----------- .../agent-lineage-reachability-benchmark.mjs | 118 --------------- package.json | 1 - ...gent-browser-bridge-keypress-input.test.ts | 3 +- .../agent-browser-bridge-cdp-endpoint.test.ts | 110 -------------- ...owser-bridge-raw-process-retention.test.ts | 72 --------- .../model-manager-progress-callback.test.ts | 75 ---------- .../node-speech-download-request.test.ts | 9 -- src/main/speech/openai-api-key-store.test.ts | 18 --- src/main/speech/stt-worker.test.ts | 6 - .../dashboard/agent-row-lineage-model.test.ts | 21 --- .../contracts/agent-status-subject.test.ts | 53 ------- .../title/agent-title-tracker.test.ts | 9 -- .../providers/hermes-terminal-title.test.ts | 17 --- .../transport/agent-status-osc.test.ts | 26 ---- 17 files changed, 2 insertions(+), 768 deletions(-) delete mode 100644 config/scripts/performance/agent-lineage/agent-inspection-cadence-batching-benchmark.mjs delete mode 100644 config/scripts/performance/agent-lineage/agent-lineage-cycle-cleanup-benchmark.mjs delete mode 100644 config/scripts/performance/agent-lineage/agent-lineage-reachability-benchmark.mjs delete mode 100644 src/main/browser/agent-browser/helper-process/agent-browser-bridge-cdp-endpoint.test.ts delete mode 100644 src/main/browser/agent-browser/helper-process/agent-browser-bridge-raw-process-retention.test.ts delete mode 100644 src/main/speech/model-manager-progress-callback.test.ts delete mode 100644 src/shared/agent-status/contracts/agent-status-subject.test.ts delete mode 100644 src/shared/agent-status/title/providers/hermes-terminal-title.test.ts diff --git a/config/scripts/ci/sharding/ci-shard-timings.json b/config/scripts/ci/sharding/ci-shard-timings.json index 0df9e76c876..4b124d87adf 100644 --- a/config/scripts/ci/sharding/ci-shard-timings.json +++ b/config/scripts/ci/sharding/ci-shard-timings.json @@ -7298,7 +7298,6 @@ "src/shared/agent-status/transport/agent-status-osc-pending-retention.test.ts": 154, "src/shared/agent-status/transport/agent-status-osc.test.ts": 104, "src/shared/agent-status/store/agent-status-store-reopen.test.ts": 199, - "src/shared/agent-status/contracts/agent-status-subject.test.ts": 171, "src/shared/agent-status/title/agent-status-tracker-program-activity.test.ts": 77, "src/shared/agent-launch/startup/agent-tui-input-clear.test.ts": 57, "src/shared/ai-vault/resume/ai-vault-resume-command.test.ts": 70, diff --git a/config/scripts/performance/agent-lineage/agent-inspection-cadence-batching-benchmark.mjs b/config/scripts/performance/agent-lineage/agent-inspection-cadence-batching-benchmark.mjs deleted file mode 100644 index ac0f0ec31af..00000000000 --- a/config/scripts/performance/agent-lineage/agent-inspection-cadence-batching-benchmark.mjs +++ /dev/null @@ -1,141 +0,0 @@ -#!/usr/bin/env node -// Measure real cadence picker against independent ±10% jitter over simulated time. -// TTL-deduped same-tick work shares one capture, so count distinct wake instants rather than pane wakes. -import { spawnSync } from 'node:child_process' -import fs from 'node:fs' -import nodeModule from 'node:module' -import path from 'node:path' -import process from 'node:process' -import { fileURLToPath, pathToFileURL } from 'node:url' - -if (!process.execArgv.includes('--experimental-transform-types')) { - const result = spawnSync( - process.execPath, - ['--experimental-transform-types', '--no-warnings', import.meta.filename], - { stdio: 'inherit' } - ) - process.exit(result.status ?? 1) -} - -nodeModule.registerHooks({ - resolve(specifier, context, nextResolve) { - if (specifier.startsWith('.') && !/\.[cm]?[jt]s$/.test(specifier) && context.parentURL) { - const candidate = new URL(`${specifier}.ts`, context.parentURL) - if (fs.existsSync(fileURLToPath(candidate))) { - return { url: candidate.href, shortCircuit: true } - } - } - return nextResolve(specifier, context) - } -}) - -const ROOT = path.resolve(import.meta.dirname, '../../../..') -const WINDOW_MS = Number(process.env.ORCA_INSPECTION_BENCH_WINDOW_MS ?? '60000') -const PANE_COUNTS = (process.env.ORCA_INSPECTION_BENCH_PANES ?? '1,2,4,8') - .split(',') - .map((value) => Number(value.trim())) - -if (!Number.isSafeInteger(WINDOW_MS) || WINDOW_MS <= 0) { - throw new Error(`ORCA_INSPECTION_BENCH_WINDOW_MS must be a positive integer, got ${WINDOW_MS}`) -} -for (const paneCount of PANE_COUNTS) { - if (!Number.isSafeInteger(paneCount) || paneCount <= 0) { - throw new Error(`ORCA_INSPECTION_BENCH_PANES entries must be positive, got ${paneCount}`) - } -} - -const { nextCadenceInspectionDelayMs } = await import( - pathToFileURL( - path.join( - ROOT, - 'src/renderer/src/components/terminal-pane/agent-completion/agent-completion-poll-interval.ts' - ) - ).href -) -const { POLL_TIER_INTERVAL_MS } = await import( - pathToFileURL( - path.join( - ROOT, - 'src/renderer/src/components/terminal-pane/agent-completion/agent-completion-poll-cadence.ts' - ) - ).href -) -const { PROCESS_TABLE_SNAPSHOT_MAX_STALENESS_MS } = await import( - pathToFileURL(path.join(ROOT, 'src/shared/process-table-snapshot-reader.ts')).href -) - -// Pre-change: independent ±10% jitter per pane, re-rolled on every reschedule. -function baselineDelayMs(baseMs) { - return Math.round(baseMs * (1 + (Math.random() * 0.2 - 0.1))) -} - -function simulate(paneCount, baseMs, pickDelay) { - const startedAt = 1_700_000_000_000 - const wakes = [] - for (let pane = 0; pane < paneCount; pane += 1) { - // Panes mount at arbitrary moments, which is what spreads them apart in the first place. - let clock = startedAt + Math.floor(Math.random() * baseMs) - while ((clock += pickDelay(baseMs, clock)) < startedAt + WINDOW_MS) { - wakes.push(clock) - } - } - // Snapshot TTL starts at actual capture, not epoch grid; nearby wakes reuse it. - let captures = 0 - let snapshotExpiresAt = -Infinity - for (const wakeAt of wakes.sort((left, right) => left - right)) { - if (wakeAt >= snapshotExpiresAt) { - captures += 1 - snapshotExpiresAt = wakeAt + PROCESS_TABLE_SNAPSHOT_MAX_STALENESS_MS - } - } - return captures -} - -function medianOf(rounds, run) { - const samples = Array.from({ length: rounds }, run).sort((left, right) => left - right) - return samples[Math.floor(samples.length / 2)] -} - -const baseMs = POLL_TIER_INTERVAL_MS.idle -console.log( - `Agent-completion cadence — whole-host \`ps\` captures over ${WINDOW_MS / 1000}s at the idle tier (${baseMs}ms)\n` -) -console.log('| visible panes | before | after | reduction |') -console.log('| --- | --- | --- | --- |') -for (const paneCount of PANE_COUNTS) { - const before = medianOf(21, () => simulate(paneCount, baseMs, baselineDelayMs)) - const after = medianOf(21, () => - simulate(paneCount, baseMs, (base, now) => - nextCadenceInspectionDelayMs({ - baseMs: base, - hasConsecutiveErrors: false, - alignToSharedGrid: true, - now - }) - ) - ) - // Short windows may yield no baseline captures; avoid meaningless division by zero. - const reduction = before > 0 ? `${(((before - after) / before) * 100).toFixed(0)}%` : 'n/a' - console.log(`| ${paneCount} | ${before} | ${after} | ${reduction} |`) -} - -// Detection latency must not regress: the grid deadline is always within one interval. -let worstDelay = 0 -for (let sample = 0; sample < 100_000; sample += 1) { - const now = 1_700_000_000_000 + sample * 7 - worstDelay = Math.max( - worstDelay, - nextCadenceInspectionDelayMs({ - baseMs, - hasConsecutiveErrors: false, - alignToSharedGrid: true, - now - }) - ) -} -if (worstDelay > baseMs) { - throw new Error(`grid alignment delayed a poll to ${worstDelay}ms, above the ${baseMs}ms tier`) -} -console.log( - `\nWorst observed wait: ${worstDelay}ms (tier interval ${baseMs}ms) — no inspection is ever delayed.` -) diff --git a/config/scripts/performance/agent-lineage/agent-lineage-cycle-cleanup-benchmark.mjs b/config/scripts/performance/agent-lineage/agent-lineage-cycle-cleanup-benchmark.mjs deleted file mode 100644 index 0693bc025a0..00000000000 --- a/config/scripts/performance/agent-lineage/agent-lineage-cycle-cleanup-benchmark.mjs +++ /dev/null @@ -1,90 +0,0 @@ -// Run: node --expose-gc config/scripts/agent-lineage-cycle-cleanup-benchmark.mjs [baseline-ref] -import assert from 'node:assert/strict' -import { execFileSync } from 'node:child_process' -import { readFile } from 'node:fs/promises' -import { performance } from 'node:perf_hooks' -import { transform } from 'esbuild' -import { buildCounterbalancedSchedule } from '../measurement/counterbalanced-benchmark-schedule.mjs' - -const sourcePath = 'src/renderer/src/components/dashboard/agent-row-lineage-model.ts' -const baseline = process.argv[2] ?? '20ab9950654' -const beforeSource = execFileSync('git', ['show', `${baseline}:${sourcePath}`], { - encoding: 'utf8', - windowsHide: true -}) -async function load(source) { - const { code } = await transform(source, { loader: 'ts', format: 'esm' }) - return (await import(`data:text/javascript;base64,${Buffer.from(code).toString('base64')}`)) - .buildAgentRowLineageTree -} -const before = await load(beforeSource) -const after = await load(await readFile(sourcePath, 'utf8')) - -function row(index, parent) { - return { - paneKey: `pane-${index}`, - entry: { - terminalHandle: `term-${index}`, - orchestration: parent === undefined ? undefined : { parentPaneKey: `pane-${parent}` } - } - } -} - -// Exercise duplicate keys, disconnected cycles, missing parents, and handle fallback. -let seed = 7391 -function random(max) { - seed = (Math.imul(seed, 1664525) + 1013904223) >>> 0 - return seed % max -} -for (let sample = 0; sample < 500; sample++) { - const rows = Array.from({ length: 40 }, () => { - const value = row(random(30), random(40)) - value.entry.orchestration.parentTerminalHandle = `term-${random(40)}` - value.entry.orchestration.coordinatorHandle = `term-${random(40)}` - return value - }) - if (sample % 2 === 0) { - rows.unshift(row('root', undefined)) - } - assert.deepEqual(after(rows), before(rows)) -} - -const results = [] -for (const [topology, count] of [ - ['flat', 1000], - ['all-cycles', 1000], - ['mixed-cycles', 100], - ['mixed-cycles', 500], - ['mixed-cycles', 1000] -]) { - const rows = Array.from({ length: count }, (_, index) => - row(index, topology === 'flat' ? undefined : index ^ 1) - ) - if (topology === 'mixed-cycles') { - rows.unshift(row('root', undefined)) - } - assert.deepEqual(after(rows), before(rows)) - for (let warmup = 0; warmup < 30; warmup++) { - before(rows) - after(rows) - } - const samples = { before: [], after: [] } - for (const pair of buildCounterbalancedSchedule(8, 'before', 'after')) { - for (const arm of pair) { - global.gc?.() - const run = arm === 'before' ? before : after - const cpu = process.cpuUsage() - const start = performance.now() - for (let iteration = 0; iteration < 30; iteration++) { - run(rows) - } - const wallMs = (performance.now() - start) / 30 - const used = process.cpuUsage(cpu) - samples[arm].push({ wallMs, cpuMs: (used.user + used.system) / 30_000 }) - } - } - results.push({ topology, count, samples }) -} -console.log( - JSON.stringify({ baseline, node: process.version, parityGraphs: 500, results }, null, 2) -) diff --git a/config/scripts/performance/agent-lineage/agent-lineage-reachability-benchmark.mjs b/config/scripts/performance/agent-lineage/agent-lineage-reachability-benchmark.mjs deleted file mode 100644 index bf881a2be79..00000000000 --- a/config/scripts/performance/agent-lineage/agent-lineage-reachability-benchmark.mjs +++ /dev/null @@ -1,118 +0,0 @@ -import assert from 'node:assert/strict' -import { readFileSync } from 'node:fs' -import { performance } from 'node:perf_hooks' -import { transform } from 'esbuild' -import { buildCounterbalancedSchedule } from '../measurement/counterbalanced-benchmark-schedule.mjs' -import { summarizeBenchmarkSamples } from '../measurement/benchmark-sample-summary.mjs' - -// git show :src/renderer/src/components/dashboard/agent-row-lineage-model.ts | node config/scripts/agent-lineage-reachability-benchmark.mjs -async function load(source) { - const { code } = await transform(source, { loader: 'ts', format: 'esm' }) - return (await import(`data:text/javascript;base64,${Buffer.from(code).toString('base64')}`)) - .buildAgentRowLineageTree -} -const implementations = { - before: await load(readFileSync(0, 'utf8')), - after: await load( - readFileSync('src/renderer/src/components/dashboard/agent-row-lineage-model.ts', 'utf8') - ) -} -function orderedTree(tree) { - return { - roots: tree.rootRows, - children: [...tree.childrenByParentPaneKey], - childKeys: [...tree.childPaneKeys] - } -} - -let seed = 42 -const random = (max) => { - seed = (Math.imul(seed, 1664525) + 1013904223) >>> 0 - return Math.floor((seed / 2 ** 32) * max) -} -let differentialCases = 0 -for (let trial = 0; trial < 5000; trial += 1) { - const count = random(100) - const rows = Object.freeze( - Array.from({ length: count }, (_, index) => - Object.freeze({ - paneKey: `pane-${random(count + 4)}`, - index, - entry: Object.freeze({ - terminalHandle: random(2) ? `term-${random(count)}` : undefined, - orchestration: Object.freeze({ - parentPaneKey: random(3) ? `pane-${random(count + 4)}` : undefined, - parentTerminalHandle: random(2) ? `term-${random(count)}` : undefined, - coordinatorHandle: random(2) ? `term-${random(count)}` : undefined - }) - }) - }) - ) - ) - assert.deepEqual( - orderedTree(implementations.after(rows)), - orderedTree(implementations.before(rows)) - ) - differentialCases += 1 -} - -const results = [] -for (const count of [8, 32, 128, 512, 1024]) { - for (const topology of ['flat', 'fanout', 'balanced', 'chain']) { - const rows = Array.from({ length: count }, (_, index) => { - const parent = - topology === 'fanout' - ? 0 - : topology === 'balanced' - ? Math.floor((index - 1) / 4) - : index - 1 - return { - paneKey: `pane-${index}`, - entry: { - orchestration: - index > 0 && topology !== 'flat' ? { parentPaneKey: `pane-${parent}` } : undefined - } - } - }) - const expected = orderedTree(implementations.before(rows)) - assert.deepEqual(orderedTree(implementations.after(rows)), expected) - const iterations = Math.max(5, Math.floor(10_000 / count)) - for (let warmup = 0; warmup < 20; warmup += 1) { - implementations.before(rows) - implementations.after(rows) - } - /** @type {{ before: number[], after: number[] }} */ - const samples = { before: [], after: [] } - for (const pair of buildCounterbalancedSchedule(8, 'before', 'after')) { - for (const arm of pair) { - let result - const started = performance.now() - for (let repeat = 0; repeat < iterations; repeat += 1) { - result = implementations[arm](rows) - } - samples[arm].push(performance.now() - started) - assert.deepEqual(orderedTree(result), expected) - } - } - results.push({ - count, - topology, - iterations, - meanMicrosecondsPerTree: Object.fromEntries( - Object.entries(samples).map(([arm, values]) => [ - arm, - (values.reduce((sum, ms) => sum + ms, 0) * 1000) / values.length / iterations - ]) - ), - before: summarizeBenchmarkSamples(samples.before), - after: summarizeBenchmarkSamples(samples.after) - }) - } -} -console.log( - JSON.stringify( - { node: process.version, platform: process.platform, differentialCases, results }, - null, - 2 - ) -) diff --git a/package.json b/package.json index faf04c0f277..ef3a28bdc7d 100644 --- a/package.json +++ b/package.json @@ -208,7 +208,6 @@ "bench:hang-watchdog-memory": "pnpm run ensure:electron-runtime && node config/scripts/diagnostics/hang-watchdog/hang-watchdog-memory-benchmark.mjs", "bench:main-thread-jank": "pnpm run ensure:electron-runtime && node tests/tools/benchmarks/main-thread-jank-bench.mjs", "bench:zustand-selector-fanout": "node config/scripts/performance/renderer-projection/zustand-selector-fanout-benchmark.mjs", - "bench:agent-inspection-cadence": "node config/scripts/performance/agent-lineage/agent-inspection-cadence-batching-benchmark.mjs", "bench:renderer-quadratic-scans": "node config/scripts/performance/renderer-markdown/renderer-quadratic-scan-benchmark.mjs", "bench:session-write-hot-path": "node config/scripts/performance/session-transcripts/session-write-hot-path-benchmark.mjs", "bench:terminal-partial-escape-tail": "node config/scripts/performance/terminal-stream/terminal-partial-escape-tail-benchmark.mjs", diff --git a/src/main/browser/agent-browser/commands/agent-browser-bridge-keypress-input.test.ts b/src/main/browser/agent-browser/commands/agent-browser-bridge-keypress-input.test.ts index 5cee79cc2dc..42896945463 100644 --- a/src/main/browser/agent-browser/commands/agent-browser-bridge-keypress-input.test.ts +++ b/src/main/browser/agent-browser/commands/agent-browser-bridge-keypress-input.test.ts @@ -79,7 +79,8 @@ describe('AgentBrowserBridge keypress input', () => { webContentsFromIdMock.mockImplementation((id: number) => (id === 100 ? wc : null)) }) - describe.each(['a', 'MediaPlayPause'])('target admission for %s', (key) => { + describe('target admission', () => { + const key = 'a' function registerTwoWorkspaces(): MockWebContents { const otherPage = mockWebContents(200) otherPage.debugger.sendCommand.mockResolvedValue({}) diff --git a/src/main/browser/agent-browser/helper-process/agent-browser-bridge-cdp-endpoint.test.ts b/src/main/browser/agent-browser/helper-process/agent-browser-bridge-cdp-endpoint.test.ts deleted file mode 100644 index 7c08b8cf623..00000000000 --- a/src/main/browser/agent-browser/helper-process/agent-browser-bridge-cdp-endpoint.test.ts +++ /dev/null @@ -1,110 +0,0 @@ -import type * as BrowserErrorTypes from '../../browser-error' -import { describe, it, expect, vi, beforeEach } from 'vitest' - -const { execFileMock, webContentsFromIdMock, existsSyncMock, readFileSyncMock, stdinWrites } = - vi.hoisted(() => ({ - execFileMock: vi.fn(), - webContentsFromIdMock: vi.fn(), - existsSyncMock: vi.fn(() => false), - readFileSyncMock: vi.fn(() => Buffer.from('')), - stdinWrites: new Array() - })) - -vi.mock('child_process', () => ({ execFile: execFileMock })) -vi.mock('fs', () => ({ - existsSync: existsSyncMock, - readFileSync: readFileSyncMock, - accessSync: vi.fn(), - chmodSync: vi.fn(), - constants: { X_OK: 1 } -})) -vi.mock('os', () => ({ platform: () => 'darwin', arch: () => 'arm64' })) -vi.mock('electron', () => { - return { - app: { getPath: vi.fn(() => '/app'), getAppPath: vi.fn(() => '/project'), isPackaged: false }, - webContents: { fromId: webContentsFromIdMock } - } -}) -const { CdpWsProxyMock, proxyStops } = vi.hoisted(() => { - const instances: unknown[] = [] - const proxyStops: ReturnType[] = [] - const MockClass = vi.fn().mockImplementation(function ( - this: Record, - _wc: unknown - ) { - this._wc = _wc - const endpoint = `ws://127.0.0.1:9222/token-${instances.length}` - this.start = vi.fn(async () => endpoint) - const stop = vi.fn(async () => {}) - this.stop = stop - proxyStops.push(stop) - this.getPort = vi.fn(() => 9222) - instances.push(this) - }) - return { CdpWsProxyMock: Object.assign(MockClass, { instances }), proxyStops } -}) - -vi.mock('../../cdp/transport/cdp-ws-proxy', () => ({ - CdpWsProxy: CdpWsProxyMock -})) -vi.mock('../../browser-error', () => ({ - BrowserError: class BrowserError extends Error { - code: string - constructor(code: string, message: string) { - super(message) - this.code = code - } - } -})) - -vi.mock('../../cdp/commands/cdp-bridge', async () => { - const { BrowserError } = await vi.importMock('../../browser-error') - return { BrowserError } -}) - -import { AgentBrowserBridge } from '../agent-browser-bridge' -import { - mockBrowserManager, - overrideBridgeWebContentsLookup, - resetAgentBrowserBridgeMocks, - succeedRecordingAgentBrowserSpawns -} from '../testing/agent-browser-bridge-test-harness' - -overrideBridgeWebContentsLookup(AgentBrowserBridge.prototype, webContentsFromIdMock) - -// agent-browser only reaches Orca's proxy through AGENT_BROWSER_CDP; `--cdp ` drops the token path. -describe('AgentBrowserBridge CDP endpoint contract', () => { - let bridge: AgentBrowserBridge - - beforeEach(() => { - resetAgentBrowserBridgeMocks({ - webContentsFromIdMock, - existsSyncMock, - readFileSyncMock, - stdinWrites, - cdpWsProxyInstances: CdpWsProxyMock.instances - }) - proxyStops.length = 0 - bridge = new AgentBrowserBridge(mockBrowserManager()) - bridge.setActiveTab(100) - }) - - it('passes the tokened endpoint only through env, for batch and raw CLI spawns', async () => { - const spawns = succeedRecordingAgentBrowserSpawns(execFileMock, stdinWrites, { - snapshot: '' - }) - - await bridge.snapshot() - await bridge.exec('--cdp 4444 get title') - - // The stale-session reset only closes a daemon; it must not name any CDP target. - const [reset, ...commands] = spawns - expect(reset).toMatchObject({ command: ['close'], cdp: undefined }) - expect(commands.map(({ command }) => command[0])).toEqual(['snapshot', 'get']) - for (const spawn of commands) { - expect(spawn.cdp).toBe('ws://127.0.0.1:9222/token-0') - expect(spawn.args).not.toContain('--cdp') - expect(spawn.args.join(' ')).not.toContain('token-0') - } - }) -}) diff --git a/src/main/browser/agent-browser/helper-process/agent-browser-bridge-raw-process-retention.test.ts b/src/main/browser/agent-browser/helper-process/agent-browser-bridge-raw-process-retention.test.ts deleted file mode 100644 index 453c60719e5..00000000000 --- a/src/main/browser/agent-browser/helper-process/agent-browser-bridge-raw-process-retention.test.ts +++ /dev/null @@ -1,72 +0,0 @@ -import * as childProcess from 'node:child_process' -import { mkdtempSync, rmSync } from 'node:fs' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, beforeEach, expect, it, vi } from 'vitest' - -const { userDataPath } = vi.hoisted(() => ({ userDataPath: { current: '' } })) - -vi.mock('electron', () => ({ - app: { - getPath: vi.fn(() => userDataPath.current), - getAppPath: vi.fn(() => userDataPath.current), - isPackaged: false - } -})) - -vi.mock('node:child_process', async (importOriginal) => { - const actual = await importOriginal() - return { ...actual, execFile: vi.fn(actual.execFile) } -}) - -import { AgentBrowserBridge } from '../agent-browser-bridge' -import { mockBrowserManager } from '../testing/agent-browser-bridge-test-harness' - -let bridge: AgentBrowserBridge - -beforeEach(() => { - vi.clearAllMocks() - userDataPath.current = mkdtempSync(join(tmpdir(), 'orca-agent-browser-retention-')) - bridge = new AgentBrowserBridge(mockBrowserManager()) - Object.defineProperty(bridge, 'agentBrowserBin', { value: process.execPath, configurable: true }) -}) - -afterEach(() => { - vi.restoreAllMocks() - rmSync(userDataPath.current, { recursive: true, force: true }) -}) - -function run(script: string): Promise { - return bridge['runAgentBrowserRaw']('orca-tab-retention', ['-e', script]) -} - -function rememberChild(script: string) { - const spawn = vi.mocked(childProcess.execFile) - const pending = run(script) - const result = spawn.mock.results[0] - if (result?.type !== 'return') { - throw new Error('Expected a real helper process') - } - const child = new WeakRef(result.value) - // Mock call records must not keep the completed helper alive. - spawn.mockClear() - return { pending, child } -} - -async function collect(): Promise { - if (!global.gc) { - throw new Error('This retention test requires --expose-gc') - } - for (let turn = 0; turn < 5; turn++) { - await new Promise((resolve) => setImmediate(resolve)) - global.gc() - } -} - -it('releases the completed helper before the fallback deadline while its bridge stays usable', async () => { - const { pending, child } = rememberChild("process.stdout.write('complete')") - expect(await pending).toBe('complete') - await collect() - expect(child.deref()).toBeUndefined() - expect(await run("process.stdout.write('next')")).toBe('next') -}) diff --git a/src/main/speech/model-manager-progress-callback.test.ts b/src/main/speech/model-manager-progress-callback.test.ts deleted file mode 100644 index 49cff109461..00000000000 --- a/src/main/speech/model-manager-progress-callback.test.ts +++ /dev/null @@ -1,75 +0,0 @@ -import { mkdtempSync, rmSync } from 'node:fs' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { describe, expect, it, vi } from 'vitest' -import { ModelManager } from './model-manager' -import { openElectronSpeechDownloadRequest } from '../host/electron-speech-services' - -vi.mock('electron', () => ({ - app: { - getPath: () => '/tmp/orca-speech-models-test' - } -})) - -type ModelManagerInternals = { - updateState: ( - modelId: string, - status: 'not-downloaded' | 'downloading' | 'extracting' | 'ready' | 'error', - progress?: number, - error?: string - ) => void -} - -describe('ModelManager progress callbacks', () => { - it('unsubscribes progress callbacks without replacing other listeners', () => { - const dir = mkdtempSync(join(tmpdir(), 'orca-model-manager-')) - try { - const manager = new ModelManager(dir, openElectronSpeechDownloadRequest) - const internals = manager as unknown as ModelManagerInternals - const first = vi.fn() - const second = vi.fn() - const clearFirst = manager.setProgressCallback(first) - const clearSecond = manager.setProgressCallback(second) - - internals.updateState('model-a', 'downloading', 0.25) - clearFirst() - internals.updateState('model-a', 'extracting') - clearSecond() - internals.updateState('model-a', 'ready') - - expect(first).toHaveBeenCalledTimes(1) - expect(first).toHaveBeenCalledWith('model-a', 0.25) - expect(second).toHaveBeenCalledTimes(2) - expect(second).toHaveBeenNthCalledWith(1, 'model-a', 0.25) - expect(second).toHaveBeenNthCalledWith(2, 'model-a', 0.95) - } finally { - rmSync(dir, { recursive: true, force: true }) - } - }) - - it('coalesces per-chunk download progress to whole percent', () => { - const dir = mkdtempSync(join(tmpdir(), 'orca-model-manager-')) - try { - const manager = new ModelManager(dir, openElectronSpeechDownloadRequest) - const internals = manager as unknown as ModelManagerInternals - const listener = vi.fn() - manager.setProgressCallback(listener) - - // A 500MB model over a 64KB chunk stream reports this many times. - for (let chunk = 0; chunk < 8_000; chunk += 1) { - internals.updateState('model-a', 'downloading', chunk / 8_000) - } - - expect(listener.mock.calls.map(([, progress]) => progress)).toEqual( - Array.from({ length: 101 }, (_unused, percent) => percent / 100) - ) - const afterDownload = listener.mock.calls.length - internals.updateState('model-a', 'extracting') - internals.updateState('model-a', 'ready') - internals.updateState('model-a', 'ready') - expect(listener.mock.calls.length).toBe(afterDownload + 3) - } finally { - rmSync(dir, { recursive: true, force: true }) - } - }) -}) diff --git a/src/main/speech/node-speech-download-request.test.ts b/src/main/speech/node-speech-download-request.test.ts index 394f7802ccf..1ace63cedfa 100644 --- a/src/main/speech/node-speech-download-request.test.ts +++ b/src/main/speech/node-speech-download-request.test.ts @@ -64,15 +64,6 @@ describe('openNodeSpeechDownloadRequest', () => { expect(listeners.response).not.toHaveBeenCalled() }) - it('hands any other response to the download', () => { - const handle = openNodeSpeechDownloadRequest('https://models.example/a.tar.bz2') - const listeners = { error: vi.fn(), response: vi.fn(), redirect: vi.fn() } - handle.listen(listeners) - const ok = incoming(206, { 'content-range': 'bytes 10-19/20' }) - lastRequest().emit('response', ok) - expect(listeners.response).toHaveBeenCalledWith(ok) - }) - // Abort emits after detach; an unhandled ClientRequest error crashes orcad. it('swallows the error abort raises after the download detached', () => { const handle = openNodeSpeechDownloadRequest('https://models.example/a.tar.bz2') diff --git a/src/main/speech/openai-api-key-store.test.ts b/src/main/speech/openai-api-key-store.test.ts index 73dd4ff7ce0..26a2dfc56e1 100644 --- a/src/main/speech/openai-api-key-store.test.ts +++ b/src/main/speech/openai-api-key-store.test.ts @@ -46,15 +46,6 @@ function writeStoredOpenAiKey(value: string): void { } describe('OpenAI speech API key store', () => { - it('checks configured status without decrypting or touching safeStorage', async () => { - writeStoredOpenAiKey('encrypted-key') - const store = await loadStoreModule() - - expect(store.hasOpenAiSpeechApiKey()).toBe(true) - expect(safeStorageMock.isEncryptionAvailable).not.toHaveBeenCalled() - expect(safeStorageMock.decryptString).not.toHaveBeenCalled() - }) - // #31174: orcad cannot open a key the desktop sealed with safeStorage, so it must not say ready. it('reports a stored key this host cannot decrypt as unusable', async () => { writeStoredOpenAiKey('v10\u0000ÿþ sealed by another store') @@ -77,13 +68,4 @@ describe('OpenAI speech API key store', () => { expect(store.canReadOpenAiSpeechApiKey()).toBe(false) expect(() => store.readOpenAiSpeechApiKey()).toThrow('OpenAI API key could not be decrypted') }) - - it('caches the decrypted key so repeated dictations do not repeatedly touch safeStorage', async () => { - writeStoredOpenAiKey('encrypted-key') - const store = await loadStoreModule() - - expect(store.readOpenAiSpeechApiKey()).toBe('encrypted-key') - expect(store.readOpenAiSpeechApiKey()).toBe('encrypted-key') - expect(safeStorageMock.decryptString).toHaveBeenCalledOnce() - }) }) diff --git a/src/main/speech/stt-worker.test.ts b/src/main/speech/stt-worker.test.ts index 588ab88be72..91f5c8c5031 100644 --- a/src/main/speech/stt-worker.test.ts +++ b/src/main/speech/stt-worker.test.ts @@ -21,10 +21,4 @@ describe('resampleToRate', () => { expect(second[1]).toBeCloseTo(0.00625, 6) expect(second[80]).toBeCloseTo(0.5, 6) }) - - it('keeps same-rate chunks unchanged', () => { - const samples = new Float32Array([0, 0.5, -0.5]) - - expect(resampleToRate(samples, 16000, 16000)).toBe(samples) - }) }) diff --git a/src/renderer/src/components/dashboard/agent-row-lineage-model.test.ts b/src/renderer/src/components/dashboard/agent-row-lineage-model.test.ts index 8c97efe2039..75d2e5688dc 100644 --- a/src/renderer/src/components/dashboard/agent-row-lineage-model.test.ts +++ b/src/renderer/src/components/dashboard/agent-row-lineage-model.test.ts @@ -100,27 +100,6 @@ describe('buildAgentRowLineageTree', () => { }) describe('unreachable lineage cleanup', () => { - it('bounds pane-key reads while flattening disconnected cycles', () => { - let paneKeyReads = 0 - const root = makeRow('root') - const cycles = Array.from({ length: 200 }, (_, index) => { - const row = makeRow(`cycle-${index}`, { parentPaneKey: `cycle-${index ^ 1}` }) - Object.defineProperty(row, 'paneKey', { - get() { - paneKeyReads++ - return `cycle-${index}` - } - }) - return row - }) - const tree = buildAgentRowLineageTree([root, ...cycles]) - const measuredReads = paneKeyReads - expect(tree.rootRows).toEqual([root, ...cycles]) - expect(tree.childrenByParentPaneKey.size).toBe(0) - expect(tree.childPaneKeys.size).toBe(0) - expect(measuredReads).toBeLessThanOrEqual(cycles.length * 20) - }) - it('preserves reachable edges and promotes the first disconnected duplicate in input order', () => { const root = makeRow('root') const child = makeRow('child', { parentPaneKey: 'root' }) diff --git a/src/shared/agent-status/contracts/agent-status-subject.test.ts b/src/shared/agent-status/contracts/agent-status-subject.test.ts deleted file mode 100644 index 7ce69af0b45..00000000000 --- a/src/shared/agent-status/contracts/agent-status-subject.test.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { - agentStatusSubjectsEqual, - makePtyAgentStatusSubject, - makePtyRunAgentStatusSubject, - makeStructuredAgentStatusSubject, - serializeAgentStatusSubject, - type AgentStatusExecutionScope -} from './agent-status-subject' -const SESSION_ID = 'session_11111111-1111-4111-8111-111111111111' - -function scope(overrides: Partial = {}): AgentStatusExecutionScope { - return { - executionHostId: 'local', - wslDistro: null, - workspaceId: 'workspace-1', - workspaceKind: 'git-worktree', - ...overrides - } -} - -describe('agent status subjects', () => { - it('isolates identical identities across scope and subject kind', () => { - const identity = 'identity-1' - const subjects = [ - makePtyRunAgentStatusSubject(scope(), identity), - makePtyRunAgentStatusSubject(scope({ wslDistro: 'Ubuntu' }), identity), - makePtyRunAgentStatusSubject(scope({ executionHostId: 'ssh:target-a' }), identity), - makePtyRunAgentStatusSubject(scope({ executionHostId: 'runtime:peer-a' }), identity), - makePtyRunAgentStatusSubject(scope({ workspaceId: 'workspace-2' }), identity), - makePtyRunAgentStatusSubject(scope({ workspaceKind: 'folder' }), identity), - makePtyAgentStatusSubject(scope(), identity), - makeStructuredAgentStatusSubject(scope(), identity) - ] - - expect(new Set(subjects.map(serializeAgentStatusSubject))).toHaveLength(subjects.length) - for (const [index, subject] of subjects.entries()) { - for (const other of subjects.slice(index + 1)) { - expect(agentStatusSubjectsEqual(subject, other)).toBe(false) - } - } - }) - - it('keeps the existing structured-session encoding byte-for-byte stable', () => { - const serialized = serializeAgentStatusSubject( - makeStructuredAgentStatusSubject(scope(), SESSION_ID) - ) - - expect(serialized).toBe( - 'agent-status-subject-v1:["structured-session","local",null,"workspace-1","git-worktree","session_11111111-1111-4111-8111-111111111111"]' - ) - }) -}) diff --git a/src/shared/agent-status/title/agent-title-tracker.test.ts b/src/shared/agent-status/title/agent-title-tracker.test.ts index 466dd55c8ce..e991f64ffd7 100644 --- a/src/shared/agent-status/title/agent-title-tracker.test.ts +++ b/src/shared/agent-status/title/agent-title-tracker.test.ts @@ -43,13 +43,4 @@ describe('createAgentStatusTracker', () => { tracker.handleTitle('Cursor ready') expect(onBecameIdle).toHaveBeenCalledTimes(1) }) - - it('does not fire when Factory Droid reports needs input during a working turn', () => { - const onBecameIdle = vi.fn() - const tracker = createAgentStatusTracker(onBecameIdle) - - tracker.handleTitle('⠋ Droid') - tracker.handleTitle('Factory Droid needs input') - expect(onBecameIdle).not.toHaveBeenCalled() - }) }) diff --git a/src/shared/agent-status/title/providers/hermes-terminal-title.test.ts b/src/shared/agent-status/title/providers/hermes-terminal-title.test.ts deleted file mode 100644 index fcc3caab0fb..00000000000 --- a/src/shared/agent-status/title/providers/hermes-terminal-title.test.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { hermesNativeTitleStatus } from './hermes-terminal-title' - -describe('Hermes native session title markers', () => { - it.each([ - ['hermes', '✓ Run Orca dispatched worker … · grok-4.7 · ~/workspace', 'idle'], - ['hermes', '⏳ Ready to deploy', 'working'], - ['hermes', '⚠ Finished the changes', 'permission'], - ['hermes', '⚠️ Waiting for approval', 'permission'], - ['hermes', 'user@host: ~/workspace', null], - ['hermes', '✓not a status marker', null], - ['codex', '✓ Run Orca dispatched worker …', null], - [null, '✓ Run Orca dispatched worker …', null] - ] as const)('classifies %s title %s as %s', (agent, title, expected) => { - expect(hermesNativeTitleStatus(title, agent)).toBe(expected) - }) -}) diff --git a/src/shared/agent-status/transport/agent-status-osc.test.ts b/src/shared/agent-status/transport/agent-status-osc.test.ts index 3c61b0caad2..6b4523425a6 100644 --- a/src/shared/agent-status/transport/agent-status-osc.test.ts +++ b/src/shared/agent-status/transport/agent-status-osc.test.ts @@ -33,30 +33,4 @@ describe('createAgentStatusOscProcessor', () => { expect(lastOffset, `split ${split}`).toBe(expected.lastPayloadCleanOffset) } }) - - it('applies the pending cap only to incomplete frames', () => { - const marker = '\x1b]9999;{"state":"working"}' - const atCap = marker + ' '.repeat(64 * 1024 - marker.length) - const retained = createAgentStatusOscProcessor() - expect(retained(`before${atCap}`).cleanData).toBe('before') - expect(retained('\x1b')).toEqual({ cleanData: '', payloads: [], lastPayloadCleanOffset: null }) - expect(retained('\\after').cleanData).toBe('\\after') - - const exact = createAgentStatusOscProcessor() - exact(atCap) - expect(exact('\x07after')).toEqual({ - cleanData: 'after', - payloads: [{ state: 'working', prompt: '' }], - lastPayloadCleanOffset: 0, - payloadCleanOffsets: [0] - }) - - const complete = createAgentStatusOscProcessor() - expect(complete(`${atCap} \x1b\\after`)).toEqual({ - cleanData: 'after', - payloads: [{ state: 'working', prompt: '' }], - lastPayloadCleanOffset: 0, - payloadCleanOffsets: [0] - }) - }) }) From f190139f032ff88ebdf1e32f98023a062da93544 Mon Sep 17 00:00:00 2001 From: Neil <4138956+nwparker@users.noreply.github.com> Date: Mon, 9 Nov 2026 05:36:44 -0800 Subject: [PATCH 41/90] fix(vm-recipes): keep a VM's checkout out of the sidebar until its create finishes (#40355) A recipe VM create registers the VM's project before its environment checks run, so the VM's primary checkout showed as a normal workspace next to the pending row while the checks ran or were paused on a failure. Hide that checkout in both sidebar list models until the create adopts it (or makes its worktree). A cancelled or failed create keeps it hidden while its VM is cleaned up; a VM that could not be cleaned up is shown again so it can be removed. --- .../listing/use-main-list-model.ts | 18 ++- .../listing/use-visible-worktrees.ts | 12 +- .../lib/ephemeral-vm-failed-create-cleanup.ts | 20 ++- .../src/lib/ephemeral-vm-worktree-creation.ts | 22 ++- .../lib/vm-create-hidden-checkouts.test.ts | 112 +++++++++++++ .../src/lib/vm-create-hidden-checkouts.ts | 152 ++++++++++++++++++ .../worktree-creation-flow-execute.ts | 7 +- .../create/pending-worktree-creation.ts | 3 +- .../worktrees-pending-creation-state.test.ts | 44 ++++- .../e2e/ssh-orcad-vm-provisioned-root.spec.ts | 134 ++++++++++++--- 10 files changed, 486 insertions(+), 38 deletions(-) create mode 100644 src/renderer/src/lib/vm-create-hidden-checkouts.test.ts create mode 100644 src/renderer/src/lib/vm-create-hidden-checkouts.ts diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-main-list-model.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-main-list-model.ts index c4faab59cdb..6c9fbe9abd5 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/use-main-list-model.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-main-list-model.ts @@ -9,6 +9,11 @@ import { } from '@/lib/sidebar-pending-layer' import { useSidebarListSession } from '@/lib/sidebar-list-session' import { readEndedCreations, subscribeEndedCreations } from '@/lib/sidebar-ended-creations' +import { + readHiddenVmCheckouts, + subscribeHiddenVmCheckouts, + withoutHiddenVmCheckouts +} from '@/lib/vm-create-hidden-checkouts' import '../../../../../../shared/folder-workspaces/folder-workspace-execution-host' import { getFolderWorkspaceHostId } from '../../../../../../shared/folder-workspaces/folder-workspace-host-id' import type { FolderWorkspace } from '../../../../../../shared/folder-workspaces/folder-workspace-types' @@ -73,6 +78,7 @@ export function useMainSidebarListModel(args: SidebarListModelArgs): SidebarList const feed = useDesktopSidebarFeed() const pending = useSyncExternalStore(subscribeSidebarPendingLayer, readSidebarPendingLayer) const endedCreationIds = useSyncExternalStore(subscribeEndedCreations, readEndedCreations) + const hiddenVmCheckouts = useSyncExternalStore(subscribeHiddenVmCheckouts, readHiddenVmCheckouts) const pendingCreationKeys = useAppStore( useShallow((s) => selectPendingWorktreeCreationKeys(s.pendingWorktreeCreations)) ) @@ -84,10 +90,13 @@ export function useMainSidebarListModel(args: SidebarListModelArgs): SidebarList const domains = useMemo( () => withWindowCreations( - overlaySidebarPendingLayer(feed?.domains ?? EMPTY_SIDEBAR_FEED_DOMAINS, pending, { - repos, - lineageById: args.worktreeLineageById - }), + withoutHiddenVmCheckouts( + overlaySidebarPendingLayer(feed?.domains ?? EMPTY_SIDEBAR_FEED_DOMAINS, pending, { + repos, + lineageById: args.worktreeLineageById + }), + hiddenVmCheckouts + ), pendingCreationKeys, endedCreationIds, hiddenCreationKeys @@ -98,6 +107,7 @@ export function useMainSidebarListModel(args: SidebarListModelArgs): SidebarList pendingCreationKeys, endedCreationIds, hiddenCreationKeys, + hiddenVmCheckouts, repos, args.worktreeLineageById ] diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.ts index 8917a0d2b3e..9a83fe32d62 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.ts @@ -1,5 +1,5 @@ import { selectSidebarLineageParentIdentities } from '@/store/slices/worktrees/metadata/cross-store-lineage-parents' -import { useMemo, useState } from 'react' +import { useMemo, useState, useSyncExternalStore } from 'react' import { shallow } from 'zustand/shallow' import type { AppState } from '@/store/types' import { useAppStore } from '@/store' @@ -24,6 +24,11 @@ import type { SidebarWorktreeFilters } from './use-filters' import { useReusedArrayIdentity } from './use-reused-array-identity' import { useSleepingSweepRetention } from './use-sleeping-sweep-retention' import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields' +import { + readHiddenVmCheckouts, + subscribeHiddenVmCheckouts, + withoutHiddenVmWorktrees +} from '@/lib/vm-create-hidden-checkouts' const EMPTY_WORKTREE_ID_SET: ReadonlySet = new Set() @@ -118,8 +123,9 @@ export function useVisibleSidebarWorktrees(args: { worktreeIdsWithStructuredChat }) + const hiddenVmCheckouts = useSyncExternalStore(subscribeHiddenVmCheckouts, readHiddenVmCheckouts) const recomputedVisibleWorktrees = useMemo(() => { - return computeVisibleWorktrees(worktreesByRepo, sortedIds, { + const visible = computeVisibleWorktrees(worktreesByRepo, sortedIds, { filterRepoIds, showSleepingWorkspaces, tabsByWorktree, @@ -148,7 +154,9 @@ export function useVisibleSidebarWorktrees(args: { ? [args.agentSendTargetWorktreeId] : undefined }) + return withoutHiddenVmWorktrees(visible, hiddenVmCheckouts) }, [ + hiddenVmCheckouts, args.agentSendTargetWorktreeId, worktreeIdsWithLiveAgent, sleepingSweepExemptWorktreeIds, diff --git a/src/renderer/src/lib/ephemeral-vm-failed-create-cleanup.ts b/src/renderer/src/lib/ephemeral-vm-failed-create-cleanup.ts index 3b8e555a2b6..0c517c440b9 100644 --- a/src/renderer/src/lib/ephemeral-vm-failed-create-cleanup.ts +++ b/src/renderer/src/lib/ephemeral-vm-failed-create-cleanup.ts @@ -3,17 +3,19 @@ import type { ExecutionHostId } from '../../../shared/execution-host' type FailedCreateCleanupActions = { deleteProjectHostSetup: (setupId: string, hostId: ExecutionHostId) => Promise - cleanupRuntime: (runtimeId: string) => Promise + /** Resolves with the runtime record; a failed destroy resolves rather than rejects. */ + cleanupRuntime: (runtimeId: string) => Promise<{ cleanupStatus?: string } | undefined> reportSetupError: (error: unknown) => void reportRuntimeError: (error: unknown) => void } +/** Resolves false when any cleanup step failed and the VM or its project may remain. */ export async function cleanupFailedEphemeralVmWorkspace( request: WorktreeCreationRequest, actions: FailedCreateCleanupActions -): Promise { +): Promise { if (!request.ephemeralVmRuntimeId) { - return + return true } if ( request.ephemeralVmCheckoutMode === 'provisioned-root' && @@ -26,16 +28,22 @@ export async function cleanupFailedEphemeralVmWorkspace( ) if (deleted == null) { actions.reportSetupError(new Error('Could not confirm project host rollback.')) - return + return false } } catch (error) { actions.reportSetupError(error) - return + return false } } try { - await actions.cleanupRuntime(request.ephemeralVmRuntimeId) + const runtime = await actions.cleanupRuntime(request.ephemeralVmRuntimeId) + if (runtime?.cleanupStatus === 'failed') { + actions.reportRuntimeError(new Error('The VM recipe could not destroy the VM.')) + return false + } + return true } catch (error) { actions.reportRuntimeError(error) + return false } } diff --git a/src/renderer/src/lib/ephemeral-vm-worktree-creation.ts b/src/renderer/src/lib/ephemeral-vm-worktree-creation.ts index 5347af12a6e..fb6604f8eda 100644 --- a/src/renderer/src/lib/ephemeral-vm-worktree-creation.ts +++ b/src/renderer/src/lib/ephemeral-vm-worktree-creation.ts @@ -7,6 +7,10 @@ import type { Repo } from '../../../shared/repo-types' import { translate } from '@/i18n/i18n' import { cleanupFailedEphemeralVmWorkspace } from '@/lib/ephemeral-vm-failed-create-cleanup' import { gateVmCreateOnEnvironmentCheck } from '@/lib/ephemeral-vm-environment-check' +import { + hideVmCreateCheckout, + settleVmCreateCheckoutAfterCleanup +} from '@/lib/vm-create-hidden-checkouts' import { appendProvisioningLog, appendProvisioningWarnings @@ -60,7 +64,14 @@ async function prepareEphemeralVmRecipeRequest( } : {}), provisionId: creationId, - setupExistingFolder: store.setupProjectExistingFolder + setupExistingFolder: async (args) => { + const setup = await store.setupProjectExistingFolder(args) + if (setup) { + // Why: until the create adopts it, the VM's primary checkout is not a workspace; the pending row stands for it. + hideVmCreateCheckout(creationId, { repoId: setup.repo.id, path: setup.repo.path }) + } + return setup + } }) } finally { unsubscribeProvisionEvents?.() @@ -119,7 +130,7 @@ async function prepareEphemeralVmRecipeRequest( preparedTarget.setup.repo.path ))) if (!proceed) { - await cleanupEphemeralVmRuntimeForFailedCreate(preparedRequest) + await cleanupEphemeralVmRuntimeForFailedCreate(preparedRequest, creationId) return null } useAppStore.getState().updatePendingWorktreeCreation(creationId, { @@ -182,10 +193,12 @@ function resolvePortableEphemeralVmProjectId(repo: Repo | undefined): string | n return key.startsWith('github:') ? key : null } +/** A VM cleaned up stays out of the sidebar; one that could not be is shown again so the user can remove it. */ export async function cleanupEphemeralVmRuntimeForFailedCreate( - request: WorktreeCreationRequest + request: WorktreeCreationRequest, + creationId: string ): Promise { - await cleanupFailedEphemeralVmWorkspace(request, { + const cleanedUp = await cleanupFailedEphemeralVmWorkspace(request, { deleteProjectHostSetup: (setupId, hostId) => useAppStore.getState().deleteProjectHostSetup({ setupId, hostId }), cleanupRuntime: (runtimeId) => window.api.ephemeralVm.cleanup({ runtimeId }), @@ -197,6 +210,7 @@ export async function cleanupEphemeralVmRuntimeForFailedCreate( error ) }) + settleVmCreateCheckoutAfterCleanup(creationId, cleanedUp) } export function getProvisionedRootSparseCheckoutError(): string { diff --git a/src/renderer/src/lib/vm-create-hidden-checkouts.test.ts b/src/renderer/src/lib/vm-create-hidden-checkouts.test.ts new file mode 100644 index 00000000000..87f2a584548 --- /dev/null +++ b/src/renderer/src/lib/vm-create-hidden-checkouts.test.ts @@ -0,0 +1,112 @@ +import { afterEach, describe, expect, it, vi } from 'vitest' +import { EMPTY_SIDEBAR_FEED_DOMAINS } from '../../../shared/sidebar-feed-client/sidebar-feed-snapshot' +import type { SidebarFeedDomains } from '../../../shared/sidebar-list/sidebar-feed-domains' +import { + hideVmCreateCheckout, + readHiddenVmCheckouts, + releaseVmCreateCheckout, + settleVmCreateCheckoutAfterCleanup, + subscribeHiddenVmCheckouts, + withoutHiddenVmCheckouts, + withoutHiddenVmWorktrees +} from './vm-create-hidden-checkouts' + +type Row = { repoId: string; path: string; isMainWorktree?: boolean } + +function domainsWith(workspaces: Row[], pairedServerRows: Row[]): SidebarFeedDomains { + // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the filter reads only repoId, path and isMainWorktree. + return { + ...EMPTY_SIDEBAR_FEED_DOMAINS, + workspaces: new Map(workspaces.map((row, i) => [`w${i}`, row])), + pairedServerRows: new Map(pairedServerRows.map((row, i) => [`p${i}`, row])) + } as unknown as SidebarFeedDomains +} + +function isListed(repoId: string, path = '/srv/repo'): boolean { + return ( + withoutHiddenVmWorktrees([{ repoId, path, isMainWorktree: true }], readHiddenVmCheckouts()) + .length === 1 + ) +} + +afterEach(() => { + releaseVmCreateCheckout('c1') + releaseVmCreateCheckout('c2') + vi.useRealTimers() +}) + +describe('withoutHiddenVmCheckouts', () => { + it('drops only the VM primary checkout while its create is in progress', () => { + const vmPrimary = { repoId: 'vm-repo', path: '/srv/repo', isMainWorktree: true } + const vmLinked = { repoId: 'vm-repo', path: '/srv/repo-wt', isMainWorktree: false } + const sameRepoIdElsewhere = { repoId: 'vm-repo', path: '/other', isMainWorktree: true } + const local = { repoId: 'local', path: '/srv/repo', isMainWorktree: true } + const domains = domainsWith([local], [vmPrimary, vmLinked, sameRepoIdElsewhere]) + + hideVmCreateCheckout('c1', { repoId: 'vm-repo', path: '/srv/repo/' }) + const filtered = withoutHiddenVmCheckouts(domains, readHiddenVmCheckouts()) + + expect([...filtered.pairedServerRows.values()]).toEqual([vmLinked, sameRepoIdElsewhere]) + expect(filtered.workspaces).toBe(domains.workspaces) + }) + + it('keeps the same domains object when nothing is hidden or nothing matches', () => { + const domains = domainsWith([{ repoId: 'a', path: '/a' }], []) + expect(withoutHiddenVmCheckouts(domains, readHiddenVmCheckouts())).toBe(domains) + hideVmCreateCheckout('c1', { repoId: 'b', path: '/b' }) + expect(withoutHiddenVmCheckouts(domains, readHiddenVmCheckouts())).toBe(domains) + }) +}) + +describe('withoutHiddenVmWorktrees', () => { + it('drops the hidden VM primary checkout from the window list and keeps identity otherwise', () => { + const vmPrimary = { id: 'vm', repoId: 'vm-repo', path: '/srv/repo', isMainWorktree: true } + const other = { id: 'o', repoId: 'local', path: '/srv/repo', isMainWorktree: true } + const list = [vmPrimary, other] + expect(withoutHiddenVmWorktrees(list, readHiddenVmCheckouts())).toBe(list) + + hideVmCreateCheckout('c1', { repoId: 'vm-repo', path: '/srv/repo' }) + expect(withoutHiddenVmWorktrees(list, readHiddenVmCheckouts())).toEqual([other]) + releaseVmCreateCheckout('c1') + expect(withoutHiddenVmWorktrees(list, readHiddenVmCheckouts())).toBe(list) + }) +}) + +describe('hidden VM checkout lifecycle', () => { + it('notifies subscribers when a checkout is hidden and released', () => { + const listener = vi.fn() + const unsubscribe = subscribeHiddenVmCheckouts(listener) + hideVmCreateCheckout('c1', { repoId: 'vm', path: '/srv/repo' }) + releaseVmCreateCheckout('c1') + releaseVmCreateCheckout('c1') + expect(listener).toHaveBeenCalledTimes(2) + unsubscribe() + }) + + it('shows a VM again when its cleanup failed, but not after it was cleaned up', () => { + vi.useFakeTimers() + hideVmCreateCheckout('c1', { repoId: 'failed-vm', path: '/srv/repo' }) + settleVmCreateCheckoutAfterCleanup('c1', false) + expect(isListed('failed-vm')).toBe(true) + + hideVmCreateCheckout('c2', { repoId: 'cleaned-vm', path: '/srv/repo' }) + settleVmCreateCheckoutAfterCleanup('c2', true) + // A cancel racing the create cleans up twice; the second, failing pass must not un-hide it. + settleVmCreateCheckoutAfterCleanup('c2', false) + expect(isListed('cleaned-vm')).toBe(false) + vi.runAllTimers() + expect(isListed('cleaned-vm')).toBe(true) + }) + + it("keeps a retry's checkout hidden while the previous attempt's cleanup settles", () => { + vi.useFakeTimers() + hideVmCreateCheckout('c1', { repoId: 'vm', path: '/srv/repo' }) + settleVmCreateCheckoutAfterCleanup('c1', true) + // Same host and path again: the retry's hide outlives the old attempt's. + hideVmCreateCheckout('c1', { repoId: 'vm', path: '/srv/repo' }) + vi.runAllTimers() + expect(isListed('vm')).toBe(false) + releaseVmCreateCheckout('c1') + expect(isListed('vm')).toBe(true) + }) +}) diff --git a/src/renderer/src/lib/vm-create-hidden-checkouts.ts b/src/renderer/src/lib/vm-create-hidden-checkouts.ts new file mode 100644 index 00000000000..8cdc5080fab --- /dev/null +++ b/src/renderer/src/lib/vm-create-hidden-checkouts.ts @@ -0,0 +1,152 @@ +import type { SidebarFeedDomains } from '../../../shared/sidebar-list/sidebar-feed-domains' +import { normalizeRuntimePathForComparison } from '../../../shared/cross-platform-path' + +/** A VM's primary checkout, registered on its host before the create that owns it finishes. */ +export type HiddenVmCheckout = { repoId: string; path: string } +type CheckoutRow = { repoId: string; path: string; isMainWorktree?: boolean } + +/** What the sidebar filters by; `repoIds` lets most rows skip building a path key. */ +export type HiddenVmCheckouts = { + readonly repoIds: ReadonlySet + readonly keys: ReadonlySet +} + +// Upper bound for a cleaned-up VM's rows to leave the lists (its host is retired asynchronously). +const HIDDEN_AFTER_CLEANUP_MS = 60_000 + +const EMPTY: HiddenVmCheckouts = { repoIds: new Set(), keys: new Set() } +type Hide = HiddenVmCheckout & { key: string } +// Keyed per hide, not per creation: a retry re-provisions under the same creation id while the +// previous attempt's cleaned-up VM may still be listed. +let hides = new Map() +const activeHideByCreation = new Map() +const cleanedHides = new Set() +let nextHideId = 1 +let hidden: HiddenVmCheckouts = EMPTY +const listeners = new Set<() => void>() + +function checkoutKey(repoId: string, path: string): string { + return `${repoId}\0${normalizeRuntimePathForComparison(path)}` +} + +function publish(next: Map): void { + hides = next + const values = [...next.values()] + hidden = + values.length === 0 + ? EMPTY + : { + repoIds: new Set(values.map((hide) => hide.repoId)), + keys: new Set(values.map((hide) => hide.key)) + } + listeners.forEach((listener) => listener()) +} + +function removeHide(hideId: number): void { + cleanedHides.delete(hideId) + if (!hides.has(hideId)) { + return + } + const next = new Map(hides) + next.delete(hideId) + publish(next) +} + +/** + * Why: a VM create registers the VM's project before its checks run and before the checkout is + * adopted or a worktree is made; the pending row stands for it until the create finishes. + */ +export function hideVmCreateCheckout(creationId: string, checkout: HiddenVmCheckout): void { + const hideId = nextHideId++ + activeHideByCreation.set(creationId, hideId) + publish( + new Map(hides).set(hideId, { ...checkout, key: checkoutKey(checkout.repoId, checkout.path) }) + ) +} + +/** The create finished: the checkout is now a workspace (or its project) the sidebar may list. */ +export function releaseVmCreateCheckout(creationId: string): void { + const hideId = activeHideByCreation.get(creationId) + if (hideId === undefined) { + return + } + activeHideByCreation.delete(creationId) + removeHide(hideId) +} + +/** + * A failed or cancelled create's VM cleanup finished. A VM that could not be cleaned up shows again + * so the user can remove it; a cleaned-up one stays hidden while its rows leave the lists. A later + * cleanup of the same create (a cancel racing the create) cannot un-hide a VM already cleaned up. + */ +export function settleVmCreateCheckoutAfterCleanup(creationId: string, cleanedUp: boolean): void { + const hideId = activeHideByCreation.get(creationId) + if (hideId === undefined || cleanedHides.has(hideId)) { + return + } + if (!cleanedUp) { + releaseVmCreateCheckout(creationId) + return + } + activeHideByCreation.delete(creationId) + cleanedHides.add(hideId) + setTimeout(() => removeHide(hideId), HIDDEN_AFTER_CLEANUP_MS) +} + +export function subscribeHiddenVmCheckouts(listener: () => void): () => void { + listeners.add(listener) + return () => listeners.delete(listener) +} + +export function readHiddenVmCheckouts(): HiddenVmCheckouts { + return hidden +} + +function isHidden(checkouts: HiddenVmCheckouts, row: CheckoutRow): boolean { + return ( + row.isMainWorktree !== false && + checkouts.repoIds.has(row.repoId) && + checkouts.keys.has(checkoutKey(row.repoId, row.path)) + ) +} + +/** The window's sidebar list without the primary checkouts of VMs whose creates are in progress. */ +export function withoutHiddenVmWorktrees( + worktrees: W[], + checkouts: HiddenVmCheckouts +): W[] { + if (checkouts.keys.size === 0) { + return worktrees + } + const kept = worktrees.filter((worktree) => !isHidden(checkouts, worktree)) + return kept.length === worktrees.length ? worktrees : kept +} + +function withoutHiddenRows( + rows: ReadonlyMap, + checkouts: HiddenVmCheckouts +): ReadonlyMap { + let kept: Map | null = null + for (const [key, row] of rows) { + if (isHidden(checkouts, row)) { + kept ??= new Map(rows) + kept.delete(key) + } + } + return kept ?? rows +} + +/** Main's rows without the primary checkouts of VMs whose creates are still in progress. */ +export function withoutHiddenVmCheckouts( + domains: SidebarFeedDomains, + checkouts: HiddenVmCheckouts +): SidebarFeedDomains { + if (checkouts.keys.size === 0) { + return domains + } + const workspaces = withoutHiddenRows(domains.workspaces, checkouts) + const pairedServerRows = withoutHiddenRows(domains.pairedServerRows, checkouts) + return workspaces === domains.workspaces && pairedServerRows === domains.pairedServerRows + ? domains + : { ...domains, workspaces, pairedServerRows } +} diff --git a/src/renderer/src/lib/workspace/creation/worktree-creation-flow-execute.ts b/src/renderer/src/lib/workspace/creation/worktree-creation-flow-execute.ts index bf95b767dfb..23955624b38 100644 --- a/src/renderer/src/lib/workspace/creation/worktree-creation-flow-execute.ts +++ b/src/renderer/src/lib/workspace/creation/worktree-creation-flow-execute.ts @@ -9,6 +9,7 @@ import { prepareRequestForCreate } from '@/lib/ephemeral-vm-worktree-creation' import { getProvisionedRootCreateOptions } from '@/lib/provisioned-root-create-options' +import { releaseVmCreateCheckout } from '@/lib/vm-create-hidden-checkouts' import { formatWorkspaceCreateError, getWorkspaceCreateErrorToastMessage @@ -125,7 +126,7 @@ export async function executeWorktreeCreation( return } if (preparedRequest.ephemeralVmRuntimeId) { - await cleanupEphemeralVmRuntimeForFailedCreate(preparedRequest) + await cleanupEphemeralVmRuntimeForFailedCreate(preparedRequest, creationId) } if (recoverWorktreeLegacyPreparation(creationId, preparedRequest, error)) { return @@ -145,10 +146,12 @@ export async function executeWorktreeCreation( // Why: cancellation can race a successful backend adoption; clean up again after it settles so an adopted workspace cannot outlive its destroyed VM. if (!useAppStore.getState().pendingWorktreeCreations[creationId]) { if (preparedRequest.ephemeralVmRuntimeId) { - await cleanupEphemeralVmRuntimeForFailedCreate(preparedRequest) + await cleanupEphemeralVmRuntimeForFailedCreate(preparedRequest, creationId) } return } + // The VM's checkout is now this workspace (or its project), so the sidebar may list it. + releaseVmCreateCheckout(creationId) await attachEphemeralVmRuntimeToWorkspace(preparedRequest, worktree.id) const backendSpawned = result.startupTerminal?.spawned === true diff --git a/src/renderer/src/store/slices/worktrees/create/pending-worktree-creation.ts b/src/renderer/src/store/slices/worktrees/create/pending-worktree-creation.ts index 155cb969d2c..d60e0d19c0b 100644 --- a/src/renderer/src/store/slices/worktrees/create/pending-worktree-creation.ts +++ b/src/renderer/src/store/slices/worktrees/create/pending-worktree-creation.ts @@ -3,6 +3,7 @@ import type { WorktreeSliceGet, WorktreeSliceSet } from '../listing/worktree-sli import type { AppState } from '../../../types' import { cleanupFailedEphemeralVmWorkspace } from '@/lib/ephemeral-vm-failed-create-cleanup' import { endWindowCreation } from '@/lib/sidebar-ended-creations' +import { settleVmCreateCheckoutAfterCleanup } from '@/lib/vm-create-hidden-checkouts' import { cancelVmEnvironmentCheck } from '@/lib/ephemeral-vm-environment-check-decision' import { pendingCreationChatDraftScopeKey, @@ -137,7 +138,7 @@ export function createRemovePendingWorktreeCreation( console.error('Failed to remove cancelled provisioned-root project setup:', error), reportRuntimeError: (error) => console.error('Failed to clean up cancelled ephemeral VM runtime:', error) - }) + }).then((cleanedUp) => settleVmCreateCheckoutAfterCleanup(creationId, cleanedUp)) } } diff --git a/src/renderer/src/store/slices/worktrees/create/worktrees-pending-creation-state.test.ts b/src/renderer/src/store/slices/worktrees/create/worktrees-pending-creation-state.test.ts index b9cef02c940..0ce94475804 100644 --- a/src/renderer/src/store/slices/worktrees/create/worktrees-pending-creation-state.test.ts +++ b/src/renderer/src/store/slices/worktrees/create/worktrees-pending-creation-state.test.ts @@ -8,6 +8,12 @@ import { resetRemoteRuntimeMocks, resetWorktreeSliceModuleMemory } from '../worktrees-slice-test-harness' +import { + hideVmCreateCheckout, + readHiddenVmCheckouts, + releaseVmCreateCheckout, + withoutHiddenVmWorktrees +} from '@/lib/vm-create-hidden-checkouts' const requestWorktreeBaseFallbackNotice = vi.hoisted(() => vi.fn()) @@ -25,7 +31,18 @@ vi.mock('@/components/worktree-base-fallback-notice', () => ({ requestWorktreeBaseFallbackNotice })) -beforeEach(resetWorktreeSliceModuleMemory) +beforeEach(() => { + resetWorktreeSliceModuleMemory() + releaseVmCreateCheckout('c1') + releaseVmCreateCheckout('c2') +}) + +function isCheckoutHidden(repoId: string): boolean { + return ( + withoutHiddenVmWorktrees([{ repoId, path: '/workspace/repo' }], readHiddenVmCheckouts()) + .length === 0 + ) +} function makePendingCreation( creationId: string, @@ -197,6 +214,31 @@ describe('pending worktree creation state', () => { expect(store.getState().pendingWorktreeCreations.c1).toBeUndefined() }) + it('keeps a cancelled VM checkout hidden once cleaned up, and shows it if the VM was not destroyed', async () => { + const store = createTestStore() + const request = { ...makePendingCreation('c1').request, ephemeralVmRuntimeId: 'runtime-1' } + store.getState().beginPendingWorktreeCreation(makePendingCreation('c1', { request })) + hideVmCreateCheckout('c1', { repoId: 'vm-repo', path: '/workspace/repo' }) + store.getState().removePendingWorktreeCreation('c1') + await vi.waitFor(() => expect(mockApi.ephemeralVm.cleanup).toHaveBeenCalledTimes(1)) + // Let the cleanup chain settle its hide before checking it was kept. + for (let i = 0; i < 10; i++) { + await Promise.resolve() + } + expect(isCheckoutHidden('vm-repo')).toBe(true) + + // A recipe whose destroy fails resolves a record rather than rejecting. + mockApi.ephemeralVm.cleanup.mockResolvedValueOnce({ cleanupStatus: 'failed' }) + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + store + .getState() + .beginPendingWorktreeCreation(makePendingCreation('c2', { request: { ...request } })) + hideVmCreateCheckout('c2', { repoId: 'vm-repo-2', path: '/workspace/repo' }) + store.getState().removePendingWorktreeCreation('c2') + await vi.waitFor(() => expect(isCheckoutHidden('vm-repo-2')).toBe(false)) + errorSpy.mockRestore() + }) + it('setActiveWorktree dismisses the creation panel even when re-selecting the already-active worktree', () => { const store = createTestStore() const wt = makeWorktree({ id: 'repo1::/path/a', repoId: 'repo1' }) diff --git a/tests/e2e/ssh-orcad-vm-provisioned-root.spec.ts b/tests/e2e/ssh-orcad-vm-provisioned-root.spec.ts index f436745acea..1076b2e976d 100644 --- a/tests/e2e/ssh-orcad-vm-provisioned-root.spec.ts +++ b/tests/e2e/ssh-orcad-vm-provisioned-root.spec.ts @@ -38,24 +38,8 @@ test('adopts a recipe-provisioned SSH root without creating a linked worktree', await waitForSessionReady(orcaPage) const sourceRepoId = await addRecipeRepo(orcaPage, sourceRepo) - await openSidebarWorkspaceComposer(orcaPage) - const dialog = orcaPage.getByRole('dialog', { name: /Create (Workspace|Worktree)/i }) - await expect(dialog).toBeVisible() - await dialog.getByRole('combobox', { name: 'Run on' }).click() - await orcaPage.getByRole('option', { name: /Per-Workspace Environment/ }).click() - await orcaPage - .getByRole('listbox', { name: 'Per-Workspace Environment' }) - .getByText('Docker provisioned root', { exact: true }) - .click() - const workspaceName = `provisioned-root-${Date.now()}` - await dialog.getByPlaceholder(/Type a name/i).fill(workspaceName) - await dialog.getByRole('button', { name: /Create (Workspace|Worktree)/i }).click() - const trustDialog = orcaPage.getByRole('dialog', { name: /Run VM recipe/ }) - await expect(trustDialog).toBeVisible() - await trustDialog.getByRole('button', { name: 'Run hooks' }).click() - - await expect(dialog).toBeHidden({ timeout: 60_000 }) + await startRecipeCreate(orcaPage, workspaceName) await expect(orcaPage.getByRole('option', { name: new RegExp(workspaceName) })).toBeVisible({ timeout: 240_000 }) @@ -138,6 +122,113 @@ test('adopts a recipe-provisioned SSH root without creating a linked worktree', } }) +test('hides the VM checkout while a create is paused on failed checks, and leaves nothing after cancel', async ({ + orcaPage +}, testInfo) => { + // The first connect deploys the VM's managed server before the checks can run. + test.setTimeout(420_000) + let target: DockerSshHostTarget | null = null + const sourceRepo = mkdtempSync(path.join(tmpdir(), 'orca-provisioned-root-source-')) + try { + ensureDockerSshHostImage(process.cwd()) + target = startDockerSshHostTarget(testInfo) + // The VM keeps a remote it cannot push to, so its environment checks fail and the create pauses. + seedRecipeRepo(sourceRepo, target, { reachableRemote: false }) + await waitForSessionReady(orcaPage) + const sourceRepoId = await addRecipeRepo(orcaPage, sourceRepo) + const reposBefore = await orcaPage.evaluate(() => + window.__store!.getState().repos.map((repo) => repo.id) + ) + + const workspaceName = `provisioned-root-${Date.now()}` + await startRecipeCreate(orcaPage, workspaceName) + const sidebar = orcaPage.getByRole('listbox', { name: 'Worktrees' }) + const pendingRow = sidebar.getByRole('button', { + name: new RegExp(`${workspaceName} Environment checks failed`) + }) + await expect(pendingRow).toBeVisible({ timeout: 240_000 }) + // The VM's checkout is in the store by now; the sidebar shows only the pending row for it. + await expect + .poll( + () => + orcaPage.evaluate( + ({ sourceRepoId, workspaceName }) => + Object.values(window.__store!.getState().worktreesByRepo) + .flat() + .some((wt) => wt.repoId !== sourceRepoId && wt.branch.endsWith(workspaceName)), + { sourceRepoId, workspaceName } + ), + { timeout: 30_000 } + ) + .toBe(true) + await expect(sidebar.getByRole('option', { name: new RegExp(workspaceName) })).toHaveCount(0) + await testInfo.attach('paused-vm-create-sidebar', { + body: await orcaPage.screenshot(), + contentType: 'image/png' + }) + + await sidebar.getByRole('button', { name: 'Cancel worktree creation' }).click() + await expect(pendingRow).toBeHidden() + const cancelled = target + await expect + .poll( + () => { + try { + execDockerSshHostTargetCommand(cancelled, 'true') + return false + } catch { + return true + } + }, + { timeout: 60_000, message: 'the cancelled VM was never destroyed' } + ) + .toBe(true) + await expect + .poll( + () => + orcaPage.evaluate( + (before) => + window + .__store!.getState() + .repos.filter((repo) => !before.includes(repo.id)) + .map((repo) => repo.id), + reposBefore + ), + { timeout: 30_000, message: 'the cancelled VM project was left behind' } + ) + .toEqual([]) + await expect(sidebar.getByRole('option', { name: new RegExp(workspaceName) })).toHaveCount(0) + await testInfo.attach('cancelled-vm-create-sidebar', { + body: await orcaPage.screenshot(), + contentType: 'image/png' + }) + } finally { + cleanupDockerSshHostTarget(target) + rmSync(sourceRepo, { recursive: true, force: true }) + } +}) + +async function startRecipeCreate( + page: Parameters[0], + workspaceName: string +): Promise { + await openSidebarWorkspaceComposer(page) + const dialog = page.getByRole('dialog', { name: /Create (Workspace|Worktree)/i }) + await expect(dialog).toBeVisible() + await dialog.getByRole('combobox', { name: 'Run on' }).click() + await page.getByRole('option', { name: /Per-Workspace Environment/ }).click() + await page + .getByRole('listbox', { name: 'Per-Workspace Environment' }) + .getByText('Docker provisioned root', { exact: true }) + .click() + await dialog.getByPlaceholder(/Type a name/i).fill(workspaceName) + await dialog.getByRole('button', { name: /Create (Workspace|Worktree)/i }).click() + const trustDialog = page.getByRole('dialog', { name: /Run VM recipe/ }) + await expect(trustDialog).toBeVisible() + await trustDialog.getByRole('button', { name: 'Run hooks' }).click() + await expect(dialog).toBeHidden({ timeout: 60_000 }) +} + async function addRecipeRepo(page: Parameters[0], repoPath: string) { return page.evaluate(async (pathValue) => { const result = await window.api.repos.add({ path: pathValue }) @@ -152,7 +243,11 @@ async function addRecipeRepo(page: Parameters[0], re }, repoPath) } -function seedRecipeRepo(repoPath: string, target: DockerSshHostTarget): string { +function seedRecipeRepo( + repoPath: string, + target: DockerSshHostTarget, + options: { reachableRemote: boolean } = { reachableRemote: true } +): string { const createScript = path.join(repoPath, 'create.sh') const destroyScript = path.join(repoPath, 'destroy.sh') // The recipe's isolated HOME must still address the engine that owns the fixture container. @@ -218,6 +313,9 @@ ${docker} rm -f ${quotePosixShell(target.containerName)} >/dev/null ) // Why: VM creates run the environment checks first, and a VM that cannot fetch or push its // remote pauses the create. Give the VM a remote it can reach so the create proceeds unattended. + if (!options.reachableRemote) { + return expectedRefHead + } const vmOrigin = '/tmp/provisioned-root-origin.git' execDockerSshHostTargetCommand( target, From 4c3dc7910880cc08d56ff993d482b33a99e2a417 Mon Sep 17 00:00:00 2001 From: OrcaWin Date: Mon, 9 Nov 2026 05:44:21 -0800 Subject: [PATCH 42/90] test: remove low-value messaging simulator and editor suites (#40363) Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com> --- .../scripts/ci/sharding/ci-shard-timings.json | 2 - src/main/linear/linear-issue-listing.test.ts | 49 --- .../messaging/agent-message-send.test.ts | 90 ------ .../agent-paste-draft-submit-retry.test.ts | 18 -- ...ve-agent-note-send-explicit-target.test.ts | 150 --------- ...ve-agent-note-send-focused-session.test.ts | 183 ----------- .../resume/agent-resume-launch-target.test.ts | 123 -------- .../appearance/code-editor-theme.test.ts | 91 ------ ...ile-operation-owner-interpretation.spec.ts | 230 -------------- .../editor-file-operation-owner.test.ts | 149 --------- .../execute-open-editor-path-move.test.ts | 205 ------------- ...p-open-editor-tabs-for-path-change.test.ts | 36 --- .../simulator-launch-coordination.test.ts | 62 ---- .../search/simulator-palette-search.test.ts | 36 +-- .../simulator-pane-shutdown-scheduler.test.ts | 125 -------- .../tabs/simulator-tab-layout-owner.test.ts | 287 ------------------ .../simulator-tab-palette-activation.test.ts | 21 -- 17 files changed, 1 insertion(+), 1856 deletions(-) delete mode 100644 src/main/linear/linear-issue-listing.test.ts delete mode 100644 src/renderer/src/lib/agent-session/messaging/agent-message-send.test.ts delete mode 100644 src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-explicit-target.test.ts delete mode 100644 src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-focused-session.test.ts delete mode 100644 src/renderer/src/lib/agent-session/resume/agent-resume-launch-target.test.ts delete mode 100644 src/renderer/src/lib/editor/appearance/code-editor-theme.test.ts delete mode 100644 src/renderer/src/lib/editor/file-operations/editor-file-operation-owner-interpretation.spec.ts delete mode 100644 src/renderer/src/lib/editor/file-operations/execute-open-editor-path-move.test.ts delete mode 100644 src/renderer/src/lib/simulator/launch/simulator-launch-coordination.test.ts delete mode 100644 src/renderer/src/lib/simulator/tabs/simulator-pane-shutdown-scheduler.test.ts delete mode 100644 src/renderer/src/lib/simulator/tabs/simulator-tab-layout-owner.test.ts diff --git a/config/scripts/ci/sharding/ci-shard-timings.json b/config/scripts/ci/sharding/ci-shard-timings.json index 4b124d87adf..af94b704dfe 100644 --- a/config/scripts/ci/sharding/ci-shard-timings.json +++ b/config/scripts/ci/sharding/ci-shard-timings.json @@ -6448,7 +6448,6 @@ "src/renderer/src/lib/clipboard-image-copy.test.ts": 243, "src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts": 526, "src/renderer/src/lib/cmd-j-linear-issue-intent.test.ts": 42, - "src/renderer/src/lib/editor/appearance/code-editor-theme.test.ts": 101, "src/renderer/src/lib/code-host-error-copy.test.ts": 297, "src/renderer/src/lib/codex-pane-selection-lane.test.ts": 543, "src/renderer/src/lib/agent-session/accounts/codex/codex-session-restart-shell-flap.test.ts": 1745, @@ -6471,7 +6470,6 @@ "src/renderer/src/lib/emulator-error-copy.test.ts": 415, "src/renderer/src/lib/ensure-hooks-confirmed.test.ts": 799, "src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts": 3601, - "src/renderer/src/lib/editor/file-operations/execute-open-editor-path-move.test.ts": 2458, "src/renderer/src/runtime/hosts/platform/execution-host-facts.test.ts": 1796, "src/renderer/src/lib/feature-education-telemetry.test.ts": 52, "src/renderer/src/lib/feedback-image-attachments.test.ts": 557, diff --git a/src/main/linear/linear-issue-listing.test.ts b/src/main/linear/linear-issue-listing.test.ts deleted file mode 100644 index f29c88d3acd..00000000000 --- a/src/main/linear/linear-issue-listing.test.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { beforeEach, expect, it, vi } from 'vitest' -import { listIssues } from './linear-issue-listing' - -const { getClients, rawRequest } = vi.hoisted(() => ({ - getClients: vi.fn(), - rawRequest: vi.fn() -})) - -vi.mock('./client', () => ({ getClients, isAuthError: () => false })) -vi.mock('./linear-token-store', () => ({ clearToken: vi.fn() })) -vi.mock('./linear-request-concurrency', () => ({ acquire: vi.fn(), release: vi.fn() })) - -const issue = { - id: 'issue-1', - identifier: 'ENG-1', - title: 'Task', - url: 'https://linear.app/acme/issue/ENG-1/task', - priority: 0, - updatedAt: '2026-11-09T00:00:00.000Z', - state: { name: 'In Progress', type: 'started', color: '#f2c94c' }, - team: { id: 'team-1', name: 'Engineering', key: 'ENG' }, - project: { id: 'project-1', name: 'Hardware verification', url: null, color: '#f7c8c1' } -} - -beforeEach(() => { - vi.clearAllMocks() - getClients.mockReturnValue([ - { - workspace: { id: 'workspace-1', organizationName: 'Workspace' }, - client: { client: { rawRequest } } - } - ]) - rawRequest.mockResolvedValue({ - data: { issues: { nodes: [issue], pageInfo: { hasNextPage: false } } } - }) -}) - -it('requests and preserves the project on open issue rows', async () => { - const result = await listIssues('open', 20, 'workspace-1') - - expect(result.items).toHaveLength(1) - expect(result.items[0].project).toStrictEqual({ - id: 'project-1', - name: 'Hardware verification', - url: undefined, - color: '#f7c8c1' - }) - expect(rawRequest.mock.calls[0][0]).toMatch(/project \{\s*id\s+name\s+url\s+color\s*\}/) -}) diff --git a/src/renderer/src/lib/agent-session/messaging/agent-message-send.test.ts b/src/renderer/src/lib/agent-session/messaging/agent-message-send.test.ts deleted file mode 100644 index 639cbff3777..00000000000 --- a/src/renderer/src/lib/agent-session/messaging/agent-message-send.test.ts +++ /dev/null @@ -1,90 +0,0 @@ -import { beforeEach, expect, it, vi } from 'vitest' -import { sendMessageToAgent } from './agent-message-send' - -const mocks = vi.hoisted(() => { - const launch: { lifecycle: string | null } = { lifecycle: null } - return { - send: vi.fn(), - relaunch: vi.fn((): Promise<{ delivered: boolean; unconfirmed?: true }> | null => null), - launch - } -}) - -vi.mock('@/store/index', () => ({ - useAppStore: { - getState: () => ({ - unifiedTabsByWorktree: { - 'wt-1': [{ contentType: 'agent-session', entityId: 'session-1' }] - } - }) - } -})) -vi.mock('@/runtime/native-chat/session-ownership/structured-agent-session-owner', () => ({ - structuredAgentSessionTargetForTab: () => ({ kind: 'local' }) -})) -vi.mock('../launch/structured-agent-session-launch-message', () => ({ - relaunchFailedStructuredAgentSessionWithMessage: mocks.relaunch -})) -vi.mock('../launch/structured-agent-session-launch-registry', () => ({ - getStructuredAgentSessionLaunchLifecycle: () => mocks.launch.lifecycle -})) -vi.mock('../launch/structured-agent-session-launch-input', () => ({ - structuredAgentSessionLaunchHasRetainedInput: () => false -})) -vi.mock('./terminal/active-agent-note-send', () => ({ sendNotesToActiveAgentSession: vi.fn() })) -vi.mock( - '@/components/native-chat/session/structured/delivery/structured-agent-session-message-sender', - () => ({ - sendStructuredAgentSessionMessage: mocks.send - }) -) - -function sendNotes() { - return sendMessageToAgent({ - worktreeId: 'wt-1', - target: { kind: 'structured-session', sessionId: 'session-1' }, - prompt: 'the notes' - }) -} - -beforeEach(() => { - mocks.send.mockReset() - mocks.relaunch.mockClear() - mocks.launch.lifecycle = null -}) - -// Notes clear only when their message is recorded; any other end keeps them with the caller. -it.each([ - ['recorded', { status: 'sent' }], - ['returned', { status: 'not-writable', code: 'session-send-refused' }], - // The host may hold it: the notes stay, worded as unconfirmed, never as refused. - ['unconfirmed', { status: 'unconfirmed', code: 'runtime-unverifiable' }], - ['dropped', { status: 'not-writable', code: 'session-send-refused' }] -] as const)('reports notes whose message was %s', async (outcome, result) => { - mocks.send.mockReturnValue({ clientMessageId: 'm', outcome: Promise.resolve(outcome) }) - await expect(sendNotes()).resolves.toEqual(result) - expect(mocks.send).toHaveBeenCalledWith( - expect.objectContaining({ sessionId: 'session-1', text: 'the notes', callerKeepsText: true }) - ) -}) - -it.each(['pending', 'visibility-unknown'])( - 'keeps the notes while the chat is %s', - async (lifecycle) => { - mocks.launch.lifecycle = lifecycle - await expect(sendNotes()).resolves.toEqual({ - status: 'not-ready', - code: 'session-send-refused' - }) - expect(mocks.send).not.toHaveBeenCalled() - } -) - -it('says a restart that carried the notes could not be confirmed, never that it refused them', async () => { - mocks.launch.lifecycle = 'failed' - mocks.relaunch.mockReturnValue(Promise.resolve({ delivered: false, unconfirmed: true })) - await expect(sendNotes()).resolves.toEqual({ - status: 'unconfirmed', - code: 'runtime-unverifiable' - }) -}) diff --git a/src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft-submit-retry.test.ts b/src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft-submit-retry.test.ts index df082ab9708..15b98fee19e 100644 --- a/src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft-submit-retry.test.ts +++ b/src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft-submit-retry.test.ts @@ -130,26 +130,8 @@ describe('post-paste submit retry Enter', () => { expect(writes.slice(0, 3)).toEqual([PASTED_ISSUE_URL, '\r', '\r']) expect(writes.at(3)).toBe('\x1b[200~') }) - - it('keeps a successful submit successful when the retry Enter is rejected', async () => { - testState.sendRuntimePtyInputVerified - .mockResolvedValueOnce(true) - .mockResolvedValueOnce(true) - .mockRejectedValueOnce(new Error('terminal_not_writable')) - - const promise = startCodexSubmit() - await signalCodexComposerReady() - await vi.advanceTimersByTimeAsync(POST_PASTE_SUBMIT_DELAY_MS + CODEX_SUBMIT_RETRY_DELAY_MS) - - await expect(promise).resolves.toBe(true) - expect(enterWrites()).toHaveLength(2) - }) }) -function enterWrites(): unknown[][] { - return testState.sendRuntimePtyInputVerified.mock.calls.filter((call) => call[1] === '\r') -} - function startCodexSubmit(): Promise { return pasteDraftWhenAgentReady({ tabId: 'tab-1', diff --git a/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-explicit-target.test.ts b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-explicit-target.test.ts deleted file mode 100644 index 8e4811078ec..00000000000 --- a/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-explicit-target.test.ts +++ /dev/null @@ -1,150 +0,0 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest' -import { sendNotesToActiveAgentSession } from './active-agent-note-send' -import { - createNoteSendAppState, - OTHER_LEAF_ID, - type NoteSendAppState -} from './active-agent-note-send-test-harness' - -const testState = vi.hoisted(() => ({ - appState: null as unknown as NoteSendAppState, - callRuntimeRpc: vi.fn(), - RuntimeRpcCallError: class RuntimeRpcCallError extends Error { - readonly code: string - readonly response: unknown - - constructor(response: { error: { code: string; message: string } }) { - super(response.error.message) - this.name = 'RuntimeRpcCallError' - this.code = response.error.code - this.response = response - } - } -})) - -vi.mock('@/store/index', () => ({ - useAppStore: Object.assign( - (selector: (state: NoteSendAppState) => unknown) => selector(testState.appState), - { - getState: () => testState.appState - } - ) -})) - -vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({ - callRuntimeRpc: testState.callRuntimeRpc -})) -vi.mock('@/runtime/rpc/calls/runtime-rpc-result', () => ({ - RuntimeRpcCallError: testState.RuntimeRpcCallError -})) - -describe('active agent note send', () => { - beforeEach(() => { - testState.appState = createNoteSendAppState() - testState.callRuntimeRpc.mockReset() - }) - - it('refuses explicit targets when an older runtime cannot verify agent status', async () => { - const methods: string[] = [] - testState.callRuntimeRpc.mockImplementation(async (_target, method) => { - methods.push(method) - if (method === 'terminal.list') { - return { - terminals: [ - { - handle: 'term-2', - worktreeId: 'wt-1', - worktreePath: '/repo', - branch: 'main', - tabId: 'tab-9', - leafId: OTHER_LEAF_ID, - title: 'Codex', - connected: true, - writable: true, - lastOutputAt: 1, - preview: '' - } - ], - totalCount: 1, - truncated: false - } - } - if (method === 'terminal.agentStatus') { - throw new testState.RuntimeRpcCallError({ - error: { code: 'method_not_found', message: 'Unknown method: terminal.agentStatus' } - }) - } - throw new Error(`unexpected method ${method}`) - }) - - await expect( - sendNotesToActiveAgentSession({ - worktreeId: 'wt-1', - prompt: 'notes', - noteTarget: { tabId: 'tab-9', leafId: OTHER_LEAF_ID } - }) - ).resolves.toEqual({ status: 'status-unavailable', code: 'status-unavailable' }) - - expect(methods).toEqual(['terminal.list', 'terminal.agentStatus']) - expect(testState.callRuntimeRpc).not.toHaveBeenCalledWith( - expect.anything(), - 'terminal.send', - expect.anything(), - expect.anything() - ) - }) - - it('maps explicit target permission or unavailable state before Enter to partial-submit-failed', async () => { - let statusChecks = 0 - testState.callRuntimeRpc.mockImplementation(async (_target, method, params) => { - if (method === 'terminal.list') { - return { - terminals: [ - { - handle: 'term-2', - worktreeId: 'wt-1', - worktreePath: '/repo', - branch: 'main', - tabId: 'tab-9', - leafId: OTHER_LEAF_ID, - title: 'Codex', - connected: true, - writable: true, - lastOutputAt: 1, - preview: '' - } - ], - totalCount: 1, - truncated: false - } - } - if (method === 'terminal.agentStatus') { - statusChecks += 1 - return { - agentStatus: { - handle: 'term-2', - isRunningAgent: true, - status: statusChecks === 1 ? 'working' : 'permission' - } - } - } - if (method === 'terminal.send') { - return { send: { handle: 'term-2', accepted: true, bytesWritten: params.text.length } } - } - throw new Error(`unexpected method ${method}`) - }) - - await expect( - sendNotesToActiveAgentSession({ - worktreeId: 'wt-1', - prompt: 'notes', - noteTarget: { tabId: 'tab-9', leafId: OTHER_LEAF_ID } - }) - ).resolves.toEqual({ status: 'partial-submit-failed', code: 'submit-readiness-lost' }) - - const sendCalls = testState.callRuntimeRpc.mock.calls.filter( - (call) => call[1] === 'terminal.send' - ) - expect(sendCalls).toHaveLength(1) - }) -}) diff --git a/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-focused-session.test.ts b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-focused-session.test.ts deleted file mode 100644 index 5b71c3a0b94..00000000000 --- a/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-focused-session.test.ts +++ /dev/null @@ -1,183 +0,0 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest' -import { sendNotesToActiveAgentSession } from './active-agent-note-send' -import { - createNoteSendAppState, - LEAF_ID, - type NoteSendAppState -} from './active-agent-note-send-test-harness' - -const testState = vi.hoisted(() => ({ - appState: null as unknown as NoteSendAppState, - callRuntimeRpc: vi.fn(), - RuntimeRpcCallError: class RuntimeRpcCallError extends Error { - readonly code: string - readonly response: unknown - - constructor(response: { error: { code: string; message: string } }) { - super(response.error.message) - this.name = 'RuntimeRpcCallError' - this.code = response.error.code - this.response = response - } - } -})) - -vi.mock('@/store/index', () => ({ - useAppStore: Object.assign( - (selector: (state: NoteSendAppState) => unknown) => selector(testState.appState), - { - getState: () => testState.appState - } - ) -})) - -vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({ - callRuntimeRpc: testState.callRuntimeRpc -})) -vi.mock('@/runtime/rpc/calls/runtime-rpc-result', () => ({ - RuntimeRpcCallError: testState.RuntimeRpcCallError -})) - -describe('active agent note send', () => { - beforeEach(() => { - testState.appState = createNoteSendAppState() - testState.callRuntimeRpc.mockReset() - }) - - it('keeps active-focused sends compatible when an older runtime lacks agentStatus', async () => { - const methods: string[] = [] - testState.callRuntimeRpc.mockImplementation(async (_target, method, params) => { - methods.push(method) - if (method === 'terminal.list') { - return { - terminals: [ - { - handle: 'term-1', - worktreeId: 'wt-1', - worktreePath: '/repo', - branch: 'main', - tabId: 'tab-1', - leafId: LEAF_ID, - title: 'Codex', - connected: true, - writable: true, - lastOutputAt: 1, - preview: '' - } - ], - totalCount: 1, - truncated: false - } - } - if (method === 'terminal.agentStatus') { - throw new testState.RuntimeRpcCallError({ - error: { code: 'method_not_found', message: 'Unknown method: terminal.agentStatus' } - }) - } - if (method === 'terminal.isRunningAgent') { - return { isRunningAgent: true } - } - if (method === 'terminal.wait') { - return { - wait: { - handle: 'term-1', - condition: 'tui-idle', - satisfied: true, - status: 'running', - exitCode: null - } - } - } - if (method === 'terminal.send') { - return { send: { handle: 'term-1', accepted: true, bytesWritten: params.text.length } } - } - throw new Error(`unexpected method ${method}`) - }) - - await expect( - sendNotesToActiveAgentSession({ worktreeId: 'wt-1', prompt: 'File: src/app.ts' }) - ).resolves.toEqual({ status: 'sent' }) - - expect(methods).toEqual([ - 'terminal.list', - 'terminal.agentStatus', - 'terminal.isRunningAgent', - 'terminal.wait', - 'terminal.agentStatus', - 'terminal.isRunningAgent', - 'terminal.send' - ]) - expect(testState.callRuntimeRpc).toHaveBeenLastCalledWith( - { kind: 'local' }, - 'terminal.send', - { - terminal: 'term-1', - text: 'File: src/app.ts', - enter: true, - client: { id: 'orca-desktop', type: 'desktop' } - }, - { timeoutMs: 15000 } - ) - }) - - it('rechecks active-focused permission after idle wait succeeds before writing', async () => { - let statusChecks = 0 - testState.callRuntimeRpc.mockImplementation(async (_target, method) => { - if (method === 'terminal.list') { - return { - terminals: [ - { - handle: 'term-1', - worktreeId: 'wt-1', - worktreePath: '/repo', - branch: 'main', - tabId: 'tab-1', - leafId: LEAF_ID, - title: 'Codex', - connected: true, - writable: true, - lastOutputAt: 1, - preview: '' - } - ], - totalCount: 1, - truncated: false - } - } - if (method === 'terminal.agentStatus') { - statusChecks += 1 - return { - agentStatus: { - handle: 'term-1', - isRunningAgent: true, - status: statusChecks === 1 ? 'idle' : 'permission' - } - } - } - if (method === 'terminal.wait') { - return { - wait: { - handle: 'term-1', - condition: 'tui-idle', - satisfied: true, - status: 'running', - exitCode: null - } - } - } - throw new Error(`unexpected method ${method}`) - }) - - await expect( - sendNotesToActiveAgentSession({ worktreeId: 'wt-1', prompt: 'notes' }) - ).resolves.toEqual({ status: 'permission', code: 'agent-permission' }) - - expect(statusChecks).toBe(2) - expect(testState.callRuntimeRpc).not.toHaveBeenCalledWith( - expect.anything(), - 'terminal.send', - expect.anything(), - expect.anything() - ) - }) -}) diff --git a/src/renderer/src/lib/agent-session/resume/agent-resume-launch-target.test.ts b/src/renderer/src/lib/agent-session/resume/agent-resume-launch-target.test.ts deleted file mode 100644 index e903c9fb7c3..00000000000 --- a/src/renderer/src/lib/agent-session/resume/agent-resume-launch-target.test.ts +++ /dev/null @@ -1,123 +0,0 @@ -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest' -import type { AgentResumeLaunchTargetArgs } from './agent-resume-launch-target' - -function setNavigatorUserAgent(userAgent: string): () => void { - const original = Object.getOwnPropertyDescriptor(globalThis, 'navigator') - Object.defineProperty(globalThis, 'navigator', { - configurable: true, - value: { - platform: userAgent.includes('Windows') ? 'Win32' : 'MacIntel', - userAgent - } - }) - return () => { - if (original) { - Object.defineProperty(globalThis, 'navigator', original) - } else { - delete (globalThis as { navigator?: Navigator }).navigator - } - } -} - -const LOCAL_WINDOWS_ARGS: AgentResumeLaunchTargetArgs = { - projectRuntime: undefined, - connectionId: null, - executionHostId: 'local', - worktreePath: 'C:\\Users\\neil\\orca\\workspaces\\orca\\feature', - terminalWindowsShell: null -} - -async function resolveWith( - overrides: Partial -): Promise<{ platform: NodeJS.Platform; shell: string | undefined }> { - const { resolveAgentResumeLaunchTarget } = await import('./agent-resume-launch-target') - const { platform, shell } = resolveAgentResumeLaunchTarget({ - ...LOCAL_WINDOWS_ARGS, - ...overrides - }) - return { platform, shell } -} - -describe('resolveAgentResumeLaunchTarget on a Windows client', () => { - let restoreNavigator = (): void => {} - - beforeAll(() => { - vi.resetModules() - }) - - beforeEach(() => { - restoreNavigator = setNavigatorUserAgent('Mozilla/5.0 (Windows NT 10.0; Win64; x64)') - }) - - afterEach(() => { - restoreNavigator() - }) - - // Why: an older server omits its OS, but its drive-letter workspace path still proves Windows. - it('keeps Windows quoting for an older Windows server that does not report its OS', async () => { - await expect( - resolveWith({ executionHostId: 'runtime:prod-box', worktreePath: 'C:\\srv\\repo' }) - ).resolves.toEqual({ platform: 'win32', shell: undefined }) - }) -}) - -describe('resolveAgentResumeLaunchTarget off Windows', () => { - let restoreNavigator = (): void => {} - - beforeEach(() => { - vi.resetModules() - restoreNavigator = setNavigatorUserAgent('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)') - }) - - afterEach(() => { - restoreNavigator() - }) - - it('quotes a nested SSH target on a Windows paired server for that target, not the server', async () => { - await expect( - resolveWith({ - connectionId: 'ssh-nested', - executionHostId: 'runtime:prod-box', - worktreePath: '/home/neil/repo', - runtimeHostPlatform: 'win32' - }) - ).resolves.toEqual({ platform: 'linux', shell: undefined }) - }) -}) - -// Why: a paired server's nested SSH target runs the command, so its own reported OS decides quoting. -describe('resolveSshHostReportedPlatform for a nested SSH target', () => { - it('reads the target the server reaches, not the server', async () => { - const { resolveSshHostReportedPlatform } = await import('./agent-resume-launch-target') - const state = { - sshConnectionStates: new Map(), - sshStateByEnvironment: new Map([ - [ - 'prod-box', - { - connectionStates: new Map([ - [ - 'ssh-nested', - { - targetId: 'ssh-nested', - status: 'connected' as const, - error: null, - reconnectAttempt: 0, - remotePlatform: 'win32' as const - } - ] - ]), - targetLabels: new Map(), - targetGenerations: new Map(), - removedTargetLabels: new Map(), - targetsHydrated: true - } - ] - ]) - } - expect(resolveSshHostReportedPlatform(state, 'runtime:prod-box', null, 'ssh-nested')).toBe( - 'win32' - ) - expect(resolveSshHostReportedPlatform(state, 'runtime:prod-box', null, null)).toBeNull() - }) -}) diff --git a/src/renderer/src/lib/editor/appearance/code-editor-theme.test.ts b/src/renderer/src/lib/editor/appearance/code-editor-theme.test.ts deleted file mode 100644 index bdc59acdf5c..00000000000 --- a/src/renderer/src/lib/editor/appearance/code-editor-theme.test.ts +++ /dev/null @@ -1,91 +0,0 @@ -import { describe, expect, it } from 'vitest' -import type { PluginThemeRegistration } from '../../../../../shared/plugins/artifacts/plugin-theme-artifact' -import { resolveCodeEditorTheme } from './code-editor-theme' -import type { ColorProbe } from '../../plugin-theme-tokens' - -// Parses #rrggbb, which is all these tests feed it. -const probe: ColorProbe = (value) => { - const hex = /^#([0-9a-f]{6})$/i.exec(value.trim())?.[1] - if (!hex) { - return null - } - const channel = (offset: number): number => Number.parseInt(hex.slice(offset, offset + 2), 16) - return [channel(0), channel(2), channel(4), 1] -} - -function theme( - id: string, - base: 'light' | 'dark', - tokens: Record -): PluginThemeRegistration { - return { - id: `plugin:samples.themes/${id}`, - base, - tokens, - revision: '1', - pluginKey: 'samples.themes', - pluginName: 'Samples', - label: id - } -} - -const dusk = theme('dusk', 'dark', { - '--background': '#1b1430', - '--editor-surface': '#120d22', - '--foreground': '#e8e0ff', - '--muted-foreground': '#b9add6', - '--border': '#5b3f9c' -}) -const dawn = theme('dawn', 'light', { '--background': '#fdf6e3', '--foreground': '#3b3226' }) -const murk = theme('murk', 'dark', { '--background': '#202020', '--foreground': '#303030' }) - -function resolve( - selected: Parameters[0]['selected'], - appTheme: PluginThemeRegistration | null = null -) { - return resolveCodeEditorTheme({ - dark: false, - appTheme, - selected, - appPainted: appTheme?.tokens ?? {}, - readDocument: (token) => dawn.tokens[token] ?? '', - probe - }) -} - -describe('resolveCodeEditorTheme', () => { - it("paints a dark plugin editor in a light app from that theme's own tokens", () => { - const result = resolve(dusk, dawn) - expect(result.monaco?.data.base).toBe('vs-dark') - expect(result.override).toEqual({ - base: 'dark', - colors: { - background: '#120d22', - foreground: '#e8e0ff', - mutedForeground: '#b9add6', - border: '#5b3f9c' - } - }) - }) - - it("uses Monaco's built-in colors for a built-in choice or an unreadable theme", () => { - expect(resolve('dark')).toMatchObject({ monaco: null, override: { base: 'dark' } }) - // A built-in light editor still overrides a plugin app theme of the same mode. - expect(resolve('light', dawn)).toMatchObject({ monaco: null, override: { base: 'light' } }) - // An unreadable caret drops to the theme's foreground, as for an app theme. - const hidden = resolve( - theme('ink', 'dark', { - '--background': '#000000', - '--editor-surface': '#000000', - '--foreground': '#ffffff', - '--muted-foreground': '#aaaaaa', - '--ring': '#000000' - }) - ) - expect(hidden.monaco?.data.colors['editorCursor.foreground']).toBe('#ffffff') - expect(resolve(murk)).toMatchObject({ - monaco: null, - override: { base: 'dark', colors: { background: '#1e1e1e' } } - }) - }) -}) diff --git a/src/renderer/src/lib/editor/file-operations/editor-file-operation-owner-interpretation.spec.ts b/src/renderer/src/lib/editor/file-operations/editor-file-operation-owner-interpretation.spec.ts deleted file mode 100644 index eae8a22adef..00000000000 --- a/src/renderer/src/lib/editor/file-operations/editor-file-operation-owner-interpretation.spec.ts +++ /dev/null @@ -1,230 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' -import { useAppStore } from '@/store/index' -import { resolveEditorModelOwner } from '@/components/editor/model-lifetime/identity/editor-model-owner' -import { folderWorkspaceKey } from '../../../../../shared/workspace-scope' -import { makeDetectedResult } from '@/store/slices/worktrees/listing/worktrees-detected-listing-fixtures' -import { makeFolderWorkspace } from '@/components/sidebar/workspace-creation/folder/folder-workspace-composer-submit-fixtures' -import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' -import { TEST_REPO } from '@/store/repos/repo.test-fixture' -import './editor-file-operation-owner' -import { - assertEditorFileOperationCurrent, - captureEditorFileOperationProvenance -} from './editor-file-operation-provenance' - -const worktreeId = 'repo::/remote/repo' - -export function runtimeEnvironment(id: string, pairingRevision: number) { - return { - id, - name: id, - createdAt: 1, - updatedAt: pairingRevision, - pairingRevision, - lastUsedAt: null, - runtimeId: id, - preferredEndpointId: 'endpoint', - endpoints: [{ id: 'endpoint', kind: 'websocket' as const, label: id, endpoint: 'ws://host' }] - } -} - -export function registerEditorOwnerInterpretationContracts(): void { - describe('shared editor owner interpretation', () => { - it.each([100, 1_000])( - 'does not walk %i unrelated runtimes on legacy editor triggers', - (size) => { - let reads = 0 - const state = { - ...useAppStore.getState(), - repos: [{ ...TEST_REPO, id: 'repo' }], - worktreesByRepo: { repo: [makeWorktree({ id: worktreeId, repoId: 'repo' })] }, - runtimeEnvironments: Array.from({ length: size }, (_, index) => ({ - ...runtimeEnvironment(`unrelated-${index}`, 1), - get id() { - reads += 1 - return `unrelated-${index}` - } - })) - } - const counts = { capture: 0, assert: 0, model: 0 } - const route = { executionHostId: 'local', runtimeEnvironmentId: null } - for (let index = 0; index < 20; index += 1) { - const provenance = captureEditorFileOperationProvenance(state, worktreeId, null, true) - expect(provenance.generation.route).toEqual(route) - counts.capture += reads - reads = 0 - expect(assertEditorFileOperationCurrent(state, worktreeId, provenance)).toEqual(route) - counts.assert += reads - reads = 0 - expect(resolveEditorModelOwner({ worktreeId }, state)).toEqual({ - environmentId: null, - hostId: 'local' - }) - counts.model += reads - reads = 0 - } - expect(counts).toEqual({ capture: 0, assert: 0, model: 0 }) - const provenance = captureEditorFileOperationProvenance(state, worktreeId, null, true) - const removed = { ...state, repos: [], worktreesByRepo: {} } - expect(() => assertEditorFileOperationCurrent(removed, worktreeId, provenance)).toThrow( - 'Reopen the file' - ) - expect(() => captureEditorFileOperationProvenance(removed, worktreeId, null, true)).toThrow( - 'Reopen the file' - ) - } - ) - - it.each([100, 1_000])('skips %i unrelated catalog rows on folder editor triggers', (size) => { - const counts = { worktree: 0, detected: 0, repo: 0 } - function counted(row: T, kind: keyof typeof counts): T { - return { - ...row, - get id() { - counts[kind] += 1 - return row.id - } - } - } - const workspace = folderWorkspaceKey('docs') - const base = { - ...useAppStore.getState(), - folderWorkspaces: [makeFolderWorkspace({ id: 'docs', executionHostId: 'local' })], - projectGroups: [], - restoredRuntimeHostIdByWorkspaceSessionKey: {} - } - const provenance = captureEditorFileOperationProvenance(base, workspace, undefined, false) - for (let generation = 0; generation < 20; generation += 1) { - const detected = makeDetectedResult( - 'unrelated', - Array.from({ length: size }, (_, index) => - makeWorktree({ id: `detected-${index}`, repoId: 'unrelated' }) - ) - ) - const state = { - ...base, - worktreesByRepo: { - unrelated: Array.from({ length: size }, (_, index) => - counted(makeWorktree({ id: `wt-${index}`, repoId: 'unrelated' }), 'worktree') - ) - }, - detectedWorktreesByRepo: { - unrelated: { - ...detected, - worktrees: detected.worktrees.map((row) => counted(row, 'detected')) - } - }, - repos: Array.from({ length: size }, (_, index) => - counted({ ...TEST_REPO, id: `repo-${index}` }, 'repo') - ) - } - // Model lookup runs first on cold catalog identities, then all three paths reuse them. - for (let repeat = 0; repeat < 2; repeat += 1) { - expect(resolveEditorModelOwner({ worktreeId: workspace }, state)).toEqual({ - environmentId: null, - hostId: 'local' - }) - expect( - captureEditorFileOperationProvenance(state, workspace, undefined, false).generation - .route - ).toEqual(provenance.generation.route) - expect(assertEditorFileOperationCurrent(state, workspace, provenance)).toEqual( - provenance.generation.route - ) - } - } - expect(counts).toEqual({ worktree: 0, detected: 0, repo: 0 }) - const moved = { - ...base, - folderWorkspaces: [makeFolderWorkspace({ id: 'docs', executionHostId: 'runtime:hub-a' })] - } - expect(resolveEditorModelOwner({ worktreeId: workspace }, moved)).toEqual({ - environmentId: 'hub-a', - hostId: 'runtime:hub-a' - }) - for (const state of [moved, { ...base, folderWorkspaces: [] }]) { - expect(() => assertEditorFileOperationCurrent(state, workspace, provenance)).toThrow( - 'Reopen the file' - ) - } - }) - - it.each(['runtime:hub-a', 'ssh:private'] as const)( - 'keeps uncaptured models and operations on stamped paired owner %s', - (hostId) => { - vi.stubGlobal('__ORCA_WEB_CLIENT__', true) - useAppStore.setState({ - worktreesByRepo: { - repo: [ - makeWorktree({ - id: worktreeId, - repoId: 'repo', - hostId, - runtimeOwnerEnvironmentId: 'hub-a' - }) - ] - } - }) - const state = useAppStore.getState() - const provenance = captureEditorFileOperationProvenance(state, worktreeId, undefined, false) - const route = assertEditorFileOperationCurrent(state, worktreeId, provenance) - expect(resolveEditorModelOwner({ worktreeId }, state)).toEqual({ - environmentId: route.runtimeEnvironmentId, - hostId: route.executionHostId - }) - expect(route).toEqual({ executionHostId: hostId, runtimeEnvironmentId: 'hub-a' }) - } - ) - - it('qualifies a same-id folder at capture without letting later focus change model identity', () => { - const workspace = folderWorkspaceKey('twin') - useAppStore.setState({ - folderWorkspaces: [ - makeFolderWorkspace({ id: 'twin', executionHostId: 'local' }), - makeFolderWorkspace({ id: 'twin', executionHostId: 'runtime:hub-a' }) - ], - activeWorktreeId: workspace, - activeWorkspaceExecutionHostId: 'local' - }) - const provenance = captureEditorFileOperationProvenance( - useAppStore.getState(), - workspace, - undefined, - false - ) - for (const host of ['local', 'runtime:hub-a'] as const) { - useAppStore.setState({ activeWorkspaceExecutionHostId: host }) - const state = useAppStore.getState() - expect(resolveEditorModelOwner({ worktreeId: workspace }, state).hostId).toBeNull() - expect( - resolveEditorModelOwner({ worktreeId: workspace, operationProvenance: provenance }, state) - ).toEqual({ environmentId: null, hostId: 'local' }) - expect(assertEditorFileOperationCurrent(state, workspace, provenance).executionHostId).toBe( - 'local' - ) - } - }) - - it('retains captured model identity while refusing vanished or ambiguous mutation owners', () => { - const owner = makeWorktree({ id: worktreeId, repoId: 'repo', hostId: 'local' }) - useAppStore.setState({ worktreesByRepo: { repo: [owner] } }) - const provenance = captureEditorFileOperationProvenance( - useAppStore.getState(), - worktreeId, - undefined, - false - ) - for (const worktrees of [[], [owner, { ...owner, hostId: 'runtime:hub-a' as const }]]) { - useAppStore.setState({ worktreesByRepo: { repo: worktrees } }) - const state = useAppStore.getState() - expect(() => assertEditorFileOperationCurrent(state, worktreeId, provenance)).toThrow( - 'Reopen the file' - ) - expect( - resolveEditorModelOwner({ worktreeId, operationProvenance: provenance }, state).hostId - ).toBe('local') - expect(resolveEditorModelOwner({ worktreeId }, state).hostId).toBeNull() - } - }) - }) -} diff --git a/src/renderer/src/lib/editor/file-operations/editor-file-operation-owner.test.ts b/src/renderer/src/lib/editor/file-operations/editor-file-operation-owner.test.ts index 7d9dcea8c5a..7579bea87b9 100644 --- a/src/renderer/src/lib/editor/file-operations/editor-file-operation-owner.test.ts +++ b/src/renderer/src/lib/editor/file-operations/editor-file-operation-owner.test.ts @@ -1,16 +1,8 @@ -import { - registerEditorOwnerInterpretationContracts, - runtimeEnvironment -} from './editor-file-operation-owner-interpretation.spec' // @vitest-environment happy-dom // @vitest-environment happy-dom import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { useAppStore } from '@/store/index' -import { - assertEditorFileOperationCurrent, - captureEditorFileOperationProvenance -} from './editor-file-operation-provenance' import { getEditorFileOperationContext } from './editor-file-operation-owner' vi.mock('../../../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true })) @@ -33,108 +25,6 @@ beforeEach(() => { }) describe('editor file operation owner', () => { - it('rejects an open tab after the same environment id is re-paired', () => { - useAppStore.getState().setRuntimeEnvironments([runtimeEnvironment('hub-a', 1)]) - useAppStore.setState({ - worktreesByRepo: { - repo: [ - { - id: worktreeId, - repoId: 'repo', - path: '/remote/repo', - hostId: 'runtime:hub-a', - runtimeOwnerEnvironmentId: 'hub-a' - } as never - ] - } - }) - const provenance = captureEditorFileOperationProvenance( - useAppStore.getState(), - worktreeId, - undefined, - false - ) - - useAppStore.getState().setRuntimeEnvironments([runtimeEnvironment('hub-a', 2)]) - - expect(() => - assertEditorFileOperationCurrent(useAppStore.getState(), worktreeId, provenance) - ).toThrow('Reopen the file') - }) - - it('captures and rejects replacement nested SSH connection generations', () => { - useAppStore.setState({ - worktreesByRepo: { - repo: [ - { - id: worktreeId, - repoId: 'repo', - path: '/remote/repo', - hostId: 'ssh:private', - runtimeOwnerEnvironmentId: 'hub-a' - } as never - ] - }, - sshStateByEnvironment: new Map([ - [ - 'hub-a', - { - targetsHydrated: true, - targetGenerations: new Map(), - targetLabels: new Map([['private', 'private']]), - removedTargetLabels: new Map(), - connectionStates: new Map([ - [ - 'private', - { - targetId: 'private', - status: 'connected', - error: null, - reconnectAttempt: 0, - connectionGeneration: 7 - } - ] - ]) - } - ] - ]) - }) - const provenance = captureEditorFileOperationProvenance( - useAppStore.getState(), - worktreeId, - undefined, - false - ) - expect(provenance.expectedSshConnectionGeneration).toBe(7) - - useAppStore.setState((state) => ({ - sshStateByEnvironment: new Map([ - [ - 'hub-a', - { - ...state.sshStateByEnvironment.get('hub-a')!, - connectionStates: new Map([ - [ - 'private', - { - targetId: 'private', - status: 'connected', - error: null, - reconnectAttempt: 0, - connectionGeneration: 8 - } - ] - ]) - } - ] - ]) - })) - - expect(() => - assertEditorFileOperationCurrent(useAppStore.getState(), worktreeId, provenance) - ).toThrow('Reopen the file') - }) - it('rejects a restored external SSH file after its target changes', () => { useAppStore.setState({ repos: [{ id: 'repo', connectionId: 'ssh-replacement' } as never], @@ -163,45 +53,6 @@ describe('editor file operation owner', () => { ) ).toThrow('Reopen the file') }) - - describe('folder workspaces', () => { - const folderWorkspaceId = 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee' - const folderKey = `folder:${folderWorkspaceId}` - - beforeEach(() => { - useAppStore.setState({ - folderWorkspaces: [ - { - id: folderWorkspaceId, - projectGroupId: 'group-1', - connectionId: null, - folderPath: '/workspace/folder' - } as never - ], - projectGroups: [{ id: 'group-1', connectionId: null, executionHostId: null } as never], - restoredRuntimeHostIdByWorkspaceSessionKey: {} - }) - }) - - it('fails closed when folder ownership changes between capture and assert', () => { - const provenance = captureEditorFileOperationProvenance( - useAppStore.getState(), - folderKey, - undefined, - false - ) - useAppStore.setState({ - projectGroups: [ - { id: 'group-1', connectionId: null, executionHostId: 'runtime:hub-a' } as never - ] - }) - expect(() => - assertEditorFileOperationCurrent(useAppStore.getState(), folderKey, provenance) - ).toThrow('Reopen the file') - }) - }) }) afterEach(() => vi.unstubAllGlobals()) - -registerEditorOwnerInterpretationContracts() diff --git a/src/renderer/src/lib/editor/file-operations/execute-open-editor-path-move.test.ts b/src/renderer/src/lib/editor/file-operations/execute-open-editor-path-move.test.ts deleted file mode 100644 index 5e609c454c3..00000000000 --- a/src/renderer/src/lib/editor/file-operations/execute-open-editor-path-move.test.ts +++ /dev/null @@ -1,205 +0,0 @@ -// @vitest-environment happy-dom - -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as RuntimeFileMutationClient from '@/runtime/files/mutations/runtime-file-mutation-client' -import type * as EditorAutosave from '@/components/editor/autosave/editor-autosave' - -const mocks = vi.hoisted(() => ({ renameRuntimePath: vi.fn() })) -vi.mock('@/runtime/files/mutations/runtime-file-mutation-client', async (importOriginal) => { - const actual = await importOriginal() - return { ...actual, renameRuntimePath: mocks.renameRuntimePath } -}) -vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) => - ( - await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture') - ).runtimeRpcClientWithLayoutApply(await importOriginal()) -) -vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (importOriginal) => - ( - await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture') - ).runtimeLayoutClientWithTestFrames(await importOriginal()) -) -vi.mock('@/components/editor/autosave/editor-autosave', async (importOriginal) => { - const actual = await importOriginal() - return { ...actual, requestEditorSaveQuiesce: vi.fn().mockResolvedValue(undefined) } -}) - -import { useAppStore } from '@/store/index' -import { executeOpenEditorPathMove } from './execute-open-editor-path-move' - -import { captureWorktreeOperationGenerationSnapshot } from '../../workspace/ownership/worktree-operation-generation' - -import { - drawTabsFromMain, - type TabsDrawnFromMain -} from '@/store/slices/tabs/tabs-drawn-from-main.test-fixture' - -let main: TabsDrawnFromMain - -const CONTEXT = { - target: { kind: 'local' as const }, - worktreeId: 'wt-1', - worktreePath: '/repo', - connectionId: undefined -} - -function openDirtyTab(): string { - const state = useAppStore.getState() - state.openFile( - { - filePath: '/repo/a.md', - relativePath: 'a.md', - worktreeId: 'wt-1', - runtimeEnvironmentId: null, - language: 'markdown', - mode: 'edit' - }, - { suppressActiveRuntimeFallback: true } - ) - const id = useAppStore.getState().openFiles[0]!.id - state.setEditorDraft(id, 'unsaved work') - state.markFileDirty(id, true) - state.setLastKnownDiskSignature(id, 'sig-a') - return id -} - -describe('executeOpenEditorPathMove', () => { - beforeEach(async () => { - useAppStore.setState(useAppStore.getInitialState(), true) - mocks.renameRuntimePath.mockReset().mockResolvedValue(undefined) - main = await drawTabsFromMain(useAppStore) - }) - - afterEach(() => { - main.close() - vi.unstubAllGlobals() - }) - - it('never retargets the same path open from a same-id workspace on a server', async () => { - const localId = openDirtyTab() - const state = useAppStore.getState() - state.openFile({ - filePath: '/repo/a.md', - relativePath: 'a.md', - worktreeId: 'wt-1', - runtimeEnvironmentId: 'env-server', - language: 'markdown', - mode: 'edit' - }) - const remote = useAppStore - .getState() - .openFiles.find((file) => file.runtimeEnvironmentId === 'env-server')! - state.setEditorDraft(remote.id, 'server draft') - state.markFileDirty(remote.id, true) - useAppStore.setState((current) => ({ - openFiles: current.openFiles.map((file) => - file.id === remote.id - ? { - ...file, - operationProvenance: { - ownershipProjection: 'explicit', - generation: captureWorktreeOperationGenerationSnapshot( - { runtimeEnvironmentId: 'env-server', executionHostId: 'runtime:env-server' }, - { endpoint: { kind: 'environment', environmentId: 'env-server' }, at: 'ssh:box' } - ) - } - } - : file - ) - })) - await executeOpenEditorPathMove({ - context: { - ...CONTEXT, - target: { kind: 'environment', environmentId: 'env-server' }, - expectedExecutionHostId: 'ssh:other' - }, - fromPath: '/repo/a.md', - toPath: '/repo/other.md', - worktreeId: 'wt-1', - worktreePath: '/repo' - }) - expect(useAppStore.getState().openFiles.every((file) => file.filePath === '/repo/a.md')).toBe( - true - ) - expect(useAppStore.getState().editorDrafts[remote.id]).toBe('server draft') - - await executeOpenEditorPathMove({ - context: { ...CONTEXT, expectedExecutionHostId: 'local' }, - fromPath: '/repo/a.md', - toPath: '/repo/b.md', - worktreeId: 'wt-1', - worktreePath: '/repo' - }) - - const files = useAppStore.getState().openFiles - expect(files.find((file) => file.runtimeEnvironmentId !== 'env-server')!.filePath).toBe( - '/repo/b.md' - ) - expect(files.find((file) => file.id === remote.id)).toMatchObject({ - filePath: '/repo/a.md', - isDirty: true - }) - expect(useAppStore.getState().editorDrafts[remote.id]).toBe('server draft') - expect(useAppStore.getState().editorDrafts[localId]).toBeUndefined() - }) - - it('still moves its own tab when the workspace host focus changes while the rename runs', async () => { - openDirtyTab() - mocks.renameRuntimePath.mockImplementation(async () => { - useAppStore.setState({ - activeWorktreeId: 'wt-1', - activeWorkspaceExecutionHostId: 'runtime:env-other' - }) - }) - - await executeOpenEditorPathMove({ - context: { ...CONTEXT, expectedExecutionHostId: 'local' }, - fromPath: '/repo/a.md', - toPath: '/repo/b.md', - worktreeId: 'wt-1', - worktreePath: '/repo' - }) - - expect(useAppStore.getState().openFiles[0]!.filePath).toBe('/repo/b.md') - }) - - it('undoes the on-disk rename when the editor rekey collides', async () => { - openDirtyTab() - useAppStore.getState().openFile( - { - filePath: '/repo/sub/a.md', - relativePath: 'sub/a.md', - worktreeId: 'wt-1', - runtimeEnvironmentId: null, - language: 'markdown', - mode: 'edit' - }, - { suppressActiveRuntimeFallback: true } - ) - const before = useAppStore.getState().openFiles.map((f) => f.id) - - await expect( - executeOpenEditorPathMove({ - context: CONTEXT, - fromPath: '/repo/a.md', - toPath: '/repo/sub/a.md', - worktreeId: 'wt-1', - worktreePath: '/repo' - }) - ).rejects.toThrow(/retarget/) - - expect(mocks.renameRuntimePath).toHaveBeenCalledWith( - CONTEXT, - '/repo/a.md', - '/repo/sub/a.md', - undefined - ) - expect(mocks.renameRuntimePath).toHaveBeenCalledWith( - CONTEXT, - '/repo/sub/a.md', - '/repo/a.md', - undefined - ) - expect(useAppStore.getState().openFiles.map((f) => f.id)).toEqual(before) - }) -}) diff --git a/src/renderer/src/lib/editor/file-operations/remap-open-editor-tabs-for-path-change.test.ts b/src/renderer/src/lib/editor/file-operations/remap-open-editor-tabs-for-path-change.test.ts index 89aac875b9a..b5d69f22180 100644 --- a/src/renderer/src/lib/editor/file-operations/remap-open-editor-tabs-for-path-change.test.ts +++ b/src/renderer/src/lib/editor/file-operations/remap-open-editor-tabs-for-path-change.test.ts @@ -250,40 +250,4 @@ describe('remapOpenEditorTabsForPathChange', () => { expect(useAppStore.getState().openFiles[0]!.filePath).toBe('/repo/dst/a\\b.txt') }) - - it('carries the disk baseline and live conflict state onto the re-homed tab', async () => { - const state = useAppStore.getState() - const oldPath = '/repo/notes.md' - const newPath = '/repo/archive/notes.md' - state.openFile( - { - filePath: oldPath, - relativePath: 'notes.md', - worktreeId: 'wt-1', - runtimeEnvironmentId: null, - language: 'markdown', - mode: 'edit' - }, - { suppressActiveRuntimeFallback: true } - ) - const oldId = useAppStore.getState().openFiles[0]!.id - state.setEditorDraft(oldId, 'unsaved work') - state.markFileDirty(oldId, true) - state.setLastKnownDiskSignature(oldId, 'sig-abc') - state.setExternalMutation(oldId, 'changed') - - await remap({ - fromPath: oldPath, - toPath: newPath, - worktreePath: '/repo', - owner: localMoveOwner(undefined) - }) - - const moved = useAppStore.getState().openFiles.find((f) => f.filePath === newPath) - expect(moved).toBeTruthy() - // Preserve move-echo identity and existing conflict so watchers distinguish rename from external writes. - expect(moved?.lastKnownDiskSignature).toBe('sig-abc') - expect(moved?.externalMutation).toBe('changed') - expect(moved?.isDirty).toBe(true) - }) }) diff --git a/src/renderer/src/lib/simulator/launch/simulator-launch-coordination.test.ts b/src/renderer/src/lib/simulator/launch/simulator-launch-coordination.test.ts deleted file mode 100644 index 2aad5e2d8b4..00000000000 --- a/src/renderer/src/lib/simulator/launch/simulator-launch-coordination.test.ts +++ /dev/null @@ -1,62 +0,0 @@ -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type { EmulatorStreamInfo } from '@/components/emulator-pane/emulator-pane-types' -import { - consumePrelaunchedSimulatorSession, - rememberPrelaunchedSimulatorSession, - resetSimulatorLaunchCoordinationForTests -} from './simulator-launch-coordination' - -function streamInfo(id: string): EmulatorStreamInfo { - return { - deviceUdid: id, - streamUrl: `http://127.0.0.1:3100/${id}/stream.mjpeg`, - wsUrl: `ws://127.0.0.1:3100/${id}/ws` - } -} - -describe('simulator-launch-coordination', () => { - beforeEach(() => { - resetSimulatorLaunchCoordinationForTests() - vi.useFakeTimers() - vi.setSystemTime(1_000) - }) - - afterEach(() => { - resetSimulatorLaunchCoordinationForTests() - vi.useRealTimers() - }) - - it('measures handoff age independently of wall-clock corrections', () => { - vi.setSystemTime(100_000) - rememberPrelaunchedSimulatorSession('wt-rollback', streamInfo('device-rollback')) - - vi.setSystemTime(0) - vi.advanceTimersByTime(30_000) - - expect(consumePrelaunchedSimulatorSession('wt-rollback')).toBeNull() - - rememberPrelaunchedSimulatorSession('wt-forward', streamInfo('device-forward')) - vi.setSystemTime(1_000_000) - - expect(consumePrelaunchedSimulatorSession('wt-forward')).toMatchObject({ - deviceUdid: 'device-forward' - }) - }) - - it('treats a refreshed worktree key as the most recently remembered', () => { - for (let index = 0; index < 16; index += 1) { - rememberPrelaunchedSimulatorSession(`wt-${index}`, streamInfo(`device-${index}`)) - } - - rememberPrelaunchedSimulatorSession('wt-0', streamInfo('device-refreshed')) - rememberPrelaunchedSimulatorSession('wt-16', streamInfo('device-16')) - - expect(consumePrelaunchedSimulatorSession('wt-1')).toBeNull() - expect(consumePrelaunchedSimulatorSession('wt-0')).toMatchObject({ - deviceUdid: 'device-refreshed' - }) - expect(consumePrelaunchedSimulatorSession('wt-16')).toMatchObject({ - deviceUdid: 'device-16' - }) - }) -}) diff --git a/src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts b/src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts index a5043c36b8c..24656791a1d 100644 --- a/src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts +++ b/src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts @@ -2,16 +2,9 @@ import { describe, expect, it } from 'vitest' import type { Tab } from '../../../../../shared/tab-types' import type { Worktree } from '../../../../../shared/worktree/types' import { getWorktreeHostIdentity } from '../../../../../shared/worktree/host-qualified-identity' -import { buildPaletteTabDocument } from '../../../../../shared/palette-match/tab-document' import '../../../../../shared/palette-match/palette-query' -import { - SIMULATOR_PALETTE_QUERY_MAX_BYTES, - SIMULATOR_TYPE_SEARCH_ALIASES, - buildSearchableSimulatorTabs, - searchSimulatorTabs -} from './simulator-palette-search' -import type { SearchableSimulatorTab } from './simulator-palette-search-types' +import { buildSearchableSimulatorTabs, searchSimulatorTabs } from './simulator-palette-search' function makeWorktree(overrides: Partial = {}): Worktree { return { @@ -52,8 +45,6 @@ function makeTab(overrides: Partial = {}): Tab { } } -/** Mirrors buildSearchableSimulatorTabs so hand-built rows index the same fields. */ - describe('simulator-palette-search', () => { it('keeps same-id simulator tabs isolated by execution host', () => { const sharedId = 'repo-shared::/workspace' @@ -127,29 +118,4 @@ describe('simulator-palette-search', () => { expect(entries).toEqual([]) }) - - it('rejects oversized pasted queries before scanning simulator tabs', () => { - const oversizedQuery = 'secret-simulator-palette'.repeat(SIMULATOR_PALETTE_QUERY_MAX_BYTES) - const entry = { - get tab(): Tab { - throw new Error('oversized simulator palette queries must not scan tabs') - }, - worktree: makeWorktree(), - repoName: 'repo/mobile', - worktreeSortIndex: 0, - isCurrentTab: false, - isCurrentWorktree: false, - document: buildPaletteTabDocument({ - id: 'sim-1', - title: 'Mobile Emulator', - secondaryTexts: [], - worktreeName: 'Mobile Worktree', - branch: 'feature/mobile-emulator', - repoName: 'repo/mobile', - typeAliases: SIMULATOR_TYPE_SEARCH_ALIASES - }) - } as SearchableSimulatorTab - - expect(searchSimulatorTabs([entry], oversizedQuery)).toEqual([]) - }) }) diff --git a/src/renderer/src/lib/simulator/tabs/simulator-pane-shutdown-scheduler.test.ts b/src/renderer/src/lib/simulator/tabs/simulator-pane-shutdown-scheduler.test.ts deleted file mode 100644 index 232c99c0134..00000000000 --- a/src/renderer/src/lib/simulator/tabs/simulator-pane-shutdown-scheduler.test.ts +++ /dev/null @@ -1,125 +0,0 @@ -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { - cancelPendingSimulatorPaneShutdown, - scheduleSimulatorPaneManagedShutdown -} from './simulator-pane-shutdown-scheduler' - -type TestTab = { - id: string - contentType: string -} - -describe('scheduleSimulatorPaneManagedShutdown', () => { - let tabsByWorktree: Record - const shutdownManagedSimulator = vi.fn() - - const getTabsForWorktree = (worktreeId: string): TestTab[] => tabsByWorktree[worktreeId] ?? [] - - beforeEach(() => { - vi.useFakeTimers() - shutdownManagedSimulator.mockReset() - tabsByWorktree = {} - }) - - afterEach(() => { - cancelPendingSimulatorPaneShutdown('wt-1') - cancelPendingSimulatorPaneShutdown('wt-2') - vi.useRealTimers() - }) - - it('shuts down the managed simulator after the final pane stays closed', async () => { - tabsByWorktree = { 'wt-1': [{ id: 'terminal-1', contentType: 'terminal' }] } - - expect( - scheduleSimulatorPaneManagedShutdown('wt-1', 'sim-1', { - delayMs: 100, - getTabsForWorktree, - shutdownManagedSimulator - }) - ).toBe(true) - - await vi.advanceTimersByTimeAsync(99) - expect(shutdownManagedSimulator).not.toHaveBeenCalled() - - await vi.advanceTimersByTimeAsync(1) - expect(shutdownManagedSimulator).toHaveBeenCalledTimes(1) - expect(shutdownManagedSimulator).toHaveBeenCalledWith('wt-1') - }) - - it('does not schedule shutdown for a remount while the same tab still exists', () => { - tabsByWorktree = { 'wt-1': [{ id: 'sim-1', contentType: 'simulator' }] } - - expect( - scheduleSimulatorPaneManagedShutdown('wt-1', 'sim-1', { - delayMs: 100, - getTabsForWorktree, - shutdownManagedSimulator - }) - ).toBe(false) - - vi.advanceTimersByTime(100) - expect(shutdownManagedSimulator).not.toHaveBeenCalled() - }) - - it('keeps the managed simulator running when another simulator tab appears before the grace expires', async () => { - tabsByWorktree = { 'wt-1': [{ id: 'terminal-1', contentType: 'terminal' }] } - - expect( - scheduleSimulatorPaneManagedShutdown('wt-1', 'sim-1', { - delayMs: 100, - getTabsForWorktree, - shutdownManagedSimulator - }) - ).toBe(true) - - tabsByWorktree = { 'wt-1': [{ id: 'sim-2', contentType: 'simulator' }] } - await vi.advanceTimersByTimeAsync(100) - - expect(shutdownManagedSimulator).not.toHaveBeenCalled() - }) - - it('cancels a pending shutdown when a replacement pane claims the worktree', async () => { - tabsByWorktree = { 'wt-1': [{ id: 'terminal-1', contentType: 'terminal' }] } - - expect( - scheduleSimulatorPaneManagedShutdown('wt-1', 'sim-1', { - delayMs: 100, - getTabsForWorktree, - shutdownManagedSimulator - }) - ).toBe(true) - - cancelPendingSimulatorPaneShutdown('wt-1') - await vi.advanceTimersByTimeAsync(100) - - expect(shutdownManagedSimulator).not.toHaveBeenCalled() - }) - - it('isolates pending shutdowns by worktree', async () => { - tabsByWorktree = { - 'wt-1': [{ id: 'terminal-1', contentType: 'terminal' }], - 'wt-2': [{ id: 'terminal-2', contentType: 'terminal' }] - } - - expect( - scheduleSimulatorPaneManagedShutdown('wt-1', 'sim-1', { - delayMs: 100, - getTabsForWorktree, - shutdownManagedSimulator - }) - ).toBe(true) - expect( - scheduleSimulatorPaneManagedShutdown('wt-2', 'sim-2', { - delayMs: 100, - getTabsForWorktree, - shutdownManagedSimulator - }) - ).toBe(true) - - cancelPendingSimulatorPaneShutdown('wt-1') - await vi.advanceTimersByTimeAsync(100) - - expect(shutdownManagedSimulator).toHaveBeenCalledTimes(1) - expect(shutdownManagedSimulator).toHaveBeenCalledWith('wt-2') - }) -}) diff --git a/src/renderer/src/lib/simulator/tabs/simulator-tab-layout-owner.test.ts b/src/renderer/src/lib/simulator/tabs/simulator-tab-layout-owner.test.ts deleted file mode 100644 index b0211c8ff91..00000000000 --- a/src/renderer/src/lib/simulator/tabs/simulator-tab-layout-owner.test.ts +++ /dev/null @@ -1,287 +0,0 @@ -// @vitest-environment happy-dom - -// With ORCA_LAYOUT_OWNER=main, a simulator tab's open and close reach main as commands first and -// the window draws them from main's frames, so its next save changes nothing in main's model. -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { LOCAL_EXECUTION_HOST_ID } from '../../../../../shared/execution-host' -import type { Tab, TabGroup, TabGroupLayoutNode } from '../../../../../shared/tab-types' -import type { LayoutCommand } from '../../../../../shared/workspace-layout/workspace-layout-command-types' -import { loadWorkspaceLayoutWithoutReport } from '../../../../../shared/workspace-layout/workspace-layout-load' -import { nameBasedLoadContext } from '../../../../../shared/workspace-layout/workspace-layout-minted-ids' -import type { WorkspaceLayout } from '../../../../../shared/workspace-layout/workspace-layout-model' -import { buildWorkspaceSessionPayload } from '@/lib/workspace/persistence/workspace-session' -import { createTestStore, seedStore } from '@/store/testing/app-store-test-fixture' -import { makeRuntimeOwnedWorktree } from '@/store/slices/worktrees/worktree-owner.test-fixture' -import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' -import { runtimeOwnedRepoState } from '@/store/repos/repo.test-fixture' -import { createStoreCascadesMockApi } from '@/store/testing/app-store-cascade-api.test-fixture' -import { layoutApplyTestTransport } from '@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture' -import { - drawTabsFromMain, - type TabsDrawnFromMain -} from '@/store/slices/tabs/tabs-drawn-from-main.test-fixture' - -type LayoutLoad = ReturnType - -type Mocks = { - layoutOwnerIsMain: boolean - store: ReturnType | null -} - -const mocks = vi.hoisted((): Mocks => ({ layoutOwnerIsMain: true, store: null })) -let main: TabsDrawnFromMain - -vi.mock('../../../../../shared/layout-owner-switch', () => ({ - get ORCA_LAYOUT_OWNER_IS_MAIN() { - return mocks.layoutOwnerIsMain - } -})) -vi.mock('@/store/index', () => ({ - get useAppStore() { - return mocks.store - } -})) -vi.mock('sonner', () => ({ - toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() } -})) -vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) => - ( - await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture') - ).runtimeRpcClientWithLayoutApply(await importOriginal()) -) -vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (importOriginal) => - ( - await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture') - ).runtimeLayoutClientWithTestFrames(await importOriginal()) -) - -createStoreCascadesMockApi() - -import { ensureSimulatorTab } from './ensure-simulator-tab' - -const WORKTREE = 'repo1::/path/wt' -const TERMINAL = 'terminal-1' -const GROUP = 'group-1' - -function store(): ReturnType { - if (!mocks.store) { - throw new Error('store not seeded') - } - return mocks.store -} - -function sent(): readonly LayoutCommand[] { - return layoutApplyTestTransport.sent -} - -function loadWindowSave(): LayoutLoad { - return loadWorkspaceLayoutWithoutReport( - LOCAL_EXECUTION_HOST_ID, - buildWorkspaceSessionPayload(store().getState()), - nameBasedLoadContext() - ) -} - -/** The workspace as the window's save would give it to main, beside main's stored copy. */ -function expectSaveTeachesMainNothing(worktreeId = WORKTREE): void { - // A lone group's tree is implied: the window may store its leaf, main none. - const withoutLoneLeaf = (workspace: WorkspaceLayout | undefined) => - workspace && { ...workspace, groupLayout: split(workspace.groupLayout) } - const split = (tree: TabGroupLayoutNode | undefined) => (tree?.type === 'split' ? tree : null) - expect(withoutLoneLeaf(loadWindowSave().layout.workspaces[worktreeId])).toEqual( - withoutLoneLeaf(layoutApplyTestTransport.mainModel!.workspaces[worktreeId]) - ) -} - -async function settled(): Promise { - await main.settle() -} - -function terminalTab(id: string, groupId: string, worktreeId = WORKTREE): Tab { - return { - id, - entityId: id, - groupId, - worktreeId, - contentType: 'terminal', - label: 'Terminal 1', - customLabel: null, - color: null, - sortOrder: 0, - createdAt: 1 - } -} - -function seed(groups: TabGroup[], layout: TabGroupLayoutNode): void { - const terminals = groups.flatMap((group) => group.tabOrder) - seedStore(store(), { - worktreesByRepo: { repo1: [makeWorktree({ id: WORKTREE, repoId: 'repo1', path: '/path/wt' })] }, - activeWorktreeId: WORKTREE, - tabsByWorktree: { - [WORKTREE]: terminals.map((id, index) => ({ - id, - ptyId: null, - worktreeId: WORKTREE, - title: 'Terminal 1', - customTitle: null, - color: null, - sortOrder: index, - createdAt: 1 - })) - }, - unifiedTabsByWorktree: { - [WORKTREE]: groups.flatMap((group) => group.tabOrder.map((id) => terminalTab(id, group.id))) - }, - groupsByWorktree: { [WORKTREE]: groups }, - activeGroupIdByWorktree: { [WORKTREE]: groups[0]!.id }, - layoutByWorktree: { [WORKTREE]: layout } - }) -} - -/** Main takes the window's layout and draws it from here on. */ -async function seedDrawnFromMain(groups: TabGroup[], layout: TabGroupLayoutNode): Promise { - main?.close() - seed(groups, layout) - main = await drawTabsFromMain(store()) -} - -beforeEach(async () => { - mocks.layoutOwnerIsMain = true - vi.spyOn(console, 'warn').mockImplementation(() => {}) - mocks.store = createTestStore() - await seedDrawnFromMain( - [{ id: GROUP, worktreeId: WORKTREE, activeTabId: TERMINAL, tabOrder: [TERMINAL] }], - { type: 'leaf', groupId: GROUP } - ) -}) - -afterEach(() => { - main.close() -}) - -function sentTypes(): string[] { - return sent().map((command) => command.type) -} - -describe('simulator tabs in a layout-owner build', () => { - it('opens a simulator tab in the active group through main, and closes it there', async () => { - const tabId = ensureSimulatorTab(WORKTREE, { placement: 'activeGroup' }) - expect(tabId).toBeTruthy() - await settled() - expectSaveTeachesMainNothing() - - store().getState().closeUnifiedTab(tabId!) - await settled() - expectSaveTeachesMainNothing() - expect(sentTypes()).toEqual(['openSimulatorTab', 'closeTabs']) - }) - - it('makes the right split with the tab in main, and collapses it on close', async () => { - const tabId = ensureSimulatorTab(WORKTREE, { placement: 'rightSplit' }) - await settled() - expect(store().getState().groupsByWorktree[WORKTREE]).toHaveLength(2) - expectSaveTeachesMainNothing() - expect(layoutApplyTestTransport.mainModel!.workspaces[WORKTREE]?.groupLayout).toMatchObject({ - type: 'split', - direction: 'horizontal', - first: { type: 'leaf', groupId: GROUP } - }) - - store().getState().closeUnifiedTab(tabId!) - await settled() - expect(store().getState().groupsByWorktree[WORKTREE]).toHaveLength(1) - expectSaveTeachesMainNothing() - }) - - it('opens a right-side tab into the right group the workspace already has', async () => { - const right = 'group-2' - await seedDrawnFromMain( - [ - { id: GROUP, worktreeId: WORKTREE, activeTabId: TERMINAL, tabOrder: [TERMINAL] }, - { id: right, worktreeId: WORKTREE, activeTabId: 'terminal-2', tabOrder: ['terminal-2'] } - ], - { - type: 'split', - direction: 'horizontal', - first: { type: 'leaf', groupId: GROUP }, - second: { type: 'leaf', groupId: right } - } - ) - const tabId = ensureSimulatorTab(WORKTREE, { placement: 'rightSplit' }) - await settled() - expect(store().getState().getTab(tabId!)?.groupId).toBe(right) - expectSaveTeachesMainNothing() - }) - - it('opens into the root group of a workspace whose tabs all closed', async () => { - await seedDrawnFromMain( - [{ id: GROUP, worktreeId: WORKTREE, activeTabId: null, tabOrder: [] }], - { - type: 'leaf', - groupId: GROUP - } - ) - // Main keeps no empty group, so its frame drops GROUP; the open makes the root group again. - expect(store().getState().groupsByWorktree[WORKTREE] ?? []).toEqual([]) - const tabId = ensureSimulatorTab(WORKTREE, { placement: 'activeGroup' }) - await settled() - const groups = store().getState().groupsByWorktree[WORKTREE] ?? [] - expect(groups).toHaveLength(1) - expect(store().getState().getTab(tabId!)?.groupId).toBe(groups[0]!.id) - expect(groups[0]!.tabOrder).toEqual([tabId]) - expect(sent()).toMatchObject([{ type: 'openSimulatorTab', tabId, groupId: groups[0]!.id }]) - expectSaveTeachesMainNothing() - }) - - it('sends nothing when the workspace already has its simulator tab', async () => { - const tabId = ensureSimulatorTab(WORKTREE) - await settled() - const before = sent().length - expect(ensureSimulatorTab(WORKTREE)).toBe(tabId) - await settled() - expect(sent()).toHaveLength(before) - }) - - it('leaves a paired server’s simulator tab to that server', async () => { - const remote = 'repo2::/path/remote' - const remoteGroup = 'group-remote' - seedStore( - store(), - runtimeOwnedRepoState('env-1', 'repo2', '/path/remote', { - worktreesByRepo: { - repo1: [makeWorktree({ id: WORKTREE, repoId: 'repo1', path: '/path/wt' })], - repo2: [makeRuntimeOwnedWorktree({ id: remote, repoId: 'repo2' }, 'env-1')] - }, - activeWorktreeId: remote, - unifiedTabsByWorktree: { [remote]: [terminalTab('terminal-r', remoteGroup, remote)] }, - groupsByWorktree: { - [remote]: [ - { - id: remoteGroup, - worktreeId: remote, - activeTabId: 'terminal-r', - tabOrder: ['terminal-r'] - } - ] - }, - activeGroupIdByWorktree: { [remote]: remoteGroup }, - layoutByWorktree: { [remote]: { type: 'leaf', groupId: remoteGroup } } - }) - ) - const tabId = ensureSimulatorTab(remote, { placement: 'rightSplit' }) - expect(tabId).toBeTruthy() - store().getState().closeUnifiedTab(tabId!) - await settled() - expect(sent()).toEqual([]) - }) - - it('sends nothing with the switch off', async () => { - mocks.layoutOwnerIsMain = false - const inGroup = ensureSimulatorTab(WORKTREE, { placement: 'activeGroup' }) - store().getState().closeUnifiedTab(inGroup!) - const split = ensureSimulatorTab(WORKTREE, { placement: 'rightSplit' }) - store().getState().closeUnifiedTab(split!) - await settled() - expect(sent()).toEqual([]) - }) -}) diff --git a/src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts b/src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts index f4cadfea872..8cac5beb7b6 100644 --- a/src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts +++ b/src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts @@ -89,27 +89,6 @@ describe('activateSimulatorTabPaletteResult', () => { seedStore() }) - it('activates an SSH worktree through its paired-runtime owner alias', () => { - seedStore({ - worktreesByRepo: { - 'repo-1': [ - makeWorktree({ - hostId: 'ssh:private-target', - runtimeOwnerEnvironmentId: 'paired-host' - }) - ] - } - }) - - expect( - activateSimulatorTabPaletteResult({ ...target, executionHostId: 'runtime:paired-host' }) - .status - ).toBe('activated') - expect(mocks.activateAndRevealWorkspace).toHaveBeenCalledWith('wt-1', { - executionHostId: 'runtime:paired-host' - }) - }) - it('rejects colliding child ids before mutating either host', () => { seedStore({ worktreesByRepo: { From be691385bd9c0bd7ae83636609156d61a444ca35 Mon Sep 17 00:00:00 2001 From: Kelvin Amoaba <97001695+AmoabaKelvin@users.noreply.github.com> Date: Mon, 9 Nov 2026 13:50:43 +0000 Subject: [PATCH 43/90] feat(runtime): tell phones when relay hosts change (#40122) * feat(runtime): tell phones when relay hosts change * fix(runtime): keep the relay host backstop live and watch every list input * fix(mobile): hold the relay host feed only for desktops that announce changes * perf(runtime): watch relay host inputs only while phones read the list --- .../host-screen/use-host-worktree-catalog.ts | 7 ++ mobile/src/worktree/relay-hosts-feed.test.ts | 29 +++++ mobile/src/worktree/relay-hosts-feed.ts | 108 ++++++++++++++-- .../worktree/use-reachable-server-clients.ts | 2 +- mobile/src/worktree/workspace-server.ts | 2 +- .../runtime-environment-mobile-relay-hosts.ts | 19 ++- .../runtime-environment-preference.ts | 26 +++- .../mobile-desktop-relay-hosts.ts | 2 + .../mobile-relay-host-catalog.test.ts | 25 +++- .../mobile-relay-host-catalog.ts | 24 ++++ .../mobile-relay-host-list-announcer.ts | 117 ++++++++++++++++++ src/main/runtime/orca-runtime.ts | 5 + .../runtime/rpc/server/runtime-rpc-pairing.ts | 7 ++ .../runtime/rpc/server/runtime-rpc-state.ts | 1 + src/main/runtime/rpc/server/runtime-rpc.ts | 2 + .../wsl-host-service-instance.ts | 16 +++ src/shared/mobile-desktop-relay-contract.ts | 7 +- src/shared/runtime-client-events.ts | 2 + 18 files changed, 377 insertions(+), 24 deletions(-) create mode 100644 src/main/runtime/mobile-desktop-relay/mobile-relay-host-list-announcer.ts diff --git a/mobile/src/host-screen/use-host-worktree-catalog.ts b/mobile/src/host-screen/use-host-worktree-catalog.ts index ca3715baef2..edbad9c48fc 100644 --- a/mobile/src/host-screen/use-host-worktree-catalog.ts +++ b/mobile/src/host-screen/use-host-worktree-catalog.ts @@ -1,3 +1,4 @@ +import { MOBILE_RELAY_HOSTS_CHANGED_EVENT_RUNTIME_CAPABILITY } from '../../../src/shared/mobile-desktop-relay-contract' import { WORKTREE_ROWS_CHANGED_EVENT_RUNTIME_CAPABILITY } from '../../../src/shared/worktree-runtime-capabilities' import { readWorktreeFirstPage } from '../worktree/worktree-catalog-first-page' import type { Worktree } from '../worktree/workspace-list-types' @@ -20,6 +21,7 @@ import { savePinnedIds } from '../storage/preferences' import type { HostScreenState } from './use-host-screen-state' import { relaysToServers } from '../worktree/execution-host-scoped-rpc-client' import { NO_SERVER_WORKSPACES } from '../worktree/server-workspaces' +import { useRelayHosts } from '../worktree/relay-hosts-feed' import { WorktreeCatalogReadError } from '../worktree/worktree-catalog-snapshot-client' import { useHostQuery } from '../query/host-query' import { hostReadClient } from '../query/host-read-client' @@ -122,6 +124,11 @@ export function useHostWorktreeCatalog(args: { const relays = client !== null && relaysToServers(client, hostCapabilities) // Until the host's status is read, stored server rows paint and nothing reads them. const relaysRuledOut = hostStatusReadable && !relays + // Held while server rows poll, so a desktop that announces host changes isn't asked for its hosts on every poll. + const announcesHosts = hostCapabilities.includes( + MOBILE_RELAY_HOSTS_CHANGED_EVENT_RUNTIME_CAPABILITY + ) + useRelayHosts(subscribed && relays && announcesHosts ? client : null, hostCapabilities) const servers = useHostQuery( hostServerWorkspacesQuery, host, diff --git a/mobile/src/worktree/relay-hosts-feed.test.ts b/mobile/src/worktree/relay-hosts-feed.test.ts index 096a1f293ed..f8350fdd552 100644 --- a/mobile/src/worktree/relay-hosts-feed.test.ts +++ b/mobile/src/worktree/relay-hosts-feed.test.ts @@ -3,6 +3,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('react-native', () => ({ AppState: { currentState: 'active' } })) import { FakeSession } from '../transport/connection/mobile-endpoint-supervisor-test-fakes' +import { stubRpcClient } from '../transport/rpc/rpc-client-test-stub' import { relayHostsFeed } from './relay-hosts-feed' function hostsReply(health: string) { @@ -46,4 +47,32 @@ describe('the desktop’s server list', () => { expect(await stale).toBeNull() expect(feed.getSnapshot()?.[0]?.health).toBe('error') }) + + it('reads again when the desktop says its hosts changed, instead of every few seconds', async () => { + let emit: (event: unknown) => void = () => {} + let reads = 0 + const client = stubRpcClient({ + getLastConnectedAt: () => 1, + subscribe: (_method, _params, onData) => { + emit = onData + return () => {} + }, + sendRequest: async () => { + reads += 1 + return hostsReply('available') + } + }) + relayHostsFeed(client).subscribe(() => {}, true) + emit({ type: 'ready', subscriptionId: 'events-1' }) + await vi.advanceTimersByTimeAsync(30_000) + expect(reads).toBe(2) + + emit({ type: 'relayHostsChanged' }) + await vi.advanceTimersByTimeAsync(0) + expect(reads).toBe(3) + + // The backstop still asks the desktop, in case a notice was lost. + await vi.advanceTimersByTimeAsync(60_000) + expect(reads).toBe(4) + }) }) diff --git a/mobile/src/worktree/relay-hosts-feed.ts b/mobile/src/worktree/relay-hosts-feed.ts index cfe98870a14..417a1e28ee4 100644 --- a/mobile/src/worktree/relay-hosts-feed.ts +++ b/mobile/src/worktree/relay-hosts-feed.ts @@ -2,17 +2,26 @@ import { useCallback, useSyncExternalStore } from 'react' import { AppState } from 'react-native' +import { MOBILE_RELAY_HOSTS_CHANGED_EVENT_RUNTIME_CAPABILITY } from '../../../src/shared/mobile-desktop-relay-contract' import { readViewBase } from '../query/host-read-client' import type { MobileRelayHost } from '../../../src/shared/remote-runtime/relay/mobile-relay-hosts-contract' import type { RpcClient } from '../transport/rpc/rpc-client-contract' +import { + subscribeSharedClientEvents, + type SharedClientEvent +} from '../transport/connection/shared-client-events' import { relayHostsListRead } from './server-workspace-operations' // Count polling cadence from the last completed read. const RELAY_HOSTS_POLL_MS = 3000 +// With relayHostsChanged heard on a live stream, the poll only backs up a lost notice. +const RELAY_HOSTS_BACKSTOP_POLL_MS = 60_000 export type RelayHostsFeed = { - subscribe: (listener: () => void) => () => void + /** `pushed`: the desktop publishes relayHostsChanged, so the feed may wait for it instead of polling. */ + subscribe: (listener: () => void, pushed: boolean) => () => void getSnapshot: () => readonly MobileRelayHost[] | null + /** Answers from the snapshot while the desktop's notices keep it current; reads otherwise. */ read: () => Promise } @@ -25,7 +34,23 @@ function createFeed(client: RpcClient): RelayHostsFeed { // Bumped on every drop, so a read from an earlier connection never lands. let generation = 0 let timer: ReturnType | null = null - const listeners = new Set<() => void>() + // Each listener with whether its desktop publishes relayHostsChanged. + const listeners = new Map<() => void, boolean>() + let stopEvents: (() => void) | null = null + let streamLive = false + // The last read failed, or a notice came during it, so its answer may already be old. + let lastReadDoubtful = false + let changedDuringRead = false + // A read went out after this feed joined the event stream, so a notice for any later change will come. + let readSinceJoining = false + + // The desktop will tell this feed when its snapshot goes out of date. + const current = (): boolean => + stopEvents !== null && + streamLive && + snapshot !== null && + !lastReadDoubtful && + Number.isFinite(lastReadAt) const publish = (next: readonly MobileRelayHost[] | null): void => { // Why: an unchanged poll keeps its identity, so readers do not re-render every tick. @@ -33,7 +58,7 @@ function createFeed(client: RpcClient): RelayHostsFeed { return } snapshot = next - for (const listener of listeners) { + for (const listener of listeners.keys()) { listener() } } @@ -48,7 +73,8 @@ function createFeed(client: RpcClient): RelayHostsFeed { if (listeners.size === 0 || client.getState() !== 'connected') { return } - const delay = lastReadAt + RELAY_HOSTS_POLL_MS - Date.now() + const pollMs = current() ? RELAY_HOSTS_BACKSTOP_POLL_MS : RELAY_HOSTS_POLL_MS + const delay = lastReadAt + pollMs - Date.now() if (delay <= 0) { tick() return @@ -58,7 +84,8 @@ function createFeed(client: RpcClient): RelayHostsFeed { const tick = (): void => { timer = null if (AppState.currentState === 'active') { - void read() + // The poll (or backstop) always asks the desktop, even while the snapshot is current. + void refresh() return } timer = setTimeout(tick, RELAY_HOSTS_POLL_MS) @@ -75,37 +102,88 @@ function createFeed(client: RpcClient): RelayHostsFeed { return null } } - const read = (): Promise => { + // A read that landed within a poll interval is as fresh as the poll would make it. + const fresh = (): boolean => + snapshot !== null && !lastReadDoubtful && Date.now() - lastReadAt < RELAY_HOSTS_POLL_MS + const read = (): Promise => + inFlight === null && (current() || fresh()) ? Promise.resolve(snapshot) : refresh() + const refresh = (): Promise => { if (inFlight) { return inFlight } const readGeneration = generation - inFlight = fetchHosts(readGeneration).finally(() => { + changedDuringRead = false + readSinceJoining = stopEvents !== null + inFlight = fetchHosts(readGeneration).then((hosts) => { if (readGeneration === generation) { inFlight = null + lastReadDoubtful = hosts === null || changedDuringRead // Schedule after completion so reads slower than the interval still get a next poll. - lastReadAt = Date.now() + lastReadAt = changedDuringRead ? Number.NEGATIVE_INFINITY : Date.now() schedule() } + return hosts }) return inFlight } + // The list may have changed since the last read: read again as soon as the page is active. + const changed = (): void => { + if (inFlight) { + changedDuringRead = true + return + } + lastReadAt = Number.NEGATIVE_INFINITY + schedule() + } + const onEvent = (event: SharedClientEvent): void => { + if (event.type === 'ready') { + streamLive = true + // A stream live before this feed joined covers reads sent since; any other ready may follow missed notices. + if (!('joined' in event) || !readSinceJoining) { + changed() + } else { + schedule() + } + } else if (event.type === 'end' || event.type === 'error') { + // The shared stream opens again by itself; until its ready, poll as an older desktop. + streamLive = false + schedule() + } else if (event.type === 'relayHostsChanged') { + changed() + } + } + // Only while a listener's desktop publishes the notice: older desktops keep the plain poll. + const syncEvents = (): void => { + const wanted = [...listeners.values()].includes(true) + if (wanted && !stopEvents) { + readSinceJoining = false + stopEvents = subscribeSharedClientEvents(client, onEvent) + } else if (!wanted && stopEvents) { + stopEvents() + stopEvents = null + streamLive = false + } + } + client.onStateChange((state) => { if (state !== 'connected') { generation += 1 inFlight = null lastReadAt = Number.NEGATIVE_INFINITY + streamLive = false publish(null) } schedule() }) return { - subscribe: (listener) => { - listeners.add(listener) + subscribe: (listener, pushedByDesktop) => { + listeners.set(listener, pushedByDesktop) + syncEvents() schedule() return () => { listeners.delete(listener) + syncEvents() if (listeners.size === 0) { stopTimer() } @@ -129,11 +207,15 @@ export function relayHostsFeed(client: RpcClient): RelayHostsFeed { const noSubscription = (): (() => void) => () => {} -export function useRelayHosts(client: RpcClient | null): readonly MobileRelayHost[] | null { +export function useRelayHosts( + client: RpcClient | null, + hostCapabilities: readonly string[] +): readonly MobileRelayHost[] | null { const feed = client ? relayHostsFeed(client) : null + const pushed = hostCapabilities.includes(MOBILE_RELAY_HOSTS_CHANGED_EVENT_RUNTIME_CAPABILITY) const subscribe = useCallback( - (listener: () => void) => (feed ? feed.subscribe(listener) : noSubscription()), - [feed] + (listener: () => void) => (feed ? feed.subscribe(listener, pushed) : noSubscription()), + [feed, pushed] ) const readHosts = () => feed?.getSnapshot() ?? null return useSyncExternalStore(subscribe, readHosts, readHosts) diff --git a/mobile/src/worktree/use-reachable-server-clients.ts b/mobile/src/worktree/use-reachable-server-clients.ts index 893ac252883..ff506ff9db8 100644 --- a/mobile/src/worktree/use-reachable-server-clients.ts +++ b/mobile/src/worktree/use-reachable-server-clients.ts @@ -15,7 +15,7 @@ export function useReachableServerClients( serverClients: ReadonlyMap } { const relays = client !== null && relaysToServers(client, hostCapabilities) - const servers = useRelayHosts(active && relays ? client : null) + const servers = useRelayHosts(active && relays ? client : null, hostCapabilities) const readyKey = (servers ?? []) .filter((host) => host.relay === 'ready') .map((host) => host.hostId) diff --git a/mobile/src/worktree/workspace-server.ts b/mobile/src/worktree/workspace-server.ts index ac43a5371ca..bb53a4d3d8f 100644 --- a/mobile/src/worktree/workspace-server.ts +++ b/mobile/src/worktree/workspace-server.ts @@ -34,7 +34,7 @@ export function useWorkspaceServer(args: { const routeHost = workspaceRouteExecutionHost(client, desktopCapabilities, executionHost) const serverClient = client && routeHost ? scopeRpcClientToExecutionHost(client, routeHost) : null // The same feed the host list reads, so the desktop is not polled twice. - const hosts = useRelayHosts(routeHost ? client : null) + const hosts = useRelayHosts(routeHost ? client : null, desktopCapabilities) const selectedHost = hosts?.find((entry) => entry.hostId === routeHost) const state = connState === 'connected' && routeHost && hosts ? serverConnState(selectedHost) : connState diff --git a/src/main/ipc/runtime-environments/runtime-environment-mobile-relay-hosts.ts b/src/main/ipc/runtime-environments/runtime-environment-mobile-relay-hosts.ts index 6cf56a3929e..f2203bafd2b 100644 --- a/src/main/ipc/runtime-environments/runtime-environment-mobile-relay-hosts.ts +++ b/src/main/ipc/runtime-environments/runtime-environment-mobile-relay-hosts.ts @@ -23,7 +23,10 @@ import { } from './runtime-environment-managed-tunnel' import { wslHostsGateOpen } from '../../wsl/host-lifecycle/wsl-host-gate' import type { WslHostPhoneReach } from '../../wsl/host-lifecycle/wsl-host-phone-reach' -import { getWslHostPhoneGate } from '../../wsl/host-lifecycle/wsl-host-service-instance' +import { + getWslHostPhoneGate, + onWslHostStatusesChanged +} from '../../wsl/host-lifecycle/wsl-host-service-instance' import type { SshConnectionState } from '../../../shared/ssh-types' import { getRegisteredSshState, @@ -41,6 +44,7 @@ import { runtimeEnvironmentManualDisconnectCount } from './runtime-environment-manual-disconnect' import { onRuntimeEnvironmentStatusPublished } from './runtime-environment-status-owner' +import { watchRuntimeEnvironmentRegistry } from './runtime-environment-preference' import { getRuntimeEnvironmentTransportGeneration } from './runtime-environment-transport-generation' import { getRuntimeEnvironmentRegistryRoot } from './runtime-environment-registry-root' import { recipeVmServerState } from './runtime-environment-recipe-vm-wake' @@ -195,7 +199,18 @@ export function createRuntimeEnvironmentMobileRelayHosts(): MobileDesktopRelayHo retirementListeners.add(listener) return () => retirementListeners.delete(listener) }, - onStatusChanged: onRuntimeEnvironmentStatusPublished, + // A WSL host's reach (hidden, stopped, ready) is part of its listing too. + onStatusChanged: (listener) => { + const stopStatus = onRuntimeEnvironmentStatusPublished(listener) + const stopWsl = onWslHostStatusesChanged(listener) + return () => { + stopStatus() + stopWsl() + } + }, + // Its own watch: serve has no window, so the renderer catalog broadcast never runs there. + onCatalogChanged: (listener) => + watchRuntimeEnvironmentRegistry(userDataPath, listener, 'Phone server list'), watchChanges: (host, expected, callbacks) => watchRuntimeEnvironmentChanges(userDataPath, host.environmentId, expected, callbacks) } diff --git a/src/main/ipc/runtime-environments/runtime-environment-preference.ts b/src/main/ipc/runtime-environments/runtime-environment-preference.ts index 2bcac60766b..df39b8a9402 100644 --- a/src/main/ipc/runtime-environments/runtime-environment-preference.ts +++ b/src/main/ipc/runtime-environments/runtime-environment-preference.ts @@ -55,19 +55,35 @@ export function watchRuntimeEnvironmentPreference( } // Reconcile changes made while the native watch was being installed. const initialCheck = setImmediate(repairPreference) - // Watch the file: macOS directory watches recursively stream Orca's own userData writes. - const registryWatch = watchFileAcrossReplacement( - getEnvironmentStorePath(userDataPath), + const stopRegistryWatch = watchRuntimeEnvironmentRegistry( + userDataPath, () => { repairPreference() onRegistryChanged() }, - (error) => console.warn('[runtime-environments] Active Server preference watch failed:', error) + 'Active Server preference' + ) + return () => { + clearImmediate(initialCheck) + stopRegistryWatch() + } +} + +/** Calls `onChanged` after any write to the saved-server registry, in-app or by the CLI. */ +export function watchRuntimeEnvironmentRegistry( + userDataPath: string, + onChanged: () => void, + owner: string +): () => void { + // Watch the file: macOS directory watches recursively stream Orca's own userData writes. + const registryWatch = watchFileAcrossReplacement( + getEnvironmentStorePath(userDataPath), + onChanged, + (error) => console.warn(`[runtime-environments] ${owner} watch failed:`, error) ) const sweep = setInterval(() => void registryWatch.refresh(), REGISTRY_REBIND_SWEEP_MS) sweep.unref?.() return () => { - clearImmediate(initialCheck) clearInterval(sweep) void registryWatch.close() } diff --git a/src/main/runtime/mobile-desktop-relay/mobile-desktop-relay-hosts.ts b/src/main/runtime/mobile-desktop-relay/mobile-desktop-relay-hosts.ts index 62d90ce20f9..8025a73be22 100644 --- a/src/main/runtime/mobile-desktop-relay/mobile-desktop-relay-hosts.ts +++ b/src/main/runtime/mobile-desktop-relay/mobile-desktop-relay-hosts.ts @@ -77,6 +77,8 @@ export type MobileDesktopRelayHosts = { ) => Promise onEnvironmentRetired: (listener: (environmentId: string) => void) => () => void onStatusChanged: (listener: () => void) => () => void + /** The saved server list was edited (added, renamed, removed), here or by the CLI. */ + onCatalogChanged?: (listener: () => void) => () => void /** Windowless server events: onChange fires on ready, catalog changes and reconnect replay. * catalog is false only for worktreesChanged; repo/project-group writes never emit that event alone. */ watchChanges: ( diff --git a/src/main/runtime/mobile-desktop-relay/mobile-relay-host-catalog.test.ts b/src/main/runtime/mobile-desktop-relay/mobile-relay-host-catalog.test.ts index ab8229178c6..1b2374e3fae 100644 --- a/src/main/runtime/mobile-desktop-relay/mobile-relay-host-catalog.test.ts +++ b/src/main/runtime/mobile-desktop-relay/mobile-relay-host-catalog.test.ts @@ -69,6 +69,7 @@ function fakeHosts( environments, pairingRevision: 1, retire: (_environmentId: string) => {}, + statusChanged: () => {}, sshTargetLabels: new Map(), sshConnectionStates: new Map() } @@ -119,7 +120,10 @@ function fakeHosts( state.retire = listener return () => {} }, - onStatusChanged: () => () => {}, + onStatusChanged: (listener) => { + state.statusChanged = listener + return () => {} + }, watchChanges: () => ({ close: () => {}, current: () => true }) } return { hosts, call, state } @@ -252,6 +256,25 @@ describe('mobile relay host catalog', () => { await expect(hostCatalog.worktrees('runtime:env')).resolves.toEqual({ worktrees: null }) }) + it('tells phones when a status change alters the host list, and not when it leaves it as is', async () => { + const { hosts, state } = fakeHosts([ + { id: 'env', name: 'Box', snapshot: snapshot('env', 'live') } + ]) + const { catalog: hostCatalog } = catalog(hosts) + const changed = vi.fn() + hostCatalog.publishListChanges({ onClientEvent: () => () => {}, changed }) + expect(hostCatalog.list().hosts).toMatchObject([{ hostId: 'runtime:env', relay: 'ready' }]) + + state.statusChanged() + await Promise.resolve() + expect(changed).not.toHaveBeenCalled() + + state.environments = [{ ...state.environments[0]!, snapshot: snapshot('env', 'unreachable') }] + state.statusChanged() + await Promise.resolve() + expect(changed).toHaveBeenCalledTimes(1) + }) + it('answers with the last rows when the server never answers the fetch', async () => { vi.useFakeTimers() try { diff --git a/src/main/runtime/mobile-desktop-relay/mobile-relay-host-catalog.ts b/src/main/runtime/mobile-desktop-relay/mobile-relay-host-catalog.ts index 491adb8f51f..f42097a7f34 100644 --- a/src/main/runtime/mobile-desktop-relay/mobile-relay-host-catalog.ts +++ b/src/main/runtime/mobile-desktop-relay/mobile-relay-host-catalog.ts @@ -20,6 +20,10 @@ import { SERVER_FETCH_TIMEOUT_MS } from './server-worktree-fetch' import { normalizePairedServerRow } from '../../../shared/sidebar-list/paired-server-rows' import type { MobileDesktopRelayHosts } from './mobile-desktop-relay-hosts' import { describeRelayHosts, relayHostFence } from './mobile-relay-host-descriptions' +import { + RelayHostListAnnouncer, + type RelayHostListAnnouncerSources +} from './mobile-relay-host-list-announcer' export type MobileRelayRecipeEnvironmentLookup = ( hostId: string @@ -142,7 +146,27 @@ export class MobileRelayHostCatalog { return null } + private announcer: RelayHostListAnnouncer | null = null + list(): MobileRelayHostsListResult { + const result = this.describe() + this.announcer?.listed(result) + return result + } + + /** Calls `changed` whenever list() would answer differently, so phones need not poll it. */ + publishListChanges(sources: RelayHostListAnnouncerSources): () => void { + const announcer = new RelayHostListAnnouncer(this.options.hosts, () => this.describe(), sources) + this.announcer = announcer + return () => { + announcer.dispose() + if (this.announcer === announcer) { + this.announcer = null + } + } + } + + private describe(): MobileRelayHostsListResult { return { hosts: describeRelayHosts(this.options.hosts, this.options.hostLabelOverrides()).map( ({ diff --git a/src/main/runtime/mobile-desktop-relay/mobile-relay-host-list-announcer.ts b/src/main/runtime/mobile-desktop-relay/mobile-relay-host-list-announcer.ts new file mode 100644 index 00000000000..c5df332e736 --- /dev/null +++ b/src/main/runtime/mobile-desktop-relay/mobile-relay-host-list-announcer.ts @@ -0,0 +1,117 @@ +import type { RuntimeClientEvent } from '../../../shared/runtime-client-events' +import type { MobileRelayHostsListResult } from '../../../shared/remote-runtime/relay/mobile-relay-hosts-contract' +import type { MobileDesktopRelayHosts } from './mobile-desktop-relay-hosts' + +// A phone holding the list reads it at least every 60 s (its backstop); three missed reads means none is left. +export const PHONE_LIST_IDLE_MS = 3 * 60_000 + +export type RelayHostListAnnouncerSources = { + onClientEvent: (listener: (event: RuntimeClientEvent) => void) => () => void + changed: () => void +} + +type Watching = { announced: string; stop: () => void; idle: ReturnType } + +/** + * Calls `changed` whenever the host list would answer differently from what phones last saw. + * It watches only while phones read the list: a desktop no phone asks pays no watch or timer. + */ +export class RelayHostListAnnouncer { + private watching: Watching | null = null + private disposed = false + + constructor( + private readonly hosts: MobileDesktopRelayHosts, + private readonly describe: () => MobileRelayHostsListResult, + private readonly sources: RelayHostListAnnouncerSources + ) {} + + /** A phone just read `result`. */ + listed(result: MobileRelayHostsListResult): void { + if (this.disposed) { + return + } + if (this.watching) { + clearTimeout(this.watching.idle) + this.watching.idle = this.idleTimer() + return + } + // Later reads don't move the baseline: a read racing a change would hide it from other phones. + this.watching = { + announced: JSON.stringify(result), + stop: this.watch(), + idle: this.idleTimer() + } + } + + dispose(): void { + this.disposed = true + this.stopWatching() + } + + private idleTimer(): ReturnType { + const timer = setTimeout(() => this.stopWatching(), PHONE_LIST_IDLE_MS) + timer.unref?.() + return timer + } + + private stopWatching(): void { + const watching = this.watching + this.watching = null + if (watching) { + clearTimeout(watching.idle) + watching.stop() + } + } + + private watch(): () => void { + let queued = false + const check = (): void => { + if (queued) { + return + } + queued = true + // One change can reach several sources, e.g. a retirement and its new status owner. + queueMicrotask(() => { + queued = false + const watching = this.watching + if (!watching) { + return + } + const next = this.describeForAnnouncement() + if (next !== watching.announced) { + watching.announced = next + this.sources.changed() + } + }) + } + const stops = [ + this.hosts.onStatusChanged(check), + this.hosts.onEnvironmentRetired(check), + this.hosts.onCatalogChanged?.(check), + this.sources.onClientEvent((event) => { + // SSH targets carry managed servers' labels and health; host label overrides live in settings. + if ( + event.type === 'sshStateChanged' || + (event.type === 'settingsChanged' && event.keys.includes('hostSettingOverrides')) + ) { + check() + } + }) + ] + return () => { + for (const stop of stops) { + stop?.() + } + } + } + + // A store that can't be read must not throw here, outside any request; phones re-read and get the error. + private describeForAnnouncement(): string { + try { + return JSON.stringify(this.describe()) + } catch { + return 'unreadable' + } + } +} diff --git a/src/main/runtime/orca-runtime.ts b/src/main/runtime/orca-runtime.ts index 8c28e659ffb..367e601fd51 100644 --- a/src/main/runtime/orca-runtime.ts +++ b/src/main/runtime/orca-runtime.ts @@ -179,6 +179,11 @@ class OrcaRuntimeService extends OrcaRuntimeSidebarBase { publishSettingsChanges(this.store, (event) => this.emitClientEvent(event)) } + /** What mobileRelay.hosts.list answers changed. */ + notifyRelayHostsChanged(): void { + this.emitClientEvent({ type: 'relayHostsChanged' }) + } + private structuredAgentAvailability?: ReturnType /** Subscribe from first use; returns the release function. */ diff --git a/src/main/runtime/rpc/server/runtime-rpc-pairing.ts b/src/main/runtime/rpc/server/runtime-rpc-pairing.ts index cd23340f166..7c73aa58f4a 100644 --- a/src/main/runtime/rpc/server/runtime-rpc-pairing.ts +++ b/src/main/runtime/rpc/server/runtime-rpc-pairing.ts @@ -129,6 +129,13 @@ export class RuntimeRpcPairing extends RuntimeRpcNetworkExposure { this.runtime.describeRecipeWorkspaceEnvironments(hostId) }) : null + this.detachRelayHostsChanges?.() + this.detachRelayHostsChanges = + this.mobileRelayHostCatalog?.publishListChanges({ + onClientEvent: (listener) => + this.runtime.onClientEvent(listener, { consumesTerminalSideEffects: false }), + changed: () => this.runtime.notifyRelayHostsChanged() + }) ?? null this.runtime.setPairedWorkspaceContextSource(this.mobileRelayHostCatalog) } diff --git a/src/main/runtime/rpc/server/runtime-rpc-state.ts b/src/main/runtime/rpc/server/runtime-rpc-state.ts index 3f6f5d6894e..8edc4ff2ef8 100644 --- a/src/main/runtime/rpc/server/runtime-rpc-state.ts +++ b/src/main/runtime/rpc/server/runtime-rpc-state.ts @@ -86,6 +86,7 @@ export class RuntimeRpcState { protected mobileDesktopRelay: MobileDesktopRelay | null = null protected mobileRelayHostCatalog: MobileRelayHostCatalog | null = null protected detachPairedServerRows: (() => void) | null = null + protected detachRelayHostsChanges: (() => void) | null = null protected readonly declaredDesktopClients = new DeclaredDesktopClients() protected readonly authenticatedSourceRecorder: AuthenticatedSourceRecorder // Why: lets an automatic mint install a provider whose launch-time construction failed. diff --git a/src/main/runtime/rpc/server/runtime-rpc.ts b/src/main/runtime/rpc/server/runtime-rpc.ts index 628d7a20455..2e0a732be19 100644 --- a/src/main/runtime/rpc/server/runtime-rpc.ts +++ b/src/main/runtime/rpc/server/runtime-rpc.ts @@ -49,6 +49,8 @@ export class OrcaRuntimeRpcServer extends RuntimeRpcMobilePairing { this.mobileSocketWiring = null this.detachPairedServerRows?.() this.detachPairedServerRows = null + this.detachRelayHostsChanges?.() + this.detachRelayHostsChanges = null this.detachWebSocketWiring = null const stopResults = await Promise.allSettled( transports.map(async (transport) => transport.stop()) diff --git a/src/main/wsl/host-lifecycle/wsl-host-service-instance.ts b/src/main/wsl/host-lifecycle/wsl-host-service-instance.ts index bfbd1d1a626..be6db00b4df 100644 --- a/src/main/wsl/host-lifecycle/wsl-host-service-instance.ts +++ b/src/main/wsl/host-lifecycle/wsl-host-service-instance.ts @@ -8,8 +8,24 @@ export function getWslHostService(): WslHostService | null { return instance } +const statusListeners = new Set<() => void>() +let stopForwardingStatuses: (() => void) | null = null + export function setWslHostService(service: WslHostService | null): void { + stopForwardingStatuses?.() instance = service + stopForwardingStatuses = + service?.onStatusesChanged(() => { + for (const listener of statusListeners) { + listener() + } + }) ?? null +} + +/** Statuses of whichever service is installed, now or later. */ +export function onWslHostStatusesChanged(listener: () => void): () => void { + statusListeners.add(listener) + return () => statusListeners.delete(listener) } let phoneGate: WslHostPhoneGate | null = null diff --git a/src/shared/mobile-desktop-relay-contract.ts b/src/shared/mobile-desktop-relay-contract.ts index e0bf449a3e6..5313d95ca37 100644 --- a/src/shared/mobile-desktop-relay-contract.ts +++ b/src/shared/mobile-desktop-relay-contract.ts @@ -7,9 +7,14 @@ export const MOBILE_DESKTOP_RELAY_RUNTIME_CAPABILITY = 'mobile.desktop-relay.v1' export const MOBILE_RELAY_HOST_WORKTREE_DELTAS_RUNTIME_CAPABILITY = 'mobile.relay-host-worktree-deltas.v1' as const +// Hosts that publish relayHostsChanged, so a phone polls mobileRelay.hosts.list only as a backstop. +export const MOBILE_RELAY_HOSTS_CHANGED_EVENT_RUNTIME_CAPABILITY = + 'mobile.relay-hosts-changed-event.v1' as const + /** A desktop relays a phone to a server that mints delegated phone devices; each side advertises. */ export const MOBILE_RELAY_RUNTIME_CAPABILITIES = [ DELEGATED_MOBILE_DEVICES_RUNTIME_CAPABILITY, MOBILE_DESKTOP_RELAY_RUNTIME_CAPABILITY, - MOBILE_RELAY_HOST_WORKTREE_DELTAS_RUNTIME_CAPABILITY + MOBILE_RELAY_HOST_WORKTREE_DELTAS_RUNTIME_CAPABILITY, + MOBILE_RELAY_HOSTS_CHANGED_EVENT_RUNTIME_CAPABILITY ] as const diff --git a/src/shared/runtime-client-events.ts b/src/shared/runtime-client-events.ts index 47e0f41508e..b1d0dcd60f0 100644 --- a/src/shared/runtime-client-events.ts +++ b/src/shared/runtime-client-events.ts @@ -38,6 +38,8 @@ export type RuntimeClientEvent = } /** An agent row changed (coalesced, no ids); phones re-read worktree.ps. Sent only while the sidebar feed is off. */ | { type: 'worktreeRowsChanged' } + /** What mobileRelay.hosts.list answers changed; phones re-read it instead of polling. */ + | { type: 'relayHostsChanged' } | ({ type: 'nativeChatLaunchDraftResolved' } & RuntimeNativeChatLaunchDraftResolution) | { type: 'terminalSideEffects'; batch: TerminalSideEffectBatch } /** Only while this host's own phone reads the sidebar feed; every other reader drops it. */ From a26277b275ee6549c698b615e39333137636e05a Mon Sep 17 00:00:00 2001 From: Kelvin Amoaba <97001695+AmoabaKelvin@users.noreply.github.com> Date: Mon, 9 Nov 2026 13:51:12 +0000 Subject: [PATCH 44/90] perf(github): use the desktop's PR fallback rule on the phone and forward refreshes (#40128) * perf(github): use the desktop's PR fallback rule on the phone and forward refreshes * fix(github): keep a merged fallback PR while the phone has no head --- ...-session.pr-sidebar-github.prchecks-1.json | 518 ++++---- ...ssion.pr-sidebar-github.prforbranch-1.json | 938 +++++++------- ...-session.pr-sidebar-github.reposlug-1.json | 398 +++--- ...n.pr-sidebar-github.workitemdetails-1.json | 518 ++++---- ...n.pr-sidebar-hostedreview.forbranch-1.json | 1014 +++++++-------- ...atrix-session.pr-sidebar-status.get-1.json | 518 ++++---- ...ix-session.pr-sidebar-worktree.show-1.json | 1106 ++++++++-------- .../goldens/pr-comment-posted-in-place.json | 426 +++---- .../pr-resolve-refused-rolls-back.json | 422 +++--- .../goldens/pr-sidebar-checks-refused.json | 398 +++--- .../goldens/pr-sidebar-load.json | 398 +++--- .../pr-sidebar-revisit-and-refresh.json | 1126 +++++++++++++++++ mobile/rpc-foundation/pilot-scenarios.json | 396 ++++++ .../source-control/review/github-pr-rpc.ts | 19 +- .../review/mobile-pr-queries.ts | 14 +- .../review/mobile-pr-sidebar-state.test.ts | 51 + .../review/mobile-pr-sidebar-state.ts | 88 +- .../adapters/pr-sidebar-mount-adapters.ts | 14 + .../github/pr-refresh-candidate-policy.ts | 9 +- .../store/github/refresh/worktree-refresh.ts | 25 +- .../src/web/preload-api/web-github-api.ts | 6 +- .../github/pr-branch-fallback-rule.test.ts | 31 + src/shared/github/pr-branch-fallback-rule.ts | 61 + 23 files changed, 5132 insertions(+), 3362 deletions(-) create mode 100644 mobile/rpc-foundation/goldens/pr-sidebar-revisit-and-refresh.json create mode 100644 mobile/src/source-control/review/mobile-pr-sidebar-state.test.ts create mode 100644 src/shared/github/pr-branch-fallback-rule.test.ts create mode 100644 src/shared/github/pr-branch-fallback-rule.ts diff --git a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.prchecks-1.json b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.prchecks-1.json index 8f71aad930b..5bd0943f174 100644 --- a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.prchecks-1.json +++ b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.prchecks-1.json @@ -124,91 +124,6 @@ "ordinal": 2, "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"github.repoSlug\",\"params\":{\"repo\":\"id:repo-9\"}}" }, - "2309f345fb72": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "pending", - "startedAt": 0 - } - }, - "27531d8cc301": { - "name": "hostedReview.forBranch#1", - "ordinal": 5, - "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" - }, - "28428f85f800": { - "name": "hostedReview.forBranch#1", - "ordinal": 3, - "args": [ - { - "name": "method", - "value": "hostedReview.forBranch" - }, - { - "name": "params", - "value": { - "active": true, - "branch": "feature", - "linkedGitHubPR": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-2", - "ok": true, - "result": { - "mergeable": "MERGEABLE", - "number": 12, - "provider": "github", - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } - } - }, "2aa7c40de795": { "name": "github.prChecks#1", "ordinal": 10, @@ -305,48 +220,10 @@ "kind": "loading" } }, - "357f9b7862e3": { - "name": "worktree.show#1", + "3b5c096da2a3": { + "name": "hostedReview.forBranch#1", "ordinal": 6, - "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" - }, - "4da7ea39401b": { - "name": "worktree.show#1", - "ordinal": 4, - "args": [ - { - "name": "method", - "value": "worktree.show" - }, - { - "name": "params", - "value": { - "worktree": "id:repo-9::/w" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-3", - "ok": true, - "result": { - "worktree": { - "linkedPR": { - "$rpc": "null" - } - } - } - } - } + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" }, "5dcef756f74d": { "name": "github.prChecks#1", @@ -418,59 +295,6 @@ } } }, - "707f5273fbe1": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-4", - "ok": true, - "result": { - "fetchedAt": 0, - "kind": "found", - "pr": { - "headSha": "head-sha-1", - "mergeable": "MERGEABLE", - "number": 12, - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } - } - } - }, "7cab7429568b": { "name": "github.prChecks#1", "ordinal": 10, @@ -749,11 +573,85 @@ } } }, + "a0729c676b9a": { + "name": "worktree.show#1", + "ordinal": 3, + "args": [ + { + "name": "method", + "value": "worktree.show" + }, + { + "name": "params", + "value": { + "worktree": "id:repo-9::/w" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "worktree": { + "linkedPR": { + "$rpc": "null" + } + } + } + } + } + }, "abcf3bdc5cde": { "name": "status.get#1", "ordinal": 13, "json": "{\"id\":\"frame-6\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}" }, + "b3a7ec3ab1c7": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, "bd448e85868e": { "commentError": { "$rpc": "null" @@ -777,6 +675,105 @@ "refreshFailed": false } }, + "c2f3182f1780": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-4", + "ok": true, + "result": { + "fetchedAt": 0, + "kind": "found", + "pr": { + "headSha": "head-sha-1", + "mergeable": "MERGEABLE", + "number": 12, + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + } + }, + "c79bbd27f177": { + "name": "hostedReview.forBranch#1", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "hostedReview.forBranch" + }, + { + "name": "params", + "value": { + "active": true, + "branch": "feature", + "linkedGitHubPR": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-3", + "ok": true, + "result": { + "mergeable": "MERGEABLE", + "number": 12, + "provider": "github", + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + }, "cac8d5a10134": { "name": "github.prChecks#1", "ordinal": 10, @@ -842,11 +839,6 @@ "startedAt": 0 } }, - "d25b12408fe6": { - "name": "github.prForBranch#1", - "ordinal": 9, - "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"currentHeadOid\":null}}" - }, "d3426861162d": { "name": "github.workItemDetails#1", "ordinal": 14, @@ -946,6 +938,11 @@ "refreshFailed": false } }, + "ea4c904bfb5f": { + "name": "worktree.show#1", + "ordinal": 5, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" + }, "eb79a9b3682a": { "status": "fulfilled", "startedAt": 0, @@ -990,6 +987,11 @@ "ok": false } } + }, + "fcced642024c": { + "name": "github.prForBranch#1", + "ordinal": 9, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"acceptMergedFallbackPR\":true,\"currentHeadOid\":null}}" } }, "recording": { @@ -998,8 +1000,8 @@ { "id": "pr-sidebar-load.prelude:branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "2309f345fb72"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "b3a7ec3ab1c7"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1012,17 +1014,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde" ], @@ -1038,18 +1040,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1066,18 +1068,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "8300ca3ac5c2", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1094,18 +1096,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "5dcef756f74d", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1122,18 +1124,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "138623e4e324", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1150,18 +1152,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "cac8d5a10134", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1178,18 +1180,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "07f2f3aaaa06", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1206,18 +1208,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "fb0e9f0edb67", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1234,18 +1236,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "2aa7c40de795", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1262,18 +1264,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "9e247bf3143d", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1290,18 +1292,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "655a4ec47a79", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1318,18 +1320,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "7cab7429568b", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" diff --git a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.prforbranch-1.json b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.prforbranch-1.json index 1f5a63c1443..266eb677a5f 100644 --- a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.prforbranch-1.json +++ b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.prforbranch-1.json @@ -4,6 +4,96 @@ "family": "session.pr-sidebar", "namedDeltas": [], "values": { + "01dceec1375a": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "error": { + "code": "refused", + "message": "" + }, + "id": "frame-4", + "ok": false + } + } + }, + "0d4584d23772": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-4", + "ok": true, + "result": { + "error": "inner refused", + "ok": false + } + } + } + }, "1287167eaf56": { "name": "github.repoSlug#1", "ordinal": 1, @@ -44,7 +134,26 @@ "ordinal": 15, "json": "{\"id\":\"frame-7\",\"deviceToken\":\"recording-device\",\"method\":\"github.workItemDetails\",\"params\":{\"repo\":\"id:repo-9\",\"number\":12,\"type\":\"pr\"}}" }, - "1dc3b425aa47": { + "1f5765918736": { + "name": "github.repoSlug#1", + "ordinal": 2, + "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"github.repoSlug\",\"params\":{\"repo\":\"id:repo-9\"}}" + }, + "29120132bf36": { + "commentError": { + "$rpc": "null" + }, + "pr": { + "kind": "error", + "message": "" + } + }, + "2bb452e534eb": { + "name": "github.prChecks#1", + "ordinal": 12, + "json": "{\"id\":\"frame-5\",\"deviceToken\":\"recording-device\",\"method\":\"github.prChecks\",\"params\":{\"repo\":\"id:repo-9\",\"prNumber\":12,\"headSha\":\"head-sha-1\"}}" + }, + "2f671ce1a654": { "name": "github.prForBranch#1", "ordinal": 8, "args": [ @@ -55,6 +164,7 @@ { "name": "params", "value": { + "acceptMergedFallbackPR": true, "branch": "feature", "currentHeadOid": { "$rpc": "null" @@ -84,275 +194,7 @@ } } }, - "1f5765918736": { - "name": "github.repoSlug#1", - "ordinal": 2, - "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"github.repoSlug\",\"params\":{\"repo\":\"id:repo-9\"}}" - }, - "2309f345fb72": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "pending", - "startedAt": 0 - } - }, - "27531d8cc301": { - "name": "hostedReview.forBranch#1", - "ordinal": 5, - "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" - }, - "28428f85f800": { - "name": "hostedReview.forBranch#1", - "ordinal": 3, - "args": [ - { - "name": "method", - "value": "hostedReview.forBranch" - }, - { - "name": "params", - "value": { - "active": true, - "branch": "feature", - "linkedGitHubPR": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-2", - "ok": true, - "result": { - "mergeable": "MERGEABLE", - "number": 12, - "provider": "github", - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } - } - }, - "29120132bf36": { - "commentError": { - "$rpc": "null" - }, - "pr": { - "kind": "error", - "message": "" - } - }, - "2bb452e534eb": { - "name": "github.prChecks#1", - "ordinal": 12, - "json": "{\"id\":\"frame-5\",\"deviceToken\":\"recording-device\",\"method\":\"github.prChecks\",\"params\":{\"repo\":\"id:repo-9\",\"prNumber\":12,\"headSha\":\"head-sha-1\"}}" - }, - "35045fa5a752": { - "commentError": { - "$rpc": "null" - }, - "pr": { - "kind": "loading" - } - }, - "357f9b7862e3": { - "name": "worktree.show#1", - "ordinal": 6, - "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" - }, - "37798555c066": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-4", - "ok": true, - "result": { - "$rpc": "null" - } - } - } - }, - "4da7ea39401b": { - "name": "worktree.show#1", - "ordinal": 4, - "args": [ - { - "name": "method", - "value": "worktree.show" - }, - { - "name": "params", - "value": { - "worktree": "id:repo-9::/w" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-3", - "ok": true, - "result": { - "worktree": { - "linkedPR": { - "$rpc": "null" - } - } - } - } - } - }, - "6b1694d3660f": { - "commentError": { - "$rpc": "null" - }, - "pr": { - "kind": "none" - } - }, - "6ed2d1d6c61b": { - "commentError": { - "$rpc": "null" - }, - "pr": { - "kind": "error", - "message": "Unknown method" - } - }, - "707f5273fbe1": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-4", - "ok": true, - "result": { - "fetchedAt": 0, - "kind": "found", - "pr": { - "headSha": "head-sha-1", - "mergeable": "MERGEABLE", - "number": 12, - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } - } - } - }, - "77ff745b56fa": { + "3311287c08a2": { "name": "github.prForBranch#1", "ordinal": 8, "args": [ @@ -363,6 +205,7 @@ { "name": "params", "value": { + "acceptMergedFallbackPR": true, "branch": "feature", "currentHeadOid": { "$rpc": "null" @@ -388,12 +231,25 @@ "settledAt": 0, "error": { "category": "Error", - "message": "transport failure", + "message": "", "isRpcDeliveryUnknown": true } } }, - "807f60a1f770": { + "35045fa5a752": { + "commentError": { + "$rpc": "null" + }, + "pr": { + "kind": "loading" + } + }, + "3b5c096da2a3": { + "name": "hostedReview.forBranch#1", + "ordinal": 6, + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" + }, + "3ff1d7177a66": { "name": "github.prForBranch#1", "ordinal": 8, "args": [ @@ -404,6 +260,7 @@ { "name": "params", "value": { + "acceptMergedFallbackPR": true, "branch": "feature", "currentHeadOid": { "$rpc": "null" @@ -431,7 +288,70 @@ "id": "frame-4", "ok": true, "result": { - "error": "inner refused", + "error": "refused" + } + } + } + }, + "6b1694d3660f": { + "commentError": { + "$rpc": "null" + }, + "pr": { + "kind": "none" + } + }, + "6ed2d1d6c61b": { + "commentError": { + "$rpc": "null" + }, + "pr": { + "kind": "error", + "message": "Unknown method" + } + }, + "71e7db356e95": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-4", + "ok": true, + "result": { + "error": { + "message": "inner refused" + }, "ok": false } } @@ -523,50 +443,6 @@ "message": "transport failure" } }, - "938c799557e3": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "error": { - "code": "refused", - "message": "" - }, - "id": "frame-4", - "ok": false - } - } - }, "98aa27f6bdff": { "commentError": { "$rpc": "null" @@ -604,12 +480,7 @@ "startedAt": 0 } }, - "abcf3bdc5cde": { - "name": "status.get#1", - "ordinal": 13, - "json": "{\"id\":\"frame-6\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}" - }, - "b36e6dd5be3d": { + "9cd150b0bcb8": { "name": "github.prForBranch#1", "ordinal": 8, "args": [ @@ -620,6 +491,7 @@ { "name": "params", "value": { + "acceptMergedFallbackPR": true, "branch": "feature", "currentHeadOid": { "$rpc": "null" @@ -639,22 +511,96 @@ } } ], + "settlement": { + "status": "rejected", + "startedAt": 0, + "settledAt": 0, + "error": { + "category": "Error", + "message": "transport failure", + "isRpcDeliveryUnknown": true + } + } + }, + "a0729c676b9a": { + "name": "worktree.show#1", + "ordinal": 3, + "args": [ + { + "name": "method", + "value": "worktree.show" + }, + { + "name": "params", + "value": { + "worktree": "id:repo-9::/w" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], "settlement": { "status": "fulfilled", "startedAt": 0, "settledAt": 0, "value": { - "id": "frame-4", + "id": "frame-2", "ok": true, "result": { - "error": { - "message": "inner refused" - }, - "ok": false + "worktree": { + "linkedPR": { + "$rpc": "null" + } + } } } } }, + "abcf3bdc5cde": { + "name": "status.get#1", + "ordinal": 13, + "json": "{\"id\":\"frame-6\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}" + }, + "b3a7ec3ab1c7": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, "b772fc418001": { "commentError": { "$rpc": "null" @@ -673,7 +619,7 @@ "message": "outer refused" } }, - "c9329ced0970": { + "c2f3182f1780": { "name": "github.prForBranch#1", "ordinal": 8, "args": [ @@ -684,6 +630,7 @@ { "name": "params", "value": { + "acceptMergedFallbackPR": true, "branch": "feature", "currentHeadOid": { "$rpc": "null" @@ -711,7 +658,62 @@ "id": "frame-4", "ok": true, "result": { - "error": "refused" + "fetchedAt": 0, + "kind": "found", + "pr": { + "headSha": "head-sha-1", + "mergeable": "MERGEABLE", + "number": 12, + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + } + }, + "c79bbd27f177": { + "name": "hostedReview.forBranch#1", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "hostedReview.forBranch" + }, + { + "name": "params", + "value": { + "active": true, + "branch": "feature", + "linkedGitHubPR": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-3", + "ok": true, + "result": { + "mergeable": "MERGEABLE", + "number": 12, + "provider": "github", + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" } } } @@ -744,11 +746,6 @@ "startedAt": 0 } }, - "d25b12408fe6": { - "name": "github.prForBranch#1", - "ordinal": 9, - "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"currentHeadOid\":null}}" - }, "d3426861162d": { "name": "github.workItemDetails#1", "ordinal": 14, @@ -823,73 +820,7 @@ "variant": "worktree-summary" } }, - "d751b4c53cb0": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "rejected", - "startedAt": 0, - "settledAt": 0, - "error": { - "category": "Error", - "message": "", - "isRpcDeliveryUnknown": true - } - } - }, - "e0a11d8a1005": { - "commentError": { - "$rpc": "null" - }, - "pr": { - "checks": ["build:success"], - "checksError": { - "$rpc": "null" - }, - "comments": [ - { - "body": "please fix", - "id": 55, - "resolved": false - } - ], - "kind": "ready", - "pr": { - "headSha": "head-sha-1", - "number": 12, - "title": "Recorded" - }, - "refreshFailed": false - } - }, - "e6ce999d34a3": { + "db0f13882cd3": { "name": "github.prForBranch#1", "ordinal": 8, "args": [ @@ -900,6 +831,7 @@ { "name": "params", "value": { + "acceptMergedFallbackPR": true, "branch": "feature", "currentHeadOid": { "$rpc": "null" @@ -933,15 +865,32 @@ } } }, - "eb79a9b3682a": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "$rpc": "undefined" + "e0a11d8a1005": { + "commentError": { + "$rpc": "null" + }, + "pr": { + "checks": ["build:success"], + "checksError": { + "$rpc": "null" + }, + "comments": [ + { + "body": "please fix", + "id": 55, + "resolved": false + } + ], + "kind": "ready", + "pr": { + "headSha": "head-sha-1", + "number": 12, + "title": "Recorded" + }, + "refreshFailed": false } }, - "ed93c0450d76": { + "e77e2e9a637f": { "name": "github.prForBranch#1", "ordinal": 8, "args": [ @@ -952,6 +901,7 @@ { "name": "params", "value": { + "acceptMergedFallbackPR": true, "branch": "feature", "currentHeadOid": { "$rpc": "null" @@ -984,6 +934,68 @@ "ok": false } } + }, + "ea4c904bfb5f": { + "name": "worktree.show#1", + "ordinal": 5, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" + }, + "eb79a9b3682a": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "$rpc": "undefined" + } + }, + "eb9299147c3a": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-4", + "ok": true, + "result": { + "$rpc": "null" + } + } + } + }, + "fcced642024c": { + "name": "github.prForBranch#1", + "ordinal": 9, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"acceptMergedFallbackPR\":true,\"currentHeadOid\":null}}" } }, "recording": { @@ -992,8 +1004,8 @@ { "id": "pr-sidebar-load.prelude:branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "2309f345fb72"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "b3a7ec3ab1c7"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1006,17 +1018,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde" ], @@ -1032,18 +1044,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1058,8 +1070,8 @@ { "id": "pr-sidebar-load.result-absent:pr", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "1dc3b425aa47"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "2f671ce1a654"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1070,8 +1082,8 @@ { "id": "pr-sidebar-load.result-absent:loaded", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "1dc3b425aa47"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "2f671ce1a654"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1082,8 +1094,8 @@ { "id": "pr-sidebar-load.result-null:pr", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "37798555c066"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "eb9299147c3a"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1094,8 +1106,8 @@ { "id": "pr-sidebar-load.result-null:loaded", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "37798555c066"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "eb9299147c3a"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1106,8 +1118,8 @@ { "id": "pr-sidebar-load.inner-ok-missing:pr", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "c9329ced0970"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "3ff1d7177a66"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1118,8 +1130,8 @@ { "id": "pr-sidebar-load.inner-ok-missing:loaded", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "c9329ced0970"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "3ff1d7177a66"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1130,8 +1142,8 @@ { "id": "pr-sidebar-load.inner-false-string-error:pr", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "807f60a1f770"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "0d4584d23772"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1142,8 +1154,8 @@ { "id": "pr-sidebar-load.inner-false-string-error:loaded", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "807f60a1f770"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "0d4584d23772"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1154,8 +1166,8 @@ { "id": "pr-sidebar-load.inner-false-object-error:pr", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "b36e6dd5be3d"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "71e7db356e95"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1166,8 +1178,8 @@ { "id": "pr-sidebar-load.inner-false-object-error:loaded", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "b36e6dd5be3d"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "71e7db356e95"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1178,8 +1190,8 @@ { "id": "pr-sidebar-load.outer-refused:pr", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "e6ce999d34a3"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "db0f13882cd3"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1190,8 +1202,8 @@ { "id": "pr-sidebar-load.outer-refused:loaded", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "e6ce999d34a3"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "db0f13882cd3"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1202,8 +1214,8 @@ { "id": "pr-sidebar-load.outer-refused-no-message:pr", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "938c799557e3"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "01dceec1375a"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1214,8 +1226,8 @@ { "id": "pr-sidebar-load.outer-refused-no-message:loaded", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "938c799557e3"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "01dceec1375a"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1226,8 +1238,8 @@ { "id": "pr-sidebar-load.method-not-found:pr", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "ed93c0450d76"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "e77e2e9a637f"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1238,8 +1250,8 @@ { "id": "pr-sidebar-load.method-not-found:loaded", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "ed93c0450d76"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "e77e2e9a637f"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1250,8 +1262,8 @@ { "id": "pr-sidebar-load.transport-rejection:pr", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "77ff745b56fa"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "9cd150b0bcb8"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1262,8 +1274,8 @@ { "id": "pr-sidebar-load.transport-rejection:loaded", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "77ff745b56fa"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "9cd150b0bcb8"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1274,8 +1286,8 @@ { "id": "pr-sidebar-load.transport-rejection-no-message:pr", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "d751b4c53cb0"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "3311287c08a2"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1286,8 +1298,8 @@ { "id": "pr-sidebar-load.transport-rejection-no-message:loaded", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "d751b4c53cb0"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "3311287c08a2"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, diff --git a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.reposlug-1.json b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.reposlug-1.json index 9c82dfbc8d3..38743c741aa 100644 --- a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.reposlug-1.json +++ b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.reposlug-1.json @@ -49,91 +49,6 @@ "ordinal": 2, "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"github.repoSlug\",\"params\":{\"repo\":\"id:repo-9\"}}" }, - "2309f345fb72": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "pending", - "startedAt": 0 - } - }, - "27531d8cc301": { - "name": "hostedReview.forBranch#1", - "ordinal": 5, - "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" - }, - "28428f85f800": { - "name": "hostedReview.forBranch#1", - "ordinal": 3, - "args": [ - { - "name": "method", - "value": "hostedReview.forBranch" - }, - { - "name": "params", - "value": { - "active": true, - "branch": "feature", - "linkedGitHubPR": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-2", - "ok": true, - "result": { - "mergeable": "MERGEABLE", - "number": 12, - "provider": "github", - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } - } - }, "2bb452e534eb": { "name": "github.prChecks#1", "ordinal": 12, @@ -212,101 +127,10 @@ "kind": "loading" } }, - "357f9b7862e3": { - "name": "worktree.show#1", + "3b5c096da2a3": { + "name": "hostedReview.forBranch#1", "ordinal": 6, - "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" - }, - "4da7ea39401b": { - "name": "worktree.show#1", - "ordinal": 4, - "args": [ - { - "name": "method", - "value": "worktree.show" - }, - { - "name": "params", - "value": { - "worktree": "id:repo-9::/w" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-3", - "ok": true, - "result": { - "worktree": { - "linkedPR": { - "$rpc": "null" - } - } - } - } - } - }, - "707f5273fbe1": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-4", - "ok": true, - "result": { - "fetchedAt": 0, - "kind": "found", - "pr": { - "headSha": "head-sha-1", - "mergeable": "MERGEABLE", - "number": 12, - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } - } - } + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" }, "8352e3c99668": { "name": "status.get#1", @@ -552,6 +376,44 @@ "startedAt": 0 } }, + "a0729c676b9a": { + "name": "worktree.show#1", + "ordinal": 3, + "args": [ + { + "name": "method", + "value": "worktree.show" + }, + { + "name": "params", + "value": { + "worktree": "id:repo-9::/w" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "worktree": { + "linkedPR": { + "$rpc": "null" + } + } + } + } + } + }, "abae46078fe1": { "name": "github.repoSlug#1", "ordinal": 1, @@ -589,6 +451,42 @@ "ordinal": 13, "json": "{\"id\":\"frame-6\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}" }, + "b3a7ec3ab1c7": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, "b77761a8ce16": { "name": "github.repoSlug#1", "ordinal": 1, @@ -693,6 +591,105 @@ } } }, + "c2f3182f1780": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-4", + "ok": true, + "result": { + "fetchedAt": 0, + "kind": "found", + "pr": { + "headSha": "head-sha-1", + "mergeable": "MERGEABLE", + "number": 12, + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + } + }, + "c79bbd27f177": { + "name": "hostedReview.forBranch#1", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "hostedReview.forBranch" + }, + { + "name": "params", + "value": { + "active": true, + "branch": "feature", + "linkedGitHubPR": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-3", + "ok": true, + "result": { + "mergeable": "MERGEABLE", + "number": 12, + "provider": "github", + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + }, "cb071b912510": { "name": "github.prChecks#1", "ordinal": 10, @@ -721,11 +718,6 @@ "startedAt": 0 } }, - "d25b12408fe6": { - "name": "github.prForBranch#1", - "ordinal": 9, - "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"currentHeadOid\":null}}" - }, "d3426861162d": { "name": "github.workItemDetails#1", "ordinal": 14, @@ -825,6 +817,11 @@ "refreshFailed": false } }, + "ea4c904bfb5f": { + "name": "worktree.show#1", + "ordinal": 5, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" + }, "ead3ad184e51": { "commentError": { "$rpc": "null" @@ -840,6 +837,11 @@ "value": { "$rpc": "undefined" } + }, + "fcced642024c": { + "name": "github.prForBranch#1", + "ordinal": 9, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"acceptMergedFallbackPR\":true,\"currentHeadOid\":null}}" } }, "recording": { @@ -848,8 +850,8 @@ { "id": "pr-sidebar-load.normal:branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "2309f345fb72"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "b3a7ec3ab1c7"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -862,17 +864,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde" ], @@ -888,18 +890,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" diff --git a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.workitemdetails-1.json b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.workitemdetails-1.json index 1de7e703184..3850da92dd4 100644 --- a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.workitemdetails-1.json +++ b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-github.workitemdetails-1.json @@ -49,91 +49,6 @@ "ordinal": 2, "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"github.repoSlug\",\"params\":{\"repo\":\"id:repo-9\"}}" }, - "2309f345fb72": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "pending", - "startedAt": 0 - } - }, - "27531d8cc301": { - "name": "hostedReview.forBranch#1", - "ordinal": 5, - "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" - }, - "28428f85f800": { - "name": "hostedReview.forBranch#1", - "ordinal": 3, - "args": [ - { - "name": "method", - "value": "hostedReview.forBranch" - }, - { - "name": "params", - "value": { - "active": true, - "branch": "feature", - "linkedGitHubPR": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-2", - "ok": true, - "result": { - "mergeable": "MERGEABLE", - "number": 12, - "provider": "github", - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } - } - }, "2bb452e534eb": { "name": "github.prChecks#1", "ordinal": 12, @@ -147,10 +62,10 @@ "kind": "loading" } }, - "357f9b7862e3": { - "name": "worktree.show#1", + "3b5c096da2a3": { + "name": "hostedReview.forBranch#1", "ordinal": 6, - "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" }, "3c501939dd10": { "name": "github.workItemDetails#1", @@ -191,44 +106,6 @@ } } }, - "4da7ea39401b": { - "name": "worktree.show#1", - "ordinal": 4, - "args": [ - { - "name": "method", - "value": "worktree.show" - }, - { - "name": "params", - "value": { - "worktree": "id:repo-9::/w" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-3", - "ok": true, - "result": { - "worktree": { - "linkedPR": { - "$rpc": "null" - } - } - } - } - } - }, "4dd3c3919d72": { "name": "github.workItemDetails#1", "ordinal": 14, @@ -319,59 +196,6 @@ "refreshFailed": false } }, - "707f5273fbe1": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-4", - "ok": true, - "result": { - "fetchedAt": 0, - "kind": "found", - "pr": { - "headSha": "head-sha-1", - "mergeable": "MERGEABLE", - "number": 12, - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } - } - } - }, "8352e3c99668": { "name": "status.get#1", "ordinal": 11, @@ -631,11 +455,85 @@ } } }, + "a0729c676b9a": { + "name": "worktree.show#1", + "ordinal": 3, + "args": [ + { + "name": "method", + "value": "worktree.show" + }, + { + "name": "params", + "value": { + "worktree": "id:repo-9::/w" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "worktree": { + "linkedPR": { + "$rpc": "null" + } + } + } + } + } + }, "abcf3bdc5cde": { "name": "status.get#1", "ordinal": 13, "json": "{\"id\":\"frame-6\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}" }, + "b3a7ec3ab1c7": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, "befec9e6a3a2": { "name": "github.workItemDetails#1", "ordinal": 14, @@ -675,6 +573,105 @@ } } }, + "c2f3182f1780": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-4", + "ok": true, + "result": { + "fetchedAt": 0, + "kind": "found", + "pr": { + "headSha": "head-sha-1", + "mergeable": "MERGEABLE", + "number": 12, + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + } + }, + "c79bbd27f177": { + "name": "hostedReview.forBranch#1", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "hostedReview.forBranch" + }, + { + "name": "params", + "value": { + "active": true, + "branch": "feature", + "linkedGitHubPR": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-3", + "ok": true, + "result": { + "mergeable": "MERGEABLE", + "number": 12, + "provider": "github", + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + }, "cb071b912510": { "name": "github.prChecks#1", "ordinal": 10, @@ -703,11 +700,6 @@ "startedAt": 0 } }, - "d25b12408fe6": { - "name": "github.prForBranch#1", - "ordinal": 9, - "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"currentHeadOid\":null}}" - }, "d3426861162d": { "name": "github.workItemDetails#1", "ordinal": 14, @@ -848,6 +840,11 @@ "refreshFailed": false } }, + "ea4c904bfb5f": { + "name": "worktree.show#1", + "ordinal": 5, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" + }, "eb79a9b3682a": { "status": "fulfilled", "startedAt": 0, @@ -891,6 +888,11 @@ "isRpcDeliveryUnknown": true } } + }, + "fcced642024c": { + "name": "github.prForBranch#1", + "ordinal": 9, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"acceptMergedFallbackPR\":true,\"currentHeadOid\":null}}" } }, "recording": { @@ -899,8 +901,8 @@ { "id": "pr-sidebar-load.prelude:branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "2309f345fb72"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "b3a7ec3ab1c7"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -913,17 +915,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde" ], @@ -939,18 +941,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -967,18 +969,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "553539d5f778" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -995,18 +997,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "9d6b176701fc" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1023,18 +1025,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "96e55cac0dab" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1051,18 +1053,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "9eeed6bde74f" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1079,18 +1081,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "dded64e82310" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1107,18 +1109,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "94aa3113193b" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1135,18 +1137,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "3c501939dd10" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1163,18 +1165,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "befec9e6a3a2" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1191,18 +1193,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "4dd3c3919d72" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1219,18 +1221,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "fb8d97e83d5b" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" diff --git a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-hostedreview.forbranch-1.json b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-hostedreview.forbranch-1.json index 4aa0fb791ce..8cf955cd37d 100644 --- a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-hostedreview.forbranch-1.json +++ b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-hostedreview.forbranch-1.json @@ -4,46 +4,6 @@ "family": "session.pr-sidebar", "namedDeltas": [], "values": { - "01e44c5eb3a8": { - "name": "hostedReview.forBranch#1", - "ordinal": 3, - "args": [ - { - "name": "method", - "value": "hostedReview.forBranch" - }, - { - "name": "params", - "value": { - "active": true, - "branch": "feature", - "linkedGitHubPR": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-2", - "ok": true, - "result": { - "error": "inner refused", - "ok": false - } - } - } - }, "1287167eaf56": { "name": "github.repoSlug#1", "ordinal": 1, @@ -84,54 +44,9 @@ "ordinal": 15, "json": "{\"id\":\"frame-7\",\"deviceToken\":\"recording-device\",\"method\":\"github.workItemDetails\",\"params\":{\"repo\":\"id:repo-9\",\"number\":12,\"type\":\"pr\"}}" }, - "1f5765918736": { - "name": "github.repoSlug#1", - "ordinal": 2, - "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"github.repoSlug\",\"params\":{\"repo\":\"id:repo-9\"}}" - }, - "2309f345fb72": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "pending", - "startedAt": 0 - } - }, - "27531d8cc301": { + "1b8c3928debe": { "name": "hostedReview.forBranch#1", - "ordinal": 5, - "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" - }, - "28428f85f800": { - "name": "hostedReview.forBranch#1", - "ordinal": 3, + "ordinal": 4, "args": [ { "name": "method", @@ -160,20 +75,20 @@ "startedAt": 0, "settledAt": 0, "value": { - "id": "frame-2", + "id": "frame-3", "ok": true, "result": { - "mergeable": "MERGEABLE", - "number": 12, - "provider": "github", - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" + "error": "inner refused", + "ok": false } } } }, + "1f5765918736": { + "name": "github.repoSlug#1", + "ordinal": 2, + "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"github.repoSlug\",\"params\":{\"repo\":\"id:repo-9\"}}" + }, "2bb452e534eb": { "name": "github.prChecks#1", "ordinal": 12, @@ -187,90 +102,10 @@ "kind": "loading" } }, - "357f9b7862e3": { - "name": "worktree.show#1", + "3b5c096da2a3": { + "name": "hostedReview.forBranch#1", "ordinal": 6, - "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" - }, - "36fa584ff08a": { - "name": "hostedReview.forBranch#1", - "ordinal": 3, - "args": [ - { - "name": "method", - "value": "hostedReview.forBranch" - }, - { - "name": "params", - "value": { - "active": true, - "branch": "feature", - "linkedGitHubPR": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "error": { - "code": "refused", - "message": "outer refused" - }, - "id": "frame-2", - "ok": false - } - } - }, - "3cfe7aea50b5": { - "name": "hostedReview.forBranch#1", - "ordinal": 3, - "args": [ - { - "name": "method", - "value": "hostedReview.forBranch" - }, - { - "name": "params", - "value": { - "active": true, - "branch": "feature", - "linkedGitHubPR": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "error": { - "code": "refused", - "message": "" - }, - "id": "frame-2", - "ok": false - } - } + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" }, "3f2be140c6f4": { "name": "github.prForBranch#1", @@ -327,18 +162,23 @@ } } }, - "4da7ea39401b": { - "name": "worktree.show#1", + "6116b3d53db6": { + "name": "hostedReview.forBranch#1", "ordinal": 4, "args": [ { "name": "method", - "value": "worktree.show" + "value": "hostedReview.forBranch" }, { "name": "params", "value": { - "worktree": "id:repo-9::/w" + "active": true, + "branch": "feature", + "linkedGitHubPR": { + "$rpc": "null" + }, + "repo": "id:repo-9" } }, { @@ -349,25 +189,19 @@ } ], "settlement": { - "status": "fulfilled", + "status": "rejected", "startedAt": 0, "settledAt": 0, - "value": { - "id": "frame-3", - "ok": true, - "result": { - "worktree": { - "linkedPR": { - "$rpc": "null" - } - } - } + "error": { + "category": "Error", + "message": "transport failure", + "isRpcDeliveryUnknown": true } } }, - "64aab527c6dd": { + "6ac3f8cddce7": { "name": "hostedReview.forBranch#1", - "ordinal": 3, + "ordinal": 4, "args": [ { "name": "method", @@ -392,108 +226,13 @@ } ], "settlement": { - "status": "fulfilled", + "status": "rejected", "startedAt": 0, "settledAt": 0, - "value": { - "id": "frame-2", - "ok": true, - "result": { - "error": "refused" - } - } - } - }, - "7057d3371d62": { - "name": "hostedReview.forBranch#1", - "ordinal": 3, - "args": [ - { - "name": "method", - "value": "hostedReview.forBranch" - }, - { - "name": "params", - "value": { - "active": true, - "branch": "feature", - "linkedGitHubPR": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "error": { - "code": "method_not_found", - "message": "Unknown method" - }, - "id": "frame-2", - "ok": false - } - } - }, - "707f5273fbe1": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-4", - "ok": true, - "result": { - "fetchedAt": 0, - "kind": "found", - "pr": { - "headSha": "head-sha-1", - "mergeable": "MERGEABLE", - "number": 12, - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } + "error": { + "category": "Error", + "message": "", + "isRpcDeliveryUnknown": true } } }, @@ -533,6 +272,127 @@ } } }, + "83d0a0d7a15f": { + "name": "hostedReview.forBranch#1", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "hostedReview.forBranch" + }, + { + "name": "params", + "value": { + "active": true, + "branch": "feature", + "linkedGitHubPR": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-3", + "ok": true, + "result": { + "$rpc": "null" + } + } + } + }, + "84c6098c5749": { + "name": "hostedReview.forBranch#1", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "hostedReview.forBranch" + }, + { + "name": "params", + "value": { + "active": true, + "branch": "feature", + "linkedGitHubPR": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-3", + "ok": true, + "result": { + "error": { + "message": "inner refused" + }, + "ok": false + } + } + } + }, + "87093c41db0a": { + "name": "hostedReview.forBranch#1", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "hostedReview.forBranch" + }, + { + "name": "params", + "value": { + "active": true, + "branch": "feature", + "linkedGitHubPR": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "error": { + "code": "method_not_found", + "message": "Unknown method" + }, + "id": "frame-3", + "ok": false + } + } + }, "87ba39148f02": { "name": "github.prChecks#1", "ordinal": 10, @@ -574,9 +434,9 @@ } } }, - "8a392c6391f4": { + "8d9bdb4e2f55": { "name": "hostedReview.forBranch#1", - "ordinal": 3, + "ordinal": 4, "args": [ { "name": "method", @@ -605,51 +465,12 @@ "startedAt": 0, "settledAt": 0, "value": { - "id": "frame-2", - "ok": true, - "result": { - "error": { - "message": "inner refused" - }, - "ok": false - } - } - } - }, - "8fee46bf95e3": { - "name": "hostedReview.forBranch#1", - "ordinal": 3, - "args": [ - { - "name": "method", - "value": "hostedReview.forBranch" - }, - { - "name": "params", - "value": { - "active": true, - "branch": "feature", - "linkedGitHubPR": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "rejected", - "startedAt": 0, - "settledAt": 0, - "error": { - "category": "Error", - "message": "transport failure", - "isRpcDeliveryUnknown": true + "error": { + "code": "refused", + "message": "" + }, + "id": "frame-3", + "ok": false } } }, @@ -690,43 +511,6 @@ "startedAt": 0 } }, - "9787a82ed96e": { - "name": "hostedReview.forBranch#1", - "ordinal": 3, - "args": [ - { - "name": "method", - "value": "hostedReview.forBranch" - }, - { - "name": "params", - "value": { - "active": true, - "branch": "feature", - "linkedGitHubPR": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "rejected", - "startedAt": 0, - "settledAt": 0, - "error": { - "category": "Error", - "message": "", - "isRpcDeliveryUnknown": true - } - } - }, "9c952632b0c0": { "name": "status.get#1", "ordinal": 11, @@ -755,11 +539,184 @@ "startedAt": 0 } }, + "a0729c676b9a": { + "name": "worktree.show#1", + "ordinal": 3, + "args": [ + { + "name": "method", + "value": "worktree.show" + }, + { + "name": "params", + "value": { + "worktree": "id:repo-9::/w" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "worktree": { + "linkedPR": { + "$rpc": "null" + } + } + } + } + } + }, "abcf3bdc5cde": { "name": "status.get#1", "ordinal": 13, "json": "{\"id\":\"frame-6\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}" }, + "b3a7ec3ab1c7": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, + "c2f3182f1780": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-4", + "ok": true, + "result": { + "fetchedAt": 0, + "kind": "found", + "pr": { + "headSha": "head-sha-1", + "mergeable": "MERGEABLE", + "number": 12, + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + } + }, + "c79bbd27f177": { + "name": "hostedReview.forBranch#1", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "hostedReview.forBranch" + }, + { + "name": "params", + "value": { + "active": true, + "branch": "feature", + "linkedGitHubPR": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-3", + "ok": true, + "result": { + "mergeable": "MERGEABLE", + "number": 12, + "provider": "github", + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + }, "cb071b912510": { "name": "github.prChecks#1", "ordinal": 10, @@ -788,11 +745,6 @@ "startedAt": 0 } }, - "d25b12408fe6": { - "name": "github.prForBranch#1", - "ordinal": 9, - "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"currentHeadOid\":null}}" - }, "d3426861162d": { "name": "github.workItemDetails#1", "ordinal": 14, @@ -867,6 +819,42 @@ "variant": "worktree-summary" } }, + "da5731d6ed68": { + "name": "hostedReview.forBranch#1", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "hostedReview.forBranch" + }, + { + "name": "params", + "value": { + "active": true, + "branch": "feature", + "linkedGitHubPR": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-3", + "ok": true + } + } + }, "e0a11d8a1005": { "commentError": { "$rpc": "null" @@ -897,6 +885,11 @@ "ordinal": 9, "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":null,\"currentHeadOid\":null}}" }, + "ea4c904bfb5f": { + "name": "worktree.show#1", + "ordinal": 5, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" + }, "eb79a9b3682a": { "status": "fulfilled", "startedAt": 0, @@ -905,9 +898,9 @@ "$rpc": "undefined" } }, - "edf124c35a74": { + "f8640e9f0f71": { "name": "hostedReview.forBranch#1", - "ordinal": 3, + "ordinal": 4, "args": [ { "name": "method", @@ -936,17 +929,17 @@ "startedAt": 0, "settledAt": 0, "value": { - "id": "frame-2", + "id": "frame-3", "ok": true, "result": { - "$rpc": "null" + "error": "refused" } } } }, - "fabc9971bcc9": { + "fad4f35a3777": { "name": "hostedReview.forBranch#1", - "ordinal": 3, + "ordinal": 4, "args": [ { "name": "method", @@ -975,10 +968,19 @@ "startedAt": 0, "settledAt": 0, "value": { - "id": "frame-2", - "ok": true + "error": { + "code": "refused", + "message": "outer refused" + }, + "id": "frame-3", + "ok": false } } + }, + "fcced642024c": { + "name": "github.prForBranch#1", + "ordinal": 9, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"acceptMergedFallbackPR\":true,\"currentHeadOid\":null}}" } }, "recording": { @@ -987,8 +989,8 @@ { "id": "pr-sidebar-load.normal:branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "2309f345fb72"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "b3a7ec3ab1c7"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1001,17 +1003,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde" ], @@ -1027,18 +1029,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1053,8 +1055,8 @@ { "id": "pr-sidebar-load.result-absent:branch-hint", "observation": { - "sender": ["1287167eaf56", "fabc9971bcc9", "4da7ea39401b", "955df7128577"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "e6d7037c4df4"], + "sender": ["1287167eaf56", "a0729c676b9a", "da5731d6ed68", "955df7128577"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "e6d7037c4df4"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1067,16 +1069,16 @@ "observation": { "sender": [ "1287167eaf56", - "fabc9971bcc9", - "4da7ea39401b", + "a0729c676b9a", + "da5731d6ed68", "3f2be140c6f4", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", + "ea4c904bfb5f", + "3b5c096da2a3", "e6d7037c4df4", "2bb452e534eb", "abcf3bdc5cde" @@ -1093,8 +1095,8 @@ "observation": { "sender": [ "1287167eaf56", - "fabc9971bcc9", - "4da7ea39401b", + "a0729c676b9a", + "da5731d6ed68", "3f2be140c6f4", "87ba39148f02", "8352e3c99668", @@ -1102,8 +1104,8 @@ ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", + "ea4c904bfb5f", + "3b5c096da2a3", "e6d7037c4df4", "2bb452e534eb", "abcf3bdc5cde", @@ -1119,8 +1121,8 @@ { "id": "pr-sidebar-load.result-null:branch-hint", "observation": { - "sender": ["1287167eaf56", "edf124c35a74", "4da7ea39401b", "955df7128577"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "e6d7037c4df4"], + "sender": ["1287167eaf56", "a0729c676b9a", "83d0a0d7a15f", "955df7128577"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "e6d7037c4df4"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1133,16 +1135,16 @@ "observation": { "sender": [ "1287167eaf56", - "edf124c35a74", - "4da7ea39401b", + "a0729c676b9a", + "83d0a0d7a15f", "3f2be140c6f4", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", + "ea4c904bfb5f", + "3b5c096da2a3", "e6d7037c4df4", "2bb452e534eb", "abcf3bdc5cde" @@ -1159,8 +1161,8 @@ "observation": { "sender": [ "1287167eaf56", - "edf124c35a74", - "4da7ea39401b", + "a0729c676b9a", + "83d0a0d7a15f", "3f2be140c6f4", "87ba39148f02", "8352e3c99668", @@ -1168,8 +1170,8 @@ ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", + "ea4c904bfb5f", + "3b5c096da2a3", "e6d7037c4df4", "2bb452e534eb", "abcf3bdc5cde", @@ -1185,8 +1187,8 @@ { "id": "pr-sidebar-load.inner-ok-missing:branch-hint", "observation": { - "sender": ["1287167eaf56", "64aab527c6dd", "4da7ea39401b", "955df7128577"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "e6d7037c4df4"], + "sender": ["1287167eaf56", "a0729c676b9a", "f8640e9f0f71", "955df7128577"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "e6d7037c4df4"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1199,16 +1201,16 @@ "observation": { "sender": [ "1287167eaf56", - "64aab527c6dd", - "4da7ea39401b", + "a0729c676b9a", + "f8640e9f0f71", "3f2be140c6f4", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", + "ea4c904bfb5f", + "3b5c096da2a3", "e6d7037c4df4", "2bb452e534eb", "abcf3bdc5cde" @@ -1225,8 +1227,8 @@ "observation": { "sender": [ "1287167eaf56", - "64aab527c6dd", - "4da7ea39401b", + "a0729c676b9a", + "f8640e9f0f71", "3f2be140c6f4", "87ba39148f02", "8352e3c99668", @@ -1234,8 +1236,8 @@ ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", + "ea4c904bfb5f", + "3b5c096da2a3", "e6d7037c4df4", "2bb452e534eb", "abcf3bdc5cde", @@ -1251,8 +1253,8 @@ { "id": "pr-sidebar-load.inner-false-string-error:branch-hint", "observation": { - "sender": ["1287167eaf56", "01e44c5eb3a8", "4da7ea39401b", "955df7128577"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "e6d7037c4df4"], + "sender": ["1287167eaf56", "a0729c676b9a", "1b8c3928debe", "955df7128577"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "e6d7037c4df4"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1265,16 +1267,16 @@ "observation": { "sender": [ "1287167eaf56", - "01e44c5eb3a8", - "4da7ea39401b", + "a0729c676b9a", + "1b8c3928debe", "3f2be140c6f4", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", + "ea4c904bfb5f", + "3b5c096da2a3", "e6d7037c4df4", "2bb452e534eb", "abcf3bdc5cde" @@ -1291,8 +1293,8 @@ "observation": { "sender": [ "1287167eaf56", - "01e44c5eb3a8", - "4da7ea39401b", + "a0729c676b9a", + "1b8c3928debe", "3f2be140c6f4", "87ba39148f02", "8352e3c99668", @@ -1300,8 +1302,8 @@ ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", + "ea4c904bfb5f", + "3b5c096da2a3", "e6d7037c4df4", "2bb452e534eb", "abcf3bdc5cde", @@ -1317,8 +1319,8 @@ { "id": "pr-sidebar-load.inner-false-object-error:branch-hint", "observation": { - "sender": ["1287167eaf56", "8a392c6391f4", "4da7ea39401b", "955df7128577"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "e6d7037c4df4"], + "sender": ["1287167eaf56", "a0729c676b9a", "84c6098c5749", "955df7128577"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "e6d7037c4df4"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1331,16 +1333,16 @@ "observation": { "sender": [ "1287167eaf56", - "8a392c6391f4", - "4da7ea39401b", + "a0729c676b9a", + "84c6098c5749", "3f2be140c6f4", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", + "ea4c904bfb5f", + "3b5c096da2a3", "e6d7037c4df4", "2bb452e534eb", "abcf3bdc5cde" @@ -1357,8 +1359,8 @@ "observation": { "sender": [ "1287167eaf56", - "8a392c6391f4", - "4da7ea39401b", + "a0729c676b9a", + "84c6098c5749", "3f2be140c6f4", "87ba39148f02", "8352e3c99668", @@ -1366,8 +1368,8 @@ ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", + "ea4c904bfb5f", + "3b5c096da2a3", "e6d7037c4df4", "2bb452e534eb", "abcf3bdc5cde", @@ -1383,8 +1385,8 @@ { "id": "pr-sidebar-load.outer-refused:branch-hint", "observation": { - "sender": ["1287167eaf56", "36fa584ff08a", "4da7ea39401b", "955df7128577"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "e6d7037c4df4"], + "sender": ["1287167eaf56", "a0729c676b9a", "fad4f35a3777", "955df7128577"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "e6d7037c4df4"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1397,16 +1399,16 @@ "observation": { "sender": [ "1287167eaf56", - "36fa584ff08a", - "4da7ea39401b", + "a0729c676b9a", + "fad4f35a3777", "3f2be140c6f4", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", + "ea4c904bfb5f", + "3b5c096da2a3", "e6d7037c4df4", "2bb452e534eb", "abcf3bdc5cde" @@ -1423,8 +1425,8 @@ "observation": { "sender": [ "1287167eaf56", - "36fa584ff08a", - "4da7ea39401b", + "a0729c676b9a", + "fad4f35a3777", "3f2be140c6f4", "87ba39148f02", "8352e3c99668", @@ -1432,8 +1434,8 @@ ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", + "ea4c904bfb5f", + "3b5c096da2a3", "e6d7037c4df4", "2bb452e534eb", "abcf3bdc5cde", @@ -1449,8 +1451,8 @@ { "id": "pr-sidebar-load.outer-refused-no-message:branch-hint", "observation": { - "sender": ["1287167eaf56", "3cfe7aea50b5", "4da7ea39401b", "955df7128577"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "e6d7037c4df4"], + "sender": ["1287167eaf56", "a0729c676b9a", "8d9bdb4e2f55", "955df7128577"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "e6d7037c4df4"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1463,16 +1465,16 @@ "observation": { "sender": [ "1287167eaf56", - "3cfe7aea50b5", - "4da7ea39401b", + "a0729c676b9a", + "8d9bdb4e2f55", "3f2be140c6f4", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", + "ea4c904bfb5f", + "3b5c096da2a3", "e6d7037c4df4", "2bb452e534eb", "abcf3bdc5cde" @@ -1489,8 +1491,8 @@ "observation": { "sender": [ "1287167eaf56", - "3cfe7aea50b5", - "4da7ea39401b", + "a0729c676b9a", + "8d9bdb4e2f55", "3f2be140c6f4", "87ba39148f02", "8352e3c99668", @@ -1498,8 +1500,8 @@ ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", + "ea4c904bfb5f", + "3b5c096da2a3", "e6d7037c4df4", "2bb452e534eb", "abcf3bdc5cde", @@ -1515,8 +1517,8 @@ { "id": "pr-sidebar-load.method-not-found:branch-hint", "observation": { - "sender": ["1287167eaf56", "7057d3371d62", "4da7ea39401b", "955df7128577"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "e6d7037c4df4"], + "sender": ["1287167eaf56", "a0729c676b9a", "87093c41db0a", "955df7128577"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "e6d7037c4df4"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1529,16 +1531,16 @@ "observation": { "sender": [ "1287167eaf56", - "7057d3371d62", - "4da7ea39401b", + "a0729c676b9a", + "87093c41db0a", "3f2be140c6f4", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", + "ea4c904bfb5f", + "3b5c096da2a3", "e6d7037c4df4", "2bb452e534eb", "abcf3bdc5cde" @@ -1555,8 +1557,8 @@ "observation": { "sender": [ "1287167eaf56", - "7057d3371d62", - "4da7ea39401b", + "a0729c676b9a", + "87093c41db0a", "3f2be140c6f4", "87ba39148f02", "8352e3c99668", @@ -1564,8 +1566,8 @@ ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", + "ea4c904bfb5f", + "3b5c096da2a3", "e6d7037c4df4", "2bb452e534eb", "abcf3bdc5cde", @@ -1581,8 +1583,8 @@ { "id": "pr-sidebar-load.transport-rejection:branch-hint", "observation": { - "sender": ["1287167eaf56", "8fee46bf95e3", "4da7ea39401b", "955df7128577"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "e6d7037c4df4"], + "sender": ["1287167eaf56", "a0729c676b9a", "6116b3d53db6", "955df7128577"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "e6d7037c4df4"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1595,16 +1597,16 @@ "observation": { "sender": [ "1287167eaf56", - "8fee46bf95e3", - "4da7ea39401b", + "a0729c676b9a", + "6116b3d53db6", "3f2be140c6f4", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", + "ea4c904bfb5f", + "3b5c096da2a3", "e6d7037c4df4", "2bb452e534eb", "abcf3bdc5cde" @@ -1621,8 +1623,8 @@ "observation": { "sender": [ "1287167eaf56", - "8fee46bf95e3", - "4da7ea39401b", + "a0729c676b9a", + "6116b3d53db6", "3f2be140c6f4", "87ba39148f02", "8352e3c99668", @@ -1630,8 +1632,8 @@ ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", + "ea4c904bfb5f", + "3b5c096da2a3", "e6d7037c4df4", "2bb452e534eb", "abcf3bdc5cde", @@ -1647,8 +1649,8 @@ { "id": "pr-sidebar-load.transport-rejection-no-message:branch-hint", "observation": { - "sender": ["1287167eaf56", "9787a82ed96e", "4da7ea39401b", "955df7128577"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "e6d7037c4df4"], + "sender": ["1287167eaf56", "a0729c676b9a", "6ac3f8cddce7", "955df7128577"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "e6d7037c4df4"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1661,16 +1663,16 @@ "observation": { "sender": [ "1287167eaf56", - "9787a82ed96e", - "4da7ea39401b", + "a0729c676b9a", + "6ac3f8cddce7", "3f2be140c6f4", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", + "ea4c904bfb5f", + "3b5c096da2a3", "e6d7037c4df4", "2bb452e534eb", "abcf3bdc5cde" @@ -1687,8 +1689,8 @@ "observation": { "sender": [ "1287167eaf56", - "9787a82ed96e", - "4da7ea39401b", + "a0729c676b9a", + "6ac3f8cddce7", "3f2be140c6f4", "87ba39148f02", "8352e3c99668", @@ -1696,8 +1698,8 @@ ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", + "ea4c904bfb5f", + "3b5c096da2a3", "e6d7037c4df4", "2bb452e534eb", "abcf3bdc5cde", diff --git a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-status.get-1.json b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-status.get-1.json index 8bdc4867580..0d9208a25c9 100644 --- a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-status.get-1.json +++ b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-status.get-1.json @@ -151,91 +151,6 @@ "ordinal": 2, "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"github.repoSlug\",\"params\":{\"repo\":\"id:repo-9\"}}" }, - "2309f345fb72": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "pending", - "startedAt": 0 - } - }, - "27531d8cc301": { - "name": "hostedReview.forBranch#1", - "ordinal": 5, - "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" - }, - "28428f85f800": { - "name": "hostedReview.forBranch#1", - "ordinal": 3, - "args": [ - { - "name": "method", - "value": "hostedReview.forBranch" - }, - { - "name": "params", - "value": { - "active": true, - "branch": "feature", - "linkedGitHubPR": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-2", - "ok": true, - "result": { - "mergeable": "MERGEABLE", - "number": 12, - "provider": "github", - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } - } - }, "2bb452e534eb": { "name": "github.prChecks#1", "ordinal": 12, @@ -249,48 +164,10 @@ "kind": "loading" } }, - "357f9b7862e3": { - "name": "worktree.show#1", + "3b5c096da2a3": { + "name": "hostedReview.forBranch#1", "ordinal": 6, - "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" - }, - "4da7ea39401b": { - "name": "worktree.show#1", - "ordinal": 4, - "args": [ - { - "name": "method", - "value": "worktree.show" - }, - { - "name": "params", - "value": { - "worktree": "id:repo-9::/w" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-3", - "ok": true, - "result": { - "worktree": { - "linkedPR": { - "$rpc": "null" - } - } - } - } - } + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" }, "5a5e8aeb9c0f": { "commentError": { @@ -345,59 +222,6 @@ } } }, - "707f5273fbe1": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-4", - "ok": true, - "result": { - "fetchedAt": 0, - "kind": "found", - "pr": { - "headSha": "head-sha-1", - "mergeable": "MERGEABLE", - "number": 12, - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } - } - } - }, "725177241005": { "name": "status.get#1", "ordinal": 11, @@ -632,6 +456,44 @@ "startedAt": 0 } }, + "a0729c676b9a": { + "name": "worktree.show#1", + "ordinal": 3, + "args": [ + { + "name": "method", + "value": "worktree.show" + }, + { + "name": "params", + "value": { + "worktree": "id:repo-9::/w" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "worktree": { + "linkedPR": { + "$rpc": "null" + } + } + } + } + } + }, "abcf3bdc5cde": { "name": "status.get#1", "ordinal": 13, @@ -676,6 +538,42 @@ } } }, + "b3a7ec3ab1c7": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, "b7fd114dbf3d": { "name": "status.get#1", "ordinal": 11, @@ -710,6 +608,105 @@ } } }, + "c2f3182f1780": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-4", + "ok": true, + "result": { + "fetchedAt": 0, + "kind": "found", + "pr": { + "headSha": "head-sha-1", + "mergeable": "MERGEABLE", + "number": 12, + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + } + }, + "c79bbd27f177": { + "name": "hostedReview.forBranch#1", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "hostedReview.forBranch" + }, + { + "name": "params", + "value": { + "active": true, + "branch": "feature", + "linkedGitHubPR": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-3", + "ok": true, + "result": { + "mergeable": "MERGEABLE", + "number": 12, + "provider": "github", + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + }, "c8f187d4ae2c": { "name": "status.get#1", "ordinal": 11, @@ -775,11 +772,6 @@ "startedAt": 0 } }, - "d25b12408fe6": { - "name": "github.prForBranch#1", - "ordinal": 9, - "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"currentHeadOid\":null}}" - }, "d3426861162d": { "name": "github.workItemDetails#1", "ordinal": 14, @@ -879,6 +871,11 @@ "refreshFailed": false } }, + "ea4c904bfb5f": { + "name": "worktree.show#1", + "ordinal": 5, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" + }, "eb79a9b3682a": { "status": "fulfilled", "startedAt": 0, @@ -923,6 +920,11 @@ } } } + }, + "fcced642024c": { + "name": "github.prForBranch#1", + "ordinal": 9, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"acceptMergedFallbackPR\":true,\"currentHeadOid\":null}}" } }, "recording": { @@ -931,8 +933,8 @@ { "id": "pr-sidebar-load.prelude:branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "2309f345fb72"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "b3a7ec3ab1c7"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -945,17 +947,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde" ], @@ -971,18 +973,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -999,17 +1001,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "96f70a0f4340" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde" ], @@ -1025,17 +1027,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8acaf63197a5" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde" ], @@ -1051,18 +1053,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "725177241005", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1079,18 +1081,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "ee35f6d45b0b", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1107,18 +1109,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "af7f3973dbfb", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1135,17 +1137,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "c8f187d4ae2c" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde" ], @@ -1161,17 +1163,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "070b061bf3fa" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde" ], @@ -1187,17 +1189,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "18e63ddf28fe" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde" ], @@ -1213,18 +1215,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "639ee016d5fa", "1b45b070f3e6" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "827779de86bf" @@ -1241,18 +1243,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "b7fd114dbf3d", "1b45b070f3e6" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "827779de86bf" diff --git a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-worktree.show-1.json b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-worktree.show-1.json index 1fc659680c1..9f3bcff2fe9 100644 --- a/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-worktree.show-1.json +++ b/mobile/rpc-foundation/goldens/matrix-session.pr-sidebar-worktree.show-1.json @@ -4,6 +4,38 @@ "family": "session.pr-sidebar", "namedDeltas": [], "values": { + "02d9b3c36ad2": { + "name": "worktree.show#1", + "ordinal": 3, + "args": [ + { + "name": "method", + "value": "worktree.show" + }, + { + "name": "params", + "value": { + "worktree": "id:repo-9::/w" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "rejected", + "startedAt": 0, + "settledAt": 0, + "error": { + "category": "Error", + "message": "", + "isRpcDeliveryUnknown": true + } + } + }, "1287167eaf56": { "name": "github.repoSlug#1", "ordinal": 1, @@ -72,9 +104,51 @@ "ordinal": 15, "json": "{\"id\":\"frame-7\",\"deviceToken\":\"recording-device\",\"method\":\"github.workItemDetails\",\"params\":{\"repo\":\"id:repo-9\",\"number\":12,\"type\":\"pr\"}}" }, - "1a8422eae0e3": { + "1c73727a07f3": { "name": "worktree.show#1", - "ordinal": 4, + "ordinal": 3, + "args": [ + { + "name": "method", + "value": "worktree.show" + }, + { + "name": "params", + "value": { + "worktree": "id:repo-9::/w" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "error": { + "message": "inner refused" + }, + "ok": false + } + } + } + }, + "1f5765918736": { + "name": "github.repoSlug#1", + "ordinal": 2, + "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"github.repoSlug\",\"params\":{\"repo\":\"id:repo-9\"}}" + }, + "22b0e91e6641": { + "name": "worktree.show#1", + "ordinal": 3, "args": [ { "name": "method", @@ -99,76 +173,63 @@ "settledAt": 0, "value": { "error": { - "code": "method_not_found", - "message": "Unknown method" + "code": "refused", + "message": "outer refused" }, - "id": "frame-3", + "id": "frame-2", "ok": false } } }, - "1f5765918736": { - "name": "github.repoSlug#1", - "ordinal": 2, - "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"github.repoSlug\",\"params\":{\"repo\":\"id:repo-9\"}}" - }, - "2309f345fb72": { - "name": "github.prForBranch#1", - "ordinal": 8, + "26b946d32577": { + "name": "worktree.show#1", + "ordinal": 3, "args": [ { "name": "method", - "value": "github.prForBranch" + "value": "worktree.show" }, { "name": "params", "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" + "worktree": "id:repo-9::/w" } }, { "name": "options", "value": { - "beforeSend": "[local beforeSend]", "failWhenDisconnected": true } } ], "settlement": { - "status": "pending", - "startedAt": 0 + "status": "rejected", + "startedAt": 0, + "settledAt": 0, + "error": { + "category": "Error", + "message": "transport failure", + "isRpcDeliveryUnknown": true + } } }, - "27531d8cc301": { - "name": "hostedReview.forBranch#1", - "ordinal": 5, - "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" + "2bb452e534eb": { + "name": "github.prChecks#1", + "ordinal": 12, + "json": "{\"id\":\"frame-5\",\"deviceToken\":\"recording-device\",\"method\":\"github.prChecks\",\"params\":{\"repo\":\"id:repo-9\",\"prNumber\":12,\"headSha\":\"head-sha-1\"}}" }, - "28428f85f800": { - "name": "hostedReview.forBranch#1", + "2db133f05901": { + "name": "worktree.show#1", "ordinal": 3, "args": [ { "name": "method", - "value": "hostedReview.forBranch" + "value": "worktree.show" }, { "name": "params", "value": { - "active": true, - "branch": "feature", - "linkedGitHubPR": { - "$rpc": "null" - }, - "repo": "id:repo-9" + "worktree": "id:repo-9::/w" } }, { @@ -185,91 +246,12 @@ "value": { "id": "frame-2", "ok": true, - "result": { - "mergeable": "MERGEABLE", - "number": 12, - "provider": "github", - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } - } - }, - "2a98ce3bea80": { - "name": "worktree.show#1", - "ordinal": 4, - "args": [ - { - "name": "method", - "value": "worktree.show" - }, - { - "name": "params", - "value": { - "worktree": "id:repo-9::/w" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-3", - "ok": true, "result": { "$rpc": "null" } } } }, - "2bb452e534eb": { - "name": "github.prChecks#1", - "ordinal": 12, - "json": "{\"id\":\"frame-5\",\"deviceToken\":\"recording-device\",\"method\":\"github.prChecks\",\"params\":{\"repo\":\"id:repo-9\",\"prNumber\":12,\"headSha\":\"head-sha-1\"}}" - }, - "2c7b67501f26": { - "name": "worktree.show#1", - "ordinal": 4, - "args": [ - { - "name": "method", - "value": "worktree.show" - }, - { - "name": "params", - "value": { - "worktree": "id:repo-9::/w" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-3", - "ok": true, - "result": { - "error": "refused" - } - } - } - }, "328a2eb7b1e2": { "name": "github.prChecks#1", "ordinal": 9, @@ -306,118 +288,14 @@ "kind": "loading" } }, - "357f9b7862e3": { - "name": "worktree.show#1", + "3b5c096da2a3": { + "name": "hostedReview.forBranch#1", "ordinal": 6, - "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" }, - "40b75de17700": { - "name": "worktree.show#1", - "ordinal": 4, - "args": [ - { - "name": "method", - "value": "worktree.show" - }, - { - "name": "params", - "value": { - "worktree": "id:repo-9::/w" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "error": { - "code": "refused", - "message": "" - }, - "id": "frame-3", - "ok": false - } - } - }, - "4da7ea39401b": { - "name": "worktree.show#1", - "ordinal": 4, - "args": [ - { - "name": "method", - "value": "worktree.show" - }, - { - "name": "params", - "value": { - "worktree": "id:repo-9::/w" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-3", - "ok": true, - "result": { - "worktree": { - "linkedPR": { - "$rpc": "null" - } - } - } - } - } - }, - "704943f0f395": { - "name": "worktree.show#1", - "ordinal": 4, - "args": [ - { - "name": "method", - "value": "worktree.show" - }, - { - "name": "params", - "value": { - "worktree": "id:repo-9::/w" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-3", - "ok": true - } - } - }, - "707f5273fbe1": { + "4be3a7b7abaa": { "name": "github.prForBranch#1", - "ordinal": 8, + "ordinal": 7, "args": [ { "name": "method", @@ -426,6 +304,7 @@ { "name": "params", "value": { + "acceptMergedFallbackPR": true, "branch": "feature", "currentHeadOid": { "$rpc": "null" @@ -468,9 +347,109 @@ } } }, - "7167083ab4d9": { + "4f700e3fc10f": { "name": "worktree.show#1", - "ordinal": 4, + "ordinal": 3, + "args": [ + { + "name": "method", + "value": "worktree.show" + }, + { + "name": "params", + "value": { + "worktree": "id:repo-9::/w" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true + } + } + }, + "54984a34ef02": { + "name": "worktree.show#1", + "ordinal": 3, + "args": [ + { + "name": "method", + "value": "worktree.show" + }, + { + "name": "params", + "value": { + "worktree": "id:repo-9::/w" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "error": "refused" + } + } + } + }, + "5b87869a6a8a": { + "name": "worktree.show#1", + "ordinal": 3, + "args": [ + { + "name": "method", + "value": "worktree.show" + }, + { + "name": "params", + "value": { + "worktree": "id:repo-9::/w" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "error": "inner refused", + "ok": false + } + } + } + }, + "63a102afa26a": { + "name": "worktree.show#1", + "ordinal": 3, "args": [ { "name": "method", @@ -496,9 +475,9 @@ "value": { "error": { "code": "refused", - "message": "outer refused" + "message": "" }, - "id": "frame-3", + "id": "frame-2", "ok": false } } @@ -590,75 +569,6 @@ } } }, - "8b7816464095": { - "name": "worktree.show#1", - "ordinal": 4, - "args": [ - { - "name": "method", - "value": "worktree.show" - }, - { - "name": "params", - "value": { - "worktree": "id:repo-9::/w" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "rejected", - "startedAt": 0, - "settledAt": 0, - "error": { - "category": "Error", - "message": "", - "isRpcDeliveryUnknown": true - } - } - }, - "8f20397f6101": { - "name": "worktree.show#1", - "ordinal": 4, - "args": [ - { - "name": "method", - "value": "worktree.show" - }, - { - "name": "params", - "value": { - "worktree": "id:repo-9::/w" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-3", - "ok": true, - "result": { - "error": { - "message": "inner refused" - }, - "ok": false - } - } - } - }, "92c7d3e81fc6": { "name": "github.workItemDetails#1", "ordinal": 13, @@ -722,11 +632,6 @@ } } }, - "956724a74728": { - "name": "github.prForBranch#1", - "ordinal": 8, - "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"currentHeadOid\":null}}" - }, "9c952632b0c0": { "name": "status.get#1", "ordinal": 11, @@ -796,9 +701,9 @@ } } }, - "a038c89eda45": { + "a0729c676b9a": { "name": "worktree.show#1", - "ordinal": 4, + "ordinal": 3, "args": [ { "name": "method", @@ -822,11 +727,14 @@ "startedAt": 0, "settledAt": 0, "value": { - "id": "frame-3", + "id": "frame-2", "ok": true, "result": { - "error": "inner refused", - "ok": false + "worktree": { + "linkedPR": { + "$rpc": "null" + } + } } } } @@ -836,7 +744,7 @@ "ordinal": 13, "json": "{\"id\":\"frame-6\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}" }, - "ca31a249027a": { + "b3561f2907d9": { "name": "github.prForBranch#1", "ordinal": 7, "args": [ @@ -847,6 +755,7 @@ { "name": "params", "value": { + "acceptMergedFallbackPR": true, "branch": "feature", "currentHeadOid": { "$rpc": "null" @@ -871,6 +780,176 @@ "startedAt": 0 } }, + "b3a7ec3ab1c7": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, + "b50e2ade18ff": { + "name": "worktree.show#1", + "ordinal": 3, + "args": [ + { + "name": "method", + "value": "worktree.show" + }, + { + "name": "params", + "value": { + "worktree": "id:repo-9::/w" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "error": { + "code": "method_not_found", + "message": "Unknown method" + }, + "id": "frame-2", + "ok": false + } + } + }, + "c2f3182f1780": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-4", + "ok": true, + "result": { + "fetchedAt": 0, + "kind": "found", + "pr": { + "headSha": "head-sha-1", + "mergeable": "MERGEABLE", + "number": 12, + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + } + }, + "c79bbd27f177": { + "name": "hostedReview.forBranch#1", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "hostedReview.forBranch" + }, + { + "name": "params", + "value": { + "active": true, + "branch": "feature", + "linkedGitHubPR": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-3", + "ok": true, + "result": { + "mergeable": "MERGEABLE", + "number": 12, + "provider": "github", + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + }, "cb071b912510": { "name": "github.prChecks#1", "ordinal": 10, @@ -935,11 +1014,6 @@ } } }, - "d25b12408fe6": { - "name": "github.prForBranch#1", - "ordinal": 9, - "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"currentHeadOid\":null}}" - }, "d3426861162d": { "name": "github.workItemDetails#1", "ordinal": 14, @@ -1039,37 +1113,10 @@ "refreshFailed": false } }, - "eadd2f60a3d9": { + "ea4c904bfb5f": { "name": "worktree.show#1", - "ordinal": 4, - "args": [ - { - "name": "method", - "value": "worktree.show" - }, - { - "name": "params", - "value": { - "worktree": "id:repo-9::/w" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "rejected", - "startedAt": 0, - "settledAt": 0, - "error": { - "category": "Error", - "message": "transport failure", - "isRpcDeliveryUnknown": true - } - } + "ordinal": 5, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" }, "eb79a9b3682a": { "status": "fulfilled", @@ -1084,58 +1131,15 @@ "ordinal": 14, "json": "{\"id\":\"frame-7\",\"deviceToken\":\"recording-device\",\"method\":\"github.workItemDetails\",\"params\":{\"repo\":\"id:repo-9\",\"number\":12,\"type\":\"pr\"}}" }, - "fdd3e0b4c48b": { + "ef988a727305": { "name": "github.prForBranch#1", - "ordinal": 7, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-4", - "ok": true, - "result": { - "fetchedAt": 0, - "kind": "found", - "pr": { - "headSha": "head-sha-1", - "mergeable": "MERGEABLE", - "number": 12, - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } - } - } + "ordinal": 8, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"acceptMergedFallbackPR\":true,\"currentHeadOid\":null}}" + }, + "fcced642024c": { + "name": "github.prForBranch#1", + "ordinal": 9, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"acceptMergedFallbackPR\":true,\"currentHeadOid\":null}}" } }, "recording": { @@ -1144,8 +1148,8 @@ { "id": "pr-sidebar-load.normal:branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "2309f345fb72"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "b3a7ec3ab1c7"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1158,17 +1162,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde" ], @@ -1184,18 +1188,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -1210,8 +1214,8 @@ { "id": "pr-sidebar-load.result-absent:branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "704943f0f395", "ca31a249027a"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "956724a74728"], + "sender": ["1287167eaf56", "4f700e3fc10f", "c79bbd27f177", "b3561f2907d9"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "ef988a727305"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1224,17 +1228,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "704943f0f395", - "fdd3e0b4c48b", + "4f700e3fc10f", + "c79bbd27f177", + "4be3a7b7abaa", "328a2eb7b1e2", "132359f59155" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "956724a74728", + "ea4c904bfb5f", + "3b5c096da2a3", + "ef988a727305", "76263332f0a0", "7a16946f2448" ], @@ -1250,18 +1254,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "704943f0f395", - "fdd3e0b4c48b", + "4f700e3fc10f", + "c79bbd27f177", + "4be3a7b7abaa", "9e3f98425211", "d1ee08e03daa", "92c7d3e81fc6" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "956724a74728", + "ea4c904bfb5f", + "3b5c096da2a3", + "ef988a727305", "76263332f0a0", "7a16946f2448", "edb9efe1b656" @@ -1276,8 +1280,8 @@ { "id": "pr-sidebar-load.result-null:branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "2a98ce3bea80", "ca31a249027a"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "956724a74728"], + "sender": ["1287167eaf56", "2db133f05901", "c79bbd27f177", "b3561f2907d9"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "ef988a727305"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1290,17 +1294,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "2a98ce3bea80", - "fdd3e0b4c48b", + "2db133f05901", + "c79bbd27f177", + "4be3a7b7abaa", "328a2eb7b1e2", "132359f59155" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "956724a74728", + "ea4c904bfb5f", + "3b5c096da2a3", + "ef988a727305", "76263332f0a0", "7a16946f2448" ], @@ -1316,18 +1320,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "2a98ce3bea80", - "fdd3e0b4c48b", + "2db133f05901", + "c79bbd27f177", + "4be3a7b7abaa", "9e3f98425211", "d1ee08e03daa", "92c7d3e81fc6" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "956724a74728", + "ea4c904bfb5f", + "3b5c096da2a3", + "ef988a727305", "76263332f0a0", "7a16946f2448", "edb9efe1b656" @@ -1342,8 +1346,8 @@ { "id": "pr-sidebar-load.inner-ok-missing:branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "2c7b67501f26", "ca31a249027a"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "956724a74728"], + "sender": ["1287167eaf56", "54984a34ef02", "c79bbd27f177", "b3561f2907d9"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "ef988a727305"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1356,17 +1360,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "2c7b67501f26", - "fdd3e0b4c48b", + "54984a34ef02", + "c79bbd27f177", + "4be3a7b7abaa", "328a2eb7b1e2", "132359f59155" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "956724a74728", + "ea4c904bfb5f", + "3b5c096da2a3", + "ef988a727305", "76263332f0a0", "7a16946f2448" ], @@ -1382,18 +1386,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "2c7b67501f26", - "fdd3e0b4c48b", + "54984a34ef02", + "c79bbd27f177", + "4be3a7b7abaa", "9e3f98425211", "d1ee08e03daa", "92c7d3e81fc6" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "956724a74728", + "ea4c904bfb5f", + "3b5c096da2a3", + "ef988a727305", "76263332f0a0", "7a16946f2448", "edb9efe1b656" @@ -1408,8 +1412,8 @@ { "id": "pr-sidebar-load.inner-false-string-error:branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "a038c89eda45", "ca31a249027a"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "956724a74728"], + "sender": ["1287167eaf56", "5b87869a6a8a", "c79bbd27f177", "b3561f2907d9"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "ef988a727305"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1422,17 +1426,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "a038c89eda45", - "fdd3e0b4c48b", + "5b87869a6a8a", + "c79bbd27f177", + "4be3a7b7abaa", "328a2eb7b1e2", "132359f59155" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "956724a74728", + "ea4c904bfb5f", + "3b5c096da2a3", + "ef988a727305", "76263332f0a0", "7a16946f2448" ], @@ -1448,18 +1452,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "a038c89eda45", - "fdd3e0b4c48b", + "5b87869a6a8a", + "c79bbd27f177", + "4be3a7b7abaa", "9e3f98425211", "d1ee08e03daa", "92c7d3e81fc6" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "956724a74728", + "ea4c904bfb5f", + "3b5c096da2a3", + "ef988a727305", "76263332f0a0", "7a16946f2448", "edb9efe1b656" @@ -1474,8 +1478,8 @@ { "id": "pr-sidebar-load.inner-false-object-error:branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "8f20397f6101", "ca31a249027a"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "956724a74728"], + "sender": ["1287167eaf56", "1c73727a07f3", "c79bbd27f177", "b3561f2907d9"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "ef988a727305"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1488,17 +1492,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "8f20397f6101", - "fdd3e0b4c48b", + "1c73727a07f3", + "c79bbd27f177", + "4be3a7b7abaa", "328a2eb7b1e2", "132359f59155" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "956724a74728", + "ea4c904bfb5f", + "3b5c096da2a3", + "ef988a727305", "76263332f0a0", "7a16946f2448" ], @@ -1514,18 +1518,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "8f20397f6101", - "fdd3e0b4c48b", + "1c73727a07f3", + "c79bbd27f177", + "4be3a7b7abaa", "9e3f98425211", "d1ee08e03daa", "92c7d3e81fc6" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "956724a74728", + "ea4c904bfb5f", + "3b5c096da2a3", + "ef988a727305", "76263332f0a0", "7a16946f2448", "edb9efe1b656" @@ -1540,8 +1544,8 @@ { "id": "pr-sidebar-load.outer-refused:branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "7167083ab4d9", "ca31a249027a"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "956724a74728"], + "sender": ["1287167eaf56", "22b0e91e6641", "c79bbd27f177", "b3561f2907d9"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "ef988a727305"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1554,17 +1558,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "7167083ab4d9", - "fdd3e0b4c48b", + "22b0e91e6641", + "c79bbd27f177", + "4be3a7b7abaa", "328a2eb7b1e2", "132359f59155" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "956724a74728", + "ea4c904bfb5f", + "3b5c096da2a3", + "ef988a727305", "76263332f0a0", "7a16946f2448" ], @@ -1580,18 +1584,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "7167083ab4d9", - "fdd3e0b4c48b", + "22b0e91e6641", + "c79bbd27f177", + "4be3a7b7abaa", "9e3f98425211", "d1ee08e03daa", "92c7d3e81fc6" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "956724a74728", + "ea4c904bfb5f", + "3b5c096da2a3", + "ef988a727305", "76263332f0a0", "7a16946f2448", "edb9efe1b656" @@ -1606,8 +1610,8 @@ { "id": "pr-sidebar-load.outer-refused-no-message:branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "40b75de17700", "ca31a249027a"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "956724a74728"], + "sender": ["1287167eaf56", "63a102afa26a", "c79bbd27f177", "b3561f2907d9"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "ef988a727305"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1620,17 +1624,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "40b75de17700", - "fdd3e0b4c48b", + "63a102afa26a", + "c79bbd27f177", + "4be3a7b7abaa", "328a2eb7b1e2", "132359f59155" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "956724a74728", + "ea4c904bfb5f", + "3b5c096da2a3", + "ef988a727305", "76263332f0a0", "7a16946f2448" ], @@ -1646,18 +1650,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "40b75de17700", - "fdd3e0b4c48b", + "63a102afa26a", + "c79bbd27f177", + "4be3a7b7abaa", "9e3f98425211", "d1ee08e03daa", "92c7d3e81fc6" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "956724a74728", + "ea4c904bfb5f", + "3b5c096da2a3", + "ef988a727305", "76263332f0a0", "7a16946f2448", "edb9efe1b656" @@ -1672,8 +1676,8 @@ { "id": "pr-sidebar-load.method-not-found:branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "1a8422eae0e3", "ca31a249027a"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "956724a74728"], + "sender": ["1287167eaf56", "b50e2ade18ff", "c79bbd27f177", "b3561f2907d9"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "ef988a727305"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1686,17 +1690,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "1a8422eae0e3", - "fdd3e0b4c48b", + "b50e2ade18ff", + "c79bbd27f177", + "4be3a7b7abaa", "328a2eb7b1e2", "132359f59155" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "956724a74728", + "ea4c904bfb5f", + "3b5c096da2a3", + "ef988a727305", "76263332f0a0", "7a16946f2448" ], @@ -1712,18 +1716,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "1a8422eae0e3", - "fdd3e0b4c48b", + "b50e2ade18ff", + "c79bbd27f177", + "4be3a7b7abaa", "9e3f98425211", "d1ee08e03daa", "92c7d3e81fc6" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "956724a74728", + "ea4c904bfb5f", + "3b5c096da2a3", + "ef988a727305", "76263332f0a0", "7a16946f2448", "edb9efe1b656" @@ -1738,8 +1742,8 @@ { "id": "pr-sidebar-load.transport-rejection:branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "eadd2f60a3d9", "ca31a249027a"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "956724a74728"], + "sender": ["1287167eaf56", "26b946d32577", "c79bbd27f177", "b3561f2907d9"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "ef988a727305"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1752,17 +1756,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "eadd2f60a3d9", - "fdd3e0b4c48b", + "26b946d32577", + "c79bbd27f177", + "4be3a7b7abaa", "328a2eb7b1e2", "132359f59155" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "956724a74728", + "ea4c904bfb5f", + "3b5c096da2a3", + "ef988a727305", "76263332f0a0", "7a16946f2448" ], @@ -1778,18 +1782,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "eadd2f60a3d9", - "fdd3e0b4c48b", + "26b946d32577", + "c79bbd27f177", + "4be3a7b7abaa", "9e3f98425211", "d1ee08e03daa", "92c7d3e81fc6" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "956724a74728", + "ea4c904bfb5f", + "3b5c096da2a3", + "ef988a727305", "76263332f0a0", "7a16946f2448", "edb9efe1b656" @@ -1804,8 +1808,8 @@ { "id": "pr-sidebar-load.transport-rejection-no-message:branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "8b7816464095", "ca31a249027a"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "956724a74728"], + "sender": ["1287167eaf56", "02d9b3c36ad2", "c79bbd27f177", "b3561f2907d9"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "ef988a727305"], "settlements": { "mount": "eb79a9b3682a" }, @@ -1818,17 +1822,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "8b7816464095", - "fdd3e0b4c48b", + "02d9b3c36ad2", + "c79bbd27f177", + "4be3a7b7abaa", "328a2eb7b1e2", "132359f59155" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "956724a74728", + "ea4c904bfb5f", + "3b5c096da2a3", + "ef988a727305", "76263332f0a0", "7a16946f2448" ], @@ -1844,18 +1848,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "8b7816464095", - "fdd3e0b4c48b", + "02d9b3c36ad2", + "c79bbd27f177", + "4be3a7b7abaa", "9e3f98425211", "d1ee08e03daa", "92c7d3e81fc6" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "956724a74728", + "ea4c904bfb5f", + "3b5c096da2a3", + "ef988a727305", "76263332f0a0", "7a16946f2448", "edb9efe1b656" diff --git a/mobile/rpc-foundation/goldens/pr-comment-posted-in-place.json b/mobile/rpc-foundation/goldens/pr-comment-posted-in-place.json index 50ec55dd90b..6ca30676602 100644 --- a/mobile/rpc-foundation/goldens/pr-comment-posted-in-place.json +++ b/mobile/rpc-foundation/goldens/pr-comment-posted-in-place.json @@ -89,91 +89,6 @@ "ordinal": 2, "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"github.repoSlug\",\"params\":{\"repo\":\"id:repo-9\"}}" }, - "2309f345fb72": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "pending", - "startedAt": 0 - } - }, - "27531d8cc301": { - "name": "hostedReview.forBranch#1", - "ordinal": 5, - "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" - }, - "28428f85f800": { - "name": "hostedReview.forBranch#1", - "ordinal": 3, - "args": [ - { - "name": "method", - "value": "hostedReview.forBranch" - }, - { - "name": "params", - "value": { - "active": true, - "branch": "feature", - "linkedGitHubPR": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-2", - "ok": true, - "result": { - "mergeable": "MERGEABLE", - "number": 12, - "provider": "github", - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } - } - }, "2bb452e534eb": { "name": "github.prChecks#1", "ordinal": 12, @@ -187,16 +102,16 @@ "kind": "loading" } }, - "357f9b7862e3": { - "name": "worktree.show#1", - "ordinal": 6, - "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" - }, "39b9c8ebcce5": { "name": "github.addIssueComment#1", "ordinal": 17, "json": "{\"id\":\"frame-8\",\"deviceToken\":\"recording-device\",\"method\":\"github.addIssueComment\",\"params\":{\"repo\":\"id:repo-9\",\"number\":12,\"body\":\"recorded comment\",\"type\":\"pr\"}}" }, + "3b5c096da2a3": { + "name": "hostedReview.forBranch#1", + "ordinal": 6, + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" + }, "3eeb7e426600": { "name": "github.prComments#1", "ordinal": 18, @@ -230,102 +145,11 @@ "startedAt": 0 } }, - "4da7ea39401b": { - "name": "worktree.show#1", - "ordinal": 4, - "args": [ - { - "name": "method", - "value": "worktree.show" - }, - { - "name": "params", - "value": { - "worktree": "id:repo-9::/w" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-3", - "ok": true, - "result": { - "worktree": { - "linkedPR": { - "$rpc": "null" - } - } - } - } - } - }, "6f75be8d77df": { "name": "github.prComments#1", "ordinal": 19, "json": "{\"id\":\"frame-9\",\"deviceToken\":\"recording-device\",\"method\":\"github.prComments\",\"params\":{\"repo\":\"id:repo-9\",\"prNumber\":12,\"noCache\":true,\"prRepo\":{\"owner\":\"owner\",\"repo\":\"repo\",\"host\":\"github.com\"}}}" }, - "707f5273fbe1": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-4", - "ok": true, - "result": { - "fetchedAt": 0, - "kind": "found", - "pr": { - "headSha": "head-sha-1", - "mergeable": "MERGEABLE", - "number": 12, - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } - } - } - }, "8352e3c99668": { "name": "status.get#1", "ordinal": 11, @@ -441,11 +265,184 @@ "startedAt": 0 } }, + "a0729c676b9a": { + "name": "worktree.show#1", + "ordinal": 3, + "args": [ + { + "name": "method", + "value": "worktree.show" + }, + { + "name": "params", + "value": { + "worktree": "id:repo-9::/w" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "worktree": { + "linkedPR": { + "$rpc": "null" + } + } + } + } + } + }, "abcf3bdc5cde": { "name": "status.get#1", "ordinal": 13, "json": "{\"id\":\"frame-6\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}" }, + "b3a7ec3ab1c7": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, + "c2f3182f1780": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-4", + "ok": true, + "result": { + "fetchedAt": 0, + "kind": "found", + "pr": { + "headSha": "head-sha-1", + "mergeable": "MERGEABLE", + "number": 12, + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + } + }, + "c79bbd27f177": { + "name": "hostedReview.forBranch#1", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "hostedReview.forBranch" + }, + { + "name": "params", + "value": { + "active": true, + "branch": "feature", + "linkedGitHubPR": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-3", + "ok": true, + "result": { + "mergeable": "MERGEABLE", + "number": 12, + "provider": "github", + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + }, "cb071b912510": { "name": "github.prChecks#1", "ordinal": 10, @@ -474,11 +471,6 @@ "startedAt": 0 } }, - "d25b12408fe6": { - "name": "github.prForBranch#1", - "ordinal": 9, - "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"currentHeadOid\":null}}" - }, "d3426861162d": { "name": "github.workItemDetails#1", "ordinal": 14, @@ -608,6 +600,11 @@ "refreshFailed": false } }, + "ea4c904bfb5f": { + "name": "worktree.show#1", + "ordinal": 5, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" + }, "eb79a9b3682a": { "status": "fulfilled", "startedAt": 0, @@ -673,6 +670,11 @@ ] } } + }, + "fcced642024c": { + "name": "github.prForBranch#1", + "ordinal": 9, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"acceptMergedFallbackPR\":true,\"currentHeadOid\":null}}" } }, "recording": { @@ -681,8 +683,8 @@ { "id": "branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "2309f345fb72"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "b3a7ec3ab1c7"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -695,17 +697,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde" ], @@ -721,18 +723,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -749,9 +751,9 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "d3426861162d", @@ -760,9 +762,9 @@ ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be", @@ -782,9 +784,9 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "d3426861162d", @@ -793,9 +795,9 @@ ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be", diff --git a/mobile/rpc-foundation/goldens/pr-resolve-refused-rolls-back.json b/mobile/rpc-foundation/goldens/pr-resolve-refused-rolls-back.json index fac1fff77d6..6a0c48ce6d9 100644 --- a/mobile/rpc-foundation/goldens/pr-resolve-refused-rolls-back.json +++ b/mobile/rpc-foundation/goldens/pr-resolve-refused-rolls-back.json @@ -97,91 +97,6 @@ "ordinal": 2, "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"github.repoSlug\",\"params\":{\"repo\":\"id:repo-9\"}}" }, - "2309f345fb72": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "pending", - "startedAt": 0 - } - }, - "27531d8cc301": { - "name": "hostedReview.forBranch#1", - "ordinal": 5, - "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" - }, - "28428f85f800": { - "name": "hostedReview.forBranch#1", - "ordinal": 3, - "args": [ - { - "name": "method", - "value": "hostedReview.forBranch" - }, - { - "name": "params", - "value": { - "active": true, - "branch": "feature", - "linkedGitHubPR": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-2", - "ok": true, - "result": { - "mergeable": "MERGEABLE", - "number": 12, - "provider": "github", - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } - } - }, "2bb452e534eb": { "name": "github.prChecks#1", "ordinal": 12, @@ -232,107 +147,16 @@ "kind": "loading" } }, - "357f9b7862e3": { - "name": "worktree.show#1", + "3b5c096da2a3": { + "name": "hostedReview.forBranch#1", "ordinal": 6, - "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" - }, - "4da7ea39401b": { - "name": "worktree.show#1", - "ordinal": 4, - "args": [ - { - "name": "method", - "value": "worktree.show" - }, - { - "name": "params", - "value": { - "worktree": "id:repo-9::/w" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-3", - "ok": true, - "result": { - "worktree": { - "linkedPR": { - "$rpc": "null" - } - } - } - } - } + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" }, "61c7e519a6dc": { "name": "github.resolveReviewThread#1", "ordinal": 17, "json": "{\"id\":\"frame-8\",\"deviceToken\":\"recording-device\",\"method\":\"github.resolveReviewThread\",\"params\":{\"repo\":\"id:repo-9\",\"threadId\":\"thread-1\",\"resolve\":true}}" }, - "707f5273fbe1": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-4", - "ok": true, - "result": { - "fetchedAt": 0, - "kind": "found", - "pr": { - "headSha": "head-sha-1", - "mergeable": "MERGEABLE", - "number": 12, - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } - } - } - }, "7ed3d39f0607": { "status": "fulfilled", "startedAt": 0, @@ -476,11 +300,184 @@ "startedAt": 0 } }, + "a0729c676b9a": { + "name": "worktree.show#1", + "ordinal": 3, + "args": [ + { + "name": "method", + "value": "worktree.show" + }, + { + "name": "params", + "value": { + "worktree": "id:repo-9::/w" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "worktree": { + "linkedPR": { + "$rpc": "null" + } + } + } + } + } + }, "abcf3bdc5cde": { "name": "status.get#1", "ordinal": 13, "json": "{\"id\":\"frame-6\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}" }, + "b3a7ec3ab1c7": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, + "c2f3182f1780": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-4", + "ok": true, + "result": { + "fetchedAt": 0, + "kind": "found", + "pr": { + "headSha": "head-sha-1", + "mergeable": "MERGEABLE", + "number": 12, + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + } + }, + "c79bbd27f177": { + "name": "hostedReview.forBranch#1", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "hostedReview.forBranch" + }, + { + "name": "params", + "value": { + "active": true, + "branch": "feature", + "linkedGitHubPR": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-3", + "ok": true, + "result": { + "mergeable": "MERGEABLE", + "number": 12, + "provider": "github", + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + }, "cb071b912510": { "name": "github.prChecks#1", "ordinal": 10, @@ -509,11 +506,6 @@ "startedAt": 0 } }, - "d25b12408fe6": { - "name": "github.prForBranch#1", - "ordinal": 9, - "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"currentHeadOid\":null}}" - }, "d3426861162d": { "name": "github.workItemDetails#1", "ordinal": 14, @@ -613,6 +605,11 @@ "refreshFailed": false } }, + "ea4c904bfb5f": { + "name": "worktree.show#1", + "ordinal": 5, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" + }, "eb79a9b3682a": { "status": "fulfilled", "startedAt": 0, @@ -620,6 +617,11 @@ "value": { "$rpc": "undefined" } + }, + "fcced642024c": { + "name": "github.prForBranch#1", + "ordinal": 9, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"acceptMergedFallbackPR\":true,\"currentHeadOid\":null}}" } }, "recording": { @@ -628,8 +630,8 @@ { "id": "branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "2309f345fb72"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "b3a7ec3ab1c7"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -642,17 +644,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde" ], @@ -668,18 +670,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" @@ -696,9 +698,9 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "d3426861162d", @@ -706,9 +708,9 @@ ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be", @@ -727,9 +729,9 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "d3426861162d", @@ -737,9 +739,9 @@ ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be", diff --git a/mobile/rpc-foundation/goldens/pr-sidebar-checks-refused.json b/mobile/rpc-foundation/goldens/pr-sidebar-checks-refused.json index 34ba75c147c..7f60be0ca5e 100644 --- a/mobile/rpc-foundation/goldens/pr-sidebar-checks-refused.json +++ b/mobile/rpc-foundation/goldens/pr-sidebar-checks-refused.json @@ -49,91 +49,6 @@ "ordinal": 2, "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"github.repoSlug\",\"params\":{\"repo\":\"id:repo-9\"}}" }, - "2309f345fb72": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "pending", - "startedAt": 0 - } - }, - "27531d8cc301": { - "name": "hostedReview.forBranch#1", - "ordinal": 5, - "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" - }, - "28428f85f800": { - "name": "hostedReview.forBranch#1", - "ordinal": 3, - "args": [ - { - "name": "method", - "value": "hostedReview.forBranch" - }, - { - "name": "params", - "value": { - "active": true, - "branch": "feature", - "linkedGitHubPR": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-2", - "ok": true, - "result": { - "mergeable": "MERGEABLE", - "number": 12, - "provider": "github", - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } - } - }, "2bb452e534eb": { "name": "github.prChecks#1", "ordinal": 12, @@ -170,101 +85,10 @@ "kind": "loading" } }, - "357f9b7862e3": { - "name": "worktree.show#1", + "3b5c096da2a3": { + "name": "hostedReview.forBranch#1", "ordinal": 6, - "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" - }, - "4da7ea39401b": { - "name": "worktree.show#1", - "ordinal": 4, - "args": [ - { - "name": "method", - "value": "worktree.show" - }, - { - "name": "params", - "value": { - "worktree": "id:repo-9::/w" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-3", - "ok": true, - "result": { - "worktree": { - "linkedPR": { - "$rpc": "null" - } - } - } - } - } - }, - "707f5273fbe1": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-4", - "ok": true, - "result": { - "fetchedAt": 0, - "kind": "found", - "pr": { - "headSha": "head-sha-1", - "mergeable": "MERGEABLE", - "number": 12, - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } - } - } + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" }, "8352e3c99668": { "name": "status.get#1", @@ -330,11 +154,184 @@ "startedAt": 0 } }, + "a0729c676b9a": { + "name": "worktree.show#1", + "ordinal": 3, + "args": [ + { + "name": "method", + "value": "worktree.show" + }, + { + "name": "params", + "value": { + "worktree": "id:repo-9::/w" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "worktree": { + "linkedPR": { + "$rpc": "null" + } + } + } + } + } + }, "abcf3bdc5cde": { "name": "status.get#1", "ordinal": 13, "json": "{\"id\":\"frame-6\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}" }, + "b3a7ec3ab1c7": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, + "c2f3182f1780": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-4", + "ok": true, + "result": { + "fetchedAt": 0, + "kind": "found", + "pr": { + "headSha": "head-sha-1", + "mergeable": "MERGEABLE", + "number": 12, + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + } + }, + "c79bbd27f177": { + "name": "hostedReview.forBranch#1", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "hostedReview.forBranch" + }, + { + "name": "params", + "value": { + "active": true, + "branch": "feature", + "linkedGitHubPR": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-3", + "ok": true, + "result": { + "mergeable": "MERGEABLE", + "number": 12, + "provider": "github", + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + }, "cb071b912510": { "name": "github.prChecks#1", "ordinal": 10, @@ -363,11 +360,6 @@ "startedAt": 0 } }, - "d25b12408fe6": { - "name": "github.prForBranch#1", - "ordinal": 9, - "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"currentHeadOid\":null}}" - }, "d3426861162d": { "name": "github.workItemDetails#1", "ordinal": 14, @@ -478,6 +470,11 @@ } } }, + "ea4c904bfb5f": { + "name": "worktree.show#1", + "ordinal": 5, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" + }, "eb79a9b3682a": { "status": "fulfilled", "startedAt": 0, @@ -485,6 +482,11 @@ "value": { "$rpc": "undefined" } + }, + "fcced642024c": { + "name": "github.prForBranch#1", + "ordinal": 9, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"acceptMergedFallbackPR\":true,\"currentHeadOid\":null}}" } }, "recording": { @@ -493,8 +495,8 @@ { "id": "branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "2309f345fb72"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "b3a7ec3ab1c7"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -507,17 +509,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde" ], @@ -533,18 +535,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "d43ea39cfd0a", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" diff --git a/mobile/rpc-foundation/goldens/pr-sidebar-load.json b/mobile/rpc-foundation/goldens/pr-sidebar-load.json index 42e186747a6..69c9e9aa140 100644 --- a/mobile/rpc-foundation/goldens/pr-sidebar-load.json +++ b/mobile/rpc-foundation/goldens/pr-sidebar-load.json @@ -49,91 +49,6 @@ "ordinal": 2, "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"github.repoSlug\",\"params\":{\"repo\":\"id:repo-9\"}}" }, - "2309f345fb72": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "pending", - "startedAt": 0 - } - }, - "27531d8cc301": { - "name": "hostedReview.forBranch#1", - "ordinal": 5, - "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" - }, - "28428f85f800": { - "name": "hostedReview.forBranch#1", - "ordinal": 3, - "args": [ - { - "name": "method", - "value": "hostedReview.forBranch" - }, - { - "name": "params", - "value": { - "active": true, - "branch": "feature", - "linkedGitHubPR": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-2", - "ok": true, - "result": { - "mergeable": "MERGEABLE", - "number": 12, - "provider": "github", - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } - } - }, "2bb452e534eb": { "name": "github.prChecks#1", "ordinal": 12, @@ -147,101 +62,10 @@ "kind": "loading" } }, - "357f9b7862e3": { - "name": "worktree.show#1", + "3b5c096da2a3": { + "name": "hostedReview.forBranch#1", "ordinal": 6, - "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" - }, - "4da7ea39401b": { - "name": "worktree.show#1", - "ordinal": 4, - "args": [ - { - "name": "method", - "value": "worktree.show" - }, - { - "name": "params", - "value": { - "worktree": "id:repo-9::/w" - } - }, - { - "name": "options", - "value": { - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-3", - "ok": true, - "result": { - "worktree": { - "linkedPR": { - "$rpc": "null" - } - } - } - } - } - }, - "707f5273fbe1": { - "name": "github.prForBranch#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "github.prForBranch" - }, - { - "name": "params", - "value": { - "branch": "feature", - "currentHeadOid": { - "$rpc": "null" - }, - "fallbackPRNumber": 12, - "linkedPRNumber": { - "$rpc": "null" - }, - "repo": "id:repo-9" - } - }, - { - "name": "options", - "value": { - "beforeSend": "[local beforeSend]", - "failWhenDisconnected": true - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-4", - "ok": true, - "result": { - "fetchedAt": 0, - "kind": "found", - "pr": { - "headSha": "head-sha-1", - "mergeable": "MERGEABLE", - "number": 12, - "state": "open", - "title": "Recorded", - "updatedAt": "2026-01-01T00:00:00Z", - "url": "https://github.com/owner/repo/pull/12" - } - } - } - } + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" }, "8352e3c99668": { "name": "status.get#1", @@ -348,11 +172,184 @@ "startedAt": 0 } }, + "a0729c676b9a": { + "name": "worktree.show#1", + "ordinal": 3, + "args": [ + { + "name": "method", + "value": "worktree.show" + }, + { + "name": "params", + "value": { + "worktree": "id:repo-9::/w" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "worktree": { + "linkedPR": { + "$rpc": "null" + } + } + } + } + } + }, "abcf3bdc5cde": { "name": "status.get#1", "ordinal": 13, "json": "{\"id\":\"frame-6\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}" }, + "b3a7ec3ab1c7": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, + "c2f3182f1780": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-4", + "ok": true, + "result": { + "fetchedAt": 0, + "kind": "found", + "pr": { + "headSha": "head-sha-1", + "mergeable": "MERGEABLE", + "number": 12, + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + } + }, + "c79bbd27f177": { + "name": "hostedReview.forBranch#1", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "hostedReview.forBranch" + }, + { + "name": "params", + "value": { + "active": true, + "branch": "feature", + "linkedGitHubPR": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-3", + "ok": true, + "result": { + "mergeable": "MERGEABLE", + "number": 12, + "provider": "github", + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + }, "cb071b912510": { "name": "github.prChecks#1", "ordinal": 10, @@ -381,11 +378,6 @@ "startedAt": 0 } }, - "d25b12408fe6": { - "name": "github.prForBranch#1", - "ordinal": 9, - "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"currentHeadOid\":null}}" - }, "d3426861162d": { "name": "github.workItemDetails#1", "ordinal": 14, @@ -485,6 +477,11 @@ "refreshFailed": false } }, + "ea4c904bfb5f": { + "name": "worktree.show#1", + "ordinal": 5, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" + }, "eb79a9b3682a": { "status": "fulfilled", "startedAt": 0, @@ -492,6 +489,11 @@ "value": { "$rpc": "undefined" } + }, + "fcced642024c": { + "name": "github.prForBranch#1", + "ordinal": 9, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"acceptMergedFallbackPR\":true,\"currentHeadOid\":null}}" } }, "recording": { @@ -500,8 +502,8 @@ { "id": "branch-hint", "observation": { - "sender": ["1287167eaf56", "28428f85f800", "4da7ea39401b", "2309f345fb72"], - "payloads": ["1f5765918736", "27531d8cc301", "357f9b7862e3", "d25b12408fe6"], + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "b3a7ec3ab1c7"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], "settlements": { "mount": "eb79a9b3682a" }, @@ -514,17 +516,17 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "cb071b912510", "9c952632b0c0" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde" ], @@ -540,18 +542,18 @@ "observation": { "sender": [ "1287167eaf56", - "28428f85f800", - "4da7ea39401b", - "707f5273fbe1", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", "87ba39148f02", "8352e3c99668", "d3426861162d" ], "payloads": [ "1f5765918736", - "27531d8cc301", - "357f9b7862e3", - "d25b12408fe6", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", "2bb452e534eb", "abcf3bdc5cde", "1723d8a5d8be" diff --git a/mobile/rpc-foundation/goldens/pr-sidebar-revisit-and-refresh.json b/mobile/rpc-foundation/goldens/pr-sidebar-revisit-and-refresh.json new file mode 100644 index 00000000000..e2f7f5e6cee --- /dev/null +++ b/mobile/rpc-foundation/goldens/pr-sidebar-revisit-and-refresh.json @@ -0,0 +1,1126 @@ +{ + "goldenFormatVersion": 6, + "operation": "session.pr-sidebar", + "family": "session.pr-sidebar", + "namedDeltas": [], + "values": { + "0e5be7456ec2": { + "name": "status.get#2", + "ordinal": 24, + "args": [ + { + "name": "method", + "value": "status.get" + }, + { + "name": "params", + "value": { + "$rpc": "undefined" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true, + "timeoutMs": 30000 + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-13", + "ok": true, + "result": { + "runtimeId": "recorded" + } + } + } + }, + "1287167eaf56": { + "name": "github.repoSlug#1", + "ordinal": 1, + "args": [ + { + "name": "method", + "value": "github.repoSlug" + }, + { + "name": "params", + "value": { + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-1", + "ok": true, + "result": { + "owner": "owner", + "repo": "repo" + } + } + } + }, + "156f18eff4ec": { + "name": "reply-salvage", + "ordinal": 29, + "value": { + "droppedCount": 1, + "droppedPaths": ["linkedPR"], + "method": "worktree.show", + "operation": "worktree.summary-or-skip", + "variant": "worktree-summary" + } + }, + "1723d8a5d8be": { + "name": "github.workItemDetails#1", + "ordinal": 15, + "json": "{\"id\":\"frame-7\",\"deviceToken\":\"recording-device\",\"method\":\"github.workItemDetails\",\"params\":{\"repo\":\"id:repo-9\",\"number\":12,\"type\":\"pr\"}}" + }, + "1f5765918736": { + "name": "github.repoSlug#1", + "ordinal": 2, + "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"github.repoSlug\",\"params\":{\"repo\":\"id:repo-9\"}}" + }, + "214734b00350": { + "name": "github.workItemDetails#2", + "ordinal": 34, + "args": [ + { + "name": "method", + "value": "github.workItemDetails" + }, + { + "name": "params", + "value": { + "number": 12, + "repo": "id:repo-9", + "type": "pr" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true, + "timeoutMs": 30000 + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-16", + "ok": true, + "result": { + "body": "body", + "comments": [ + { + "author": "rev", + "body": "please fix", + "createdAt": "2026-01-01T00:00:00Z", + "id": 55, + "isResolved": false, + "line": 3, + "path": "src/app.ts", + "threadId": "thread-1", + "url": "https://github.com/owner/repo/pull/12#discussion_r55" + } + ], + "headSha": "head-sha-1", + "item": { + "assignees": [], + "id": "PR_1", + "labels": [], + "number": 12, + "state": "open", + "title": "Recorded", + "type": "pr", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + } + }, + "2bb452e534eb": { + "name": "github.prChecks#1", + "ordinal": 12, + "json": "{\"id\":\"frame-5\",\"deviceToken\":\"recording-device\",\"method\":\"github.prChecks\",\"params\":{\"repo\":\"id:repo-9\",\"prNumber\":12,\"headSha\":\"head-sha-1\"}}" + }, + "3358329fa363": { + "name": "hostedReview.forBranch#2", + "ordinal": 26, + "json": "{\"id\":\"frame-11\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" + }, + "35045fa5a752": { + "commentError": { + "$rpc": "null" + }, + "pr": { + "kind": "loading" + } + }, + "3b5c096da2a3": { + "name": "hostedReview.forBranch#1", + "ordinal": 6, + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.forBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedGitHubPR\":null,\"active\":true}}" + }, + "415376507669": { + "name": "github.prForBranch#2", + "ordinal": 19, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-9", + "ok": true, + "result": { + "fetchedAt": 0, + "kind": "found", + "pr": { + "headSha": "head-sha-1", + "mergeable": "MERGEABLE", + "number": 12, + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + } + }, + "463387bfd97b": { + "name": "status.get#3", + "ordinal": 30, + "args": [ + { + "name": "method", + "value": "status.get" + }, + { + "name": "params", + "value": { + "$rpc": "undefined" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true, + "timeoutMs": 15000 + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-14", + "ok": true, + "result": { + "runtimeId": "recorded" + } + } + } + }, + "65beb11d253c": { + "name": "github.prForBranch#2", + "ordinal": 20, + "json": "{\"id\":\"frame-9\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"acceptMergedFallbackPR\":true,\"currentHeadOid\":null}}" + }, + "6c4dd527b59b": { + "name": "worktree.show#3", + "ordinal": 21, + "args": [ + { + "name": "method", + "value": "worktree.show" + }, + { + "name": "params", + "value": { + "worktree": "id:repo-9::/w" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-10", + "ok": true, + "result": { + "worktree": { + "linkedPR": { + "$rpc": "null" + } + } + } + } + } + }, + "6fad2b580d21": { + "name": "worktree.show#3", + "ordinal": 25, + "json": "{\"id\":\"frame-10\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" + }, + "743fd59534bc": { + "name": "worktree.show#2", + "ordinal": 16, + "args": [ + { + "name": "method", + "value": "worktree.show" + }, + { + "name": "params", + "value": { + "worktree": "id:repo-9::/w" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-8", + "ok": true, + "result": { + "worktree": { + "linkedPR": { + "$rpc": "null" + } + } + } + } + } + }, + "79306c86c331": { + "name": "github.prForBranch#3", + "ordinal": 33, + "json": "{\"id\":\"frame-15\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"acceptMergedFallbackPR\":true,\"currentHeadOid\":null,\"userRefresh\":true}}" + }, + "8352e3c99668": { + "name": "status.get#1", + "ordinal": 11, + "args": [ + { + "name": "method", + "value": "status.get" + }, + { + "name": "params", + "value": { + "$rpc": "undefined" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true, + "timeoutMs": 30000 + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-6", + "ok": true, + "result": { + "runtimeId": "recorded" + } + } + } + }, + "87ba39148f02": { + "name": "github.prChecks#1", + "ordinal": 10, + "args": [ + { + "name": "method", + "value": "github.prChecks" + }, + { + "name": "params", + "value": { + "headSha": "head-sha-1", + "prNumber": 12, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-5", + "ok": true, + "result": [ + { + "checkRunId": 7, + "conclusion": "success", + "name": "build", + "status": "completed" + } + ] + } + } + }, + "897654ba1e6c": { + "name": "status.get#2", + "ordinal": 28, + "json": "{\"id\":\"frame-13\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}" + }, + "8fd563d499bd": { + "name": "github.workItemDetails#2", + "ordinal": 35, + "json": "{\"id\":\"frame-16\",\"deviceToken\":\"recording-device\",\"method\":\"github.workItemDetails\",\"params\":{\"repo\":\"id:repo-9\",\"number\":12,\"type\":\"pr\"}}" + }, + "9c952632b0c0": { + "name": "status.get#1", + "ordinal": 11, + "args": [ + { + "name": "method", + "value": "status.get" + }, + { + "name": "params", + "value": { + "$rpc": "undefined" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true, + "timeoutMs": 30000 + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, + "a0729c676b9a": { + "name": "worktree.show#1", + "ordinal": 3, + "args": [ + { + "name": "method", + "value": "worktree.show" + }, + { + "name": "params", + "value": { + "worktree": "id:repo-9::/w" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "worktree": { + "linkedPR": { + "$rpc": "null" + } + } + } + } + } + }, + "a299c1832313": { + "name": "reply-salvage", + "ordinal": 18, + "value": { + "droppedCount": 1, + "droppedPaths": ["linkedPR"], + "method": "worktree.show", + "operation": "worktree.summary-or-skip", + "variant": "worktree-summary" + } + }, + "a8038818d0e2": { + "name": "hostedReview.forBranch#2", + "ordinal": 22, + "args": [ + { + "name": "method", + "value": "hostedReview.forBranch" + }, + { + "name": "params", + "value": { + "active": true, + "branch": "feature", + "linkedGitHubPR": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-11", + "ok": true, + "result": { + "mergeable": "MERGEABLE", + "number": 12, + "provider": "github", + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + }, + "abcf3bdc5cde": { + "name": "status.get#1", + "ordinal": 13, + "json": "{\"id\":\"frame-6\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}" + }, + "b341f4128fcc": { + "name": "github.prForBranch#3", + "ordinal": 32, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9", + "userRefresh": true + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-15", + "ok": true, + "result": { + "fetchedAt": 0, + "kind": "found", + "pr": { + "headSha": "head-sha-1", + "mergeable": "MERGEABLE", + "number": 12, + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + } + }, + "b3a7ec3ab1c7": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, + "c2a6bcc380f8": { + "name": "worktree.show#2", + "ordinal": 17, + "json": "{\"id\":\"frame-8\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" + }, + "c2f3182f1780": { + "name": "github.prForBranch#1", + "ordinal": 8, + "args": [ + { + "name": "method", + "value": "github.prForBranch" + }, + { + "name": "params", + "value": { + "acceptMergedFallbackPR": true, + "branch": "feature", + "currentHeadOid": { + "$rpc": "null" + }, + "fallbackPRNumber": 12, + "linkedPRNumber": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-4", + "ok": true, + "result": { + "fetchedAt": 0, + "kind": "found", + "pr": { + "headSha": "head-sha-1", + "mergeable": "MERGEABLE", + "number": 12, + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + } + }, + "c79bbd27f177": { + "name": "hostedReview.forBranch#1", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "hostedReview.forBranch" + }, + { + "name": "params", + "value": { + "active": true, + "branch": "feature", + "linkedGitHubPR": { + "$rpc": "null" + }, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-3", + "ok": true, + "result": { + "mergeable": "MERGEABLE", + "number": 12, + "provider": "github", + "state": "open", + "title": "Recorded", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + }, + "cb071b912510": { + "name": "github.prChecks#1", + "ordinal": 10, + "args": [ + { + "name": "method", + "value": "github.prChecks" + }, + { + "name": "params", + "value": { + "headSha": "head-sha-1", + "prNumber": 12, + "repo": "id:repo-9" + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, + "d28ec805dd9e": { + "name": "status.get#3", + "ordinal": 31, + "json": "{\"id\":\"frame-14\",\"deviceToken\":\"recording-device\",\"method\":\"status.get\"}" + }, + "d3426861162d": { + "name": "github.workItemDetails#1", + "ordinal": 14, + "args": [ + { + "name": "method", + "value": "github.workItemDetails" + }, + { + "name": "params", + "value": { + "number": 12, + "repo": "id:repo-9", + "type": "pr" + } + }, + { + "name": "options", + "value": { + "beforeSend": "[local beforeSend]", + "failWhenDisconnected": true, + "timeoutMs": 30000 + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-7", + "ok": true, + "result": { + "body": "body", + "comments": [ + { + "author": "rev", + "body": "please fix", + "createdAt": "2026-01-01T00:00:00Z", + "id": 55, + "isResolved": false, + "line": 3, + "path": "src/app.ts", + "threadId": "thread-1", + "url": "https://github.com/owner/repo/pull/12#discussion_r55" + } + ], + "headSha": "head-sha-1", + "item": { + "assignees": [], + "id": "PR_1", + "labels": [], + "number": 12, + "state": "open", + "title": "Recorded", + "type": "pr", + "updatedAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12" + } + } + } + } + }, + "d3d85b61b684": { + "name": "reply-salvage", + "ordinal": 7, + "value": { + "droppedCount": 1, + "droppedPaths": ["linkedPR"], + "method": "worktree.show", + "operation": "worktree.summary-or-skip", + "variant": "worktree-summary" + } + }, + "e0a11d8a1005": { + "commentError": { + "$rpc": "null" + }, + "pr": { + "checks": ["build:success"], + "checksError": { + "$rpc": "null" + }, + "comments": [ + { + "body": "please fix", + "id": 55, + "resolved": false + } + ], + "kind": "ready", + "pr": { + "headSha": "head-sha-1", + "number": 12, + "title": "Recorded" + }, + "refreshFailed": false + } + }, + "ea4c904bfb5f": { + "name": "worktree.show#1", + "ordinal": 5, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo-9::/w\"}}" + }, + "eb79a9b3682a": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "$rpc": "undefined" + } + }, + "ed61696aef2a": { + "name": "github.prChecks#2", + "ordinal": 23, + "args": [ + { + "name": "method", + "value": "github.prChecks" + }, + { + "name": "params", + "value": { + "headSha": "head-sha-1", + "noCache": true, + "prNumber": 12, + "repo": "id:repo-9", + "userRefresh": true + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-12", + "ok": true, + "result": [ + { + "checkRunId": 7, + "conclusion": "success", + "name": "build", + "status": "completed" + } + ] + } + } + }, + "f207e2355d21": { + "name": "github.prChecks#2", + "ordinal": 27, + "json": "{\"id\":\"frame-12\",\"deviceToken\":\"recording-device\",\"method\":\"github.prChecks\",\"params\":{\"repo\":\"id:repo-9\",\"prNumber\":12,\"noCache\":true,\"userRefresh\":true,\"headSha\":\"head-sha-1\"}}" + }, + "fcced642024c": { + "name": "github.prForBranch#1", + "ordinal": 9, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"github.prForBranch\",\"params\":{\"repo\":\"id:repo-9\",\"branch\":\"feature\",\"linkedPRNumber\":null,\"fallbackPRNumber\":12,\"acceptMergedFallbackPR\":true,\"currentHeadOid\":null}}" + } + }, + "recording": { + "scenario": "pr-sidebar-revisit-and-refresh", + "checkpoints": [ + { + "id": "branch-hint", + "observation": { + "sender": ["1287167eaf56", "a0729c676b9a", "c79bbd27f177", "b3a7ec3ab1c7"], + "payloads": ["1f5765918736", "ea4c904bfb5f", "3b5c096da2a3", "fcced642024c"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "35045fa5a752", + "effects": ["d3d85b61b684"] + } + }, + { + "id": "pr", + "observation": { + "sender": [ + "1287167eaf56", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", + "cb071b912510", + "9c952632b0c0" + ], + "payloads": [ + "1f5765918736", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", + "2bb452e534eb", + "abcf3bdc5cde" + ], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "35045fa5a752", + "effects": ["d3d85b61b684"] + } + }, + { + "id": "loaded", + "observation": { + "sender": [ + "1287167eaf56", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", + "87ba39148f02", + "8352e3c99668", + "d3426861162d" + ], + "payloads": [ + "1f5765918736", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", + "2bb452e534eb", + "abcf3bdc5cde", + "1723d8a5d8be" + ], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "e0a11d8a1005", + "effects": ["d3d85b61b684"] + } + }, + { + "id": "revisited", + "observation": { + "sender": [ + "1287167eaf56", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", + "87ba39148f02", + "8352e3c99668", + "d3426861162d", + "743fd59534bc", + "415376507669" + ], + "payloads": [ + "1f5765918736", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", + "2bb452e534eb", + "abcf3bdc5cde", + "1723d8a5d8be", + "c2a6bcc380f8", + "65beb11d253c" + ], + "settlements": { + "mount": "eb79a9b3682a", + "revisit": "eb79a9b3682a" + }, + "state": "e0a11d8a1005", + "effects": ["d3d85b61b684", "a299c1832313"] + } + }, + { + "id": "refreshed", + "observation": { + "sender": [ + "1287167eaf56", + "a0729c676b9a", + "c79bbd27f177", + "c2f3182f1780", + "87ba39148f02", + "8352e3c99668", + "d3426861162d", + "743fd59534bc", + "415376507669", + "6c4dd527b59b", + "a8038818d0e2", + "ed61696aef2a", + "0e5be7456ec2", + "463387bfd97b", + "b341f4128fcc", + "214734b00350" + ], + "payloads": [ + "1f5765918736", + "ea4c904bfb5f", + "3b5c096da2a3", + "fcced642024c", + "2bb452e534eb", + "abcf3bdc5cde", + "1723d8a5d8be", + "c2a6bcc380f8", + "65beb11d253c", + "6fad2b580d21", + "3358329fa363", + "f207e2355d21", + "897654ba1e6c", + "d28ec805dd9e", + "79306c86c331", + "8fd563d499bd" + ], + "settlements": { + "mount": "eb79a9b3682a", + "revisit": "eb79a9b3682a", + "refresh": "eb79a9b3682a" + }, + "state": "e0a11d8a1005", + "effects": ["d3d85b61b684", "a299c1832313", "156f18eff4ec"] + } + } + ] + } +} diff --git a/mobile/rpc-foundation/pilot-scenarios.json b/mobile/rpc-foundation/pilot-scenarios.json index 5be06b0d6b0..ca6e39e633b 100644 --- a/mobile/rpc-foundation/pilot-scenarios.json +++ b/mobile/rpc-foundation/pilot-scenarios.json @@ -8473,6 +8473,7 @@ "branch": "feature", "linkedPRNumber": null, "fallbackPRNumber": 12, + "acceptMergedFallbackPR": true, "currentHeadOid": null }, "paramsFollowDivergence": true, @@ -8572,6 +8573,398 @@ } ] }, + { + "id": "pr-sidebar-revisit-and-refresh", + "operation": "session.pr-sidebar", + "family": "session.pr-sidebar", + "sites": [ + "mobile/src/source-control/review/use-mobile-pr-sidebar-controller.ts", + "mobile/src/source-control/review/mobile-pr-queries.ts", + "mobile/src/source-control/review/mobile-pr-sidebar-state.ts" + ], + "schedules": [], + "steps": [ + { + "action": "mount", + "id": "mount" + }, + { + "complete": "github.repoSlug#1", + "params": { + "repo": "id:repo-9" + }, + "reply": { + "ok": true, + "result": { + "owner": "owner", + "repo": "repo" + } + } + }, + { + "complete": "hostedReview.forBranch#1", + "params": { + "repo": "id:repo-9", + "branch": "feature", + "linkedGitHubPR": null, + "active": true + }, + "reply": { + "ok": true, + "result": { + "provider": "github", + "number": 12, + "title": "Recorded", + "state": "open", + "url": "https://github.com/owner/repo/pull/12", + "updatedAt": "2026-01-01T00:00:00Z", + "mergeable": "MERGEABLE" + } + } + }, + { + "complete": "worktree.show#1", + "params": { + "worktree": "id:repo-9::/w" + }, + "reply": { + "ok": true, + "result": { + "worktree": { + "linkedPR": null + } + } + } + }, + { + "checkpoint": "branch-hint" + }, + { + "complete": "github.prForBranch#1", + "params": { + "repo": "id:repo-9", + "branch": "feature", + "linkedPRNumber": null, + "fallbackPRNumber": 12, + "acceptMergedFallbackPR": true, + "currentHeadOid": null + }, + "paramsFollowDivergence": true, + "reply": { + "ok": true, + "result": { + "kind": "found", + "pr": { + "number": 12, + "state": "open", + "title": "Recorded", + "url": "https://github.com/owner/repo/pull/12", + "headSha": "head-sha-1", + "updatedAt": "2026-01-01T00:00:00Z", + "mergeable": "MERGEABLE" + }, + "fetchedAt": 0 + } + } + }, + { + "checkpoint": "pr" + }, + { + "complete": "github.prChecks#1", + "params": { + "repo": "id:repo-9", + "prNumber": 12, + "headSha": "head-sha-1" + }, + "reply": { + "ok": true, + "result": [ + { + "name": "build", + "status": "completed", + "conclusion": "success", + "checkRunId": 7 + } + ] + } + }, + { + "complete": "status.get#1", + "params": { + "$undefined": true + }, + "reply": { + "ok": true, + "result": { + "runtimeId": "recorded" + } + } + }, + { + "complete": "github.workItemDetails#1", + "params": { + "repo": "id:repo-9", + "number": 12, + "type": "pr" + }, + "paramsFollowDivergence": true, + "reply": { + "ok": true, + "result": { + "item": { + "id": "PR_1", + "number": 12, + "type": "pr", + "state": "open", + "title": "Recorded", + "url": "https://github.com/owner/repo/pull/12", + "updatedAt": "2026-01-01T00:00:00Z", + "labels": [], + "assignees": [] + }, + "body": "body", + "headSha": "head-sha-1", + "comments": [ + { + "id": 55, + "author": "rev", + "body": "please fix", + "createdAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12#discussion_r55", + "threadId": "thread-1", + "path": "src/app.ts", + "line": 3, + "isResolved": false + } + ] + } + } + }, + { + "checkpoint": "loaded" + }, + { + "action": "revisit", + "id": "revisit" + }, + { + "complete": "worktree.show#2", + "params": { + "worktree": "id:repo-9::/w" + }, + "reply": { + "ok": true, + "result": { + "worktree": { + "linkedPR": null + } + } + } + }, + { + "complete": "github.prForBranch#2", + "params": { + "repo": "id:repo-9", + "branch": "feature", + "linkedPRNumber": null, + "fallbackPRNumber": 12, + "acceptMergedFallbackPR": true, + "currentHeadOid": null + }, + "paramsFollowDivergence": true, + "reply": { + "ok": true, + "result": { + "kind": "found", + "pr": { + "number": 12, + "state": "open", + "title": "Recorded", + "url": "https://github.com/owner/repo/pull/12", + "headSha": "head-sha-1", + "updatedAt": "2026-01-01T00:00:00Z", + "mergeable": "MERGEABLE" + }, + "fetchedAt": 0 + } + } + }, + { + "checkpoint": "revisited" + }, + { + "action": "refresh", + "id": "refresh" + }, + { + "complete": "hostedReview.forBranch#2", + "params": { + "repo": "id:repo-9", + "branch": "feature", + "linkedGitHubPR": null, + "active": true + }, + "reply": { + "ok": true, + "result": { + "provider": "github", + "number": 12, + "title": "Recorded", + "state": "open", + "url": "https://github.com/owner/repo/pull/12", + "updatedAt": "2026-01-01T00:00:00Z", + "mergeable": "MERGEABLE" + } + } + }, + { + "complete": "worktree.show#3", + "params": { + "worktree": "id:repo-9::/w" + }, + "reply": { + "ok": true, + "result": { + "worktree": { + "linkedPR": null + } + } + } + }, + { + "complete": "github.prForBranch#3", + "params": { + "repo": "id:repo-9", + "branch": "feature", + "linkedPRNumber": null, + "fallbackPRNumber": 12, + "acceptMergedFallbackPR": true, + "currentHeadOid": null, + "userRefresh": true + }, + "paramsFollowDivergence": true, + "reply": { + "ok": true, + "result": { + "kind": "found", + "pr": { + "number": 12, + "state": "open", + "title": "Recorded", + "url": "https://github.com/owner/repo/pull/12", + "headSha": "head-sha-1", + "updatedAt": "2026-01-01T00:00:00Z", + "mergeable": "MERGEABLE" + }, + "fetchedAt": 0 + } + } + }, + { + "complete": "github.prChecks#2", + "params": { + "repo": "id:repo-9", + "prNumber": 12, + "noCache": true, + "userRefresh": true, + "headSha": "head-sha-1" + }, + "reply": { + "ok": true, + "result": [ + { + "name": "build", + "status": "completed", + "conclusion": "success", + "checkRunId": 7 + } + ] + } + }, + { + "bind": "refresh-status-2", + "request": "status.get#2", + "params": { + "$undefined": true + } + }, + { + "complete": "refresh-status-2", + "params": { + "$undefined": true + }, + "reply": { + "ok": true, + "result": { + "runtimeId": "recorded" + } + } + }, + { + "bind": "refresh-status-3", + "request": "status.get#3", + "params": { + "$undefined": true + } + }, + { + "complete": "refresh-status-3", + "params": { + "$undefined": true + }, + "reply": { + "ok": true, + "result": { + "runtimeId": "recorded" + } + } + }, + { + "complete": "github.workItemDetails#2", + "params": { + "repo": "id:repo-9", + "number": 12, + "type": "pr" + }, + "paramsFollowDivergence": true, + "reply": { + "ok": true, + "result": { + "item": { + "id": "PR_1", + "number": 12, + "type": "pr", + "state": "open", + "title": "Recorded", + "url": "https://github.com/owner/repo/pull/12", + "updatedAt": "2026-01-01T00:00:00Z", + "labels": [], + "assignees": [] + }, + "body": "body", + "headSha": "head-sha-1", + "comments": [ + { + "id": 55, + "author": "rev", + "body": "please fix", + "createdAt": "2026-01-01T00:00:00Z", + "url": "https://github.com/owner/repo/pull/12#discussion_r55", + "threadId": "thread-1", + "path": "src/app.ts", + "line": 3, + "isResolved": false + } + ] + } + } + }, + { + "checkpoint": "refreshed" + } + ] + }, { "id": "pr-sidebar-checks-refused", "operation": "session.pr-sidebar", @@ -8645,6 +9038,7 @@ "branch": "feature", "linkedPRNumber": null, "fallbackPRNumber": 12, + "acceptMergedFallbackPR": true, "currentHeadOid": null }, "paramsFollowDivergence": true, @@ -8813,6 +9207,7 @@ "branch": "feature", "linkedPRNumber": null, "fallbackPRNumber": 12, + "acceptMergedFallbackPR": true, "currentHeadOid": null }, "paramsFollowDivergence": true, @@ -9012,6 +9407,7 @@ "branch": "feature", "linkedPRNumber": null, "fallbackPRNumber": 12, + "acceptMergedFallbackPR": true, "currentHeadOid": null }, "paramsFollowDivergence": true, diff --git a/mobile/src/source-control/review/github-pr-rpc.ts b/mobile/src/source-control/review/github-pr-rpc.ts index 595d67de125..0b46be0adc6 100644 --- a/mobile/src/source-control/review/github-pr-rpc.ts +++ b/mobile/src/source-control/review/github-pr-rpc.ts @@ -100,7 +100,9 @@ export async function fetchPRForBranch( branch: string linkedPRNumber?: number | null fallbackPRNumber?: number | null + acceptMergedFallbackPR?: boolean currentHeadOid?: string | null + // An action's read: re-learn host status, and join no host lookup begun before it. refresh?: boolean } ): Promise> { @@ -131,7 +133,9 @@ export async function fetchPRForBranch( branch: args.branch, linkedPRNumber: args.linkedPRNumber ?? null, fallbackPRNumber: args.fallbackPRNumber ?? null, - currentHeadOid: args.currentHeadOid ?? null + ...(args.acceptMergedFallbackPR ? { acceptMergedFallbackPR: true } : {}), + currentHeadOid: args.currentHeadOid ?? null, + ...(args.refresh ? { userRefresh: true } : {}) }), contract.options ) @@ -222,7 +226,13 @@ export async function fetchWorkItemDetails( export function fetchPRChecks( client: RpcOperationSender, worktreeId: string, - args: { prNumber: number; headSha?: string | null; prRepo?: GitHubPrRepoSlug | null } + args: { + prNumber: number + headSha?: string | null + prRepo?: GitHubPrRepoSlug | null + // An action's read: past gh's response cache, joining no host read begun before it. + refresh?: boolean + } ): Promise> { return settleGithubPrRead(githubPrChecksRead, () => githubPrChecksRead.request( @@ -230,7 +240,10 @@ export function fetchPRChecks( githubPrRequestParams( githubPrChecksRead.operation.method, worktreeId, - { prNumber: args.prNumber }, + { + prNumber: args.prNumber, + ...(args.refresh ? { noCache: true, userRefresh: true } : {}) + }, { prRepo: args.prRepo, headSha: args.headSha } ) ) diff --git a/mobile/src/source-control/review/mobile-pr-queries.ts b/mobile/src/source-control/review/mobile-pr-queries.ts index d4279971f0e..973079c5dde 100644 --- a/mobile/src/source-control/review/mobile-pr-queries.ts +++ b/mobile/src/source-control/review/mobile-pr-queries.ts @@ -146,7 +146,8 @@ export const prBranchReviewQuery = defineHostQuery({ branch: input.branch, headSha: input.head, // Only an action's read re-learns host status; revalidations reuse what this connection knows. - refresh: read.live + refresh: read.live, + previous } ), previous @@ -157,12 +158,19 @@ export const prChecksQuery = defineHostQuery({ family: 'pr.checks', staleTime: 15_000, refetchOnWindowFocus: true, - fetch: async (client, target, input: PrChecksInput): Promise => { + fetch: async ( + client, + target, + input: PrChecksInput, + _previous, + read + ): Promise => { const outcome = await fetchPRChecks(client, target.worktree ?? '', { prNumber: input.number, headSha: input.head, // Fork checks must use the PR's own repo identity. - prRepo: prRepoSlug(input) + prRepo: prRepoSlug(input), + refresh: read.live }) if (!outcome.ok) { throw new Error(outcome.error) diff --git a/mobile/src/source-control/review/mobile-pr-sidebar-state.test.ts b/mobile/src/source-control/review/mobile-pr-sidebar-state.test.ts new file mode 100644 index 00000000000..66764c5e41a --- /dev/null +++ b/mobile/src/source-control/review/mobile-pr-sidebar-state.test.ts @@ -0,0 +1,51 @@ +import { describe, expect, it } from 'vitest' +import type { PRInfo } from '../../../../src/shared/github/pull-request-types' +import { loadPrBranchReview, type PrSidebarLoadDeps } from './mobile-pr-sidebar-state' + +const linkedPR: PRInfo = { + number: 5, + title: 'Linked', + state: 'open', + url: 'https://github.com/o/r/pull/5', + checksStatus: 'neutral', + updatedAt: '2026-11-09T00:00:00Z', + mergeable: 'MERGEABLE' +} + +describe('loadPrBranchReview', () => { + it('stops falling back to a PR read under a link the workspace no longer has', async () => { + const sent: { fallbackPRNumber?: number | null }[] = [] + const deps: PrSidebarLoadDeps = { + fetchForBranch: async () => ({ + ok: true, + result: { + provider: 'github', + number: 12, + title: 'Branch PR', + state: 'open', + url: 'https://github.com/o/r/pull/12', + status: 'neutral', + updatedAt: '2026-11-09T00:00:00Z', + mergeable: 'MERGEABLE' + } + }), + fetchWorktreeGitHubPRLink: async () => ({ + linkedPR: null, + suppressedGitHubPR: null, + pushTarget: null + }), + clearWorktreeReviewLink: async () => {}, + fetchPRForBranch: async (_worktreeId, args) => { + sent.push(args) + return { ok: true, result: null } + } + } + await loadPrBranchReview(deps, { + worktreeId: 'repo::/w', + branch: 'feature', + headSha: 'head-1', + previous: { kind: 'found', pr: linkedPR, pushTarget: null, linkedPRNumber: 5 } + }) + expect(sent.map((args) => args.fallbackPRNumber)).toEqual([12]) + }) +}) diff --git a/mobile/src/source-control/review/mobile-pr-sidebar-state.ts b/mobile/src/source-control/review/mobile-pr-sidebar-state.ts index 34416229028..5038ee8801d 100644 --- a/mobile/src/source-control/review/mobile-pr-sidebar-state.ts +++ b/mobile/src/source-control/review/mobile-pr-sidebar-state.ts @@ -9,6 +9,11 @@ import type { GitHubWorkItemDetails } from '../../../../src/shared/github/work-i import type { HostedReviewInfo } from '../../../../src/shared/source-control/hosted-review/hosted-review-contracts' import type { GitHubPrReadOutcome } from './github-pr-rpc' import { isGitHubPRSuppressed } from '../../../../src/shared/worktree/github-pr-suppression' +import { + prBranchFallbackNeedsHint, + resolvePRBranchFallback, + shouldAcceptMergedFallbackPR +} from '../../../../src/shared/github/pr-branch-fallback-rule' import { shouldApplyBranchMismatchedLinkedPRClear, shouldApplyDivergedLinkedPRClear, @@ -72,6 +77,7 @@ export type PrSidebarLoadDeps = { branch: string linkedPRNumber?: number | null fallbackPRNumber?: number | null + acceptMergedFallbackPR?: boolean currentHeadOid?: string | null refresh?: boolean } @@ -109,12 +115,25 @@ function resolveStaleLink( return null } +/** The hosted-review hint a branch lookup fell back to, kept so a branch with no PR isn't asked twice per read. */ +export type PrBranchHint = { number: number | null; readAt: number } + /** The branch's GitHub review: its PR and the workspace's push target, or none. */ export type PrBranchReview = - | { kind: 'found'; pr: PRInfo; pushTarget: GitPushTarget | null } - | { kind: 'none' } + // linkedPRNumber: the link the PR was read with, so a later link change drops it as a fallback. + | { kind: 'found'; pr: PRInfo; pushTarget: GitPushTarget | null; linkedPRNumber: number | null } + | { kind: 'none'; hint?: PrBranchHint } + +// The host re-reads a selected branch's hosted review once a minute, so a younger hint is still its answer. +const BRANCH_HINT_STALE_MS = 60_000 + +function keptHint(previous: PrBranchReview | undefined): PrBranchHint | null { + const hint = previous?.kind === 'none' ? previous.hint : undefined + return hint && Date.now() - hint.readAt < BRANCH_HINT_STALE_MS ? hint : null +} // Parallel link resolution also retains closed/merged reviews. A failed read throws its message, classified when shown. +// Like desktop, the last PR result is the lookup's fallback, so the hint is read only for a branch with none. export async function loadPrBranchReview( deps: PrSidebarLoadDeps, args: { @@ -122,37 +141,68 @@ export async function loadPrBranchReview( branch: string headSha?: string | null refresh?: boolean + previous?: PrBranchReview } ): Promise { - const [hintOutcome, link] = await Promise.all([ - deps.fetchForBranch(args.worktreeId, { branch: args.branch }), - deps.fetchWorktreeGitHubPRLink(args.worktreeId) + const previousRead = args.previous?.kind === 'found' ? args.previous : null + // Desktop drops its last PR when the workspace's link changes; a result read under another link is no fallback. + const fallbackPR = (linkedPRNumber: number | null) => + previousRead && previousRead.linkedPRNumber === linkedPRNumber ? previousRead.pr : null + const kept = keptHint(args.previous) + // A failed hint read is no hint, and is not kept. + let hintRead: Promise | undefined + const readHint = () => + (hintRead ??= kept + ? Promise.resolve(kept) + : deps.fetchForBranch(args.worktreeId, { branch: args.branch }).then((outcome) => + outcome.ok + ? { + number: outcome.result?.provider === 'github' ? outcome.result.number : null, + readAt: Date.now() + } + : null + )) + // The link isn't known yet: with no PR read before, start the hint alongside it (a linked PR wastes it); + // a link that changed since the last read waits for the hint instead. + const [link] = await Promise.all([ + deps.fetchWorktreeGitHubPRLink(args.worktreeId), + prBranchFallbackNeedsHint({ linkedPRNumber: null, cachedPR: previousRead }) ? readHint() : null ]) - const branchHint = - hintOutcome.ok && hintOutcome.result?.provider === 'github' ? hintOutcome.result.number : null const requestHeadOid = args.headSha ?? null - // Same as desktop: the explicit link wins; the branch's review is only a fallback. - const fetchPR = (linkedPRNumber: number | null) => - deps.fetchPRForBranch(args.worktreeId, { + // Same as desktop: the explicit link wins; the last PR result, else the branch's review, is only a fallback. + const fetchPR = async (linkedPRNumber: number | null, cachedPR: PRInfo | null) => { + const fallback = resolvePRBranchFallback({ + linkedPRNumber, + cachedPR, + hintPRNumber: prBranchFallbackNeedsHint({ linkedPRNumber, cachedPR }) + ? ((await readHint())?.number ?? null) + : null, + currentHeadOid: requestHeadOid + }) + return deps.fetchPRForBranch(args.worktreeId, { branch: args.branch, linkedPRNumber, - fallbackPRNumber: linkedPRNumber === null ? branchHint : null, + fallbackPRNumber: fallback.fallbackPRNumber, + ...(shouldAcceptMergedFallbackPR({ linkedPRNumber, ...fallback }) + ? { acceptMergedFallbackPR: true } + : {}), currentHeadOid: requestHeadOid, ...(args.refresh ? { refresh: true } : {}) }) + } let linkedPR = link.linkedPR - let prOutcome = await fetchPR(linkedPR) + let prOutcome = await fetchPR(linkedPR, fallbackPR(linkedPR)) const staleLink = prOutcome.ok ? resolveStaleLink(prOutcome.result, link, args.branch, requestHeadOid) : null - // Desktop drops a link the branch has moved past, then resolves by branch. + // Desktop drops a link the branch has moved past, then resolves by branch with only the hint. if (staleLink) { linkedPR = null // The refetch sends no link, so it need not wait for the clear to land. ;[, prOutcome] = await Promise.all([ deps.clearWorktreeReviewLink(args.worktreeId, staleLink), - fetchPR(null) + fetchPR(null, null) ]) } if (!prOutcome.ok) { @@ -165,9 +215,15 @@ export async function loadPrBranchReview( prOutcome.result.number ) ) { - return { kind: 'none' } + const hint = await hintRead + return hint ? { kind: 'none', hint } : { kind: 'none' } + } + return { + kind: 'found', + pr: prOutcome.result, + pushTarget: link.pushTarget, + linkedPRNumber: linkedPR } - return { kind: 'found', pr: prOutcome.result, pushTarget: link.pushTarget } } // What the screen shows for a PR read that failed with nothing accepted to keep. diff --git a/mobile/src/test-support/rpc-recording/adapters/pr-sidebar-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/pr-sidebar-mount-adapters.ts index e3eee2f2741..822fa7997c7 100644 --- a/mobile/src/test-support/rpc-recording/adapters/pr-sidebar-mount-adapters.ts +++ b/mobile/src/test-support/rpc-recording/adapters/pr-sidebar-mount-adapters.ts @@ -1,3 +1,4 @@ +import { useQueryClient, type QueryClient } from '@tanstack/react-query' import { hookMount, performHookAction } from '../hook-mount' import type { MountAdapter } from '../recording-scenario' import type { operationModuleLoader } from '../operation-module-loader' @@ -55,7 +56,9 @@ export function prSidebarMountAdapters( ).useMobilePrCommentActions let controller: ReturnType | undefined let comments: ReturnType | undefined + let queryClient: QueryClient | undefined const hook = hookMount(() => { + queryClient = useQueryClient() controller = useController({ hostId: HOST, client, @@ -99,6 +102,17 @@ export function prSidebarMountAdapters( if (name === 'resolve-thread') { return performHookAction(() => comments!.toggleResolve(firstThreadComment())) } + // Coming back to a stale PR: a revalidation that builds on the cached review. + if (name === 'revisit') { + return performHookAction(() => + queryClient!.invalidateQueries({ + predicate: (query) => query.queryKey[2] === 'pr.forBranch' + }) + ) + } + if (name === 'refresh') { + return performHookAction(() => controller!.refetchPRSidebar({ refresh: true })) + } if (name === 'unmount') { return hook.unmount() } diff --git a/src/main/github/pr-refresh-candidate-policy.ts b/src/main/github/pr-refresh-candidate-policy.ts index 963c74e8d3e..cb82cfe9e36 100644 --- a/src/main/github/pr-refresh-candidate-policy.ts +++ b/src/main/github/pr-refresh-candidate-policy.ts @@ -1,3 +1,4 @@ +import { shouldAcceptMergedFallbackPR } from '../../shared/github/pr-branch-fallback-rule' import { reviewRefreshIntervalMs } from '../../shared/review-refresh-policy' import type { GitHubPRRefreshAlias, @@ -18,14 +19,6 @@ type PRBranchLookupCandidate = Pick< 'localGitOptions' | 'linkedPRNumber' | 'fallbackPRNumber' | 'fallbackPRSource' | 'currentHeadOid' > -function shouldAcceptMergedFallbackPR(candidate: PRBranchLookupCandidate): boolean { - return ( - candidate.linkedPRNumber == null && - candidate.fallbackPRNumber != null && - candidate.fallbackPRSource != null - ) -} - export function hostedReviewOptionArgs( candidate: PRBranchLookupCandidate, reason: GitHubPRRefreshReason = 'visible', diff --git a/src/renderer/src/store/github/refresh/worktree-refresh.ts b/src/renderer/src/store/github/refresh/worktree-refresh.ts index 0f90fa4966b..83ae9de3985 100644 --- a/src/renderer/src/store/github/refresh/worktree-refresh.ts +++ b/src/renderer/src/store/github/refresh/worktree-refresh.ts @@ -20,7 +20,7 @@ import { worktreeOwnerHostIds } from '@/lib/workspace/ownership/workspace-catalo import { prCacheKey } from '../cache/cache-identity' import { settingsForGitHubRepoOwner } from '../work-items/work-item-routing' import { githubHostedReviewFallbackPRNumber } from '../pull-requests/pr-result-routing' -import type { GitHubPRFallbackSource } from '../cache/cache-model' +import { resolvePRBranchFallback } from '../../../../../shared/github/pr-branch-fallback-rule' import { selectWorktreesByRepo } from '../../workspaces/catalog/workspace-record-fields' export function findWorktreeById( @@ -251,23 +251,12 @@ export function buildPRRefreshCandidate( repo.executionHostId, true ) - const cachedFallbackPRNumber = cachedPR?.number ?? null - // Why: a merged PR is a valid fallback only while the worktree sits on its head or a confirmed-contained commit — else the branch moved on. - const cachedMergedPRMovedPastHead = - worktree.linkedPR == null && - cachedPR?.state === 'merged' && - cachedPR.headSha !== worktree.head && - cachedPR.confirmedContainedHeadOid !== worktree.head - const fallbackPRNumber = - worktree.linkedPR == null && !cachedMergedPRMovedPastHead - ? (cachedFallbackPRNumber ?? hostedReviewFallbackPRNumber) - : null - const fallbackPRSource: GitHubPRFallbackSource | null = - worktree.linkedPR != null || fallbackPRNumber == null - ? null - : cachedFallbackPRNumber != null - ? 'pr-cache' - : 'hosted-review' + const { fallbackPRNumber, fallbackPRSource } = resolvePRBranchFallback({ + linkedPRNumber: worktree.linkedPR ?? null, + cachedPR, + hintPRNumber: hostedReviewFallbackPRNumber, + currentHeadOid: worktree.head + }) const sshStatus = repo.connectionId ? state.sshConnectionStates.get(repo.connectionId)?.status : null diff --git a/src/renderer/src/web/preload-api/web-github-api.ts b/src/renderer/src/web/preload-api/web-github-api.ts index 6c763885c56..1cc369338a1 100644 --- a/src/renderer/src/web/preload-api/web-github-api.ts +++ b/src/renderer/src/web/preload-api/web-github-api.ts @@ -1,6 +1,7 @@ import { callGitHubTargetOperation } from '@/lib/work-items/github/github-work-item-target-request' import { requireActiveEnvironment } from './web-runtime-session' import { requireGitHubWorkItemTargetDetails } from '../../../../shared/github/work-item-target' +import { shouldAcceptMergedFallbackPR } from '../../../../shared/github/pr-branch-fallback-rule' import type { PreloadApi } from '../../../../preload/api-types' import { GITHUB_MARK_PR_READY_RUNTIME_CAPABILITY, @@ -28,10 +29,7 @@ export function createGitHubApi(): WebGitHubApi { prForBranch: ({ wakeWslDistro: _wake, ...args }) => route>(GITHUB_WEB_RPC_METHODS.prForBranch, args), refreshPRNow: async ({ candidate, reason, userRefresh }) => { - const acceptMergedFallbackPR = - candidate.linkedPRNumber == null && - candidate.fallbackPRNumber != null && - candidate.fallbackPRSource != null + const acceptMergedFallbackPR = shouldAcceptMergedFallbackPR(candidate) const pr = await route>(GITHUB_WEB_RPC_METHODS.prForBranch, { repoPath: candidate.repoPath, repoId: candidate.repoId, diff --git a/src/shared/github/pr-branch-fallback-rule.test.ts b/src/shared/github/pr-branch-fallback-rule.test.ts new file mode 100644 index 00000000000..e9de7d6f1bc --- /dev/null +++ b/src/shared/github/pr-branch-fallback-rule.test.ts @@ -0,0 +1,31 @@ +import { describe, expect, it } from 'vitest' +import { resolvePRBranchFallback, shouldAcceptMergedFallbackPR } from './pr-branch-fallback-rule' + +describe('resolvePRBranchFallback', () => { + it('drops a merged last PR once the head moved past it, without asking the hint', () => { + const fallback = resolvePRBranchFallback({ + linkedPRNumber: null, + cachedPR: { + number: 41, + state: 'merged', + headSha: 'merged-head', + confirmedContainedHeadOid: 'older-head' + }, + hintPRNumber: 7, + currentHeadOid: 'new-head' + }) + expect(fallback).toEqual({ fallbackPRNumber: null, fallbackPRSource: null }) + expect(shouldAcceptMergedFallbackPR({ linkedPRNumber: null, ...fallback })).toBe(false) + }) + + it('falls back to a cached open PR with merged fallbacks accepted', () => { + const fallback = resolvePRBranchFallback({ + linkedPRNumber: null, + cachedPR: { number: 41, state: 'open', headSha: 'old-head' }, + hintPRNumber: 7, + currentHeadOid: 'new-head' + }) + expect(fallback).toEqual({ fallbackPRNumber: 41, fallbackPRSource: 'pr-cache' }) + expect(shouldAcceptMergedFallbackPR({ linkedPRNumber: null, ...fallback })).toBe(true) + }) +}) diff --git a/src/shared/github/pr-branch-fallback-rule.ts b/src/shared/github/pr-branch-fallback-rule.ts new file mode 100644 index 00000000000..3c299532b0d --- /dev/null +++ b/src/shared/github/pr-branch-fallback-rule.ts @@ -0,0 +1,61 @@ +import type { PRInfo } from './pull-request-types' +import type { GitHubPRRefreshCandidate } from './pull-request-refresh-types' + +export type PRBranchFallback = { + fallbackPRNumber: number | null + fallbackPRSource: 'pr-cache' | 'hosted-review' | null +} + +const NO_FALLBACK: PRBranchFallback = { fallbackPRNumber: null, fallbackPRSource: null } + +/** + * The PR number a branch lookup may fall back to when the branch itself finds none: the last PR result, + * else the hosted-review hint, and never for a linked PR. A merged PR is dropped once the head moved past it. + */ +export function resolvePRBranchFallback(args: { + linkedPRNumber: number | null + cachedPR: Pick | null + hintPRNumber: number | null + currentHeadOid: string | null | undefined +}): PRBranchFallback { + const { linkedPRNumber, cachedPR, hintPRNumber, currentHeadOid } = args + if (linkedPRNumber != null) { + return NO_FALLBACK + } + if (cachedPR) { + // An unknown head (a phone before its git status) can't prove the branch moved on. + const mergedPRMovedPastHead = + currentHeadOid != null && + cachedPR.state === 'merged' && + cachedPR.headSha !== currentHeadOid && + cachedPR.confirmedContainedHeadOid !== currentHeadOid + return mergedPRMovedPastHead + ? NO_FALLBACK + : { fallbackPRNumber: cachedPR.number, fallbackPRSource: 'pr-cache' } + } + return hintPRNumber != null + ? { fallbackPRNumber: hintPRNumber, fallbackPRSource: 'hosted-review' } + : NO_FALLBACK +} + +/** Whether `resolvePRBranchFallback` reads the hint: only with no link and no PR result of its own. */ +export function prBranchFallbackNeedsHint(args: { + linkedPRNumber: number | null + cachedPR: unknown +}): boolean { + return args.linkedPRNumber == null && args.cachedPR == null +} + +/** A fallback the caller already trusts may stay visible after it merged. */ +export function shouldAcceptMergedFallbackPR( + candidate: Pick< + GitHubPRRefreshCandidate, + 'linkedPRNumber' | 'fallbackPRNumber' | 'fallbackPRSource' + > +): boolean { + return ( + candidate.linkedPRNumber == null && + candidate.fallbackPRNumber != null && + candidate.fallbackPRSource != null + ) +} From e22bb7c46ce424d082ab336fb5ed7503620c243b Mon Sep 17 00:00:00 2001 From: Kelvin Amoaba <97001695+AmoabaKelvin@users.noreply.github.com> Date: Mon, 9 Nov 2026 13:51:32 +0000 Subject: [PATCH 45/90] feat(mobile): keep Tasks and new-workspace drafts across kills (#40127) * feat(mobile): keep Tasks and new-workspace drafts across kills Task comments (per item and project row), the New issue title and body, and the New workspace note now live in device-store draft rows. They come back after the form closes or the app is killed, and only into an empty field. A comment's setter stays bound to its item, so a send that settles after the user moved on clears the right row. * fix(mobile): rebuild comment sends when the draft's item changes * fix(mobile): key the workspace note by host and keep cleared fields cleared * fix(mobile): clear only the note a finished create sent * fix(mobile): count clearing an empty draft field as the user's choice * perf(mobile): cap field drafts, read sheet drafts on open, retry a failed read once * fix(mobile): retry a failed draft read after a pause and keep New issue text typed during a create * fix(mobile): save draft text again once a failed store read can be retried * fix(mobile): remove a stored draft when an unread field is cleared --- ...mment-github-github.addissuecomment-1.json | 64 +- ...mment-gitlab-gitlab.addissuecomment-1.json | 64 +- ...mment-gitlab-mr-gitlab.addmrcomment-1.json | 64 +- ....item-review-github-github.prchecks-1.json | 68 +- ...ew-github-github.requestprreviewers-1.json | 108 +- ...item-review-github-pr-check-discovery.json | 68 +- ....linear-item-linear.addissuecomment-1.json | 352 ++--- ...inear-team-context-linear.listteams-1.json | 1211 ++++++++--------- ...near-team-context-linear.teamstates-1.json | 1003 +++++++------- ...ithub.project.workitemdetailsbyslug-1.json | 840 ++++++------ .../goldens/tk-item-comment-github.json | 24 +- .../goldens/tk-item-comment-gitlab-mr.json | 24 +- .../goldens/tk-item-comment-gitlab.json | 24 +- .../goldens/tk-item-review-github.json | 28 +- .../goldens/tk-linear-team-context.json | 225 ++- .../goldens/tk-project-row-detail.json | 180 ++- .../src/components/NewWorktreeModal.test.tsx | 73 + mobile/src/components/NewWorktreeModal.tsx | 30 +- mobile/src/drafts/document-edit-draft-rows.ts | 15 +- .../src/drafts/durable-draft-fields.test.tsx | 155 +++ mobile/src/drafts/durable-draft-fields.ts | 148 ++ mobile/src/drafts/durable-draft-rows.ts | 37 +- .../in-memory-device-store.test-support.ts | 27 + .../drafts/use-document-edit-draft.test.tsx | 19 +- .../tasks/github-review-publication.test.tsx | 4 + mobile/src/tasks/task-draft-rows.test.tsx | 99 ++ mobile/src/tasks/task-draft-rows.ts | 35 + .../use-mobile-task-comment-send-outcome.ts | 4 +- ...le-tasks-hosted-comment-review-actions.tsx | 2 +- .../src/tasks/use-mobile-tasks-item-state.tsx | 3 - .../use-mobile-tasks-linear-item-actions.tsx | 2 +- ...e-mobile-tasks-list-and-detail-effects.tsx | 10 +- ...se-mobile-tasks-project-detail-loading.tsx | 4 +- ...asks-project-workspace-comment-actions.tsx | 2 +- .../use-mobile-tasks-route-and-item-state.tsx | 10 +- .../use-mobile-tasks-task-create-actions.tsx | 5 +- ...bile-tasks-workspace-and-project-state.tsx | 7 +- ...ask-item-hosted-metadata-mount-adapters.ts | 15 +- .../rpc-recording/task-action-mount-owners.ts | 30 +- 39 files changed, 2813 insertions(+), 2270 deletions(-) create mode 100644 mobile/src/drafts/durable-draft-fields.test.tsx create mode 100644 mobile/src/drafts/durable-draft-fields.ts create mode 100644 mobile/src/drafts/in-memory-device-store.test-support.ts create mode 100644 mobile/src/tasks/task-draft-rows.test.tsx create mode 100644 mobile/src/tasks/task-draft-rows.ts diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-github-github.addissuecomment-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-github-github.addissuecomment-1.json index 222221a0b91..d2c96c4112f 100644 --- a/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-github-github.addissuecomment-1.json +++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-github-github.addissuecomment-1.json @@ -97,11 +97,6 @@ "targetKey": "repo-1\u0000owner/repo\u0000issue\u00009" } }, - "1fc52836dac4": { - "name": "itemReviewersDraft", - "ordinal": 9, - "value": "octocat" - }, "21d560a20bed": { "name": "error", "ordinal": 14, @@ -300,11 +295,6 @@ "ordinal": 3, "value": "" }, - "56a29701de21": { - "name": "itemCommentDraft", - "ordinal": 8, - "value": "a comment" - }, "5737a7806a0c": { "name": "mutatingStatus", "ordinal": 15, @@ -562,6 +552,11 @@ "targetKey": "repo-1\u0000owner/repo\u0000issue\u00009" } }, + "9331fbfa07e4": { + "name": "itemCommentDraft", + "ordinal": 9, + "value": "a comment" + }, "948fc1352362": { "name": "github.addIssueComment#1", "ordinal": 11, @@ -741,6 +736,11 @@ "targetKey": "repo-1\u0000owner/repo\u0000issue\u00009" } }, + "ac15f5699a77": { + "name": "itemReviewersDraft", + "ordinal": 8, + "value": "octocat" + }, "ae745d4c2372": { "name": "detailPayload", "ordinal": 14, @@ -1394,8 +1394,8 @@ "4031bf455f49", "c43ab05aed16", "1ca30ac68b76", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "ae745d4c2372", @@ -1422,8 +1422,8 @@ "4031bf455f49", "c43ab05aed16", "1ca30ac68b76", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "ffd879a2e2be", @@ -1449,8 +1449,8 @@ "4031bf455f49", "c43ab05aed16", "1ca30ac68b76", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "ffd879a2e2be", @@ -1476,8 +1476,8 @@ "4031bf455f49", "c43ab05aed16", "1ca30ac68b76", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "fa158073af7f", @@ -1504,8 +1504,8 @@ "4031bf455f49", "c43ab05aed16", "1ca30ac68b76", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "21d560a20bed", @@ -1531,8 +1531,8 @@ "4031bf455f49", "c43ab05aed16", "1ca30ac68b76", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "cc399e1bb52f", @@ -1559,8 +1559,8 @@ "4031bf455f49", "c43ab05aed16", "1ca30ac68b76", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "cb543ce964ae", @@ -1586,8 +1586,8 @@ "4031bf455f49", "c43ab05aed16", "1ca30ac68b76", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "ef8932b03a8c", @@ -1613,8 +1613,8 @@ "4031bf455f49", "c43ab05aed16", "1ca30ac68b76", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "36782b753721", @@ -1640,8 +1640,8 @@ "4031bf455f49", "c43ab05aed16", "1ca30ac68b76", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "f65e0af02b52", @@ -1667,8 +1667,8 @@ "4031bf455f49", "c43ab05aed16", "1ca30ac68b76", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "ef8932b03a8c", diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-gitlab-gitlab.addissuecomment-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-gitlab-gitlab.addissuecomment-1.json index b81073c14b1..c5046f71ae8 100644 --- a/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-gitlab-gitlab.addissuecomment-1.json +++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-gitlab-gitlab.addissuecomment-1.json @@ -107,11 +107,6 @@ "provider": "gitlab" } }, - "1fc52836dac4": { - "name": "itemReviewersDraft", - "ordinal": 9, - "value": "octocat" - }, "21d560a20bed": { "name": "error", "ordinal": 14, @@ -313,11 +308,6 @@ "ordinal": 3, "value": "" }, - "56a29701de21": { - "name": "itemCommentDraft", - "ordinal": 8, - "value": "a comment" - }, "5737a7806a0c": { "name": "mutatingStatus", "ordinal": 15, @@ -414,6 +404,11 @@ "provider": "gitlab" } }, + "9331fbfa07e4": { + "name": "itemCommentDraft", + "ordinal": 9, + "value": "a comment" + }, "9932bdaf3500": { "draft": "a comment", "error": "The host sent a reply this app could not read (gitlab.addIssueComment)", @@ -529,6 +524,11 @@ } } }, + "ac15f5699a77": { + "name": "itemReviewersDraft", + "ordinal": 8, + "value": "octocat" + }, "ad33e328b827": { "name": "gitlab.addIssueComment#1", "ordinal": 13, @@ -1020,8 +1020,8 @@ "4031bf455f49", "779d1b9a2edb", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "02b5df9521e8", @@ -1048,8 +1048,8 @@ "4031bf455f49", "779d1b9a2edb", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "d0afe3374825", @@ -1075,8 +1075,8 @@ "4031bf455f49", "779d1b9a2edb", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "d0afe3374825", @@ -1102,8 +1102,8 @@ "4031bf455f49", "779d1b9a2edb", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "8a21f81d9fc4", @@ -1130,8 +1130,8 @@ "4031bf455f49", "779d1b9a2edb", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "21d560a20bed", @@ -1157,8 +1157,8 @@ "4031bf455f49", "779d1b9a2edb", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "d986773c38a9", @@ -1185,8 +1185,8 @@ "4031bf455f49", "779d1b9a2edb", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "cb543ce964ae", @@ -1212,8 +1212,8 @@ "4031bf455f49", "779d1b9a2edb", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "ef8932b03a8c", @@ -1239,8 +1239,8 @@ "4031bf455f49", "779d1b9a2edb", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "36782b753721", @@ -1266,8 +1266,8 @@ "4031bf455f49", "779d1b9a2edb", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "f65e0af02b52", @@ -1293,8 +1293,8 @@ "4031bf455f49", "779d1b9a2edb", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "ef8932b03a8c", diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-gitlab-mr-gitlab.addmrcomment-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-gitlab-mr-gitlab.addmrcomment-1.json index 1e526bae61f..d7ecfd19a58 100644 --- a/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-gitlab-mr-gitlab.addmrcomment-1.json +++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-comment-gitlab-mr-gitlab.addmrcomment-1.json @@ -51,11 +51,6 @@ "provider": "gitlab" } }, - "1fc52836dac4": { - "name": "itemReviewersDraft", - "ordinal": 9, - "value": "octocat" - }, "21d560a20bed": { "name": "error", "ordinal": 14, @@ -146,11 +141,6 @@ "ordinal": 3, "value": "" }, - "56a29701de21": { - "name": "itemCommentDraft", - "ordinal": 8, - "value": "a comment" - }, "5737a7806a0c": { "name": "mutatingStatus", "ordinal": 15, @@ -406,6 +396,11 @@ } } }, + "9331fbfa07e4": { + "name": "itemCommentDraft", + "ordinal": 9, + "value": "a comment" + }, "965bf7fe4cd8": { "draft": "a comment", "error": "Unknown method", @@ -523,6 +518,11 @@ } } }, + "ac15f5699a77": { + "name": "itemReviewersDraft", + "ordinal": 8, + "value": "octocat" + }, "b6c88ff35429": { "draft": "a comment", "error": "inner refused", @@ -1020,8 +1020,8 @@ "4031bf455f49", "622bbddf4f05", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "f3cb1a7df6dc", @@ -1048,8 +1048,8 @@ "4031bf455f49", "622bbddf4f05", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "1e866e52fed3", @@ -1075,8 +1075,8 @@ "4031bf455f49", "622bbddf4f05", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "1e866e52fed3", @@ -1102,8 +1102,8 @@ "4031bf455f49", "622bbddf4f05", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "8a21f81d9fc4", @@ -1130,8 +1130,8 @@ "4031bf455f49", "622bbddf4f05", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "21d560a20bed", @@ -1157,8 +1157,8 @@ "4031bf455f49", "622bbddf4f05", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "de7b906df67a", @@ -1185,8 +1185,8 @@ "4031bf455f49", "622bbddf4f05", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "cb543ce964ae", @@ -1212,8 +1212,8 @@ "4031bf455f49", "622bbddf4f05", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "ef8932b03a8c", @@ -1239,8 +1239,8 @@ "4031bf455f49", "622bbddf4f05", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "36782b753721", @@ -1266,8 +1266,8 @@ "4031bf455f49", "622bbddf4f05", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "f65e0af02b52", @@ -1293,8 +1293,8 @@ "4031bf455f49", "622bbddf4f05", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "ef8932b03a8c", diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-review-github-github.prchecks-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-review-github-github.prchecks-1.json index 4eed3994ef1..5528b3ed142 100644 --- a/mobile/rpc-foundation/goldens/matrix-tasks.item-review-github-github.prchecks-1.json +++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-review-github-github.prchecks-1.json @@ -276,11 +276,6 @@ "title": "A pull request" } }, - "1fc52836dac4": { - "name": "itemReviewersDraft", - "ordinal": 9, - "value": "octocat" - }, "22b1e4293201": { "name": "mutatingStatus", "ordinal": 28, @@ -628,11 +623,6 @@ "ordinal": 3, "value": "" }, - "56a29701de21": { - "name": "itemCommentDraft", - "ordinal": 8, - "value": "a comment" - }, "593c53b594c5": { "draft": "a comment", "error": "", @@ -1138,6 +1128,11 @@ "ordinal": 12, "value": true }, + "9331fbfa07e4": { + "name": "itemCommentDraft", + "ordinal": 9, + "value": "a comment" + }, "94caa29bceef": { "name": "error", "ordinal": 19, @@ -1153,6 +1148,11 @@ "ordinal": 25, "value": "The host sent a reply this app could not read (github.prChecks)" }, + "ac15f5699a77": { + "name": "itemReviewersDraft", + "ordinal": 8, + "value": "octocat" + }, "acff45feb249": { "name": "mutatingStatus", "ordinal": 26, @@ -1663,8 +1663,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -1694,8 +1694,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -1731,8 +1731,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -1766,8 +1766,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -1801,8 +1801,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -1836,8 +1836,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -1871,8 +1871,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -1906,8 +1906,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -1941,8 +1941,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -1976,8 +1976,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -2011,8 +2011,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -2046,8 +2046,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-review-github-github.requestprreviewers-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-review-github-github.requestprreviewers-1.json index 7e5912c4c24..a1e16784ad0 100644 --- a/mobile/rpc-foundation/goldens/matrix-tasks.item-review-github-github.requestprreviewers-1.json +++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-review-github-github.requestprreviewers-1.json @@ -268,11 +268,6 @@ "title": "A pull request" } }, - "1fc52836dac4": { - "name": "itemReviewersDraft", - "ordinal": 9, - "value": "octocat" - }, "21d560a20bed": { "name": "error", "ordinal": 14, @@ -580,11 +575,6 @@ "ordinal": 3, "value": "" }, - "56a29701de21": { - "name": "itemCommentDraft", - "ordinal": 8, - "value": "a comment" - }, "5737a7806a0c": { "name": "mutatingStatus", "ordinal": 15, @@ -1288,6 +1278,11 @@ } } }, + "9331fbfa07e4": { + "name": "itemCommentDraft", + "ordinal": 9, + "value": "a comment" + }, "949da9fa9fb2": { "name": "github.requestPRReviewers#1", "ordinal": 11, @@ -1632,6 +1627,11 @@ "targetKey": "repo-1\u0000owner/repo\u0000pr\u000012" } }, + "ac15f5699a77": { + "name": "itemReviewersDraft", + "ordinal": 8, + "value": "octocat" + }, "acff45feb249": { "name": "mutatingStatus", "ordinal": 26, @@ -2384,8 +2384,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -2415,8 +2415,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -2451,8 +2451,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "407af7575a68", @@ -2479,8 +2479,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "407af7575a68", @@ -2512,8 +2512,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "407af7575a68", @@ -2540,8 +2540,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "407af7575a68", @@ -2573,8 +2573,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -2604,8 +2604,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -2640,8 +2640,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "21d560a20bed", @@ -2668,8 +2668,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "21d560a20bed", @@ -2701,8 +2701,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "124bef35e9e5", @@ -2730,8 +2730,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "124bef35e9e5", @@ -2764,8 +2764,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "cb543ce964ae", @@ -2792,8 +2792,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "cb543ce964ae", @@ -2825,8 +2825,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "ef8932b03a8c", @@ -2853,8 +2853,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "ef8932b03a8c", @@ -2886,8 +2886,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "36782b753721", @@ -2914,8 +2914,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "36782b753721", @@ -2947,8 +2947,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "f65e0af02b52", @@ -2975,8 +2975,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "f65e0af02b52", @@ -3008,8 +3008,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "ef8932b03a8c", @@ -3036,8 +3036,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "ef8932b03a8c", diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.item-review-github-pr-check-discovery.json b/mobile/rpc-foundation/goldens/matrix-tasks.item-review-github-pr-check-discovery.json index bc5453d504b..c4b1edf7823 100644 --- a/mobile/rpc-foundation/goldens/matrix-tasks.item-review-github-pr-check-discovery.json +++ b/mobile/rpc-foundation/goldens/matrix-tasks.item-review-github-pr-check-discovery.json @@ -244,11 +244,6 @@ } } }, - "1fc52836dac4": { - "name": "itemReviewersDraft", - "ordinal": 9, - "value": "octocat" - }, "22b1e4293201": { "name": "mutatingStatus", "ordinal": 28, @@ -454,11 +449,6 @@ "ordinal": 3, "value": "" }, - "56a29701de21": { - "name": "itemCommentDraft", - "ordinal": 8, - "value": "a comment" - }, "593c53b594c5": { "draft": "a comment", "error": "", @@ -798,6 +788,11 @@ "ordinal": 12, "value": true }, + "9331fbfa07e4": { + "name": "itemCommentDraft", + "ordinal": 9, + "value": "a comment" + }, "94caa29bceef": { "name": "error", "ordinal": 19, @@ -841,6 +836,11 @@ "ordinal": 18, "value": false }, + "ac15f5699a77": { + "name": "itemReviewersDraft", + "ordinal": 8, + "value": "octocat" + }, "ace73bafef56": { "name": "status.get#1", "ordinal": 20, @@ -1187,8 +1187,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -1218,8 +1218,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -1255,8 +1255,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -1292,8 +1292,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -1329,8 +1329,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -1366,8 +1366,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -1403,8 +1403,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -1440,8 +1440,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -1477,8 +1477,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -1514,8 +1514,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -1551,8 +1551,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -1588,8 +1588,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.linear-item-linear.addissuecomment-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.linear-item-linear.addissuecomment-1.json index efebc9b7b8a..86cc6641a63 100644 --- a/mobile/rpc-foundation/goldens/matrix-tasks.linear-item-linear.addissuecomment-1.json +++ b/mobile/rpc-foundation/goldens/matrix-tasks.linear-item-linear.addissuecomment-1.json @@ -383,39 +383,20 @@ "provider": "linear" } }, + "22b1e4293201": { + "name": "mutatingStatus", + "ordinal": 28, + "value": false + }, "29cadc65bcbb": { "name": "error", "ordinal": 15, "value": "" }, - "2ea9c99d4796": { - "name": "detailPayload", - "ordinal": 25, - "value": { - "assignee": { - "$rpc": "undefined" - }, - "children": [ - { - "id": "issue-3", - "identifier": "ENG-3", - "title": "A sub-issue", - "url": "" - } - ], - "comments": [], - "description": "description", - "labels": [], - "project": { - "$rpc": "null" - }, - "provider": "linear" - } - }, - "31dce0186d15": { - "name": "mutatingStatus", + "29ed7524dd3c": { + "name": "error", "ordinal": 22, - "value": true + "value": "" }, "335cdd96334f": { "error": "", @@ -588,11 +569,6 @@ "provider": "linear" } }, - "3f80db506009": { - "name": "linearSubIssueTitle", - "ordinal": 24, - "value": "" - }, "3fcdcfa261ee": { "name": "mutatingStatus", "ordinal": 23, @@ -645,11 +621,6 @@ "provider": "linear" } }, - "427b7993fe85": { - "name": "error", - "ordinal": 20, - "value": "" - }, "44efd00fa69f": { "name": "linearCommentDraft", "ordinal": 7, @@ -798,6 +769,11 @@ } } }, + "5348c8d60b38": { + "name": "linearCommentDraft", + "ordinal": 20, + "value": "" + }, "57207b51913e": { "name": "error", "ordinal": 12, @@ -876,49 +852,10 @@ "provider": "linear" } }, - "65b434738c91": { - "name": "linear.createIssue#1", - "ordinal": 21, - "args": [ - { - "name": "method", - "value": "linear.createIssue" - }, - { - "name": "params", - "value": { - "parentIssueId": "issue-1", - "projectId": { - "$rpc": "null" - }, - "teamId": "team-1", - "title": "A sub-issue", - "workspaceId": "linear-workspace" - } - }, - { - "name": "options", - "value": { - "timeoutMs": 30000 - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-3", - "ok": true, - "result": { - "id": "issue-3", - "identifier": "ENG-3", - "ok": true, - "title": "A sub-issue", - "url": "" - } - } - } + "68003f9dae22": { + "name": "mutatingStatus", + "ordinal": 24, + "value": true }, "760659bea59b": { "name": "linear.addIssueComment#1", @@ -1074,11 +1011,6 @@ "ordinal": 12, "value": "outer refused" }, - "8167ff6bda4e": { - "name": "linear.createIssue#1", - "ordinal": 23, - "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"linear.createIssue\",\"params\":{\"teamId\":\"team-1\",\"title\":\"A sub-issue\",\"workspaceId\":\"linear-workspace\",\"parentIssueId\":\"issue-1\",\"projectId\":null}}" - }, "8427fd4151f1": { "name": "mutatingStatus", "ordinal": 14, @@ -1227,6 +1159,11 @@ "ordinal": 12, "value": "inner refused" }, + "9911a44bcc07": { + "name": "linearCommentDraft", + "ordinal": 21, + "value": "" + }, "99b079cb804c": { "name": "linear.addIssueComment#1", "ordinal": 9, @@ -1317,16 +1254,35 @@ } } }, + "9c6909125d76": { + "name": "detailPayload", + "ordinal": 27, + "value": { + "assignee": { + "$rpc": "undefined" + }, + "children": [ + { + "id": "issue-3", + "identifier": "ENG-3", + "title": "A sub-issue", + "url": "" + } + ], + "comments": [], + "description": "description", + "labels": [], + "project": { + "$rpc": "null" + }, + "provider": "linear" + } + }, "9dc1f136772e": { "name": "linearCommentDraft", "ordinal": 4, "value": "" }, - "acff45feb249": { - "name": "mutatingStatus", - "ordinal": 26, - "value": false - }, "b1f0308d3795": { "name": "actionItem", "ordinal": 5, @@ -1366,6 +1322,11 @@ "ordinal": 13, "value": "Failed to add comment" }, + "b2da94d284a1": { + "name": "linearSubIssueTitle", + "ordinal": 26, + "value": "" + }, "b71922b936d3": { "name": "linear.addIssueComment#1", "ordinal": 9, @@ -1516,6 +1477,50 @@ "updatedAt": "2020-01-01T00:00:00.000Z" } }, + "c4bd3e068c64": { + "name": "linear.createIssue#1", + "ordinal": 23, + "args": [ + { + "name": "method", + "value": "linear.createIssue" + }, + { + "name": "params", + "value": { + "parentIssueId": "issue-1", + "projectId": { + "$rpc": "null" + }, + "teamId": "team-1", + "title": "A sub-issue", + "workspaceId": "linear-workspace" + } + }, + { + "name": "options", + "value": { + "timeoutMs": 30000 + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-3", + "ok": true, + "result": { + "id": "issue-3", + "identifier": "ENG-3", + "ok": true, + "title": "A sub-issue", + "url": "" + } + } + } + }, "c99df17a93d5": { "name": "linear.addIssueComment#1", "ordinal": 9, @@ -1728,6 +1733,11 @@ "ordinal": 13, "value": false }, + "e72b7c40f270": { + "name": "linear.createIssue#1", + "ordinal": 25, + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"linear.createIssue\",\"params\":{\"teamId\":\"team-1\",\"title\":\"A sub-issue\",\"workspaceId\":\"linear-workspace\",\"parentIssueId\":\"issue-1\",\"projectId\":null}}" + }, "eb79a9b3682a": { "status": "fulfilled", "startedAt": 0, @@ -2014,15 +2024,16 @@ "ef8932b03a8c", "8ebaf0949b6d", "c39516152855", - "bbf2458754b4" + "bbf2458754b4", + "5348c8d60b38" ] } }, { "id": "tk-linear-item.result-absent:sub-issue-create-settled", "observation": { - "sender": ["b71922b936d3", "1fa11661cd73", "65b434738c91"], - "payloads": ["760659bea59b", "da485104c1ac", "8167ff6bda4e"], + "sender": ["b71922b936d3", "1fa11661cd73", "039c2b59e061"], + "payloads": ["760659bea59b", "da485104c1ac", "88dbfd66d809"], "settlements": { "mount": "eb79a9b3682a", "comment-0": "eb79a9b3682a", @@ -2046,11 +2057,12 @@ "8ebaf0949b6d", "c39516152855", "bbf2458754b4", - "427b7993fe85", - "31dce0186d15", - "3f80db506009", - "2ea9c99d4796", - "acff45feb249" + "5348c8d60b38", + "029bb83f402f", + "3fcdcfa261ee", + "7b614cf87045", + "1b7a093f724f", + "fa2f2de4dfe7" ] } }, @@ -2105,15 +2117,16 @@ "ef8932b03a8c", "8ebaf0949b6d", "c39516152855", - "bbf2458754b4" + "bbf2458754b4", + "5348c8d60b38" ] } }, { "id": "tk-linear-item.result-null:sub-issue-create-settled", "observation": { - "sender": ["99b079cb804c", "1fa11661cd73", "65b434738c91"], - "payloads": ["760659bea59b", "da485104c1ac", "8167ff6bda4e"], + "sender": ["99b079cb804c", "1fa11661cd73", "039c2b59e061"], + "payloads": ["760659bea59b", "da485104c1ac", "88dbfd66d809"], "settlements": { "mount": "eb79a9b3682a", "comment-0": "eb79a9b3682a", @@ -2137,11 +2150,12 @@ "8ebaf0949b6d", "c39516152855", "bbf2458754b4", - "427b7993fe85", - "31dce0186d15", - "3f80db506009", - "2ea9c99d4796", - "acff45feb249" + "5348c8d60b38", + "029bb83f402f", + "3fcdcfa261ee", + "7b614cf87045", + "1b7a093f724f", + "fa2f2de4dfe7" ] } }, @@ -2290,15 +2304,16 @@ "ef8932b03a8c", "8ebaf0949b6d", "c39516152855", - "bbf2458754b4" + "bbf2458754b4", + "5348c8d60b38" ] } }, { "id": "tk-linear-item.inner-false-string-error:sub-issue-create-settled", "observation": { - "sender": ["8f6bc911a494", "1fa11661cd73", "65b434738c91"], - "payloads": ["760659bea59b", "da485104c1ac", "8167ff6bda4e"], + "sender": ["8f6bc911a494", "1fa11661cd73", "039c2b59e061"], + "payloads": ["760659bea59b", "da485104c1ac", "88dbfd66d809"], "settlements": { "mount": "eb79a9b3682a", "comment-0": "eb79a9b3682a", @@ -2322,11 +2337,12 @@ "8ebaf0949b6d", "c39516152855", "bbf2458754b4", - "427b7993fe85", - "31dce0186d15", - "3f80db506009", - "2ea9c99d4796", - "acff45feb249" + "5348c8d60b38", + "029bb83f402f", + "3fcdcfa261ee", + "7b614cf87045", + "1b7a093f724f", + "fa2f2de4dfe7" ] } }, @@ -2383,15 +2399,16 @@ "29cadc65bcbb", "4dd9211bea32", "3b3ee1b48010", - "3accbb2a4fcb" + "3accbb2a4fcb", + "9911a44bcc07" ] } }, { "id": "tk-linear-item.inner-false-object-error:sub-issue-create-settled", "observation": { - "sender": ["8786f555ebcb", "9c2ca99506b2", "039c2b59e061"], - "payloads": ["760659bea59b", "8e34e506a7f8", "88dbfd66d809"], + "sender": ["8786f555ebcb", "9c2ca99506b2", "c4bd3e068c64"], + "payloads": ["760659bea59b", "8e34e506a7f8", "e72b7c40f270"], "settlements": { "mount": "eb79a9b3682a", "comment-0": "eb79a9b3682a", @@ -2416,11 +2433,12 @@ "4dd9211bea32", "3b3ee1b48010", "3accbb2a4fcb", - "029bb83f402f", - "3fcdcfa261ee", - "7b614cf87045", - "1b7a093f724f", - "fa2f2de4dfe7" + "9911a44bcc07", + "29ed7524dd3c", + "68003f9dae22", + "b2da94d284a1", + "9c6909125d76", + "22b1e4293201" ] } }, @@ -2475,15 +2493,16 @@ "ef8932b03a8c", "8ebaf0949b6d", "c39516152855", - "bbf2458754b4" + "bbf2458754b4", + "5348c8d60b38" ] } }, { "id": "tk-linear-item.outer-refused:sub-issue-create-settled", "observation": { - "sender": ["d970b2195d6d", "1fa11661cd73", "65b434738c91"], - "payloads": ["760659bea59b", "da485104c1ac", "8167ff6bda4e"], + "sender": ["d970b2195d6d", "1fa11661cd73", "039c2b59e061"], + "payloads": ["760659bea59b", "da485104c1ac", "88dbfd66d809"], "settlements": { "mount": "eb79a9b3682a", "comment-0": "eb79a9b3682a", @@ -2507,11 +2526,12 @@ "8ebaf0949b6d", "c39516152855", "bbf2458754b4", - "427b7993fe85", - "31dce0186d15", - "3f80db506009", - "2ea9c99d4796", - "acff45feb249" + "5348c8d60b38", + "029bb83f402f", + "3fcdcfa261ee", + "7b614cf87045", + "1b7a093f724f", + "fa2f2de4dfe7" ] } }, @@ -2566,15 +2586,16 @@ "ef8932b03a8c", "8ebaf0949b6d", "c39516152855", - "bbf2458754b4" + "bbf2458754b4", + "5348c8d60b38" ] } }, { "id": "tk-linear-item.outer-refused-no-message:sub-issue-create-settled", "observation": { - "sender": ["167c8724b16b", "1fa11661cd73", "65b434738c91"], - "payloads": ["760659bea59b", "da485104c1ac", "8167ff6bda4e"], + "sender": ["167c8724b16b", "1fa11661cd73", "039c2b59e061"], + "payloads": ["760659bea59b", "da485104c1ac", "88dbfd66d809"], "settlements": { "mount": "eb79a9b3682a", "comment-0": "eb79a9b3682a", @@ -2598,11 +2619,12 @@ "8ebaf0949b6d", "c39516152855", "bbf2458754b4", - "427b7993fe85", - "31dce0186d15", - "3f80db506009", - "2ea9c99d4796", - "acff45feb249" + "5348c8d60b38", + "029bb83f402f", + "3fcdcfa261ee", + "7b614cf87045", + "1b7a093f724f", + "fa2f2de4dfe7" ] } }, @@ -2657,15 +2679,16 @@ "ef8932b03a8c", "8ebaf0949b6d", "c39516152855", - "bbf2458754b4" + "bbf2458754b4", + "5348c8d60b38" ] } }, { "id": "tk-linear-item.method-not-found:sub-issue-create-settled", "observation": { - "sender": ["5037193eac5c", "1fa11661cd73", "65b434738c91"], - "payloads": ["760659bea59b", "da485104c1ac", "8167ff6bda4e"], + "sender": ["5037193eac5c", "1fa11661cd73", "039c2b59e061"], + "payloads": ["760659bea59b", "da485104c1ac", "88dbfd66d809"], "settlements": { "mount": "eb79a9b3682a", "comment-0": "eb79a9b3682a", @@ -2689,11 +2712,12 @@ "8ebaf0949b6d", "c39516152855", "bbf2458754b4", - "427b7993fe85", - "31dce0186d15", - "3f80db506009", - "2ea9c99d4796", - "acff45feb249" + "5348c8d60b38", + "029bb83f402f", + "3fcdcfa261ee", + "7b614cf87045", + "1b7a093f724f", + "fa2f2de4dfe7" ] } }, @@ -2748,15 +2772,16 @@ "ef8932b03a8c", "8ebaf0949b6d", "c39516152855", - "bbf2458754b4" + "bbf2458754b4", + "5348c8d60b38" ] } }, { "id": "tk-linear-item.transport-rejection:sub-issue-create-settled", "observation": { - "sender": ["cad9f764ce58", "1fa11661cd73", "65b434738c91"], - "payloads": ["760659bea59b", "da485104c1ac", "8167ff6bda4e"], + "sender": ["cad9f764ce58", "1fa11661cd73", "039c2b59e061"], + "payloads": ["760659bea59b", "da485104c1ac", "88dbfd66d809"], "settlements": { "mount": "eb79a9b3682a", "comment-0": "eb79a9b3682a", @@ -2780,11 +2805,12 @@ "8ebaf0949b6d", "c39516152855", "bbf2458754b4", - "427b7993fe85", - "31dce0186d15", - "3f80db506009", - "2ea9c99d4796", - "acff45feb249" + "5348c8d60b38", + "029bb83f402f", + "3fcdcfa261ee", + "7b614cf87045", + "1b7a093f724f", + "fa2f2de4dfe7" ] } }, @@ -2839,15 +2865,16 @@ "ef8932b03a8c", "8ebaf0949b6d", "c39516152855", - "bbf2458754b4" + "bbf2458754b4", + "5348c8d60b38" ] } }, { "id": "tk-linear-item.transport-rejection-no-message:sub-issue-create-settled", "observation": { - "sender": ["0534215ae768", "1fa11661cd73", "65b434738c91"], - "payloads": ["760659bea59b", "da485104c1ac", "8167ff6bda4e"], + "sender": ["0534215ae768", "1fa11661cd73", "039c2b59e061"], + "payloads": ["760659bea59b", "da485104c1ac", "88dbfd66d809"], "settlements": { "mount": "eb79a9b3682a", "comment-0": "eb79a9b3682a", @@ -2871,11 +2898,12 @@ "8ebaf0949b6d", "c39516152855", "bbf2458754b4", - "427b7993fe85", - "31dce0186d15", - "3f80db506009", - "2ea9c99d4796", - "acff45feb249" + "5348c8d60b38", + "029bb83f402f", + "3fcdcfa261ee", + "7b614cf87045", + "1b7a093f724f", + "fa2f2de4dfe7" ] } } diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.linear-team-context-linear.listteams-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.linear-team-context-linear.listteams-1.json index bfa6195e8f5..2660b5ebccb 100644 --- a/mobile/rpc-foundation/goldens/matrix-tasks.linear-team-context-linear.listteams-1.json +++ b/mobile/rpc-foundation/goldens/matrix-tasks.linear-team-context-linear.listteams-1.json @@ -4,93 +4,14 @@ "family": "tasks.linear-team-context", "namedDeltas": [], "values": { - "0086e1c04b47": { + "031c50459130": { + "name": "createTeamId", + "ordinal": 10, + "value": "team-1" + }, + "0393503430d4": { "name": "linear.listTeams#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "linear.listTeams" - }, - { - "name": "params", - "value": { - "$rpc": "absent" - } - }, - { - "name": "options", - "value": { - "$rpc": "absent" - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-1", - "ok": true - } - } - }, - "10b6d9eca9a8": { - "name": "linear.listTeams#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "linear.listTeams" - }, - { - "name": "params", - "value": { - "$rpc": "absent" - } - }, - { - "name": "options", - "value": { - "$rpc": "absent" - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "error": { - "code": "method_not_found", - "message": "Unknown method" - }, - "id": "frame-1", - "ok": false - } - } - }, - "1288b8513745": { - "name": "linearStatesError", - "ordinal": 13, - "value": "" - }, - "2afc4b1311c1": { - "createTeamId": "team-1", - "states": [], - "statesLoading": false, - "teams": [ - { - "id": "team-1", - "key": "ENG", - "name": "Engineering", - "workspaceId": "linear-workspace" - } - ] - }, - "2b0fea7d064e": { - "name": "linear.listTeams#1", - "ordinal": 8, + "ordinal": 7, "args": [ { "name": "method", @@ -125,63 +46,50 @@ } } }, - "33218d06f656": { - "name": "linearStates", - "ordinal": 6, - "value": [] - }, - "356f2cb9a0df": { - "name": "linearStatesLoading", - "ordinal": 17, - "value": false - }, - "3abc893d377b": { - "name": "mutatingStatus", - "ordinal": 3, - "value": false - }, - "475ec9a66266": { - "name": "linearTeams", + "17249df8377f": { + "name": "createTeamId", "ordinal": 10, - "value": [ - { - "id": "team-1", - "key": "ENG", - "name": "Engineering", - "workspaceId": "linear-workspace" - } - ] + "value": { + "$rpc": "null" + } }, - "5711e2717b76": { - "name": "linearStates", - "ordinal": 16, - "value": [ - { - "color": "#000000", - "id": "state-1", - "name": "Todo", - "type": "unstarted" - } - ] - }, - "5e7b9a1d95b3": { - "name": "linearTeams", - "ordinal": 10, - "value": [] - }, - "60a0395d07c7": { - "name": "linearStatesLoading", - "ordinal": 12, - "value": true - }, - "610f6c28e7a1": { - "name": "linearSubIssueTitle", - "ordinal": 5, - "value": "" - }, - "6568a8d15463": { + "1ec7cb477142": { "name": "linear.listTeams#1", - "ordinal": 8, + "ordinal": 7, + "args": [ + { + "name": "method", + "value": "linear.listTeams" + }, + { + "name": "params", + "value": { + "$rpc": "absent" + } + }, + { + "name": "options", + "value": { + "$rpc": "absent" + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-1", + "ok": true, + "result": { + "$rpc": "null" + } + } + } + }, + "295be39dd439": { + "name": "linear.listTeams#1", + "ordinal": 7, "args": [ { "name": "method", @@ -207,24 +115,29 @@ "value": { "error": { "code": "refused", - "message": "" + "message": "outer refused" }, "id": "frame-1", "ok": false } } }, - "74ca99e85dba": { - "createTeamId": { - "$rpc": "null" - }, + "2afc4b1311c1": { + "createTeamId": "team-1", "states": [], "statesLoading": false, - "teams": [] + "teams": [ + { + "id": "team-1", + "key": "ENG", + "name": "Engineering", + "workspaceId": "linear-workspace" + } + ] }, - "8ff86f3a6d6e": { + "3008cf7db0e8": { "name": "linear.listTeams#1", - "ordinal": 8, + "ordinal": 7, "args": [ { "name": "method", @@ -257,14 +170,320 @@ } } }, - "9131972798ca": { - "name": "linear.teamStates#1", - "ordinal": 15, - "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"linear.teamStates\",\"params\":{\"teamId\":\"team-1\",\"workspaceId\":\"linear-workspace\"}}" + "38ed617d559f": { + "name": "linearTeams", + "ordinal": 9, + "value": [ + { + "id": "team-1", + "key": "ENG", + "name": "Engineering", + "workspaceId": "linear-workspace" + } + ] }, - "95b075d66243": { + "3abc893d377b": { + "name": "mutatingStatus", + "ordinal": 3, + "value": false + }, + "4fcc46dfeb77": { + "name": "linear.listTeams#1", + "ordinal": 8, + "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"linear.listTeams\"}" + }, + "5dcdc7fd7492": { + "name": "linearSubIssueTitle", + "ordinal": 4, + "value": "" + }, + "6e2cda0e22c3": { + "name": "linear.listTeams#1", + "ordinal": 7, + "args": [ + { + "name": "method", + "value": "linear.listTeams" + }, + { + "name": "params", + "value": { + "$rpc": "absent" + } + }, + { + "name": "options", + "value": { + "$rpc": "absent" + } + } + ], + "settlement": { + "status": "rejected", + "startedAt": 0, + "settledAt": 0, + "error": { + "category": "Error", + "message": "transport failure", + "isRpcDeliveryUnknown": true + } + } + }, + "74335ecb4cd2": { + "name": "linearStatesLoading", + "ordinal": 16, + "value": false + }, + "74505ce2789a": { + "name": "linearStates", + "ordinal": 5, + "value": [] + }, + "74ca99e85dba": { + "createTeamId": { + "$rpc": "null" + }, + "states": [], + "statesLoading": false, + "teams": [] + }, + "77a7eff4a3cc": { + "name": "linearStatesLoading", + "ordinal": 11, + "value": true + }, + "7a1d9604491f": { + "name": "linear.listTeams#1", + "ordinal": 7, + "args": [ + { + "name": "method", + "value": "linear.listTeams" + }, + { + "name": "params", + "value": { + "$rpc": "absent" + } + }, + { + "name": "options", + "value": { + "$rpc": "absent" + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-1", + "ok": true, + "result": { + "error": "refused" + } + } + } + }, + "82b36eab5101": { + "name": "creatingTask", + "ordinal": 6, + "value": false + }, + "8640fb2add9b": { + "name": "linearTeams", + "ordinal": 9, + "value": [] + }, + "a14f6c361136": { + "name": "linearStates", + "ordinal": 15, + "value": [ + { + "color": "#000000", + "id": "state-1", + "name": "Todo", + "type": "unstarted" + } + ] + }, + "b57d92c5b837": { + "name": "linear.listTeams#1", + "ordinal": 7, + "args": [ + { + "name": "method", + "value": "linear.listTeams" + }, + { + "name": "params", + "value": { + "$rpc": "absent" + } + }, + { + "name": "options", + "value": { + "$rpc": "absent" + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "error": { + "code": "refused", + "message": "" + }, + "id": "frame-1", + "ok": false + } + } + }, + "b5ba6f00c4fb": { "name": "linear.teamStates#1", "ordinal": 14, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"linear.teamStates\",\"params\":{\"teamId\":\"team-1\",\"workspaceId\":\"linear-workspace\"}}" + }, + "b6a3835a95e0": { + "name": "linear.listTeams#1", + "ordinal": 7, + "args": [ + { + "name": "method", + "value": "linear.listTeams" + }, + { + "name": "params", + "value": { + "$rpc": "absent" + } + }, + { + "name": "options", + "value": { + "$rpc": "absent" + } + } + ], + "settlement": { + "status": "rejected", + "startedAt": 0, + "settledAt": 0, + "error": { + "category": "Error", + "message": "", + "isRpcDeliveryUnknown": true + } + } + }, + "b6bf81e9e237": { + "createTeamId": "team-1", + "states": [ + { + "color": "#000000", + "id": "state-1", + "name": "Todo", + "type": "unstarted" + } + ], + "statesLoading": false, + "teams": [ + { + "id": "team-1", + "key": "ENG", + "name": "Engineering", + "workspaceId": "linear-workspace" + } + ] + }, + "bb26ae00041e": { + "createTeamId": { + "$rpc": "null" + }, + "states": [ + { + "color": "#000000", + "id": "state-1", + "name": "Todo", + "type": "unstarted" + } + ], + "statesLoading": false, + "teams": [] + }, + "c3709cdbfa6b": { + "name": "linear.listTeams#1", + "ordinal": 7, + "args": [ + { + "name": "method", + "value": "linear.listTeams" + }, + { + "name": "params", + "value": { + "$rpc": "absent" + } + }, + { + "name": "options", + "value": { + "$rpc": "absent" + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-1", + "ok": true + } + } + }, + "c74dd55429c8": { + "name": "linear.listTeams#1", + "ordinal": 7, + "args": [ + { + "name": "method", + "value": "linear.listTeams" + }, + { + "name": "params", + "value": { + "$rpc": "absent" + } + }, + { + "name": "options", + "value": { + "$rpc": "absent" + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "error": { + "code": "method_not_found", + "message": "Unknown method" + }, + "id": "frame-1", + "ok": false + } + } + }, + "c88d134e7a42": { + "name": "linear.teamStates#1", + "ordinal": 13, "args": [ { "name": "method", @@ -302,157 +521,6 @@ } } }, - "9dc1f136772e": { - "name": "linearCommentDraft", - "ordinal": 4, - "value": "" - }, - "ab4350eb906f": { - "name": "linear.listTeams#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "linear.listTeams" - }, - { - "name": "params", - "value": { - "$rpc": "absent" - } - }, - { - "name": "options", - "value": { - "$rpc": "absent" - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-1", - "ok": true, - "result": { - "error": "refused" - } - } - } - }, - "ab739ce318cf": { - "name": "linear.listTeams#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "linear.listTeams" - }, - { - "name": "params", - "value": { - "$rpc": "absent" - } - }, - { - "name": "options", - "value": { - "$rpc": "absent" - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "error": { - "code": "refused", - "message": "outer refused" - }, - "id": "frame-1", - "ok": false - } - } - }, - "b164dfd464b3": { - "name": "linear.listTeams#1", - "ordinal": 9, - "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"linear.listTeams\"}" - }, - "b1adae647a3f": { - "name": "createTeamId", - "ordinal": 11, - "value": "team-1" - }, - "b6bf81e9e237": { - "createTeamId": "team-1", - "states": [ - { - "color": "#000000", - "id": "state-1", - "name": "Todo", - "type": "unstarted" - } - ], - "statesLoading": false, - "teams": [ - { - "id": "team-1", - "key": "ENG", - "name": "Engineering", - "workspaceId": "linear-workspace" - } - ] - }, - "bb26ae00041e": { - "createTeamId": { - "$rpc": "null" - }, - "states": [ - { - "color": "#000000", - "id": "state-1", - "name": "Todo", - "type": "unstarted" - } - ], - "statesLoading": false, - "teams": [] - }, - "c6fcb742b15b": { - "name": "linear.listTeams#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "linear.listTeams" - }, - { - "name": "params", - "value": { - "$rpc": "absent" - } - }, - { - "name": "options", - "value": { - "$rpc": "absent" - } - } - ], - "settlement": { - "status": "rejected", - "startedAt": 0, - "settledAt": 0, - "error": { - "category": "Error", - "message": "transport failure", - "isRpcDeliveryUnknown": true - } - } - }, "cc2ece9478f0": { "name": "actionItem", "ordinal": 1, @@ -460,9 +528,29 @@ "$rpc": "null" } }, - "ceb71a750e06": { + "db66582f88a9": { + "name": "linearStatesError", + "ordinal": 12, + "value": "" + }, + "eb79a9b3682a": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "$rpc": "undefined" + } + }, + "eda130337c99": { + "name": "detailPayload", + "ordinal": 2, + "value": { + "$rpc": "null" + } + }, + "ee01f277ffc4": { "name": "linear.listTeams#1", - "ordinal": 8, + "ordinal": 7, "args": [ { "name": "method", @@ -498,99 +586,6 @@ ] } } - }, - "d837ce2317b7": { - "name": "linear.listTeams#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "linear.listTeams" - }, - { - "name": "params", - "value": { - "$rpc": "absent" - } - }, - { - "name": "options", - "value": { - "$rpc": "absent" - } - } - ], - "settlement": { - "status": "rejected", - "startedAt": 0, - "settledAt": 0, - "error": { - "category": "Error", - "message": "", - "isRpcDeliveryUnknown": true - } - } - }, - "db3e553e51e5": { - "name": "linear.listTeams#1", - "ordinal": 8, - "args": [ - { - "name": "method", - "value": "linear.listTeams" - }, - { - "name": "params", - "value": { - "$rpc": "absent" - } - }, - { - "name": "options", - "value": { - "$rpc": "absent" - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-1", - "ok": true, - "result": { - "$rpc": "null" - } - } - } - }, - "e7edc26c6e24": { - "name": "createTeamId", - "ordinal": 11, - "value": { - "$rpc": "null" - } - }, - "e9a162defc32": { - "name": "creatingTask", - "ordinal": 7, - "value": false - }, - "eb79a9b3682a": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "$rpc": "undefined" - } - }, - "eda130337c99": { - "name": "detailPayload", - "ordinal": 2, - "value": { - "$rpc": "null" - } } }, "recording": { @@ -599,8 +594,8 @@ { "id": "tk-linear-team-context.normal:open-composer-settled", "observation": { - "sender": ["ceb71a750e06"], - "payloads": ["b164dfd464b3"], + "sender": ["ee01f277ffc4"], + "payloads": ["4fcc46dfeb77"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a" @@ -610,20 +605,19 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "475ec9a66266", - "b1adae647a3f" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "38ed617d559f", + "031c50459130" ] } }, { "id": "tk-linear-team-context.normal:select-metadata-item-settled", "observation": { - "sender": ["ceb71a750e06", "95b075d66243"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["ee01f277ffc4", "c88d134e7a42"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -634,24 +628,23 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "475ec9a66266", - "b1adae647a3f", - "60a0395d07c7", - "1288b8513745", - "5711e2717b76", - "356f2cb9a0df" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "38ed617d559f", + "031c50459130", + "77a7eff4a3cc", + "db66582f88a9", + "a14f6c361136", + "74335ecb4cd2" ] } }, { "id": "tk-linear-team-context.result-absent:open-composer-settled", "observation": { - "sender": ["0086e1c04b47"], - "payloads": ["b164dfd464b3"], + "sender": ["c3709cdbfa6b"], + "payloads": ["4fcc46dfeb77"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a" @@ -661,20 +654,19 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "5e7b9a1d95b3", - "e7edc26c6e24" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "8640fb2add9b", + "17249df8377f" ] } }, { "id": "tk-linear-team-context.result-absent:select-metadata-item-settled", "observation": { - "sender": ["0086e1c04b47", "95b075d66243"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["c3709cdbfa6b", "c88d134e7a42"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -685,24 +677,23 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "5e7b9a1d95b3", - "e7edc26c6e24", - "60a0395d07c7", - "1288b8513745", - "5711e2717b76", - "356f2cb9a0df" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "8640fb2add9b", + "17249df8377f", + "77a7eff4a3cc", + "db66582f88a9", + "a14f6c361136", + "74335ecb4cd2" ] } }, { "id": "tk-linear-team-context.result-null:open-composer-settled", "observation": { - "sender": ["db3e553e51e5"], - "payloads": ["b164dfd464b3"], + "sender": ["1ec7cb477142"], + "payloads": ["4fcc46dfeb77"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a" @@ -712,20 +703,19 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "5e7b9a1d95b3", - "e7edc26c6e24" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "8640fb2add9b", + "17249df8377f" ] } }, { "id": "tk-linear-team-context.result-null:select-metadata-item-settled", "observation": { - "sender": ["db3e553e51e5", "95b075d66243"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["1ec7cb477142", "c88d134e7a42"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -736,24 +726,23 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "5e7b9a1d95b3", - "e7edc26c6e24", - "60a0395d07c7", - "1288b8513745", - "5711e2717b76", - "356f2cb9a0df" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "8640fb2add9b", + "17249df8377f", + "77a7eff4a3cc", + "db66582f88a9", + "a14f6c361136", + "74335ecb4cd2" ] } }, { "id": "tk-linear-team-context.inner-ok-missing:open-composer-settled", "observation": { - "sender": ["ab4350eb906f"], - "payloads": ["b164dfd464b3"], + "sender": ["7a1d9604491f"], + "payloads": ["4fcc46dfeb77"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a" @@ -763,20 +752,19 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "5e7b9a1d95b3", - "e7edc26c6e24" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "8640fb2add9b", + "17249df8377f" ] } }, { "id": "tk-linear-team-context.inner-ok-missing:select-metadata-item-settled", "observation": { - "sender": ["ab4350eb906f", "95b075d66243"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["7a1d9604491f", "c88d134e7a42"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -787,24 +775,23 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "5e7b9a1d95b3", - "e7edc26c6e24", - "60a0395d07c7", - "1288b8513745", - "5711e2717b76", - "356f2cb9a0df" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "8640fb2add9b", + "17249df8377f", + "77a7eff4a3cc", + "db66582f88a9", + "a14f6c361136", + "74335ecb4cd2" ] } }, { "id": "tk-linear-team-context.inner-false-string-error:open-composer-settled", "observation": { - "sender": ["8ff86f3a6d6e"], - "payloads": ["b164dfd464b3"], + "sender": ["3008cf7db0e8"], + "payloads": ["4fcc46dfeb77"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a" @@ -814,20 +801,19 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "5e7b9a1d95b3", - "e7edc26c6e24" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "8640fb2add9b", + "17249df8377f" ] } }, { "id": "tk-linear-team-context.inner-false-string-error:select-metadata-item-settled", "observation": { - "sender": ["8ff86f3a6d6e", "95b075d66243"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["3008cf7db0e8", "c88d134e7a42"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -838,24 +824,23 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "5e7b9a1d95b3", - "e7edc26c6e24", - "60a0395d07c7", - "1288b8513745", - "5711e2717b76", - "356f2cb9a0df" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "8640fb2add9b", + "17249df8377f", + "77a7eff4a3cc", + "db66582f88a9", + "a14f6c361136", + "74335ecb4cd2" ] } }, { "id": "tk-linear-team-context.inner-false-object-error:open-composer-settled", "observation": { - "sender": ["2b0fea7d064e"], - "payloads": ["b164dfd464b3"], + "sender": ["0393503430d4"], + "payloads": ["4fcc46dfeb77"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a" @@ -865,20 +850,19 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "5e7b9a1d95b3", - "e7edc26c6e24" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "8640fb2add9b", + "17249df8377f" ] } }, { "id": "tk-linear-team-context.inner-false-object-error:select-metadata-item-settled", "observation": { - "sender": ["2b0fea7d064e", "95b075d66243"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["0393503430d4", "c88d134e7a42"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -889,24 +873,23 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "5e7b9a1d95b3", - "e7edc26c6e24", - "60a0395d07c7", - "1288b8513745", - "5711e2717b76", - "356f2cb9a0df" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "8640fb2add9b", + "17249df8377f", + "77a7eff4a3cc", + "db66582f88a9", + "a14f6c361136", + "74335ecb4cd2" ] } }, { "id": "tk-linear-team-context.outer-refused:open-composer-settled", "observation": { - "sender": ["ab739ce318cf"], - "payloads": ["b164dfd464b3"], + "sender": ["295be39dd439"], + "payloads": ["4fcc46dfeb77"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a" @@ -916,20 +899,19 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "5e7b9a1d95b3", - "e7edc26c6e24" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "8640fb2add9b", + "17249df8377f" ] } }, { "id": "tk-linear-team-context.outer-refused:select-metadata-item-settled", "observation": { - "sender": ["ab739ce318cf", "95b075d66243"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["295be39dd439", "c88d134e7a42"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -940,24 +922,23 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "5e7b9a1d95b3", - "e7edc26c6e24", - "60a0395d07c7", - "1288b8513745", - "5711e2717b76", - "356f2cb9a0df" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "8640fb2add9b", + "17249df8377f", + "77a7eff4a3cc", + "db66582f88a9", + "a14f6c361136", + "74335ecb4cd2" ] } }, { "id": "tk-linear-team-context.outer-refused-no-message:open-composer-settled", "observation": { - "sender": ["6568a8d15463"], - "payloads": ["b164dfd464b3"], + "sender": ["b57d92c5b837"], + "payloads": ["4fcc46dfeb77"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a" @@ -967,20 +948,19 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "5e7b9a1d95b3", - "e7edc26c6e24" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "8640fb2add9b", + "17249df8377f" ] } }, { "id": "tk-linear-team-context.outer-refused-no-message:select-metadata-item-settled", "observation": { - "sender": ["6568a8d15463", "95b075d66243"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["b57d92c5b837", "c88d134e7a42"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -991,24 +971,23 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "5e7b9a1d95b3", - "e7edc26c6e24", - "60a0395d07c7", - "1288b8513745", - "5711e2717b76", - "356f2cb9a0df" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "8640fb2add9b", + "17249df8377f", + "77a7eff4a3cc", + "db66582f88a9", + "a14f6c361136", + "74335ecb4cd2" ] } }, { "id": "tk-linear-team-context.method-not-found:open-composer-settled", "observation": { - "sender": ["10b6d9eca9a8"], - "payloads": ["b164dfd464b3"], + "sender": ["c74dd55429c8"], + "payloads": ["4fcc46dfeb77"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a" @@ -1018,20 +997,19 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "5e7b9a1d95b3", - "e7edc26c6e24" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "8640fb2add9b", + "17249df8377f" ] } }, { "id": "tk-linear-team-context.method-not-found:select-metadata-item-settled", "observation": { - "sender": ["10b6d9eca9a8", "95b075d66243"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["c74dd55429c8", "c88d134e7a42"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -1042,24 +1020,23 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "5e7b9a1d95b3", - "e7edc26c6e24", - "60a0395d07c7", - "1288b8513745", - "5711e2717b76", - "356f2cb9a0df" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "8640fb2add9b", + "17249df8377f", + "77a7eff4a3cc", + "db66582f88a9", + "a14f6c361136", + "74335ecb4cd2" ] } }, { "id": "tk-linear-team-context.transport-rejection:open-composer-settled", "observation": { - "sender": ["c6fcb742b15b"], - "payloads": ["b164dfd464b3"], + "sender": ["6e2cda0e22c3"], + "payloads": ["4fcc46dfeb77"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a" @@ -1069,20 +1046,19 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "5e7b9a1d95b3", - "e7edc26c6e24" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "8640fb2add9b", + "17249df8377f" ] } }, { "id": "tk-linear-team-context.transport-rejection:select-metadata-item-settled", "observation": { - "sender": ["c6fcb742b15b", "95b075d66243"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["6e2cda0e22c3", "c88d134e7a42"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -1093,24 +1069,23 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "5e7b9a1d95b3", - "e7edc26c6e24", - "60a0395d07c7", - "1288b8513745", - "5711e2717b76", - "356f2cb9a0df" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "8640fb2add9b", + "17249df8377f", + "77a7eff4a3cc", + "db66582f88a9", + "a14f6c361136", + "74335ecb4cd2" ] } }, { "id": "tk-linear-team-context.transport-rejection-no-message:open-composer-settled", "observation": { - "sender": ["d837ce2317b7"], - "payloads": ["b164dfd464b3"], + "sender": ["b6a3835a95e0"], + "payloads": ["4fcc46dfeb77"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a" @@ -1120,20 +1095,19 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "5e7b9a1d95b3", - "e7edc26c6e24" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "8640fb2add9b", + "17249df8377f" ] } }, { "id": "tk-linear-team-context.transport-rejection-no-message:select-metadata-item-settled", "observation": { - "sender": ["d837ce2317b7", "95b075d66243"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["b6a3835a95e0", "c88d134e7a42"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -1144,16 +1118,15 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "5e7b9a1d95b3", - "e7edc26c6e24", - "60a0395d07c7", - "1288b8513745", - "5711e2717b76", - "356f2cb9a0df" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "8640fb2add9b", + "17249df8377f", + "77a7eff4a3cc", + "db66582f88a9", + "a14f6c361136", + "74335ecb4cd2" ] } } diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.linear-team-context-linear.teamstates-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.linear-team-context-linear.teamstates-1.json index 5543dee089c..487e8942865 100644 --- a/mobile/rpc-foundation/goldens/matrix-tasks.linear-team-context-linear.teamstates-1.json +++ b/mobile/rpc-foundation/goldens/matrix-tasks.linear-team-context-linear.teamstates-1.json @@ -4,14 +4,47 @@ "family": "tasks.linear-team-context", "namedDeltas": [], "values": { - "1288b8513745": { - "name": "linearStatesError", - "ordinal": 13, - "value": "" + "031c50459130": { + "name": "createTeamId", + "ordinal": 10, + "value": "team-1" }, - "1a8a5ec5fc23": { + "08ba0389f3cc": { "name": "linear.teamStates#1", - "ordinal": 14, + "ordinal": 13, + "args": [ + { + "name": "method", + "value": "linear.teamStates" + }, + { + "name": "params", + "value": { + "teamId": "team-1", + "workspaceId": "linear-workspace" + } + }, + { + "name": "options", + "value": { + "$rpc": "absent" + } + } + ], + "settlement": { + "status": "rejected", + "startedAt": 0, + "settledAt": 0, + "error": { + "category": "Error", + "message": "transport failure", + "isRpcDeliveryUnknown": true + } + } + }, + "0bbe7048713b": { + "name": "linear.teamStates#1", + "ordinal": 13, "args": [ { "name": "method", @@ -45,9 +78,253 @@ } } }, - "257a7865e607": { + "2afc4b1311c1": { + "createTeamId": "team-1", + "states": [], + "statesLoading": false, + "teams": [ + { + "id": "team-1", + "key": "ENG", + "name": "Engineering", + "workspaceId": "linear-workspace" + } + ] + }, + "3508d5a4f814": { + "name": "linear.teamStates#1", + "ordinal": 13, + "args": [ + { + "name": "method", + "value": "linear.teamStates" + }, + { + "name": "params", + "value": { + "teamId": "team-1", + "workspaceId": "linear-workspace" + } + }, + { + "name": "options", + "value": { + "$rpc": "absent" + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "$rpc": "null" + } + } + } + }, + "356f2cb9a0df": { + "name": "linearStatesLoading", + "ordinal": 17, + "value": false + }, + "37b06a0ef857": { + "name": "linear.teamStates#1", + "ordinal": 13, + "args": [ + { + "name": "method", + "value": "linear.teamStates" + }, + { + "name": "params", + "value": { + "teamId": "team-1", + "workspaceId": "linear-workspace" + } + }, + { + "name": "options", + "value": { + "$rpc": "absent" + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "error": "refused" + } + } + } + }, + "38ed617d559f": { + "name": "linearTeams", + "ordinal": 9, + "value": [ + { + "id": "team-1", + "key": "ENG", + "name": "Engineering", + "workspaceId": "linear-workspace" + } + ] + }, + "3abc893d377b": { + "name": "mutatingStatus", + "ordinal": 3, + "value": false + }, + "4fcc46dfeb77": { + "name": "linear.listTeams#1", + "ordinal": 8, + "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"linear.listTeams\"}" + }, + "5dcdc7fd7492": { + "name": "linearSubIssueTitle", + "ordinal": 4, + "value": "" + }, + "74335ecb4cd2": { + "name": "linearStatesLoading", + "ordinal": 16, + "value": false + }, + "74505ce2789a": { + "name": "linearStates", + "ordinal": 5, + "value": [] + }, + "77a7eff4a3cc": { + "name": "linearStatesLoading", + "ordinal": 11, + "value": true + }, + "82b36eab5101": { + "name": "creatingTask", + "ordinal": 6, + "value": false + }, + "8bfe92d83df7": { + "name": "linear.teamStates#1", + "ordinal": 13, + "args": [ + { + "name": "method", + "value": "linear.teamStates" + }, + { + "name": "params", + "value": { + "teamId": "team-1", + "workspaceId": "linear-workspace" + } + }, + { + "name": "options", + "value": { + "$rpc": "absent" + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "error": "inner refused", + "ok": false + } + } + } + }, + "9c2bebd630ca": { + "name": "linear.teamStates#1", + "ordinal": 13, + "args": [ + { + "name": "method", + "value": "linear.teamStates" + }, + { + "name": "params", + "value": { + "teamId": "team-1", + "workspaceId": "linear-workspace" + } + }, + { + "name": "options", + "value": { + "$rpc": "absent" + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "error": { + "code": "method_not_found", + "message": "Unknown method" + }, + "id": "frame-2", + "ok": false + } + } + }, + "a14f6c361136": { + "name": "linearStates", + "ordinal": 15, + "value": [ + { + "color": "#000000", + "id": "state-1", + "name": "Todo", + "type": "unstarted" + } + ] + }, + "b5ba6f00c4fb": { "name": "linear.teamStates#1", "ordinal": 14, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"linear.teamStates\",\"params\":{\"teamId\":\"team-1\",\"workspaceId\":\"linear-workspace\"}}" + }, + "b6bf81e9e237": { + "createTeamId": "team-1", + "states": [ + { + "color": "#000000", + "id": "state-1", + "name": "Todo", + "type": "unstarted" + } + ], + "statesLoading": false, + "teams": [ + { + "id": "team-1", + "key": "ENG", + "name": "Engineering", + "workspaceId": "linear-workspace" + } + ] + }, + "bc9c421bce9d": { + "name": "linear.teamStates#1", + "ordinal": 13, "args": [ { "name": "method", @@ -81,159 +358,9 @@ } } }, - "2afc4b1311c1": { - "createTeamId": "team-1", - "states": [], - "statesLoading": false, - "teams": [ - { - "id": "team-1", - "key": "ENG", - "name": "Engineering", - "workspaceId": "linear-workspace" - } - ] - }, - "33218d06f656": { - "name": "linearStates", - "ordinal": 6, - "value": [] - }, - "356f2cb9a0df": { - "name": "linearStatesLoading", - "ordinal": 17, - "value": false - }, - "38ffd79cd25a": { - "name": "linearStatesLoading", - "ordinal": 18, - "value": false - }, - "3abc893d377b": { - "name": "mutatingStatus", - "ordinal": 3, - "value": false - }, - "3ec904e24cfd": { - "name": "linearStatesError", - "ordinal": 17, - "value": "Couldn't load states. Reopen to try again." - }, - "475ec9a66266": { - "name": "linearTeams", - "ordinal": 10, - "value": [ - { - "id": "team-1", - "key": "ENG", - "name": "Engineering", - "workspaceId": "linear-workspace" - } - ] - }, - "493c7b4199f7": { + "c88d134e7a42": { "name": "linear.teamStates#1", - "ordinal": 14, - "args": [ - { - "name": "method", - "value": "linear.teamStates" - }, - { - "name": "params", - "value": { - "teamId": "team-1", - "workspaceId": "linear-workspace" - } - }, - { - "name": "options", - "value": { - "$rpc": "absent" - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-2", - "ok": true, - "result": { - "error": "refused" - } - } - } - }, - "5711e2717b76": { - "name": "linearStates", - "ordinal": 16, - "value": [ - { - "color": "#000000", - "id": "state-1", - "name": "Todo", - "type": "unstarted" - } - ] - }, - "5b6eff1db997": { - "name": "linear.teamStates#1", - "ordinal": 14, - "args": [ - { - "name": "method", - "value": "linear.teamStates" - }, - { - "name": "params", - "value": { - "teamId": "team-1", - "workspaceId": "linear-workspace" - } - }, - { - "name": "options", - "value": { - "$rpc": "absent" - } - } - ], - "settlement": { - "status": "rejected", - "startedAt": 0, - "settledAt": 0, - "error": { - "category": "Error", - "message": "", - "isRpcDeliveryUnknown": true - } - } - }, - "60a0395d07c7": { - "name": "linearStatesLoading", - "ordinal": 12, - "value": true - }, - "610f6c28e7a1": { - "name": "linearSubIssueTitle", - "ordinal": 5, - "value": "" - }, - "680165cd199f": { - "name": "linearStates", - "ordinal": 16, - "value": [] - }, - "9131972798ca": { - "name": "linear.teamStates#1", - "ordinal": 15, - "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"linear.teamStates\",\"params\":{\"teamId\":\"team-1\",\"workspaceId\":\"linear-workspace\"}}" - }, - "95b075d66243": { - "name": "linear.teamStates#1", - "ordinal": 14, + "ordinal": 13, "args": [ { "name": "method", @@ -271,14 +398,16 @@ } } }, - "9dc1f136772e": { - "name": "linearCommentDraft", - "ordinal": 4, - "value": "" + "cc2ece9478f0": { + "name": "actionItem", + "ordinal": 1, + "value": { + "$rpc": "null" + } }, - "a29f541d9116": { + "cc5c41192644": { "name": "linear.teamStates#1", - "ordinal": 14, + "ordinal": 13, "args": [ { "name": "method", @@ -304,46 +433,23 @@ "settledAt": 0, "value": { "id": "frame-2", - "ok": true, - "result": { - "$rpc": "null" - } + "ok": true } } }, - "b164dfd464b3": { - "name": "linear.listTeams#1", - "ordinal": 9, - "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"linear.listTeams\"}" + "cd1bce5e6fae": { + "name": "linearStates", + "ordinal": 15, + "value": [] }, - "b1adae647a3f": { - "name": "createTeamId", - "ordinal": 11, - "value": "team-1" + "db66582f88a9": { + "name": "linearStatesError", + "ordinal": 12, + "value": "" }, - "b6bf81e9e237": { - "createTeamId": "team-1", - "states": [ - { - "color": "#000000", - "id": "state-1", - "name": "Todo", - "type": "unstarted" - } - ], - "statesLoading": false, - "teams": [ - { - "id": "team-1", - "key": "ENG", - "name": "Engineering", - "workspaceId": "linear-workspace" - } - ] - }, - "bba047c7732c": { + "e11f0649d40c": { "name": "linear.teamStates#1", - "ordinal": 14, + "ordinal": 13, "args": [ { "name": "method", @@ -379,16 +485,57 @@ } } }, - "cc2ece9478f0": { - "name": "actionItem", - "ordinal": 1, + "ea8fa14b318f": { + "name": "linear.teamStates#1", + "ordinal": 13, + "args": [ + { + "name": "method", + "value": "linear.teamStates" + }, + { + "name": "params", + "value": { + "teamId": "team-1", + "workspaceId": "linear-workspace" + } + }, + { + "name": "options", + "value": { + "$rpc": "absent" + } + } + ], + "settlement": { + "status": "rejected", + "startedAt": 0, + "settledAt": 0, + "error": { + "category": "Error", + "message": "", + "isRpcDeliveryUnknown": true + } + } + }, + "eb79a9b3682a": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "$rpc": "undefined" + } + }, + "eda130337c99": { + "name": "detailPayload", + "ordinal": 2, "value": { "$rpc": "null" } }, - "ceb71a750e06": { + "ee01f277ffc4": { "name": "linear.listTeams#1", - "ordinal": 8, + "ordinal": 7, "args": [ { "name": "method", @@ -425,162 +572,10 @@ } } }, - "cf77783ec600": { - "name": "linear.teamStates#1", - "ordinal": 14, - "args": [ - { - "name": "method", - "value": "linear.teamStates" - }, - { - "name": "params", - "value": { - "teamId": "team-1", - "workspaceId": "linear-workspace" - } - }, - { - "name": "options", - "value": { - "$rpc": "absent" - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-2", - "ok": true - } - } - }, - "e9a162defc32": { - "name": "creatingTask", - "ordinal": 7, - "value": false - }, - "eb79a9b3682a": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "$rpc": "undefined" - } - }, - "eda130337c99": { - "name": "detailPayload", - "ordinal": 2, - "value": { - "$rpc": "null" - } - }, - "f47f4cf7bd2b": { - "name": "linear.teamStates#1", - "ordinal": 14, - "args": [ - { - "name": "method", - "value": "linear.teamStates" - }, - { - "name": "params", - "value": { - "teamId": "team-1", - "workspaceId": "linear-workspace" - } - }, - { - "name": "options", - "value": { - "$rpc": "absent" - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "error": { - "code": "method_not_found", - "message": "Unknown method" - }, - "id": "frame-2", - "ok": false - } - } - }, - "fed235ce8e9c": { - "name": "linear.teamStates#1", - "ordinal": 14, - "args": [ - { - "name": "method", - "value": "linear.teamStates" - }, - { - "name": "params", - "value": { - "teamId": "team-1", - "workspaceId": "linear-workspace" - } - }, - { - "name": "options", - "value": { - "$rpc": "absent" - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-2", - "ok": true, - "result": { - "error": "inner refused", - "ok": false - } - } - } - }, - "ff9c7b4bdfb6": { - "name": "linear.teamStates#1", - "ordinal": 14, - "args": [ - { - "name": "method", - "value": "linear.teamStates" - }, - { - "name": "params", - "value": { - "teamId": "team-1", - "workspaceId": "linear-workspace" - } - }, - { - "name": "options", - "value": { - "$rpc": "absent" - } - } - ], - "settlement": { - "status": "rejected", - "startedAt": 0, - "settledAt": 0, - "error": { - "category": "Error", - "message": "transport failure", - "isRpcDeliveryUnknown": true - } - } + "ef290fdf0bf5": { + "name": "linearStatesError", + "ordinal": 16, + "value": "Couldn't load states. Reopen to try again." } }, "recording": { @@ -589,8 +584,8 @@ { "id": "tk-linear-team-context.prelude:open-composer-settled", "observation": { - "sender": ["ceb71a750e06"], - "payloads": ["b164dfd464b3"], + "sender": ["ee01f277ffc4"], + "payloads": ["4fcc46dfeb77"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a" @@ -600,20 +595,19 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "475ec9a66266", - "b1adae647a3f" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "38ed617d559f", + "031c50459130" ] } }, { "id": "tk-linear-team-context.normal:select-metadata-item-settled", "observation": { - "sender": ["ceb71a750e06", "95b075d66243"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["ee01f277ffc4", "c88d134e7a42"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -624,24 +618,23 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "475ec9a66266", - "b1adae647a3f", - "60a0395d07c7", - "1288b8513745", - "5711e2717b76", - "356f2cb9a0df" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "38ed617d559f", + "031c50459130", + "77a7eff4a3cc", + "db66582f88a9", + "a14f6c361136", + "74335ecb4cd2" ] } }, { "id": "tk-linear-team-context.result-absent:select-metadata-item-settled", "observation": { - "sender": ["ceb71a750e06", "cf77783ec600"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["ee01f277ffc4", "cc5c41192644"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -652,25 +645,24 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "475ec9a66266", - "b1adae647a3f", - "60a0395d07c7", - "1288b8513745", - "680165cd199f", - "3ec904e24cfd", - "38ffd79cd25a" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "38ed617d559f", + "031c50459130", + "77a7eff4a3cc", + "db66582f88a9", + "cd1bce5e6fae", + "ef290fdf0bf5", + "356f2cb9a0df" ] } }, { "id": "tk-linear-team-context.result-null:select-metadata-item-settled", "observation": { - "sender": ["ceb71a750e06", "a29f541d9116"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["ee01f277ffc4", "3508d5a4f814"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -681,25 +673,24 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "475ec9a66266", - "b1adae647a3f", - "60a0395d07c7", - "1288b8513745", - "680165cd199f", - "3ec904e24cfd", - "38ffd79cd25a" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "38ed617d559f", + "031c50459130", + "77a7eff4a3cc", + "db66582f88a9", + "cd1bce5e6fae", + "ef290fdf0bf5", + "356f2cb9a0df" ] } }, { "id": "tk-linear-team-context.inner-ok-missing:select-metadata-item-settled", "observation": { - "sender": ["ceb71a750e06", "493c7b4199f7"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["ee01f277ffc4", "37b06a0ef857"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -710,25 +701,24 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "475ec9a66266", - "b1adae647a3f", - "60a0395d07c7", - "1288b8513745", - "680165cd199f", - "3ec904e24cfd", - "38ffd79cd25a" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "38ed617d559f", + "031c50459130", + "77a7eff4a3cc", + "db66582f88a9", + "cd1bce5e6fae", + "ef290fdf0bf5", + "356f2cb9a0df" ] } }, { "id": "tk-linear-team-context.inner-false-string-error:select-metadata-item-settled", "observation": { - "sender": ["ceb71a750e06", "fed235ce8e9c"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["ee01f277ffc4", "8bfe92d83df7"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -739,25 +729,24 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "475ec9a66266", - "b1adae647a3f", - "60a0395d07c7", - "1288b8513745", - "680165cd199f", - "3ec904e24cfd", - "38ffd79cd25a" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "38ed617d559f", + "031c50459130", + "77a7eff4a3cc", + "db66582f88a9", + "cd1bce5e6fae", + "ef290fdf0bf5", + "356f2cb9a0df" ] } }, { "id": "tk-linear-team-context.inner-false-object-error:select-metadata-item-settled", "observation": { - "sender": ["ceb71a750e06", "bba047c7732c"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["ee01f277ffc4", "e11f0649d40c"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -768,25 +757,24 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "475ec9a66266", - "b1adae647a3f", - "60a0395d07c7", - "1288b8513745", - "680165cd199f", - "3ec904e24cfd", - "38ffd79cd25a" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "38ed617d559f", + "031c50459130", + "77a7eff4a3cc", + "db66582f88a9", + "cd1bce5e6fae", + "ef290fdf0bf5", + "356f2cb9a0df" ] } }, { "id": "tk-linear-team-context.outer-refused:select-metadata-item-settled", "observation": { - "sender": ["ceb71a750e06", "1a8a5ec5fc23"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["ee01f277ffc4", "0bbe7048713b"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -797,25 +785,24 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "475ec9a66266", - "b1adae647a3f", - "60a0395d07c7", - "1288b8513745", - "680165cd199f", - "3ec904e24cfd", - "38ffd79cd25a" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "38ed617d559f", + "031c50459130", + "77a7eff4a3cc", + "db66582f88a9", + "cd1bce5e6fae", + "ef290fdf0bf5", + "356f2cb9a0df" ] } }, { "id": "tk-linear-team-context.outer-refused-no-message:select-metadata-item-settled", "observation": { - "sender": ["ceb71a750e06", "257a7865e607"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["ee01f277ffc4", "bc9c421bce9d"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -826,25 +813,24 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "475ec9a66266", - "b1adae647a3f", - "60a0395d07c7", - "1288b8513745", - "680165cd199f", - "3ec904e24cfd", - "38ffd79cd25a" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "38ed617d559f", + "031c50459130", + "77a7eff4a3cc", + "db66582f88a9", + "cd1bce5e6fae", + "ef290fdf0bf5", + "356f2cb9a0df" ] } }, { "id": "tk-linear-team-context.method-not-found:select-metadata-item-settled", "observation": { - "sender": ["ceb71a750e06", "f47f4cf7bd2b"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["ee01f277ffc4", "9c2bebd630ca"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -855,25 +841,24 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "475ec9a66266", - "b1adae647a3f", - "60a0395d07c7", - "1288b8513745", - "680165cd199f", - "3ec904e24cfd", - "38ffd79cd25a" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "38ed617d559f", + "031c50459130", + "77a7eff4a3cc", + "db66582f88a9", + "cd1bce5e6fae", + "ef290fdf0bf5", + "356f2cb9a0df" ] } }, { "id": "tk-linear-team-context.transport-rejection:select-metadata-item-settled", "observation": { - "sender": ["ceb71a750e06", "ff9c7b4bdfb6"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["ee01f277ffc4", "08ba0389f3cc"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -884,25 +869,24 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "475ec9a66266", - "b1adae647a3f", - "60a0395d07c7", - "1288b8513745", - "680165cd199f", - "3ec904e24cfd", - "38ffd79cd25a" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "38ed617d559f", + "031c50459130", + "77a7eff4a3cc", + "db66582f88a9", + "cd1bce5e6fae", + "ef290fdf0bf5", + "356f2cb9a0df" ] } }, { "id": "tk-linear-team-context.transport-rejection-no-message:select-metadata-item-settled", "observation": { - "sender": ["ceb71a750e06", "5b6eff1db997"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["ee01f277ffc4", "ea8fa14b318f"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -913,17 +897,16 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "475ec9a66266", - "b1adae647a3f", - "60a0395d07c7", - "1288b8513745", - "680165cd199f", - "3ec904e24cfd", - "38ffd79cd25a" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "38ed617d559f", + "031c50459130", + "77a7eff4a3cc", + "db66582f88a9", + "cd1bce5e6fae", + "ef290fdf0bf5", + "356f2cb9a0df" ] } } diff --git a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-detail-github.project.workitemdetailsbyslug-1.json b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-detail-github.project.workitemdetailsbyslug-1.json index 28697a03a85..638a36a7192 100644 --- a/mobile/rpc-foundation/goldens/matrix-tasks.project-row-detail-github.project.workitemdetailsbyslug-1.json +++ b/mobile/rpc-foundation/goldens/matrix-tasks.project-row-detail-github.project.workitemdetailsbyslug-1.json @@ -4,99 +4,9 @@ "family": "tasks.project-row-detail", "namedDeltas": [], "values": { - "0679b27a119b": { - "name": "projectFieldDrafts", - "ordinal": 11, - "value": {} - }, - "0fa980ff8396": { - "detail": { - "$rpc": "null" - }, - "error": "outer refused", - "loading": false - }, - "118d9662d37f": { + "0018cf2b103a": { "name": "github.project.workItemDetailsBySlug#1", - "ordinal": 16, - "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"github.project.workItemDetailsBySlug\",\"params\":{\"owner\":\"owner\",\"repo\":\"repo\",\"host\":\"github.enterprise.test\",\"number\":1,\"type\":\"issue\"}}" - }, - "183c3c26aba7": { - "detail": { - "$rpc": "null" - }, - "error": "The host sent a reply this app could not read (github.project.workItemDetailsBySlug)", - "loading": false - }, - "1e161db29c89": { - "name": "projectRowDetail", - "ordinal": 17, - "value": { - "assignees": [], - "baseSha": "base-sha", - "body": "body", - "checks": [], - "comments": [], - "files": [], - "headSha": "head-sha", - "labels": [], - "latestReviews": [], - "provider": "github", - "pullRequestId": "PR_kwDO", - "reviewDecision": { - "$rpc": "undefined" - }, - "reviewRequests": [] - } - }, - "205699b4093c": { - "detail": { - "$rpc": "null" - }, - "error": "inner refused", - "loading": false - }, - "213a7e810bb6": { - "name": "github.project.workItemDetailsBySlug#1", - "ordinal": 15, - "args": [ - { - "name": "method", - "value": "github.project.workItemDetailsBySlug" - }, - { - "name": "params", - "value": { - "host": "github.enterprise.test", - "number": 1, - "owner": "owner", - "repo": "repo", - "type": "issue" - } - }, - { - "name": "options", - "value": { - "timeoutMs": 30000 - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-1", - "ok": true, - "result": { - "error": "refused" - } - } - } - }, - "222e474aa914": { - "name": "github.project.workItemDetailsBySlug#1", - "ordinal": 15, + "ordinal": 14, "args": [ { "name": "method", @@ -133,26 +43,9 @@ } } }, - "2dc6bc594542": { - "name": "projectRowDetailError", - "ordinal": 17, - "value": "outer refused" - }, - "2ee1c7329449": { - "name": "projectRowDetail", - "ordinal": 12, - "value": { - "$rpc": "null" - } - }, - "31fcc93f02da": { - "name": "projectEditingCommentDraft", - "ordinal": 9, - "value": "" - }, - "3236e59b43c5": { + "0283d28b3dfb": { "name": "github.project.workItemDetailsBySlug#1", - "ordinal": 15, + "ordinal": 14, "args": [ { "name": "method", @@ -176,13 +69,130 @@ } ], "settlement": { - "status": "rejected", + "status": "fulfilled", "startedAt": 0, "settledAt": 0, - "error": { - "category": "Error", - "message": "transport failure", - "isRpcDeliveryUnknown": true + "value": { + "id": "frame-1", + "ok": true, + "result": { + "error": "refused" + } + } + } + }, + "044bed918d57": { + "name": "projectRowDetailError", + "ordinal": 16, + "value": "Unknown method" + }, + "0a6c63ec0fc1": { + "name": "github.project.workItemDetailsBySlug#1", + "ordinal": 15, + "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"github.project.workItemDetailsBySlug\",\"params\":{\"owner\":\"owner\",\"repo\":\"repo\",\"host\":\"github.enterprise.test\",\"number\":1,\"type\":\"issue\"}}" + }, + "0d5e8bc85abb": { + "name": "projectEditingCommentDraft", + "ordinal": 8, + "value": "" + }, + "0dc3824edb1e": { + "name": "projectRowDetailError", + "ordinal": 16, + "value": "" + }, + "0fa980ff8396": { + "detail": { + "$rpc": "null" + }, + "error": "outer refused", + "loading": false + }, + "183c3c26aba7": { + "detail": { + "$rpc": "null" + }, + "error": "The host sent a reply this app could not read (github.project.workItemDetailsBySlug)", + "loading": false + }, + "1e92a0ffa26a": { + "name": "github.project.workItemDetailsBySlug#1", + "ordinal": 14, + "args": [ + { + "name": "method", + "value": "github.project.workItemDetailsBySlug" + }, + { + "name": "params", + "value": { + "host": "github.enterprise.test", + "number": 1, + "owner": "owner", + "repo": "repo", + "type": "issue" + } + }, + { + "name": "options", + "value": { + "timeoutMs": 30000 + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-1", + "ok": true + } + } + }, + "205699b4093c": { + "detail": { + "$rpc": "null" + }, + "error": "inner refused", + "loading": false + }, + "209abb3e5ca9": { + "name": "github.project.workItemDetailsBySlug#1", + "ordinal": 14, + "args": [ + { + "name": "method", + "value": "github.project.workItemDetailsBySlug" + }, + { + "name": "params", + "value": { + "host": "github.enterprise.test", + "number": 1, + "owner": "owner", + "repo": "repo", + "type": "issue" + } + }, + { + "name": "options", + "value": { + "timeoutMs": 30000 + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-1", + "ok": true, + "result": { + "error": "inner refused", + "ok": false + } } } }, @@ -193,10 +203,10 @@ "error": "transport failure", "loading": false }, - "368311fc2981": { - "name": "projectCommentDraft", - "ordinal": 7, - "value": "" + "34aecaef096a": { + "name": "projectRowDetailLoading", + "ordinal": 17, + "value": false }, "3a42a92c5487": { "name": "projectBodyDraft", @@ -224,31 +234,9 @@ "error": "", "loading": false }, - "4f23116da7f6": { - "name": "projectReviewersDraft", - "ordinal": 10, - "value": "" - }, - "561861a537bb": { - "name": "projectRowDetailLoading", - "ordinal": 18, - "value": false - }, - "5cebe6c14680": { - "name": "prFileLoadingPath", - "ordinal": 4, - "value": { - "$rpc": "null" - } - }, - "60012e7abb60": { - "name": "prFileCommentDrafts", - "ordinal": 2, - "value": {} - }, - "6c3d811fffe9": { + "4b5e90f7c640": { "name": "github.project.workItemDetailsBySlug#1", - "ordinal": 15, + "ordinal": 14, "args": [ { "name": "method", @@ -284,14 +272,9 @@ } } }, - "7ca2bb47ab1c": { - "name": "prFileContents", - "ordinal": 3, - "value": {} - }, - "899221be28d8": { + "55361bf207c6": { "name": "github.project.workItemDetailsBySlug#1", - "ordinal": 15, + "ordinal": 14, "args": [ { "name": "method", @@ -350,53 +333,38 @@ } } }, - "8bea5c781cb0": { - "name": "github.project.workItemDetailsBySlug#1", - "ordinal": 15, - "args": [ - { - "name": "method", - "value": "github.project.workItemDetailsBySlug" - }, - { - "name": "params", - "value": { - "host": "github.enterprise.test", - "number": 1, - "owner": "owner", - "repo": "repo", - "type": "issue" - } - }, - { - "name": "options", - "value": { - "timeoutMs": 30000 - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "error": { - "code": "refused", - "message": "outer refused" - }, - "id": "frame-1", - "ok": false - } + "5b08d6631c0c": { + "name": "projectRowDetailError", + "ordinal": 12, + "value": "" + }, + "5cebe6c14680": { + "name": "prFileLoadingPath", + "ordinal": 4, + "value": { + "$rpc": "null" } }, - "9239767275ff": { + "60012e7abb60": { + "name": "prFileCommentDrafts", + "ordinal": 2, + "value": {} + }, + "6a0930bd2fdb": { + "name": "projectEditingCommentId", + "ordinal": 7, + "value": { + "$rpc": "null" + } + }, + "6bc1a66fb171": { "name": "projectRowDetailError", - "ordinal": 17, + "ordinal": 16, "value": "The host sent a reply this app could not read (github.project.workItemDetailsBySlug)" }, - "96d6a5752f05": { + "74c575cf3feb": { "name": "github.project.workItemDetailsBySlug#1", - "ordinal": 15, + "ordinal": 14, "args": [ { "name": "method", @@ -420,23 +388,24 @@ } ], "settlement": { - "status": "fulfilled", + "status": "rejected", "startedAt": 0, "settledAt": 0, - "value": { - "id": "frame-1", - "ok": true + "error": { + "category": "Error", + "message": "transport failure", + "isRpcDeliveryUnknown": true } } }, - "9911dd53d1d7": { - "name": "projectTitleDraft", - "ordinal": 5, - "value": "Project issue" + "78b8331a5238": { + "name": "projectRowDetailError", + "ordinal": 16, + "value": "transport failure" }, - "9c91ff2e7fe6": { + "7bfaa68178f3": { "name": "github.project.workItemDetailsBySlug#1", - "ordinal": 15, + "ordinal": 14, "args": [ { "name": "method", @@ -470,96 +439,24 @@ } } }, - "9ef3651bf4ad": { - "name": "github.project.workItemDetailsBySlug#1", - "ordinal": 15, - "args": [ - { - "name": "method", - "value": "github.project.workItemDetailsBySlug" - }, - { - "name": "params", - "value": { - "host": "github.enterprise.test", - "number": 1, - "owner": "owner", - "repo": "repo", - "type": "issue" - } - }, - { - "name": "options", - "value": { - "timeoutMs": 30000 - } - } - ], - "settlement": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "id": "frame-1", - "ok": true, - "result": { - "error": "inner refused", - "ok": false - } - } - } + "7ca2bb47ab1c": { + "name": "prFileContents", + "ordinal": 3, + "value": {} }, - "a90f501112f8": { - "name": "projectRowDetailError", - "ordinal": 17, - "value": "Unknown method" - }, - "ab52357ddee7": { - "name": "projectRowDetailError", - "ordinal": 17, - "value": "inner refused" - }, - "b2a01ad6d4fe": { - "detail": { - "assignees": [], - "baseSha": "base-sha", - "body": "body", - "checks": [], - "comments": [], - "files": [], - "headSha": "head-sha", - "labels": [], - "latestReviews": [], - "provider": "github", - "pullRequestId": "PR_kwDO", - "reviewDecision": { - "$rpc": "undefined" - }, - "reviewRequests": [] - }, - "error": "", - "loading": false - }, - "b63d5911050c": { - "name": "projectRowDetailError", + "93c5cbde2045": { + "name": "projectRowDetailLoading", "ordinal": 13, - "value": "" + "value": true }, - "bff535848bcf": { - "name": "projectRowDetailError", - "ordinal": 17, - "value": "" + "9911dd53d1d7": { + "name": "projectTitleDraft", + "ordinal": 5, + "value": "Project issue" }, - "c0e2c37d8abf": { - "name": "projectEditingCommentId", - "ordinal": 8, - "value": { - "$rpc": "null" - } - }, - "cd23fb9a85c7": { + "a8ed211a5296": { "name": "github.project.workItemDetailsBySlug#1", - "ordinal": 15, + "ordinal": 14, "args": [ { "name": "method", @@ -596,10 +493,108 @@ } } }, - "ea064759ca04": { + "b2a01ad6d4fe": { + "detail": { + "assignees": [], + "baseSha": "base-sha", + "body": "body", + "checks": [], + "comments": [], + "files": [], + "headSha": "head-sha", + "labels": [], + "latestReviews": [], + "provider": "github", + "pullRequestId": "PR_kwDO", + "reviewDecision": { + "$rpc": "undefined" + }, + "reviewRequests": [] + }, + "error": "", + "loading": false + }, + "b3022e1b4bce": { + "name": "github.project.workItemDetailsBySlug#1", + "ordinal": 14, + "args": [ + { + "name": "method", + "value": "github.project.workItemDetailsBySlug" + }, + { + "name": "params", + "value": { + "host": "github.enterprise.test", + "number": 1, + "owner": "owner", + "repo": "repo", + "type": "issue" + } + }, + { + "name": "options", + "value": { + "timeoutMs": 30000 + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "error": { + "code": "refused", + "message": "outer refused" + }, + "id": "frame-1", + "ok": false + } + } + }, + "bf07b693e877": { + "name": "projectRowDetail", + "ordinal": 16, + "value": { + "assignees": [], + "baseSha": "base-sha", + "body": "body", + "checks": [], + "comments": [], + "files": [], + "headSha": "head-sha", + "labels": [], + "latestReviews": [], + "provider": "github", + "pullRequestId": "PR_kwDO", + "reviewDecision": { + "$rpc": "undefined" + }, + "reviewRequests": [] + } + }, + "c82fb4f46067": { + "name": "projectReviewersDraft", + "ordinal": 9, + "value": "" + }, + "de8ce98bdd63": { + "name": "projectRowDetail", + "ordinal": 11, + "value": { + "$rpc": "null" + } + }, + "e07f42e59479": { "name": "projectRowDetailError", - "ordinal": 17, - "value": "transport failure" + "ordinal": 16, + "value": "outer refused" + }, + "e5129a14b6e4": { + "name": "projectFieldDrafts", + "ordinal": 10, + "value": {} }, "eb79a9b3682a": { "status": "fulfilled", @@ -609,14 +604,14 @@ "$rpc": "undefined" } }, - "f6a5085dd8e9": { - "name": "projectRowDetailLoading", - "ordinal": 14, - "value": true + "f8970fcf56b2": { + "name": "projectRowDetailError", + "ordinal": 16, + "value": "inner refused" }, - "fc2def66694f": { + "fb55d5c279f3": { "name": "github.project.workItemDetailsBySlug#1", - "ordinal": 15, + "ordinal": 14, "args": [ { "name": "method", @@ -662,8 +657,8 @@ { "id": "tk-project-row-detail.normal:mounted", "observation": { - "sender": ["899221be28d8"], - "payloads": ["118d9662d37f"], + "sender": ["55361bf207c6"], + "payloads": ["0a6c63ec0fc1"], "settlements": { "mount": "eb79a9b3682a" }, @@ -675,24 +670,23 @@ "5cebe6c14680", "9911dd53d1d7", "3a42a92c5487", - "368311fc2981", - "c0e2c37d8abf", - "31fcc93f02da", - "4f23116da7f6", - "0679b27a119b", - "2ee1c7329449", - "b63d5911050c", - "f6a5085dd8e9", - "1e161db29c89", - "561861a537bb" + "6a0930bd2fdb", + "0d5e8bc85abb", + "c82fb4f46067", + "e5129a14b6e4", + "de8ce98bdd63", + "5b08d6631c0c", + "93c5cbde2045", + "bf07b693e877", + "34aecaef096a" ] } }, { "id": "tk-project-row-detail.result-absent:mounted", "observation": { - "sender": ["96d6a5752f05"], - "payloads": ["118d9662d37f"], + "sender": ["1e92a0ffa26a"], + "payloads": ["0a6c63ec0fc1"], "settlements": { "mount": "eb79a9b3682a" }, @@ -704,24 +698,23 @@ "5cebe6c14680", "9911dd53d1d7", "3a42a92c5487", - "368311fc2981", - "c0e2c37d8abf", - "31fcc93f02da", - "4f23116da7f6", - "0679b27a119b", - "2ee1c7329449", - "b63d5911050c", - "f6a5085dd8e9", - "9239767275ff", - "561861a537bb" + "6a0930bd2fdb", + "0d5e8bc85abb", + "c82fb4f46067", + "e5129a14b6e4", + "de8ce98bdd63", + "5b08d6631c0c", + "93c5cbde2045", + "6bc1a66fb171", + "34aecaef096a" ] } }, { "id": "tk-project-row-detail.result-null:mounted", "observation": { - "sender": ["6c3d811fffe9"], - "payloads": ["118d9662d37f"], + "sender": ["4b5e90f7c640"], + "payloads": ["0a6c63ec0fc1"], "settlements": { "mount": "eb79a9b3682a" }, @@ -733,24 +726,23 @@ "5cebe6c14680", "9911dd53d1d7", "3a42a92c5487", - "368311fc2981", - "c0e2c37d8abf", - "31fcc93f02da", - "4f23116da7f6", - "0679b27a119b", - "2ee1c7329449", - "b63d5911050c", - "f6a5085dd8e9", - "9239767275ff", - "561861a537bb" + "6a0930bd2fdb", + "0d5e8bc85abb", + "c82fb4f46067", + "e5129a14b6e4", + "de8ce98bdd63", + "5b08d6631c0c", + "93c5cbde2045", + "6bc1a66fb171", + "34aecaef096a" ] } }, { "id": "tk-project-row-detail.inner-ok-missing:mounted", "observation": { - "sender": ["213a7e810bb6"], - "payloads": ["118d9662d37f"], + "sender": ["0283d28b3dfb"], + "payloads": ["0a6c63ec0fc1"], "settlements": { "mount": "eb79a9b3682a" }, @@ -762,24 +754,23 @@ "5cebe6c14680", "9911dd53d1d7", "3a42a92c5487", - "368311fc2981", - "c0e2c37d8abf", - "31fcc93f02da", - "4f23116da7f6", - "0679b27a119b", - "2ee1c7329449", - "b63d5911050c", - "f6a5085dd8e9", - "9239767275ff", - "561861a537bb" + "6a0930bd2fdb", + "0d5e8bc85abb", + "c82fb4f46067", + "e5129a14b6e4", + "de8ce98bdd63", + "5b08d6631c0c", + "93c5cbde2045", + "6bc1a66fb171", + "34aecaef096a" ] } }, { "id": "tk-project-row-detail.inner-false-string-error:mounted", "observation": { - "sender": ["9ef3651bf4ad"], - "payloads": ["118d9662d37f"], + "sender": ["209abb3e5ca9"], + "payloads": ["0a6c63ec0fc1"], "settlements": { "mount": "eb79a9b3682a" }, @@ -791,24 +782,23 @@ "5cebe6c14680", "9911dd53d1d7", "3a42a92c5487", - "368311fc2981", - "c0e2c37d8abf", - "31fcc93f02da", - "4f23116da7f6", - "0679b27a119b", - "2ee1c7329449", - "b63d5911050c", - "f6a5085dd8e9", - "9239767275ff", - "561861a537bb" + "6a0930bd2fdb", + "0d5e8bc85abb", + "c82fb4f46067", + "e5129a14b6e4", + "de8ce98bdd63", + "5b08d6631c0c", + "93c5cbde2045", + "6bc1a66fb171", + "34aecaef096a" ] } }, { "id": "tk-project-row-detail.inner-false-object-error:mounted", "observation": { - "sender": ["fc2def66694f"], - "payloads": ["118d9662d37f"], + "sender": ["fb55d5c279f3"], + "payloads": ["0a6c63ec0fc1"], "settlements": { "mount": "eb79a9b3682a" }, @@ -820,24 +810,23 @@ "5cebe6c14680", "9911dd53d1d7", "3a42a92c5487", - "368311fc2981", - "c0e2c37d8abf", - "31fcc93f02da", - "4f23116da7f6", - "0679b27a119b", - "2ee1c7329449", - "b63d5911050c", - "f6a5085dd8e9", - "ab52357ddee7", - "561861a537bb" + "6a0930bd2fdb", + "0d5e8bc85abb", + "c82fb4f46067", + "e5129a14b6e4", + "de8ce98bdd63", + "5b08d6631c0c", + "93c5cbde2045", + "f8970fcf56b2", + "34aecaef096a" ] } }, { "id": "tk-project-row-detail.outer-refused:mounted", "observation": { - "sender": ["8bea5c781cb0"], - "payloads": ["118d9662d37f"], + "sender": ["b3022e1b4bce"], + "payloads": ["0a6c63ec0fc1"], "settlements": { "mount": "eb79a9b3682a" }, @@ -849,24 +838,23 @@ "5cebe6c14680", "9911dd53d1d7", "3a42a92c5487", - "368311fc2981", - "c0e2c37d8abf", - "31fcc93f02da", - "4f23116da7f6", - "0679b27a119b", - "2ee1c7329449", - "b63d5911050c", - "f6a5085dd8e9", - "2dc6bc594542", - "561861a537bb" + "6a0930bd2fdb", + "0d5e8bc85abb", + "c82fb4f46067", + "e5129a14b6e4", + "de8ce98bdd63", + "5b08d6631c0c", + "93c5cbde2045", + "e07f42e59479", + "34aecaef096a" ] } }, { "id": "tk-project-row-detail.outer-refused-no-message:mounted", "observation": { - "sender": ["cd23fb9a85c7"], - "payloads": ["118d9662d37f"], + "sender": ["a8ed211a5296"], + "payloads": ["0a6c63ec0fc1"], "settlements": { "mount": "eb79a9b3682a" }, @@ -878,24 +866,23 @@ "5cebe6c14680", "9911dd53d1d7", "3a42a92c5487", - "368311fc2981", - "c0e2c37d8abf", - "31fcc93f02da", - "4f23116da7f6", - "0679b27a119b", - "2ee1c7329449", - "b63d5911050c", - "f6a5085dd8e9", - "bff535848bcf", - "561861a537bb" + "6a0930bd2fdb", + "0d5e8bc85abb", + "c82fb4f46067", + "e5129a14b6e4", + "de8ce98bdd63", + "5b08d6631c0c", + "93c5cbde2045", + "0dc3824edb1e", + "34aecaef096a" ] } }, { "id": "tk-project-row-detail.method-not-found:mounted", "observation": { - "sender": ["222e474aa914"], - "payloads": ["118d9662d37f"], + "sender": ["0018cf2b103a"], + "payloads": ["0a6c63ec0fc1"], "settlements": { "mount": "eb79a9b3682a" }, @@ -907,24 +894,23 @@ "5cebe6c14680", "9911dd53d1d7", "3a42a92c5487", - "368311fc2981", - "c0e2c37d8abf", - "31fcc93f02da", - "4f23116da7f6", - "0679b27a119b", - "2ee1c7329449", - "b63d5911050c", - "f6a5085dd8e9", - "a90f501112f8", - "561861a537bb" + "6a0930bd2fdb", + "0d5e8bc85abb", + "c82fb4f46067", + "e5129a14b6e4", + "de8ce98bdd63", + "5b08d6631c0c", + "93c5cbde2045", + "044bed918d57", + "34aecaef096a" ] } }, { "id": "tk-project-row-detail.transport-rejection:mounted", "observation": { - "sender": ["3236e59b43c5"], - "payloads": ["118d9662d37f"], + "sender": ["74c575cf3feb"], + "payloads": ["0a6c63ec0fc1"], "settlements": { "mount": "eb79a9b3682a" }, @@ -936,24 +922,23 @@ "5cebe6c14680", "9911dd53d1d7", "3a42a92c5487", - "368311fc2981", - "c0e2c37d8abf", - "31fcc93f02da", - "4f23116da7f6", - "0679b27a119b", - "2ee1c7329449", - "b63d5911050c", - "f6a5085dd8e9", - "ea064759ca04", - "561861a537bb" + "6a0930bd2fdb", + "0d5e8bc85abb", + "c82fb4f46067", + "e5129a14b6e4", + "de8ce98bdd63", + "5b08d6631c0c", + "93c5cbde2045", + "78b8331a5238", + "34aecaef096a" ] } }, { "id": "tk-project-row-detail.transport-rejection-no-message:mounted", "observation": { - "sender": ["9c91ff2e7fe6"], - "payloads": ["118d9662d37f"], + "sender": ["7bfaa68178f3"], + "payloads": ["0a6c63ec0fc1"], "settlements": { "mount": "eb79a9b3682a" }, @@ -965,16 +950,15 @@ "5cebe6c14680", "9911dd53d1d7", "3a42a92c5487", - "368311fc2981", - "c0e2c37d8abf", - "31fcc93f02da", - "4f23116da7f6", - "0679b27a119b", - "2ee1c7329449", - "b63d5911050c", - "f6a5085dd8e9", - "bff535848bcf", - "561861a537bb" + "6a0930bd2fdb", + "0d5e8bc85abb", + "c82fb4f46067", + "e5129a14b6e4", + "de8ce98bdd63", + "5b08d6631c0c", + "93c5cbde2045", + "0dc3824edb1e", + "34aecaef096a" ] } } diff --git a/mobile/rpc-foundation/goldens/tk-item-comment-github.json b/mobile/rpc-foundation/goldens/tk-item-comment-github.json index 8a5e337b8a3..082e8e1ec47 100644 --- a/mobile/rpc-foundation/goldens/tk-item-comment-github.json +++ b/mobile/rpc-foundation/goldens/tk-item-comment-github.json @@ -54,11 +54,6 @@ "targetKey": "repo-1\u0000owner/repo\u0000issue\u00009" } }, - "1fc52836dac4": { - "name": "itemReviewersDraft", - "ordinal": 9, - "value": "octocat" - }, "3aefb3006914": { "name": "error", "ordinal": 10, @@ -74,11 +69,6 @@ "ordinal": 3, "value": "" }, - "56a29701de21": { - "name": "itemCommentDraft", - "ordinal": 8, - "value": "a comment" - }, "69e396c2097f": { "name": "github.addIssueComment#1", "ordinal": 13, @@ -94,6 +84,16 @@ "ordinal": 12, "value": true }, + "9331fbfa07e4": { + "name": "itemCommentDraft", + "ordinal": 9, + "value": "a comment" + }, + "ac15f5699a77": { + "name": "itemReviewersDraft", + "ordinal": 8, + "value": "octocat" + }, "ae745d4c2372": { "name": "detailPayload", "ordinal": 14, @@ -341,8 +341,8 @@ "4031bf455f49", "c43ab05aed16", "1ca30ac68b76", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "ae745d4c2372", diff --git a/mobile/rpc-foundation/goldens/tk-item-comment-gitlab-mr.json b/mobile/rpc-foundation/goldens/tk-item-comment-gitlab-mr.json index bf05600a7bb..c578aa4f5f8 100644 --- a/mobile/rpc-foundation/goldens/tk-item-comment-gitlab-mr.json +++ b/mobile/rpc-foundation/goldens/tk-item-comment-gitlab-mr.json @@ -4,11 +4,6 @@ "family": "tasks.item-comment-gitlab-mr", "namedDeltas": [], "values": { - "1fc52836dac4": { - "name": "itemReviewersDraft", - "ordinal": 9, - "value": "octocat" - }, "3aefb3006914": { "name": "error", "ordinal": 10, @@ -48,11 +43,6 @@ "ordinal": 3, "value": "" }, - "56a29701de21": { - "name": "itemCommentDraft", - "ordinal": 8, - "value": "a comment" - }, "622bbddf4f05": { "name": "actionItem", "ordinal": 6, @@ -129,6 +119,16 @@ "ordinal": 12, "value": true }, + "9331fbfa07e4": { + "name": "itemCommentDraft", + "ordinal": 9, + "value": "a comment" + }, + "ac15f5699a77": { + "name": "itemReviewersDraft", + "ordinal": 8, + "value": "octocat" + }, "c650cf641414": { "name": "itemReviewersDraft", "ordinal": 4, @@ -250,8 +250,8 @@ "4031bf455f49", "622bbddf4f05", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "f3cb1a7df6dc", diff --git a/mobile/rpc-foundation/goldens/tk-item-comment-gitlab.json b/mobile/rpc-foundation/goldens/tk-item-comment-gitlab.json index 124b984af93..12c817feb30 100644 --- a/mobile/rpc-foundation/goldens/tk-item-comment-gitlab.json +++ b/mobile/rpc-foundation/goldens/tk-item-comment-gitlab.json @@ -71,11 +71,6 @@ "provider": "gitlab" } }, - "1fc52836dac4": { - "name": "itemReviewersDraft", - "ordinal": 9, - "value": "octocat" - }, "3aefb3006914": { "name": "error", "ordinal": 10, @@ -110,11 +105,6 @@ "ordinal": 3, "value": "" }, - "56a29701de21": { - "name": "itemCommentDraft", - "ordinal": 8, - "value": "a comment" - }, "6f50ec77f02f": { "name": "itemCommentDraft", "ordinal": 15, @@ -145,6 +135,16 @@ "ordinal": 12, "value": true }, + "9331fbfa07e4": { + "name": "itemCommentDraft", + "ordinal": 9, + "value": "a comment" + }, + "ac15f5699a77": { + "name": "itemReviewersDraft", + "ordinal": 8, + "value": "octocat" + }, "ad33e328b827": { "name": "gitlab.addIssueComment#1", "ordinal": 13, @@ -250,8 +250,8 @@ "4031bf455f49", "779d1b9a2edb", "474412c229f4", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "02b5df9521e8", diff --git a/mobile/rpc-foundation/goldens/tk-item-review-github.json b/mobile/rpc-foundation/goldens/tk-item-review-github.json index 1505ba32bde..82a001bcefa 100644 --- a/mobile/rpc-foundation/goldens/tk-item-review-github.json +++ b/mobile/rpc-foundation/goldens/tk-item-review-github.json @@ -136,11 +136,6 @@ "title": "A pull request" } }, - "1fc52836dac4": { - "name": "itemReviewersDraft", - "ordinal": 9, - "value": "octocat" - }, "22b1e4293201": { "name": "mutatingStatus", "ordinal": 28, @@ -310,11 +305,6 @@ "ordinal": 3, "value": "" }, - "56a29701de21": { - "name": "itemCommentDraft", - "ordinal": 8, - "value": "a comment" - }, "593c53b594c5": { "draft": "a comment", "error": "", @@ -581,6 +571,11 @@ "ordinal": 12, "value": true }, + "9331fbfa07e4": { + "name": "itemCommentDraft", + "ordinal": 9, + "value": "a comment" + }, "94caa29bceef": { "name": "error", "ordinal": 19, @@ -591,6 +586,11 @@ "ordinal": 18, "value": false }, + "ac15f5699a77": { + "name": "itemReviewersDraft", + "ordinal": 8, + "value": "octocat" + }, "baa2764f836f": { "name": "github.prChecks#1", "ordinal": 24, @@ -827,8 +827,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", @@ -858,8 +858,8 @@ "4031bf455f49", "04f768fb79f6", "26f442c9e2e5", - "56a29701de21", - "1fc52836dac4", + "ac15f5699a77", + "9331fbfa07e4", "3aefb3006914", "886c60a7e62e", "c29314fc4896", diff --git a/mobile/rpc-foundation/goldens/tk-linear-team-context.json b/mobile/rpc-foundation/goldens/tk-linear-team-context.json index 05b6f3cd2e2..81ba10022ae 100644 --- a/mobile/rpc-foundation/goldens/tk-linear-team-context.json +++ b/mobile/rpc-foundation/goldens/tk-linear-team-context.json @@ -4,10 +4,10 @@ "family": "tasks.linear-team-context", "namedDeltas": [], "values": { - "1288b8513745": { - "name": "linearStatesError", - "ordinal": 13, - "value": "" + "031c50459130": { + "name": "createTeamId", + "ordinal": 10, + "value": "team-1" }, "2afc4b1311c1": { "createTeamId": "team-1", @@ -22,24 +22,9 @@ } ] }, - "33218d06f656": { - "name": "linearStates", - "ordinal": 6, - "value": [] - }, - "356f2cb9a0df": { - "name": "linearStatesLoading", - "ordinal": 17, - "value": false - }, - "3abc893d377b": { - "name": "mutatingStatus", - "ordinal": 3, - "value": false - }, - "475ec9a66266": { + "38ed617d559f": { "name": "linearTeams", - "ordinal": 10, + "ordinal": 9, "value": [ { "id": "team-1", @@ -49,9 +34,44 @@ } ] }, - "5711e2717b76": { - "name": "linearStates", + "3abc893d377b": { + "name": "mutatingStatus", + "ordinal": 3, + "value": false + }, + "4fcc46dfeb77": { + "name": "linear.listTeams#1", + "ordinal": 8, + "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"linear.listTeams\"}" + }, + "5dcdc7fd7492": { + "name": "linearSubIssueTitle", + "ordinal": 4, + "value": "" + }, + "74335ecb4cd2": { + "name": "linearStatesLoading", "ordinal": 16, + "value": false + }, + "74505ce2789a": { + "name": "linearStates", + "ordinal": 5, + "value": [] + }, + "77a7eff4a3cc": { + "name": "linearStatesLoading", + "ordinal": 11, + "value": true + }, + "82b36eab5101": { + "name": "creatingTask", + "ordinal": 6, + "value": false + }, + "a14f6c361136": { + "name": "linearStates", + "ordinal": 15, "value": [ { "color": "#000000", @@ -61,24 +81,34 @@ } ] }, - "60a0395d07c7": { - "name": "linearStatesLoading", - "ordinal": 12, - "value": true - }, - "610f6c28e7a1": { - "name": "linearSubIssueTitle", - "ordinal": 5, - "value": "" - }, - "9131972798ca": { - "name": "linear.teamStates#1", - "ordinal": 15, - "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"linear.teamStates\",\"params\":{\"teamId\":\"team-1\",\"workspaceId\":\"linear-workspace\"}}" - }, - "95b075d66243": { + "b5ba6f00c4fb": { "name": "linear.teamStates#1", "ordinal": 14, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"linear.teamStates\",\"params\":{\"teamId\":\"team-1\",\"workspaceId\":\"linear-workspace\"}}" + }, + "b6bf81e9e237": { + "createTeamId": "team-1", + "states": [ + { + "color": "#000000", + "id": "state-1", + "name": "Todo", + "type": "unstarted" + } + ], + "statesLoading": false, + "teams": [ + { + "id": "team-1", + "key": "ENG", + "name": "Engineering", + "workspaceId": "linear-workspace" + } + ] + }, + "c88d134e7a42": { + "name": "linear.teamStates#1", + "ordinal": 13, "args": [ { "name": "method", @@ -116,41 +146,6 @@ } } }, - "9dc1f136772e": { - "name": "linearCommentDraft", - "ordinal": 4, - "value": "" - }, - "b164dfd464b3": { - "name": "linear.listTeams#1", - "ordinal": 9, - "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"linear.listTeams\"}" - }, - "b1adae647a3f": { - "name": "createTeamId", - "ordinal": 11, - "value": "team-1" - }, - "b6bf81e9e237": { - "createTeamId": "team-1", - "states": [ - { - "color": "#000000", - "id": "state-1", - "name": "Todo", - "type": "unstarted" - } - ], - "statesLoading": false, - "teams": [ - { - "id": "team-1", - "key": "ENG", - "name": "Engineering", - "workspaceId": "linear-workspace" - } - ] - }, "cc2ece9478f0": { "name": "actionItem", "ordinal": 1, @@ -158,9 +153,29 @@ "$rpc": "null" } }, - "ceb71a750e06": { + "db66582f88a9": { + "name": "linearStatesError", + "ordinal": 12, + "value": "" + }, + "eb79a9b3682a": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "$rpc": "undefined" + } + }, + "eda130337c99": { + "name": "detailPayload", + "ordinal": 2, + "value": { + "$rpc": "null" + } + }, + "ee01f277ffc4": { "name": "linear.listTeams#1", - "ordinal": 8, + "ordinal": 7, "args": [ { "name": "method", @@ -196,26 +211,6 @@ ] } } - }, - "e9a162defc32": { - "name": "creatingTask", - "ordinal": 7, - "value": false - }, - "eb79a9b3682a": { - "status": "fulfilled", - "startedAt": 0, - "settledAt": 0, - "value": { - "$rpc": "undefined" - } - }, - "eda130337c99": { - "name": "detailPayload", - "ordinal": 2, - "value": { - "$rpc": "null" - } } }, "recording": { @@ -224,8 +219,8 @@ { "id": "open-composer-settled", "observation": { - "sender": ["ceb71a750e06"], - "payloads": ["b164dfd464b3"], + "sender": ["ee01f277ffc4"], + "payloads": ["4fcc46dfeb77"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a" @@ -235,20 +230,19 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "475ec9a66266", - "b1adae647a3f" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "38ed617d559f", + "031c50459130" ] } }, { "id": "select-metadata-item-settled", "observation": { - "sender": ["ceb71a750e06", "95b075d66243"], - "payloads": ["b164dfd464b3", "9131972798ca"], + "sender": ["ee01f277ffc4", "c88d134e7a42"], + "payloads": ["4fcc46dfeb77", "b5ba6f00c4fb"], "settlements": { "mount": "eb79a9b3682a", "open-composer-0": "eb79a9b3682a", @@ -259,16 +253,15 @@ "cc2ece9478f0", "eda130337c99", "3abc893d377b", - "9dc1f136772e", - "610f6c28e7a1", - "33218d06f656", - "e9a162defc32", - "475ec9a66266", - "b1adae647a3f", - "60a0395d07c7", - "1288b8513745", - "5711e2717b76", - "356f2cb9a0df" + "5dcdc7fd7492", + "74505ce2789a", + "82b36eab5101", + "38ed617d559f", + "031c50459130", + "77a7eff4a3cc", + "db66582f88a9", + "a14f6c361136", + "74335ecb4cd2" ] } } diff --git a/mobile/rpc-foundation/goldens/tk-project-row-detail.json b/mobile/rpc-foundation/goldens/tk-project-row-detail.json index b1f0371bb9f..a603880f415 100644 --- a/mobile/rpc-foundation/goldens/tk-project-row-detail.json +++ b/mobile/rpc-foundation/goldens/tk-project-row-detail.json @@ -4,53 +4,20 @@ "family": "tasks.project-row-detail", "namedDeltas": [], "values": { - "0679b27a119b": { - "name": "projectFieldDrafts", - "ordinal": 11, - "value": {} - }, - "118d9662d37f": { + "0a6c63ec0fc1": { "name": "github.project.workItemDetailsBySlug#1", - "ordinal": 16, + "ordinal": 15, "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"github.project.workItemDetailsBySlug\",\"params\":{\"owner\":\"owner\",\"repo\":\"repo\",\"host\":\"github.enterprise.test\",\"number\":1,\"type\":\"issue\"}}" }, - "1e161db29c89": { - "name": "projectRowDetail", - "ordinal": 17, - "value": { - "assignees": [], - "baseSha": "base-sha", - "body": "body", - "checks": [], - "comments": [], - "files": [], - "headSha": "head-sha", - "labels": [], - "latestReviews": [], - "provider": "github", - "pullRequestId": "PR_kwDO", - "reviewDecision": { - "$rpc": "undefined" - }, - "reviewRequests": [] - } - }, - "2ee1c7329449": { - "name": "projectRowDetail", - "ordinal": 12, - "value": { - "$rpc": "null" - } - }, - "31fcc93f02da": { + "0d5e8bc85abb": { "name": "projectEditingCommentDraft", - "ordinal": 9, + "ordinal": 8, "value": "" }, - "368311fc2981": { - "name": "projectCommentDraft", - "ordinal": 7, - "value": "" + "34aecaef096a": { + "name": "projectRowDetailLoading", + "ordinal": 17, + "value": false }, "3a42a92c5487": { "name": "projectBodyDraft", @@ -64,36 +31,9 @@ "$rpc": "null" } }, - "4f23116da7f6": { - "name": "projectReviewersDraft", - "ordinal": 10, - "value": "" - }, - "561861a537bb": { - "name": "projectRowDetailLoading", - "ordinal": 18, - "value": false - }, - "5cebe6c14680": { - "name": "prFileLoadingPath", - "ordinal": 4, - "value": { - "$rpc": "null" - } - }, - "60012e7abb60": { - "name": "prFileCommentDrafts", - "ordinal": 2, - "value": {} - }, - "7ca2bb47ab1c": { - "name": "prFileContents", - "ordinal": 3, - "value": {} - }, - "899221be28d8": { + "55361bf207c6": { "name": "github.project.workItemDetailsBySlug#1", - "ordinal": 15, + "ordinal": 14, "args": [ { "name": "method", @@ -152,6 +92,40 @@ } } }, + "5b08d6631c0c": { + "name": "projectRowDetailError", + "ordinal": 12, + "value": "" + }, + "5cebe6c14680": { + "name": "prFileLoadingPath", + "ordinal": 4, + "value": { + "$rpc": "null" + } + }, + "60012e7abb60": { + "name": "prFileCommentDrafts", + "ordinal": 2, + "value": {} + }, + "6a0930bd2fdb": { + "name": "projectEditingCommentId", + "ordinal": 7, + "value": { + "$rpc": "null" + } + }, + "7ca2bb47ab1c": { + "name": "prFileContents", + "ordinal": 3, + "value": {} + }, + "93c5cbde2045": { + "name": "projectRowDetailLoading", + "ordinal": 13, + "value": true + }, "9911dd53d1d7": { "name": "projectTitleDraft", "ordinal": 5, @@ -178,18 +152,44 @@ "error": "", "loading": false }, - "b63d5911050c": { - "name": "projectRowDetailError", - "ordinal": 13, + "bf07b693e877": { + "name": "projectRowDetail", + "ordinal": 16, + "value": { + "assignees": [], + "baseSha": "base-sha", + "body": "body", + "checks": [], + "comments": [], + "files": [], + "headSha": "head-sha", + "labels": [], + "latestReviews": [], + "provider": "github", + "pullRequestId": "PR_kwDO", + "reviewDecision": { + "$rpc": "undefined" + }, + "reviewRequests": [] + } + }, + "c82fb4f46067": { + "name": "projectReviewersDraft", + "ordinal": 9, "value": "" }, - "c0e2c37d8abf": { - "name": "projectEditingCommentId", - "ordinal": 8, + "de8ce98bdd63": { + "name": "projectRowDetail", + "ordinal": 11, "value": { "$rpc": "null" } }, + "e5129a14b6e4": { + "name": "projectFieldDrafts", + "ordinal": 10, + "value": {} + }, "eb79a9b3682a": { "status": "fulfilled", "startedAt": 0, @@ -197,11 +197,6 @@ "value": { "$rpc": "undefined" } - }, - "f6a5085dd8e9": { - "name": "projectRowDetailLoading", - "ordinal": 14, - "value": true } }, "recording": { @@ -210,8 +205,8 @@ { "id": "mounted", "observation": { - "sender": ["899221be28d8"], - "payloads": ["118d9662d37f"], + "sender": ["55361bf207c6"], + "payloads": ["0a6c63ec0fc1"], "settlements": { "mount": "eb79a9b3682a" }, @@ -223,16 +218,15 @@ "5cebe6c14680", "9911dd53d1d7", "3a42a92c5487", - "368311fc2981", - "c0e2c37d8abf", - "31fcc93f02da", - "4f23116da7f6", - "0679b27a119b", - "2ee1c7329449", - "b63d5911050c", - "f6a5085dd8e9", - "1e161db29c89", - "561861a537bb" + "6a0930bd2fdb", + "0d5e8bc85abb", + "c82fb4f46067", + "e5129a14b6e4", + "de8ce98bdd63", + "5b08d6631c0c", + "93c5cbde2045", + "bf07b693e877", + "34aecaef096a" ] } } diff --git a/mobile/src/components/NewWorktreeModal.test.tsx b/mobile/src/components/NewWorktreeModal.test.tsx index 201ad65e052..b44507b5157 100644 --- a/mobile/src/components/NewWorktreeModal.test.tsx +++ b/mobile/src/components/NewWorktreeModal.test.tsx @@ -68,6 +68,9 @@ import '../../../src/shared/execution-host' import type { ExecutionHostId } from '../../../src/shared/execution-host' import { NewWorktreeModal } from './NewWorktreeModal' +import { publishPageDeviceStore } from '../mobile-web-shell/bridge/page-device-store' +import { resetDurableDraftFieldsForTests } from '../drafts/durable-draft-fields' +import { publishInMemoryDeviceStore } from '../drafts/in-memory-device-store.test-support' import { findAllByHostType } from '../test-support/react-test-renderer-host-nodes' @@ -347,3 +350,73 @@ describe('NewWorktreeModal project targets', () => { expect(sourceInputs(renderer).map((input) => input.props.value)).toEqual(['', '']) }) }) + +describe('NewWorktreeModal note draft', () => { + // The shell's draft table outlives the page; nothing else does. + const table = new Map() + let renderer: ReactTestRenderer | null = null + + async function open(): Promise { + const client = requestsOnly( + vi.fn((method: string) => + method === 'repo.list' ? replied({ repos }) : new Promise(() => {}) + ) + ) + await act(async () => { + renderer = create( + createElement(NewWorktreeModal, { + visible: true, + client, + hostId: 'host-1', + onCreated: () => {}, + onClose: () => {}, + openExternalUrl: () => {} + }) + ) + await vi.advanceTimersByTimeAsync(0) + }) + return renderer! + } + + const noteInput = (opened: ReactTestRenderer) => + findAllByHostType(opened.root, 'TextInput').find( + (node) => node.props.placeholder === 'Write a note' + )! + const optionsExpanded = (opened: ReactTestRenderer) => + opened.root.find((node) => node.props.title === 'Options' && 'expanded' in node.props).props + .expanded + + // A kill: the page and its memory go, the store stays. + function kill(): void { + act(() => renderer?.unmount()) + renderer = null + resetDurableDraftFieldsForTests() + } + + beforeEach(() => { + vi.useFakeTimers() + setCachedRepos('host-1', repos) + resetDurableDraftFieldsForTests() + publishInMemoryDeviceStore(table) + }) + + afterEach(() => { + kill() + table.clear() + publishPageDeviceStore(null) + vi.useRealTimers() + }) + + it('brings the note back after a kill, with Options open so it is not sent unseen', async () => { + const typed = await open() + act(() => noteInput(typed).props.onChangeText('pairing with Ama on the flaky test')) + await act(async () => { + await vi.advanceTimersByTimeAsync(1000) + }) + kill() + + const reopened = await open() + expect(noteInput(reopened).props.value).toBe('pairing with Ama on the flaky test') + expect(optionsExpanded(reopened)).toBe(true) + }) +}) diff --git a/mobile/src/components/NewWorktreeModal.tsx b/mobile/src/components/NewWorktreeModal.tsx index 3b6ba3870c4..11bf01b970f 100644 --- a/mobile/src/components/NewWorktreeModal.tsx +++ b/mobile/src/components/NewWorktreeModal.tsx @@ -16,6 +16,8 @@ import { buildRetiredWorktreeNamesRefreshKey, useRetiredWorktreeNames } from '../worktree/use-retired-worktree-names' +import { durableDraftRowKey } from '../drafts/durable-draft-rows' +import { useDurableDraftField } from '../drafts/durable-draft-fields' import { BottomDrawerModalHost } from './bottom-drawer/bottom-drawer-modal-host' import { getMobileWorkspaceRepoBadgeColor, @@ -82,7 +84,12 @@ function NewWorktreeModalContent(props: NewWorktreeModalProps) { const repoServer = selectedRepo ? serverOf(selectedRepo) : undefined const client = repoServer ? (serverClients?.get(repoServer) ?? null) : desktopClient const navigation = useNewWorktreeDrawerNavigation(visible) - const [note, setNote] = useState('') + // Kept per desktop until a create succeeds, and read only once the form shows. The host is in the key + // because the tablet sidebar's native host list has no shell to bind it. + const [note, setNote] = useDurableDraftField( + visible ? durableDraftRowKey('workspaceCreate', '', hostId ?? '') : null, + 'note' + ) const [error, setError] = useState('') const runtime = useNewWorkspaceRuntimeContext(client, visible, hostId, repoServer) const repoRuntime = useNewWorktreeRuntimeCapabilities(client, visible) @@ -103,6 +110,12 @@ function NewWorktreeModalContent(props: NewWorktreeModalProps) { visible }) const setupScript = useNewWorkspaceSetupScript({ client, selectedRepo }) + // A kept note opens Options until the user folds them, so it isn't sent unseen. + const [noteOptions, setNoteOptions] = useState<'closed' | 'open' | 'folded'>('closed') + if (note && noteOptions === 'closed') { + setNoteOptions('open') + } + const showOptions = setupScript.showAdvanced || noteOptions === 'open' const selectedRepoWorktreeBranches = useMemo( () => getComposerRepoWorktreeBranches(existingWorktrees ?? [], selectedRepo?.id ?? null), [existingWorktrees, selectedRepo] @@ -161,7 +174,11 @@ function NewWorktreeModalContent(props: NewWorktreeModalProps) { getAgentLaunchSupport, transitionDrawer: navigation.transitionDrawer, setError, - onCreated: (worktreeId, name, warning) => onCreated(worktreeId, name, warning, repoServer), + onCreated: (worktreeId, name, warning) => { + // A note typed in a reopened form while this create ran is not the one it sent. + setNote((current) => (current === note ? '' : current)) + onCreated(worktreeId, name, warning, repoServer) + }, onClose }) @@ -254,7 +271,7 @@ function NewWorktreeModalContent(props: NewWorktreeModalProps) { sshGate={executionTarget.sshGate} composer={composer} selectedAgent={agentSelection.selectedAgent} - showAdvanced={setupScript.showAdvanced} + showAdvanced={showOptions} note={note} setupCommand={setupScript.setupCommand} setupSource={setupScript.setupSource} @@ -272,7 +289,12 @@ function NewWorktreeModalContent(props: NewWorktreeModalProps) { onClearError={() => setError('')} onConnect={() => void executionTarget.connect()} onOpenAgent={() => openPicker('agent')} - onShowAdvancedChange={setupScript.setShowAdvanced} + onShowAdvancedChange={(show) => { + if (!show) { + setNoteOptions('folded') + } + setupScript.setShowAdvanced(show) + }} onNoteChange={setNote} onSetupDecisionChange={setupScript.setSetupDecisionChoice} onRunSetupChange={setupScript.setRunSetup} diff --git a/mobile/src/drafts/document-edit-draft-rows.ts b/mobile/src/drafts/document-edit-draft-rows.ts index 53b912634f0..81e3ea467a2 100644 --- a/mobile/src/drafts/document-edit-draft-rows.ts +++ b/mobile/src/drafts/document-edit-draft-rows.ts @@ -1,11 +1,8 @@ import * as z from 'zod' -import { - DEVICE_STORE_MAX_VALUE_LENGTH, - encodeDeviceStoreValue -} from '../device-store/device-store-value-codec' import { durableDraftRow, durableDraftRowKey, + fitsDeviceStore, pageDraftRowBackend, resetDurableDraftRowsForTests, type DurableDraftRow @@ -41,16 +38,6 @@ export function fileEditDraftKey(scope: DocumentEditScope, path: string): string return durableDraftRowKey('fileEdit', scope.worktreeId, scopedId(scope, path)) } -// A value past the store's cap would be refused and leave older edits behind, so it is not kept at all. -function fitsDeviceStore(draft: DocumentEditDraft): boolean { - const json = JSON.stringify(draft) - // At most 3 UTF-8 bytes per code unit, gzip barely grows any input, base64 adds a third: most documents skip the encode. - if (json.length * 4 + 1024 <= DEVICE_STORE_MAX_VALUE_LENGTH) { - return true - } - return encodeDeviceStoreValue(draft).length <= DEVICE_STORE_MAX_VALUE_LENGTH -} - function slotFor(key: string): Slot { let slot = slots.get(key) if (!slot) { diff --git a/mobile/src/drafts/durable-draft-fields.test.tsx b/mobile/src/drafts/durable-draft-fields.test.tsx new file mode 100644 index 00000000000..9e3b4882f59 --- /dev/null +++ b/mobile/src/drafts/durable-draft-fields.test.tsx @@ -0,0 +1,155 @@ +import { createElement } from 'react' +import { act, create, type ReactTestRenderer } from 'react-test-renderer' +import { afterEach, expect, it, vi } from 'vitest' +import { + publishPageDeviceStore, + readPageDeviceStore +} from '../mobile-web-shell/bridge/page-device-store' +import { encodeDeviceStoreValue } from '../device-store/device-store-value-codec' +import { resetDurableDraftFieldsForTests, useDurableDraftField } from './durable-draft-fields' +import { publishInMemoryDeviceStore } from './in-memory-device-store.test-support' + +const KEY = 'draft:prEdit:wt:main' +let renderer: ReactTestRenderer | null = null +let field: ReturnType | null = null + +function Field() { + field = useDurableDraftField(KEY, 'body') + return null +} + +afterEach(() => { + act(() => renderer?.unmount()) + renderer = null + resetDurableDraftFieldsForTests() + publishPageDeviceStore(null) +}) + +it('keeps a field the user cleared while the saved copy was still being read', async () => { + // The shell holds an earlier draft, and its read answers only when released. + let release!: () => void + const held = new Promise((resolve) => { + release = resolve + }) + publishPageDeviceStore({ + available: () => true, + read: async () => { + await held + return { status: 'ok', values: [encodeDeviceStoreValue({ body: 'old saved text' })] } + }, + write: async () => ({ written: true }) + }) + await act(async () => { + renderer = create(createElement(Field)) + }) + + act(() => field![1]('')) + await act(async () => { + release() + await held + }) + + expect(field![0]).toBe('') +}) + +it('drops an older draft once the text grows past what the store can hold', async () => { + vi.useFakeTimers() + const table = new Map() + publishInMemoryDeviceStore(table) + const open = async () => { + await act(async () => { + renderer = create(createElement(Field)) + await vi.advanceTimersByTimeAsync(0) + }) + } + const kill = () => { + act(() => renderer?.unmount()) + renderer = null + resetDurableDraftFieldsForTests() + } + await open() + act(() => field![1]('a short description')) + await act(async () => { + await vi.advanceTimersByTimeAsync(1000) + }) + // Text that doesn't compress, well past the store's 512 KiB cap once encoded. + let seed = 7 + const huge = Array.from({ length: 900_000 }, () => { + seed ^= seed << 13 + seed ^= seed >>> 17 + seed ^= seed << 5 + return String.fromCharCode(33 + ((seed >>> 0) % 90)) + }).join('') + act(() => field![1](huge)) + await act(async () => { + await vi.advanceTimersByTimeAsync(1000) + }) + kill() + + await open() + expect(field![0]).toBe('') + vi.useRealTimers() +}) + +it('saves text typed while the store could not be read once the store answers again', async () => { + vi.useFakeTimers() + const table = new Map() + publishInMemoryDeviceStore(table) + const store = readPageDeviceStore()! + let readFails = true + publishPageDeviceStore({ + ...store, + read: async (name, keys) => (readFails ? { status: 'unavailable' } : store.read(name, keys)) + }) + await act(async () => { + renderer = create(createElement(Field)) + await vi.advanceTimersByTimeAsync(0) + }) + act(() => field![1]('typed while the store was down')) + readFails = false + await act(async () => { + await vi.advanceTimersByTimeAsync(15_000) + }) + act(() => renderer?.unmount()) + renderer = null + resetDurableDraftFieldsForTests() + + await act(async () => { + renderer = create(createElement(Field)) + await vi.advanceTimersByTimeAsync(0) + }) + expect(field![0]).toBe('typed while the store was down') + vi.useRealTimers() +}) + +it('does not bring back a saved draft the user cleared while the store could not be read', async () => { + vi.useFakeTimers() + const table = new Map([[KEY, encodeDeviceStoreValue({ body: 'already sent text' })]]) + publishInMemoryDeviceStore(table) + const store = readPageDeviceStore()! + let readFails = true + publishPageDeviceStore({ + ...store, + read: async (name, keys) => (readFails ? { status: 'unavailable' } : store.read(name, keys)) + }) + await act(async () => { + renderer = create(createElement(Field)) + await vi.advanceTimersByTimeAsync(0) + }) + // The send landed: its success handler clears a field that is already empty on this page. + act(() => field![1]('')) + readFails = false + await act(async () => { + await vi.advanceTimersByTimeAsync(15_000) + }) + act(() => renderer?.unmount()) + renderer = null + resetDurableDraftFieldsForTests() + + await act(async () => { + renderer = create(createElement(Field)) + await vi.advanceTimersByTimeAsync(0) + }) + expect(field![0]).toBe('') + vi.useRealTimers() +}) diff --git a/mobile/src/drafts/durable-draft-fields.ts b/mobile/src/drafts/durable-draft-fields.ts new file mode 100644 index 00000000000..70d550ab760 --- /dev/null +++ b/mobile/src/drafts/durable-draft-fields.ts @@ -0,0 +1,148 @@ +import { useCallback, useSyncExternalStore, type SetStateAction } from 'react' +import * as z from 'zod' +import { + durableDraftRow, + fitsDeviceStore, + pageDraftRowBackend, + resetDurableDraftRowsForTests, + type DurableDraftRow +} from './durable-draft-rows' + +// A row's typed text fields; an empty field is left out, and a row with none is removed. +type DraftFields = Readonly> + +const savedFieldsSchema = z.record(z.string(), z.string()) + +type Slot = { + fields: DraftFields + // Fields set on this page, cleared ones included; a read that lands later never overwrites them. + touched: Set + // The shortest JSON length found over the store's cap: longer text is not encoded again on every save. + overCap: number + listeners: Set<() => void> + row: DurableDraftRow +} + +// The page's copy of each row, so a form that closes and reopens shows its text without a read. +const slots = new Map() + +function notify(slot: Slot): void { + for (const listener of slot.listeners) { + listener() + } +} + +function slotFor(key: string): Slot { + const existing = slots.get(key) + if (existing) { + return existing + } + const slot: Slot = { + fields: {}, + touched: new Set(), + overCap: Infinity, + listeners: new Set(), + row: durableDraftRow(key, { + backend: () => pageDraftRowBackend(key), + // Text too big for the store stays in memory and removes the row, so an older, smaller draft can't come back. + snapshot: () => { + if (Object.keys(slot.fields).length === 0) { + return null + } + const length = JSON.stringify(slot.fields).length + if (length >= slot.overCap) { + return null + } + if (fitsDeviceStore(slot.fields)) { + return slot.fields + } + slot.overCap = length + return null + }, + restore: (saved) => { + const parsed = savedFieldsSchema.safeParse(saved) + if (!parsed.success) { + return + } + // Text typed or cleared before the read landed wins over the saved copy. + const restored = Object.entries(parsed.data).filter( + ([field, text]) => text && !slot.touched.has(field) + ) + if (restored.length === 0) { + return + } + slot.fields = { ...Object.fromEntries(restored), ...slot.fields } + notify(slot) + } + }) + } + slots.set(key, slot) + return slot +} + +/** Sets one field of a row, wherever it is shown; a send that settles after its form closed clears its own row. */ +export function updateDurableDraftField( + key: string, + field: string, + update: SetStateAction +): void { + const slot = slotFor(key) + const current = slot.fields[field] ?? '' + const next = typeof update === 'function' ? update(current) : update + // Even an unchanged value is the user's choice: a read still pending must not overwrite it. + slot.touched.add(field) + if (next === current) { + // A clear on a row the page couldn't read yet still removes what the store holds, so sent text can't come back. + if (!next && Object.keys(slot.fields).length === 0) { + slot.row.save('immediate') + } + return + } + const rest = Object.fromEntries(Object.entries(slot.fields).filter(([name]) => name !== field)) + slot.fields = next ? { ...rest, [field]: next } : rest + notify(slot) + // An emptied row is written at once, so sent text can't come back. + slot.row.save(Object.keys(slot.fields).length > 0 ? 'deferred' : 'immediate') +} + +/** + * One typed field kept in a draft row: it survives the form closing and the page being killed, and + * comes back only into a field still empty. A null key (nothing to type into) holds nothing. + */ +export function useDurableDraftField( + key: string | null, + field: string +): readonly [string, (update: SetStateAction) => void] { + const subscribe = useCallback( + (onChange: () => void) => { + if (!key) { + return () => {} + } + const slot = slotFor(key) + slot.listeners.add(onChange) + // Read once per page; a read the store dropped is retried by the next form that opens the row. + void slot.row.load() + return () => { + slot.listeners.delete(onChange) + } + }, + [key] + ) + const read = () => (key ? (slots.get(key)?.fields[field] ?? '') : '') + const value = useSyncExternalStore(subscribe, read, read) + // Bound to this key, so a send that settles after the user moved on clears the row it came from. + const setValue = useCallback( + (update: SetStateAction) => { + if (key) { + updateDurableDraftField(key, field, update) + } + }, + [field, key] + ) + return [value, setValue] as const +} + +export function resetDurableDraftFieldsForTests(): void { + slots.clear() + resetDurableDraftRowsForTests() +} diff --git a/mobile/src/drafts/durable-draft-rows.ts b/mobile/src/drafts/durable-draft-rows.ts index 4d0dbe5c2e6..06be8f74839 100644 --- a/mobile/src/drafts/durable-draft-rows.ts +++ b/mobile/src/drafts/durable-draft-rows.ts @@ -3,6 +3,7 @@ import { type PageDeviceStore } from '../mobile-web-shell/bridge/page-device-store' import { + DEVICE_STORE_MAX_VALUE_LENGTH, decodeDeviceStoreValue, encodeDeviceStoreValue } from '../device-store/device-store-value-codec' @@ -39,6 +40,8 @@ type Row = { // Every read and write of the row runs in order, the load first. chain: Promise state: 'pending' | 'loaded' + // After a failed read, no hook or save reads again until then; the text stays in memory meanwhile. + retryReadAt: number // What the backend holds; undefined after a failed write, so the next save cannot match it. written: string | undefined timer: ReturnType | null @@ -47,6 +50,19 @@ type Row = { const rows = new Map() +// One retry per row at most this often, however many hooks open it or saves land. +const READ_RETRY_MS = 10_000 + +/** A value past the store's cap is refused and would leave an older value behind, so owners keep none instead. */ +export function fitsDeviceStore(value: unknown): boolean { + const json = JSON.stringify(value) + // At most 3 UTF-8 bytes per code unit, gzip barely grows any input, base64 adds a third: most values skip the encode. + if (json.length * 4 + 1024 <= DEVICE_STORE_MAX_VALUE_LENGTH) { + return true + } + return encodeDeviceStoreValue(value).length <= DEVICE_STORE_MAX_VALUE_LENGTH +} + // The store refuses keys past 512 characters; a long worktree path or id is hashed instead. const MAX_KEY_LENGTH = 512 @@ -115,14 +131,15 @@ function enqueue(row: Row, step: () => Promise): Promise { return row.chain } -async function load(row: Row): Promise { - if (row.state !== 'pending') { +async function load(row: Row, ignoreRetryWait = false): Promise { + if (row.state !== 'pending' || (!ignoreRetryWait && Date.now() < row.retryReadAt)) { return } row.backend ??= row.owner.backend() const read = await row.backend.read() if (!read.ok) { - // A dropped or refused read is retried, backend re-picked, at the next save; until then the text stays in memory. + // A dropped or refused read is retried later, backend re-picked; until then the text stays in memory. + row.retryReadAt = Date.now() + READ_RETRY_MS row.backend = null return } @@ -133,9 +150,11 @@ async function load(row: Row): Promise { } } -async function write(row: Row): Promise { - await load(row) +async function write(row: Row, hiding: boolean): Promise { + await load(row, hiding) if (row.state !== 'loaded' || !row.backend) { + // Still unread: save again once a read may be retried, so the text doesn't stay only in memory. + row.timer ??= setTimeout(() => flush(row), Math.max(0, row.retryReadAt - Date.now())) return } const value = row.owner.snapshot() ?? null @@ -149,12 +168,12 @@ async function write(row: Row): Promise { } } -function flush(row: Row): void { +function flush(row: Row, hiding = false): void { if (row.timer !== null) { clearTimeout(row.timer) row.timer = null } - void enqueue(row, () => write(row)) + void enqueue(row, () => write(row, hiding)) } // The app going to the background may be the last chance before it is killed, so pending typing saves then. @@ -164,7 +183,8 @@ function flushPendingOnHide(): void { } for (const row of rows.values()) { if (row.timer !== null) { - flush(row) + // Possibly the last chance before a kill, so a read waiting to be retried is tried now. + flush(row, true) } } } @@ -186,6 +206,7 @@ export function durableDraftRow(key: string, owner: DurableDraftRowOwner): Durab backend: null, chain: Promise.resolve(), state: 'pending', + retryReadAt: 0, written: undefined, timer: null, handle: { diff --git a/mobile/src/drafts/in-memory-device-store.test-support.ts b/mobile/src/drafts/in-memory-device-store.test-support.ts new file mode 100644 index 00000000000..eab27b59619 --- /dev/null +++ b/mobile/src/drafts/in-memory-device-store.test-support.ts @@ -0,0 +1,27 @@ +import { DEVICE_STORE_MAX_VALUE_LENGTH } from '../device-store/device-store-value-codec' +import { publishPageDeviceStore } from '../mobile-web-shell/bridge/page-device-store' + +/** Grants the page a device store backed by `table`, which outlives the page and keeps the shell's value cap. */ +export function publishInMemoryDeviceStore(table: Map): void { + publishPageDeviceStore({ + available: () => true, + read: async (_table, keys) => ({ + status: 'ok', + values: keys.map((key) => table.get(key) ?? null) + }), + write: async (_table, ops) => { + // Like the shell, a value over the cap refuses the whole call. + if (ops.some((op) => (op.value?.length ?? 0) > DEVICE_STORE_MAX_VALUE_LENGTH)) { + return { written: false, refusal: 'too-large' } + } + for (const op of ops) { + if (op.value === null) { + table.delete(op.key) + } else { + table.set(op.key, op.value) + } + } + return { written: true } + } + }) +} diff --git a/mobile/src/drafts/use-document-edit-draft.test.tsx b/mobile/src/drafts/use-document-edit-draft.test.tsx index 166243c1603..a941c117bd4 100644 --- a/mobile/src/drafts/use-document-edit-draft.test.tsx +++ b/mobile/src/drafts/use-document-edit-draft.test.tsx @@ -2,6 +2,7 @@ import { createElement } from 'react' import { act, create, type ReactTestRenderer } from 'react-test-renderer' import { afterEach, beforeEach, expect, it, vi } from 'vitest' import { publishPageDeviceStore } from '../mobile-web-shell/bridge/page-device-store' +import { publishInMemoryDeviceStore } from './in-memory-device-store.test-support' import { dropDocumentEditDraft, resetDocumentEditDraftsForTests } from './document-edit-draft-rows' import { useDocumentEditDraft } from './use-document-edit-draft' @@ -42,23 +43,7 @@ function kill(): void { beforeEach(() => { vi.useFakeTimers() - publishPageDeviceStore({ - available: () => true, - read: async (_table, keys) => ({ - status: 'ok', - values: keys.map((key) => table.get(key) ?? null) - }), - write: async (_table, ops) => { - for (const op of ops) { - if (op.value === null) { - table.delete(op.key) - } else { - table.set(op.key, op.value) - } - } - return { written: true } - } - }) + publishInMemoryDeviceStore(table) }) afterEach(() => { diff --git a/mobile/src/tasks/github-review-publication.test.tsx b/mobile/src/tasks/github-review-publication.test.tsx index 6b8eecf228c..27ef19d09c3 100644 --- a/mobile/src/tasks/github-review-publication.test.tsx +++ b/mobile/src/tasks/github-review-publication.test.tsx @@ -11,6 +11,7 @@ import type { TaskItem } from './mobile-tasks-project-workspace-types' import { useMobileTasksHostedCommentReviewActions } from './use-mobile-tasks-hosted-comment-review-actions' import { useMobileTasksMutation } from './use-mobile-tasks-workspace-and-project-state' import { useMobileTasksItemState } from './use-mobile-tasks-item-state' +import { useTaskCommentDraft } from './task-draft-rows' import { useMobileTasksItemDetailLoading } from './use-mobile-tasks-item-detail-loading' vi.mock('./mobile-tasks-dependencies', async () => ({ @@ -60,6 +61,7 @@ async function mount(loadDetails = false) { itemState.readDetailPayload, itemState.reconcilePrFileConnection ) + const [itemCommentDraft, setItemCommentDraft] = useTaskCommentDraft(selection.actionItem) const mutation = useMobileTasksMutation() const [items, setItems] = useState([selected]) const [error, setError] = useState('') @@ -70,6 +72,8 @@ async function mount(loadDetails = false) { ...selection, ...mutation, ...itemState, + itemCommentDraft, + setItemCommentDraft, client, tasksSupported: true, setError, diff --git a/mobile/src/tasks/task-draft-rows.test.tsx b/mobile/src/tasks/task-draft-rows.test.tsx new file mode 100644 index 00000000000..a8b07223c71 --- /dev/null +++ b/mobile/src/tasks/task-draft-rows.test.tsx @@ -0,0 +1,99 @@ +import { createElement } from 'react' +import { act, create, type ReactTestRenderer } from 'react-test-renderer' +import { afterEach, beforeEach, expect, it, vi } from 'vitest' +import { publishPageDeviceStore } from '../mobile-web-shell/bridge/page-device-store' +import { resetDurableDraftFieldsForTests } from '../drafts/durable-draft-fields' +import { publishInMemoryDeviceStore } from '../drafts/in-memory-device-store.test-support' +import { item } from './github-task-identity.test-fixture' +import type { ActionableTaskItem } from './mobile-tasks-project-workspace-types' +import { useTaskCommentDraft, useTaskCreateDraft } from './task-draft-rows' + +type Screen = { + comment: ReturnType + create: ReturnType +} + +// The shell's draft table outlives the page; nothing else does. +const table = new Map() +let renderer: ReactTestRenderer | null = null +let screen: Screen | null = null + +function Tasks(props: { item: ActionableTaskItem | null }) { + screen = { comment: useTaskCommentDraft(props.item), create: useTaskCreateDraft(true) } + return null +} + +async function open(selected: ActionableTaskItem | null): Promise { + await act(async () => { + if (renderer) { + renderer.update(createElement(Tasks, { item: selected })) + } else { + renderer = create(createElement(Tasks, { item: selected })) + } + await vi.advanceTimersByTimeAsync(0) + }) + return screen! +} + +async function settle(): Promise { + await act(async () => { + await vi.advanceTimersByTimeAsync(1000) + }) +} + +// A kill: the page and its memory go, the store stays. +function kill(): void { + act(() => renderer?.unmount()) + renderer = null + resetDurableDraftFieldsForTests() +} + +beforeEach(() => { + vi.useFakeTimers() + publishInMemoryDeviceStore(table) +}) + +afterEach(() => { + kill() + table.clear() + publishPageDeviceStore(null) + vi.useRealTimers() +}) + +it('brings a comment back to the item it was typed on after a kill', async () => { + const typed = await open(item('acme')) + act(() => typed.comment[1]('Looks good, one nit')) + await settle() + kill() + + expect((await open(item('other'))).comment[0]).toBe('') + expect((await open(item('acme'))).comment[0]).toBe('Looks good, one nit') +}) + +it('does not bring back a comment whose send landed after the user moved on', async () => { + const typed = await open(item('acme')) + act(() => typed.comment[1]('Looks good, one nit')) + await settle() + const clearSent = typed.comment[1] + + await open(item('other')) + act(() => clearSent((current) => (current.trim() === 'Looks good, one nit' ? '' : current))) + await settle() + kill() + + expect((await open(item('acme'))).comment[0]).toBe('') +}) + +it('brings the New issue title and body back after a kill', async () => { + const typed = await open(null) + act(() => { + typed.create.setCreateTitle('Crash on launch') + typed.create.setCreateBody('Steps: open the app') + }) + await settle() + kill() + + const reopened = await open(null) + expect(reopened.create.createTitle).toBe('Crash on launch') + expect(reopened.create.createBody).toBe('Steps: open the app') +}) diff --git a/mobile/src/tasks/task-draft-rows.ts b/mobile/src/tasks/task-draft-rows.ts new file mode 100644 index 00000000000..9a9d25f0d89 --- /dev/null +++ b/mobile/src/tasks/task-draft-rows.ts @@ -0,0 +1,35 @@ +import { durableDraftRowKey } from '../drafts/durable-draft-rows' +import { useDurableDraftField } from '../drafts/durable-draft-fields' +import { githubTaskKey } from './github-task-identity' +import type { ActionableTaskItem } from './mobile-tasks-project-workspace-types' +import type { GitHubProjectRow } from './mobile-tasks-view-state-types' + +/** The item a status edit or refresh hands over as a new object is still the same item. */ +export function taskItemIdentity(item: ActionableTaskItem): string { + return item.provider === 'github' ? `github:${githubTaskKey(item.source)}` : item.key +} + +// Tasks rows are host-scoped (`''` worktree part); the shell binds the host. +function taskCommentDraftKey(id: string | null): string | null { + return id === null ? null : durableDraftRowKey('taskComment', '', id) +} + +const TASK_CREATE_DRAFT_KEY = durableDraftRowKey('taskCreate', '', '') + +/** The open item's comment box, kept per item. */ +export function useTaskCommentDraft(item: ActionableTaskItem | null) { + return useDurableDraftField(taskCommentDraftKey(item && taskItemIdentity(item)), 'text') +} + +/** A GitHub project row's comment box, kept per row. */ +export function useProjectRowCommentDraft(row: GitHubProjectRow | null) { + return useDurableDraftField(taskCommentDraftKey(row && `githubProject:${row.id}`), 'text') +} + +/** The New issue sheet's title and body, kept until a create succeeds and read only once the sheet opens. */ +export function useTaskCreateDraft(open: boolean) { + const key = open ? TASK_CREATE_DRAFT_KEY : null + const [createTitle, setCreateTitle] = useDurableDraftField(key, 'title') + const [createBody, setCreateBody] = useDurableDraftField(key, 'body') + return { createTitle, setCreateTitle, createBody, setCreateBody } +} diff --git a/mobile/src/tasks/use-mobile-task-comment-send-outcome.ts b/mobile/src/tasks/use-mobile-task-comment-send-outcome.ts index f0225f11fe1..ac847f9fc26 100644 --- a/mobile/src/tasks/use-mobile-task-comment-send-outcome.ts +++ b/mobile/src/tasks/use-mobile-task-comment-send-outcome.ts @@ -5,7 +5,7 @@ import { useRef, useState } from './mobile-tasks-dependencies' -import { githubTaskKey } from './github-task-identity' +import { taskItemIdentity } from './task-draft-rows' import type { ActionableTaskItem } from './mobile-tasks-project-workspace-types' import type { DetailPayload } from './mobile-tasks-provider-detail-types' import { isRpcDeliveryUnknown } from '../transport/rpc/rpc-delivery-ambiguity' @@ -33,7 +33,7 @@ type CommentSendOutcome = { } function itemIdentity(item: ActionableTaskItem | null): string | null { - return item?.provider === 'github' ? githubTaskKey(item.source) : (item?.key ?? null) + return item && taskItemIdentity(item) } function sameCommentText(a: string, b: string): boolean { diff --git a/mobile/src/tasks/use-mobile-tasks-hosted-comment-review-actions.tsx b/mobile/src/tasks/use-mobile-tasks-hosted-comment-review-actions.tsx index b2399a1c5ee..21908343735 100644 --- a/mobile/src/tasks/use-mobile-tasks-hosted-comment-review-actions.tsx +++ b/mobile/src/tasks/use-mobile-tasks-hosted-comment-review-actions.tsx @@ -160,7 +160,7 @@ export function useMobileTasksHostedCommentReviewActions< finish() } }, - [claimPublication, client, itemCommentDraft, tryBeginMutation] + [claimPublication, client, itemCommentDraft, setItemCommentDraft, tryBeginMutation] ) const copyTaskLink = useCallback( diff --git a/mobile/src/tasks/use-mobile-tasks-item-state.tsx b/mobile/src/tasks/use-mobile-tasks-item-state.tsx index 09470fdf41a..c20f71c2f7c 100644 --- a/mobile/src/tasks/use-mobile-tasks-item-state.tsx +++ b/mobile/src/tasks/use-mobile-tasks-item-state.tsx @@ -27,7 +27,6 @@ export function useMobileTasksItemState() { }, []) const [itemTitleDraft, setItemTitleDraft] = useState('') const [itemBodyDraft, setItemBodyDraft] = useState('') - const [itemCommentDraft, setItemCommentDraft] = useState('') const [itemAddLabelsDraft, setItemAddLabelsDraft] = useState('') const [itemRemoveLabelsDraft, setItemRemoveLabelsDraft] = useState('') const [itemAddAssigneesDraft, setItemAddAssigneesDraft] = useState('') @@ -110,8 +109,6 @@ export function useMobileTasksItemState() { setItemTitleDraft, itemBodyDraft, setItemBodyDraft, - itemCommentDraft, - setItemCommentDraft, itemAddLabelsDraft, setItemAddLabelsDraft, itemRemoveLabelsDraft, diff --git a/mobile/src/tasks/use-mobile-tasks-linear-item-actions.tsx b/mobile/src/tasks/use-mobile-tasks-linear-item-actions.tsx index b1ff0216e05..c5c85a0ee1a 100644 --- a/mobile/src/tasks/use-mobile-tasks-linear-item-actions.tsx +++ b/mobile/src/tasks/use-mobile-tasks-linear-item-actions.tsx @@ -81,7 +81,7 @@ export function useMobileTasksLinearItemActions< finish() } }, - [client, linearCommentDraft, tryBeginMutation] + [client, linearCommentDraft, setLinearCommentDraft, tryBeginMutation] ) const openLinearSubIssue = useCallback( diff --git a/mobile/src/tasks/use-mobile-tasks-list-and-detail-effects.tsx b/mobile/src/tasks/use-mobile-tasks-list-and-detail-effects.tsx index da5a090f2fa..1c5aaeccc21 100644 --- a/mobile/src/tasks/use-mobile-tasks-list-and-detail-effects.tsx +++ b/mobile/src/tasks/use-mobile-tasks-list-and-detail-effects.tsx @@ -1,4 +1,5 @@ import { githubTaskKey } from './github-task-identity' +import { taskItemIdentity } from './task-draft-rows' import { translate } from '../i18n/mobile-i18n' import type { ProjectLoadingActionsModel } from './use-mobile-tasks-project-loading-actions' import { @@ -52,7 +53,6 @@ export function useMobileTasksListAndDetailEffects(model: ProjectLoadingActionsM setError, setGithubProjectError, setGithubRepoSlugCache, - setLinearCommentDraft, setLinearStates, setLinearStatesError, setLinearStatesLoading, @@ -246,7 +246,6 @@ export function useMobileTasksListAndDetailEffects(model: ProjectLoadingActionsM const linearMetadataKey = linearMetadataItem?.key ?? null useEffect(() => { - setLinearCommentDraft('') setLinearSubIssueTitle('') }, [linearMetadataKey]) @@ -315,7 +314,6 @@ export function useMobileTasksItemSelectionEffects( | 'setItemAddAssigneesDraft' | 'setItemAddLabelsDraft' | 'setItemBodyDraft' - | 'setItemCommentDraft' | 'setItemRemoveAssigneesDraft' | 'setItemRemoveLabelsDraft' | 'setItemReplyDrafts' @@ -333,7 +331,6 @@ export function useMobileTasksItemSelectionEffects( setItemAddAssigneesDraft, setItemAddLabelsDraft, setItemBodyDraft, - setItemCommentDraft, setItemRemoveAssigneesDraft, setItemRemoveLabelsDraft, setItemReplyDrafts, @@ -341,8 +338,7 @@ export function useMobileTasksItemSelectionEffects( setItemTitleDraft, setPrFileCommentDrafts } = model - const actionIdentity = - actionItem?.provider === 'github' ? githubTaskKey(actionItem.source) : actionItem?.key + const actionIdentity = actionItem && taskItemIdentity(actionItem) const fileRevision = model.detailPayload?.provider === 'github' @@ -357,10 +353,10 @@ export function useMobileTasksItemSelectionEffects( }, [actionIdentity, client, fileRevision, resetPrFiles]) // Keyed on identity: status edits, refreshes and reconnects hand over a new object for the same item. + // The comment box is not reset: it is kept per item in its draft row. useEffect(() => { setItemTitleDraft(actionItem?.title ?? '') setItemBodyDraft('') - setItemCommentDraft('') setItemAddLabelsDraft('') setItemRemoveLabelsDraft('') setItemAddAssigneesDraft('') diff --git a/mobile/src/tasks/use-mobile-tasks-project-detail-loading.tsx b/mobile/src/tasks/use-mobile-tasks-project-detail-loading.tsx index 35fbe3e4e86..c7a950ce7c4 100644 --- a/mobile/src/tasks/use-mobile-tasks-project-detail-loading.tsx +++ b/mobile/src/tasks/use-mobile-tasks-project-detail-loading.tsx @@ -20,7 +20,6 @@ export function useMobileTasksProjectDetailLoading< | 'setPrFileCommentDrafts' | 'resetPrFiles' | 'setProjectBodyDraft' - | 'setProjectCommentDraft' | 'setProjectEditingCommentDraft' | 'setProjectEditingCommentId' | 'setProjectFieldDrafts' @@ -42,7 +41,6 @@ export function useMobileTasksProjectDetailLoading< setPrFileCommentDrafts, resetPrFiles, setProjectBodyDraft, - setProjectCommentDraft, setProjectEditingCommentDraft, setProjectEditingCommentId, setProjectFieldDrafts, @@ -57,11 +55,11 @@ export function useMobileTasksProjectDetailLoading< resetPrFiles() }, [projectRowItem, client, projectRowDetailRefreshSeq, resetPrFiles]) // Keyed on row id: field edits, merges and reconnects hand over a new object for the same row. + // The comment box is not reset: it is kept per row in its draft row. const projectRowId = projectRowItem?.id ?? null useEffect(() => { setProjectTitleDraft(projectRowItem?.content.title ?? '') setProjectBodyDraft(projectRowItem?.content.body ?? '') - setProjectCommentDraft('') setProjectEditingCommentId(null) setProjectEditingCommentDraft('') setProjectReviewersDraft('') diff --git a/mobile/src/tasks/use-mobile-tasks-project-workspace-comment-actions.tsx b/mobile/src/tasks/use-mobile-tasks-project-workspace-comment-actions.tsx index f606200946d..3640476072c 100644 --- a/mobile/src/tasks/use-mobile-tasks-project-workspace-comment-actions.tsx +++ b/mobile/src/tasks/use-mobile-tasks-project-workspace-comment-actions.tsx @@ -233,7 +233,7 @@ export function useMobileTasksProjectWorkspaceCommentActions(model: WorkspaceCre setProjectMutating(false) } }, - [activeGitHubProjectHost, client, projectCommentDraft, projectMutating] + [activeGitHubProjectHost, client, projectCommentDraft, projectMutating, setProjectCommentDraft] ) const updateProjectRowComment = useCallback( diff --git a/mobile/src/tasks/use-mobile-tasks-route-and-item-state.tsx b/mobile/src/tasks/use-mobile-tasks-route-and-item-state.tsx index 2d4e4b8e826..70aaa0eb0a9 100644 --- a/mobile/src/tasks/use-mobile-tasks-route-and-item-state.tsx +++ b/mobile/src/tasks/use-mobile-tasks-route-and-item-state.tsx @@ -50,6 +50,7 @@ import { } from './mobile-tasks-legacy-foundation' import { getTaskPresetQuery } from '../../../src/shared/work-items/task-preset-query' import { useMobileTasksItemState } from './use-mobile-tasks-item-state' +import { useTaskCommentDraft, useTaskCreateDraft } from './task-draft-rows' import { useMobileJiraConnectionState } from './use-mobile-jira-connection-state' import type { JiraIssueFilter } from '../../../src/shared/jira/jira-types' @@ -165,8 +166,8 @@ export function useMobileTasksRouteAndItemState() { const [showGitHubPagePicker, setShowGitHubPagePicker] = useState(false) const [showCreateTask, setShowCreateTask] = useState(false) const [showCreateTargetPicker, setShowCreateTargetPicker] = useState(false) - const [createTitle, setCreateTitle] = useState('') - const [createBody, setCreateBody] = useState('') + const { createTitle, setCreateTitle, createBody, setCreateBody } = + useTaskCreateDraft(showCreateTask) const [createRepoId, setCreateRepoId] = useState(null) const [createTeamId, setCreateTeamId] = useState(null) const [linearTeams, setLinearTeams] = useState([]) @@ -186,6 +187,7 @@ export function useMobileTasksRouteAndItemState() { itemState.readDetailPayload, itemState.reconcilePrFileConnection ) + const [itemCommentDraft, setItemCommentDraft] = useTaskCommentDraft(itemSelection.actionItem) const [mergeMethodTaskItem, setMergeMethodTaskItem] = useState< Extract | Extract | null >(null) @@ -360,7 +362,9 @@ export function useMobileTasksRouteAndItemState() { setPendingProjectGitHubMerge, pendingHostedStateChange, setPendingHostedStateChange, - ...itemState + ...itemState, + itemCommentDraft, + setItemCommentDraft } } diff --git a/mobile/src/tasks/use-mobile-tasks-task-create-actions.tsx b/mobile/src/tasks/use-mobile-tasks-task-create-actions.tsx index 59e08b80ce2..d794ab4f4f1 100644 --- a/mobile/src/tasks/use-mobile-tasks-task-create-actions.tsx +++ b/mobile/src/tasks/use-mobile-tasks-task-create-actions.tsx @@ -141,8 +141,9 @@ export function useMobileTasksTaskCreateActions(model: LinearItemActionsModel) { ) } setShowCreateTask(false) - setCreateTitle('') - setCreateBody('') + // Text typed while the create ran, here or in a reopened sheet, is not what it sent. + setCreateTitle((current) => (current === createTitle ? '' : current)) + setCreateBody((current) => (current === createBody ? '' : current)) await loadTasks({ silent: true }) } catch (err) { setError(err instanceof Error ? err.message : 'Failed to create task') diff --git a/mobile/src/tasks/use-mobile-tasks-workspace-and-project-state.tsx b/mobile/src/tasks/use-mobile-tasks-workspace-and-project-state.tsx index 6f9ba1e71d5..c557bd86ec4 100644 --- a/mobile/src/tasks/use-mobile-tasks-workspace-and-project-state.tsx +++ b/mobile/src/tasks/use-mobile-tasks-workspace-and-project-state.tsx @@ -2,6 +2,7 @@ import { useRef, useCallback } from 'react' import { useBottomDrawerFollowUp } from '../components/bottom-drawer/use-bottom-drawer-follow-up' import type { RouteAndItemStateModel } from './use-mobile-tasks-route-and-item-state' import type { WorkspaceSshRecord } from './workspace-ssh-gate' +import { useProjectRowCommentDraft, useTaskCommentDraft } from './task-draft-rows' import { type BaseRefSearchResult, type GitHubProjectPartialFailure, @@ -86,7 +87,9 @@ export function useMobileTasksWorkspaceAndProjectState(model: RouteAndItemStateM const [linearStates, setLinearStates] = useState([]) const [linearStatesLoading, setLinearStatesLoading] = useState(false) const [linearStatesError, setLinearStatesError] = useState('') - const [linearCommentDraft, setLinearCommentDraft] = useState('') + const [linearCommentDraft, setLinearCommentDraft] = useTaskCommentDraft( + model.actionItem?.provider === 'linear' ? model.actionItem : null + ) const [linearSubIssueTitle, setLinearSubIssueTitle] = useState('') const [taskStateHydrated, setTaskStateHydrated] = useState(false) const [runtimeTaskSettings, setRuntimeTaskSettings] = useState({}) @@ -131,7 +134,7 @@ export function useMobileTasksWorkspaceAndProjectState(model: RouteAndItemStateM const [projectRowDetailRefreshSeq, setProjectRowDetailRefreshSeq] = useState(0) const [projectTitleDraft, setProjectTitleDraft] = useState('') const [projectBodyDraft, setProjectBodyDraft] = useState('') - const [projectCommentDraft, setProjectCommentDraft] = useState('') + const [projectCommentDraft, setProjectCommentDraft] = useProjectRowCommentDraft(projectRowItem) const [projectEditingCommentId, setProjectEditingCommentId] = useState(null) const [projectEditingCommentDraft, setProjectEditingCommentDraft] = useState('') const [projectReviewersDraft, setProjectReviewersDraft] = useState('') diff --git a/mobile/src/test-support/rpc-recording/adapters/task-item-hosted-metadata-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/task-item-hosted-metadata-mount-adapters.ts index e66c7e47b1e..8a2ff198538 100644 --- a/mobile/src/test-support/rpc-recording/adapters/task-item-hosted-metadata-mount-adapters.ts +++ b/mobile/src/test-support/rpc-recording/adapters/task-item-hosted-metadata-mount-adapters.ts @@ -254,16 +254,25 @@ export function taskItemHostedMetadataMountAdapters( 'use-mobile-tasks-workspace-and-project-state.tsx' ).useMobileTasksWorkspaceAndProjectState return mountModelHook(modules, context, { - useHook: (model: Parameters[0]) => { + useHook: ( + model: Parameters[0] & + Pick[0], 'actionItem'> + ) => { const initialDraft = useRef(model.linearCommentDraft) const { linearCommentDraft, setLinearCommentDraft } = useWorkspace( mountFixture[0]>({ + actionItem: model.actionItem, setActionItem: model.setActionItem }) ) + // The comment box is kept per item, so its fixture text goes in once the item is selected. + const seeded = useRef(false) useLayoutEffect(() => { - setLinearCommentDraft(initialDraft.current) - }, [setLinearCommentDraft]) + if (!seeded.current && model.actionItem) { + seeded.current = true + setLinearCommentDraft(initialDraft.current) + } + }) useCommittedOwnerProjection(context, { linearCommentDraft }) return useActions(Object.assign(model, { linearCommentDraft, setLinearCommentDraft })) }, diff --git a/mobile/src/test-support/rpc-recording/task-action-mount-owners.ts b/mobile/src/test-support/rpc-recording/task-action-mount-owners.ts index 826e3d678d8..c7f72b1a24c 100644 --- a/mobile/src/test-support/rpc-recording/task-action-mount-owners.ts +++ b/mobile/src/test-support/rpc-recording/task-action-mount-owners.ts @@ -1,6 +1,8 @@ import type * as WorkspaceAndProjectStateModule from '../../tasks/use-mobile-tasks-workspace-and-project-state' import type * as GithubTaskIdentityModule from '../../tasks/github-task-identity' import type * as TaskItemStateModule from '../../tasks/use-mobile-tasks-item-state' +import type * as TaskDraftRowsModule from '../../tasks/task-draft-rows' +import type * as DurableDraftFieldsModule from '../../drafts/durable-draft-fields' import { useLayoutEffect, useRef } from 'react' import type { operationModuleLoader } from './operation-module-loader' import type { ActionableTaskItem } from '../../tasks/mobile-tasks-project-workspace-types' @@ -22,13 +24,35 @@ function useTaskStateAndSelection( const { useMobileTasksSelection, githubTaskKey } = modules.load( 'mobile/src/tasks/github-task-identity.ts' ) - const state = useMobileTasksItemState() + const { useTaskCommentDraft } = modules.load( + 'mobile/src/tasks/task-draft-rows.ts' + ) + const itemState = useMobileTasksItemState() const selection = useMobileTasksSelection( // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the mount adapter stores its actual recording client in this field. model.client as RpcClient, - state.readDetailPayload, - state.reconcilePrFileConnection + itemState.readDetailPayload, + itemState.reconcilePrFileConnection ) + // The comment box is kept per item, so its fixture text goes in once the item is selected. + const [itemCommentDraft, setItemCommentDraft] = useTaskCommentDraft(selection.actionItem) + const state = { ...itemState, itemCommentDraft, setItemCommentDraft } + const { resetDurableDraftFieldsForTests } = modules.load( + 'mobile/src/drafts/durable-draft-fields.ts' + ) + // The recording's document ends at unmount, and its unsaved draft timers end with it as a page's would. + useLayoutEffect(() => resetDurableDraftFieldsForTests, []) + const commentSeeded = useRef(false) + useLayoutEffect(() => { + if ( + !commentSeeded.current && + selection.actionItem && + typeof fixture.itemCommentDraft === 'string' + ) { + commentSeeded.current = true + setItemCommentDraft(fixture.itemCommentDraft) + } + }) useLayoutEffect(() => { const isStateKey = (key: string): key is keyof typeof state => key in state for (const [field, value] of Object.entries(fixture)) { From 6f83fb3c467b7ff495ed6808c78f16b71fc58fc2 Mon Sep 17 00:00:00 2001 From: Kelvin Amoaba <97001695+AmoabaKelvin@users.noreply.github.com> Date: Mon, 9 Nov 2026 13:51:51 +0000 Subject: [PATCH 46/90] fix(mobile): floor event-driven reads after failures and catch up reads that span a stream reopen (#40142) * fix(mobile): floor event-driven reads after failures and catch up reads that span a stream reopen * test(mobile): pin the event router's read floor after a refused read in a recording --- .../event-router-failed-read-floor.json | 215 ++++ ...og-runtime.clientevents.subscribe-1-1.json | 815 ++++++++++++ ...og-runtime.clientevents.subscribe-1-2.json | 566 +++++++++ ...og-runtime.clientevents.subscribe-1-3.json | 637 ++++++++++ ...og-runtime.clientevents.subscribe-1-4.json | 637 ++++++++++ ...og-runtime.clientevents.subscribe-1-5.json | 637 ++++++++++ ...og-runtime.clientevents.subscribe-1-6.json | 637 ++++++++++ ...ry.event-router-catalog-worktree.ps-1.json | 1117 +++++++++++++++++ mobile/rpc-foundation/pilot-scenarios.json | 138 ++ mobile/src/query/host-event-router.test.ts | 52 + mobile/src/query/host-event-router.ts | 17 +- .../client-event-stream-mount-adapters.ts | 34 + .../reply-matrix-normal-result.ts | 6 + 13 files changed, 5504 insertions(+), 4 deletions(-) create mode 100644 mobile/rpc-foundation/goldens/event-router-failed-read-floor.json create mode 100644 mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-1.json create mode 100644 mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-2.json create mode 100644 mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-3.json create mode 100644 mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-4.json create mode 100644 mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-5.json create mode 100644 mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-6.json create mode 100644 mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-worktree.ps-1.json create mode 100644 mobile/src/query/host-event-router.test.ts diff --git a/mobile/rpc-foundation/goldens/event-router-failed-read-floor.json b/mobile/rpc-foundation/goldens/event-router-failed-read-floor.json new file mode 100644 index 00000000000..9dd33a238a3 --- /dev/null +++ b/mobile/rpc-foundation/goldens/event-router-failed-read-floor.json @@ -0,0 +1,215 @@ +{ + "goldenFormatVersion": 6, + "operation": "query.event-router-catalog", + "family": "query.event-router-catalog", + "namedDeltas": [], + "values": { + "5bd4621f47d0": { + "name": "runtime.clientEvents.unsubscribe#1", + "ordinal": 6, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.unsubscribe\",\"params\":{\"subscriptionId\":\"sub-1\"}}" + }, + "704ca5c34f99": { + "name": "worktree.ps#1", + "ordinal": 3, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"afterSnapshotId\":null,\"acceptRowDelta\":true,\"supportsWorktreeVisibilitySourceDefaults\":true}}" + }, + "78a0dbbe27a8": { + "name": "worktree.ps#2", + "ordinal": 5, + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"afterSnapshotId\":null,\"acceptRowDelta\":true,\"supportsWorktreeVisibilitySourceDefaults\":true}}" + }, + "a839711b15b8": { + "status": "pending" + }, + "ac14275e5e23": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "error": { + "code": "runtime_error", + "message": "worktree list unavailable" + }, + "id": "frame-2", + "ok": false + } + } + }, + "ae9f66f12cc9": { + "status": "fulfilled", + "startedAt": 3750, + "settledAt": 3750, + "value": { + "$rpc": "undefined" + } + }, + "b91023634f14": { + "name": "worktree.ps#2", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 3000 + } + }, + "c448f53917f7": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, + "c7fbd9501e80": { + "status": "error" + }, + "eb79a9b3682a": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "$rpc": "undefined" + } + }, + "eef1ee3c2773": { + "name": "runtime.clientEvents.subscribe#1", + "ordinal": 1, + "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}" + } + }, + "recording": { + "scenario": "event-router-failed-read-floor", + "checkpoints": [ + { + "id": "listening", + "observation": { + "sender": ["c448f53917f7"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "read-refused", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + } + ] + } +} diff --git a/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-1.json b/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-1.json new file mode 100644 index 00000000000..f26f1fbaa5c --- /dev/null +++ b/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-1.json @@ -0,0 +1,815 @@ +{ + "goldenFormatVersion": 6, + "operation": "query.event-router-catalog", + "family": "query.event-router-catalog", + "namedDeltas": [], + "values": { + "1eef7ff9a9b9": { + "name": "worktree.ps#2", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "rejected", + "startedAt": 3000, + "settledAt": 3750, + "error": { + "category": "Error", + "message": "Connection closed", + "isRpcDeliveryUnknown": true + } + } + }, + "5bd4621f47d0": { + "name": "runtime.clientEvents.unsubscribe#1", + "ordinal": 6, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.unsubscribe\",\"params\":{\"subscriptionId\":\"sub-1\"}}" + }, + "704ca5c34f99": { + "name": "worktree.ps#1", + "ordinal": 3, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"afterSnapshotId\":null,\"acceptRowDelta\":true,\"supportsWorktreeVisibilitySourceDefaults\":true}}" + }, + "78a0dbbe27a8": { + "name": "worktree.ps#2", + "ordinal": 5, + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"afterSnapshotId\":null,\"acceptRowDelta\":true,\"supportsWorktreeVisibilitySourceDefaults\":true}}" + }, + "a839711b15b8": { + "status": "pending" + }, + "ac14275e5e23": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "error": { + "code": "runtime_error", + "message": "worktree list unavailable" + }, + "id": "frame-2", + "ok": false + } + } + }, + "ae9f66f12cc9": { + "status": "fulfilled", + "startedAt": 3750, + "settledAt": 3750, + "value": { + "$rpc": "undefined" + } + }, + "b91023634f14": { + "name": "worktree.ps#2", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 3000 + } + }, + "c448f53917f7": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, + "c7fbd9501e80": { + "status": "error" + }, + "e1883df1f8f5": { + "name": "streams-registered-at-teardown", + "ordinal": 6, + "value": [ + { + "cancelled": true, + "method": "runtime.clientEvents.subscribe", + "payload": "runtime.clientEvents.subscribe#1" + } + ] + }, + "eb79a9b3682a": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "$rpc": "undefined" + } + }, + "eef1ee3c2773": { + "name": "runtime.clientEvents.subscribe#1", + "ordinal": 1, + "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}" + } + }, + "recording": { + "scenario": "matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-1", + "checkpoints": [ + { + "id": "event-router-failed-read-floor.normal:listening", + "observation": { + "sender": ["c448f53917f7"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:read-refused", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:listening", + "observation": { + "sender": ["c448f53917f7"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:read-refused", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:cleanup", + "observation": { + "sender": ["ac14275e5e23", "1eef7ff9a9b9"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": ["e1883df1f8f5"] + } + }, + { + "id": "event-router-failed-read-floor.result-null:listening", + "observation": { + "sender": ["c448f53917f7"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:read-refused", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:cleanup", + "observation": { + "sender": ["ac14275e5e23", "1eef7ff9a9b9"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": ["e1883df1f8f5"] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:listening", + "observation": { + "sender": ["c448f53917f7"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:read-refused", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:cleanup", + "observation": { + "sender": ["ac14275e5e23", "1eef7ff9a9b9"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": ["e1883df1f8f5"] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:listening", + "observation": { + "sender": ["c448f53917f7"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:read-refused", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:cleanup", + "observation": { + "sender": ["ac14275e5e23", "1eef7ff9a9b9"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": ["e1883df1f8f5"] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:listening", + "observation": { + "sender": ["c448f53917f7"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:read-refused", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:cleanup", + "observation": { + "sender": ["ac14275e5e23", "1eef7ff9a9b9"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": ["e1883df1f8f5"] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:listening", + "observation": { + "sender": ["c448f53917f7"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:read-refused", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:floor-passed", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:unmounted", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:listening", + "observation": { + "sender": ["c448f53917f7"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:read-refused", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:floor-passed", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:unmounted", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:listening", + "observation": { + "sender": ["c448f53917f7"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:read-refused", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:floor-passed", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:unmounted", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "c7fbd9501e80", + "effects": [] + } + } + ] + } +} diff --git a/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-2.json b/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-2.json new file mode 100644 index 00000000000..acdc360fc11 --- /dev/null +++ b/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-2.json @@ -0,0 +1,566 @@ +{ + "goldenFormatVersion": 6, + "operation": "query.event-router-catalog", + "family": "query.event-router-catalog", + "namedDeltas": [], + "values": { + "5bd4621f47d0": { + "name": "runtime.clientEvents.unsubscribe#1", + "ordinal": 6, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.unsubscribe\",\"params\":{\"subscriptionId\":\"sub-1\"}}" + }, + "704ca5c34f99": { + "name": "worktree.ps#1", + "ordinal": 3, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"afterSnapshotId\":null,\"acceptRowDelta\":true,\"supportsWorktreeVisibilitySourceDefaults\":true}}" + }, + "78a0dbbe27a8": { + "name": "worktree.ps#2", + "ordinal": 5, + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"afterSnapshotId\":null,\"acceptRowDelta\":true,\"supportsWorktreeVisibilitySourceDefaults\":true}}" + }, + "a328c933a31f": { + "name": "streams-registered-at-teardown", + "ordinal": 5, + "value": [ + { + "cancelled": true, + "method": "runtime.clientEvents.subscribe", + "payload": "runtime.clientEvents.subscribe#2" + } + ] + }, + "a839711b15b8": { + "status": "pending" + }, + "ac14275e5e23": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "error": { + "code": "runtime_error", + "message": "worktree list unavailable" + }, + "id": "frame-2", + "ok": false + } + } + }, + "ae9f66f12cc9": { + "status": "fulfilled", + "startedAt": 3750, + "settledAt": 3750, + "value": { + "$rpc": "undefined" + } + }, + "b91023634f14": { + "name": "worktree.ps#2", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 3000 + } + }, + "c448f53917f7": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, + "c686e7f77d44": { + "name": "runtime.clientEvents.subscribe#2", + "ordinal": 4, + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}" + }, + "c7fbd9501e80": { + "status": "error" + }, + "eb79a9b3682a": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "$rpc": "undefined" + } + }, + "eef1ee3c2773": { + "name": "runtime.clientEvents.subscribe#1", + "ordinal": 1, + "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}" + } + }, + "recording": { + "scenario": "matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-2", + "checkpoints": [ + { + "id": "event-router-failed-read-floor.prelude:listening", + "observation": { + "sender": ["c448f53917f7"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.prelude:read-refused", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:floor-passed", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:unmounted", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:cleanup", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "c7fbd9501e80", + "effects": ["a328c933a31f"] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:floor-passed", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:unmounted", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:cleanup", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "c7fbd9501e80", + "effects": ["a328c933a31f"] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:floor-passed", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:unmounted", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:cleanup", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "c7fbd9501e80", + "effects": ["a328c933a31f"] + } + } + ] + } +} diff --git a/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-3.json b/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-3.json new file mode 100644 index 00000000000..a9e315b074f --- /dev/null +++ b/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-3.json @@ -0,0 +1,637 @@ +{ + "goldenFormatVersion": 6, + "operation": "query.event-router-catalog", + "family": "query.event-router-catalog", + "namedDeltas": [], + "values": { + "0769c2565e2f": { + "name": "worktree.ps#2", + "ordinal": 5, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 3000 + } + }, + "1fcd3f3dee98": { + "name": "streams-registered-at-teardown", + "ordinal": 7, + "value": [ + { + "cancelled": true, + "method": "runtime.clientEvents.subscribe", + "payload": "runtime.clientEvents.subscribe#2" + } + ] + }, + "4e87a83926ae": { + "name": "worktree.ps#2", + "ordinal": 5, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "rejected", + "startedAt": 3000, + "settledAt": 3750, + "error": { + "category": "Error", + "message": "Connection closed", + "isRpcDeliveryUnknown": true + } + } + }, + "5bd4621f47d0": { + "name": "runtime.clientEvents.unsubscribe#1", + "ordinal": 6, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.unsubscribe\",\"params\":{\"subscriptionId\":\"sub-1\"}}" + }, + "704ca5c34f99": { + "name": "worktree.ps#1", + "ordinal": 3, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"afterSnapshotId\":null,\"acceptRowDelta\":true,\"supportsWorktreeVisibilitySourceDefaults\":true}}" + }, + "78a0dbbe27a8": { + "name": "worktree.ps#2", + "ordinal": 5, + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"afterSnapshotId\":null,\"acceptRowDelta\":true,\"supportsWorktreeVisibilitySourceDefaults\":true}}" + }, + "8b854beb872a": { + "name": "worktree.ps#2", + "ordinal": 6, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"afterSnapshotId\":null,\"acceptRowDelta\":true,\"supportsWorktreeVisibilitySourceDefaults\":true}}" + }, + "a839711b15b8": { + "status": "pending" + }, + "ac14275e5e23": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "error": { + "code": "runtime_error", + "message": "worktree list unavailable" + }, + "id": "frame-2", + "ok": false + } + } + }, + "ae9f66f12cc9": { + "status": "fulfilled", + "startedAt": 3750, + "settledAt": 3750, + "value": { + "$rpc": "undefined" + } + }, + "b91023634f14": { + "name": "worktree.ps#2", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 3000 + } + }, + "c448f53917f7": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, + "c686e7f77d44": { + "name": "runtime.clientEvents.subscribe#2", + "ordinal": 4, + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}" + }, + "c7fbd9501e80": { + "status": "error" + }, + "eb79a9b3682a": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "$rpc": "undefined" + } + }, + "eef1ee3c2773": { + "name": "runtime.clientEvents.subscribe#1", + "ordinal": 1, + "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}" + } + }, + "recording": { + "scenario": "matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-3", + "checkpoints": [ + { + "id": "event-router-failed-read-floor.prelude:listening", + "observation": { + "sender": ["c448f53917f7"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.prelude:read-refused", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:unmounted", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:cleanup", + "observation": { + "sender": ["ac14275e5e23", "4e87a83926ae"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": ["1fcd3f3dee98"] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:unmounted", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:cleanup", + "observation": { + "sender": ["ac14275e5e23", "4e87a83926ae"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": ["1fcd3f3dee98"] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:unmounted", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:cleanup", + "observation": { + "sender": ["ac14275e5e23", "4e87a83926ae"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": ["1fcd3f3dee98"] + } + } + ] + } +} diff --git a/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-4.json b/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-4.json new file mode 100644 index 00000000000..dd61b787a40 --- /dev/null +++ b/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-4.json @@ -0,0 +1,637 @@ +{ + "goldenFormatVersion": 6, + "operation": "query.event-router-catalog", + "family": "query.event-router-catalog", + "namedDeltas": [], + "values": { + "0769c2565e2f": { + "name": "worktree.ps#2", + "ordinal": 5, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 3000 + } + }, + "1fcd3f3dee98": { + "name": "streams-registered-at-teardown", + "ordinal": 7, + "value": [ + { + "cancelled": true, + "method": "runtime.clientEvents.subscribe", + "payload": "runtime.clientEvents.subscribe#2" + } + ] + }, + "4e87a83926ae": { + "name": "worktree.ps#2", + "ordinal": 5, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "rejected", + "startedAt": 3000, + "settledAt": 3750, + "error": { + "category": "Error", + "message": "Connection closed", + "isRpcDeliveryUnknown": true + } + } + }, + "5bd4621f47d0": { + "name": "runtime.clientEvents.unsubscribe#1", + "ordinal": 6, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.unsubscribe\",\"params\":{\"subscriptionId\":\"sub-1\"}}" + }, + "704ca5c34f99": { + "name": "worktree.ps#1", + "ordinal": 3, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"afterSnapshotId\":null,\"acceptRowDelta\":true,\"supportsWorktreeVisibilitySourceDefaults\":true}}" + }, + "78a0dbbe27a8": { + "name": "worktree.ps#2", + "ordinal": 5, + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"afterSnapshotId\":null,\"acceptRowDelta\":true,\"supportsWorktreeVisibilitySourceDefaults\":true}}" + }, + "8b854beb872a": { + "name": "worktree.ps#2", + "ordinal": 6, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"afterSnapshotId\":null,\"acceptRowDelta\":true,\"supportsWorktreeVisibilitySourceDefaults\":true}}" + }, + "a839711b15b8": { + "status": "pending" + }, + "ac14275e5e23": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "error": { + "code": "runtime_error", + "message": "worktree list unavailable" + }, + "id": "frame-2", + "ok": false + } + } + }, + "ae9f66f12cc9": { + "status": "fulfilled", + "startedAt": 3750, + "settledAt": 3750, + "value": { + "$rpc": "undefined" + } + }, + "b91023634f14": { + "name": "worktree.ps#2", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 3000 + } + }, + "c448f53917f7": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, + "c686e7f77d44": { + "name": "runtime.clientEvents.subscribe#2", + "ordinal": 4, + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}" + }, + "c7fbd9501e80": { + "status": "error" + }, + "eb79a9b3682a": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "$rpc": "undefined" + } + }, + "eef1ee3c2773": { + "name": "runtime.clientEvents.subscribe#1", + "ordinal": 1, + "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}" + } + }, + "recording": { + "scenario": "matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-4", + "checkpoints": [ + { + "id": "event-router-failed-read-floor.prelude:listening", + "observation": { + "sender": ["c448f53917f7"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.prelude:read-refused", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:unmounted", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:cleanup", + "observation": { + "sender": ["ac14275e5e23", "4e87a83926ae"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": ["1fcd3f3dee98"] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:unmounted", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:cleanup", + "observation": { + "sender": ["ac14275e5e23", "4e87a83926ae"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": ["1fcd3f3dee98"] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:unmounted", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:cleanup", + "observation": { + "sender": ["ac14275e5e23", "4e87a83926ae"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": ["1fcd3f3dee98"] + } + } + ] + } +} diff --git a/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-5.json b/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-5.json new file mode 100644 index 00000000000..7edecb5933b --- /dev/null +++ b/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-5.json @@ -0,0 +1,637 @@ +{ + "goldenFormatVersion": 6, + "operation": "query.event-router-catalog", + "family": "query.event-router-catalog", + "namedDeltas": [], + "values": { + "0769c2565e2f": { + "name": "worktree.ps#2", + "ordinal": 5, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 3000 + } + }, + "1fcd3f3dee98": { + "name": "streams-registered-at-teardown", + "ordinal": 7, + "value": [ + { + "cancelled": true, + "method": "runtime.clientEvents.subscribe", + "payload": "runtime.clientEvents.subscribe#2" + } + ] + }, + "4e87a83926ae": { + "name": "worktree.ps#2", + "ordinal": 5, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "rejected", + "startedAt": 3000, + "settledAt": 3750, + "error": { + "category": "Error", + "message": "Connection closed", + "isRpcDeliveryUnknown": true + } + } + }, + "5bd4621f47d0": { + "name": "runtime.clientEvents.unsubscribe#1", + "ordinal": 6, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.unsubscribe\",\"params\":{\"subscriptionId\":\"sub-1\"}}" + }, + "704ca5c34f99": { + "name": "worktree.ps#1", + "ordinal": 3, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"afterSnapshotId\":null,\"acceptRowDelta\":true,\"supportsWorktreeVisibilitySourceDefaults\":true}}" + }, + "78a0dbbe27a8": { + "name": "worktree.ps#2", + "ordinal": 5, + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"afterSnapshotId\":null,\"acceptRowDelta\":true,\"supportsWorktreeVisibilitySourceDefaults\":true}}" + }, + "8b854beb872a": { + "name": "worktree.ps#2", + "ordinal": 6, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"afterSnapshotId\":null,\"acceptRowDelta\":true,\"supportsWorktreeVisibilitySourceDefaults\":true}}" + }, + "a839711b15b8": { + "status": "pending" + }, + "ac14275e5e23": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "error": { + "code": "runtime_error", + "message": "worktree list unavailable" + }, + "id": "frame-2", + "ok": false + } + } + }, + "ae9f66f12cc9": { + "status": "fulfilled", + "startedAt": 3750, + "settledAt": 3750, + "value": { + "$rpc": "undefined" + } + }, + "b91023634f14": { + "name": "worktree.ps#2", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 3000 + } + }, + "c448f53917f7": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, + "c686e7f77d44": { + "name": "runtime.clientEvents.subscribe#2", + "ordinal": 4, + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}" + }, + "c7fbd9501e80": { + "status": "error" + }, + "eb79a9b3682a": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "$rpc": "undefined" + } + }, + "eef1ee3c2773": { + "name": "runtime.clientEvents.subscribe#1", + "ordinal": 1, + "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}" + } + }, + "recording": { + "scenario": "matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-5", + "checkpoints": [ + { + "id": "event-router-failed-read-floor.prelude:listening", + "observation": { + "sender": ["c448f53917f7"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.prelude:read-refused", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:unmounted", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:cleanup", + "observation": { + "sender": ["ac14275e5e23", "4e87a83926ae"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": ["1fcd3f3dee98"] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:unmounted", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:cleanup", + "observation": { + "sender": ["ac14275e5e23", "4e87a83926ae"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": ["1fcd3f3dee98"] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:unmounted", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:cleanup", + "observation": { + "sender": ["ac14275e5e23", "4e87a83926ae"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": ["1fcd3f3dee98"] + } + } + ] + } +} diff --git a/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-6.json b/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-6.json new file mode 100644 index 00000000000..fcad6692de2 --- /dev/null +++ b/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-6.json @@ -0,0 +1,637 @@ +{ + "goldenFormatVersion": 6, + "operation": "query.event-router-catalog", + "family": "query.event-router-catalog", + "namedDeltas": [], + "values": { + "0769c2565e2f": { + "name": "worktree.ps#2", + "ordinal": 5, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 3000 + } + }, + "1fcd3f3dee98": { + "name": "streams-registered-at-teardown", + "ordinal": 7, + "value": [ + { + "cancelled": true, + "method": "runtime.clientEvents.subscribe", + "payload": "runtime.clientEvents.subscribe#2" + } + ] + }, + "4e87a83926ae": { + "name": "worktree.ps#2", + "ordinal": 5, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "rejected", + "startedAt": 3000, + "settledAt": 3750, + "error": { + "category": "Error", + "message": "Connection closed", + "isRpcDeliveryUnknown": true + } + } + }, + "5bd4621f47d0": { + "name": "runtime.clientEvents.unsubscribe#1", + "ordinal": 6, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.unsubscribe\",\"params\":{\"subscriptionId\":\"sub-1\"}}" + }, + "704ca5c34f99": { + "name": "worktree.ps#1", + "ordinal": 3, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"afterSnapshotId\":null,\"acceptRowDelta\":true,\"supportsWorktreeVisibilitySourceDefaults\":true}}" + }, + "78a0dbbe27a8": { + "name": "worktree.ps#2", + "ordinal": 5, + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"afterSnapshotId\":null,\"acceptRowDelta\":true,\"supportsWorktreeVisibilitySourceDefaults\":true}}" + }, + "8b854beb872a": { + "name": "worktree.ps#2", + "ordinal": 6, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"afterSnapshotId\":null,\"acceptRowDelta\":true,\"supportsWorktreeVisibilitySourceDefaults\":true}}" + }, + "a839711b15b8": { + "status": "pending" + }, + "ac14275e5e23": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "error": { + "code": "runtime_error", + "message": "worktree list unavailable" + }, + "id": "frame-2", + "ok": false + } + } + }, + "ae9f66f12cc9": { + "status": "fulfilled", + "startedAt": 3750, + "settledAt": 3750, + "value": { + "$rpc": "undefined" + } + }, + "b91023634f14": { + "name": "worktree.ps#2", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 3000 + } + }, + "c448f53917f7": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, + "c686e7f77d44": { + "name": "runtime.clientEvents.subscribe#2", + "ordinal": 4, + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}" + }, + "c7fbd9501e80": { + "status": "error" + }, + "eb79a9b3682a": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "$rpc": "undefined" + } + }, + "eef1ee3c2773": { + "name": "runtime.clientEvents.subscribe#1", + "ordinal": 1, + "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}" + } + }, + "recording": { + "scenario": "matrix-query.event-router-catalog-runtime.clientevents.subscribe-1-6", + "checkpoints": [ + { + "id": "event-router-failed-read-floor.prelude:listening", + "observation": { + "sender": ["c448f53917f7"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.prelude:read-refused", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:unmounted", + "observation": { + "sender": ["ac14275e5e23", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:unmounted", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:cleanup", + "observation": { + "sender": ["ac14275e5e23", "4e87a83926ae"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": ["1fcd3f3dee98"] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:unmounted", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:cleanup", + "observation": { + "sender": ["ac14275e5e23", "4e87a83926ae"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": ["1fcd3f3dee98"] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:five-notices-inside-the-floor", + "observation": { + "sender": ["ac14275e5e23"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:floor-passed", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:unmounted", + "observation": { + "sender": ["ac14275e5e23", "0769c2565e2f"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:cleanup", + "observation": { + "sender": ["ac14275e5e23", "4e87a83926ae"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "c686e7f77d44", "8b854beb872a"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": ["1fcd3f3dee98"] + } + } + ] + } +} diff --git a/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-worktree.ps-1.json b/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-worktree.ps-1.json new file mode 100644 index 00000000000..2eda7c6805a --- /dev/null +++ b/mobile/rpc-foundation/goldens/matrix-query.event-router-catalog-worktree.ps-1.json @@ -0,0 +1,1117 @@ +{ + "goldenFormatVersion": 6, + "operation": "query.event-router-catalog", + "family": "query.event-router-catalog", + "namedDeltas": [], + "values": { + "2159667cf633": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true + } + } + }, + "5bd4621f47d0": { + "name": "runtime.clientEvents.unsubscribe#1", + "ordinal": 6, + "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.unsubscribe\",\"params\":{\"subscriptionId\":\"sub-1\"}}" + }, + "5ece68a8cbc5": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "error": { + "code": "method_not_found", + "message": "Unknown method" + }, + "id": "frame-2", + "ok": false + } + } + }, + "6030c04ddbcd": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "rejected", + "startedAt": 0, + "settledAt": 0, + "error": { + "category": "Error", + "message": "", + "isRpcDeliveryUnknown": true + } + } + }, + "704ca5c34f99": { + "name": "worktree.ps#1", + "ordinal": 3, + "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"afterSnapshotId\":null,\"acceptRowDelta\":true,\"supportsWorktreeVisibilitySourceDefaults\":true}}" + }, + "70f531389976": { + "name": "worktree.ps#2", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, + "73083f54975f": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "rejected", + "startedAt": 0, + "settledAt": 0, + "error": { + "category": "Error", + "message": "transport failure", + "isRpcDeliveryUnknown": true + } + } + }, + "78a0dbbe27a8": { + "name": "worktree.ps#2", + "ordinal": 5, + "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.ps\",\"params\":{\"limit\":10000,\"afterSnapshotId\":null,\"acceptRowDelta\":true,\"supportsWorktreeVisibilitySourceDefaults\":true}}" + }, + "89b9ba8d8cd7": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "error": { + "code": "refused", + "message": "outer refused" + }, + "id": "frame-2", + "ok": false + } + } + }, + "8db531aac9cb": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "error": "refused" + } + } + } + }, + "912d0c07da7b": { + "status": "success" + }, + "a839711b15b8": { + "status": "pending" + }, + "ae35b72a6d04": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "worktrees": [] + } + } + } + }, + "ae9f66f12cc9": { + "status": "fulfilled", + "startedAt": 3750, + "settledAt": 3750, + "value": { + "$rpc": "undefined" + } + }, + "b91023634f14": { + "name": "worktree.ps#2", + "ordinal": 4, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 3000 + } + }, + "baf8a4d812f1": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "$rpc": "null" + } + } + } + }, + "c448f53917f7": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "pending", + "startedAt": 0 + } + }, + "c7fbd9501e80": { + "status": "error" + }, + "e6d56f2fda86": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "error": { + "code": "refused", + "message": "" + }, + "id": "frame-2", + "ok": false + } + } + }, + "eb79a9b3682a": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "$rpc": "undefined" + } + }, + "eef1ee3c2773": { + "name": "runtime.clientEvents.subscribe#1", + "ordinal": 1, + "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"runtime.clientEvents.subscribe\",\"params\":null}" + }, + "efab2a313e0c": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "error": "inner refused", + "ok": false + } + } + } + }, + "f7c49a54fd25": { + "name": "worktree.ps#1", + "ordinal": 2, + "args": [ + { + "name": "method", + "value": "worktree.ps" + }, + { + "name": "params", + "value": { + "acceptRowDelta": true, + "afterSnapshotId": { + "$rpc": "null" + }, + "limit": 10000 + } + }, + { + "name": "options", + "value": { + "failWhenDisconnected": true + } + } + ], + "settlement": { + "status": "fulfilled", + "startedAt": 0, + "settledAt": 0, + "value": { + "id": "frame-2", + "ok": true, + "result": { + "error": { + "message": "inner refused" + }, + "ok": false + } + } + } + } + }, + "recording": { + "scenario": "matrix-query.event-router-catalog-worktree.ps-1", + "checkpoints": [ + { + "id": "event-router-failed-read-floor.prelude:listening", + "observation": { + "sender": ["c448f53917f7"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:read-refused", + "observation": { + "sender": ["ae35b72a6d04"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "912d0c07da7b", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:five-notices-inside-the-floor", + "observation": { + "sender": ["ae35b72a6d04"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "912d0c07da7b", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:floor-passed", + "observation": { + "sender": ["ae35b72a6d04", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "912d0c07da7b", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.normal:unmounted", + "observation": { + "sender": ["ae35b72a6d04", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "912d0c07da7b", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:read-refused", + "observation": { + "sender": ["2159667cf633"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:five-notices-inside-the-floor", + "observation": { + "sender": ["2159667cf633"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:floor-passed", + "observation": { + "sender": ["2159667cf633", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-absent:unmounted", + "observation": { + "sender": ["2159667cf633", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:read-refused", + "observation": { + "sender": ["baf8a4d812f1"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:five-notices-inside-the-floor", + "observation": { + "sender": ["baf8a4d812f1"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:floor-passed", + "observation": { + "sender": ["baf8a4d812f1", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.result-null:unmounted", + "observation": { + "sender": ["baf8a4d812f1", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:read-refused", + "observation": { + "sender": ["8db531aac9cb"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:five-notices-inside-the-floor", + "observation": { + "sender": ["8db531aac9cb"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:floor-passed", + "observation": { + "sender": ["8db531aac9cb", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-ok-missing:unmounted", + "observation": { + "sender": ["8db531aac9cb", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:read-refused", + "observation": { + "sender": ["efab2a313e0c"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:five-notices-inside-the-floor", + "observation": { + "sender": ["efab2a313e0c"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:floor-passed", + "observation": { + "sender": ["efab2a313e0c", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-string-error:unmounted", + "observation": { + "sender": ["efab2a313e0c", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:read-refused", + "observation": { + "sender": ["f7c49a54fd25"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:five-notices-inside-the-floor", + "observation": { + "sender": ["f7c49a54fd25"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:floor-passed", + "observation": { + "sender": ["f7c49a54fd25", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.inner-false-object-error:unmounted", + "observation": { + "sender": ["f7c49a54fd25", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:read-refused", + "observation": { + "sender": ["89b9ba8d8cd7"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:five-notices-inside-the-floor", + "observation": { + "sender": ["89b9ba8d8cd7"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:floor-passed", + "observation": { + "sender": ["89b9ba8d8cd7", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused:unmounted", + "observation": { + "sender": ["89b9ba8d8cd7", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:read-refused", + "observation": { + "sender": ["e6d56f2fda86"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:five-notices-inside-the-floor", + "observation": { + "sender": ["e6d56f2fda86"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:floor-passed", + "observation": { + "sender": ["e6d56f2fda86", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.outer-refused-no-message:unmounted", + "observation": { + "sender": ["e6d56f2fda86", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:read-refused", + "observation": { + "sender": ["5ece68a8cbc5"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:five-notices-inside-the-floor", + "observation": { + "sender": ["5ece68a8cbc5"], + "payloads": ["eef1ee3c2773", "704ca5c34f99"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "c7fbd9501e80", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:floor-passed", + "observation": { + "sender": ["5ece68a8cbc5", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.method-not-found:unmounted", + "observation": { + "sender": ["5ece68a8cbc5", "b91023634f14"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.transport-rejection:read-refused", + "observation": { + "sender": ["73083f54975f", "70f531389976"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.transport-rejection:five-notices-inside-the-floor", + "observation": { + "sender": ["73083f54975f", "70f531389976"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.transport-rejection:floor-passed", + "observation": { + "sender": ["73083f54975f", "70f531389976"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.transport-rejection:unmounted", + "observation": { + "sender": ["73083f54975f", "70f531389976"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.transport-rejection-no-message:read-refused", + "observation": { + "sender": ["6030c04ddbcd", "70f531389976"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.transport-rejection-no-message:five-notices-inside-the-floor", + "observation": { + "sender": ["6030c04ddbcd", "70f531389976"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.transport-rejection-no-message:floor-passed", + "observation": { + "sender": ["6030c04ddbcd", "70f531389976"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8"], + "settlements": { + "mount": "eb79a9b3682a" + }, + "state": "a839711b15b8", + "effects": [] + } + }, + { + "id": "event-router-failed-read-floor.transport-rejection-no-message:unmounted", + "observation": { + "sender": ["6030c04ddbcd", "70f531389976"], + "payloads": ["eef1ee3c2773", "704ca5c34f99", "78a0dbbe27a8", "5bd4621f47d0"], + "settlements": { + "mount": "eb79a9b3682a", + "unmount": "ae9f66f12cc9" + }, + "state": "a839711b15b8", + "effects": [] + } + } + ] + } +} diff --git a/mobile/rpc-foundation/pilot-scenarios.json b/mobile/rpc-foundation/pilot-scenarios.json index ca6e39e633b..eeb45a4f5ee 100644 --- a/mobile/rpc-foundation/pilot-scenarios.json +++ b/mobile/rpc-foundation/pilot-scenarios.json @@ -22080,6 +22080,144 @@ } ] }, + { + "id": "event-router-failed-read-floor", + "operation": "query.event-router-catalog", + "family": "query.event-router-catalog", + "sites": ["mobile/src/query/host-event-router.ts"], + "schedules": [], + "steps": [ + { + "action": "mount", + "id": "mount" + }, + { + "frame": "runtime.clientEvents.subscribe#1", + "params": null, + "reply": { + "ok": true, + "streaming": true, + "result": { + "type": "ready", + "subscriptionId": "sub-1" + } + } + }, + { + "checkpoint": "listening" + }, + { + "complete": "worktree.ps#1", + "params": { + "limit": 10000, + "supportsWorktreeVisibilitySourceDefaults": true, + "afterSnapshotId": null, + "acceptRowDelta": true + }, + "reply": { + "ok": false, + "error": { + "code": "runtime_error", + "message": "worktree list unavailable" + } + } + }, + { + "checkpoint": "read-refused" + }, + { + "frame": "runtime.clientEvents.subscribe#1", + "params": null, + "reply": { + "ok": true, + "streaming": true, + "result": { + "type": "worktreesChanged", + "repoId": "repo-1" + } + } + }, + { + "advance": 150 + }, + { + "frame": "runtime.clientEvents.subscribe#1", + "params": null, + "reply": { + "ok": true, + "streaming": true, + "result": { + "type": "worktreesChanged", + "repoId": "repo-1" + } + } + }, + { + "advance": 150 + }, + { + "frame": "runtime.clientEvents.subscribe#1", + "params": null, + "reply": { + "ok": true, + "streaming": true, + "result": { + "type": "worktreesChanged", + "repoId": "repo-1" + } + } + }, + { + "advance": 150 + }, + { + "frame": "runtime.clientEvents.subscribe#1", + "params": null, + "reply": { + "ok": true, + "streaming": true, + "result": { + "type": "worktreesChanged", + "repoId": "repo-1" + } + } + }, + { + "advance": 150 + }, + { + "frame": "runtime.clientEvents.subscribe#1", + "params": null, + "reply": { + "ok": true, + "streaming": true, + "result": { + "type": "worktreesChanged", + "repoId": "repo-1" + } + } + }, + { + "advance": 150 + }, + { + "checkpoint": "five-notices-inside-the-floor" + }, + { + "advance": 3000 + }, + { + "checkpoint": "floor-passed" + }, + { + "action": "unmount", + "id": "unmount" + }, + { + "checkpoint": "unmounted" + } + ] + }, { "id": "sc-changes-loaded", "operation": "source-control.changes-load", diff --git a/mobile/src/query/host-event-router.test.ts b/mobile/src/query/host-event-router.test.ts new file mode 100644 index 00000000000..096f908ee9e --- /dev/null +++ b/mobile/src/query/host-event-router.test.ts @@ -0,0 +1,52 @@ +import { QueryObserver } from '@tanstack/react-query' +import { expect, it, vi } from 'vitest' +import { stubRpcClient } from '../transport/rpc/rpc-client-test-stub' +import { retainHostEventRouter } from './host-event-router' +import { createOrcaQueryClient } from './orca-query-client' + +vi.mock('react-native', () => ({ AppState: {}, Platform: { OS: 'ios' } })) + +const KEY = ['orca', 'host-1', 'test.rows', { exec: 'local' }, {}] as const + +it('reads again after a read that was already out when the event stream reopened', async () => { + // One client-events wire at a time; each subscribe hands the test its frames. + const wires: ((payload: unknown) => void)[] = [] + const client = stubRpcClient({ + getLastConnectedAt: () => 1, + subscribe: (_method, _params, onData) => { + wires.push(onData) + return () => {} + } + }) + let desktopRows = 1 + const replies: ((rows: number) => void)[] = [] + const queryClient = createOrcaQueryClient() + const router = retainHostEventRouter(queryClient, 'host-1', client) + wires[0]?.({ type: 'ready', subscriptionId: 'events-1' }) + + const observer = new QueryObserver(queryClient, { + queryKey: KEY, + queryFn: () => new Promise((resolve) => replies.push(resolve)), + meta: { signal: { events: ['worktreesChanged'] } } + }) + const stop = observer.subscribe(() => {}) + await vi.waitFor(() => expect(replies).toHaveLength(1)) + replies[0]?.(desktopRows) + await vi.waitFor(() => expect(observer.getCurrentResult().data).toBe(1)) + + // A read goes out; the stream drops and reopens on the same connection while it is out. + void observer.refetch() + await vi.waitFor(() => expect(replies).toHaveLength(2)) + wires[0]?.({ type: 'end' }) + desktopRows = 2 + await vi.waitFor(() => expect(wires).toHaveLength(2)) + wires[1]?.({ type: 'ready', subscriptionId: 'events-2' }) + // The read sent before the gap answers with what the desktop had then. + replies[1]?.(1) + + await vi.waitFor(() => expect(replies).toHaveLength(3)) + replies[2]?.(desktopRows) + await vi.waitFor(() => expect(observer.getCurrentResult().data).toBe(2)) + stop() + router.release() +}) diff --git a/mobile/src/query/host-event-router.ts b/mobile/src/query/host-event-router.ts index f26fb5f360a..7269e2f8fcc 100644 --- a/mobile/src/query/host-event-router.ts +++ b/mobile/src/query/host-event-router.ts @@ -117,9 +117,11 @@ function startHostEventRouter( if (!readsNow(query) || floorTimers.has(query.queryHash)) { return } - // Change events can come per agent step; keep reads `floorMs` apart, polls and reads in flight included. + // Change events can come per agent step; keep reads `floorMs` apart, polls, failed reads and reads in flight included. const lastReadAt = - query.state.fetchStatus === 'fetching' ? Date.now() : query.state.dataUpdatedAt + query.state.fetchStatus === 'fetching' + ? Date.now() + : Math.max(query.state.dataUpdatedAt, query.state.errorUpdatedAt) const wait = lastReadAt + (signalOf(query)?.floorMs ?? 0) - Date.now() if (wait <= 0) { refetchHostQueryAfterInFlight(queryClient, query) @@ -137,9 +139,16 @@ function startHostEventRouter( } // Reads again (or marks stale, when no one watches) every answer older than `readSince`. + // `readSince` Infinity is a stream reopened on the same connection: a read already out may predate the gap. const catchUp = (readSince: number): void => { for (const query of signalledQueries(() => true)) { - if (query.state.fetchStatus === 'fetching' || query.state.dataUpdatedAt >= readSince) { + if (query.state.fetchStatus === 'fetching') { + if (readSince === Infinity) { + onChange(query) + } + continue + } + if (query.state.dataUpdatedAt >= readSince) { continue } if (readsNow(query)) { @@ -206,7 +215,7 @@ type Router = { holders: number; handle: RouterHandle } const routers = new WeakMap>() // One router per world per host client, however many screens read that host. -function retainHostEventRouter( +export function retainHostEventRouter( queryClient: QueryClient, hostId: string, client: RpcClient diff --git a/mobile/src/test-support/rpc-recording/adapters/client-event-stream-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/client-event-stream-mount-adapters.ts index ec7a4a46c31..3fa2de1e3e5 100644 --- a/mobile/src/test-support/rpc-recording/adapters/client-event-stream-mount-adapters.ts +++ b/mobile/src/test-support/rpc-recording/adapters/client-event-stream-mount-adapters.ts @@ -1,5 +1,8 @@ import type * as UseLiveWorktreeNameModule from '../../../worktree/use-live-worktree-name' import type * as HostWorktreeRefreshModule from '../../../worktree/host-worktree-refresh' +import type * as HostListQueries from '../../../host-screen/host-list-queries' +import type * as HostQueryModule from '../../../query/host-query' +import { hookMount } from '../hook-mount' import { hookScreenMount } from '../mounted-screen-tree' import type { operationModuleLoader } from '../operation-module-loader' import type { MountAdapter } from '../recording-scenario' @@ -44,6 +47,37 @@ export function clientEventStreamMountAdapters( dispose: screen.unmount } }, + // The host list's catalog read and the event router that re-reads it on desktop change notices. + 'query.event-router-catalog': ({ client }) => { + const { useHostQuery } = modules.load( + 'mobile/src/query/host-query.ts' + ) + const queries = modules.load( + 'mobile/src/host-screen/host-list-queries.ts' + ) + let status: string | null = null + const hook = hookMount(() => { + status = useHostQuery( + queries.hostWorktreeCatalogQuery, + { hostId: 'host-1', client }, + queries.HOST_LIST_TARGET, + queries.NO_HOST_LIST_INPUT + ).status + }) + return { + action(name) { + if (name === 'mount') { + return hook.mount() + } + if (name === 'unmount') { + return hook.unmount() + } + throw new Error(`Unknown event router action: ${name}`) + }, + state: () => ({ status }), + dispose: () => void hook.unmount() + } + }, 'worktree.host-refresh': ({ client, effect }) => { const startHostWorktreeRefresh = modules.load( 'mobile/src/worktree/host-worktree-refresh.ts' diff --git a/mobile/src/test-support/rpc-recording/reply-matrix-normal-result.ts b/mobile/src/test-support/rpc-recording/reply-matrix-normal-result.ts index 0b2c2cb514a..21c3e51d93f 100644 --- a/mobile/src/test-support/rpc-recording/reply-matrix-normal-result.ts +++ b/mobile/src/test-support/rpc-recording/reply-matrix-normal-result.ts @@ -29,6 +29,12 @@ export const REPLY_MATRIX_NORMAL_RESULT_INVENTORY: readonly ReplyMatrixNormalRes reason: 'the seed records a null result, which the result-null partition already drives', result: { ok: true } }, + { + family: 'query.event-router-catalog', + request: 'worktree.ps#1', + reason: 'the scenario refuses the first read by design: it pins the read floor after a failure', + result: { worktrees: [] } + }, { family: 'settings-best-effort', request: 'settings.update#1', From 41867a2a85e6a0d3dd616472c62da6aaa58e129c Mon Sep 17 00:00:00 2001 From: Kelvin Amoaba <97001695+AmoabaKelvin@users.noreply.github.com> Date: Mon, 9 Nov 2026 13:52:05 +0000 Subject: [PATCH 47/90] perf(mobile): stop rebooting the Home spare page on every hop and after iOS memory warnings (#40270) * perf(mobile): back off spare page refills after an unclaimed drop or memory warning * fix(mobile): skip a spare whose store read outlived an unclaimed drop * fix(mobile): arm the spare refill timer on whole milliseconds --- .../ios/MobileWebShellSparePool.swift | 21 +++++++++++++++-- .../ios/OrcaMobileWebShellModule.swift | 3 +-- .../src/spare-document.ts | 3 ++- mobile/src/home/use-home-spare-page.ts | 3 ++- .../src/mobile-web-shell/home-spare-page.ts | 23 ++++++++++++++++--- 5 files changed, 44 insertions(+), 9 deletions(-) diff --git a/mobile/modules/orca-mobile-web-shell/ios/MobileWebShellSparePool.swift b/mobile/modules/orca-mobile-web-shell/ios/MobileWebShellSparePool.swift index 92e9ff89ffc..79fbb8c9b10 100644 --- a/mobile/modules/orca-mobile-web-shell/ios/MobileWebShellSparePool.swift +++ b/mobile/modules/orca-mobile-web-shell/ios/MobileWebShellSparePool.swift @@ -7,6 +7,9 @@ private let minimumPhysicalMemory: UInt64 = 3 << 30 /// A claim is adopted on the claiming screen's first commit; this only bounds a screen that never mounts. private let claimExpirySeconds: TimeInterval = 10 +/// iOS has no "memory is low" to ask before booting (Android's `lowMemory`), and pressure outlasts its warning. +private let memoryWarningBackoffSeconds: TimeInterval = 180 + /// A booted document waiting for a screen. It keeps what the page reported, and the page's ready, for /// the view that adopts it: a parked page stops asking for init, so its ready is answered from here. final class MobileWebShellSpare: MobileWebShellDocumentSink { @@ -56,11 +59,14 @@ final class MobileWebShellSparePool { private var parked: MobileWebShellSpare? private var claimed: MobileWebShellSpare? private let shown = NSHashTable.weakObjects() + private var memoryWarningUptime: TimeInterval? - /// Whether a spare for `directory` is parked after the call; never on a small phone, inactive app or shown page. + /// Whether a spare for `directory` is parked after the call; never on a small phone, inactive app or shown + /// page, nor soon after a memory warning. func prepare(directory: String, sessionId: String) -> Bool { guard ProcessInfo.processInfo.physicalMemory > minimumPhysicalMemory, + !recentlyWarnedAboutMemory(), UIApplication.shared.applicationState == .active, shown.allObjects.isEmpty, let window = keyWindow() @@ -121,7 +127,13 @@ final class MobileWebShellSparePool { return document } - /// Memory pressure, the app leaving the foreground, files going away, or Home without a claim. + /// A spare is the first thing to give back: nothing is shown by it. + func didReceiveMemoryWarning() { + memoryWarningUptime = ProcessInfo.processInfo.systemUptime + discardAll() + } + + /// The app leaving the foreground, files going away, Home without a claim, or memory pressure. func discardAll() { for spare in [parked, claimed].compactMap({ $0 }) { spare.document.destroy() @@ -141,6 +153,11 @@ final class MobileWebShellSparePool { spare.document.destroy() } + private func recentlyWarnedAboutMemory() -> Bool { + guard let memoryWarningUptime else { return false } + return ProcessInfo.processInfo.systemUptime - memoryWarningUptime < memoryWarningBackoffSeconds + } + private func keyWindow() -> UIWindow? { UIApplication.shared.connectedScenes .compactMap { $0 as? UIWindowScene } diff --git a/mobile/modules/orca-mobile-web-shell/ios/OrcaMobileWebShellModule.swift b/mobile/modules/orca-mobile-web-shell/ios/OrcaMobileWebShellModule.swift index ed5e81770d1..ba18966b711 100644 --- a/mobile/modules/orca-mobile-web-shell/ios/OrcaMobileWebShellModule.swift +++ b/mobile/modules/orca-mobile-web-shell/ios/OrcaMobileWebShellModule.swift @@ -9,14 +9,13 @@ public class OrcaMobileWebShellModule: Module { public func definition() -> ModuleDefinition { Name("OrcaMobileWebShell") - // A spare is the first thing to give back: nothing is shown by it. OnCreate { memoryWarningObserver = NotificationCenter.default.addObserver( forName: UIApplication.didReceiveMemoryWarningNotification, object: nil, queue: .main ) { _ in - MobileWebShellSparePool.shared.discardAll() + MobileWebShellSparePool.shared.didReceiveMemoryWarning() } } diff --git a/mobile/modules/orca-mobile-web-shell/src/spare-document.ts b/mobile/modules/orca-mobile-web-shell/src/spare-document.ts index ca9ba5c1f85..2106c89423f 100644 --- a/mobile/modules/orca-mobile-web-shell/src/spare-document.ts +++ b/mobile/modules/orca-mobile-web-shell/src/spare-document.ts @@ -11,7 +11,8 @@ const spareModule = (): SpareDocumentModule | null => requireOptionalNativeModule('OrcaMobileWebShell') // Boot a page from `directory` under `sessionId` and park it, invisible, until a screen claims it. -// False when native declined: a phone under 4 GB, the app not active, or a page document shown. +// False when native declined: a phone under 4 GB, the app not active, a page document shown, or an iOS +// memory warning in the last few minutes. export async function prepareSpareDocument(directory: string, sessionId: string): Promise { return (await spareModule()?.prepareSpareDocument?.(directory, sessionId)) ?? false } diff --git a/mobile/src/home/use-home-spare-page.ts b/mobile/src/home/use-home-spare-page.ts index 58aa55953c6..14a883477e1 100644 --- a/mobile/src/home/use-home-spare-page.ts +++ b/mobile/src/home/use-home-spare-page.ts @@ -4,6 +4,7 @@ import { AppState } from 'react-native' import { setForegroundTimer } from '../mobile-web-shell/foreground-timer' import { enterHomeSparePage, + homeSpareRefillWaitMs, leaveHomeSparePage, prepareHomeSparePage } from '../mobile-web-shell/home-spare-page' @@ -29,7 +30,7 @@ export function useHomeSparePage(hostIds: readonly string[]): void { cancelTimer() cancelTimer = setForegroundTimer( () => void prepareHomeSparePage(processGenerationStore(), hosts.split(HOST_ID_SEPARATOR)), - HOME_SPARE_IDLE_MS + Math.max(HOME_SPARE_IDLE_MS, Math.ceil(homeSpareRefillWaitMs())) ) } arm() diff --git a/mobile/src/mobile-web-shell/home-spare-page.ts b/mobile/src/mobile-web-shell/home-spare-page.ts index 1456e5909b1..bf93ad3d371 100644 --- a/mobile/src/mobile-web-shell/home-spare-page.ts +++ b/mobile/src/mobile-web-shell/home-spare-page.ts @@ -11,12 +11,16 @@ import { mintShellSessionId } from './shell-session-id' // A Home entry claims the spare about 0.2 s after the tap on a simulator; a native screen keeps it no longer. const HOME_SPARE_CLAIM_GRACE_MS = 2000 +// Hopping between Home and native screens would otherwise boot and destroy a whole page on every return. +const HOME_SPARE_REFILL_BACKOFF_MS = 30_000 + // What JS last asked native to park, until a claim or a drop. Native may since have dropped it on // its own (background, memory); this only saves the claim's native round trip when nothing can match. let parkedDirectory: string | null = null let dropTimer: ReturnType | null = null // A prepare still reading the store when Home goes must not park a spare after the drop ran. let homeShown = false +let unclaimedDropAt: number | null = null function cancelDrop(): void { if (dropTimer !== null) { @@ -37,13 +41,13 @@ export async function prepareHomeSparePage( if (active === null) { continue } - if (!homeShown) { + if (!homeShown || homeSpareRefillWaitMs() > 0) { return } const directory = generationDirectoryPath(active.directory) const prepared = await prepareSpareDocument(directory, mintShellSessionId()) if (prepared && !homeShown) { - await dropHomeSparePage() + await dropUnclaimedHomeSparePage() } else if (prepared) { parkedDirectory = directory } @@ -68,6 +72,14 @@ export async function claimHomeSparePage(directory: string): Promise { dropTimer = null - void dropHomeSparePage() + void (parkedDirectory === null ? dropHomeSparePage() : dropUnclaimedHomeSparePage()) }, HOME_SPARE_CLAIM_GRACE_MS) } +function dropUnclaimedHomeSparePage(): Promise { + unclaimedDropAt = performance.now() + return dropHomeSparePage() +} + // Also runs before any host's built files go: that is rare, and a spare must not outlive its files. export function dropHomeSparePage(): Promise { parkedDirectory = null From 6c951c0a9adb2c120ce159eee4ce37487576d7a5 Mon Sep 17 00:00:00 2001 From: Neil <4138956+nwparker@users.noreply.github.com> Date: Mon, 9 Nov 2026 05:54:03 -0800 Subject: [PATCH 48/90] feat(vm-recipes): show VM lifecycle states in the sidebar, with Suspend/Resume VM (#40046) * feat(vm-recipes): show VM lifecycle states in the sidebar, with Suspend/Resume VM * fix(vm-recipes): Suspend VM suspends an idle parent with active children; dedupe repeat suspends - With active children, Suspend VM sleeps this workspace too, so its VM suspends once their sessions stop. - A repeat Suspend VM while one is pending is dropped in the coordinator instead of trusting a possibly stale suspended record. - After a direct suspend, re-probe the host so its header reads Suspended. --- src/main/ephemeral-vm/runtime-service.ts | 61 ++--- .../workspace-lifecycle-result.ts | 16 ++ src/main/ephemeral-vm/workspace-resume.ts | 32 ++- src/main/ephemeral-vm/workspace-suspend.ts | 9 +- .../ipc/ephemeral-vm-provision-cancel.test.ts | 1 + .../ephemeral-vm-provisioned-root-ref.test.ts | 1 + ...hemeral-vm-runtime-handler-cleanup.test.ts | 1 + src/main/ipc/ephemeral-vm-runtime-handlers.ts | 32 ++- src/main/ipc/ephemeral-vm.test.ts | 91 +++++++ src/main/ipc/runtime.test.ts | 29 ++- src/main/ipc/runtime.ts | 11 +- .../runtime-workspace-sleep-operations.ts | 5 + .../sleep/workspace-sleep-runtime.ts | 55 ++++- .../sleep/workspace-sleep-vm-wake.test.ts | 73 ++++++ src/preload/api/ephemeral-vm-api.ts | 9 +- src/preload/api/ephemeral-vm-bridge.ts | 7 + .../host-selection/AddRepoHostSelector.tsx | 9 +- .../WorktreeContextMenu.fixture.tsx | 25 ++ .../context-menu/WorktreeContextMenuView.tsx | 42 +++- .../use-worktree-context-menu-commands.ts | 9 + .../WorkspaceVmLifecycleMenuItems.test.ts | 33 +++ .../sleep/WorkspaceVmLifecycleMenuItems.tsx | 184 ++++++++++++++ .../surface/WorktreeCardStatusSlot.tsx | 58 ++++- .../surface/WorktreeCardVmState.fixture.tsx | 81 +++++++ .../WorktreeCardVmStateBadge.fixture.tsx | 61 +++++ .../surface/WorktreeCardVmStateBadge.tsx | 126 ++++++++++ .../default-workspace-card.parity.test.tsx | 3 +- .../controls/SidebarHostScopeMenuSection.tsx | 2 +- .../controls/sidebar-host-options.ts | 21 +- .../use-sidebar-host-scope-options.ts | 8 +- .../worktree-list/listing/use-section-rows.ts | 7 +- .../rows/HostSectionHeader.fixture.tsx | 36 +++ .../worktree-list/rows/HostSectionHeader.tsx | 48 +++- .../worktree-list/rows/host-header-detail.ts | 36 ++- .../task-source-host-status-labels.ts | 6 + .../hooks/ipc-events-harness-store-state.ts | 1 + .../ipc-events/app-lifetime-ipc-bridge.ts | 2 + .../ephemeral-vm-lifecycle-ipc-bridge.ts | 19 ++ src/renderer/src/i18n/locales/en.json | 43 +++- .../src/lib/project-host-health-detail.ts | 23 ++ .../src/lib/project-host-setup-options.ts | 18 +- src/renderer/src/lib/runtime-host-copy.ts | 20 +- .../sidebar-worktree-activation.test.ts | 94 ++++++++ .../activation/sidebar-worktree-activation.ts | 95 ++++++-- src/renderer/src/store/index.ts | 4 +- .../ephemeral-vm-lifecycle.test.ts | 154 ++++++++++++ .../ephemeral-vm/ephemeral-vm-lifecycle.ts | 228 ++++++++++++++++++ .../worktrees/worktrees-slice-test-harness.ts | 2 + .../store/testing/app-store-test-fixture.ts | 4 +- src/renderer/src/store/types.ts | 4 +- src/shared/ephemeral-vm-failure-copy.ts | 17 ++ .../ephemeral-vm-runtime-store-events.ts | 23 ++ src/shared/ephemeral-vm-runtime-store.test.ts | 17 ++ src/shared/ephemeral-vm-runtime-store.ts | 23 +- src/shared/ephemeral-vm-runtimes.ts | 28 +++ .../execution-host/execution-host-health.ts | 75 +++++- .../execution-host-registry-entry.ts | 4 +- ...ecution-host-registry-vm-lifecycle.test.ts | 117 +++++++++ .../execution-host/execution-host-registry.ts | 6 +- .../execution-host-vm-lifecycle.ts | 53 ++++ src/shared/sidebar-list/host-section-rows.ts | 9 +- 61 files changed, 2156 insertions(+), 155 deletions(-) create mode 100644 src/main/ephemeral-vm/workspace-lifecycle-result.ts create mode 100644 src/renderer/src/components/sidebar/workspace-actions/sleep/WorkspaceVmLifecycleMenuItems.test.ts create mode 100644 src/renderer/src/components/sidebar/workspace-actions/sleep/WorkspaceVmLifecycleMenuItems.tsx create mode 100644 src/renderer/src/components/sidebar/workspace-card/surface/WorktreeCardVmState.fixture.tsx create mode 100644 src/renderer/src/components/sidebar/workspace-card/surface/WorktreeCardVmStateBadge.fixture.tsx create mode 100644 src/renderer/src/components/sidebar/workspace-card/surface/WorktreeCardVmStateBadge.tsx create mode 100644 src/renderer/src/components/sidebar/worktree-list/rows/HostSectionHeader.fixture.tsx create mode 100644 src/renderer/src/hooks/ipc-events/ephemeral-vm-lifecycle-ipc-bridge.ts create mode 100644 src/renderer/src/lib/project-host-health-detail.ts create mode 100644 src/renderer/src/lib/workspace/activation/sidebar-worktree-activation.test.ts create mode 100644 src/renderer/src/store/slices/ephemeral-vm/ephemeral-vm-lifecycle.test.ts create mode 100644 src/renderer/src/store/slices/ephemeral-vm/ephemeral-vm-lifecycle.ts create mode 100644 src/shared/ephemeral-vm-runtime-store-events.ts create mode 100644 src/shared/execution-host/execution-host-registry-vm-lifecycle.test.ts create mode 100644 src/shared/execution-host/execution-host-vm-lifecycle.ts diff --git a/src/main/ephemeral-vm/runtime-service.ts b/src/main/ephemeral-vm/runtime-service.ts index d2a41304b06..cb87758dd92 100644 --- a/src/main/ephemeral-vm/runtime-service.ts +++ b/src/main/ephemeral-vm/runtime-service.ts @@ -21,7 +21,8 @@ import { getProvisionedRootResumeIntegrityError } from './resume-integrity' import { runControlledEphemeralVmRuntimeCleanup } from './runtime-cleanup-control' import { ephemeralVmFailure, - pickEphemeralVmFailureCode + pickEphemeralVmFailureCode, + type EphemeralVmFailure } from '../../shared/ephemeral-vm-failure-copy' export type ProvisionEphemeralVmRuntimeArgs = { @@ -83,23 +84,13 @@ export type SuspendEphemeralVmRuntimeResult = runtime: EphemeralVmRuntimeRecord skipped: boolean } - | { + | ({ ok: false runtime: EphemeralVmRuntimeRecord - error: string - } + } & EphemeralVmFailure) -export type ResumeEphemeralVmRuntimeResult = - | { - ok: true - runtime: EphemeralVmRuntimeRecord - skipped: boolean - } - | { - ok: false - runtime: EphemeralVmRuntimeRecord - error: string - } +/** Same shape as suspend: success may be a skipped no-op; failure carries the coded reason. */ +export type ResumeEphemeralVmRuntimeResult = SuspendEphemeralVmRuntimeResult export async function provisionEphemeralVmRuntime( args: ProvisionEphemeralVmRuntimeArgs @@ -229,15 +220,16 @@ export async function suspendEphemeralVmRuntime( }) if (!suspend.ok) { - const failed = updateEphemeralVmRuntimeStatus(args.userDataPath, existing.id, { - status: 'suspend_failed', - updatedAt: Date.now() - }) - return { ok: false, runtime: failed, error: suspend.error ?? 'Suspend failed.' } + const failure = { + error: suspend.error ?? 'Suspend failed.', + ...pickEphemeralVmFailureCode(suspend) + } + return recordLifecycleFailure(args.userDataPath, existing.id, 'suspend_failed', failure) } const suspended = updateEphemeralVmRuntimeStatus(args.userDataPath, existing.id, { status: suspend.skipped ? existing.status : 'suspended', + ...(suspend.skipped ? {} : { lifecycleLastError: null }), updatedAt: Date.now() }) return { ok: true, runtime: suspended, skipped: suspend.skipped } @@ -264,32 +256,43 @@ export async function resumeEphemeralVmRuntime( }) if (!resume.ok) { - const failed = updateEphemeralVmRuntimeStatus(args.userDataPath, existing.id, { - status: 'resume_failed', - updatedAt: Date.now() - }) - return { ok: false, runtime: failed, error: resume.error } + const failure = { error: resume.error, ...pickEphemeralVmFailureCode(resume) } + return recordLifecycleFailure(args.userDataPath, existing.id, 'resume_failed', failure) } const resumeIntegrityError = resume.skipped ? null : getProvisionedRootResumeIntegrityError(existing.recipeResult, resume.result) if (resumeIntegrityError) { - const failed = updateEphemeralVmRuntimeStatus(args.userDataPath, existing.id, { - status: 'resume_failed', - updatedAt: Date.now() + return recordLifecycleFailure(args.userDataPath, existing.id, 'resume_failed', { + error: resumeIntegrityError }) - return { ok: false, runtime: failed, error: resumeIntegrityError } } const runtime = updateEphemeralVmRuntimeStatus(args.userDataPath, existing.id, { status: 'running', + lifecycleLastError: null, ...(!resume.skipped ? { recipeResult: resume.result } : {}), updatedAt: Date.now() }) return { ok: true, runtime, skipped: resume.skipped } } +/** Persist the failed status with its reason so the sidebar can explain it after a restart. */ +function recordLifecycleFailure( + userDataPath: string, + runtimeId: string, + status: 'suspend_failed' | 'resume_failed', + failure: EphemeralVmFailure +): { ok: false; runtime: EphemeralVmRuntimeRecord } & EphemeralVmFailure { + const runtime = updateEphemeralVmRuntimeStatus(userDataPath, runtimeId, { + status, + lifecycleLastError: failure, + updatedAt: Date.now() + }) + return { ok: false, runtime, ...failure } +} + function contextFromRuntime( repoPath: string, runtime: EphemeralVmRuntimeRecord diff --git a/src/main/ephemeral-vm/workspace-lifecycle-result.ts b/src/main/ephemeral-vm/workspace-lifecycle-result.ts new file mode 100644 index 00000000000..9697758071a --- /dev/null +++ b/src/main/ephemeral-vm/workspace-lifecycle-result.ts @@ -0,0 +1,16 @@ +import type { + EphemeralVmRuntimeRecord, + EphemeralVmWorkspaceLifecycleResult +} from '../../shared/ephemeral-vm-runtimes' +import { ephemeralVmFailureFromError } from '../../shared/ephemeral-vm-failure-copy' + +/** Thrown IPC errors keep only the message; a value keeps the code for the renderer catalog. */ +export async function toWorkspaceLifecycleResult( + run: () => Promise +): Promise { + try { + return { ok: true, runtime: await run() } + } catch (error) { + return { ok: false, ...ephemeralVmFailureFromError(error) } + } +} diff --git a/src/main/ephemeral-vm/workspace-resume.ts b/src/main/ephemeral-vm/workspace-resume.ts index 4572fe00cf5..10d07137160 100644 --- a/src/main/ephemeral-vm/workspace-resume.ts +++ b/src/main/ephemeral-vm/workspace-resume.ts @@ -8,6 +8,11 @@ import { getEphemeralVmRecipeResultPairingCode } from '../../shared/ephemeral-vm-recipes' import { resolveEnvironment } from '../../shared/remote-runtime/host-store/runtime-environment-store' +import { + EphemeralVmFailureError, + ephemeralVmFailureFromError, + pickEphemeralVmFailureCode +} from '../../shared/ephemeral-vm-failure-copy' import { resumeEphemeralVmRuntime } from './runtime-service' import { connectRuntimeOwnedSshTarget, refreshRuntimeOwnedSshTarget } from './runtime-ssh' import { noteRecipeVmWakePairing } from './recipe-vm-wake-pairings' @@ -58,9 +63,22 @@ export async function resumeEphemeralVmWorkspace( } const restoreAfterFailedRecovery = (): void => { if (lostContact) { + // The record stays as it was; a lifecycle error only shows on a resume_failed VM. updateEphemeralVmRuntimeStatus(userDataPath, runtime.id, { status: runtime.status }) } } + // After the recipe marked the VM running, an SSH host Orca cannot reach again is still a failed + // resume, saved with its reason so the row can explain it after a restart. + const failAfterResume = (error: unknown): void => { + if (lostContact) { + restoreAfterFailedRecovery() + return + } + updateEphemeralVmRuntimeStatus(userDataPath, runtime.id, { + status: 'resume_failed', + lifecycleLastError: ephemeralVmFailureFromError(error) + }) + } const recipeContext = getRuntimeRecipeContext(store, userDataPath, runtime.id) if (lostContact && runtime.connectionMode === 'orca-server' && !recipeContext.recipe.resume) { // Nothing can restart this VM, and only the user can tell whether it is gone. Retry the @@ -78,7 +96,10 @@ export async function resumeEphemeralVmWorkspace( }) if (!result.ok) { restoreAfterFailedRecovery() - throw new Error(result.error) + throw new EphemeralVmFailureError({ + error: result.error, + ...pickEphemeralVmFailureCode(result) + }) } if (lostContact && runtime.runtimeEnvironmentId) { // The resume restarted the VM; its server's old failures say nothing about the new boot. @@ -90,6 +111,7 @@ export async function resumeEphemeralVmWorkspace( const connection = getEphemeralVmRecipeResultConnection(result.runtime.recipeResult) // SSH servers use their target and have no pairing to refresh. if (!result.skipped && connection.type !== 'ssh' && runtime.runtimeEnvironmentId) { + // A pairing failure leaves the VM running: retrying the recipe's resume on it would fail. const pairingCode = getEphemeralVmRecipeResultPairingCode(result.runtime.recipeResult) if (!pairingCode) { throw new Error('Resume result did not include an Orca Server pairing code.') @@ -139,13 +161,7 @@ export async function resumeEphemeralVmWorkspace( reestablishWokenServer(userDataPath, ssh.environmentId) return woken } catch (error) { - if (lostContact) { - restoreAfterFailedRecovery() - } else { - updateEphemeralVmRuntimeStatus(userDataPath, result.runtime.id, { - status: 'resume_failed' - }) - } + failAfterResume(error) throw error } } diff --git a/src/main/ephemeral-vm/workspace-suspend.ts b/src/main/ephemeral-vm/workspace-suspend.ts index 7b79aa813f5..844a804d5ea 100644 --- a/src/main/ephemeral-vm/workspace-suspend.ts +++ b/src/main/ephemeral-vm/workspace-suspend.ts @@ -4,6 +4,10 @@ import { findWorkspaceEphemeralVmRuntime } from '../../shared/ephemeral-vm-works import { suspendEphemeralVmRuntime } from './runtime-service' import { disconnectRuntimeOwnedSshTarget } from './runtime-ssh' import { getRuntimeRecipeContext } from '../ipc/ephemeral-vm-recipe-context' +import { + EphemeralVmFailureError, + pickEphemeralVmFailureCode +} from '../../shared/ephemeral-vm-failure-copy' export async function suspendEphemeralVmWorkspace( store: Store, @@ -22,7 +26,10 @@ export async function suspendEphemeralVmWorkspace( runtimeId: runtime.id }) if (!result.ok) { - throw new Error(result.error) + throw new EphemeralVmFailureError({ + error: result.error, + ...pickEphemeralVmFailureCode(result) + }) } // A skipped suspend leaves the VM running, so its SSH connection must remain live. if (runtime.connectionMode === 'ssh' && !result.skipped) { diff --git a/src/main/ipc/ephemeral-vm-provision-cancel.test.ts b/src/main/ipc/ephemeral-vm-provision-cancel.test.ts index 0243488d077..5ffa3e55049 100644 --- a/src/main/ipc/ephemeral-vm-provision-cancel.test.ts +++ b/src/main/ipc/ephemeral-vm-provision-cancel.test.ts @@ -11,6 +11,7 @@ const { getPathMock, handleMock, resolveProvisionedRootSourceMock } = vi.hoisted })) vi.mock('electron', () => ({ + BrowserWindow: { getAllWindows: () => [] }, app: { getPath: getPathMock }, ipcMain: { handle: handleMock, removeHandler: vi.fn() } })) diff --git a/src/main/ipc/ephemeral-vm-provisioned-root-ref.test.ts b/src/main/ipc/ephemeral-vm-provisioned-root-ref.test.ts index fcfc5dd9e11..190c3268bc4 100644 --- a/src/main/ipc/ephemeral-vm-provisioned-root-ref.test.ts +++ b/src/main/ipc/ephemeral-vm-provisioned-root-ref.test.ts @@ -15,6 +15,7 @@ const { connectRuntimeOwnedSshTargetMock, getPathMock, handleMock, removeHandler ) vi.mock('electron', () => ({ + BrowserWindow: { getAllWindows: () => [] }, app: { getPath: getPathMock }, ipcMain: { handle: handleMock, removeHandler: removeHandlerMock } })) diff --git a/src/main/ipc/ephemeral-vm-runtime-handler-cleanup.test.ts b/src/main/ipc/ephemeral-vm-runtime-handler-cleanup.test.ts index 37645f8f1d0..96a52a900b4 100644 --- a/src/main/ipc/ephemeral-vm-runtime-handler-cleanup.test.ts +++ b/src/main/ipc/ephemeral-vm-runtime-handler-cleanup.test.ts @@ -16,6 +16,7 @@ const { getPathMock, handleMock, removeRuntimeOwnedSshTargetMock, removeHandlerM ) vi.mock('electron', () => ({ + BrowserWindow: { getAllWindows: () => [] }, app: { getPath: getPathMock }, ipcMain: { handle: handleMock, removeHandler: removeHandlerMock } })) diff --git a/src/main/ipc/ephemeral-vm-runtime-handlers.ts b/src/main/ipc/ephemeral-vm-runtime-handlers.ts index af566602f62..716a8e388fe 100644 --- a/src/main/ipc/ephemeral-vm-runtime-handlers.ts +++ b/src/main/ipc/ephemeral-vm-runtime-handlers.ts @@ -1,9 +1,13 @@ -import { app, ipcMain } from 'electron' +import { app, BrowserWindow, ipcMain } from 'electron' import type { Store } from '../persistence/loading-store/store' import { listEphemeralVmRuntimes, updateEphemeralVmRuntimeStatus } from '../../shared/ephemeral-vm-runtime-store' +import { + EPHEMERAL_VM_RUNTIMES_CHANGED_CHANNEL, + onEphemeralVmRuntimesChanged +} from '../../shared/ephemeral-vm-runtime-store-events' import type { EphemeralVmRuntimeRecord } from '../../shared/ephemeral-vm-runtimes' import { cleanupOwnedEphemeralVmRuntime } from '../ephemeral-vm/owned-runtime-cleanup' import { stopEphemeralVmRuntimeCleanup } from '../ephemeral-vm/runtime-cleanup-control' @@ -16,6 +20,30 @@ import { ephemeralVmFailure } from '../../shared/ephemeral-vm-failure-copy' import { attachEphemeralVmRuntimeToWorkspace } from '../ephemeral-vm/runtime-attachment' import { forgetInterruptedEphemeralVmProvision } from '../ephemeral-vm/runtime-provisioning-persistence' +let stopRuntimesChangedBroadcast: (() => void) | null = null +let runtimesChangedBroadcastQueued = false + +/** One coalesced signal per tick: a lifecycle op writes the store several times. */ +function broadcastEphemeralVmRuntimesChanged(): void { + if (runtimesChangedBroadcastQueued) { + return + } + runtimesChangedBroadcastQueued = true + setImmediate(() => { + runtimesChangedBroadcastQueued = false + for (const window of BrowserWindow.getAllWindows()) { + if (window.isDestroyed()) { + continue + } + try { + window.webContents.send(EPHEMERAL_VM_RUNTIMES_CHANGED_CHANNEL) + } catch { + // A renderer can disappear between isDestroyed() and send(). + } + } + }) +} + export type EphemeralVmCleanupCommandResult = { runtimeId: string command: string | null @@ -31,6 +59,8 @@ export function registerEphemeralVmRuntimeHandlers(store: Store): void { ipcMain.removeHandler('ephemeralVm:stopCleanup') ipcMain.removeHandler('ephemeralVm:forgetRuntime') ipcMain.removeHandler('ephemeralVm:getCleanupCommand') + stopRuntimesChangedBroadcast?.() + stopRuntimesChangedBroadcast = onEphemeralVmRuntimesChanged(broadcastEphemeralVmRuntimesChanged) ipcMain.handle('ephemeralVm:listRuntimes', (): EphemeralVmRuntimeRecord[] => { return listEphemeralVmRuntimes(app.getPath('userData')) diff --git a/src/main/ipc/ephemeral-vm.test.ts b/src/main/ipc/ephemeral-vm.test.ts index 1847714de86..6dd61f6f944 100644 --- a/src/main/ipc/ephemeral-vm.test.ts +++ b/src/main/ipc/ephemeral-vm.test.ts @@ -30,6 +30,7 @@ const { })) vi.mock('electron', () => ({ + BrowserWindow: { getAllWindows: () => [] }, app: { getPath: getPathMock }, @@ -52,6 +53,7 @@ vi.mock('./runtime-environments/runtime-environments', () => ({ import { registerEphemeralVmHandlers } from './ephemeral-vm' import { suspendEphemeralVmWorkspace } from '../ephemeral-vm/workspace-suspend' import { resumeEphemeralVmWorkspace } from '../ephemeral-vm/workspace-resume' +import { toWorkspaceLifecycleResult } from '../ephemeral-vm/workspace-lifecycle-result' const tempDirs: string[] = [] @@ -405,6 +407,95 @@ describe('registerEphemeralVmHandlers', () => { ) }) + it('returns coded suspend and resume failures and keeps them on the record', async () => { + const userDataPath = makeDir('orca-ephemeral-vm-ipc-user-data-') + const repoPath = makeDir('orca-ephemeral-vm-ipc-repo-') + getPathMock.mockReturnValue(userDataPath) + mkdirSync(join(repoPath, 'scripts'), { recursive: true }) + const startPath = join(repoPath, 'scripts', 'start.js') + const suspendPath = join(repoPath, 'scripts', 'suspend.js') + const resumePath = join(repoPath, 'scripts', 'resume.js') + writeFileSync( + startPath, + [ + 'console.log(JSON.stringify({', + ' schemaVersion: 1,', + ` pairingCode: ${JSON.stringify(makePairingCode())},`, + " projectRoot: '/workspace/repo'", + '}))' + ].join('\n') + ) + writeFileSync(suspendPath, "if (require('fs').existsSync('fail-suspend.txt')) process.exit(4)") + writeFileSync(resumePath, 'process.exit(3)') + writeFileSync( + join(repoPath, 'orca.yaml'), + [ + 'environmentRecipes:', + ' - id: cloud-sandbox', + ' name: Cloud Sandbox', + ` create: ${JSON.stringify(nodeCommand(startPath))}`, + ` suspend: ${JSON.stringify(nodeCommand(suspendPath))}`, + ` resume: ${JSON.stringify(nodeCommand(resumePath))}`, + ' destroy: none' + ].join('\n') + ) + const store = makeStore(repoPath) + registerEphemeralVmHandlers(store as never) + const provisioned = (await handlers.get('ephemeralVm:provision')?.(null, { + repoId: 'repo-1', + recipeId: 'cloud-sandbox' + } as never)) as { ok: true; runtime: { id: string } } + await handlers.get('ephemeralVm:attachWorkspace')?.(null, { + runtimeId: provisioned.runtime.id, + workspaceId: 'workspace-1' + } as never) + const suspend = () => + toWorkspaceLifecycleResult(async () => { + // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the suspend reads only getRepo and getRepos, which makeStore provides. + await suspendEphemeralVmWorkspace(store as never, 'workspace-1') + return null + }) + + writeFileSync(join(repoPath, 'fail-suspend.txt'), '') + expect(await suspend()).toEqual({ + ok: false, + error: 'Suspend exited with code 4.', + errorCode: 'suspendExited', + errorParams: { exitCode: 4 } + }) + expect(listEphemeralVmRuntimes(userDataPath)[0]).toMatchObject({ + status: 'suspend_failed', + lifecycleLastErrorCode: 'suspendExited' + }) + + rmSync(join(repoPath, 'fail-suspend.txt')) + expect(await suspend()).toEqual({ ok: true, runtime: null }) + // A successful suspend clears the earlier suspend failure from the record. + expect(listEphemeralVmRuntimes(userDataPath)[0]?.lifecycleLastErrorCode).toBeUndefined() + + const resumeFailed = await toWorkspaceLifecycleResult(() => + // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the resume reads only getRepo and getRepos, which makeStore provides. + resumeEphemeralVmWorkspace(store as never, 'workspace-1', { + sshHeld: false, + sshUserDisconnects: 0 + }) + ) + expect(resumeFailed).toEqual({ + ok: false, + error: 'Resume exited with code 3.', + errorCode: 'resumeExited', + errorParams: { exitCode: 3 } + }) + expect(listEphemeralVmRuntimes(userDataPath)).toEqual([ + expect.objectContaining({ + status: 'resume_failed', + lifecycleLastError: 'Resume exited with code 3.', + lifecycleLastErrorCode: 'resumeExited', + lifecycleLastErrorParams: { exitCode: 3 } + }) + ]) + }) + it('redacts recipe stdout when provisioning fails', async () => { const userDataPath = makeDir('orca-ephemeral-vm-ipc-user-data-') const repoPath = makeDir('orca-ephemeral-vm-ipc-repo-') diff --git a/src/main/ipc/runtime.test.ts b/src/main/ipc/runtime.test.ts index 9c8b0cebdf1..426ee56ba12 100644 --- a/src/main/ipc/runtime.test.ts +++ b/src/main/ipc/runtime.test.ts @@ -21,6 +21,7 @@ vi.mock('electron', () => ({ } })) import { registerRuntimeHandlers } from './runtime' +import { EphemeralVmFailureError } from '../../shared/ephemeral-vm-failure-copy' describe('registerRuntimeHandlers', () => { beforeEach(() => { @@ -41,10 +42,36 @@ describe('registerRuntimeHandlers', () => { const registration = handleMock.mock.calls.find( ([channel]) => channel === 'ephemeralVm:resumeWorkspace' ) - await expect(registration![1]({}, { workspaceId: 'repo::/vm' })).resolves.toBe(record) + await expect(registration![1]({}, { workspaceId: 'repo::/vm' })).resolves.toEqual({ + ok: true, + runtime: record + }) expect(runtime.wakeWorkspaceVm).toHaveBeenCalledWith('repo::/vm') }) + it('returns coded VM wake and suspend failures as values so the code reaches the window', async () => { + const failure = { + error: 'Resume exited with code 3.', + errorCode: 'resumeExited', + errorParams: { exitCode: 3 } + } + const runtime = { + wakeWorkspaceVm: vi.fn().mockRejectedValue(new EphemeralVmFailureError(failure)), + suspendWorkspaceVm: vi.fn().mockRejectedValue(new Error('Suspend failed.')) + } + registerRuntimeHandlers(runtime as never) + const handler = (channel: string) => + handleMock.mock.calls.find(([registered]) => registered === channel)![1] + + await expect( + handler('ephemeralVm:resumeWorkspace')({}, { workspaceId: 'repo::/vm' }) + ).resolves.toEqual({ ok: false, ...failure }) + await expect( + handler('ephemeralVm:suspendWorkspace')({}, { workspaceId: 'repo::/vm' }) + ).resolves.toEqual({ ok: false, error: 'Suspend failed.' }) + expect(runtime.suspendWorkspaceVm).toHaveBeenCalledWith('repo::/vm') + }) + // #37067: a phone's re-read on the add's reposChanged came before this publish. it('rejects a graph publication queued by a superseded main frame', () => { diff --git a/src/main/ipc/runtime.ts b/src/main/ipc/runtime.ts index 52565e74f8e..7dadefd1eee 100644 --- a/src/main/ipc/runtime.ts +++ b/src/main/ipc/runtime.ts @@ -14,6 +14,7 @@ import { RpcDispatcher } from '../runtime/rpc/dispatcher' import { DESKTOP_RPC_CALLER } from '../runtime/rpc/rpc-caller-identity' import { ALL_RPC_METHODS } from '../runtime/rpc/methods/rpc-method-registry' import { DesktopRuntimeSenderLifecycle } from './desktop-runtime-sender-lifecycle' +import { toWorkspaceLifecycleResult } from '../ephemeral-vm/workspace-lifecycle-result' import { publishMobileProjectSections } from '../runtime/sidebar-inputs/mobile-project-sections-snapshot' function boundTerminalFitRestore(pending: Promise): Promise { @@ -34,10 +35,18 @@ export function registerRuntimeHandlers(runtime: OrcaRuntimeService): void { ipcMain.removeHandler('runtime:subscribe') ipcMain.removeAllListeners('runtime:unsubscribe') ipcMain.removeHandler('ephemeralVm:resumeWorkspace') + ipcMain.removeHandler('ephemeralVm:suspendWorkspace') // The window's wake shares the runtime's single VM wake path with its sleep's suspend. ipcMain.handle('ephemeralVm:resumeWorkspace', (_event, args: { workspaceId: string }) => - runtime.wakeWorkspaceVm(args.workspaceId) + toWorkspaceLifecycleResult(() => runtime.wakeWorkspaceVm(args.workspaceId)) + ) + // Suspend VM with nothing open; a workspace with open panels sleeps, which suspends it after. + ipcMain.handle('ephemeralVm:suspendWorkspace', (_event, args: { workspaceId: string }) => + toWorkspaceLifecycleResult(async () => { + await runtime.suspendWorkspaceVm(args.workspaceId) + return null + }) ) ipcMain.handle( diff --git a/src/main/runtime/workspaces/sleep/runtime-workspace-sleep-operations.ts b/src/main/runtime/workspaces/sleep/runtime-workspace-sleep-operations.ts index cb1a161ffd6..69c4825efa5 100644 --- a/src/main/runtime/workspaces/sleep/runtime-workspace-sleep-operations.ts +++ b/src/main/runtime/workspaces/sleep/runtime-workspace-sleep-operations.ts @@ -146,6 +146,11 @@ export abstract class RuntimeWorkspaceSleepOperations extends OrcaRuntimeWithRes ) } + /** The user's Suspend VM, serialised with any wake of the same VM. */ + suspendWorkspaceVm(worktreeId: string): Promise { + return this.workspaceSleep.suspendVm(worktreeId) + } + /** Where this workspace's recipe VM stands for a client about to reach its server. */ workspaceVmState(worktreeId: string, recordSuspended: boolean): RecipeVmState { return this.workspaceSleep.vmState(worktreeId, recordSuspended) diff --git a/src/main/runtime/workspaces/sleep/workspace-sleep-runtime.ts b/src/main/runtime/workspaces/sleep/workspace-sleep-runtime.ts index 8bd911b0526..49b038d774b 100644 --- a/src/main/runtime/workspaces/sleep/workspace-sleep-runtime.ts +++ b/src/main/runtime/workspaces/sleep/workspace-sleep-runtime.ts @@ -209,6 +209,47 @@ export class WorkspaceSleepCoordinator { } } + /** The user's Suspend VM on a workspace with nothing open to sleep: queued like a sleep's + * suspend, so it never runs beside a wake of the same VM, and skipped if the workspace is + * opened before its turn. */ + suspendVm(worktreeId: string): Promise { + const platform = this.runtime.workspaceSleepPlatform + if (!platform?.ownsVm(worktreeId)) { + return Promise.resolve() + } + // A second Suspend VM while one is queued or running would rerun the recipe's suspend on a + // VM already going to sleep. + const pending = (this.pendingVmOperations.get(worktreeId) ?? []).at(-1) + if (pending?.kind === 'suspend') { + return Promise.resolve() + } + // Opening the workspace while this waits its turn keeps the VM up, as it does for a Sleep. + const at = this.reopenings.get(worktreeId) ?? 0 + return this.queueVmSuspend( + platform, + worktreeId, + () => (this.reopenings.get(worktreeId) ?? 0) === at + ) + } + + private queueVmSuspend( + platform: WorkspaceSleepPlatform, + worktreeId: string, + wanted: () => boolean + ): Promise { + const operation: VmOperation = { kind: 'suspend', suspending: false } + return this.trackVmOperation( + worktreeId, + operation, + this.afterVmOperations(worktreeId, async () => { + if (wanted()) { + operation.suspending = true + await platform.suspendVm(worktreeId) + } + }) + ) + } + private trackVmOperation(worktreeId: string, operation: VmOperation, run: Promise) { return trackPendingVmOperation(this.pendingVmOperations, worktreeId, operation, run) } @@ -256,19 +297,7 @@ export class WorkspaceSleepCoordinator { return host.sleepWorkspace(worktreeId, markAsleep) }, suspendVm: platform - ? (worktreeId, wanted) => { - const operation: VmOperation = { kind: 'suspend', suspending: false } - return this.trackVmOperation( - worktreeId, - operation, - this.afterVmOperations(worktreeId, async () => { - if (wanted()) { - operation.suspending = true - await platform.suspendVm(worktreeId) - } - }) - ) - } + ? (worktreeId, wanted) => this.queueVmSuspend(platform, worktreeId, wanted) : null, vmWakeSettled: (worktreeId) => pendingVmWake(this.pendingVmOperations.get(worktreeId) ?? []).catch(() => {}), diff --git a/src/main/runtime/workspaces/sleep/workspace-sleep-vm-wake.test.ts b/src/main/runtime/workspaces/sleep/workspace-sleep-vm-wake.test.ts index 04e3c822fbc..8e58b572b57 100644 --- a/src/main/runtime/workspaces/sleep/workspace-sleep-vm-wake.test.ts +++ b/src/main/runtime/workspaces/sleep/workspace-sleep-vm-wake.test.ts @@ -130,6 +130,79 @@ describe('WorkspaceSleepCoordinator VM wake', () => { expect(order).toEqual(['resume']) }) + it("runs the user's Suspend VM after a wake already running, and reads it as asleep meanwhile", async () => { + const order: string[] = [] + const resuming = gate() + const workspaceSleep = coordinator({ + suspendVm: async () => { + order.push('suspend') + }, + resumeVm: async () => { + await resuming.opened + order.push('resume') + return null + } + }) + + const woke = workspaceSleep.wakeVm(WORKTREE_ID) + const suspended = workspaceSleep.suspendVm(WORKTREE_ID) + expect(workspaceSleep.vmState(WORKTREE_ID, false)).toBe('waking') + resuming.open() + await woke + expect(workspaceSleep.vmState(WORKTREE_ID, false)).toBe('asleep') + await suspended + + expect(order).toEqual(['resume', 'suspend']) + expect(workspaceSleep.vmState(WORKTREE_ID, true)).toBe('asleep') + }) + + it('drops a queued Suspend VM when the workspace is opened before its turn', async () => { + const order: string[] = [] + const resuming = gate() + const workspaceSleep = coordinator({ + suspendVm: async () => { + order.push('suspend') + }, + resumeVm: async () => { + await resuming.opened + order.push('resume') + return null + } + }) + + const woke = workspaceSleep.wakeVm(WORKTREE_ID) + const suspended = workspaceSleep.suspendVm(WORKTREE_ID) + workspaceSleep.noteReopened(WORKTREE_ID) + resuming.open() + await Promise.all([woke, suspended]) + + expect(order).toEqual(['resume']) + }) + + it('runs one suspend for a Suspend VM chosen twice before the first finishes', async () => { + const suspending = gate() + const suspendVm = vi.fn(async () => { + await suspending.opened + }) + const workspaceSleep = coordinator({ suspendVm, resumeVm: async () => null }) + + const first = workspaceSleep.suspendVm(WORKTREE_ID) + const second = workspaceSleep.suspendVm(WORKTREE_ID) + suspending.open() + await Promise.all([first, second]) + + expect(suspendVm).toHaveBeenCalledTimes(1) + }) + + it('skips Suspend VM for a workspace without a VM', async () => { + const suspendVm = vi.fn(async () => {}) + const workspaceSleep = coordinator({ suspendVm, resumeVm: async () => null }) + + await workspaceSleep.suspendVm('repo-1::/tmp/plain') + + expect(suspendVm).not.toHaveBeenCalled() + }) + // #36923: clients reaching the VM's server learn where it stands from its pending operations, // which outrank a stored record that lags them. it('reports a VM waking from its wake until the resume settles, even when it fails', async () => { diff --git a/src/preload/api/ephemeral-vm-api.ts b/src/preload/api/ephemeral-vm-api.ts index 0b83d3f7157..2acefc41669 100644 --- a/src/preload/api/ephemeral-vm-api.ts +++ b/src/preload/api/ephemeral-vm-api.ts @@ -4,7 +4,8 @@ import type { EphemeralVmRecipeDoctorResult } from '../../shared/ephemeral-vm-re import type { EphemeralVmRecipeResultWarning } from '../../shared/ephemeral-vm-recipe-diagnostics' import type { EphemeralVmProvisionedRuntimeRecord, - EphemeralVmRuntimeRecord + EphemeralVmRuntimeRecord, + EphemeralVmWorkspaceLifecycleResult } from '../../shared/ephemeral-vm-runtimes' import type { EphemeralVmFailure } from '../../shared/ephemeral-vm-failure-copy' @@ -68,7 +69,11 @@ export type EphemeralVmApi = { runtimeId: string workspaceId: string }) => Promise - resumeWorkspace: (args: { workspaceId: string }) => Promise + resumeWorkspace: (args: { workspaceId: string }) => Promise + /** Suspends the workspace's VM without closing panels; sleep closes them first. */ + suspendWorkspace: (args: { workspaceId: string }) => Promise + /** Fires after any runtime record write; re-list to read the new lifecycle status. */ + onRuntimesChanged: (callback: () => void) => () => void cleanup: (args: { runtimeId: string }) => Promise stopCleanup: (args: { runtimeId: string }) => Promise /** Drops an interrupted write-ahead record that never received a recipe result. */ diff --git a/src/preload/api/ephemeral-vm-bridge.ts b/src/preload/api/ephemeral-vm-bridge.ts index ee9748e499d..a0b3ebd1a9f 100644 --- a/src/preload/api/ephemeral-vm-bridge.ts +++ b/src/preload/api/ephemeral-vm-bridge.ts @@ -1,5 +1,6 @@ import { ipcRenderer } from 'electron' import type { PreloadApi } from '../api-types' +import { EPHEMERAL_VM_RUNTIMES_CHANGED_CHANNEL } from '../../shared/ephemeral-vm-runtime-store-events' export const ephemeralVmApi = { listRecipes: (args) => ipcRenderer.invoke('ephemeralVm:listRecipes', args), @@ -18,6 +19,12 @@ export const ephemeralVmApi = { listRuntimes: () => ipcRenderer.invoke('ephemeralVm:listRuntimes'), attachWorkspace: (args) => ipcRenderer.invoke('ephemeralVm:attachWorkspace', args), resumeWorkspace: (args) => ipcRenderer.invoke('ephemeralVm:resumeWorkspace', args), + suspendWorkspace: (args) => ipcRenderer.invoke('ephemeralVm:suspendWorkspace', args), + onRuntimesChanged: (callback) => { + const listener = (): void => callback() + ipcRenderer.on(EPHEMERAL_VM_RUNTIMES_CHANGED_CHANNEL, listener) + return () => ipcRenderer.removeListener(EPHEMERAL_VM_RUNTIMES_CHANGED_CHANNEL, listener) + }, cleanup: (args) => ipcRenderer.invoke('ephemeralVm:cleanup', args), stopCleanup: (args) => ipcRenderer.invoke('ephemeralVm:stopCleanup', args), forgetRuntime: (args) => ipcRenderer.invoke('ephemeralVm:forgetRuntime', args), diff --git a/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoHostSelector.tsx b/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoHostSelector.tsx index 92a42d7ef6b..2d979407484 100644 --- a/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoHostSelector.tsx +++ b/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoHostSelector.tsx @@ -44,7 +44,7 @@ function getHostStatusDetail(host: SidebarHostOption, t?: Translate): string { return describeRuntimeCompatBlock(host.compatibility, t) } const detail = host.failureReason ?? host.detail - return `${getSidebarHostHealthLabel(host.health, host.blockedReason, t)}${detail ? ` - ${detail}` : ''}` + return `${getSidebarHostHealthLabel(host.health, host.blockedReason, t, host.vmState)}${detail ? ` - ${detail}` : ''}` } export function AddRepoHostSelector({ @@ -92,7 +92,12 @@ export function AddRepoHostSelector({ title={getHostStatusDetail(selectedHost, t)} className="shrink-0 text-[11px] font-normal text-muted-foreground" > - {getSidebarHostHealthLabel(selectedHost.health, selectedHost.blockedReason, t)} + {getSidebarHostHealthLabel( + selectedHost.health, + selectedHost.blockedReason, + t, + selectedHost.vmState + )} ) : null} diff --git a/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenu.fixture.tsx b/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenu.fixture.tsx index 6b55067f341..d144589a0c9 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenu.fixture.tsx +++ b/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenu.fixture.tsx @@ -129,3 +129,28 @@ export const ssh = menuFixture( { ...repo, connectionId: 'preview' }, { ...worktree, hostId: 'ssh:preview' } ) + +function vmMenuFixture(status: 'running' | 'suspended' | 'resume_failed', waking = false) { + const fixture = menuFixture(repo) + return defineFixture({ + ...fixture, + store: { + ...fixture.store, + ephemeralVmRuntimesByWorkspaceId: { + [worktree.id]: { + id: 'vm-1', + workspaceId: worktree.id, + status, + runtimeEnvironmentId: 'vm', + canSuspend: true + } + }, + wakingEphemeralVmWorkspaceIds: waking ? { [worktree.id]: true } : {} + } + }) +} + +export const vmRunning = vmMenuFixture('running') +export const vmSuspended = vmMenuFixture('suspended') +export const vmResumeFailed = vmMenuFixture('resume_failed') +export const vmWaking = vmMenuFixture('suspended', true) diff --git a/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenuView.tsx b/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenuView.tsx index cd52fe9f7d8..0bc057b14ac 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenuView.tsx +++ b/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenuView.tsx @@ -11,6 +11,7 @@ import { cn } from '@/lib/utils' import { WorktreeRowOpenInSubMenu } from '../open/WorktreeRowOpenInSubMenu' import { WorktreeDeveloperMenu } from '../open/WorktreeDeveloperMenu' import { WorkspaceSleepMenuItems } from '../sleep/WorkspaceSleepMenuItems' +import { WorkspaceVmLifecycleMenuItems } from '../sleep/WorkspaceVmLifecycleMenuItems' import { isEventTargetInsideCurrentTarget } from '../../workspace-card/controller/worktree-card-dom-events' import { useTranslate } from '@/i18n/use-translate' import type { WorktreeContextMenuModel } from './use-worktree-context-menu-model' @@ -47,6 +48,7 @@ export default function WorktreeContextMenuView({ model }: { model: WorktreeCont handleRemoveParentLink, handleRename, handleSleepSubtree, + handleSleepSubtreeWithVm, handleTogglePin, handleToggleRead, hasAnyContextLineage, @@ -70,6 +72,17 @@ export default function WorktreeContextMenuView({ model }: { model: WorktreeCont workspaceStatuses } = model const t = useTranslate() + const sleepItems = ( + + ) return (
{!isMultiContext && } - + {isMultiContext ? ( + sleepItems + ) : ( + 0} + disabled={ + deletingContext || + (deletingSubtree && + subtreeSleepableWorktrees.some((target) => target.id !== worktree.id)) + } + onSleep={handleCloseTerminals} + hasActiveDescendants={subtreeSleepableWorktrees.some( + (target) => target.id !== worktree.id + )} + onSleepSubtree={handleSleepSubtreeWithVm} + sleepItems={sleepItems} + replacesSleep={lineageDescendantCount === 0} + /> + )} {!isMultiContext && ( {worktree.isUnread ? : } diff --git a/src/renderer/src/components/sidebar/workspace-actions/context-menu/use-worktree-context-menu-commands.ts b/src/renderer/src/components/sidebar/workspace-actions/context-menu/use-worktree-context-menu-commands.ts index 744947a4239..1e16fbbb104 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/context-menu/use-worktree-context-menu-commands.ts +++ b/src/renderer/src/components/sidebar/workspace-actions/context-menu/use-worktree-context-menu-commands.ts @@ -196,6 +196,14 @@ export function useWorktreeContextMenuCommands(args: { const handleSleepSubtree = useCallback(() => { sleepWorktreesAfterMenuClose(args.subtreeSleepableWorktrees) }, [args.subtreeSleepableWorktrees, sleepWorktreesAfterMenuClose]) + // Suspend VM with active descendants: this workspace sleeps too, even idle, so its VM suspends + // once every child session on it has stopped. + const handleSleepSubtreeWithVm = useCallback(() => { + sleepWorktreesAfterMenuClose([ + args.worktree, + ...args.subtreeSleepableWorktrees.filter((target) => target.id !== args.worktree.id) + ]) + }, [args.worktree, args.subtreeSleepableWorktrees, sleepWorktreesAfterMenuClose]) const handleDelete = useCallback(() => { const restoreSidebarPosition = preserveDeleteSiblingPosition(args.scopeRef.current) args.scopeRef.current @@ -237,6 +245,7 @@ export function useWorktreeContextMenuCommands(args: { handleRemoveProjectFromGroup, handleRename, handleSleepSubtree, + handleSleepSubtreeWithVm, handleSubmitNewProjectGroup, handleTogglePin, handleToggleRead diff --git a/src/renderer/src/components/sidebar/workspace-actions/sleep/WorkspaceVmLifecycleMenuItems.test.ts b/src/renderer/src/components/sidebar/workspace-actions/sleep/WorkspaceVmLifecycleMenuItems.test.ts new file mode 100644 index 00000000000..4bf4561bf81 --- /dev/null +++ b/src/renderer/src/components/sidebar/workspace-actions/sleep/WorkspaceVmLifecycleMenuItems.test.ts @@ -0,0 +1,33 @@ +import { describe, expect, it } from 'vitest' +import { getVmSuspendRoute, getWorkspaceVmLifecycleAction } from './WorkspaceVmLifecycleMenuItems' + +describe('Suspend VM routing', () => { + it('sleeps active child workspaces first, since they may run on this VM', () => { + expect(getVmSuspendRoute({ hasActiveDescendants: true, hasSleepableActivity: false })).toBe( + 'sleep-subtree' + ) + expect(getVmSuspendRoute({ hasActiveDescendants: true, hasSleepableActivity: true })).toBe( + 'sleep-subtree' + ) + }) + + it('sleeps open panels before the VM, and suspends directly when nothing is open', () => { + expect(getVmSuspendRoute({ hasActiveDescendants: false, hasSleepableActivity: true })).toBe( + 'sleep' + ) + expect(getVmSuspendRoute({ hasActiveDescendants: false, hasSleepableActivity: false })).toBe( + 'suspend' + ) + }) +}) + +describe('VM lifecycle menu item', () => { + it('replaces Sleep only for a VM that can be suspended or resumed', () => { + expect(getWorkspaceVmLifecycleAction(undefined, false)).toBeNull() + expect(getWorkspaceVmLifecycleAction('running', false)).toBe('suspend') + expect(getWorkspaceVmLifecycleAction('running', false, false)).toBeNull() + expect(getWorkspaceVmLifecycleAction('suspended', false)).toBe('resume') + expect(getWorkspaceVmLifecycleAction('suspended', true)).toBe('waking') + expect(getWorkspaceVmLifecycleAction('provisioning', false)).toBeNull() + }) +}) diff --git a/src/renderer/src/components/sidebar/workspace-actions/sleep/WorkspaceVmLifecycleMenuItems.tsx b/src/renderer/src/components/sidebar/workspace-actions/sleep/WorkspaceVmLifecycleMenuItems.tsx new file mode 100644 index 00000000000..1667dc54f23 --- /dev/null +++ b/src/renderer/src/components/sidebar/workspace-actions/sleep/WorkspaceVmLifecycleMenuItems.tsx @@ -0,0 +1,184 @@ +import React from 'react' +import { Loader2, Moon, Play } from 'lucide-react' +import { DropdownMenuItem } from '@/components/ui/dropdown-menu' +import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip' +import { useTranslate, type Translate } from '@/i18n/use-translate' +import { useShallow } from 'zustand/react/shallow' +import { useAppStore } from '@/store' +import { selectEphemeralVmWorkspaceRuntime } from '@/store/slices/ephemeral-vm/ephemeral-vm-lifecycle' +import { + resumeEphemeralVmWorkspace, + suspendEphemeralVmWorkspace +} from '@/lib/workspace/activation/sidebar-worktree-activation' +import type { EphemeralVmRuntimeStatus } from '../../../../../../shared/ephemeral-vm-runtimes' + +export type WorkspaceVmLifecycleAction = 'suspend' | 'resume' | 'waking' | null + +/** Which lifecycle entry a VM-backed workspace's menu offers; null hides the entry. */ +export function getWorkspaceVmLifecycleAction( + status: EphemeralVmRuntimeStatus | undefined, + waking: boolean, + canSuspend = true +): WorkspaceVmLifecycleAction { + if (!status) { + return null + } + if (waking) { + return 'waking' + } + switch (status) { + case 'running': + case 'suspend_failed': + return canSuspend ? 'suspend' : null + case 'suspended': + case 'resume_failed': + return 'resume' + case 'provisioning': + case 'failed': + case 'cleanup_pending': + case 'cleanup_failed': + case 'cleaned': + return null + } +} + +/** + * How Suspend VM reaches the VM. It never suspends under live sessions: Sleep stops them and + * then suspends the VM. With active children, this workspace sleeps with them (even idle), so + * its VM suspends once their sessions have stopped. + */ +export function getVmSuspendRoute(args: { + hasActiveDescendants: boolean + hasSleepableActivity: boolean +}): 'sleep-subtree' | 'sleep' | 'suspend' { + if (args.hasActiveDescendants) { + return 'sleep-subtree' + } + return args.hasSleepableActivity ? 'sleep' : 'suspend' +} + +/** + * Suspend/Resume for a workspace that owns a VM, in place of its Sleep item. Sleep on a VM + * workspace already stops its panels and then suspends the VM, so the two would be the same + * action under two names; Suspend VM runs that Sleep, or suspends the VM directly when nothing + * is open. `sleepItems` stay for workspaces without a suspendable VM, and beside the VM item + * when they offer more (sleeping descendants). Mounted only inside the open menu, so idle rows + * add no subscription. + */ +export function WorkspaceVmLifecycleMenuItems({ + worktreeId, + hasSleepableActivity, + disabled, + onSleep, + hasActiveDescendants, + onSleepSubtree, + sleepItems, + replacesSleep +}: { + worktreeId: string + hasSleepableActivity: boolean + disabled: boolean + onSleep: () => void + /** A child workspace with open panels may run on this VM; suspending must sleep it first. */ + hasActiveDescendants: boolean + onSleepSubtree: () => void + sleepItems: React.ReactNode + /** False when Sleep offers more than this workspace (its descendants), so both stay. */ + replacesSleep: boolean +}): React.JSX.Element | null { + const { status, canSuspend, waking } = useAppStore( + useShallow((state) => { + const runtime = selectEphemeralVmWorkspaceRuntime(state, worktreeId) + return { + status: runtime?.status, + canSuspend: runtime?.canSuspend ?? true, + waking: Boolean(state.wakingEphemeralVmWorkspaceIds[worktreeId]) + } + }) + ) + const t = useTranslate() + const action = getWorkspaceVmLifecycleAction(status, waking, canSuspend) + if (!action) { + return <>{sleepItems} + } + const vmItem = ( + void resumeEphemeralVmWorkspace(worktreeId)} + onSuspend={() => { + const route = getVmSuspendRoute({ hasActiveDescendants, hasSleepableActivity }) + if (route === 'sleep-subtree') { + onSleepSubtree() + } else if (route === 'sleep') { + onSleep() + } else { + void suspendEphemeralVmWorkspace(worktreeId) + } + }} + /> + ) + // Sleep and Suspend VM are one action on a running VM. A VM still asleep or waking keeps Sleep + // only while it has restored panels to close; otherwise Sleep would sit there disabled. + return replacesSleep && (action === 'suspend' || !hasSleepableActivity) ? ( + vmItem + ) : ( + <> + {sleepItems} + {vmItem} + + ) +} + +function VmLifecycleMenuItem({ + action, + retry, + disabled, + t, + onResume, + onSuspend +}: { + action: NonNullable + retry: boolean + disabled: boolean + t: Translate + onResume: () => void + onSuspend: () => void +}): React.JSX.Element { + if (action === 'waking') { + return ( + + + {t('workspace.vm.menu.waking', 'Waking VM…')} + + ) + } + if (action === 'resume') { + return ( + + + {retry + ? t('workspace.vm.menu.retryResume', 'Retry Resume VM') + : t('workspace.vm.menu.resume', 'Resume VM')} + + ) + } + return ( + + + + + {t('workspace.vm.menu.suspend', 'Suspend VM')} + + + + {t( + 'workspace.vm.menu.suspendDescription', + "Close this workspace's panels and suspend its VM. Opening the workspace wakes it." + )} + + + ) +} diff --git a/src/renderer/src/components/sidebar/workspace-card/surface/WorktreeCardStatusSlot.tsx b/src/renderer/src/components/sidebar/workspace-card/surface/WorktreeCardStatusSlot.tsx index 0f8be7582f5..ac763f6bb63 100644 --- a/src/renderer/src/components/sidebar/workspace-card/surface/WorktreeCardStatusSlot.tsx +++ b/src/renderer/src/components/sidebar/workspace-card/surface/WorktreeCardStatusSlot.tsx @@ -12,7 +12,15 @@ import { FilledBellIcon } from '../identity/worktree-card-glyphs' import { checksLabel } from '../review/workspace-review-check-label' import StatusIndicator from './StatusIndicator' import { useWorktreeActivityStatus } from '../activity/use-worktree-activity-status' -import { useIsSleepingWorktree } from '../../workspace-actions/sleep/use-worktree-sleep-state' +import { useShallow } from 'zustand/react/shallow' +import { useAppStore } from '@/store' +import { + selectEphemeralVmWorkspaceRuntime, + selectEphemeralVmWorkspaceWaking +} from '@/store/slices/ephemeral-vm/ephemeral-vm-lifecycle' +import { selectIsSleepingWorktree } from '../../workspace-actions/sleep/use-worktree-sleep-state' +import { getEphemeralVmHostState } from '../../../../../../shared/execution-host/execution-host-health' +import { getVmStateLabel, VmStateIcon, WorktreeCardVmStateBadge } from './WorktreeCardVmStateBadge' import type { WorktreeCardPrDisplay } from '../review/worktree-card-pr-display' import { getReviewLabel, ReviewIcon } from '../review/worktree-review-presentation' import type { WorkspaceReviewChecksSummary } from '../../../../../../shared/workspace-review-checks' @@ -128,7 +136,16 @@ export function WorktreeCardStatusSlot({ const collectionChecks = reviewChecks && reviewChecks.total > 1 ? reviewChecks : undefined const isReviewStale = reviewStale || Boolean(collectionChecks?.stale) const status = useWorktreeActivityStatus(worktreeId) - const isSleeping = useIsSleepingWorktree(worktreeId) + // One subscription per card: rows mount by the hundreds, and every listener runs on each store write. + const { isSleeping, vmRuntime, vmWaking } = useAppStore( + useShallow((state) => ({ + isSleeping: selectIsSleepingWorktree(state, worktreeId), + vmRuntime: selectEphemeralVmWorkspaceRuntime(state, worktreeId), + vmWaking: selectEphemeralVmWorkspaceWaking(state, worktreeId) + })) + ) + const vmState = vmRuntime ? getEphemeralVmHostState(vmRuntime.status, vmWaking) : null + const vmFailure = vmRuntime?.failure ?? null const statusLabel = getWorktreeStatusLabel(status) || status // Sleeping remains distinct from quiet done/branch/review states; attention keeps its own glyph. const canShowSleepingStatus = @@ -225,6 +242,20 @@ export function WorktreeCardStatusSlot({ return null } + // A VM that is not running cannot have live activity; its lifecycle is the row's status. + // The classic card's unread toggle keeps its button and shows the VM state inside it. + if (vmState && showStatus && !unreadActionEnabled) { + return overlayNewCardUnreadStatus( + , + newCardStyle && isUnread + ) + } + if (!unreadActionEnabled) { return overlayNewCardUnreadStatus(passiveStatus, showNewCardUnreadAlert) } @@ -232,8 +263,9 @@ export function WorktreeCardStatusSlot({ const actionLabel = isUnread ? t('auto.components.sidebar.WorktreeCardStatusSlot.markAsRead', 'Mark as read') : t('auto.components.sidebar.WorktreeCardStatusSlot.markAsUnread', 'Mark as unread') + const statusTooltipLabel = vmState ? getVmStateLabel(vmState, t) : passiveStatusLabel const tooltip = - showStatus && !isUnread ? `${passiveStatusLabel} · ${unreadTooltip}` : unreadTooltip + showStatus && !isUnread ? `${statusTooltipLabel} · ${unreadTooltip}` : unreadTooltip return ( <> @@ -278,12 +310,18 @@ export function WorktreeCardStatusSlot({ ) : showStatus ? ( <> -