diff --git a/.github/workflows/mobile.yml b/.github/workflows/mobile.yml index 4eb8ec63f31..ae12bf8460f 100644 --- a/.github/workflows/mobile.yml +++ b/.github/workflows/mobile.yml @@ -44,8 +44,8 @@ on: - 'src/main/native-chat/subagent-entry-id-bounds.ts' - 'src/main/native-chat/agent-session-journal/item-lifecycle/journal-payload-bounds.ts' - 'src/main/native-chat/agent-session-journal/item-lifecycle/journal-reasoning-row.ts' - - 'src/main/claude/claude-internal-message-content.ts' - - 'src/main/claude/claude-stop-hook-feedback.ts' + - 'src/main/claude/structured/journal/claude-internal-message-content.ts' + - 'src/main/claude/structured/journal/claude-stop-hook-feedback.ts' - 'src/main/claude/structured/journal/**' - 'src/main/claude/__fixtures__/claude-adapter-capture-fold.jsonl' - 'src/main/codex/app-server/codex-item-field-readers.ts' @@ -132,8 +132,8 @@ on: - 'src/main/native-chat/subagent-entry-id-bounds.ts' - 'src/main/native-chat/agent-session-journal/item-lifecycle/journal-payload-bounds.ts' - 'src/main/native-chat/agent-session-journal/item-lifecycle/journal-reasoning-row.ts' - - 'src/main/claude/claude-internal-message-content.ts' - - 'src/main/claude/claude-stop-hook-feedback.ts' + - 'src/main/claude/structured/journal/claude-internal-message-content.ts' + - 'src/main/claude/structured/journal/claude-stop-hook-feedback.ts' - 'src/main/claude/structured/journal/**' - 'src/main/claude/__fixtures__/claude-adapter-capture-fold.jsonl' - 'src/main/codex/app-server/codex-item-field-readers.ts' diff --git a/config/ast-grep/rules/claude-chat-entrypoint.yml b/config/ast-grep/rules/claude-chat-entrypoint.yml index 0d2bbad8f49..be6996784eb 100644 --- a/config/ast-grep/rules/claude-chat-entrypoint.yml +++ b/config/ast-grep/rules/claude-chat-entrypoint.yml @@ -45,9 +45,9 @@ ignores: - '**/__fixtures__/**' - 'src/shared/agent-launch/startup/claude-chat-entrypoint.ts' - 'src/main/claude/claude-stream-json-connection.ts' - - 'src/main/claude/claude-agent-sdk-process-spawn.ts' + - 'src/main/claude/child-process/claude-agent-sdk-process-spawn.ts' - 'src/main/claude/structured/launch/claude-structured-child-env.ts' - - 'src/main/claude/claude-model-catalog-probe.ts' + - 'src/main/claude/model-catalog/claude-model-catalog-probe.ts' rule: all: - any: @@ -67,9 +67,9 @@ ignores: - '**/__fixtures__/**' - 'src/shared/agent-launch/startup/claude-chat-entrypoint.ts' - 'src/main/claude/claude-stream-json-connection.ts' - - 'src/main/claude/claude-agent-sdk-process-spawn.ts' + - 'src/main/claude/child-process/claude-agent-sdk-process-spawn.ts' - 'src/main/claude/structured/launch/claude-structured-child-env.ts' - - 'src/main/claude/claude-model-catalog-probe.ts' + - 'src/main/claude/model-catalog/claude-model-catalog-probe.ts' rule: all: - any: diff --git a/config/build-plugins/main-build-entry-points.ts b/config/build-plugins/main-build-entry-points.ts index d62affdbd34..d68603e8ff5 100644 --- a/config/build-plugins/main-build-entry-points.ts +++ b/config/build-plugins/main-build-entry-points.ts @@ -16,7 +16,7 @@ export const MAIN_BUILD_ENTRY_POINTS: Record = { ), 'computer-sidecar': resolve('src/main/computer/computer-sidecar.ts'), 'claude-conversation-fork-worker-entry': resolve( - 'src/main/claude/claude-conversation-fork-worker-entry.ts' + 'src/main/claude/transcripts/claude-conversation-fork-worker-entry.ts' ), 'stt-worker': resolve('src/main/speech/stt-worker.ts'), 'warp-theme-parser-worker': resolve('src/main/warp-themes/warp-theme-parser-worker.ts'), diff --git a/config/flaky-test-pattern-baseline.txt b/config/flaky-test-pattern-baseline.txt index 01020f2e8a8..ce332f797be 100644 --- a/config/flaky-test-pattern-baseline.txt +++ b/config/flaky-test-pattern-baseline.txt @@ -5,7 +5,6 @@ 4 test-no-in-test-import-actual:src/main/bitbucket/credential-store.test.ts 1 test-no-in-test-import-actual:src/main/bitbucket/status-no-decrypt.test.ts 3 test-no-in-test-import-actual:src/main/claude-usage/scanner-scan.test.ts -1 test-no-in-test-import-actual:src/main/claude/claude-agent-sdk-process-spawn.test.ts 5 test-no-in-test-import-actual:src/main/daemon/endpoint/publication/testing/daemon-endpoint-publish.test.ts 1 test-no-in-test-import-actual:src/main/daemon/history/storage/testing/terminal-history-permissions.test.ts 1 test-no-in-test-import-actual:src/main/git/command-runner/process-capture/spawned-command-tree-kill.test.ts @@ -28,14 +27,6 @@ 3 test-no-in-test-import-actual:src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-alt-screen-host-chain.test.ts 1 test-no-in-test-import-actual:src/renderer/src/hooks/useIpcEvents-agent-status-pane-teardown.test.ts 1 test-no-polling-loop:src/main/browser/cookies/browser-cookie-import-concurrency.test.ts -1 test-no-polling-loop:src/main/claude/claude-stop-ack-race.test.ts -1 test-no-polling-loop:src/main/claude/claude-stream-json-connection.test.ts -1 test-no-polling-loop:src/main/claude/claude-supervised-stop-real-cli.test.ts -1 test-no-polling-loop:src/main/claude/claude-supervised-stop.integration.test.ts -1 test-no-polling-loop:src/main/claude/structured/claude-structured-real-cli-fold.test.ts -1 test-no-polling-loop:src/main/claude/structured/claude-structured-real-cli-stop-task.test.ts -5 test-no-polling-loop:src/main/claude/structured/claude-structured-real-cli.test.ts -1 test-no-polling-loop:src/main/claude/structured/launch/claude-structured-real-cli-options.test.ts 1 test-no-polling-loop:src/main/codex/hooks/reconciliation/codex-hook-toggle-off-wins.test.ts 1 test-no-polling-loop:src/main/codex/structured/launch/codex-structured-real-cli-command-env.test.ts 1 test-no-polling-loop:src/main/daemon/providers/adapter/testing/daemon-self-retirement-respawn.test.ts @@ -151,16 +142,6 @@ 1 test-no-real-time-wait:src/main/browser/identity/wire-probes/browser-session-ua-wire-identity.electron.test.ts 1 test-no-real-time-wait:src/main/browser/network/tunnels/execution-route-socket-duplex.test.ts 1 test-no-real-time-wait:src/main/browser/network/tunnels/remote-browser-socks-server.test.ts -1 test-no-real-time-wait:src/main/claude/claude-agent-sdk-exit-proof.test.ts -1 test-no-real-time-wait:src/main/claude/claude-agent-sdk-user-message-queue.test.ts -1 test-no-real-time-wait:src/main/claude/claude-stop-ack-race.test.ts -1 test-no-real-time-wait:src/main/claude/claude-stream-json-connection.test.ts -1 test-no-real-time-wait:src/main/claude/claude-supervised-stop-real-cli.test.ts -1 test-no-real-time-wait:src/main/claude/claude-supervised-stop.integration.test.ts -2 test-no-real-time-wait:src/main/claude/structured/claude-structured-real-cli-fold.test.ts -2 test-no-real-time-wait:src/main/claude/structured/claude-structured-real-cli-stop-task.test.ts -5 test-no-real-time-wait:src/main/claude/structured/claude-structured-real-cli.test.ts -1 test-no-real-time-wait:src/main/claude/structured/launch/claude-structured-real-cli-options.test.ts 1 test-no-real-time-wait:src/main/codex/hooks/reconciliation/codex-hook-reconcile.test.ts 1 test-no-real-time-wait:src/main/codex/hooks/reconciliation/codex-hook-toggle-off-wins.test.ts 1 test-no-real-time-wait:src/main/codex/structured/launch/codex-structured-real-cli-command-env.test.ts @@ -271,7 +252,6 @@ 1 test-no-real-time-wait:tests/e2e/codex-ctrl-c-status.spec.ts 4 test-no-real-time-wait:tests/e2e/combined-diff-scroll-restore.spec.ts 1 test-no-real-time-wait:tests/e2e/computer-windows.e2e.ts -3 test-no-real-time-wait:tests/e2e/cross-version-wire/host-model-catalog-released-phone.unit.test.ts 1 test-no-real-time-wait:tests/e2e/cross-version-wire/legacy-relay-bridge.unit.test.ts 1 test-no-real-time-wait:tests/e2e/cross-version-wire/released-relay-daemon.ts 2 test-no-real-time-wait:tests/e2e/cross-version-wire/released-relay-transport.ts @@ -427,7 +407,7 @@ 2 test-no-wall-clock:src/main/agent-hooks/installation/scripts/managed-hook-timeout.test.ts 1 test-no-wall-clock:src/main/agent-hooks/server/testing/http/server-endpoint-file-lifecycle.test.ts 4 test-no-wall-clock:src/main/agent-hooks/server/testing/identity/server-launch-resume-identity.test.ts -5 test-no-wall-clock:src/main/agent-hooks/server/testing/replay/spool.test.ts +3 test-no-wall-clock:src/main/agent-hooks/server/testing/replay/spool.test.ts 3 test-no-wall-clock:src/main/agent-hooks/server/testing/structured-ingress/server-ingest-structured-status.test.ts 1 test-no-wall-clock:src/main/ai-vault/parse-cache/session-parse-cache-preview-upgrade.test.ts 2 test-no-wall-clock:src/main/ai-vault/scanners/copilot/session-scanner-copilot-parser.test.ts @@ -440,16 +420,6 @@ 2 test-no-wall-clock:src/main/antigravity/posix-hook-invocation.test.ts 2 test-no-wall-clock:src/main/browser/cookies/browser-cookie-import-partition-reland.electron.test.ts 2 test-no-wall-clock:src/main/browser/network/execution-routes/wsl-browser-network-execution-route.test.ts -1 test-no-wall-clock:src/main/claude/claude-background-wake-retention.test.ts -1 test-no-wall-clock:src/main/claude/claude-descendant-escalation-boundary.test.ts -1 test-no-wall-clock:src/main/claude/claude-folder-trust-file.test.ts -5 test-no-wall-clock:src/main/claude/claude-supervised-stop-real-cli.test.ts -6 test-no-wall-clock:src/main/claude/claude-supervised-stop.integration.test.ts -4 test-no-wall-clock:src/main/claude/structured/claude-structured-real-cli-fold.test.ts -1 test-no-wall-clock:src/main/claude/structured/claude-structured-real-cli-rewind.test.ts -3 test-no-wall-clock:src/main/claude/structured/claude-structured-real-cli-stop-task.test.ts -10 test-no-wall-clock:src/main/claude/structured/claude-structured-real-cli.test.ts -3 test-no-wall-clock:src/main/claude/structured/launch/claude-structured-real-cli-options.test.ts 1 test-no-wall-clock:src/main/codex-accounts/legacy-wsl-auth-drain/legacy-wsl-runtime-auth-drain-rollback-script.test.ts 6 test-no-wall-clock:src/main/codex/app-server/codex-app-server-client.test.ts 2 test-no-wall-clock:src/main/codex/structured/launch/codex-structured-real-cli-command-env.test.ts @@ -628,12 +598,7 @@ 1 test-timeout-needs-reason:src/main/browser/guest-lifecycle/find/browser-find-frame-traversal.electron.test.ts 1 test-timeout-needs-reason:src/main/browser/identity/wire-probes/browser-session-ua-wire-identity-cross-context.electron.test.ts 1 test-timeout-needs-reason:src/main/browser/identity/wire-probes/browser-session-ua-wire-identity.electron.test.ts -1 test-timeout-needs-reason:src/main/claude/claude-agent-sdk-exit-proof.test.ts -1 test-timeout-needs-reason:src/main/claude/claude-background-run-isolation-real-cli.test.ts -2 test-timeout-needs-reason:src/main/claude/claude-status-line-windows.test.ts -1 test-timeout-needs-reason:src/main/claude/claude-stop-ack-race.test.ts -1 test-timeout-needs-reason:src/main/claude/structured/claude-structured-real-cli.test.ts -1 test-timeout-needs-reason:src/main/claude/windows-native-hook-registration.test.ts +1 test-timeout-needs-reason:src/main/claude/child-process/claude-agent-sdk-exit-proof.test.ts 2 test-timeout-needs-reason:src/main/codex/app-server/codex-app-server-teardown.integration.test.ts 1 test-timeout-needs-reason:src/main/codex/hooks/installation/hook-service-legacy-cleanup.test.ts 1 test-timeout-needs-reason:src/main/codex/structured/catalog/codex-model-catalog-probe.test.ts diff --git a/config/main-blocking-worker-entries.json b/config/main-blocking-worker-entries.json index 391f30c80f5..74f7b41f447 100644 --- a/config/main-blocking-worker-entries.json +++ b/config/main-blocking-worker-entries.json @@ -1,6 +1,6 @@ { "src/main/plugins/panels/plugin-source-transpile-worker-entry.ts": "Dedicated worker-thread entry; blocking work stays off Electron main.", - "src/main/claude/claude-conversation-fork-worker-entry.ts": "Dedicated worker-thread entry; blocking work stays off Electron main.", + "src/main/claude/transcripts/claude-conversation-fork-worker-entry.ts": "Dedicated worker-thread entry; blocking work stays off Electron main.", "src/main/speech/stt-worker.ts": "Dedicated utility/forked-process entry; speech work stays off Electron main.", "src/main/warp-themes/warp-theme-parser-worker.ts": "Dedicated worker-thread entry; blocking work stays off Electron main.", "src/main/ai-vault-search/worker/session-search-worker-entry.ts": "Dedicated worker-thread entry; blocking work stays off Electron main.", diff --git a/config/main-sync-fs-baseline.txt b/config/main-sync-fs-baseline.txt index 126527fa808..973e8ec997f 100644 --- a/config/main-sync-fs-baseline.txt +++ b/config/main-sync-fs-baseline.txt @@ -89,14 +89,14 @@ 1 src/main/claude-accounts/runtime-auth/runtime-paths.ts 7 src/main/claude-accounts/sign-in/claude-account-folder.ts 3 src/main/claude/agent-view/agent-view-install.ts -1 src/main/claude/claude-diff-panel-auto-open.ts -14 src/main/claude/claude-folder-trust-file.ts -2 src/main/claude/claude-profile-hook-target.ts -1 src/main/claude/claude-rejected-api-key.ts -1 src/main/claude/claude-rewind-transcript.ts +1 src/main/claude/configuration/claude-diff-panel-auto-open.ts +14 src/main/claude/configuration/claude-folder-trust-file.ts +2 src/main/claude/hooks/claude-profile-hook-target.ts +1 src/main/claude/configuration/claude-rejected-api-key.ts +1 src/main/claude/transcripts/claude-rewind-transcript.ts 1 src/main/claude/hook-service.ts -3 src/main/claude/statusline-install.ts -6 src/main/claude/windows-hook-files.ts +3 src/main/claude/hooks/statusline-install.ts +6 src/main/claude/hooks/windows-hook-files.ts 1 src/main/cli/appimage/appimage-copy-pre-extraction.ts 3 src/main/cli/appimage/appimage-extracted-root.ts 1 src/main/cli/appimage/appimage-extraction-pruning.ts diff --git a/config/scripts/ci/sharding/ci-shard-timings.json b/config/scripts/ci/sharding/ci-shard-timings.json index fc84775c1bf..c0c2d5e36ef 100644 --- a/config/scripts/ci/sharding/ci-shard-timings.json +++ b/config/scripts/ci/sharding/ci-shard-timings.json @@ -1056,62 +1056,62 @@ "src/main/claude/agent-view/agent-view-service.test.ts": 403, "src/main/claude/claude-agent-sdk-contract-pins.test.ts": 3506, "src/main/claude/claude-agent-sdk-exit-proof-identity.test.ts": 134, - "src/main/claude/claude-agent-sdk-exit-proof.test.ts": 8832, - "src/main/claude/claude-agent-sdk-import-boundary.test.ts": 546, - "src/main/claude/claude-agent-sdk-process-spawn.test.ts": 182, - "src/main/claude/claude-agent-sdk-user-message-queue.test.ts": 143, + "src/main/claude/child-process/claude-agent-sdk-exit-proof.test.ts": 8832, + "src/main/claude/sdk-transport/claude-agent-sdk-import-boundary.test.ts": 546, + "src/main/claude/child-process/claude-agent-sdk-process-spawn.test.ts": 182, + "src/main/claude/sdk-transport/claude-agent-sdk-user-message-queue.test.ts": 143, "src/main/claude/claude-api-retry-row.test.ts": 901, "src/main/claude/claude-background-run-isolation-real-cli.test.ts": 147, "src/main/claude/claude-background-stop-records.test.ts": 1249, - "src/main/claude/claude-background-task-resume.test.ts": 54, - "src/main/claude/claude-background-task-terminal-frames.test.ts": 103, + "src/main/claude/background-tasks/claude-background-task-resume.test.ts": 54, + "src/main/claude/background-tasks/claude-background-task-terminal-frames.test.ts": 103, "src/main/claude/claude-background-task-turn-resumption.test.ts": 325, "src/main/claude/claude-background-wake-retention.test.ts": 1652, - "src/main/claude/claude-child-process-environment.test.ts": 52, - "src/main/claude/claude-child-work-decoder.test.ts": 110, + "src/main/claude/child-process/claude-child-process-environment.test.ts": 52, + "src/main/claude/child-work/claude-child-work-decoder.test.ts": 110, "src/main/claude/claude-close-turn-end.test.ts": 970, - "src/main/claude/claude-command-lifecycle-frames.test.ts": 268, - "src/main/claude/claude-command-lifecycle.test.ts": 1107, - "src/main/claude/claude-command-turn.test.ts": 292, - "src/main/claude/claude-config-dir-pin.test.ts": 47, + "src/main/claude/structured/turns/claude-command-lifecycle-frames.test.ts": 268, + "src/main/claude/structured/turns/claude-command-lifecycle.test.ts": 1107, + "src/main/claude/structured/turns/claude-command-turn.test.ts": 292, + "src/main/claude/structured/launch/claude-config-dir-pin.test.ts": 47, "src/main/claude/claude-context-model-switch.test.ts": 422, "src/main/claude/claude-context-usage-restart.test.ts": 925, "src/main/claude/claude-context-usage-unloaded-turn.test.ts": 4910, "src/main/claude/claude-descendant-escalation-boundary.test.ts": 593, - "src/main/claude/claude-diff-panel-auto-open.test.ts": 117, + "src/main/claude/configuration/claude-diff-panel-auto-open.test.ts": 117, "src/main/claude/claude-fold-steer-receipt.test.ts": 1019, - "src/main/claude/claude-folder-trust-file.test.ts": 762, - "src/main/claude/claude-hook-event-versions.test.ts": 137, + "src/main/claude/configuration/claude-folder-trust-file.test.ts": 762, + "src/main/claude/cli-capabilities/claude-hook-event-versions.test.ts": 137, "src/main/claude/claude-informational-row.test.ts": 811, - "src/main/claude/claude-journal-turn-scope.test.ts": 254, - "src/main/claude/claude-model-catalog-probe.test.ts": 2098, + "src/main/claude/structured/journal/claude-journal-turn-scope.test.ts": 254, + "src/main/claude/model-catalog/claude-model-catalog-probe.test.ts": 2098, "src/main/claude/claude-naming-invocation.test.ts": 334, "src/main/claude/claude-plan-approval-mode.test.ts": 905, - "src/main/claude/claude-profile-hooks.test.ts": 371, - "src/main/claude/claude-provider-session-rename.test.ts": 597, - "src/main/claude/claude-provisional-row-corrections.test.ts": 67, - "src/main/claude/claude-request-end-wait.test.ts": 53, - "src/main/claude/claude-rewind-transcript.test.ts": 762, + "src/main/claude/hooks/claude-profile-hooks.test.ts": 371, + "src/main/claude/transcripts/claude-provider-session-rename.test.ts": 597, + "src/main/claude/subagents/claude-provisional-row-corrections.test.ts": 67, + "src/main/claude/structured/turns/claude-request-end-wait.test.ts": 53, + "src/main/claude/transcripts/claude-rewind-transcript.test.ts": 762, "src/main/claude/claude-settings-schema-install.test.ts": 410, - "src/main/claude/claude-status-line-install.test.ts": 342, + "src/main/claude/hooks/claude-status-line-install.test.ts": 342, "src/main/claude/claude-status-line-windows.test.ts": 273, "src/main/claude/claude-stop-ack-race.test.ts": 1301, "src/main/claude/claude-stream-json-connection-close.test.ts": 621, - "src/main/claude/claude-stream-json-connection.test.ts": 8687, - "src/main/claude/claude-streamed-text-checkpoints.test.ts": 59, + "src/main/claude/sdk-transport/claude-stream-json-connection.test.ts": 8687, + "src/main/claude/structured/journal/claude-streamed-text-checkpoints.test.ts": 59, "src/main/claude/claude-structured-launch-home-perf.test.ts": 401, "src/main/claude/claude-structured-result-control-overlap.test.ts": 1136, - "src/main/claude/claude-subagent-id-aliases.test.ts": 46, + "src/main/claude/subagents/claude-subagent-id-aliases.test.ts": 46, "src/main/claude/claude-subagent-permission-request.test.ts": 3776, - "src/main/claude/claude-subagent-resume-after-restart.test.ts": 825, + "src/main/claude/subagents/claude-subagent-resume-after-restart.test.ts": 825, "src/main/claude/claude-supervised-stop-real-cli.test.ts": 382, "src/main/claude/claude-supervised-stop.integration.test.ts": 3821, - "src/main/claude/claude-transcript-catch-up.test.ts": 4017, + "src/main/claude/transcripts/claude-transcript-catch-up.test.ts": 4017, "src/main/claude/claude-transcript-duration.test.ts": 1411, - "src/main/claude/claude-transcript-entry-uuid.test.ts": 38, - "src/main/claude/hook-service.test.ts": 329, - "src/main/claude/post-compact-hook-command.test.ts": 314, - "src/main/claude/statusline-script.test.ts": 257, + "src/main/claude/transcripts/claude-transcript-entry-uuid.test.ts": 38, + "src/main/claude/hooks/hook-service.test.ts": 329, + "src/main/claude/hooks/post-compact-hook-command.test.ts": 314, + "src/main/claude/hooks/statusline-script.test.ts": 257, "src/main/claude/structured/claude-structured-content-parts.test.ts": 277, "src/main/claude/structured/claude-structured-conversation-stop.test.ts": 884, "src/main/claude/structured/claude-structured-dispatch-admission.test.ts": 426, @@ -1153,7 +1153,7 @@ "src/main/claude/structured/launch/claude-structured-options.test.ts": 420, "src/main/claude/structured/launch/claude-structured-provider-fallback.test.ts": 670, "src/main/claude/structured/launch/claude-structured-real-cli-options.test.ts": 902, - "src/main/claude/windows-hook-files.test.ts": 356, + "src/main/claude/hooks/windows-hook-files.test.ts": 356, "src/main/claude/windows-native-hook-registration.test.ts": 246, "src/main/cli/appimage/appimage-copy-pre-extraction.test.ts": 328, "src/main/cli/appimage/appimage-extraction-pruning-namespace.test.ts": 106, diff --git a/config/scripts/orcad-distribution/server-bundle/orcad-entry-build.mjs b/config/scripts/orcad-distribution/server-bundle/orcad-entry-build.mjs index 116f01e391b..98813cd772d 100644 --- a/config/scripts/orcad-distribution/server-bundle/orcad-entry-build.mjs +++ b/config/scripts/orcad-distribution/server-bundle/orcad-entry-build.mjs @@ -29,7 +29,7 @@ export const ORCAD_CHILD_ENTRY_POINTS = { 'src/main/worker-thread-child-process/worker-thread-child-process-entry.ts', claudeProfileSetup: 'src/main/claude-accounts/profiles/setup/claude-profile-setup-worker-entry.ts', - claudeConversationFork: 'src/main/claude/claude-conversation-fork-worker-entry.ts', + claudeConversationFork: 'src/main/claude/transcripts/claude-conversation-fork-worker-entry.ts', sttWorker: 'src/main/speech/stt-worker.ts', computerSidecar: 'src/main/computer/computer-sidecar.ts' } diff --git a/config/scripts/test-runtime/sqlite-admission/vitest-node-runtime-files.mjs b/config/scripts/test-runtime/sqlite-admission/vitest-node-runtime-files.mjs index 9cb9bee4471..4551b966b86 100644 --- a/config/scripts/test-runtime/sqlite-admission/vitest-node-runtime-files.mjs +++ b/config/scripts/test-runtime/sqlite-admission/vitest-node-runtime-files.mjs @@ -33,8 +33,7 @@ const NODE_RUNTIME_INCLUDE = [ 'config/scripts/test-runtime/dom/happy-dom-mutation-observer-retention.test.ts', // These reach Node SQLite through a shared helper or a dynamic import, which the scan skips. 'src/main/agent-hooks/server/testing/providers/codex/server-codex-session-start.test.ts', - 'src/main/claude/claude-transcript-catch-up.test.ts', - 'src/main/claude/claude-transcript-duration.test.ts', + 'src/main/claude/transcripts/claude-transcript-catch-up.test.ts', 'tests/e2e/native-chat-startup-option-pickers.unit.test.ts', 'src/main/ai-vault/transcripts/session-document-consumer-replacement.test.ts', 'src/main/ai-vault-search/indexing/session-search-dependent-transcripts.test.ts', @@ -44,7 +43,6 @@ const NODE_RUNTIME_INCLUDE = [ 'src/main/runtime/orchestration/mailbox/routing/orchestration-mailbox-routing.test.ts', 'tests/e2e/cross-version-wire/agent-session-clear-old-client.unit.test.ts', 'tests/e2e/cross-version-wire/agent-session-clear-old-tab-mirror.unit.test.ts', - 'tests/e2e/cross-version-wire/host-model-catalog-released-phone.unit.test.ts', 'src/main/pi/rpc/rpc-session-startup.test.ts', 'src/main/acp/session/acp-structured-omp-recordings.test.ts', 'src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-clear-queued-command.test.ts', @@ -150,7 +148,6 @@ const NODE_RUNTIME_INCLUDE = [ 'src/main/ipc/filesystem/watchers/filesystem-watcher-ignore-real.test.ts', 'src/main/ipc/runtime-environments/runtime-environment-preference.test.ts', 'src/renderer/src/components/emulator-pane/emulator-device-frame-visibility.test.tsx', - 'src/main/claude/claude-agent-sdk-contract-pins.test.ts', 'config/scripts/desktop-distribution/runtime-verification/process-host-dev-rebuild.test.ts', 'config/scripts/test-runtime/node-worker/vitest-node-runtime-pool.test.ts', // Reopen WAL-backed row caches read-only, which Bun on macOS cannot. diff --git a/config/scripts/workflow/source-routing/pr-code-change-scope.mjs b/config/scripts/workflow/source-routing/pr-code-change-scope.mjs index 971ee6708a7..30cf31c68da 100644 --- a/config/scripts/workflow/source-routing/pr-code-change-scope.mjs +++ b/config/scripts/workflow/source-routing/pr-code-change-scope.mjs @@ -251,7 +251,7 @@ const CROSS_VERSION_WIRE_PREFIXES = [ 'src/main/native-chat/agent-model-catalog/agent-model-catalog-lister.ts', 'src/main/native-chat/agent-model-catalog/agent-model-catalog-listing-waiters.ts', 'src/main/native-chat/agent-model-catalog/agent-model-catalog-probe-runner.ts', - 'src/main/claude/claude-model-catalog-probe.ts', + 'src/main/claude/model-catalog/claude-model-catalog-probe.ts', 'src/main/runtime/agent-session/records/agent-session-record-store', 'src/main/runtime/agent-session/records/agent-session-recovery-capsule', 'src/shared/agent-session-resume-marker', 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 6a1be20214d..9ff01ceca20 100644 --- a/config/scripts/workflow/source-routing/pr-e2e-source-routing.mjs +++ b/config/scripts/workflow/source-routing/pr-e2e-source-routing.mjs @@ -320,7 +320,7 @@ export const PR_E2E_SOURCE_ROUTES = [ MANAGED_SSH_HARNESS.test(file) || file === 'tests/e2e/fixtures/structured-claude-stub.cjs' || (isProductSource(file) && - /^src\/(?:main\/(?:claude\/claude-(?:stream-json-connection|stream-json-exit-error|structured-session-exit-lifecycle)|native-chat\/agent-session-wire\/structured-agent-session-failure-text)|renderer\/src\/components\/native-chat\/structured-agent-session-delivery-notices)\.ts$/.test( + /^src\/(?:main\/(?:claude\/(?:claude-(?:stream-json-connection|structured-session-exit-lifecycle)|sdk-transport\/claude-stream-json-exit-error)|native-chat\/agent-session-wire\/structured-agent-session-failure-text)|renderer\/src\/components\/native-chat\/structured-agent-session-delivery-notices)\.ts$/.test( file )) }, diff --git a/config/scripts/workflow/source-routing/pr-package-test-paths.mjs b/config/scripts/workflow/source-routing/pr-package-test-paths.mjs index f22d5c6747d..dd8a63c7bf8 100644 --- a/config/scripts/workflow/source-routing/pr-package-test-paths.mjs +++ b/config/scripts/workflow/source-routing/pr-package-test-paths.mjs @@ -170,12 +170,9 @@ export const WINDOWS_BOUNDARY_TESTS = [ 'src/shared/windows-batch-spawn.win32.test.ts', 'src/main/claude/structured/launch/claude-structured-child-env.test.ts', 'src/main/agent-hooks/installation/commands/windows-hook-payload-delivery.test.ts', - 'src/main/agent-hooks/installation/scripts/managed-hook-stdin-lifecycle.test.ts', 'src/main/jcode/hook-gate-script.test.ts', 'src/main/agent-hooks/installation/commands/windows-native-hook-exe-hosts.test.ts', - 'src/main/claude/windows-native-hook-registration.test.ts', 'src/main/agent-hooks/installation/commands/windows-batch-hook-launcher.test.ts', - 'src/main/claude/claude-status-line-windows.test.ts', 'src/main/codex/hooks/installation/windows-hook-command.test.ts', 'src/main/codex/hooks/installation/hook-service-managed-install.test.ts', 'src/main/windows/windows-pty-job.win32.test.ts', diff --git a/src/main/agent-hooks/installation/commands/windows-batch-hook-launcher.test.ts b/src/main/agent-hooks/installation/commands/windows-batch-hook-launcher.test.ts index 11dd2824b3f..91a8462f1bd 100644 --- a/src/main/agent-hooks/installation/commands/windows-batch-hook-launcher.test.ts +++ b/src/main/agent-hooks/installation/commands/windows-batch-hook-launcher.test.ts @@ -4,7 +4,7 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { runProcess } from '@orca/process-host' import { removeTree } from '../../../../shared/windows-transient-lock-removal' -import '../../../claude/hook-settings' +import '../../../claude/hooks/hook-settings' import { wrapWindowsBatchHookCommand } from './windows-direct-cmd-hook-command' import './testing/windows-git-bash-path.test-fixture' import { getWindowsPowerShellExecutablePath } from './windows-powershell-hook-launcher' diff --git a/src/main/agent-hooks/installation/managed-agent-hook-controls.ts b/src/main/agent-hooks/installation/managed-agent-hook-controls.ts index 76e1e46da60..0dcc522c590 100644 --- a/src/main/agent-hooks/installation/managed-agent-hook-controls.ts +++ b/src/main/agent-hooks/installation/managed-agent-hook-controls.ts @@ -12,7 +12,7 @@ import { isAgentStatusHooksEnabled, isAgentStatusHooksEnabledForAgent } from '../../../shared/agent-hook-listener/configuration/agent-status-hooks-setting' -import { probeClaudeCliVersion } from '../../claude/claude-hook-event-versions' +import { probeClaudeCliVersion } from '../../claude/cli-capabilities/claude-hook-event-versions' import { detectLocalManagedAgentCliPresence } from './local-agent-cli-presence' import { MANAGED_AGENT_HOOK_ASYNC_REMOVERS, diff --git a/src/main/agent-hooks/installation/managed-hook-detection-commands.ts b/src/main/agent-hooks/installation/managed-hook-detection-commands.ts index 0378b0aba67..e3d7a194b54 100644 --- a/src/main/agent-hooks/installation/managed-hook-detection-commands.ts +++ b/src/main/agent-hooks/installation/managed-hook-detection-commands.ts @@ -7,7 +7,7 @@ import { MANAGED_AGENT_HOOK_TARGETS } from '../../../shared/managed-agent-hook-t import { normalizeDisabledTuiAgents } from '../../../shared/agent-launch/catalog/tui-agent-selection' import type { GlobalSettings } from '../../../shared/global-settings-types' import type { TuiAgentDetectionCommand } from '../../../shared/agent-launch/catalog/tui-agent-detection-commands' -import { parseClaudeCliVersionOutput } from '../../claude/claude-hook-event-versions' +import { parseClaudeCliVersionOutput } from '../../claude/cli-capabilities/claude-hook-event-versions' export type ManagedHookDetectionSettings = Partial< Pick< diff --git a/src/main/agent-hooks/installation/scripts/cursor-replay-guard.test.ts b/src/main/agent-hooks/installation/scripts/cursor-replay-guard.test.ts index 413ae77c29b..72cb9dad591 100644 --- a/src/main/agent-hooks/installation/scripts/cursor-replay-guard.test.ts +++ b/src/main/agent-hooks/installation/scripts/cursor-replay-guard.test.ts @@ -4,7 +4,7 @@ vi.mock('electron', () => ({ app: { getPath: () => '/tmp/userData' } })) import { runVendorHook } from './testing/vendor-hook-delivery.test-fixture' -import { getManagedScript as getClaudeManagedScript } from '../../../claude/hook-service' +import { getManagedScript as getClaudeManagedScript } from '../../../claude/hooks/hook-script' import { getManagedScript as getCursorManagedScript } from '../../../cursor/hook-script' const CLAUDE_SCRIPT_OPTIONS = { diff --git a/src/main/agent-hooks/installation/scripts/grok-replay-guard.test.ts b/src/main/agent-hooks/installation/scripts/grok-replay-guard.test.ts index b21f154bc0d..7e318f07e41 100644 --- a/src/main/agent-hooks/installation/scripts/grok-replay-guard.test.ts +++ b/src/main/agent-hooks/installation/scripts/grok-replay-guard.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it, vi } from 'vitest' vi.mock('electron', () => ({ app: { getPath: () => '/tmp/userData' } })) -import { getManagedScript as getClaudeManagedScript } from '../../../claude/hook-service' +import { getManagedScript as getClaudeManagedScript } from '../../../claude/hooks/hook-script' import { getManagedScript as getCursorManagedScript } from '../../../cursor/hook-script' import { runVendorHook } from './testing/vendor-hook-delivery.test-fixture' diff --git a/src/main/agent-hooks/installation/scripts/managed-hook-stdin-lifecycle.test.ts b/src/main/agent-hooks/installation/scripts/managed-hook-stdin-lifecycle.test.ts deleted file mode 100644 index c6cffd1ba59..00000000000 --- a/src/main/agent-hooks/installation/scripts/managed-hook-stdin-lifecycle.test.ts +++ /dev/null @@ -1,284 +0,0 @@ -// POSIX hooks drain before exit; Windows missing-context hooks may exit without owning stdin. -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as CodexHookHashLookup from '../../../codex/trust/hooks/codex-hook-hash-lookup' -import { spawnProcess } from '@orca/process-host' -import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs' -import { tmpdir } from 'node:os' -import { join } from 'node:path' - -import type * as osModule from 'node:os' -import type * as NativeHookExecutableModule from '../commands/windows-native-hook-executable' - -let isolatedUserDataDir = '' -let previousUserDataPath: string | undefined - -beforeEach(() => { - vi.stubEnv('GROK_HOME', undefined) - vi.stubEnv('KIMI_CODE_HOME', undefined) - vi.stubEnv('COPILOT_HOME', undefined) - vi.stubEnv('KIRO_HOME', undefined) - vi.stubEnv('XDG_CONFIG_HOME', undefined) - previousUserDataPath = process.env.ORCA_USER_DATA_PATH - isolatedUserDataDir = mkdtempSync(join(tmpdir(), 'orca-hook-stdin-user-data-')) - // Isolate managed-script resolution so inherited user-data paths cannot target live hooks. - process.env.ORCA_USER_DATA_PATH = isolatedUserDataDir -}) - -afterEach(() => { - if (previousUserDataPath === undefined) { - delete process.env.ORCA_USER_DATA_PATH - } else { - process.env.ORCA_USER_DATA_PATH = previousUserDataPath - } - rmSync(isolatedUserDataDir, { recursive: true, force: true }) - vi.unstubAllEnvs() -}) - -const { homedirMock, bundledHook } = vi.hoisted(() => { - const bundledHook: { path: string | null } = { path: null } - return { homedirMock: vi.fn<() => string>(), bundledHook } -}) - -// Test the real built executable without packaged resource lookup. -vi.mock('../commands/windows-native-hook-executable', async (importOriginal) => ({ - ...(await importOriginal()), - resolveBundledWindowsNativeHookExecutable: () => bundledHook.path -})) - -vi.mock('../../../codex/trust/hooks/codex-hook-hash-lookup', async (importOriginal) => ({ - ...(await importOriginal()), - resolveCodexHookAnswerForLaunch: async () => - ( - await import('../../../codex/hooks/installation/hook-service-test-harness') - ).codexHookAnswerForTests() -})) - -vi.mock('electron', () => ({ - app: { - getPath: () => '/tmp/orca-user-data' - } -})) - -vi.mock('os', async (importOriginal) => { - const actual = await importOriginal() - return { - ...actual, - homedir: homedirMock.mockImplementation(actual.homedir) - } -}) - -import '../../../antigravity/hook-service' -import { ClaudeHookService } from '../../../claude/hook-service' -import '../../../claude/hook-settings' -import '../../../codex/hooks/installation/hook-service' -import '../../../codex/hooks/installation/codex-hook-service-implementation' -import '../../../command-code/hook-service' -import '../../../copilot/hook-service' -import '../../../cursor/hook-service' -import '../../../devin/hook-service' -import '../../../droid/hook-service' -import '../../../gemini/hook-service' -import '../../../grok/hook-service' -import '../../../kimi/hook-service' - -import '../../../openclaude/hook-service' - -import { POSIX_HOOK_STDIN_READER } from './hook-stdin-contract' -import '../commands/runtime-home-hook-command' -import '../remote/testing/agent-hook-memory-sftp.test-fixture' -import { findGitBash } from '../commands/testing/windows-git-bash-path.test-fixture' -import { - WINDOWS_POWERSHELL_WARM_UP_TIMEOUT_MS, - warmWindowsEncodedPowerShell -} from '../commands/testing/windows-powershell-warm-up.test-fixture' -import { - buildWindowsNativeHookExecutable, - WINDOWS_NATIVE_HOOK_BUILD_TIMEOUT_MS -} from '../commands/testing/windows-native-hook-exe.test-fixture' - -const REMOTE_HOME = '/home/dev' -const LARGE_PAYLOAD = Buffer.alloc(1_000_000, 'x') - -// Seed the user's usual AutoRun target so profile redirection cannot introduce cmd stderr noise. -function seedCmdAutoRunTarget(profileDir: string): void { - mkdirSync(profileDir, { recursive: true }) - writeFileSync(join(profileDir, '.cmd_aliases.cmd'), '@echo off\r\n', 'utf8') -} - -type HookRun = { - exitCode: number | null - stdinErrors: NodeJS.ErrnoException[] - stderr: string - stdout: string -} - -function runHookProcess( - executable: string, - args: string[], - env: NodeJS.ProcessEnv, - // An open, unwritten pipe exposes read-to-EOF hangs outside an Orca pane. - stdin: 'close' | 'abandon' = 'close' -): Promise { - return new Promise((resolve, reject) => { - const child = spawnProcess({ - program: executable, - args, - env, - stdio: 'pipe' - }) - const stdinErrors: NodeJS.ErrnoException[] = [] - let stderr = '' - let stdout = '' - const timeout = setTimeout(() => { - child.stdin.destroy() - child.kill('SIGKILL') - reject( - new Error( - `hook did not finish with stdin ${stdin}d: ${executable} ${args.join(' ').slice(0, 200)}` - ) - ) - }, 10_000) - child.on('error', (error) => { - clearTimeout(timeout) - reject(error) - }) - child.stdout.on('data', (chunk: Buffer) => { - stdout += chunk.toString() - }) - child.stderr.on('data', (chunk: Buffer) => { - stderr += chunk.toString() - }) - child.stdin.on('error', (error: NodeJS.ErrnoException) => stdinErrors.push(error)) - child.on('close', (exitCode) => { - clearTimeout(timeout) - resolve({ exitCode, stdinErrors, stderr, stdout }) - }) - if (stdin === 'close') { - child.stdin.end(LARGE_PAYLOAD) - } - }) -} - -function hookEnvironment(extraEnv: NodeJS.ProcessEnv = {}): NodeJS.ProcessEnv { - const env = Object.fromEntries( - Object.entries(process.env).filter(([key]) => !key.startsWith('ORCA_')) - ) - return { - ...env, - HOME: REMOTE_HOME, - ORCA_AGENT_HOOK_ENDPOINT: '', - ...extraEnv - } -} - -describe('Windows managed hook stdin structure', () => { - beforeAll(async () => { - if (process.platform === 'win32') { - await warmWindowsEncodedPowerShell(hookEnvironment()) - } - }, WINDOWS_POWERSHELL_WARM_UP_TIMEOUT_MS) - - // Command-shape assertions missed conhost discarding the consumer's JSON output. - it.skipIf(process.platform !== 'win32').each([ - { form: 'claude-hook.cmd', bundled: false }, - { form: 'orca-agent-hook.exe claude', bundled: true } - ])( - 'emits parseable JSON on stdout from the registered Claude hook command ($form), through cmd.exe and Git Bash', - async ({ form, bundled }) => { - const home = mkdtempSync(join(tmpdir(), 'orca-hook-stdout-json-')) - homedirMock.mockReturnValue(home) - const absentProfile = join(home, 'absent') - seedCmdAutoRunTarget(home) - seedCmdAutoRunTarget(absentProfile) - try { - bundledHook.path = bundled ? buildWindowsNativeHookExecutable() : null - expect(new ClaudeHookService().install().state).toBe('installed') - const settings = JSON.parse( - readFileSync(join(home, '.claude', 'settings.json'), 'utf8') - ) as { hooks: Record } - const entry = settings.hooks.PreToolUse[0].hooks[0] - expect(entry.args).toBeUndefined() - expect(entry.command.endsWith(form)).toBe(true) - - // MSYS rewrites paths and switches, so exercise both shells. - const gitBash = findGitBash() - const shells = [ - { name: 'cmd.exe', executable: 'cmd.exe', args: ['/d', '/c', entry.command] }, - { name: 'Git Bash', executable: gitBash, args: ['-c', entry.command] } - ] - const environments = [ - { name: 'no Orca env', env: hookEnvironment({ USERPROFILE: home }) }, - { - name: 'Orca env with dead listener', - env: hookEnvironment({ - USERPROFILE: home, - ORCA_AGENT_HOOK_PORT: '59999', - ORCA_AGENT_HOOK_TOKEN: 'token', - ORCA_PANE_KEY: 'tab:leaf' - }) - }, - { - // Profile redirection hides runtime-resolved scripts; direct launchers retain their absolute path. - name: 'missing managed script', - env: hookEnvironment({ USERPROFILE: absentProfile }) - } - ] - for (const shell of shells) { - for (const environment of environments) { - const label = `${shell.name} / ${environment.name}` - const result = await runHookProcess(shell.executable, shell.args, environment.env) - expect(result.exitCode, `${label} exit code`).toBe(0) - expect(result.stderr, `${label} stderr`).toBe('') - expect(() => JSON.parse(result.stdout.trim()), `${label} stdout is JSON`).not.toThrow() - expect(JSON.parse(result.stdout.trim()), `${label} stdout`).toEqual({}) - } - if (bundled) { - const abandoned = await runHookProcess( - shell.executable, - shell.args, - environments[0].env, - 'abandon' - ) - expect(abandoned.exitCode, `${shell.name} abandoned-stdin exit code`).toBe(0) - } - } - } finally { - bundledHook.path = null - homedirMock.mockImplementation(() => process.env.HOME ?? tmpdir()) - rmSync(home, { recursive: true, force: true }) - } - }, - // Allow cold executable builds and six shell launches under load. - WINDOWS_NATIVE_HOOK_BUILD_TIMEOUT_MS - ) -}) - -describe.skipIf(process.platform === 'win32')('managed hook stdin lifecycle', () => { - // Exit zero does not prove stdin was consumed; measure captured bytes. - it.each([ - ['empty PATH', ''], - // NixOS may lack /bin/cat; exercise the shell's default PATH. - ['PATH without coreutils', '/nonexistent'], - ['PATH whose first cat is a decoy', ''] - ])('captures the whole payload with %s', async (label, pathValue) => { - const decoyDir = mkdtempSync(join(tmpdir(), 'orca-hook-stdin-decoy-')) - try { - let effectivePath = pathValue - if (label === 'PATH whose first cat is a decoy') { - const decoy = join(decoyDir, 'cat') - writeFileSync(decoy, '#!/bin/sh\nexit 0\n', { mode: 0o755 }) - effectivePath = decoyDir - } - const result = await runHookProcess( - '/bin/sh', - ['-c', `payload=$(${POSIX_HOOK_STDIN_READER}); printf '%s' "${'${#payload}'}"`], - { ...hookEnvironment(), PATH: effectivePath } - ) - expect(result.exitCode, `${label} exit code`).toBe(0) - expect(result.stdinErrors, `${label} stdin errors`).toHaveLength(0) - expect(result.stdout, `${label} captured bytes`).toBe(String(LARGE_PAYLOAD.length)) - } finally { - rmSync(decoyDir, { recursive: true, force: true }) - } - }) -}) diff --git a/src/main/agent-hooks/server/testing/replay/spool.test.ts b/src/main/agent-hooks/server/testing/replay/spool.test.ts index 110d8ca0302..b478c091987 100644 --- a/src/main/agent-hooks/server/testing/replay/spool.test.ts +++ b/src/main/agent-hooks/server/testing/replay/spool.test.ts @@ -1,8 +1,6 @@ -import { readSavedStatus } from '../persistence/last-status.test-fixtures' import { describe, expect, it } from 'vitest' import { appendFileSync, - chmodSync, mkdirSync, mkdtempSync, readFileSync, @@ -19,10 +17,9 @@ import { launchTokenHash, type SpoolRecord } from '../../../../../shared/agent-hook-listener/transport/agent-hook-spool' -import { AgentHookServer, _internals } from '../../agent-hook-server' -import { buildBody } from '../server.test-fixtures' -import { _internals as codexInternals } from '../../../../codex/hooks/installation/hook-service' -import { getManagedScript as getClaudeManagedScript } from '../../../../claude/hook-script' +import { AgentHookServer } from '../../agent-hook-server' + +import { getManagedScript as getClaudeManagedScript } from '../../../../claude/hooks/hook-script' import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id' describe('agent hook spool', () => { @@ -102,49 +99,6 @@ describe('agent hook spool', () => { expect(statSync(file).ino).toBe(inode) }) - it('replays a spooled Codex SubagentStop through the server after restart', async () => { - const userDataPath = mkdtempSync(join(tmpdir(), 'orca-spool-e2e-')) - const paneKey = makePaneKey('tab-spool', '00000000-0000-4000-8000-000000000001') - const launchToken = 'generation-token' - const first = new AgentHookServer() - await first.start({ env: 'production', userDataPath }) - const started = _internals.normalizeHookPayload( - 'codex', - buildBody({ hook_event_name: 'SubagentStart', agent_id: 'child-spooled' }), - 'production' - )! - first.ingestRemote( - { - paneKey, - source: 'codex', - hookEventName: 'SubagentStart', - launchToken, - payload: started.payload - }, - 'spool-test' - ) - expect(first.getStatusSnapshot()).toHaveLength(1) - first.flushStatusPersistSync() - first.stop() - const spoolDir = join(userDataPath, 'agent-hooks', 'spool') - mkdirSync(spoolDir, { recursive: true }) - writeFileSync( - join(spoolDir, 'pane-tab-spooled_0.jsonl'), - `\n${JSON.stringify({ paneKey, source: 'codex', hookEventName: 'SubagentStop', launchToken, receivedAt: Date.now(), payload: { hook_event_name: 'SubagentStop', agent_id: 'child-spooled' } })}\n` - ) - const restarted = new AgentHookServer() - await restarted.start({ env: 'production', userDataPath }) - try { - const snapshot = restarted.getStatusSnapshot() - expect(snapshot).toHaveLength(1) - expect(snapshot[0]!.subagents).toBeUndefined() - restarted.flushStatusPersistSync() - expect(readSavedStatus(restarted.lastStatusPath!)).not.toContain('isReplay') - } finally { - restarted.stop() - } - }) - it('rejects a stale remote replay against the hydrated launch-token fence', async () => { const userDataPath = mkdtempSync(join(tmpdir(), 'orca-spool-remote-fence-')) const paneKey = makePaneKey('tab-remote-fence', '00000000-0000-4000-8000-000000000003') @@ -186,37 +140,6 @@ describe('agent hook spool', () => { } }) - it('spools when the endpoint is present but the receiver is unavailable', () => { - const dir = mkdtempSync(join(tmpdir(), 'orca-spool-failure-')) - const endpointDir = join(dir, 'agent-hooks') - mkdirSync(endpointDir, { recursive: true }) - const endpoint = join(endpointDir, 'endpoint.env') - writeFileSync( - endpoint, - 'ORCA_AGENT_HOOK_PORT=9\nORCA_AGENT_HOOK_TOKEN=stale\nORCA_AGENT_HOOK_ENV=production\nORCA_AGENT_HOOK_VERSION=1\n' - ) - const script = join(dir, 'codex-hook.sh') - writeFileSync(script, codexInternals.getManagedScript('posix')) - chmodSync(script, 0o755) - execFileSync('/bin/sh', [script], { - input: '{"hook_event_name":"SubagentStop","agent_id":"child"}\n', - env: { - ...process.env, - ORCA_AGENT_HOOK_ENDPOINT: endpoint, - ORCA_PANE_KEY: 'tab-failure:0', - ORCA_TAB_ID: 'tab-failure', - ORCA_AGENT_LAUNCH_TOKEN: 'generation-token', - CLAUDE_JOB_DIR: '' - }, - timeout: 5000 - }) - const spoolFiles = readdirSync(join(endpointDir, 'spool')) - expect(spoolFiles).toHaveLength(1) - expect(readFileSync(join(endpointDir, 'spool', spoolFiles[0]!), 'utf8')).toContain( - 'SubagentStop' - ) - }) - it('keeps a Claude hook attributed when CLAUDE_CODE_SUBPROCESS_ENV_SCRUB drops the pane key', () => { const dir = mkdtempSync(join(tmpdir(), 'orca-spool-scrubbed-')) const endpointDir = join(dir, 'agent-hooks') @@ -278,42 +201,4 @@ describe('agent hook spool', () => { expect(records).toHaveLength(1) expect(records[0]).toContain('"Stop"') }) - - it('does not mark a non-terminal downtime replay as runtime-observed', async () => { - const userDataPath = mkdtempSync(join(tmpdir(), 'orca-spool-observed-')) - const paneKey = makePaneKey('tab-observed', '00000000-0000-4000-8000-000000000002') - const launchToken = 'observed-generation' - const first = new AgentHookServer() - await first.start({ env: 'production', userDataPath }) - const started = _internals.normalizeHookPayload( - 'codex', - buildBody({ hook_event_name: 'SubagentStart', agent_id: 'child-observed' }), - 'production' - )! - first.ingestRemote( - { - paneKey, - source: 'codex', - hookEventName: 'SubagentStart', - launchToken, - payload: started.payload - }, - null - ) - first.flushStatusPersistSync() - first.stop() - const spoolDir = join(userDataPath, 'agent-hooks', 'spool') - mkdirSync(spoolDir, { recursive: true }) - writeFileSync( - join(spoolDir, 'pane-observed.jsonl'), - `\n${JSON.stringify({ paneKey, source: 'codex', hookEventName: 'SubagentStart', launchToken, receivedAt: Date.now(), payload: started.payload })}\n` - ) - const restarted = new AgentHookServer() - await restarted.start({ env: 'production', userDataPath }) - try { - expect(restarted.getStatusChangeSnapshot()[0]?.observedInCurrentRuntime).toBe(false) - } finally { - restarted.stop() - } - }) }) diff --git a/src/main/agent-launch/trust/agent-workspace-trust.test.ts b/src/main/agent-launch/trust/agent-workspace-trust.test.ts index 8af5154ff77..1c14ca48a5f 100644 --- a/src/main/agent-launch/trust/agent-workspace-trust.test.ts +++ b/src/main/agent-launch/trust/agent-workspace-trust.test.ts @@ -11,7 +11,7 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import type * as NodePath from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as ClaudeFolderTrustFile from '../../claude/claude-folder-trust-file' +import type * as ClaudeFolderTrustFile from '../../claude/configuration/claude-folder-trust-file' const CODEX_CONFIG_FILES = ['/orca/codex-home/config.toml', '/home/u/.codex/config.toml'] @@ -47,7 +47,7 @@ vi.mock('../../codex/configuration/homes/codex-home-paths', () => ({ getLocalCodexTrustConfigFiles: mocks.codexConfigFiles })) vi.mock('../../qoder/workspace-trust', () => ({ markQoderWorkspaceTrusted: mocks.qoder })) -vi.mock('../../claude/claude-folder-trust-file', async (importOriginal) => { +vi.mock('../../claude/configuration/claude-folder-trust-file', async (importOriginal) => { const actual = await importOriginal() mocks.claudeGrant.mockImplementation(actual.grantClaudeWorkspaceTrust) return { ...actual, grantClaudeWorkspaceTrust: mocks.claudeGrant } diff --git a/src/main/agent-launch/trust/agent-workspace-trust.ts b/src/main/agent-launch/trust/agent-workspace-trust.ts index 792e418650b..d16e7b865fa 100644 --- a/src/main/agent-launch/trust/agent-workspace-trust.ts +++ b/src/main/agent-launch/trust/agent-workspace-trust.ts @@ -4,7 +4,7 @@ import { SHORT_AGENT_TRUST_WRITE_DEADLINE_MS } from './agent-trust-write-deadline' import type { AgentTrustPreset } from './agent-trust-presets' -import { resolveLocalClaudeTrustConfig } from '../../claude/claude-folder-trust-file' +import { resolveLocalClaudeTrustConfig } from '../../claude/configuration/claude-folder-trust-file' import type { ClaudeRuntimeAuthPreparation } from '../../claude-accounts/runtime-auth/runtime-auth-types' import type { AgentWorkspaceTrustSpawnRequest } from '../../../shared/agent-launch/permissions/agent-workspace-trust-spawn-request' import { parseWslUncPath, toLinuxPath } from '../../../shared/wsl-paths' diff --git a/src/main/agent-launch/trust/execution-host-workspace-trust.ts b/src/main/agent-launch/trust/execution-host-workspace-trust.ts index 04132d61370..8ef1e2631af 100644 --- a/src/main/agent-launch/trust/execution-host-workspace-trust.ts +++ b/src/main/agent-launch/trust/execution-host-workspace-trust.ts @@ -14,7 +14,7 @@ import { awaitAgentTrustWriteWithinDeadline } from './agent-trust-write-deadline import { type ClaudeTrustConfigTarget, grantClaudeWorkspaceTrust -} from '../../claude/claude-folder-trust-file' +} from '../../claude/configuration/claude-folder-trust-file' import { isTooBroadToPreTrust } from '../../../shared/agent-launch/permissions/workspace-pretrust-scope' /** Resolve trust on the agent’s execution host, including WSL guests and SSH relays. */ diff --git a/src/main/claude-accounts/profiles/routing/claude-profile-router.ts b/src/main/claude-accounts/profiles/routing/claude-profile-router.ts index c101c1aa7c1..171f742d392 100644 --- a/src/main/claude-accounts/profiles/routing/claude-profile-router.ts +++ b/src/main/claude-accounts/profiles/routing/claude-profile-router.ts @@ -15,7 +15,7 @@ import { import { claudeProfileMissing } from './claude-profile-launch-errors' import type { GlobalSettings } from '../../../../shared/global-settings-types' import type { ClaudeManagedAccount } from '../../../../shared/managed-account-types' -import { probeRecentClaudeCliVersion } from '../../../claude/claude-hook-event-versions' +import { probeRecentClaudeCliVersion } from '../../../claude/cli-capabilities/claude-hook-event-versions' import { writeFileAtomically } from '../../../filesystem/atomic-file-publication' import { resolveClaudeCommand } from '../../../codex-cli/command' import { diff --git a/src/main/claude-accounts/profiles/routing/claude-profile-selection-homes.ts b/src/main/claude-accounts/profiles/routing/claude-profile-selection-homes.ts index 076a9ed5253..345284e11d5 100644 --- a/src/main/claude-accounts/profiles/routing/claude-profile-selection-homes.ts +++ b/src/main/claude-accounts/profiles/routing/claude-profile-selection-homes.ts @@ -1,5 +1,5 @@ import type { ClaudeProfileRouter, ClaudeProfileRouterSettings } from './claude-profile-router' -import { claudeLaunchDestinationHome } from '../../../claude/claude-launch-destination-home' +import { claudeLaunchDestinationHome } from '../../../claude/structured/launch/claude-launch-destination-home' /** Every native switcher destination, even an account whose setup has not created its home. */ export async function claudeProfileSelectionHomes( diff --git a/src/main/claude-accounts/profiles/setup/claude-profile-provisioning.ts b/src/main/claude-accounts/profiles/setup/claude-profile-provisioning.ts index 3d27f2ac77b..b02cd2fb031 100644 --- a/src/main/claude-accounts/profiles/setup/claude-profile-provisioning.ts +++ b/src/main/claude-accounts/profiles/setup/claude-profile-provisioning.ts @@ -5,7 +5,7 @@ import { isDefinitiveAbsence } from '../../../../shared/definitive-filesystem-ab import { resolveClaudeGlobalConfigFile, updateClaudeGlobalConfig -} from '../../../claude/claude-folder-trust-file' +} from '../../../claude/configuration/claude-folder-trust-file' import { publishFileWithoutOverwrite } from '../../../filesystem/atomic-file-publication' import { CLAUDE_PROFILE_HISTORY_DIRS, mergeClaudeProfileDirectory } from './claude-profile-history' import { readClaudeProfileObject, resolveClaudeDefaultHome } from '../claude-profile-paths' diff --git a/src/main/claude-accounts/sign-in/claude-account-folder.ts b/src/main/claude-accounts/sign-in/claude-account-folder.ts index 562a14c70ba..ee99171b86c 100644 --- a/src/main/claude-accounts/sign-in/claude-account-folder.ts +++ b/src/main/claude-accounts/sign-in/claude-account-folder.ts @@ -11,7 +11,7 @@ import { readFile, stat } from 'node:fs/promises' import { homedir } from 'node:os' import { dirname, join } from 'node:path' import { z } from 'zod' -import { resolveClaudeGlobalConfigFile } from '../../claude/claude-folder-trust-file' +import { resolveClaudeGlobalConfigFile } from '../../claude/configuration/claude-folder-trust-file' import { execSecurityCommand } from '../../macos-keychain/generic-password' import { describeClaudeProfile, readClaudeProfileObject } from '../profiles/claude-profile-paths' import { claudeConfigDirSpellings, claudeKeychainService } from '../runtime-auth/keychain' diff --git a/src/main/claude/claude-background-task-frames.ts b/src/main/claude/background-tasks/claude-background-task-frames.ts similarity index 91% rename from src/main/claude/claude-background-task-frames.ts rename to src/main/claude/background-tasks/claude-background-task-frames.ts index c2948a166e9..2527794906b 100644 --- a/src/main/claude/claude-background-task-frames.ts +++ b/src/main/claude/background-tasks/claude-background-task-frames.ts @@ -1,15 +1,13 @@ -import { classifyClaudeBackgroundTaskKind } from '../../shared/claude-background-task-kind' import type { AgentSessionBackgroundTask, AgentSessionBackgroundTaskRunState -} from '../../shared/agent-session/agent-session-background-task-wire' -import { ownRetainedString } from '../../shared/own-retained-string' +} from '../../../shared/agent-session/agent-session-background-task-wire' +import { ownRetainedString } from '../../../shared/own-retained-string' const MAX_TASK_ID_LENGTH = 512 const MAX_TASK_TEXT_LENGTH = 512 export type ClaudeBackgroundTaskKind = AgentSessionBackgroundTask['kind'] -export { classifyClaudeBackgroundTaskKind } export function record(value: unknown): Record | null { return typeof value === 'object' && value !== null ? (value as Record) : null diff --git a/src/main/claude/claude-background-task-identity.ts b/src/main/claude/background-tasks/claude-background-task-identity.ts similarity index 85% rename from src/main/claude/claude-background-task-identity.ts rename to src/main/claude/background-tasks/claude-background-task-identity.ts index 2d19b843dde..a9eed16b4b2 100644 --- a/src/main/claude/claude-background-task-identity.ts +++ b/src/main/claude/background-tasks/claude-background-task-identity.ts @@ -1,8 +1,8 @@ -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import { parseAgentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' -import type { AgentJournalProducerLinkage } from '../../shared/agent-session/journal/agent-session-journal-types' -import { isBackgroundTaskBlock } from '../../shared/native-chat/native-chat-types' -import type { StructuredAgentSessionLifecycleJournal } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-journal-views' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session/journal/agent-session-journal-identity' +import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalProducerLinkage } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { isBackgroundTaskBlock } from '../../../shared/native-chat/native-chat-types' +import type { StructuredAgentSessionLifecycleJournal } from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-journal-views' export type ClaudeBackgroundTaskDescriptor = { identity: AgentJournalItemIdentity diff --git a/src/main/claude/claude-background-task-memory.ts b/src/main/claude/background-tasks/claude-background-task-memory.ts similarity index 97% rename from src/main/claude/claude-background-task-memory.ts rename to src/main/claude/background-tasks/claude-background-task-memory.ts index 39996ab903d..b9f64dec4f4 100644 --- a/src/main/claude/claude-background-task-memory.ts +++ b/src/main/claude/background-tasks/claude-background-task-memory.ts @@ -1,4 +1,4 @@ -import { isSettledBackgroundTaskState } from '../../shared/native-chat/input/native-chat-background-task-row' +import { isSettledBackgroundTaskState } from '../../../shared/native-chat/input/native-chat-background-task-row' import type { ClaudeBackgroundTaskRow } from './claude-background-task-row-lifecycle' const MAX_GENERATION_ENTRIES = 512 diff --git a/src/main/claude/claude-background-task-resume.test.ts b/src/main/claude/background-tasks/claude-background-task-resume.test.ts similarity index 100% rename from src/main/claude/claude-background-task-resume.test.ts rename to src/main/claude/background-tasks/claude-background-task-resume.test.ts diff --git a/src/main/claude/claude-background-task-roster-merge.ts b/src/main/claude/background-tasks/claude-background-task-roster-merge.ts similarity index 100% rename from src/main/claude/claude-background-task-roster-merge.ts rename to src/main/claude/background-tasks/claude-background-task-roster-merge.ts diff --git a/src/main/claude/claude-background-task-roster.ts b/src/main/claude/background-tasks/claude-background-task-roster.ts similarity index 87% rename from src/main/claude/claude-background-task-roster.ts rename to src/main/claude/background-tasks/claude-background-task-roster.ts index 80e89a514e6..39eeb12c58f 100644 --- a/src/main/claude/claude-background-task-roster.ts +++ b/src/main/claude/background-tasks/claude-background-task-roster.ts @@ -1,12 +1,7 @@ import type { ClaudeTaskInvocations } from './claude-task-invocations' -import { isSettledBackgroundTaskState } from '../../shared/native-chat/input/native-chat-background-task-row' -import { - classifyClaudeBackgroundTaskKind, - record, - taskDescription, - taskId, - taskName -} from './claude-background-task-frames' +import { isSettledBackgroundTaskState } from '../../../shared/native-chat/input/native-chat-background-task-row' +import { classifyClaudeBackgroundTaskKind } from '../../../shared/claude-background-task-kind' +import { record, taskDescription, taskId, taskName } from './claude-background-task-frames' import type { ClaudeBackgroundTaskChange, ClaudeBackgroundTaskRow diff --git a/src/main/claude/claude-background-task-row-journal.ts b/src/main/claude/background-tasks/claude-background-task-row-journal.ts similarity index 83% rename from src/main/claude/claude-background-task-row-journal.ts rename to src/main/claude/background-tasks/claude-background-task-row-journal.ts index 3ea4197ff06..a7dca1e29e6 100644 --- a/src/main/claude/claude-background-task-row-journal.ts +++ b/src/main/claude/background-tasks/claude-background-task-row-journal.ts @@ -1,29 +1,23 @@ -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import type { AgentJournalTurnScope } from '../../shared/agent-session/journal/agent-session-journal-turn-scope' -import { backgroundTaskJournalBody } from '../../shared/native-chat/input/native-chat-background-task-row' -import { isBackgroundTaskBlock } from '../../shared/native-chat/native-chat-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session/journal/agent-session-journal-identity' +import type { AgentJournalTurnScope } from '../../../shared/agent-session/journal/agent-session-journal-turn-scope' +import { backgroundTaskJournalBody as claudeBackgroundTaskBody } from '../../../shared/native-chat/input/native-chat-background-task-row' +import { isBackgroundTaskBlock } from '../../../shared/native-chat/native-chat-types' import type { StructuredAgentSessionEventSink, StructuredAgentSessionSinkAdmission -} from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import type { StructuredAgentSessionLifecycleJournal } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-journal-views' +} from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import type { StructuredAgentSessionLifecycleJournal } from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-journal-views' import type { ClaudeBackgroundTaskRow } from './claude-background-task-row-lifecycle' -import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' -import { estimateStructuredAgentSessionItemBytes } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink-estimate' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { estimateStructuredAgentSessionItemBytes } from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink-estimate' import { claudeBackgroundTaskIdentity, resolveClaudeBackgroundTaskIdentity } from './claude-background-task-identity' -export { - claudeBackgroundTaskIdentity, - resolveClaudeBackgroundTaskIdentity -} from './claude-background-task-identity' const MAX_RESOLVED_TASK_IDENTITIES = 512 const ADMITTED: StructuredAgentSessionSinkAdmission = { accepted: true } -export const claudeBackgroundTaskBody = backgroundTaskJournalBody - export class ClaudeBackgroundTaskIdentityResolver { private journal: StructuredAgentSessionLifecycleJournal | null = null private epoch: string | null = null diff --git a/src/main/claude/claude-background-task-row-lifecycle.ts b/src/main/claude/background-tasks/claude-background-task-row-lifecycle.ts similarity index 94% rename from src/main/claude/claude-background-task-row-lifecycle.ts rename to src/main/claude/background-tasks/claude-background-task-row-lifecycle.ts index 112157ec7d7..b3772d0b8c7 100644 --- a/src/main/claude/claude-background-task-row-lifecycle.ts +++ b/src/main/claude/background-tasks/claude-background-task-row-lifecycle.ts @@ -1,13 +1,13 @@ import type { ClaudeTaskInvocation } from './claude-task-invocations' -import type { AgentJournalProducerLinkage } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalProducerLinkage } from '../../../shared/agent-session/journal/agent-session-journal-types' import { canReplaceBackgroundTaskState, isSettledBackgroundTaskState -} from '../../shared/native-chat/input/native-chat-background-task-row' -import type { NativeChatBackgroundTaskBlock } from '../../shared/native-chat/native-chat-types' -import type { ClaudeSubagentIds } from './claude-subagent-id-aliases' +} from '../../../shared/native-chat/input/native-chat-background-task-row' +import type { NativeChatBackgroundTaskBlock } from '../../../shared/native-chat/native-chat-types' +import type { ClaudeSubagentIds } from '../subagents/claude-subagent-id-aliases' +import { classifyClaudeBackgroundTaskKind } from '../../../shared/claude-background-task-kind' import { - classifyClaudeBackgroundTaskKind, liveClaudeTaskRunState, record, taskAliasId, diff --git a/src/main/claude/claude-background-task-row-test-support.ts b/src/main/claude/background-tasks/claude-background-task-row-test-support.ts similarity index 84% rename from src/main/claude/claude-background-task-row-test-support.ts rename to src/main/claude/background-tasks/claude-background-task-row-test-support.ts index 000a8cd21c8..f5e809e701e 100644 --- a/src/main/claude/claude-background-task-row-test-support.ts +++ b/src/main/claude/background-tasks/claude-background-task-row-test-support.ts @@ -1,10 +1,10 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { vi } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import type { NativeChatBackgroundTaskBlock } from '../../shared/native-chat/native-chat-types' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session/journal/agent-session-journal-identity' +import type { NativeChatBackgroundTaskBlock } from '../../../shared/native-chat/native-chat-types' +import type { StructuredAgentSessionEventSink } from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' import { ClaudeBackgroundTaskRows } from './claude-background-task-rows' /** Lifecycle frames captured from the reported failure. */ diff --git a/src/main/claude/claude-background-task-row-writer.ts b/src/main/claude/background-tasks/claude-background-task-row-writer.ts similarity index 95% rename from src/main/claude/claude-background-task-row-writer.ts rename to src/main/claude/background-tasks/claude-background-task-row-writer.ts index b4551e1e480..df3bb012a16 100644 --- a/src/main/claude/claude-background-task-row-writer.ts +++ b/src/main/claude/background-tasks/claude-background-task-row-writer.ts @@ -1,11 +1,11 @@ import { CLAUDE_BACKGROUND_TASK_SILENT_REFRESH_SUBTYPES } from './claude-background-task-frames' import type { ClaudeTaskInvocations } from './claude-task-invocations' import { claudeBackgroundTaskToolUseId } from './claude-background-task-row-lifecycle' -import type { AgentJournalTurnScope } from '../../shared/agent-session/journal/agent-session-journal-turn-scope' +import type { AgentJournalTurnScope } from '../../../shared/agent-session/journal/agent-session-journal-turn-scope' import type { StructuredAgentSessionEventSink, StructuredAgentSessionSinkAdmission -} from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +} from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' import type { ClaudeBackgroundTaskRow } from './claude-background-task-row-lifecycle' import { ClaudeBackgroundTaskIdentityResolver, diff --git a/src/main/claude/claude-background-task-rows.ts b/src/main/claude/background-tasks/claude-background-task-rows.ts similarity index 96% rename from src/main/claude/claude-background-task-rows.ts rename to src/main/claude/background-tasks/claude-background-task-rows.ts index bc5dca47ebc..c76dda5258f 100644 --- a/src/main/claude/claude-background-task-rows.ts +++ b/src/main/claude/background-tasks/claude-background-task-rows.ts @@ -1,8 +1,8 @@ import { ClaudeTaskInvocations } from './claude-task-invocations' -import type { AgentJournalTurnScope } from '../../shared/agent-session/journal/agent-session-journal-turn-scope' -import { isSettledBackgroundTaskState } from '../../shared/native-chat/input/native-chat-background-task-row' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import { BoundedMap } from '../../shared/bounded-map' +import type { AgentJournalTurnScope } from '../../../shared/agent-session/journal/agent-session-journal-turn-scope' +import { isSettledBackgroundTaskState } from '../../../shared/native-chat/input/native-chat-background-task-row' +import type { StructuredAgentSessionEventSink } from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import { BoundedMap } from '../../../shared/bounded-map' import { record, taskAliasId, @@ -31,7 +31,7 @@ import { } from './claude-background-task-row-writer' import { observeClaudeBackgroundTaskStart } from './claude-background-task-start' import { observeOwnedClaudeBackgroundTaskRoster } from './claude-background-task-roster' -import { ClaudeSubagentIds } from './claude-subagent-id-aliases' +import { ClaudeSubagentIds } from '../subagents/claude-subagent-id-aliases' import { ClaudeOverflowTerminalRows } from './claude-overflow-terminal-rows' const MAX_TASK_ROWS = 64 diff --git a/src/main/claude/claude-background-task-start.ts b/src/main/claude/background-tasks/claude-background-task-start.ts similarity index 91% rename from src/main/claude/claude-background-task-start.ts rename to src/main/claude/background-tasks/claude-background-task-start.ts index 76f6ad07b1b..4041d8d1147 100644 --- a/src/main/claude/claude-background-task-start.ts +++ b/src/main/claude/background-tasks/claude-background-task-start.ts @@ -1,5 +1,5 @@ -import { isSettledBackgroundTaskState } from '../../shared/native-chat/input/native-chat-background-task-row' -import { classifyClaudeBackgroundTaskKind } from './claude-background-task-frames' +import { isSettledBackgroundTaskState } from '../../../shared/native-chat/input/native-chat-background-task-row' +import { classifyClaudeBackgroundTaskKind } from '../../../shared/claude-background-task-kind' import { claudeBackgroundTaskToolUseId, isClaudeBackgroundTranscriptTask, @@ -10,7 +10,7 @@ import { ensureClaudeBackgroundTaskRowSlot, type ClaudeBackgroundTaskLedgers } from './claude-background-task-memory' -import { isClaudeSubagentTask } from './claude-subagent-task-frames' +import { isClaudeSubagentTask } from '../subagents/claude-subagent-task-frames' type ClaudeBackgroundTaskStartInput = { id: string diff --git a/src/main/claude/claude-background-task-terminal-frames.test.ts b/src/main/claude/background-tasks/claude-background-task-terminal-frames.test.ts similarity index 53% rename from src/main/claude/claude-background-task-terminal-frames.test.ts rename to src/main/claude/background-tasks/claude-background-task-terminal-frames.test.ts index 6f1754c36e9..65ade3bc1e6 100644 --- a/src/main/claude/claude-background-task-terminal-frames.test.ts +++ b/src/main/claude/background-tasks/claude-background-task-terminal-frames.test.ts @@ -7,23 +7,6 @@ import { } from './claude-background-task-row-test-support' describe('claude background task terminal frames', () => { - it('reports a failure for a task it never saw admitted', () => { - const { rows, items, latest, latestTwin, turnOpens } = harness() - expect(rows.observe(ORPHAN_FAILED_NOTIFICATION)).toBe(true) - expect(items).toHaveLength(1) - expect(turnOpens).toHaveLength(1) - expect(latest()).toMatchObject({ - type: 'background-task', - taskId: 'bjzenpq13', - kind: 'unknown', - state: 'blocked', - summary: 'Locate the exact screenshot session', - parentToolUseId: 'toolu_01ASNfnDBEzt4w3ejLE12bGu' - }) - expect(latest()?.label).toBe('') - expect(latestTwin()).toBe('Locate the exact screenshot session') - }) - it('does not resurrect an orphan outcome that named its own parent tool', () => { const { rows, items, latest } = harness([ FORWARDED_TOOL, diff --git a/src/main/claude/claude-background-task-tracker.ts b/src/main/claude/background-tasks/claude-background-task-tracker.ts similarity index 96% rename from src/main/claude/claude-background-task-tracker.ts rename to src/main/claude/background-tasks/claude-background-task-tracker.ts index 6b215b6ad9d..0d96e10072e 100644 --- a/src/main/claude/claude-background-task-tracker.ts +++ b/src/main/claude/background-tasks/claude-background-task-tracker.ts @@ -2,9 +2,9 @@ import type { AgentSessionBackgroundTask, AgentSessionBackgroundTaskRunState, AgentSessionBackgroundTaskState -} from '../../shared/agent-session/agent-session-background-task-wire' +} from '../../../shared/agent-session/agent-session-background-task-wire' +import { classifyClaudeBackgroundTaskKind } from '../../../shared/claude-background-task-kind' import { - classifyClaudeBackgroundTaskKind, liveClaudeTaskRunState, record, taskDescription, @@ -21,14 +21,6 @@ import { } from './claude-settled-background-tasks' import { combineClaudeBackgroundTaskRoster } from './claude-background-task-roster-merge' -export { - classifyClaudeBackgroundTaskKind, - isBoundedClaudeTaskId, - taskDescription as claudeTaskDescription, - taskId as claudeTaskId -} from './claude-background-task-frames' -export type { ClaudeBackgroundTaskKind } from './claude-background-task-frames' - // Bound terminal IDs without evicting live tasks. const MAX_TERMINAL_TASK_IDS = 256 export type ClaudeGoalBackgroundWork = 'live' | 'unverifiable' | 'exited' diff --git a/src/main/claude/claude-overflow-terminal-rows.ts b/src/main/claude/background-tasks/claude-overflow-terminal-rows.ts similarity index 100% rename from src/main/claude/claude-overflow-terminal-rows.ts rename to src/main/claude/background-tasks/claude-overflow-terminal-rows.ts diff --git a/src/main/claude/claude-settled-background-tasks.ts b/src/main/claude/background-tasks/claude-settled-background-tasks.ts similarity index 98% rename from src/main/claude/claude-settled-background-tasks.ts rename to src/main/claude/background-tasks/claude-settled-background-tasks.ts index 80feadc3d07..1add242b3d8 100644 --- a/src/main/claude/claude-settled-background-tasks.ts +++ b/src/main/claude/background-tasks/claude-settled-background-tasks.ts @@ -3,7 +3,7 @@ import type { AgentSessionBackgroundTask, AgentSessionBackgroundTaskRunState -} from '../../shared/agent-session/agent-session-background-task-wire' +} from '../../../shared/agent-session/agent-session-background-task-wire' const MAX_RETAINED_TASKS = 256 diff --git a/src/main/claude/claude-task-invocations.ts b/src/main/claude/background-tasks/claude-task-invocations.ts similarity index 100% rename from src/main/claude/claude-task-invocations.ts rename to src/main/claude/background-tasks/claude-task-invocations.ts diff --git a/src/main/claude/child-process/claude-agent-sdk-exit-proof.test.ts b/src/main/claude/child-process/claude-agent-sdk-exit-proof.test.ts new file mode 100644 index 00000000000..c4eca5d19d3 --- /dev/null +++ b/src/main/claude/child-process/claude-agent-sdk-exit-proof.test.ts @@ -0,0 +1,42 @@ +import type { ChildProcessWithoutNullStreams } from 'node:child_process' +import { describe, expect, it } from 'vitest' +import { spawnProcess } from '@orca/process-host' +import { proveClaudeChildExit } from './claude-agent-sdk-exit-proof' +import { managedChild } from './claude-child-exit-proof-fixture' + +const COOPERATIVE_CHILD = ` +process.stdin.on('end', () => process.exit(0)) +process.stdin.resume() +process.stdout.write('ready\\n') +` + +/** Sample at the close boundary; zombies count as exited even though kill(pid, 0) finds them. */ + +// ps start times have second precision; cross that boundary so the snapshot permits forced signals. + +// Model registry retries: slow process-table reads may leave one close attempt unproven. + +function spawnScript(script: string): ChildProcessWithoutNullStreams { + const child = spawnProcess({ + program: process.execPath, + args: ['-e', script], + stdio: ['pipe', 'pipe', 'pipe'] + }) + managedChild(child) + return child +} + +function firstStdoutLine(child: ChildProcessWithoutNullStreams): Promise { + return new Promise((resolve) => { + child.stdout.setEncoding('utf8').once('data', (chunk: string) => resolve(chunk.trim())) + }) +} + +describe('claude child exit proof', () => { + it('proves a clean close of a childless root with one snapshot and no signal', async () => { + const child = spawnScript(COOPERATIVE_CHILD) + expect(await firstStdoutLine(child)).toBe('ready') + + await expect(proveClaudeChildExit({ managed: managedChild(child) })).resolves.toBe(true) + }, 20_000) +}) diff --git a/src/main/claude/claude-agent-sdk-exit-proof.ts b/src/main/claude/child-process/claude-agent-sdk-exit-proof.ts similarity index 96% rename from src/main/claude/claude-agent-sdk-exit-proof.ts rename to src/main/claude/child-process/claude-agent-sdk-exit-proof.ts index 7587f8798fa..19801279fb8 100644 --- a/src/main/claude/claude-agent-sdk-exit-proof.ts +++ b/src/main/claude/child-process/claude-agent-sdk-exit-proof.ts @@ -2,15 +2,15 @@ import type { ChildProcess } from 'node:child_process' import { terminateDescendantSnapshotWithVerdict, type DescendantTreeVerdict -} from '../pty/process-retirement/pty-descendant-exit-verification' +} from '../../pty/process-retirement/pty-descendant-exit-verification' import { captureDescendantSnapshot, type DescendantSnapshot -} from '../pty/process-retirement/pty-descendant-termination' -import { terminateWindowsProcessTree } from '../pty/process-retirement/windows-process-tree-kill' +} from '../../pty/process-retirement/pty-descendant-termination' +import { terminateWindowsProcessTree } from '../../pty/process-retirement/windows-process-tree-kill' import { mergeClaudeDescendantSnapshots } from './claude-child-tree-snapshot' import { terminateClaudeRoot } from './claude-child-root-termination' -import { killProviderWriter } from '../provider-process/provider-process-teardown' +import { killProviderWriter } from '../../provider-process/provider-process-teardown' import { proveClaudeChildExitWithReaper, type ClaudeChildExitProofInput diff --git a/src/main/claude/child-process/claude-agent-sdk-process-spawn.test.ts b/src/main/claude/child-process/claude-agent-sdk-process-spawn.test.ts new file mode 100644 index 00000000000..289fbe4367e --- /dev/null +++ b/src/main/claude/child-process/claude-agent-sdk-process-spawn.test.ts @@ -0,0 +1,72 @@ +import { createFakePipedChild } from '../../../shared/__fixtures__/fake-spawned-child' +import { describe, expect, it, vi } from 'vitest' +import type { SpawnOptions as SdkSpawnOptions } from '@anthropic-ai/claude-agent-sdk' +import type { PipedProcessSpawner, ProcessSpec } from '@orca/process-host/process-spec' + +import type * as ProviderSupervisor from '../../provider-process/provider-process-supervisor' + +import { createClaudeCodeProcessSpawn } from './claude-agent-sdk-process-spawn' + +vi.mock('../../provider-process/provider-process-supervisor', async (importOriginal) => { + const actual = await importOriginal() + return { ...actual, createProviderSpawnSpec: vi.fn(actual.createProviderSpawnSpec) } +}) + +function fakeSpawn() { + const child = createFakePipedChild() + const specs: ProcessSpec[] = [] + const spawnImpl: PipedProcessSpawner = (spec) => { + specs.push(spec) + return child + } + return { child, spawnImpl, specs } +} + +function sdkOptions(overrides: Partial = {}): SdkSpawnOptions { + return { + command: '/usr/local/bin/claude', + args: ['--output-format', 'stream-json'], + cwd: '/work/repo', + env: { PATH: '/usr/bin', CLAUDE_CONFIG_DIR: '/accounts/one', UNSET: undefined }, + signal: new AbortController().signal, + ...overrides + } +} + +describe('claude agent SDK process spawn', () => { + it('keeps native chat identity after SDK and configured environment defaults', () => { + const process = fakeSpawn() + createClaudeCodeProcessSpawn(process.spawnImpl, 'win32').spawn( + sdkOptions({ + env: { + CLAUDE_CODE_ENTRYPOINT: 'sdk-ts', + claude_code_entrypoint: 'account', + PATH: 'C:\\bin' + } + }) + ) + expect(process.specs[0]?.env).toMatchObject({ CLAUDE_CODE_ENTRYPOINT: 'orca', PATH: 'C:\\bin' }) + expect( + Object.keys(process.specs[0]?.env ?? {}).filter( + (key) => key.toUpperCase() === 'CLAUDE_CODE_ENTRYPOINT' + ) + ).toEqual(['CLAUDE_CODE_ENTRYPOINT']) + }) + + it('preserves a Windows .cmd shim and its arguments for the host spawner', () => { + const process = fakeSpawn() + createClaudeCodeProcessSpawn(process.spawnImpl, 'win32').spawn( + sdkOptions({ + command: 'C:\\Users\\dev\\AppData\\npm\\claude.cmd', + args: ['--setting-sources=user,project,local', '--session-id', 'a b&c'] + }) + ) + + expect(process.specs).toEqual([ + expect.objectContaining({ + program: 'C:\\Users\\dev\\AppData\\npm\\claude.cmd', + args: ['--setting-sources=user,project,local', '--session-id', 'a b&c'] + }) + ]) + }) +}) diff --git a/src/main/claude/claude-agent-sdk-process-spawn.ts b/src/main/claude/child-process/claude-agent-sdk-process-spawn.ts similarity index 95% rename from src/main/claude/claude-agent-sdk-process-spawn.ts rename to src/main/claude/child-process/claude-agent-sdk-process-spawn.ts index 71b6adcd9e3..68d3fe0a1e5 100644 --- a/src/main/claude/claude-agent-sdk-process-spawn.ts +++ b/src/main/claude/child-process/claude-agent-sdk-process-spawn.ts @@ -1,4 +1,4 @@ -import { withOrcaClaudeChatEntrypoint } from '../../shared/agent-launch/startup/claude-chat-entrypoint' +import { withOrcaClaudeChatEntrypoint } from '../../../shared/agent-launch/startup/claude-chat-entrypoint' import type { ChildProcessWithoutNullStreams } from 'node:child_process' import type { PipedProcessSpawner } from '@orca/process-host/process-spec' import type { SpawnOptions as ClaudeAgentSdkSpawnOptions } from '@anthropic-ai/claude-agent-sdk' @@ -6,7 +6,7 @@ import { spawnProcess } from '@orca/process-host' import { spawnManagedProviderProcess, type ManagedProviderProcess -} from '../provider-process/managed-provider-process' +} from '../../provider-process/managed-provider-process' import { claudeChildClosePolicy, claudeChildCloseProven } from './claude-child-exit-proof-ladder' export type ClaudeCodeProcessSpawn = { diff --git a/src/main/claude/claude-child-exit-proof-fixture.ts b/src/main/claude/child-process/claude-child-exit-proof-fixture.ts similarity index 94% rename from src/main/claude/claude-child-exit-proof-fixture.ts rename to src/main/claude/child-process/claude-child-exit-proof-fixture.ts index f157807d036..8a25ba5bc06 100644 --- a/src/main/claude/claude-child-exit-proof-fixture.ts +++ b/src/main/claude/child-process/claude-child-exit-proof-fixture.ts @@ -2,7 +2,7 @@ import type { ChildProcessWithoutNullStreams } from 'node:child_process' import { spawnManagedProviderProcess, type ManagedProviderProcess -} from '../provider-process/managed-provider-process' +} from '../../provider-process/managed-provider-process' import { claudeChildClosePolicy, claudeChildCloseProven } from './claude-child-exit-proof-ladder' const managedChildren = new WeakMap() diff --git a/src/main/claude/claude-child-exit-proof-ladder.ts b/src/main/claude/child-process/claude-child-exit-proof-ladder.ts similarity index 84% rename from src/main/claude/claude-child-exit-proof-ladder.ts rename to src/main/claude/child-process/claude-child-exit-proof-ladder.ts index e62fc260e8f..50bdbf2817c 100644 --- a/src/main/claude/claude-child-exit-proof-ladder.ts +++ b/src/main/claude/child-process/claude-child-exit-proof-ladder.ts @@ -1,9 +1,9 @@ -import type { ManagedProviderProcess } from '../provider-process/managed-provider-process' -import { PROVIDER_SUPERVISOR_MAX_STOP_MS } from '../provider-process/provider-process-supervisor' +import type { ManagedProviderProcess } from '../../provider-process/managed-provider-process' +import { PROVIDER_SUPERVISOR_MAX_STOP_MS } from '../../provider-process/provider-process-supervisor' import type { ProviderProcessClosePolicy, ProviderProcessCloseResult -} from '../provider-process/provider-process-close' +} from '../../provider-process/provider-process-close' import type { ClaudeChildTreeReaper } from './claude-agent-sdk-exit-proof' export const GRACEFUL_EXIT_MS = 1_500 diff --git a/src/main/claude/claude-child-process-environment.test.ts b/src/main/claude/child-process/claude-child-process-environment.test.ts similarity index 100% rename from src/main/claude/claude-child-process-environment.test.ts rename to src/main/claude/child-process/claude-child-process-environment.test.ts diff --git a/src/main/claude/claude-child-process-environment.ts b/src/main/claude/child-process/claude-child-process-environment.ts similarity index 90% rename from src/main/claude/claude-child-process-environment.ts rename to src/main/claude/child-process/claude-child-process-environment.ts index 1df9100bef9..c05fd804cb6 100644 --- a/src/main/claude/claude-child-process-environment.ts +++ b/src/main/claude/child-process/claude-child-process-environment.ts @@ -1,12 +1,12 @@ import { CLAUDE_AUTH_ENV_VARS, applyClaudeEnvPatch -} from '../claude-accounts/runtime-auth/environment' -import { stripInheritedAgentSessionEnv } from '../../shared/agent-launch/startup/parent-agent-session-env' +} from '../../claude-accounts/runtime-auth/environment' +import { stripInheritedAgentSessionEnv } from '../../../shared/agent-launch/startup/parent-agent-session-env' import { LEGACY_NATIVE_CHAT_VISUALS_DIR_ENV, NATIVE_CHAT_SCRATCH_DIR_ENV -} from '../native-chat/native-chat-visuals-delivery' +} from '../../native-chat/native-chat-visuals-delivery' function cloneProcessEnv(source: NodeJS.ProcessEnv): Record { const env: Record = {} diff --git a/src/main/claude/claude-child-root-termination.ts b/src/main/claude/child-process/claude-child-root-termination.ts similarity index 100% rename from src/main/claude/claude-child-root-termination.ts rename to src/main/claude/child-process/claude-child-root-termination.ts diff --git a/src/main/claude/claude-child-tree-snapshot.ts b/src/main/claude/child-process/claude-child-tree-snapshot.ts similarity index 96% rename from src/main/claude/claude-child-tree-snapshot.ts rename to src/main/claude/child-process/claude-child-tree-snapshot.ts index 632e1ef2829..6a080d87bd1 100644 --- a/src/main/claude/claude-child-tree-snapshot.ts +++ b/src/main/claude/child-process/claude-child-tree-snapshot.ts @@ -1,4 +1,4 @@ -import type { DescendantSnapshot } from '../pty/process-retirement/pty-descendant-termination' +import type { DescendantSnapshot } from '../../pty/process-retirement/pty-descendant-termination' // Non-atomic scans may omit live rows; retain them, but reject any PID whose identity changed. function mergeRowsByPid( diff --git a/src/main/claude/claude-startup-answer-observation.ts b/src/main/claude/child-process/claude-startup-answer-observation.ts similarity index 95% rename from src/main/claude/claude-startup-answer-observation.ts rename to src/main/claude/child-process/claude-startup-answer-observation.ts index ec460aa09eb..25c9bf23a05 100644 --- a/src/main/claude/claude-startup-answer-observation.ts +++ b/src/main/claude/child-process/claude-startup-answer-observation.ts @@ -1,5 +1,5 @@ import { StringDecoder } from 'node:string_decoder' -import { createIncrementalNdjsonFramer } from '../../shared/main-process-ndjson-framer' +import { createIncrementalNdjsonFramer } from '../../../shared/main-process-ndjson-framer' // Unescaped quotes occur only as JSON structure, so other records skip this second parse. const FAILED_RESULT_TOKENS = [/"type"\s*:\s*"result"/, /"is_error"\s*:\s*true/] diff --git a/src/main/claude/claude-agent-wait-calls.ts b/src/main/claude/child-work/claude-agent-wait-calls.ts similarity index 81% rename from src/main/claude/claude-agent-wait-calls.ts rename to src/main/claude/child-work/claude-agent-wait-calls.ts index 62ab8fb5184..2814176fde7 100644 --- a/src/main/claude/claude-agent-wait-calls.ts +++ b/src/main/claude/child-work/claude-agent-wait-calls.ts @@ -1,10 +1,10 @@ -import { BoundedMap } from '../../shared/bounded-map' -import { runsOrcaOrchestrationWait } from '../../shared/orca-cli-invocations' +import { BoundedMap } from '../../../shared/bounded-map' +import { runsOrcaOrchestrationWait } from '../../../shared/orca-cli-invocations' import { claudeRecord, claudeToolUses, readClaudeMessageEnvelope -} from './structured/journal/claude-structured-item-translation' +} from '../structured/journal/claude-structured-item-translation' /** Bash calls that block on `orca orchestration check --wait`, by tool_use_id, until their background task starts. */ export class ClaudeAgentWaitCalls { diff --git a/src/main/claude/claude-child-work-decoder.test.ts b/src/main/claude/child-work/claude-child-work-decoder.test.ts similarity index 100% rename from src/main/claude/claude-child-work-decoder.test.ts rename to src/main/claude/child-work/claude-child-work-decoder.test.ts diff --git a/src/main/claude/claude-child-work-decoder.ts b/src/main/claude/child-work/claude-child-work-decoder.ts similarity index 96% rename from src/main/claude/claude-child-work-decoder.ts rename to src/main/claude/child-work/claude-child-work-decoder.ts index d155db75b49..6de7eebff81 100644 --- a/src/main/claude/claude-child-work-decoder.ts +++ b/src/main/claude/child-work/claude-child-work-decoder.ts @@ -1,9 +1,9 @@ // Roster changes, turn endings and spawn results cannot settle a child. -import { ClaudeTaskInvocations } from './claude-task-invocations' -import type { AgentChildWorkEvidence } from '../../shared/agent-status/child-work/agent-status-child-work-evidence' +import { ClaudeTaskInvocations } from '../background-tasks/claude-task-invocations' +import type { AgentChildWorkEvidence } from '../../../shared/agent-status/child-work/agent-status-child-work-evidence' +import { classifyClaudeBackgroundTaskKind } from '../../../shared/claude-background-task-kind' import { - classifyClaudeBackgroundTaskKind, liveClaudeTaskRunState, record, taskAliasId, @@ -13,8 +13,8 @@ import { taskText, taskUsageTotalTokens, terminalClaudeTaskRunState -} from './claude-background-task-frames' -import { claudeStartedTaskKind } from './claude-subagent-task-frames' +} from '../background-tasks/claude-background-task-frames' +import { claudeStartedTaskKind } from '../subagents/claude-subagent-task-frames' import { ClaudeAgentWaitCalls } from './claude-agent-wait-calls' import { claudeChildWorkOutcome, diff --git a/src/main/claude/claude-child-work-evidence.ts b/src/main/claude/child-work/claude-child-work-evidence.ts similarity index 90% rename from src/main/claude/claude-child-work-evidence.ts rename to src/main/claude/child-work/claude-child-work-evidence.ts index 7110cd50489..6cea1cb0f1f 100644 --- a/src/main/claude/claude-child-work-evidence.ts +++ b/src/main/claude/child-work/claude-child-work-evidence.ts @@ -1,26 +1,24 @@ -import { ORCA_ORCHESTRATION_WAIT_COMMAND } from '../../shared/orca-cli-invocations' +import { ORCA_ORCHESTRATION_WAIT_COMMAND } from '../../../shared/orca-cli-invocations' import type { AgentChildWorkKind, AgentChildWorkOperation, AgentChildWorkOutcome -} from '../../shared/agent-status/child-work/agent-status-child-work' +} from '../../../shared/agent-status/child-work/agent-status-child-work' import type { AgentChildWorkEvidence, AgentChildWorkLiveObservation -} from '../../shared/agent-status/child-work/agent-status-child-work-evidence' -import { taskText, taskUsageTotalTokens } from './claude-background-task-frames' -import type { - ClaudeSession, - ClaudeStructuredSessionEvent -} from './structured/claude-structured-session-state' -import { deriveToolInputPreview } from '../../shared/agent-hook-listener/tool-input-preview' +} from '../../../shared/agent-status/child-work/agent-status-child-work-evidence' +import { taskText, taskUsageTotalTokens } from '../background-tasks/claude-background-task-frames' +import type { ClaudeSession } from '../structured/claude-structured-session-state' +import type { ClaudeStructuredSessionEvent } from '../structured/claude-structured-session-event' +import { deriveToolInputPreview } from '../../../shared/agent-hook-listener/tool-input-preview' import { claudeRecord, claudeToolResultId, claudeToolUses, readClaudeMessageEnvelope, type ClaudeToolUse -} from './structured/journal/claude-structured-item-translation' +} from '../structured/journal/claude-structured-item-translation' export type EndedClaudeTask = { run: string | undefined diff --git a/src/main/claude/claude-agent-sdk-contract-pins.test.ts b/src/main/claude/claude-agent-sdk-contract-pins.test.ts deleted file mode 100644 index d48e13e014e..00000000000 --- a/src/main/claude/claude-agent-sdk-contract-pins.test.ts +++ /dev/null @@ -1,317 +0,0 @@ -import { createClaudeCodeProcessSpawn } from './claude-agent-sdk-process-spawn' -import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { - query, - type CanUseTool, - type Options, - type SDKUserMessage, - type SpawnedProcess as SdkSpawnedProcess, - type SpawnOptions as SdkSpawnOptions -} from '@anthropic-ai/claude-agent-sdk' -import { afterEach, describe, expect, it, vi } from 'vitest' -import { spawnProcess } from '@orca/process-host' -import { ClaudePromptRegistry } from './claude-prompt-registry' -import { claudeLaunchPermissions } from './structured/claude-structured-inbound-control' -import { claudeStructuredPermissionOptions } from './structured/launch/claude-structured-launch-resolution' - -// Exercise the real SDK against a scripted CLI to detect protocol and spawn-contract drift. - -const FAKE_CLI = join(__dirname, '__fixtures__', 'claude-agent-sdk-scripted-cli.mjs') -const SESSION_ID = '5348c19f-6a54-4c2e-9c68-9c2b1a3d4e5f' - -const RESULT_FRAME = { - type: 'result', - subtype: 'success', - is_error: false, - duration_ms: 1, - duration_api_ms: 1, - num_turns: 1, - result: 'ok', - session_id: SESSION_ID, - total_cost_usd: 0, - usage: { input_tokens: 1, output_tokens: 1 }, - uuid: 'uuid-result-1' -} - -type ScenarioStep = Record -type SpawnSeen = { - command: string - args: string[] - cwd: string | undefined - env: Record -} -type ScriptedCliReport = { - argv: string[] - execPath: string - controlRequests: { request_id: string; request: { subtype: string } }[] - controlResponses: { response: { request_id: string; response?: Record } }[] - userMessages: Record[] -} - -const scratchDirs: string[] = [] -afterEach(() => { - vi.unstubAllEnvs() - for (const dir of scratchDirs.splice(0)) { - rmSync(dir, { recursive: true, force: true }) - } -}) - -function scriptScenario( - steps: ScenarioStep[], - controlResponses: Record = {}, - extra: Record = {} -): { - scenarioPath: string - reportPath: string - cwd: string - readReport: () => ScriptedCliReport -} { - const dir = mkdtempSync(join(tmpdir(), 'claude-sdk-contract-')) - scratchDirs.push(dir) - const scenarioPath = join(dir, 'scenario.json') - const reportPath = join(dir, 'report.json') - writeFileSync(scenarioPath, JSON.stringify({ steps, controlResponses, ...extra })) - return { - scenarioPath, - reportPath, - cwd: dir, - readReport: () => JSON.parse(readFileSync(reportPath, 'utf8')) as ScriptedCliReport - } -} - -function scenarioEnv(scenario: { scenarioPath: string; reportPath: string }) { - return { - PATH: process.env.PATH, - ORCA_SDK_CONTRACT_SCENARIO_PATH: scenario.scenarioPath, - ORCA_SDK_CONTRACT_REPORT_PATH: scenario.reportPath - } -} - -function recordingSpawner(spawns: SpawnSeen[]) { - return (opts: SdkSpawnOptions): SdkSpawnedProcess => { - spawns.push({ - command: opts.command, - args: [...opts.args], - cwd: opts.cwd, - env: { ...opts.env } - }) - return spawnProcess({ - program: opts.command, - args: opts.args, - cwd: opts.cwd, - env: opts.env as NodeJS.ProcessEnv, - signal: opts.signal - }) as unknown as SdkSpawnedProcess - } -} - -function singleUserTurn(): AsyncIterable { - return (async function* () { - yield { - type: 'user', - message: { role: 'user', content: [{ type: 'text', text: 'hello' }] }, - parent_tool_use_id: null, - session_id: SESSION_ID - } as SDKUserMessage - // Keep input open until the scripted CLI exits; an unresolved promise does not keep Node alive. - await new Promise(() => {}) - })() -} - -async function drainQuery(options: Options): Promise[]> { - const messages: Record[] = [] - for await (const message of query({ prompt: singleUserTurn(), options })) { - messages.push(message as unknown as Record) - } - return messages -} - -describe('Claude Agent SDK contract pins', () => { - it('gives canUseTool the wire request_id and fires its abort signal on control_cancel_request', async () => { - const scenario = scriptScenario([ - { awaitUserMessage: true }, - { - emit: { - type: 'control_request', - request_id: 'perm-421', - request: { - subtype: 'can_use_tool', - tool_name: 'Bash', - input: { command: 'echo hi' }, - tool_use_id: 'tool-use-9' - } - } - }, - { delayMs: 120 }, - { emit: { type: 'control_cancel_request', request_id: 'perm-421' } }, - { awaitControlResponse: 'perm-421' }, - { emit: RESULT_FRAME } - ]) - const seen: { toolName: string; requestId: string; toolUseID: string }[] = [] - let abortFired = false - const canUseTool: CanUseTool = (toolName, _input, { signal, requestId, toolUseID }) => { - seen.push({ toolName, requestId, toolUseID }) - return new Promise((resolve) => { - signal.addEventListener('abort', () => { - abortFired = true - resolve({ behavior: 'deny', message: 'cancelled by test' }) - }) - }) - } - const spawns: SpawnSeen[] = [] - await drainQuery({ - pathToClaudeCodeExecutable: FAKE_CLI, - cwd: scenario.cwd, - env: scenarioEnv(scenario), - canUseTool, - spawnClaudeCodeProcess: recordingSpawner(spawns) - }) - - expect(seen).toEqual([{ toolName: 'Bash', requestId: 'perm-421', toolUseID: 'tool-use-9' }]) - expect(abortFired).toBe(true) - const settled = scenario - .readReport() - .controlResponses.find((frame) => frame.response.request_id === 'perm-421') - expect(settled?.response.response?.behavior).toBe('deny') - expect(spawns).toHaveLength(1) - }) - - describe("Full access decisions keep each request's place in one stdout chunk", () => { - const status = (permissionMode: string) => ({ - type: 'system', - subtype: 'status', - status: null, - permissionMode, - session_id: SESSION_ID - }) - const ask = (id: string, extra: Record = {}) => ({ - type: 'control_request', - request_id: id, - request: { - subtype: 'can_use_tool', - tool_name: 'Bash', - input: { command: 'echo harmless' }, - tool_use_id: `tool-${id}`, - ...extra - } - }) - const cancel = (id: string) => ({ type: 'control_cancel_request', request_id: id }) - type WireFrame = ReturnType | ReturnType | ReturnType - const isAsk = (frame: WireFrame): frame is ReturnType => 'request' in frame - const many = (prefix: string) => - Array.from({ length: 300 }, (_, index) => ask(`${prefix}${index}`)) - const asked = (ids: string[], allowed: boolean) => - ids.map((requestId) => ({ requestId, allowed })) - const manyIds = (prefix: string) => many(prefix).map((frame) => frame.request_id) - - it.each([ - { - label: 'plan, then bypass, with the interaction flag', - frames: [ - status('plan'), - ask('A'), - status('bypassPermissions'), - ask('B'), - ask('flagged', { tool_name: 'mcp__forms__confirm', requires_user_interaction: true }) - ], - seen: [...asked(['A'], false), ...asked(['B'], true), ...asked(['flagged'], false)], - interaction: [true], - pending: [] - }, - { - label: 'a request initialize resends, then plan', - frames: [status('plan'), ask('A')], - seen: [...asked(['resent'], true), ...asked(['A'], false)], - interaction: [], - pending: [ask('resent')] - }, - { - label: 'a cancel in the same chunk', - frames: [status('plan'), ask('A'), cancel('A'), status('bypassPermissions'), ask('B')], - seen: [...asked(['A'], false), ...asked(['B'], true)], - interaction: [], - pending: [] - }, - { - label: 'a duplicate id after bypass', - frames: [status('plan'), ask('A'), status('bypassPermissions'), ask('A'), ask('B')], - seen: [...asked(['A', 'A'], false), ...asked(['B'], true)], - interaction: [], - pending: [] - }, - { - label: 'more than 256 unread requests in plan', - frames: [status('plan'), ...many('p'), status('bypassPermissions'), ask('B')], - seen: [...asked(manyIds('p'), false), ...asked(['B'], true)], - interaction: [], - pending: [] - }, - { - label: 'more than 256 unread requests in Full access', - frames: [status('bypassPermissions'), ...many('f'), status('plan'), ask('C')], - seen: [...asked(manyIds('f'), true), ...asked(['C'], false)], - interaction: [], - pending: [] - } - ])('$label', async ({ frames, seen: expected, interaction: flags, pending }) => { - const requestIds = [ - ...new Set([...pending, ...frames].filter(isAsk).map((frame) => frame.request_id)) - ] - const scenario = scriptScenario( - [ - { awaitUserMessage: true }, - { emitTogether: frames }, - ...requestIds.map((id) => ({ awaitControlResponse: id })), - { emit: RESULT_FRAME } - ], - {}, - { pendingPermissionRequests: { initialize: pending } } - ) - const prompts = new ClaudePromptRegistry() - const permissions = claudeLaunchPermissions( - { sessionId: 'session-1', prompts, emit: () => {} }, - { - providerSessionId: SESSION_ID, - options: claudeStructuredPermissionOptions('full-access') - } - ) - const seen: { requestId: string; allowed: boolean }[] = [] - const interaction: unknown[] = [] - const canUseTool: CanUseTool = async (toolName, input, options) => { - if ('requiresUserInteraction' in options) { - interaction.push(options.requiresUserInteraction) - } - const answer = permissions.handlers.canUseTool!(toolName, input, options) - // Answer any card at once so the scripted turn can finish. - prompts.find(options.requestId)?.prompt.settle({ - behavior: 'deny', - message: 'asked', - toolUseID: options.toolUseID - }) - const decision = { requestId: options.requestId, allowed: false } - seen.push(decision) - const result = await answer - decision.allowed = result?.behavior === 'allow' - return result ?? { behavior: 'deny', message: 'cancelled', toolUseID: options.toolUseID } - } - const spawner = createClaudeCodeProcessSpawn( - spawnProcess, - process.platform, - { pathToClaudeCodeExecutable: FAKE_CLI }, - permissions.handlers.onStdout - ) - await drainQuery({ - pathToClaudeCodeExecutable: FAKE_CLI, - cwd: scenario.cwd, - env: scenarioEnv(scenario), - canUseTool, - spawnClaudeCodeProcess: spawner.spawn - }) - - expect(seen).toEqual(expected) - expect(interaction).toEqual(flags) - }) - }) -}) diff --git a/src/main/claude/claude-agent-sdk-exit-proof-identity.test.ts b/src/main/claude/claude-agent-sdk-exit-proof-identity.test.ts deleted file mode 100644 index 893e32b960f..00000000000 --- a/src/main/claude/claude-agent-sdk-exit-proof-identity.test.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' - -import { collectDescendantRows } from '../pty/process-retirement/pty-descendant-termination' -import { createClaudeChildTreeReaper } from './claude-agent-sdk-exit-proof' - -describe('Claude child root identity', () => { - it('rejects mixed old and recycled root rows instead of making the tree killable', async () => { - const child = { pid: 100, kill: vi.fn(() => true) } - const terminateDescendants = vi.fn(async () => 'exited' as const) - const tree = createClaudeChildTreeReaper(child, { - site: 'claude-structured-child-close', - platform: 'linux', - captureDescendants: vi.fn(async () => - collectDescendantRows( - 100, - [ - { pid: 100, ppid: 1, pgid: 100, startedAt: 'Mon Jan 1 00:00:00 2026' }, - { pid: 100, ppid: 1, pgid: 101, startedAt: 'Mon Jan 1 00:00:01 2026' }, - { pid: 200, ppid: 100, pgid: 200, startedAt: 'Mon Jan 1 00:00:00 2026' } - ], - 1 - ) - ), - terminateDescendants - }) - - await expect(tree.reap()).resolves.toBe('unverifiable') - expect(terminateDescendants).not.toHaveBeenCalled() - expect(child.kill).toHaveBeenCalledWith('SIGKILL') - }) -}) diff --git a/src/main/claude/claude-agent-sdk-exit-proof.test.ts b/src/main/claude/claude-agent-sdk-exit-proof.test.ts deleted file mode 100644 index c71e8743aa6..00000000000 --- a/src/main/claude/claude-agent-sdk-exit-proof.test.ts +++ /dev/null @@ -1,181 +0,0 @@ -import { execFileSync, type ChildProcessWithoutNullStreams } from 'node:child_process' -import { describe, expect, it } from 'vitest' -import { spawnProcess } from '@orca/process-host' -import { proveClaudeChildExit } from './claude-agent-sdk-exit-proof' -import { managedChild } from './claude-child-exit-proof-fixture' - -function childWithDescendantScript(input: { - rootTrapsSigterm: boolean - descendantTrapsSigterm: boolean -}): string { - const descendantScript = `${input.descendantTrapsSigterm ? 'process.on("SIGTERM", () => {}); ' : ''}setInterval(() => {}, 1000000)` - const rootBehaviour = input.rootTrapsSigterm - ? `process.on('SIGTERM', () => {}) -process.on('SIGINT', () => {}) -setInterval(() => {}, 1000000)` - : `process.stdin.on('end', () => process.exit(0)) -process.stdin.resume()` - return ` -const descendant = require('node:child_process').spawn( - process.execPath, - ['-e', ${JSON.stringify(descendantScript)}], - { stdio: 'ignore' } -) -descendant.unref() -process.stdout.write(JSON.stringify({ descendantPid: descendant.pid }) + '\\n') -${rootBehaviour} -` -} - -const COOPERATIVE_CHILD = ` -process.stdin.on('end', () => process.exit(0)) -process.stdin.resume() -process.stdout.write('ready\\n') -` - -/** Sample at the close boundary; zombies count as exited even though kill(pid, 0) finds them. */ -function descendantState(pid: number): 'running' | 'exited' { - let state: string - try { - state = execFileSync('ps', ['-o', 'state=', '-p', String(pid)], { - encoding: 'utf8', - env: { ...process.env, LANG: 'C', LC_ALL: 'C' } - }).trim() - } catch (error) { - // ps exits 1 when no process matches; anything else is a failed probe, not an answer. - if ((error as { status?: number }).status !== 1) { - throw error - } - return 'exited' - } - return state.startsWith('Z') ? 'exited' : 'running' -} - -// ps start times have second precision; cross that boundary so the snapshot permits forced signals. -function ageDescendantPastTheCaptureSecond(): Promise { - // ast-grep-ignore: test-no-wall-clock -- ps reports native process birth times on this clock. - return new Promise((resolve) => setTimeout(resolve, 1_000 - (Date.now() % 1_000) + 20)) -} - -// Model registry retries: slow process-table reads may leave one close attempt unproven. -async function proveExitWithRetries( - input: Parameters[0], - attempts = 3 -): Promise { - for (let attempt = 1; attempt < attempts; attempt += 1) { - if (await proveClaudeChildExit(input)) { - return true - } - } - return proveClaudeChildExit(input) -} - -function spawnScript(script: string): ChildProcessWithoutNullStreams { - const child = spawnProcess({ - program: process.execPath, - args: ['-e', script], - stdio: ['pipe', 'pipe', 'pipe'] - }) - managedChild(child) - return child -} - -function firstStdoutLine(child: ChildProcessWithoutNullStreams): Promise { - return new Promise((resolve) => { - child.stdout.setEncoding('utf8').once('data', (chunk: string) => resolve(chunk.trim())) - }) -} - -describe('claude child exit proof', () => { - it.runIf(process.platform !== 'win32')( - 'reports a proven exit only once a SIGTERM-resistant descendant is gone at the close boundary', - async () => { - const child = spawnScript( - childWithDescendantScript({ rootTrapsSigterm: true, descendantTrapsSigterm: true }) - ) - const { descendantPid } = JSON.parse(await firstStdoutLine(child)) as { - descendantPid: number - } - expect(descendantState(descendantPid)).toBe('running') - await ageDescendantPastTheCaptureSecond() - - try { - const proven = await proveExitWithRetries({ managed: managedChild(child) }) - // Assert at lease release; polling afterward could conceal a surviving descendant. - expect({ proven, descendant: descendantState(descendantPid) }).toEqual({ - proven: true, - descendant: 'exited' - }) - } finally { - try { - process.kill(descendantPid, 'SIGKILL') - } catch { - // Already gone. - } - } - }, - 20_000 - ) - - it.runIf(process.platform !== 'win32')( - 'proves a promptly exiting root only once its stubborn descendant is gone too', - async () => { - const child = spawnScript( - childWithDescendantScript({ rootTrapsSigterm: false, descendantTrapsSigterm: true }) - ) - const { descendantPid } = JSON.parse(await firstStdoutLine(child)) as { - descendantPid: number - } - expect(descendantState(descendantPid)).toBe('running') - await ageDescendantPastTheCaptureSecond() - - try { - const proven = await proveExitWithRetries({ managed: managedChild(child) }) - expect({ proven, descendant: descendantState(descendantPid) }).toEqual({ - proven: true, - descendant: 'exited' - }) - } finally { - try { - process.kill(descendantPid, 'SIGKILL') - } catch { - // Already gone. - } - } - }, - 20_000 - ) - - it.runIf(process.platform !== 'win32')( - 'still proves a stubborn child whose descendant honours SIGTERM', - async () => { - const child = spawnScript( - childWithDescendantScript({ rootTrapsSigterm: true, descendantTrapsSigterm: false }) - ) - const { descendantPid } = JSON.parse(await firstStdoutLine(child)) as { - descendantPid: number - } - try { - const proven = await proveExitWithRetries({ managed: managedChild(child) }) - expect({ proven, descendant: descendantState(descendantPid) }).toEqual({ - proven: true, - descendant: 'exited' - }) - } finally { - try { - process.kill(descendantPid, 'SIGKILL') - } catch { - // Already gone. - } - } - }, - 20_000 - ) - - it('proves a clean close of a childless root with one snapshot and no signal', async () => { - const child = spawnScript(COOPERATIVE_CHILD) - expect(await firstStdoutLine(child)).toBe('ready') - - await expect(proveClaudeChildExit({ managed: managedChild(child) })).resolves.toBe(true) - }, 20_000) -}) diff --git a/src/main/claude/claude-agent-sdk-process-spawn.test.ts b/src/main/claude/claude-agent-sdk-process-spawn.test.ts deleted file mode 100644 index 65dbbbfaddc..00000000000 --- a/src/main/claude/claude-agent-sdk-process-spawn.test.ts +++ /dev/null @@ -1,128 +0,0 @@ -import { createFakePipedChild } from '../../shared/__fixtures__/fake-spawned-child' -import { describe, expect, it, vi } from 'vitest' -import type { SpawnOptions as SdkSpawnOptions } from '@anthropic-ai/claude-agent-sdk' -import type { PipedProcessSpawner, ProcessSpec } from '@orca/process-host/process-spec' - -import type * as ProviderSupervisor from '../provider-process/provider-process-supervisor' -import { createProviderSpawnSpec } from '../provider-process/provider-process-supervisor' -import { createClaudeCodeProcessSpawn } from './claude-agent-sdk-process-spawn' -import { proveClaudeChildExitWithReaper } from './claude-child-exit-proof-ladder' - -vi.mock('../provider-process/provider-process-supervisor', async (importOriginal) => { - const actual = await importOriginal() - return { ...actual, createProviderSpawnSpec: vi.fn(actual.createProviderSpawnSpec) } -}) - -function fakeSpawn() { - const child = createFakePipedChild() - const specs: ProcessSpec[] = [] - const spawnImpl: PipedProcessSpawner = (spec) => { - specs.push(spec) - return child - } - return { child, spawnImpl, specs } -} - -function sdkOptions(overrides: Partial = {}): SdkSpawnOptions { - return { - command: '/usr/local/bin/claude', - args: ['--output-format', 'stream-json'], - cwd: '/work/repo', - env: { PATH: '/usr/bin', CLAUDE_CONFIG_DIR: '/accounts/one', UNSET: undefined }, - signal: new AbortController().signal, - ...overrides - } -} - -describe('claude agent SDK process spawn', () => { - it.each([ - { platform: 'darwin', specSupervised: false }, - { platform: 'win32', specSupervised: true } - ] as const)( - 'stops Claude by the spawn spec\u2019s supervision on $platform, never the platform', - async ({ platform, specSupervised }) => { - const actual = await vi.importActual( - '../provider-process/provider-process-supervisor' - ) - vi.mocked(createProviderSpawnSpec).mockImplementationOnce((...args) => ({ - ...actual.createProviderSpawnSpec(...args), - supervised: specSupervised - })) - const process = fakeSpawn() - const spawn = createClaudeCodeProcessSpawn(process.spawnImpl, platform) - spawn.spawn(sdkOptions()) - expect(spawn.supervised).toBe(specSupervised) - - const managed = spawn.managed - if (!managed) { - throw new Error('Claude spawner did not retain its managed child') - } - process.child.stdin.on('finish', () => - setTimeout(() => process.child.emit('exit', 0, null), 10) - ) - const tree = { - capture: vi.fn(async () => {}), - reap: vi.fn(async () => 'exited' as const), - treeVerdict: 'exited' as const, - forcedReapAttempted: false - } - await expect(proveClaudeChildExitWithReaper({ managed, tree }, () => tree)).resolves.toBe( - true - ) - if (specSupervised) { - expect(process.child.kill).toHaveBeenCalledWith('SIGTERM') - } else { - expect(process.child.kill).not.toHaveBeenCalled() - } - } - ) - - it('drains stderr into a bounded tail so an exit error still carries it', async () => { - const process = fakeSpawn() - const spawn = createClaudeCodeProcessSpawn(process.spawnImpl) - spawn.spawn(sdkOptions()) - - process.child.stderr.write('x'.repeat(9000)) - process.child.stderr.write('claude: not signed in') - await new Promise((resolve) => setImmediate(resolve)) - - expect(spawn.managed?.stderrTail()).toMatch(/claude: not signed in$/) - expect(spawn.managed?.stderrTail().length).toBe(8192) - }) - - it('keeps native chat identity after SDK and configured environment defaults', () => { - const process = fakeSpawn() - createClaudeCodeProcessSpawn(process.spawnImpl, 'win32').spawn( - sdkOptions({ - env: { - CLAUDE_CODE_ENTRYPOINT: 'sdk-ts', - claude_code_entrypoint: 'account', - PATH: 'C:\\bin' - } - }) - ) - expect(process.specs[0]?.env).toMatchObject({ CLAUDE_CODE_ENTRYPOINT: 'orca', PATH: 'C:\\bin' }) - expect( - Object.keys(process.specs[0]?.env ?? {}).filter( - (key) => key.toUpperCase() === 'CLAUDE_CODE_ENTRYPOINT' - ) - ).toEqual(['CLAUDE_CODE_ENTRYPOINT']) - }) - - it('preserves a Windows .cmd shim and its arguments for the host spawner', () => { - const process = fakeSpawn() - createClaudeCodeProcessSpawn(process.spawnImpl, 'win32').spawn( - sdkOptions({ - command: 'C:\\Users\\dev\\AppData\\npm\\claude.cmd', - args: ['--setting-sources=user,project,local', '--session-id', 'a b&c'] - }) - ) - - expect(process.specs).toEqual([ - expect.objectContaining({ - program: 'C:\\Users\\dev\\AppData\\npm\\claude.cmd', - args: ['--setting-sources=user,project,local', '--session-id', 'a b&c'] - }) - ]) - }) -}) diff --git a/src/main/claude/claude-agent-sdk-user-message-queue.test.ts b/src/main/claude/claude-agent-sdk-user-message-queue.test.ts deleted file mode 100644 index c2c1c818f3a..00000000000 --- a/src/main/claude/claude-agent-sdk-user-message-queue.test.ts +++ /dev/null @@ -1,65 +0,0 @@ -import type { SDKUserMessage } from '@anthropic-ai/claude-agent-sdk' -import { describe, expect, it } from 'vitest' -import { - claudeUserMessageWasProvablyUnwritten, - createClaudeUserMessageQueue -} from './claude-agent-sdk-user-message-queue' - -// Model the SDK pump: it resumes only after transport.write and abandons the iterator on failure. -const frame = (text: string): SDKUserMessage => - ({ - type: 'user', - message: { role: 'user', content: [{ type: 'text', text }] } - }) as unknown as SDKUserMessage - -const settled = (promise: Promise): Promise<'settled' | 'pending'> => - Promise.race([ - promise.then( - () => 'settled' as const, - () => 'settled' as const - ), - new Promise<'pending'>((resolve) => setTimeout(() => resolve('pending'), 100)) - ]) - -describe('claude user message queue', () => { - it('treats a frame the SDK pulled and abandoned as write-outcome unknown', async () => { - const queue = createClaudeUserMessageQueue() - const pump = queue.messages[Symbol.asyncIterator]() - const sent = queue.push(frame('hello')) - - await pump.next() - await pump.return?.(undefined) - - await expect(settled(sent)).resolves.toBe('settled') - const error = await sent.catch((caught: unknown) => caught) - expect(error).toMatchObject({ - message: 'claude stream-json input ended before confirming the frame write' - }) - expect(claudeUserMessageWasProvablyUnwritten(error)).toBe(false) - }) - - it('marks only frames still queued in Orca as provably unwritten', async () => { - const queue = createClaudeUserMessageQueue() - const pump = queue.messages[Symbol.asyncIterator]() - const inFlight = queue.push(frame('first')).catch((caught: unknown) => caught) - await pump.next() - const queued = queue.push(frame('second')).catch((caught: unknown) => caught) - - queue.fail(new Error('claude stream-json exited: child died')) - - expect(claudeUserMessageWasProvablyUnwritten(await inFlight)).toBe(false) - expect(claudeUserMessageWasProvablyUnwritten(await queued)).toBe(true) - }) - - it('still settles a written frame only once the pump asks for the next one', async () => { - const queue = createClaudeUserMessageQueue() - const pump = queue.messages[Symbol.asyncIterator]() - const sent = queue.push(frame('hello')) - - const pulled = await pump.next() - expect(pulled.value).toMatchObject({ type: 'user' }) - await expect(settled(sent)).resolves.toBe('pending') - void pump.next() - await expect(sent).resolves.toBeUndefined() - }) -}) diff --git a/src/main/claude/claude-api-retry-row.test.ts b/src/main/claude/claude-api-retry-row.test.ts deleted file mode 100644 index 88ca734194b..00000000000 --- a/src/main/claude/claude-api-retry-row.test.ts +++ /dev/null @@ -1,102 +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 { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' -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') -} - -function apiRetry(attempt: number, fields: Record = {}): Record { - return { - type: 'system', - subtype: 'api_retry', - attempt, - max_retries: 10, - retry_delay_ms: 622, - error_status: 429, - error: 'rate_limit', - session_id: 'provider-1', - uuid: `9b2f6a1e-0c4d-4e7a-8f3b-00000000000${attempt}`, - ...fields - } -} - -let root = '' - -beforeEach(async () => { - root = await mkdtemp(join(tmpdir(), 'orca-claude-api-retry-')) -}) - -afterEach(async () => { - await closeTestJournalHostDatabases() - await rm(root, { recursive: true, force: true }) -}) - -async function statusRowsFor(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.flatMap((item): Extract[] => - item.body.kind === 'status' ? [item.body] : [] - ) -} - -describe('a Claude api_retry frame', () => { - it('writes one sentence row per retry run, revised by each attempt, not the frame', async () => { - const rows = await statusRowsFor([apiRetry(1), apiRetry(2), apiRetry(3)]) - - expect(rows).toHaveLength(1) - const [row] = rows - expect(row).toMatchObject({ - text: 'Claude is rate-limited and retrying. Retry 3 of 10.\nLast error: HTTP 429 rate limit.', - tone: 'warning', - failure: { - kind: 'providerRetrying', - retry: { error: 'rate_limit', status: 429, attempt: 3, maxRetries: 10 }, - detail: { audience: 'log' } - } - }) - expect(row).not.toHaveProperty('providerFrame') - expect(row.failure?.detail?.text).toContain('"attempt":3') - }) - - it('hides unmodeled system frames even when their payload names an error', async () => { - const unknown = { - type: 'system', - subtype: 'future_notice', - error: 'rate_limit', - session_id: 'provider-1', - uuid: 'future-1' - } - const rows = await statusRowsFor([unknown]) - expect(rows).toEqual([]) - }) -}) diff --git a/src/main/claude/claude-background-run-isolation-real-cli.test.ts b/src/main/claude/claude-background-run-isolation-real-cli.test.ts deleted file mode 100644 index 407e56d1cbe..00000000000 --- a/src/main/claude/claude-background-run-isolation-real-cli.test.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, describe, expect, it } from 'vitest' -import { runProcess } from '@orca/process-host' -import { withCliRuntimeOnPath } from '../../shared/node-cli-command-resolution' -import { claudeBackgroundArgs } from '../../shared/claude-background-run-isolation' -import { CLAUDE_MODEL_LIST_ARGS } from '../../shared/claude-model-list-probe' -import { realClaudeAvailable, realClaudeCommand } from './claude-real-cli-availability-test-support' - -// Probe real CLI control answers in a temporary account home without spending a turn. -const root = mkdtempSync(join(tmpdir(), 'orca-claude-isolation-')) -afterEach(() => rmSync(root, { recursive: true, force: true })) - -async function loaded(args: string[]): Promise<{ servers: unknown; hooksOff: unknown }> { - const request = (id: string) => - `${JSON.stringify({ type: 'control_request', request_id: id, request: { subtype: id } })}\n` - const { stdout } = await runProcess({ - program: realClaudeCommand, - args, - cwd: root, - input: request('mcp_status') + request('get_settings'), - timeoutMs: 60_000, - env: withCliRuntimeOnPath(realClaudeCommand, { - ...process.env, - HOME: root, - CLAUDE_CONFIG_DIR: join(root, 'config') - }) - }) - const answers = new Map( - stdout.split('\n').flatMap((line) => { - const response = line.startsWith('{') ? JSON.parse(line).response : undefined - return response?.request_id ? [[response.request_id, response.response]] : [] - }) - ) - return { - servers: answers.get('mcp_status')?.mcpServers?.map((server: { name: string }) => server.name), - hooksOff: answers.get('get_settings')?.effective?.disableAllHooks ?? false - } -} - -describe.skipIf(!realClaudeAvailable)('background Claude runs with the real CLI', () => { - it('load none of the user MCP servers or hooks, and keep a --mcp-config the user passed', async () => { - const server = { type: 'stdio', command: '/bin/cat', args: [] } - mkdirSync(join(root, 'config')) - writeFileSync( - join(root, 'config', '.claude.json'), - JSON.stringify({ mcpServers: { user: server } }) - ) - writeFileSync( - join(root, 'config', 'settings.json'), - JSON.stringify({ allowedMcpServers: [{ serverName: 'user' }, { serverName: 'explicit' }] }) - ) - writeFileSync(join(root, 'mcp.json'), JSON.stringify({ mcpServers: { explicit: server } })) - const listing = CLAUDE_MODEL_LIST_ARGS.slice(0, -claudeBackgroundArgs().length) - - expect(await loaded(listing)).toEqual({ servers: ['user'], hooksOff: false }) - expect(await loaded([...listing, ...claudeBackgroundArgs()])).toEqual({ - servers: [], - hooksOff: true - }) - expect( - await loaded([...listing, ...claudeBackgroundArgs(), '--mcp-config', join(root, 'mcp.json')]) - ).toEqual({ servers: ['explicit'], hooksOff: true }) - }, 180_000) -}) diff --git a/src/main/claude/claude-background-stop-records.test.ts b/src/main/claude/claude-background-stop-records.test.ts deleted file mode 100644 index 6d9e034bfd3..00000000000 --- a/src/main/claude/claude-background-stop-records.test.ts +++ /dev/null @@ -1,185 +0,0 @@ -import { afterEach, describe, expect, it, vi } from 'vitest' -import { - agentChildWorkStopEvidence, - agentChildWorkStopTargets, - type AgentChildWorkStopAcknowledgement -} from '../../shared/agent-status/child-work/agent-child-work-stop-targets' -import type { AgentSessionRecord } from '../../shared/agent-session/lifecycle/agent-session-record' -import { agentChildWorkLiveness } from '../../shared/agent-status/child-work/agent-status-child-work-liveness' -import { conversationCommandBlocked } from '../native-chat/agent-session-wire/operations/structured-conversation-command-admission' -import type { CapturedFrame } from './claude-captured-frame-builders.test-fixture' -import { PARENT_TASK_STOP } from './claude-parent-task-frames.test-fixture' -import { RESUMED_BY_MESSAGE } from './claude-captured-task-frames.test-fixture' -import { hostWithParent, parent, producer } from './claude-child-work-producer-harness.test-fixture' - -vi.mock('../telemetry/client', () => ({ track: vi.fn() })) -vi.mock('../telemetry/cohort-classifier', () => ({ getCohortAtEmit: vi.fn(() => ({})) })) -afterEach(() => vi.restoreAllMocks()) - -// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: admission reads only the lease and the command/rewind records, all absent here. -const RECORD = { lease: {} } as unknown as AgentSessionRecord - -/** Host records retain live work after provider roster removal. */ -async function droppedFromRoster() { - const host = hostWithParent() - const run = await producer(host) - const launch: CapturedFrame[] = RESUMED_BY_MESSAGE.filter((captured) => captured.at < 5_077) - run.replay(launch) - run.replay([ - { at: 6_000, frame: { type: 'system', subtype: 'background_tasks_changed', tasks: [] } } - ]) - const records = () => host.getStructuredChildWorkViews(parent) - const blocked = () => - conversationCommandBlocked( - { - sessionId: 'session-1', - fence: 7, - journal: { - itemsRead: () => ({ items: [] }), - cursor: () => ({ epoch: 'e', sequence: 0 }), - item: () => null, - submissions: () => [], - inputOrder: { recoverableSubmissions: () => [] }, - runningTurn: () => null, - itemFence: () => undefined, - visitItems: () => undefined, - wroteBeforeOpen: () => false - }, - adapter: run.adapter - }, - RECORD, - { views: records(), open: agentChildWorkLiveness(records()) !== null } - ) - const stopCalls = () => - run.claude.connections[0]!.calls.filter((call) => call.subtype === 'stop_task') - expect(records()).toMatchObject([ - { membership: 'live', stoppable: true, providerId: 'agent-1', kind: 'agent' } - ]) - expect(blocked()?.message).toBe('Stop background tasks before using this command.') - // Snapshot stop targets before dispatch; settle only acknowledged records. - const stop = async (taskId?: string) => { - const targets = agentChildWorkStopTargets(records(), taskId) - const acknowledged: AgentChildWorkStopAcknowledgement[] = [] - const outcome = await run.adapter.stopBackgroundTasks({ - sessionId: 'session-1', - fence: 7, - taskIds: targets.map((target) => target.providerId), - acknowledge: (acknowledgement) => void acknowledged.push(acknowledgement) - }) - host.ingestStructuredChildWork( - parent, - agentChildWorkStopEvidence(targets, acknowledged, 6_500), - 'claude' - ) - return outcome - } - const basis = () => host.getStructuredChildWork(parent).map((record) => record.outcomeBasis) - return { run, records, blocked, stopCalls, stop, basis } -} - -describe('a background Stop acts on the host child records', () => { - it('keeps a stopped owner and its independently stoppable shell attached from real task frames', async () => { - const host = hostWithParent() - const run = await producer(host) - run.replay(PARENT_TASK_STOP.slice(0, 7)) - const owner = run.records().find((record) => record.kind === 'agent') - expect(owner).toMatchObject({ membership: 'settled', outcome: 'cancelled' }) - expect(run.records().find((record) => record.kind === 'command')).toMatchObject({ - membership: 'live', - stoppable: true, - parentChildWorkId: owner?.childWorkId - }) - const targets = agentChildWorkStopTargets( - host.getStructuredChildWorkViews(parent), - 'shell-child' - ) - expect(targets.map((target) => target.providerId)).toEqual(['shell-child']) - await run.adapter.stopBackgroundTasks({ - sessionId: 'session-1', - fence: 7, - taskIds: targets.map((target) => target.providerId) - }) - expect(run.claude.connections[0]!.calls.filter((call) => call.subtype === 'stop_task')).toEqual( - [{ subtype: 'stop_task', params: { taskId: 'shell-child' } }] - ) - run.replay(PARENT_TASK_STOP.slice(7)) - expect(run.records().find((record) => record.kind === 'command')).toMatchObject({ - membership: 'settled', - outcome: 'cancelled' - }) - - // Start-only delivery in reverse owner order must converge too; no original tool traffic is replayed. - const childFirst = await producer() - childFirst.replay([PARENT_TASK_STOP[3]!, PARENT_TASK_STOP[1]!]) - const resolvedOwner = childFirst.records().find((record) => record.kind === 'agent') - expect(childFirst.records().find((record) => record.kind === 'command')).toMatchObject({ - membership: 'live', - parentChildWorkId: resolvedOwner?.childWorkId - }) - }) - - it("stops the row's own task, which the records keep after the roster dropped it", async () => { - const { records, blocked, stopCalls, stop, basis } = await droppedFromRoster() - - const outcome = await stop('agent-1') - - expect(outcome).toMatchObject({ cancelled: true }) - expect(stopCalls()).toEqual([{ subtype: 'stop_task', params: { taskId: 'agent-1' } }]) - expect(records()).toMatchObject([{ membership: 'settled', outcome: 'cancelled' }]) - expect(basis()).toEqual(['stop-acknowledged']) - expect(blocked()).toBeNull() - }) - - it('leaves a task that ended on its own frame as it ended: its row offers no stop', async () => { - const { run, records, stopCalls, stop } = await droppedFromRoster() - run.replay([ - { - at: 7_000, - frame: { - type: 'system', - subtype: 'task_updated', - task_id: 'agent-1', - patch: { status: 'completed' } - } - }, - { - at: 7_000, - frame: { - type: 'system', - subtype: 'task_notification', - task_id: 'agent-1', - status: 'completed' - } - } - ]) - - const outcome = await stop('agent-1') - - expect(outcome).toMatchObject({ cancelled: false }) - expect(stopCalls()).toEqual([]) - expect(records()).toMatchObject([{ membership: 'settled', outcome: 'succeeded' }]) - }) - - it('lets the task’s own completion, written before the acknowledgement, replace the Stop', async () => { - const { run, records, stop } = await droppedFromRoster() - await stop('agent-1') - expect(records()).toMatchObject([{ membership: 'settled', outcome: 'cancelled' }]) - - // The completion the CLI wrote before its answer, which the SDK delivered after it. - run.replay([ - { - at: 7_000, - frame: { - type: 'system', - subtype: 'task_notification', - task_id: 'agent-1', - status: 'completed', - summary: 'Found 3 call sites' - } - } - ]) - expect(records()).toMatchObject([ - { membership: 'settled', outcome: 'succeeded', lastMessage: 'Found 3 call sites' } - ]) - }) -}) diff --git a/src/main/claude/claude-background-task-turn-resumption.test.ts b/src/main/claude/claude-background-task-turn-resumption.test.ts deleted file mode 100644 index 13a2d59ba17..00000000000 --- a/src/main/claude/claude-background-task-turn-resumption.test.ts +++ /dev/null @@ -1,238 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalRenderItem -} from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' -import { readAgentJournalTurn } from '../../shared/agent-session/lifecycle/agent-session-turn-record' -import { hasUnansweredStructuredAgentSessionDispatch } from '../../shared/agent-session/requests/structured-agent-session-unanswered-dispatch' -import { projectStructuredAgentSessionStatus } from '../../shared/agent-session/view/structured-agent-session-projection' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import { createClaudeJournalTranslator } from './structured/journal/claude-structured-journal-translation' - -const SESSION = 'claude-session' -const TOOL = 'toolu_fwd' - -function harness() { - const appended: { identity: AgentJournalItemIdentity; body: AgentJournalItemBody }[] = [] - const sink: StructuredAgentSessionEventSink = { - appendItem: (identity, body) => appended.push({ identity, body }), - appendTombstone: () => {}, - publish: vi.fn() - } - const translator = createClaudeJournalTranslator({ sink, fallbackIdPrefix: 'test' }) - const items = (): AgentJournalRenderItem[] => { - const byKey = new Map() - appended.forEach(({ identity, body }, index) => { - const key = agentJournalItemKey(identity) - const existing = byKey.get(key) - byKey.set(key, { - itemId: key, - revision: (existing?.revision ?? 0) + 1, - body, - sequence: existing?.sequence ?? index, - observedAt: index - }) - }) - return [...byKey.values()].sort((a, b) => a.sequence - b.sequence) - } - return { translator, items, appended } -} - -function projected(items: readonly AgentJournalRenderItem[]): string { - expect(hasUnansweredStructuredAgentSessionDispatch([], null)).toBe(false) - return projectStructuredAgentSessionStatus(items, [], null) -} - -function systemFrame(uuid: string, fields: Record) { - return { - type: 'message' as const, - sessionId: 'orca-session', - message: { type: 'system', uuid, session_id: SESSION, ...fields } - } -} - -function spawnToolCall(translator: ReturnType['translator']) { - translator.handle({ - type: 'message' as const, - sessionId: 'orca-session', - message: { - type: 'assistant', - uuid: 'a1', - session_id: SESSION, - parent_tool_use_id: null, - message: { - role: 'assistant', - content: [{ type: 'tool_use', id: TOOL, name: 'Bash', input: { command: 'wait' } }] - } - } - }) -} - -function settleTurn(translator: ReturnType['translator']) { - translator.handle({ - type: 'message' as const, - sessionId: 'orca-session', - message: { - type: 'result', - subtype: 'success', - uuid: 'r1', - session_id: SESSION, - parent_tool_use_id: null, - duration_ms: 1000 - } - }) -} - -describe('a typed background-task row opens the turn it resumes', () => { - it('reports working, not idle, when a task notification wakes the agent', () => { - const { translator, items } = harness() - spawnToolCall(translator) - translator.handle( - systemFrame('s1', { - subtype: 'task_started', - task_id: 'byjnee2no', - tool_use_id: TOOL, - task_type: 'local_bash', - description: 'Wait for the verification verdict', - is_backgrounded: true - }) - ) - settleTurn(translator) - expect(projected(items())).toBe('idle') - - translator.handle( - systemFrame('s2', { - subtype: 'task_notification', - task_id: 'byjnee2no', - tool_use_id: TOOL, - status: 'failed', - summary: 'Background command "Wait" failed with exit code 1' - }) - ) - - const taskRow = items().find((item) => item.itemId.includes('byjnee2no')) - expect(taskRow).toBeDefined() - const running = items().filter((item) => readAgentJournalTurn(item.body)?.state === 'running') - expect(running).toHaveLength(1) - expect(projected(items())).toBe('working') - }) - - it('does not reopen a completed turn when an overflow terminal row is enriched', () => { - const { translator, items } = harness() - for (let index = 0; index < 64; index += 1) { - translator.handle( - systemFrame(`start-${index}`, { - subtype: 'task_started', - task_id: `live-${index}`, - task_type: 'local_bash', - is_backgrounded: true - }) - ) - } - translator.handle( - systemFrame('overflow-start', { - subtype: 'task_started', - task_id: 'overflow-turn', - task_type: 'local_bash', - is_backgrounded: true - }) - ) - translator.handle( - systemFrame('overflow-update', { - subtype: 'task_updated', - task_id: 'overflow-turn', - patch: { status: 'failed' } - }) - ) - settleTurn(translator) - expect(projected(items())).toBe('idle') - - translator.handle( - systemFrame('overflow-notification', { - subtype: 'task_notification', - task_id: 'overflow-turn', - status: 'stopped', - summary: 'No completion record was found' - }) - ) - - expect(projected(items())).toBe('idle') - }) -}) - -it('keeps an alias-only owned notification idle even when its alias was forwarded at the root', () => { - const { translator, items } = harness() - spawnToolCall(translator) - translator.handle( - systemFrame('owned-start', { - subtype: 'task_started', - task_id: 'owned', - tool_use_id: TOOL, - parent_task_id: 'owner', - task_type: 'local_bash', - is_backgrounded: true - }) - ) - settleTurn(translator) - translator.handle( - systemFrame('owned-terminal', { - subtype: 'task_notification', - tool_use_id: TOOL, - status: 'completed', - summary: 'Finished child' - }) - ) - expect(items().find((item) => item.itemId.includes('owned'))?.body).toMatchObject({ - kind: 'message', - blocks: expect.arrayContaining([ - expect.objectContaining({ type: 'background-task', taskId: 'owned', state: 'done' }) - ]) - }) - expect(projected(items())).toBe('idle') - translator.dispose() -}) - -it('keeps owned terminal overflow writes idle without a retained row invocation', () => { - const { translator, items } = harness() - for (let index = 0; index < 65; index += 1) { - translator.handle( - systemFrame(`owned-start-${index}`, { - subtype: 'task_started', - task_id: `owned-${index}`, - parent_task_id: 'owner', - task_type: 'local_bash', - is_backgrounded: true - }) - ) - } - settleTurn(translator) - translator.handle( - systemFrame('overflow-owned-patch', { - subtype: 'task_updated', - task_id: 'owned-64', - patch: { status: 'failed' } - }) - ) - translator.handle( - systemFrame('overflow-owned-orphan', { - subtype: 'task_notification', - task_id: 'owned-terminal-only', - parent_task_id: 'owner', - status: 'completed' - }) - ) - const terminal = items().filter( - (item) => - item.body.kind === 'message' && - item.body.blocks.some( - (block) => - block.type === 'background-task' && - ['owned-64', 'owned-terminal-only'].includes(block.taskId) - ) - ) - expect(terminal).toHaveLength(2) - expect(projected(items())).toBe('idle') - translator.dispose() -}) diff --git a/src/main/claude/claude-background-wake-retention.test.ts b/src/main/claude/claude-background-wake-retention.test.ts deleted file mode 100644 index 1cb8b52af79..00000000000 --- a/src/main/claude/claude-background-wake-retention.test.ts +++ /dev/null @@ -1,157 +0,0 @@ -import { afterEach, describe, expect, it, vi } from 'vitest' -import type { AgentJournalSubmission } from '../../shared/agent-session/journal/agent-session-journal-types' -import { structuredRunningChildWork } from '../../shared/agent-status/child-work/agent-child-work-listing' -import type { AgentHookServer } from '../agent-hooks/server/agent-hook-server' -import type { StructuredAgentSessionJournalProjections } from '../native-chat/agent-session-wire/observations/structured-agent-session-status-journal-projection' -import { StructuredAgentSessionStatusFeed } from '../native-chat/agent-session-wire/observations/structured-agent-session-status-feed' -import type { CapturedFrame } from './claude-captured-frame-builders.test-fixture' -import { backgroundWakeCapture } from './claude-captured-fold-steer-frames.test-fixture' -import { MOVED_TO_BACKGROUND } from './claude-captured-task-frames.test-fixture' -import { hostWithParent, parent, producer } from './claude-child-work-producer-harness.test-fixture' -import { PROVIDER_SESSION_ID } from './structured/claude-structured-session-test-support' -import { createStructuredAgentSessionLogger } from '../native-chat/agent-session-wire/host/structured-agent-session-logger' - -vi.mock('../telemetry/client', () => ({ track: vi.fn() })) -vi.mock('../telemetry/cohort-classifier', () => ({ getCohortAtEmit: vi.fn(() => ({})) })) -afterEach(() => vi.restoreAllMocks()) - -type Journal = Parameters[0] - -async function wiredSession() { - const host: AgentHookServer = hostWithParent() - const run = await producer(host) - const submissions: AgentJournalSubmission[] = [] - let sequence = 0 - const journal = { - cursor: () => ({ epoch: 'epoch-1', sequence: ++sequence }), - lastActivityAt: () => 1, - submissions: (): ReturnType => - submissions.map((submission) => ({ ...submission })), - item: (itemId: string): ReturnType => { - const item = run.journalItems.get(itemId) - return item ? { ...item, revision: 1, observedAt: run.now() } : null - }, - statusRead(): ReturnType { - return this.snapshot() - }, - inputOrder: { - inputCount: () => submissions.length, - inputOrdinal: (id: string) => submissions.findIndex((s) => s.clientMessageId === id), - recoverableSubmissions: () => - submissions.filter((s) => s.dispatchState === 'pending' || s.dispatchState === 'unknown') - }, - context: { floor: () => null }, - stopMarks: { latest: () => null, revision: () => 0 }, - itemFence: () => undefined, - wroteBeforeOpen: () => false, - runningTurn: () => null, - snapshot: () => ({ - items: [...run.journalItems.values()] - .sort((a, b) => a.sequence - b.sequence) - .map((item) => ({ ...item, revision: 1, observedAt: run.now() })), - submissions: submissions.map((submission) => ({ ...submission })) - }) - } - const feed = new StructuredAgentSessionStatusFeed({ - logger: createStructuredAgentSessionLogger(), - sessions: new Map([ - [ - parent.sessionId, - { - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixture supplies the feed's cursor, clock, Stop marks, context floor, snapshot, submissions, item and provenance reads. - journal: journal as unknown as Journal, - params: { - location: { - executionHostId: parent.executionHostId, - wslDistro: parent.wslDistro, - workspaceId: parent.workspaceId, - workspaceKind: parent.workspaceKind - }, - provider: 'claude' as const - } - } - ] - ]), - getConversation: () => null, - now: () => Date.now(), - statusSink: () => ({ - publish: (summary, subject) => host.ingestStructuredStatus(summary, subject), - forget: (subject) => host.dropStructuredStatus(subject), - publishChildWork: (subject, evidence, provider) => - host.ingestStructuredChildWork(subject, evidence, provider), - readChildWork: (subject) => host.getStructuredChildWorkViews(subject) - }) - }) - const describe = (views: ReturnType) => - views.map((view) => `${view.description}:${view.membership}:${view.outcome ?? ''}`) - const records = () => describe(host.getStructuredChildWorkViews(parent)) - const running = () => - describe(structuredRunningChildWork(host.getStructuredChildWorkViews(parent))) - const replay = (frames: readonly CapturedFrame[]) => { - for (const captured of frames) { - run.replay([captured]) - feed.publish(parent.sessionId) - } - } - const send = (clientMessageId: string): AgentJournalSubmission => { - const submission: AgentJournalSubmission = { - clientMessageId, - fence: 7, - payloadFingerprint: clientMessageId, - dispatchState: 'pending', - providerItemId: null, - reason: null, - submittedAt: run.now(), - resolvedAt: null - } - submissions.push(submission) - feed.publish(parent.sessionId) - return submission - } - const accept = (submission: AgentJournalSubmission) => { - submission.dispatchState = 'accepted' - feed.publish(parent.sessionId) - } - const rootTurns = () => - [...run.journalItems.values()].filter((item) => !item.agentId && item.body.kind === 'turn') - return { run, feed, records, running, replay, send, accept, rootTurns } -} - -describe("a finished child's record stays until the user's next turn", () => { - it("keeps a background agent through Claude's own wake turn, then retires it at the next send", async () => { - const session = await wiredSession() - session.replay(MOVED_TO_BACKGROUND) - expect(session.rootTurns()).toHaveLength(2) - expect(session.records()).toContain('Run 45s sleep command:settled:succeeded') - expect(session.running()).toEqual([]) - - const next = session.send('next-send') - // Submitting is not acceptance; a refused send must not retire retained work. - expect(session.records()).toContain('Run 45s sleep command:settled:succeeded') - session.accept(next) - expect(session.records()).toEqual([]) - }) - - it('keeps a background shell through the wake its completion opens, and a steer into that wake retires it', async () => { - const session = await wiredSession() - const { firstTurn, wake } = backgroundWakeCapture({ - sessionId: PROVIDER_SESSION_ID, - first: 'first-uuid', - steer: 'steer-uuid' - }) - session.accept(session.send('first-uuid')) - session.replay(firstTurn) - expect(session.running()).toEqual(['Sleep then print marker:live:']) - - const wakeInit = wake.findIndex((captured) => captured.frame.subtype === 'init') - session.replay(wake.slice(0, wakeInit + 1)) - expect(session.rootTurns()).toHaveLength(2) - expect(session.records()).toEqual(['Sleep then print marker:settled:succeeded']) - expect(session.running()).toEqual([]) - - session.accept(session.send('steer-uuid')) - expect(session.records()).toEqual([]) - session.replay(wake.slice(wakeInit + 1)) - expect(session.records()).toEqual([]) - }) -}) diff --git a/src/main/claude/claude-captured-fold-steer-frames.test-fixture.ts b/src/main/claude/claude-captured-fold-steer-frames.test-fixture.ts deleted file mode 100644 index 978ca55e122..00000000000 --- a/src/main/claude/claude-captured-fold-steer-frames.test-fixture.ts +++ /dev/null @@ -1,254 +0,0 @@ -// CLI 2.1.280 captures: sanitized IDs/paths/prompts; original frame order and send-relative times. - -import { - assistant, - assistantText, - assistantToolUse, - initFrame, - resultFrame, - sessionIdle, - taskFrame, - toolResult, - userReplay, - type CapturedFoldFrame, - type FoldCaptureIds -} from './claude-fold-steer-frame-builders.test-fixture' - -export type { CapturedFoldFrame, FoldCaptureIds } - -export const FIRST_PROMPT = 'Run the sleep command three times, then reply: FIRST DONE' -export const STEER_PROMPT = 'Also say the word banana at the end of your reply.' -export const SECOND_STEER_PROMPT = 'And also say the word mango at the very end.' - -export const FOLD_FRESH_SEND_AT = { first: 12, steer: 3_878 } -export function foldFreshCapture({ sessionId, first, steer }: FoldCaptureIds): CapturedFoldFrame[] { - return [ - initFrame(222, sessionId), - userReplay(2_094, sessionId, first, FIRST_PROMPT), - assistantToolUse(2_676, sessionId, 'reply-tool-1', 'toolu_sleep_1', [first]), - toolResult(7_890, sessionId, 'tool-result-1', 'toolu_sleep_1'), - userReplay(7_892, sessionId, steer, STEER_PROMPT), - assistantToolUse(9_725, sessionId, 'reply-tool-2', 'toolu_sleep_2'), - toolResult(14_740, sessionId, 'tool-result-2', 'toolu_sleep_2'), - assistantText(23_039, sessionId, 'reply-text-1', 'FIRST DONE banana'), - resultFrame(23_048, sessionId, 'result-1', { - userMessageUuids: [first, steer], - durationMs: 22_845, - numTurns: 4 - }), - sessionIdle(23_049, sessionId) - ] -} - -export const FOLD_RESUMED_SEND_AT = { first: 12, steer: 4_458 } -export function foldResumedCapture({ - sessionId, - first, - steer -}: FoldCaptureIds): CapturedFoldFrame[] { - return [ - initFrame(218, sessionId), - userReplay(2_057, sessionId, first, FIRST_PROMPT), - assistant( - 3_229, - sessionId, - 'reply-thinking-1', - [{ type: 'thinking', thinking: 'plan' }], - [first] - ), - assistantToolUse(3_258, sessionId, 'reply-tool-1', 'toolu_sleep_1'), - toolResult(8_464, sessionId, 'tool-result-1', 'toolu_sleep_1'), - userReplay(8_467, sessionId, steer, STEER_PROMPT), - assistantToolUse(10_318, sessionId, 'reply-tool-2', 'toolu_sleep_2'), - toolResult(15_373, sessionId, 'tool-result-2', 'toolu_sleep_2'), - assistantText(23_587, sessionId, 'reply-text-1', 'FIRST DONE banana'), - resultFrame(23_628, sessionId, 'result-1', { - userMessageUuids: [first, steer], - durationMs: 23_367, - numTurns: 4 - }), - sessionIdle(23_640, sessionId) - ] -} - -export const TWO_STEERS_SEND_AT = { first: 31, steer: 3_630, secondSteer: 5_031 } -export function twoSteersCapture({ - sessionId, - first, - steer, - secondSteer -}: Required): CapturedFoldFrame[] { - return [ - initFrame(351, sessionId), - userReplay(1_169, sessionId, first, FIRST_PROMPT), - assistantToolUse(2_412, sessionId, 'reply-tool-1', 'toolu_sleep_1', [first]), - toolResult(7_949, sessionId, 'tool-result-1', 'toolu_sleep_1'), - userReplay(7_963, sessionId, steer, STEER_PROMPT), - userReplay(7_967, sessionId, secondSteer, SECOND_STEER_PROMPT), - assistantToolUse(9_806, sessionId, 'reply-tool-2', 'toolu_sleep_2'), - toolResult(14_835, sessionId, 'tool-result-2', 'toolu_sleep_2'), - assistantText(22_210, sessionId, 'reply-text-1', 'FIRST DONE banana mango'), - resultFrame(22_317, sessionId, 'result-1', { - userMessageUuids: [first, steer, secondSteer], - durationMs: 21_859, - numTurns: 4 - }), - sessionIdle(22_341, sessionId) - ] -} - -/** A steer replayed after the first result runs in its own turn. */ -export const MISS_SEND_AT = { first: 30, steer: 23_384 } -export function missCapture({ sessionId, first, steer }: FoldCaptureIds): { - beforeSteerSend: CapturedFoldFrame[] - afterSteerSend: CapturedFoldFrame[] -} { - return { - beforeSteerSend: [ - initFrame(333, sessionId), - userReplay(2_118, sessionId, first, FIRST_PROMPT), - assistantToolUse(2_793, sessionId, 'reply-tool-1', 'toolu_sleep_1', [first]), - toolResult(8_258, sessionId, 'tool-result-1', 'toolu_sleep_1'), - assistantToolUse(11_019, sessionId, 'reply-tool-2', 'toolu_sleep_2'), - toolResult(15_961, sessionId, 'tool-result-2', 'toolu_sleep_2'), - assistantToolUse(18_362, sessionId, 'reply-tool-3', 'toolu_sleep_3'), - toolResult(23_375, sessionId, 'tool-result-3', 'toolu_sleep_3') - ], - afterSteerSend: [ - assistantText(25_550, sessionId, 'reply-text-1', 'FIRST DONE'), - resultFrame(25_556, sessionId, 'result-1', { - userMessageUuids: [first], - durationMs: 25_241, - numTurns: 4 - }), - initFrame(25_584, sessionId), - userReplay(28_703, sessionId, steer, STEER_PROMPT), - assistantText(29_239, sessionId, 'reply-text-2', 'banana'), - resultFrame(29_275, sessionId, 'result-2', { - userMessageUuids: [steer], - durationMs: 3_711, - numTurns: 1 - }), - sessionIdle(29_306, sessionId) - ] - } -} - -/** Cancelled steer has no replay; the synthetic interrupt text is not a send. */ -export const CANCEL_SEND_AT = { first: 18, steer: 3_578 } -export function cancelCapture({ sessionId, first, steer: _steer }: FoldCaptureIds): { - beforeSteerSend: CapturedFoldFrame[] - afterInterrupt: CapturedFoldFrame[] -} { - return { - beforeSteerSend: [ - initFrame(354, sessionId), - userReplay(1_329, sessionId, first, FIRST_PROMPT), - assistantToolUse(2_366, sessionId, 'reply-tool-1', 'toolu_sleep_1', [first]) - ], - afterInterrupt: [ - toolResult( - 3_889, - sessionId, - 'tool-result-1', - 'toolu_sleep_1', - "The user doesn't want to proceed with this tool use.", - true - ), - { - at: 3_900, - frame: { - type: 'user', - session_id: sessionId, - parent_tool_use_id: null, - uuid: 'interrupt-notice-1', - message: { - role: 'user', - content: [{ type: 'text', text: '[Request interrupted by user for tool use]' }] - } - } - }, - resultFrame(3_926, sessionId, 'result-1', { - userMessageUuids: [first], - durationMs: 3_573, - numTurns: 3, - subtype: 'error_during_execution', - isError: true, - terminalReason: 'aborted_tools' - }), - sessionIdle(3_941, sessionId) - ] - } -} - -/** A steer before the first replay still folds into one result naming both sends. */ -export const EARLY_STEER_SEND_AT = { first: 11, steer: 312 } -export function earlySteerCapture({ - sessionId, - first, - steer -}: FoldCaptureIds): CapturedFoldFrame[] { - return [ - initFrame(205, sessionId), - userReplay(1_208, sessionId, first, FIRST_PROMPT), - assistantToolUse(2_190, sessionId, 'reply-tool-1', 'toolu_sleep_1', [first]), - toolResult(6_316, sessionId, 'tool-result-1', 'toolu_sleep_1'), - userReplay(6_318, sessionId, steer, STEER_PROMPT), - assistantText(7_336, sessionId, 'reply-text-1', 'FIRST DONE banana'), - resultFrame(7_340, sessionId, 'result-1', { - userMessageUuids: [first, steer], - durationMs: 7_155, - numTurns: 2 - }), - sessionIdle(7_341, sessionId) - ] -} - -/** Completion precedes wake init; the new cycle has no user replay or result send IDs. */ -export function backgroundWakeCapture({ sessionId, first }: FoldCaptureIds): { - firstTurn: CapturedFoldFrame[] - wake: CapturedFoldFrame[] -} { - return { - firstTurn: [ - initFrame(252, sessionId), - userReplay(1_193, sessionId, first, FIRST_PROMPT), - assistantToolUse(2_372, sessionId, 'reply-tool-1', 'toolu_bg_1', [first]), - taskFrame(2_530, sessionId, 'task_started', { - task_id: 'task_bg_1', - tool_use_id: 'toolu_bg_1', - description: 'Sleep then print marker', - is_backgrounded: true, - task_type: 'local_bash' - }), - toolResult(2_532, sessionId, 'tool-result-1', 'toolu_bg_1'), - assistantText(3_403, sessionId, 'reply-text-1', 'STARTED'), - resultFrame(3_406, sessionId, 'result-1', { - userMessageUuids: [first], - durationMs: 3_177, - numTurns: 2 - }), - sessionIdle(3_407, sessionId) - ], - wake: [ - taskFrame(17_547, sessionId, 'task_updated', { - task_id: 'task_bg_1', - patch: { status: 'completed' } - }), - taskFrame(17_547, sessionId, 'task_notification', { - task_id: 'task_bg_1', - tool_use_id: 'toolu_bg_1', - status: 'completed', - summary: 'Background command completed (exit code 0)' - }), - initFrame(17_626, sessionId), - assistantText(19_721, sessionId, 'wake-text-1', 'The background command finished.'), - resultFrame(19_729, sessionId, 'result-2', { - userMessageUuids: [], - durationMs: 2_105, - numTurns: 1 - }), - sessionIdle(19_730, sessionId) - ] - } -} diff --git a/src/main/claude/claude-captured-foreground-frames.test-fixture.ts b/src/main/claude/claude-captured-foreground-frames.test-fixture.ts deleted file mode 100644 index 161bc7642d2..00000000000 --- a/src/main/claude/claude-captured-foreground-frames.test-fixture.ts +++ /dev/null @@ -1,145 +0,0 @@ -// CLI 2.1.280 captures: sanitized IDs/paths/prompts; original frame order and send-relative times. - -import { - result, - spawn, - system, - toolResult, - type CapturedFrame -} from './claude-captured-frame-builders.test-fixture' - -const interruptedAgentStart = (at: number, toolUseId: string): CapturedFrame[] => [ - { - at, - frame: spawn(toolUseId, 'Agent', { description: 'Run sleep command and report' }, null) - }, - { - at: at + 16, - frame: system('task_started', { - task_id: 'agent-1', - tool_use_id: toolUseId, - description: 'Run sleep command and report', - subagent_type: 'general-purpose', - is_backgrounded: false, - task_type: 'local_agent' - }) - }, - { - at: at + 4_357, - frame: system('task_progress', { - task_id: 'agent-1', - tool_use_id: toolUseId, - usage: { total_tokens: 18_844, tool_uses: 1, duration_ms: 4_342 }, - last_tool_name: 'Bash' - }) - } -] - -const REJECTED = "The user doesn't want to proceed with this tool use. The tool use was rejected." - -/** An interrupt while the foreground agent sits between tools: its own stop comes first. */ -export const INTERRUPTED_BETWEEN_TOOLS: CapturedFrame[] = [ - ...interruptedAgentStart(5_000, 'toolu_agent'), - { - at: 11_019, - frame: system('task_updated', { task_id: 'agent-1', patch: { status: 'killed' } }) - }, - { - at: 11_019, - frame: system('task_notification', { - task_id: 'agent-1', - tool_use_id: 'toolu_agent', - status: 'stopped', - summary: 'Run sleep command and report' - }) - }, - { at: 11_020, frame: toolResult('toolu_agent', REJECTED, null, true) }, - { at: 11_026, frame: result('error_during_execution') } -] - -/** An interrupt while the foreground agent's own shell runs: the spawn result precedes its stop. */ -export const INTERRUPTED_IN_OWN_SHELL: CapturedFrame[] = [ - ...interruptedAgentStart(2_876, 'toolu_agent'), - { - at: 6_317, - frame: spawn('toolu_shell', 'Bash', { command: 'sleep 45; echo 1' }, 'toolu_agent') - }, - { - at: 9_424, - frame: system('task_started', { - task_id: 'shell-1', - owned_by_subagent: true, - tool_use_id: 'toolu_shell', - description: 'Sleep 45 seconds then print 1', - is_backgrounded: false, - task_type: 'local_bash' - }) - }, - { - at: 11_321, - frame: system('task_notification', { - task_id: 'shell-1', - tool_use_id: 'toolu_shell', - status: 'stopped', - summary: 'Sleep 45 seconds then print 1' - }) - }, - { at: 11_324, frame: toolResult('toolu_agent', REJECTED, null, true) }, - { - at: 11_325, - frame: system('task_updated', { task_id: 'agent-1', patch: { status: 'killed' } }) - }, - { - at: 11_325, - frame: system('task_notification', { - task_id: 'agent-1', - tool_use_id: 'toolu_agent', - status: 'stopped', - summary: 'Run sleep command and report' - }) - }, - { at: 11_328, frame: result('error_during_execution') } -] - -/** A foreground agent that finishes: its own ending, then its summary, then the spawn result. */ -export const FOREGROUND_SUCCESS: CapturedFrame[] = [ - { at: 3_695, frame: spawn('toolu_agent', 'Agent', { description: 'Run echo hi command' }, null) }, - { - at: 3_709, - frame: system('task_started', { - task_id: 'agent-1', - tool_use_id: 'toolu_agent', - description: 'Run echo hi command', - subagent_type: 'general-purpose', - is_backgrounded: false, - task_type: 'local_agent' - }) - }, - { - at: 5_501, - frame: system('task_progress', { - task_id: 'agent-1', - tool_use_id: 'toolu_agent', - usage: { total_tokens: 14_576, tool_uses: 1, duration_ms: 1_792 }, - last_tool_name: 'Bash' - }) - }, - { at: 5_505, frame: spawn('toolu_echo', 'Bash', { command: 'echo hi' }, 'toolu_agent') }, - { at: 5_652, frame: toolResult('toolu_echo', 'hi', 'toolu_agent', false) }, - { - at: 7_101, - frame: system('task_updated', { task_id: 'agent-1', patch: { status: 'completed' } }) - }, - { - at: 7_101, - frame: system('task_notification', { - task_id: 'agent-1', - tool_use_id: 'toolu_agent', - status: 'completed', - summary: 'The command executed successfully. Output: `hi`', - usage: { total_tokens: 16_908, tool_uses: 1, duration_ms: 3_393 } - }) - }, - { at: 7_113, frame: toolResult('toolu_agent', 'hi', null) }, - { at: 8_952, frame: result('success') } -] diff --git a/src/main/claude/claude-captured-frame-builders.test-fixture.ts b/src/main/claude/claude-captured-frame-builders.test-fixture.ts deleted file mode 100644 index a090fb0198b..00000000000 --- a/src/main/claude/claude-captured-frame-builders.test-fixture.ts +++ /dev/null @@ -1,59 +0,0 @@ -export type CapturedFrame = { at: number; frame: Record } - -export function spawn( - id: string, - name: string, - input: Record, - parent: string | null -) { - return { - type: 'assistant', - parent_tool_use_id: parent, - message: { - id: `msg-${id}`, - role: 'assistant', - content: [{ type: 'tool_use', id, name, input }] - } - } -} - -export function toolResult( - toolUseId: string, - content: string, - parent: string | null, - isError?: boolean -) { - return { - type: 'user', - parent_tool_use_id: parent, - message: { - role: 'user', - content: [ - { - type: 'tool_result', - tool_use_id: toolUseId, - content, - ...(isError === undefined ? {} : { is_error: isError }) - } - ] - } - } -} - -export function says(id: string, text: string, parent: string | null) { - return { - type: 'assistant', - parent_tool_use_id: parent, - message: { id: `msg-${id}`, role: 'assistant', content: [{ type: 'text', text }] } - } -} - -export function system(subtype: string, fields: Record) { - return { type: 'system', subtype, ...fields } -} - -export const result = (subtype: string) => ({ - type: 'result', - subtype, - is_error: subtype !== 'success' -}) diff --git a/src/main/claude/claude-captured-task-frames.test-fixture.ts b/src/main/claude/claude-captured-task-frames.test-fixture.ts deleted file mode 100644 index 42dc0337d96..00000000000 --- a/src/main/claude/claude-captured-task-frames.test-fixture.ts +++ /dev/null @@ -1,224 +0,0 @@ -// CLI 2.1.280 captures: sanitized IDs/paths/prompts; original frame order and send-relative times. - -import { - result, - says, - spawn, - system, - toolResult, - type CapturedFrame -} from './claude-captured-frame-builders.test-fixture' - -/** Parent finishes while the backgrounded agent's shell keeps running. */ -export const MOVED_TO_BACKGROUND: CapturedFrame[] = [ - { - at: 3_259, - frame: spawn( - 'toolu_agent', - 'Agent', - { description: 'Run 45s sleep command', run_in_background: false }, - null - ) - }, - { - at: 3_275, - frame: system('task_started', { - task_id: 'agent-1', - tool_use_id: 'toolu_agent', - description: 'Run 45s sleep command', - subagent_type: 'general-purpose', - is_backgrounded: false, - task_type: 'local_agent' - }) - }, - { - at: 6_126, - frame: system('task_progress', { - task_id: 'agent-1', - tool_use_id: 'toolu_agent', - description: 'Running Sleep 45 seconds then print 1', - usage: { total_tokens: 18_837, tool_uses: 1, duration_ms: 2_852 }, - last_tool_name: 'Bash' - }) - }, - { - at: 6_127, - frame: spawn( - 'toolu_shell', - 'Bash', - { command: 'sleep 45; echo 1', description: 'Sleep 45 seconds then print 1' }, - 'toolu_agent' - ) - }, - { - at: 9_249, - frame: system('task_started', { - task_id: 'shell-1', - owned_by_subagent: true, - tool_use_id: 'toolu_shell', - description: 'Sleep 45 seconds then print 1', - is_backgrounded: false, - task_type: 'local_bash' - }) - }, - { - at: 11_128, - frame: system('background_tasks_changed', { - tasks: [ - { task_id: 'agent-1', task_type: 'local_agent', description: 'Run 45s sleep command' } - ] - }) - }, - { - at: 11_128, - frame: system('task_updated', { task_id: 'agent-1', patch: { is_backgrounded: true } }) - }, - { - at: 11_139, - frame: toolResult('toolu_agent', 'Async agent launched successfully.', null) - }, - { at: 12_563, frame: says('parent-1', 'The agent has been launched.', null) }, - { at: 12_610, frame: result('success') }, - { - at: 51_275, - frame: system('task_notification', { - task_id: 'shell-1', - tool_use_id: 'toolu_shell', - status: 'completed', - summary: 'Sleep 45 seconds then print 1' - }) - }, - { at: 51_292, frame: toolResult('toolu_shell', '1', 'toolu_agent', false) }, - { at: 52_398, frame: says('agent-1-final', 'Exact stdout: `1`', 'toolu_agent') }, - { at: 52_441, frame: system('background_tasks_changed', { tasks: [] }) }, - { - at: 52_441, - frame: system('task_updated', { task_id: 'agent-1', patch: { status: 'completed' } }) - }, - { - at: 52_441, - frame: system('task_notification', { - task_id: 'agent-1', - tool_use_id: 'toolu_agent', - status: 'completed', - summary: 'The command completed after ~45 seconds. Exact stdout: `1`', - usage: { total_tokens: 22_160, tool_uses: 1, duration_ms: 49_167 } - }) - }, - { at: 54_303, frame: says('parent-2', 'The agent ran the command.', null) }, - { at: 54_450, frame: result('success') } -] - -/** Messaging a finished agent resumes it under the message call, after its roster entry. */ -export const RESUMED_BY_MESSAGE: CapturedFrame[] = [ - { - at: 3_279, - frame: spawn( - 'toolu_agent', - 'Agent', - { description: 'Run echo first-run command', run_in_background: true }, - null - ) - }, - { - at: 3_320, - frame: system('background_tasks_changed', { - tasks: [ - { task_id: 'agent-1', task_type: 'local_agent', description: 'Run echo first-run command' } - ] - }) - }, - { - at: 3_322, - frame: system('task_started', { - task_id: 'agent-1', - tool_use_id: 'toolu_agent', - description: 'Run echo first-run command', - subagent_type: 'general-purpose', - is_backgrounded: true, - task_type: 'local_agent' - }) - }, - { at: 3_349, frame: toolResult('toolu_agent', 'Async agent launched successfully.', null) }, - { at: 4_765, frame: result('success') }, - { - at: 5_077, - frame: system('task_progress', { - task_id: 'agent-1', - tool_use_id: 'toolu_agent', - usage: { total_tokens: 13_615, tool_uses: 1, duration_ms: 1_759 }, - last_tool_name: 'Bash' - }) - }, - { at: 7_427, frame: system('background_tasks_changed', { tasks: [] }) }, - { - at: 7_427, - frame: system('task_updated', { task_id: 'agent-1', patch: { status: 'completed' } }) - }, - { - at: 7_427, - frame: system('task_notification', { - task_id: 'agent-1', - tool_use_id: 'toolu_agent', - status: 'completed', - summary: 'The command executed successfully. Output: `first-run`', - usage: { total_tokens: 15_971, tool_uses: 1, duration_ms: 4_110 } - }) - }, - { at: 10_960, frame: result('success') }, - { - at: 16_118, - frame: spawn( - 'toolu_message', - 'SendMessage', - { to: 'agent-1', message: 'Run echo second-run and report.' }, - null - ) - }, - { - at: 16_142, - frame: system('background_tasks_changed', { - tasks: [ - { task_id: 'agent-1', task_type: 'local_agent', description: 'Run echo first-run command' } - ] - }) - }, - { - at: 16_143, - frame: system('task_started', { - task_id: 'agent-1', - tool_use_id: 'toolu_message', - description: 'Run echo first-run command', - subagent_type: 'general-purpose', - is_backgrounded: true, - task_type: 'local_agent' - }) - }, - { at: 16_166, frame: toolResult('toolu_message', '{"success":true}', null) }, - { at: 17_420, frame: result('success') }, - { - at: 17_889, - frame: system('task_progress', { - task_id: 'agent-1', - tool_use_id: 'toolu_message', - usage: { total_tokens: 16_064, tool_uses: 2, duration_ms: 14_568 }, - last_tool_name: 'Bash' - }) - }, - { at: 19_568, frame: system('background_tasks_changed', { tasks: [] }) }, - { - at: 19_568, - frame: system('task_updated', { task_id: 'agent-1', patch: { status: 'completed' } }) - }, - { - at: 19_568, - frame: system('task_notification', { - task_id: 'agent-1', - tool_use_id: 'toolu_message', - status: 'completed', - summary: 'The command executed successfully. Output: `second-run`', - usage: { total_tokens: 16_259, tool_uses: 2, duration_ms: 16_249 } - }) - }, - { at: 20_956, frame: result('success') } -] diff --git a/src/main/claude/claude-captured-wake-frames.test-fixture.ts b/src/main/claude/claude-captured-wake-frames.test-fixture.ts deleted file mode 100644 index 8b76c4cdecd..00000000000 --- a/src/main/claude/claude-captured-wake-frames.test-fixture.ts +++ /dev/null @@ -1,121 +0,0 @@ -// CLI 2.1.280 capture: sanitized IDs/prompts; original frame order and spawn-relative times. - -import { - result, - says, - spawn, - system, - toolResult, - type CapturedFrame -} from './claude-captured-frame-builders.test-fixture' - -/** Shell completion resumes the same agent under its original spawn call. */ -export const WAKES_AFTER_ITS_SHELL: CapturedFrame[] = [ - { - at: 0, - frame: spawn( - 'toolu_agent', - 'Agent', - { description: 'Sleep 40 seconds then reply', run_in_background: true }, - null - ) - }, - { - at: 15, - frame: system('task_started', { - task_id: 'agent-1', - tool_use_id: 'toolu_agent', - description: 'Sleep 40 seconds then reply', - subagent_type: 'general-purpose', - is_backgrounded: true, - task_type: 'local_agent' - }) - }, - { at: 30, frame: toolResult('toolu_agent', 'Async agent launched successfully.', null) }, - { at: 1_944, frame: result('success') }, - { - at: 4_343, - frame: spawn( - 'toolu_shell', - 'Bash', - { - command: 'sleep 40', - description: 'Wait 40 seconds in background', - run_in_background: true - }, - 'toolu_agent' - ) - }, - { - at: 4_431, - frame: system('task_started', { - task_id: 'shell-1', - owned_by_subagent: true, - tool_use_id: 'toolu_shell', - description: 'Wait 40 seconds in background', - is_backgrounded: true, - task_type: 'local_bash' - }) - }, - { - at: 4_441, - frame: toolResult( - 'toolu_shell', - 'Command running in background with ID: shell-1.', - 'toolu_agent' - ) - }, - { - at: 11_913, - frame: system('task_updated', { task_id: 'agent-1', patch: { status: 'completed' } }) - }, - { - at: 11_913, - frame: system('task_notification', { - task_id: 'agent-1', - tool_use_id: 'toolu_agent', - status: 'completed', - summary: '`sleep 40` is still running in the background.', - usage: { total_tokens: 17_928, tool_uses: 2, duration_ms: 11_901 } - }) - }, - { - at: 44_454, - frame: system('task_updated', { task_id: 'shell-1', patch: { status: 'completed' } }) - }, - { - at: 44_454, - frame: system('task_notification', { - task_id: 'shell-1', - tool_use_id: 'toolu_shell', - status: 'completed', - summary: 'Background command "Wait 40 seconds in background" completed (exit code 0)' - }) - }, - { - at: 44_460, - frame: system('task_started', { - task_id: 'agent-1', - tool_use_id: 'toolu_agent', - description: 'Sleep 40 seconds then reply', - subagent_type: 'general-purpose', - is_backgrounded: true, - task_type: 'local_agent' - }) - }, - { at: 46_198, frame: says('agent-1-final', 'DONE', 'toolu_agent') }, - { - at: 46_198, - frame: system('task_updated', { task_id: 'agent-1', patch: { status: 'completed' } }) - }, - { - at: 46_199, - frame: system('task_notification', { - task_id: 'agent-1', - tool_use_id: 'toolu_agent', - status: 'completed', - summary: 'DONE', - usage: { total_tokens: 18_181, tool_uses: 2, duration_ms: 46_184 } - }) - } -] diff --git a/src/main/claude/claude-child-work-producer-harness.test-fixture.ts b/src/main/claude/claude-child-work-producer-harness.test-fixture.ts deleted file mode 100644 index 68009ae669c..00000000000 --- a/src/main/claude/claude-child-work-producer-harness.test-fixture.ts +++ /dev/null @@ -1,191 +0,0 @@ -import { expect } from 'vitest' -import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' -import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types' -import { createAgentChildWorkAdmission } from '../../shared/agent-status/child-work/agent-status-child-work-admission' -import type { AgentChildWorkRecord } from '../../shared/agent-status/child-work/agent-status-child-work' -import type { AgentChildWorkEvidence } from '../../shared/agent-status/child-work/agent-status-child-work-evidence' -import { reconcileAgentChildWorkEvidence } from '../../shared/agent-status/child-work/agent-status-child-work-reconciliation' -import type { AgentChildWorkReconcileOutcome } from '../../shared/agent-status/child-work/agent-status-child-work-evidence-admission' -import { createAgentStatusStore } from '../../shared/agent-status/store/agent-status-store' -import { makeStructuredAgentStatusSubject } from '../../shared/agent-status/contracts/agent-status-subject' -import { AgentHookServer } from '../agent-hooks/server/agent-hook-server' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import type { CapturedFrame } from './claude-captured-frame-builders.test-fixture' -import { ClaudeStructuredSessionAdapter } from './structured/claude-structured-session-adapter' -import { - fakeClaude, - identityFor, - PROVIDER_SESSION_ID -} from './structured/claude-structured-session-test-support' - -export const parent = makeStructuredAgentStatusSubject( - { - executionHostId: 'local', - wslDistro: null, - workspaceId: 'workspace-1', - workspaceKind: 'folder' - }, - 'session-1' -) - -let uuid = 0 -export function frame(fields: Record): Record { - return { session_id: PROVIDER_SESSION_ID, uuid: `frame-${++uuid}`, ...fields } -} -export function system(subtype: string, fields: Record) { - return frame({ type: 'system', subtype, ...fields }) -} -export function toolUse( - id: string, - name: string, - input: unknown, - parentToolUseId: string | null = null -) { - return frame({ - type: 'assistant', - parent_tool_use_id: parentToolUseId, - message: { - id: `msg-${id}`, - role: 'assistant', - content: [{ type: 'tool_use', id, name, input }] - } - }) -} -export function toolResult( - toolUseId: string, - text: string, - parentToolUseId: string | null = null, - isError = false -) { - return frame({ - type: 'user', - parent_tool_use_id: parentToolUseId, - message: { - role: 'user', - content: [{ type: 'tool_result', tool_use_id: toolUseId, content: text, is_error: isError }] - } - }) -} - -type Delivery = { kind: 'journal' | 'publish' | 'evidence'; detail: string } - -export type JournaledItem = Pick - -export const T0 = 1_700_000_000_500 - -export function hostWithParent(): AgentHookServer { - const host = new AgentHookServer() - host.ingestStructuredStatus( - { - sessionId: parent.sessionId, - workspaceId: parent.workspaceId, - agent: 'claude', - status: 'working', - hostExecutionOwned: true, - latestPrompt: 'find the flaky tests', - updatedAt: 100 - }, - parent - ) - return host -} - -/** With `host`, evidence goes through the host's own ingest instead of straight to reconciliation. */ -export async function producer(host?: AgentHookServer) { - const claude = fakeClaude() - const store = createAgentStatusStore({ epoch: 'epoch-1', mode: 'authority' }) - expect(store.applyMutation({ parent: { subject: parent } })).not.toBeNull() - const admission = createAgentChildWorkAdmission(store, { - mintChildWorkId: (() => { - let minted = 0 - return () => `child-${++minted}` - })() - }) - let clock = T0 - const deliveries: Delivery[] = [] - /** The producer linkage the journal stamped on each child row. */ - const stamps: { providerParentRef?: string; attempt?: number }[] = [] - const evidenceLog: AgentChildWorkEvidence[][] = [] - const ingested: (AgentChildWorkReconcileOutcome | null)[] = [] - const adapter = new ClaudeStructuredSessionAdapter({ - resolveLaunch: async () => ({ - pathToClaudeCodeExecutable: 'claude', - options: {}, - cwd: '/work/repo', - claudeConfigDir: '/accounts/claude', - providerSessionId: PROVIDER_SESSION_ID, - resumeLeafUuid: null, - resumesTranscript: false, - cliFlag: async () => 'supported' as const, - continuesChain: false - }), - openConnection: claude.openConnection, - readProcessStartTime: async () => 1_700_000_000_000, - now: () => clock, - persistHandle: async () => {}, - onChildWorkEvidence: (sessionId, evidence) => { - expect(sessionId).toBe('session-1') - deliveries.push({ kind: 'evidence', detail: evidence.map((edge) => edge.type).join(',') }) - evidenceLog.push(evidence) - if (host) { - ingested.push(host.ingestStructuredChildWork(parent, evidence, 'claude')) - } else { - reconcileAgentChildWorkEvidence({ store, admission, parent, provider: 'claude', evidence }) - } - } - }) - const journalItems = new Map() - const journal: StructuredAgentSessionEventSink = { - appendItem: (identity, body, options) => { - deliveries.push({ kind: 'journal', detail: JSON.stringify(identity) }) - const itemId = agentJournalItemKey(identity) - journalItems.set(itemId, { - itemId, - body, - sequence: journalItems.get(itemId)?.sequence ?? journalItems.size + 1, - ...(options?.agentId ? { agentId: options.agentId } : {}) - }) - if (options?.agentId !== undefined) { - stamps.push(options) - } - }, - appendTombstone: () => {}, - // Production's journal publication is what republishes the parent's own row. - publish: () => deliveries.push({ kind: 'publish', detail: '' }) - } - await adapter.acquire({ - identity: identityFor(), - fence: 7, - spawnToken: 'spawn-9', - events: journal - }) - const send = (message: Record): Delivery[] => { - const from = deliveries.length - claude.connections[0]!.handlers.onMessage?.(message) - return deliveries.slice(from) - } - const replay = (frames: readonly CapturedFrame[]) => { - for (const { at, frame: captured } of frames) { - clock = T0 + at - send(frame(captured)) - } - } - const records = (): AgentChildWorkRecord[] => - host ? host.getStructuredChildWork(parent) : store.getChildren(parent) - const byDescription = (description: string) => - records().find((record) => record.description === description) - return { - adapter, - claude, - now: () => clock, - store, - send, - replay, - records, - byDescription, - evidenceLog, - stamps, - ingested, - journalItems - } -} diff --git a/src/main/claude/claude-close-turn-end.test.ts b/src/main/claude/claude-close-turn-end.test.ts deleted file mode 100644 index 8dd69e3cbaa..00000000000 --- a/src/main/claude/claude-close-turn-end.test.ts +++ /dev/null @@ -1,77 +0,0 @@ -// Close supplies no turn outcome; a prior observed exit keeps its own cause. - -import { describe, expect, it } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalTurnLifecycle -} from '../../shared/agent-session/journal/agent-session-journal-types' -import { readAgentJournalTurn } from '../../shared/agent-session/lifecycle/agent-session-turn-record' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import type { ClaudeStructuredSessionEvent } from './structured/claude-structured-session-state' -import { - PROVIDER_SESSION_ID, - adapterFor, - fakeClaude, - identityFor, - tick -} from './structured/claude-structured-session-test-support' - -function turnSink() { - const turns: AgentJournalTurnLifecycle[] = [] - const sink: StructuredAgentSessionEventSink = { - appendItem: (_identity, body: AgentJournalItemBody) => { - const turn = readAgentJournalTurn(body) - if (turn) { - turns.push(turn) - } - }, - appendTombstone: () => {}, - publish: () => {} - } - return { sink, turns } -} - -async function childInsideTurn() { - const claude = fakeClaude() - const events: ClaudeStructuredSessionEvent[] = [] - const adapter = adapterFor(claude, {}, events) - const { sink, turns } = turnSink() - await adapter.acquire({ identity: identityFor(), fence: 7, spawnToken: 'spawn-9', events: sink }) - const connection = claude.connections[0]! - connection.handlers.onMessage?.({ - session_id: PROVIDER_SESSION_ID, - type: 'assistant', - uuid: 'assistant-1', - parent_tool_use_id: null, - message: { role: 'assistant', content: [{ type: 'text', text: 'working' }] } - }) - await tick() - expect(turns.at(-1)).toMatchObject({ state: 'running' }) - return { adapter, connection, events, turns } -} - -describe('a Claude close settles the open turn with no verdict of its own', () => { - it('ends it interrupted, with no outcome', async () => { - const { adapter, turns } = await childInsideTurn() - - await expect(adapter.closeSession('session-1')).resolves.toBe(true) - - expect(turns.at(-1)).toMatchObject({ state: 'interrupted' }) - expect(turns.at(-1)).not.toHaveProperty('outcome') - }) - - it('settles a crash it saw before the close once, as that exit', async () => { - const { adapter, connection, events, turns } = await childInsideTurn() - connection.handlers.onExit?.(new Error('provider exited')) - - await adapter.closeSession('session-1') - await tick() - - const settled = turns.filter((turn) => turn.state !== 'running') - expect(settled).toEqual([expect.objectContaining({ state: 'interrupted' })]) - expect(settled[0]).not.toHaveProperty('outcome') - expect(events.filter((event) => event.type === 'ended')).toEqual([ - expect.objectContaining({ cause: 'unexpected-exit' }) - ]) - }) -}) diff --git a/src/main/claude/claude-context-model-switch.test.ts b/src/main/claude/claude-context-model-switch.test.ts deleted file mode 100644 index 9da11ba40c0..00000000000 --- a/src/main/claude/claude-context-model-switch.test.ts +++ /dev/null @@ -1,119 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { selectStructuredAgentContextUsage } from '../../shared/agent-session/structured-agent-session-context-usage' -import { readAgentJournalTurn } from '../../shared/agent-session/lifecycle/agent-session-turn-record' -import { bindClaudeContextUsageCapture } from './claude-context-usage' -import { - assistantFrame, - initFrame, - resultFrame, - setup, - userFrame -} from './claude-context-usage-test-support' - -const SONNET = 'claude-sonnet-5' -const OPUS = 'claude-opus-5-5' -// Shape measured from Claude Code 2.1.280: plan mode under `opusplan` keys Opus with `[1m]`. -const PLAN_USAGE = { - [SONNET]: { contextWindow: 200_000 }, - [`${OPUS}[1m]`]: { contextWindow: 1_000_000 } -} - -const answer = (model: string, totalTokens: number, rawMaxTokens: number) => ({ - model, - totalTokens, - rawMaxTokens, - categories: [] -}) - -function session(init: string) { - const t = setup({ init }) - const pending: ((value: unknown) => void)[] = [] - bindClaudeContextUsageCapture( - { getContextUsage: () => new Promise((resolve) => pending.push(resolve)) }, - t.translator, - { now: () => 90_000 } - ) - const settle = async (): Promise => { - for (let index = 0; index < 4; index += 1) { - await Promise.resolve() - } - } - const reply = async (value: unknown, request = pending.length - 1): Promise => { - pending[request]?.(value) - await settle() - } - const ring = () => selectStructuredAgentContextUsage(t.items()) - const unknownWrites = () => - t.appends.filter( - (entry) => readAgentJournalTurn(entry.body)?.contextUsage?.used?.kind === 'unknown' - ).length - return { ...t, pending, reply, ring, unknownWrites } -} - -describe('the context ring across a model change', () => { - it('holds estimates from the moment an approved plan hands the turn to another model', async () => { - const s = session(SONNET) - s.handle(userFrame('turn-a', 1_000)) - s.handle(assistantFrame('reply-a', 2_000, 100_000, undefined, OPUS)) - s.handle(resultFrame(3_000, PLAN_USAGE)) - await s.reply(answer(`${OPUS}[1m]`, 101_000, 1_000_000)) - s.handle(initFrame(SONNET, 3_900)) - s.handle(userFrame('turn-b', 4_000)) - s.handle(assistantFrame('reply-b1', 5_000, 110_000, undefined, OPUS)) - expect(s.ring()).toMatchObject({ usedTokens: 110_000, windowTokens: 1_000_000 }) - - const requests = s.pending.length - s.handle(assistantFrame('reply-b2', 6_000, 120_000, undefined, SONNET)) - expect(s.ring()).toBeNull() - expect(s.unknownWrites()).toBe(1) - expect(s.pending).toHaveLength(requests + 1) - s.handle(assistantFrame('reply-b3', 7_000, 130_000, undefined, SONNET)) - expect(s.unknownWrites()).toBe(1) - expect(s.turnRow('turn-b')?.body).toMatchObject({ contextUsage: { used: { kind: 'unknown' } } }) - await s.reply(answer(SONNET, 121_000, 200_000), requests) - expect(s.turnRow('turn-b')?.body).toMatchObject({ - contextUsage: { window: { tokens: 200_000 }, used: { kind: 'unknown' } } - }) - s.handle(assistantFrame('reply-b4', 7_500, 140_000, undefined, SONNET)) - expect(s.ring()).toMatchObject({ usedTokens: 140_000, windowTokens: 200_000, percentage: 70 }) - - s.handle(resultFrame(8_000, PLAN_USAGE)) - expect(s.ring()).toMatchObject({ usedTokens: 140_000, windowTokens: 200_000 }) - await s.reply(answer(SONNET, 141_000, 200_000)) - expect(s.ring()).toMatchObject({ usedTokens: 141_000, windowTokens: 200_000, estimated: false }) - s.translator.dispose() - }) - - it('does not let a turn result undo the window a mid-turn switch between 1M and 200k reported', async () => { - const s = session(`${SONNET}[1m]`) - s.handle(userFrame('turn-a', 1_000)) - s.handle(assistantFrame('reply-a', 2_000, 140_000, undefined, SONNET)) - s.handle(resultFrame(3_000, { [`${SONNET}[1m]`]: { contextWindow: 1_000_000 } })) - await s.reply(answer(`${SONNET}[1m]`, 141_000, 1_000_000)) - s.handle(initFrame(`${SONNET}[1m]`, 3_900)) - s.handle(userFrame('turn-b', 4_000)) - s.handle(assistantFrame('reply-b1', 5_000, 145_000, undefined, SONNET)) - - s.translator.modelMayHaveChanged() - const switched = s.pending.length - 1 - s.handle(assistantFrame('reply-b2', 6_000, 150_000, undefined, SONNET)) - await s.reply(answer(SONNET, 151_000, 200_000), switched) - s.handle(assistantFrame('reply-b3', 7_000, 160_000, undefined, SONNET)) - expect(s.ring()).toMatchObject({ usedTokens: 160_000, windowTokens: 200_000, percentage: 80 }) - - s.handle( - resultFrame(8_000, { - [`${SONNET}[1m]`]: { contextWindow: 1_000_000 }, - [SONNET]: { contextWindow: 200_000 } - }) - ) - expect(s.ring()).toMatchObject({ usedTokens: 160_000, windowTokens: 200_000, percentage: 80 }) - s.translator.markContextActivity() - await s.reply(answer(SONNET, 161_000, 200_000)) - s.handle(initFrame(SONNET, 8_900)) - s.handle(userFrame('turn-c', 9_000)) - s.handle(assistantFrame('reply-c', 10_000, 170_000, undefined, SONNET)) - expect(s.ring()).toMatchObject({ usedTokens: 170_000, windowTokens: 200_000, percentage: 85 }) - s.translator.dispose() - }) -}) diff --git a/src/main/claude/claude-context-usage-restart.test.ts b/src/main/claude/claude-context-usage-restart.test.ts deleted file mode 100644 index 2abe111ab79..00000000000 --- a/src/main/claude/claude-context-usage-restart.test.ts +++ /dev/null @@ -1,206 +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 } from 'vitest' -import { selectStructuredAgentContextUsage } from '../../shared/agent-session/structured-agent-session-context-usage' -import type { AgentSessionJournal } from '../native-chat/agent-session-journal/journal-store' -import { createTrackedJournalOpener } from '../native-chat/agent-session-journal/store-lifecycle/journal-host-database-test-support' -import { createDeferredStructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import '../native-chat/agent-session-wire/termination/structured-agent-session-dead-generation-settlement' -import { settleStaleStructuredAgentSessionState } from '../native-chat/agent-session-wire/termination/structured-agent-session-stale-state-settlement' -import { readAgentJournalTurn } from '../../shared/agent-session/lifecycle/agent-session-turn-record' -import { bindClaudeContextUsageCapture } from './claude-context-usage' -import { createClaudeJournalTranslator } from './structured/journal/claude-structured-journal-translation' -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 journals = createTrackedJournalOpener() -let root: string - -beforeEach(async () => { - root = await mkdtemp(join(tmpdir(), 'orca-claude-context-restart-')) -}) - -afterEach(async () => { - await journals.closeAll() - await rm(root, { recursive: true, force: true }) -}) - -function frame(message: Record, observedAt: number, startsTurn = false) { - return { - type: 'message' as const, - sessionId: 'orca-session', - observedAt, - ...(startsTurn ? { startsTurn: true as const } : {}), - message: { session_id: 'claude-session', parent_tool_use_id: null, ...message } - } -} - -const initFrame = (at: number) => - frame({ type: 'system', subtype: 'init', uuid: `init-${at}`, model: 'claude-fable-5-1[1m]' }, at) - -const userFrame = (uuid: string, at: number) => - frame( - { type: 'user', uuid, message: { role: 'user', content: [{ type: 'text', text: 'go' }] } }, - at, - true - ) - -const assistantFrame = (uuid: string, at: number, input: number, model = 'claude-fable-5-1') => - frame( - { - type: 'assistant', - uuid, - message: { - role: 'assistant', - model, - content: [{ type: 'text', text: uuid }], - usage: { - input_tokens: input, - cache_creation_input_tokens: 0, - cache_read_input_tokens: 0, - output_tokens: 4 - } - } - }, - at - ) - -const resultFrame = (at: number, contextWindow = 1_000_000) => - frame( - { - type: 'result', - subtype: 'success', - is_error: false, - result: 'done', - duration_ms: 10, - uuid: `result-${at}`, - modelUsage: { 'claude-fable-5-1[1m]': { contextWindow } } - }, - at - ) - -const compactBoundary = (at: number) => - frame( - { - type: 'system', - subtype: 'compact_boundary', - uuid: `compact-${at}`, - compact_metadata: { trigger: 'manual', pre_tokens: 150_000 } - }, - at - ) - -const postCompactionReport = { - model: 'claude-fable-5-1[1m]', - totalTokens: 40_000, - rawMaxTokens: 1_000_000, - percentage: 4, - categories: [{ name: 'Messages', tokens: 30_000 }] -} - -async function openJournal(): Promise { - return journals.open({ - identity: { - sessionId: 'orca-session', - workspaceId: 'workspace-1', - hostId: 'local', - agent: 'claude', - providerHandle: claudeProviderHandle('claude-session', null) - }, - now: () => 9_000, - stateDirectory: join(root, 'orca-session') - }) -} - -function acquire(journal: AgentSessionJournal) { - const deferred = createDeferredStructuredAgentSessionEventSink(testEventSinkLogging()) - const translator = createClaudeJournalTranslator({ sink: deferred.sink, coalesceMs: 0 }) - deferred.bind({ journal, fence: 1, publish: () => {} }) - const answers: ((value: unknown) => void)[] = [] - const unbind = bindClaudeContextUsageCapture( - { - getContextUsage: () => new Promise((resolve) => answers.push(resolve)) - }, - translator, - { now: () => 20_000 } - ) - const settle = async (): Promise => { - for (let index = 0; index < 4; index += 1) { - await Promise.resolve() - } - await expect(deferred.drained()).resolves.toEqual({ ok: true }) - } - const detach = (): void => deferred.unbind() - const reattach = (): void => deferred.bind({ journal, fence: 1, publish: () => {} }) - const release = (): void => { - unbind?.() - translator.dispose() - deferred.close() - } - return { translator, answers, settle, detach, reattach, release } -} - -const ring = (journal: AgentSessionJournal) => - selectStructuredAgentContextUsage(journal.snapshot().items) - -describe('context usage across a restart', () => { - it('resets the ring at a /compact that is the first thing after a restart, then reads the fresh report', async () => { - const journal = await openJournal() - const before = acquire(journal) - before.translator.handle(initFrame(900)) - before.translator.handle(userFrame('turn-a', 1_000)) - before.translator.handle(assistantFrame('reply-a', 2_000, 150_000)) - before.translator.handle(resultFrame(3_000)) - await before.settle() - expect(ring(journal)).toMatchObject({ usedTokens: 150_000, windowTokens: 1_000_000 }) - before.release() - - const after = acquire(journal) - after.translator.handle(compactBoundary(10_000)) - await after.settle() - expect(ring(journal)).toBeNull() - - after.translator.handle(resultFrame(11_000)) - await after.settle() - expect(ring(journal)).toBeNull() - after.answers.at(-1)?.(postCompactionReport) - await after.settle() - expect(ring(journal)).toMatchObject({ - usedTokens: 40_000, - windowTokens: 1_000_000, - estimated: false, - categories: [{ name: 'Messages', tokens: 30_000 }] - }) - after.release() - }) - - it('never brings a settled turn back to running with a context write that ran late', async () => { - const journal = await openJournal() - const live = acquire(journal) - live.translator.handle(initFrame(900)) - live.translator.handle(userFrame('turn-a', 1_000)) - live.translator.handle(assistantFrame('reply-a', 2_000, 20_000)) - await live.settle() - live.detach() - live.translator.handle(assistantFrame('reply-a2', 3_000, 30_000)) - await settleStaleStructuredAgentSessionState({ - journal, - sessionId: 'orca-session', - fence: 1, - acquisitionGeneration: 'next', - deathEvidence: null - }) - live.reattach() - await live.settle() - const turn = journal - .snapshot() - .items.map((item) => readAgentJournalTurn(item.body)) - .find(Boolean) - expect(turn).toMatchObject({ - state: 'unverifiable', - contextUsage: { used: { kind: 'estimate', usage: { inputTokens: 30_000 } } } - }) - live.release() - }) -}) diff --git a/src/main/claude/claude-context-usage-test-support.ts b/src/main/claude/claude-context-usage-test-support.ts deleted file mode 100644 index 684317e4a8e..00000000000 --- a/src/main/claude/claude-context-usage-test-support.ts +++ /dev/null @@ -1,187 +0,0 @@ -import { vi } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalRenderItem -} from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import type { StructuredAgentSessionRevisionJournal } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-journal-views' -import { createJournalReducerState } from '../native-chat/agent-session-journal/projection/journal-reducer' -import { personStopDecidesTurn } from '../native-chat/agent-session-journal/context-epochs/journal-stop-turn-end' -import type { ClaudeContextReportTarget } from './claude-context-facts' -import { createClaudeJournalTranslator } from './structured/journal/claude-structured-journal-translation' -import { claudeTurnLifecycleIdentity } from './claude-turn-lifecycle-item' - -export function journal({ deferred = false } = {}) { - const queued: (() => void)[] = [] - const run = (write: () => void): void => { - if (deferred) { - queued.push(write) - } else { - write() - } - } - const flush = (): void => { - while (queued.length) { - queued.shift()!() - } - } - const clock = { now: 0 } - const appends: { identity: AgentJournalItemIdentity; body: AgentJournalItemBody }[] = [] - const rows = new Map() - const appendItem: StructuredAgentSessionEventSink['appendItem'] = (identity, body, options) => { - appends.push({ identity, body }) - const itemId = agentJournalItemKey(identity) - const existing = rows.get(itemId) - rows.set(itemId, { - itemId, - revision: (existing?.revision ?? 0) + 1, - sequence: existing?.sequence ?? rows.size + 1, - observedAt: existing?.observedAt ?? options?.observedAt ?? clock.now, - ...options, - turnScope: existing?.turnScope ?? options.turnScope, - body - }) - } - const scans = { count: 0 } - const bound: StructuredAgentSessionRevisionJournal = { - item: (itemId) => rows.get(itemId) ?? null, - epoch: 'test', - visitItems: (visit) => { - scans.count += 1 - for (const row of rows.values()) { - visit(row.itemId, row.sequence, row.body) - } - }, - itemBody: (itemId) => rows.get(itemId)?.body ?? null - } - const revise: NonNullable = ( - _reservedBytes, - resolve, - options - ) => { - run(() => { - const resolved = resolve(bound) - if (resolved) { - appendItem(resolved.identity, resolved.body, options) - } - }) - return { accepted: true } - } - const stopState = createJournalReducerState('orca-session', 'test') - const queueStop = (turnId: string, at: number): void => - run(() => { - stopState.queuePauseMarks.latestStop = { - sequence: rows.size + 1, - event: { reason: 'user-stop', turnId, at } - } - }) - const sink: StructuredAgentSessionEventSink = { - journalStopDecidesTurn: (turnId, at) => personStopDecidesTurn(stopState, turnId, at), - appendItem: (...args) => run(() => appendItem(...args)), - tryReviseResolvedItem: revise, - tryReviseResolvedItemAndPublish: revise, - appendTombstone: () => {}, - publish: vi.fn() - } - const turnRow = (turnId: string) => - rows.get(agentJournalItemKey(claudeTurnLifecycleIdentity('claude-session', turnId))) - const items = () => [...rows.values()].sort((left, right) => left.sequence - right.sequence) - return { sink, clock, appends, rows, turnRow, items, scans, flush, queueStop } -} - -export function frame(message: Record, observedAt: number, startsTurn = false) { - return { - type: 'message' as const, - sessionId: 'orca-session', - observedAt, - ...(startsTurn ? { startsTurn: true as const } : {}), - message: { session_id: 'claude-session', parent_tool_use_id: null, ...message } - } -} - -export const userFrame = (uuid: string, at: number) => - frame( - { type: 'user', uuid, message: { role: 'user', content: [{ type: 'text', text: 'go' }] } }, - at, - true - ) - -export function assistantFrame( - uuid: string, - at: number, - input: number, - parentToolUseId?: string, - model = 'claude-fable-5-1', - content: unknown[] = [{ type: 'text', text: uuid }] -) { - return frame( - { - type: 'assistant', - uuid, - ...(parentToolUseId ? { parent_tool_use_id: parentToolUseId } : {}), - message: { - role: 'assistant', - model, - content, - usage: { - input_tokens: input, - cache_creation_input_tokens: 0, - cache_read_input_tokens: 0, - output_tokens: 4 - } - } - }, - at - ) -} - -export const resultFrame = (at: number, modelUsage: Record = {}) => - frame( - { - type: 'result', - subtype: 'success', - is_error: false, - result: 'done', - duration_ms: 10, - uuid: `result-${at}`, - modelUsage - }, - at - ) - -export const initFrame = (model: string, at: number) => - frame({ type: 'system', subtype: 'init', uuid: `init-${at}`, model }, at) - -export const compactBoundary = (at: number) => - frame( - { - type: 'system', - subtype: 'compact_boundary', - uuid: `compact-${at}`, - compact_metadata: { trigger: 'auto', pre_tokens: 150_000 } - }, - at - ) - -export const turnIdentity = (turnId: string) => - claudeTurnLifecycleIdentity('claude-session', turnId) - -export function setup({ - init = 'claude-fable-5-1[1m]', - deferred = false -}: { init?: string | null; deferred?: boolean } = {}) { - const state = journal({ deferred }) - const translator = createClaudeJournalTranslator({ sink: state.sink, coalesceMs: 0 }) - const requests: ClaudeContextReportTarget[] = [] - translator.subscribeContextUsageRequests((target) => requests.push(target)) - const handle = (event: Parameters[0]): void => { - state.clock.now = event.type === 'message' ? (event.observedAt ?? 0) : 0 - translator.handle(event) - } - if (init) { - handle(initFrame(init, 500)) - } - return { ...state, translator, requests, handle } -} diff --git a/src/main/claude/claude-context-usage-unloaded-turn.test.ts b/src/main/claude/claude-context-usage-unloaded-turn.test.ts deleted file mode 100644 index fcfcffed4aa..00000000000 --- a/src/main/claude/claude-context-usage-unloaded-turn.test.ts +++ /dev/null @@ -1,236 +0,0 @@ -import { agentSessionConversationView } from '../../shared/agent-session/lifecycle/agent-session-conversation-view' -import { - agentSessionLeaseFixture, - agentSessionRecordFixture -} from '../../shared/agent-session/lifecycle/agent-session-record.test-fixture' -import { mkdtemp, rm } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, beforeEach, describe, expect, it } from 'vitest' -import type { AgentSessionHistoryPage } from '../../shared/agent-session/agent-session-wire' -import { readAgentJournalTurn } from '../../shared/agent-session/lifecycle/agent-session-turn-record' -import { MAX_RETAINED_OWN_ITEMS } from '../../shared/agent-session/view/structured-agent-session-item-retention' -import { selectStructuredAgentContextUsage } from '../../shared/agent-session/structured-agent-session-context-usage' -import { - EMPTY_STRUCTURED_AGENT_SESSION, - reduceStructuredAgentSession, - type StructuredAgentSessionState -} from '../../shared/agent-session/structured-agent-session-reducer' -import type { AgentSessionJournal } from '../native-chat/agent-session-journal/journal-store' -import { createTrackedJournalOpener } from '../native-chat/agent-session-journal/store-lifecycle/journal-host-database-test-support' -import { readAgentSessionHistory } from '../native-chat/agent-session-wire/publication/history/agent-session-history-page' -import { createDeferredStructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import type { StructuredAgentSessionMutationContext } from '../native-chat/agent-session-wire/operations/structured-agent-session-mutation-context' -import { readStructuredAgentSessionOptions } from '../native-chat/agent-session-wire/options/structured-agent-session-options-read' -import { - assistantFrame, - initFrame, - resultFrame, - userFrame -} from './claude-context-usage-test-support' -import { createClaudeJournalTranslator } from './structured/journal/claude-structured-journal-translation' -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' -import { claudeAndCodexAgents } from '../native-chat/agent-session-wire/providers/testing/structured-agent-session-adapter-router-test-support' -import type { StructuredAgentRegistry } from '../native-chat/agent-session-wire/providers/structured-agent-registry' - -const SESSION = 'orca-session' -const journals = createTrackedJournalOpener() -let root: string - -beforeEach(async () => { - root = await mkdtemp(join(tmpdir(), 'orca-claude-context-unloaded-')) -}) - -afterEach(async () => { - await journals.closeAll() - await rm(root, { recursive: true, force: true }) -}) - -async function openJournal(): Promise { - return journals.open({ - identity: { - sessionId: SESSION, - workspaceId: 'workspace-1', - hostId: 'local', - agent: 'claude', - providerHandle: claudeProviderHandle('claude-session', null) - }, - now: () => 9_000, - stateDirectory: join(root, SESSION) - }) -} - -function translate(journal: AgentSessionJournal) { - const deferred = createDeferredStructuredAgentSessionEventSink(testEventSinkLogging()) - const translator = createClaudeJournalTranslator({ sink: deferred.sink, coalesceMs: 0 }) - deferred.bind({ journal, fence: 1, publish: () => {} }) - const settle = async (): Promise => { - await expect(deferred.drained()).resolves.toEqual({ ok: true }) - } - return { translator, settle } -} - -function runTurn( - translator: ReturnType['translator'], - turnId: string, - at: number, - sizes: number[] -): void { - translator.handle(initFrame('claude-fable-5-1[1m]', at - 100)) - translator.handle(userFrame(turnId, at)) - sizes.forEach((size, index) => { - translator.handle(assistantFrame(`${turnId}-reply-${index}`, at + 100 * (index + 1), size)) - }) -} - -function readOptions(journal: AgentSessionJournal, agents: StructuredAgentRegistry) { - const running = { - journal, - child: { fence: 1, generation: 'generation-1' }, - params: { provider: 'claude' } - } - const record = { - ...agentSessionRecordFixture(agentSessionLeaseFixture({ sessionId: SESSION, runtimeFence: 1 })), - options: { model: 'opus' } - } - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the options read touches only these members. - const context = { - deps: { - adapter: { - readOptions: async () => ({ models: [], current: { model: 'opus' } }) - }, - agents, - store: { - requireWritableRecord: () => record, - getConversation: () => agentSessionConversationView(record) - } - }, - serialize: (_sessionId: string, task: () => Promise) => task(), - openConversation: async () => running, - conversation: async () => running, - sessions: new Map([[SESSION, running]]) - } as unknown as StructuredAgentSessionMutationContext - return readStructuredAgentSessionOptions(context, SESSION, { readsWithoutModel: true }) -} - -function attachTail(journal: AgentSessionJournal, limit: number): StructuredAgentSessionState { - const read = readAgentSessionHistory(journal, { sessionId: SESSION, direction: 'tail', limit }) - if (!read.ok) { - throw new Error('tail read failed') - } - return reduceStructuredAgentSession(EMPTY_STRUCTURED_AGENT_SESSION, { - type: 'event', - event: { type: 'snapshot', sessionId: SESSION, fence: 1, page: read.page } - }) -} - -function applyLive( - journal: AgentSessionJournal, - state: StructuredAgentSessionState -): StructuredAgentSessionState { - const read = readAgentSessionHistory(journal, { - sessionId: SESSION, - direction: 'after', - cursor: state.cursor ?? undefined - }) - if (!read.ok) { - throw new Error('live read failed') - } - const page: AgentSessionHistoryPage = read.page - return reduceStructuredAgentSession(state, { - type: 'event', - event: { - type: 'batch', - sessionId: SESSION, - batch: { - cursor: page.window.nextCursor, - items: page.items, - removedItemIds: page.removedItemIds, - submissions: page.submissions - } - } - }) -} - -const hasTurnRow = (state: StructuredAgentSessionState): boolean => - state.items.some((item) => readAgentJournalTurn(item.body) !== null) - -function catchUp( - journal: AgentSessionJournal, - state: StructuredAgentSessionState -): StructuredAgentSessionState { - let next = applyLive(journal, state) - while (next.cursor?.sequence !== state.cursor?.sequence) { - state = next - next = applyLive(journal, state) - } - return next -} - -describe('context usage for a turn row outside the loaded page', () => { - it('marks a live context write on a turn row the window cannot take, and the host answer carries it', async () => { - const journal = await openJournal() - const { translator, settle } = translate(journal) - runTurn(translator, 'turn-a', 1_000, [120_000, 130_000, 140_000, 150_000]) - translator.handle(resultFrame(2_000, { 'claude-fable-5-1[1m]': { contextWindow: 1_000_000 } })) - runTurn(translator, 'turn-b', 3_000, [200_000, 210_000, 220_000, 230_000]) - await settle() - const attached = attachTail(journal, 3) - expect(hasTurnRow(attached)).toBe(false) - expect(attached.unloadedTurnRevisions).toBeUndefined() - - translator.handle(assistantFrame('turn-b-reply-late', 4_000, 250_000)) - await settle() - const live = applyLive(journal, attached) - - expect(hasTurnRow(live)).toBe(false) - expect(live.unloadedTurnRevisions).toBe(1) - const options = await readOptions(journal, claudeAndCodexAgents()) - expect( - selectStructuredAgentContextUsage(live.items, options.contextUsage?.current) - ).toMatchObject({ usedTokens: 250_000, windowTokens: 1_000_000 }) - }) - - it('keeps the ring on the newest facts while a live turn outgrows the retained window', async () => { - const journal = await openJournal() - const { translator, settle } = translate(journal) - runTurn(translator, 'turn-a', 1_000, [120_000]) - translator.handle(resultFrame(2_000, { 'claude-fable-5-1[1m]': { contextWindow: 1_000_000 } })) - runTurn(translator, 'turn-b', 3_000, []) - await settle() - const hostAnswer = async () => - (await readOptions(journal, claudeAndCodexAgents())).contextUsage?.current - let state = attachTail(journal, 200) - let host = await hostAnswer() - const respond = (index: number): void => { - translator.handle(assistantFrame(`turn-b-reply-${index}`, 4_000 + index, 200_000 + index)) - } - let index = 0 - for (; index < MAX_RETAINED_OWN_ITEMS - 20; index += 1) { - respond(index) - if (index % 100 === 99) { - await settle() - } - } - await settle() - state = catchUp(journal, state) - expect(hasTurnRow(state)).toBe(true) - - let stepsAfterTrim = 0 - while (stepsAfterTrim < 5 && index < 3_000) { - respond(index++) - await settle() - const seen = state.unloadedTurnRevisions - state = catchUp(journal, state) - if (state.unloadedTurnRevisions !== seen) { - host = await hostAnswer() - } - expect(selectStructuredAgentContextUsage(state.items, host)).toEqual( - selectStructuredAgentContextUsage(journal.snapshot().items) - ) - stepsAfterTrim += hasTurnRow(state) ? 0 : 1 - } - expect(hasTurnRow(state)).toBe(false) - }) -}) diff --git a/src/main/claude/claude-descendant-escalation-boundary.test.ts b/src/main/claude/claude-descendant-escalation-boundary.test.ts deleted file mode 100644 index 590a3fd45cf..00000000000 --- a/src/main/claude/claude-descendant-escalation-boundary.test.ts +++ /dev/null @@ -1,105 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' -import { terminateDescendantSnapshotWithVerdict } from '../pty/process-retirement/pty-descendant-exit-verification' -import { - collectDescendantRows, - type DescendantSnapshot -} from '../pty/process-retirement/pty-descendant-termination' -import type { ProcessTableRow } from '../pty/process-retirement/pty-process-table-parser' -import { createClaudeChildTreeReaper } from './claude-agent-sdk-exit-proof' - -const ROOT_PID = 500 -const ORCA_PGID = 400 -const ROOT_STARTED_AT = 'Thu Sep 3 18:04:50 2026' -const WALK_SECOND = 'Thu Sep 3 18:05:04 2026' -const WALK_MS = Date.parse(WALK_SECOND) -const EARLIER_SECOND = 'Thu Sep 3 18:05:03 2026' - -/** The measured split: `s20` at :03.946 died, `s21` at :04.042 leaked. */ -const EARLIER_BORN = [700, 701, 702] -const WALK_SECOND_BORN = [721, 722, 723, 724] - -type Cohort = { pids: number[]; startedAt: string } - -const LIVE_TREE: Cohort[] = [ - { pids: EARLIER_BORN, startedAt: EARLIER_SECOND }, - { pids: WALK_SECOND_BORN, startedAt: WALK_SECOND } -] - -function rowsFor(cohorts: Cohort[]): ProcessTableRow[] { - return [ - { pid: ROOT_PID, ppid: 1, pgid: ORCA_PGID, startedAt: ROOT_STARTED_AT }, - ...cohorts.flatMap((cohort) => - cohort.pids.map((pid) => ({ - pid, - ppid: ROOT_PID, - pgid: ORCA_PGID, - startedAt: cohort.startedAt - })) - ) - ] -} - -function walk(capturedAtMs: number, cohorts: Cohort[] = LIVE_TREE): DescendantSnapshot { - return collectDescendantRows(ROOT_PID, rowsFor(cohorts), capturedAtMs) -} - -function killedPids(calls: [number, NodeJS.Signals][]): number[] { - return calls.flatMap(([pid, signal]) => (signal === 'SIGKILL' ? [pid] : [])).sort((a, b) => a - b) -} - -function signalledPids(calls: [number, NodeJS.Signals][]): number[] { - return calls.flatMap(([pid, signal]) => (signal === 'SIGTERM' ? [pid] : [])).sort((a, b) => a - b) -} - -/** Descendants survive SIGTERM in the mock table, forcing the real verifier to escalate. */ -async function sweep( - captures: DescendantSnapshot[], - liveTree: Cohort[] = LIVE_TREE -): Promise<[number, NodeJS.Signals][]> { - const calls: [number, NodeJS.Signals][] = [] - const captureDescendants = vi.fn() - for (const capture of captures) { - captureDescendants.mockResolvedValueOnce(capture) - } - const tree = createClaudeChildTreeReaper( - { pid: ROOT_PID, kill: vi.fn(() => true) }, - { - site: 'claude-structured-child-close', - platform: 'linux', - exited: () => false, - captureDescendants, - terminateDescendants: (snapshot) => - terminateDescendantSnapshotWithVerdict(snapshot, { - requireIdentityBeforeSignal: true, - graceMs: 0, - verifyMs: 120, - sendSignal: (pid, signal) => calls.push([pid, signal]), - readTable: async () => ({ rows: rowsFor(liveTree), capturedAtMs: Date.now() }) - }) - } - ) - await tree.capture() - await tree.refresh?.() - await tree.reap() - return calls -} - -describe('Claude descendant forced-sweep fence', () => { - it('escalates a descendant forked in the same second as both close walks', async () => { - const calls = await sweep([walk(WALK_MS + 42), walk(WALK_MS + 140)]) - - expect(signalledPids(calls)).toEqual([...EARLIER_BORN, ...WALK_SECOND_BORN]) - expect(killedPids(calls)).toEqual([...EARLIER_BORN, ...WALK_SECOND_BORN]) - }) - - it('withholds the sweep from a row no walk re-derived, on its start second alone', async () => { - const retained = { pids: [900], startedAt: WALK_SECOND } - const firstWalk = walk(WALK_MS + 42, [...LIVE_TREE, retained]) - const refresh = walk(WALK_MS + 140) - - const calls = await sweep([firstWalk, refresh], [...LIVE_TREE, retained]) - - expect(signalledPids(calls)).toEqual([...EARLIER_BORN, ...WALK_SECOND_BORN, 900]) - expect(killedPids(calls)).toEqual([...EARLIER_BORN, ...WALK_SECOND_BORN]) - }) -}) diff --git a/src/main/claude/claude-fold-steer-frame-builders.test-fixture.ts b/src/main/claude/claude-fold-steer-frame-builders.test-fixture.ts deleted file mode 100644 index 39e966eed21..00000000000 --- a/src/main/claude/claude-fold-steer-frame-builders.test-fixture.ts +++ /dev/null @@ -1,177 +0,0 @@ -// Rebuild fold-steer captures with only dispatch and turn fields. - -export type CapturedFoldFrame = { at: number; frame: Record } - -export type FoldCaptureIds = { - sessionId: string - /** Turn-opening client UUID adopted by the replay. */ - first: string - steer: string - /** Present only for two-steer captures. */ - secondSteer?: string -} - -export function userReplay( - at: number, - sessionId: string, - uuid: string, - text: string -): CapturedFoldFrame { - return { - at, - frame: { - type: 'user', - session_id: sessionId, - parent_tool_use_id: null, - uuid, - isReplay: true, - message: { role: 'user', content: [{ type: 'text', text }] } - } - } -} - -export function assistant( - at: number, - sessionId: string, - uuid: string, - content: unknown[], - userMessageUuids?: string[] -): CapturedFoldFrame { - return { - at, - frame: { - type: 'assistant', - session_id: sessionId, - parent_tool_use_id: null, - uuid, - message: { id: `msg-${uuid}`, role: 'assistant', content }, - ...(userMessageUuids && userMessageUuids.length > 0 - ? { user_message_uuid: userMessageUuids[0], user_message_uuids: userMessageUuids } - : {}) - } - } -} - -export function assistantToolUse( - at: number, - sessionId: string, - uuid: string, - toolUseId: string, - userMessageUuids?: string[] -): CapturedFoldFrame { - return assistant( - at, - sessionId, - uuid, - [{ type: 'tool_use', id: toolUseId, name: 'Bash', input: { command: 'sleep 5' } }], - userMessageUuids - ) -} - -export function assistantText( - at: number, - sessionId: string, - uuid: string, - text: string, - userMessageUuids?: string[] -): CapturedFoldFrame { - return assistant(at, sessionId, uuid, [{ type: 'text', text }], userMessageUuids) -} - -export function toolResult( - at: number, - sessionId: string, - uuid: string, - toolUseId: string, - content = '(Bash completed with no output)', - isError = false -): CapturedFoldFrame { - return { - at, - frame: { - type: 'user', - session_id: sessionId, - parent_tool_use_id: null, - uuid, - message: { - role: 'user', - content: [{ type: 'tool_result', tool_use_id: toolUseId, content, is_error: isError }] - } - } - } -} - -export function resultFrame( - at: number, - sessionId: string, - uuid: string, - fields: { - userMessageUuids: string[] - durationMs: number - numTurns: number - subtype?: string - isError?: boolean - terminalReason?: string - } -): CapturedFoldFrame { - return { - at, - frame: { - type: 'result', - subtype: fields.subtype ?? 'success', - session_id: sessionId, - uuid, - is_error: fields.isError ?? false, - terminal_reason: fields.terminalReason ?? 'completed', - duration_ms: fields.durationMs, - num_turns: fields.numTurns, - result: 'FIRST DONE', - ...(fields.userMessageUuids.length > 0 - ? { - user_message_uuid: fields.userMessageUuids[0], - user_message_uuids: fields.userMessageUuids - } - : {}) - } - } -} - -export function sessionIdle(at: number, sessionId: string): CapturedFoldFrame { - return { - at, - frame: { - type: 'system', - subtype: 'session_state_changed', - state: 'idle', - session_id: sessionId, - uuid: `ssc-idle-${at}` - } - } -} - -/** Root init marks each request cycle, including background wakes and manual compaction (p3 captures). */ -export function initFrame(at: number, sessionId: string): CapturedFoldFrame { - return { - at, - frame: { - type: 'system', - subtype: 'init', - session_id: sessionId, - uuid: `init-${at}`, - model: 'claude-sonnet-5', - apiKeySource: 'none' - } - } -} - -export function taskFrame( - at: number, - sessionId: string, - subtype: string, - fields: Record -): CapturedFoldFrame { - return { - at, - frame: { type: 'system', subtype, session_id: sessionId, uuid: `${subtype}-${at}`, ...fields } - } -} diff --git a/src/main/claude/claude-fold-steer-receipt.test.ts b/src/main/claude/claude-fold-steer-receipt.test.ts deleted file mode 100644 index 334c307736d..00000000000 --- a/src/main/claude/claude-fold-steer-receipt.test.ts +++ /dev/null @@ -1,272 +0,0 @@ -// Replay orders captured from Claude CLI 2.1.280; synthetic boundary cases are labeled separately. - -import { describe, expect, it, vi, type Mock } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalMessageItem -} from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import { readAgentJournalTurn } from '../../shared/agent-session/lifecycle/agent-session-turn-record' -import { ClaudeStructuredSessionAdapter } from './structured/claude-structured-session-adapter' -import type { - ClaudeStructuredSessionAdapterDeps, - ClaudeStructuredSessionEvent -} from './structured/claude-structured-session-state' -import type { ClaudeStructuredLaunch } from './structured/launch/claude-structured-launch-resolution' -import { - fakeClaude, - identityFor, - PROVIDER_SESSION_ID -} from './structured/claude-structured-session-test-support' -import { claudeStartupSettled } from './structured/claude-structured-startup-settled-test-support' -import { - assistantText, - initFrame, - resultFrame, - userReplay, - type CapturedFoldFrame -} from './claude-fold-steer-frame-builders.test-fixture' -import { - FIRST_PROMPT, - SECOND_STEER_PROMPT, - STEER_PROMPT, - twoSteersCapture, - TWO_STEERS_SEND_AT -} from './claude-captured-fold-steer-frames.test-fixture' - -const T0 = 1_700_000_100_000 - -type Rig = { - adapter: ClaudeStructuredSessionAdapter - claude: ReturnType - events: ClaudeStructuredSessionEvent[] - settled: Mock - turns: () => NonNullable>[] - deliver: (captured: CapturedFoldFrame) => void - /** Dispatch at the capture offset and return the client UUID adopted by the CLI. */ - dispatchAt: (at: number, clientMessageId: string, text: string) => Promise -} - -async function riggedAdapter( - launch: Partial = {}, - claudeOptions: Parameters[0] = {} -): Promise { - let nowMs = T0 - const appended: { identity: AgentJournalItemIdentity; body: AgentJournalItemBody }[] = [] - const sink: StructuredAgentSessionEventSink = { - appendItem: (identity, body) => appended.push({ identity, body }), - appendTombstone: () => {}, - publish: () => {} - } - const events: ClaudeStructuredSessionEvent[] = [] - const settled = vi.fn() - const claude = fakeClaude({ replayUuid: null, ...claudeOptions }) - const deps: ClaudeStructuredSessionAdapterDeps = { - resolveLaunch: async () => ({ - pathToClaudeCodeExecutable: 'claude', - options: {}, - cwd: '/work/repo', - claudeConfigDir: '/accounts/claude', - providerSessionId: PROVIDER_SESSION_ID, - resumeLeafUuid: null, - resumesTranscript: false, - cliFlag: async () => 'supported' as const, - continuesChain: false, - ...launch - }), - onEvent: (event) => events.push(event), - openConnection: claude.openConnection, - readProcessStartTime: async () => T0 - 1_000, - now: () => nowMs, - persistHandle: async () => {}, - onDispatchSettledLate: settled - } - const adapter = new ClaudeStructuredSessionAdapter(deps) - await adapter.acquire({ identity: identityFor(), fence: 7, spawnToken: 'spawn-9', events: sink }) - await claudeStartupSettled(adapter, 'session-1') - return { - adapter, - claude, - events, - settled, - turns: () => - appended.flatMap((item) => { - const turn = readAgentJournalTurn(item.body) - return turn ? [turn] : [] - }), - deliver: (captured) => { - nowMs = T0 + captured.at - claude.connections[0]!.handlers.onMessage?.(captured.frame) - }, - dispatchAt: async (at, clientMessageId, text) => { - nowMs = T0 + at - const body: AgentJournalMessageItem = { - kind: 'message', - role: 'user', - blocks: [{ type: 'text', text }] - } - const outcome = await adapter.dispatch({ - sessionId: 'session-1', - clientMessageId, - body, - requestedAt: nowMs, - fence: 7 - }) - expect(outcome).toMatchObject({ state: 'admitted' }) - const sentUuid = claude.connections[0]!.sent.at(-1)?.uuid - if (typeof sentUuid !== 'string') { - throw new Error('the fake connection recorded no sent uuid') - } - return sentUuid - } - } -} - -function replayEventFor(events: ClaudeStructuredSessionEvent[], uuid: string) { - return events.find( - (event) => - event.type === 'message' && event.message.type === 'user' && event.message.uuid === uuid - ) -} - -describe('Claude fold receipt for a mid-turn send (captured orders)', () => { - it('two-steers: both folded sends settle individually inside the one turn', async () => { - const rig = await riggedAdapter() - const first = await rig.dispatchAt(TWO_STEERS_SEND_AT.first, 'client-first', FIRST_PROMPT) - const framesFor = (steerUuid: string, secondSteerUuid: string) => - twoSteersCapture({ - sessionId: PROVIDER_SESSION_ID, - first, - steer: steerUuid, - secondSteer: secondSteerUuid - }) - for (const captured of framesFor('pending', 'pending-2')) { - if (captured.at < TWO_STEERS_SEND_AT.steer) { - rig.deliver(captured) - } - } - const steer = await rig.dispatchAt(TWO_STEERS_SEND_AT.steer, 'client-steer', STEER_PROMPT) - const secondSteer = await rig.dispatchAt( - TWO_STEERS_SEND_AT.secondSteer, - 'client-steer-2', - SECOND_STEER_PROMPT - ) - for (const captured of framesFor(steer, secondSteer)) { - if (captured.at > TWO_STEERS_SEND_AT.secondSteer) { - rig.deliver(captured) - } - } - - expect([...new Set(rig.turns().map((turn) => turn.turnId))]).toEqual([first]) - expect(rig.turns().every((turn) => turn.state !== 'interrupted')).toBe(true) - expect(rig.settled).toHaveBeenCalledWith({ - sessionId: 'session-1', - clientMessageId: 'client-steer', - providerIdentity: { provider: 'claude', sessionId: PROVIDER_SESSION_ID, uuid: steer } - }) - expect(rig.settled).toHaveBeenCalledWith({ - sessionId: 'session-1', - clientMessageId: 'client-steer-2', - providerIdentity: { provider: 'claude', sessionId: PROVIDER_SESSION_ID, uuid: secondSteer } - }) - }) - - it('mid-turn auto-compaction emits no root init, so a steer after the boundary still folds', async () => { - // Captured with forced auto-compaction (p4): compacting, boundary, and synthetic continuation have no root init. - const rig = await riggedAdapter() - const first = await rig.dispatchAt(14, 'client-first', FIRST_PROMPT) - rig.deliver(initFrame(234, PROVIDER_SESSION_ID)) - rig.deliver(userReplay(2_437, PROVIDER_SESSION_ID, first, FIRST_PROMPT)) - rig.deliver(assistantText(2_864, PROVIDER_SESSION_ID, 'reply-1', 'reading files')) - rig.deliver({ - at: 11_518, - frame: { - type: 'system', - subtype: 'status', - status: 'compacting', - session_id: PROVIDER_SESSION_ID, - uuid: 'status-compacting-1' - } - }) - rig.deliver({ - at: 26_584, - frame: { - type: 'system', - subtype: 'compact_boundary', - session_id: PROVIDER_SESSION_ID, - uuid: 'compact-boundary-1', - compact_metadata: { trigger: 'auto', pre_tokens: 69_960, post_tokens: 9_311 } - } - }) - rig.deliver({ - at: 26_585, - frame: { - type: 'user', - session_id: PROVIDER_SESSION_ID, - parent_tool_use_id: null, - uuid: 'continuation-1', - isSynthetic: true, - message: { - role: 'user', - content: [{ type: 'text', text: 'This session is being continued.' }] - } - } - }) - const steer = await rig.dispatchAt(26_987, 'client-steer', STEER_PROMPT) - rig.deliver(userReplay(34_601, PROVIDER_SESSION_ID, steer, STEER_PROMPT)) - rig.deliver(assistantText(37_824, PROVIDER_SESSION_ID, 'reply-2', 'FIRST DONE banana')) - rig.deliver( - resultFrame(37_828, PROVIDER_SESSION_ID, 'result-1', { - userMessageUuids: [first, steer], - durationMs: 37_616, - numTurns: 6 - }) - ) - - expect([...new Set(rig.turns().map((turn) => turn.turnId))]).toEqual([first]) - expect(rig.turns().every((turn) => turn.state !== 'interrupted')).toBe(true) - expect(replayEventFor(rig.events, steer)).not.toHaveProperty('startsTurn') - expect(rig.settled).toHaveBeenCalledWith({ - sessionId: 'session-1', - clientMessageId: 'client-steer', - providerIdentity: { provider: 'claude', sessionId: PROVIDER_SESSION_ID, uuid: steer } - }) - }) -}) - -describe('Claude fold receipt boundaries (synthetic orders)', () => { - it('a fresh replay uuid with user_message_uuid correlation keeps the opener path, not a fold receipt', async () => { - const rig = await riggedAdapter() - const uuidA = await rig.dispatchAt(10, 'client-a', 'first prompt') - rig.deliver(userReplay(1_000, PROVIDER_SESSION_ID, uuidA, 'first prompt')) - const uuidB = await rig.dispatchAt(1_500, 'client-b', STEER_PROMPT) - const fresh = userReplay(2_000, PROVIDER_SESSION_ID, 'fresh-turn-2', STEER_PROMPT) - rig.deliver({ ...fresh, frame: { ...fresh.frame, user_message_uuid: uuidB } }) - - expect([...new Set(rig.turns().map((turn) => turn.turnId))]).toEqual([uuidA, 'fresh-turn-2']) - expect(replayEventFor(rig.events, 'fresh-turn-2')).toMatchObject({ startsTurn: true }) - expect(rig.settled).toHaveBeenCalledWith({ - sessionId: 'session-1', - clientMessageId: 'client-b', - providerIdentity: { provider: 'claude', sessionId: PROVIDER_SESSION_ID, uuid: 'fresh-turn-2' } - }) - }) - - it('plural result uuids: a result naming only settled sends does not claim an unnamed live waiter by queue order', async () => { - const rig = await riggedAdapter() - const uuidA = await rig.dispatchAt(10, 'client-a', 'first prompt') - rig.deliver(userReplay(1_000, PROVIDER_SESSION_ID, uuidA, 'first prompt')) - await rig.dispatchAt(1_500, 'client-b', STEER_PROMPT) - rig.deliver( - resultFrame(5_000, PROVIDER_SESSION_ID, 'result-1', { - userMessageUuids: [uuidA], - durationMs: 4_990, - numTurns: 1 - }) - ) - expect(rig.settled).not.toHaveBeenCalledWith( - expect.objectContaining({ clientMessageId: 'client-b' }) - ) - }) -}) diff --git a/src/main/claude/claude-hook-event-versions.test.ts b/src/main/claude/claude-hook-event-versions.test.ts deleted file mode 100644 index 477c7b795bc..00000000000 --- a/src/main/claude/claude-hook-event-versions.test.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' -import { runProcess } from '@orca/process-host' -import { readManagedHookDetectionResult } from '../agent-hooks/installation/managed-hook-detection-commands' -import { getClaudeManagedHookPlan } from './claude-managed-hook-events' - -vi.mock('@orca/process-host', () => ({ runProcess: vi.fn() })) - -import { parseClaudeCliVersionOutput, probeClaudeCliVersion } from './claude-hook-event-versions' - -describe('identified Claude version output', () => { - // Recorded macOS 2.1.310 / Windows 2.1.221 probes; historical releases' CLI source - // registers the same suffix (1.0.23, 1.0.64, 2.0.0 and 2.1.100). - it.each([ - ['2.1.310 (Claude Code)\n', '', '2.1.310', 16, 0], - ['2.1.221 (Claude Code)\n', '', '2.1.221', 15, 1], - ['1.0.23 (Claude Code)', '', '1.0.23', 2, 14], - ['1.0.64 (Claude Code)', '', '1.0.64', 6, 10], - ['2.0.0 (Claude Code)', '', '2.0.0', 6, 10], - ['2.1.100 (Claude Code)', '', '2.1.100', 14, 2], - ['launcher 11.17.0\n1.0.64 (Claude Code)', '', '1.0.64', 6, 10], - ['launcher 0.1.0\n2.1.310 (Claude Code)', '', '2.1.310', 16, 0], - ['launcher 0.1.0', '2.1.310 (Claude Code)\n', '2.1.310', 16, 0], - ['', '2.1.310 (Claude Code)\n', '2.1.310', 16, 0], - ['2.1.94-rc.1+build.2 (Claude Code)', '', '2.1.94-rc.1+build.2', 14, 2], - ['11.17.0\n', '', null, 6, 0], - ['2.30.0', '', null, 6, 0], - ['2.1.310\nwrapper for (Claude Code)', '', null, 6, 0], - ['2.1.310\n(Claude Code)', '', null, 6, 0], - ['2.1 (Claude Code)', '', null, 6, 0] - ] as const)( - 'uses the identified version and hook plan for stdout=%s stderr=%s', - async (stdout, stderr, expected, installs, retirements) => { - vi.mocked(runProcess).mockResolvedValue({ - stdout, - stderr, - code: 0, - signal: null, - timedOut: false - }) - const local = await probeClaudeCliVersion('/bin/claude') - // Older guests send combined raw output, not canonical stored semver. - const remote = readManagedHookDetectionResult({ - agents: ['claude'], - versions: { claude: `${stdout}\n${stderr}` } - }) - expect(remote.agents).toEqual(['claude']) - expect(parseClaudeCliVersionOutput(`${stdout}\n${stderr}`)).toBe(expected) - for (const version of [local, remote.claudeVersion]) { - expect(version).toBe(expected) - const plan = getClaudeManagedHookPlan(version) - expect(plan.install).toHaveLength(installs) - expect(plan.retire).toHaveLength(retirements) - expect(plan.statusLine).toBe(expected === '1.0.23' ? 'retire' : 'install') - } - } - ) - - it('does not accept marked output from a failed probe', async () => { - vi.mocked(runProcess).mockResolvedValue({ - stdout: '2.1.310 (Claude Code)\n', - stderr: '', - code: 1, - signal: null, - timedOut: false - }) - expect(await probeClaudeCliVersion('/bin/claude')).toBeNull() - }) -}) diff --git a/src/main/claude/claude-journal-bound-delivery.test.ts b/src/main/claude/claude-journal-bound-delivery.test.ts deleted file mode 100644 index 6c14507c9cf..00000000000 --- a/src/main/claude/claude-journal-bound-delivery.test.ts +++ /dev/null @@ -1,112 +0,0 @@ -import { expect, it, vi } from 'vitest' -import { ClaudeJournalBoundDelivery } from './claude-journal-bound-delivery' -import { bindClaudeJournalReadingControl } from './structured/journal/claude-structured-session-journal-control' -import type { - StructuredAgentSessionEventSink, - StructuredAgentSessionReadingControl -} from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' - -function unboundSink() { - let notify: (() => void) | undefined - let control: StructuredAgentSessionReadingControl | undefined - let bound = false - const sink: StructuredAgentSessionEventSink = { - appendItem: () => {}, - appendTombstone: () => {}, - publish: () => {}, - onJournalBound: (listener) => { - notify = listener - return () => { - notify = undefined - } - }, - journalLinkage: () => - bound - ? { - epoch: 'test', - visitItemsWithLinkage: () => {}, - threadGoal: () => null, - threadGoalSource: () => ({ goal: null, row: null }) - } - : null, - bindReadingControl: (next) => { - control = next - return () => {} - } - } - return { - sink, - bind: () => { - bound = true - notify?.() - }, - pressure: (paused: boolean) => control?.[paused ? 'pauseReading' : 'resumeReading']() - } -} - -it('holds ordered interpretation until binding while preserving independent sink pressure', () => { - const state = unboundSink() - let published = false - const delivery = new ClaudeJournalBoundDelivery(state.sink, () => published) - const connection = { pauseReading: vi.fn(), resumeReading: vi.fn() } - bindClaudeJournalReadingControl(state.sink, connection, null, delivery) - const observed: string[] = [] - delivery.deliver(() => { - observed.push('start') - delivery.deliver(() => observed.push('later')) - }) - delivery.deliver(() => observed.push('terminal')) - published = true - delivery.flush() - state.pressure(true) - expect(observed).toEqual([]) - state.bind() - expect(observed).toEqual(['start', 'terminal', 'later']) - expect(connection.resumeReading).not.toHaveBeenCalled() - state.pressure(false) - expect(connection.resumeReading).toHaveBeenCalledOnce() -}) - -it('terminates the uncommitted prefix on disposal and ignores a late binding', () => { - const state = unboundSink() - const delivery = new ClaudeJournalBoundDelivery(state.sink) - const interpret = vi.fn() - delivery.deliver(interpret) - delivery.dispose() - state.bind() - delivery.deliver(interpret) - expect(interpret).not.toHaveBeenCalled() -}) - -it('fails a bounded unbound prefix instead of silently losing or replaying observations', () => { - const state = unboundSink() - const delivery = new ClaudeJournalBoundDelivery(state.sink) - const failure = vi.fn() - const interpret = vi.fn() - delivery.onFailure = failure - const payload = 'x'.repeat(1024 * 1024) - expect(() => { - for (let index = 0; index < 33; index++) { - delivery.deliver(interpret, payload) - } - }).toThrow('capacity exceeded') - state.bind() - expect(failure).toHaveBeenCalledOnce() - expect(interpret).not.toHaveBeenCalled() -}) - -it('reports binding interpretation failure through its owning failure path', () => { - const state = unboundSink() - const delivery = new ClaudeJournalBoundDelivery(state.sink) - const failure = vi.fn() - delivery.onFailure = failure - const error = new Error('invalid saved identity') - delivery.deliver(() => { - throw error - }) - const later = vi.fn() - delivery.deliver(later) - expect(() => state.bind()).not.toThrow() - expect(failure).toHaveBeenCalledWith(error) - expect(later).not.toHaveBeenCalled() -}) diff --git a/src/main/claude/claude-model-catalog-probe.test.ts b/src/main/claude/claude-model-catalog-probe.test.ts deleted file mode 100644 index e807112bf26..00000000000 --- a/src/main/claude/claude-model-catalog-probe.test.ts +++ /dev/null @@ -1,154 +0,0 @@ -import { chmodSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { describe, expect, it } from 'vitest' -import { PROVIDER_STDIN_END_GRACE_MS } from '../provider-process/provider-process-supervisor' -import { createClaudeModelCatalogProbe } from './claude-model-catalog-probe' -import { resolveStructuredAgentCommand } from '../native-chat/structured-agent-command-resolution' -import type { runAgentModelCatalogListing } from '../native-chat/agent-model-catalog/agent-model-catalog-probe-runner' - -type ListingCall = Parameters - -const AUTH_POLICY = { account: 'system' } as const - -const HOME = (path: string): { variable: string; path: string } => ({ - variable: 'CLAUDE_CONFIG_DIR', - path -}) - -function probeDeps(command = `"${process.execPath}"`): { - resolveCommand: () => { command: string; prefixArgs: string[] } - resolveEnv: () => Record - resolveInheritedEnv: () => Promise> - resolveAuthPolicy: () => typeof AUTH_POLICY -} { - return { - resolveCommand: () => - resolveStructuredAgentCommand('claude', { - agentCmdOverrides: { claude: command } - }), - resolveEnv: () => ({ ANTHROPIC_MODEL_GATEWAY: 'https://gateway.example' }), - resolveInheritedEnv: async () => ({ PATH: '/resolved/bin', HOME: '/homes/user' }), - resolveAuthPolicy: () => AUTH_POLICY - } -} - -const LISTED = `${JSON.stringify({ - type: 'control_response', - response: { - subtype: 'success', - request_id: 'orca-model-discovery', - response: { - models: [ - { - value: 'sonnet', - displayName: 'Sonnet', - supportsEffort: true, - supportedEffortLevels: ['low'] - } - ] - } - } -})}\n` - -describe('claude model catalog probe', () => { - it.each([ - [[], [], ['/orca-probe', '/orca-probe'], 'user,project,local'], - [['node_modules/claude/cli.js'], [], ['/chat-a', '/chat-b'], 'user'], - [[], ['--settings', 'settings.json'], ['/chat-a', '/chat-b'], 'user'] - ])( - 'lists prefix %j with arguments %j from %j, reading %s settings', - async (prefixArgs, launchArgs, listedIn, sources) => { - // A user command line may name files in the chat's folder, so it runs there, but reads only - // user settings there so the project's own settings never narrow the account's list. - const calls: ListingCall[] = [] - const probe = createClaudeModelCatalogProbe({ - ...probeDeps(), - resolveCommand: () => ({ command: process.execPath, prefixArgs }), - resolveLaunchArgs: async () => launchArgs, - runListing: async (...call) => { - calls.push(call) - return LISTED - } - }) - const identities: unknown[] = [] - for (const folder of ['/chat-a', '/chat-b']) { - const resolved = await probe.resolve?.( - HOME('/homes/a'), - '/orca-probe', - 'snapshot', - undefined, - folder - ) - identities.push(resolved?.identity) - await resolved?.run() - } - expect(calls.map(([launch]) => launch.cwd)).toEqual(listedIn) - const args = calls[0]?.[0].args ?? [] - expect(args.slice(0, prefixArgs.length)).toEqual(prefixArgs) - expect(args.slice(args.length - launchArgs.length)).toEqual(launchArgs) - expect(args[args.indexOf('--setting-sources') + 1]).toBe(sources) - expect(JSON.stringify(identities[0]) === JSON.stringify(identities[1])).toBe( - listedIn[0] === listedIn[1] - ) - } - ) - - it.runIf(process.platform !== 'win32')( - 'lists through a supervised one-shot that answers after its input ends', - async () => { - const folder = mkdtempSync(join(tmpdir(), 'orca-claude-probe-')) - try { - const parentFile = join(folder, 'parent-pid') - const standIn = join(folder, 'claude') - // Delay beyond the stdin-end grace to verify supervised one-shot lifetime. - writeFileSync( - standIn, - `#!${process.execPath} -let input = '' -process.stdin.on('data', (chunk) => (input += chunk)) -process.stdin.on('end', () => setTimeout(() => { - require('node:fs').writeFileSync(${JSON.stringify(parentFile)}, String(process.ppid)) - const request = JSON.parse(input.trim().split('\\n').find(line => line.includes('list_models'))) - if (request.request.subtype !== 'list_models') process.exit(2) - console.log(JSON.stringify({ type: 'control_response', response: { subtype: 'success', - request_id: request.request_id, response: { models: [{ value: 'sonnet', displayName: 'Sonnet' }] } } })) -}, ${PROVIDER_STDIN_END_GRACE_MS * 1.5})) -` - ) - chmodSync(standIn, 0o755) - const probe = createClaudeModelCatalogProbe({ - ...probeDeps(), - resolveCommand: () => ({ command: standIn, prefixArgs: [] }), - resolveInheritedEnv: async () => ({ PATH: process.env.PATH ?? '', HOME: folder }) - }) - - await expect(probe(HOME(join(folder, 'account')))).resolves.toMatchObject({ - origin: 'probe', - models: [{ id: 'sonnet', label: 'Sonnet' }] - }) - expect(Number(readFileSync(parentFile, 'utf8'))).not.toBe(process.pid) - } finally { - rmSync(folder, { recursive: true, force: true }) - } - } - ) -}) - -describe('Claude catalog availability', () => { - it('says the CLI is missing when the resolved executable is not there', async () => { - const folder = mkdtempSync(join(tmpdir(), 'orca-claude-missing-')) - try { - const missing = join(folder, 'claude with spaces', 'claude') - const probe = createClaudeModelCatalogProbe({ - ...probeDeps(), - resolveCommand: () => ({ command: missing, prefixArgs: [] }) - }) - await expect(probe(HOME('/homes/a'))).rejects.toMatchObject({ - unavailable: { reason: 'cliMissing' } - }) - } finally { - rmSync(folder, { recursive: true, force: true }) - } - }) -}) diff --git a/src/main/claude/claude-naming-invocation.test.ts b/src/main/claude/claude-naming-invocation.test.ts deleted file mode 100644 index 3e5fd87360d..00000000000 --- a/src/main/claude/claude-naming-invocation.test.ts +++ /dev/null @@ -1,83 +0,0 @@ -import { mkdtemp, rm } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { expect, it, vi } from 'vitest' -import { ClaudeProfileRouter } from '../claude-accounts/profiles/routing/claude-profile-router' -import * as installedRouter from '../claude-accounts/profiles/routing/claude-profile-installed-router' -import { agentSessionRecordFixture } from '../native-chat/agent-session-record-test-fixture' -import type { StructuredAgentLaunchSources } from '../runtime/agent-session/launch/structured-agent-launch-composition' -import { claudeNamingInvocation } from './claude-naming-invocation' - -it('captures configured command, overlay and pure selected-account policy before awaited input resolution', async ({ - onTestFinished -}) => { - const root = await mkdtemp(join(tmpdir(), 'orca-naming-inputs-')) - onTestFinished(async () => { - vi.restoreAllMocks() - await rm(root, { recursive: true, force: true }) - }) - const router = new ClaudeProfileRouter({ - getSettings: () => ({ - claudeManagedAccounts: [], - activeClaudeManagedAccountId: null, - agentStatusHooksEnabled: false, - disabledTuiAgents: [] - }), - dataRoot: root, - userHome: root, - env: {} - }) - const selected = join(root, 'selected-account') - const later = join(root, 'later-account') - const preparation = vi.spyOn(router, 'preparation').mockReturnValue({ - configDir: selected, - runtime: 'host', - wslDistro: null, - wslLinuxConfigDir: null, - envPatch: { CLAUDE_CONFIG_DIR: selected }, - provenance: 'profile:a' - }) - const prepareLaunch = vi.spyOn(router, 'prepareLaunch') - vi.spyOn(installedRouter, 'getClaudeProfileRouter').mockReturnValue(router) - const record = agentSessionRecordFixture({ - sessionId: 'chat', - accountHome: { variable: 'CLAUDE_CONFIG_DIR', path: join(root, 'saved-account') } - }) - const inherited = Promise.withResolvers>() - const settings = { agentCmdOverrides: { claude: `"${process.execPath}"` } } - const overlay = { CLAUDE_CONFIG_DIR: join(root, 'overlay-account'), NAMING_INPUT: 'accepted' } - const sources: StructuredAgentLaunchSources = { - store: { - selectWritableRecord: () => ({ kind: 'writable', record }), - requireWritableRecord: () => record, - pinLaunchDirectory: async () => record - }, - resolveWorkspacePath: async () => root, - resolveBaseEnvironment: () => inherited.promise, - resolveAgentEnvironment: async () => overlay, - resolveAgentLaunchEnv: () => overlay, - resolveCommandSettings: () => settings - } - const snapshot = claudeNamingInvocation(sources, () => []) - const pending = snapshot(record) - settings.agentCmdOverrides.claude = 'does-not-exist-orca-naming' - overlay.NAMING_INPUT = 'changed' - preparation.mockReturnValue({ - configDir: later, - runtime: 'host', - wslDistro: null, - wslLinuxConfigDir: null, - envPatch: { CLAUDE_CONFIG_DIR: later }, - provenance: 'profile:b' - }) - inherited.resolve({ HOME: root, PATH: process.env.PATH ?? '' }) - expect(await pending).toMatchObject({ - command: process.execPath, - home: selected, - cwd: root, - env: { CLAUDE_CONFIG_DIR: selected, NAMING_INPUT: 'accepted' } - }) - expect(prepareLaunch).not.toHaveBeenCalled() - await expect(snapshot(record)).rejects.toThrow() - expect(prepareLaunch).not.toHaveBeenCalled() -}) diff --git a/src/main/claude/claude-parent-task-frames.test-fixture.ts b/src/main/claude/claude-parent-task-frames.test-fixture.ts deleted file mode 100644 index a90897291da..00000000000 --- a/src/main/claude/claude-parent-task-frames.test-fixture.ts +++ /dev/null @@ -1,11 +0,0 @@ -// CLI 2.1.319, isolated real run: parent Stop, live child roster, then separate child Stop; IDs/paths sanitized. -import { readFileSync } from 'node:fs' -import type { CapturedFrame } from './claude-captured-frame-builders.test-fixture' - -export const PARENT_TASK_STOP: CapturedFrame[] = readFileSync( - new URL('./__fixtures__/claude-parent-task-stop-2.1.319.jsonl', import.meta.url), - 'utf8' -) - .trim() - .split('\n') - .map((line) => JSON.parse(line)) diff --git a/src/main/claude/claude-plan-approval-mode.test.ts b/src/main/claude/claude-plan-approval-mode.test.ts deleted file mode 100644 index 09992646b69..00000000000 --- a/src/main/claude/claude-plan-approval-mode.test.ts +++ /dev/null @@ -1,232 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' -import { invokeCanUseTool } from './claude-can-use-tool-test-support' -import { - PROVIDER_SESSION_ID, - USER_MESSAGE, - acquired, - claudeFrame, - fakeClaude, - tick, - type FakeConnection -} from './structured/claude-structured-session-test-support' -import { claudeStructuredPermissionOptions } from './structured/launch/claude-structured-launch-resolution' - -async function pendingPlanApproval( - input: Record, - initPermissionMode?: string, - requested?: 'full-access' -) { - const claude = fakeClaude({ replayUuid: 'turn-1', initPermissionMode }) - const adapter = await acquired( - claude, - requested ? { options: claudeStructuredPermissionOptions(requested) } : {} - ) - await adapter.dispatch({ - sessionId: 'session-1', - clientMessageId: 'client-turn-1', - body: USER_MESSAGE, - fence: 7 - }) - const connection = claude.connections[0] - if (!connection) { - throw new Error('expected Claude connection') - } - claudeFrame(connection, { type: 'system', subtype: 'status', permissionMode: 'plan' }) - if (requested) { - for (const frame of [ - { - type: 'system', - subtype: 'status', - status: null, - permissionMode: 'plan', - session_id: PROVIDER_SESSION_ID - }, - { - type: 'control_request', - request_id: 'permission-plan', - request: { - subtype: 'can_use_tool', - tool_name: 'ExitPlanMode', - input, - tool_use_id: 'tool-plan' - } - } - ]) { - connection.handlers.onStdout?.(`${JSON.stringify(frame)}\n`) - } - } - const request = new AbortController() - const answered = invokeCanUseTool(connection, 'ExitPlanMode', 'permission-plan', 'tool-plan', { - input, - signal: request.signal - }) - adapter.bindPromptItemId('session-1', 'journal-plan', 'permission-plan') - return { adapter, connection, answered, request } -} - -describe('leaving Claude plan mode on an approved plan', () => { - it.each(['failed commit', 'lost ownership'])( - 'does not change mode when approval has %s', - async (failure) => { - const { adapter, connection, answered, request } = await pendingPlanApproval({}) - const setMode = vi.spyOn(connection, 'setPermissionMode') - await expect( - adapter.answerPrompt({ - sessionId: 'session-1', - itemId: 'journal-plan', - kind: 'approval', - response: { kind: 'option', optionId: 'allow' }, - fence: 7, - commit: async () => { - expect(setMode).not.toHaveBeenCalled() - expect(answered.settled()).toBe(false) - if (failure === 'failed commit') { - throw new Error('journal write failed') - } - request.abort() - } - }) - ).rejects.toThrow() - expect(setMode).not.toHaveBeenCalled() - if (failure === 'lost ownership') { - await expect(answered.promise).resolves.toBeNull() - } else { - expect(answered.settled()).toBe(false) - // The failed write released its claim, so a later approval still works. - await adapter.answerPrompt({ - sessionId: 'session-1', - itemId: 'journal-plan', - kind: 'approval', - response: { kind: 'option', optionId: 'allow' }, - fence: 7, - commit: async () => {} - }) - await expect(answered.promise).resolves.toMatchObject({ behavior: 'allow' }) - expect(setMode).toHaveBeenCalledOnce() - } - setMode.mockRestore() - } - ) - - it('restores Full access from the plan Claude reported on the wire, before presentation reads it', async () => { - // Init reported bypassPermissions through presentation; the later plan status is still unread there. - const claude = fakeClaude({ replayUuid: 'turn-1', initPermissionMode: 'bypassPermissions' }) - const adapter = await acquired(claude, { - options: claudeStructuredPermissionOptions('full-access') - }) - await adapter.dispatch({ - sessionId: 'session-1', - clientMessageId: 'client-turn-1', - body: USER_MESSAGE, - fence: 7 - }) - const connection = claude.connections[0]! - const raw = (target: FakeConnection, frame: Record): void => - target.handlers.onStdout?.(`${JSON.stringify(frame)}\n`) - const request = (id: string, toolName: string, input: Record) => { - raw(connection, { - type: 'control_request', - request_id: id, - request: { subtype: 'can_use_tool', tool_name: toolName, input, tool_use_id: `tool-${id}` } - }) - return invokeCanUseTool(connection, toolName, id, `tool-${id}`, { input }) - } - const status = (permissionMode: string) => ({ - type: 'system', - subtype: 'status', - status: null, - permissionMode, - session_id: PROVIDER_SESSION_ID - }) - raw(connection, status('plan')) - const plan = request('permission-plan', 'ExitPlanMode', { plan: '# Plan' }) - adapter.bindPromptItemId('session-1', 'journal-plan', 'permission-plan') - const order: string[] = [] - const setMode = vi.spyOn(connection, 'setPermissionMode').mockImplementation((mode) => { - order.push(`set_permission_mode:${mode}`) - // Never resolves: the approval must not wait for Claude to confirm the mode. - return new Promise(() => {}) - }) - const answered = plan.promise.then((result) => { - order.push('control_response') - return result - }) - - await adapter.answerPrompt({ - sessionId: 'session-1', - itemId: 'journal-plan', - kind: 'approval', - response: { kind: 'option', optionId: 'allow' }, - fence: 7, - commit: async () => {} - }) - await expect(answered).resolves.toMatchObject({ - behavior: 'allow', - toolUseID: 'tool-permission-plan' - }) - expect(order).toEqual(['set_permission_mode:bypassPermissions', 'control_response']) - expect(setMode).toHaveBeenCalledOnce() - - // Sending the restore grants nothing; Claude's own bypass report does. - const beforeReport = request('before-report', 'Bash', { command: 'ls' }) - await tick() - expect(beforeReport.settled()).toBe(false) - raw(connection, status('bypassPermissions')) - const afterReport = request('after-report', 'Bash', { command: 'ls' }) - await expect(afterReport.promise).resolves.toEqual({ - behavior: 'allow', - updatedInput: { command: 'ls' }, - toolUseID: 'tool-after-report' - }) - setMode.mockRestore() - }) -}) - -it.each([true, false])( - 'uses the approved Build policy only after successful native restoration: %s', - async (restored) => { - const { adapter, connection, answered } = await pendingPlanApproval( - {}, - 'default', - 'full-access' - ) - const warn = vi.spyOn(console, 'warn').mockImplementation(() => {}) - const setMode = vi.spyOn(connection, 'setPermissionMode').mockImplementationOnce(async () => { - if (!restored) { - throw new Error('native restoration failed') - } - }) - try { - await adapter.answerPrompt({ - sessionId: 'session-1', - itemId: 'journal-plan', - kind: 'approval', - response: { kind: 'option', optionId: 'allow' }, - fence: 7, - commit: async () => {} - }) - await expect(answered.promise).resolves.toMatchObject({ behavior: 'allow' }) - await tick() - expect(setMode).toHaveBeenCalledWith('bypassPermissions') - for (const clientMessageId of ['build-first', 'build-second']) { - claudeFrame(connection, { type: 'system', subtype: 'session_state_changed', state: 'idle' }) - await adapter.readOptions({ sessionId: 'session-1', fence: 7 }) - expect( - await adapter.dispatch({ - sessionId: 'session-1', - clientMessageId, - body: USER_MESSAGE, - fence: 7, - executionOptions: { interactionMode: 'default' } - }) - ).toMatchObject({ state: 'admitted' }) - expect(setMode).toHaveBeenLastCalledWith(restored ? 'bypassPermissions' : 'default', { - timeoutMs: undefined - }) - } - } finally { - warn.mockRestore() - await adapter.closeAll() - } - } -) diff --git a/src/main/claude/claude-provider-session-rename.test.ts b/src/main/claude/claude-provider-session-rename.test.ts deleted file mode 100644 index 29d434c5c2d..00000000000 --- a/src/main/claude/claude-provider-session-rename.test.ts +++ /dev/null @@ -1,121 +0,0 @@ -import { listSessions } from '@anthropic-ai/claude-agent-sdk' -import { randomUUID } from 'node:crypto' -import * as fs from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, beforeEach, expect, it, vi } from 'vitest' -import * as transcriptFs from '../native-chat/wsl-transcript-fs-access' -import { renameClaudeTranscript } from './claude-provider-session-rename' - -let home: string -let conversation: string -let transcript: string -beforeEach(async () => { - home = await fs.mkdtemp(join(tmpdir(), 'orca-claude-rename-')) - conversation = randomUUID() - const project = join(home, 'projects', 'workspace') - await fs.mkdir(project, { recursive: true }) - transcript = join(project, `${conversation}.jsonl`) -}) -afterEach(async () => { - vi.restoreAllMocks() - await fs.rm(home, { recursive: true, force: true }) -}) - -it.each([false, true])( - 'appends both native names after a torn tail (earlier agent-name=%s)', - async (earlierName) => { - const user = { - type: 'user', - uuid: randomUUID(), - sessionId: conversation, - message: { role: 'user', content: 'ship it' } - } - const oldName = earlierName - ? `${JSON.stringify({ type: 'agent-name', agentName: 'Earlier native name', sessionId: conversation })}\n` - : '' - const prefix = `${JSON.stringify(user)}\n${oldName}{"type":"assistant","mess` - await fs.writeFile(transcript, prefix) - const otherAccount = join(home, 'other-account', 'projects', 'workspace') - await fs.mkdir(otherAccount, { recursive: true }) - const otherTranscript = join(otherAccount, `${conversation}.jsonl`) - await fs.writeFile(otherTranscript, 'another account\n') - const source = join(home, 'projects', 'workspace', `${randomUUID()}.jsonl`) - await fs.writeFile(source, 'unrelated source\n') - const inventory = vi.spyOn(transcriptFs, 'wslGatedReaddir') - const stat = vi.spyOn(transcriptFs, 'wslGatedStat') - const append = vi.spyOn(fs, 'appendFile') - const originalOpen = fs.open - const open = vi.spyOn(fs, 'open').mockImplementation(async (...args) => { - const handle = await originalOpen(...args) - vi.spyOn(handle, 'read') - return handle - }) - await renameClaudeTranscript(home, conversation, ' Release notes ') - const result = await fs.readFile(transcript, 'utf8') - expect(result.slice(0, prefix.length + 1)).toBe(`${prefix}\n`) - const lines = result - .slice(prefix.length + 1) - .trim() - .split('\n') - expect(lines).toHaveLength(2) - const title = JSON.parse(lines[0] ?? '') - expect(title).toMatchObject({ - type: 'custom-title', - sessionId: conversation, - customTitle: 'Release notes' - }) - expect(title.uuid).toEqual(expect.any(String)) - expect(title.timestamp).toEqual(expect.any(String)) - expect(JSON.parse(lines[1] ?? '')).toEqual({ - type: 'agent-name', - agentName: 'Release notes', - sessionId: conversation - }) - expect(inventory).toHaveBeenCalledTimes(1) - expect(stat).toHaveBeenCalledTimes(1) - expect(open).toHaveBeenCalledExactlyOnceWith(transcript, 'r') - const handle = await open.mock.results[0]?.value - expect(handle?.read).toHaveBeenCalledExactlyOnceWith( - expect.any(Buffer), - 0, - 1, - Buffer.byteLength(prefix) - 1 - ) - expect(append).toHaveBeenCalledExactlyOnceWith(transcript, `\n${lines.join('\n')}\n`, { - flag: 'a' - }) - expect(await fs.readFile(otherTranscript, 'utf8')).toBe('another account\n') - expect(await fs.readFile(source, 'utf8')).toBe('unrelated source\n') - const listed = await listSessions({ - sessionStore: { - load: async () => [user, title], - append: async () => {}, - listSessions: async () => [{ sessionId: conversation, mtime: 1_700_000_000_000 }] - } - }) - expect(listed[0]?.customTitle).toBe('Release notes') - } -) - -it('refuses missing, empty, multiple and incomplete inventories without mutating another candidate', async () => { - await expect(renameClaudeTranscript(home, conversation, 'Missing')).rejects.toThrow( - 'no transcript' - ) - await fs.writeFile(transcript, '') - await expect(renameClaudeTranscript(home, conversation, 'Empty')).rejects.toThrow('no transcript') - await fs.writeFile(transcript, 'old\n') - const second = join(home, 'projects', 'hash-or-worktree') - await fs.mkdir(second) - const duplicate = join(second, `${conversation}.jsonl`) - await fs.writeFile(duplicate, 'other\n') - await expect(renameClaudeTranscript(home, conversation, 'Ambiguous')).rejects.toThrow( - 'multiple transcripts' - ) - expect(await fs.readFile(transcript, 'utf8')).toBe('old\n') - expect(await fs.readFile(duplicate, 'utf8')).toBe('other\n') - const denied = Object.assign(new Error('denied'), { code: 'EACCES' }) - vi.spyOn(transcriptFs, 'wslGatedStat').mockRejectedValue(denied) - await expect(renameClaudeTranscript(home, conversation, 'Denied')).rejects.toBe(denied) - expect(await fs.readFile(transcript, 'utf8')).toBe('old\n') -}) diff --git a/src/main/claude/claude-real-cli-availability-test-support.ts b/src/main/claude/claude-real-cli-availability-test-support.ts deleted file mode 100644 index 22150adc1cd..00000000000 --- a/src/main/claude/claude-real-cli-availability-test-support.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { homedir } from 'node:os' -import { join } from 'node:path' -import { runProcessSync } from '@orca/process-host' -import type { ProcessResult } from '@orca/process-host/process-spec' -import { withCliRuntimeOnPath } from '../../shared/node-cli-command-resolution' -import { CLAUDE_AUTH_ENV_VARS } from '../claude-accounts/runtime-auth/environment' -import { resolveClaudeCommand } from '../codex-cli/command' -import { resolveRealClaudeCliGate } from './claude-real-cli-test-gate' - -export const realClaudeCommand = resolveClaudeCommand() - -// Match structured launches by using the CLI's paired Node runtime. -function probeRealClaude(args: string[]): ProcessResult | null { - try { - return runProcessSync({ - program: realClaudeCommand, - args, - env: withCliRuntimeOnPath(realClaudeCommand, process.env), - stdio: ['ignore', 'pipe', 'pipe'], - timeoutMs: 5_000 - }) - } catch { - return null - } -} - -export const realClaudeCliGate = resolveRealClaudeCliGate(process.env, (args) => { - const result = probeRealClaude([...args]) - return { status: result?.code ?? null, stdout: result?.stdout ?? '' } -}) - -export const realClaudeAvailable = realClaudeCliGate.skipReason === null - -/** Use the CLI's account report as an independent oracle for transcript paths. */ -export const realClaudeAuthStatus = realClaudeCliGate.authStatus - -export const realClaudeAuthenticated = realClaudeAuthStatus?.loggedIn === true - -/** Restore the probed home and auth explicitly: connections strip inherited account state. */ -export function realClaudeLaunchHome(): { claudeConfigDir: string; env: Record } { - const env: Record = {} - for (const key of CLAUDE_AUTH_ENV_VARS) { - const value = process.env[key] - if (value) { - env[key] = value - } - } - return { - claudeConfigDir: process.env.CLAUDE_CONFIG_DIR?.trim() || join(homedir(), '.claude'), - env - } -} diff --git a/src/main/claude/claude-real-cli-test-gate.ts b/src/main/claude/claude-real-cli-test-gate.ts deleted file mode 100644 index 745ede2733b..00000000000 --- a/src/main/claude/claude-real-cli-test-gate.ts +++ /dev/null @@ -1,63 +0,0 @@ -/** Opt-in for tests that drive the real `claude` CLI on this machine's signed-in account. */ -export const REAL_CLAUDE_CLI_TEST_ENV = 'ORCA_REAL_CLAUDE_CLI_TEST' - -export type ClaudeCliProbeResult = { status: number | null; stdout: string } - -export type RealClaudeAuthStatus = { loggedIn?: boolean; projectsDirectory?: string } - -export type RealClaudeCliGate = { - /** Null permits the real-CLI suite to run. */ - skipReason: string | null - authStatus: RealClaudeAuthStatus | null -} - -function parseAuthStatus(stdout: string): RealClaudeAuthStatus | null { - const start = stdout.search(/[[{]/) - if (start === -1) { - return null - } - // CLI warnings may precede the report, but another JSON value makes it ambiguous. - for (const line of stdout.slice(0, start).split('\n')) { - try { - JSON.parse(line) - return null - } catch { - continue - } - } - let parsed: unknown - try { - parsed = JSON.parse(stdout.slice(start)) - } catch { - return null - } - if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) { - return null - } - const status: RealClaudeAuthStatus = {} - if ('loggedIn' in parsed && typeof parsed.loggedIn === 'boolean') { - status.loggedIn = parsed.loggedIn - } - if ('projectsDirectory' in parsed && typeof parsed.projectsDirectory === 'string') { - status.projectsDirectory = parsed.projectsDirectory - } - return status -} - -export function resolveRealClaudeCliGate( - env: NodeJS.ProcessEnv, - runClaude: (args: readonly string[]) => ClaudeCliProbeResult -): RealClaudeCliGate { - // Require opt-in before probing an account whose tests spend turns and write transcripts. - if (env[REAL_CLAUDE_CLI_TEST_ENV] !== '1') { - return { - skipReason: `set ${REAL_CLAUDE_CLI_TEST_ENV}=1 to run against the real claude CLI`, - authStatus: null - } - } - if (runClaude(['--version']).status !== 0) { - return { skipReason: '`claude --version` failed', authStatus: null } - } - const auth = runClaude(['auth', 'status', '--json']) - return { skipReason: null, authStatus: auth.status === 0 ? parseAuthStatus(auth.stdout) : null } -} diff --git a/src/main/claude/claude-rewind-transcript.test.ts b/src/main/claude/claude-rewind-transcript.test.ts deleted file mode 100644 index 9e56548cac5..00000000000 --- a/src/main/claude/claude-rewind-transcript.test.ts +++ /dev/null @@ -1,226 +0,0 @@ -import './claude-conversation-worker.test-fixture' -import { randomUUID } from 'node:crypto' -import { mkdir, mkdtemp, readFile, readdir, rm, stat, writeFile } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { claudeProviderHandle } from '../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding' -import { AgentSessionRewindRecordSchema } from '../../shared/agent-session/lifecycle/agent-session-rewind' -import { agentSessionRecordFixture } from '../native-chat/agent-session-record-test-fixture' -import { createClaudeStructuredLaunchResolver } from '../runtime/agent-session/launch/structured-agent-launch-composition.test-support' -import { resolveClaudeRewindFork } from './claude-rewind-fork' -import { claudeSessionIdForRewind } from './structured/claude-structured-session-id' - -let root: string -let home: string -let project: string -let source: string -let path: string -let original: string -let sourceRows: ReturnType - -function transcriptRows(contents: string) { - return contents - .trim() - .split('\n') - .map((line) => JSON.parse(line)) -} - -async function recordedTranscript(kind: 'hook' | 'informational') { - return readFile(new URL(`./__fixtures__/claude-rewind-${kind}.jsonl`, import.meta.url), 'utf8') -} - -beforeEach(async () => { - root = await mkdtemp(join(tmpdir(), 'orca-rewind-transcript-')) - home = join(root, 'account') - project = join(home, 'projects', 'workspace') - await mkdir(project, { recursive: true }) - original = await recordedTranscript('hook') - sourceRows = transcriptRows(original) - source = sourceRows[6].sessionId - path = join(project, `${source}.jsonl`) - await writeFile(path, original) -}) - -afterEach(async () => { - await rm(root, { recursive: true, force: true }) -}) - -function forkBefore(uuid: string, rewindOperationId = randomUUID()) { - return resolveClaudeRewindFork({ - orcaSessionId: 'orca-chat', - rewindOperationId, - head: claudeProviderHandle(source, sourceRows.at(-1)?.uuid), - prompt: { sessionId: source, uuid }, - claudeConfigDirs: [join(root, 'other-account'), home] - }) -} - -describe('durable Claude rewind transcripts', () => { - it.each([ - { promptRow: 35, parentRow: 28, cursorRole: 'user' }, - { promptRow: 55, parentRow: 51, cursorRole: 'assistant' } - ])( - 'keeps the exact $cursorRole cursor before recorded prompt $promptRow', - async ({ promptRow, parentRow, cursorRole }) => { - const prompt = sourceRows[promptRow - 1] - const fork = await forkBefore(prompt.uuid) - expect(fork).toMatchObject({ - materialized: true, - sourceSessionId: source, - throughEntryId: sourceRows[parentRow - 1].uuid - }) - if (!fork) { - throw new Error('fork missing') - } - const forkPath = join(project, `${fork.sessionId}.jsonl`) - const contents = await readFile(forkPath, 'utf8') - const conversation = (rows: typeof sourceRows) => - rows.filter((row) => row.type === 'user' || row.type === 'assistant') - const kept = conversation(transcriptRows(contents)) - const expected = conversation(sourceRows.slice(0, parentRow)) - expect(kept.map((row) => row.forkedFrom.messageUuid)).toEqual(expected.map((row) => row.uuid)) - expect(kept.at(-1)).toMatchObject({ type: cursorRole, uuid: fork.resumeCursor }) - expect(fork.resumeCursor).toBeTruthy() - expect(fork.resumeCursor).not.toBe(expected.at(-1)?.uuid) - expect(contents).not.toContain(prompt.uuid) - expect(await readFile(path, 'utf8')).toBe(original) - expect((await readdir(project)).sort()).toEqual( - [`${source}.jsonl`, `${fork.sessionId}.jsonl`].sort() - ) - if (process.platform !== 'win32') { - expect((await stat(forkPath)).mode & 0o777).toBe(0o600) - } - } - ) - - it.each(['hook', 'informational', 'null'] as const)( - 'starts and reloads an empty fork after a %s parent', - async (kind) => { - original = await recordedTranscript(kind === 'informational' ? 'informational' : 'hook') - sourceRows = transcriptRows(original) - const prompt = sourceRows.find((row) => row.type === 'user') - if (kind === 'null') { - prompt.parentUuid = null - original = `${sourceRows.map((row) => JSON.stringify(row)).join('\n')}\n` - } - await writeFile(path, original) - const operationId = randomUUID() - const fork = await forkBefore(prompt.uuid, operationId) - expect(fork).toStrictEqual({ - sessionId: claudeSessionIdForRewind('orca-chat', operationId), - sourceSessionId: source, - replacesSessionId: source, - materialized: true, - coverage: [] - }) - if (!fork) { - throw new Error('fork missing') - } - expect(await readdir(project)).toEqual([`${source}.jsonl`]) - const launchers = [true, false].map((prepared) => { - const handle = claudeProviderHandle( - prepared ? source : fork.sessionId, - prepared ? prompt.uuid : null - ) - const record = agentSessionRecordFixture({ - sessionId: 'orca-chat', - accountHome: { variable: 'CLAUDE_CONFIG_DIR', path: home }, - providerHandleChain: [ - { linkId: 'head', origin: 'created', mintedAtFence: 1, observedAt: 1, handle } - ], - rewind: AgentSessionRewindRecordSchema.parse( - JSON.parse( - JSON.stringify({ - operationId, - callerKey: 'desktop', - itemId: 'item-1', - expectedEpoch: 'epoch-1', - phase: prepared ? 'prepared' : 'completed', - providerFork: fork - }) - ) - ) - }) - const resolve = createClaudeStructuredLaunchResolver({ - store: { getRecord: () => record, pinLaunchDirectory: vi.fn() }, - resolveLaunchArgs: () => [], - resolveWorkspacePath: async () => project, - resolveCommand: () => ({ command: '/usr/local/bin/claude', prefixArgs: [] }), - resolveInheritedEnv: async () => ({ PATH: '/usr/bin' }), - resolveAuthPolicy: () => ({ account: 'system' }) - }) - return () => - resolve({ - identity: { - sessionId: record.sessionId, - workspaceId: 'workspace-1', - hostId: 'local', - agent: 'claude', - providerHandle: handle - } - }) - }) - for (const launch of launchers) { - const fresh = await launch() - expect(fresh.options.sessionId).toBe(fork.sessionId) - expect(fresh.resumesTranscript).toBe(false) - for (const key of ['resume', 'resumeSessionAt', 'forkSession']) { - expect(fresh.options).not.toHaveProperty(key) - } - } - await writeFile( - join(project, `${fork.sessionId}.jsonl`), - `${JSON.stringify({ ...prompt, sessionId: fork.sessionId, parentUuid: null })}\n` - ) - for (const launch of launchers) { - const resumed = await launch() - expect(resumed.options.resume).toBe(fork.sessionId) - expect(resumed.options).not.toHaveProperty('resumeSessionAt') - expect(resumed.options).not.toHaveProperty('forkSession') - } - expect(await readFile(path, 'utf8')).toBe(original) - } - ) - - it('drops the local-command caveat when rewinding to a local command', async () => { - const turn = sourceRows[50] - const row = (uuid: string, parentUuid: string, content: string, isMeta?: true) => ({ - ...sourceRows[54], - uuid, - parentUuid, - isMeta, - message: { role: 'user', content } - }) - const caveat = row( - randomUUID(), - turn.uuid, - 'The command below was run directly in Claude Code.', - true - ) - const command = row(randomUUID(), caveat.uuid, '/usage') - const stdout = row( - randomUUID(), - command.uuid, - 'ok' - ) - await writeFile( - path, - `${[...sourceRows.slice(0, 54), caveat, command, stdout].map((r) => JSON.stringify(r)).join('\n')}\n` - ) - const fork = await forkBefore(command.uuid) - expect(fork).toMatchObject({ materialized: true, throughEntryId: turn.uuid }) - const contents = await readFile(join(project, `${fork?.sessionId}.jsonl`), 'utf8') - expect(contents).not.toContain('local-command-caveat') - }) - - it('skips a torn transcript line instead of failing the rewind', async () => { - const damaged = `{broken-json}\n${original}{"type":` - await writeFile(path, damaged) - const fork = await forkBefore(sourceRows[34].uuid) - expect(fork).toMatchObject({ materialized: true, throughEntryId: sourceRows[27].uuid }) - const contents = await readFile(join(project, `${fork?.sessionId}.jsonl`), 'utf8') - expect(contents).not.toContain(sourceRows[34].uuid) - expect(await readFile(path, 'utf8')).toBe(damaged) - }) -}) diff --git a/src/main/claude/claude-scripted-child.test-fixture.ts b/src/main/claude/claude-scripted-child.test-fixture.ts deleted file mode 100644 index 9672c1f17ba..00000000000 --- a/src/main/claude/claude-scripted-child.test-fixture.ts +++ /dev/null @@ -1,164 +0,0 @@ -// Registration fixture uses the real Claude adapter over scripted stream-json, including initialize handshake. - -import { randomUUID } from 'node:crypto' -import { mkdirSync, writeFileSync } from 'node:fs' -import { join } from 'node:path' -import type { - ClaudeStreamJsonConnection, - ClaudeStreamJsonLaunch, - openClaudeStreamJsonConnection -} from './claude-stream-json-connection' -import type { - ScriptedAgentChild, - ScriptedAgentChildFactory -} from '../runtime/agent-session/installation/structured-agent-scripted-child.test-fixture' -import { scriptedClaudeExitError } from '../runtime/agent-session/installation/structured-claude-scripted-runtime-test-support' -import { result, says } from './claude-captured-frame-builders.test-fixture' - -type Spawned = { - connection: Omit & { - closed: boolean - exitVerdict: ClaudeStreamJsonConnection['exitVerdict'] - } - answer: () => void - fail: (message: string) => void -} - -function promptText(message: Record): string { - const inner = message.message - const content = - inner && typeof inner === 'object' && 'content' in inner ? inner.content : undefined - const blocks = Array.isArray(content) ? content : [] - return blocks - .map((block: unknown) => - block && typeof block === 'object' && 'text' in block ? String(block.text) : '' - ) - .join('') -} - -/** The CLI writes its transcript as a conversation's first message lands; a later start resumes it. */ -function writeTranscript(launch: ClaudeStreamJsonLaunch, providerSessionId: string): void { - const home = launch.env?.CLAUDE_CONFIG_DIR - if (!home) { - return - } - const folder = join(home, 'projects', 'scripted') - mkdirSync(folder, { recursive: true }) - writeFileSync(join(folder, `${providerSessionId}.jsonl`), '{}\n') -} - -export const claudeScriptedChild: ScriptedAgentChildFactory = () => { - const spawned: Spawned[] = [] - const prompts: string[] = [] - let resumes = 0 - let closes = 0 - const openConnection: typeof openClaudeStreamJsonConnection = async (launch, handlers = {}) => { - if (launch.options.resume !== undefined) { - resumes += 1 - } - const providerSessionId = String(launch.options.sessionId ?? launch.options.resume) - const initialized = { models: [{ value: 'sonnet', displayName: 'Sonnet' }] } - let answer = (): void => {} - let reject = (_error: Error): void => {} - const init = new Promise((resolve, fail) => { - answer = () => { - handlers.onMessage?.({ - type: 'system', - subtype: 'init', - session_id: providerSessionId, - model: 'claude-sonnet-5', - apiKeySource: 'none' - }) - resolve(initialized) - } - reject = fail - }) - if (!child.holdHandshakes) { - answer() - } - const connection: Spawned['connection'] = { - pid: 7000 + spawned.length, - closed: false, - exitVerdict: { root: 'live', tree: 'unverifiable' }, - initializationResult: () => init, - getContextUsage: async () => ({}), - renameSession: async () => {}, - getSettings: async () => ({ effective: {} }), - supportedModels: async () => [{ value: 'sonnet', displayName: 'Sonnet' }], - setModel: async () => {}, - setPermissionMode: async () => {}, - applyFlagSettings: async () => {}, - interrupt: async () => undefined, - cancelAsyncMessage: async () => false, - stopTask: async () => {}, - send: async (message, beforeDispatch) => { - await beforeDispatch?.() - prompts.push(promptText(message)) - writeTranscript(launch, providerSessionId) - // The CLI echoes each message it takes under the client's uuid: Orca's proof of delivery. - handlers.onMessage?.({ - type: 'user', - session_id: providerSessionId, - parent_tool_use_id: null, - uuid: message.uuid, - isReplay: true, - message: message.message - }) - if (child.completeTurns) { - const id = randomUUID() - handlers.onMessage?.({ ...says(id, 'done', null), session_id: providerSessionId }) - handlers.onMessage?.({ ...result('success'), session_id: providerSessionId, uuid: id }) - } - }, - close: async () => { - if (!connection.closed) { - connection.closed = true - closes += 1 - connection.exitVerdict = { root: 'exited', tree: 'exited' } - handlers.onExit?.(new Error('closed by Orca')) - } - return true - } - } - spawned.push({ - connection, - answer, - fail: (message) => { - const error = scriptedClaudeExitError(message) - connection.closed = true - connection.exitVerdict = { root: 'exited', tree: 'unverifiable' } - reject(error) - handlers.onExit?.(error) - } - }) - return connection - } - const newest = (): Spawned => { - const latest = spawned.at(-1) - if (!latest) { - throw new Error('no Claude child was spawned') - } - return latest - } - const child: ScriptedAgentChild = { - deps: { - openClaudeConnection: openConnection, - readProcessStartTime: async (pid) => - spawned.find((entry) => entry.connection.pid === pid)?.connection.exitVerdict.root === - 'exited' - ? null - : pid * 10, - resolveClaudeCommand: () => ({ command: '/nonexistent/scripted-claude', prefixArgs: [] }), - resolveClaudeAuthPolicy: () => ({ account: 'system' }) - }, - holdHandshakes: true, - releaseHandshake: () => newest().answer(), - failHandshake: (message) => newest().fail(message), - completeTurns: true, - prompts: () => prompts, - spawns: () => spawned.length, - resumes: () => resumes, - closes: () => closes - } - return child -} diff --git a/src/main/claude/claude-settings-schema-install.test.ts b/src/main/claude/claude-settings-schema-install.test.ts deleted file mode 100644 index 76c01011f47..00000000000 --- a/src/main/claude/claude-settings-schema-install.test.ts +++ /dev/null @@ -1,58 +0,0 @@ -import { mkdtempSync, readFileSync, rmSync } from 'node:fs' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import fixture from './__fixtures__/claude-hook-event-enums.json' - -vi.mock('electron', () => ({ - app: { - getPath: () => '/tmp/userData' - } -})) - -import { ClaudeHookService } from './hook-service' - -const enums: Record = fixture.enums -const topLevelSettings: Record = - fixture.topLevelSettings -const strictReleases = Object.keys(topLevelSettings).filter( - (version) => topLevelSettings[version].strict -) - -describe('Claude settings written for a strict settings schema', () => { - let tmpHome: string - let settingsPath: string - - beforeEach(() => { - tmpHome = mkdtempSync(join(tmpdir(), 'orca-claude-settings-schema-')) - settingsPath = join(tmpHome, '.claude', 'settings.json') - vi.stubEnv('HOME', tmpHome) - vi.stubEnv('USERPROFILE', tmpHome) - }) - - afterEach(() => { - vi.unstubAllEnvs() - rmSync(tmpHome, { recursive: true, force: true }) - }) - - function expectAcceptedBy(version: string): void { - const written = JSON.parse(readFileSync(settingsPath, 'utf-8')) - const { keys } = topLevelSettings[version] - expect(Object.keys(written).filter((key) => !keys.includes(key))).toEqual([]) - expect( - Object.keys(written.hooks ?? {}).filter((event) => !enums[version].includes(event)) - ).toEqual([]) - } - - it.each(strictReleases)('a fresh install writes only what Claude %s accepts', (version) => { - new ClaudeHookService().install({ claudeVersion: version }) - expectAcceptedBy(version) - }) - - it.each(strictReleases)('a downgrade to Claude %s leaves only what it accepts', (version) => { - const service = new ClaudeHookService() - service.install({ claudeVersion: '2.1.261' }) - service.install({ claudeVersion: version }) - expectAcceptedBy(version) - }) -}) diff --git a/src/main/claude/claude-status-line-windows.test.ts b/src/main/claude/claude-status-line-windows.test.ts deleted file mode 100644 index 95fdf8313d1..00000000000 --- a/src/main/claude/claude-status-line-windows.test.ts +++ /dev/null @@ -1,189 +0,0 @@ -import { mkdirSync, mkdtempSync, readFileSync, writeFileSync } from 'node:fs' -import { createServer, type Server } from 'node:http' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import type * as osModule from 'node:os' -import { runProcess } from '@orca/process-host' -import { afterEach, describe, expect, it, vi } from 'vitest' -import { removeTreeSync } from '../../shared/windows-transient-lock-removal' -import { parseClaudeStatusLineBody } from '../../shared/claude-statusline-rate-limits' - -const { homedirMock } = vi.hoisted(() => ({ - homedirMock: vi.fn<() => string>() -})) - -vi.mock('electron', () => ({ app: { getPath: () => '/tmp/orca-user-data' } })) - -vi.mock('os', async (importOriginal) => { - const actual = await importOriginal() - return { ...actual, homedir: homedirMock.mockImplementation(actual.homedir) } -}) - -import { findGitBash } from '../agent-hooks/installation/commands/testing/windows-git-bash-path.test-fixture' -import { ClaudeHookService } from './hook-service' -import { getManagedCommand } from './hook-settings' - -const CURRENT_CLAUDE = { claudeVersion: '2.1.261 (Claude Code)' } -const PAYLOAD = JSON.stringify({ - session_id: 'statusline-delivery', - model: { id: 'claude-opus-5-5', display_name: 'Opus' }, - rate_limits: { - five_hour: { used_percentage: 42, resets_at: 1790000000 }, - seven_day: { used_percentage: 7, resets_at: 1790500000 } - } -}) -const EXPECTED_RATE_LIMITS = { - configDir: null, - fiveHour: { used_percentage: 42, resets_at: 1790000000 }, - sevenDay: { used_percentage: 7, resets_at: 1790500000 } -} -const HOOK_TOKEN = 'statusline-delivery-token' -// Match Claude.exe's PowerShell flags. -const POWERSHELL_ARGS = ['-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-Command'] - -const LEGACY_COMMAND = getManagedCommand('claude-statusline.cmd') - -type StatusLineSettings = { statusLine?: { type: string; command: string } } - -function settingsPath(home: string): string { - return join(home, '.claude', 'settings.json') -} - -function powershellPath(): string { - const systemRoot = process.env.SystemRoot ?? 'C:\\Windows' - return join(systemRoot, 'System32', 'WindowsPowerShell', 'v1.0', 'powershell.exe') -} - -async function startStatusLineListener(): Promise<{ - server: Server - port: number - posts: Record[] -}> { - const posts: Record[] = [] - const server = createServer((req, res) => { - let body = '' - req.setEncoding('utf8') - req.on('data', (chunk) => { - body += chunk - }) - req.on('end', () => { - posts.push({ ...Object.fromEntries(new URLSearchParams(body)), path: req.url ?? '' }) - res.writeHead(200) - res.end() - }) - }) - const port = await new Promise((resolve) => { - server.listen(0, '127.0.0.1', () => { - const address = server.address() - resolve(typeof address === 'object' && address ? address.port : 0) - }) - }) - return { server, port, posts } -} - -describe.skipIf(process.platform !== 'win32')('Claude statusLine delivery on Windows', () => { - let home = '' - let server: Server | null = null - - afterEach(() => { - server?.close() - server = null - homedirMock.mockReset() - if (home) { - removeTreeSync(home) - home = '' - } - }) - - async function installInto(prefix: string, seed?: StatusLineSettings) { - home = mkdtempSync(join(tmpdir(), prefix)) - homedirMock.mockReturnValue(home) - // Satisfy developer cmd AutoRun entries that reference this file. - writeFileSync(join(home, '.cmd_aliases.cmd'), '@rem\r\n', 'utf8') - if (seed) { - mkdirSync(join(home, '.claude'), { recursive: true }) - writeFileSync(settingsPath(home), JSON.stringify(seed)) - } - new ClaudeHookService().install(CURRENT_CLAUDE) - const settings: StatusLineSettings = JSON.parse(readFileSync(settingsPath(home), 'utf-8')) - const command = settings.statusLine?.command - if (!command) { - throw new Error('Missing managed statusLine command') - } - - const listener = await startStatusLineListener() - server = listener.server - const baseEnv = Object.fromEntries( - // Isolate live Orca endpoints and inherited daemon-worker guards. - Object.entries(process.env).filter(([key]) => !/^(ORCA|CLAUDE)_/.test(key)) - ) - const run = (program: string, args: string[], paneId: number) => - runProcess({ - program, - args, - input: PAYLOAD, - timeoutMs: 15_000, - env: { - ...baseEnv, - USERPROFILE: home, - HOME: home, - // Keep throttle stamps inside the fixture. - TEMP: home, - TMP: home, - ORCA_BACKGROUND_LAUNCH: '1', - ORCA_AGENT_HOOK_PORT: String(listener.port), - ORCA_AGENT_HOOK_TOKEN: HOOK_TOKEN, - ORCA_PANE_KEY: `tab-1:00000000-0000-4000-8000-00000000000${paneId}` - } - }) - return { command, posts: listener.posts, run } - } - - it('upgrades the runtime-home entry to one Windows PowerShell 5.1 and Git Bash both post through', async () => { - const { command, posts, run } = await installInto('orca-claude-statusline-run-', { - statusLine: { type: 'command', command: LEGACY_COMMAND } - }) - expect(command).toBe( - join(home, '.orca', 'agent-hooks', 'claude-statusline.cmd').replaceAll('\\', '/') - ) - - const legacy = await run(powershellPath(), [...POWERSHELL_ARGS, LEGACY_COMMAND], 0) - expect(legacy.code).not.toBe(0) - expect(posts).toHaveLength(0) - - const shells = [ - { - name: 'Windows PowerShell', - program: powershellPath(), - args: [...POWERSHELL_ARGS, command] - }, - { name: 'Git Bash', program: findGitBash(), args: ['-c', command] } - ] - for (const [index, shell] of shells.entries()) { - const result = await run(shell.program, shell.args, index + 1) - expect(result.timedOut, `${shell.name} timed out`).toBe(false) - expect(result.code, `${shell.name} exit code`).toBe(0) - expect(result.stdout, `${shell.name} stdout`).toBe('') - expect(result.stderr, `${shell.name} stderr`).toBe('') - expect(posts[index]?.path, `${shell.name} posted`).toBe('/statusline/claude') - expect(parseClaudeStatusLineBody(posts[index])).toEqual(EXPECTED_RATE_LIMITS) - } - expect(posts).toHaveLength(shells.length) - }, 60_000) - - it('starts no PowerShell per tick for a profile path with a space', async () => { - const { command, posts, run } = await installInto('orca claude statusline space ') - expect(command).toBe(LEGACY_COMMAND) - - const result = await run(findGitBash(), ['-xc', command], 1) - expect(result.code).toBe(0) - expect(result.stdout).toBe('') - expect(result.stderr).not.toMatch(/powershell|-EncodedCommand/i) - expect(posts).toHaveLength(1) - expect(parseClaudeStatusLineBody(posts[0])).toEqual(EXPECTED_RATE_LIMITS) - - // PowerShell-only hosts with unsafe paths rely on OAuth polling. - await run(powershellPath(), [...POWERSHELL_ARGS, command], 2) - expect(posts).toHaveLength(1) - }, 60_000) -}) diff --git a/src/main/claude/claude-stop-ack-race.test.ts b/src/main/claude/claude-stop-ack-race.test.ts deleted file mode 100644 index 7d2f8319d50..00000000000 --- a/src/main/claude/claude-stop-ack-race.test.ts +++ /dev/null @@ -1,139 +0,0 @@ -// SDK control replies can overtake queued frames even when the CLI wrote task completion first. - -import { mkdtempSync, rmSync, writeFileSync } from 'node:fs' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, describe, expect, it } from 'vitest' -import { spawnProcess } from '@orca/process-host' -import { createAgentChildWorkAdmission } from '../../shared/agent-status/child-work/agent-status-child-work-admission' -import type { AgentChildWorkEvidence } from '../../shared/agent-status/child-work/agent-status-child-work-evidence' -import { reconcileAgentChildWorkEvidence } from '../../shared/agent-status/child-work/agent-status-child-work-reconciliation' -import { createAgentStatusStore } from '../../shared/agent-status/store/agent-status-store' -import { makeStructuredAgentStatusSubject } from '../../shared/agent-status/contracts/agent-status-subject' -import { ClaudeChildWorkDecoder } from './claude-child-work-decoder' -import { - openClaudeStreamJsonConnection, - type ClaudeStreamJsonConnection -} from './claude-stream-json-connection' -import { stopClaudeBackgroundTasks } from './structured/claude-structured-control-actions' -import { CLAUDE_STRUCTURED_BASE_OPTIONS } from './structured/launch/claude-structured-launch-resolution' -import type { ClaudeSession } from './structured/claude-structured-session-state' - -const FAKE_CLI = join(__dirname, '__fixtures__', 'claude-agent-sdk-scripted-cli.mjs') -const SESSION_ID = '5348c19f-6a54-4c2e-9c68-9c2b1a3d4e5f' -const parent = makeStructuredAgentStatusSubject( - { executionHostId: 'local', wslDistro: null, workspaceId: 'ws-1', workspaceKind: 'folder' }, - 'session-1' -) -const STARTED = { - type: 'system', - subtype: 'task_started', - task_id: 'task-1', - tool_use_id: 'toolu_1', - task_type: 'local_bash', - is_backgrounded: true, - description: 'npm test', - session_id: SESSION_ID, - uuid: 'started-1' -} -const COMPLETED = { - type: 'system', - subtype: 'task_notification', - task_id: 'task-1', - tool_use_id: 'toolu_1', - status: 'completed', - summary: 'all 12 tests passed', - session_id: SESSION_ID, - uuid: 'completed-1' -} - -const scratch: string[] = [] -const connections: ClaudeStreamJsonConnection[] = [] -afterEach(async () => { - for (const connection of connections.splice(0)) { - await connection.close() - } - for (const dir of scratch.splice(0)) { - rmSync(dir, { recursive: true, force: true }) - } -}) - -function streamed(count: number): Record[] { - return Array.from({ length: count }, (_, index) => ({ - type: 'stream_event', - event: { type: 'content_block_delta', index: 0, delta: { type: 'text_delta', text: 'x' } }, - session_id: SESSION_ID, - uuid: `stream-${index}` - })) -} - -async function until(done: () => boolean): Promise { - for (let attempt = 0; attempt < 500 && !done(); attempt += 1) { - await new Promise((resolve) => setTimeout(resolve, 10)) - } - expect(done()).toBe(true) -} - -/** Emit streamed frames and task completion before the stop reply in one write. */ -async function stoppedAsItCompleted(ahead: number) { - const dir = mkdtempSync(join(tmpdir(), 'claude-stop-ack-race-')) - scratch.push(dir) - const scenarioPath = join(dir, 'scenario.json') - writeFileSync( - scenarioPath, - JSON.stringify({ - steps: [{ emit: STARTED }, { delayMs: 10_000 }], - controlResponses: { stop_task: {} }, - controlResponseLeadingFrames: { stop_task: [...streamed(ahead), COMPLETED] } - }) - ) - const decoder = new ClaudeChildWorkDecoder() - const evidence: AgentChildWorkEvidence[] = [] - const seen: string[] = [] - const connection = await openClaudeStreamJsonConnection( - { - pathToClaudeCodeExecutable: FAKE_CLI, - options: { ...CLAUDE_STRUCTURED_BASE_OPTIONS, sessionId: SESSION_ID }, - cwd: dir, - env: { - PATH: process.env.PATH ?? '', - ORCA_SDK_CONTRACT_SCENARIO_PATH: scenarioPath, - ORCA_SDK_CONTRACT_REPORT_PATH: join(dir, 'report.json') - } - }, - { - onMessage: (message) => { - seen.push(`${String(message.type)}:${String(message.subtype ?? '')}`) - decoder.observe(message) - evidence.push(...decoder.drain(seen.length)) - } - }, - spawnProcess - ) - connections.push(connection) - await until(() => seen.includes('system:task_started')) - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a background stop reads only the session's connection and its child-work decoder. - const session = { connection, childWork: decoder } as unknown as ClaudeSession - await stopClaudeBackgroundTasks(session, 5_000, () => true, ['task-1']) - evidence.push(...decoder.drain(seen.length)) - await until(() => seen.includes('system:task_notification')) - - const store = createAgentStatusStore({ epoch: 'epoch-1', mode: 'authority' }) - store.applyMutation({ parent: { subject: parent } }) - let minted = 0 - const admission = createAgentChildWorkAdmission(store, { - mintChildWorkId: () => `child-${++minted}` - }) - reconcileAgentChildWorkEvidence({ store, admission, parent, provider: 'claude', evidence }) - return store.getChildren(parent) -} - -describe('a Stop acknowledged ahead of the task’s own earlier completion', () => { - for (const ahead of [0, 1, 5, 50]) { - it(`keeps the task's own outcome and summary with ${ahead} frames ahead of it`, async () => { - expect(await stoppedAsItCompleted(ahead)).toMatchObject([ - { membership: 'settled', outcome: 'succeeded', lastMessage: 'all 12 tests passed' } - ]) - }, 20_000) - } -}) diff --git a/src/main/claude/claude-stream-json-connection-close.test.ts b/src/main/claude/claude-stream-json-connection-close.test.ts deleted file mode 100644 index ff888801f42..00000000000 --- a/src/main/claude/claude-stream-json-connection-close.test.ts +++ /dev/null @@ -1,205 +0,0 @@ -import { EventEmitter } from 'node:events' -import { PassThrough } from 'node:stream' -import type { ChildProcessWithoutNullStreams } from 'node:child_process' -import { describe, expect, it, vi } from 'vitest' -import type * as ManagedProviderProcessModule from '../provider-process/managed-provider-process' -import type { query } from '@anthropic-ai/claude-agent-sdk' -import { - CLAUDE_READER_DRAIN_AFTER_EXIT_MS, - openClaudeStreamJsonConnection -} from './claude-stream-json-connection' - -const mocks = vi.hoisted(() => { - const refresh = vi.fn() - const closeWriter = vi.fn() - const tree = { - capture: vi.fn(async () => {}), - refresh: (...args: unknown[]) => refresh(...args), - reap: vi.fn(async () => 'exited' as const), - treeVerdict: 'unverifiable' as const, - forcedReapAttempted: false - } - return { closeWriter, refresh, tree } -}) - -vi.mock('./claude-agent-sdk-exit-proof', () => ({ - createClaudeChildTreeReaper: vi.fn(() => mocks.tree) -})) - -vi.mock('../provider-process/managed-provider-process', async (importOriginal) => { - const original = await importOriginal() - return { - ...original, - spawnManagedProviderProcess: ( - ...args: Parameters - ) => { - const managed = original.spawnManagedProviderProcess(...args) - managed.closeWriter = async () => - (await mocks.closeWriter()) - ? { root: 'exited', tree: 'exited' } - : { root: 'live', tree: 'unverifiable' } - return managed - } - } -}) - -function fakeChild( - streams: { stdout: PassThrough; stderr: PassThrough } = { - stdout: new PassThrough(), - stderr: new PassThrough() - } -): ChildProcessWithoutNullStreams { - const child = new EventEmitter() - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The connection reads only pid, the three pipes and kill, which this fake carries. - return Object.assign(child, { - pid: 424242, - stdin: new PassThrough(), - stdout: streams.stdout, - stderr: streams.stderr, - kill: vi.fn() - }) as unknown as ChildProcessWithoutNullStreams -} - -describe('Claude stream-json close ordering', () => { - it('stops pulling SDK messages until reading resumes', async () => { - mocks.refresh.mockReset() - mocks.closeWriter.mockReset() - mocks.refresh.mockResolvedValue(undefined) - mocks.closeWriter.mockResolvedValue(true) - const child = fakeChild() - const first = Promise.withResolvers>() - const next = vi - .fn<() => Promise>>>() - .mockImplementationOnce(async () => ({ value: await first.promise, done: false })) - .mockResolvedValueOnce({ value: { type: 'second' }, done: false }) - .mockResolvedValue({ value: undefined, done: true }) - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This injected query exercises only the async iterator used by the connection. - const queryImpl = ((params: Parameters[0]) => { - params.options?.spawnClaudeCodeProcess?.({ - command: 'claude', - args: [], - env: {}, - signal: new AbortController().signal - }) - return { - [Symbol.asyncIterator]: () => ({ next }) - } - }) as unknown as typeof query - const seen: string[] = [] - let connection: Awaited> - connection = await openClaudeStreamJsonConnection( - { pathToClaudeCodeExecutable: 'claude', options: {}, cwd: '/work/repo' }, - { - onMessage: (message) => { - seen.push(String(message.type)) - if (message.type === 'first') { - connection.pauseReading?.() - } - } - }, - () => child, - queryImpl - ) - - first.resolve({ type: 'first' }) - await vi.waitFor(() => expect(seen).toEqual(['first'])) - await new Promise((resolve) => setImmediate(resolve)) - expect(next).toHaveBeenCalledOnce() - - connection.resumeReading?.() - await vi.waitFor(() => expect(seen).toEqual(['first', 'second'])) - expect(next).toHaveBeenCalledTimes(3) - await expect(connection.close()).resolves.toBe(true) - }) - - it('releases a pulled frame when provider exit is reported', async () => { - mocks.refresh.mockReset() - mocks.closeWriter.mockReset() - mocks.refresh.mockResolvedValue(undefined) - mocks.closeWriter.mockResolvedValue(true) - const child = fakeChild() - const first = Promise.withResolvers>() - const next = vi - .fn<() => Promise>>>() - .mockImplementationOnce(async () => ({ value: await first.promise, done: false })) - .mockResolvedValue({ value: undefined, done: true }) - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This injected query exercises only the async iterator used by the connection. - const queryImpl = ((params: Parameters[0]) => { - params.options?.spawnClaudeCodeProcess?.({ - command: 'claude', - args: [], - env: {}, - signal: new AbortController().signal - }) - return { - [Symbol.asyncIterator]: () => ({ next }) - } - }) as unknown as typeof query - const events: string[] = [] - const connection = await openClaudeStreamJsonConnection( - { pathToClaudeCodeExecutable: 'claude', options: {}, cwd: '/work/repo' }, - { - onMessage: (message) => events.push(`message:${String(message.type)}`), - onExit: () => events.push('exit') - }, - () => child, - queryImpl - ) - - connection.pauseReading?.() - first.resolve({ type: 'task_notification' }) - await vi.waitFor(() => expect(next).toHaveBeenCalledOnce()) - expect(events).toEqual([]) - - child.emit('exit', 1, null) - await vi.waitFor(() => expect(events).toEqual(['exit', 'message:task_notification'])) - await expect(connection.close()).resolves.toBe(true) - }) - - // Inherited pipes must not keep sends and Stops waiting after proven exit. - it('resolves a proven close though the output never ends', async () => { - mocks.refresh.mockReset() - mocks.closeWriter.mockReset() - mocks.refresh.mockResolvedValue(undefined) - mocks.closeWriter.mockResolvedValue(true) - const child = fakeChild() - const next = vi.fn(() => new Promise>>(() => {})) - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This injected query exercises only the async iterator used by the connection. - const queryImpl = ((params: Parameters[0]) => { - params.options?.spawnClaudeCodeProcess?.({ - command: 'claude', - args: [], - env: {}, - signal: new AbortController().signal - }) - return { - [Symbol.asyncIterator]: () => ({ next }) - } - }) as unknown as typeof query - const connection = await openClaudeStreamJsonConnection( - { pathToClaudeCodeExecutable: 'claude', options: {}, cwd: '/work/repo' }, - {}, - () => child, - queryImpl - ) - const warn = vi.spyOn(console, 'warn').mockImplementation(() => {}) - vi.useFakeTimers() - try { - let closed: boolean | undefined - void connection.close().then((value) => { - closed = value - }) - await vi.advanceTimersByTimeAsync(CLAUDE_READER_DRAIN_AFTER_EXIT_MS - 1) - expect(closed).toBeUndefined() - await vi.advanceTimersByTimeAsync(1) - expect(closed).toBe(true) - expect(warn).toHaveBeenCalledWith( - '[claude-stream-json] output still open after the proven exit:', - expect.anything() - ) - } finally { - vi.useRealTimers() - warn.mockRestore() - } - }) -}) diff --git a/src/main/claude/claude-stream-json-connection.ts b/src/main/claude/claude-stream-json-connection.ts index ae39fdfb007..492b021361e 100644 --- a/src/main/claude/claude-stream-json-connection.ts +++ b/src/main/claude/claude-stream-json-connection.ts @@ -1,34 +1,31 @@ import { withOrcaClaudeChatEntrypoint } from '../../shared/agent-launch/startup/claude-chat-entrypoint' -import { claudeStartupAnswerObservation } from './claude-startup-answer-observation' +import { claudeStartupAnswerObservation } from './child-process/claude-startup-answer-observation' import type { PipedProcessSpawner } from '@orca/process-host/process-spec' import type * as ClaudeAgentSdk from '@anthropic-ai/claude-agent-sdk' import type { CanUseTool, OnUserDialog, SDKUserMessage } from '@anthropic-ai/claude-agent-sdk' import { spawnProcess } from '@orca/process-host' -import { buildClaudeChildProcessEnv } from './claude-child-process-environment' -import { withoutInheritedClaudeConfigDir } from './claude-config-dir-pin' -import { withoutRejectedClaudeApiKey } from './claude-rejected-api-key' +import { buildClaudeChildProcessEnv } from './child-process/claude-child-process-environment' +import { withoutInheritedClaudeConfigDir } from './structured/launch/claude-config-dir-pin' +import { withoutRejectedClaudeApiKey } from './configuration/claude-rejected-api-key' import { - ClaudeControlRequestError, createClaudeControlSurface, type ClaudeControlSurface -} from './claude-agent-sdk-control-requests' -import { createClaudeChildTreeReaper } from './claude-agent-sdk-exit-proof' +} from './sdk-transport/claude-agent-sdk-control-requests' +import { createClaudeChildTreeReaper } from './child-process/claude-agent-sdk-exit-proof' import { withTimeout } from '../../shared/promise-timeout-fallback' import type { DescendantTreeVerdict } from '../pty/process-retirement/pty-descendant-exit-verification' -import { claudeChildCloseProven } from './claude-child-exit-proof-ladder' -import { createClaudeCodeProcessSpawn } from './claude-agent-sdk-process-spawn' +import { claudeChildCloseProven } from './child-process/claude-child-exit-proof-ladder' +import { createClaudeCodeProcessSpawn } from './child-process/claude-agent-sdk-process-spawn' import { claudeUnwrittenUserMessageError, createClaudeUserMessageQueue -} from './claude-agent-sdk-user-message-queue' +} from './sdk-transport/claude-agent-sdk-user-message-queue' import type { ClaudeStructuredSdkOptions } from './structured/launch/claude-structured-launch-resolution' import { withProviderSpawnAbsence } from '../provider-process/provider-executable-missing' -import { claudeStreamJsonExitError } from './claude-stream-json-exit-error' +import { claudeStreamJsonExitError } from './sdk-transport/claude-stream-json-exit-error' import { withObservedProviderExit } from '../native-chat/agent-session-wire/startup/structured-agent-session-failure-text' import type { ProviderProcessCloseOptions } from '../provider-process/provider-process-close' -export { ClaudeControlRequestError } - /** Bound output draining after proven exit so inherited pipes cannot hold close open. */ export const CLAUDE_READER_DRAIN_AFTER_EXIT_MS = 2_000 diff --git a/src/main/claude/claude-structured-result-control-overlap.test.ts b/src/main/claude/claude-structured-result-control-overlap.test.ts deleted file mode 100644 index aceb32b543a..00000000000 --- a/src/main/claude/claude-structured-result-control-overlap.test.ts +++ /dev/null @@ -1,97 +0,0 @@ -import { expect, it, vi } from 'vitest' -import { ClaudeControlRequestTimeoutError } from './claude-agent-sdk-control-requests' -import type { ClaudeStructuredSessionEvent } from './structured/claude-structured-session-state' -import { - acquired, - claudeFrame, - fakeClaude, - tick, - USER_MESSAGE -} from './structured/claude-structured-session-test-support' - -it.each(['before-settlement', 'after-settlement'])( - 'retires result settings begun during an uncertain control: %s', - async (release) => { - const control = Promise.withResolvers() - const report = Promise.withResolvers() - const events: ClaudeStructuredSessionEvent[] = [] - const native = fakeClaude({ routes: { set_model: () => control.promise } }) - const adapter = await acquired(native, {}, events) - const connection = native.connections[0]! - const session = adapter['sessions'].get('session-1')! - const read = () => adapter.readOptions({ sessionId: 'session-1', fence: 7 }) - const finishTurn = () => - claudeFrame(connection, { - type: 'result', - subtype: 'success', - result: 'previous turn completed', - is_error: false - }) - try { - await adapter.setOption({ sessionId: 'session-1', fence: 7, key: 'fastMode', value: 'true' }) - await tick() - await adapter.dispatch({ - sessionId: 'session-1', - fence: 7, - clientMessageId: 'first', - body: USER_MESSAGE - }) - finishTurn() - await tick() - const writing = adapter.dispatch({ - sessionId: 'session-1', - fence: 7, - clientMessageId: 'next', - body: USER_MESSAGE, - executionOptions: { model: 'claude-opus-5' } - }) - await vi.waitFor(() => - expect(connection.calls.some((call) => call.subtype === 'set_model')).toBe(true) - ) - const settings = vi.spyOn(connection, 'getSettings').mockReturnValueOnce(report.promise) - finishTurn() - await vi.waitFor(() => expect(settings).toHaveBeenCalledOnce()) - const stale = { - applied: { model: 'claude-sonnet-5', effort: 'low' }, - effective: { effortLevel: 'low', fastMode: false } - } - if (release === 'before-settlement') { - report.resolve(stale) - await tick() - expect((await read()).current.fastMode).toBe(true) - expect(session.appliedOptions).toBeUndefined() - } - control.reject(new ClaudeControlRequestTimeoutError('set_model')) - expect(await writing).toMatchObject({ state: 'rejected' }) - report.resolve(stale) - await tick() - const current = (await read()).current - expect(current).toMatchObject({ effort: 'high', fastMode: true }) - expect(current.confirmed ?? []).not.toContain('fastMode') - expect(session.appliedOptions).toBeUndefined() - expect(Object.fromEntries(session.appliedInputOptions)).toEqual({}) - expect( - events.some( - (event) => event.type === 'options-reported' && event.reportedOptions.effort === 'low' - ) - ).toBe(false) - - native.routes.set_model = () => undefined - await adapter.setOption({ sessionId: 'session-1', fence: 7, key: 'model', value: 'opus' }) - settings.mockResolvedValueOnce({ - applied: { model: 'claude-opus-5', effort: 'medium' }, - effective: { effortLevel: 'medium', fastMode: true } - }) - finishTurn() - await vi.waitFor(async () => - expect((await read()).current).toMatchObject({ effort: 'medium', fastMode: true }) - ) - expect(session.appliedInputOptions.get('model')).toBe('opus') - expect(session.appliedOptions).toEqual({ model: 'claude-opus-5', effort: 'medium' }) - } finally { - report.resolve(null) - control.resolve() - await adapter.closeSession('session-1') - } - } -) diff --git a/src/main/claude/claude-subagent-permission-request.test.ts b/src/main/claude/claude-subagent-permission-request.test.ts deleted file mode 100644 index 59dd7c9b91e..00000000000 --- a/src/main/claude/claude-subagent-permission-request.test.ts +++ /dev/null @@ -1,398 +0,0 @@ -// Real CLI captures verify waiting children have durable cards and child waits do not alter parent status. - -import { readFileSync } from 'node:fs' -import { mkdtemp, rm } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { isDeepStrictEqual } from 'node:util' -import { afterEach, beforeEach, describe, expect, it } from 'vitest' -import { parseAgentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' -import type { - AgentJournalRenderItem, - AgentJournalResolution -} from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentChildWorkEvidence } from '../../shared/agent-status/child-work/agent-status-child-work-evidence' -import type { AgentStatusStructuredSessionSubject } from '../../shared/agent-status/contracts/agent-status-subject' -import { AgentHookServer } from '../agent-hooks/server/agent-hook-server' -import type { AgentSessionJournal } from '../native-chat/agent-session-journal/journal-store' -import { createTrackedJournalOpener } from '../native-chat/agent-session-journal/store-lifecycle/journal-host-database-test-support' -import { StructuredAgentSessionCurrentWork } from '../native-chat/agent-session-wire/observations/structured-agent-session-current-work' -import { createDeferredStructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import { testEventSinkLogging } from '../native-chat/agent-session-wire/host/testing/structured-agent-session-logger-test-support' -import { createStructuredAgentSessionLogger } from '../native-chat/agent-session-wire/host/structured-agent-session-logger' -import { StructuredAgentSessionStatusFeed } from '../native-chat/agent-session-wire/observations/structured-agent-session-status-feed' -import { indexedStatusFeedSession } from '../native-chat/agent-session-wire/observations/testing/structured-agent-session-status-feed-test-session' -import { invokeCanUseTool } from './claude-can-use-tool-test-support' -import { ClaudeStructuredSessionAdapter } from './structured/claude-structured-session-adapter' -import type { ClaudeStructuredSessionEvent } from './structured/claude-structured-session-state' -import { - fakeClaude, - identityFor, - PROVIDER_SESSION_ID -} from './structured/claude-structured-session-test-support' -import { claudeStartupSettled } from './structured/claude-structured-startup-settled-test-support' - -const SESSION = 'session-1' -const FENCE = 7 - -type Captured = { from: 'cli' | 'orca'; frame: Record } - -function isRecord(value: unknown): value is Record { - return typeof value === 'object' && value !== null && !Array.isArray(value) -} - -function text(value: unknown): string { - return typeof value === 'string' ? value : '' -} - -function captured(name: string): Captured[] { - const path = join(__dirname, '__fixtures__', 'claude-subagent-permission-frames.json') - const parsed: unknown = JSON.parse(readFileSync(path, 'utf8')) - const events = isRecord(parsed) && isRecord(parsed.scenarios) ? parsed.scenarios[name] : null - if (!Array.isArray(events)) { - throw new Error(`no captured scenario ${name}`) - } - return events.flatMap((event) => - isRecord(event) && (event.from === 'cli' || event.from === 'orca') && isRecord(event.frame) - ? [{ from: event.from, frame: event.frame }] - : [] - ) -} - -function askerOf(name: string): string { - return text(captured(name).find((event) => event.frame.subtype === 'task_started')?.frame.task_id) -} - -const ASKER = askerOf('fg-allow') - -function withoutWaits(evidence: AgentChildWorkEvidence[]): AgentChildWorkEvidence[] { - return evidence.map((edge) => - edge.type === 'live' && edge.child.state === 'waiting' - ? { ...edge, child: { ...edge.child, state: 'working' } } - : edge - ) -} - -function parentRow(server: AgentHookServer) { - const row = server.getStatusSnapshot()[0] - return ( - row && { - state: row.state, - workingMode: row.workingMode, - mainAgent: row.mainAgent, - stateStartedAt: row.stateStartedAt - } - ) -} - -function pendingCards(items: readonly AgentJournalRenderItem[]): AgentJournalRenderItem[] { - return items.filter( - (item) => - (item.body.kind === 'approval' || item.body.kind === 'question') && - item.body.resolution.state === 'pending' - ) -} - -const journals = createTrackedJournalOpener() -let root: string -const hooks: { onEvent?: (event: ClaudeStructuredSessionEvent) => void } = {} - -beforeEach(async () => { - root = await mkdtemp(join(tmpdir(), 'orca-claude-subagent-request-')) -}) - -afterEach(async () => { - hooks.onEvent = undefined - await journals.closeAll() - await rm(root, { recursive: true, force: true }) -}) - -type Publish = { waiting: string[]; askers: string[]; row: unknown; unwaited: unknown } - -async function pipeline() { - let clock = 1_700_000_000_000 - const now = () => (clock += 1) - const journal: AgentSessionJournal = await journals.open({ - identity: identityFor(SESSION), - now, - stateDirectory: join(root, SESSION) - }) - const server = new AgentHookServer() - const unwaited = new AgentHookServer() - const publishes: Publish[] = [] - let published: AgentStatusStructuredSessionSubject | undefined - const viewOf = (providerId: string) => - published && - server.getStructuredChildWorkViews(published).find((view) => view.providerId === providerId) - const record = (subject: AgentStatusStructuredSessionSubject): void => { - published = subject - const cards = pendingCards(journal.snapshot().items) - publishes.push({ - waiting: server - .getStructuredChildWorkViews(subject) - .flatMap((view) => - view.state === 'waiting' && view.membership === 'live' ? [view.providerId ?? '?'] : [] - ), - askers: cards.flatMap((card) => (card.agentId ? [card.agentId] : [])), - row: parentRow(server), - unwaited: parentRow(unwaited) - }) - } - const feed = new StructuredAgentSessionStatusFeed({ - logger: createStructuredAgentSessionLogger(), - sessions: new Map([ - [ - SESSION, - indexedStatusFeedSession({ - journal, - child: { generation: 'spawn-9', fence: FENCE, phase: 'ready' }, - provider: 'claude' - }) - ] - ]), - getConversation: () => null, - now, - statusSink: () => ({ - publish: (summary, subject) => { - server.ingestStructuredStatus(summary, subject) - unwaited.ingestStructuredStatus(summary, subject) - record(subject) - }, - forget: (subject) => { - server.dropStructuredStatus(subject) - unwaited.dropStructuredStatus(subject) - }, - publishChildWork: (subject, evidence, provider) => { - server.ingestStructuredChildWork(subject, evidence, provider) - unwaited.ingestStructuredChildWork(subject, withoutWaits(evidence), provider) - }, - readChildWork: (subject) => server.getStructuredChildWorkViews(subject) - }) - }) - // Match host publication on sink publish and deferred journal commits. - const deferred = createDeferredStructuredAgentSessionEventSink(testEventSinkLogging(SESSION)) - const publishStatus = () => feed.publish(SESSION, journal) - const target = { journal, fence: FENCE, publish: publishStatus } - deferred.bind(target) - let queued = false - journal.observeCommits(() => { - if (!queued) { - queued = true - queueMicrotask(() => { - queued = false - feed.publish(SESSION, journal) - }) - } - }) - const claude = fakeClaude() - const adapter = new ClaudeStructuredSessionAdapter({ - resolveLaunch: async () => ({ - pathToClaudeCodeExecutable: 'claude', - options: {}, - cwd: '/work/repo', - claudeConfigDir: '/accounts/claude', - providerSessionId: PROVIDER_SESSION_ID, - resumeLeafUuid: null, - resumesTranscript: false, - cliFlag: async () => 'supported' as const, - continuesChain: false - }), - openConnection: claude.openConnection, - readProcessStartTime: async () => 1_700_000_000_000, - now, - persistHandle: async () => {}, - onChildWorkEvidence: (sessionId, evidence) => feed.publishChildWork(sessionId, evidence), - onEvent: (event) => hooks.onEvent?.(event) - }) - await adapter.acquire({ - identity: identityFor(SESSION), - fence: FENCE, - spawnToken: 'spawn-9', - events: deferred.sink - }) - await claudeStartupSettled(adapter, SESSION) - const settle = async (): Promise => { - for (let round = 0; round < 3; round += 1) { - expect(await deferred.drained()).toEqual({ ok: true }) - await new Promise((resolve) => setTimeout(resolve, 0)) - } - } - const hostRecords = - (resolution: Pick, itemId = cardId()) => - async (): Promise => { - await deferred.drained() - const card = pendingCards(journal.snapshot().items).find((item) => item.itemId === itemId) - const identity = card && parseAgentJournalItemKey(card.itemId) - if (card?.body.kind !== 'approval' || !identity) { - throw new Error('no pending card to record') - } - await journal.appendItem( - identity, - { ...card.body, resolution: { ...resolution, resolvedBy: 'client-1', resolvedAt: now() } }, - { - fence: FENCE, - turnScope: new StructuredAgentSessionCurrentWork(journal, FENCE).turnScope() - } - ) - } - const cardId = (): string => { - const card = pendingCards(journal.snapshot().items)[0] - if (!card) { - throw new Error('no pending card') - } - return card.itemId - } - const connection = claude.connections[0]! - const aborts = new Map() - const step = async ( - { from, frame }: Captured, - options: { withoutAgentId?: boolean } = {} - ): Promise => { - const request = isRecord(frame.request) ? frame.request : null - if (frame.type === 'control_request' && request?.subtype === 'can_use_tool') { - const controller = new AbortController() - aborts.set(text(frame.request_id), controller) - const agentId = options.withoutAgentId ? '' : text(request.agent_id) - invokeCanUseTool( - connection, - text(request.tool_name), - text(frame.request_id), - text(request.tool_use_id), - { - input: isRecord(request.input) ? request.input : {}, - signal: controller.signal, - ...(agentId ? { agentID: agentId } : {}) - } - ) - } else if (from === 'cli') { - connection.handlers.onMessage?.({ ...frame, session_id: PROVIDER_SESSION_ID }) - } - await settle() - } - const ask = async (name: string, options: { withoutAgentId?: boolean } = {}): Promise => { - const events = captured(name) - const at = events.findIndex((event) => event.frame.type === 'control_request') - for (const event of events.slice(0, at + 1)) { - await step(event, options) - } - } - const violations = () => - publishes.filter( - (entry) => - entry.waiting.some((id) => !entry.askers.includes(id)) || - !isDeepStrictEqual(entry.row, entry.unwaited) - ) - const raise = (requestId: string, toolUseId: string, agentId?: string): void => { - const controller = new AbortController() - aborts.set(requestId, controller) - invokeCanUseTool(connection, 'Bash', requestId, toolUseId, { - input: { command: `echo ${requestId}` }, - signal: controller.signal, - ...(agentId ? { agentID: agentId } : {}) - }) - } - return { - adapter, - journal, - deferred, - target, - publishStatus, - connection, - now, - raise, - publishes, - violations, - viewOf, - settle, - step, - ask, - cardId, - hostRecords, - aborts - } -} - -type Pipeline = Awaited> - -function answer( - run: Pipeline, - optionId: 'allow' | 'deny', - commit = run.hostRecords({ state: 'resolved', selectedOptionId: optionId }), - itemId = run.cardId() -) { - return run.adapter.answerPrompt({ - sessionId: SESSION, - itemId, - kind: 'approval', - response: { kind: 'option', optionId }, - fence: FENCE, - commit - }) -} - -describe("a Claude subagent's permission request", () => { - it('waits only once its card is written, though the write waits for the journal', async () => { - const run = await pipeline() - const events = captured('fg-allow') - const at = events.findIndex((event) => event.frame.type === 'control_request') - for (const event of events.slice(0, at)) { - await run.step(event) - } - run.deferred.unbind() - run.raise('req-late', 'toolu_late', ASKER) - await new Promise((resolve) => setTimeout(resolve, 0)) - run.publishStatus() - expect(run.publishes.at(-1)?.waiting).toEqual([]) - run.deferred.bind(run.target) - await run.settle() - expect(run.publishes.at(-1)?.waiting).toEqual([ASKER]) - expect(run.violations()).toEqual([]) - }) - - it('waits again, beside its card, when the host fails to record the answer', async () => { - const run = await pipeline() - await run.ask('fg-allow') - await expect( - answer(run, 'allow', async () => { - throw new Error('journal write failed') - }) - ).rejects.toThrow('journal write failed') - await run.settle() - expect(run.publishes.at(-1)?.waiting).toEqual([ASKER]) - expect(run.violations()).toEqual([]) - }) - - it('waits each asking subagent beside its own card, and only those', async () => { - const run = await pipeline() - await run.ask('fg-allow') - const started = captured('fg-allow').find((event) => event.frame.subtype === 'task_started') - await run.step({ - from: 'cli', - frame: { ...started?.frame, task_id: 'agent-two', uuid: 'u-two', tool_use_id: 'toolu_two' } - }) - run.raise('req-two', 'toolu_two_bash', 'agent-two') - await run.settle() - expect([...(run.publishes.at(-1)?.waiting ?? [])].sort()).toEqual([ASKER, 'agent-two'].sort()) - const cardOf = (agentId: string) => - pendingCards(run.journal.snapshot().items).find((card) => card.agentId === agentId)?.itemId - const first = cardOf(ASKER) - await answer( - run, - 'allow', - run.hostRecords({ state: 'resolved', selectedOptionId: 'allow' }, first), - first - ) - await run.settle() - expect(run.publishes.at(-1)?.waiting).toEqual(['agent-two']) - const second = cardOf('agent-two') - await answer( - run, - 'allow', - run.hostRecords({ state: 'resolved', selectedOptionId: 'allow' }, second), - second - ) - await run.settle() - expect(run.publishes.at(-1)?.waiting).toEqual([]) - expect(run.violations()).toEqual([]) - }) -}) diff --git a/src/main/claude/claude-supervised-stop-real-cli.test.ts b/src/main/claude/claude-supervised-stop-real-cli.test.ts deleted file mode 100644 index e64788518a2..00000000000 --- a/src/main/claude/claude-supervised-stop-real-cli.test.ts +++ /dev/null @@ -1,246 +0,0 @@ -import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { randomUUID } from 'node:crypto' -import { afterEach, describe, expect, it } from 'vitest' -import { runProcess } from '@orca/process-host' -import { resolveSessionFilePath } from '../native-chat/session-file-resolver' -import { SUPERVISED_GRACEFUL_EXIT_MS } from './claude-child-exit-proof-ladder' -import { claudeConfigDirEnvPatch } from './claude-config-dir-pin' -import { realClaudeLaunchHome } from './claude-real-cli-availability-test-support' -import { - openClaudeStreamJsonConnection, - type ClaudeStreamJsonConnection -} from './claude-stream-json-connection' -import { - CLAUDE_STRUCTURED_BASE_OPTIONS, - claudeStructuredPermissionOptions -} from './structured/launch/claude-structured-launch-resolution' - -// Opt-in spends real turns; ORCA_REAL_CLAUDE_SETTINGS supports auth outside the Claude home. -const CLAUDE_BIN = process.env.ORCA_REAL_CLAUDE_BIN ?? '' -const enabled = - process.env.ORCA_REAL_CLAUDE_SUPERVISED_STOP === '1' && - process.platform !== 'win32' && - CLAUDE_BIN.length > 0 -const FRAMES_OUT = process.env.ORCA_REAL_CLAUDE_FRAMES_OUT -const home = realClaudeLaunchHome() -const TOOL_MARKER = 'orca_supervised_stop_probe' -const TOOL_PROMPT = `Use the Bash tool to run exactly this command, with no timeout argument, and nothing else: python3 -c "import time; time.sleep(120) # ${TOOL_MARKER}"` - -type Frame = { at: number; message: Record } -type Row = { pid: number; ppid: number; command: string } - -const recordedPids = new Set() -const tempDirs: string[] = [] -const connections: ClaudeStreamJsonConnection[] = [] - -function alive(pid: number): boolean { - try { - process.kill(pid, 0) - return true - } catch (error) { - return !(error instanceof Error && 'code' in error && error.code === 'ESRCH') - } -} - -async function processTable(): Promise { - const result = await runProcess({ program: 'ps', args: ['-axo', 'pid=,ppid=,command='] }) - return result.stdout.split('\n').flatMap((line) => { - const match = /^\s*(\d+)\s+(\d+)\s+(.*)$/.exec(line) - return match ? [{ pid: Number(match[1]), ppid: Number(match[2]), command: match[3] }] : [] - }) -} - -async function descendantsOf(rootPid: number): Promise { - const rows = await processTable() - const found: Row[] = [] - const frontier = [rootPid] - while (frontier.length > 0) { - const parent = frontier.pop() - for (const row of rows.filter((candidate) => candidate.ppid === parent)) { - found.push(row) - frontier.push(row.pid) - } - } - return found -} - -async function until(read: () => Promise | T | null, what: string, ms = 90_000) { - const deadline = Date.now() + ms - for (;;) { - const value = await read() - if (value !== null) { - return value - } - if (Date.now() >= deadline) { - throw new Error(`timed out waiting for ${what}`) - } - await new Promise((resolve) => setTimeout(resolve, 250)) - } -} - -async function open(sessionId: string, cwd: string, resume: boolean, frames: Frame[]) { - const settings = process.env.ORCA_REAL_CLAUDE_SETTINGS - const permission = claudeStructuredPermissionOptions('full-access') - const connection = await openClaudeStreamJsonConnection( - { - pathToClaudeCodeExecutable: CLAUDE_BIN, - options: { - ...CLAUDE_STRUCTURED_BASE_OPTIONS, - model: 'haiku', - extraArgs: { - ...CLAUDE_STRUCTURED_BASE_OPTIONS.extraArgs, - ...permission.extraArgs, - ...(settings ? { settings } : {}) - }, - ...(resume ? { resume: sessionId } : { sessionId }) - }, - cwd, - env: { ...home.env, ...claudeConfigDirEnvPatch(home.claudeConfigDir, { env: home.env }) } - }, - { onMessage: (message) => frames.push({ at: Date.now(), message }) } - ) - connections.push(connection) - recordedPids.add(connection.pid!) - return connection -} - -function userMessage(text: string): Record { - return { - type: 'user', - message: { role: 'user', content: [{ type: 'text', text }] }, - parent_tool_use_id: null, - session_id: '' - } -} - -async function transcriptLines(sessionId: string): Promise { - const path = await until( - () => - resolveSessionFilePath('claude', sessionId, { - claudeProjectsDir: join(home.claudeConfigDir, 'projects') - }), - 'the transcript', - 15_000 - ) - return readFileSync(path, 'utf8') -} - -function expectLineAtomic(contents: string): void { - expect(contents.length).toBeGreaterThan(0) - expect(contents.endsWith('\n')).toBe(true) - for (const line of contents.split('\n').filter((entry) => entry.trim())) { - expect(() => JSON.parse(line)).not.toThrow() - } -} - -function isRecord(value: unknown): value is Record { - return typeof value === 'object' && value !== null -} - -function summarize(frames: Frame[], since: number): string[] { - return frames - .filter((frame) => frame.at >= since) - .map(({ at, message }) => { - const inner = isRecord(message.message) ? message.message.content : undefined - const blocks = (Array.isArray(inner) ? inner : []) - .filter(isRecord) - .map((block) => - block.type === 'tool_result' - ? `tool_result(is_error=${String(block.is_error)}:${JSON.stringify(block.content).slice(0, 80)})` - : String(block.type) - ) - return `+${at - since}ms ${String(message.type)}/${String(message.subtype ?? '')}${ - message.type === 'result' ? `(is_error=${String(message.is_error)})` : '' - } ${blocks.join(',')}`.trim() - }) -} - -async function resumeAndAsk(sessionId: string, cwd: string): Promise { - const frames: Frame[] = [] - const resumed = await open(sessionId, cwd, true, frames) - await resumed.send(userMessage('In one short line: what command did I ask you to run?')) - const result = await until( - () => frames.find((frame) => frame.message.type === 'result')?.message ?? null, - 'the resumed turn result' - ) - expect(result.subtype).toBe('success') - await expect(resumed.close()).resolves.toBe(true) -} - -type StopCase = 'close mid-tool' | 'SIGTERM to the supervisor mid-tool' | 'close while idle' - -afterEach(async () => { - for (const pid of recordedPids) { - if (alive(pid)) { - process.kill(pid, 'SIGKILL') - } - } - recordedPids.clear() - connections.splice(0) - for (const dir of tempDirs.splice(0)) { - rmSync(dir, { recursive: true, force: true }) - } -}) - -describe.runIf(enabled)('real Claude stopped through the POSIX supervisor', () => { - it.each(['close mid-tool', 'SIGTERM to the supervisor mid-tool', 'close while idle'])( - '%s: stops Claude and its tool, keeps the transcript line-atomic, and resumes', - async (stopCase) => { - const cwd = mkdtempSync(join(tmpdir(), 'orca-real-claude-stop-')) - tempDirs.push(cwd) - const sessionId = randomUUID() - const frames: Frame[] = [] - const connection = await open(sessionId, cwd, false, frames) - const supervisor = connection.pid! - const midTool = stopCase !== 'close while idle' - await connection.send(userMessage(midTool ? TOOL_PROMPT : 'Reply with the single word: ok')) - const descendants = midTool - ? await until(async () => { - const rows = await descendantsOf(supervisor) - return rows.some((row) => row.command.includes(TOOL_MARKER)) ? rows : null - }, 'the Bash tool').catch((error: unknown) => { - console.log('[no tool] frames so far:', summarize(frames, 0)) - throw error - }) - : await until( - async () => - frames.some((frame) => frame.message.type === 'result') - ? await descendantsOf(supervisor) - : null, - 'the idle turn' - ) - for (const row of descendants) { - recordedPids.add(row.pid) - } - - const signalledAt = Date.now() - if (stopCase === 'SIGTERM to the supervisor mid-tool') { - process.kill(supervisor, 'SIGTERM') - } else { - await expect(connection.close()).resolves.toBe(true) - } - const gone = await until( - () => ([supervisor, ...descendants.map((row) => row.pid)].some(alive) ? null : true), - 'the supervisor, Claude and its tools to exit', - SUPERVISED_GRACEFUL_EXIT_MS + 2_000 - ) - const stoppedMs = Date.now() - signalledAt - const after = summarize(frames, signalledAt) - console.log(`[${stopCase}] stopped in ${stoppedMs} ms; frames after the stop:`, after) - if (FRAMES_OUT) { - writeFileSync( - `${FRAMES_OUT}.${stopCase.replaceAll(' ', '-')}.json`, - JSON.stringify({ stoppedMs, after }, null, 2) - ) - } - expect(gone).toBe(true) - - expectLineAtomic(await transcriptLines(sessionId)) - await resumeAndAsk(sessionId, cwd) - expectLineAtomic(await transcriptLines(sessionId)) - }, - 180_000 - ) -}) diff --git a/src/main/claude/claude-supervised-stop.integration.test.ts b/src/main/claude/claude-supervised-stop.integration.test.ts deleted file mode 100644 index 17155f59f56..00000000000 --- a/src/main/claude/claude-supervised-stop.integration.test.ts +++ /dev/null @@ -1,241 +0,0 @@ -import { spawn, type ChildProcess } from 'node:child_process' -import { existsSync, mkdtempSync, rmSync } from 'node:fs' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, describe, expect, it } from 'vitest' -import type { SpawnOptions as SdkSpawnOptions } from '@anthropic-ai/claude-agent-sdk' -import { spawnProcess } from '@orca/process-host' -import type { ProcessSpec } from '@orca/process-host/process-spec' -import { - PROVIDER_SIGTERM_GRACE_MS, - PROVIDER_STDIN_END_GRACE_MS, - PROVIDER_SUPERVISOR_MAX_STOP_MS -} from '../provider-process/provider-process-supervisor' -import { createClaudeChildTreeReaper, proveClaudeChildExit } from './claude-agent-sdk-exit-proof' -import { createClaudeCodeProcessSpawn } from './claude-agent-sdk-process-spawn' - -// EOF leaves the turn running; SIGTERM reaps a detached tool but preserves a double-forked daemon. -const FAKE_CLAUDE = String.raw` - const { spawn } = require('node:child_process') - const { writeFileSync } = require('node:fs') - process.stdin.resume() - process.stdout.on('error', () => {}) - const tool = spawn(process.execPath, ['-e', 'setInterval(() => {}, 60000)'], { - detached: true, - stdio: 'ignore' - }) - const forker = spawn( - process.execPath, - ['-e', "const d = require('node:child_process').spawn(process.execPath, ['-e', 'setInterval(() => {}, 60000)'], { detached: true, stdio: 'ignore' }); d.unref(); process.stdout.write(String(d.pid))"], - { stdio: ['ignore', 'pipe', 'ignore'] } - ) - let daemon = '' - forker.stdout.on('data', (chunk) => { daemon += chunk }) - forker.once('exit', () => { - process.stdout.write(JSON.stringify({ claude: process.pid, tool: tool.pid, daemon: Number(daemon) }) + '\n') - }) - process.on('SIGTERM', () => { - if (process.env.ORCA_TEST_CLAUDE_IGNORES_SIGTERM) return - try { process.kill(-tool.pid, 'SIGKILL') } catch {} - writeFileSync(process.env.ORCA_TEST_SIGTERM_MARKER, 'reaped') - process.exit(143) - }) - setInterval(() => {}, 60000) -` - -// A killable stand-in for Orca's main launches the production spawn spec. -const OWNER = String.raw` - const { spawn } = require('node:child_process') - const spec = JSON.parse(process.env.ORCA_TEST_SPAWN_SPEC) - const env = { ...spec.env } - if (env.ORCA_PROVIDER_SUPERVISOR_SPEC) { - const supervisor = JSON.parse(Buffer.from(env.ORCA_PROVIDER_SUPERVISOR_SPEC, 'base64').toString()) - supervisor.ownerPid = process.pid - env.ORCA_PROVIDER_SUPERVISOR_SPEC = Buffer.from(JSON.stringify(supervisor)).toString('base64') - } - const child = spawn(spec.program, spec.args, { - cwd: spec.cwd, - env, - detached: spec.detached, - stdio: ['pipe', 'pipe', 'ignore'] - }) - process.stdout.write(JSON.stringify({ root: child.pid }) + '\n') - child.stdout.pipe(process.stdout) - setInterval(() => {}, 60000) -` - -const recordedPids = new Set() -const tempDirs: string[] = [] - -function alive(pid: number): boolean { - try { - process.kill(pid, 0) - return true - } catch (error) { - return !(error instanceof Error && 'code' in error && error.code === 'ESRCH') - } -} - -async function waitFor(predicate: () => boolean, timeoutMs: number): Promise { - const deadline = Date.now() + timeoutMs - while (!predicate()) { - if (Date.now() >= deadline) { - return false - } - await new Promise((resolve) => setTimeout(resolve, 25)) - } - return true -} - -function readPids(child: ChildProcess, keys: readonly string[]): Promise> { - return new Promise((resolve, reject) => { - const pids: Record = {} - let buffered = '' - const timeout = setTimeout(() => reject(new Error(`no ${keys.join('/')} pids`)), 10_000) - const onData = (chunk: Buffer): void => { - buffered += chunk.toString() - const lines = buffered.split('\n') - buffered = lines.pop() ?? '' - for (const line of lines) { - const parsed: unknown = JSON.parse(line) - for (const [key, pid] of Object.entries(parsed ?? {})) { - if (typeof pid === 'number' && pid > 0) { - pids[key] = pid - recordedPids.add(pid) - } - } - } - if (keys.every((key) => key in pids)) { - clearTimeout(timeout) - child.stdout!.off('data', onData) - child.stdout!.resume() - resolve(pids) - } - } - child.stdout!.on('data', onData) - }) -} - -function sdkOptions(env: Record): SdkSpawnOptions { - const dir = mkdtempSync(join(tmpdir(), 'orca-claude-supervised-')) - tempDirs.push(dir) - return { - command: process.execPath, - args: ['-e', FAKE_CLAUDE], - cwd: dir, - env: { - ...process.env, - ORCA_TEST_SIGTERM_MARKER: join(dir, 'sigterm-reap'), - ...env - }, - signal: new AbortController().signal - } -} - -async function spawnClaude(env: Record = {}) { - const spawner = createClaudeCodeProcessSpawn(spawnProcess) - const options = sdkOptions(env) - const child = spawner.spawn(options) - recordedPids.add(child.pid!) - const managed = spawner.managed - if (!managed) { - throw new Error('Claude spawner did not retain its managed child') - } - const exit = new Promise<{ code: number | null; signal: NodeJS.Signals | null }>((resolve) => - managed.onExit(resolve) - ) - const pids = await readPids(child, ['claude', 'tool', 'daemon']) - const close = (): Promise => proveClaudeChildExit({ managed }) - return { child, managed, exit, pids, close, marker: String(options.env.ORCA_TEST_SIGTERM_MARKER) } -} - -afterEach(() => { - for (const pid of recordedPids) { - if (alive(pid)) { - process.kill(pid, 'SIGKILL') - } - } - recordedPids.clear() - for (const dir of tempDirs.splice(0)) { - rmSync(dir, { recursive: true, force: true }) - } -}) - -describe.runIf(process.platform !== 'win32')('Claude under the POSIX provider supervisor', () => { - it('stops a mid-turn Claude on close instead of letting stdin end finish its turn', async () => { - const { child, managed, exit, pids, close, marker } = await spawnClaude() - expect(child.pid).not.toBe(pids.claude) - - const startedAt = Date.now() - await expect(close()).resolves.toBe(true) - expect(managed.lastCloseResult).toEqual({ root: 'exited', tree: 'exited' }) - await expect(close()).resolves.toBe(true) - - expect(Date.now() - startedAt).toBeLessThan(PROVIDER_STDIN_END_GRACE_MS) - expect(existsSync(marker)).toBe(true) - await expect(exit).resolves.toEqual({ code: null, signal: 'SIGTERM', processless: false }) - expect(alive(pids.claude)).toBe(false) - expect(alive(pids.tool)).toBe(false) - }) - - it('lets the supervisor escalate a Claude that ignores SIGTERM, and exits only after it', async () => { - const { managed, exit, pids, close } = await spawnClaude({ - ORCA_TEST_CLAUDE_IGNORES_SIGTERM: '1' - }) - - const startedAt = Date.now() - await expect(close()).resolves.toBe(true) - expect(managed.lastCloseResult).toEqual({ root: 'exited', tree: 'exited' }) - await expect(close()).resolves.toBe(true) - - const elapsed = Date.now() - startedAt - expect(elapsed).toBeGreaterThanOrEqual(PROVIDER_SIGTERM_GRACE_MS) - expect(elapsed).toBeLessThan(PROVIDER_SUPERVISOR_MAX_STOP_MS + 1_000) - await expect(exit).resolves.toEqual({ code: null, signal: 'SIGTERM', processless: false }) - expect(alive(pids.claude)).toBe(false) - }) - - it('forces a Claude that ignores SIGTERM soon after a brief close, with its exit proven', async () => { - const { managed, exit, pids } = await spawnClaude({ ORCA_TEST_CLAUDE_IGNORES_SIGTERM: '1' }) - const tree = createClaudeChildTreeReaper(managed.child, { - site: 'claude-structured-child-close', - exited: () => managed.rootVerdict === 'exited' - }) - - // ast-grep-ignore: test-no-wall-clock -- the brief grace is the behaviour under test - const startedAt = Date.now() - await expect(managed.close(tree, { grace: 'brief' })).resolves.toEqual({ - root: 'exited', - tree: 'exited' - }) - - // ast-grep-ignore: test-no-wall-clock -- the full SIGTERM grace is 3 s; a brief close must not wait it out - expect(Date.now() - startedAt).toBeLessThan(2_500) - await expect(exit).resolves.toEqual({ code: null, signal: 'SIGTERM', processless: false }) - expect(alive(pids.claude)).toBe(false) - expect(alive(pids.tool)).toBe(false) - }) - - it("stops Claude and its tool when Orca's main dies, and leaves a daemon that left its tree alone", async () => { - const specs: ProcessSpec[] = [] - createClaudeCodeProcessSpawn((spec) => { - specs.push(spec) - return spawnProcess({ program: 'true' }) - }).spawn(sdkOptions({})) - const owner = spawn(process.execPath, ['-e', OWNER], { - env: { ...process.env, ORCA_TEST_SPAWN_SPEC: JSON.stringify(specs[0]) }, - stdio: ['ignore', 'pipe', 'ignore'] - }) - recordedPids.add(owner.pid!) - const pids = await readPids(owner, ['root', 'claude', 'tool', 'daemon']) - - owner.kill('SIGKILL') - - expect(await waitFor(() => !alive(pids.claude), PROVIDER_SUPERVISOR_MAX_STOP_MS)).toBe(true) - expect(await waitFor(() => !alive(pids.root), PROVIDER_SUPERVISOR_MAX_STOP_MS)).toBe(true) - // The tool's separate group requires Claude's SIGTERM handler to reap it. - expect(alive(pids.tool)).toBe(false) - // A daemon that left the tree has no proven ownership. - expect(alive(pids.daemon)).toBe(true) - }) -}) diff --git a/src/main/claude/claude-transcript-duration.test.ts b/src/main/claude/claude-transcript-duration.test.ts deleted file mode 100644 index 23b672ad9b3..00000000000 --- a/src/main/claude/claude-transcript-duration.test.ts +++ /dev/null @@ -1,329 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' -import { selectStructuredAgentSettledTurns } from '../../shared/agent-session/view/structured-agent-session-turn-timing' -import { isStructuredRewindTarget } from '../native-chat/agent-session-wire/rewind/structured-rewind-cut' -import { SID, chat, chatTurn } from './claude-transcript-catch-up-test-support' - -// Captured CLI 2.1.308 ancestry: retain source identities, clocks, content and cycle boundaries. -// Only the session and first parent are rebound to the shared disk/journal fixture below. -const capturedDurationRows: Record[] = [ - { - type: 'user', - uuid: '2d5c5bfb-2fb5-4d6e-9ad1-88e68f302f90', - parentUuid: '55b46dc4-c498-4048-a31e-49484f80bf41', - timestamp: '2026-10-22T23:31:49.253Z', - isSidechain: false, - promptSource: 'typed', - message: { - role: 'user', - content: 'Reply exactly CLAUDE-AFTER-RECOVERY HARBOUR-1489 and CLI-REWIND-1552' - } - }, - { - type: 'attachment', - uuid: '600bd4b1-fbb0-4ef5-b9ab-13133119cf9d', - parentUuid: '2d5c5bfb-2fb5-4d6e-9ad1-88e68f302f90', - timestamp: '2026-10-22T23:31:49.253Z', - isSidechain: false, - attachment: { - type: 'environment' - } - }, - { - type: 'attachment', - uuid: 'adb98c53-b869-4fb3-8e69-8a789c44a6ed', - parentUuid: '600bd4b1-fbb0-4ef5-b9ab-13133119cf9d', - timestamp: '2026-10-22T23:31:49.253Z', - isSidechain: false, - attachment: { - type: 'agent_listing_delta' - } - }, - { - type: 'attachment', - uuid: '42c32240-2529-4d45-a2cf-c6d20e7a7495', - parentUuid: 'adb98c53-b869-4fb3-8e69-8a789c44a6ed', - timestamp: '2026-10-22T23:31:49.253Z', - isSidechain: false, - attachment: { - type: 'total_tokens_reminder' - } - }, - { - type: 'assistant', - uuid: 'ab494260-8c70-4383-a859-e726caf272cf', - parentUuid: '42c32240-2529-4d45-a2cf-c6d20e7a7495', - timestamp: '2026-10-22T23:31:51.148Z', - isSidechain: false, - apiBlockIndex: 0, - message: { - id: 'msg_011CgJ9Xf5dhTUW23wbCZ1Yn', - role: 'assistant', - content: [ - { - type: 'text', - text: 'CLAUDE-AFTER-RECOVERY HARBOUR-1489 CLI-REWIND-1552' - } - ] - } - }, - { - type: 'system', - subtype: 'turn_duration', - uuid: 'f47f4e0a-9816-473c-b80d-8ed90d0a21e2', - parentUuid: 'ab494260-8c70-4383-a859-e726caf272cf', - timestamp: '2026-10-22T23:31:51.167Z', - isMeta: false, - isSidechain: false, - durationMs: 1938 - }, - { - type: 'user', - uuid: '37adf9f0-c934-4a98-8a8f-34cfacb53fce', - parentUuid: 'f47f4e0a-9816-473c-b80d-8ed90d0a21e2', - timestamp: '2026-10-22T23:32:10.885Z', - isSidechain: false, - promptSource: 'typed', - message: { - role: 'user', - content: 'Use your Bash tool to run sleep 20, then reply exactly QUEUE-REWRITE-OPEN-1552.' - } - }, - { - type: 'attachment', - uuid: 'f11c17a7-5c52-43d6-9881-aed7b0092489', - parentUuid: '37adf9f0-c934-4a98-8a8f-34cfacb53fce', - timestamp: '2026-10-22T23:32:10.885Z', - isSidechain: false, - attachment: { - type: 'total_tokens_reminder' - } - }, - { - type: 'assistant', - uuid: '47f13407-55d3-4226-91f2-431383ec38d5', - parentUuid: 'f11c17a7-5c52-43d6-9881-aed7b0092489', - timestamp: '2026-10-22T23:32:12.581Z', - isSidechain: false, - apiBlockIndex: 0, - message: { - id: 'msg_011CgJ9ZFsSZTgTX12zBVFp2', - role: 'assistant', - content: [ - { - type: 'tool_use', - id: 'toolu_01MoAGs3MB32fco3kjkHRF5B', - name: 'Bash', - input: { - command: 'sleep 20', - description: 'Wait 20 seconds' - }, - caller: { - type: 'direct' - } - } - ] - } - }, - { - type: 'user', - uuid: '76d04699-d585-45f3-b04f-de029ec2afe7', - parentUuid: '47f13407-55d3-4226-91f2-431383ec38d5', - timestamp: '2026-10-22T23:32:32.660Z', - isSidechain: false, - message: { - role: 'user', - content: [ - { - tool_use_id: 'toolu_01MoAGs3MB32fco3kjkHRF5B', - type: 'tool_result', - content: '(Bash completed with no output)', - is_error: false - } - ] - } - }, - { - type: 'attachment', - uuid: '282e98b1-5a75-46ff-be81-ebad78e28563', - parentUuid: '76d04699-d585-45f3-b04f-de029ec2afe7', - timestamp: '2026-10-22T23:32:21.679Z', - isSidechain: false, - attachment: { - type: 'queued_command', - prompt: 'Include QUEUE-BEFORE-EDIT-1552 in your reply. Also include QUEUE-AFTER-EDIT-1552.', - source_uuid: '080f8253-c2a1-41e1-b5e6-b6083f15c62d', - delivery_id: 'ae32f76f-8553-4989-bbdc-b230447648e4', - commandMode: 'prompt', - origin: { - kind: 'human' - }, - timestamp: '2026-10-22T23:32:21.679Z', - humanTurn: true - } - }, - { - type: 'attachment', - uuid: '7cbffe1d-5bde-4f7b-84d5-26c8cc3b55a8', - parentUuid: '282e98b1-5a75-46ff-be81-ebad78e28563', - timestamp: '2026-10-22T23:32:32.665Z', - isSidechain: false, - attachment: { - type: 'total_tokens_reminder' - } - }, - { - type: 'assistant', - uuid: '6869216c-9a65-4acc-87e0-140b280200bf', - parentUuid: '7cbffe1d-5bde-4f7b-84d5-26c8cc3b55a8', - timestamp: '2026-10-22T23:32:37.224Z', - isSidechain: false, - apiBlockIndex: 0, - message: { - id: 'msg_011CgJ9asNQ7ZS2EUrFAGTtS', - role: 'assistant', - content: [ - { - type: 'text', - text: 'QUEUE-REWRITE-OPEN-1552 QUEUE-BEFORE-EDIT-1552 QUEUE-AFTER-EDIT-1552' - } - ] - } - }, - { - type: 'system', - subtype: 'turn_duration', - uuid: '876beb5e-a4e4-4c4a-b842-6af45cfcf20b', - parentUuid: '6869216c-9a65-4acc-87e0-140b280200bf', - timestamp: '2026-10-22T23:32:37.231Z', - isMeta: false, - isSidechain: false, - durationMs: 26349 - }, - { - type: 'user', - uuid: '0ad4bb3c-e775-496a-b4f2-f43f6a47446d', - parentUuid: '876beb5e-a4e4-4c4a-b842-6af45cfcf20b', - timestamp: '2026-10-22T23:33:10.191Z', - isMeta: true, - isSidechain: false, - message: { - role: 'user', - content: - "The command below was run directly in Claude Code, not sent to you as a request, and its output goes straight to the user. It's recorded here as context for later messages." - } - }, - { - type: 'user', - uuid: 'e9a0b4a2-082c-42c4-9f09-e054d6f83921', - parentUuid: '0ad4bb3c-e775-496a-b4f2-f43f6a47446d', - timestamp: '2026-10-22T23:33:10.190Z', - isSidechain: false, - message: { - role: 'user', - content: - '/exit\n exit\n ' - } - }, - { - type: 'user', - uuid: '8422612e-3899-4058-b3f8-b0b960ed86fc', - parentUuid: 'e9a0b4a2-082c-42c4-9f09-e054d6f83921', - timestamp: '2026-10-22T23:33:10.190Z', - isSidechain: false, - message: { - role: 'user', - content: 'See ya!' - } - } -] - -const key = (uuid: string) => agentJournalItemKey({ provider: 'claude', sessionId: SID, uuid }) - -describe('Claude historical cycle duration', () => { - it('ends captured work at its boundary before later idle, next prompt and exit', async () => { - const c = await chat() - await c.live() - const before = c.journal.snapshot() - const handle = structuredClone(c.identity.providerHandle) - const alias = key('p1') - const canonical = c.journal.canonicalItemId(alias) - await c.write([ - ...chatTurn, - ...capturedDurationRows.map((row, i) => ({ - ...row, - sessionId: SID, - ...(i === 0 ? { parentUuid: 'a1' } : {}) - })) - ]) - expect(await c.open('a1')).toBe(true) - const snapshot = c.journal.snapshot() - const turns = snapshot.items.filter((item) => item.body.kind === 'turn') - const first = turns.find( - (item) => - item.body.kind === 'turn' && item.body.turnId === '2d5c5bfb-2fb5-4d6e-9ad1-88e68f302f90' - )! - const second = turns.find( - (item) => - item.body.kind === 'turn' && item.body.turnId === '37adf9f0-c934-4a98-8a8f-34cfacb53fce' - )! - const settled = selectStructuredAgentSettledTurns(snapshot.items, snapshot.submissions) - const seconds = [first, second].map( - (item) => settled.get(item.body.kind === 'turn' ? item.body.userItemId! : '')?.workedSeconds - ) - console.info('captured historical seconds', seconds) - expect(seconds).toEqual([1, 26]) - expect(first).toMatchObject({ - observedAt: 1792711909253, - body: { - startedAt: 1792711909253, - completedAt: 1792711911167, - state: 'completed' - } - }) - expect(second).toMatchObject({ - observedAt: 1792711930885, - body: { - startedAt: 1792711930885, - completedAt: 1792711957231, - state: 'completed' - } - }) - for (const turn of turns.slice(1)) { - expect(turn.body).not.toHaveProperty('outcome') - expect(turn.body).not.toHaveProperty('durationMs') - } - const queuedItem = c.journal.item(key('080f8253-c2a1-41e1-b5e6-b6083f15c62d'))! - expect(queuedItem).toMatchObject({ - observedAt: 1792711941679, - turnScope: { - kind: 'turn', - turnItemId: second.itemId - } - }) - expect(isStructuredRewindTarget(c.journal, queuedItem.itemId)).toBe(false) - expect(isStructuredRewindTarget(c.journal, key('37adf9f0-c934-4a98-8a8f-34cfacb53fce'))).toBe( - true - ) - for (const item of before.items) { - expect(c.journal.item(item.itemId)).toEqual(item) - } - expect(snapshot.submissions).toEqual(before.submissions) - expect(c.identity.providerHandle).toEqual(handle) - expect(c.journal.canonicalItemId(alias)).toBe(canonical) - expect(c.rows()).toContain('user:See ya!') - const exits = turns.filter( - (item) => - item !== first && - item !== second && - !before.items.some((saved) => saved.itemId === item.itemId) - ) - expect(exits).toHaveLength(2) - for (const item of exits) { - expect(item.body).not.toHaveProperty('completedAt') - } - expect(await c.open('a1')).toBe(true) - expect(c.journal.snapshot()).toEqual(snapshot) - expect(c.warn).not.toHaveBeenCalled() - }) -}) diff --git a/src/main/claude/claude-cli-flag-prewarm.ts b/src/main/claude/cli-capabilities/claude-cli-flag-prewarm.ts similarity index 85% rename from src/main/claude/claude-cli-flag-prewarm.ts rename to src/main/claude/cli-capabilities/claude-cli-flag-prewarm.ts index bdebc1be852..0c480e47269 100644 --- a/src/main/claude/claude-cli-flag-prewarm.ts +++ b/src/main/claude/cli-capabilities/claude-cli-flag-prewarm.ts @@ -1,12 +1,12 @@ import { homedir } from 'node:os' -import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host' -import type { AgentSessionRecordStore } from '../runtime/agent-session/records/agent-session-record-store' +import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host' +import type { AgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store' import type { ClaudeCliFlagSupport } from './claude-cli-flag-support' import { claudeProbeEnv, resolveClaudeChildEnvSources, type ClaudeEnvDeps -} from './structured/launch/claude-structured-child-env' +} from '../structured/launch/claude-structured-child-env' const MAX_PREWARMED_FOLDERS = 4 diff --git a/src/main/claude/claude-cli-flag-support.ts b/src/main/claude/cli-capabilities/claude-cli-flag-support.ts similarity index 100% rename from src/main/claude/claude-cli-flag-support.ts rename to src/main/claude/cli-capabilities/claude-cli-flag-support.ts diff --git a/src/main/claude/cli-capabilities/claude-hook-event-versions.test.ts b/src/main/claude/cli-capabilities/claude-hook-event-versions.test.ts new file mode 100644 index 00000000000..392f1c76457 --- /dev/null +++ b/src/main/claude/cli-capabilities/claude-hook-event-versions.test.ts @@ -0,0 +1,22 @@ +import { describe, expect, it, vi } from 'vitest' +import { runProcess } from '@orca/process-host' + +vi.mock('@orca/process-host', () => ({ runProcess: vi.fn() })) + +import { probeClaudeCliVersion } from './claude-hook-event-versions' + +describe('identified Claude version output', () => { + // Recorded macOS 2.1.310 / Windows 2.1.221 probes; historical releases' CLI source + // registers the same suffix (1.0.23, 1.0.64, 2.0.0 and 2.1.100). + + it('does not accept marked output from a failed probe', async () => { + vi.mocked(runProcess).mockResolvedValue({ + stdout: '2.1.310 (Claude Code)\n', + stderr: '', + code: 1, + signal: null, + timedOut: false + }) + expect(await probeClaudeCliVersion('/bin/claude')).toBeNull() + }) +}) diff --git a/src/main/claude/claude-hook-event-versions.ts b/src/main/claude/cli-capabilities/claude-hook-event-versions.ts similarity index 98% rename from src/main/claude/claude-hook-event-versions.ts rename to src/main/claude/cli-capabilities/claude-hook-event-versions.ts index 3321a3703d1..27910729429 100644 --- a/src/main/claude/claude-hook-event-versions.ts +++ b/src/main/claude/cli-capabilities/claude-hook-event-versions.ts @@ -1,4 +1,4 @@ -import { hasReachedAppVersion, isValidAppVersion } from '../../shared/app-version' +import { hasReachedAppVersion, isValidAppVersion } from '../../../shared/app-version' import { runProcess } from '@orca/process-host' import path from 'node:path' diff --git a/src/main/claude/claude-at-rest-commands.ts b/src/main/claude/command-catalog/claude-at-rest-commands.ts similarity index 80% rename from src/main/claude/claude-at-rest-commands.ts rename to src/main/claude/command-catalog/claude-at-rest-commands.ts index 165d870fdc3..45133fd7631 100644 --- a/src/main/claude/claude-at-rest-commands.ts +++ b/src/main/claude/command-catalog/claude-at-rest-commands.ts @@ -1,26 +1,24 @@ -import type { AtRestCommandDemand } from '../native-chat/agent-session-wire/options/at-rest-command-demand' -import { waitForPromiseWithSignal } from '../../shared/abort-signal-reason' -import { PrioritySemaphore } from '../../shared/priority-semaphore' -import type { AgentSessionRecord } from '../../shared/agent-session/lifecycle/agent-session-record' +import type { AtRestCommandDemand } from '../../native-chat/agent-session-wire/options/at-rest-command-demand' +import { waitForPromiseWithSignal } from '../../../shared/abort-signal-reason' +import { PrioritySemaphore } from '../../../shared/priority-semaphore' +import type { AgentSessionRecord } from '../../../shared/agent-session/lifecycle/agent-session-record' import { isLegacyAgentSessionAccountHome, requireLegacyAgentSessionAccountHome, type AgentSessionAccountHome -} from '../../shared/agent-session/lifecycle/agent-session-account-home' -import type { AgentSessionSlashCommand } from '../../shared/agent-session/agent-session-wire' -import { structuredSlashCommands } from '../../shared/agent-session/view/structured-agent-session-composer' -import { discoverSkills } from '../skills/discovery/skill-native-discovery' +} from '../../../shared/agent-session/lifecycle/agent-session-account-home' +import type { AgentSessionSlashCommand } from '../../../shared/agent-session/agent-session-wire' +import { structuredSlashCommands } from '../../../shared/agent-session/view/structured-agent-session-composer' +import { discoverSkills } from '../../skills/discovery/skill-native-discovery' import { scanClaudeCommandFolders } from './claude-command-folder-scan' -import { supportsClaudeStructuredLocation } from './structured/launch/claude-structured-location-support' +import { supportsClaudeStructuredLocation } from '../structured/launch/claude-structured-location-support' import type { ClaudeCommandCatalogProbe } from './claude-command-catalog-probe' import { - AT_REST_COMMANDS_TTL_MS, AtRestCommandCatalog, type AtRestCommandScan -} from '../native-chat/agent-session-wire/options/at-rest-command-catalog' +} from '../../native-chat/agent-session-wire/options/at-rest-command-catalog' import { join } from 'node:path' -export const CLAUDE_AT_REST_COMMANDS_TTL_MS = AT_REST_COMMANDS_TTL_MS // Older clients eagerly discover commands; retain their bounded admission. const MAX_PROBES_RUNNING = 2 diff --git a/src/main/claude/claude-command-catalog-probe.ts b/src/main/claude/command-catalog/claude-command-catalog-probe.ts similarity index 82% rename from src/main/claude/claude-command-catalog-probe.ts rename to src/main/claude/command-catalog/claude-command-catalog-probe.ts index c13a4459e27..2db61b4e6b3 100644 --- a/src/main/claude/claude-command-catalog-probe.ts +++ b/src/main/claude/command-catalog/claude-command-catalog-probe.ts @@ -1,7 +1,10 @@ -import type { AgentSessionSlashCommand } from '../../shared/agent-session/agent-session-wire' -import { runClaudeListing, type ClaudeModelCatalogProbeDeps } from './claude-model-catalog-probe' +import type { AgentSessionSlashCommand } from '../../../shared/agent-session/agent-session-wire' +import { + runClaudeListing, + type ClaudeModelCatalogProbeDeps +} from '../model-catalog/claude-model-catalog-probe' import { ClaudeSlashCommandCatalog } from './claude-slash-command-catalog' -import { readClaudeControlResponses } from './claude-control-responses' +import { readClaudeControlResponses } from '../sdk-transport/claude-control-responses' const REQUEST_ID = 'orca-command-discovery' diff --git a/src/main/claude/claude-command-folder-scan.ts b/src/main/claude/command-catalog/claude-command-folder-scan.ts similarity index 94% rename from src/main/claude/claude-command-folder-scan.ts rename to src/main/claude/command-catalog/claude-command-folder-scan.ts index 15a5f0a2c8a..fec4dadd914 100644 --- a/src/main/claude/claude-command-folder-scan.ts +++ b/src/main/claude/command-catalog/claude-command-folder-scan.ts @@ -1,8 +1,8 @@ import type { Dirent } from 'node:fs' import { opendir, readFile } from 'node:fs/promises' import { join, relative, sep } from 'node:path' -import type { AgentSessionSlashCommand } from '../../shared/agent-session/agent-session-wire' -import { summarizeSkillMarkdown } from '../../shared/skill-metadata' +import type { AgentSessionSlashCommand } from '../../../shared/agent-session/agent-session-wire' +import { summarizeSkillMarkdown } from '../../../shared/skill-metadata' const MARKDOWN_EXTENSION = '.md' const MAX_SCAN_DEPTH = 24 diff --git a/src/main/claude/claude-slash-command-catalog.ts b/src/main/claude/command-catalog/claude-slash-command-catalog.ts similarity index 98% rename from src/main/claude/claude-slash-command-catalog.ts rename to src/main/claude/command-catalog/claude-slash-command-catalog.ts index 2ecf7947716..6859e195152 100644 --- a/src/main/claude/claude-slash-command-catalog.ts +++ b/src/main/claude/command-catalog/claude-slash-command-catalog.ts @@ -1,4 +1,4 @@ -import type { AgentSessionSlashCommand } from '../../shared/agent-session/agent-session-wire' +import type { AgentSessionSlashCommand } from '../../../shared/agent-session/agent-session-wire' // Stream init carries name arrays; control initialization and reloads carry descriptors. const MAX_COMMANDS = 512 diff --git a/src/main/claude/claude-diff-panel-auto-open.test.ts b/src/main/claude/configuration/claude-diff-panel-auto-open.test.ts similarity index 100% rename from src/main/claude/claude-diff-panel-auto-open.test.ts rename to src/main/claude/configuration/claude-diff-panel-auto-open.test.ts diff --git a/src/main/claude/claude-diff-panel-auto-open.ts b/src/main/claude/configuration/claude-diff-panel-auto-open.ts similarity index 94% rename from src/main/claude/claude-diff-panel-auto-open.ts rename to src/main/claude/configuration/claude-diff-panel-auto-open.ts index 496f1ea5634..48a4c4995b8 100644 --- a/src/main/claude/claude-diff-panel-auto-open.ts +++ b/src/main/claude/configuration/claude-diff-panel-auto-open.ts @@ -4,8 +4,8 @@ import { readFile } from 'node:fs/promises' import { homedir } from 'node:os' import { join } from 'node:path' import { resolveClaudeGlobalConfigFile } from './claude-folder-trust-file' -import { claudeVersionReaches } from './claude-hook-event-versions' -import { isRecord } from '../../shared/agent-status/child-work/agent-status-child-work-value-guards' +import { claudeVersionReaches } from '../cli-capabilities/claude-hook-event-versions' +import { isRecord } from '../../../shared/agent-status/child-work/agent-status-child-work-value-guards' export const CLAUDE_DIFF_PANEL_FIRST_VERSION = '2.1.260' diff --git a/src/main/claude/claude-folder-trust-file.test.ts b/src/main/claude/configuration/claude-folder-trust-file.test.ts similarity index 72% rename from src/main/claude/claude-folder-trust-file.test.ts rename to src/main/claude/configuration/claude-folder-trust-file.test.ts index b72e2de9d32..64aaa3d9a3a 100644 --- a/src/main/claude/claude-folder-trust-file.test.ts +++ b/src/main/claude/configuration/claude-folder-trust-file.test.ts @@ -1,16 +1,13 @@ import { chmodSync, - existsSync, lstatSync, mkdirSync, mkdtempSync, - readdirSync, readFileSync, realpathSync, rmSync, statSync, symlinkSync, - utimesSync, writeFileSync } from 'node:fs' import { tmpdir } from 'node:os' @@ -74,22 +71,6 @@ describe('grantClaudeFolderTrust', () => { expect(readFileSync(file, 'utf-8')).toBe('{"oauthAccount": ') }) - it('does nothing while Claude holds its lock, and leaves the lock in place', async () => { - const file = join(root, '.claude.json') - writeConfig(file, {}) - const lockDir = `${file}.lock` - mkdirSync(lockDir) - const oldTime = new Date(Date.now() - 60_000) - // Exceed Claude's 10-second stale window to verify Orca leaves its lock intact. - utimesSync(lockDir, oldTime, oldTime) - await expect(grantClaudeFolderTrust({ configFile: file, folderKeys: ['/wt'] })).resolves.toBe( - 'locked' - ) - expect(readConfig(file)).toEqual({}) - expect(existsSync(lockDir)).toBe(true) - expect(readdirSync(root).sort()).toEqual(['.claude.json', '.claude.json.lock']) - }) - it('updates a symlinked config through its target and keeps the link', async () => { const target = join(root, 'dotfiles-claude.json') const link = join(root, '.claude.json') @@ -102,19 +83,6 @@ describe('grantClaudeFolderTrust', () => { projects: { '/wt': { hasTrustDialogAccepted: true } } }) }) - - it('grants every folder of a launch burst instead of losing some to its own lock', async () => { - const file = join(root, '.claude.json') - writeConfig(file, {}) - const keys = Array.from({ length: 12 }, (_, index) => `/wt-${index}`) - const outcomes = await Promise.all( - keys.map((key) => grantClaudeFolderTrust({ configFile: file, folderKeys: [key] })) - ) - expect(outcomes).toEqual(keys.map(() => 'granted')) - expect(readConfig(file).projects).toEqual( - Object.fromEntries(keys.map((key) => [key, { hasTrustDialogAccepted: true }])) - ) - }) }) describe('grantClaudeWorkspaceTrust', () => { diff --git a/src/main/claude/claude-folder-trust-file.ts b/src/main/claude/configuration/claude-folder-trust-file.ts similarity index 96% rename from src/main/claude/claude-folder-trust-file.ts rename to src/main/claude/configuration/claude-folder-trust-file.ts index 42d3fdbf709..478f2cfd809 100644 --- a/src/main/claude/claude-folder-trust-file.ts +++ b/src/main/claude/configuration/claude-folder-trust-file.ts @@ -12,12 +12,12 @@ import { import { dirname, join, posix, resolve, win32 } from 'node:path' import { homedir } from 'node:os' import { lock } from 'proper-lockfile' -import '../filesystem/atomic-file-publication' -import { renameFileWithWindowsRetry } from '../../shared/windows-retry-file-operations' -import { runKeyedSerializedOperation } from '../../shared/concurrency/keyed-serialized-operations' -import { parseWslUncPath } from '../../shared/wsl-paths' -import { runWslProcess } from '../wsl/execution/wsl-runner' -import type { ClaudeRuntimeAuthPreparation } from '../claude-accounts/runtime-auth/runtime-auth-types' +import '../../filesystem/atomic-file-publication' +import { renameFileWithWindowsRetry } from '../../../shared/windows-retry-file-operations' +import { runKeyedSerializedOperation } from '../../../shared/concurrency/keyed-serialized-operations' +import { parseWslUncPath } from '../../../shared/wsl-paths' +import { runWslProcess } from '../../wsl/execution/wsl-runner' +import type { ClaudeRuntimeAuthPreparation } from '../../claude-accounts/runtime-auth/runtime-auth-types' export type ClaudeTrustPathStyle = 'posix' | 'win32' diff --git a/src/main/claude/claude-rejected-api-key.ts b/src/main/claude/configuration/claude-rejected-api-key.ts similarity index 100% rename from src/main/claude/claude-rejected-api-key.ts rename to src/main/claude/configuration/claude-rejected-api-key.ts diff --git a/src/main/claude/claude-context-facts.ts b/src/main/claude/context-usage/claude-context-facts.ts similarity index 90% rename from src/main/claude/claude-context-facts.ts rename to src/main/claude/context-usage/claude-context-facts.ts index cdcbae70fdf..2c2f7f7c062 100644 --- a/src/main/claude/claude-context-facts.ts +++ b/src/main/claude/context-usage/claude-context-facts.ts @@ -4,9 +4,9 @@ import { type AgentSessionContextReport, type AgentSessionContextUsage, type AgentSessionContextWindow -} from '../../shared/agent-session/agent-session-context-usage' -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +} from '../../../shared/agent-session/agent-session-context-usage' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session/journal/agent-session-journal-identity' +import type { StructuredAgentSessionEventSink } from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' import { claudeContextResetKind, claudeContextWindowFromResult, @@ -14,14 +14,14 @@ import { claudeTokenUsage, type ClaudeMainThreadModel } from './claude-context-usage' -import type { ClaudeOpenTurn } from './claude-open-turn' -import { claudeRecord, claudeText } from './structured/journal/claude-structured-item-translation' -import type { ClaudeTurnEnd } from './claude-turn-lifecycle-item' -import { isRootClaudeFrame } from './claude-turn-opening' +import type { ClaudeOpenTurn } from '../structured/turns/claude-open-turn' +import { claudeRecord, claudeText } from '../structured/journal/claude-structured-item-translation' +import type { ClaudeTurnEnd } from '../structured/turns/claude-turn-lifecycle-item' +import { isRootClaudeFrame } from '../structured/turns/claude-turn-opening' import { writeAgentJournalTurnRow, type AgentJournalTurnRowTarget -} from '../native-chat/agent-session-timeline/agent-journal-turn-row-revision' +} from '../../native-chat/agent-session-timeline/agent-journal-turn-row-revision' const CONVERSATION_FRAME_TYPES = new Set(['assistant', 'user', 'stream_event']) diff --git a/src/main/claude/claude-context-usage.ts b/src/main/claude/context-usage/claude-context-usage.ts similarity index 96% rename from src/main/claude/claude-context-usage.ts rename to src/main/claude/context-usage/claude-context-usage.ts index 8ce61a16c17..64b6100efa7 100644 --- a/src/main/claude/claude-context-usage.ts +++ b/src/main/claude/context-usage/claude-context-usage.ts @@ -5,9 +5,9 @@ import { type AgentSessionContextReport, type AgentSessionContextUsageCategory, type AgentSessionTokenUsage -} from '../../shared/agent-session/agent-session-context-usage' -import type { ClaudeStreamJsonConnection } from './claude-stream-json-connection' -import type { ClaudeJournalTranslator } from './claude-journal-translator-contract' +} from '../../../shared/agent-session/agent-session-context-usage' +import type { ClaudeStreamJsonConnection } from '../claude-stream-json-connection' +import type { ClaudeJournalTranslator } from '../structured/journal/claude-journal-translator-contract' export const CLAUDE_CONTEXT_USAGE_TIMEOUT_MS = 5_000 diff --git a/src/main/claude/claude-conversation-naming.ts b/src/main/claude/conversation-naming/claude-conversation-naming.ts similarity index 95% rename from src/main/claude/claude-conversation-naming.ts rename to src/main/claude/conversation-naming/claude-conversation-naming.ts index 04709778785..dc9736bb34b 100644 --- a/src/main/claude/claude-conversation-naming.ts +++ b/src/main/claude/conversation-naming/claude-conversation-naming.ts @@ -1,13 +1,13 @@ -import { activeProviderContext } from '../../shared/agent-session/agent-session-provider-context' -import type { AgentSessionRecord } from '../../shared/agent-session/lifecycle/agent-session-record' -import { claudeSessionIdForOrcaSession } from './structured/claude-structured-session-id' +import { activeProviderContext } from '../../../shared/agent-session/agent-session-provider-context' +import type { AgentSessionRecord } from '../../../shared/agent-session/lifecycle/agent-session-record' +import { claudeSessionIdForOrcaSession } from '../structured/claude-structured-session-id' import { createClaudeNamingGeneration, type ClaudeNamingGeneration } from './claude-naming-generation' import type { ClaudeNamingInputs } from './claude-naming-invocation' -import { renameClaudeTranscript } from './claude-provider-session-rename' -import type { StructuredAgentSessionAcquireInput } from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +import { renameClaudeTranscript } from '../transcripts/claude-provider-session-rename' +import type { StructuredAgentSessionAcquireInput } from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' type Intent = { record: AgentSessionRecord diff --git a/src/main/claude/claude-naming-generation.ts b/src/main/claude/conversation-naming/claude-naming-generation.ts similarity index 93% rename from src/main/claude/claude-naming-generation.ts rename to src/main/claude/conversation-naming/claude-naming-generation.ts index 2edde684fd4..6dc7a120bf7 100644 --- a/src/main/claude/claude-naming-generation.ts +++ b/src/main/claude/conversation-naming/claude-naming-generation.ts @@ -1,5 +1,5 @@ -import type { ClaudeStreamJsonConnection } from './claude-stream-json-connection' -import type { ClaudeStructuredLaunch } from './structured/launch/claude-structured-launch-resolution' +import type { ClaudeStreamJsonConnection } from '../claude-stream-json-connection' +import type { ClaudeStructuredLaunch } from '../structured/launch/claude-structured-launch-resolution' import { claudeNamingLaunchInputs, type ClaudeNamingInputs } from './claude-naming-invocation' type Phase = 'acquiring' | 'initializing' | 'ready' | 'closing' | 'exited' | 'unproven' diff --git a/src/main/claude/claude-naming-invocation.ts b/src/main/claude/conversation-naming/claude-naming-invocation.ts similarity index 72% rename from src/main/claude/claude-naming-invocation.ts rename to src/main/claude/conversation-naming/claude-naming-invocation.ts index dc077bf6e34..5d7c574a815 100644 --- a/src/main/claude/claude-naming-invocation.ts +++ b/src/main/claude/conversation-naming/claude-naming-invocation.ts @@ -1,19 +1,22 @@ -import type { AgentSessionRecord } from '../../shared/agent-session/lifecycle/agent-session-record' -import { requireLegacyAgentSessionAccountHome } from '../../shared/agent-session/lifecycle/agent-session-account-home' -import { getClaudeProfileRouter } from '../claude-accounts/profiles/routing/claude-profile-installed-router' -import { applyClaudeEnvPatch } from '../claude-accounts/runtime-auth/environment' -import { agentSessionPinnedLaunchDirectory } from '../runtime/agent-session/records/agent-session-record-launch-directory' -import type { StructuredAgentLaunchSources } from '../runtime/agent-session/launch/structured-agent-launch-composition' -import { resolveStructuredAgentCommand } from '../native-chat/structured-agent-command-resolution' +import type { AgentSessionRecord } from '../../../shared/agent-session/lifecycle/agent-session-record' +import { requireLegacyAgentSessionAccountHome } from '../../../shared/agent-session/lifecycle/agent-session-account-home' +import { getClaudeProfileRouter } from '../../claude-accounts/profiles/routing/claude-profile-installed-router' +import { applyClaudeEnvPatch } from '../../claude-accounts/runtime-auth/environment' +import { agentSessionPinnedLaunchDirectory } from '../../runtime/agent-session/records/agent-session-record-launch-directory' +import type { StructuredAgentLaunchSources } from '../../runtime/agent-session/launch/structured-agent-launch-composition' +import { resolveStructuredAgentCommand } from '../../native-chat/structured-agent-command-resolution' import { claudeChildEnv, resolveClaudeChildEnvSources, type ClaudeEnvDeps -} from './structured/launch/claude-structured-child-env' -import { claudeStructuredLaunchArgs } from './structured/launch/claude-structured-launch-args' -import { claudeConfigDirEnvPatch, withoutInheritedClaudeConfigDir } from './claude-config-dir-pin' -import { buildClaudeChildProcessEnv } from './claude-child-process-environment' -import type { ClaudeStructuredLaunch } from './structured/launch/claude-structured-launch-resolution' +} from '../structured/launch/claude-structured-child-env' +import { claudeStructuredLaunchArgs } from '../structured/launch/claude-structured-launch-args' +import { + claudeConfigDirEnvPatch, + withoutInheritedClaudeConfigDir +} from '../structured/launch/claude-config-dir-pin' +import { buildClaudeChildProcessEnv } from '../child-process/claude-child-process-environment' +import type { ClaudeStructuredLaunch } from '../structured/launch/claude-structured-launch-resolution' import { resolve } from 'node:path' export type ClaudeNamingInputs = { diff --git a/src/main/claude/claude-captured-compact-frames.test-fixture.ts b/src/main/claude/fixtures/claude-captured-compact-frames.test-fixture.ts similarity index 100% rename from src/main/claude/claude-captured-compact-frames.test-fixture.ts rename to src/main/claude/fixtures/claude-captured-compact-frames.test-fixture.ts diff --git a/src/main/claude/hook-service.ts b/src/main/claude/hook-service.ts index 433eb1b1ad6..b741945d9fb 100644 --- a/src/main/claude/hook-service.ts +++ b/src/main/claude/hook-service.ts @@ -20,7 +20,7 @@ import { } from '../agent-hooks/installation/configuration/hooks-json-remote' import { writeManagedScriptRemote } from '../agent-hooks/installation/scripts/managed-script-write-remote' import { refreshManagedScriptIfPresent } from '../agent-hooks/installation/scripts/managed-hook-script-refresh' -import { getManagedScript } from './hook-script' +import { getManagedScript } from './hooks/hook-script' import { removeClaudeAgentViewRemote, refreshClaudeAgentView, @@ -32,12 +32,12 @@ import { installWindowsClaudeHookExecutable, installWindowsClaudeHookFiles, refreshWindowsClaudeHookFiles -} from './windows-hook-files' +} from './hooks/windows-hook-files' -export { getManagedScript } -import { getManagedStatusLineScript } from './statusline-script' -import { installClaudeManagedStatusLine, retireClaudeManagedStatusLine } from './statusline-install' -import { refuseProfileAtDefaultHome } from './claude-profile-hook-target' +import { getManagedStatusLineScript } from './hooks/statusline-script' +// oxfmt-ignore +import { installClaudeManagedStatusLine, retireClaudeManagedStatusLine } from './hooks/statusline-install' +import { refuseProfileAtDefaultHome } from './hooks/claude-profile-hook-target' import { applyManagedHooks, CLAUDE_HOOK_SETTINGS, @@ -54,14 +54,14 @@ import { removeManagedHooks, removeManagedStatusLine, type ClaudeCompatibleHookSettings -} from './hook-settings' -import { claudeAcceptsExecFormHooks } from './claude-hook-event-versions' -import { getManagedEventHook } from './claude-managed-event-hook' +} from './hooks/hook-settings' +import { claudeAcceptsExecFormHooks } from './cli-capabilities/claude-hook-event-versions' +import { getManagedEventHook } from './hooks/claude-managed-event-hook' import { getClaudeManagedHookPlan, OPENCLAUDE_MANAGED_HOOK_PLAN, type ClaudeManagedHookPlan -} from './claude-managed-hook-events' +} from './hooks/claude-managed-hook-events' type ClaudeHookServiceOptions = { agent: AgentHookInstallStatus['agent'] diff --git a/src/main/claude/claude-async-permission-request.ts b/src/main/claude/hooks/claude-async-permission-request.ts similarity index 94% rename from src/main/claude/claude-async-permission-request.ts rename to src/main/claude/hooks/claude-async-permission-request.ts index 13a6c83e51a..5c287cd219b 100644 --- a/src/main/claude/claude-async-permission-request.ts +++ b/src/main/claude/hooks/claude-async-permission-request.ts @@ -1,7 +1,7 @@ import { MANAGED_HOOK_TIMEOUT_SECONDS, type HookCommandConfig -} from '../agent-hooks/installation/configuration/hook-config-schema' +} from '../../agent-hooks/installation/configuration/hook-config-schema' // Read by the hook script: this entry runs async, so Claude ignores its output and nothing waits on it. const ASYNC_FLAG = 'export ORCA_HOOK_ASYNC=1; ' diff --git a/src/main/claude/claude-hook-decision-script.ts b/src/main/claude/hooks/claude-hook-decision-script.ts similarity index 92% rename from src/main/claude/claude-hook-decision-script.ts rename to src/main/claude/hooks/claude-hook-decision-script.ts index 721c1f0d601..928e22d4e71 100644 --- a/src/main/claude/claude-hook-decision-script.ts +++ b/src/main/claude/hooks/claude-hook-decision-script.ts @@ -1,5 +1,5 @@ -import { CLAUDE_PRE_TOOL_USE_DECISION } from '../agent-hooks/tool-events/agent-tool-plugin-hooks' -import { CLAUDE_PERMISSION_REQUEST_DECISION } from '../agent-hooks/server/claude-permission-hook-hold' +import { CLAUDE_PRE_TOOL_USE_DECISION } from '../../agent-hooks/tool-events/agent-tool-plugin-hooks' +import { CLAUDE_PERMISSION_REQUEST_DECISION } from '../../agent-hooks/server/claude-permission-hook-hold' /** * Lets Claude Code's PreToolUse hook print Orca's answer (plugins' `agent.tool.before`), and its diff --git a/src/main/claude/claude-managed-event-hook.ts b/src/main/claude/hooks/claude-managed-event-hook.ts similarity index 81% rename from src/main/claude/claude-managed-event-hook.ts rename to src/main/claude/hooks/claude-managed-event-hook.ts index d68b110b690..136d9ab607d 100644 --- a/src/main/claude/claude-managed-event-hook.ts +++ b/src/main/claude/hooks/claude-managed-event-hook.ts @@ -1,5 +1,5 @@ -import { buildManagedCommandHook } from '../agent-hooks/installation/configuration/hook-config-schema' -import type { HookCommandConfig } from '../agent-hooks/installation/configuration/hook-config-schema' +import { buildManagedCommandHook } from '../../agent-hooks/installation/configuration/hook-config-schema' +import type { HookCommandConfig } from '../../agent-hooks/installation/configuration/hook-config-schema' import { CLAUDE_HOOK_SETTINGS, getManagedLifecycleHook, diff --git a/src/main/claude/claude-managed-hook-events.ts b/src/main/claude/hooks/claude-managed-hook-events.ts similarity index 96% rename from src/main/claude/claude-managed-hook-events.ts rename to src/main/claude/hooks/claude-managed-hook-events.ts index 9894f5b4227..550411a20ea 100644 --- a/src/main/claude/claude-managed-hook-events.ts +++ b/src/main/claude/hooks/claude-managed-hook-events.ts @@ -1,10 +1,10 @@ -import type { HookDefinition } from '../agent-hooks/installation/configuration/hook-config-schema' +import type { HookDefinition } from '../../agent-hooks/installation/configuration/hook-config-schema' import { claudeKnowsHookEvent, claudeKnowsStatusLine, claudeVersionReaches, parseClaudeCliVersion -} from './claude-hook-event-versions' +} from '../cli-capabilities/claude-hook-event-versions' export const CLAUDE_EVENTS = [ // SessionStart creates sidebar rows for resumed or idle sessions before the first prompt. diff --git a/src/main/claude/claude-profile-hook-target.ts b/src/main/claude/hooks/claude-profile-hook-target.ts similarity index 87% rename from src/main/claude/claude-profile-hook-target.ts rename to src/main/claude/hooks/claude-profile-hook-target.ts index 19baf9a379e..c868576cc07 100644 --- a/src/main/claude/claude-profile-hook-target.ts +++ b/src/main/claude/hooks/claude-profile-hook-target.ts @@ -1,7 +1,7 @@ import { statSync } from 'node:fs' import { dirname, resolve } from 'node:path' -import type { AgentHookInstallStatus } from '../../shared/agent-hook-listener/configuration/agent-hook-types' -import { isDefinitiveAbsence } from '../../shared/definitive-filesystem-absence' +import type { AgentHookInstallStatus } from '../../../shared/agent-hook-listener/configuration/agent-hook-types' +import { isDefinitiveAbsence } from '../../../shared/definitive-filesystem-absence' import { getConfigPath, type ClaudeCompatibleHookSettings } from './hook-settings' function sameFile(left: string, right: string): boolean { diff --git a/src/main/claude/claude-profile-hooks.test.ts b/src/main/claude/hooks/claude-profile-hooks.test.ts similarity index 95% rename from src/main/claude/claude-profile-hooks.test.ts rename to src/main/claude/hooks/claude-profile-hooks.test.ts index d7e885f5c30..e9680c78f74 100644 --- a/src/main/claude/claude-profile-hooks.test.ts +++ b/src/main/claude/hooks/claude-profile-hooks.test.ts @@ -17,8 +17,8 @@ vi.mock('node:os', async (original) => ({ homedir: () => state.home })) vi.mock('electron', () => ({ app: { getPath: () => state.home } })) -import { ClaudeHookService } from './hook-service' -import { provisionClaudeProfile } from '../claude-accounts/profiles/setup/claude-profile-provisioning' +import { ClaudeHookService } from '../hook-service' +import { provisionClaudeProfile } from '../../claude-accounts/profiles/setup/claude-profile-provisioning' const caseInsensitive = (() => { const dir = mkdtempSync(join(tmpdir(), 'claude-case-probe-')) diff --git a/src/main/claude/claude-status-line-install.test.ts b/src/main/claude/hooks/claude-status-line-install.test.ts similarity index 98% rename from src/main/claude/claude-status-line-install.test.ts rename to src/main/claude/hooks/claude-status-line-install.test.ts index c8069aea660..4d0d362783b 100644 --- a/src/main/claude/claude-status-line-install.test.ts +++ b/src/main/claude/hooks/claude-status-line-install.test.ts @@ -20,7 +20,7 @@ vi.mock('electron', () => ({ } })) -import { ClaudeHookService } from './hook-service' +import { ClaudeHookService } from '../hook-service' const USER_STATUS_LINE = { type: 'command', command: '/usr/local/bin/my-statusline' } diff --git a/src/main/claude/hook-script.ts b/src/main/claude/hooks/hook-script.ts similarity index 85% rename from src/main/claude/hook-script.ts rename to src/main/claude/hooks/hook-script.ts index a12c2812f2e..c6cc7275d99 100644 --- a/src/main/claude/hook-script.ts +++ b/src/main/claude/hooks/hook-script.ts @@ -1,28 +1,28 @@ -import { buildHookProcessCapture } from '../agent-hooks/installation/scripts/hook-process-capture' -import type { AgentHookSource } from '../../shared/agent-hook-listener/transport/agent-hook-relay' -import { buildWindowsAgentHookCurlPostCommand } from '../agent-hooks/installation/commands/windows-agent-hook-post-command' +import { buildHookProcessCapture } from '../../agent-hooks/installation/scripts/hook-process-capture' +import type { AgentHookSource } from '../../../shared/agent-hook-listener/transport/agent-hook-relay' +import { buildWindowsAgentHookCurlPostCommand } from '../../agent-hooks/installation/commands/windows-agent-hook-post-command' import { buildPosixAgentHookPostCommand, buildPosixHookMetadataCacheLines -} from '../agent-hooks/installation/scripts/hook-post-command' +} from '../../agent-hooks/installation/scripts/hook-post-command' import { buildPosixScrubSafeEnvRestoreLines, buildWindowsScrubSafeEnvRestoreLines -} from '../../shared/agent-hook-listener/transport/agent-hook-scrub-safe-env' +} from '../../../shared/agent-hook-listener/transport/agent-hook-scrub-safe-env' import { buildPosixCursorReplayGuardLines, buildWindowsCursorReplayGuardLines -} from '../agent-hooks/installation/scripts/cursor-replay-guard' +} from '../../agent-hooks/installation/scripts/cursor-replay-guard' import { buildPosixGrokReplayGuardLines, buildWindowsGrokReplayGuardLines -} from '../agent-hooks/installation/scripts/grok-replay-guard' +} from '../../agent-hooks/installation/scripts/grok-replay-guard' import { buildPosixHookPayloadCapture, buildPosixHookSpoolLines, buildWindowsHookEnvironmentGuardLines, POSIX_HOOK_STDIN_EXEC -} from '../agent-hooks/installation/scripts/hook-stdin-contract' +} from '../../agent-hooks/installation/scripts/hook-stdin-contract' import { buildPosixClaudeDecisionModeLines, buildPosixClaudeDecisionPreludeLines, @@ -31,7 +31,7 @@ import { import { WINDOWS_CLAUDE_BACKGROUND_JOB_GUARD, buildPosixClaudeBackgroundJobGuardLines -} from '../agent-hooks/installation/scripts/claude-background-job-guard' +} from '../../agent-hooks/installation/scripts/claude-background-job-guard' export function getManagedScript( target: 'local' | 'posix' = 'local', diff --git a/src/main/claude/hook-service.test.ts b/src/main/claude/hooks/hook-service.test.ts similarity index 58% rename from src/main/claude/hook-service.test.ts rename to src/main/claude/hooks/hook-service.test.ts index 7cd3920a2f5..de9d7bdc01c 100644 --- a/src/main/claude/hook-service.test.ts +++ b/src/main/claude/hooks/hook-service.test.ts @@ -2,7 +2,7 @@ import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs' import { tmpdir } from 'node:os' import { join } from 'node:path' import { vi, describe, expect, it } from 'vitest' -import type * as GitBashModule from '../pty/shell-startup/git-bash' +import type * as GitBashModule from '../../pty/shell-startup/git-bash' vi.mock('electron', () => ({ app: { @@ -11,37 +11,14 @@ vi.mock('electron', () => ({ })) const { gitBashAvailableMock } = vi.hoisted(() => ({ gitBashAvailableMock: { value: true } })) -vi.mock('../pty/shell-startup/git-bash', async (importOriginal) => ({ +vi.mock('../../pty/shell-startup/git-bash', async (importOriginal) => ({ ...(await importOriginal()), isGitBashAvailable: () => gitBashAvailableMock.value })) -import { ClaudeHookService } from './hook-service' - -const CURRENT_CLAUDE = { claudeVersion: '2.1.261 (Claude Code)' } +import { ClaudeHookService } from '../hook-service' describe('ClaudeHookService.install', () => { - it('keeps newer Orca events and reports installed when a later probe cannot resolve the version', () => { - const tmpHome = mkdtempSync(join(tmpdir(), 'orca-claude-unknown-version-')) - vi.stubEnv('HOME', tmpHome) - vi.stubEnv('USERPROFILE', tmpHome) - try { - const service = new ClaudeHookService() - const settingsPath = join(tmpHome, '.claude', 'settings.json') - expect(service.install(CURRENT_CLAUDE).state).toBe('installed') - const known = JSON.parse(readFileSync(settingsPath, 'utf-8')) - - expect(service.install().state).toBe('installed') - - const unknown = JSON.parse(readFileSync(settingsPath, 'utf-8')) - expect(unknown.hooks).toEqual(known.hooks) - expect(service.getStatus().state).toBe('installed') - } finally { - vi.unstubAllEnvs() - rmSync(tmpHome, { recursive: true, force: true }) - } - }) - it('does not re-install a managed statusLine the user deleted, until remove() resets the opt-out', () => { const tmpHome = mkdtempSync(join(tmpdir(), 'orca-claude-statusline-optout-')) vi.stubEnv('HOME', tmpHome) diff --git a/src/main/claude/hook-settings.ts b/src/main/claude/hooks/hook-settings.ts similarity index 92% rename from src/main/claude/hook-settings.ts rename to src/main/claude/hooks/hook-settings.ts index f97b98bbd3f..b40595af4f3 100644 --- a/src/main/claude/hook-settings.ts +++ b/src/main/claude/hooks/hook-settings.ts @@ -5,23 +5,23 @@ import { MANAGED_HOOK_TIMEOUT_SECONDS, type HookCommandConfig, type HooksConfig -} from '../agent-hooks/installation/configuration/hook-config-schema' +} from '../../agent-hooks/installation/configuration/hook-config-schema' import { createManagedCommandMatcher, removeManagedCommands, withPreviousManagedAsync -} from '../agent-hooks/installation/commands/managed-hook-command-matching' -import { getSharedManagedScriptPath } from '../agent-hooks/installation/scripts/managed-hook-script-path' -import { isPlainObject } from '../agent-hooks/installation/configuration/hooks-json-read' -import { isSafeUnicodeWindowsBatchHookPath } from '../agent-hooks/installation/commands/windows-hook-command' -import { wrapWindowsPowerShellEncodedCommand } from '../agent-hooks/installation/commands/windows-powershell-hook-launcher' -import { quotePowerShellLiteral } from '../../shared/powershell-native-argument' -import { getWindowsNativeHookAgent } from '../agent-hooks/installation/commands/windows-native-hook-executable' +} from '../../agent-hooks/installation/commands/managed-hook-command-matching' +import { getSharedManagedScriptPath } from '../../agent-hooks/installation/scripts/managed-hook-script-path' +import { isPlainObject } from '../../agent-hooks/installation/configuration/hooks-json-read' +import { isSafeUnicodeWindowsBatchHookPath } from '../../agent-hooks/installation/commands/windows-hook-command' +import { wrapWindowsPowerShellEncodedCommand } from '../../agent-hooks/installation/commands/windows-powershell-hook-launcher' +import { quotePowerShellLiteral } from '../../../shared/powershell-native-argument' +import { getWindowsNativeHookAgent } from '../../agent-hooks/installation/commands/windows-native-hook-executable' import { wrapRuntimeHomeHookCommand, wrapRuntimeHomePosixHookCommand -} from '../agent-hooks/installation/commands/runtime-home-hook-command' -import { wrapWindowsDirectCmdHookCommand } from '../agent-hooks/installation/commands/windows-direct-cmd-hook-command' +} from '../../agent-hooks/installation/commands/runtime-home-hook-command' +import { wrapWindowsDirectCmdHookCommand } from '../../agent-hooks/installation/commands/windows-direct-cmd-hook-command' import type { ClaudeManagedHookPlan } from './claude-managed-hook-events' import { claudeManagedHookForms, diff --git a/src/main/claude/post-compact-hook-command.test.ts b/src/main/claude/hooks/post-compact-hook-command.test.ts similarity index 100% rename from src/main/claude/post-compact-hook-command.test.ts rename to src/main/claude/hooks/post-compact-hook-command.test.ts diff --git a/src/main/claude/statusline-install.ts b/src/main/claude/hooks/statusline-install.ts similarity index 89% rename from src/main/claude/statusline-install.ts rename to src/main/claude/hooks/statusline-install.ts index 30d793113f2..890fd7198c2 100644 --- a/src/main/claude/statusline-install.ts +++ b/src/main/claude/hooks/statusline-install.ts @@ -1,6 +1,6 @@ import { existsSync, rmSync, writeFileSync } from 'node:fs' -import { writeManagedScript } from '../agent-hooks/installation/scripts/managed-hook-script-write' -import type { HooksConfig } from '../agent-hooks/installation/configuration/hook-config-schema' +import { writeManagedScript } from '../../agent-hooks/installation/scripts/managed-hook-script-write' +import type { HooksConfig } from '../../agent-hooks/installation/configuration/hook-config-schema' import { getManagedStatusLineCommand, getManagedStatusLineScript } from './statusline-script' import { applyManagedStatusLine, diff --git a/src/main/claude/hooks/statusline-script.test.ts b/src/main/claude/hooks/statusline-script.test.ts new file mode 100644 index 00000000000..9c71c6fdad6 --- /dev/null +++ b/src/main/claude/hooks/statusline-script.test.ts @@ -0,0 +1,105 @@ +import { spawn } from 'node:child_process' +import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs' +import { tmpdir } from 'node:os' +import { join } from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' +import { getManagedStatusLineScript } from './statusline-script' + +const ORIGINAL_PLATFORM = process.platform + +afterEach(() => { + Object.defineProperty(process, 'platform', { configurable: true, value: ORIGINAL_PLATFORM }) +}) + +describe.skipIf(process.platform === 'win32')('statusline curl throttle (posix behavioral)', () => { + const PANE_KEY = 'tab-1:00000000-0000-4000-8000-000000000000' + const dirs: string[] = [] + + afterEach(() => { + for (const dir of dirs.splice(0)) { + rmSync(dir, { recursive: true, force: true }) + } + }) + + function rateLimitPayload(durationMs: number): string { + return JSON.stringify({ + cost: { total_duration_ms: durationMs }, + rate_limits: { five_hour: { used_percentage: 12 } } + }) + } + + function makeHarness(): { + scriptPath: string + dir: string + curlLog: string + payloadLog: string + dateLog: string + catLog: string + } { + const dir = mkdtempSync(join(tmpdir(), 'orca-statusline-throttle-')) + dirs.push(dir) + const curlLog = join(dir, 'curl.log') + const payloadLog = join(dir, 'payload.log') + const dateLog = join(dir, 'date.log') + const catLog = join(dir, 'cat.log') + const scriptPath = join(dir, 'statusline.sh') + writeFileSync(scriptPath, getManagedStatusLineScript('posix')) + const binDir = join(dir, 'stub-bin') + mkdirSync(binDir, { recursive: true }) + writeFileSync( + join(binDir, 'curl'), + `#!/bin/sh\n/bin/cat > "${payloadLog}"\nprintf 'x\\n' >> "${curlLog}"\nexit 0\n`, + { mode: 0o755 } + ) + writeFileSync( + join(binDir, 'date'), + `#!/bin/sh\nprintf 'x\\n' >> "${dateLog}"\nprintf '2000000000\\n'\n`, + { mode: 0o755 } + ) + writeFileSync(join(binDir, 'cat'), `#!/bin/sh\nprintf 'x\\n' >> "${catLog}"\n/bin/cat "$@"\n`, { + mode: 0o755 + }) + return { scriptPath, dir, curlLog, payloadLog, dateLog, catLog } + } + + function runScript( + scriptPath: string, + dir: string, + payload: string, + paneKey = PANE_KEY + ): Promise { + return new Promise((resolve, reject) => { + const child = spawn('sh', [scriptPath], { + env: { + PATH: `${join(dir, 'stub-bin')}:${process.env.PATH ?? ''}`, + TMPDIR: dir, + ORCA_AGENT_HOOK_PORT: '65535', + ORCA_AGENT_HOOK_TOKEN: 'test-token', + ORCA_PANE_KEY: paneKey + }, + stdio: ['pipe', 'ignore', 'pipe'] + }) + let stderr = '' + child.stderr.on('data', (chunk: Buffer) => { + stderr += chunk.toString() + }) + child.on('error', reject) + child.on('close', (code) => { + if (code === 0) { + resolve() + } else { + reject(new Error(`statusline script exited ${code}: ${stderr}`)) + } + }) + child.stdin.write(payload) + child.stdin.end() + }) + } + + it('preserves multiline payloads while capturing stdin with shell builtins', async () => { + const { scriptPath, dir, payloadLog } = makeHarness() + const payload = JSON.stringify(JSON.parse(rateLimitPayload(1_000)), null, 2) + await runScript(scriptPath, dir, payload) + expect(readFileSync(payloadLog, 'utf8')).toBe(payload) + }) +}) diff --git a/src/main/claude/statusline-script.ts b/src/main/claude/hooks/statusline-script.ts similarity index 95% rename from src/main/claude/statusline-script.ts rename to src/main/claude/hooks/statusline-script.ts index 0d11d0e4344..72d457e84ba 100644 --- a/src/main/claude/statusline-script.ts +++ b/src/main/claude/hooks/statusline-script.ts @@ -1,14 +1,14 @@ import { WINDOWS_CLAUDE_BACKGROUND_JOB_GUARD, buildPosixClaudeBackgroundJobGuardLines -} from '../agent-hooks/installation/scripts/claude-background-job-guard' -import { posixCurlCommand } from '../agent-hooks/installation/scripts/hook-post-command' -import { WINDOWS_HOOK_STDIN_READER } from '../agent-hooks/installation/scripts/hook-stdin-contract' +} from '../../agent-hooks/installation/scripts/claude-background-job-guard' +import { posixCurlCommand } from '../../agent-hooks/installation/scripts/hook-post-command' +import { WINDOWS_HOOK_STDIN_READER } from '../../agent-hooks/installation/scripts/hook-stdin-contract' import { CLAUDE_STATUSLINE_MIN_POST_INTERVAL_SECONDS, CLAUDE_STATUSLINE_PATHNAME -} from '../../shared/claude-statusline-rate-limits' -import { wrapWindowsDirectCmdHookCommand } from '../agent-hooks/installation/commands/windows-direct-cmd-hook-command' +} from '../../../shared/claude-statusline-rate-limits' +import { wrapWindowsDirectCmdHookCommand } from '../../agent-hooks/installation/commands/windows-direct-cmd-hook-command' import { getManagedCommand } from './hook-settings' const STATUSLINE_CLEANUP_LABEL = 'orca_statusline_cleanup' diff --git a/src/main/claude/hooks/windows-hook-files.test.ts b/src/main/claude/hooks/windows-hook-files.test.ts new file mode 100644 index 00000000000..84afb9f2bfc --- /dev/null +++ b/src/main/claude/hooks/windows-hook-files.test.ts @@ -0,0 +1,74 @@ +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs' +import { tmpdir } from 'node:os' +import type * as osModule from 'node:os' +import { join } from 'node:path' +import * as refresh from '../../agent-hooks/installation/scripts/managed-hook-script-refresh' +import { readHooksJson } from '../../agent-hooks/installation/configuration/hooks-json-read' +import { writeHooksJson } from '../../agent-hooks/installation/configuration/hooks-json-write' +import { ClaudeHookService } from '../hook-service' +import { getWindowsManagedLifecycleHook } from './hook-settings' +import { getWindowsClaudeHookPayloadPath } from './windows-hook-files' + +const { home } = vi.hoisted(() => ({ home: { path: '' } })) +vi.mock('node:os', async (original) => ({ + ...(await original()), + homedir: () => home.path +})) +vi.mock('electron', () => ({ app: { getPath: () => home.path } })) + +const platform = Object.getOwnPropertyDescriptor(process, 'platform')! +let entry: string +let payload: string +let settings: string +const service = new ClaudeHookService() + +beforeEach(() => { + home.path = mkdtempSync(join(tmpdir(), 'claude-windows-files-')) + entry = join(home.path, '.orca', 'agent-hooks', 'claude-hook.cmd') + payload = getWindowsClaudeHookPayloadPath(entry) + settings = join(home.path, '.claude', 'settings.json') + Object.defineProperty(process, 'platform', { configurable: true, value: 'win32' }) +}) + +afterEach(() => { + Object.defineProperty(process, 'platform', platform) + vi.restoreAllMocks() + rmSync(home.path, { recursive: true, force: true }) +}) + +describe('Windows Claude hook files', () => { + it('leaves the old single-file entry intact when payload publication fails', async () => { + mkdirSync(join(home.path, '.orca', 'agent-hooks'), { recursive: true }) + const oldEntry = '@echo off\r\necho {}\r\nexit /b 0\r\n' + writeFileSync(entry, oldEntry) + vi.spyOn(refresh, 'restoreManagedScript').mockRejectedValueOnce(new Error('disk full')) + await expect(service.refreshManagedScripts()).rejects.toThrow('disk full') + expect(readFileSync(entry, 'utf8')).toBe(oldEntry) + expect(existsSync(payload)).toBe(false) + }) + + it('migrates old command forms while preserving user hooks', () => { + const encoded = getWindowsManagedLifecycleHook( + 'C:\\Users\\%name%\\.orca\\agent-hooks\\claude-hook.cmd' + ) + writeHooksJson(settings, { + hooks: { + Stop: [{ hooks: [encoded, { type: 'command', command: 'echo user-hook' }] }], + PreToolUse: [ + { + hooks: [ + { type: 'command', command: 'C:/old/.orca/agent-hooks/claude-hook.cmd || echo {}' } + ] + } + ] + } + }) + service.install() + const config = JSON.stringify(readHooksJson(settings)) + expect(config).not.toContain('|| echo {}') + expect(config).not.toContain('C:/old/') + expect(config).toContain('echo user-hook') + expect(service.getStatus().state).toBe('installed') + }) +}) diff --git a/src/main/claude/windows-hook-files.ts b/src/main/claude/hooks/windows-hook-files.ts similarity index 85% rename from src/main/claude/windows-hook-files.ts rename to src/main/claude/hooks/windows-hook-files.ts index 7b7c9620cf2..7fbc42a5777 100644 --- a/src/main/claude/windows-hook-files.ts +++ b/src/main/claude/hooks/windows-hook-files.ts @@ -1,23 +1,23 @@ import { existsSync, readFileSync, rmSync } from 'node:fs' import { readFile } from 'node:fs/promises' import { dirname, join } from 'node:path' -import type { AgentHookInstallStatus } from '../../shared/agent-hook-listener/configuration/agent-hook-types' -import { writeManagedScript } from '../agent-hooks/installation/scripts/managed-hook-script-write' -import { getLockedExecutableAsidePath } from '../agent-hooks/installation/scripts/locked-executable-rename' +import type { AgentHookInstallStatus } from '../../../shared/agent-hook-listener/configuration/agent-hook-types' +import { writeManagedScript } from '../../agent-hooks/installation/scripts/managed-hook-script-write' +import { getLockedExecutableAsidePath } from '../../agent-hooks/installation/scripts/locked-executable-rename' import { refreshManagedScriptIfPresent, restoreManagedScript, scriptStillExists -} from '../agent-hooks/installation/scripts/managed-hook-script-refresh' +} from '../../agent-hooks/installation/scripts/managed-hook-script-refresh' import { buildWindowsHookEnvironmentGuardLines, WINDOWS_HOOK_STDIN_DRAIN_COMMAND -} from '../agent-hooks/installation/scripts/hook-stdin-contract' +} from '../../agent-hooks/installation/scripts/hook-stdin-contract' import { resolveBundledWindowsNativeHookExecutable, WINDOWS_NATIVE_HOOK_EXECUTABLE_NAME -} from '../agent-hooks/installation/commands/windows-native-hook-executable' -import { WINDOWS_CLAUDE_BACKGROUND_JOB_GUARD } from '../agent-hooks/installation/scripts/claude-background-job-guard' +} from '../../agent-hooks/installation/commands/windows-native-hook-executable' +import { WINDOWS_CLAUDE_BACKGROUND_JOB_GUARD } from '../../agent-hooks/installation/scripts/claude-background-job-guard' const PAYLOAD_FILE_NAME = 'claude-hook-impl.cmd' diff --git a/src/main/claude/model-catalog/claude-model-catalog-probe.test.ts b/src/main/claude/model-catalog/claude-model-catalog-probe.test.ts new file mode 100644 index 00000000000..5ea1984b47d --- /dev/null +++ b/src/main/claude/model-catalog/claude-model-catalog-probe.test.ts @@ -0,0 +1,49 @@ +import { mkdtempSync, rmSync } from 'node:fs' +import { tmpdir } from 'node:os' +import { join } from 'node:path' +import { describe, expect, it } from 'vitest' + +import { createClaudeModelCatalogProbe } from './claude-model-catalog-probe' +import { resolveStructuredAgentCommand } from '../../native-chat/structured-agent-command-resolution' + +const AUTH_POLICY = { account: 'system' } as const + +const HOME = (path: string): { variable: string; path: string } => ({ + variable: 'CLAUDE_CONFIG_DIR', + path +}) + +function probeDeps(command = `"${process.execPath}"`): { + resolveCommand: () => { command: string; prefixArgs: string[] } + resolveEnv: () => Record + resolveInheritedEnv: () => Promise> + resolveAuthPolicy: () => typeof AUTH_POLICY +} { + return { + resolveCommand: () => + resolveStructuredAgentCommand('claude', { + agentCmdOverrides: { claude: command } + }), + resolveEnv: () => ({ ANTHROPIC_MODEL_GATEWAY: 'https://gateway.example' }), + resolveInheritedEnv: async () => ({ PATH: '/resolved/bin', HOME: '/homes/user' }), + resolveAuthPolicy: () => AUTH_POLICY + } +} + +describe('Claude catalog availability', () => { + it('says the CLI is missing when the resolved executable is not there', async () => { + const folder = mkdtempSync(join(tmpdir(), 'orca-claude-missing-')) + try { + const missing = join(folder, 'claude with spaces', 'claude') + const probe = createClaudeModelCatalogProbe({ + ...probeDeps(), + resolveCommand: () => ({ command: missing, prefixArgs: [] }) + }) + await expect(probe(HOME('/homes/a'))).rejects.toMatchObject({ + unavailable: { reason: 'cliMissing' } + }) + } finally { + rmSync(folder, { recursive: true, force: true }) + } + }) +}) diff --git a/src/main/claude/claude-model-catalog-probe.ts b/src/main/claude/model-catalog/claude-model-catalog-probe.ts similarity index 85% rename from src/main/claude/claude-model-catalog-probe.ts rename to src/main/claude/model-catalog/claude-model-catalog-probe.ts index cac6371c9d1..dc130eedcac 100644 --- a/src/main/claude/claude-model-catalog-probe.ts +++ b/src/main/claude/model-catalog/claude-model-catalog-probe.ts @@ -1,52 +1,53 @@ -import { withOrcaClaudeChatEntrypoint } from '../../shared/agent-launch/startup/claude-chat-entrypoint' -import { waitForPromiseWithSignal } from '../../shared/abort-signal-reason' +import { withOrcaClaudeChatEntrypoint } from '../../../shared/agent-launch/startup/claude-chat-entrypoint' +import { waitForPromiseWithSignal } from '../../../shared/abort-signal-reason' import { assertStructuredAgentResolutionCurrent, type StructuredAgentResolutionOperation -} from '../native-chat/structured-agent-command-resolution' +} from '../../native-chat/structured-agent-command-resolution' import { buildClaudeModelListArgs, CLAUDE_MODEL_LIST_STDIN -} from '../../shared/claude-model-list-probe' -import { requireLegacyAgentSessionAccountHome } from '../../shared/agent-session/lifecycle/agent-session-account-home' -import { runClaudeBackgroundAttempts } from '../../shared/claude-background-run-isolation' +} from '../../../shared/claude-model-list-probe' +import { requireLegacyAgentSessionAccountHome } from '../../../shared/agent-session/lifecycle/agent-session-account-home' +import { runClaudeBackgroundAttempts } from '../../../shared/claude-background-run-isolation' import { isCompleteClaudeModelListing, listedModels, record -} from './structured/launch/claude-structured-model-catalog' +} from '../structured/launch/claude-structured-model-catalog' import { claudeCatalogSignedOut } from './claude-model-catalog-signed-out' import { claudeFastModeSupport, wireClaudeModels -} from './structured/launch/claude-structured-catalog-listing' -import { readClaudeSettingsApplied } from './structured/launch/claude-structured-session-options' -import { readClaudeControlResponses } from './claude-control-responses' -import { claudeStructuredLaunchArgs } from './structured/launch/claude-structured-launch-args' -import { AgentModelCatalogUnavailableError } from '../native-chat/agent-model-catalog/agent-model-catalog-unavailable' -import { claudeConfigDirEnvPatch } from './claude-config-dir-pin' +} from '../structured/launch/claude-structured-catalog-listing' +import { readClaudeSettingsApplied } from '../structured/launch/claude-structured-session-options' +import { readClaudeControlResponses } from '../sdk-transport/claude-control-responses' +import { claudeStructuredLaunchArgs } from '../structured/launch/claude-structured-launch-args' +import { AgentModelCatalogUnavailableError } from '../../native-chat/agent-model-catalog/agent-model-catalog-unavailable' +import { claudeConfigDirEnvPatch } from '../structured/launch/claude-config-dir-pin' import { envWithPathRelativeTo, catalogListingDirectory -} from '../../shared/node-cli-command-resolution' +} from '../../../shared/node-cli-command-resolution' import { CLAUDE_DEFAULT_SETTING_SOURCES, resolveClaudeStructuredInvocation, type ClaudeStructuredLaunchPartDeps -} from './structured/launch/claude-structured-launch-resolution' +} from '../structured/launch/claude-structured-launch-resolution' import { resolveClaudeChildEnvSources, type ClaudeEnvDeps -} from './structured/launch/claude-structured-child-env' +} from '../structured/launch/claude-structured-child-env' import type { AgentModelCatalogProbe, - AgentModelCatalogSuccess -} from '../native-chat/agent-model-catalog/agent-model-catalog-store' -import type { AgentModelCatalogLookup } from '../native-chat/agent-model-catalog/agent-model-catalog-discovery' + AgentModelCatalogLookup +} from '../../native-chat/agent-model-catalog/agent-model-catalog-discovery' +import type { AgentModelCatalogSuccess } from '../../native-chat/agent-model-catalog/agent-model-catalog-entry' + import { AgentModelCatalogProbeError, runAgentModelCatalogListing -} from '../native-chat/agent-model-catalog/agent-model-catalog-probe-runner' +} from '../../native-chat/agent-model-catalog/agent-model-catalog-probe-runner' export type ClaudeModelCatalogProbeDeps = ClaudeEnvDeps & Pick & { diff --git a/src/main/claude/claude-model-catalog-signed-out.ts b/src/main/claude/model-catalog/claude-model-catalog-signed-out.ts similarity index 92% rename from src/main/claude/claude-model-catalog-signed-out.ts rename to src/main/claude/model-catalog/claude-model-catalog-signed-out.ts index 5d9cbabbccd..a7834e42a27 100644 --- a/src/main/claude/claude-model-catalog-signed-out.ts +++ b/src/main/claude/model-catalog/claude-model-catalog-signed-out.ts @@ -1,4 +1,4 @@ -import { record } from './structured/launch/claude-structured-model-catalog' +import { record } from '../structured/launch/claude-structured-model-catalog' /** A first-party CLI with no credential and no other provider or endpoint is signed out. */ export function claudeCatalogSignedOut( diff --git a/src/main/claude/claude-agent-sdk-control-requests.ts b/src/main/claude/sdk-transport/claude-agent-sdk-control-requests.ts similarity index 100% rename from src/main/claude/claude-agent-sdk-control-requests.ts rename to src/main/claude/sdk-transport/claude-agent-sdk-control-requests.ts diff --git a/src/main/claude/claude-agent-sdk-import-boundary.test.ts b/src/main/claude/sdk-transport/claude-agent-sdk-import-boundary.test.ts similarity index 86% rename from src/main/claude/claude-agent-sdk-import-boundary.test.ts rename to src/main/claude/sdk-transport/claude-agent-sdk-import-boundary.test.ts index d2ec78f6ac9..538268b5b33 100644 --- a/src/main/claude/claude-agent-sdk-import-boundary.test.ts +++ b/src/main/claude/sdk-transport/claude-agent-sdk-import-boundary.test.ts @@ -5,7 +5,7 @@ describe('claude agent SDK import boundary', () => { it('leaves the Windows executable-search environment alone when the runtime loads', async () => { // Remove any shell-provided value before checking this isolated test process. delete process.env.NoDefaultCurrentDirectoryInExePath - await import('../runtime/agent-session/structured-agent-session-runtime') + await import('../../runtime/agent-session/structured-agent-session-runtime') expect(process.env.NoDefaultCurrentDirectoryInExePath).toBeUndefined() }) diff --git a/src/main/claude/sdk-transport/claude-agent-sdk-user-message-queue.test.ts b/src/main/claude/sdk-transport/claude-agent-sdk-user-message-queue.test.ts new file mode 100644 index 00000000000..37379ed2972 --- /dev/null +++ b/src/main/claude/sdk-transport/claude-agent-sdk-user-message-queue.test.ts @@ -0,0 +1,28 @@ +import type { SDKUserMessage } from '@anthropic-ai/claude-agent-sdk' +import { describe, expect, it } from 'vitest' +import { + claudeUserMessageWasProvablyUnwritten, + createClaudeUserMessageQueue +} from './claude-agent-sdk-user-message-queue' + +// Model the SDK pump: it resumes only after transport.write and abandons the iterator on failure. +const frame = (text: string): SDKUserMessage => + ({ + type: 'user', + message: { role: 'user', content: [{ type: 'text', text }] } + }) as unknown as SDKUserMessage + +describe('claude user message queue', () => { + it('marks only frames still queued in Orca as provably unwritten', async () => { + const queue = createClaudeUserMessageQueue() + const pump = queue.messages[Symbol.asyncIterator]() + const inFlight = queue.push(frame('first')).catch((caught: unknown) => caught) + await pump.next() + const queued = queue.push(frame('second')).catch((caught: unknown) => caught) + + queue.fail(new Error('claude stream-json exited: child died')) + + expect(claudeUserMessageWasProvablyUnwritten(await inFlight)).toBe(false) + expect(claudeUserMessageWasProvablyUnwritten(await queued)).toBe(true) + }) +}) diff --git a/src/main/claude/claude-agent-sdk-user-message-queue.ts b/src/main/claude/sdk-transport/claude-agent-sdk-user-message-queue.ts similarity index 100% rename from src/main/claude/claude-agent-sdk-user-message-queue.ts rename to src/main/claude/sdk-transport/claude-agent-sdk-user-message-queue.ts diff --git a/src/main/claude/claude-control-responses.ts b/src/main/claude/sdk-transport/claude-control-responses.ts similarity index 90% rename from src/main/claude/claude-control-responses.ts rename to src/main/claude/sdk-transport/claude-control-responses.ts index 0a5b6da70f9..df1f7ab318c 100644 --- a/src/main/claude/claude-control-responses.ts +++ b/src/main/claude/sdk-transport/claude-control-responses.ts @@ -1,4 +1,4 @@ -import { assertJsonTextStructureWithinLimits } from '../../shared/json-stream/json-text-structure-limit' +import { assertJsonTextStructureWithinLimits } from '../../../shared/json-stream/json-text-structure-limit' const CONTROL_JSON_LIMITS = { structuralTokens: 64 * 1024, nestingDepth: 16 } as const diff --git a/src/main/claude/claude-plugin-ui.ts b/src/main/claude/sdk-transport/claude-plugin-ui.ts similarity index 80% rename from src/main/claude/claude-plugin-ui.ts rename to src/main/claude/sdk-transport/claude-plugin-ui.ts index bbe4bd73474..9797894973e 100644 --- a/src/main/claude/claude-plugin-ui.ts +++ b/src/main/claude/sdk-transport/claude-plugin-ui.ts @@ -2,9 +2,9 @@ import { agentSessionFailureFact, providerDiagnostic, type SubmissionRejectionFact -} from '../../shared/agent-session/failures/agent-session-failure' -import { agentSessionFailureSentence } from '../../shared/agent-session/failures/agent-session-failure-words' -import { isProviderRecord } from '../provider-process/provider-json-record' +} from '../../../shared/agent-session/failures/agent-session-failure' +import { agentSessionFailureSentence } from '../../../shared/agent-session/failures/agent-session-failure-words' +import { isProviderRecord } from '../../provider-process/provider-json-record' function nonemptyString(value: unknown): string | null { return typeof value === 'string' && value.trim() ? value.trim() : null diff --git a/src/main/claude/claude-startup-failure.ts b/src/main/claude/sdk-transport/claude-startup-failure.ts similarity index 90% rename from src/main/claude/claude-startup-failure.ts rename to src/main/claude/sdk-transport/claude-startup-failure.ts index d0beb47eb94..3db152e61c9 100644 --- a/src/main/claude/claude-startup-failure.ts +++ b/src/main/claude/sdk-transport/claude-startup-failure.ts @@ -1,4 +1,4 @@ -import { findInErrorChain } from '../provider-process/provider-error-chain' +import { findInErrorChain } from '../../provider-process/provider-error-chain' import { ClaudeControlRequestError } from './claude-agent-sdk-control-requests' import { agentSessionAcquireFailure, @@ -6,7 +6,7 @@ import { providerResourcePressure, type AgentSessionStartAnswer, type AgentSessionStartFailure -} from '../native-chat/agent-session-wire/startup/structured-agent-session-start-failure' +} from '../../native-chat/agent-session-wire/startup/structured-agent-session-start-failure' /** SDK runtime tags are not in its public Error declaration. */ export function claudeStartupErrorClass(error: Error): string | undefined { diff --git a/src/main/claude/claude-stream-json-connection.test.ts b/src/main/claude/sdk-transport/claude-stream-json-connection.test.ts similarity index 59% rename from src/main/claude/claude-stream-json-connection.test.ts rename to src/main/claude/sdk-transport/claude-stream-json-connection.test.ts index d3f7443d0ad..333fbd25cb8 100644 --- a/src/main/claude/claude-stream-json-connection.test.ts +++ b/src/main/claude/sdk-transport/claude-stream-json-connection.test.ts @@ -1,4 +1,4 @@ -import { execFileSync, type ChildProcess } from 'node:child_process' +import type { ChildProcess } from 'node:child_process' import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs' import { tmpdir } from 'node:os' import { join } from 'node:path' @@ -10,11 +10,11 @@ import { openClaudeStreamJsonConnection, type ClaudeStreamJsonConnection, type ClaudeStreamJsonLaunch -} from './claude-stream-json-connection' -import { CLAUDE_STRUCTURED_BASE_OPTIONS } from './structured/launch/claude-structured-launch-resolution' +} from '../claude-stream-json-connection' +import { CLAUDE_STRUCTURED_BASE_OPTIONS } from '../structured/launch/claude-structured-launch-resolution' // Exercise the real SDK against a scripted child CLI. -const FAKE_CLI = join(__dirname, '__fixtures__', 'claude-agent-sdk-scripted-cli.mjs') +const FAKE_CLI = join(__dirname, '../__fixtures__', 'claude-agent-sdk-scripted-cli.mjs') const SESSION_ID = '5348c19f-6a54-4c2e-9c68-9c2b1a3d4e5f' const HOLD_OPEN = { delayMs: 10_000 } @@ -93,40 +93,6 @@ async function open( return connection } -async function until(read: () => T | null | undefined, label: string): Promise { - for (let attempt = 0; attempt < 400; attempt++) { - const value = read() - if (value !== null && value !== undefined) { - return value - } - await new Promise((resolve) => setTimeout(resolve, 25)) - } - throw new Error(`timed out waiting for ${label}`) -} - -function readReportSafely(scenario: { readReport: () => ScriptedCliReport }) { - try { - return scenario.readReport() - } catch { - return null - } -} - -function processState(pid: number): 'running' | 'exited' { - try { - const state = execFileSync('ps', ['-o', 'state=', '-p', String(pid)], { - encoding: 'utf8', - env: { ...process.env, LANG: 'C', LC_ALL: 'C' } - }).trim() - return state.startsWith('Z') ? 'exited' : 'running' - } catch (error) { - if ((error as { status?: number }).status === 1) { - return 'exited' - } - throw error - } -} - describe('Claude stream-json connection', () => { it('completes task Stop through the real SDK while semantic reading is paused', async () => { const scenario = scriptScenario([HOLD_OPEN]) @@ -141,40 +107,4 @@ describe('Claude stream-json connection', () => { ) connection.resumeReading?.() }) - - it.runIf(process.platform !== 'win32')( - 'proves a natural SDK exit and cleans up its descendant before recovery', - async () => { - const scenario = scriptScenario([ - { stderr: 'claude: natural exit\n' }, - { delayMs: 500 }, - { exit: 1 } - ]) - let exit: Error | null = null - const connection = await open( - { - ...launchFor(scenario), - env: { ...launchFor(scenario).env, ORCA_SDK_CONTRACT_DESCENDANT: '1' } - }, - { onExit: (error) => (exit = error) } - ) - const report = await until(() => { - const current = readReportSafely(scenario) - return current?.descendantPid ? current : null - }, 'the descendant report') - await until(() => exit, 'the natural exit error') - try { - await expect(connection.close()).resolves.toBe(true) - expect(connection.exitVerdict).toEqual({ root: 'exited', tree: 'exited' }) - expect(processState(report.descendantPid as number)).toBe('exited') - } finally { - try { - process.kill(report.descendantPid as number, 'SIGKILL') - } catch { - // Already gone. - } - } - }, - 20_000 - ) }) diff --git a/src/main/claude/claude-stream-json-exit-error.ts b/src/main/claude/sdk-transport/claude-stream-json-exit-error.ts similarity index 82% rename from src/main/claude/claude-stream-json-exit-error.ts rename to src/main/claude/sdk-transport/claude-stream-json-exit-error.ts index 8f8ec98980f..eea66222633 100644 --- a/src/main/claude/claude-stream-json-exit-error.ts +++ b/src/main/claude/sdk-transport/claude-stream-json-exit-error.ts @@ -1,12 +1,12 @@ import { providerDiagnostic, withProviderDiagnostic -} from '../../shared/agent-session/failures/agent-session-failure' -import type { ProviderProcessExit } from '../provider-process/managed-provider-process' -import { providerExitStatusText } from '../provider-process/provider-process-exit-status' -import { providerStderrForDisplay } from '../provider-process/provider-spawn-failure-report' -import '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' -import { AgentSessionAcquisitionRefusal } from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter-errors' +} from '../../../shared/agent-session/failures/agent-session-failure' +import type { ProviderProcessExit } from '../../provider-process/managed-provider-process' +import { providerExitStatusText } from '../../provider-process/provider-process-exit-status' +import { providerStderrForDisplay } from '../../provider-process/provider-spawn-failure-report' +import '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +import { AgentSessionAcquisitionRefusal } from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter-errors' import { ClaudeControlRequestError } from './claude-agent-sdk-control-requests' // Claude Code's own startup refusal: as root it exits before initialize rather than skip permissions. diff --git a/src/main/claude/statusline-script.test.ts b/src/main/claude/statusline-script.test.ts deleted file mode 100644 index 73b56bf650e..00000000000 --- a/src/main/claude/statusline-script.test.ts +++ /dev/null @@ -1,186 +0,0 @@ -import { spawn } from 'node:child_process' -import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, describe, expect, it } from 'vitest' -import { getManagedStatusLineScript } from './statusline-script' - -const ORIGINAL_PLATFORM = process.platform - -afterEach(() => { - Object.defineProperty(process, 'platform', { configurable: true, value: ORIGINAL_PLATFORM }) -}) - -describe.skipIf(process.platform === 'win32')('statusline curl throttle (posix behavioral)', () => { - const LEAF_ID = '00000000-0000-4000-8000-000000000000' - const PANE_KEY = 'tab-1:00000000-0000-4000-8000-000000000000' - const dirs: string[] = [] - - afterEach(() => { - for (const dir of dirs.splice(0)) { - rmSync(dir, { recursive: true, force: true }) - } - }) - - function rateLimitPayload(durationMs: number): string { - return JSON.stringify({ - cost: { total_duration_ms: durationMs }, - rate_limits: { five_hour: { used_percentage: 12 } } - }) - } - - function makeHarness(): { - scriptPath: string - dir: string - curlLog: string - payloadLog: string - dateLog: string - catLog: string - } { - const dir = mkdtempSync(join(tmpdir(), 'orca-statusline-throttle-')) - dirs.push(dir) - const curlLog = join(dir, 'curl.log') - const payloadLog = join(dir, 'payload.log') - const dateLog = join(dir, 'date.log') - const catLog = join(dir, 'cat.log') - const scriptPath = join(dir, 'statusline.sh') - writeFileSync(scriptPath, getManagedStatusLineScript('posix')) - const binDir = join(dir, 'stub-bin') - mkdirSync(binDir, { recursive: true }) - writeFileSync( - join(binDir, 'curl'), - `#!/bin/sh\n/bin/cat > "${payloadLog}"\nprintf 'x\\n' >> "${curlLog}"\nexit 0\n`, - { mode: 0o755 } - ) - writeFileSync( - join(binDir, 'date'), - `#!/bin/sh\nprintf 'x\\n' >> "${dateLog}"\nprintf '2000000000\\n'\n`, - { mode: 0o755 } - ) - writeFileSync(join(binDir, 'cat'), `#!/bin/sh\nprintf 'x\\n' >> "${catLog}"\n/bin/cat "$@"\n`, { - mode: 0o755 - }) - return { scriptPath, dir, curlLog, payloadLog, dateLog, catLog } - } - - function runScript( - scriptPath: string, - dir: string, - payload: string, - paneKey = PANE_KEY - ): Promise { - return new Promise((resolve, reject) => { - const child = spawn('sh', [scriptPath], { - env: { - PATH: `${join(dir, 'stub-bin')}:${process.env.PATH ?? ''}`, - TMPDIR: dir, - ORCA_AGENT_HOOK_PORT: '65535', - ORCA_AGENT_HOOK_TOKEN: 'test-token', - ORCA_PANE_KEY: paneKey - }, - stdio: ['pipe', 'ignore', 'pipe'] - }) - let stderr = '' - child.stderr.on('data', (chunk: Buffer) => { - stderr += chunk.toString() - }) - child.on('error', reject) - child.on('close', (code) => { - if (code === 0) { - resolve() - } else { - reject(new Error(`statusline script exited ${code}: ${stderr}`)) - } - }) - child.stdin.write(payload) - child.stdin.end() - }) - } - - function lineCount(logPath: string): number { - try { - return readFileSync(logPath, 'utf8').split('\n').filter(Boolean).length - } catch { - return 0 - } - } - - function stampPathFor(dir: string, leafId = LEAF_ID): string { - return join(dir, `orca-claude-statusline-last-${leafId}`) - } - - it('spawns one curl and no capture or clock subprocesses across 30 rapid ticks', async () => { - const { scriptPath, dir, curlLog, dateLog, catLog } = makeHarness() - for (let index = 0; index < 30; index += 1) { - await runScript(scriptPath, dir, rateLimitPayload(1_000 + index * 100)) - } - expect(lineCount(curlLog)).toBe(1) - expect(lineCount(dateLog)).toBe(0) - expect(lineCount(catLog)).toBe(0) - expect(readFileSync(stampPathFor(dir), 'utf8')).toMatch(/^[0-9]+$/) - }) - - it('posts again once the interval has elapsed', async () => { - const { scriptPath, dir, curlLog } = makeHarness() - await runScript(scriptPath, dir, rateLimitPayload(1_000)) - await runScript(scriptPath, dir, rateLimitPayload(16_000)) - expect(lineCount(curlLog)).toBe(2) - }) - - it('stays bounded and keeps a valid stamp under overlapping same-pane ticks', async () => { - const { scriptPath, dir, curlLog } = makeHarness() - // Lock-free stamps fail open: overlapping ticks may post more than once but must throttle subsequent ticks. - await Promise.all( - Array.from({ length: 10 }, () => runScript(scriptPath, dir, rateLimitPayload(1_000))) - ) - const burstPosts = lineCount(curlLog) - expect(burstPosts).toBeGreaterThanOrEqual(1) - expect(readFileSync(stampPathFor(dir), 'utf8')).toBe('1') - for (let index = 0; index < 5; index += 1) { - await runScript(scriptPath, dir, rateLimitPayload(2_000 + index * 100)) - } - expect(lineCount(curlLog)).toBe(burstPosts) - }) - - it('preserves multiline payloads while capturing stdin with shell builtins', async () => { - const { scriptPath, dir, payloadLog } = makeHarness() - const payload = JSON.stringify(JSON.parse(rateLimitPayload(1_000)), null, 2) - await runScript(scriptPath, dir, payload) - expect(readFileSync(payloadLog, 'utf8')).toBe(payload) - }) - - it('fails open and repairs a leading-zero stamp instead of dying in arithmetic', async () => { - const { scriptPath, dir, curlLog } = makeHarness() - // 008 is invalid octal in dash arithmetic and must not prevent stamp repair. - writeFileSync(stampPathFor(dir), '008') - await runScript(scriptPath, dir, rateLimitPayload(1_000)) - expect(lineCount(curlLog)).toBe(1) - expect(readFileSync(stampPathFor(dir), 'utf8')).toBe('1') - }) - - it('uses only the stable leaf id for temp files', async () => { - const { scriptPath, dir, curlLog } = makeHarness() - const paneKey = `${'path/segment/'.repeat(30)}tab:${LEAF_ID}` - await runScript(scriptPath, dir, rateLimitPayload(1_000), paneKey) - await runScript(scriptPath, dir, rateLimitPayload(2_000), paneKey) - expect(lineCount(curlLog)).toBe(1) - expect(readFileSync(stampPathFor(dir), 'utf8')).toBe('1') - }) - - it('keeps legacy numeric pane ids isolated by tab', async () => { - const { scriptPath, dir, curlLog } = makeHarness() - await runScript(scriptPath, dir, rateLimitPayload(1_000), 'legacy-tab-a:1') - await runScript(scriptPath, dir, rateLimitPayload(1_000), 'legacy-tab-b:1') - expect(lineCount(curlLog)).toBe(2) - expect(readFileSync(stampPathFor(dir, 'legacy-tab-a_1'), 'utf8')).toBe('1') - expect(readFileSync(stampPathFor(dir, 'legacy-tab-b_1'), 'utf8')).toBe('1') - }) - - it('never touches curl or the stamp for payloads without rate_limits', async () => { - const { scriptPath, dir, curlLog, dateLog } = makeHarness() - await runScript(scriptPath, dir, '{"model":{"id":"claude-fable-5"}}') - expect(lineCount(curlLog)).toBe(0) - expect(lineCount(dateLog)).toBe(0) - expect(() => readFileSync(stampPathFor(dir), 'utf8')).toThrow() - }) -}) diff --git a/src/main/claude/structured/claude-conversation-title-owner.ts b/src/main/claude/structured/claude-conversation-title-owner.ts index b7e4c11091a..db0809be950 100644 --- a/src/main/claude/structured/claude-conversation-title-owner.ts +++ b/src/main/claude/structured/claude-conversation-title-owner.ts @@ -1,8 +1,8 @@ import { resolve } from 'node:path' import { getClaudeProfileRouter } from '../../claude-accounts/profiles/routing/claude-profile-installed-router' import { agentSessionAccountHomesEqual } from '../../../shared/agent-session/lifecycle/agent-session-account-home' -import { claudeNamingContextId } from '../claude-conversation-naming' -import { CLAUDE_CACHED_FLAG_CHECK_BUDGET_MS } from '../claude-cli-flag-support' +import { claudeNamingContextId } from '../conversation-naming/claude-conversation-naming' +import { CLAUDE_CACHED_FLAG_CHECK_BUDGET_MS } from '../cli-capabilities/claude-cli-flag-support' import type { StructuredAgentSessionAdapter } from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' import type { ClaudeSession } from './claude-structured-session-state' diff --git a/src/main/claude/structured/claude-full-access-policy.ts b/src/main/claude/structured/claude-full-access-policy.ts index 7482b266156..8bfd7c0a19a 100644 --- a/src/main/claude/structured/claude-full-access-policy.ts +++ b/src/main/claude/structured/claude-full-access-policy.ts @@ -1,5 +1,5 @@ import { StringDecoder } from 'node:string_decoder' -import { isRootClaudeFrame } from '../claude-turn-opening' +import { isRootClaudeFrame } from './turns/claude-turn-opening' import { readClaudeFrameString, readClaudeReportedPermissionMode diff --git a/src/main/claude/structured/claude-owned-task-send.test.ts b/src/main/claude/structured/claude-owned-task-send.test.ts deleted file mode 100644 index 1f842127849..00000000000 --- a/src/main/claude/structured/claude-owned-task-send.test.ts +++ /dev/null @@ -1,116 +0,0 @@ -import { expect, it } from 'vitest' -import { - adapterFor, - claudeFrame, - fakeClaude, - identityFor -} from './claude-structured-session-test-support' -import { PARENT_TASK_STOP } from '../claude-parent-task-frames.test-fixture' -import { createQueuedMessageTestRig } from '../../native-chat/agent-session-wire/host/testing/structured-agent-session-queued-message-rig.test-fixture' -import { eventually } from '../../native-chat/agent-session-wire/host/testing/structured-agent-session-queued-message-rig-provider.test-fixture' -import { HOST_TEST_SESSION as SESSION } from '../../native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data' -import type { AgentChildWorkEvidence } from '../../../shared/agent-status/child-work/agent-status-child-work-evidence' - -it('delivers an ordinary send after an owned roster/start refresh without inventing root work', async () => { - const claude = fakeClaude() - const evidence: AgentChildWorkEvidence[] = [] - const rig = await createQueuedMessageTestRig({ agent: 'claude' }) - const adapter = adapterFor( - claude, - {}, - [], - [], - undefined, - undefined, - (_sessionId, batch) => evidence.push(...batch), - (outcome) => { - void rig.host.settleLateDispatch({ ...outcome, sessionId: SESSION }) - } - ) - let acquired = false - try { - rig.dispatch.mockImplementation(async (input) => { - if (!acquired) { - await adapter.acquire({ - identity: identityFor(SESSION), - fence: 1, - spawnToken: 'spawn-1', - events: rig.providerEvents() - }) - acquired = true - } - return adapter.dispatch({ ...input, sessionId: SESSION, fence: 1 }) - }) - const first = rig.send('start the work') - expect(await first.result).toMatchObject({ ok: true }) - await eventually(async () => - expect((await rig.submission(first.id))?.dispatchState).toBe('accepted') - ) - const connection = claude.connections[0]! - claudeFrame(connection, { - type: 'assistant', - uuid: 'root-answer', - parent_tool_use_id: null, - message: { role: 'assistant', content: [{ type: 'text', text: 'Started.' }] } - }) - claudeFrame(connection, { - type: 'result', - subtype: 'success', - uuid: 'root-result', - parent_tool_use_id: null, - duration_ms: 1000 - }) - await rig.host.collaboratorsForTests().runtimeState.flushAllEventSinks() - expect(rig.host.currentWork(SESSION)!.working()).toBe(false) - - // Recorded CLI roster has no tool alias; the following start enriches that same task. - const roster = PARENT_TASK_STOP[2]!.frame - claudeFrame(connection, { - ...roster, - tasks: Array.isArray(roster.tasks) ? roster.tasks.slice(1) : [] - }) - claudeFrame(connection, PARENT_TASK_STOP[3]!.frame) - await rig.host.collaboratorsForTests().runtimeState.flushAllEventSinks() - const snapshot = await rig.host.journalSnapshot(SESSION) - const children = snapshot.items.filter( - (item) => - item.body.kind === 'message' && - item.body.blocks.some( - (block) => block.type === 'background-task' && block.taskId === 'shell-child' - ) - ) - expect(children).toHaveLength(1) - expect(children[0]).toMatchObject({ agentId: 'shell-child', parentAgentId: 'agent-parent' }) - expect(evidence).toContainEqual( - expect.objectContaining({ - type: 'live', - child: expect.objectContaining({ - handle: expect.objectContaining({ id: 'shell-child' }), - ownerId: 'agent-parent', - stoppable: true - }) - }) - ) - const rootAfterChild = rig.host - .collaboratorsForTests() - .sessions.get(SESSION)! - .journal.runningTurn() - - const followup = rig.send('continue normally') - expect(await followup.result).toMatchObject({ ok: true }) - await eventually(async () => - expect((await rig.submission(followup.id))?.handedOverAt).toBeDefined() - ) - expect(rootAfterChild).toBeNull() - expect(connection.sent).toHaveLength(2) - expect(connection.sent[1]).toMatchObject({ - message: { - content: [{ type: 'text', text: 'continue normally' }] - } - }) - } finally { - await adapter.closeAll() - await rig.dispose() - claude.dispose() - } -}) diff --git a/src/main/claude/structured/claude-structured-control-actions.ts b/src/main/claude/structured/claude-structured-control-actions.ts index f26d63b1ec3..e99d00ae7e7 100644 --- a/src/main/claude/structured/claude-structured-control-actions.ts +++ b/src/main/claude/structured/claude-structured-control-actions.ts @@ -1,14 +1,14 @@ import type { PermissionResult } from '@anthropic-ai/claude-agent-sdk' import type { AgentChildWorkStopAcknowledgement } from '../../../shared/agent-status/child-work/agent-child-work-stop-targets' -import type { ClaudePromptClaim } from '../claude-prompt-registry' +import type { ClaudePromptClaim } from './permissions/claude-prompt-registry' import { ClaudeControlRequestError, ClaudeControlRequestTimeoutError -} from '../claude-agent-sdk-control-requests' +} from '../sdk-transport/claude-agent-sdk-control-requests' import { settleCancelledClaudeDispatchWaiters } from './claude-structured-dispatch' -import type { ClaudeLateDispatchSettlement } from '../claude-replay-turn-resolution' +import type { ClaudeLateDispatchSettlement } from './turns/claude-replay-turn-resolution' import type { ClaudeSession } from './claude-structured-session-state' -import { CLAUDE_STOP_GRACE_MS } from '../claude-request-end-wait' +import { CLAUDE_STOP_GRACE_MS } from './turns/claude-request-end-wait' const INTERRUPT_CANCEL_QUEUED_CAPABILITY = 'interrupt_cancel_queued_v1' diff --git a/src/main/claude/structured/claude-structured-dispatch-admission.test.ts b/src/main/claude/structured/claude-structured-dispatch-admission.test.ts deleted file mode 100644 index 3e7129c86cb..00000000000 --- a/src/main/claude/structured/claude-structured-dispatch-admission.test.ts +++ /dev/null @@ -1,110 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' -import { dispatchClaudeTurn } from './claude-structured-dispatch' -import { resolveClaudeReplayTurn } from '../claude-replay-turn-resolution' -import { sessionFor, userMessage, userReplayFrame } from './claude-structured-dispatch-test-support' - -function resolveClaudeReplayWaiter(...args: Parameters): boolean { - return resolveClaudeReplayTurn(...args) !== null -} - -describe('Claude structured dispatch admission', () => { - it('opens queued exact replays with the origin and the send owned by each send', async () => { - const session = sessionFor() - await dispatchClaudeTurn(session, { - clientMessageId: 'client-a', - body: userMessage([{ type: 'text', text: 'a' }]), - requestedAt: 100 - }) - const aUuid = session.dispatchWaiters[0]!.sentUuid - expect(resolveClaudeReplayTurn(session, userReplayFrame(aUuid, 'a'))).toEqual({ - requestedAt: 100, - clientMessageId: 'client-a' - }) - - await dispatchClaudeTurn(session, { - clientMessageId: 'client-b', - body: userMessage([{ type: 'text', text: 'b' }]), - requestedAt: 200 - }) - await dispatchClaudeTurn(session, { - clientMessageId: 'client-c', - body: userMessage([{ type: 'text', text: 'c' }]), - requestedAt: 300 - }) - const [b, c] = session.dispatchWaiters - - expect(resolveClaudeReplayTurn(session, userReplayFrame(b!.sentUuid, 'b'))).toEqual({ - requestedAt: 200, - clientMessageId: 'client-b' - }) - expect(resolveClaudeReplayTurn(session, userReplayFrame(c!.sentUuid, 'c'))).toEqual({ - requestedAt: 300, - clientMessageId: 'client-c' - }) - }) - - it('settles a send queued behind a running turn when that turn starts, with no doubt in between', async () => { - vi.useFakeTimers() - try { - const session = sessionFor() - const settled = vi.fn() - const running = await dispatchClaudeTurn(session, { - clientMessageId: 'client-1', - body: userMessage([{ type: 'text', text: 'one' }]) - }) - const runningUuid = session.dispatchWaiters[0]!.sentUuid - expect(resolveClaudeReplayWaiter(session, userReplayFrame(runningUuid, 'one'), settled)).toBe( - true - ) - - const queued = await dispatchClaudeTurn(session, { - clientMessageId: 'client-2', - body: userMessage([{ type: 'text', text: 'two' }]) - }) - const queuedUuid = session.dispatchWaiters[0]!.sentUuid - expect(running).toEqual({ state: 'admitted' }) - expect(queued).toEqual({ state: 'admitted' }) - - await vi.advanceTimersByTimeAsync(10 * 60_000) - expect(session.dispatchWaiters).toHaveLength(1) - expect(session.retiredDispatchWaiters).toHaveLength(0) - expect(settled).toHaveBeenCalledTimes(1) - - expect(resolveClaudeReplayWaiter(session, userReplayFrame(queuedUuid, 'two'), settled)).toBe( - true - ) - expect(settled).toHaveBeenLastCalledWith({ - clientMessageId: 'client-2', - providerIdentity: { provider: 'claude', sessionId: 'provider-session', uuid: queuedUuid } - }) - expect(session.dispatchWaiters).toHaveLength(0) - } finally { - vi.useRealTimers() - } - }) - - it('bounds pending replay identities instead of retaining an unbounded queue', async () => { - const session = sessionFor() - for (let index = 0; index < 64; index += 1) { - await expect( - dispatchClaudeTurn(session, { - clientMessageId: `client-${index}`, - body: userMessage([{ type: 'text', text: String(index) }]) - }) - ).resolves.toEqual({ state: 'admitted' }) - } - - await expect( - dispatchClaudeTurn(session, { - clientMessageId: 'client-over-capacity', - body: userMessage([{ type: 'text', text: 'one too many' }]) - }) - ).resolves.toEqual({ - state: 'rejected', - reason: 'claude structured dispatch queue is full', - rejection: { kind: 'queueFull' } - }) - expect(session.dispatchWaiters).toHaveLength(64) - expect(session.connection.send).toHaveBeenCalledTimes(64) - }) -}) diff --git a/src/main/claude/structured/claude-structured-dispatch-queue-boundary.test.ts b/src/main/claude/structured/claude-structured-dispatch-queue-boundary.test.ts deleted file mode 100644 index 3ab5f1668a1..00000000000 --- a/src/main/claude/structured/claude-structured-dispatch-queue-boundary.test.ts +++ /dev/null @@ -1,100 +0,0 @@ -import { expect, it, vi } from 'vitest' -import { AgentSessionPreDispatchError } from '../../native-chat/agent-session-wire/operations/structured-agent-session-operation-settlement' -import { createClaudeUserMessageQueue } from '../claude-agent-sdk-user-message-queue' -import { dispatchClaudeTurn } from './claude-structured-dispatch' -import { sessionFor } from './claude-structured-dispatch-test-support' -import { USER_MESSAGE } from './claude-structured-session-test-support' - -it('refuses stale continuation work after waiting for the SDK input pump', async () => { - const queue = createClaudeUserMessageQueue() - const queued = Promise.withResolvers() - const send = vi.fn((_message, beforeDispatch?: () => Promise) => { - const result = queue.push( - { - type: 'user', - session_id: 'provider-session', - parent_tool_use_id: null, - message: { role: 'user', content: 'continue' } - }, - beforeDispatch - ) - queued.resolve() - return result - }) - const session = sessionFor(send) - session.connection.send = send - let superseded = false - const refusal = new AgentSessionPreDispatchError('agent_session_restart_work_superseded') - const beforeDispatch = vi.fn(async () => { - if (superseded) { - throw refusal - } - }) - const result = dispatchClaudeTurn(session, { body: USER_MESSAGE }, beforeDispatch).catch( - (error: unknown) => error - ) - await queued.promise - expect(beforeDispatch).not.toHaveBeenCalled() - expect(session.dispatchWaiters).toEqual([]) - superseded = true - queue.end() - const pump = queue.messages[Symbol.asyncIterator]() - const handedOff = await pump.next() - await pump.return?.() - expect(handedOff.done).toBe(true) - expect(await result).toBe(refusal) - expect(beforeDispatch).toHaveBeenCalledOnce() - expect(session.dispatchWaiters).toEqual([]) - expect(session.retiredDispatchWaiters).toEqual([]) -}) - -it.each(['exit', 'capacity'] as const)( - 'refuses %s during authorization without leaked correlation', - async (failure) => { - const queue = createClaudeUserMessageQueue() - const authorizing = Promise.withResolvers() - const authorized = Promise.withResolvers() - const queued = Promise.withResolvers() - const session = sessionFor() - session.connection.send = (_message, beforeDispatch) => { - const result = queue.push( - { - type: 'user', - session_id: 'provider-session', - parent_tool_use_id: null, - message: { role: 'user', content: 'continue' } - }, - beforeDispatch - ) - queued.resolve() - return result - } - const beforeDispatch = vi.fn(() => { - authorizing.resolve() - return authorized.promise - }) - const result = dispatchClaudeTurn(session, { body: USER_MESSAGE }, beforeDispatch) - await queued.promise - const pump = queue.messages[Symbol.asyncIterator]() - const handedOff = pump.next() - await authorizing.promise - if (failure === 'exit') { - queue.fail(new Error('provider exited')) - } else { - session.connection.send = vi.fn().mockResolvedValue(undefined) - for (let index = 0; index < 64; index += 1) { - await dispatchClaudeTurn(session, { - body: USER_MESSAGE, - clientMessageId: `ordinary-${index}` - }) - } - queue.end() - } - authorized.resolve() - expect((await handedOff).done).toBe(true) - expect(await result).toMatchObject({ state: 'rejected' }) - expect(beforeDispatch).toHaveBeenCalledOnce() - expect(session.dispatchWaiters).toHaveLength(failure === 'exit' ? 0 : 64) - expect(session.retiredDispatchWaiters).toEqual([]) - } -) diff --git a/src/main/claude/structured/claude-structured-dispatch-test-support.ts b/src/main/claude/structured/claude-structured-dispatch-test-support.ts index 28964e3371a..02e3dab8dff 100644 --- a/src/main/claude/structured/claude-structured-dispatch-test-support.ts +++ b/src/main/claude/structured/claude-structured-dispatch-test-support.ts @@ -1,11 +1,11 @@ -import { ClaudeJournalBoundDelivery } from '../claude-journal-bound-delivery' +import { ClaudeJournalBoundDelivery } from './journal/claude-journal-bound-delivery' import { vi, type Mock } from 'vitest' import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { retireClaudeDispatchWaiters } from './claude-structured-dispatch' import type { ClaudeSession } from './claude-structured-session-state' -import { ClaudeBackgroundTaskTracker } from '../claude-background-task-tracker' -import { ClaudeChildWorkDecoder } from '../claude-child-work-decoder' -import { ClaudeSlashCommandCatalog } from '../claude-slash-command-catalog' +import { ClaudeBackgroundTaskTracker } from '../background-tasks/claude-background-task-tracker' +import { ClaudeChildWorkDecoder } from '../child-work/claude-child-work-decoder' +import { ClaudeSlashCommandCatalog } from '../command-catalog/claude-slash-command-catalog' import { createClaudeInitProof } from './claude-structured-init-proof' import { createClaudeStartupOutcome } from './claude-structured-startup-outcome' import { claudeProviderHandleLink } from './claude-structured-owner-identity' diff --git a/src/main/claude/structured/claude-structured-dispatch.ts b/src/main/claude/structured/claude-structured-dispatch.ts index 12a38877d34..031fdea5da7 100644 --- a/src/main/claude/structured/claude-structured-dispatch.ts +++ b/src/main/claude/structured/claude-structured-dispatch.ts @@ -11,7 +11,7 @@ import { import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionDispatchOutcome } from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' import type { ClaudeDispatchWaiter, ClaudeSession } from './claude-structured-session-state' -import type { ClaudeLateDispatchSettlement } from '../claude-replay-turn-resolution' +import type { ClaudeLateDispatchSettlement } from './turns/claude-replay-turn-resolution' import { claudeDispatchContentKey, claudeDispatchContentRejection, @@ -30,13 +30,13 @@ import type { AgentJournalDispatchRejection } from '../../../shared/agent-sessio import { claudeUnwrittenUserMessageError, claudeUserMessageWasProvablyUnwritten -} from '../claude-agent-sdk-user-message-queue' +} from '../sdk-transport/claude-agent-sdk-user-message-queue' import { AgentSessionPreDispatchError } from '../../native-chat/agent-session-wire/operations/structured-agent-session-operation-settlement' import { ClaudeEffortValidationError, isAgentSessionOptionRejectedError } from '../../native-chat/agent-session-wire/options/structured-agent-session-option-error' -import { ClaudeControlRequestError } from '../claude-agent-sdk-control-requests' +import { ClaudeControlRequestError } from '../sdk-transport/claude-agent-sdk-control-requests' import { admitStructuredAgentSessionInput, StructuredAgentSessionInputNotAdmitted, diff --git a/src/main/claude/structured/claude-structured-effort-reporting.test.ts b/src/main/claude/structured/claude-structured-effort-reporting.test.ts deleted file mode 100644 index c407b60cc8b..00000000000 --- a/src/main/claude/structured/claude-structured-effort-reporting.test.ts +++ /dev/null @@ -1,128 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { - readClaudeSettingsEffort, - readClaudeSettingsApplied -} from './launch/claude-structured-session-options' -import { ClaudeControlRequestTimeoutError } from '../claude-agent-sdk-control-requests' -import recordedUltracodeSettings from '../__fixtures__/ultracode-settings.json' -import { - USER_MESSAGE, - adapterFor, - claudeFrame, - fakeClaude, - identityFor, - recordingJournalSink -} from './claude-structured-session-test-support' - -describe('Claude effort reporting', () => { - it('distinguishes old CLI omissions from native no-effort and malformed responses', () => { - expect(readClaudeSettingsEffort({ effective: { effortLevel: 'high' } })).toBe('high') - expect(readClaudeSettingsEffort({ applied: {}, effective: { effortLevel: 'high' } })).toBe( - 'high' - ) - expect( - readClaudeSettingsEffort({ applied: { effort: null }, effective: { effortLevel: 'high' } }) - ).toBeNull() - expect( - readClaudeSettingsEffort({ applied: { effort: 42 }, effective: { effortLevel: 'high' } }) - ).toBeUndefined() - expect( - readClaudeSettingsEffort({ applied: null, effective: { effortLevel: 'high' } }) - ).toBeUndefined() - expect(readClaudeSettingsApplied(recordedUltracodeSettings.configured)?.effort).toBe('xhigh') - expect(readClaudeSettingsEffort(recordedUltracodeSettings.configured)).toBe('ultracode') - }) - - it('keeps a configured workflow at launch without confirming saved ordinary XHigh', async () => { - const claude = fakeClaude({ - settings: { applied: { effort: 'xhigh', ultracode: true }, effective: {} } - }) - const adapter = adapterFor(claude) - await adapter.acquire({ - identity: identityFor(), - fence: 7, - spawnToken: 'configured-workflow', - options: { effort: 'xhigh' }, - events: recordingJournalSink() - }) - const current = (await adapter.readOptions({ sessionId: 'session-1', fence: 7 })).current - expect(current.effort).toBe('xhigh') - expect(current.confirmed ?? []).not.toContain('effort') - await expect( - adapter.dispatch({ - sessionId: 'session-1', - clientMessageId: 'configured-workflow', - body: USER_MESSAGE, - executionOptions: { effort: 'xhigh' }, - fence: 7 - }) - ).resolves.toMatchObject({ state: 'admitted', ranOptions: { effort: 'ultracode' } }) - expect(claude.connections[0]!.calls.map(({ subtype }) => subtype)).not.toContain( - 'apply_flag_settings' - ) - const connection = claude.connections[0]! - connection.getSettings = async () => recordedUltracodeSettings.configured - claudeFrame(connection, { type: 'system', subtype: 'session_state_changed', state: 'idle' }) - for (const clientMessageId of ['fast-on', 'after-fast']) { - await expect( - adapter.dispatch({ - sessionId: 'session-1', - clientMessageId, - body: USER_MESSAGE, - executionOptions: { effort: 'xhigh', fastMode: 'true' }, - fence: 7 - }) - ).resolves.toMatchObject({ state: 'admitted' }) - claudeFrame(connection, { type: 'system', subtype: 'session_state_changed', state: 'idle' }) - } - expect( - connection.calls - .filter(({ subtype }) => subtype === 'apply_flag_settings') - .map(({ params }) => params?.settings) - ).toEqual([{ fastMode: true }, { effortLevel: 'xhigh' }]) - await adapter.closeAll() - }) - - it('leaves an attempted workflow after lost enable and exit acknowledgements', async () => { - const claude = fakeClaude() - const adapter = adapterFor(claude) - await adapter.acquire({ - identity: identityFor(), - fence: 7, - spawnToken: 'uncertain-workflow', - options: { effort: 'xhigh' }, - events: recordingJournalSink() - }) - const connection = claude.connections[0]! - connection.getSettings = async () => null - const settings: unknown[] = [] - connection.applyFlagSettings = async (input) => { - settings.push(input) - if (settings.length < 3) { - throw new ClaudeControlRequestTimeoutError('apply_flag_settings') - } - } - for (const [clientMessageId, effort, state] of [ - ['enable', 'ultracode', 'rejected'], - ['exit-unanswered', 'xhigh', 'rejected'], - ['exit-retry', 'xhigh', 'admitted'] - ] as const) { - await expect( - adapter.dispatch({ - sessionId: 'session-1', - clientMessageId, - body: USER_MESSAGE, - executionOptions: { effort }, - fence: 7 - }) - ).resolves.toMatchObject({ state }) - } - expect(settings).toEqual([ - { effortLevel: 'xhigh', ultracode: true }, - { effortLevel: 'xhigh', ultracode: false }, - { effortLevel: 'xhigh', ultracode: false } - ]) - expect(connection.sent).toHaveLength(1) - await adapter.closeAll() - }) -}) diff --git a/src/main/claude/structured/claude-structured-event-delivery.ts b/src/main/claude/structured/claude-structured-event-delivery.ts index 0bd7e9189bf..6d8b79378b3 100644 --- a/src/main/claude/structured/claude-structured-event-delivery.ts +++ b/src/main/claude/structured/claude-structured-event-delivery.ts @@ -1,5 +1,5 @@ -import { ClaudePluginInputError } from '../claude-plugin-ui' -import { claudePromptCardWritten } from '../claude-child-work-evidence' +import { ClaudePluginInputError } from '../sdk-transport/claude-plugin-ui' +import { claudePromptCardWritten } from '../child-work/claude-child-work-evidence' import type { ClaudeAcquisitionAttempt, ClaudeSessionExit, diff --git a/src/main/claude/structured/claude-structured-execution-observations.ts b/src/main/claude/structured/claude-structured-execution-observations.ts index 60f7a34ecaf..50187365093 100644 --- a/src/main/claude/structured/claude-structured-execution-observations.ts +++ b/src/main/claude/structured/claude-structured-execution-observations.ts @@ -1,7 +1,7 @@ import { claudeObservedEffort } from './launch/claude-structured-session-options' import { claudeRecord, claudeText } from './journal/claude-structured-item-translation' -import { claudeMatchingInitModel } from '../claude-context-usage' -import { isRootClaudeFrame } from '../claude-turn-opening' +import { claudeMatchingInitModel } from '../context-usage/claude-context-usage' +import { isRootClaudeFrame } from './turns/claude-turn-opening' import { MAX_CONTEXT_MODEL_ID_CHARS } from '../../../shared/agent-session/agent-session-context-usage' import type { ClaudeSession } from './claude-structured-session-state' diff --git a/src/main/claude/structured/claude-structured-in-turn-stop.test.ts b/src/main/claude/structured/claude-structured-in-turn-stop.test.ts deleted file mode 100644 index 1a40b7e2e2b..00000000000 --- a/src/main/claude/structured/claude-structured-in-turn-stop.test.ts +++ /dev/null @@ -1,191 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' -import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' -import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' -import { readAgentJournalTurn } from '../../../shared/agent-session/lifecycle/agent-session-turn-record' -import { personStopDecidesTurn } from '../../native-chat/agent-session-journal/context-epochs/journal-stop-turn-end' -import { createJournalReducerState } from '../../native-chat/agent-session-journal/projection/journal-reducer' -import { ClaudeControlRequestError } from '../claude-agent-sdk-control-requests' -import { - PROVIDER_SESSION_ID, - USER_MESSAGE, - adapterFor, - fakeClaude, - identityFor, - type FakeConnection -} from './claude-structured-session-test-support' - -// Claude before 2.1.91 omitted terminal_reason; the journal Stop determines the outcome. -const CUT_SHORT = { - type: 'result', - subtype: 'error_during_execution', - is_error: true, - session_id: PROVIDER_SESSION_ID, - parent_tool_use_id: null -} - -async function runningChat(claude: ReturnType): Promise<{ - adapter: ReturnType - bodies: Map - connection: FakeConnection - turnId: string - stopEvent: (turnId: string) => void -}> { - const bodies = new Map() - const journal = createJournalReducerState('session-1', 'epoch-1') - const adapter = adapterFor(claude) - await adapter.acquire({ - identity: identityFor(), - fence: 7, - spawnToken: 'spawn-9', - events: { - appendItem: (identity, body) => bodies.set(agentJournalItemKey(identity), body), - appendTombstone: (identity) => bodies.delete(agentJournalItemKey(identity)), - publish: vi.fn(), - journalStopDecidesTurn: (turnId, endedAt) => personStopDecidesTurn(journal, turnId, endedAt) - } - }) - await adapter.dispatch({ - sessionId: 'session-1', - clientMessageId: 'client-a', - body: USER_MESSAGE, - fence: 7 - }) - const connection = claude.connections[0]! - connection.handlers.onMessage?.({ ...connection.sent.at(-1)! }) - const turnId = [...bodies.values()] - .map((body) => readAgentJournalTurn(body)) - .find((turn) => turn?.state === 'running')?.turnId - if (!turnId) { - throw new Error('expected a running turn') - } - const stopEvent = (stoppedTurnId: string) => { - journal.queuePauseMarks.latestStop = { - sequence: 9, - event: { reason: 'user-stop', turnId: stoppedTurnId, at: 1 } - } - } - return { adapter, bodies, connection, turnId, stopEvent } -} - -function settled(bodies: Map, turnId: string) { - return [...bodies.values()] - .map((body) => readAgentJournalTurn(body)) - .find((turn) => turn?.turnId === turnId && turn.state !== 'running') -} - -function providerRows(bodies: Map): string[] { - return [...bodies.keys()].filter((key) => key.includes('provider-frame')) -} - -describe("a user's Stop inside a live Claude chat", () => { - it('leaves the turn the interrupt cut to the Stop when the CLI names no reason', async () => { - const claude = fakeClaude({ - routes: { - interrupt: () => { - claude.connections[0]!.handlers.onMessage?.(CUT_SHORT) - return undefined - } - } - }) - const { adapter, bodies, turnId, stopEvent } = await runningChat(claude) - stopEvent(turnId) - - await expect(adapter.cancelTurn({ sessionId: 'session-1', turnId, fence: 7 })).resolves.toEqual( - { cancelled: true } - ) - - expect(settled(bodies, turnId)).toMatchObject({ state: 'interrupted' }) - expect(settled(bodies, turnId)).not.toHaveProperty('outcome') - expect(providerRows(bodies)).toEqual([]) - }) - - it('leaves the open turn a Stop naming no turn cut to that Stop', async () => { - const claude = fakeClaude({ - routes: { - interrupt: () => { - claude.connections[0]!.handlers.onMessage?.(CUT_SHORT) - return undefined - } - } - }) - const { adapter, bodies, turnId, stopEvent } = await runningChat(claude) - // The host records the target even when the adapter request omits it. - stopEvent(turnId) - - await expect(adapter.cancelTurn({ sessionId: 'session-1', fence: 7 })).resolves.toEqual({ - cancelled: true - }) - - expect(settled(bodies, turnId)).toMatchObject({ state: 'interrupted' }) - expect(settled(bodies, turnId)).not.toHaveProperty('outcome') - expect(providerRows(bodies)).toEqual([]) - }) - - it('reads the same result with no Stop as a failure', async () => { - const { bodies, connection, turnId } = await runningChat(fakeClaude()) - - connection.handlers.onMessage?.(CUT_SHORT) - - expect(settled(bodies, turnId)).toMatchObject({ state: 'completed', outcome: 'failure' }) - expect(providerRows(bodies)).toHaveLength(1) - }) - - it('keeps a Stop naming no turn off the turn after it', async () => { - const claude = fakeClaude({ - replayUuids: ['user-uuid-0', 'user-uuid-1'], - routes: { - interrupt: () => { - claude.connections[0]!.handlers.onMessage?.(CUT_SHORT) - return undefined - } - } - }) - const { adapter, bodies, connection, turnId, stopEvent } = await runningChat(claude) - stopEvent(turnId) - await adapter.cancelTurn({ sessionId: 'session-1', fence: 7 }) - - await adapter.dispatch({ - sessionId: 'session-1', - clientMessageId: 'client-b', - body: USER_MESSAGE, - fence: 7 - }) - connection.handlers.onMessage?.({ ...connection.sent.at(-1)! }) - const nextTurnId = [...bodies.values()] - .map((body) => readAgentJournalTurn(body)) - .find((turn) => turn?.state === 'running')?.turnId - if (!nextTurnId) { - throw new Error('expected the next turn running') - } - connection.handlers.onMessage?.(CUT_SHORT) - - expect(settled(bodies, nextTurnId)).toMatchObject({ state: 'completed', outcome: 'failure' }) - }) - - it.each([ - ['naming the turn', true], - ['naming no turn', false] - ] as const)( - 'leaves a turn the CLI refused to interrupt to the Stop, %s', - async (_label, named) => { - const claude = fakeClaude({ - routes: { - interrupt: () => { - throw new ClaudeControlRequestError('interrupt', 'not running') - } - } - }) - const { adapter, bodies, connection, turnId, stopEvent } = await runningChat(claude) - stopEvent(turnId) - - await expect( - adapter.cancelTurn({ sessionId: 'session-1', ...(named ? { turnId } : {}), fence: 7 }) - ).resolves.toEqual({ cancelled: false }) - connection.handlers.onMessage?.(CUT_SHORT) - - expect(settled(bodies, turnId)).toMatchObject({ state: 'interrupted' }) - expect(settled(bodies, turnId)).not.toHaveProperty('outcome') - expect(providerRows(bodies)).toHaveLength(0) - } - ) -}) diff --git a/src/main/claude/structured/claude-structured-inbound-control.test.ts b/src/main/claude/structured/claude-structured-inbound-control.test.ts index d218b479698..0444b4a350b 100644 --- a/src/main/claude/structured/claude-structured-inbound-control.test.ts +++ b/src/main/claude/structured/claude-structured-inbound-control.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest' import type { CanUseTool } from '@anthropic-ai/claude-agent-sdk' -import { ClaudePromptRegistry } from '../claude-prompt-registry' +import { ClaudePromptRegistry } from './permissions/claude-prompt-registry' import { buildClaudePermissionCallbacks } from './claude-structured-inbound-control' type CanUseToolOptions = Parameters[2] diff --git a/src/main/claude/structured/claude-structured-inbound-control.ts b/src/main/claude/structured/claude-structured-inbound-control.ts index b1fa8e47ebc..5252e0c2217 100644 --- a/src/main/claude/structured/claude-structured-inbound-control.ts +++ b/src/main/claude/structured/claude-structured-inbound-control.ts @@ -1,5 +1,5 @@ import type { CanUseTool, OnUserDialog, PermissionResult } from '@anthropic-ai/claude-agent-sdk' -import type { ClaudePromptRegistry } from '../claude-prompt-registry' +import type { ClaudePromptRegistry } from './permissions/claude-prompt-registry' import type { ClaudeStructuredSessionEvent } from './claude-structured-session-state' import type { ClaudeStreamJsonConnectionHandlers } from '../claude-stream-json-connection' import type { ClaudeStructuredLaunch } from './launch/claude-structured-launch-resolution' @@ -8,7 +8,7 @@ import { createClaudeFullAccessPolicy } from './claude-full-access-policy' import { claudePermissionPresentation, claudePermissionSubject -} from '../claude-permission-presentation' +} from './permissions/claude-permission-presentation' export type ClaudePermissionCallbackDeps = { sessionId: string diff --git a/src/main/claude/structured/claude-structured-plugin-ui-recovery.ts b/src/main/claude/structured/claude-structured-plugin-ui-recovery.ts index c57e3ef9d81..2a6b1015456 100644 --- a/src/main/claude/structured/claude-structured-plugin-ui-recovery.ts +++ b/src/main/claude/structured/claude-structured-plugin-ui-recovery.ts @@ -1,4 +1,4 @@ -import { claudeFocusedPlugin, ClaudePluginInputError } from '../claude-plugin-ui' +import { claudeFocusedPlugin, ClaudePluginInputError } from '../sdk-transport/claude-plugin-ui' import type { ClaudeAcquisitionAttempt, ClaudeAcquireCallbacks, diff --git a/src/main/claude/structured/claude-structured-real-cli-fold.test.ts b/src/main/claude/structured/claude-structured-real-cli-fold.test.ts deleted file mode 100644 index 50cd1d9cc6c..00000000000 --- a/src/main/claude/structured/claude-structured-real-cli-fold.test.ts +++ /dev/null @@ -1,180 +0,0 @@ -import { randomUUID } from 'node:crypto' -import { mkdtemp } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { describe, expect, it, vi } from 'vitest' -import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentSessionJournalIdentity } from '../../../shared/agent-session/journal/agent-session-journal-identity' -import { readAgentJournalTurn } from '../../../shared/agent-session/lifecycle/agent-session-turn-record' -import type { StructuredAgentSessionEventSink } from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import { CLAUDE_STRUCTURED_BASE_OPTIONS } from './launch/claude-structured-launch-resolution' -import { ClaudeStructuredSessionAdapter } from './claude-structured-session-adapter' -import type { ClaudeStructuredSessionEvent } from './claude-structured-session-state' -import { - realClaudeAuthenticated, - realClaudeAvailable, - realClaudeCommand, - realClaudeLaunchHome -} from '../claude-real-cli-availability-test-support' -import { claudeStartupSettled } from './claude-structured-startup-settled-test-support' -import { claudeProviderHandle } from '../../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding' - -const SESSION_ID = 'real-cli-fold' -// Force SessionStart-before-init ordering and avoid prompts during the fold window. -const FOLD_SESSION_SETTINGS = JSON.stringify({ - hooks: { SessionStart: [{ hooks: [{ type: 'command', command: 'echo' }] }] }, - permissions: { allow: ['Bash(sleep:*)'] } -}) - -function identity(providerSessionId: string): AgentSessionJournalIdentity { - return { - sessionId: SESSION_ID, - workspaceId: 'real-cli-fold-workspace', - hostId: 'local', - agent: 'claude', - providerHandle: claudeProviderHandle(providerSessionId, null) - } -} - -async function until(check: () => boolean, timeoutMs: number): Promise { - const deadline = Date.now() + timeoutMs - while (Date.now() < deadline) { - if (check()) { - return true - } - await new Promise((resolve) => setTimeout(resolve, 200)) - } - return check() -} - -describe.skipIf(!realClaudeAvailable)('Claude structured real CLI fold', () => { - it.skipIf(!realClaudeAuthenticated)( - 'keeps one turn row when the CLI folds a mid-turn send', - async () => { - const providerSessionId = randomUUID() - const { claudeConfigDir, env } = realClaudeLaunchHome() - const cwd = await mkdtemp(join(tmpdir(), 'orca-real-fold-')) - const events: ClaudeStructuredSessionEvent[] = [] - const turnRows: NonNullable>[] = [] - const sink: StructuredAgentSessionEventSink = { - appendItem: (_identity, body: AgentJournalItemBody) => { - const turn = readAgentJournalTurn(body) - if (turn) { - turnRows.push(turn) - } - }, - appendTombstone: () => {}, - publish: () => {} - } - const settled = vi.fn() - const adapter = new ClaudeStructuredSessionAdapter({ - resolveLaunch: async () => ({ - pathToClaudeCodeExecutable: realClaudeCommand, - options: { - ...CLAUDE_STRUCTURED_BASE_OPTIONS, - extraArgs: { - ...CLAUDE_STRUCTURED_BASE_OPTIONS.extraArgs, - settings: FOLD_SESSION_SETTINGS - }, - sessionId: providerSessionId - }, - cwd, - env, - claudeConfigDir, - providerSessionId, - resumeLeafUuid: null, - resumesTranscript: false, - cliFlag: async () => 'supported' as const, - continuesChain: false - }), - onEvent: (event) => events.push(event), - onDispatchSettledLate: settled, - readProcessStartTime: async () => 1 - }) - try { - await adapter.acquire({ - identity: identity(providerSessionId), - fence: 1, - spawnToken: 'real-cli-fold', - events: sink - }) - await claudeStartupSettled(adapter, SESSION_ID) - expect( - events.some( - (event) => - event.type === 'message' && - event.message.type === 'system' && - event.message.subtype === 'init' - ) - ).toBe(false) - - await expect( - adapter.dispatch({ - sessionId: SESSION_ID, - clientMessageId: 'client-A', - body: { - kind: 'message', - role: 'user', - blocks: [ - { - type: 'text', - text: 'Use the Bash tool to run `sleep 8` two separate times, one call at a time, waiting for each. Then reply exactly: FIRST DONE' - } - ] - }, - requestedAt: Date.now(), - fence: 1 - }) - ).resolves.toMatchObject({ state: 'admitted' }) - - // The sleep prompt keeps A running while B is sent. - expect( - await until( - () => events.some((event) => event.type === 'message' && event.startsTurn === true), - 30_000 - ) - ).toBe(true) - await new Promise((resolve) => setTimeout(resolve, 2_000)) - await expect( - adapter.dispatch({ - sessionId: SESSION_ID, - clientMessageId: 'client-B', - body: { - kind: 'message', - role: 'user', - blocks: [{ type: 'text', text: 'Also say the word banana at the end of your reply.' }] - }, - requestedAt: Date.now(), - fence: 1 - }) - ).resolves.toMatchObject({ state: 'admitted' }) - - const results = () => - events.flatMap((event) => - event.type === 'message' && event.message.type === 'result' ? [event.message] : [] - ) - expect(await until(() => results().length > 0, 90_000)).toBe(true) - - // A single send means B missed the fold window. - const named = results().flatMap((message) => - Array.isArray(message.user_message_uuids) ? [message.user_message_uuids] : [] - ) - expect(named[0]).toHaveLength(2) - - expect(turnRows.every((turn) => turn.state !== 'interrupted')).toBe(true) - expect([...new Set(turnRows.map((turn) => turn.turnId))]).toHaveLength(1) - expect(turnRows.at(-1)).toMatchObject({ state: 'completed' }) - expect(settled).toHaveBeenCalledWith( - expect.objectContaining({ - sessionId: SESSION_ID, - clientMessageId: 'client-B', - providerIdentity: expect.objectContaining({ provider: 'claude' }) - }) - ) - } finally { - await adapter.closeAll() - } - }, - 150_000 - ) -}) diff --git a/src/main/claude/structured/claude-structured-real-cli-rewind.test.ts b/src/main/claude/structured/claude-structured-real-cli-rewind.test.ts deleted file mode 100644 index 3de328e0f6e..00000000000 --- a/src/main/claude/structured/claude-structured-real-cli-rewind.test.ts +++ /dev/null @@ -1,150 +0,0 @@ -import { randomUUID } from 'node:crypto' -import { mkdtemp, readFile } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { describe, expect, it, vi } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../../shared/agent-session/journal/agent-session-journal-identity' -import { claudeProviderHandle } from '../../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding' -import { resolveSessionFilePath } from '../../native-chat/session-file-resolver' -import { - realClaudeAuthenticated, - realClaudeAvailable, - realClaudeCommand, - realClaudeLaunchHome -} from '../claude-real-cli-availability-test-support' -import { readClaudePromptParentUuid, resolveClaudeRewindFork } from '../claude-rewind-fork' -import { - CLAUDE_STRUCTURED_BASE_OPTIONS, - type ClaudeStructuredSdkOptions -} from './launch/claude-structured-launch-resolution' -import { ClaudeStructuredSessionAdapter } from './claude-structured-session-adapter' -import type { ClaudeStructuredSessionEvent } from './claude-structured-session-state' -import { claudeStartupSettled } from './claude-structured-startup-settled-test-support' - -const SESSION_ID = 'real-cli-rewind' - -const identity = (providerSessionId: string): AgentSessionJournalIdentity => ({ - sessionId: SESSION_ID, - workspaceId: 'real-cli-rewind-workspace', - hostId: 'local', - agent: 'claude', - providerHandle: claudeProviderHandle(providerSessionId, null) -}) - -async function transcript(providerSessionId: string, claudeConfigDir: string): Promise { - const path = await resolveSessionFilePath('claude', providerSessionId, { - claudeProjectsDir: join(claudeConfigDir, 'projects') - }) - return readFile(path ?? '', 'utf8') -} - -describe.skipIf(!realClaudeAvailable)('Claude structured real CLI rewind', () => { - it.skipIf(!realClaudeAuthenticated)( - 'forks the conversation at the rewound prompt and forgets the undone turn', - async () => { - const source = randomUUID() - const { claudeConfigDir, env } = realClaudeLaunchHome() - const cwd = await mkdtemp(join(tmpdir(), 'orca-real-rewind-')) - const results: string[] = [] - // Replay supplies transcript prompt IDs after dispatch resolves. - const promptIds: string[] = [] - const adapterFor = (providerSessionId: string, launch: ClaudeStructuredSdkOptions) => - new ClaudeStructuredSessionAdapter({ - resolveLaunch: async () => ({ - pathToClaudeCodeExecutable: realClaudeCommand, - options: { ...CLAUDE_STRUCTURED_BASE_OPTIONS, ...launch }, - cwd, - env, - claudeConfigDir, - providerSessionId, - resumeLeafUuid: null, - resumesTranscript: false, - cliFlag: async () => 'supported' as const, - continuesChain: false - }), - onEvent: (event: ClaudeStructuredSessionEvent) => { - if (event.type === 'message' && event.message.type === 'result') { - results.push(String(event.message.result)) - } - }, - onDispatchSettledLate: (settled) => { - if ('providerIdentity' in settled && settled.providerIdentity.provider === 'claude') { - promptIds.push(settled.providerIdentity.uuid) - } - }, - readProcessStartTime: async () => 1 - }) - const send = async (adapter: ClaudeStructuredSessionAdapter, text: string, n: number) => { - await adapter.dispatch({ - sessionId: SESSION_ID, - clientMessageId: `real-cli-rewind-${n}`, - body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text }] }, - requestedAt: Date.now(), - fence: 1 - }) - await vi.waitFor(() => expect(results).toHaveLength(n), { timeout: 90_000, interval: 250 }) - return promptIds[n - 1] - } - - const first = adapterFor(source, { sessionId: source }) - let promptUuid: string | undefined - try { - await first.acquire({ identity: identity(source), fence: 1, spawnToken: 'rewind-source' }) - await claudeStartupSettled(first, SESSION_ID) - await send(first, 'Reply with the single word ALPHA and nothing else.', 1) - promptUuid = await send(first, 'Reply with the single word BRAVO and nothing else.', 2) - } finally { - await first.closeAll() - } - - const sourceBefore = await transcript(source, claudeConfigDir) - expect(sourceBefore).toContain(`"uuid":"${promptUuid}"`) - const throughEntryId = await readClaudePromptParentUuid({ - providerSessionId: source, - promptUuid: promptUuid ?? '', - claudeConfigDir - }) - - const fork = await resolveClaudeRewindFork({ - orcaSessionId: SESSION_ID, - rewindOperationId: randomUUID(), - head: claudeProviderHandle(source, null), - prompt: { sessionId: source, uuid: promptUuid ?? '' }, - claudeConfigDirs: [claudeConfigDir] - }) - expect(fork).toMatchObject({ materialized: true, throughEntryId }) - if (!fork) { - throw new Error('rewind fork was not created') - } - const beforeSend = await transcript(fork.sessionId, claudeConfigDir) - expect(beforeSend).toContain(throughEntryId) - expect(beforeSend).not.toContain(promptUuid) - const rewound = adapterFor(fork.sessionId, { resume: fork.sessionId }) - try { - await rewound.acquire({ - identity: identity(fork.sessionId), - fence: 1, - spawnToken: 'rewind-fork' - }) - await claudeStartupSettled(rewound, SESSION_ID) - await send( - rewound, - 'List every word I have asked you to reply with in this conversation, in capitals.', - 3 - ) - } finally { - await rewound.closeAll() - } - - const answer = results[2] ?? '' - expect(answer).toContain('ALPHA') - expect(answer).not.toContain('BRAVO') - // Forked entries retain original UUIDs in provenance. - const forked = await transcript(fork.sessionId, claudeConfigDir) - expect(forked).toContain(`"messageUuid":"${throughEntryId}"`) - expect(forked).not.toContain(promptUuid) - expect(await transcript(source, claudeConfigDir)).toBe(sourceBefore) - }, - 240_000 - ) -}) diff --git a/src/main/claude/structured/claude-structured-real-cli-stop-task.test.ts b/src/main/claude/structured/claude-structured-real-cli-stop-task.test.ts deleted file mode 100644 index 952135ab827..00000000000 --- a/src/main/claude/structured/claude-structured-real-cli-stop-task.test.ts +++ /dev/null @@ -1,176 +0,0 @@ -import { randomUUID } from 'node:crypto' -import { mkdtemp } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { describe, expect, it } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../../shared/agent-session/journal/agent-session-journal-identity' -import type { StructuredAgentSessionEventSink } from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import { CLAUDE_STRUCTURED_BASE_OPTIONS } from './launch/claude-structured-launch-resolution' -import { ClaudeStructuredSessionAdapter } from './claude-structured-session-adapter' -import type { ClaudeStructuredSessionEvent } from './claude-structured-session-state' -import { - realClaudeAuthenticated, - realClaudeAvailable, - realClaudeCommand, - realClaudeLaunchHome -} from '../claude-real-cli-availability-test-support' -import { claudeStartupSettled } from './claude-structured-startup-settled-test-support' -import { claudeProviderHandle } from '../../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding' - -const SESSION_ID = 'real-cli-stop-task' -const SETTINGS = JSON.stringify({ permissions: { allow: ['Bash(sleep:*)'] } }) - -function identity(providerSessionId: string): AgentSessionJournalIdentity { - return { - sessionId: SESSION_ID, - workspaceId: 'real-cli-stop-task-workspace', - hostId: 'local', - agent: 'claude', - providerHandle: claudeProviderHandle(providerSessionId, null) - } -} - -async function until(check: () => boolean, timeoutMs: number): Promise { - const deadline = Date.now() + timeoutMs - while (Date.now() < deadline) { - if (check()) { - return true - } - await new Promise((resolve) => setTimeout(resolve, 200)) - } - return check() -} - -function taskFrames(events: readonly ClaudeStructuredSessionEvent[], taskId: string) { - return events.flatMap((event) => - event.type === 'message' && - event.message.type === 'system' && - typeof event.message.subtype === 'string' && - event.message.subtype.startsWith('task_') && - event.message.task_id === taskId - ? [event.message] - : [] - ) -} - -describe.skipIf(!realClaudeAvailable)('Claude structured real CLI targeted stop', () => { - it.skipIf(!realClaudeAuthenticated)( - 'acknowledges stop_task on one live background agent', - async () => { - const providerSessionId = randomUUID() - const { claudeConfigDir, env } = realClaudeLaunchHome() - const cwd = await mkdtemp(join(tmpdir(), 'orca-real-stop-task-')) - const events: ClaudeStructuredSessionEvent[] = [] - const sink: StructuredAgentSessionEventSink = { - appendItem: () => {}, - appendTombstone: () => {}, - publish: () => {} - } - const adapter = new ClaudeStructuredSessionAdapter({ - resolveLaunch: async () => ({ - pathToClaudeCodeExecutable: realClaudeCommand, - options: { - ...CLAUDE_STRUCTURED_BASE_OPTIONS, - extraArgs: { ...CLAUDE_STRUCTURED_BASE_OPTIONS.extraArgs, settings: SETTINGS }, - sessionId: providerSessionId - }, - cwd, - env, - claudeConfigDir, - providerSessionId, - resumeLeafUuid: null, - resumesTranscript: false, - cliFlag: async () => 'supported' as const, - continuesChain: false - }), - onEvent: (event) => events.push(event), - readProcessStartTime: async () => 1 - }) - try { - await adapter.acquire({ - identity: identity(providerSessionId), - fence: 1, - spawnToken: 'real-cli-stop-task', - events: sink - }) - await claudeStartupSettled(adapter, SESSION_ID) - await expect( - adapter.dispatch({ - sessionId: SESSION_ID, - clientMessageId: 'client-A', - body: { - kind: 'message', - role: 'user', - blocks: [ - { - type: 'text', - text: 'Use the Agent tool once, with run_in_background set to true and description "Sleeper", asking the subagent to run `sleep 120` with the Bash tool. Do not wait for it. Then reply exactly: LAUNCHED' - } - ] - }, - requestedAt: Date.now(), - fence: 1 - }) - ).resolves.toMatchObject({ state: 'admitted' }) - - const started = () => - events.flatMap((event) => - event.type === 'message' && - event.message.type === 'system' && - event.message.subtype === 'task_started' && - event.message.task_type === 'local_agent' && - typeof event.message.task_id === 'string' - ? [event.message.task_id] - : [] - ) - expect(await until(() => started().length > 0, 90_000)).toBe(true) - const [taskId] = started() - // Give the subagent time to reach its sleep, so the stop lands on a live run. - await new Promise((resolve) => setTimeout(resolve, 5_000)) - - const acknowledged: unknown[] = [] - const outcome = await adapter.stopBackgroundTasks({ - sessionId: SESSION_ID, - fence: 1, - taskIds: [taskId], - acknowledge: (acknowledgement) => void acknowledged.push(acknowledgement) - }) - expect(outcome).toMatchObject({ cancelled: true }) - expect(acknowledged).toEqual([{ taskId }]) - - const ended = await until( - () => - taskFrames(events, taskId).some( - (frame) => - frame.subtype === 'task_notification' || - (frame.subtype === 'task_updated' && - typeof frame.patch === 'object' && - frame.patch !== null && - 'status' in frame.patch) - ), - 30_000 - ) - expect(ended).toBe(true) - const frames = taskFrames(events, taskId).map((frame) => ({ - subtype: frame.subtype, - status: - frame.status ?? - (typeof frame.patch === 'object' && frame.patch !== null && 'status' in frame.patch - ? frame.patch.status - : undefined) - })) - console.info('[real-cli stop_task] task frames', JSON.stringify(frames)) - const endings = frames.filter((frame) => frame.status !== undefined) - expect(endings.length).toBeGreaterThan(0) - expect( - endings.every((frame) => - ['stopped', 'killed', 'cancelled'].includes(String(frame.status)) - ) - ).toBe(true) - } finally { - await adapter.closeAll() - } - }, - 180_000 - ) -}) diff --git a/src/main/claude/structured/claude-structured-real-cli-visuals.test.ts b/src/main/claude/structured/claude-structured-real-cli-visuals.test.ts deleted file mode 100644 index 92b8d52201f..00000000000 --- a/src/main/claude/structured/claude-structured-real-cli-visuals.test.ts +++ /dev/null @@ -1,127 +0,0 @@ -import { createClaudeStructuredLaunchResolver } from '../../runtime/agent-session/launch/structured-agent-launch-composition.test-support' -import { mkdir, mkdtemp, rm } from 'node:fs/promises' -import { homedir, tmpdir } from 'node:os' -import { join } from 'node:path' -import { describe, expect, it, vi } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../../shared/agent-session/journal/agent-session-journal-identity' -import { agentSessionRecordFixture } from '../../native-chat/agent-session-record-test-fixture' -import { claudeProviderHandle } from '../../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding' -import { createNativeChatVisualsDelivery } from '../../native-chat/native-chat-visuals-delivery' -import { nativeChatScratchFolderFor } from '../../native-chat/native-chat-scratch-folder' -import { NATIVE_CHAT_VISUALS_SKILL_NAME } from '../../native-chat/native-chat-visuals-skill-location' -import { createClaudeCliFlagSupport } from '../claude-cli-flag-support' -import { readClaudeInit } from './claude-structured-init-proof' -import { - realClaudeAuthenticated, - realClaudeAvailable, - realClaudeCliGate, - realClaudeCommand, - realClaudeLaunchHome -} from '../claude-real-cli-availability-test-support' -import { ClaudeStructuredSessionAdapter } from './claude-structured-session-adapter' -import type { ClaudeStructuredSessionEvent } from './claude-structured-session-state' - -const SESSION_ID = 'real-cli-visuals' -const listed = (value: unknown): unknown[] => (Array.isArray(value) ? value : []) -const suiteTitle = `Claude real CLI chat visuals${realClaudeCliGate.skipReason ? ` (skipped: ${realClaudeCliGate.skipReason})` : ''}` - -describe.skipIf(!realClaudeAvailable)(suiteTitle, () => { - it.skipIf(!realClaudeAuthenticated)( - "loads the visuals skill through Orca's launch and grants the chat folder", - async () => { - const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR?.trim() || join(homedir(), '.claude') - const scratch = await mkdtemp(join(tmpdir(), 'orca-real-cli-visuals-')) - const cwd = join(scratch, 'workspace') - const stateDirectory = join(scratch, 'state') - const record = agentSessionRecordFixture({ - sessionId: SESSION_ID, - location: { workspaceId: 'real-cli-visuals-workspace' }, - accountHome: { variable: 'CLAUDE_CONFIG_DIR', path: claudeConfigDir }, - launchDirectory: cwd - }) - const logger = { warn: vi.fn(), error: vi.fn() } - const resolveLaunch = createClaudeStructuredLaunchResolver({ - store: { getRecord: () => record, pinLaunchDirectory: vi.fn() }, - resolveWorkspacePath: async () => cwd, - resolveCommand: () => ({ command: realClaudeCommand, prefixArgs: [] }), - resolveLaunchArgs: () => [], - resolveEnv: () => realClaudeLaunchHome().env, - resolveAuthPolicy: () => ({ account: 'system' }), - hasTranscript: async () => false, - cliFlags: createClaudeCliFlagSupport(), - prepareVisuals: createNativeChatVisualsDelivery({ stateDirectory, logger }) - }) - const identity: AgentSessionJournalIdentity = { - sessionId: SESSION_ID, - workspaceId: 'real-cli-visuals-workspace', - hostId: 'local', - agent: 'claude', - providerHandle: null - } - const events: ClaudeStructuredSessionEvent[] = [] - const adapter = new ClaudeStructuredSessionAdapter({ - resolveLaunch, - onEvent: (event) => events.push(event), - readProcessStartTime: async () => 1, - now: () => 2 - }) - const frames = (): Record[] => - events.flatMap((event) => (event.type === 'message' ? [event.message] : [])) - try { - await mkdir(cwd, { recursive: true }) - const launch = await resolveLaunch({ identity }) - const folder = nativeChatScratchFolderFor(stateDirectory, SESSION_ID) - expect(launch.options.additionalDirectories).toEqual([folder]) - expect(launch.options.plugins).toHaveLength(1) - await adapter.acquire({ - identity: { - ...identity, - providerHandle: claudeProviderHandle(launch.providerSessionId, null) - }, - fence: 1, - spawnToken: 'real-cli-visuals' - }) - await adapter.dispatch({ - sessionId: SESSION_ID, - clientMessageId: 'real-cli-visuals-1', - body: { - kind: 'message', - role: 'user', - blocks: [ - { - type: 'text', - text: 'Without using any tool, reply with only the exact names of the skills available to you whose name contains "visuals", comma separated, or NONE.' - } - ] - }, - fence: 1 - }) - await vi.waitFor( - () => expect(frames()).toContainEqual(expect.objectContaining({ type: 'result' })), - { timeout: 120_000, interval: 200 } - ) - const init = frames().find( - (frame) => readClaudeInit(frame) !== null && frame.subtype === 'init' - ) - // The model sees the skill even though the / menu and init lists hide it. - const answer = frames().find((frame) => frame.type === 'result')?.result - expect(String(answer)).toContain(NATIVE_CHAT_VISUALS_SKILL_NAME) - expect( - [...listed(init?.skills), ...listed(init?.slash_commands)].some( - (name) => typeof name === 'string' && name.endsWith(NATIVE_CHAT_VISUALS_SKILL_NAME) - ) - ).toBe(false) - expect(init?.plugins).toEqual( - expect.arrayContaining([ - expect.objectContaining({ path: launch.options.plugins?.[0]?.path }) - ]) - ) - expect(logger.warn).not.toHaveBeenCalled() - } finally { - await adapter.closeAll() - await rm(scratch, { recursive: true, force: true }) - } - }, - 150_000 - ) -}) diff --git a/src/main/claude/structured/claude-structured-real-cli.test.ts b/src/main/claude/structured/claude-structured-real-cli.test.ts deleted file mode 100644 index 9c9a3a56670..00000000000 --- a/src/main/claude/structured/claude-structured-real-cli.test.ts +++ /dev/null @@ -1,605 +0,0 @@ -import { randomUUID } from 'node:crypto' -import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises' -import { homedir, tmpdir } from 'node:os' -import { basename, join, relative } from 'node:path' -import { describe, expect, it, vi } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../../shared/agent-session/journal/agent-session-journal-identity' -import { resolveSessionFilePath } from '../../native-chat/session-file-resolver' -import { - CLAUDE_STRUCTURED_BASE_OPTIONS, - claudeStructuredPermissionOptions -} from './launch/claude-structured-launch-resolution' -import { readClaudeInit } from './claude-structured-init-proof' -import { - realClaudeAuthenticated, - realClaudeAuthStatus, - realClaudeAvailable, - realClaudeCliGate, - realClaudeCommand, - realClaudeLaunchHome -} from '../claude-real-cli-availability-test-support' -import { ClaudeStructuredSessionAdapter } from './claude-structured-session-adapter' -import type { - ClaudeStructuredSessionEvent, - ClaudeStructuredSessionAdapterDeps -} from './claude-structured-session-state' - -import { - claudeOpened, - claudeStartupSettled -} from './claude-structured-startup-settled-test-support' -import { claudeProviderHandle } from '../../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding' - -const command = realClaudeCommand -const suiteTitle = `Claude structured real CLI handshake${realClaudeCliGate.skipReason ? ` (skipped: ${realClaudeCliGate.skipReason})` : ''}` - -function realAdapter( - providerSessionId: string, - claudeConfigDir: string, - events: ClaudeStructuredSessionEvent[] = [], - cwd = process.cwd(), - onDispatchSettledLate?: ClaudeStructuredSessionAdapterDeps['onDispatchSettledLate'], - env = realClaudeLaunchHome().env, - waitsForStartup = true -): ClaudeStructuredSessionAdapter { - const adapter = new ClaudeStructuredSessionAdapter({ - resolveLaunch: async ({ permissionMode }) => { - const permission = claudeStructuredPermissionOptions(permissionMode ?? 'ask') - return { - pathToClaudeCodeExecutable: command, - options: { - ...CLAUDE_STRUCTURED_BASE_OPTIONS, - ...permission, - extraArgs: { ...CLAUDE_STRUCTURED_BASE_OPTIONS.extraArgs, ...permission.extraArgs }, - sessionId: providerSessionId - }, - cwd, - env, - claudeConfigDir, - providerSessionId, - resumeLeafUuid: null, - resumesTranscript: false, - cliFlag: async () => 'supported' as const, - continuesChain: false - } - }, - onEvent: (event) => events.push(event), - ...(onDispatchSettledLate ? { onDispatchSettledLate } : {}), - readProcessStartTime: async () => 1, - now: () => 2 - }) - if (!waitsForStartup) { - return adapter - } - // These proofs read startup facts, which land after the session is published. - const acquire = adapter.acquire - adapter.acquire = async (input) => { - const acquisition = await acquire(input) - await claudeStartupSettled(adapter, input.identity.sessionId) - return acquisition - } - return adapter -} - -/** Isolate SessionStart proof from the machine's hook settings. */ -async function projectWithStartHook( - prefix: string, - settings: Record = {} -): Promise { - const cwd = await mkdtemp(join(tmpdir(), prefix)) - await mkdir(join(cwd, '.claude'), { recursive: true }) - await writeFile( - join(cwd, '.claude', 'settings.json'), - JSON.stringify({ - ...settings, - hooks: { SessionStart: [{ hooks: [{ type: 'command', command: 'true' }] }] } - }) - ) - return cwd -} - -function identity(providerSessionId: string): AgentSessionJournalIdentity { - return { - sessionId: 'real-cli-handshake', - workspaceId: 'real-cli-workspace', - hostId: 'local', - agent: 'claude', - providerHandle: claudeProviderHandle(providerSessionId, null) - } -} - -/** The CLI flushes its transcript on its own schedule; poll rather than race it. */ -async function waitForResolvedTranscript( - providerSessionId: string, - timeoutMs = 15_000 -): Promise { - const deadline = Date.now() + timeoutMs - for (;;) { - // Match mobile lookup: no project-root override. - const resolved = await resolveSessionFilePath('claude', providerSessionId) - if (resolved || Date.now() >= deadline) { - return resolved - } - await new Promise((resolve) => setTimeout(resolve, 250)) - } -} - -describe.skipIf(!realClaudeAvailable)(suiteTitle, () => { - it.skipIf(!realClaudeAuthenticated)( - 'proves a pre-minted session before the first user message', - async () => { - const providerSessionId = randomUUID() - const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR?.trim() || join(homedir(), '.claude') - const events: ClaudeStructuredSessionEvent[] = [] - const cwd = await projectWithStartHook('orca-command-init-') - await mkdir(join(cwd, '.claude', 'commands'), { recursive: true }) - await writeFile( - join(cwd, '.claude', 'commands', 'orca-init-catalog-proof.md'), - '---\ndescription: Initialization catalog proof\n---\nReply with OK.\n' - ) - const adapter = realAdapter(providerSessionId, claudeConfigDir, events, cwd) - - try { - await adapter.acquire({ - identity: identity(providerSessionId), - fence: 1, - spawnToken: 'real-cli' - }) - await claudeStartupSettled(adapter, 'real-cli-handshake') - const observedSubtypes = events.flatMap((event) => - event.type === 'message' ? [event.message.subtype] : [] - ) - - // Startup frame UUIDs are not resumable transcript leaves. - expect((await claudeOpened(adapter, 'real-cli-handshake')).link?.handle).toEqual( - claudeProviderHandle(providerSessionId, null) - ) - expect(observedSubtypes).toContain('hook_started') - expect(adapter.readCommands('real-cli-handshake')).toContainEqual( - expect.objectContaining({ - name: 'orca-init-catalog-proof', - kind: 'command', - kindUnspecified: true - }) - ) - expect( - adapter.readCommands('real-cli-handshake')?.some(({ name }) => name === 'help') - ).toBe(false) - } finally { - await adapter.closeAll() - await rm(cwd, { recursive: true, force: true }) - } - }, - 10_000 - ) - - it.skipIf(!realClaudeAuthenticated)( - 'reports the current effort through get_settings and never on the init frame', - async () => { - const providerSessionId = randomUUID() - const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR?.trim() || join(homedir(), '.claude') - const events: ClaudeStructuredSessionEvent[] = [] - const cwd = await projectWithStartHook('orca-effort-readback-', { effortLevel: 'low' }) - const adapter = realAdapter(providerSessionId, claudeConfigDir, events, cwd) - - try { - await adapter.acquire({ - identity: identity(providerSessionId), - fence: 1, - spawnToken: 'real-cli-effort' - }) - await claudeStartupSettled(adapter, 'real-cli-handshake') - const published = events.flatMap((event) => - event.type === 'message' ? [event.message] : [] - ) - const options = await adapter.readOptions({ sessionId: 'real-cli-handshake', fence: 1 }) - - expect(published.length).toBeGreaterThan(0) - // Startup proof varies by host, so inspect every published frame. - expect(published.filter((frame) => 'effortLevel' in frame)).toEqual([]) - expect(options.current.effort).toBe('low') - } finally { - await adapter.closeAll() - await rm(cwd, { recursive: true, force: true }) - } - }, - 15_000 - ) - - // Use the CLI-reported project root so resolver and expectation cannot share a path bug. - it.skipIf(!realClaudeAuthenticated || !realClaudeAuthStatus?.projectsDirectory)( - 'writes its transcript where the mobile session-file resolver looks for it', - async () => { - const providerSessionId = randomUUID() - const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR?.trim() || join(homedir(), '.claude') - const adapter = realAdapter(providerSessionId, claudeConfigDir) - const cliProjectsDir = realClaudeAuthStatus?.projectsDirectory as string - - let transcriptPath: string | null = null - try { - await adapter.acquire({ - identity: identity(providerSessionId), - fence: 1, - spawnToken: 'real-cli-transcript' - }) - await claudeStartupSettled(adapter, 'real-cli-handshake') - await adapter.dispatch({ - sessionId: 'real-cli-handshake', - clientMessageId: 'real-cli-transcript-1', - body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'hi' }] }, - fence: 1 - }) - transcriptPath = await waitForResolvedTranscript(providerSessionId) - } finally { - await adapter.closeAll() - } - - expect(transcriptPath).not.toBeNull() - expect(basename(transcriptPath ?? '')).toBe(`${providerSessionId}.jsonl`) - expect(relative(cliProjectsDir, transcriptPath ?? '').split(/[\\/]/)).toHaveLength(2) - expect(join(claudeConfigDir, 'projects')).toBe(cliProjectsDir) - }, - 45_000 - ) - - // set_model accepts nonexistent IDs; only a later init proves the model was adopted. - it.skipIf(!realClaudeAuthenticated)( - 'reports the model it adopted on the init frame that opens each turn', - async () => { - const providerSessionId = randomUUID() - const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR?.trim() || join(homedir(), '.claude') - const events: ClaudeStructuredSessionEvent[] = [] - const adapter = realAdapter(providerSessionId, claudeConfigDir, events) - - try { - await adapter.acquire({ - identity: identity(providerSessionId), - fence: 1, - spawnToken: 'real-cli-model' - }) - await claudeStartupSettled(adapter, 'real-cli-handshake') - await adapter.setOption({ - sessionId: 'real-cli-handshake', - key: 'model', - value: 'haiku', - fence: 1 - }) - const before = events.length - await adapter.dispatch({ - sessionId: 'real-cli-handshake', - clientMessageId: 'real-cli-model-1', - body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'Say ok' }] }, - fence: 1 - }) - const deadline = Date.now() + 60_000 - let frames: Record[] = [] - for (;;) { - frames = events - .slice(before) - .flatMap((event) => - event.type === 'message' && - event.message.type === 'system' && - event.message.subtype === 'init' - ? [event.message] - : [] - ) - if (frames.length > 0 || Date.now() >= deadline) { - break - } - await new Promise((resolve) => setTimeout(resolve, 250)) - } - - expect(frames).not.toHaveLength(0) - expect(frames[0]?.model).toEqual(expect.any(String)) - expect(frames[0]?.model).toMatch(/^claude-haiku-/) - await expect( - adapter.readOptions({ sessionId: 'real-cli-handshake', fence: 1 }) - ).resolves.toMatchObject({ - current: { model: 'haiku', confirmed: expect.arrayContaining(['model']) } - }) - } finally { - await adapter.closeAll() - } - }, - 90_000 - ) - - it.skipIf(!realClaudeAuthenticated).each([ - ['accept-edits', 'acceptEdits'], - ['auto', 'auto'], - ['full-access', 'bypassPermissions'] - ] as const)( - 'runs a message after open with saved options and %s', - async (permissionMode, cliPermissionMode) => { - const providerSessionId = randomUUID() - const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR?.trim() || join(homedir(), '.claude') - const cwd = await mkdtemp(join(tmpdir(), 'orca-claude-permissions-')) - const events: ClaudeStructuredSessionEvent[] = [] - const adapter = realAdapter( - providerSessionId, - claudeConfigDir, - events, - cwd, - undefined, - realClaudeLaunchHome().env, - false - ) - const messages = (): Record[] => - events.flatMap((event) => (event.type === 'message' ? [event.message] : [])) - - try { - await adapter.acquire({ - identity: identity(providerSessionId), - fence: 1, - spawnToken: 'real-cli-saved-options', - options: { model: 'sonnet', effort: 'low' }, - permissionMode - }) - await claudeStartupSettled(adapter, 'real-cli-handshake') - const dispatched = await adapter.dispatch({ - sessionId: 'real-cli-handshake', - clientMessageId: 'real-cli-saved-options-1', - body: { - kind: 'message', - role: 'user', - blocks: [ - { - type: 'text', - text: - permissionMode === 'auto' - ? 'Use tools to write auto-mode-proof.txt containing exactly AUTO_MODE_OK, then read it back. Reply with exactly: OK.' - : 'Reply with exactly: OK. Do not use any tools.' - } - ] - }, - fence: 1 - }) - expect(dispatched).toMatchObject({ state: 'admitted' }) - const deadline = Date.now() + 90_000 - while (!messages().some((m) => m.type === 'result') && Date.now() < deadline) { - await new Promise((resolve) => setTimeout(resolve, 250)) - } - - expect(messages()).toContainEqual(expect.objectContaining({ type: 'user', isReplay: true })) - expect(messages().find((m) => m.type === 'result')).toMatchObject({ is_error: false }) - expect(messages().find((m) => m.type === 'system' && m.subtype === 'init')).toMatchObject({ - model: expect.stringMatching(/^claude-sonnet-/), - permissionMode: cliPermissionMode - }) - if (permissionMode === 'auto') { - expect((await readFile(join(cwd, 'auto-mode-proof.txt'), 'utf8')).trim()).toBe( - 'AUTO_MODE_OK' - ) - } - } finally { - await adapter.closeAll() - await rm(cwd, { recursive: true, force: true }) - } - }, - 120_000 - ) - - it.skipIf(!realClaudeAuthenticated)( - 'stops a message interrupted before its reply starts, and takes the next one', - async () => { - const providerSessionId = randomUUID() - const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR?.trim() || join(homedir(), '.claude') - const events: ClaudeStructuredSessionEvent[] = [] - const adapter = realAdapter(providerSessionId, claudeConfigDir, events) - const frames = (from: number) => - events.slice(from).flatMap((event) => (event.type === 'message' ? [event.message] : [])) - const replyStarted = (from: number) => - frames(from).some( - (frame) => - frame.type === 'stream_event' && - typeof frame.event === 'object' && - frame.event !== null && - 'type' in frame.event && - frame.event.type === 'message_start' - ) - const result = async (from: number) => { - const deadline = Date.now() + 60_000 - for (;;) { - const found = frames(from).find((frame) => frame.type === 'result') - if (found || Date.now() >= deadline) { - return found - } - await new Promise((resolve) => setTimeout(resolve, 100)) - } - } - const send = (clientMessageId: string, text: string) => - adapter.dispatch({ - sessionId: 'real-cli-handshake', - clientMessageId, - body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text }] }, - fence: 1 - }) - - try { - await adapter.acquire({ - identity: identity(providerSessionId), - fence: 1, - spawnToken: 'real-cli-stop' - }) - await claudeStartupSettled(adapter, 'real-cli-handshake') - const first = events.length - await expect( - send('real-cli-stop-1', 'Count from 1 to 300, one number per line, and nothing else.') - ).resolves.toMatchObject({ state: 'admitted' }) - const startedBeforeStop = replyStarted(first) - - await expect( - adapter.cancelTurn({ sessionId: 'real-cli-handshake', fence: 1 }) - ).resolves.toEqual({ - cancelled: true - }) - const stopped = await result(first) - - expect(startedBeforeStop).toBe(false) - // Claude 2.1.280 echoes the message, then ends that turn as interrupted without replying. - expect(stopped).toMatchObject({ subtype: 'error_during_execution' }) - expect(replyStarted(first)).toBe(false) - - const second = events.length - await expect( - send('real-cli-stop-2', 'Reply with the single word ok.') - ).resolves.toMatchObject({ - state: 'admitted' - }) - await expect(result(second)).resolves.toMatchObject({ subtype: 'success' }) - } finally { - await adapter.closeAll() - } - }, - 150_000 - ) - - // SessionStart can prove startup before system/init advertises queue-cancellation support. - it.skipIf(!realClaudeAuthenticated)( - 'withdraws a follow-up queued behind a turn that is stopped, behind a SessionStart hook', - async () => { - const providerSessionId = randomUUID() - const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR?.trim() || join(homedir(), '.claude') - const cwd = await projectWithStartHook('orca-queued-stop-') - const events: ClaudeStructuredSessionEvent[] = [] - const settlements: unknown[] = [] - const adapter = realAdapter(providerSessionId, claudeConfigDir, events, cwd, (settlement) => - settlements.push(settlement) - ) - const send = (clientMessageId: string, text: string) => - adapter.dispatch({ - sessionId: 'real-cli-handshake', - clientMessageId, - body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text }] }, - fence: 1 - }) - const waitFor = async (found: () => boolean): Promise => { - const deadline = Date.now() + 60_000 - while (!found() && Date.now() < deadline) { - await new Promise((resolve) => setTimeout(resolve, 100)) - } - return found() - } - - try { - await adapter.acquire({ - identity: identity(providerSessionId), - fence: 1, - spawnToken: 'real-cli-queued-stop' - }) - await claudeStartupSettled(adapter, 'real-cli-handshake') - await send('real-cli-queued-stop-a', 'Count from 1 to 400, one number per line.') - await expect( - waitFor(() => - events.some( - (event) => - event.type === 'message' && - event.message.type === 'stream_event' && - JSON.stringify(event.message).includes('text_delta') - ) - ) - ).resolves.toBe(true) - await send('real-cli-queued-stop-b', 'Say the word banana.') - - await expect( - adapter.cancelTurn({ - sessionId: 'real-cli-handshake', - turnId: 'turn-a', - fence: 1, - resolveLiveTurnId: () => 'turn-a', - dispatchStatus: { state: 'pending', recovered: false } - }) - ).resolves.toEqual({ cancelled: true }) - - expect(settlements).toContainEqual({ - sessionId: 'real-cli-handshake', - clientMessageId: 'real-cli-queued-stop-b', - state: 'rejected', - reason: 'provider_cancelled_before_start', - rejection: { kind: 'cancelled' }, - unrun: true - }) - } finally { - await adapter.closeAll() - await rm(cwd, { recursive: true, force: true }) - } - }, - 150_000 - ) - - it.skipIf(!realClaudeAuthenticated)( - 'starts and answers with every hook disabled, so no start frame precedes the turn', - async () => { - const providerSessionId = randomUUID() - const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR?.trim() || join(homedir(), '.claude') - const cwd = await mkdtemp(join(tmpdir(), 'orca-no-hooks-')) - await mkdir(join(cwd, '.claude'), { recursive: true }) - await writeFile( - join(cwd, '.claude', 'settings.json'), - JSON.stringify({ disableAllHooks: true }) - ) - const events: ClaudeStructuredSessionEvent[] = [] - const adapter = realAdapter(providerSessionId, claudeConfigDir, events, cwd) - const frames = (): Record[] => - events.flatMap((event) => (event.type === 'message' ? [event.message] : [])) - try { - await adapter.acquire({ - identity: identity(providerSessionId), - fence: 1, - spawnToken: 'real-cli-no-hooks' - }) - await claudeStartupSettled(adapter, 'real-cli-handshake') - expect(frames().filter((frame) => readClaudeInit(frame) !== null)).toEqual([]) - await expect( - adapter.dispatch({ - sessionId: 'real-cli-handshake', - clientMessageId: 'real-cli-no-hooks-1', - body: { - kind: 'message', - role: 'user', - blocks: [{ type: 'text', text: 'Reply with the single word ok.' }] - }, - fence: 1 - }) - ).resolves.toMatchObject({ state: 'admitted' }) - await vi.waitFor( - () => expect(frames()).toContainEqual(expect.objectContaining({ type: 'result' })), - { timeout: 120_000, interval: 200 } - ) - } finally { - await adapter.closeAll() - await rm(cwd, { recursive: true, force: true }) - } - }, - 150_000 - ) - - it('turns a real silent unauthenticated startup into sign-in guidance', async () => { - const claudeConfigDir = await mkdtemp(join(tmpdir(), 'orca-claude-no-auth-')) - const providerSessionId = randomUUID() - const events: ClaudeStructuredSessionEvent[] = [] - const adapter = realAdapter( - providerSessionId, - claudeConfigDir, - events, - process.cwd(), - undefined, - {}, - false - ) - - try { - await adapter.acquire({ - identity: identity(providerSessionId), - fence: 1, - spawnToken: 'real-cli-no-auth' - }) - await expect(claudeStartupSettled(adapter, 'real-cli-handshake')).rejects.toThrow( - /not signed in.*Claude CLI.*CLAUDE_CONFIG_DIR/s - ) - } finally { - await adapter.closeAll() - await rm(claudeConfigDir, { recursive: true, force: true }) - } - }, 10_000) -}) diff --git a/src/main/claude/structured/claude-structured-resume-point.ts b/src/main/claude/structured/claude-structured-resume-point.ts index 1d6f01857de..286bf9d70f2 100644 --- a/src/main/claude/structured/claude-structured-resume-point.ts +++ b/src/main/claude/structured/claude-structured-resume-point.ts @@ -2,8 +2,8 @@ import type { ClaudeSession, ClaudeStructuredSessionAdapterDeps } from './claude-structured-session-state' -import { settleClaudeTurnEndWaiters } from '../claude-request-end-wait' -import { isRootClaudeFrame } from '../claude-turn-opening' +import { settleClaudeTurnEndWaiters } from './turns/claude-request-end-wait' +import { isRootClaudeFrame } from './turns/claude-turn-opening' export function claudeTurnResumePointWriter( sessionId: string, diff --git a/src/main/claude/structured/claude-structured-session-acquisition.ts b/src/main/claude/structured/claude-structured-session-acquisition.ts index 68dc786dbb0..f905d84750f 100644 --- a/src/main/claude/structured/claude-structured-session-acquisition.ts +++ b/src/main/claude/structured/claude-structured-session-acquisition.ts @@ -4,14 +4,14 @@ import { claudeLaunchPermissions } from './claude-structured-inbound-control' import { resolveClaudeReplayTurn, withClaudeReplaySettlements -} from '../claude-replay-turn-resolution' -import { claudeStartedUnechoedSend } from '../claude-command-lifecycle' -import { claudeSessionStateEndsTurn } from '../claude-session-state-turn-over' -import { settleClaudeTurnEndWaiters } from '../claude-request-end-wait' +} from './turns/claude-replay-turn-resolution' +import { claudeStartedUnechoedSend } from './turns/claude-command-lifecycle' +import { claudeSessionStateEndsTurn } from './turns/claude-session-state-turn-over' +import { settleClaudeTurnEndWaiters } from './turns/claude-request-end-wait' import * as proof from './claude-structured-init-proof' -import { claudeConfigDirEnvPatch } from '../claude-config-dir-pin' +import { claudeConfigDirEnvPatch } from './launch/claude-config-dir-pin' import { claudeProcessIdentity } from './claude-structured-owner-identity' -import { ClaudePromptRegistry } from '../claude-prompt-registry' +import { ClaudePromptRegistry } from './permissions/claude-prompt-registry' import { adoptClaudeStructuredSpawnOptions } from './launch/claude-structured-spawn-options' import { observeClaudeFrameModels } from './claude-structured-execution-observations' import { observeClaudeFastModeFacts } from './launch/claude-structured-session-options' @@ -23,14 +23,14 @@ import { import type * as sessionState from './claude-structured-session-state' import { resolveClaudeAcquisitionError } from './claude-structured-session-close' import { claudeStartupError, claudeStartupExit } from './claude-structured-session-startup-exit' -import { readClaudeTranscriptEntryUuid } from '../claude-transcript-entry-uuid' +import { readClaudeTranscriptEntryUuid } from '../transcripts/claude-transcript-entry-uuid' import { claudeTurnResumePointWriter } from './claude-structured-resume-point' import { withAgentSessionCreatePhase } from '../../observability/agent-session-instrumentation' import { resolveClaudeAcquisitionLaunch } from './launch/claude-structured-acquisition-launch' import * as journal from './journal/claude-structured-session-journal-control' -import { isRootClaudeFrame } from '../claude-turn-opening' +import { isRootClaudeFrame } from './turns/claude-turn-opening' import { createClaudeStartupOutcome, endsClaudeStartup } from './claude-structured-startup-outcome' -import { claudeStartupResultError } from '../claude-stream-json-exit-error' +import { claudeStartupResultError } from '../sdk-transport/claude-stream-json-exit-error' import { claudePluginUiRecovery, ignoresClaudeRetiredConnection diff --git a/src/main/claude/structured/claude-structured-session-adapter.test.ts b/src/main/claude/structured/claude-structured-session-adapter.test.ts deleted file mode 100644 index 9b45fff46e1..00000000000 --- a/src/main/claude/structured/claude-structured-session-adapter.test.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { describe, expect, it } from 'vitest' -import type { ClaudeStructuredSessionEvent } from './claude-structured-session-state' -import { acquired, fakeClaude, tick } from './claude-structured-session-test-support' -import { invokeCanUseTool } from '../claude-can-use-tool-test-support' - -describe('ClaudeStructuredSessionAdapter prompts', () => { - it('leaves a prompt cancelled and unanswerable once the SDK abort signal fires', async () => { - const claude = fakeClaude() - const events: ClaudeStructuredSessionEvent[] = [] - const adapter = await acquired(claude, {}, events) - const controller = new AbortController() - const answered = invokeCanUseTool(claude.connections[0], 'Bash', 'permission-9', 'tool-9', { - input: { command: 'rm -rf /' }, - signal: controller.signal - }) - adapter.bindPromptItemId('session-1', 'journal-9', 'permission-9') - - controller.abort() - await expect(answered.promise).resolves.toBeNull() - expect(events.at(-1)).toMatchObject({ type: 'prompt-cancelled', promptKey: 'permission-9' }) - await expect( - adapter.answerPrompt({ - sessionId: 'session-1', - itemId: 'journal-9', - kind: 'approval', - response: { kind: 'option', optionId: 'allow' }, - fence: 7, - commit: async () => undefined - }) - ).rejects.toThrow(/no longer waiting/) - }) - - it('settles an in-flight permission callback when the session closes, leaving no dangling promise', async () => { - const claude = fakeClaude() - const adapter = await acquired(claude) - const answered = invokeCanUseTool(claude.connections[0], 'Bash', 'permission-close', 'tool-c', { - input: { command: 'ls' } - }) - await tick() - expect(answered.settled()).toBe(false) - - await adapter.closeSession('session-1') - - await expect(answered.promise).resolves.toBeNull() - }) -}) diff --git a/src/main/claude/structured/claude-structured-session-adapter.ts b/src/main/claude/structured/claude-structured-session-adapter.ts index e9369cceb69..dc24bf1f4cf 100644 --- a/src/main/claude/structured/claude-structured-session-adapter.ts +++ b/src/main/claude/structured/claude-structured-session-adapter.ts @@ -1,6 +1,6 @@ import { dispatchClaudeCommand } from './claude-structured-command-dispatch' import { isKillDeliveredExitReceipt } from './claude-kill-delivered-exit-receipt' -import { claudeAcquireFailure } from '../claude-startup-failure' +import { claudeAcquireFailure } from '../sdk-transport/claude-startup-failure' import { claudeStartPublication, openClaudeStart } from './claude-structured-start-ending' import { AgentSessionStartEndings } from '../../native-chat/agent-session-wire/startup/structured-agent-session-start-failure' import type { @@ -8,7 +8,7 @@ import type { StructuredAgentSessionAdapter } from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' import { stopCurrentClaudeBackgroundTasks } from './claude-structured-control-actions' -import { claudeHeldSends, claudeHoldsDispatch } from '../claude-command-lifecycle' +import { claudeHeldSends, claudeHoldsDispatch } from './turns/claude-command-lifecycle' import { releaseClaudeAcquisition, type ClaudeReleaseRequest @@ -27,7 +27,7 @@ import { type ClaudeStructuredSessionEvent } from './claude-structured-session-state' import { closeAllClaudeSessions } from './claude-structured-session-close' -import { claudeStoppedRequestEndWait } from '../claude-request-end-wait' +import { claudeStoppedRequestEndWait } from './turns/claude-request-end-wait' import { finishClaudeCloseAfterExit, drainClaudeObservedExits, @@ -36,7 +36,7 @@ import { settleClaudeUnexpectedExit, type ClaudeExitLifecycle } from './claude-structured-session-exit-lifecycle' -import { drainClaudeChildWork } from '../claude-child-work-evidence' +import { drainClaudeChildWork } from '../child-work/claude-child-work-evidence' import { deliverClaudeConnectionEvent, emitClaudeStructuredSessionEvent @@ -48,9 +48,9 @@ import { settleClaudePromptFreeingChild } from './journal/claude-structured-prompt-ownership' import { claudePromptCancelRoute } from './journal/claude-structured-prompt-replies' -import { claudeForkForRewind } from '../claude-rewind-fork' -import { copyClaudeConversation } from '../claude-conversation-copy' -import { ClaudeConversationNaming } from '../claude-conversation-naming' +import { claudeForkForRewind } from '../transcripts/claude-rewind-fork' +import { copyClaudeConversation } from '../transcripts/claude-conversation-copy' +import { ClaudeConversationNaming } from '../conversation-naming/claude-conversation-naming' import { captureClaudeConversationTitleOwner } from './claude-conversation-title-owner' export class ClaudeStructuredSessionAdapter implements StructuredAgentSessionAdapter { diff --git a/src/main/claude/structured/claude-structured-session-close.ts b/src/main/claude/structured/claude-structured-session-close.ts index ff1154cdca3..7cc681140ad 100644 --- a/src/main/claude/structured/claude-structured-session-close.ts +++ b/src/main/claude/structured/claude-structured-session-close.ts @@ -13,13 +13,13 @@ import { } from '../../native-chat/agent-session-wire/acquisition/structured-agent-session-acquisition-errors' import { AgentSessionPreSpawnError } from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter-errors' import type { ClaudeStreamJsonConnection } from '../claude-stream-json-connection' -import type { ClaudeJournalTranslator } from '../claude-journal-translator-contract' -import type { ClaudePromptRegistry } from '../claude-prompt-registry' +import type { ClaudeJournalTranslator } from './journal/claude-journal-translator-contract' +import type { ClaudePromptRegistry } from './permissions/claude-prompt-registry' import { closeProcessRegistry } from '@orca/process-host/close-process-registry' import { retireClaudeDispatchWaiters } from './claude-structured-dispatch' -import { claudeHeldSends } from '../claude-command-lifecycle' +import { claudeHeldSends } from './turns/claude-command-lifecycle' import { settledClaudeTurnEndLeaf } from './claude-structured-resume-point' -import { settleClaudeTurnEndWaiters } from '../claude-request-end-wait' +import { settleClaudeTurnEndWaiters } from './turns/claude-request-end-wait' import type { StructuredAgentSessionLogger } from '../../native-chat/agent-session-wire/host/structured-agent-session-logger' import type { ProviderProcessCloseOptions } from '../../provider-process/provider-process-close' diff --git a/src/main/claude/structured/claude-structured-session-event.ts b/src/main/claude/structured/claude-structured-session-event.ts index ce72b47a418..a0b7a15dfd5 100644 --- a/src/main/claude/structured/claude-structured-session-event.ts +++ b/src/main/claude/structured/claude-structured-session-event.ts @@ -1,6 +1,6 @@ import type { SubmissionRejectionFact } from '../../../shared/agent-session/failures/agent-session-failure' import type * as SessionAdapter from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' -import type { ClaudePendingPrompt } from '../claude-prompt-registry' +import type { ClaudePendingPrompt } from './permissions/claude-prompt-registry' import type { ClaudeStartedSend } from './claude-structured-session-state' export type ClaudeAuthDiagnostic = { diff --git a/src/main/claude/structured/claude-structured-session-exit-blame.test.ts b/src/main/claude/structured/claude-structured-session-exit-blame.test.ts deleted file mode 100644 index 2aeb0529f8f..00000000000 --- a/src/main/claude/structured/claude-structured-session-exit-blame.test.ts +++ /dev/null @@ -1,124 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' -import type { StructuredAgentSessionEventSink } from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import type { ClaudeStructuredSessionEvent } from './claude-structured-session-state' -import { - adapterFor, - fakeClaude, - identityFor, - PROVIDER_SESSION_ID -} from './claude-structured-session-test-support' -import { claudeStreamJsonExitError } from '../claude-stream-json-exit-error' -import { structuredAgentSessionStartFailureFact } from '../../native-chat/agent-session-wire/startup/structured-agent-session-failure-text' -import { - providerSpawnAbsence, - withProviderSpawnAbsence -} from '../../provider-process/provider-executable-missing' -import { - PROVIDER_SPAWN_FAILURE_MARKER, - supervisedProviderSpawnFailure -} from '../../provider-process/provider-spawn-failure-report' - -/** The exit error a supervised Claude connection raises when the supervisor cannot spawn `claude`. */ -function supervisedSpawnEnoentExit(): Error { - const stderr = `${PROVIDER_SPAWN_FAILURE_MARKER}${JSON.stringify({ - thrown: false, - code: 'ENOENT', - message: 'spawn claude ENOENT' - })}\n` - const status = { code: 127, signal: null, processless: false } - const reported = supervisedProviderSpawnFailure(status.code, stderr) - return withProviderSpawnAbsence( - claudeStreamJsonExitError(stderr, status), - providerSpawnAbsence(reported?.error, 'claude') - ) -} - -async function startedClaude(sink: StructuredAgentSessionEventSink) { - const claude = fakeClaude() - const events: ClaudeStructuredSessionEvent[] = [] - const adapter = adapterFor(claude, {}, events) - await adapter.acquire({ identity: identityFor(), fence: 7, spawnToken: 'spawn-9', events: sink }) - const ended = async () => { - await vi.waitFor(() => expect(events.some((event) => event.type === 'ended')).toBe(true)) - return events.find((event) => event.type === 'ended') - } - return { connection: claude.connections[0], ended } -} - -describe('what a started Claude session says ended it', () => { - it('says Claude stopped when the child exits on its own', async () => { - const { connection, ended } = await startedClaude({ - appendItem: () => {}, - appendTombstone: () => {}, - publish: () => {} - }) - - connection.handlers.onExit?.(new Error('claude stream-json exited (code 1): killed')) - - expect(await ended()).toMatchObject({ - cause: 'unexpected-exit', - failure: { kind: 'providerExited' } - }) - }) - - it("names Claude's root refusal of Full access rather than a bare exit", async () => { - const { connection, ended } = await startedClaude({ - appendItem: () => {}, - appendTombstone: () => {}, - publish: () => {} - }) - const refusal = - '--dangerously-skip-permissions cannot be used with root/sudo privileges for security reasons' - - connection.handlers.onExit?.( - claudeStreamJsonExitError(refusal, { code: 1, signal: null, processless: false }) - ) - - expect(await ended()).toMatchObject({ - cause: 'unexpected-exit', - failure: { kind: 'fullAccessAsRoot', detail: { text: `(code 1)\n${refusal}` } } - }) - }) - - it('says the CLI was not found when the supervisor could not spawn it', async () => { - const { connection, ended } = await startedClaude({ - appendItem: () => {}, - appendTombstone: () => {}, - publish: () => {} - }) - - connection.handlers.onExit?.(supervisedSpawnEnoentExit()) - - const event = await ended() - expect(event).toMatchObject({ cause: 'unexpected-exit', failure: { kind: 'cliMissing' } }) - // An exit during startup is worded through the start-failure path, which must keep it. - expect( - event?.type === 'ended' && structuredAgentSessionStartFailureFact({ exit: event.failure }) - ).toMatchObject({ kind: 'cliMissing' }) - }) - - it('blames Orca when a journal fault makes Orca close the child', async () => { - const { connection, ended } = await startedClaude({ - appendItem: () => {}, - appendTombstone: () => {}, - publish: () => {}, - tryAppendResolvedItemAndPublish: () => ({ accepted: false, reason: 'failed' }) - }) - - connection.handlers.onMessage?.({ - type: 'system', - subtype: 'task_notification', - session_id: PROVIDER_SESSION_ID, - task_id: 'task-1', - status: 'failed', - summary: 'failed' - }) - - expect(await ended()).toMatchObject({ - reason: 'claude background task journal sink failed', - cause: 'unexpected-exit', - failure: { kind: 'hostFault' } - }) - expect(connection.closeCount).toBeGreaterThanOrEqual(1) - }) -}) diff --git a/src/main/claude/structured/claude-structured-session-exit-lifecycle.ts b/src/main/claude/structured/claude-structured-session-exit-lifecycle.ts index a2e09a80453..935e631b078 100644 --- a/src/main/claude/structured/claude-structured-session-exit-lifecycle.ts +++ b/src/main/claude/structured/claude-structured-session-exit-lifecycle.ts @@ -14,8 +14,8 @@ import { claudeSessionHasTurnWork, settledClaudeTurnEndLeaf } from './claude-structured-resume-point' -import { claudeHeldSends } from '../claude-command-lifecycle' -import { ClaudePluginInputError } from '../claude-plugin-ui' +import { claudeHeldSends } from './turns/claude-command-lifecycle' +import { ClaudePluginInputError } from '../sdk-transport/claude-plugin-ui' import type { AgentSessionStartEndings } from '../../native-chat/agent-session-wire/startup/structured-agent-session-start-failure' import { claudeExitEnding } from './claude-structured-start-ending' import { diff --git a/src/main/claude/structured/claude-structured-session-open.ts b/src/main/claude/structured/claude-structured-session-open.ts index 96e8b8fbe73..1dd3c6a1948 100644 --- a/src/main/claude/structured/claude-structured-session-open.ts +++ b/src/main/claude/structured/claude-structured-session-open.ts @@ -6,7 +6,7 @@ import type { import { waitForPromiseWithSignal } from '../../../shared/abort-signal-reason' import { readClaudeStructuredSessionSettings } from './launch/claude-structured-session-acquisition-options' import { openClaudeSession, readClaudeStartupFacts } from './claude-structured-session-startup' -import { catchUpClaudeTranscript } from '../claude-transcript-catch-up' +import { catchUpClaudeTranscript } from '../transcripts/claude-transcript-catch-up' import type { ClaudeSession, ClaudeStructuredSessionAdapterDeps, diff --git a/src/main/claude/structured/claude-structured-session-publication.ts b/src/main/claude/structured/claude-structured-session-publication.ts index 30aac7965ca..6ef5e4e2151 100644 --- a/src/main/claude/structured/claude-structured-session-publication.ts +++ b/src/main/claude/structured/claude-structured-session-publication.ts @@ -8,8 +8,8 @@ import type { StructuredAgentSessionAcquireInput } from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' import { claudeProviderHandleLink } from './claude-structured-owner-identity' -import type { ClaudePromptRegistry } from '../claude-prompt-registry' -import type { ClaudeJournalTranslator } from '../claude-journal-translator-contract' +import type { ClaudePromptRegistry } from './permissions/claude-prompt-registry' +import type { ClaudeJournalTranslator } from './journal/claude-journal-translator-contract' import type { ClaudeSession, ClaudeSessionExit, @@ -18,12 +18,12 @@ import type { ClaudeStructuredSessionEvent, ClaudeStructuredSessionAdapterDeps } from './claude-structured-session-state' -import { ClaudeBackgroundTaskTracker } from '../claude-background-task-tracker' -import { ClaudeChildWorkDecoder } from '../claude-child-work-decoder' -import { ClaudeSlashCommandCatalog } from '../claude-slash-command-catalog' +import { ClaudeBackgroundTaskTracker } from '../background-tasks/claude-background-task-tracker' +import { ClaudeChildWorkDecoder } from '../child-work/claude-child-work-decoder' +import { ClaudeSlashCommandCatalog } from '../command-catalog/claude-slash-command-catalog' import type { ClaudeStructuredLaunch } from './launch/claude-structured-launch-resolution' import type { ClaudeAcquisitionLaunch } from './launch/claude-structured-acquisition-launch' -import type { ClaudeNamingGeneration } from '../claude-naming-generation' +import type { ClaudeNamingGeneration } from '../conversation-naming/claude-naming-generation' import { readClaudeStartupFacts } from './claude-structured-session-startup' function claudeSessionInitialization(input: { diff --git a/src/main/claude/structured/claude-structured-session-startup-exit.ts b/src/main/claude/structured/claude-structured-session-startup-exit.ts index 6b3f39ac45e..d872af65966 100644 --- a/src/main/claude/structured/claude-structured-session-startup-exit.ts +++ b/src/main/claude/structured/claude-structured-session-startup-exit.ts @@ -1,4 +1,4 @@ -import { isClaudeQueryClosed } from '../claude-agent-sdk-control-requests' +import { isClaudeQueryClosed } from '../sdk-transport/claude-agent-sdk-control-requests' import { withTimeout } from '../../../shared/promise-timeout-fallback' import { providerExitObserved, @@ -7,7 +7,7 @@ import { } from '../../native-chat/agent-session-wire/startup/structured-agent-session-failure-text' import type { ClaudeStreamJsonConnection } from '../claude-stream-json-connection' import type { StructuredAgentSessionEventSink } from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import { claudeStartFailure, claudeStartupAnswer } from '../claude-startup-failure' +import { claudeStartFailure, claudeStartupAnswer } from '../sdk-transport/claude-startup-failure' import type { AgentSessionStartFailure } from '../../native-chat/agent-session-wire/startup/structured-agent-session-start-failure' /** A physical exit waits briefly for initialize's answer, which the start's verdict weighs diff --git a/src/main/claude/structured/claude-structured-session-startup.ts b/src/main/claude/structured/claude-structured-session-startup.ts index 27f5e8cd116..2e8e44d918b 100644 --- a/src/main/claude/structured/claude-structured-session-startup.ts +++ b/src/main/claude/structured/claude-structured-session-startup.ts @@ -1,5 +1,5 @@ -import { isClaudeQueryClosed } from '../claude-agent-sdk-control-requests' -import { claudeStartFailure } from '../claude-startup-failure' +import { isClaudeQueryClosed } from '../sdk-transport/claude-agent-sdk-control-requests' +import { claudeStartFailure } from '../sdk-transport/claude-startup-failure' import { startupAcquisitionRefusal, providerExitObserved @@ -9,7 +9,7 @@ import { import type { AgentSessionAccountKind } from '../../../shared/agent-session/agent-session-availability' import type { StructuredAgentSessionProviderOpenResult } from '../../native-chat/agent-session-wire/startup/structured-agent-session-provider-open-contract' import type { ClaudeStreamJsonConnection } from '../claude-stream-json-connection' -import { ClaudeSlashCommandCatalog } from '../claude-slash-command-catalog' +import { ClaudeSlashCommandCatalog } from '../command-catalog/claude-slash-command-catalog' import { claudeAuthDiagnostic, claudeInitializationAuthError, diff --git a/src/main/claude/structured/claude-structured-session-state.ts b/src/main/claude/structured/claude-structured-session-state.ts index 130bc0f0441..6d02f679059 100644 --- a/src/main/claude/structured/claude-structured-session-state.ts +++ b/src/main/claude/structured/claude-structured-session-state.ts @@ -1,6 +1,9 @@ import type { StructuredAgentSessionChildWorkProducer } from '../../native-chat/agent-session-wire/observations/structured-agent-session-subagent-rows' import type { ClaudeStartupOutcome } from './claude-structured-startup-outcome' -import type { ClaudeCliFlagCheck, ClaudeCliFlagFact } from '../claude-cli-flag-support' +import type { + ClaudeCliFlagCheck, + ClaudeCliFlagFact +} from '../cli-capabilities/claude-cli-flag-support' import type { StructuredAgentSessionLogger } from '../../native-chat/agent-session-wire/host/structured-agent-session-logger' import type { AgentJournalDispatchRejection } from '../../../shared/agent-session/failures/agent-session-failure-words' import type { AgentJournalItemIdentity } from '../../../shared/agent-session/journal/agent-session-journal-identity' @@ -11,20 +14,20 @@ import type { } from '../claude-stream-json-connection' import type { ClaudeStructuredLaunch } from './launch/claude-structured-launch-resolution' import type { StructuredLaunchRequest } from '../../runtime/agent-session/launch/structured-agent-launch-composition' -import type { ClaudeJournalTranslator } from '../claude-journal-translator-contract' -import type { ClaudePromptRegistry } from '../claude-prompt-registry' -import { ClaudeJournalBoundDelivery } from '../claude-journal-bound-delivery' +import type { ClaudeJournalTranslator } from './journal/claude-journal-translator-contract' +import type { ClaudePromptRegistry } from './permissions/claude-prompt-registry' +import { ClaudeJournalBoundDelivery } from './journal/claude-journal-bound-delivery' import { cancelProcessAcquisition } from '@orca/process-host/cancel-process-acquisition' import type { AgentSessionFastModeState } from '../../../shared/agent-session/agent-session-wire' import type { AgentChildWorkEvidence } from '../../../shared/agent-status/child-work/agent-status-child-work-evidence' -import type { ClaudeBackgroundTaskTracker } from '../claude-background-task-tracker' -import type { ClaudeChildWorkDecoder } from '../claude-child-work-decoder' -import type { ClaudeSlashCommandCatalog } from '../claude-slash-command-catalog' -import type { ClaudeAtRestCommandCatalog } from '../claude-at-rest-commands' +import type { ClaudeBackgroundTaskTracker } from '../background-tasks/claude-background-task-tracker' +import type { ClaudeChildWorkDecoder } from '../child-work/claude-child-work-decoder' +import type { ClaudeSlashCommandCatalog } from '../command-catalog/claude-slash-command-catalog' +import type { ClaudeAtRestCommandCatalog } from '../command-catalog/claude-at-rest-commands' import type { ClaudeInitProof } from './claude-structured-init-proof' import type { AgentSessionProviderHandleLink } from '../../../shared/agent-session/lifecycle/agent-session-provider-handle' import type { AgentSessionRecord } from '../../../shared/agent-session/lifecycle/agent-session-record' -import type { ClaudeNamingInputs } from '../claude-naming-invocation' +import type { ClaudeNamingInputs } from '../conversation-naming/claude-naming-invocation' import type { ClaudeInitializeFacts } from './claude-structured-session-startup' export type { diff --git a/src/main/claude/structured/claude-structured-start-ending.ts b/src/main/claude/structured/claude-structured-start-ending.ts index 58cf01ac006..8d7a102e96b 100644 --- a/src/main/claude/structured/claude-structured-start-ending.ts +++ b/src/main/claude/structured/claude-structured-start-ending.ts @@ -9,7 +9,7 @@ import type { StructuredAgentSessionProviderOpenResult } from '../../native-chat/agent-session-wire/startup/structured-agent-session-provider-open-contract' import { openClaudeStructuredSession } from './claude-structured-session-open' -import { claudeStartFailure } from '../claude-startup-failure' +import { claudeStartFailure } from '../sdk-transport/claude-startup-failure' import type { ClaudeSession, ClaudeSessionExit } from './claude-structured-session-state' /** Publishes an acquisition's session with its start ending admitted first, so its exit is never diff --git a/src/main/claude/claude-api-retry-row.ts b/src/main/claude/structured/journal/claude-api-retry-row.ts similarity index 74% rename from src/main/claude/claude-api-retry-row.ts rename to src/main/claude/structured/journal/claude-api-retry-row.ts index d5f0ff4111c..b9412a19734 100644 --- a/src/main/claude/claude-api-retry-row.ts +++ b/src/main/claude/structured/journal/claude-api-retry-row.ts @@ -2,10 +2,10 @@ import { agentSessionFailureFact, providerDiagnostic, readProviderRetry -} from '../../shared/agent-session/failures/agent-session-failure' -import { agentSessionFailureWords } from '../../shared/agent-session/failures/agent-session-failure-words' -import type { AgentJournalStatusItem } from '../../shared/agent-session/journal/agent-session-journal-types' -import { TUI_AGENT_DISPLAY_NAMES } from '../../shared/agent-launch/catalog/tui-agent-display-names' +} from '../../../../shared/agent-session/failures/agent-session-failure' +import { agentSessionFailureWords } from '../../../../shared/agent-session/failures/agent-session-failure-words' +import type { AgentJournalStatusItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import { TUI_AGENT_DISPLAY_NAMES } from '../../../../shared/agent-launch/catalog/tui-agent-display-names' export const CLAUDE_API_RETRY_FRAME_KIND = 'message:system:api_retry' diff --git a/src/main/claude/claude-assistant-failures.ts b/src/main/claude/structured/journal/claude-assistant-failures.ts similarity index 86% rename from src/main/claude/claude-assistant-failures.ts rename to src/main/claude/structured/journal/claude-assistant-failures.ts index e7d81e487e2..4be03591e19 100644 --- a/src/main/claude/claude-assistant-failures.ts +++ b/src/main/claude/structured/journal/claude-assistant-failures.ts @@ -1,11 +1,11 @@ import { agentSessionFailureFact, providerDiagnostic -} from '../../shared/agent-session/failures/agent-session-failure' -import { agentSessionFailureWords } from '../../shared/agent-session/failures/agent-session-failure-words' -import { BoundedMap } from '../../shared/bounded-map' -import { claudeRecord, claudeText } from './structured/journal/claude-structured-item-translation' -import type { AgentSessionAccountKind } from '../../shared/agent-session/agent-session-availability' +} from '../../../../shared/agent-session/failures/agent-session-failure' +import { agentSessionFailureWords } from '../../../../shared/agent-session/failures/agent-session-failure-words' +import { BoundedMap } from '../../../../shared/bounded-map' +import { claudeRecord, claudeText } from './claude-structured-item-translation' +import type { AgentSessionAccountKind } from '../../../../shared/agent-session/agent-session-availability' /** Associates the assistant's typed error with its duplicate result, never with error text. */ export class ClaudeAssistantFailures { diff --git a/src/main/claude/claude-final-output-coverage.ts b/src/main/claude/structured/journal/claude-final-output-coverage.ts similarity index 94% rename from src/main/claude/claude-final-output-coverage.ts rename to src/main/claude/structured/journal/claude-final-output-coverage.ts index 416ab91c8d1..96eca1bc37e 100644 --- a/src/main/claude/claude-final-output-coverage.ts +++ b/src/main/claude/structured/journal/claude-final-output-coverage.ts @@ -1,7 +1,7 @@ import type { StructuredAgentSessionEventSink, StructuredAgentSessionSinkAdmission -} from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +} from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' /** A refused final snapshot makes this acquisition's leaf unsafe; the next open re-derives it. */ export function createClaudeFinalOutputCoverage(target: StructuredAgentSessionEventSink) { diff --git a/src/main/claude/claude-informational-row.ts b/src/main/claude/structured/journal/claude-informational-row.ts similarity index 83% rename from src/main/claude/claude-informational-row.ts rename to src/main/claude/structured/journal/claude-informational-row.ts index 049fddeb31e..2168a322249 100644 --- a/src/main/claude/claude-informational-row.ts +++ b/src/main/claude/structured/journal/claude-informational-row.ts @@ -3,10 +3,10 @@ import { hookOutcomeRowBody, type AgentSessionHookOutcome -} from '../../shared/agent-session/journal/agent-session-hook-outcome' -import { AGENT_SESSION_TURN_NOTICE_PRESENTATION } from '../../shared/agent-session/journal/agent-session-turn-notice' -import type { AgentJournalStatusItem } from '../../shared/agent-session/journal/agent-session-journal-types' -import { claudeRecord, claudeText } from './structured/journal/claude-structured-item-translation' +} from '../../../../shared/agent-session/journal/agent-session-hook-outcome' +import { AGENT_SESSION_TURN_NOTICE_PRESENTATION } from '../../../../shared/agent-session/journal/agent-session-turn-notice' +import type { AgentJournalStatusItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import { claudeRecord, claudeText } from './claude-structured-item-translation' export const CLAUDE_INFORMATIONAL_FRAME_KIND = 'message:system:informational' diff --git a/src/main/claude/claude-internal-message-content.ts b/src/main/claude/structured/journal/claude-internal-message-content.ts similarity index 96% rename from src/main/claude/claude-internal-message-content.ts rename to src/main/claude/structured/journal/claude-internal-message-content.ts index 45377a2bf1a..be9b0fa448a 100644 --- a/src/main/claude/claude-internal-message-content.ts +++ b/src/main/claude/structured/journal/claude-internal-message-content.ts @@ -1,4 +1,4 @@ -import { asRecord } from '../ai-vault/session-scanner-values' +import { asRecord } from '../../../ai-vault/session-scanner-record-value' import type { ClaudeJournalTranslator } from './claude-journal-translator-contract' export function withClaudeConversationContent( diff --git a/src/main/claude/claude-journal-bound-delivery.ts b/src/main/claude/structured/journal/claude-journal-bound-delivery.ts similarity index 97% rename from src/main/claude/claude-journal-bound-delivery.ts rename to src/main/claude/structured/journal/claude-journal-bound-delivery.ts index f095cc7576d..2e8e256fcc8 100644 --- a/src/main/claude/claude-journal-bound-delivery.ts +++ b/src/main/claude/structured/journal/claude-journal-bound-delivery.ts @@ -1,7 +1,7 @@ import type { StructuredAgentSessionEventSink, StructuredAgentSessionReadingControl -} from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +} from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' /** Own provider observations until their saved identity input is available. */ export class ClaudeJournalBoundDelivery { diff --git a/src/main/claude/claude-journal-translator-contract.ts b/src/main/claude/structured/journal/claude-journal-translator-contract.ts similarity index 70% rename from src/main/claude/claude-journal-translator-contract.ts rename to src/main/claude/structured/journal/claude-journal-translator-contract.ts index 21f4057ca02..8c7626b8a1d 100644 --- a/src/main/claude/claude-journal-translator-contract.ts +++ b/src/main/claude/structured/journal/claude-journal-translator-contract.ts @@ -1,20 +1,23 @@ -import type { ClaudeTaskInvocations } from './claude-task-invocations' +import type { ClaudeTaskInvocations } from '../../background-tasks/claude-task-invocations' import type { ClaudeJournalBoundDelivery } from './claude-journal-bound-delivery' -import type { AgentSessionContextReport } from '../../shared/agent-session/agent-session-context-usage' -import type { AgentJournalTurnScope } from '../../shared/agent-session/journal/agent-session-journal-turn-scope' +import type { AgentSessionContextReport } from '../../../../shared/agent-session/agent-session-context-usage' +import type { AgentJournalTurnScope } from '../../../../shared/agent-session/journal/agent-session-journal-turn-scope' import type { StructuredAgentSessionEventSink, StructuredAgentSessionSinkAdmission -} from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import type { ClaudeChildToolQueries } from './claude-child-tool-queries' -import type { ClaudeContextReportPart, ClaudeContextReportTarget } from './claude-context-facts' -import type { ClaudeJournalPrompts } from './structured/journal/claude-structured-journal-prompts' -import type { ClaudeStructuredSessionEvent } from './structured/claude-structured-session-state' -import type { ClaudeCommandStart } from './claude-command-turn' +} from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import type { ClaudeChildToolQueries } from '../../subagents/claude-child-tool-queries' +import type { + ClaudeContextReportPart, + ClaudeContextReportTarget +} from '../../context-usage/claude-context-facts' +import type { ClaudeJournalPrompts } from './claude-structured-journal-prompts' +import type { ClaudeStructuredSessionEvent } from '../claude-structured-session-event' +import type { ClaudeCommandStart } from '../turns/claude-command-turn' -import type { AgentSessionDeltaCoalescerDeps } from '../native-chat/agent-session-wire/publication/subscribers/agent-session-delta-coalescer' -import type { ClaudeGoalBackgroundWork } from './claude-background-task-tracker' -import type { AgentSessionAccountKind } from '../../shared/agent-session/agent-session-availability' +import type { AgentSessionDeltaCoalescerDeps } from '../../../native-chat/agent-session-wire/publication/subscribers/agent-session-delta-coalescer' +import type { ClaudeGoalBackgroundWork } from '../../background-tasks/claude-background-task-tracker' +import type { AgentSessionAccountKind } from '../../../../shared/agent-session/agent-session-availability' export type ClaudeJournalTranslatorDeps = { sink: StructuredAgentSessionEventSink diff --git a/src/main/claude/claude-journal-turn-scope.test.ts b/src/main/claude/structured/journal/claude-journal-turn-scope.test.ts similarity index 85% rename from src/main/claude/claude-journal-turn-scope.test.ts rename to src/main/claude/structured/journal/claude-journal-turn-scope.test.ts index 367959db5b8..bf5ec650614 100644 --- a/src/main/claude/claude-journal-turn-scope.test.ts +++ b/src/main/claude/structured/journal/claude-journal-turn-scope.test.ts @@ -1,11 +1,11 @@ import { expect, it, vi } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' +import type { AgentJournalItemBody } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity' import type { StructuredAgentSessionEventSink, StructuredAgentSessionItemAppendOptions -} from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import { createClaudeJournalTranslator } from './structured/journal/claude-structured-journal-translation' +} from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import { createClaudeJournalTranslator } from './claude-structured-journal-translation' function recorder() { const writes: { diff --git a/src/main/claude/claude-message-journaling.ts b/src/main/claude/structured/journal/claude-message-journaling.ts similarity index 90% rename from src/main/claude/claude-message-journaling.ts rename to src/main/claude/structured/journal/claude-message-journaling.ts index b25929a818a..6dca4ca3001 100644 --- a/src/main/claude/claude-message-journaling.ts +++ b/src/main/claude/structured/journal/claude-message-journaling.ts @@ -1,12 +1,12 @@ import { writeClaudeTerminalFailure } from './claude-terminal-failure' -import { agentSessionFailureWords } from '../../shared/agent-session/failures/agent-session-failure-words' +import { agentSessionFailureWords } from '../../../../shared/agent-session/failures/agent-session-failure-words' import { agentJournalItemKey, agentJournalSubmissionKey -} from '../../shared/agent-session/journal/agent-session-journal-item-key' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import type { ClaudeBackgroundTaskRows } from './claude-background-task-rows' -import type { ClaudeToolOriginRegistry } from './claude-tool-origin-registry' +} from '../../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { StructuredAgentSessionEventSink } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import type { ClaudeBackgroundTaskRows } from '../../background-tasks/claude-background-task-rows' +import type { ClaudeToolOriginRegistry } from '../../subagents/claude-tool-origin-registry' import { claudeRecord, claudeMessageBody, @@ -18,24 +18,24 @@ import { claudeToolUses, readClaudeMessageEnvelope, type ClaudeToolUse -} from './structured/journal/claude-structured-item-translation' +} from './claude-structured-item-translation' import { claudeEnvelopeStopHookFeedbackRow } from './claude-stop-hook-feedback' import { appendUnmodeledContent, type ClaudeProviderFrameFallback -} from './structured/launch/claude-structured-provider-fallback' +} from '../launch/claude-structured-provider-fallback' import type { createClaudeStreamedBlockRegistry } from './claude-streamed-block-identity' import type { createClaudeStreamedTextCheckpoints } from './claude-streamed-text-checkpoints' import type { ClaudeStreamedThinking } from './claude-streamed-thinking' -import type { ClaudeProvisionalRowCorrections } from './claude-provisional-row-corrections' -import type { ClaudeSubagentIdentities } from './claude-subagent-identities' +import type { ClaudeProvisionalRowCorrections } from '../../subagents/claude-provisional-row-corrections' +import type { ClaudeSubagentIdentities } from '../../subagents/claude-subagent-identities' import { claudeStreamTurnSource, claudeStreamTurnStartSource, claudeTurnOpenedBySendEcho, type ClaudeTurnSource -} from './claude-turn-opening' -import type { ClaudeOpenTurn } from './claude-open-turn' +} from '../turns/claude-turn-opening' +import type { ClaudeOpenTurn } from '../turns/claude-open-turn' import type { ClaudeAssistantFailures } from './claude-assistant-failures' import type { ClaudeUsageLimits } from './claude-usage-limits' import type { ClaudeThreadGoal } from './claude-thread-goal' diff --git a/src/main/claude/claude-plugin-input-failure-journal.ts b/src/main/claude/structured/journal/claude-plugin-input-failure-journal.ts similarity index 74% rename from src/main/claude/claude-plugin-input-failure-journal.ts rename to src/main/claude/structured/journal/claude-plugin-input-failure-journal.ts index 06209841ec8..6553c9a59a7 100644 --- a/src/main/claude/claude-plugin-input-failure-journal.ts +++ b/src/main/claude/structured/journal/claude-plugin-input-failure-journal.ts @@ -1,9 +1,9 @@ -import { agentJournalSubmissionKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' -import { PROVIDER_EXIT_ROW_PREFIX } from '../../shared/agent-session/lifecycle/agent-session-stop-row-identity' -import { agentSessionFailureWords } from '../../shared/agent-session/failures/agent-session-failure-words' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import type { ClaudeOpenTurn } from './claude-open-turn' -import type { ClaudeStructuredSessionEvent } from './structured/claude-structured-session-state' +import { agentJournalSubmissionKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' +import { PROVIDER_EXIT_ROW_PREFIX } from '../../../../shared/agent-session/lifecycle/agent-session-stop-row-identity' +import { agentSessionFailureWords } from '../../../../shared/agent-session/failures/agent-session-failure-words' +import type { StructuredAgentSessionEventSink } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import type { ClaudeOpenTurn } from '../turns/claude-open-turn' +import type { ClaudeStructuredSessionEvent } from '../claude-structured-session-event' export function journalClaudePluginInputFailure({ event, diff --git a/src/main/claude/claude-plugin-ui-frames.test.ts b/src/main/claude/structured/journal/claude-plugin-ui-frames.test.ts similarity index 86% rename from src/main/claude/claude-plugin-ui-frames.test.ts rename to src/main/claude/structured/journal/claude-plugin-ui-frames.test.ts index 2013b1d4838..357a0ff6b13 100644 --- a/src/main/claude/claude-plugin-ui-frames.test.ts +++ b/src/main/claude/structured/journal/claude-plugin-ui-frames.test.ts @@ -1,8 +1,8 @@ import { describe, expect, it, vi } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import { createClaudeJournalTranslator } from './structured/journal/claude-structured-journal-translation' +import type { AgentJournalItemBody } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity' +import type { StructuredAgentSessionEventSink } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import { createClaudeJournalTranslator } from './claude-structured-journal-translation' function sinkState() { const items: { identity: AgentJournalItemIdentity; body: AgentJournalItemBody }[] = [] diff --git a/src/main/claude/claude-result-journaling.ts b/src/main/claude/structured/journal/claude-result-journaling.ts similarity index 90% rename from src/main/claude/claude-result-journaling.ts rename to src/main/claude/structured/journal/claude-result-journaling.ts index c2fade9f160..7955f7841b0 100644 --- a/src/main/claude/claude-result-journaling.ts +++ b/src/main/claude/structured/journal/claude-result-journaling.ts @@ -1,16 +1,16 @@ import { writeClaudeTerminalFailure } from './claude-terminal-failure' -import type { ClaudeContextFacts } from './claude-context-facts' -import { claudeCommandEnd } from './claude-command-turn' +import type { ClaudeContextFacts } from '../../context-usage/claude-context-facts' +import { claudeCommandEnd } from '../turns/claude-command-turn' import type { ClaudeMessageJournalContext } from './claude-message-journaling' -import type { ClaudeJournalPrompts } from './structured/journal/claude-structured-journal-prompts' +import type { ClaudeJournalPrompts } from './claude-structured-journal-prompts' import { claudeProviderFrameKind, claudeResultFailure, isSettledClaudeResultKind -} from './structured/launch/claude-structured-provider-fallback' -import { claudeTurnEndForResult } from './claude-turn-lifecycle-item' -import { claudeFrameParentRef, isRootClaudeFrame } from './claude-turn-opening' -import type { ClaudeGoalBackgroundWork } from './claude-background-task-tracker' +} from '../launch/claude-structured-provider-fallback' +import { claudeTurnEndForResult } from '../turns/claude-turn-lifecycle-item' +import { claudeFrameParentRef, isRootClaudeFrame } from '../turns/claude-turn-opening' +import type { ClaudeGoalBackgroundWork } from '../../background-tasks/claude-background-task-tracker' import type { ClaudeJournalTranslatorDeps } from './claude-journal-translator-contract' export type ClaudeResultJournalContext = Pick< diff --git a/src/main/claude/claude-stop-hook-feedback.ts b/src/main/claude/structured/journal/claude-stop-hook-feedback.ts similarity index 80% rename from src/main/claude/claude-stop-hook-feedback.ts rename to src/main/claude/structured/journal/claude-stop-hook-feedback.ts index c889a15bf02..0b9f7086000 100644 --- a/src/main/claude/claude-stop-hook-feedback.ts +++ b/src/main/claude/structured/journal/claude-stop-hook-feedback.ts @@ -1,10 +1,10 @@ -import { hookOutcomeRowBody } from '../../shared/agent-session/journal/agent-session-hook-outcome' -import type { AgentJournalPlainStatusItem } from '../../shared/agent-session/journal/agent-session-journal-types' +import { hookOutcomeRowBody } from '../../../../shared/agent-session/journal/agent-session-hook-outcome' +import type { AgentJournalPlainStatusItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { claudeRecord, claudeText, type ClaudeMessageEnvelope -} from './structured/journal/claude-structured-item-translation' +} from './claude-structured-item-translation' // Claude injects a blocking Stop hook's reason as a meta user turn; exit-2 hooks prefix it with their command. const STOP_HOOK_FEEDBACK = /^Stop hook feedback:\n/ diff --git a/src/main/claude/claude-streamed-block-identity.ts b/src/main/claude/structured/journal/claude-streamed-block-identity.ts similarity index 95% rename from src/main/claude/claude-streamed-block-identity.ts rename to src/main/claude/structured/journal/claude-streamed-block-identity.ts index 1f42262db57..9bacee58599 100644 --- a/src/main/claude/claude-streamed-block-identity.ts +++ b/src/main/claude/structured/journal/claude-streamed-block-identity.ts @@ -1,5 +1,5 @@ -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import { claudeRecord, claudeText } from './structured/journal/claude-structured-item-translation' +import type { AgentJournalItemIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity' +import { claudeRecord, claudeText } from './claude-structured-item-translation' // Stream and final frames have different UUIDs; reconcile by message.id and block order to avoid duplicate rows. diff --git a/src/main/claude/claude-streamed-text-checkpoints.test.ts b/src/main/claude/structured/journal/claude-streamed-text-checkpoints.test.ts similarity index 68% rename from src/main/claude/claude-streamed-text-checkpoints.test.ts rename to src/main/claude/structured/journal/claude-streamed-text-checkpoints.test.ts index 0f532403a63..2220f57d102 100644 --- a/src/main/claude/claude-streamed-text-checkpoints.test.ts +++ b/src/main/claude/structured/journal/claude-streamed-text-checkpoints.test.ts @@ -1,12 +1,12 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import type { AgentJournalProducerLinkage } from '../../shared/agent-session/journal/agent-session-journal-types' -import type { StructuredAgentSessionAppendOptions } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import type { AgentJournalItemIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity' +import type { AgentJournalProducerLinkage } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { StructuredAgentSessionAppendOptions } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' import { createClaudeStreamedTextCheckpoints } from './claude-streamed-text-checkpoints' import type { ClaudeSubagentLinkageSource, ClaudeSubagentLinkageVerdict -} from './claude-subagent-linkage' +} from '../../subagents/claude-subagent-linkage' function identityOf(uuid: string): AgentJournalItemIdentity { return { provider: 'claude', sessionId: 'claude-session', uuid } @@ -75,29 +75,6 @@ function checkpoints(producer: ClaudeSubagentLinkageSource = unconsultedProducer } describe('claude streamed text checkpoints', () => { - it('rewrites a block row with the full text accumulated so far', () => { - const { store, rows, runWindow } = checkpoints() - - store.append(identityOf('block-1'), 'hel') - store.append(identityOf('block-1'), 'lo') - runWindow() - - expect(rows).toEqual([{ uuid: 'block-1', text: 'hello' }]) - expect(store.pending).toBe(1) - }) - - it('drops every block still awaiting its final frame at settlement', () => { - const { store, rows, runWindow } = checkpoints() - - store.append(identityOf('block-1'), 'partial answer') - runWindow() - store.settle() - - expect(store.pending).toBe(0) - store.flush() - expect(rows).toEqual([{ uuid: 'block-1', text: 'partial answer' }]) - }) - it('writes a checkpoint at once while the producing agent is provisional', () => { const producer = scriptedProducer() const { store, rows, stamps, runWindow } = checkpoints(producer.source) @@ -117,16 +94,4 @@ describe('claude streamed text checkpoints', () => { expect(rows.at(-1)).toEqual({ uuid: 'block-1', text: 'partial' }) expect(stamps.at(-1)).toEqual(CHILD_LINKAGE) }) - - it('stops persisting once disposed', () => { - const { store, rows, runWindow } = checkpoints() - - store.append(identityOf('block-1'), 'text') - store.dispose() - runWindow() - store.flush() - - expect(rows).toEqual([]) - expect(store.pending).toBe(0) - }) }) diff --git a/src/main/claude/claude-streamed-text-checkpoints.ts b/src/main/claude/structured/journal/claude-streamed-text-checkpoints.ts similarity index 88% rename from src/main/claude/claude-streamed-text-checkpoints.ts rename to src/main/claude/structured/journal/claude-streamed-text-checkpoints.ts index 3345ea2e911..4713a2532bd 100644 --- a/src/main/claude/claude-streamed-text-checkpoints.ts +++ b/src/main/claude/structured/journal/claude-streamed-text-checkpoints.ts @@ -1,12 +1,12 @@ -import { agentJournalLinkageFields } from '../../shared/agent-session/journal/agent-session-journal-producer' -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' -import type { StructuredAgentSessionAppendOptions } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import { agentJournalLinkageFields } from '../../../../shared/agent-session/journal/agent-session-journal-producer' +import type { AgentJournalItemIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity' +import { agentJournalItemKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { StructuredAgentSessionAppendOptions } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' import { createAgentSessionDeltaCoalescer, type AgentSessionDeltaCoalescerDeps -} from '../native-chat/agent-session-wire/publication/subscribers/agent-session-delta-coalescer' -import type { ClaudeSubagentLinkageSource } from './claude-subagent-linkage' +} from '../../../native-chat/agent-session-wire/publication/subscribers/agent-session-delta-coalescer' +import type { ClaudeSubagentLinkageSource } from '../../subagents/claude-subagent-linkage' export type ClaudeStreamedTextCheckpointDeps = { /** Rewrite accumulated text; ended marks the last write when no final frame will arrive. */ diff --git a/src/main/claude/claude-streamed-thinking.ts b/src/main/claude/structured/journal/claude-streamed-thinking.ts similarity index 82% rename from src/main/claude/claude-streamed-thinking.ts rename to src/main/claude/structured/journal/claude-streamed-thinking.ts index 9c147e7a362..675433bbf5d 100644 --- a/src/main/claude/claude-streamed-thinking.ts +++ b/src/main/claude/structured/journal/claude-streamed-thinking.ts @@ -1,13 +1,13 @@ -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentJournalTurnScope } from '../../shared/agent-session/journal/agent-session-journal-turn-scope' -import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity' +import type { AgentJournalMessageItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../../shared/agent-session/journal/agent-session-journal-turn-scope' +import { agentJournalItemKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import { endedJournalReasoning, journalReasoningBody -} from '../native-chat/agent-session-journal/item-lifecycle/journal-reasoning-row' -import type { AgentSessionDeltaCoalescerDeps } from '../native-chat/agent-session-wire/publication/subscribers/agent-session-delta-coalescer' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +} from '../../../native-chat/agent-session-journal/item-lifecycle/journal-reasoning-row' +import type { AgentSessionDeltaCoalescerDeps } from '../../../native-chat/agent-session-wire/publication/subscribers/agent-session-delta-coalescer' +import type { StructuredAgentSessionEventSink } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' import { createClaudeStreamedBlockRegistry } from './claude-streamed-block-identity' import { createClaudeStreamedTextCheckpoints, @@ -19,8 +19,8 @@ import { claudeThinkingIdentity, claudeThinkingText, type ClaudeMessageEnvelope -} from './structured/journal/claude-structured-item-translation' -import type { ClaudeSubagentLinkageSource } from './claude-subagent-linkage' +} from './claude-structured-item-translation' +import type { ClaudeSubagentLinkageSource } from '../../subagents/claude-subagent-linkage' function streamScope(frame: Record): string | null { const event = claudeRecord(frame.event) diff --git a/src/main/claude/structured/journal/claude-structured-item-translation.ts b/src/main/claude/structured/journal/claude-structured-item-translation.ts index 5b313f8194b..56b1c1f48c5 100644 --- a/src/main/claude/structured/journal/claude-structured-item-translation.ts +++ b/src/main/claude/structured/journal/claude-structured-item-translation.ts @@ -5,7 +5,7 @@ import type { import type { AgentJournalItemIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity' import type { NativeChatBlock } from '../../../../shared/native-chat/native-chat-types' import { journalPayload } from '../../../native-chat/agent-session-journal/item-lifecycle/journal-payload-bounds' -import { isClaudeInjectedUserMessage } from '../../claude-internal-message-content' +import { isClaudeInjectedUserMessage } from './claude-internal-message-content' import { isClaudeToolUseContent, isClaudeToolResultContent, diff --git a/src/main/claude/structured/journal/claude-structured-journal-prompt-retry.test.ts b/src/main/claude/structured/journal/claude-structured-journal-prompt-retry.test.ts deleted file mode 100644 index e1812986743..00000000000 --- a/src/main/claude/structured/journal/claude-structured-journal-prompt-retry.test.ts +++ /dev/null @@ -1,211 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' -import type { AgentJournalItemBody } from '../../../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentJournalItemIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity' -import type { - StructuredAgentSessionEventSink, - StructuredAgentSessionReadingControl -} from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import type { ClaudePendingPrompt } from '../../claude-prompt-registry' -import { createClaudeJournalTranslator } from './claude-structured-journal-translation' -import { bindClaudeJournalReadingControl } from './claude-structured-session-journal-control' - -function approval(promptKey: string): ClaudePendingPrompt { - return { - requestId: promptKey, - promptKey, - toolUseId: 'tool-retry', - toolName: 'Bash', - kind: 'approval', - input: { command: 'git status' }, - suggestions: [], - questionIds: [], - settle: () => {} - } -} - -function transientBackpressureSink( - refusedAt: 'append' | 'publish', - persistent = false -): { - sink: StructuredAgentSessionEventSink - durableApproval: () => AgentJournalItemBody | undefined - appendAttempts: () => number - publishAttempts: () => number - appliedSettlements: Set - release: () => void -} { - const staged = new Map() - const durable = new Map() - const appliedSettlements = new Set() - let lifecycleAppendAttempts = 0 - let lifecyclePublishAttempts = 0 - let released = false - const persist = (): void => { - durable.clear() - for (const [key, body] of staged) { - durable.set(key, body) - } - } - const applyItem = (identity: AgentJournalItemIdentity, body: AgentJournalItemBody): void => { - staged.set(agentJournalItemKey(identity), body) - } - return { - sink: { - appendItem: applyItem, - appendTombstone: (identity) => staged.delete(agentJournalItemKey(identity)), - publish: persist, - tryAppendLifecycleBatch: (settlementId, mutations) => { - lifecycleAppendAttempts += 1 - if (refusedAt === 'append' && (persistent ? !released : lifecycleAppendAttempts === 1)) { - return { accepted: false, reason: 'backpressure' } - } - if (!appliedSettlements.has(settlementId)) { - for (const mutation of mutations) { - if (mutation.kind === 'item') { - applyItem(mutation.identity, mutation.body) - } else { - staged.delete(agentJournalItemKey(mutation.identity)) - } - } - appliedSettlements.add(settlementId) - } - return { accepted: true } - }, - tryPublish: () => { - lifecyclePublishAttempts += 1 - if (refusedAt === 'publish' && (persistent ? !released : lifecyclePublishAttempts === 1)) { - return { accepted: false, reason: 'backpressure' } - } - persist() - return { accepted: true } - } - }, - durableApproval: () => [...durable.values()].find((body) => body.kind === 'approval'), - appendAttempts: () => lifecycleAppendAttempts, - publishAttempts: () => lifecyclePublishAttempts, - appliedSettlements, - release: () => { - released = true - } - } -} - -function rootResult() { - return { - type: 'message' as const, - sessionId: 'orca-session', - message: { - type: 'result', - subtype: 'success', - uuid: 'result-success', - session_id: 'claude-session', - parent_tool_use_id: null, - is_error: false, - duration_ms: 1 - } - } -} - -function streamDelta(index: number) { - return { - type: 'message' as const, - sessionId: 'orca-session', - message: { - type: 'stream_event', - uuid: `stream-${index}`, - session_id: 'claude-session', - parent_tool_use_id: null, - event: { - type: 'content_block_delta', - index: 0, - delta: { type: 'text_delta', text: 'x' } - } - } - } -} - -describe('Claude journal prompt cancellation retry', () => { - it.each(['append', 'publish'] as const)( - 'retries after transient lifecycle %s backpressure', - (refusedAt) => { - const state = transientBackpressureSink(refusedAt) - const translator = createClaudeJournalTranslator({ sink: state.sink }) - const prompt = approval('permission-retry') - - translator.handle({ type: 'prompt', sessionId: 'orca-session', prompt }) - translator.handle({ - type: 'prompt-cancelled', - sessionId: 'orca-session', - promptKey: prompt.promptKey - }) - expect(state.durableApproval()).toMatchObject({ resolution: { state: 'pending' } }) - - translator.handle(rootResult()) - expect(state.durableApproval()).toMatchObject({ resolution: { state: 'cancelled' } }) - expect(state.appendAttempts()).toBe(2) - expect(state.publishAttempts()).toBe(refusedAt === 'publish' ? 2 : 1) - expect(state.appliedSettlements).toEqual(new Set(['prompt-cancelled:permission-retry'])) - - translator.handle(rootResult()) - expect(state.appendAttempts()).toBe(2) - expect(state.publishAttempts()).toBe(refusedAt === 'publish' ? 2 : 1) - } - ) - - it('keeps streaming frames off retry work and recovers at the next root result', () => { - const state = transientBackpressureSink('append', true) - const translator = createClaudeJournalTranslator({ sink: state.sink }) - const prompt = approval('permission-streaming') - - translator.handle({ type: 'prompt', sessionId: 'orca-session', prompt }) - translator.handle({ - type: 'prompt-cancelled', - sessionId: 'orca-session', - promptKey: prompt.promptKey - }) - expect(state.appendAttempts()).toBe(1) - - for (let index = 0; index < 100; index += 1) { - translator.handle(streamDelta(index)) - } - expect(state.appendAttempts()).toBe(1) - - state.release() - translator.handle(rootResult()) - expect(state.appendAttempts()).toBe(2) - expect(state.durableApproval()).toMatchObject({ resolution: { state: 'cancelled' } }) - }) - - it('closes the card on the sink drain when no later provider event comes', () => { - const state = transientBackpressureSink('append', true) - let control: StructuredAgentSessionReadingControl | undefined - const sink: StructuredAgentSessionEventSink = { - ...state.sink, - bindReadingControl: (next) => { - control = next - return () => {} - } - } - const translator = createClaudeJournalTranslator({ sink }) - const connection = { pauseReading: vi.fn(), resumeReading: vi.fn() } - bindClaudeJournalReadingControl(sink, connection, translator) - const prompt = approval('permission-drain') - - translator.handle({ type: 'prompt', sessionId: 'orca-session', prompt }) - control?.pauseReading() - translator.handle({ - type: 'prompt-cancelled', - sessionId: 'orca-session', - promptKey: prompt.promptKey - }) - control?.resumeReading() - expect(state.durableApproval()).toMatchObject({ resolution: { state: 'pending' } }) - expect(connection.resumeReading).not.toHaveBeenCalled() - - state.release() - control?.resumeReading() - expect(state.durableApproval()).toMatchObject({ resolution: { state: 'cancelled' } }) - expect(connection.resumeReading).toHaveBeenCalledOnce() - }) -}) diff --git a/src/main/claude/structured/journal/claude-structured-journal-translation.test.ts b/src/main/claude/structured/journal/claude-structured-journal-translation.test.ts deleted file mode 100644 index f12bc3c1e4e..00000000000 --- a/src/main/claude/structured/journal/claude-structured-journal-translation.test.ts +++ /dev/null @@ -1,263 +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 { - AgentJournalItemBody, - AgentJournalRenderItem -} from '../../../../shared/agent-session/journal/agent-session-journal-types' -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 type { ClaudePendingPrompt } from '../../claude-prompt-registry' -import { createClaudeJournalTranslator } from './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' - -// Claude Code 2.1.258 / SDK 0.3.251 capture: only message.id links partial and final frames. -function streamEvent(uuid: string, event: Record) { - return { - type: 'message' as const, - sessionId: 'orca-session', - message: { - type: 'stream_event', - uuid, - session_id: 'claude-session', - parent_tool_use_id: null, - event - } - } -} - -function resultFrame(subtype: string, fields: Record) { - return { - type: 'message' as const, - sessionId: 'orca-session', - message: { - type: 'result', - subtype, - duration_ms: 1200, - duration_api_ms: 1100, - num_turns: 1, - session_id: 'claude-session', - uuid: `result-${subtype}`, - ...fields - } - } -} - -function streamedTextTurn(input: { - messageId: string - startUuid: string - finalUuid: string - chunks: string[] -}) { - const text = input.chunks.join('') - return { - start: [ - streamEvent(`${input.messageId}-message-start`, { - type: 'message_start', - message: { id: input.messageId, role: 'assistant', content: [] } - }), - streamEvent(input.startUuid, { - type: 'content_block_start', - index: 0, - content_block: { type: 'text', text: '' } - }) - ], - deltas: input.chunks.map((chunk, index) => - streamEvent(`${input.messageId}-delta-${index}`, { - type: 'content_block_delta', - index: 0, - delta: { type: 'text_delta', text: chunk } - }) - ), - final: { - type: 'message' as const, - sessionId: 'orca-session', - message: { - type: 'assistant', - uuid: input.finalUuid, - session_id: 'claude-session', - parent_tool_use_id: null, - message: { - id: input.messageId, - role: 'assistant', - content: [{ type: 'text', text }], - stop_reason: null - } - } - }, - stop: [ - streamEvent(`${input.messageId}-block-stop`, { type: 'content_block_stop', index: 0 }), - streamEvent(`${input.messageId}-message-delta`, { - type: 'message_delta', - delta: { stop_reason: 'end_turn' } - }), - streamEvent(`${input.messageId}-message-stop`, { type: 'message_stop' }), - resultFrame('success', { - is_error: false, - result: text, - stop_reason: 'end_turn', - terminal_reason: 'completed' - }) - ], - text - } -} - -function assistantMessages(items: T[]): T[] { - return items.filter((item) => item.body.kind === 'message' && item.body.role === 'assistant') -} - -function providerFrameKinds(items: { body: AgentJournalItemBody }[]): string[] { - return items.flatMap((item) => - item.body.kind === 'status' && item.body.providerFrame ? [item.body.providerFrame.kind] : [] - ) -} - -const JOURNAL_IDENTITY: AgentSessionJournalIdentity = { - sessionId: 'session-1', - workspaceId: 'workspace-1', - hostId: 'host-1', - agent: 'claude', - providerHandle: claudeProviderHandle('claude-session', 'leaf-1') -} - -let journalRoot = '' - -beforeEach(async () => { - journalRoot = await mkdtemp(join(tmpdir(), 'orca-claude-journal-translation-')) -}) - -afterEach(async () => { - await closeTestJournalHostDatabases() - await rm(journalRoot, { recursive: true, force: true }) -}) - -describe('Claude structured journal translation', () => { - it('journals a count-to-200 stream as one assistant item carrying the complete reply', async () => { - const journal = await openAgentSessionJournal({ - identity: JOURNAL_IDENTITY, - database: openTestJournalHostDatabase(journalRoot), - now: () => 1_700_000_000_000, - mintEpoch: () => 'epoch-1' - }) - const deferred = createDeferredStructuredAgentSessionEventSink(testEventSinkLogging()) - deferred.bind({ journal, fence: 1, publish: vi.fn() }) - let scheduled: (() => void) | null = null - const translator = createClaudeJournalTranslator({ - sink: deferred.sink, - schedule: (run) => { - scheduled = run - return () => { - scheduled = null - } - } - }) - const numbers = Array.from({ length: 200 }, (_, index) => String(index + 1)) - // The chunk boundaries the real CLI produced for this prompt. - const boundaries = [0, 1, 45, 93, 141, 189, 200] - const chunks = boundaries.slice(1).map((end, index) => { - const slice = numbers.slice(boundaries[index], end).join('\n') - return index === 0 ? slice : `\n${slice}` - }) - const turn = streamedTextTurn({ - messageId: 'msg_count', - startUuid: 'count-start', - finalUuid: 'count-final', - chunks - }) - - for (const event of turn.start) { - translator.handle(event) - } - for (const delta of turn.deltas) { - translator.handle(delta) - // Each chunk lands in its own coalescing window, as it did on the wire. - const run = scheduled as (() => void) | null - run?.() - } - translator.handle(turn.final) - for (const event of turn.stop) { - translator.handle(event) - } - await deferred.drained() - - const items: AgentJournalRenderItem[] = journal.snapshot().items - const assistant = assistantMessages(items) - expect(assistant.map((item) => item.itemId)).toEqual([ - 'claude:claude-session:block%3Amsg_count%3A0' - ]) - expect(assistant[0]?.body).toEqual({ - kind: 'message', - role: 'assistant', - blocks: [{ type: 'text', text: numbers.join('\n') }] - }) - expect(providerFrameKinds(items)).toEqual([]) - }) - - it('restores a cancelled prompt as terminal history after reopening the journal', async () => { - const journal = await openAgentSessionJournal({ - identity: JOURNAL_IDENTITY, - database: openTestJournalHostDatabase(journalRoot), - 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 }) - const approval = prompt({ - requestId: 'permission-1', - promptKey: 'permission-1', - toolUseId: 'tool-1', - toolName: 'Bash', - kind: 'approval', - input: { command: 'git status' }, - questionIds: [] - }) - - translator.handle({ type: 'prompt', sessionId: 'orca-session', prompt: approval }) - translator.handle({ - type: 'prompt-cancelled', - sessionId: 'orca-session', - promptKey: approval.promptKey - }) - await expect(deferred.drained()).resolves.toEqual({ ok: true }) - deferred.close() - await journal.close() - - const reopened = await openAgentSessionJournal({ - identity: JOURNAL_IDENTITY, - database: openTestJournalHostDatabase(journalRoot), - now: () => 1_700_000_000_000, - mintEpoch: () => 'epoch-2' - }) - expect(reopened.snapshot().items).toEqual([ - expect.objectContaining({ - body: expect.objectContaining({ - kind: 'approval', - resolution: expect.objectContaining({ state: 'cancelled' }) - }) - }) - ]) - await reopened.close() - }) -}) - -function prompt( - input: Pick< - ClaudePendingPrompt, - 'requestId' | 'promptKey' | 'toolUseId' | 'toolName' | 'kind' | 'input' | 'questionIds' - > -): ClaudePendingPrompt { - return { - ...input, - suggestions: [], - settle: () => {} - } -} diff --git a/src/main/claude/structured/journal/claude-structured-journal-translation.ts b/src/main/claude/structured/journal/claude-structured-journal-translation.ts index b9a7cd8de4e..4591d740244 100644 --- a/src/main/claude/structured/journal/claude-structured-journal-translation.ts +++ b/src/main/claude/structured/journal/claude-structured-journal-translation.ts @@ -1,48 +1,48 @@ -import { ClaudeTaskInvocations } from '../../claude-task-invocations' -import { ClaudeJournalBoundDelivery } from '../../claude-journal-bound-delivery' -import type * as contract from '../../claude-journal-translator-contract' +import { ClaudeTaskInvocations } from '../../background-tasks/claude-task-invocations' +import { ClaudeJournalBoundDelivery } from './claude-journal-bound-delivery' +import type * as contract from './claude-journal-translator-contract' import { claudeStreamingMessageBody, type ClaudeToolUse } from './claude-structured-item-translation' -import { publishClaudeTurnActivity } from '../../claude-turn-activity' +import { publishClaudeTurnActivity } from '../turns/claude-turn-activity' import { claudeProviderFrameKind, createClaudeProviderFrameFallback, isClaudeProgressFrame } from '../launch/claude-structured-provider-fallback' -import { ClaudeBackgroundTaskRows } from '../../claude-background-task-rows' -import { ClaudeToolOriginRegistry } from '../../claude-tool-origin-registry' -import { ClaudeProvisionalRowCorrections } from '../../claude-provisional-row-corrections' -import { createClaudeStreamedThinking } from '../../claude-streamed-thinking' -import { ClaudeSubagentIdentities } from '../../claude-subagent-identities' -import { ClaudeJournaledSubagents } from '../../claude-subagent-journaled-identities' -import { createClaudeStreamedBlockRegistry } from '../../claude-streamed-block-identity' -import { createClaudeStreamedTextCheckpoints } from '../../claude-streamed-text-checkpoints' +import { ClaudeBackgroundTaskRows } from '../../background-tasks/claude-background-task-rows' +import { ClaudeToolOriginRegistry } from '../../subagents/claude-tool-origin-registry' +import { ClaudeProvisionalRowCorrections } from '../../subagents/claude-provisional-row-corrections' +import { createClaudeStreamedThinking } from './claude-streamed-thinking' +import { ClaudeSubagentIdentities } from '../../subagents/claude-subagent-identities' +import { ClaudeJournaledSubagents } from '../../subagents/claude-subagent-journaled-identities' +import { createClaudeStreamedBlockRegistry } from './claude-streamed-block-identity' +import { createClaudeStreamedTextCheckpoints } from './claude-streamed-text-checkpoints' import { claudeFrameParentRef, claudeStreamTurnSource, isRootClaudeFrame -} from '../../claude-turn-opening' -import { ClaudeOpenTurn } from '../../claude-open-turn' -import { absorbClaudeCommandFrame, claudeCommandCurrentTurn } from '../../claude-command-turn' -import { ClaudeContextFacts } from '../../claude-context-facts' -import { claudeSessionStateEndsTurn } from '../../claude-session-state-turn-over' +} from '../turns/claude-turn-opening' +import { ClaudeOpenTurn } from '../turns/claude-open-turn' +import { absorbClaudeCommandFrame, claudeCommandCurrentTurn } from '../turns/claude-command-turn' +import { ClaudeContextFacts } from '../../context-usage/claude-context-facts' +import { claudeSessionStateEndsTurn } from '../turns/claude-session-state-turn-over' import { ClaudeJournalPrompts } from './claude-structured-journal-prompts' -import { claudeChildToolQueries } from '../../claude-child-tool-queries' -import { journalClaudeMessage, journalClaudeStream } from '../../claude-message-journaling' -import type { ClaudeMessageJournalContext } from '../../claude-message-journaling' -import { journalClaudeResult } from '../../claude-result-journaling' -import type { ClaudeResultJournalContext } from '../../claude-result-journaling' -import { ClaudeAssistantFailures } from '../../claude-assistant-failures' -import { ClaudeUsageLimits } from '../../claude-usage-limits' -import { ClaudeThreadGoal } from '../../claude-thread-goal' -import { createClaudeFinalOutputCoverage } from '../../claude-final-output-coverage' -import { withClaudeConversationContent } from '../../claude-internal-message-content' +import { claudeChildToolQueries } from '../../subagents/claude-child-tool-queries' +import { journalClaudeMessage, journalClaudeStream } from './claude-message-journaling' +import type { ClaudeMessageJournalContext } from './claude-message-journaling' +import { journalClaudeResult } from './claude-result-journaling' +import type { ClaudeResultJournalContext } from './claude-result-journaling' +import { ClaudeAssistantFailures } from './claude-assistant-failures' +import { ClaudeUsageLimits } from './claude-usage-limits' +import { ClaudeThreadGoal } from './claude-thread-goal' +import { createClaudeFinalOutputCoverage } from './claude-final-output-coverage' +import { withClaudeConversationContent } from './claude-internal-message-content' import { journalClaudePluginInputFailure, settleClaudeInterruptedTurn -} from '../../claude-plugin-input-failure-journal' +} from './claude-plugin-input-failure-journal' export function createClaudeJournalTranslator( deps: contract.ClaudeJournalTranslatorDeps diff --git a/src/main/claude/structured/journal/claude-structured-prompt-items.ts b/src/main/claude/structured/journal/claude-structured-prompt-items.ts index 2cbfd351ae7..ad4c5d3043e 100644 --- a/src/main/claude/structured/journal/claude-structured-prompt-items.ts +++ b/src/main/claude/structured/journal/claude-structured-prompt-items.ts @@ -14,7 +14,7 @@ import { askOptionPreview } from '../../../../shared/native-chat/input/native-ch import { boundJournalPromptBody } from '../../../native-chat/agent-session-journal/item-lifecycle/journal-prompt-body-bounds' import { claudeRecord, claudeText } from './claude-structured-item-translation' import { encodeClaudeQuestionOptionId } from './claude-structured-prompt-replies' -import type { ClaudePendingPrompt } from '../../claude-prompt-registry' +import type { ClaudePendingPrompt } from '../permissions/claude-prompt-registry' const APPROVAL_OPTIONS: readonly AgentJournalPromptOption[] = [ { id: 'allow', label: 'Allow', intent: 'allow_once' }, diff --git a/src/main/claude/structured/journal/claude-structured-prompt-ownership.test.ts b/src/main/claude/structured/journal/claude-structured-prompt-ownership.test.ts deleted file mode 100644 index 35868580b36..00000000000 --- a/src/main/claude/structured/journal/claude-structured-prompt-ownership.test.ts +++ /dev/null @@ -1,192 +0,0 @@ -import { - AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemBody -} from '../../../../shared/agent-session/journal/agent-session-journal-types' -import { describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' -import type { - StructuredAgentSessionAppendOptions, - StructuredAgentSessionEventSink -} from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import { ClaudeJournalPrompts } from './claude-structured-journal-prompts' -import type { ClaudePendingPrompt } from '../../claude-prompt-registry' -import { - USER_MESSAGE, - type acquired, - adapterFor, - fakeClaude, - identityFor -} from '../claude-structured-session-test-support' -import { invokeCanUseTool } from '../../claude-can-use-tool-test-support' - -function lifecycleRecorder(acceptPromptCancellation = true): { - sink: StructuredAgentSessionEventSink - bodies: Map - tombstones: Set - order: string[] -} { - const bodies = new Map() - const tombstones = new Set() - const order: string[] = [] - const appendTombstone = ( - identity: Parameters[0], - options?: StructuredAgentSessionAppendOptions - ): void => { - const key = agentJournalItemKey(identity) - bodies.delete(key) - tombstones.add(key) - if (options?.lifecycle === true) { - order.push('prompt-lifecycle') - } - } - const appendItem = ( - identity: Parameters[0], - body: Parameters[1], - options?: StructuredAgentSessionAppendOptions - ): void => { - bodies.set(agentJournalItemKey(identity), body) - if (options?.lifecycle === true) { - order.push('prompt-lifecycle') - } - } - const sink: StructuredAgentSessionEventSink = { - appendItem, - appendTombstone, - tryAppendTombstone: (identity, options) => { - if (!acceptPromptCancellation) { - return { accepted: false, reason: 'backpressure' } - } - appendTombstone(identity, options) - return { accepted: true } - }, - tryAppendLifecycleBatch: (_settlementId, mutations, options) => { - if (!acceptPromptCancellation) { - return { accepted: false, reason: 'backpressure' } - } - for (const mutation of mutations) { - if (mutation.kind === 'tombstone') { - appendTombstone(mutation.identity, options) - } else { - appendItem(mutation.identity, mutation.body, options) - } - } - return { accepted: true } - }, - publish: (_options?: StructuredAgentSessionAppendOptions) => {}, - tryPublish: () => ({ accepted: true }) - } - return { sink, bodies, tombstones, order } -} - -async function startTurn( - adapter: Awaited>, - turnId = 'turn-1' -): Promise { - await adapter.dispatch({ - sessionId: 'session-1', - clientMessageId: `client-${turnId}`, - body: USER_MESSAGE, - fence: 7 - }) -} - -describe('Claude live prompt ownership', () => { - it('hands the card back when the host fails to record it, so a withdrawal still closes it', async () => { - const claude = fakeClaude({ replayUuid: 'turn-1' }) - const recorded = lifecycleRecorder() - const adapter = adapterFor(claude) - await adapter.acquire({ - identity: identityFor(), - fence: 7, - spawnToken: 'spawn-9', - events: recorded.sink - }) - await startTurn(adapter) - const request = new AbortController() - invokeCanUseTool(claude.connections[0]!, 'AskUserQuestion', 'permission-1', 'tool-1', { - input: { questions: [{ question: 'Which branch?', options: [{ label: 'main' }] }] }, - signal: request.signal - }) - const [card] = [...recorded.bodies].find(([, body]) => body.kind === 'question') ?? [] - const dismiss = adapter.dismissPrompt - if (!card || !dismiss) { - throw new Error('expected the question card and a dismissal') - } - - await expect( - dismiss({ - sessionId: 'session-1', - itemId: card, - fence: 7, - answer: false, - commit: async () => { - request.abort() - throw new Error('journal write failed') - } - }) - ).rejects.toThrow('journal write failed') - - expect(recorded.bodies.get(card)).toMatchObject({ resolution: { state: 'cancelled' } }) - }) - - it('keeps every backpressured prompt cancellation retry in its owned entry', () => { - let backpressured = true - let lifecycleAttempts = 0 - const prompts = new ClaudeJournalPrompts({ - sink: { - appendItem: () => {}, - appendTombstone: () => {}, - publish: () => {}, - tryAppendLifecycleBatch: () => { - lifecycleAttempts += 1 - return backpressured ? { accepted: false, reason: 'backpressure' } : { accepted: true } - } - }, - turnScope: () => AGENT_JOURNAL_THREAD_SCOPE - }) - const registerCancellation = (index: number): void => { - const promptKey = `permission-${index}` - const prompt: ClaudePendingPrompt = { - requestId: promptKey, - promptKey, - toolUseId: `tool-${index}`, - toolName: 'Bash', - kind: 'approval', - input: { command: 'git status' }, - suggestions: [], - questionIds: [], - settle: vi.fn() - } - prompts.handle({ type: 'prompt', sessionId: 'session-1', prompt }) - prompts.cancel(promptKey) - } - - registerCancellation(0) - prompts.cancel('permission-0') - expect(prompts.pendingCancellationCount).toBe(1) - for (let index = 1; index < 65; index += 1) { - registerCancellation(index) - } - expect(prompts.pendingCancellationCount).toBe(65) - - backpressured = false - const attemptsBeforeRecovery = lifecycleAttempts - prompts.retryPendingCancellations() - expect(lifecycleAttempts - attemptsBeforeRecovery).toBe(65) - expect(prompts.pendingCancellationCount).toBe(0) - expect(prompts.size).toBe(0) - const attemptsAfterRecovery = lifecycleAttempts - prompts.retryPendingCancellations() - expect(lifecycleAttempts).toBe(attemptsAfterRecovery) - - backpressured = true - registerCancellation(65) - expect(prompts.pendingCancellationCount).toBe(1) - prompts.resolve('permission-65') - expect(prompts.pendingCancellationCount).toBe(0) - registerCancellation(66) - prompts.clear() - expect(prompts.pendingCancellationCount).toBe(0) - expect(prompts.size).toBe(0) - }) -}) diff --git a/src/main/claude/structured/journal/claude-structured-prompt-ownership.ts b/src/main/claude/structured/journal/claude-structured-prompt-ownership.ts index 1926810d6c9..c07c57d4a15 100644 --- a/src/main/claude/structured/journal/claude-structured-prompt-ownership.ts +++ b/src/main/claude/structured/journal/claude-structured-prompt-ownership.ts @@ -5,12 +5,12 @@ import { import type { StructuredAgentSessionAdapter } from '../../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' import type { StructuredAgentSessionAdapterStop } from '../../../native-chat/agent-session-wire/providers/structured-agent-session-adapter-stop' import { answerClaudePrompt, cancelClaudeTurn } from '../claude-structured-control-actions' -import { leaveClaudePlanModeOnApproval } from '../../claude-plan-approval-mode' -import type { ClaudeLateDispatchSettlement } from '../../claude-replay-turn-resolution' +import { leaveClaudePlanModeOnApproval } from '../permissions/claude-plan-approval-mode' +import type { ClaudeLateDispatchSettlement } from '../turns/claude-replay-turn-resolution' import { buildClaudePromptReply, claudePromptDismissal } from './claude-structured-prompt-replies' import type { ClaudeSession } from '../claude-structured-session-state' -import type { ClaudePendingPrompt } from '../../claude-prompt-registry' -import { CLAUDE_STOP_GRACE_MS } from '../../claude-request-end-wait' +import type { ClaudePendingPrompt } from '../permissions/claude-prompt-registry' +import { CLAUDE_STOP_GRACE_MS } from '../turns/claude-request-end-wait' import type { PermissionResult } from '@anthropic-ai/claude-agent-sdk' type CancelInput = Parameters[0] diff --git a/src/main/claude/structured/journal/claude-structured-prompt-replies.ts b/src/main/claude/structured/journal/claude-structured-prompt-replies.ts index cdcd7e264e4..d5df7193646 100644 --- a/src/main/claude/structured/journal/claude-structured-prompt-replies.ts +++ b/src/main/claude/structured/journal/claude-structured-prompt-replies.ts @@ -9,7 +9,7 @@ import { isClaudePromptRecord, readClaudePromptString, type ClaudePendingPrompt -} from '../../claude-prompt-registry' +} from '../permissions/claude-prompt-registry' /** Keep `cancel` for older cards; it now means dismissal. */ export const CLAUDE_APPROVAL_DECISIONS = ['allow', 'allowForSession', 'deny', 'cancel'] as const diff --git a/src/main/claude/structured/journal/claude-structured-session-journal-control.ts b/src/main/claude/structured/journal/claude-structured-session-journal-control.ts index 374e73737dc..2cb0c99da7b 100644 --- a/src/main/claude/structured/journal/claude-structured-session-journal-control.ts +++ b/src/main/claude/structured/journal/claude-structured-session-journal-control.ts @@ -1,16 +1,16 @@ import { bindClaudeContextUsageCapture, type ClaudeContextUsageCaptureOptions -} from '../../claude-context-usage' +} from '../../context-usage/claude-context-usage' import type { StructuredAgentSessionEventSink, StructuredAgentSessionSinkAdmission } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' import type { ClaudeStreamJsonConnection } from '../../claude-stream-json-connection' -import type { ClaudeJournalTranslator } from '../../claude-journal-translator-contract' +import type { ClaudeJournalTranslator } from './claude-journal-translator-contract' import { createClaudeJournalTranslator } from './claude-structured-journal-translation' import type { ClaudeInitProof } from '../claude-structured-init-proof' -import type { ClaudeJournalBoundDelivery } from '../../claude-journal-bound-delivery' +import type { ClaudeJournalBoundDelivery } from './claude-journal-bound-delivery' import type { ClaudeAcquisitionAttempt, ClaudeSession, diff --git a/src/main/claude/claude-terminal-failure.ts b/src/main/claude/structured/journal/claude-terminal-failure.ts similarity index 80% rename from src/main/claude/claude-terminal-failure.ts rename to src/main/claude/structured/journal/claude-terminal-failure.ts index 0086baada02..caaf307587b 100644 --- a/src/main/claude/claude-terminal-failure.ts +++ b/src/main/claude/structured/journal/claude-terminal-failure.ts @@ -1,19 +1,19 @@ -import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' -import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import { isRootAgentJournalItem } from '../../shared/agent-session/journal/agent-session-journal-producer' +import { agentJournalItemKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity' +import { isRootAgentJournalItem } from '../../../../shared/agent-session/journal/agent-session-journal-producer' import { readAgentSessionFailureFact, providerDiagnostic -} from '../../shared/agent-session/failures/agent-session-failure' -import { agentSessionFailureWords } from '../../shared/agent-session/failures/agent-session-failure-words' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import type { StructuredAgentSessionRevisionJournal } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-journal-views' +} from '../../../../shared/agent-session/failures/agent-session-failure' +import { agentSessionFailureWords } from '../../../../shared/agent-session/failures/agent-session-failure-words' +import type { StructuredAgentSessionEventSink } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import type { StructuredAgentSessionRevisionJournal } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-journal-views' import { agentJournalTurnRowReservedBytes, resolveAgentJournalTurnRowWrite, type AgentJournalTurnRowWrite -} from '../native-chat/agent-session-timeline/agent-journal-turn-row-revision' +} from '../../../native-chat/agent-session-timeline/agent-journal-turn-row-revision' function claudeTerminalFailureIdentity(turnItemId: string): AgentJournalItemIdentity { return { provider: 'orca', clientMessageId: `terminal-failure:claude:${turnItemId}` } diff --git a/src/main/claude/claude-thread-goal.ts b/src/main/claude/structured/journal/claude-thread-goal.ts similarity index 92% rename from src/main/claude/claude-thread-goal.ts rename to src/main/claude/structured/journal/claude-thread-goal.ts index ed094f4b168..12cd94e003e 100644 --- a/src/main/claude/claude-thread-goal.ts +++ b/src/main/claude/structured/journal/claude-thread-goal.ts @@ -3,11 +3,11 @@ import type { AgentJournalItemBody, AgentJournalThreadGoal -} from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import { claudeRecord, claudeText } from './structured/journal/claude-structured-item-translation' -import { isRootClaudeFrame } from './claude-turn-opening' -import type { ClaudeGoalBackgroundWork } from './claude-background-task-tracker' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity' +import { claudeRecord, claudeText } from './claude-structured-item-translation' +import { isRootClaudeFrame } from '../turns/claude-turn-opening' +import type { ClaudeGoalBackgroundWork } from '../../background-tasks/claude-background-task-tracker' const GOAL_SET = 'Goal set: ' const GOAL_ACTIVE = /^Goal active: ([\s\S]+) \((?:not yet evaluated|\d+ turns?)\)$/u diff --git a/src/main/claude/claude-usage-limits.ts b/src/main/claude/structured/journal/claude-usage-limits.ts similarity index 94% rename from src/main/claude/claude-usage-limits.ts rename to src/main/claude/structured/journal/claude-usage-limits.ts index 0ce1a106b03..af6b4935dde 100644 --- a/src/main/claude/claude-usage-limits.ts +++ b/src/main/claude/structured/journal/claude-usage-limits.ts @@ -2,18 +2,18 @@ import { agentSessionFailureFact, providerDiagnostic, type ProviderDiagnostic -} from '../../shared/agent-session/failures/agent-session-failure' +} from '../../../../shared/agent-session/failures/agent-session-failure' import { agentSessionFailureWords, type AgentSessionFailureRowWords -} from '../../shared/agent-session/failures/agent-session-failure-words' +} from '../../../../shared/agent-session/failures/agent-session-failure-words' import { usageLimitResetsAt, type AgentSessionUsageLimit, type AgentSessionUsageLimitWindow -} from '../../shared/agent-session/failures/agent-session-usage-limit' -import type { ClaudeOpenTurn } from './claude-open-turn' -import { claudeRecord, claudeText } from './structured/journal/claude-structured-item-translation' +} from '../../../../shared/agent-session/failures/agent-session-usage-limit' +import type { ClaudeOpenTurn } from '../turns/claude-open-turn' +import { claudeRecord, claudeText } from './claude-structured-item-translation' const CLAUDE_LIMIT_WINDOWS: Record = { five_hour: 'session', diff --git a/src/main/claude/claude-config-dir-pin.test.ts b/src/main/claude/structured/launch/claude-config-dir-pin.test.ts similarity index 100% rename from src/main/claude/claude-config-dir-pin.test.ts rename to src/main/claude/structured/launch/claude-config-dir-pin.test.ts diff --git a/src/main/claude/claude-config-dir-pin.ts b/src/main/claude/structured/launch/claude-config-dir-pin.ts similarity index 100% rename from src/main/claude/claude-config-dir-pin.ts rename to src/main/claude/structured/launch/claude-config-dir-pin.ts diff --git a/src/main/claude/claude-launch-account.ts b/src/main/claude/structured/launch/claude-launch-account.ts similarity index 69% rename from src/main/claude/claude-launch-account.ts rename to src/main/claude/structured/launch/claude-launch-account.ts index 02969a655d7..65eb3194529 100644 --- a/src/main/claude/claude-launch-account.ts +++ b/src/main/claude/structured/launch/claude-launch-account.ts @@ -1,7 +1,7 @@ -import type { ClaudeAccountRecipe } from '../../shared/agent-session/lifecycle/agent-session-acquired-account' -import type { ClaudeProfileRouter } from '../claude-accounts/profiles/routing/claude-profile-router' -import { applyClaudeEnvPatch } from '../claude-accounts/runtime-auth/environment' -import { resolveStructuredClaudeAccountHomePath } from '../runtime/agent-session/environment/structured-agent-account-home' +import type { ClaudeAccountRecipe } from '../../../../shared/agent-session/lifecycle/agent-session-acquired-account' +import type { ClaudeProfileRouter } from '../../../claude-accounts/profiles/routing/claude-profile-router' +import { applyClaudeEnvPatch } from '../../../claude-accounts/runtime-auth/environment' +import { resolveStructuredClaudeAccountHomePath } from '../../../runtime/agent-session/environment/structured-agent-account-home' /** The account a launch runs under is the current selection; the receipt records what it used. */ export async function prepareClaudeLaunchAccount( diff --git a/src/main/claude/claude-launch-destination-home.ts b/src/main/claude/structured/launch/claude-launch-destination-home.ts similarity index 80% rename from src/main/claude/claude-launch-destination-home.ts rename to src/main/claude/structured/launch/claude-launch-destination-home.ts index d03d72b03f9..8e58fc28119 100644 --- a/src/main/claude/claude-launch-destination-home.ts +++ b/src/main/claude/structured/launch/claude-launch-destination-home.ts @@ -1,4 +1,4 @@ -import type { ClaudeRuntimeAuthPreparation } from '../claude-accounts/runtime-auth/runtime-auth-types' +import type { ClaudeRuntimeAuthPreparation } from '../../../claude-accounts/runtime-auth/runtime-auth-types' /** System provenance preserves the explicit agent overlay; managed provenance pins its own home. */ export function claudeLaunchDestinationHome( diff --git a/src/main/claude/structured/launch/claude-structured-acquisition-launch.ts b/src/main/claude/structured/launch/claude-structured-acquisition-launch.ts index 3dc85bc33be..8bb259d3984 100644 --- a/src/main/claude/structured/launch/claude-structured-acquisition-launch.ts +++ b/src/main/claude/structured/launch/claude-structured-acquisition-launch.ts @@ -1,4 +1,4 @@ -import type { ClaudeNamingGeneration } from '../../claude-naming-generation' +import type { ClaudeNamingGeneration } from '../../conversation-naming/claude-naming-generation' import { claudeProviderHandle } from '../../../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding' import { AgentSessionAcquisitionExitUnprovenError } from '../../../native-chat/agent-session-wire/acquisition/structured-agent-session-acquisition-errors' import { launchPreparationFailure } from '../../../native-chat/agent-session-wire/providers/structured-agent-session-adapter-errors' @@ -11,7 +11,7 @@ import { CLAUDE_CACHED_FLAG_CHECK_BUDGET_MS, CLAUDE_CLI_FLAG_PROBE_KILL_AFTER_MS, CLAUDE_EFFORT_FLAG -} from '../../claude-cli-flag-support' +} from '../../cli-capabilities/claude-cli-flag-support' import { claudeStructuredSpawnOptions, type ClaudeStructuredSpawnOptions diff --git a/src/main/claude/structured/launch/claude-structured-child-env.ts b/src/main/claude/structured/launch/claude-structured-child-env.ts index 46f29548a52..e6be2562fb9 100644 --- a/src/main/claude/structured/launch/claude-structured-child-env.ts +++ b/src/main/claude/structured/launch/claude-structured-child-env.ts @@ -12,7 +12,7 @@ import { import { withCliRuntimeOnPath } from '../../../../shared/node-cli-command-resolution' import { applyClaudeEnvPatch } from '../../../claude-accounts/runtime-auth/environment' import { resolveClaudeCommand } from '../../../codex-cli/command' -import { withoutInheritedClaudeConfigDir } from '../../claude-config-dir-pin' +import { withoutInheritedClaudeConfigDir } from './claude-config-dir-pin' import { stripInheritedAgentSessionEnv } from '../../../../shared/agent-launch/startup/parent-agent-session-env' import { overlayEnvironmentVariables } from '../../../../shared/environment-overlay' diff --git a/src/main/claude/structured/launch/claude-structured-launch-flags.ts b/src/main/claude/structured/launch/claude-structured-launch-flags.ts index 38df557317b..ae4813827a7 100644 --- a/src/main/claude/structured/launch/claude-structured-launch-flags.ts +++ b/src/main/claude/structured/launch/claude-structured-launch-flags.ts @@ -11,7 +11,7 @@ import { type ClaudeCliFlagFact, type ClaudeCliFlagSupport, type ClaudeCliLaunch -} from '../../claude-cli-flag-support' +} from '../../cli-capabilities/claude-cli-flag-support' const THINKING_DISPLAY_ARGS: Readonly> = { 'thinking-display': 'summarized' } diff --git a/src/main/claude/structured/launch/claude-structured-launch-home.ts b/src/main/claude/structured/launch/claude-structured-launch-home.ts index 88df61b9e6f..1e9b50e99d7 100644 --- a/src/main/claude/structured/launch/claude-structured-launch-home.ts +++ b/src/main/claude/structured/launch/claude-structured-launch-home.ts @@ -2,7 +2,7 @@ import { join } from 'node:path' import type { ClaudeProfileRouter } from '../../../claude-accounts/profiles/routing/claude-profile-router' import { AgentSessionPreSpawnError } from '../../../native-chat/agent-session-wire/providers/structured-agent-session-adapter-errors' import { resolveSessionFilePath } from '../../../native-chat/session-file-resolver' -import { prepareClaudeLaunchAccount } from '../../claude-launch-account' +import { prepareClaudeLaunchAccount } from './claude-launch-account' /** Follow the current account selection and pin its environment for this launch. */ export async function resolveClaudeStructuredLaunchHome( diff --git a/src/main/claude/structured/launch/claude-structured-launch-resolution.ts b/src/main/claude/structured/launch/claude-structured-launch-resolution.ts index e58f06c59e1..3f7f4495393 100644 --- a/src/main/claude/structured/launch/claude-structured-launch-resolution.ts +++ b/src/main/claude/structured/launch/claude-structured-launch-resolution.ts @@ -1,5 +1,5 @@ import type { ClaudeAccountRecipe } from '../../../../shared/agent-session/lifecycle/agent-session-acquired-account' -import { prepareClaudeLaunchAccount } from '../../claude-launch-account' +import { prepareClaudeLaunchAccount } from './claude-launch-account' import { assertStructuredAgentResolutionCurrent } from '../../../native-chat/structured-agent-command-resolution' import { activeProviderContext } from '../../../../shared/agent-session/agent-session-provider-context' import { getClaudeProfileRouter } from '../../../claude-accounts/profiles/routing/claude-profile-installed-router' @@ -26,7 +26,10 @@ import { type ClaudeEnvDeps } from './claude-structured-child-env' import { claudeStructuredLaunchArgs } from './claude-structured-launch-args' -import type { ClaudeCliFlagCheck, ClaudeCliFlagSupport } from '../../claude-cli-flag-support' +import type { + ClaudeCliFlagCheck, + ClaudeCliFlagSupport +} from '../../cli-capabilities/claude-cli-flag-support' import { resolveClaudeLaunchFlags } from './claude-structured-launch-flags' import { withNativeChatVisualsEnv } from '../../../native-chat/native-chat-visuals-delivery' import { claudeLaunchResumesTranscript } from './claude-structured-launch-home' diff --git a/src/main/claude/structured/launch/claude-structured-launch-visuals.test.ts b/src/main/claude/structured/launch/claude-structured-launch-visuals.test.ts deleted file mode 100644 index b94903365ed..00000000000 --- a/src/main/claude/structured/launch/claude-structured-launch-visuals.test.ts +++ /dev/null @@ -1,71 +0,0 @@ -import { createClaudeStructuredLaunchResolver } from '../../../runtime/agent-session/launch/structured-agent-launch-composition.test-support' -import { describe, expect, it, vi } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity' -import { agentSessionRecordFixture } from '../../../native-chat/agent-session-record-test-fixture' -import { LOCAL_EXECUTION_HOST_ID } from '../../../../shared/execution-host' -import type { NativeChatVisualsLaunch } from '../../../native-chat/native-chat-visuals-delivery' -import { - CLAUDE_PLUGIN_DIR_FLAG, - type ClaudeCliFlag, - type ClaudeCliFlagFact -} from '../../claude-cli-flag-support' - -const SESSION_ID = 'orca-session-visuals' -const VISUALS: NativeChatVisualsLaunch = { - folder: '/state/chat-scratch/abc', - skill: { pluginDir: '/app/native-chat-visuals', skillsRoot: '/app/native-chat-visuals/skills' } -} - -const record = agentSessionRecordFixture({ sessionId: SESSION_ID }) -const IDENTITY: AgentSessionJournalIdentity = { - sessionId: SESSION_ID, - workspaceId: 'workspace-1', - hostId: LOCAL_EXECUTION_HOST_ID, - agent: 'claude', - providerHandle: null -} - -type Supports = (flag: ClaudeCliFlag, launch: unknown, budgetMs?: number) => Promise - -const checkOf = - (supports: Supports) => - async (...args: Parameters): Promise => - (await supports(...args)) ? 'supported' : 'unsupported' - -function launch(options: { - prepareVisuals?: (sessionId: string) => Promise - supports?: Supports - launchArgs?: string[] - env?: Record - attachmentDirectory?: string -}) { - return createClaudeStructuredLaunchResolver({ - store: { getRecord: () => record, pinLaunchDirectory: vi.fn() }, - resolveWorkspacePath: async (id) => `/repos/${id}`, - resolveCommand: () => ({ command: '/usr/local/bin/claude', prefixArgs: [] }), - resolveAuthPolicy: () => ({ account: 'system' }), - resolveLaunchArgs: () => options.launchArgs ?? [], - resolveEnv: () => options.env ?? {}, - hasTranscript: async () => false, - ...(options.attachmentDirectory ? { attachmentDirectory: options.attachmentDirectory } : {}), - ...(options.supports ? { cliFlags: { check: checkOf(options.supports) } } : {}), - ...(options.prepareVisuals ? { prepareVisuals: options.prepareVisuals } : {}) - })({ identity: IDENTITY }) -} - -describe('a Claude chat launch with inline visuals', () => { - it('asks for readable thinking again once the plugin check has learned the version', async () => { - let versionKnown = false - const supports = vi.fn(async (flag: ClaudeCliFlag, _launch: unknown, budgetMs?: number) => { - if (flag === CLAUDE_PLUGIN_DIR_FLAG) { - versionKnown = true - return true - } - // The first thinking check gave up at its short budget; the re-check reads the cached answer. - return versionKnown && budgetMs !== undefined - }) - const resolved = await launch({ prepareVisuals: async () => VISUALS, supports }) - expect(resolved.options.plugins).toHaveLength(1) - expect(resolved.options.extraArgs).toMatchObject({ 'thinking-display': 'summarized' }) - }) -}) diff --git a/src/main/claude/structured/launch/claude-structured-message-options.test.ts b/src/main/claude/structured/launch/claude-structured-message-options.test.ts deleted file mode 100644 index 9900850b95f..00000000000 --- a/src/main/claude/structured/launch/claude-structured-message-options.test.ts +++ /dev/null @@ -1,334 +0,0 @@ -import { StructuredAgentSessionInputNotAdmitted } from '../../../native-chat/agent-session-wire/delivery/structured-agent-session-input-admission' -import { describe, expect, it, vi } from 'vitest' -import { - acquired, - adapterFor, - claudeFrame, - fakeClaude, - identityFor, - recordingJournalSink, - USER_MESSAGE -} from '../claude-structured-session-test-support' -import * as dispatchContent from '../claude-structured-dispatch-content' -import { ClaudeControlRequestError } from '../../claude-agent-sdk-control-requests' -import { claudeStructuredPermissionOptions } from './claude-structured-launch-resolution' - -/** Claude ends a turn; a message sent before this joins the running turn on its choices. */ -const claudeTurnEnds = (connection: Parameters[0]) => - claudeFrame(connection, { type: 'system', subtype: 'session_state_changed', state: 'idle' }) - -const MODELS = [ - { value: 'default', resolvedModel: 'claude-sonnet-5' }, - { - value: 'sonnet', - resolvedModel: 'claude-sonnet-5', - supportsEffort: true, - supportedEffortLevels: ['low', 'high'] - }, - { - value: 'opus', - resolvedModel: 'claude-opus-5', - supportsEffort: true, - supportedEffortLevels: ['low', 'high'] - } -] - -it('checks the latest permission after model preparation without admitting a stale frame', async () => { - const claude = fakeClaude() - const adapter = adapterFor(claude) - await adapter.acquire({ - identity: identityFor(), - fence: 7, - spawnToken: 'permission-race', - events: recordingJournalSink() - }) - const connection = claude.connections[0]! - claudeFrame(connection, { type: 'system', subtype: 'init', model: 'claude-sonnet-5' }) - const preparing = Promise.withResolvers() - const resume = Promise.withResolvers() - connection.setModel = async () => { - preparing.resolve() - await resume.promise - } - let changed = false - const admitted = vi.fn() - const sending = adapter.dispatch({ - sessionId: 'session-1', - clientMessageId: 'permission-race', - body: USER_MESSAGE, - executionOptions: { model: 'custom[1m]' }, - fence: 7, - admitFreshInput: async (enqueue) => - changed ? { kind: 'acquire', reason: 'permission' } : enqueue('ask', false) - }) - const result = sending.then(admitted, (error) => error) - await preparing.promise - changed = true - resume.resolve() - expect(await result).toBeInstanceOf(StructuredAgentSessionInputNotAdmitted) - expect(admitted).not.toHaveBeenCalled() - expect(connection.sent).toHaveLength(0) - await adapter.closeAll() -}) - -describe('Claude accepted message choices', () => { - // --effort arrived in Claude Code 2.1.38 and the live control in 2.1.50; older CLIs reject the flag - // and never answer the control, so either one failed every resume of a chat with a saved effort. - - it('applies a held message A before its prompt, then message B on the existing child', async () => { - const order: string[] = [] - let currentEffort = 'high' - const claude = fakeClaude({ - routes: { - list_models: () => MODELS, - set_model: ({ model } = {}) => order.push(`model:${String(model)}`), - apply_flag_settings: ({ settings } = {}) => { - order.push(`effort:${JSON.stringify(settings)}`) - if ( - typeof settings === 'object' && - settings !== null && - 'effortLevel' in settings && - typeof settings.effortLevel === 'string' - ) { - currentEffort = settings.effortLevel - } - } - } - }) - const adapter = await acquired(claude) - const connection = claude.connections[0]! - connection.getSettings = async () => ({ effective: { effortLevel: currentEffort } }) - const send = connection.send - let release!: () => void - const held = new Promise((resolve) => { - release = resolve - }) - let entered!: () => void - const enteredSend = new Promise((resolve) => { - entered = resolve - }) - let first = true - connection.send = async (message, beforeDispatch) => { - if (first) { - first = false - entered() - await held - } - const result = await send(message, beforeDispatch) - order.push('prompt') - return result - } - - const a = adapter.dispatch({ - sessionId: 'session-1', - clientMessageId: 'A', - body: USER_MESSAGE, - executionOptions: { model: 'sonnet', effort: 'low' }, - fence: 7 - }) - await enteredSend - await adapter.setOption({ sessionId: 'session-1', key: 'model', value: 'opus', fence: 7 }) - await adapter.setOption({ sessionId: 'session-1', key: 'effort', value: 'high', fence: 7 }) - order.length = 0 - release() - await expect(a).resolves.toMatchObject({ state: 'admitted' }) - expect(order).toEqual(['model:sonnet', 'effort:{"effortLevel":"low"}', 'prompt']) - claudeTurnEnds(connection) - - order.length = 0 - await expect( - adapter.dispatch({ - sessionId: 'session-1', - clientMessageId: 'B', - body: USER_MESSAGE, - executionOptions: { model: 'opus', effort: 'high' }, - fence: 7 - }) - ).resolves.toMatchObject({ state: 'admitted' }) - expect(order).toEqual(['model:opus', 'effort:{"effortLevel":"high"}', 'prompt']) - }) - - // Host admission treats the original abort as never written. - it('surfaces a Stop while it applies a choice as the abort, and a refusal as a refusal', async () => { - let refuse = false - const claude = fakeClaude({ - initModels: MODELS, - routes: { - list_models: () => MODELS, - set_model: () => { - if (refuse) { - throw new ClaudeControlRequestError('set_model', 'unknown model') - } - return new Promise(() => {}) - } - } - }) - const adapter = await acquired(claude) - const stop = new AbortController() - const dispatch = (clientMessageId: string, signal?: AbortSignal) => - adapter.dispatch({ - sessionId: 'session-1', - clientMessageId, - body: USER_MESSAGE, - executionOptions: { model: 'opus' }, - fence: 7, - ...(signal ? { signal } : {}) - }) - const stopped = dispatch('stopped', stop.signal) - await vi.waitFor(() => - expect(claude.connections[0]!.calls.some((call) => call.subtype === 'set_model')).toBe(true) - ) - stop.abort(new Error('stopped while starting')) - await expect(stopped).rejects.toBe(stop.signal.reason) - refuse = true - await expect(dispatch('refused')).resolves.toMatchObject({ - state: 'rejected', - rejection: { kind: 'providerRejected' } - }) - expect(claude.connections[0]!.sent).toHaveLength(0) - }) - - it('keeps a running turn on its choices and applies new ones at the next turn', async () => { - const claude = fakeClaude({ - initModels: MODELS.map((model) => ({ ...model, supportsFastMode: true })), - routes: { list_models: () => MODELS } - }) - const adapter = await acquired(claude) - const connection = claude.connections[0]! - const send = (clientMessageId: string, model: string, body = USER_MESSAGE) => - adapter.dispatch({ - sessionId: 'session-1', - clientMessageId, - body, - executionOptions: { - model, - effort: model === 'sonnet' ? 'high' : 'low', - fastMode: model === 'sonnet' ? 'false' : 'true' - }, - fence: 7 - }) - const models = () => - connection.calls.flatMap((call) => (call.subtype === 'set_model' ? [call.params?.model] : [])) - await expect(send('opens', 'sonnet')).resolves.toMatchObject({ state: 'admitted' }) - expect(models()).toEqual(['sonnet']) - const settings = () => connection.calls.filter((call) => call.subtype === 'apply_flag_settings') - const liveSettings = [...settings()] - // Typed while that turn runs, after the pick changed: it joins the turn as it is. - await expect(send('joins', 'opus')).resolves.toMatchObject({ state: 'admitted' }) - expect(models()).toEqual(['sonnet']) - expect(settings()).toEqual(liveSettings) - claudeTurnEnds(connection) - const mail = { - ...USER_MESSAGE, - from: { - kind: 'agent' as const, - senders: [], - orchestration: { - message: 'mail-notice' as const, - mailbox: 'agent:worker', - dispatchId: null, - messages: [] - } - } - } - await expect(send('mail', 'opus', mail)).resolves.toMatchObject({ state: 'admitted' }) - expect(models()).toEqual(['sonnet']) - expect(settings()).toEqual(liveSettings) - const held = Promise.withResolvers() - const entered = Promise.withResolvers() - const original = dispatchContent.claudeDispatchMessageContent - const content = vi - .spyOn(dispatchContent, 'claudeDispatchMessageContent') - .mockImplementationOnce(async (body) => { - entered.resolve() - await held.promise - return original(body) - }) - const delayed = send('next', 'opus') - try { - await entered.promise - claudeTurnEnds(connection) - held.resolve() - await expect(delayed).resolves.toMatchObject({ state: 'admitted' }) - } finally { - held.resolve() - content.mockRestore() - } - expect(models()).toEqual(['sonnet', 'opus']) - expect(settings()).toContainEqual({ - subtype: 'apply_flag_settings', - params: { settings: { effortLevel: 'low' } } - }) - expect(settings()).toContainEqual({ - subtype: 'apply_flag_settings', - params: { settings: { fastMode: true } } - }) - expect(connection.sent).toHaveLength(4) - claudeTurnEnds(connection) - const settingsAfterTurn = [...settings()] - const originalSend = connection.send - connection.send = async (message, prepare) => { - await prepare?.() - connection.sent.push(message) - } - try { - await expect(send('starts', 'opus')).resolves.toMatchObject({ state: 'admitted' }) - expect(models()).toEqual(['sonnet', 'opus', 'opus']) - expect(settings()).toEqual([ - ...settingsAfterTurn, - { subtype: 'apply_flag_settings', params: { settings: { effortLevel: 'low' } } }, - { subtype: 'apply_flag_settings', params: { settings: { fastMode: true } } } - ]) - const settingsAtStart = [...settings()] - claudeFrame(connection, { - type: 'command_lifecycle', - state: 'started', - command_uuid: connection.sent.at(-1)?.uuid - }) - await expect(send('before-echo', 'sonnet')).resolves.toMatchObject({ state: 'admitted' }) - expect(models()).toEqual(['sonnet', 'opus', 'opus']) - expect(settings()).toEqual(settingsAtStart) - } finally { - connection.send = originalSend - await adapter.closeAll() - } - }) -}) - -it('applies explicit planning at fresh turns, preserves startup permission fallback, and leaves steers alone', async () => { - const claude = fakeClaude({ initPermissionMode: 'default' }) - const adapter = await acquired(claude, { - options: claudeStructuredPermissionOptions('full-access') - }) - const connection = claude.connections[0]! - claudeFrame(connection, { - type: 'system', - subtype: 'init', - model: 'claude-opus-5-5', - permissionMode: 'default' - }) - const setMode = vi.spyOn(connection, 'setPermissionMode').mockResolvedValue(undefined) - const send = (id: string, mode?: 'plan' | 'default') => - adapter.dispatch({ - sessionId: 'session-1', - clientMessageId: id, - body: USER_MESSAGE, - fence: 7, - executionOptions: mode ? { interactionMode: mode } : {} - }) - await send('own') - expect(setMode).not.toHaveBeenCalled() - claudeTurnEnds(connection) - await send('plan', 'plan') - expect(setMode).toHaveBeenLastCalledWith('plan', { timeoutMs: undefined }) - await send('steer', 'default') - expect(setMode).toHaveBeenCalledTimes(1) - claudeTurnEnds(connection) - await send('build', 'default') - expect(setMode).toHaveBeenLastCalledWith('default', { timeoutMs: undefined }) - claudeTurnEnds(connection) - claudeFrame(connection, { type: 'system', subtype: 'status', permissionMode: 'plan' }) - await send('build-again', 'default') - expect(setMode).toHaveBeenCalledTimes(3) - await adapter.closeAll() -}) diff --git a/src/main/claude/structured/launch/claude-structured-message-options.ts b/src/main/claude/structured/launch/claude-structured-message-options.ts index abd34fe3d5b..ee56bdbdada 100644 --- a/src/main/claude/structured/launch/claude-structured-message-options.ts +++ b/src/main/claude/structured/launch/claude-structured-message-options.ts @@ -1,5 +1,5 @@ -import { claudeBuildPermissionMode } from '../../claude-plan-approval-mode' -import { claudeStartedUnechoedSend } from '../../claude-command-lifecycle' +import { claudeBuildPermissionMode } from '../permissions/claude-plan-approval-mode' +import { claudeStartedUnechoedSend } from '../turns/claude-command-lifecycle' import { claudeExecutionObservations } from '../claude-structured-execution-observations' import { dispatchClaudeTurn } from '../claude-structured-dispatch' import type { StructuredAgentSessionAdapter } from '../../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' diff --git a/src/main/claude/structured/launch/claude-structured-options-context-window.test.ts b/src/main/claude/structured/launch/claude-structured-options-context-window.test.ts deleted file mode 100644 index ad87ada94a1..00000000000 --- a/src/main/claude/structured/launch/claude-structured-options-context-window.test.ts +++ /dev/null @@ -1,58 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' -import { ClaudeControlRequestError } from '../../claude-agent-sdk-control-requests' -import { selectStructuredAgentContextUsage } from '../../../../shared/agent-session/structured-agent-session-context-usage' -import { assistantFrame, journal, userFrame } from '../../claude-context-usage-test-support' -import { sessionFor } from '../claude-structured-dispatch-test-support' -import { createClaudeJournalTranslator } from '../journal/claude-structured-journal-translation' -import { setClaudeStructuredOption } from './claude-structured-options' -import { adoptClaudeStructuredSpawnOptions } from './claude-structured-spawn-options' -import type { ClaudeSession } from '../claude-structured-session-state' - -function ringSession(catalog: unknown[] = []) { - const session = sessionFor() - const setModel = vi.fn(async () => undefined) - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: supplies every connection member a model write and its catalog read call. - session.connection = { - ...session.connection, - setModel, - supportedModels: async () => catalog - } as ClaudeSession['connection'] - const state = journal() - const translator = createClaudeJournalTranslator({ sink: state.sink, coalesceMs: 0 }) - session.translator = translator - const write = (key: string, value: string) => - setClaudeStructuredOption(session, { key, value }, undefined) - const respond = (turnId: string, at: number) => { - translator.handle(userFrame(turnId, at)) - translator.handle(assistantFrame(`${turnId}-reply`, at + 1, 100_000)) - return selectStructuredAgentContextUsage(state.items()) - } - return { session, setModel, write, respond } -} - -describe('the context ring after a session option write', () => { - it('sizes a new session from the model it was launched with', () => { - const s = ringSession() - adoptClaudeStructuredSpawnOptions(s.session, { - sdkOptions: { model: 'opus[1m]' }, - options: new Map([['model', 'opus[1m]']]), - fastModeAtStart: false - }) - expect(s.respond('turn-a', 1_000)).toMatchObject({ windowTokens: 1_000_000, percentage: 10 }) - }) - - it('sizes estimates from a live model write straight away', async () => { - const s = ringSession() - await s.write('model', 'sonnet') - expect(s.respond('turn-a', 1_000)).toBeNull() - await s.write('model', 'sonnet[1m]') - expect(s.respond('turn-b', 2_000)).toMatchObject({ windowTokens: 1_000_000, percentage: 10 }) - }) - - it('implies no window for a model the child refused', async () => { - const refused = ringSession() - refused.setModel.mockRejectedValueOnce(new ClaudeControlRequestError('set_model', 'refused')) - await expect(refused.write('model', 'opus[1m]')).rejects.toThrow() - expect(refused.respond('turn-a', 1_000)).toBeNull() - }) -}) diff --git a/src/main/claude/structured/launch/claude-structured-options.test.ts b/src/main/claude/structured/launch/claude-structured-options.test.ts deleted file mode 100644 index 0caf086fbf8..00000000000 --- a/src/main/claude/structured/launch/claude-structured-options.test.ts +++ /dev/null @@ -1,85 +0,0 @@ -import { ClaudeJournalBoundDelivery } from '../../claude-journal-bound-delivery' -import { describe, expect, it, vi } from 'vitest' -import { setClaudeStructuredOption } from './claude-structured-options' -import type { ClaudeSession } from '../claude-structured-session-state' -import { ClaudeBackgroundTaskTracker } from '../../claude-background-task-tracker' -import { ClaudeChildWorkDecoder } from '../../claude-child-work-decoder' -import { ClaudeSlashCommandCatalog } from '../../claude-slash-command-catalog' -import { createClaudeInitProof } from '../claude-structured-init-proof' -import { createClaudeStartupOutcome } from '../claude-structured-startup-outcome' -import { claudeProviderHandleLink } from '../claude-structured-owner-identity' - -vi.mock('@orca/process-host', () => ({ runProcess: vi.fn() })) - -function sessionFor(setModel: ClaudeSession['connection']['setModel']): ClaudeSession { - return { - connection: { - setModel, - supportedModels: async (): Promise => [] - } as ClaudeSession['connection'], - providerSessionId: 'provider-session', - leafUuid: null, - turnEndLeafUuid: null, - fence: 1, - acquisitionGeneration: 'generation-1', - prompts: {} as ClaudeSession['prompts'], - dispatchWaiters: [], - retiredDispatchWaiters: [], - replayContentFallbackBlocked: false, - delivery: new ClaudeJournalBoundDelivery(), - backgroundTasks: new ClaudeBackgroundTaskTracker(), - childWork: new ClaudeChildWorkDecoder(), - commands: new ClaudeSlashCommandCatalog(), - dispatchSequence: 0, - optionMutationSequence: 0, - options: new Map(), - reportedOptions: {}, - reportedModelMutation: 0, - confirmedOptions: new Set(), - appliedInputOptions: new Map(), - fastModeAtStart: false, - capabilities: [], - events: undefined, - translator: null, - link: claudeProviderHandleLink({ - sessionId: 'provider-session', - leafUuid: null, - resumed: false, - fence: 1, - observedAt: 1 - }), - initialization: { - proof: createClaudeInitProof(), - account: undefined, - resumesTranscript: false, - claudeConfigDir: '/claude-home', - cwd: '/work', - history: { leafUuid: null, covered: true, contextActivity: 0 }, - onLateRefusal: () => {}, - startup: createClaudeStartupOutcome() - } - } -} - -describe('Claude structured option mutation fencing', () => { - it('does not let a delayed earlier apply overwrite a later option', async () => { - let releaseFirst!: () => void - const firstApply = new Promise((resolve) => { - releaseFirst = resolve - }) - const setModel = vi - .fn() - .mockReturnValueOnce(firstApply) - .mockResolvedValue(undefined) - const session = sessionFor(setModel) - - const first = setClaudeStructuredOption(session, { key: 'model', value: 'old' }, undefined) - await vi.waitFor(() => expect(setModel).toHaveBeenCalledTimes(1)) - const second = setClaudeStructuredOption(session, { key: 'model', value: 'new' }, undefined) - await expect(second).resolves.toEqual({ model: 'new' }) - - releaseFirst() - await expect(first).resolves.toEqual({ model: 'new' }) - expect(session.options).toEqual(new Map([['model', 'new']])) - }) -}) diff --git a/src/main/claude/structured/launch/claude-structured-options.ts b/src/main/claude/structured/launch/claude-structured-options.ts index d360ce78688..ea637485a7f 100644 --- a/src/main/claude/structured/launch/claude-structured-options.ts +++ b/src/main/claude/structured/launch/claude-structured-options.ts @@ -1,4 +1,4 @@ -import { ClaudeControlRequestError } from '../../claude-agent-sdk-control-requests' +import { ClaudeControlRequestError } from '../../sdk-transport/claude-agent-sdk-control-requests' import { AgentSessionOptionRejectedError, ClaudeEffortValidationError @@ -16,7 +16,7 @@ import { beginClaudeOptionMutation } from '../claude-structured-execution-observ import { CLAUDE_APPLY_FLAG_SETTINGS_CONTROL, CLAUDE_CACHED_FLAG_CHECK_BUDGET_MS -} from '../../claude-cli-flag-support' +} from '../../cli-capabilities/claude-cli-flag-support' const EFFORT_LEVELS = ['low', 'medium', 'high', 'xhigh', 'max'] as const diff --git a/src/main/claude/structured/launch/claude-structured-provider-fallback.ts b/src/main/claude/structured/launch/claude-structured-provider-fallback.ts index 8595432cc9f..f0fd7c56797 100644 --- a/src/main/claude/structured/launch/claude-structured-provider-fallback.ts +++ b/src/main/claude/structured/launch/claude-structured-provider-fallback.ts @@ -22,22 +22,22 @@ import { claudeText, type ClaudeMessageEnvelope } from '../journal/claude-structured-item-translation' -import { claudeResultOutcome } from '../../claude-result-outcome' +import { claudeResultOutcome } from '../turns/claude-result-outcome' import { isUnmodeledClaudeSystemFrame } from '../../../native-chat/agent-session-wire/providers/provider-frame-disposition' import { isClaudeToolUseContent, isClaudeToolResultContent } from '../../../../shared/claude-tool-content' -import type { ClaudeRowStamp } from '../../claude-provisional-row-corrections' +import type { ClaudeRowStamp } from '../../subagents/claude-provisional-row-corrections' import { CLAUDE_API_RETRY_FRAME_KIND, claudeApiRetryRowBody, createClaudeApiRetryRuns -} from '../../claude-api-retry-row' +} from '../journal/claude-api-retry-row' import { CLAUDE_INFORMATIONAL_FRAME_KIND, claudeInformationalRowBody -} from '../../claude-informational-row' +} from '../journal/claude-informational-row' export function claudeProviderFrameKind(message: Record): string { const type = claudeText(message.type) ?? 'unknown' diff --git a/src/main/claude/structured/launch/claude-structured-real-cli-options.test.ts b/src/main/claude/structured/launch/claude-structured-real-cli-options.test.ts deleted file mode 100644 index 6f0fb6ce0a2..00000000000 --- a/src/main/claude/structured/launch/claude-structured-real-cli-options.test.ts +++ /dev/null @@ -1,233 +0,0 @@ -import { randomUUID } from 'node:crypto' -import { mkdtemp, rm } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { describe, expect, it } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity' -import type { AgentSessionExecutionOptions } from '../../../../shared/agent-session/options/agent-session-execution-options' -import { readAgentJournalTurn } from '../../../../shared/agent-session/lifecycle/agent-session-turn-record' -import { - claudeProviderHandle, - claudeProviderHandleLeafUuid -} from '../../../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding' -import { - CLAUDE_STRUCTURED_BASE_OPTIONS, - claudeStructuredPermissionOptions -} from './claude-structured-launch-resolution' -import { listedModels } from './claude-structured-model-catalog' -import { ClaudeStructuredSessionAdapter } from '../claude-structured-session-adapter' -import type { ClaudeStructuredSessionEvent } from '../claude-structured-session-state' -import { - realClaudeAuthenticated, - realClaudeAvailable, - realClaudeCommand, - realClaudeLaunchHome -} from '../../claude-real-cli-availability-test-support' -import { claudeStartupSettled } from '../claude-structured-startup-settled-test-support' -import { journal } from '../../claude-context-usage-test-support' - -const SESSION_ID = 'real-cli-options' -// CLI effort order is unspecified. -const EFFORT_SCALE = ['low', 'medium', 'high', 'xhigh', 'max'] - -function identity(providerSessionId: string, leafUuid: string | null): AgentSessionJournalIdentity { - return { - sessionId: SESSION_ID, - workspaceId: 'real-cli-options-workspace', - hostId: 'local', - agent: 'claude', - providerHandle: claudeProviderHandle(providerSessionId, leafUuid) - } -} - -async function until(check: () => boolean, timeoutMs: number): Promise { - const deadline = Date.now() + timeoutMs - while (Date.now() < deadline) { - if (check()) { - return true - } - await new Promise((resolve) => setTimeout(resolve, 200)) - } - return check() -} - -// Inits name a 1M-window model with `[1m]`; context reports and responses drop it. -const baseModelId = (model: string): string => - model - .replace(/\[[^\]]*\]$/u, '') - .trim() - .toLowerCase() - -describe.skipIf(!realClaudeAvailable)('Claude structured real CLI options', () => { - it.skipIf(!realClaudeAuthenticated)( - 'applies a message model and effort, reports context usage, and relaunches into a new permission mode', - async () => { - const providerSessionId = randomUUID() - const { claudeConfigDir, env } = realClaudeLaunchHome() - const cwd = await mkdtemp(join(tmpdir(), 'orca-real-options-')) - const events: ClaudeStructuredSessionEvent[] = [] - const record = journal() - const persisted: { leafUuid: string | null } = { leafUuid: null } - let launches = 0 - const adapter = new ClaudeStructuredSessionAdapter({ - resolveLaunch: async ({ identity: launchIdentity, permissionMode }) => { - const permission = claudeStructuredPermissionOptions(permissionMode ?? 'ask') - const resumes = launches++ > 0 - return { - pathToClaudeCodeExecutable: realClaudeCommand, - options: { - ...CLAUDE_STRUCTURED_BASE_OPTIONS, - ...permission, - extraArgs: { ...CLAUDE_STRUCTURED_BASE_OPTIONS.extraArgs, ...permission.extraArgs }, - ...(resumes ? { resume: providerSessionId } : { sessionId: providerSessionId }) - }, - cwd, - env, - claudeConfigDir, - providerSessionId, - resumeLeafUuid: - resumes && launchIdentity.providerHandle - ? claudeProviderHandleLeafUuid(launchIdentity.providerHandle) - : null, - resumesTranscript: resumes, - cliFlag: async () => 'supported' as const, - continuesChain: resumes - } - }, - onEvent: (event) => events.push(event), - persistHandle: async (handle) => { - persisted.leafUuid = handle.leafUuid - }, - readProcessStartTime: async () => 1 - }) - const frames = (from: number) => - events.slice(from).flatMap((event) => (event.type === 'message' ? [event.message] : [])) - const inits = (from: number) => - frames(from).filter((message) => message.type === 'system' && message.subtype === 'init') - const results = (from: number) => frames(from).filter((message) => message.type === 'result') - const send = ( - clientMessageId: string, - text: string, - fence: number, - executionOptions?: AgentSessionExecutionOptions - ) => - adapter.dispatch({ - sessionId: SESSION_ID, - clientMessageId, - body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text }] }, - requestedAt: Date.now(), - fence, - ...(executionOptions ? { executionOptions } : {}) - }) - const contextReport = () => - record - .items() - .flatMap((row) => { - const used = readAgentJournalTurn(row.body)?.contextUsage?.used - return used?.kind === 'report' ? [used] : [] - }) - .at(-1) - - try { - await adapter.acquire({ - identity: identity(providerSessionId, null), - fence: 1, - spawnToken: 'real-cli-options-1', - permissionMode: 'ask', - events: record.sink - }) - await claudeStartupSettled(adapter, SESSION_ID) - - // Missing resolved IDs disable admission, effort validation and model confirmation. - const connection = adapter['sessions'].get(SESSION_ID)?.connection - if (!connection) { - throw new Error('no live Claude connection') - } - const listed = listedModels({ models: await connection.supportedModels() }) - const rows = ['haiku', 'sonnet'].map((alias) => listed.find(({ id }) => id === alias)) - for (const row of rows) { - expect(row?.resolvedModel).toEqual(expect.stringMatching(/\S/u)) - } - const opened = await adapter.readOptions({ sessionId: SESSION_ID, fence: 1 }) - expect(opened.catalogListing?.models.map(({ id }) => id)).toContain('haiku') - - const pick = rows.find((row) => row !== undefined && row.efforts.length > 0) - const level = pick?.efforts - .map(({ value }) => value) - .filter((value) => EFFORT_SCALE.includes(value)) - .sort((left, right) => EFFORT_SCALE.indexOf(left) - EFFORT_SCALE.indexOf(right))[0] - if (!pick?.resolvedModel || !level) { - throw new Error('neither haiku nor sonnet lists an effort level') - } - - // ranOptions may omit an alias pick; message metadata retains the requested model. - const firstTurn = events.length - const outcome = await send( - 'real-cli-options-1', - 'Reply with exactly: OK. Do not use any tools.', - 1, - { model: pick.id, effort: level } - ) - expect(outcome).toMatchObject({ state: 'admitted', ranOptions: { effort: level } }) - expect([undefined, pick.id]).toContain( - 'ranOptions' in outcome ? outcome.ranOptions?.model : undefined - ) - expect(await until(() => results(firstTurn).length > 0, 90_000)).toBe(true) - expect(results(firstTurn)[0]).toMatchObject({ subtype: 'success', is_error: false }) - expect(inits(firstTurn)[0]?.model).toBe(pick.resolvedModel) - expect(frames(0).filter((frame) => 'effortLevel' in frame)).toEqual([]) - await expect( - adapter.readOptions({ sessionId: SESSION_ID, fence: 1 }) - ).resolves.toMatchObject({ - current: { - model: pick.id, - effort: level, - confirmed: expect.arrayContaining(['model', 'effort']) - } - }) - - expect(await until(() => contextReport() !== undefined, 10_000)).toBe(true) - const report = contextReport() - if (!report) { - throw new Error('no context report on any turn row') - } - expect(report.usedTokens).toBeGreaterThan(0) - expect(report.windowTokens).toBeGreaterThanOrEqual(report.usedTokens) - expect(report.model).toMatch(/\S/u) - expect(baseModelId(report.model)).toBe(baseModelId(pick.resolvedModel)) - - // Permission changes relaunch the child with saved options instead of a live control request. - await adapter.closeSession(SESSION_ID) - const resumedTurn = events.length - await adapter.acquire({ - identity: identity(providerSessionId, persisted.leafUuid), - fence: 2, - spawnToken: 'real-cli-options-2', - permissionMode: 'accept-edits', - options: { model: pick.id, effort: level }, - events: record.sink - }) - await claudeStartupSettled(adapter, SESSION_ID) - await expect( - send('real-cli-options-2', 'Reply with exactly: OK.', 2) - ).resolves.toMatchObject({ - state: 'admitted' - }) - expect(await until(() => results(resumedTurn).length > 0, 90_000)).toBe(true) - expect(results(resumedTurn)[0]).toMatchObject({ subtype: 'success', is_error: false }) - expect(inits(resumedTurn)[0]).toMatchObject({ - session_id: providerSessionId, - permissionMode: 'acceptEdits', - model: pick.resolvedModel - }) - await expect( - adapter.readOptions({ sessionId: SESSION_ID, fence: 2 }) - ).resolves.toMatchObject({ current: { effort: level } }) - } finally { - await adapter.closeAll() - await rm(cwd, { recursive: true, force: true }) - } - }, - 180_000 - ) -}) diff --git a/src/main/claude/structured/launch/claude-structured-spawn-options.ts b/src/main/claude/structured/launch/claude-structured-spawn-options.ts index da37c5bfbff..f80019f5d3e 100644 --- a/src/main/claude/structured/launch/claude-structured-spawn-options.ts +++ b/src/main/claude/structured/launch/claude-structured-spawn-options.ts @@ -8,7 +8,7 @@ import { claudeEffortLevel, restoredClaudeStructuredSessionOptions } from './claude-structured-options' -import type { ClaudeCliFlagFact } from '../../claude-cli-flag-support' +import type { ClaudeCliFlagFact } from '../../cli-capabilities/claude-cli-flag-support' /** Saved choices replace configured flags so the CLI receives each flag once. */ function withoutConfiguredFlag( diff --git a/src/main/claude/claude-can-use-tool-test-support.ts b/src/main/claude/structured/permissions/claude-can-use-tool-test-support.ts similarity index 91% rename from src/main/claude/claude-can-use-tool-test-support.ts rename to src/main/claude/structured/permissions/claude-can-use-tool-test-support.ts index 99f0b18d001..23f912f5630 100644 --- a/src/main/claude/claude-can-use-tool-test-support.ts +++ b/src/main/claude/structured/permissions/claude-can-use-tool-test-support.ts @@ -1,5 +1,5 @@ import type { CanUseTool } from '@anthropic-ai/claude-agent-sdk' -import type { FakeConnection } from './structured/claude-structured-session-test-support' +import type { FakeConnection } from '../claude-structured-session-test-support' type CanUseToolOptions = Parameters[2] diff --git a/src/main/claude/claude-permission-presentation.ts b/src/main/claude/structured/permissions/claude-permission-presentation.ts similarity index 93% rename from src/main/claude/claude-permission-presentation.ts rename to src/main/claude/structured/permissions/claude-permission-presentation.ts index 2f10774ac89..43a6d415774 100644 --- a/src/main/claude/claude-permission-presentation.ts +++ b/src/main/claude/structured/permissions/claude-permission-presentation.ts @@ -1,9 +1,9 @@ import type { CanUseTool } from '@anthropic-ai/claude-agent-sdk' -import type { AgentJournalApprovalSubject } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalApprovalSubject } from '../../../../shared/agent-session/journal/agent-session-journal-approval-subject' import { stripAnsiEscapeSequences, TERMINAL_CONTROL_CHARACTER_PATTERN -} from '../../shared/ansi-escape-sequences' +} from '../../../../shared/ansi-escape-sequences' import type { ClaudePromptPresentation } from './claude-prompt-registry' type ClaudePermissionOptions = Parameters[2] diff --git a/src/main/claude/claude-plan-approval-mode.ts b/src/main/claude/structured/permissions/claude-plan-approval-mode.ts similarity index 97% rename from src/main/claude/claude-plan-approval-mode.ts rename to src/main/claude/structured/permissions/claude-plan-approval-mode.ts index 19270359907..4cdf7113e22 100644 --- a/src/main/claude/claude-plan-approval-mode.ts +++ b/src/main/claude/structured/permissions/claude-plan-approval-mode.ts @@ -1,6 +1,6 @@ import type { PermissionMode, PermissionResult } from '@anthropic-ai/claude-agent-sdk' import type { ClaudePendingPrompt } from './claude-prompt-registry' -import type { ClaudeSession } from './structured/claude-structured-session-state' +import type { ClaudeSession } from '../claude-structured-session-state' /** This process's requested mode, else its first init's; anything else asks for each edit. */ export function claudePlanApprovalMode( diff --git a/src/main/claude/claude-prompt-registry.ts b/src/main/claude/structured/permissions/claude-prompt-registry.ts similarity index 98% rename from src/main/claude/claude-prompt-registry.ts rename to src/main/claude/structured/permissions/claude-prompt-registry.ts index ff4528e38ef..ab121767958 100644 --- a/src/main/claude/claude-prompt-registry.ts +++ b/src/main/claude/structured/permissions/claude-prompt-registry.ts @@ -2,7 +2,7 @@ import type { PermissionResult, PermissionUpdate } from '@anthropic-ai/claude-ag import type { AgentJournalApprovalMatchedAskRule, AgentJournalApprovalSubject -} from '../../shared/agent-session/journal/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-approval-subject' /** Settles the SDK's `canUseTool` promise; `null` writes no provider response. */ export type ClaudePromptSettle = (response: PermissionResult | null) => void diff --git a/src/main/claude/claude-command-lifecycle-frames.test.ts b/src/main/claude/structured/turns/claude-command-lifecycle-frames.test.ts similarity index 85% rename from src/main/claude/claude-command-lifecycle-frames.test.ts rename to src/main/claude/structured/turns/claude-command-lifecycle-frames.test.ts index bdd6b24c593..4a5761ed64a 100644 --- a/src/main/claude/claude-command-lifecycle-frames.test.ts +++ b/src/main/claude/structured/turns/claude-command-lifecycle-frames.test.ts @@ -1,8 +1,8 @@ import { describe, expect, it, vi } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import { createClaudeJournalTranslator } from './structured/journal/claude-structured-journal-translation' +import type { AgentJournalItemBody } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity' +import type { StructuredAgentSessionEventSink } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import { createClaudeJournalTranslator } from '../journal/claude-structured-journal-translation' function sinkState() { const items: { identity: AgentJournalItemIdentity; body: AgentJournalItemBody }[] = [] diff --git a/src/main/claude/claude-command-lifecycle.test.ts b/src/main/claude/structured/turns/claude-command-lifecycle.test.ts similarity index 68% rename from src/main/claude/claude-command-lifecycle.test.ts rename to src/main/claude/structured/turns/claude-command-lifecycle.test.ts index 312dcfccedc..71ed654e0b9 100644 --- a/src/main/claude/claude-command-lifecycle.test.ts +++ b/src/main/claude/structured/turns/claude-command-lifecycle.test.ts @@ -3,20 +3,18 @@ import { readFileSync } from 'node:fs' import { join } from 'node:path' import { describe, expect, it } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' -import { readAgentJournalTurn } from '../../shared/agent-session/lifecycle/agent-session-turn-record' -import { DISPATCH_REJECTED_CANCELLED } from '../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' -import { DISPATCH_DOUBT_PROVIDER_ENDED_UNANSWERED } from '../native-chat/agent-session-journal/projection/journal-dispatch-doubt-reasons' -import { ClaudeControlRequestError } from './claude-agent-sdk-control-requests' -import { ClaudeStructuredSessionAdapter } from './structured/claude-structured-session-adapter' -import type { ClaudeLateDispatchOutcome } from './structured/claude-structured-session-state' +import type { AgentJournalItemBody } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import { readAgentJournalTurn } from '../../../../shared/agent-session/lifecycle/agent-session-turn-record' + +import { ClaudeStructuredSessionAdapter } from '../claude-structured-session-adapter' +import type { ClaudeLateDispatchOutcome } from '../claude-structured-session-state' import { fakeClaude, identityFor, PROVIDER_SESSION_ID, type FakeConnection -} from './structured/claude-structured-session-test-support' -import { claudeStartupSettled } from './structured/claude-structured-startup-settled-test-support' +} from '../claude-structured-session-test-support' +import { claudeStartupSettled } from '../claude-structured-startup-settled-test-support' type CapturedEvent = | { kind: 'meta'; providerSessionId: string } @@ -62,7 +60,7 @@ function decodeCapturedEvent(value: unknown): CapturedEvent { } function loadCapture(name: string): CapturedEvent[] { - const path = join(__dirname, '__fixtures__', `claude-lifecycle-capture-${name}.jsonl`) + const path = join(__dirname, '../../__fixtures__', `claude-lifecycle-capture-${name}.jsonl`) return readFileSync(path, 'utf8') .trim() .split('\n') @@ -236,61 +234,6 @@ async function replayCapture( return { settlementsFor, turnStates, liveUuid, connection, adapter } } -const WITHDRAWN = { - state: 'rejected', - unrun: true, - reason: DISPATCH_REJECTED_CANCELLED, - rejection: { kind: 'cancelled' } -} - -function acceptedAs(uuid: string) { - return { providerIdentity: { provider: 'claude', sessionId: PROVIDER_SESSION_ID, uuid } } -} - -function stopWithInterruptAnswer(answer: 'recorded' | 'lost') { - return async (point: ControlPoint): Promise => { - point.routes.interrupt = () => { - point.deliverInFlight() - if (answer === 'lost') { - throw new ClaudeControlRequestError('interrupt', 'Control request timed out') - } - return point.answer - } - await point.adapter.cancelTurn({ sessionId: 'session-1', fence: 7 }) - } -} - -describe('a Stop whose interrupt cancelled a queued follow-up (cancel_queued)', () => { - it.each(['recorded', 'lost'] as const)( - 'withdraws the follow-up once when the interrupt answer is %s, and leaves the stopped turn’s message accepted', - async (answer) => { - const replay = await replayCapture('interrupt-lost', { - atControl: stopWithInterruptAnswer(answer) - }) - - expect(replay.connection.calls.filter((call) => call.subtype === 'interrupt')).toEqual([ - { subtype: 'interrupt', params: { cancelQueued: true } } - ]) - expect(replay.settlementsFor('client-B')).toEqual([WITHDRAWN]) - expect(replay.settlementsFor('client-A')).toEqual([acceptedAs(replay.liveUuid('client-A'))]) - } - ) -}) - -describe('a queued send the CLI withdraws without Orca hearing why', () => { - it('withdraws only the batch lead; the send behind it runs as its own turn and is accepted', async () => { - const replay = await replayCapture('batch-lead') - - expect(replay.settlementsFor('client-B')).toEqual([WITHDRAWN]) - expect(replay.settlementsFor('client-A')).toEqual([acceptedAs(replay.liveUuid('client-A'))]) - expect(replay.settlementsFor('client-C')).toEqual([acceptedAs(replay.liveUuid('client-C'))]) - expect([...replay.turnStates.entries()]).toEqual([ - [replay.liveUuid('client-A'), 'completed'], - [replay.liveUuid('client-C'), 'completed'] - ]) - }) -}) - function isTurnOutput(frame: Record): boolean { return frame.type === 'user' || frame.type === 'assistant' || frame.type === 'result' } @@ -299,35 +242,6 @@ function isLifecycleFrame(frame: Record, state?: string): boole return frame.type === 'command_lifecycle' && (state === undefined || frame.state === state) } -const ENDED_IN_DOUBT = { state: 'unknown', reason: DISPATCH_DOUBT_PROVIDER_ENDED_UNANSWERED } - -describe('a send the CLI started, then cancelled', () => { - it('stays started when a redelivered command re-emits queued before its cancelled frame', async () => { - const replay = await replayCapture('auth-failed', { - omitFrame: isTurnOutput, - afterFrame: (frame) => - isLifecycleFrame(frame, 'started') ? [{ ...frame, state: 'queued' }] : [] - }) - - expect(replay.settlementsFor('client-A')).toEqual([ENDED_IN_DOUBT]) - }) - - it('is still accepted when its echo lands after the doubt', async () => { - const replay = await replayCapture('auth-failed', { omitFrame: isTurnOutput }) - const uuid = replay.liveUuid('client-A') - - replay.connection.handlers.onMessage?.({ - type: 'user', - message: { role: 'user', content: [{ type: 'text', text: 'late echo' }] }, - parent_tool_use_id: null, - session_id: PROVIDER_SESSION_ID, - uuid - }) - - expect(replay.settlementsFor('client-A')).toEqual([ENDED_IN_DOUBT, acceptedAs(uuid)]) - }) -}) - describe('a send the CLI holds', () => { // CLI 2.1.280 can report idle before rereading its queue. diff --git a/src/main/claude/claude-command-lifecycle.ts b/src/main/claude/structured/turns/claude-command-lifecycle.ts similarity index 90% rename from src/main/claude/claude-command-lifecycle.ts rename to src/main/claude/structured/turns/claude-command-lifecycle.ts index 456b458e876..e08fa2c1b6d 100644 --- a/src/main/claude/claude-command-lifecycle.ts +++ b/src/main/claude/structured/turns/claude-command-lifecycle.ts @@ -3,18 +3,18 @@ import { agentSessionFailureFact, type SubmissionRejectionKind -} from '../../shared/agent-session/failures/agent-session-failure' +} from '../../../../shared/agent-session/failures/agent-session-failure' import { DISPATCH_DOUBT_PROVIDER_ENDED_UNANSWERED, DISPATCH_DOUBT_PROVIDER_IDLE -} from '../native-chat/agent-session-journal/projection/journal-dispatch-doubt-reasons' +} from '../../../native-chat/agent-session-journal/projection/journal-dispatch-doubt-reasons' import { rejectClaudeDispatchWaiters, releaseClaudeDispatchWaitersInDoubt -} from './structured/claude-structured-dispatch' -import { readClaudeFrameString } from './structured/claude-structured-init-proof' +} from '../claude-structured-dispatch' +import { readClaudeFrameString } from '../claude-structured-init-proof' import type { ClaudeLateDispatchSettlement } from './claude-replay-turn-resolution' -import type { ClaudeSession, ClaudeStartedSend } from './structured/claude-structured-session-state' +import type { ClaudeSession, ClaudeStartedSend } from '../claude-structured-session-state' const UNSTARTED_VERDICT = { cancelled: 'cancelled', diff --git a/src/main/claude/claude-command-turn.test.ts b/src/main/claude/structured/turns/claude-command-turn.test.ts similarity index 70% rename from src/main/claude/claude-command-turn.test.ts rename to src/main/claude/structured/turns/claude-command-turn.test.ts index cd55f33d809..6772166f9e9 100644 --- a/src/main/claude/claude-command-turn.test.ts +++ b/src/main/claude/structured/turns/claude-command-turn.test.ts @@ -1,17 +1,16 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' -import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import type { AgentJournalTurnScope } from '../../shared/agent-session/journal/agent-session-journal-turn-scope' -import { readAgentJournalTurn } from '../../shared/agent-session/lifecycle/agent-session-turn-record' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import type { StructuredAgentSessionRevisionJournal } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-journal-views' +import { agentJournalItemKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity' +import type { AgentJournalTurnScope } from '../../../../shared/agent-session/journal/agent-session-journal-turn-scope' +import { readAgentJournalTurn } from '../../../../shared/agent-session/lifecycle/agent-session-turn-record' +import type { StructuredAgentSessionEventSink } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import type { StructuredAgentSessionRevisionJournal } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-journal-views' import { CAPTURED_COMPACT_SESSION_ID, - CAPTURED_COMPACT_STOPPED_THEN_SEND, type CapturedCompactEvent -} from './claude-captured-compact-frames.test-fixture' -import { createClaudeJournalTranslator } from './structured/journal/claude-structured-journal-translation' +} from '../../fixtures/claude-captured-compact-frames.test-fixture' +import { createClaudeJournalTranslator } from '../journal/claude-structured-journal-translation' const COMMAND_IDENTITY: AgentJournalItemIdentity = { provider: 'orca', @@ -19,7 +18,7 @@ const COMMAND_IDENTITY: AgentJournalItemIdentity = { } const COMMAND_KEY = agentJournalItemKey(COMMAND_IDENTITY) const NOW = 1_800_000_000_000 -const IN_COMMAND: AgentJournalTurnScope = { kind: 'turn', turnItemId: COMMAND_KEY } + const RUNNING = { kind: 'turn' as const, turnId: 'compact:cmd-1', @@ -120,21 +119,6 @@ function harness() { } describe('a captured /compact as the open Claude turn', () => { - it("ends a stopped compaction as the user's cancellation, then answers the next send in its own turn", () => { - const { replay, commandTurn, drawn, rows } = harness() - replay(CAPTURED_COMPACT_STOPPED_THEN_SEND) - - expect(commandTurn()).toMatchObject({ state: 'interrupted', outcome: 'cancellation' }) - const answer = drawn().find((row) => row.body.kind === 'message') - expect(answer?.body).toMatchObject({ role: 'assistant' }) - expect(answer?.turnScope).not.toEqual(IN_COMMAND) - const answered = readAgentJournalTurn( - answer?.turnScope?.kind === 'turn' ? rows.get(answer.turnScope.turnItemId)?.body : undefined - ) - expect(answered).toMatchObject({ state: 'completed', outcome: 'success' }) - expect(drawn().filter((row) => row.body.kind === 'status')).toEqual([]) - }) - it('leaves the command running at a result that names another input', () => { const { begin, frame, commandTurn, translator } = harness() begin('compact-input') diff --git a/src/main/claude/claude-command-turn.ts b/src/main/claude/structured/turns/claude-command-turn.ts similarity index 80% rename from src/main/claude/claude-command-turn.ts rename to src/main/claude/structured/turns/claude-command-turn.ts index 16d722eda14..67791d6d8c2 100644 --- a/src/main/claude/claude-command-turn.ts +++ b/src/main/claude/structured/turns/claude-command-turn.ts @@ -1,23 +1,23 @@ // Command output stays off the reply timeline; only the command's result ends its turn. -import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity' +import { agentJournalItemKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import { providerDiagnostic, type ProviderDiagnostic -} from '../../shared/agent-session/failures/agent-session-failure' -import { agentSessionFailureWords } from '../../shared/agent-session/failures/agent-session-failure-words' -import { TUI_AGENT_DISPLAY_NAMES } from '../../shared/agent-launch/catalog/tui-agent-display-names' -import type { StructuredAgentSessionCommandRun } from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' -import { structuredCompactionOutcome } from '../native-chat/agent-session-wire/operations/structured-conversation-command-outcome' -import { claudeText } from './structured/journal/claude-structured-item-translation' -import { claudeResultFailure } from './structured/launch/claude-structured-provider-fallback' +} from '../../../../shared/agent-session/failures/agent-session-failure' +import { agentSessionFailureWords } from '../../../../shared/agent-session/failures/agent-session-failure-words' +import { TUI_AGENT_DISPLAY_NAMES } from '../../../../shared/agent-launch/catalog/tui-agent-display-names' +import type { StructuredAgentSessionCommandRun } from '../../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +import { structuredCompactionOutcome } from '../../../native-chat/agent-session-wire/operations/structured-conversation-command-outcome' +import { claudeText } from '../journal/claude-structured-item-translation' +import { claudeResultFailure } from '../launch/claude-structured-provider-fallback' import type { ClaudeCurrentTurn, ClaudeTurnEnd } from './claude-turn-lifecycle-item' import { isRootClaudeFrame } from './claude-turn-opening' import type { ClaudeOpenTurn } from './claude-open-turn' -import type { ClaudeUsageLimits } from './claude-usage-limits' -import type { ClaudeAssistantFailures } from './claude-assistant-failures' +import type { ClaudeUsageLimits } from '../journal/claude-usage-limits' +import type { ClaudeAssistantFailures } from '../journal/claude-assistant-failures' export type ClaudeCommandTurn = { identity: AgentJournalItemIdentity diff --git a/src/main/claude/claude-open-turn.ts b/src/main/claude/structured/turns/claude-open-turn.ts similarity index 86% rename from src/main/claude/claude-open-turn.ts rename to src/main/claude/structured/turns/claude-open-turn.ts index d4eb8a5d0e9..a213b8bd60e 100644 --- a/src/main/claude/claude-open-turn.ts +++ b/src/main/claude/structured/turns/claude-open-turn.ts @@ -1,21 +1,21 @@ -import type { AgentSessionContextUsage } from '../../shared/agent-session/agent-session-context-usage' -import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import type { AgentJournalTurnScope } from '../../shared/agent-session/journal/agent-session-journal-turn-scope' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import type { AgentSessionContextUsage } from '../../../../shared/agent-session/agent-session-context-usage' +import { agentJournalItemKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity' +import type { AgentJournalTurnScope } from '../../../../shared/agent-session/journal/agent-session-journal-turn-scope' +import type { StructuredAgentSessionEventSink } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' import { claudeCurrentTurnIdentity, claudeTurnLifecycleItem, type ClaudeCurrentTurn, type ClaudeTurnEnd } from './claude-turn-lifecycle-item' -import { writeAgentJournalTurnRow } from '../native-chat/agent-session-timeline/agent-journal-turn-row-revision' +import { writeAgentJournalTurnRow } from '../../../native-chat/agent-session-timeline/agent-journal-turn-row-revision' import type { ClaudeCommandTurn } from './claude-command-turn' import { createClaudeTurnOpener, type ClaudeTurnSource } from './claude-turn-opening' -import { refineClaudeQuotaTurnEnd } from './claude-terminal-failure' -import type { ClaudeUsageLimitEvidence } from './claude-usage-limits' -import type { ClaudeStartedSend } from './structured/claude-structured-session-state' +import { refineClaudeQuotaTurnEnd } from '../journal/claude-terminal-failure' +import type { ClaudeUsageLimitEvidence } from '../journal/claude-usage-limits' +import type { ClaudeStartedSend } from '../claude-structured-session-state' export type ClaudeOpenTurnDeps = { sink: StructuredAgentSessionEventSink diff --git a/src/main/claude/claude-replay-turn-resolution.ts b/src/main/claude/structured/turns/claude-replay-turn-resolution.ts similarity index 95% rename from src/main/claude/claude-replay-turn-resolution.ts rename to src/main/claude/structured/turns/claude-replay-turn-resolution.ts index 50cb95df847..2700ec9b68a 100644 --- a/src/main/claude/claude-replay-turn-resolution.ts +++ b/src/main/claude/structured/turns/claude-replay-turn-resolution.ts @@ -3,18 +3,18 @@ import { releaseClaudeDispatchesUnansweredAtIdle } from './claude-command-lifecycle' import { claudeSessionStateEndsTurn } from './claude-session-state-turn-over' -import { forgetRetiredWaiter } from './structured/claude-structured-dispatch-waiters' +import { forgetRetiredWaiter } from '../claude-structured-dispatch-waiters' import { claudeHasReplayContent, readClaudeMessageEnvelope -} from './structured/journal/claude-structured-item-translation' +} from '../journal/claude-structured-item-translation' import type { ClaudeDispatchWaiter, ClaudeLateDispatchOutcome, ClaudeSession -} from './structured/claude-structured-session-state' -import { readClaudeFrameString } from './structured/claude-structured-init-proof' -import { claudeDispatchContentKey } from './structured/claude-structured-dispatch-content' +} from '../claude-structured-session-state' +import { readClaudeFrameString } from '../claude-structured-init-proof' +import { claudeDispatchContentKey } from '../claude-structured-dispatch-content' /** Settle provider-proven delivery independently of replay-row acceptance reconciliation. */ export type ClaudeLateDispatchSettlement = (input: ClaudeLateDispatchOutcome) => void diff --git a/src/main/claude/claude-request-end-wait.test.ts b/src/main/claude/structured/turns/claude-request-end-wait.test.ts similarity index 68% rename from src/main/claude/claude-request-end-wait.test.ts rename to src/main/claude/structured/turns/claude-request-end-wait.test.ts index 5cadb80089d..f88c771841d 100644 --- a/src/main/claude/claude-request-end-wait.test.ts +++ b/src/main/claude/structured/turns/claude-request-end-wait.test.ts @@ -2,10 +2,9 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { awaitClaudeRequestEnd, CLAUDE_STOP_GRACE_MS, - claudeStoppedRequestEndWait, settleClaudeTurnEndWaiters } from './claude-request-end-wait' -import type { ClaudeSession } from './structured/claude-structured-session-state' +import type { ClaudeSession } from '../claude-structured-session-state' type InFlight = { translator: { currentTurnId: string | null }; dispatchWaiters: unknown[] } @@ -21,10 +20,6 @@ function claudeWith( return { claude: state as unknown as ClaudeSession, state } } -function session(currentTurnId: string | null = 'turn-1'): ClaudeSession { - return claudeWith(currentTurnId).claude -} - async function settledWithin(promise: Promise, ms: number): Promise { let settled = false void promise.then(() => { @@ -54,16 +49,4 @@ describe("a Stop's wait for Claude to wind down what it has in flight", () => { settleClaudeTurnEndWaiters(claude) expect(await settledWithin(waiting, 0)).toBe(true) }) - - it('waits only what the interrupt left of the grace, and nothing for a session that is gone', async () => { - const sessions = new Map([['session-1', session()]]) - const wait = claudeStoppedRequestEndWait(sessions) - const stoppedAt = Date.now() - await vi.advanceTimersByTimeAsync(CLAUDE_STOP_GRACE_MS - 1_000) - const waiting = wait('session-1', stoppedAt) - - expect(await settledWithin(waiting, 999)).toBe(false) - expect(await settledWithin(waiting, 1)).toBe(true) - expect(await settledWithin(wait('session-2', Date.now()), 0)).toBe(true) - }) }) diff --git a/src/main/claude/claude-request-end-wait.ts b/src/main/claude/structured/turns/claude-request-end-wait.ts similarity index 96% rename from src/main/claude/claude-request-end-wait.ts rename to src/main/claude/structured/turns/claude-request-end-wait.ts index d1ca6b61612..b9f7f952294 100644 --- a/src/main/claude/claude-request-end-wait.ts +++ b/src/main/claude/structured/turns/claude-request-end-wait.ts @@ -1,6 +1,6 @@ // Stop grace follows the provider request, including sends whose echo has not opened a turn yet. -import type { ClaudeSession } from './structured/claude-structured-session-state' +import type { ClaudeSession } from '../claude-structured-session-state' /** Interrupt acknowledgement and request wind-down share this budget. */ export const CLAUDE_STOP_GRACE_MS = 3_000 diff --git a/src/main/claude/claude-result-outcome.ts b/src/main/claude/structured/turns/claude-result-outcome.ts similarity index 78% rename from src/main/claude/claude-result-outcome.ts rename to src/main/claude/structured/turns/claude-result-outcome.ts index c9a07206414..3184382d1de 100644 --- a/src/main/claude/claude-result-outcome.ts +++ b/src/main/claude/structured/turns/claude-result-outcome.ts @@ -1,5 +1,5 @@ -import type { AgentJournalTurnOutcome } from '../../shared/agent-status/lifecycle/agent-turn-outcome' -import { claudeText } from './structured/journal/claude-structured-item-translation' +import type { AgentJournalTurnOutcome } from '../../../../shared/agent-status/lifecycle/agent-turn-outcome' +import { claudeText } from '../journal/claude-structured-item-translation' /** User stops are error results too; abort reasons distinguish cancellation from failure. */ const CLAUDE_ABORTED_TERMINAL_REASONS = new Set(['aborted_streaming', 'aborted_tools']) diff --git a/src/main/claude/claude-session-state-turn-over.ts b/src/main/claude/structured/turns/claude-session-state-turn-over.ts similarity index 83% rename from src/main/claude/claude-session-state-turn-over.ts rename to src/main/claude/structured/turns/claude-session-state-turn-over.ts index ad42c0d3ae4..7f16398cc10 100644 --- a/src/main/claude/claude-session-state-turn-over.ts +++ b/src/main/claude/structured/turns/claude-session-state-turn-over.ts @@ -1,7 +1,7 @@ // Idle ends turns even when results are missing; requires_action stays open for pending user input. -import { claudeText } from './structured/journal/claude-structured-item-translation' -import type { ClaudeJournalTranslator } from './claude-journal-translator-contract' +import { claudeText } from '../journal/claude-structured-item-translation' +import type { ClaudeJournalTranslator } from '../journal/claude-journal-translator-contract' function isClaudeSessionStateFrame(message: Record): boolean { return message.type === 'system' && message.subtype === 'session_state_changed' diff --git a/src/main/claude/claude-turn-activity.ts b/src/main/claude/structured/turns/claude-turn-activity.ts similarity index 66% rename from src/main/claude/claude-turn-activity.ts rename to src/main/claude/structured/turns/claude-turn-activity.ts index 0f767ba68fa..45eecc1f561 100644 --- a/src/main/claude/claude-turn-activity.ts +++ b/src/main/claude/structured/turns/claude-turn-activity.ts @@ -1,7 +1,7 @@ -import { claudeProviderFrameActivity } from '../native-chat/agent-session-wire/providers/provider-frame-activity' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import { claudeProviderFrameKind } from './structured/launch/claude-structured-provider-fallback' -import type { ClaudeStructuredSessionEvent } from './structured/claude-structured-session-state' +import { claudeProviderFrameActivity } from '../../../native-chat/agent-session-wire/providers/provider-frame-activity' +import type { StructuredAgentSessionEventSink } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import { claudeProviderFrameKind } from '../launch/claude-structured-provider-fallback' +import type { ClaudeStructuredSessionEvent } from '../claude-structured-session-event' import type { ClaudeOpenTurn } from './claude-open-turn' import { claudeStreamTurnSource, isRootClaudeFrame } from './claude-turn-opening' diff --git a/src/main/claude/claude-turn-lifecycle-item.ts b/src/main/claude/structured/turns/claude-turn-lifecycle-item.ts similarity index 82% rename from src/main/claude/claude-turn-lifecycle-item.ts rename to src/main/claude/structured/turns/claude-turn-lifecycle-item.ts index f0a57821309..63e24de44f8 100644 --- a/src/main/claude/claude-turn-lifecycle-item.ts +++ b/src/main/claude/structured/turns/claude-turn-lifecycle-item.ts @@ -1,9 +1,9 @@ -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import type { AgentJournalTurnItem } from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentJournalTurnOutcome } from '../../shared/agent-status/lifecycle/agent-turn-outcome' -import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' -import { agentJournalTurnBody } from '../../shared/agent-session/lifecycle/agent-session-turn-record' -import type { StructuredAgentSessionAppendOptions } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import type { AgentJournalItemIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity' +import type { AgentJournalTurnItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnOutcome } from '../../../../shared/agent-status/lifecycle/agent-turn-outcome' +import { agentJournalItemKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' +import { agentJournalTurnBody } from '../../../../shared/agent-session/lifecycle/agent-session-turn-record' +import type { StructuredAgentSessionAppendOptions } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' import { claudeResultOutcome } from './claude-result-outcome' import type { ClaudeCommandTurn } from './claude-command-turn' diff --git a/src/main/claude/claude-turn-opening.ts b/src/main/claude/structured/turns/claude-turn-opening.ts similarity index 92% rename from src/main/claude/claude-turn-opening.ts rename to src/main/claude/structured/turns/claude-turn-opening.ts index 81a43519105..c8c32eba37b 100644 --- a/src/main/claude/claude-turn-opening.ts +++ b/src/main/claude/structured/turns/claude-turn-opening.ts @@ -3,9 +3,9 @@ import { claudeRecord, claudeText, type ClaudeMessageEnvelope -} from './structured/journal/claude-structured-item-translation' -import { agentJournalSubmissionKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' -import type { ClaudeStartedSend } from './structured/claude-structured-session-state' +} from '../journal/claude-structured-item-translation' +import { agentJournalSubmissionKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { ClaudeStartedSend } from '../claude-structured-session-state' import { claudeProviderResumedTurnTimingAnchor, type ClaudeCurrentTurn diff --git a/src/main/claude/claude-child-tool-queries.ts b/src/main/claude/subagents/claude-child-tool-queries.ts similarity index 86% rename from src/main/claude/claude-child-tool-queries.ts rename to src/main/claude/subagents/claude-child-tool-queries.ts index 42114ac4272..d42035bcd18 100644 --- a/src/main/claude/claude-child-tool-queries.ts +++ b/src/main/claude/subagents/claude-child-tool-queries.ts @@ -1,6 +1,6 @@ -import type { AgentJournalProducerLinkage } from '../../shared/agent-session/journal/agent-session-journal-types' -import type { ClaudePendingPrompt } from './claude-prompt-registry' -import type { ClaudeToolUse } from './structured/journal/claude-structured-item-translation' +import type { AgentJournalProducerLinkage } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { ClaudePendingPrompt } from '../structured/permissions/claude-prompt-registry' +import type { ClaudeToolUse } from '../structured/journal/claude-structured-item-translation' import type { ClaudeAgentLinkageSource, ClaudeSubagentLinkageSource diff --git a/src/main/claude/claude-provisional-row-corrections.test.ts b/src/main/claude/subagents/claude-provisional-row-corrections.test.ts similarity index 51% rename from src/main/claude/claude-provisional-row-corrections.test.ts rename to src/main/claude/subagents/claude-provisional-row-corrections.test.ts index 9ed34e3e17f..c9ff7f239a3 100644 --- a/src/main/claude/claude-provisional-row-corrections.test.ts +++ b/src/main/claude/subagents/claude-provisional-row-corrections.test.ts @@ -1,8 +1,8 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { describe, expect, it } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import type { StructuredAgentSessionAppendOptions } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session/journal/agent-session-journal-identity' +import type { StructuredAgentSessionAppendOptions } from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' import { ClaudeProvisionalRowCorrections } from './claude-provisional-row-corrections' import type { ClaudeSubagentLinkageVerdict } from './claude-subagent-linkage' @@ -69,56 +69,6 @@ function ledger(initial: Record = {}) { } describe('ClaudeProvisionalRowCorrections', () => { - it('stamps a provisional row at once and re-attributes it on the announcement', () => { - const { corrections, rewrites, announce } = ledger() - const stamped = corrections.stampFor('toolu_1')(identityOf('toolu_2'), RUNNING) - - expect(stamped).toMatchObject({ agentId: 'toolu_1' }) - expect(corrections.pending).toBe(1) - - announce('toolu_1', 'task-1') - corrections.retry() - - expect(rewrites).toEqual([ - { - identity: identityOf('toolu_2'), - body: RUNNING, - options: expect.objectContaining({ agentId: 'task-1' }) - } - ]) - expect(corrections.pending).toBe(0) - }) - - it('lets a settled write supersede the correction owed to that row', () => { - const { corrections, rewrites, announce } = ledger() - corrections.stampFor('toolu_1')(identityOf('toolu_2'), RUNNING) - expect(corrections.pending).toBe(1) - - announce('toolu_other', 'task-other') - corrections.stampFor('toolu_other')(identityOf('toolu_2'), COMPLETED) - - expect(corrections.pending).toBe(0) - announce('toolu_1', 'task-1') - corrections.retry() - expect(rewrites).toEqual([]) - }) - - it('keeps a correction owed when the sink refuses it, and retries at abandon', () => { - const { corrections, rewrites, announce, setRefusing } = ledger() - corrections.stampFor('toolu_1')(identityOf('toolu_2'), RUNNING) - announce('toolu_1', 'task-1') - - setRefusing(true) - corrections.retry() - expect(rewrites).toEqual([]) - expect(corrections.pending).toBe(1) - - setRefusing(false) - corrections.retry() - expect(rewrites).toHaveLength(1) - expect(corrections.pending).toBe(0) - }) - it('carries the NEWEST body when a row is written provisionally twice', () => { const { corrections, rewrites, announce } = ledger() const stamp = corrections.stampFor('toolu_1') @@ -131,18 +81,4 @@ describe('ClaudeProvisionalRowCorrections', () => { expect(rewrites).toHaveLength(1) expect(rewrites[0]?.body).toEqual(COMPLETED) }) - - it('gives up on a producer WHOLESALE past the bound, never half of it', () => { - const { corrections, rewrites, announce } = ledger() - const stamp = corrections.stampFor('toolu_1') - for (let index = 0; index < 129; index += 1) { - stamp(identityOf(`toolu_row_${index}`), RUNNING) - } - expect(corrections.pending).toBe(0) - - announce('toolu_1', 'task-1') - corrections.retry() - - expect(rewrites).toEqual([]) - }) }) diff --git a/src/main/claude/claude-provisional-row-corrections.ts b/src/main/claude/subagents/claude-provisional-row-corrections.ts similarity index 90% rename from src/main/claude/claude-provisional-row-corrections.ts rename to src/main/claude/subagents/claude-provisional-row-corrections.ts index b229e8c6b65..b11a3341db4 100644 --- a/src/main/claude/claude-provisional-row-corrections.ts +++ b/src/main/claude/subagents/claude-provisional-row-corrections.ts @@ -1,14 +1,14 @@ // Publish before task_started using the spawn ID; correct attribution later without replacing content. -import { agentJournalLinkageFields } from '../../shared/agent-session/journal/agent-session-journal-producer' -import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import { agentJournalLinkageFields } from '../../../shared/agent-session/journal/agent-session-journal-producer' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalItemBody, AgentJournalProducerLinkage -} from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import type { AgentJournalTurnScope } from '../../shared/agent-session/journal/agent-session-journal-turn-scope' -import type { StructuredAgentSessionItemAppendOptions } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session/journal/agent-session-journal-identity' +import type { AgentJournalTurnScope } from '../../../shared/agent-session/journal/agent-session-journal-turn-scope' +import type { StructuredAgentSessionItemAppendOptions } from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' import type { ClaudeSubagentLinkageSource } from './claude-subagent-linkage' export type ClaudeRowStamp = ( diff --git a/src/main/claude/claude-subagent-id-aliases.test.ts b/src/main/claude/subagents/claude-subagent-id-aliases.test.ts similarity index 100% rename from src/main/claude/claude-subagent-id-aliases.test.ts rename to src/main/claude/subagents/claude-subagent-id-aliases.test.ts diff --git a/src/main/claude/claude-subagent-id-aliases.ts b/src/main/claude/subagents/claude-subagent-id-aliases.ts similarity index 95% rename from src/main/claude/claude-subagent-id-aliases.ts rename to src/main/claude/subagents/claude-subagent-id-aliases.ts index 9a703790f6b..491498fca33 100644 --- a/src/main/claude/claude-subagent-id-aliases.ts +++ b/src/main/claude/subagents/claude-subagent-id-aliases.ts @@ -1,6 +1,6 @@ // Resumes change tool IDs but keep task IDs; retain aliases across restarts and remember non-agent exclusions. -import { isBoundedClaudeTaskId } from './claude-background-task-tracker' +import { isBoundedClaudeTaskId } from '../background-tasks/claude-background-task-frames' /** Bound event-accumulated aliases and exclusions. */ const MAX_TOOL_USE_ALIASES = 512 diff --git a/src/main/claude/claude-subagent-identities.ts b/src/main/claude/subagents/claude-subagent-identities.ts similarity index 95% rename from src/main/claude/claude-subagent-identities.ts rename to src/main/claude/subagents/claude-subagent-identities.ts index ebafff0d1da..b7ef0362d1f 100644 --- a/src/main/claude/claude-subagent-identities.ts +++ b/src/main/claude/subagents/claude-subagent-identities.ts @@ -1,5 +1,5 @@ -import { ClaudeTaskInvocations } from './claude-task-invocations' -import { BoundedMap } from '../../shared/bounded-map' +import { ClaudeTaskInvocations } from '../background-tasks/claude-task-invocations' +import { BoundedMap } from '../../../shared/bounded-map' import { ClaudeSubagentIds } from './claude-subagent-id-aliases' import type { ClaudeJournaledSubagents } from './claude-subagent-journaled-identities' import { diff --git a/src/main/claude/claude-subagent-journaled-identities.ts b/src/main/claude/subagents/claude-subagent-journaled-identities.ts similarity index 85% rename from src/main/claude/claude-subagent-journaled-identities.ts rename to src/main/claude/subagents/claude-subagent-journaled-identities.ts index 82b51b7d0f3..5b278a55251 100644 --- a/src/main/claude/claude-subagent-journaled-identities.ts +++ b/src/main/claude/subagents/claude-subagent-journaled-identities.ts @@ -3,12 +3,12 @@ import { selectClaudeBackgroundTask, type ClaudeBackgroundTaskIndex, type ClaudeBackgroundTaskDescriptor -} from './claude-background-task-identity' -import { isBackgroundTaskBlock } from '../../shared/native-chat/native-chat-types' -import type { AgentJournalProducerLinkage } from '../../shared/agent-session/journal/agent-session-journal-types' -import { namedSubagents } from '../../shared/native-chat/transcript/native-chat-subagent-items' -import type { StructuredAgentSessionLinkageJournal } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-journal-views' -import { isBoundedClaudeTaskId } from './claude-background-task-tracker' +} from '../background-tasks/claude-background-task-identity' +import { isBackgroundTaskBlock } from '../../../shared/native-chat/native-chat-types' +import type { AgentJournalProducerLinkage } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { namedSubagents } from '../../../shared/native-chat/transcript/native-chat-subagent-items' +import type { StructuredAgentSessionLinkageJournal } from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-journal-views' +import { isBoundedClaudeTaskId } from '../background-tasks/claude-background-task-frames' type Reading = { canonicalByToolUse: Map diff --git a/src/main/claude/claude-subagent-linkage.ts b/src/main/claude/subagents/claude-subagent-linkage.ts similarity index 98% rename from src/main/claude/claude-subagent-linkage.ts rename to src/main/claude/subagents/claude-subagent-linkage.ts index ba8eed43498..bfd76edf32b 100644 --- a/src/main/claude/claude-subagent-linkage.ts +++ b/src/main/claude/subagents/claude-subagent-linkage.ts @@ -1,6 +1,6 @@ // Prefer canonical task IDs across resumes; write provisional child rows immediately and correct them in place. -import type { AgentJournalProducerLinkage } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalProducerLinkage } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { ClaudeSubagentIds } from './claude-subagent-id-aliases' export type ClaudeSubagentLinkageVerdict = diff --git a/src/main/claude/claude-subagent-resume-after-restart.test.ts b/src/main/claude/subagents/claude-subagent-resume-after-restart.test.ts similarity index 62% rename from src/main/claude/claude-subagent-resume-after-restart.test.ts rename to src/main/claude/subagents/claude-subagent-resume-after-restart.test.ts index 049cc308d76..a28bd24858d 100644 --- a/src/main/claude/claude-subagent-resume-after-restart.test.ts +++ b/src/main/claude/subagents/claude-subagent-resume-after-restart.test.ts @@ -1,16 +1,14 @@ -import { PARENT_TASK_STOP } from './claude-parent-task-frames.test-fixture' -import { blockOf } from './claude-background-task-row-test-support' 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 { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentSessionJournal } from '../native-chat/agent-session-journal/journal-store' -import { createTrackedJournalOpener } from '../native-chat/agent-session-journal/store-lifecycle/journal-host-database-test-support' -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 { 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' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournal } from '../../native-chat/agent-session-journal/journal-store' +import { createTrackedJournalOpener } from '../../native-chat/agent-session-journal/store-lifecycle/journal-host-database-test-support' +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 { 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' // Captured restart order: resumed frames retain original spawn IDs while announcements name new resume calls. @@ -133,85 +131,6 @@ const proseRow = (journal: AgentSessionJournal, text: string): AgentJournalRende ) describe('a Claude subagent resumed after its provider restarted', () => { - it.each(['terminal-only', 'roster-first', 'unbound-roster-first', 'parent-omitting-roster'])( - 'retains one owned shell across close/reopen: %s', - async (order) => { - let journal = await openJournal() - const first = acquire(journal) - first.translator.handle(userTurn('parent-task-turn')) - // Contract: a parentless admission can learn ownership from a later roster without a body change. - first.translator.handle( - frame({ ...PARENT_TASK_STOP[3]!.frame, parent_task_id: undefined, tool_use_id: undefined }) - ) - await first.settle() - const beforeOwnership = journal - .snapshot() - .items.find((item) => blockOf(item.body)?.taskId === 'shell-child') - expect(beforeOwnership?.agentId).toBeUndefined() - first.translator.handle(frame(PARENT_TASK_STOP[2]!.frame)) - await first.settle() - expect(journal.item(beforeOwnership!.itemId)).toMatchObject({ - agentId: 'shell-child', - parentAgentId: 'agent-parent' - }) - first.translator.handle(frame(PARENT_TASK_STOP[3]!.frame)) - await first.settle() - const shell = journal - .snapshot() - .items.find((item) => blockOf(item.body)?.taskId === 'shell-child') - expect(shell).toMatchObject({ - agentId: 'shell-child', - parentAgentId: 'agent-parent', - producerKind: 'background', - providerParentRef: 'toolu_shell' - }) - await first.exit() - expect(blockOf(journal.item(shell!.itemId)?.body)?.state).toBe('unverifiable') - await journals.closeAll() - - journal = await openJournal() - const delayed = order === 'unbound-roster-first' - const resumed = acquire(journal, delayed) - if (!delayed) { - expect(resumed.translator.childTaskParent?.('shell-child')).toBe('agent-parent') - } - if (order === 'parent-omitting-roster') { - resumed.translator.handle( - frame({ - type: 'system', - subtype: 'background_tasks_changed', - tasks: [{ task_id: 'shell-child', task_type: 'local_bash' }] - }) - ) - await resumed.settle() - expect(journal.item(shell!.itemId)).toMatchObject({ parentAgentId: 'agent-parent' }) - expect(blockOf(journal.item(shell!.itemId)?.body)?.state).toBe('working') - } else if (order !== 'terminal-only') { - resumed.translator.handle(frame(PARENT_TASK_STOP[2]!.frame)) - resumed.translator.handle(frame(PARENT_TASK_STOP[3]!.frame)) - } - if (delayed) { - resumed.bind() - } - // Contract: a terminal revision must retain saved ownership even without a repeated start. - resumed.translator.handle(frame(PARENT_TASK_STOP[8]!.frame)) - await resumed.settle() - const shells = journal - .snapshot() - .items.filter((item) => blockOf(item.body)?.taskId === 'shell-child') - expect(shells).toHaveLength(1) - expect(shells[0]).toMatchObject({ - itemId: shell!.itemId, - agentId: 'shell-child', - parentAgentId: 'agent-parent', - producerKind: 'background', - providerParentRef: 'toolu_shell' - }) - expect(blockOf(shells[0]?.body)?.state).toBe('idle') - await resumed.exit() - } - ) - it('keeps the canonical id its first run was given, so one child stays one child', async () => { const journal = await openJournal() diff --git a/src/main/claude/claude-subagent-task-frames.ts b/src/main/claude/subagents/claude-subagent-task-frames.ts similarity index 81% rename from src/main/claude/claude-subagent-task-frames.ts rename to src/main/claude/subagents/claude-subagent-task-frames.ts index 89602d480ce..943bb861ab8 100644 --- a/src/main/claude/claude-subagent-task-frames.ts +++ b/src/main/claude/subagents/claude-subagent-task-frames.ts @@ -1,13 +1,13 @@ -import type { AgentChildWorkKind } from '../../shared/agent-status/child-work/agent-status-child-work' +import type { AgentChildWorkKind } from '../../../shared/agent-status/child-work/agent-status-child-work' // Task IDs alone cannot distinguish agents from shells or workflows; task_type identifies the kind. +import { classifyClaudeBackgroundTaskKind } from '../../../shared/claude-background-task-kind' import { - classifyClaudeBackgroundTaskKind, - claudeTaskId, + taskId as claudeTaskId, isBoundedClaudeTaskId -} from './claude-background-task-tracker' -import { isAgentChildWorkKind } from '../../shared/agent-status/child-work/agent-status-child-work-liveness' -import { claudeRecord, claudeText } from './structured/journal/claude-structured-item-translation' +} from '../background-tasks/claude-background-task-frames' +import { isAgentChildWorkKind } from '../../../shared/agent-status/child-work/agent-status-child-work-liveness' +import { claudeRecord, claudeText } from '../structured/journal/claude-structured-item-translation' const TASK_SUBTYPES: ReadonlySet = new Set([ 'task_started', diff --git a/src/main/claude/claude-tool-origin-registry.ts b/src/main/claude/subagents/claude-tool-origin-registry.ts similarity index 100% rename from src/main/claude/claude-tool-origin-registry.ts rename to src/main/claude/subagents/claude-tool-origin-registry.ts diff --git a/src/main/claude/theme-sync/claude-code-theme-sync.test.ts b/src/main/claude/theme-sync/claude-code-theme-sync.test.ts index 39e71097e1c..8d1c19bd96d 100644 --- a/src/main/claude/theme-sync/claude-code-theme-sync.test.ts +++ b/src/main/claude/theme-sync/claude-code-theme-sync.test.ts @@ -2,9 +2,9 @@ import { chmodSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as ClaudeHookEventVersions from '../claude-hook-event-versions' +import type * as ClaudeHookEventVersions from '../cli-capabilities/claude-hook-event-versions' -vi.mock('../claude-hook-event-versions', async (importOriginal) => ({ +vi.mock('../cli-capabilities/claude-hook-event-versions', async (importOriginal) => ({ ...(await importOriginal()), probeRecentClaudeCliVersion: () => Promise.resolve(claudeVersion) })) diff --git a/src/main/claude/theme-sync/claude-code-theme-sync.ts b/src/main/claude/theme-sync/claude-code-theme-sync.ts index 1f9a224ef8f..e79c56586ec 100644 --- a/src/main/claude/theme-sync/claude-code-theme-sync.ts +++ b/src/main/claude/theme-sync/claude-code-theme-sync.ts @@ -4,14 +4,17 @@ import { dirname, join } from 'node:path' import { isDefinitiveAbsence } from '../../../shared/definitive-filesystem-absence' import { readHooksJson } from '../../agent-hooks/installation/configuration/hooks-json-read' import { writeHooksJson } from '../../agent-hooks/installation/configuration/hooks-json-write' -import { defaultClaudeConfigDir } from '../claude-config-dir-pin' +import { defaultClaudeConfigDir } from '../structured/launch/claude-config-dir-pin' import { listClaudeProfileHomesAsync } from '../../claude-accounts/profiles/claude-profile-homes' import { getClaudeObservedConfigDirs, getClaudeProfileRouter } from '../../claude-accounts/profiles/routing/claude-profile-installed-router' import { resolveClaudeCommand } from '../../codex-cli/command' -import { claudeLoadsCustomThemes, probeRecentClaudeCliVersion } from '../claude-hook-event-versions' +import { + claudeLoadsCustomThemes, + probeRecentClaudeCliVersion +} from '../cli-capabilities/claude-hook-event-versions' import type { ClaudeCodeTheme } from './claude-code-theme' import { readClaudeThemeOwnership, diff --git a/src/main/claude/claude-conversation-copy.test.ts b/src/main/claude/transcripts/claude-conversation-copy.test.ts similarity index 95% rename from src/main/claude/claude-conversation-copy.test.ts rename to src/main/claude/transcripts/claude-conversation-copy.test.ts index 084c12488c4..9f850ffd52b 100644 --- a/src/main/claude/claude-conversation-copy.test.ts +++ b/src/main/claude/transcripts/claude-conversation-copy.test.ts @@ -6,7 +6,7 @@ import { afterEach, beforeEach, expect, it, vi } from 'vitest' import { copyClaudeConversation } from './claude-conversation-copy' const accounts = vi.hoisted((): { homes: string[] } => ({ homes: [] })) -vi.mock('../claude-accounts/profiles/routing/claude-profile-installed-router', () => ({ +vi.mock('../../claude-accounts/profiles/routing/claude-profile-installed-router', () => ({ getClaudeProfileRouter: () => ({ accountHomes: () => accounts.homes, systemDefaultHome: () => accounts.homes[0] @@ -34,7 +34,7 @@ beforeEach(async () => { await mkdir(project, { recursive: true }) sourcePath = join(project, `${SOURCE}.jsonl`) const source = await readFile( - new URL('./__fixtures__/claude-rewind-hook.jsonl', import.meta.url), + new URL('../__fixtures__/claude-rewind-hook.jsonl', import.meta.url), 'utf8' ) rows = parseRows(source) diff --git a/src/main/claude/claude-conversation-copy.ts b/src/main/claude/transcripts/claude-conversation-copy.ts similarity index 75% rename from src/main/claude/claude-conversation-copy.ts rename to src/main/claude/transcripts/claude-conversation-copy.ts index c659f4aad3e..93a74b80733 100644 --- a/src/main/claude/claude-conversation-copy.ts +++ b/src/main/claude/transcripts/claude-conversation-copy.ts @@ -1,9 +1,9 @@ import { basename, dirname, join } from 'node:path' -import { requireLegacyAgentSessionAccountHome } from '../../shared/agent-session/lifecycle/agent-session-account-home' -import { getClaudeProfileRouter } from '../claude-accounts/profiles/routing/claude-profile-installed-router' -import { AgentConversationCopyError } from '../native-chat/agent-conversation-copy-error' -import type { StructuredAgentSessionAdapter } from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' -import { resolveSessionFilePath } from '../native-chat/session-file-resolver' +import { requireLegacyAgentSessionAccountHome } from '../../../shared/agent-session/lifecycle/agent-session-account-home' +import { getClaudeProfileRouter } from '../../claude-accounts/profiles/routing/claude-profile-installed-router' +import { AgentConversationCopyError } from '../../native-chat/agent-conversation-copy-error' +import type { StructuredAgentSessionAdapter } from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +import { resolveSessionFilePath } from '../../native-chat/session-file-resolver' import { materializeClaudeConversationTranscript } from './claude-rewind-transcript' export const copyClaudeConversation: NonNullable< diff --git a/src/main/claude/claude-conversation-fork-boundary.ts b/src/main/claude/transcripts/claude-conversation-fork-boundary.ts similarity index 92% rename from src/main/claude/claude-conversation-fork-boundary.ts rename to src/main/claude/transcripts/claude-conversation-fork-boundary.ts index c13d47bee21..0f318e3fa65 100644 --- a/src/main/claude/claude-conversation-fork-boundary.ts +++ b/src/main/claude/transcripts/claude-conversation-fork-boundary.ts @@ -1,16 +1,16 @@ import type { SessionStoreEntry } from '@anthropic-ai/claude-agent-sdk' -import { AgentConversationCopyError } from '../native-chat/agent-conversation-copy-error' -import type { StructuredAgentSessionAdapter } from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' -import { decodeClaudeTranscriptLine } from '../native-chat/transcript-line-decoders-claude' +import { AgentConversationCopyError } from '../../native-chat/agent-conversation-copy-error' +import type { StructuredAgentSessionAdapter } from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +import { decodeClaudeTranscriptLine } from '../../native-chat/transcript-line-decoders-claude' import { isLocalCommandCaveatRow } from './claude-rewind-fork' -import { claudeSourceBlockId } from './claude-streamed-block-identity' +import { claudeSourceBlockId } from '../structured/journal/claude-streamed-block-identity' import { isClaudeTranscriptRootPrompt } from './claude-transcript-root-prompt' import { claudeRecord, claudeToolUses, claudeToolResults, readClaudeMessageEnvelope -} from './structured/journal/claude-structured-item-translation' +} from '../structured/journal/claude-structured-item-translation' import { claudeTranscriptPrompt } from './claude-transcript-prompt' export type ClaudeForkCheckpoint = NonNullable< diff --git a/src/main/claude/claude-conversation-fork-worker-entry.ts b/src/main/claude/transcripts/claude-conversation-fork-worker-entry.ts similarity index 97% rename from src/main/claude/claude-conversation-fork-worker-entry.ts rename to src/main/claude/transcripts/claude-conversation-fork-worker-entry.ts index 682cf360079..19099291b14 100644 --- a/src/main/claude/claude-conversation-fork-worker-entry.ts +++ b/src/main/claude/transcripts/claude-conversation-fork-worker-entry.ts @@ -8,7 +8,7 @@ import { createInterface } from 'node:readline' import { parentPort, workerData } from 'node:worker_threads' import { publishClaudeConversationTranscript } from './claude-conversation-transcript-publication' -import { AgentConversationCopyError } from '../native-chat/agent-conversation-copy-error' +import { AgentConversationCopyError } from '../../native-chat/agent-conversation-copy-error' import { claudeConversationForkBoundary, isClaudeConversationEntry, diff --git a/src/main/claude/claude-conversation-transcript-publication.test.ts b/src/main/claude/transcripts/claude-conversation-transcript-publication.test.ts similarity index 76% rename from src/main/claude/claude-conversation-transcript-publication.test.ts rename to src/main/claude/transcripts/claude-conversation-transcript-publication.test.ts index 08b095ebce4..08af616db8d 100644 --- a/src/main/claude/claude-conversation-transcript-publication.test.ts +++ b/src/main/claude/transcripts/claude-conversation-transcript-publication.test.ts @@ -1,5 +1,5 @@ import { existsSync, readFileSync } from 'node:fs' -import { mkdir, mkdtemp, readFile, rm, stat, writeFile } from 'node:fs/promises' +import { mkdtemp, readFile, rm, stat, writeFile } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, expect, it } from 'vitest' @@ -52,15 +52,3 @@ it('removes an incomplete owned temp without publishing or replacing a destinati expect(existsSync(temporary)).toBe(false) expect(await readFile(destination, 'utf8')).toBe('existing transcript\n') }) - -it('removes the fsynced temp when publishing the copy fails', async () => { - const temporary = join(root, 'owned.tmp') - const destination = join(root, 'existing-directory') - await mkdir(destination) - await writeFile(join(destination, 'kept'), 'existing data') - await expect( - publishClaudeConversationTranscript(temporary, destination, [{ type: 'user', uuid: 'first' }]) - ).rejects.toThrow() - expect(existsSync(temporary)).toBe(false) - expect(await readFile(join(destination, 'kept'), 'utf8')).toBe('existing data') -}) diff --git a/src/main/claude/claude-conversation-transcript-publication.ts b/src/main/claude/transcripts/claude-conversation-transcript-publication.ts similarity index 91% rename from src/main/claude/claude-conversation-transcript-publication.ts rename to src/main/claude/transcripts/claude-conversation-transcript-publication.ts index ab0658d6ac9..37836f77426 100644 --- a/src/main/claude/claude-conversation-transcript-publication.ts +++ b/src/main/claude/transcripts/claude-conversation-transcript-publication.ts @@ -1,5 +1,5 @@ import { open, rm } from 'node:fs/promises' -import { renameDurable } from '../filesystem/durable-file-write' +import { renameDurable } from '../../filesystem/durable-file-write' /** Serialize one record at a time, then publish the fsynced file with Windows rename retries. */ export async function publishClaudeConversationTranscript( diff --git a/src/main/claude/claude-conversation-worker.test-fixture.ts b/src/main/claude/transcripts/claude-conversation-worker.test-fixture.ts similarity index 100% rename from src/main/claude/claude-conversation-worker.test-fixture.ts rename to src/main/claude/transcripts/claude-conversation-worker.test-fixture.ts diff --git a/src/main/claude/claude-conversation-worker.test-loader.mjs b/src/main/claude/transcripts/claude-conversation-worker.test-loader.mjs similarity index 100% rename from src/main/claude/claude-conversation-worker.test-loader.mjs rename to src/main/claude/transcripts/claude-conversation-worker.test-loader.mjs diff --git a/src/main/claude/transcripts/claude-provider-session-rename.test.ts b/src/main/claude/transcripts/claude-provider-session-rename.test.ts new file mode 100644 index 00000000000..d274d3e270a --- /dev/null +++ b/src/main/claude/transcripts/claude-provider-session-rename.test.ts @@ -0,0 +1,44 @@ +import { randomUUID } from 'node:crypto' +import * as fs from 'node:fs/promises' +import { tmpdir } from 'node:os' +import { join } from 'node:path' +import { afterEach, beforeEach, expect, it, vi } from 'vitest' +import * as transcriptFs from '../../native-chat/wsl-transcript-fs-access' +import { renameClaudeTranscript } from './claude-provider-session-rename' + +let home: string +let conversation: string +let transcript: string +beforeEach(async () => { + home = await fs.mkdtemp(join(tmpdir(), 'orca-claude-rename-')) + conversation = randomUUID() + const project = join(home, 'projects', 'workspace') + await fs.mkdir(project, { recursive: true }) + transcript = join(project, `${conversation}.jsonl`) +}) +afterEach(async () => { + vi.restoreAllMocks() + await fs.rm(home, { recursive: true, force: true }) +}) + +it('refuses missing, empty, multiple and incomplete inventories without mutating another candidate', async () => { + await expect(renameClaudeTranscript(home, conversation, 'Missing')).rejects.toThrow( + 'no transcript' + ) + await fs.writeFile(transcript, '') + await expect(renameClaudeTranscript(home, conversation, 'Empty')).rejects.toThrow('no transcript') + await fs.writeFile(transcript, 'old\n') + const second = join(home, 'projects', 'hash-or-worktree') + await fs.mkdir(second) + const duplicate = join(second, `${conversation}.jsonl`) + await fs.writeFile(duplicate, 'other\n') + await expect(renameClaudeTranscript(home, conversation, 'Ambiguous')).rejects.toThrow( + 'multiple transcripts' + ) + expect(await fs.readFile(transcript, 'utf8')).toBe('old\n') + expect(await fs.readFile(duplicate, 'utf8')).toBe('other\n') + const denied = Object.assign(new Error('denied'), { code: 'EACCES' }) + vi.spyOn(transcriptFs, 'wslGatedStat').mockRejectedValue(denied) + await expect(renameClaudeTranscript(home, conversation, 'Denied')).rejects.toBe(denied) + expect(await fs.readFile(transcript, 'utf8')).toBe('old\n') +}) diff --git a/src/main/claude/claude-provider-session-rename.ts b/src/main/claude/transcripts/claude-provider-session-rename.ts similarity index 90% rename from src/main/claude/claude-provider-session-rename.ts rename to src/main/claude/transcripts/claude-provider-session-rename.ts index 40f97911495..28fbf384c65 100644 --- a/src/main/claude/claude-provider-session-rename.ts +++ b/src/main/claude/transcripts/claude-provider-session-rename.ts @@ -1,9 +1,9 @@ import type { SessionStoreEntry } from '@anthropic-ai/claude-agent-sdk' import { appendFile, open } from 'node:fs/promises' import { join } from 'node:path' -import { isDefinitiveAbsence } from '../../shared/definitive-filesystem-absence' -import { wslGatedReaddir, wslGatedStat } from '../native-chat/wsl-transcript-fs-access' -import { loadClaudeAgentSdk } from './claude-stream-json-connection' +import { isDefinitiveAbsence } from '../../../shared/definitive-filesystem-absence' +import { wslGatedReaddir, wslGatedStat } from '../../native-chat/wsl-transcript-fs-access' +import { loadClaudeAgentSdk } from '../claude-stream-json-connection' export async function renameClaudeTranscript( home: string, diff --git a/src/main/claude/claude-rewind-fork.ts b/src/main/claude/transcripts/claude-rewind-fork.ts similarity index 85% rename from src/main/claude/claude-rewind-fork.ts rename to src/main/claude/transcripts/claude-rewind-fork.ts index 1c1f22a174b..765fd763bcb 100644 --- a/src/main/claude/claude-rewind-fork.ts +++ b/src/main/claude/transcripts/claude-rewind-fork.ts @@ -1,16 +1,16 @@ import { createReadStream } from 'node:fs' import { basename, dirname, join } from 'node:path' -import { requireLegacyAgentSessionAccountHome } from '../../shared/agent-session/lifecycle/agent-session-account-home' +import { requireLegacyAgentSessionAccountHome } from '../../../shared/agent-session/lifecycle/agent-session-account-home' import { agentSessionProviderHandleChainHead, type AgentSessionProviderHandle -} from '../../shared/agent-session/lifecycle/agent-session-provider-handle' -import type { AgentSessionRewindFork } from '../../shared/agent-session/lifecycle/agent-session-rewind' -import { getClaudeProfileRouter } from '../claude-accounts/profiles/routing/claude-profile-installed-router' -import type { StructuredAgentSessionAdapter } from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' -import { resolveSessionFilePath } from '../native-chat/session-file-resolver' -import { splitTranscriptStreamLines } from '../native-chat/transcript-stream-lines' -import { claudeSessionIdForRewind } from './structured/claude-structured-session-id' +} from '../../../shared/agent-session/lifecycle/agent-session-provider-handle' +import type { AgentSessionRewindFork } from '../../../shared/agent-session/lifecycle/agent-session-rewind' +import { getClaudeProfileRouter } from '../../claude-accounts/profiles/routing/claude-profile-installed-router' +import type { StructuredAgentSessionAdapter } from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +import { resolveSessionFilePath } from '../../native-chat/session-file-resolver' +import { splitTranscriptStreamLines } from '../../native-chat/transcript-stream-lines' +import { claudeSessionIdForRewind } from '../structured/claude-structured-session-id' import { materializeClaudeRewindTranscript } from './claude-rewind-transcript' type TranscriptUserRow = { diff --git a/src/main/claude/transcripts/claude-rewind-transcript.test.ts b/src/main/claude/transcripts/claude-rewind-transcript.test.ts new file mode 100644 index 00000000000..391c42a7e1c --- /dev/null +++ b/src/main/claude/transcripts/claude-rewind-transcript.test.ts @@ -0,0 +1,97 @@ +import './claude-conversation-worker.test-fixture' +import { randomUUID } from 'node:crypto' +import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import { join } from 'node:path' +import { afterEach, beforeEach, describe, expect, it } from 'vitest' +import { claudeProviderHandle } from '../../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding' + +import { resolveClaudeRewindFork } from './claude-rewind-fork' + +let root: string +let home: string +let project: string +let source: string +let path: string +let original: string +let sourceRows: ReturnType + +function transcriptRows(contents: string) { + return contents + .trim() + .split('\n') + .map((line) => JSON.parse(line)) +} + +async function recordedTranscript(kind: 'hook' | 'informational') { + return readFile(new URL(`../__fixtures__/claude-rewind-${kind}.jsonl`, import.meta.url), 'utf8') +} + +beforeEach(async () => { + root = await mkdtemp(join(tmpdir(), 'orca-rewind-transcript-')) + home = join(root, 'account') + project = join(home, 'projects', 'workspace') + await mkdir(project, { recursive: true }) + original = await recordedTranscript('hook') + sourceRows = transcriptRows(original) + source = sourceRows[6].sessionId + path = join(project, `${source}.jsonl`) + await writeFile(path, original) +}) + +afterEach(async () => { + await rm(root, { recursive: true, force: true }) +}) + +function forkBefore(uuid: string, rewindOperationId = randomUUID()) { + return resolveClaudeRewindFork({ + orcaSessionId: 'orca-chat', + rewindOperationId, + head: claudeProviderHandle(source, sourceRows.at(-1)?.uuid), + prompt: { sessionId: source, uuid }, + claudeConfigDirs: [join(root, 'other-account'), home] + }) +} + +describe('durable Claude rewind transcripts', () => { + it('drops the local-command caveat when rewinding to a local command', async () => { + const turn = sourceRows[50] + const row = (uuid: string, parentUuid: string, content: string, isMeta?: true) => ({ + ...sourceRows[54], + uuid, + parentUuid, + isMeta, + message: { role: 'user', content } + }) + const caveat = row( + randomUUID(), + turn.uuid, + 'The command below was run directly in Claude Code.', + true + ) + const command = row(randomUUID(), caveat.uuid, '/usage') + const stdout = row( + randomUUID(), + command.uuid, + 'ok' + ) + await writeFile( + path, + `${[...sourceRows.slice(0, 54), caveat, command, stdout].map((r) => JSON.stringify(r)).join('\n')}\n` + ) + const fork = await forkBefore(command.uuid) + expect(fork).toMatchObject({ materialized: true, throughEntryId: turn.uuid }) + const contents = await readFile(join(project, `${fork?.sessionId}.jsonl`), 'utf8') + expect(contents).not.toContain('local-command-caveat') + }) + + it('skips a torn transcript line instead of failing the rewind', async () => { + const damaged = `{broken-json}\n${original}{"type":` + await writeFile(path, damaged) + const fork = await forkBefore(sourceRows[34].uuid) + expect(fork).toMatchObject({ materialized: true, throughEntryId: sourceRows[27].uuid }) + const contents = await readFile(join(project, `${fork?.sessionId}.jsonl`), 'utf8') + expect(contents).not.toContain(sourceRows[34].uuid) + expect(await readFile(path, 'utf8')).toBe(damaged) + }) +}) diff --git a/src/main/claude/claude-rewind-transcript.ts b/src/main/claude/transcripts/claude-rewind-transcript.ts similarity index 91% rename from src/main/claude/claude-rewind-transcript.ts rename to src/main/claude/transcripts/claude-rewind-transcript.ts index 61e545e36bb..598cfb8bd1e 100644 --- a/src/main/claude/claude-rewind-transcript.ts +++ b/src/main/claude/transcripts/claude-rewind-transcript.ts @@ -1,14 +1,14 @@ -import { AgentConversationCopyError } from '../native-chat/agent-conversation-copy-error' +import { AgentConversationCopyError } from '../../native-chat/agent-conversation-copy-error' import { existsSync } from 'node:fs' import { rm } from 'node:fs/promises' import { dirname, join } from 'node:path' -import type { AgentSessionRewindFork } from '../../shared/agent-session/lifecycle/agent-session-rewind' -import { spawnWorkerThread } from '../worker-threads/worker-thread-spawn' +import type { AgentSessionRewindFork } from '../../../shared/agent-session/lifecycle/agent-session-rewind' +import { spawnWorkerThread } from '../../worker-threads/worker-thread-spawn' import { currentWorkerEntryLayout, resolveWorkerThreadEntryPath -} from '../worker-threads/worker-thread-entry-path' -import { durableWriteTempPath } from '../filesystem/durable-file-write' +} from '../../worker-threads/worker-thread-entry-path' +import { durableWriteTempPath } from '../../filesystem/durable-file-write' import type { ClaudeForkCheckpoint } from './claude-conversation-fork-boundary' import type { ClaudeConversationForkWork } from './claude-conversation-fork-worker-entry' diff --git a/src/main/claude/claude-transcript-catch-up-test-support.ts b/src/main/claude/transcripts/claude-transcript-catch-up-test-support.ts similarity index 92% rename from src/main/claude/claude-transcript-catch-up-test-support.ts rename to src/main/claude/transcripts/claude-transcript-catch-up-test-support.ts index cd64526f018..16ca3459c10 100644 --- a/src/main/claude/claude-transcript-catch-up-test-support.ts +++ b/src/main/claude/transcripts/claude-transcript-catch-up-test-support.ts @@ -3,12 +3,12 @@ import { appendFile, mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, type Mock, vi } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import { claudeProviderHandle } from '../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding' -import { createTrackedJournalOpener } from '../native-chat/agent-session-journal/store-lifecycle/journal-host-database-test-support' -import { createDeferredStructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import { testEventSinkLogging } from '../native-chat/agent-session-wire/host/testing/structured-agent-session-logger-test-support' -import { createClaudeJournalTranslator } from './structured/journal/claude-structured-journal-translation' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session/journal/agent-session-journal-identity' +import { claudeProviderHandle } from '../../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding' +import { createTrackedJournalOpener } from '../../native-chat/agent-session-journal/store-lifecycle/journal-host-database-test-support' +import { createDeferredStructuredAgentSessionEventSink } from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import { testEventSinkLogging } from '../../native-chat/agent-session-wire/host/testing/structured-agent-session-logger-test-support' +import { createClaudeJournalTranslator } from '../structured/journal/claude-structured-journal-translation' import { catchUpClaudeTranscript } from './claude-transcript-catch-up' export const SESSION = 'session-claude-catch-up' diff --git a/src/main/claude/claude-transcript-catch-up.test.ts b/src/main/claude/transcripts/claude-transcript-catch-up.test.ts similarity index 93% rename from src/main/claude/claude-transcript-catch-up.test.ts rename to src/main/claude/transcripts/claude-transcript-catch-up.test.ts index e27ba39f354..1340f8f29ea 100644 --- a/src/main/claude/claude-transcript-catch-up.test.ts +++ b/src/main/claude/transcripts/claude-transcript-catch-up.test.ts @@ -1,7 +1,7 @@ import './claude-conversation-worker.test-fixture' import { describe, expect, it, vi } from 'vitest' -import { createClaudeJournalTranslator } from './structured/journal/claude-structured-journal-translation' +import { createClaudeJournalTranslator } from '../structured/journal/claude-structured-journal-translation' import { SESSION, diff --git a/src/main/claude/claude-transcript-catch-up.ts b/src/main/claude/transcripts/claude-transcript-catch-up.ts similarity index 87% rename from src/main/claude/claude-transcript-catch-up.ts rename to src/main/claude/transcripts/claude-transcript-catch-up.ts index cfcbaa2ef1f..853f3776795 100644 --- a/src/main/claude/claude-transcript-catch-up.ts +++ b/src/main/claude/transcripts/claude-transcript-catch-up.ts @@ -2,14 +2,14 @@ import { nativeCopyIds, usableJournalHistoryOrigin, type JournalHistoryOrigin -} from '../native-chat/agent-session-journal/context-epochs/journal-history-origin' +} from '../../native-chat/agent-session-journal/context-epochs/journal-history-origin' import { recoverClaudeTranscript } from './claude-transcript-recovery' import { join } from 'node:path' -import { isRootAgentJournalItem } from '../../shared/agent-session/journal/agent-session-journal-producer' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import { runHistoryCatchUp } from '../native-chat/agent-session-wire/acquisition/structured-agent-session-history-catch-up' -import type { StructuredAgentSessionLogger } from '../native-chat/agent-session-wire/host/structured-agent-session-logger' -import { resolveSessionFilePath } from '../native-chat/session-file-resolver' +import { isRootAgentJournalItem } from '../../../shared/agent-session/journal/agent-session-journal-producer' +import type { StructuredAgentSessionEventSink } from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import { runHistoryCatchUp } from '../../native-chat/agent-session-wire/acquisition/structured-agent-session-history-catch-up' +import type { StructuredAgentSessionLogger } from '../../native-chat/agent-session-wire/host/structured-agent-session-logger' +import { resolveSessionFilePath } from '../../native-chat/session-file-resolver' import { createClaudeTranscriptImportPlan } from './claude-transcript-import-plan' import { readClaudeTranscriptTail } from './claude-transcript-tail' diff --git a/src/main/claude/claude-transcript-entry-uuid.test.ts b/src/main/claude/transcripts/claude-transcript-entry-uuid.test.ts similarity index 100% rename from src/main/claude/claude-transcript-entry-uuid.test.ts rename to src/main/claude/transcripts/claude-transcript-entry-uuid.test.ts diff --git a/src/main/claude/claude-transcript-entry-uuid.ts b/src/main/claude/transcripts/claude-transcript-entry-uuid.ts similarity index 100% rename from src/main/claude/claude-transcript-entry-uuid.ts rename to src/main/claude/transcripts/claude-transcript-entry-uuid.ts diff --git a/src/main/claude/claude-transcript-import-plan.ts b/src/main/claude/transcripts/claude-transcript-import-plan.ts similarity index 88% rename from src/main/claude/claude-transcript-import-plan.ts rename to src/main/claude/transcripts/claude-transcript-import-plan.ts index 4f555aecca1..dc9cf58a623 100644 --- a/src/main/claude/claude-transcript-import-plan.ts +++ b/src/main/claude/transcripts/claude-transcript-import-plan.ts @@ -2,32 +2,32 @@ import { isDeepStrictEqual } from 'node:util' import { agentJournalItemKey, parseAgentJournalItemKey -} from '../../shared/agent-session/journal/agent-session-journal-item-key' +} from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalItemBody -} from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import type { AgentJournalTurnScope } from '../../shared/agent-session/journal/agent-session-journal-turn-scope' -import '../native-chat/agent-session-journal/writing/journal-row-builders' -import { journalLifecycleItemMutation } from '../native-chat/agent-session-journal/writing/journal-lifecycle-mutation' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session/journal/agent-session-journal-identity' +import type { AgentJournalTurnScope } from '../../../shared/agent-session/journal/agent-session-journal-turn-scope' +import '../../native-chat/agent-session-journal/writing/journal-row-builders' +import { journalLifecycleItemMutation } from '../../native-chat/agent-session-journal/writing/journal-lifecycle-mutation' import { continuedOutsideNotice, continuedOutsideRecordId, createHistoryCatchUpBatch, HISTORY_CATCH_UP_MAX_OPERATIONS, type HistoryCatchUpPlan -} from '../native-chat/agent-session-wire/acquisition/structured-agent-session-history-catch-up' +} from '../../native-chat/agent-session-wire/acquisition/structured-agent-session-history-catch-up' import { legacyItemBody, LEGACY_IMPORT_BLOCK_LIMITS -} from '../native-chat/agent-session-journal/history-import/journal-legacy-import' +} from '../../native-chat/agent-session-journal/history-import/journal-legacy-import' import type { StructuredAgentSessionEventSink, StructuredAgentSessionItemAppendOptions -} from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import type { StructuredAgentSessionTransitionJournal } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-transition' -import { claudeSourceBlockId } from './claude-streamed-block-identity' +} from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import type { StructuredAgentSessionTransitionJournal } from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-transition' +import { claudeSourceBlockId } from '../structured/journal/claude-streamed-block-identity' import { claudeMessageIdentity, claudeRecord, @@ -37,14 +37,14 @@ import { claudeToolResults, claudeToolUses, readClaudeMessageEnvelope -} from './structured/journal/claude-structured-item-translation' -import { createClaudeJournalTranslator } from './structured/journal/claude-structured-journal-translation' +} from '../structured/journal/claude-structured-item-translation' +import { createClaudeJournalTranslator } from '../structured/journal/claude-structured-journal-translation' import { createClaudeTranscriptItemReader, claudeRestoredItemBody } from './claude-transcript-item-reader' -import { idleClaudeJournalTurn } from './claude-session-state-turn-over' -import { claudeMessageWithoutSyntheticText } from './claude-internal-message-content' +import { idleClaudeJournalTurn } from '../structured/turns/claude-session-state-turn-over' +import { claudeMessageWithoutSyntheticText } from '../structured/journal/claude-internal-message-content' import { claudeTranscriptPrompt } from './claude-transcript-prompt' export function createClaudeTranscriptImportPlan(input: { diff --git a/src/main/claude/claude-transcript-item-reader.ts b/src/main/claude/transcripts/claude-transcript-item-reader.ts similarity index 85% rename from src/main/claude/claude-transcript-item-reader.ts rename to src/main/claude/transcripts/claude-transcript-item-reader.ts index 8181b3b9592..ddaa8ad4d92 100644 --- a/src/main/claude/claude-transcript-item-reader.ts +++ b/src/main/claude/transcripts/claude-transcript-item-reader.ts @@ -2,12 +2,12 @@ import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalItemBody, type AgentJournalRenderItem -} from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentJournalTurnScope } from '../../shared/agent-session/journal/agent-session-journal-turn-scope' -import { HISTORY_CATCH_UP_MAX_OPERATIONS } from '../native-chat/agent-session-wire/acquisition/structured-agent-session-history-catch-up' -import type { StructuredAgentSessionTransitionJournal } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-transition' -import { parseAgentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' -import { claudePromptUuidForSubmission } from './structured/claude-structured-session-id' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session/journal/agent-session-journal-turn-scope' +import { HISTORY_CATCH_UP_MAX_OPERATIONS } from '../../native-chat/agent-session-wire/acquisition/structured-agent-session-history-catch-up' +import type { StructuredAgentSessionTransitionJournal } from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-transition' +import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { claudePromptUuidForSubmission } from '../structured/claude-structured-session-id' /** Every saved item used by the projection is a conditional commit dependency, even if equal. */ export function createClaudeTranscriptItemReader( diff --git a/src/main/claude/claude-transcript-prompt.ts b/src/main/claude/transcripts/claude-transcript-prompt.ts similarity index 79% rename from src/main/claude/claude-transcript-prompt.ts rename to src/main/claude/transcripts/claude-transcript-prompt.ts index 51cc4712797..a10383e886d 100644 --- a/src/main/claude/claude-transcript-prompt.ts +++ b/src/main/claude/transcripts/claude-transcript-prompt.ts @@ -1,11 +1,11 @@ -import { isClaudeToolResultContent } from '../../shared/claude-tool-content' -import { decodeClaudeTranscriptLine } from '../native-chat/transcript-line-decoders-claude' -import { claudeEnvelopeStopHookFeedbackRow } from './claude-stop-hook-feedback' +import { isClaudeToolResultContent } from '../../../shared/claude-tool-content' +import { decodeClaudeTranscriptLine } from '../../native-chat/transcript-line-decoders-claude' +import { claudeEnvelopeStopHookFeedbackRow } from '../structured/journal/claude-stop-hook-feedback' import { claudeRecord, claudeOutputEnvelope, type ClaudeMessageEnvelope -} from './structured/journal/claude-structured-item-translation' +} from '../structured/journal/claude-structured-item-translation' export function claudeTranscriptPrompt( row: Record, diff --git a/src/main/claude/claude-transcript-recovery.ts b/src/main/claude/transcripts/claude-transcript-recovery.ts similarity index 100% rename from src/main/claude/claude-transcript-recovery.ts rename to src/main/claude/transcripts/claude-transcript-recovery.ts diff --git a/src/main/claude/claude-transcript-root-prompt.ts b/src/main/claude/transcripts/claude-transcript-root-prompt.ts similarity index 86% rename from src/main/claude/claude-transcript-root-prompt.ts rename to src/main/claude/transcripts/claude-transcript-root-prompt.ts index f6a7cad41da..4049032caff 100644 --- a/src/main/claude/claude-transcript-root-prompt.ts +++ b/src/main/claude/transcripts/claude-transcript-root-prompt.ts @@ -1,5 +1,5 @@ import { claudeTranscriptPrompt } from './claude-transcript-prompt' -import { readClaudeMessageEnvelope } from './structured/journal/claude-structured-item-translation' +import { readClaudeMessageEnvelope } from '../structured/journal/claude-structured-item-translation' /** Attachments/queued steer and tool results continue the existing root. */ export function isClaudeTranscriptRootPrompt(row: Record): boolean { diff --git a/src/main/claude/claude-transcript-tail.ts b/src/main/claude/transcripts/claude-transcript-tail.ts similarity index 97% rename from src/main/claude/claude-transcript-tail.ts rename to src/main/claude/transcripts/claude-transcript-tail.ts index ed544f027d8..9235d9f655d 100644 --- a/src/main/claude/claude-transcript-tail.ts +++ b/src/main/claude/transcripts/claude-transcript-tail.ts @@ -1,6 +1,6 @@ import { isClaudeConversationEntry } from './claude-conversation-fork-boundary' import { open } from 'node:fs/promises' -import { claudeRecord } from './structured/journal/claude-structured-item-translation' +import { claudeRecord } from '../structured/journal/claude-structured-item-translation' // Read backward to the saved leaf so catch-up costs only the appended stretch, not the whole conversation. diff --git a/src/main/claude/windows-hook-files.test.ts b/src/main/claude/windows-hook-files.test.ts deleted file mode 100644 index 2a79cdb3fcf..00000000000 --- a/src/main/claude/windows-hook-files.test.ts +++ /dev/null @@ -1,130 +0,0 @@ -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs' -import { tmpdir } from 'node:os' -import type * as osModule from 'node:os' -import { join } from 'node:path' -import * as refresh from '../agent-hooks/installation/scripts/managed-hook-script-refresh' -import { readHooksJson } from '../agent-hooks/installation/configuration/hooks-json-read' -import { writeHooksJson } from '../agent-hooks/installation/configuration/hooks-json-write' -import { ClaudeHookService } from './hook-service' -import { getWindowsManagedLifecycleHook } from './hook-settings' -import { getWindowsClaudeHookEntry, getWindowsClaudeHookPayloadPath } from './windows-hook-files' - -const { home } = vi.hoisted(() => ({ home: { path: '' } })) -vi.mock('node:os', async (original) => ({ - ...(await original()), - homedir: () => home.path -})) -vi.mock('electron', () => ({ app: { getPath: () => home.path } })) - -const platform = Object.getOwnPropertyDescriptor(process, 'platform')! -let entry: string -let payload: string -let settings: string -const service = new ClaudeHookService() - -beforeEach(() => { - home.path = mkdtempSync(join(tmpdir(), 'claude-windows-files-')) - entry = join(home.path, '.orca', 'agent-hooks', 'claude-hook.cmd') - payload = getWindowsClaudeHookPayloadPath(entry) - settings = join(home.path, '.claude', 'settings.json') - Object.defineProperty(process, 'platform', { configurable: true, value: 'win32' }) -}) - -afterEach(() => { - Object.defineProperty(process, 'platform', platform) - vi.restoreAllMocks() - rmSync(home.path, { recursive: true, force: true }) -}) - -describe('Windows Claude hook files', () => { - it('repairs a missing payload from the surviving entry without touching settings', async () => { - service.install() - rmSync(payload) - expect(service.getStatus().state).toBe('partial') - const configBefore = readFileSync(settings, 'utf8') - await service.refreshManagedScripts() - expect(service.getStatus().state).toBe('installed') - expect(readFileSync(entry, 'utf8')).toBe(getWindowsClaudeHookEntry()) - expect(readFileSync(payload, 'utf8')).toContain('/hook/claude') - expect(readFileSync(settings, 'utf8')).toBe(configBefore) - }) - - it.each(['entry', 'both'])('leaves a missing %s to install()', async (missing) => { - service.install() - rmSync(entry) - if (missing === 'both') { - rmSync(payload) - } - await service.refreshManagedScripts() - expect(existsSync(entry)).toBe(false) - expect(service.getStatus().state).toBe('partial') - expect(service.install().state).toBe('installed') - expect(readFileSync(entry, 'utf8')).toBe(getWindowsClaudeHookEntry()) - expect(readFileSync(payload, 'utf8')).toContain('/hook/claude') - }) - - it('leaves the old single-file entry intact when payload publication fails', async () => { - mkdirSync(join(home.path, '.orca', 'agent-hooks'), { recursive: true }) - const oldEntry = '@echo off\r\necho {}\r\nexit /b 0\r\n' - writeFileSync(entry, oldEntry) - vi.spyOn(refresh, 'restoreManagedScript').mockRejectedValueOnce(new Error('disk full')) - await expect(service.refreshManagedScripts()).rejects.toThrow('disk full') - expect(readFileSync(entry, 'utf8')).toBe(oldEntry) - expect(existsSync(payload)).toBe(false) - }) - - it('publishes the payload before replacing a legacy entry', async () => { - mkdirSync(join(home.path, '.orca', 'agent-hooks'), { recursive: true }) - writeFileSync(entry, 'legacy payload') - const restore = refresh.restoreManagedScript - const writes: string[] = [] - vi.spyOn(refresh, 'restoreManagedScript').mockImplementation(async (path, content) => { - if (path === entry) { - expect(readFileSync(payload, 'utf8')).toContain('/hook/claude') - } - writes.push(path) - await restore(path, content) - }) - await service.refreshManagedScripts() - expect(writes).toEqual([payload, entry]) - expect(existsSync(settings)).toBe(false) - }) - - it('keeps inert scripts on uninstall and never creates an entry from an orphan payload', async () => { - service.install() - service.remove() - expect(JSON.stringify(readHooksJson(settings))).not.toContain('claude-hook.cmd') - // Keep scripts callable for sessions still holding the old hook settings. - expect(readFileSync(entry, 'utf8')).toBe(getWindowsClaudeHookEntry()) - rmSync(entry) - writeFileSync(payload, 'orphan payload') - await service.refreshManagedScripts() - expect(existsSync(entry)).toBe(false) - expect(readFileSync(payload, 'utf8')).toBe('orphan payload') - }) - - it('migrates old command forms while preserving user hooks', () => { - const encoded = getWindowsManagedLifecycleHook( - 'C:\\Users\\%name%\\.orca\\agent-hooks\\claude-hook.cmd' - ) - writeHooksJson(settings, { - hooks: { - Stop: [{ hooks: [encoded, { type: 'command', command: 'echo user-hook' }] }], - PreToolUse: [ - { - hooks: [ - { type: 'command', command: 'C:/old/.orca/agent-hooks/claude-hook.cmd || echo {}' } - ] - } - ] - } - }) - service.install() - const config = JSON.stringify(readHooksJson(settings)) - expect(config).not.toContain('|| echo {}') - expect(config).not.toContain('C:/old/') - expect(config).toContain('echo user-hook') - expect(service.getStatus().state).toBe('installed') - }) -}) diff --git a/src/main/claude/windows-native-hook-registration.test.ts b/src/main/claude/windows-native-hook-registration.test.ts deleted file mode 100644 index bf01e0fe34f..00000000000 --- a/src/main/claude/windows-native-hook-registration.test.ts +++ /dev/null @@ -1,147 +0,0 @@ -import { afterEach, describe, expect, it, vi } from 'vitest' -import { spawnProcess } from '@orca/process-host' -import type { ChildProcessWithoutNullStreams } from 'node:child_process' -import { once } from 'node:events' -import { existsSync, mkdtempSync, readFileSync, writeFileSync } from 'node:fs' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { removeTreeSync } from '../../shared/windows-transient-lock-removal' -import type * as NativeHookExecutableModule from '../agent-hooks/installation/commands/windows-native-hook-executable' - -vi.mock('electron', () => ({ app: { getPath: () => '/tmp/userData' } })) - -const { bundledHook } = vi.hoisted(() => { - const bundledHook: { path: string | null } = { path: null } - return { bundledHook } -}) -vi.mock( - '../agent-hooks/installation/commands/windows-native-hook-executable', - async (importOriginal) => ({ - ...(await importOriginal()), - resolveBundledWindowsNativeHookExecutable: () => bundledHook.path - }) -) - -import { - createManagedCommandMatcher, - removeManagedCommands -} from '../agent-hooks/installation/commands/managed-hook-command-matching' -import type { - HookCommandConfig, - HookDefinition -} from '../agent-hooks/installation/configuration/hook-config-schema' -import { - buildWindowsNativeHookExecutable, - WINDOWS_NATIVE_HOOK_BUILD_TIMEOUT_MS -} from '../agent-hooks/installation/commands/testing/windows-native-hook-exe.test-fixture' -import { ClaudeHookService } from './hook-service' - -const CURRENT_CLAUDE = { claudeVersion: '2.1.261 (Claude Code)' } -const EXE = 'orca-agent-hook.exe' - -describe.skipIf(process.platform !== 'win32')('ClaudeHookService native hook install', () => { - let home = '' - - afterEach(() => { - vi.unstubAllEnvs() - bundledHook.path = null - if (home) { - removeTreeSync(home) - home = '' - } - }) - - function useTempHome(prefix = 'orca-claude-native-hook-'): { - hooksDir: string - settingsPath: string - bundle: string - } { - home = mkdtempSync(join(tmpdir(), prefix)) - vi.stubEnv('HOME', home) - vi.stubEnv('USERPROFILE', home) - const bundle = join(home, 'bundled-agent-hook.exe') - writeFileSync(bundle, 'MZ stand-in for the signed bundle') - return { - hooksDir: join(home, '.orca', 'agent-hooks'), - settingsPath: join(home, '.claude', 'settings.json'), - bundle - } - } - - function managedHooks(settingsPath: string, event: string): HookCommandConfig[] { - const settings = JSON.parse(readFileSync(settingsPath, 'utf8')) - const definitions: HookDefinition[] = settings.hooks[event] - const isManaged = createManagedCommandMatcher('claude-hook.cmd') - return definitions - .flatMap((definition) => definition.hooks ?? []) - .filter((hook) => removeManagedCommands([{ hooks: [hook] }], isManaged).length === 0) - } - - function managedCommands(settingsPath: string, event: string): string[] { - return managedHooks(settingsPath, event).map((hook) => hook.command) - } - - const exeCommand = (hooksDir: string): string => - `${join(hooksDir, EXE).replaceAll('\\', '/')} claude` - - // Holding stdin open keeps the hook image mapped to exercise locked-executable replacement. - function startHeldHook(program: string): ChildProcessWithoutNullStreams { - return spawnProcess({ - program, - args: ['claude'], - env: { - SystemRoot: process.env.SystemRoot, - ORCA_AGENT_HOOK_PORT: '1', - ORCA_AGENT_HOOK_TOKEN: 'token', - ORCA_PANE_KEY: 'tab:leaf' - }, - stdio: ['pipe', 'pipe', 'pipe'] - }) - } - - it( - 'replaces a copy whose hook is still running by moving it aside, in install and refresh', - { timeout: WINDOWS_NATIVE_HOOK_BUILD_TIMEOUT_MS }, - async () => { - const { hooksDir, settingsPath } = useTempHome() - bundledHook.path = buildWindowsNativeHookExecutable() - const service = new ClaudeHookService() - expect(service.install(CURRENT_CLAUDE).state).toBe('installed') - const installed = join(hooksDir, EXE) - const built = readFileSync(installed) - const nextBuild = (tag: string): Buffer => { - const path = join(home, `${tag}.exe`) - writeFileSync(path, Buffer.concat([built, Buffer.from(tag)])) - bundledHook.path = path - return readFileSync(path) - } - - const held = startHeldHook(installed) - try { - await once(held.stdout, 'data') - const next = nextBuild('next') - expect(service.install(CURRENT_CLAUDE).state).toBe('installed') - expect(managedCommands(settingsPath, 'Stop')).toEqual([exeCommand(hooksDir)]) - expect(readFileSync(installed).equals(next)).toBe(true) - expect(readFileSync(`${installed}.old`).equals(built)).toBe(true) - } finally { - held.stdin.end() - await once(held, 'close') - } - - const refreshing = startHeldHook(installed) - try { - await once(refreshing.stdout, 'data') - const later = nextBuild('later') - await service.refreshManagedScripts() - expect(readFileSync(installed).equals(later)).toBe(true) - } finally { - refreshing.stdin.end() - await once(refreshing, 'close') - } - - expect(service.install(CURRENT_CLAUDE).state).toBe('installed') - expect(existsSync(`${installed}.old`)).toBe(false) - } - ) -}) diff --git a/src/main/codebuddy/hook-service.test.ts b/src/main/codebuddy/hook-service.test.ts deleted file mode 100644 index 54c99319d87..00000000000 --- a/src/main/codebuddy/hook-service.test.ts +++ /dev/null @@ -1,57 +0,0 @@ -import { mkdtempSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs' -import { tmpdir } from 'node:os' -import type * as OsModule from 'node:os' -import { join } from 'node:path' -import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest' -const sandbox = vi.hoisted(() => ({ home: '' })) -vi.mock('node:os', async (importOriginal) => ({ - ...(await importOriginal()), - homedir: () => sandbox.home -})) -vi.mock('electron', () => ({ app: { getPath: () => sandbox.home } })) -import { getManagedLifecycleHook, getWindowsManagedLifecycleHook } from '../claude/hook-settings' -import { codebuddyHookService, CODEBUDDY_HOOK_EVENTS } from './hook-service' - -beforeAll(() => { - sandbox.home = mkdtempSync(join(tmpdir(), 'orca-codebuddy-test-')) - mkdirSync(join(sandbox.home, '.codebuddy')) -}) -afterAll(() => rmSync(sandbox.home, { recursive: true, force: true })) - -describe('CodeBuddy managed hooks on Windows', () => { - const platform = Object.getOwnPropertyDescriptor(process, 'platform')! - afterEach(() => Object.defineProperty(process, 'platform', platform)) - - // CodeBuddy spawns `shell: 'powershell'` hooks as bare `pwsh`, which stock Windows lacks (#27182). - it('registers a shell-free command and replaces the legacy pwsh registration', () => { - Object.defineProperty(process, 'platform', { configurable: true, value: 'win32' }) - const path = join(sandbox.home, '.codebuddy', 'settings.json') - const userHook = { type: 'command', command: 'echo user-hook' } - const scriptPath = join(sandbox.home, '.orca', 'agent-hooks', 'codebuddy-hook.cmd') - const legacyHook = getManagedLifecycleHook(scriptPath, { - configDirName: '.codebuddy', - scriptBaseName: 'codebuddy-hook', - usesWindowsCompatLauncher: true, - windowsHookShell: 'powershell' - }) - expect(legacyHook.shell).toBe('powershell') - writeFileSync( - path, - JSON.stringify({ hooks: { UserPromptSubmit: [{ hooks: [legacyHook, userHook] }] } }) - ) - expect(codebuddyHookService.getStatus().state).not.toBe('installed') - - expect(codebuddyHookService.install().state).toBe('installed') - const installed = JSON.parse(readFileSync(path, 'utf8')) - const expected = getWindowsManagedLifecycleHook(scriptPath) - for (const event of CODEBUDDY_HOOK_EVENTS) { - const hooks = installed.hooks[event].flatMap((d: { hooks: unknown[] }) => d.hooks) - expect(hooks).toContainEqual(expected) - for (const hook of hooks) { - expect(hook).not.toHaveProperty('shell') - } - } - expect(JSON.stringify(installed)).toContain('echo user-hook') - expect(JSON.stringify(installed)).not.toContain(legacyHook.command) - }) -}) diff --git a/src/main/codebuddy/hook-service.ts b/src/main/codebuddy/hook-service.ts index 628d376ffbd..b12ed619f6b 100644 --- a/src/main/codebuddy/hook-service.ts +++ b/src/main/codebuddy/hook-service.ts @@ -1,4 +1,4 @@ -import type { ClaudeManagedHookPlan } from '../claude/claude-managed-hook-events' +import type { ClaudeManagedHookPlan } from '../claude/hooks/claude-managed-hook-events' import { ClaudeHookService } from '../claude/hook-service' export const CODEBUDDY_HOOK_EVENTS = [ diff --git a/src/main/codex/app-server/codex-app-server-connection-tree-unproven.test.ts b/src/main/codex/app-server/codex-app-server-connection-tree-unproven.test.ts index 379c8478551..1797e0fb31f 100644 --- a/src/main/codex/app-server/codex-app-server-connection-tree-unproven.test.ts +++ b/src/main/codex/app-server/codex-app-server-connection-tree-unproven.test.ts @@ -3,10 +3,8 @@ import { PassThrough } from 'node:stream' import { afterEach, describe, expect, it, vi } from 'vitest' import type { spawnProcess } from '@orca/process-host' import type { DescendantTreeVerdict } from '../../pty/process-retirement/pty-descendant-exit-verification' -import { providerRequestTimeoutOf } from '../../provider-process/provider-request-timeout' + import { openCodexAppServerConnection } from './codex-app-server-connection' -import { CodexAppServerTimeoutError } from './codex-app-server-session' -import { codexTurnLifecycleRig } from '../structured/turns/codex-structured-dispatch-test-support' const teardown = vi.hoisted(() => { const state: { verdict: DescendantTreeVerdict; rootExits: () => void } = { @@ -15,7 +13,7 @@ const teardown = vi.hoisted(() => { } return state }) -vi.mock('../../claude/claude-agent-sdk-exit-proof', () => ({ +vi.mock('../../claude/child-process/claude-agent-sdk-exit-proof', () => ({ createClaudeChildTreeReaper: () => ({ capture: async () => {}, refresh: async () => {}, @@ -50,83 +48,6 @@ function stubChild() { } describe('Codex process-tree diagnostic after a forced close', () => { - it.each([undefined, 'turn-1'])( - 'bounds unanswered Stop %s and ignores its late reply after replacement', - async (turnId) => { - const rig = await codexTurnLifecycleRig() - const session = rig.adapter['sessions'].get('session-1')! - session.activeTurnIds?.add('turn-1') - vi.useFakeTimers() - const { child, spawnImpl } = stubChild() - const connection = await openCodexAppServerConnection( - { command: 'codex', args: [] }, - {}, - spawnImpl - ) - const original = session.connection - session.connection = connection - const acceptedAt = Date.now() - const stopping = rig.adapter.cancelTurn({ - sessionId: 'session-1', - fence: 7, - turnId, - stoppedAt: Date.now() - 4_900 - }) - let settled = false - const observed = stopping.then((outcome) => { - settled = true - return outcome - }) - await vi.advanceTimersByTimeAsync(99) - expect(settled).toBe(false) - await vi.advanceTimersByTimeAsync(1) - const outcome = await observed - expect(Date.now() - acceptedAt).toBe(100) - expect(outcome).toMatchObject({ - cancelled: false, - stop: { - pause: 'unconfirmed', - interrupt: 'unconfirmed', - root: 'unproven', - workload: 'unproven' - } - }) - const timeouts = outcome.stop?.errors.flatMap((error) => - error instanceof CodexAppServerTimeoutError && 'providerRequestTimeout' in error - ? [error.providerRequestTimeout] - : [] - ) - expect(timeouts).toEqual([ - { method: 'thread/goal/get', timeoutMs: expect.closeTo(100 / 3, 3) }, - { method: 'turn/interrupt', timeoutMs: 67 } - ]) - expect(providerRequestTimeoutOf(outcome.stop?.errors[1])).toEqual({ - method: 'turn/interrupt', - timeoutMs: 67 - }) - expect(outcome.stop?.errors).toHaveLength(3) - expect(outcome.stop?.errors[2]).toEqual(new Error('codex Stop reconciliation unavailable')) - const replacement = { - ...session, - connection: original, - fence: 8, - abortedTurnIds: new Set() - } - rig.adapter['sessions'].set('session-1', replacement) - const warning = vi.spyOn(console, 'warn').mockImplementation(() => {}) - child.stdout.write(`${JSON.stringify({ id: 2, result: {} })}\n`) - await vi.advanceTimersByTimeAsync(0) - expect(replacement.abortedTurnIds.size).toBe(0) - expect(warning).toHaveBeenCalled() - warning.mockRestore() - teardown.rootExits = () => child.emit('exit', 0, null) - const closing = connection.close() - await vi.advanceTimersByTimeAsync(10_000) - await closing - await rig.adapter.closeAll() - } - ) - it('reports a root exit that arrives after an unproven close', async () => { vi.useFakeTimers() teardown.verdict = 'unverifiable' diff --git a/src/main/codex/app-server/codex-app-server-connection.ts b/src/main/codex/app-server/codex-app-server-connection.ts index cb5a536f5ee..213e5153ea6 100644 --- a/src/main/codex/app-server/codex-app-server-connection.ts +++ b/src/main/codex/app-server/codex-app-server-connection.ts @@ -1,7 +1,7 @@ import type { PipedProcessSpawner } from '@orca/process-host/process-spec' import { spawnProcess } from '@orca/process-host' import { spawnManagedProviderProcess } from '../../provider-process/managed-provider-process' -import { createClaudeChildTreeReaper } from '../../claude/claude-agent-sdk-exit-proof' +import { createClaudeChildTreeReaper } from '../../claude/child-process/claude-agent-sdk-exit-proof' import type { ProviderProcessLaunch } from '../../provider-process/provider-process-launch' import { buildCodexAppServerExitError } from './codex-app-server-exit-error' import { withProviderSpawnAbsence } from '../../provider-process/provider-executable-missing' diff --git a/src/main/codex/structured/catalog/codex-at-rest-skills-probe.test.ts b/src/main/codex/structured/catalog/codex-at-rest-skills-probe.test.ts deleted file mode 100644 index 190d35548a0..00000000000 --- a/src/main/codex/structured/catalog/codex-at-rest-skills-probe.test.ts +++ /dev/null @@ -1,48 +0,0 @@ -import type * as Files from 'node:fs/promises' -import { scanClaudeCommandFolders } from '../../../claude/claude-command-folder-scan' -import type * as Catalog from '../../../native-chat/agent-session-wire/options/at-rest-command-catalog' -import { afterEach, expect, it, vi } from 'vitest' - -const folders = vi.hoisted(() => ({ open: vi.fn(), read: vi.fn() })) -vi.mock('node:fs/promises', async (original) => ({ - ...(await original()), - opendir: folders.open, - readFile: folders.read, - stat: vi.fn(async () => ({ isDirectory: () => true })) -})) -afterEach(() => vi.useRealTimers()) - -const visits = vi.hoisted(() => vi.fn((current: boolean) => current)) -vi.mock( - '../../../native-chat/agent-session-wire/options/at-rest-command-catalog', - async (original) => { - const actual = await original() - return { - ...actual, - AtRestCommandCatalog: vi.fn(function (source: Catalog.AtRestCommandSource) { - return new actual.AtRestCommandCatalog({ - ...source, - scan: (record, cwd, current, ...rest) => - source.scan(record, cwd, () => visits(current()), ...rest) - }) - }) - } - } -) - -it('closes a directory opened after cancellation before any read or recursion', async () => { - const opened = Promise.withResolvers() - const next = vi.fn(() => new Promise>(() => {})) - const close = vi.fn(async () => undefined) - folders.open.mockReturnValueOnce(opened.promise) - const stop = new AbortController() - const reading = scanClaudeCommandFolders(['/commands'], stop.signal) - const rejected = expect(reading).rejects.toThrow('cancelled') - stop.abort(new Error('cancelled')) - opened.resolve({ close, [Symbol.asyncIterator]: () => ({ next }) }) - await rejected - expect(close).toHaveBeenCalledExactlyOnceWith() - expect(next).not.toHaveBeenCalled() - expect(folders.open).toHaveBeenCalledExactlyOnceWith('/commands') - expect(folders.read).not.toHaveBeenCalled() -}) diff --git a/src/main/ipc/pty/ipc/claude-diff-panel-notice.ts b/src/main/ipc/pty/ipc/claude-diff-panel-notice.ts index 0a7d931857d..38825ea6ab7 100644 --- a/src/main/ipc/pty/ipc/claude-diff-panel-notice.ts +++ b/src/main/ipc/pty/ipc/claude-diff-panel-notice.ts @@ -2,8 +2,8 @@ import { isRemoteRuntimePtyId } from '../../../../shared/remote-runtime/remote-r import { LOCAL_EXECUTION_HOST_ID } from '../../../../shared/execution-host' import { getPtyIpc } from '../pty-host-bindings' import { parseAppSshPtyId } from '../../../providers/ssh-pty-id' -import { claudeDiffPanelMayAutoOpen } from '../../../claude/claude-diff-panel-auto-open' -import { probeRecentClaudeCliVersion } from '../../../claude/claude-hook-event-versions' +import { claudeDiffPanelMayAutoOpen } from '../../../claude/configuration/claude-diff-panel-auto-open' +import { probeRecentClaudeCliVersion } from '../../../claude/cli-capabilities/claude-hook-event-versions' import { getClaudeProfileRouter } from '../../../claude-accounts/profiles/routing/claude-profile-installed-router' import { resolveClaudeCommand } from '../../../codex-cli/command' import { ptyOwnership } from '../provider/ownership-state' diff --git a/src/main/native-chat/agent-session-wire/acquisition/testing/structured-agent-session-fork-boundary.test.ts b/src/main/native-chat/agent-session-wire/acquisition/testing/structured-agent-session-fork-boundary.test.ts deleted file mode 100644 index 00fdb85a2d7..00000000000 --- a/src/main/native-chat/agent-session-wire/acquisition/testing/structured-agent-session-fork-boundary.test.ts +++ /dev/null @@ -1,482 +0,0 @@ -import { fixture } from '../../publication/history/testing/agent-session-history-contract-test-fixture' -import { PI_CWD_BUCKET_LAYOUT } from '../../../../ai-vault/session-cwd-bucket-layouts' -import { prepareStructuredAgentSessionFork } from '../structured-agent-session-fork' -import type { StructuredAgentSessionHost } from '../../host/structured-agent-session-host' -import { acpHistoryTurns } from '../../../../acp/history/acp-history-replay' -import { translateHistoryTurn } from '../../../../acp/history/acp-history-translation' -import { OPENCODE_ACP_DIALECT } from '../../../../acp/acp-dialects/opencode-dialect' -import { readAcpFixture } from '../../../../acp/timeline/testing/acp-timeline-fixture.test-support' -import { structuredRewindCut } from '../../rewind/structured-rewind-cut' -import type { JournalReplacementItem } from '../../../agent-session-journal/context-epochs/journal-epoch-replacement' -import { prepareForkSnapshot } from '../structured-agent-session-fork-snapshot' -import type { AgentJournalSnapshot } from '../../../../../shared/agent-session/journal/agent-session-journal-types' -import { readFile, writeFile, mkdir } from 'node:fs/promises' -import { join } from 'node:path' -import { expect, it } from 'vitest' -import { claudeConversationForkBoundary } from '../../../../claude/claude-conversation-fork-boundary' -import { agentJournalItemKey } from '../../../../../shared/agent-session/journal/agent-session-journal-item-key' -import { agentSessionRecordFixture } from '../../../agent-session-record-test-fixture' - -import { structuredAgentSessionForkBoundary } from '../structured-agent-session-fork-boundary' -import { - continuedOutsideNotice, - continuedOutsideRecordId -} from '../structured-agent-session-history-catch-up' - -it('carries a settled root opener even when the streamed block never acquired a final native row', () => { - const opener = agentJournalItemKey({ - provider: 'claude', - sessionId: 'native-source', - uuid: 'prompt-1' - }) - const selected = agentJournalItemKey({ - provider: 'claude', - sessionId: 'native-source', - uuid: 'block:msg_lost:0' - }) - const boundary = structuredAgentSessionForkBoundary( - { - sessionId: 'source', - cursor: { epoch: 'epoch', sequence: 3 }, - submissions: [], - items: [ - { - itemId: opener, - sequence: 1, - revision: 0, - observedAt: 1, - body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'hello' }] } - }, - { - itemId: 'root', - sequence: 2, - revision: 1, - observedAt: 2, - body: { kind: 'turn', turnId: 'root', userItemId: opener, state: 'interrupted' } - }, - { - itemId: selected, - sequence: 3, - revision: 1, - observedAt: 3, - turnScope: { kind: 'turn', turnItemId: 'root' }, - body: { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'partial' }] } - } - ] - }, - agentSessionRecordFixture({ sessionId: 'source', provider: 'claude' }), - selected - ) - expect(boundary?.checkpoint).toMatchObject({ - settled: true, - rootMessage: { sessionId: 'native-source', uuid: 'prompt-1' } - }) -}) - -it('cuts Claude forks before a local-command caveat following the response', async () => { - const rows = ( - await readFile( - new URL('../../../../claude/__fixtures__/claude-rewind-hook.jsonl', import.meta.url), - 'utf8' - ) - ) - .trim() - .split('\n') - .map((line) => JSON.parse(line)) - const row = (uuid: string, parentUuid: string, content: string, isMeta?: true) => ({ - ...rows[54], - uuid, - parentUuid, - isMeta, - message: { role: 'user', content } - }) - const caveat = row( - 'caveat', - 'ef5b13f9-6a3f-5d82-8452-cb799862efc0', - 'The command below was run directly in Claude Code.', - true - ) - const command = row('command', caveat.uuid, '/usage') - const stdout = row('stdout', command.uuid, 'ok') - const entries = [...rows.slice(0, 48), caveat, command, stdout] - const checkpoint = { - selectedItemId: 'response', - settled: true, - throughMessage: { sessionId: 'source', uuid: 'ef5b13f9-6a3f-5d82-8452-cb799862efc0' } - } - expect(claudeConversationForkBoundary(entries, checkpoint)).toBe( - 'ef5b13f9-6a3f-5d82-8452-cb799862efc0' - ) - expect( - claudeConversationForkBoundary(entries, { - ...checkpoint, - beforeMessage: { sessionId: 'source', uuid: command.uuid } - }) - ).toBe('ef5b13f9-6a3f-5d82-8452-cb799862efc0') -}) - -it('cuts before a Claude continuation notice attributed to the next imported prompt', () => { - const key = (uuid: string) => - agentJournalItemKey({ provider: 'claude', sessionId: 'source', uuid }) - const turn = (recordId: string) => - agentJournalItemKey({ provider: 'legacy', agent: 'claude', sessionId: 'chat', recordId }) - const snapshot: AgentJournalSnapshot = { - sessionId: 'chat', - cursor: { epoch: 'epoch', sequence: 6 }, - submissions: [], - items: ( - [ - { itemId: turn('T1'), body: { kind: 'turn', turnId: 'T1', state: 'completed' } }, - { - itemId: turn(continuedOutsideRecordId(key('answer'))), - body: continuedOutsideNotice(false), - turnScope: { kind: 'thread' } - }, - { - itemId: key('answer'), - body: { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'FOXTROT' }] }, - turnScope: { kind: 'turn', turnItemId: turn('T1') } - }, - { - itemId: turn(continuedOutsideRecordId(key('late-detail'))), - body: continuedOutsideNotice(false), - turnScope: { kind: 'thread' } - }, - { - itemId: turn(continuedOutsideRecordId(key('terminal-user'))), - body: continuedOutsideNotice(false), - turnScope: { kind: 'thread' } - }, - { - itemId: turn('T2'), - body: { kind: 'turn', turnId: 'T2', state: 'completed', userItemId: key('terminal-user') } - }, - { - itemId: key('terminal-user'), - body: { - kind: 'message', - role: 'user', - blocks: [{ type: 'text', text: 'later terminal prompt' }] - }, - turnScope: { kind: 'turn', turnItemId: turn('T2') } - }, - { - itemId: key('late-detail'), - body: { kind: 'status', text: 'retained detail' }, - turnScope: { kind: 'turn', turnItemId: turn('T1') } - } - ] satisfies Omit< - AgentJournalSnapshot['items'][number], - 'sequence' | 'revision' | 'observedAt' - >[] - ).map((item, index) => ({ - ...item, - sequence: index + 1, - revision: 1, - observedAt: 123 - })) - } - expect( - prepareForkSnapshot({ snapshot, nextItemId: turn('T2') }).map((item) => - agentJournalItemKey(item.identity) - ) - ).toEqual([ - 'legacy:claude:chat:T1', - 'legacy:claude:chat:continued-outside%3Aclaude%3Asource%3Aanswer', - 'claude:source:answer', - 'legacy:claude:chat:continued-outside%3Aclaude%3Asource%3Alate-detail', - 'claude:source:late-detail' - ]) -}) - -it.each(['rewind', 'persisted', 'unrelated T3', 'saved fork'])( - 'forks FOXTROT without the orphan terminal notice: %s', - async (route) => { - const native = (turnId: string, ordinal: number) => - ({ provider: 'codex', threadId: 'thread-1', turnId, ordinal }) as const - const legacy = (recordId: string) => - ({ provider: 'legacy', agent: 'codex', sessionId: 'session-1', recordId }) as const - const root1 = agentJournalItemKey(legacy('root1')) - const root2 = agentJournalItemKey(legacy('root2')) - const source: JournalReplacementItem[] = ( - [ - { - identity: native('T1', 0), - body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'first' }] } - }, - { - identity: legacy('root1'), - body: { - kind: 'turn', - turnId: 'T1', - userItemId: 'codex:thread-1:T1:0', - state: 'completed' - } - }, - { - identity: native('T1', 1), - turnScope: { kind: 'turn', turnItemId: root1 }, - body: { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'FOXTROT' }] } - }, - { - identity: legacy(continuedOutsideRecordId('T2')), - body: continuedOutsideNotice(false), - turnScope: { kind: 'thread' } - }, - { - identity: legacy('root2'), - body: { - kind: 'turn', - turnId: 'T2', - userItemId: 'codex:thread-1:T2:0', - state: 'completed' - } - }, - { - identity: native('T2', 0), - turnScope: { kind: 'turn', turnItemId: root2 }, - body: { - kind: 'message', - role: 'user', - blocks: [{ type: 'text', text: 'terminal prompt' }] - } - }, - { - identity: native('T2', 1), - turnScope: { kind: 'turn', turnItemId: root2 }, - body: { - kind: 'message', - role: 'assistant', - blocks: [{ type: 'text', text: 'terminal answer' }] - } - } - ] satisfies Omit[] - ).map((row) => ({ ...row, observedAt: 123, ownerFence: 0 })) - const journal = fixture.journal - await journal.replaceEpochItems('session_created', 1, source) - if (route === 'rewind') { - const cut = structuredRewindCut(journal, { - itemId: 'codex:thread-1:T2:0', - provider: 'codex', - nativeId: 'thread-1' - }) - expect(cut).not.toBeNull() - await journal.replaceEpochItems('handle_forked', 1, cut!.kept) - } else { - await journal.replaceEpochItems('session_created', 1, [ - ...source.slice(0, 4), - // Earlier work alone cannot be introduced by a later notice. - { - identity: legacy(continuedOutsideRecordId('T1')), - body: continuedOutsideNotice(false), - observedAt: 123, - ownerFence: 0 - }, - ...(route === 'unrelated T3' - ? [ - { - identity: legacy('root3'), - body: { kind: 'turn' as const, turnId: 'T3', state: 'completed' as const }, - observedAt: 123, - ownerFence: 0 - }, - { - ...source[5]!, - identity: native('T3', 0), - turnScope: { - kind: 'turn' as const, - turnItemId: agentJournalItemKey(legacy('root3')) - } - } - ] - : []) - ]) - } - const record = agentSessionRecordFixture({ sessionId: 'session-1', provider: 'codex' }) - let snapshot = journal.snapshot() - let selected = 'codex:thread-1:T1:1' - let sourceThreadId = 'thread-1' - if (route === 'saved fork') { - const copied = prepareForkSnapshot({ - snapshot, - nextItemId: null, - sourceThreadId, - childThreadId: 'child' - }) - await journal.replaceEpochItems('session_created', 1, [ - ...copied, - source[3]!, - { - identity: legacy('fork-marker'), - body: { - kind: 'status', - text: 'Forked', - forkedFrom: { sessionId: 'parent' } - }, - observedAt: 123, - ownerFence: 0 - } - ]) - snapshot = journal.snapshot() - selected = 'codex:child:T1:1' - sourceThreadId = 'child' - } - const boundary = structuredAgentSessionForkBoundary(snapshot, record, selected) - expect(boundary).not.toBeNull() - expect( - prepareForkSnapshot({ - snapshot, - nextItemId: boundary!.nextItemId, - sourceThreadId, - childThreadId: 'result' - }).map((row) => agentJournalItemKey(row.identity)) - ).toEqual(['codex:result:T1:0', 'legacy:codex:session-1:root1', 'codex:result:T1:1']) - } -) - -it('retains the notice for an encoded ACP replay turn only while its introduced work survives', async () => { - const frames = (await readAcpFixture('opencode-v2-reopen-outside')) - .filter((frame) => frame.process === 'C' && frame.message.method === 'session/update') - .map((frame) => ({ method: 'session/update', params: frame.message.params })) - const first = acpHistoryTurns(frames, 'user-message-id')[0]! - if (first.turn === null) { - throw new Error('recorded replay has no user id') - } - const rows = translateHistoryTurn( - { - agent: 'opencode', - sessionId: 'chat', - providerSessionId: 'session-1', - dialect: OPENCODE_ACP_DIALECT, - identity: 'user-message-id' - }, - { ...first, turn: first.turn } - ) - const notice = { - itemId: 'legacy:opencode:chat:continued-outside%3Amsg_15fad6c9f001d4ix8WtRMUSWtI', - body: continuedOutsideNotice(false), - turnScope: { kind: 'thread' as const } - } - const snapshot: AgentJournalSnapshot = { - sessionId: 'chat', - cursor: { epoch: 'epoch', sequence: 3 }, - submissions: [], - items: [ - notice, - ...rows.map((row) => ({ ...row, itemId: agentJournalItemKey(row.identity) })) - ].map((row, index) => ({ ...row, sequence: index + 1, revision: 1, observedAt: 123 })) - } - expect( - prepareForkSnapshot({ snapshot, nextItemId: null }).map((row) => - agentJournalItemKey(row.identity) - ) - ).toEqual([ - 'legacy:opencode:chat:continued-outside%3Amsg_15fad6c9f001d4ix8WtRMUSWtI', - 'legacy:opencode:chat:turn-lifecycle%3Ap%3Asession-1%3Amsg_15fad6c9f001d4ix8WtRMUSWtI', - 'legacy:opencode:chat:item%3Ap%3Asession-1%3Asession-1%2Fuser%253Amsg_15fad6c9f001d4ix8WtRMUSWtI' - ]) - snapshot.items[2]!.body = { kind: 'tool-call', name: 'command', state: 'running', input: {} } - expect( - prepareForkSnapshot({ snapshot, nextItemId: null }).map((row) => - agentJournalItemKey(row.identity) - ) - ).toEqual([]) - snapshot.items.pop() - expect( - prepareForkSnapshot({ snapshot, nextItemId: null }).map((row) => - agentJournalItemKey(row.identity) - ) - ).toEqual([ - 'legacy:opencode:chat:turn-lifecycle%3Ap%3Asession-1%3Amsg_15fad6c9f001d4ix8WtRMUSWtI' - ]) -}) - -it('refuses an imported ACP tip with assistant prose but no native terminal evidence', async () => { - const nativeId = '019e6b26-18e2-7103-b7a0-7ba6bb071123' - const home = join(fixture.root, 'omp-account') - const sessions = join(home, 'sessions') - const directory = join(sessions, `${PI_CWD_BUCKET_LAYOUT.encodeScopePrefixes(fixture.root)[0]}--`) - await mkdir(directory, { recursive: true }) - await writeFile( - join(directory, `${nativeId}.jsonl`), - `${[ - { type: 'session', version: 3, id: nativeId, cwd: fixture.root }, - { - type: 'message', - id: 'prompt', - parentId: null, - message: { role: 'user', content: 'Remember 57319' } - }, - { - type: 'message', - id: 'response', - parentId: 'prompt', - message: { role: 'assistant', content: [{ type: 'text', text: 'Remembered' }] } - } - ] - .map((row) => JSON.stringify(row)) - .join('\n')}\n` - ) - for (const [recordId, role] of [ - ['prompt', 'user'], - ['response', 'assistant'] - ] as const) { - await fixture.journal.appendItem( - { provider: 'legacy', agent: 'omp', sessionId: nativeId, recordId }, - { - kind: 'message', - role, - blocks: [{ type: 'text', text: role === 'user' ? 'Remember 57319' : 'Remembered' }] - }, - { fence: 1, turnScope: { kind: 'thread' } } - ) - } - const record = agentSessionRecordFixture({ - sessionId: 'session-1', - provider: 'omp', - accountHome: { variable: 'PI_CODING_AGENT_DIR', path: home }, - launchDirectory: fixture.root, - providerHandleChain: [ - { - linkId: 'omp-head', - origin: 'created', - mintedAtFence: 1, - observedAt: 1, - handle: { transport: 'acp', agent: 'omp', nativeId } - } - ] - }) - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: boundary preparation reads only these saved source and adapter facets. - const host = { - deps: { - store: { - selectWritableRecord: () => ({ kind: 'writable' }), - requireWritableRecord: () => record, - admittedSendCount: () => 0 - }, - agents: { capabilities: () => ({ fork: 'tip' }) }, - adapter: { - copyConversation: async () => { - throw new Error('unexpected copy') - } - }, - resolveLaunchEnv: async () => ({ PI_CODING_AGENT_DIR: home, OMP_CODING_AGENT_DIR: sessions }) - }, - journalSnapshot: async () => fixture.journal.snapshot() - } as unknown as StructuredAgentSessionHost - await expect( - prepareStructuredAgentSessionFork({ - host, - agent: 'omp', - sessionId: 'session-1', - throughItemId: 'legacy:omp:019e6b26-18e2-7103-b7a0-7ba6bb071123:response', - location: record.location, - envelope: { - sessionId: 'omp-child', - clientOperationId: 'copy', - expectedRuntimeFence: null, - payloadFingerprint: '' - } - }) - ).rejects.toMatchObject({ refusal: { details: { reason: 'turnActive' } } }) -}) diff --git a/src/main/native-chat/agent-session-wire/host/testing/mobile-queued-edit-host.test-fixture.ts b/src/main/native-chat/agent-session-wire/host/testing/mobile-queued-edit-host.test-fixture.ts index 7d1dd5d7360..07514626bf7 100644 --- a/src/main/native-chat/agent-session-wire/host/testing/mobile-queued-edit-host.test-fixture.ts +++ b/src/main/native-chat/agent-session-wire/host/testing/mobile-queued-edit-host.test-fixture.ts @@ -66,7 +66,7 @@ export const createMobileCommandMenuHostFixture: MobileCommandMenuHostFixtureMod const { tmpdir } = await import('node:os') const { join } = await import('node:path') const { ClaudeAtRestCommandCatalog } = - await import('../../../../claude/claude-at-rest-commands') + await import('../../../../claude/command-catalog/claude-at-rest-commands') const { commandDiscoveryRig, OMP, DISCOVERY_SESSION } = await import('../../../../acp/discovery/testing/acp-command-discovery.test-fixture') const { acpStructuredAgentDefinition } = diff --git a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-at-rest-command-rig.test-fixture.ts b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-at-rest-command-rig.test-fixture.ts index 27495d9bfc9..b5bc1bf37c4 100644 --- a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-at-rest-command-rig.test-fixture.ts +++ b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-at-rest-command-rig.test-fixture.ts @@ -22,7 +22,7 @@ import type { import { ClaudeAtRestCommandCatalog, type ClaudeAtRestCommandsDeps -} from '../../../../claude/claude-at-rest-commands' +} from '../../../../claude/command-catalog/claude-at-rest-commands' import type { AgentSessionRecordStore } from '../../../../runtime/agent-session/records/agent-session-record-store' import { openTestAgentSessionRecordStore } from '../../../../runtime/agent-session/records/agent-session-record-store-test-harness' diff --git a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-claude-background-wake-owner.test.ts b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-claude-background-wake-owner.test.ts deleted file mode 100644 index 1fd1b857cdf..00000000000 --- a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-claude-background-wake-owner.test.ts +++ /dev/null @@ -1,112 +0,0 @@ -import { expect, it } from 'vitest' -import { readAgentJournalTurn } from '../../../../../shared/agent-session/lifecycle/agent-session-turn-record' -import { agentJournalSubmissionKey } from '../../../../../shared/agent-session/journal/agent-session-journal-item-key' -import { claudeFrame as frame } from '../../../../claude/structured/claude-structured-session-test-support' -import { - backgroundWakeCapture, - FIRST_PROMPT -} from '../../../../claude/claude-captured-fold-steer-frames.test-fixture' -import { HOST_TEST_SESSION as SESSION } from './structured-agent-session-host-test-data' -import { fixture, laneDrained } from './structured-agent-session-claude-stop-contract-test-fixture' -import { - dispatch, - eventually, - openTurn, - send, - sendUnechoed -} from './structured-agent-session-claude-stop-contract-test-actions' - -async function turns() { - await laneDrained() - await fixture.host.flushStreamedEvents(SESSION) - return (await fixture.host.journalSnapshot(SESSION)).items.flatMap((item) => { - const turn = readAgentJournalTurn(item.body) - return turn ? [turn] : [] - }) -} - -// The wake frames are CLI 2.1.280's; B's place among them is constructed, not captured. -it.each([ - ['handed over before the first result, without receipts', 3_406, null], - ['handed over before the first result, reported queued', 3_406, 'queued'], - ['handed over after the first turn ended', Infinity, null] -])( - 'keeps an unrelated background wake provider-owned when a follow-up is %s', - async (_label, handoffAt, receipt) => { - const connection = fixture.claude.connections[0]! - await send(FIRST_PROMPT) - await eventually(() => expect(connection.sent).toHaveLength(1)) - const first = connection.sent[0]! - const capture = backgroundWakeCapture({ - sessionId: String(first.session_id), - first: String(first.uuid), - steer: 'unused' - }) - for (const event of capture.firstTurn.filter((event) => event.at < handoffAt)) { - frame(connection, event.frame) - } - await laneDrained() - const followUp = await send('What is seven times eight?') - await eventually(() => expect(connection.sent).toHaveLength(2)) - const written = connection.sent[1]! - if (receipt) { - frame(connection, { type: 'command_lifecycle', state: receipt, command_uuid: written.uuid }) - } - for (const event of capture.firstTurn.filter((event) => event.at >= handoffAt)) { - frame(connection, event.frame) - } - for (const event of capture.wake) { - frame(connection, event.frame) - } - - const wake = (await turns()).at(-1) - expect(wake).toMatchObject({ turnId: 'task_updated-17547', state: 'completed' }) - expect(wake?.userItemId).not.toBe(agentJournalSubmissionKey(followUp)) - expect(wake?.userItemId).not.toContain(String(written.uuid)) - expect((await dispatch(followUp)).state).not.toBe('accepted') - - // The follow-up's own echo opens its turn. - frame(connection, { ...written, parent_tool_use_id: null }) - expect((await turns()).at(-1)).toMatchObject({ turnId: written.uuid, state: 'running' }) - expect(await dispatch(followUp)).toMatchObject({ state: 'accepted' }) - } -) - -it.each([ - ['plural', (uuid: unknown) => ({ user_message_uuids: [uuid] })], - ['singular', (uuid: unknown) => ({ user_message_uuid: uuid })] -])( - 'settles a follow-up its own %s result names without letting it own the next send', - async (_label, names) => { - const connection = fixture.claude.connections[0]! - await openTurn(connection, 'Say the word A.') - const uuidA = connection.sent.at(-1)!.uuid - const followUp = await sendUnechoed(connection) - const uuidB = connection.sent.at(-1)!.uuid - frame(connection, { - type: 'result', - subtype: 'success', - is_error: false, - uuid: 'result-a', - user_message_uuids: [uuidA] - }) - // B's own result arrives with no echo, init or output of B. - frame(connection, { - type: 'result', - subtype: 'success', - is_error: false, - uuid: 'result-b', - ...names(uuidB) - }) - expect(await dispatch(followUp)).toMatchObject({ state: 'accepted' }) - - const next = await send('Say the word C.') - await eventually(() => expect(connection.sent).toHaveLength(3)) - const written = connection.sent.at(-1)! - frame(connection, { ...written, parent_tool_use_id: null }) - expect((await turns()).filter((turn) => turn.state === 'running')).toEqual([ - expect.objectContaining({ turnId: written.uuid }) - ]) - expect(await dispatch(next)).toMatchObject({ state: 'accepted' }) - } -) diff --git a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-claude-stop-contract-test-actions.ts b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-claude-stop-contract-test-actions.ts index 7710211d9fb..67f6431fb9a 100644 --- a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-claude-stop-contract-test-actions.ts +++ b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-claude-stop-contract-test-actions.ts @@ -10,7 +10,7 @@ import { claudeWasSent as wrote, type FakeConnection } from '../../../../claude/structured/claude-structured-session-test-support' -import { invokeCanUseTool } from '../../../../claude/claude-can-use-tool-test-support' +import { invokeCanUseTool } from '../../../../claude/structured/permissions/claude-can-use-tool-test-support' import { HOST_TEST_SESSION as SESSION, hostTestMessage, diff --git a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-claude-stop-contract-test-fixture.ts b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-claude-stop-contract-test-fixture.ts index f2b61430a39..8c59bc7e0e4 100644 --- a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-claude-stop-contract-test-fixture.ts +++ b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-claude-stop-contract-test-fixture.ts @@ -4,7 +4,7 @@ import { join } from 'node:path' import { afterEach, beforeEach, expect, vi } from 'vitest' import type { AgentStatusStructuredSessionSubject } from '../../../../../shared/agent-status/contracts/agent-status-subject' import { AgentHookServer } from '../../../../agent-hooks/server/agent-hook-server' -import { runClaudeControl } from '../../../../claude/claude-agent-sdk-control-requests' +import { runClaudeControl } from '../../../../claude/sdk-transport/claude-agent-sdk-control-requests' import { ClaudeStructuredSessionAdapter } from '../../../../claude/structured/claude-structured-session-adapter' import type { ClaudeStructuredSessionEvent } from '../../../../claude/structured/claude-structured-session-event' import { diff --git a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-fork-rewind.test.ts b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-fork-rewind.test.ts deleted file mode 100644 index d41f02e2918..00000000000 --- a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-fork-rewind.test.ts +++ /dev/null @@ -1,341 +0,0 @@ -import { catchUpClaudeTranscript } from '../../../../claude/claude-transcript-catch-up' -import { createDeferredStructuredAgentSessionEventSink } from '../../journal-ingress/structured-agent-session-event-sink' -import { testEventSinkLogging } from './structured-agent-session-logger-test-support' -import { AgentSessionJournal } from '../../../agent-session-journal/journal-store' -import { usableJournalHistoryOrigin } from '../../../agent-session-journal/context-epochs/journal-history-origin' -import { recoverStructuredRewind } from '../../rewind/structured-rewind-recovery' -import { mkdtemp, mkdir, rm, writeFile } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { - agentJournalItemKey, - parseAgentJournalItemKey -} from '../../../../../shared/agent-session/journal/agent-session-journal-item-key' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../../shared/agent-session/journal/agent-session-journal-types' -import { computeAgentSessionPayloadFingerprint } from '../../../../../shared/agent-session/lifecycle/agent-session-mutation-envelope' -import { claudeProviderHandle } from '../../../../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding' -import { agentSessionProviderHandleChainHead } from '../../../../../shared/agent-session/lifecycle/agent-session-provider-handle' -import type { AgentSessionRewindFork } from '../../../../../shared/agent-session/lifecycle/agent-session-rewind' -import type { AgentSessionRecordStore } from '../../../../runtime/agent-session/records/agent-session-record-store' -import { openTestAgentSessionRecordStore } from '../../../../runtime/agent-session/records/agent-session-record-store-test-harness' -import { - closeTestJournalHostDatabases, - openTestJournalHostDatabase -} from '../../../agent-session-journal/store-lifecycle/journal-host-database-test-support' -import type { StructuredAgentSessionAdapter } from '../../providers/structured-agent-session-adapter' -import { claudeAndCodexAgents } from '../../providers/testing/structured-agent-session-adapter-router-test-support' -import type { StructuredAgentSessionEventSink } from '../../journal-ingress/structured-agent-session-event-sink' -import { StructuredAgentSessionHost } from '../structured-agent-session-host' -import { - HOST_TEST_NOW, - HOST_TEST_SESSION, - hostTestAttachParams, - hostTestMessage, - hostTestOperationId, - resetHostTestOperationIds -} from './structured-agent-session-host-test-data' -import { startsWhenPublished } from './structured-agent-session-instant-start.test-support' -import { createStructuredAgentSessionLogger } from '../structured-agent-session-logger' - -const caller = { callerKey: 'desktop' } -const SOURCE = '11111111-1111-4111-8111-111111111111' -const FORK: AgentSessionRewindFork = { - sessionId: '22222222-2222-4222-8222-222222222222', - sourceSessionId: SOURCE, - replacesSessionId: SOURCE, - materialized: true, - resumeCursor: 'fork-answer-1' -} -const key = (uuid: string) => agentJournalItemKey({ provider: 'claude', sessionId: SOURCE, uuid }) -let directory: string -let store: AgentSessionRecordStore -let host: StructuredAgentSessionHost -let sink: StructuredAgentSessionEventSink -let failAcquire: boolean -const forkForRewind = vi.fn>( - async () => ({ ok: true, fork: FORK }) -) -const nameProviderConversation = vi.fn() -const closeSession = vi.fn(async () => true) - -const attachParams = (fence: number | null) => - hostTestAttachParams(fence, { - provider: 'claude', - agent: 'claude', - accountHome: { variable: 'CLAUDE_CONFIG_DIR', path: '/home/dev/.claude' }, - providerHandle: { kind: 'claude', sessionId: SOURCE, leafUuid: 'answer-2' } - }) - -beforeEach(async () => { - resetHostTestOperationIds() - failAcquire = false - nameProviderConversation.mockClear() - forkForRewind.mockReset() - closeSession.mockClear() - forkForRewind.mockImplementation(async ({ record, beforeMessage }) => ({ - ok: true, - fork: { - ...FORK, - sessionId: - beforeMessage.uuid === 'prompt-2' ? FORK.sessionId : '33333333-3333-4333-8333-333333333333', - ...(beforeMessage.uuid === 'prompt-1' ? { resumeCursor: undefined } : {}), - replacesSessionId: agentSessionProviderHandleChainHead(record.providerHandleChain)!.handle - .nativeId - } - })) - directory = await mkdtemp(join(tmpdir(), 'orca-fork-rewind-')) - store = await openTestAgentSessionRecordStore(directory) - const adapter = startsWhenPublished( - { - supportsCreate: (_location, agent) => agent === 'claude', - supportsLocation: () => true, - acquire: async (input) => { - if (failAcquire) { - throw new Error('Claude cannot start') - } - sink = input.events! - return { - providerChildPhase: 'starting' as const, - process: { - hostId: 'local', - pid: 5001, - processStartTimeMs: HOST_TEST_NOW, - spawnToken: input.spawnToken - }, - acquisitionGeneration: 'generation-1', - link: { - linkId: `acquire-${input.fence}`, - mintedAtFence: input.fence, - observedAt: HOST_TEST_NOW, - origin: store.getRecord(HOST_TEST_SESSION)!.providerHandleChain.length - ? 'resumed' - : 'created', - handle: input.identity.providerHandle ?? claudeProviderHandle(SOURCE, 'answer-2') - } - } - }, - open: async ({ fence }) => ({ - reportedOptions: { model: '' }, - link: { - ...store.getRecord(HOST_TEST_SESSION)!.providerHandleChain.at(-1)!, - origin: 'resumed', - mintedAtFence: fence - } - }), - dispatch: async () => ({ state: 'unknown', reason: 'test' }), - cancelTurn: async () => ({ cancelled: false }), - answerPrompt: async () => {}, - setOption: async () => {}, - rewindSupport: () => ({ supported: true }), - forkForRewind, - releaseAcquisition: async () => true, - closeSession - }, - () => host - ) - const agents = claudeAndCodexAgents({ claude: adapter, codex: adapter }) - host = new StructuredAgentSessionHost({ - agents, - nameProviderConversation, - logger: createStructuredAgentSessionLogger(), - store, - adapter, - journalDatabase: openTestJournalHostDatabase(directory), - claimKeyId: 'key', - now: () => HOST_TEST_NOW, - probeOwner: async () => ({ outcome: 'exit-observed' }) - }) - expect(await host.attach(caller, attachParams(null))).toMatchObject({ ok: true }) - for (const [uuid, role] of [ - ['prompt-1', 'user'], - ['answer-1', 'assistant'], - ['prompt-2', 'user'], - ['answer-2', 'assistant'] - ] as const) { - sink.appendItem( - { provider: 'claude', sessionId: SOURCE, uuid }, - { ...hostTestMessage(uuid), role }, - { turnScope: AGENT_JOURNAL_THREAD_SCOPE } - ) - } - await host.flushStreamedEvents(HOST_TEST_SESSION) -}) - -afterEach(async () => { - vi.restoreAllMocks() - await host.flushAllStreamedEvents() - await closeTestJournalHostDatabases() - await rm(directory, { recursive: true, force: true }) -}) - -async function rewindSecondPrompt(uuid = 'prompt-2') { - const fields = { - itemId: key(uuid), - expectedEpoch: (await host.journalSnapshot(HOST_TEST_SESSION)).cursor.epoch - } - return host.rewind(caller, { - ...fields, - envelope: { - sessionId: HOST_TEST_SESSION, - clientOperationId: hostTestOperationId(), - expectedRuntimeFence: store.getRecord(HOST_TEST_SESSION)!.lease.runtimeFence, - payloadFingerprint: computeAgentSessionPayloadFingerprint({ - method: 'agentSession.rewind', - sessionId: HOST_TEST_SESSION, - fields - }) - } - }) -} - -describe('rewinding a chat whose agent forks', () => { - it('keeps the original conversation when saving its fork fails', async () => { - const before = await host.journalSnapshot(HOST_TEST_SESSION) - forkForRewind.mockRejectedValueOnce(new Error('transcript write failed')) - await expect(rewindSecondPrompt()).rejects.toThrow('transcript write failed') - expect(await host.journalSnapshot(HOST_TEST_SESSION)).toEqual(before) - expect(store.getRecord(HOST_TEST_SESSION)?.rewind).toBeUndefined() - expect(closeSession).not.toHaveBeenCalled() - }) -}) - -it('publishes the saved copy receipt after a crash before Claude rewind completion', async () => { - const session = host.collaboratorsForTests().sessions.get(HOST_TEST_SESSION)! - const journal = session.journal - const items = journal.snapshot().items.map((item) => ({ - identity: parseAgentJournalItemKey(item.itemId)!, - body: item.body, - observedAt: item.observedAt, - ownerFence: 0, - turnScope: item.turnScope - })) - await journal.replaceEpochItems('session_created', 1, items, undefined, undefined, { - version: 1, - kind: 'native_copy', - agent: 'claude', - unit: 'claude-entry', - providerHandle: { kind: 'claude', sessionId: SOURCE, leafUuid: 'answer-2' }, - ids: ['old-covered'] - }) - forkForRewind.mockResolvedValueOnce({ - ok: true, - fork: { ...FORK, resumeCursor: 'copy-answer', coverage: ['copy-prompt', 'copy-answer'] } - }) - const crash = vi - .spyOn(journal, 'replaceEpochItems') - .mockRejectedValueOnce(new Error('crash before completion')) - await expect(rewindSecondPrompt()).rejects.toThrow('crash before completion') - crash.mockRestore() - expect(store.getRecord(HOST_TEST_SESSION)?.rewind).toMatchObject({ - phase: 'provider-succeeded', - providerFork: { coverage: ['copy-prompt', 'copy-answer'] } - }) - const projects = join(directory, 'claude-home', 'projects', '-work') - await mkdir(projects, { recursive: true }) - const nativeRows = [ - { - type: 'user', - uuid: 'copy-prompt', - parentUuid: null, - message: { role: 'user', content: 'copied prompt' } - }, - { - type: 'assistant', - uuid: 'copy-answer', - parentUuid: 'copy-prompt', - message: { - id: 'msg_copy', - role: 'assistant', - content: [{ type: 'text', text: 'copied answer' }] - } - }, - { - type: 'user', - uuid: 'CLI-during-crash', - parentUuid: 'copy-answer', - message: { role: 'user', content: 'new CLI prompt' } - }, - { - type: 'assistant', - uuid: 'CLI-answer', - parentUuid: 'CLI-during-crash', - message: { - id: 'msg_cli', - role: 'assistant', - content: [{ type: 'text', text: 'new CLI answer' }] - } - } - ].map((row) => ({ - ...row, - sessionId: FORK.sessionId, - isSidechain: false, - timestamp: '2026-11-06T12:00:00Z' - })) - await writeFile( - join(projects, `${FORK.sessionId}.jsonl`), - nativeRows.map((row) => `${JSON.stringify(row)}\n`).join('') - ) - await journal.close() - store = await openTestAgentSessionRecordStore(directory) - const recovered = new AgentSessionJournal({ - identity: { - sessionId: HOST_TEST_SESSION, - workspaceId: 'workspace-1', - hostId: 'local', - agent: 'claude', - providerHandle: claudeProviderHandle(SOURCE, 'answer-2') - }, - database: openTestJournalHostDatabase(directory) - }) - await recovered.open() - await recoverStructuredRewind( - { store, logger: createStructuredAgentSessionLogger() }, - HOST_TEST_SESSION, - recovered, - store.getRecord(HOST_TEST_SESSION)!.lease.runtimeFence - ) - const origin = usableJournalHistoryOrigin(recovered.historyOrigin()) - expect(origin).toEqual({ - version: 1, - kind: 'native_copy', - agent: 'claude', - unit: 'claude-entry', - providerHandle: { kind: 'claude', sessionId: FORK.sessionId, leafUuid: 'copy-answer' }, - ids: ['copy-prompt', 'copy-answer'] - }) - expect(store.getRecord(HOST_TEST_SESSION)?.rewind?.providerFork?.coverage).toBeUndefined() - const deferred = createDeferredStructuredAgentSessionEventSink(testEventSinkLogging()) - deferred.bind({ - journal: recovered, - fence: store.getRecord(HOST_TEST_SESSION)!.lease.runtimeFence, - publish: () => {} - }) - try { - const open = () => - catchUpClaudeTranscript({ - sessionId: HOST_TEST_SESSION, - providerSessionId: FORK.sessionId, - leafUuid: 'copy-answer', - claudeConfigDir: join(directory, 'claude-home'), - cwd: '/work', - sink: deferred.sink - }) - expect(await open()).toBe(true) - expect(await open()).toBe(true) - const messages = recovered.snapshot().items.filter((item) => item.body.kind === 'message') - expect( - messages.flatMap((item) => (item.body.kind === 'message' ? item.body.blocks : [])) - ).toContainEqual({ type: 'text', text: 'new CLI prompt' }) - expect( - messages.filter( - (item) => - item.body.kind === 'message' && - item.body.blocks.some((block) => block.type === 'text' && block.text === 'new CLI answer') - ) - ).toHaveLength(1) - } finally { - deferred.close() - await recovered.close() - } -}) diff --git a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-stop-deadline.test-fixture.ts b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-stop-deadline.test-fixture.ts index 83958d70db0..34767bedf9c 100644 --- a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-stop-deadline.test-fixture.ts +++ b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-stop-deadline.test-fixture.ts @@ -1,5 +1,5 @@ import { expect, vi } from 'vitest' -import { CLAUDE_STOP_GRACE_MS } from '../../../../claude/claude-request-end-wait' +import { CLAUDE_STOP_GRACE_MS } from '../../../../claude/structured/turns/claude-request-end-wait' import type { ClaudeStructuredSessionAdapter } from '../../../../claude/structured/claude-structured-session-adapter' import type { fakeClaude, diff --git a/src/main/native-chat/agent-session-wire/observations/testing/structured-agent-session-resumed-child-owner.test.ts b/src/main/native-chat/agent-session-wire/observations/testing/structured-agent-session-resumed-child-owner.test.ts deleted file mode 100644 index e3d514026e3..00000000000 --- a/src/main/native-chat/agent-session-wire/observations/testing/structured-agent-session-resumed-child-owner.test.ts +++ /dev/null @@ -1,144 +0,0 @@ -import { mkdtemp, rm } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, beforeEach, expect, it } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../../shared/agent-session/journal/agent-session-journal-types' -import { claudeProviderHandle } from '../../../../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding' -import { parseAgentJournalItemKey } from '../../../../../shared/agent-session/journal/agent-session-journal-item-key' -import { - isBackgroundTaskBlock, - isSubagentBlock -} from '../../../../../shared/native-chat/native-chat-types' -import { - ClaudeBackgroundTaskIdentityResolver, - writeClaudeBackgroundTaskRow -} from '../../../../claude/claude-background-task-row-journal' -import { createTrackedJournalOpener } from '../../../agent-session-journal/store-lifecycle/journal-host-database-test-support' -import { StructuredAgentSessionCurrentWork } from '../structured-agent-session-current-work' -import { createDeferredStructuredAgentSessionEventSink } from '../../journal-ingress/structured-agent-session-event-sink' -import { testEventSinkLogging } from '../../host/testing/structured-agent-session-logger-test-support' -import { settleStaleStructuredAgentSessionState } from '../../termination/structured-agent-session-stale-state-settlement' -import { - StructuredAgentSessionSubagentRows, - type AgentChildWorkRowView -} from '../structured-agent-session-subagent-rows' - -// Resumed child work belongs to the new run despite older row creation; old-owner death cannot settle it. - -const journals = createTrackedJournalOpener() -let root: string - -beforeEach(async () => { - root = await mkdtemp(join(tmpdir(), 'orca-resumed-child-owner-')) -}) - -afterEach(async () => { - await journals.closeAll() - await rm(root, { recursive: true, force: true }) -}) - -const subagent: AgentChildWorkRowView = { - id: 'record-1', - providerId: 'agent-1', - kind: 'agent', - description: 'Audit the build', - state: 'working', - membership: 'live', - firstObservedAt: 100, - observedAt: 100, - stoppable: true, - invocation: { invocationId: 'toolu_1', generation: 1 }, - residency: 'background' -} - -it('keeps a resumed subagent and background task working when the run that created them dies', async () => { - const journal = await journals.open({ - identity: { - sessionId: 'session-1', - workspaceId: 'workspace-1', - hostId: 'local', - agent: 'claude', - providerHandle: claudeProviderHandle('claude-session', null) - }, - now: () => 9_000, - stateDirectory: root - }) - let fence = 1 - const rows = new StructuredAgentSessionSubagentRows({ - journal: () => journal, - fence: () => fence, - currentWork: (_sessionId, open) => new StructuredAgentSessionCurrentWork(open, fence), - readChildWork: () => [subagent], - onWriteFailed: (_sessionId, error) => { - throw error - } - }) - const tasks = new ClaudeBackgroundTaskIdentityResolver() - const run = async () => { - const deferred = createDeferredStructuredAgentSessionEventSink(testEventSinkLogging()) - deferred.bind({ journal, fence, publish: () => {} }) - rows.changed('session-1', deferred.sink) - writeClaudeBackgroundTaskRow( - deferred.sink, - tasks, - 'task-1', - { - block: { - type: 'background-task', - taskId: 'task-1', - kind: 'command', - label: 'Build', - state: 'working' - }, - lastSerialized: null, - toolUseId: 'tool-1', - terminalNotificationReceived: false, - generation: 1 - }, - () => AGENT_JOURNAL_THREAD_SCOPE - ) - await expect(deferred.drained()).resolves.toEqual({ ok: true }) - await new Promise((resolve) => setTimeout(resolve, 0)) - deferred.close() - } - - const settleRunOne = () => - settleStaleStructuredAgentSessionState({ - journal, - sessionId: 'session-1', - fence: 2, - acquisitionGeneration: null, - deathEvidence: { - kind: 'exit-observed', - detail: 'run 1 exited', - observedAt: 9_000, - ownerFence: 1 - }, - below: 2 - }) - await run() - fence = 2 - await run() - await settleRunOne() - // Epoch rebuild preserves both creation and execution provenance. - await journal.replaceEpochItems( - 'handle_forked', - 2, - journal.snapshot().items.map((item) => { - const { ownerFence, executionOwner } = journal.itemProvenance(item.itemId) - return { - identity: parseAgentJournalItemKey(item.itemId)!, - body: journal.itemBody(item.itemId)!, - ownerFence: ownerFence ?? 0, - ...(executionOwner === undefined ? {} : { executionOwner }) - } - }) - ) - await settleRunOne() - - const blocks = journal - .snapshot() - .items.flatMap((item) => (item.body.kind === 'message' ? item.body.blocks : [])) - expect(blocks.filter(isSubagentBlock).map((block) => block.state)).toEqual(['working']) - expect(blocks.filter(isBackgroundTaskBlock).map((block) => block.state)).toEqual(['working']) -}) diff --git a/src/main/native-chat/agent-session-wire/recovery/structured-agent-session-recovery-read.ts b/src/main/native-chat/agent-session-wire/recovery/structured-agent-session-recovery-read.ts index 7b026f69930..c1dfad38b63 100644 --- a/src/main/native-chat/agent-session-wire/recovery/structured-agent-session-recovery-read.ts +++ b/src/main/native-chat/agent-session-wire/recovery/structured-agent-session-recovery-read.ts @@ -3,7 +3,7 @@ import { structuredSessionRecoveryOptions, type RecoveryContextCache } from '../../../runtime/agent-session/lifecycle/structured-session-recovery-options' -import { withoutInheritedClaudeConfigDir } from '../../../claude/claude-config-dir-pin' +import { withoutInheritedClaudeConfigDir } from '../../../claude/structured/launch/claude-config-dir-pin' import type { StructuredAgentSessionHostDeps, StructuredAgentSessionHostSession diff --git a/src/main/native-chat/agent-session-wire/termination/structured-agent-session-host-teardown.ts b/src/main/native-chat/agent-session-wire/termination/structured-agent-session-host-teardown.ts index b60463c44e5..b567556d1d9 100644 --- a/src/main/native-chat/agent-session-wire/termination/structured-agent-session-host-teardown.ts +++ b/src/main/native-chat/agent-session-wire/termination/structured-agent-session-host-teardown.ts @@ -3,7 +3,7 @@ import { closeStructuredAgentSessionHandovers } from '../delivery/structured-agent-session-handing-over' import type { AgentSessionResumeTrigger } from '../../../../shared/agent-session/lifecycle/agent-session-resume-marker' -import { SUPERVISED_GRACEFUL_EXIT_MS } from '../../../claude/claude-child-exit-proof-ladder' +import { SUPERVISED_GRACEFUL_EXIT_MS } from '../../../claude/child-process/claude-child-exit-proof-ladder' import { PROVIDER_SUPERVISOR_MAX_STOP_MS } from '../../../provider-process/provider-process-supervisor' import { SNAPSHOT_DRAIN_TIMEOUT_MS } from './structured-agent-session-eviction' import type { StructuredAgentSessionRestartResume } from '../recovery/structured-agent-session-restart-resume-contract' diff --git a/src/main/native-chat/native-chat-inline-visuals-setting.test.ts b/src/main/native-chat/native-chat-inline-visuals-setting.test.ts deleted file mode 100644 index 735680d7f1a..00000000000 --- a/src/main/native-chat/native-chat-inline-visuals-setting.test.ts +++ /dev/null @@ -1,158 +0,0 @@ -import { - createClaudeStructuredLaunchResolver, - createCodexStructuredLaunchResolver -} from '../runtime/agent-session/launch/structured-agent-launch-composition.test-support' -import { existsSync, mkdtempSync, rmSync } from 'node:fs' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, describe, expect, it, vi } from 'vitest' -import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host' -import { CLAUDE_PLUGIN_DIR_FLAG, type ClaudeCliFlag } from '../claude/claude-cli-flag-support' -import { - acquireReadyCodexForTest, - adapterFor, - fakeCodex, - identityFor -} from '../codex/structured/session-lifecycle/codex-structured-session-adapter-fixture' -import { agentSessionRecordFixture } from './agent-session-record-test-fixture' -import { - createNativeChatVisualsDelivery, - NATIVE_CHAT_SCRATCH_DIR_ENV -} from './native-chat-visuals-delivery' -import { nativeChatScratchFolderFor } from './native-chat-scratch-folder' - -const SKILL = { pluginDir: '/app/plugin', skillsRoot: '/app/plugin/skills' } -const scratch: string[] = [] -afterEach(() => { - for (const dir of scratch.splice(0)) { - rmSync(dir, { recursive: true, force: true }) - } -}) - -function delivery(isEnabled: () => boolean) { - const stateDirectory = mkdtempSync(join(tmpdir(), 'orca-visuals-setting-')) - scratch.push(stateDirectory) - const prepareVisuals = createNativeChatVisualsDelivery({ - stateDirectory, - logger: { warn: vi.fn(), error: vi.fn() }, - isEnabled, - resolveSkill: async () => SKILL - }) - return { stateDirectory, prepareVisuals } -} - -describe('inline visuals launch preference', () => { - it('starts Claude without visuals while preserving configured plugins, user folders and attachment access', async () => { - const sessionId = 'claude-disabled' - const { stateDirectory, prepareVisuals } = delivery(() => false) - const check = vi.fn(async (_flag: ClaudeCliFlag) => 'supported' as const) - const record = agentSessionRecordFixture({ sessionId }) - const launch = await createClaudeStructuredLaunchResolver({ - store: { getRecord: () => record, pinLaunchDirectory: vi.fn() }, - resolveWorkspacePath: async () => '/repo', - resolveCommand: () => ({ command: '/bin/claude', prefixArgs: [] }), - resolveAuthPolicy: () => ({ account: 'system' }), - resolveLaunchArgs: () => ['--add-dir', '/user/notes', '--plugin-dir', '/user/plugin'], - resolveEnv: () => ({ [NATIVE_CHAT_SCRATCH_DIR_ENV]: '/inherited', KEEP: 'yes' }), - resolveInheritedEnv: async () => ({ PATH: '/bin' }), - attachmentDirectory: '/state/agent-session-attachments', - hasTranscript: async () => false, - cliFlags: { check }, - prepareVisuals - })({ identity: { ...identityFor(sessionId), agent: 'claude', providerHandle: null } }) - expect(launch.options).not.toHaveProperty('plugins') - expect(launch.options.extraArgs).toHaveProperty('plugin-dir', '/user/plugin') - expect(launch.options.additionalDirectories).toEqual([ - '/user/notes', - '/state/agent-session-attachments' - ]) - expect(launch.env).not.toHaveProperty(NATIVE_CHAT_SCRATCH_DIR_ENV) - expect(launch.env?.KEEP).toBe('yes') - expect(check.mock.calls.map(([flag]) => flag)).not.toContain(CLAUDE_PLUGIN_DIR_FLAG) - expect(existsSync(nativeChatScratchFolderFor(stateDirectory, sessionId))).toBe(false) - }) - - it('gives new Codex chats the current preference without changing another live chat', async () => { - let enabled = true - const { stateDirectory, prepareVisuals } = delivery(() => enabled) - const codex = fakeCodex({ - 'config/read': () => ({ - config: { sandbox_workspace_write: { writable_roots: ['/user/notes'] } } - }) - }) - const resolveLaunch = createCodexStructuredLaunchResolver({ - store: { - getRecord: (sessionId) => - agentSessionRecordFixture({ - sessionId, - provider: 'codex', - accountHome: { variable: 'CODEX_HOME', path: '/home/codex' } - }), - pinLaunchDirectory: vi.fn() - }, - resolveWorkspacePath: async () => '/repo', - resolveCommand: () => ({ command: '/bin/codex', prefixArgs: [] }), - resolveLaunchArgs: () => [], - resolveEnvironment: async () => ({ - [NATIVE_CHAT_SCRATCH_DIR_ENV]: '/inherited', - KEEP: 'yes' - }), - prepareVisuals - }) - const adapter = adapterFor(codex, {}, [], { resolveLaunch }) - const start = (sessionId: string) => - acquireReadyCodexForTest(adapter, { - identity: { - ...identityFor(sessionId), - hostId: LOCAL_EXECUTION_HOST_ID, - providerHandle: null - }, - fence: 1, - spawnToken: sessionId - }) - try { - await start('first') - const first = codex.connections[0]! - const firstCalls = [...first.calls] - const firstFolder = nativeChatScratchFolderFor(stateDirectory, 'first') - expect(first.launch.env?.[NATIVE_CHAT_SCRATCH_DIR_ENV]).toBe(firstFolder) - expect(first.calls.find(({ method }) => method === 'thread/start')?.params).toMatchObject({ - config: { 'sandbox_workspace_write.writable_roots': ['/user/notes', firstFolder] } - }) - - enabled = false - await start('disabled') - const disabled = codex.connections[1]! - expect(disabled.launch.env).not.toHaveProperty(NATIVE_CHAT_SCRATCH_DIR_ENV) - expect(disabled.launch.env?.KEEP).toBe('yes') - expect(disabled.calls.map(({ method }) => method)).not.toContain('skills/extraRoots/set') - const openIndex = disabled.calls.findIndex(({ method }) => method === 'thread/start') - expect(disabled.calls.slice(0, openIndex).map(({ method }) => method)).not.toContain( - 'config/read' - ) - const disabledOpen = disabled.calls.find(({ method }) => method === 'thread/start') - const scratchDirOverride = `shell_environment_policy.set.${NATIVE_CHAT_SCRATCH_DIR_ENV}` - expect(disabledOpen?.params?.config).not.toHaveProperty([ - 'sandbox_workspace_write.writable_roots' - ]) - expect(disabledOpen?.params?.config).not.toHaveProperty([scratchDirOverride]) - expect(existsSync(nativeChatScratchFolderFor(stateDirectory, 'disabled'))).toBe(false) - expect(first.closed).toBe(false) - expect(first.calls).toEqual(firstCalls) - - enabled = true - await start('reenabled') - const reenabled = codex.connections[2]! - expect( - reenabled.calls.find(({ method }) => method === 'skills/extraRoots/set')?.params - ).toEqual({ extraRoots: [SKILL.skillsRoot] }) - expect(reenabled.launch.env?.[NATIVE_CHAT_SCRATCH_DIR_ENV]).toBe( - nativeChatScratchFolderFor(stateDirectory, 'reenabled') - ) - expect(first.closed).toBe(false) - expect(first.calls).toEqual(firstCalls) - } finally { - await adapter.closeAll() - } - }) -}) diff --git a/src/main/native-chat/transcript-line-decoders-claude.ts b/src/main/native-chat/transcript-line-decoders-claude.ts index 095e183e1d4..8a37756b51e 100644 --- a/src/main/native-chat/transcript-line-decoders-claude.ts +++ b/src/main/native-chat/transcript-line-decoders-claude.ts @@ -17,12 +17,12 @@ import { isKnownRasterImageMimeType } from '../../shared/file-preview/raster-ima import { unwrapClaudePastedContentBlock } from '../../shared/claude-pasted-content' import { unwrapClaudeBashInputBlock } from '../../shared/claude-bash-input' import { claudeInterruptedMessageId } from './transcript-turn-markers' -import { claudeStopHookFeedbackRow } from '../claude/claude-stop-hook-feedback' +import { claudeStopHookFeedbackRow } from '../claude/structured/journal/claude-stop-hook-feedback' import { structuredAgentSessionStatusBlock } from '../../shared/agent-session/view/structured-agent-session-status-block' import { claudeMessageWithoutSyntheticText, isClaudeInjectedUserMessage -} from '../claude/claude-internal-message-content' +} from '../claude/structured/journal/claude-internal-message-content' const MAX_EDIT_PATCH_HUNKS = 40 const MAX_EDIT_PATCH_HUNK_LINES = 400 diff --git a/src/main/openclaude/hook-service.ts b/src/main/openclaude/hook-service.ts index 5f93d47d813..ccac406a70e 100644 --- a/src/main/openclaude/hook-service.ts +++ b/src/main/openclaude/hook-service.ts @@ -1,5 +1,5 @@ import { ClaudeHookService } from '../claude/hook-service' -import { OPENCLAUDE_HOOK_SETTINGS } from '../claude/hook-settings' +import { OPENCLAUDE_HOOK_SETTINGS } from '../claude/hooks/hook-settings' export const openClaudeHookService = new ClaudeHookService({ agent: 'openclaude', diff --git a/src/main/provider-process/managed-provider-writer-close.test.ts b/src/main/provider-process/managed-provider-writer-close.test.ts deleted file mode 100644 index c3e0bf4730f..00000000000 --- a/src/main/provider-process/managed-provider-writer-close.test.ts +++ /dev/null @@ -1,62 +0,0 @@ -import { afterEach, expect, it, vi } from 'vitest' -import { createFakePipedChild } from '../../shared/__fixtures__/fake-spawned-child' -import { createClaudeChildTreeReaper } from '../claude/claude-agent-sdk-exit-proof' -import { claudeChildCloseProven } from '../claude/claude-child-exit-proof-ladder' -import { spawnManagedProviderProcess } from './managed-provider-process' - -const taskkill = vi.hoisted(() => vi.fn(async () => false)) -vi.mock('../pty/process-retirement/windows-process-tree-kill', () => ({ - terminateWindowsProcessTree: taskkill -})) - -afterEach(() => { - vi.useRealTimers() - vi.restoreAllMocks() - taskkill.mockReset() -}) - -function fixture(strict = false) { - const child = createFakePipedChild(424242) - vi.spyOn(child, 'kill').mockReturnValue(true) - const managed = spawnManagedProviderProcess( - { command: 'fixture', args: [] }, - { - spawnImpl: () => child, - platform: 'win32', - site: 'fixture', - policy: () => ({ gracefulExitMs: 10, forcedExitMs: 5 }), - ...(strict ? { acceptClose: claudeChildCloseProven } : {}) - } - ) - return { child, managed } -} - -it('retains irreversible delivery through explicit strict cleanup retries without delaying writer joins', async () => { - vi.useFakeTimers() - const { managed, child } = fixture(true) - const kill = vi.fn().mockResolvedValueOnce(true).mockResolvedValue(false) - const tree = createClaudeChildTreeReaper(child, { - site: 'claude-structured-child-close', - platform: 'win32', - terminateWindowsTree: kill - }) - const first = managed.close(tree) - await vi.advanceTimersByTimeAsync(15) - expect(await first).toMatchObject({ root: 'live', killDelivered: true }) - const retry = managed.close(tree) - const writer = managed.closeWriter(tree) - await expect(writer).resolves.toMatchObject({ root: 'live', killDelivered: true }) - await vi.advanceTimersByTimeAsync(15) - expect(await retry).toMatchObject({ root: 'live', killDelivered: true }) - expect(kill).toHaveBeenCalledTimes(2) - child.emit('exit', 0, null) - await expect(managed.close(tree)).resolves.toMatchObject({ root: 'exited', killDelivered: true }) - await expect(managed.closeWriter(tree)).resolves.toMatchObject({ - root: 'exited', - killDelivered: true - }) - expect(kill).toHaveBeenCalledTimes(2) - const replacement = fixture().managed.close() - await vi.advanceTimersByTimeAsync(15) - expect(await replacement).not.toHaveProperty('killDelivered') -}) diff --git a/src/main/provider-process/provider-tree-kill-attribution.test.ts b/src/main/provider-process/provider-tree-kill-attribution.test.ts deleted file mode 100644 index 45a4fe286a6..00000000000 --- a/src/main/provider-process/provider-tree-kill-attribution.test.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { afterEach, expect, it, vi } from 'vitest' -import { createFakePipedChild } from '../../shared/__fixtures__/fake-spawned-child' -import { spawnCodexAppServerConnection } from '../codex/app-server/codex-app-server-connection' -import { proveClaudeChildExit } from '../claude/claude-agent-sdk-exit-proof' -import { - findSelfInitiatedTreeKills, - resetSelfInitiatedTreeKillLogForTest -} from '../crash-reporting/process-exits/self-initiated-tree-kill-log' -import { spawnManagedProviderProcess } from './managed-provider-process' - -vi.mock('node:child_process', async (importOriginal) => ({ - ...(await importOriginal>()), - execFile: vi.fn( - (_file: string, _args: string[], _options: unknown, callback: (error: Error | null) => void) => - callback(null) - ) -})) - -const platform = Object.getOwnPropertyDescriptor(process, 'platform')! - -afterEach(() => { - Object.defineProperty(process, 'platform', platform) - vi.useRealTimers() - resetSelfInitiatedTreeKillLogForTest() -}) - -it('attributes forced Windows child closes to their owning agent and path', async () => { - Object.defineProperty(process, 'platform', { configurable: true, value: 'win32' }) - vi.useFakeTimers() - resetSelfInitiatedTreeKillLogForTest() - const codexChild = createFakePipedChild(424242) - const codex = await spawnCodexAppServerConnection( - { command: 'codex', args: ['app-server'] }, - {}, - () => codexChild - ) - const claudeChild = createFakePipedChild(424243) - const claude = spawnManagedProviderProcess( - { command: 'claude', args: [] }, - { spawnImpl: () => claudeChild, site: 'claude-stream-json-teardown' } - ) - const closes = Promise.all([codex.close(), proveClaudeChildExit({ managed: claude })]) - await vi.runAllTimersAsync() - await closes - - expect(findSelfInitiatedTreeKills(Date.now())).toEqual([ - { - pid: 424242, - site: 'codex-app-server-child-close', - scope: 'win-taskkill-tree', - at: expect.any(Number) - }, - { - pid: 424243, - site: 'claude-structured-child-close', - scope: 'win-taskkill-tree', - at: expect.any(Number) - } - ]) -}) diff --git a/src/main/qoder/hook-service.ts b/src/main/qoder/hook-service.ts index 4e5db2c33ee..1ed5a33ef5c 100644 --- a/src/main/qoder/hook-service.ts +++ b/src/main/qoder/hook-service.ts @@ -1,4 +1,4 @@ -import type { ClaudeManagedHookPlan } from '../claude/claude-managed-hook-events' +import type { ClaudeManagedHookPlan } from '../claude/hooks/claude-managed-hook-events' import { ClaudeHookService } from '../claude/hook-service' // Qoder documents Claude-shaped hooks at https://docs.qoder.com/cli/hooks. diff --git a/src/main/qwen-code/hook-service.ts b/src/main/qwen-code/hook-service.ts index 7488271380e..bceea6c9950 100644 --- a/src/main/qwen-code/hook-service.ts +++ b/src/main/qwen-code/hook-service.ts @@ -1,5 +1,5 @@ import { ClaudeHookService } from '../claude/hook-service' -import type { ClaudeManagedHookPlan } from '../claude/claude-managed-hook-events' +import type { ClaudeManagedHookPlan } from '../claude/hooks/claude-managed-hook-events' // Qwen's hook enum is authoritative; Claude's version table and statusline do not apply. export const QWEN_CODE_HOOK_EVENTS = [ diff --git a/src/main/runtime/agent-session/installation/structured-agent-runtime-registrations.ts b/src/main/runtime/agent-session/installation/structured-agent-runtime-registrations.ts index fa247c73bac..d24a8884f9d 100644 --- a/src/main/runtime/agent-session/installation/structured-agent-runtime-registrations.ts +++ b/src/main/runtime/agent-session/installation/structured-agent-runtime-registrations.ts @@ -3,8 +3,8 @@ import { resolveNativeChatVisualsSkillLocation } from '../../../native-chat/nati import { withSupportedCodexCli } from '../../../codex/structured/launch/codex-cli-installation-error' import { codexStructuredLaunchPart } from '../../../codex/structured/launch/codex-structured-launch-resolution' import { claudeStructuredLaunchPart } from '../../../claude/structured/launch/claude-structured-launch-resolution' -import { claudeNamingInvocation } from '../../../claude/claude-naming-invocation' -import { createClaudeCommandCatalogProbe } from '../../../claude/claude-command-catalog-probe' +import { claudeNamingInvocation } from '../../../claude/conversation-naming/claude-naming-invocation' +import { createClaudeCommandCatalogProbe } from '../../../claude/command-catalog/claude-command-catalog-probe' import { CodexStructuredSessionAdapter } from '../../../codex/structured/session-lifecycle/codex-structured-session-adapter' import { createCodexAtRestSkillCatalog } from '../../../codex/structured/catalog/codex-at-rest-skills-probe' import { CODEX_STRUCTURED_AGENT } from '../../../codex/structured/launch/codex-structured-agent-definition' diff --git a/src/main/runtime/agent-session/installation/structured-agent-session-runtime-contract.ts b/src/main/runtime/agent-session/installation/structured-agent-session-runtime-contract.ts index 1abd762ecd1..2d639b16994 100644 --- a/src/main/runtime/agent-session/installation/structured-agent-session-runtime-contract.ts +++ b/src/main/runtime/agent-session/installation/structured-agent-session-runtime-contract.ts @@ -11,7 +11,7 @@ import type { import type { NativeChatShellEnvironmentPolicy } from '../../../../shared/native-chat/native-chat-shell-environment' import type { ClaudeStructuredAuthPolicy } from '../../../claude-accounts/runtime-auth/claude-structured-auth-policy' import type { RuntimeAgentAccountHomeResolver } from '../model-catalog/structured-agent-model-catalog-wiring' -import type { ClaudeCliFlagSupport } from '../../../claude/claude-cli-flag-support' +import type { ClaudeCliFlagSupport } from '../../../claude/cli-capabilities/claude-cli-flag-support' import type { StructuredAgentSessionLogger } from '../../../native-chat/agent-session-wire/host/structured-agent-session-logger' import type { AgentSessionStatusSummary } from '../../../../shared/agent-session/agent-session-wire' import type { AgentSessionTurnCompletionEvent } from '../../../../shared/agent-session/view/agent-session-turn-completion-wire' diff --git a/src/main/runtime/agent-session/installation/structured-claude-runtime-adapter.ts b/src/main/runtime/agent-session/installation/structured-claude-runtime-adapter.ts index 3fd9aa4c1af..b393cf58ffb 100644 --- a/src/main/runtime/agent-session/installation/structured-claude-runtime-adapter.ts +++ b/src/main/runtime/agent-session/installation/structured-claude-runtime-adapter.ts @@ -15,11 +15,11 @@ import type { AgentSessionRecordStore } from '../records/agent-session-record-st import { ClaudeAtRestCommandCatalog, type ClaudeAtRestCommandsDeps -} from '../../../claude/claude-at-rest-commands' -import type { ClaudeCommandCatalogProbe } from '../../../claude/claude-command-catalog-probe' +} from '../../../claude/command-catalog/claude-at-rest-commands' +import type { ClaudeCommandCatalogProbe } from '../../../claude/command-catalog/claude-command-catalog-probe' import { openClaudeStreamJsonConnection } from '../../../claude/claude-stream-json-connection' -import type { ClaudeCliFlagSupport } from '../../../claude/claude-cli-flag-support' -import { prewarmClaudeCliFlags } from '../../../claude/claude-cli-flag-prewarm' +import type { ClaudeCliFlagSupport } from '../../../claude/cli-capabilities/claude-cli-flag-support' +import { prewarmClaudeCliFlags } from '../../../claude/cli-capabilities/claude-cli-flag-prewarm' export type StructuredClaudeRuntimeAdapterDeps = { store: AgentSessionRecordStore diff --git a/src/main/runtime/agent-session/installation/structured-claude-scripted-runtime-test-support.ts b/src/main/runtime/agent-session/installation/structured-claude-scripted-runtime-test-support.ts index 19036dcec59..553c214c5c2 100644 --- a/src/main/runtime/agent-session/installation/structured-claude-scripted-runtime-test-support.ts +++ b/src/main/runtime/agent-session/installation/structured-claude-scripted-runtime-test-support.ts @@ -3,7 +3,7 @@ import { CLAUDE_CLI_FLAG_PROBE_BUDGET_MS, createClaudeCliFlagSupport -} from '../../../claude/claude-cli-flag-support' +} from '../../../claude/cli-capabilities/claude-cli-flag-support' import { providerDiagnostic, withProviderDiagnostic @@ -17,7 +17,7 @@ import type { ClaudeStreamJsonLaunch, openClaudeStreamJsonConnection } from '../../../claude/claude-stream-json-connection' -import { runClaudeControl } from '../../../claude/claude-agent-sdk-control-requests' +import { runClaudeControl } from '../../../claude/sdk-transport/claude-agent-sdk-control-requests' import { claudeSessionIdForOrcaSession } from '../../../claude/structured/claude-structured-session-id' import type { AgentSessionAttachParams } from '../../../native-chat/agent-session-wire/acquisition/structured-agent-session-attach' import { hostTestAttachParams } from '../../../native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data' diff --git a/src/main/runtime/agent-session/lifecycle/structured-agent-session-history-close-race.test.ts b/src/main/runtime/agent-session/lifecycle/structured-agent-session-history-close-race.test.ts deleted file mode 100644 index 3900b2e8efa..00000000000 --- a/src/main/runtime/agent-session/lifecycle/structured-agent-session-history-close-race.test.ts +++ /dev/null @@ -1,78 +0,0 @@ -import { expect, it, vi } from 'vitest' -import { RpcDispatcher } from '../../rpc/dispatcher' -import { STRUCTURED_AGENT_SESSION_REVEAL_METHODS } from '../../rpc/methods/structured-sessions/conversation/structured-agent-session-reveal' -import { STRUCTURED_AGENT_SESSION_CLOSE_METHOD } from '../../rpc/methods/structured-sessions/conversation/structured-agent-session-close-method' -import { STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY } from '../../../../shared/agent-session/agent-session-runtime-capabilities' -import { - B, - authorityProfile, - openAuthorityRuntime, - savedIds -} from './structured-agent-session-tab-authority.test-support' -import * as publication from '../../session-tabs/structured-session-tab-publication' -import { chatTabCommandsSettled } from '../../orca-runtime-tests/session-layout-apply.test-fixture' - -vi.mock('../../../claude/claude-cli-flag-prewarm', () => ({ - prewarmClaudeCliFlags: async () => undefined -})) - -it('does not resurrect a History tab when normal close commits before its publisher resumes', async () => { - const rig = await openAuthorityRuntime(await authorityProfile([], { records: [B], visible: [] })) - await rig.runtime.restoreStructuredAgentSessionTabs() - const rpc = new RpcDispatcher({ - runtime: rig.runtime, - methods: STRUCTURED_AGENT_SESSION_REVEAL_METHODS - }) - const events: string[] = [] - const admit = publication.admitStructuredSessionTabPublication - vi.spyOn(publication, 'admitStructuredSessionTabPublication').mockImplementationOnce( - async (...args) => { - const admitted = await admit(...args) - expect(rig.host.getSessionTabId(B)).toBe(admitted.tabId) - expect(rig.host.hasSession(B)).toBe(true) - events.push('show-committed') - // Forward real SHOW and close effects; hold only the opener's continuation after its currency read. - expect( - await STRUCTURED_AGENT_SESSION_CLOSE_METHOD.handler( - { sessionId: B }, - { - runtime: rig.runtime, - clientKind: 'mobile', - clientCapabilities: [STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY] - } - ) - ).toEqual({ ok: true }) - expect(rig.host.getSessionTabId(B)).toBeNull() - events.push('close-committed') - return admitted - } - ) - const reveal = await rpc.dispatch( - { - id: 'history-reveal', - authToken: 'token', - method: 'agentSession.reveal', - params: { sessionId: B, navigation: 'caller' } - }, - { - pairedDeviceId: 'phone', - clientKind: 'mobile', - clientCapabilities: [STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY] - } - ) - events.push('opener-settled') - await chatTabCommandsSettled() - expect(events).toEqual(['show-committed', 'close-committed', 'opener-settled']) - expect(rig.host.getSessionTabId(B)).toBeNull() - expect(rig.runtime.currentLocalStructuredSessionPresentation(B)).toBeNull() - expect(savedIds(rig)).toEqual([]) - expect(rig.host.listSessionTabs()).toEqual([]) - expect(rig.host.hasSession(B)).toBe(false) - expect(rig.store.getRecord(B)?.lease).toMatchObject({ - claimStatus: 'released', - ownerProcess: null, - reservedSpawnToken: null - }) - expect(rig.acquire).not.toHaveBeenCalled() - expect(reveal).toMatchObject({ ok: false }) -}) diff --git a/src/main/runtime/agent-session/lifecycle/structured-claude-thinking-display-refusal.test.ts b/src/main/runtime/agent-session/lifecycle/structured-claude-thinking-display-refusal.test.ts deleted file mode 100644 index 1a7e846a50d..00000000000 --- a/src/main/runtime/agent-session/lifecycle/structured-claude-thinking-display-refusal.test.ts +++ /dev/null @@ -1,85 +0,0 @@ -// A real child, through the real SDK connection, refusing the thinking-display flag the way an -// older Claude CLI does: commander's message and exit code 1. -import { mkdtempSync, rmSync, writeFileSync } from 'node:fs' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, describe, expect, it, vi } from 'vitest' -import { CLAUDE_STRUCTURED_BASE_OPTIONS } from '../../../claude/structured/launch/claude-structured-launch-resolution' -import { - CLAUDE_THINKING_DISPLAY_FLAG, - createClaudeCliFlagSupport -} from '../../../claude/claude-cli-flag-support' -import { openClaudeConnectionOf } from '../installation/structured-claude-runtime-adapter' - -const FAKE_CLI = join( - __dirname, - '../../..', - 'claude', - '__fixtures__', - 'claude-agent-sdk-scripted-cli.mjs' -) -const scratchDirs: string[] = [] - -afterEach(() => { - for (const dir of scratchDirs.splice(0)) { - rmSync(dir, { recursive: true, force: true }) - } -}) - -async function startRefusing(stderr: string) { - const dir = mkdtempSync(join(tmpdir(), 'claude-thinking-display-')) - scratchDirs.push(dir) - const scenarioPath = join(dir, 'scenario.json') - writeFileSync(scenarioPath, JSON.stringify({ steps: [{ stderr }, { exit: 1 }] })) - const env = { PATH: process.env.PATH ?? '', ORCA_SDK_CONTRACT_SCENARIO_PATH: scenarioPath } - const probe = vi.fn(async () => '2.1.280') - const support = createClaudeCliFlagSupport({ - probe, - keyOf: async (command, cwd) => `${command}\n${cwd}`, - budgetMs: 1_000, - now: () => performance.now() - }) - const flag = - (await support.check(CLAUDE_THINKING_DISPLAY_FLAG, { - command: FAKE_CLI, - cwd: dir, - env - })) === 'supported' - ? { 'thinking-display': 'summarized' } - : null - const { openConnection } = openClaudeConnectionOf({ claudeCliFlags: support }) - let exited: Error | null = null - const connection = await openConnection!( - { - pathToClaudeCodeExecutable: FAKE_CLI, - options: { - ...CLAUDE_STRUCTURED_BASE_OPTIONS, - extraArgs: { ...CLAUDE_STRUCTURED_BASE_OPTIONS.extraArgs, ...flag } - }, - cwd: dir, - env - }, - { onExit: (error) => (exited = error) } - ) - await vi.waitFor(() => expect(exited).not.toBeNull(), { timeout: 10_000 }) - await connection.close() - return { support, probe, flag, launch: { command: FAKE_CLI, cwd: dir, env } } -} - -describe('a Claude CLI that refuses the thinking-display flag', () => { - it('fails that one start as today, and the next launch skips the flag', async () => { - const { support, probe, flag, launch } = await startRefusing( - "error: unknown option '--thinking-display'\n" - ) - expect(flag).toEqual({ 'thinking-display': 'summarized' }) - await vi.waitFor(async () => - expect(await support.check(CLAUDE_THINKING_DISPLAY_FLAG, launch)).toBe('unsupported') - ) - expect(probe).toHaveBeenCalledTimes(1) - }) - - it('records nothing when the start failed for another reason', async () => { - const { support, launch } = await startRefusing('claude: not signed in\n') - await expect(support.check(CLAUDE_THINKING_DISPLAY_FLAG, launch)).resolves.toBe('supported') - }) -}) diff --git a/src/main/runtime/agent-session/model-catalog/structured-agent-model-catalog-discovery.ts b/src/main/runtime/agent-session/model-catalog/structured-agent-model-catalog-discovery.ts index cbd1910d443..eb1f124e40f 100644 --- a/src/main/runtime/agent-session/model-catalog/structured-agent-model-catalog-discovery.ts +++ b/src/main/runtime/agent-session/model-catalog/structured-agent-model-catalog-discovery.ts @@ -6,7 +6,7 @@ import type { AcpLaunchSpec } from '../../../acp/launch/acp-launch-contract' import { createClaudeModelCatalogProbe, type ClaudeModelCatalogProbeDeps -} from '../../../claude/claude-model-catalog-probe' +} from '../../../claude/model-catalog/claude-model-catalog-probe' import { createCodexModelCatalogProbe } from '../../../codex/structured/catalog/codex-model-catalog-probe' import type { AgentModelCatalogDiscovery } from '../../../native-chat/agent-model-catalog/agent-model-catalog-discovery' import type { StructuredAgentModelCatalogContext } from '../installation/structured-agent-runtime-registration-types' diff --git a/src/main/runtime/agent-session/naming/structured-chat-naming-agent-launch.ts b/src/main/runtime/agent-session/naming/structured-chat-naming-agent-launch.ts index c59b8c1b969..8aa358a8e67 100644 --- a/src/main/runtime/agent-session/naming/structured-chat-naming-agent-launch.ts +++ b/src/main/runtime/agent-session/naming/structured-chat-naming-agent-launch.ts @@ -7,7 +7,7 @@ import { getClaudeProfileRouter } from '../../../claude-accounts/profiles/routin import { claudeConfigDirEnvPatch, withoutInheritedClaudeConfigDir -} from '../../../claude/claude-config-dir-pin' +} from '../../../claude/structured/launch/claude-config-dir-pin' import { resolveClaudeStructuredLaunchHome } from '../../../claude/structured/launch/claude-structured-launch-home' import type { CommitMessageGenerationTarget } from '../../../text-generation/source-control-text-generation-types' diff --git a/src/main/runtime/agent-session/naming/structured-chat-naming-runtime.ts b/src/main/runtime/agent-session/naming/structured-chat-naming-runtime.ts index 88fb2bbc2ae..0aaf2bdf654 100644 --- a/src/main/runtime/agent-session/naming/structured-chat-naming-runtime.ts +++ b/src/main/runtime/agent-session/naming/structured-chat-naming-runtime.ts @@ -1,4 +1,4 @@ -import { ClaudeControlRequestTimeoutError } from '../../../claude/claude-agent-sdk-control-requests' +import { ClaudeControlRequestTimeoutError } from '../../../claude/sdk-transport/claude-agent-sdk-control-requests' import { normalizeSourceControlAiSettings } from '../../../../shared/source-control/ai/settings/source-control-ai-settings' import { resolveSourceControlActionRecipe, diff --git a/src/main/runtime/agent-session/naming/structured-claude-naming-test-support.ts b/src/main/runtime/agent-session/naming/structured-claude-naming-test-support.ts index 0a79b0e5f4c..6ee45edcae2 100644 --- a/src/main/runtime/agent-session/naming/structured-claude-naming-test-support.ts +++ b/src/main/runtime/agent-session/naming/structured-claude-naming-test-support.ts @@ -3,7 +3,7 @@ import { appendFile, mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/pro import { tmpdir } from 'node:os' import { dirname, join } from 'node:path' import { claudeProviderHandle } from '../../../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding' -import { appendTranscriptEntries } from '../../../claude/claude-provider-session-rename' +import { appendTranscriptEntries } from '../../../claude/transcripts/claude-provider-session-rename' import { computeAgentSessionPayloadFingerprint } from '../../../../shared/agent-session/lifecycle/agent-session-mutation-envelope' import { fakeClaude } from '../../../claude/structured/claude-structured-session-test-support' import type { FakeConnection } from '../../../claude/structured/claude-structured-session-test-support' diff --git a/src/main/runtime/workspaces/process-listing/workspace-process-listing.ts b/src/main/runtime/workspaces/process-listing/workspace-process-listing.ts index 32c4131cc88..18f33acf5d3 100644 --- a/src/main/runtime/workspaces/process-listing/workspace-process-listing.ts +++ b/src/main/runtime/workspaces/process-listing/workspace-process-listing.ts @@ -48,7 +48,7 @@ import { } from '../../orchestration/terminal-authority/structured-sessions/structured-worker-custody' import { preModeChatGetsFullAccess } from '../../../../shared/agent-launch/permissions/agent-chat-permission-mode' import { isTuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent-config' -import { claudeCliFlagSupport } from '../../../claude/claude-cli-flag-support' +import { claudeCliFlagSupport } from '../../../claude/cli-capabilities/claude-cli-flag-support' import { runtimeHiddenHostIds, runtimeHiddenRepos, diff --git a/src/main/startup/agent-hooks-uninstall-preflight-real-removers.test.ts b/src/main/startup/agent-hooks-uninstall-preflight-real-removers.test.ts deleted file mode 100644 index 073c6f01ad2..00000000000 --- a/src/main/startup/agent-hooks-uninstall-preflight-real-removers.test.ts +++ /dev/null @@ -1,85 +0,0 @@ -import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, beforeEach, expect, it, vi } from 'vitest' - -const fixture = vi.hoisted(() => ({ home: '', userData: '', exit: vi.fn() })) - -vi.mock('electron', () => ({ - app: { - exit: fixture.exit, - getPath: (name: string) => (name === 'userData' ? fixture.userData : fixture.home), - getAppPath: () => fixture.userData, - getVersion: () => '0.0.0-test', - isPackaged: false, - on: vi.fn(), - setPath: vi.fn(), - requestSingleInstanceLock: vi.fn() - }, - BrowserWindow: vi.fn(), - ipcMain: { handle: vi.fn() } -})) -vi.mock('./windows-app-data-path', () => ({ ensureWindowsAppDataPath: vi.fn() })) -vi.mock(import('node:os'), async (importOriginal) => { - const actual = await importOriginal() - return { ...actual, homedir: () => fixture.home } -}) - -const APP_ENVIRONMENT_SLOT = Symbol.for('orca.host.appEnvironment') - -beforeEach(() => { - fixture.home = mkdtempSync(join(tmpdir(), 'orca-uninstall-hooks-home-')) - fixture.userData = mkdtempSync(join(tmpdir(), 'orca-uninstall-hooks-data-')) - fixture.exit.mockClear() - // Every path the removers resolve from the environment stays in the fixture, on any runner. - vi.stubEnv('HOME', fixture.home) - vi.stubEnv('USERPROFILE', fixture.home) - vi.stubEnv('ORCA_USER_DATA_PATH', fixture.userData) - vi.stubEnv('XDG_CONFIG_HOME', join(fixture.home, '.config')) - vi.stubEnv('APPDATA', join(fixture.home, 'AppData', 'Roaming')) - vi.stubEnv('CODEX_HOME', join(fixture.home, '.codex')) - vi.stubEnv('CLAUDE_CONFIG_DIR', '') - // The uninstaller launches a fresh process: nothing has installed the app environment yet. - Reflect.set(globalThis, APP_ENVIRONMENT_SLOT, null) -}) - -afterEach(() => { - vi.unstubAllEnvs() - rmSync(fixture.home, { recursive: true, force: true }) - rmSync(fixture.userData, { recursive: true, force: true }) -}) - -it("runs every agent's real remover, including Claude's agent view and status-line marker", async () => { - const { installClaudeAgentView } = await import('../claude/agent-view/agent-view-install') - const { markerName } = await import('../claude/agent-view/agent-view-binding-plan') - const { CLAUDE_AGENT_VIEW_COMMAND } = await import('../../shared/claude-agent-view') - const { getStatusLineInstallMarkerPath } = await import('../claude/hook-settings') - const claudeDir = join(fixture.home, '.claude') - mkdirSync(claudeDir, { recursive: true }) - expect(installClaudeAgentView(join(claudeDir, 'settings.json'))).toBe(true) - expect(readFileSync(join(claudeDir, 'keybindings.json'), 'utf8')).toContain( - `command:${CLAUDE_AGENT_VIEW_COMMAND}` - ) - const statusLineMarker = getStatusLineInstallMarkerPath() - mkdirSync(join(statusLineMarker, '..'), { recursive: true }) - writeFileSync(statusLineMarker, '') - const warn = vi.spyOn(console, 'warn').mockImplementation(() => {}) - - const { AGENT_HOOKS_UNINSTALL_FLAG, runAgentHooksUninstallPreflight } = - await import('./agent-hooks-uninstall-preflight') - expect(runAgentHooksUninstallPreflight(['Orca.exe', AGENT_HOOKS_UNINSTALL_FLAG])).toBe(true) - - await vi.waitFor(() => expect(fixture.exit).toHaveBeenCalled(), { timeout: 20_000 }) - // No remover failed, so none hit an uninitialised singleton. - expect(warn).not.toHaveBeenCalled() - expect(fixture.exit).toHaveBeenCalledExactlyOnceWith(0) - // The keybinding goes; the marker stays, recording that Orca disabled it. - expect(readFileSync(join(claudeDir, 'keybindings.json'), 'utf8')).not.toContain( - `command:${CLAUDE_AGENT_VIEW_COMMAND}` - ) - expect(JSON.parse(readFileSync(join(claudeDir, markerName), 'utf8'))).toMatchObject({ - setup: 'pending', - cleanupPending: false - }) - expect(existsSync(statusLineMarker)).toBe(false) -}) diff --git a/tests/e2e/automation-chat-reopen.unit.test.ts b/tests/e2e/automation-chat-reopen.unit.test.ts deleted file mode 100644 index ce7dab8a631..00000000000 --- a/tests/e2e/automation-chat-reopen.unit.test.ts +++ /dev/null @@ -1,113 +0,0 @@ -import { afterEach, expect, it, vi } from 'vitest' -import type { createTestStore } from '../../src/renderer/src/store/testing/app-store-test-fixture' -import type { RuntimeClientTarget } from '../../src/shared/runtime-client-target' - -const bridge = vi.hoisted(() => { - const current: { - store: ReturnType | null - call: - | ((target: RuntimeClientTarget, method: string, params: unknown) => Promise) - | null - } = { store: null, call: null } - return { current, fallback: vi.fn(), workspace: vi.fn(() => true) } -}) -vi.mock('@/store', () => ({ - useAppStore: { - getState: () => { - if (!bridge.current.store) { - throw new Error('renderer fixture not bound') - } - return bridge.current.store.getState() - } - } -})) -vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({ - callRuntimeRpc: (target: RuntimeClientTarget, method: string, params: unknown) => { - if (!bridge.current.call) { - throw new Error('transport fixture not bound') - } - return bridge.current.call(target, method, params) - } -})) -vi.mock('@/runtime/rpc/compatibility/runtime-capability-proof', () => ({ - runtimeEnvironmentSupportsCapability: async () => true -})) -vi.mock('@/lib/workspace/activation/worktree-activation', () => ({ - activateAndRevealWorktree: bridge.workspace, - activateAndRevealFolderWorkspace: bridge.workspace -})) -vi.mock('sonner', () => ({ toast: { error: bridge.fallback, message: bridge.fallback } })) -vi.mock('../../src/main/claude/claude-cli-flag-prewarm', () => ({ - prewarmClaudeCliFlags: async () => undefined -})) - -import { CHAT, SURVIVOR, createReopenRig } from './helpers/automation-chat-reopen-test-harness' -import { createTabsSliceMockApi } from '../../src/renderer/src/store/slices/tabs/tabs-slice-test-harness' -import { resetWebSessionTabsSyncTestState } from '../../src/renderer/src/runtime/web-session-tabs-sync/testing/web-session-tabs-sync.test-fixture' -import { resetLocalStructuredSessionVersionForTests } from '../../src/renderer/src/runtime/local-structured-session-tabs-sync/inventory-generation-fence' - -createTabsSliceMockApi() -afterEach(() => { - resetWebSessionTabsSyncTestState() - resetLocalStructuredSessionVersionForTests() - bridge.current.store = null - bridge.current.call = null - vi.clearAllMocks() -}) - -it.each([false, true])( - 'Details republishes the same closed durable Chat through real owners, paired=%s', - async (paired) => { - const rig = await createReopenRig(paired, (store) => { - bridge.current.store = store - }) - bridge.current.call = rig.call - try { - await rig.close() - expect(rig.selected()?.entityId).toBe(SURVIVOR) - expect( - rig.store - .getState() - .unifiedTabsByWorktree[rig.workspace]?.some((tab) => tab.entityId === CHAT) - ).toBe(false) - if (paired) { - rig.decoy() - } - rig.action() - await vi.waitFor(() => - expect(rig.calls.some(({ method }) => method === 'agentSession.reveal')).toBe(true) - ) - await vi.waitFor(() => - expect(rig.selected()).toMatchObject({ - entityId: CHAT, - executionHostId: paired ? 'runtime:reopen-host' : 'local' - }) - ) - expect(rig.host.isSessionTabVisible(CHAT)).toBe(true) - await rig.inventory() - expect(rig.selected()?.entityId).toBe(CHAT) - expect(bridge.fallback).not.toHaveBeenCalled() - // A later real close wins; the next explicit click is a new, released interaction. - await rig.close() - await rig.inventory() - expect(rig.selected()?.entityId).toBe(SURVIVOR) - expect(rig.host.isSessionTabVisible(CHAT)).toBe(false) - rig.action() - await vi.waitFor(() => - expect(rig.calls.filter(({ method }) => method === 'agentSession.reveal')).toHaveLength(2) - ) - await vi.waitFor(() => - expect(rig.selected()).toMatchObject({ - entityId: CHAT, - executionHostId: paired ? 'runtime:reopen-host' : 'local' - }) - ) - await rig.inventory() - expect(rig.selected()?.entityId).toBe(CHAT) - expect(bridge.fallback).not.toHaveBeenCalled() - await rig.unchanged() - } finally { - rig.dispose() - } - } -) diff --git a/tests/e2e/cross-version-wire/host-model-catalog-released-phone.unit.test.ts b/tests/e2e/cross-version-wire/host-model-catalog-released-phone.unit.test.ts deleted file mode 100644 index cfcf9586f63..00000000000 --- a/tests/e2e/cross-version-wire/host-model-catalog-released-phone.unit.test.ts +++ /dev/null @@ -1,270 +0,0 @@ -import { execFileSync } from 'node:child_process' -import { stripTypeScriptTypes } from 'node:module' -import { beforeAll, expect, it, vi } from 'vitest' -import { - call, - hostStub -} from '../../../src/main/runtime/rpc/methods/structured-sessions/protocol/structured-agent-session-rpc.test-fixture' - -import { STRUCTURED_CLIENT } from '../../../src/main/runtime/rpc/methods/structured-sessions/protocol/structured-agent-session-rpc-client.test-fixture' -import { setStructuredAgentSessionHost } from '../../../src/main/native-chat/agent-session-wire/host/structured-agent-session-registry' -import { createAgentModelCatalogService } from '../../../src/main/native-chat/agent-model-catalog/agent-model-catalog-service' -import { AgentModelCatalogStore } from '../../../src/main/native-chat/agent-model-catalog/agent-model-catalog-store' -import { - runAgentModelCatalogSession, - AgentModelCatalogProbeError -} from '../../../src/main/native-chat/agent-model-catalog/agent-model-catalog-probe-runner' -import { createClaudeModelCatalogProbe } from '../../../src/main/claude/claude-model-catalog-probe' - -import { prepareReleaseCheckoutSnapshot, REPO_ROOT } from './release-checkout' -import { LOCAL_RELEASE_GIT_ENV } from './release-checkout-process' - -beforeAll(async () => { - await prepareReleaseCheckoutSnapshot('v1.4.229') -}, 180_000) - -// Local acceptance rig: execute the pinned source, with only React's effect scheduler and transport replaced. -function released(path: string, names: string[], dependencies: Record = {}) { - const source = execFileSync('git', ['show', `v1.4.229:${path}`], { - cwd: REPO_ROOT, - env: { ...process.env, ...LOCAL_RELEASE_GIT_ENV }, - encoding: 'utf8' - }) - .replace( - 'constructor(private readonly options: RequestTrackerOptions) {}', - 'constructor(options: RequestTrackerOptions) { this.options = options; }' - ) - .replace( - /constructor\(\s*readonly code: string,[\s\S]*?super\(message\)\s*\}/, - 'constructor(code: string, message: string, data?: unknown) { super(message); this.code = code; this.data = data; }' - ) - const javascript = stripTypeScriptTypes(source) - .replace(/import[\s\S]*?from\s*['"][^'"]+['"];?/g, '') - .replace(/export /g, '') - return new Function( - ...Object.keys(dependencies), - `${javascript}; return { ${names.join(', ')} };` - )(...Object.values(dependencies)) -} - -it.each(['success', 'budget'] as const)( - 'released one-follow tracker accepts direct legacy %s with enterprise retry and cleanup under modern saturation', - async (mode) => { - vi.useFakeTimers() - const start = Date.now() - const wait = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms)) - const attempts: boolean[] = [] - let closes = 0 - let output = [ - { - response: { - subtype: 'success', - request_id: 'orca-model-discovery', - response: { models: [{ value: 'opus', supportsFastMode: true }] } - } - }, - { - response: { - subtype: 'success', - request_id: 'orca-model-settings', - response: { applied: {} } - } - } - ] - .map((row) => JSON.stringify(row)) - .join('\n') - const probe = createClaudeModelCatalogProbe({ - resolveCommand: () => ({ command: process.execPath, prefixArgs: [] }), - resolveEnv: () => ({}), - resolveInheritedEnv: async () => ({}), - resolveAuthPolicy: () => ({ account: 'system' }), - runListing: (launch, options) => { - const strict = launch.args.includes('--strict-mcp-config') - attempts.push(strict) - return runAgentModelCatalogSession( - () => ({ - close: async () => { - if (!strict) { - await wait(6_000) - } - closes++ - } - }), - async () => { - await wait(strict ? 14_000 : mode === 'success' ? 8_000 : 60_000) - if (strict) { - throw new AgentModelCatalogProbeError('enterprise policy', 'exit', false, { - exitCode: 1, - stdout: '', - stderr: - 'You cannot use --strict-mcp-config when an enterprise MCP config is present' - }) - } - return output - }, - { label: 'released-acceptance', signal: options.signal } - ) - } - }) - const modern = vi.fn( - (signal?: AbortSignal) => - new Promise((_resolve, reject) => { - signal?.addEventListener('abort', () => reject(new Error('stopped')), { once: true }) - }) - ) - const home = { variable: 'CLAUDE_CONFIG_DIR', path: '/qa-account' } - // A command line relative to each folder lists per folder, so five folders saturate admission. - const scoped = Object.assign(probe, { - resolve: async ( - _home: unknown, - _cwd: string, - _lookup: unknown, - _operation: unknown, - launchDirectory?: string - ) => ({ - identity: { command: 'qa-modern', cwd: launchDirectory }, - run: modern - }) - }) - const service = createAgentModelCatalogService({ - store: new AgentModelCatalogStore(), - getRecord: () => undefined, - getConversation: () => undefined, - drivesRecord: () => true, - resolveAccountHome: async () => home, - probes: { claude: scoped } - }) - setStructuredAgentSessionHost( - Object.assign(hostStub(), { - readModelCatalog: async (params: Parameters[0]) => { - if (!params.savedOnly) { - void service.demand(params) - } - return service.read(params) - }, - deps: { - modelCatalog: service, - store: { getRecord: () => undefined, getConversation: () => undefined }, - adapter: {} - } - }) - ) - const budget = released('mobile/src/transport/rpc-request-budget.ts', [ - 'openRpcRequestBudget', - 'resolvePostConnectRequestTimeout' - ]) - const ambiguity = released('mobile/src/transport/rpc-delivery-ambiguity.ts', [ - 'markRpcDeliveryUnknown' - ]) - const { RpcClientRequestTracker } = released( - 'mobile/src/transport/rpc-client-request-tracker.ts', - ['RpcClientRequestTracker'], - { ...budget, ...ambiguity } - ) - let sequence = 0 - const frames: { params?: unknown }[] = [] - const receipts: boolean[] = [] - const tracker = new RpcClientRequestTracker({ - nextId: () => String(++sequence), - getState: () => 'connected', - waitForConnected: async () => {}, - sendFrame: (frame: { id: string; method: string; params?: unknown }) => { - frames.push(frame) - void call(frame.method, frame.params, STRUCTURED_CLIENT).then((response) => { - receipts.push(tracker.resolve({ ...response, id: frame.id })) - }) - return true - } - }) - const { callAgentSession } = released( - 'mobile/src/session/mobile-structured-agent-session-rpc.ts', - ['callAgentSession'] - ) - let cleanup: (() => void) | undefined - const applied: unknown[] = [] - let landed = 0 - const record = {} - const { useMobileHostModelCatalogUpgrade } = released( - 'mobile/src/session/use-mobile-host-model-catalog-upgrade.ts', - ['useMobileHostModelCatalogUpgrade'], - { - callAgentSession, - useEffect: (effect: () => () => void) => { - cleanup = effect() - }, - applyStructuredAgentSessionModelCatalog: ( - _state: unknown, - _seed: unknown, - catalog: unknown - ) => { - applied.push(catalog) - return { record } - }, - settleStructuredAgentSessionBuiltinCatalog: () => { - throw new Error('released caller timed out') - } - } - ) - try { - await Promise.all( - ['/1', '/2', '/3', '/4', '/5'].map((workspacePath) => { - void service.demand({ agent: 'claude', workspacePath }) - return service.read({ agent: 'claude', workspacePath }) - }) - ) - await vi.advanceTimersByTimeAsync(0) - expect(modern).toHaveBeenCalledTimes(2) - useMobileHostModelCatalogUpgrade({ - agent: 'claude', - client: tracker, - sessionId: 'released', - enabled: true, - newLaunch: false, - fence: 1, - optionCatalog: {}, - activeOptionRecordRef: { current: record }, - updateOptionState: (update: (state: { record: object }) => unknown) => update({ record }), - onListingLanded: () => landed++ - }) - await vi.advanceTimersByTimeAsync(0) - expect(frames).toHaveLength(2) - await vi.advanceTimersByTimeAsync(36_000) - expect(attempts).toEqual([true, false]) - expect(closes).toBe(2) - expect(receipts).toEqual([true, true]) - expect(tracker.size()).toBe(0) - expect(applied.at(-1)).not.toHaveProperty('listingInProgress') - expect(landed).toBe(mode === 'success' ? 1 : 0) - expect(Date.now() - start).toBeLessThan(45_000) - if (mode === 'success') { - cleanup?.() - await vi.advanceTimersByTimeAsync(120_001) - output = output.replace('opus', 'sonnet') - useMobileHostModelCatalogUpgrade({ - agent: 'claude', - client: tracker, - sessionId: 'released', - enabled: true, - newLaunch: false, - fence: 1, - optionCatalog: {}, - activeOptionRecordRef: { current: record }, - updateOptionState: (update: (state: { record: object }) => unknown) => update({ record }) - }) - await vi.advanceTimersByTimeAsync(0) - expect(frames).toHaveLength(3) - expect(applied.at(-1)).toMatchObject({ models: [{ id: 'opus' }] }) - await vi.advanceTimersByTimeAsync(34_000) - expect(frames).toHaveLength(3) - expect( - await service.read({ agent: 'claude', legacy: true, savedOnly: true }) - ).toMatchObject({ models: [{ id: 'sonnet' }] }) - } - } finally { - cleanup?.() - service.stop() - await vi.advanceTimersByTimeAsync(0) - vi.useRealTimers() - } - } -) diff --git a/tests/e2e/helpers/connector-fake-claude.ts b/tests/e2e/helpers/connector-fake-claude.ts index 6fee5044571..c58dccafd97 100644 --- a/tests/e2e/helpers/connector-fake-claude.ts +++ b/tests/e2e/helpers/connector-fake-claude.ts @@ -1,7 +1,7 @@ // A scripted Claude for connector E2E: real managed hooks, Claude's OSC 7501 activity reports, no model. import { chmodSync, existsSync, readFileSync, writeFileSync } from 'node:fs' import path from 'node:path' -import { getManagedScript } from '../../../src/main/claude/hook-script' +import { getManagedScript } from '../../../src/main/claude/hooks/hook-script' /** A message containing this asks for Bash approval, as in the captured approve/deny transcript. */ export const FAKE_CLAUDE_NEEDS_APPROVAL = '[needs-approval]'