refactor: organize backend agent-session and tab owners (#43268)

* refactor(main): organize agent session and tab lifecycle owners

* fix(ci): carry moved backend test and mobile routing metadata

* test: retire copy assertions in headless notification test
This commit is contained in:
Neil
2026-11-16 14:42:12 -08:00
committed by GitHub
parent a312f06b3f
commit d23e47411a
351 changed files with 1102 additions and 11934 deletions
@@ -55,4 +55,3 @@ jobs:
src/main/updater/mac-install/updater.mac-install.test.ts
src/main/updater/updater.headless-serve-install.test.ts
src/main/updater/mac-install/updater-mac-quit-guard.test.ts
src/main/startup/quit/main-process-quit-update-veto.test.ts
+10 -18
View File
@@ -21,17 +21,13 @@ on:
- 'src/main/runtime/rpc/server/runtime-rpc.ts'
- 'src/main/runtime/rpc/server/pairing/device-registry.ts'
- 'src/main/runtime/orca-runtime.ts'
- 'src/main/runtime/agent-session/agent-session-*.ts'
- 'src/main/runtime/agent-session/environment/agent-session-account-env.ts'
- 'src/main/runtime/agent-session/launch/agent-session-launch-directory.ts'
- 'src/main/runtime/session-tabs/chat/agent-session-tab-identity.ts'
- 'src/main/runtime/session-tabs/chat/agent-session-tab-layout-queue.ts'
- 'src/main/runtime/session-tabs/chat/agent-session-tab-layout.ts'
- 'src/main/runtime/agent-session/ownership/agent-session-*.ts'
- 'src/main/runtime/agent-session/records/agent-session-*.ts'
- 'src/main/runtime/agent-session/agent-session-account-*.ts'
- 'src/main/runtime/agent-session/agent-session-acquisition-*.ts'
- 'src/main/runtime/agent-session/agent-session-conversation-*.ts'
- 'src/main/runtime/agent-session/agent-session-launch-*.ts'
- 'src/main/runtime/agent-session/agent-session-operation-*.ts'
- 'src/main/runtime/agent-session/agent-session-rewind-*.ts'
- 'src/main/runtime/agent-session/agent-session-runtime-*.ts'
- 'src/main/runtime/agent-session/agent-session-unsaved-*.ts'
# The phone/host contract program's unmocked desktop sources and its declaration owner's inputs.
- 'src/main/runtime/integrations/github/runtime-github-repository-query-commands.ts'
- 'src/main/github/issues/issue-field-options.ts'
@@ -152,17 +148,13 @@ on:
- 'src/main/runtime/rpc/server/runtime-rpc.ts'
- 'src/main/runtime/rpc/server/pairing/device-registry.ts'
- 'src/main/runtime/orca-runtime.ts'
- 'src/main/runtime/agent-session/agent-session-*.ts'
- 'src/main/runtime/agent-session/environment/agent-session-account-env.ts'
- 'src/main/runtime/agent-session/launch/agent-session-launch-directory.ts'
- 'src/main/runtime/session-tabs/chat/agent-session-tab-identity.ts'
- 'src/main/runtime/session-tabs/chat/agent-session-tab-layout-queue.ts'
- 'src/main/runtime/session-tabs/chat/agent-session-tab-layout.ts'
- 'src/main/runtime/agent-session/ownership/agent-session-*.ts'
- 'src/main/runtime/agent-session/records/agent-session-*.ts'
- 'src/main/runtime/agent-session/agent-session-account-*.ts'
- 'src/main/runtime/agent-session/agent-session-acquisition-*.ts'
- 'src/main/runtime/agent-session/agent-session-conversation-*.ts'
- 'src/main/runtime/agent-session/agent-session-launch-*.ts'
- 'src/main/runtime/agent-session/agent-session-operation-*.ts'
- 'src/main/runtime/agent-session/agent-session-rewind-*.ts'
- 'src/main/runtime/agent-session/agent-session-runtime-*.ts'
- 'src/main/runtime/agent-session/agent-session-unsaved-*.ts'
# The phone/host contract program's unmocked desktop sources and its declaration owner's inputs.
- 'src/main/runtime/integrations/github/runtime-github-repository-query-commands.ts'
- 'src/main/github/issues/issue-field-options.ts'
@@ -18,7 +18,6 @@ on:
- '**/*.performance.test.tsx'
# Contracts without the .performance suffix. Keep in sync with config/vitest.performance.config.ts;
# without these a rename lands green and only breaks the next nightly.
- 'src/main/runtime/session-tabs/session-tabs-phone-layout-moves.test.ts'
- 'src/renderer/src/components/agent/launch-menu/use-new-tab-agent-menu-host-preferences.test.tsx'
- 'src/main/codex-usage/codex-rollout-file-lifetime.test.ts'
- 'src/main/codex-usage/scanner-incremental-append.test.ts'
+1 -4
View File
@@ -148,7 +148,6 @@
1 test-no-real-time-wait:src/main/pty/process-retirement/node-pty-master-fd-retirement.test.ts
1 test-no-real-time-wait:src/main/pty/process-retirement/posix-pty-process-groups.integration.test.ts
5 test-no-real-time-wait:src/main/pty/process-retirement/windows-live-tree-kill.win32.test.ts
1 test-no-real-time-wait:src/main/runtime/agent-session/structured-agent-session-legacy-send-behind-command.test.ts
3 test-no-real-time-wait:src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-codex-real-pty.integration.test.ts
1 test-no-real-time-wait:src/main/runtime/rpc/terminal/terminal-subscribe-mounted-pane.test.ts
1 test-no-real-time-wait:src/main/runtime/terminal/wait/launched-agent-crash-guard.live-shell.test.ts
@@ -389,8 +388,7 @@
1 test-no-wall-clock:src/main/rate-limits/service/service-cursor-usage.test.ts
1 test-no-wall-clock:src/main/rate-limits/service/service-minimax-usage.test.ts
3 test-no-wall-clock:src/main/rate-limits/service/service-zcode-usage.test.ts
1 test-no-wall-clock:src/main/runtime/agent-session/lifecycle/structured-codex-child-work-runtime.test.ts
2 test-no-wall-clock:src/main/runtime/agent-session/structured-agent-session-held-signal.test.ts
1 test-no-wall-clock:src/main/runtime/agent-session/installation/structured-agent-session-held-signal.test.ts
1 test-no-wall-clock:src/main/runtime/mobile-cloud-relay/testing/mobile-relay-e2ee.integration.test.ts
2 test-no-wall-clock:src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-codex-real-pty.integration.test.ts
1 test-no-wall-clock:src/main/runtime/push/push-registration-rpc.test.ts
@@ -679,7 +677,6 @@
1 test-timeout-needs-reason:tests/e2e/ssh-orcad-windows-cli-matrix.spec.ts
4 test-timeout-needs-reason:tests/e2e/ssh-orcad-workspace-tools.spec.ts
1 test-timeout-needs-reason:tests/e2e/staging-skill-sharing.spec.ts
1 test-timeout-needs-reason:tests/e2e/structured-chat-tabs-open-close.spec.ts
1 test-timeout-needs-reason:tests/e2e/terminal-cli-split-closed-before-mount.spec.ts
6 test-timeout-needs-reason:tests/e2e/terminal-column-desync-repro.spec.ts
1 test-timeout-needs-reason:tests/e2e/terminal-inline-images-memory.spec.ts
+6 -6
View File
@@ -60,12 +60,12 @@
2 src/main/runtime/session-graph/session-graph-promotion.ts
2 src/main/runtime/session-lifecycle/projection/apply-mobile-session-tab-navigation.ts
2 src/main/runtime/session-lifecycle/projection/build-headless-mobile-session-browser-tabs.ts
1 src/main/runtime/session-tabs/headless-editor-tabs.ts
2 src/main/runtime/session-tabs/headless-tab-group-moves.ts
6 src/main/runtime/session-tabs/headless-tab-properties.ts
2 src/main/runtime/session-tabs/headless-terminal-tab-titles.ts
1 src/main/runtime/session-tabs/structured-session-tab-close.ts
1 src/main/runtime/session-tabs/terminal-surface-retirements.ts
1 src/main/runtime/session-tabs/restoration/headless-editor-tabs.ts
2 src/main/runtime/session-tabs/layout/headless-tab-group-moves.ts
6 src/main/runtime/session-tabs/layout/headless-tab-properties.ts
2 src/main/runtime/session-tabs/publication/headless-terminal-tab-titles.ts
1 src/main/runtime/session-tabs/chat/structured-session-tab-close.ts
1 src/main/runtime/session-tabs/terminal-retirement/terminal-surface-retirements.ts
2 src/main/runtime/terminal/adoption/adopt-terminal-orphans-from-inventory.ts
7 src/main/runtime/terminal/adoption/runtime-terminal-orphan-session-adoption.ts
1 src/main/runtime/terminal/driver/terminal-driver-resources.ts
+1 -1
View File
@@ -473,7 +473,7 @@
8 src/main/runtime/agent-session/ownership/agent-session-claim-identity.ts
1 src/main/runtime/agent-session/records/agent-session-record-store-slot.ts
7 src/main/runtime/agent-session/records/agent-session-runtime-end-record.ts
1 src/main/runtime/agent-session/structured-agent-session-attachment-wiring.ts
1 src/main/runtime/agent-session/installation/structured-agent-session-attachment-wiring.ts
1 src/main/runtime/client/navigation/desktop-chat-creation-history.ts
9 src/main/runtime/host-instance-identity.ts
4 src/main/runtime/hosts/platform-probe/host-descriptor.ts
+1 -2
View File
@@ -7849,7 +7849,7 @@
"pnpm exec vitest run --config config/vitest.config.ts tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts --maxWorkers=1",
"pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/construction/orca-runtime.test.ts src/main/runtime/rpc/terminal/terminal-multiplex-initial-snapshot-buffering.test.ts src/main/runtime/rpc/terminal/terminal-multiplex-pty-wait-capacity.test.ts src/main/runtime/rpc/terminal/terminal-subscribe-buffer.test.ts src/renderer/src/components/terminal-pane/pty-transport/output/terminal-side-effect-facts-handler.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-activation-inventory-fallback.test.ts src/renderer/src/runtime/rpc/subscriptions/runtime-client-events.test.ts src/renderer/src/web/web-preload-api-runtime-environment.test.ts src/main/ipc/runtime-environments/pairing/runtime-environments-pairing.test.ts",
"pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/terminal/adoption/terminal-subscriber-driven-daemon-attach.test.ts",
"pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/session-tabs/runtime-inventory-publication-authority.test.ts src/main/runtime/rpc/methods/session-tabs/session-tabs-inventory-census-race.test.ts src/main/daemon/terminal-host/testing/terminal-host-agent-session.test.ts tests/e2e/session-tabs-empty-inventory-daemon-oracle.unit.test.ts --maxWorkers=1",
"pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/rpc/methods/session-tabs/session-tabs-inventory-census-race.test.ts src/main/daemon/terminal-host/testing/terminal-host-agent-session.test.ts tests/e2e/session-tabs-empty-inventory-daemon-oracle.unit.test.ts --maxWorkers=1",
"pnpm exec vitest run --config config/vitest.config.ts src/shared/remote-runtime/control/remote-runtime-shared-control-connection.test.ts",
"SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-host-restart-background-sync.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1",
"ORCA_E2E_FORWARD_APP_LOGS=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-host-restart-background-sync.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1 --repeat-each=10 --max-failures=1",
@@ -7873,7 +7873,6 @@
"src/main/runtime/rpc/terminal/terminal-multiplex-pty-wait-capacity.test.ts",
"src/main/runtime/rpc/terminal/terminal-subscribe-buffer.test.ts",
"src/main/runtime/terminal/adoption/terminal-subscriber-driven-daemon-attach.test.ts",
"src/main/runtime/session-tabs/runtime-inventory-publication-authority.test.ts",
"src/main/runtime/rpc/methods/session-tabs/session-tabs-inventory-census-race.test.ts",
"src/main/daemon/terminal-host/testing/terminal-host-agent-session.test.ts",
"tests/e2e/session-tabs-empty-inventory-daemon-oracle.unit.test.ts",
@@ -810,29 +810,21 @@
"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/transcripts/claude-transcript-catch-up.test.ts": 4017,
"src/main/claude/claude-transcript-duration.test.ts": 1411,
"src/main/claude/hooks/post-compact-hook-command.test.ts": 314,
"src/main/claude/structured/claude-structured-conversation-stop.test.ts": 884,
"src/main/claude/structured/claude-structured-dispatch-admission.test.ts": 426,
"src/main/claude/structured/claude-structured-dispatch-queue-boundary.test.ts": 911,
"src/main/claude/structured/claude-structured-effort-reporting.test.ts": 1127,
"src/main/claude/structured/claude-structured-execution-recording.test.ts": 2228,
"src/main/claude/structured/claude-structured-in-turn-stop.test.ts": 1017,
"src/main/claude/structured/claude-structured-inbound-control.test.ts": 55,
"src/main/claude/structured/claude-structured-option-confirmation.test.ts": 919,
"src/main/claude/structured/permissions/claude-structured-inbound-control.test.ts": 55,
"src/main/claude/structured/claude-structured-real-cli-fold.test.ts": 921,
"src/main/claude/structured/claude-structured-real-cli-rewind.test.ts": 933,
"src/main/claude/structured/claude-structured-real-cli-stop-task.test.ts": 888,
"src/main/claude/structured/claude-structured-real-cli-visuals.test.ts": 945,
"src/main/claude/structured/claude-structured-real-cli.test.ts": 918,
"src/main/claude/structured/claude-structured-requested-stop.test.ts": 925,
"src/main/claude/structured/claude-structured-resume-point.test.ts": 1713,
"src/main/claude/structured/claude-structured-session-acquisition-processless.test.ts": 778,
"src/main/claude/structured/claude-structured-session-adapter.test.ts": 1034,
"src/main/claude/structured/claude-structured-session-close.test.ts": 1040,
"src/main/claude/structured/claude-structured-session-exit-blame.test.ts": 1176,
"src/main/claude/structured/claude-structured-session-startup.test.ts": 1002,
"src/main/claude/structured/startup/claude-structured-session-startup.test.ts": 1002,
"src/main/claude/structured/claude-structured-turn-resume-point.test.ts": 1989,
"src/main/claude/structured/journal/claude-structured-journal-prompt-cards.test.ts": 62,
"src/main/claude/structured/journal/claude-structured-journal-prompt-retry.test.ts": 282,
@@ -1712,7 +1704,6 @@
"src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-adopted-import.test.ts": 2881,
"src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-attachment-admission.test.ts": 2402,
"src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-background-stop-unreadable.test.ts": 1988,
"src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-claude-echo-working.test.ts": 2219,
"src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-clear-queued-command.test.ts": 2168,
"src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-close-aborts-start.test.ts": 1806,
"src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-codex-held-goal.test.ts": 2081,
@@ -1819,7 +1810,6 @@
"src/main/orcad/serve-startup/orcad-help.integration.test.ts": 5016,
"src/main/orcad/instance-lock/orcad-instance-lock.test.ts": 315,
"src/main/orcad/runtime-launch/orcad-launcher-isolation.integration.test.ts": 617,
"src/main/orcad/host-lifecycle/orcad-lifecycle-host.test.ts": 407,
"src/main/orcad/host-lifecycle/managed-stop/orcad-managed-stop-identity.test.ts": 270,
"src/main/orcad/host-lifecycle/managed-stop/orcad-managed-stop.test.ts": 1726,
"src/main/orcad/native-runtime/orcad-packaged-node-pty.integration.test.ts": 78,
@@ -2087,8 +2077,7 @@
"src/main/ripgrep/bundled-ripgrep-text-search.test.ts": 707,
"src/main/ripgrep/ripgrep-filename-identity-real.test.ts": 274,
"src/main/ripgrep/text-search-unicode-real.test.ts": 332,
"src/main/runtime/session-tabs/acknowledged-terminal-tab-retirement-main-close.test.ts": 6833,
"src/main/runtime/session-tabs/acknowledged-terminal-tab-retirement.test.ts": 6423,
"src/main/runtime/session-tabs/terminal-retirement/acknowledged-terminal-tab-retirement.test.ts": 6423,
"src/main/runtime/terminal/input/agent-prompt-line-settle.test.ts": 4085,
"src/main/runtime/terminal/input/agent-prompt-permission-wait.test.ts": 4446,
"src/main/runtime/terminal/input/agent-prompt-receipt-correlation.test.ts": 4439,
@@ -2096,14 +2085,12 @@
"src/main/runtime/terminal/input/agent-prompt-submission-runtime.test.ts": 5619,
"src/main/runtime/terminal/input/agent-prompt-submission-windows-submit-delay.test.ts": 4664,
"src/main/runtime/agent-session/records/agent-session-acquired-account.test.ts": 2056,
"src/main/runtime/agent-session/records/agent-session-inventory-scale.test.ts": 2496,
"src/main/runtime/agent-session/records/agent-session-record-store-damaged.test.ts": 1557,
"src/main/runtime/agent-session/records/agent-session-store-load-scale.test.ts": 732,
"src/main/runtime/agent-session/agent-session-tab-layout-queue.test.ts": 4061,
"src/main/runtime/agent-session/agent-session-conversation-clear-commit.test.ts": 957,
"src/main/runtime/agent-session/agent-session-launch-directory.test.ts": 926,
"src/main/runtime/agent-session/agent-session-tab-layout.test.ts": 275,
"src/main/runtime/agent-session/agent-session-unsaved-creation-supersession.test.ts": 726,
"src/main/runtime/agent-session/launch/agent-session-launch-directory.test.ts": 926,
"src/main/runtime/session-tabs/chat/agent-session-tab-layout.test.ts": 275,
"src/main/runtime/agent-session/records/agent-session-unsaved-creation-supersession.test.ts": 726,
"src/main/runtime/agent-session/ownership/agent-session-launch-env-admission.test.ts": 676,
"src/main/runtime/agent-session/ownership/agent-session-lease-renewal.test.ts": 699,
"src/main/runtime/agent-session/ownership/agent-session-operation-admission.test.ts": 150,
@@ -2119,19 +2106,11 @@
"src/main/runtime/agent-session/records/agent-session-recovery-capsule.test.ts": 1074,
"src/main/runtime/agent-session/records/agent-session-runtime-end-record.test.ts": 284,
"src/main/runtime/agent-session/records/agent-session-store-transactions.test.ts": 1528,
"src/main/runtime/agent-session/records/structured-agent-session-mobile-restore.test.ts": 1965,
"src/main/runtime/agent-session/records/structured-agent-session-startup-tab-restore.test.ts": 7761,
"src/main/runtime/agent-session/structured-agent-session-attachment-wiring.test.ts": 521,
"src/main/runtime/agent-session/structured-agent-session-close.test.ts": 256,
"src/main/runtime/agent-session/structured-agent-session-held-signal.test.ts": 2773,
"src/main/runtime/agent-session/structured-agent-session-host-refusal.test.ts": 6115,
"src/main/runtime/agent-session/installation/structured-agent-session-attachment-wiring.test.ts": 521,
"src/main/runtime/agent-session/installation/structured-agent-session-held-signal.test.ts": 2773,
"src/main/runtime/agent-session/structured-agent-session-install-failure.test.ts": 2103,
"src/main/runtime/agent-session/structured-agent-session-integration-replay.test.ts": 5400,
"src/main/runtime/agent-session/structured-agent-session-legacy-send-behind-command.test.ts": 6238,
"src/main/runtime/agent-session/structured-agent-session-paired-caller.test.ts": 5749,
"src/main/runtime/agent-session/structured-agent-session-runtime-provider-started.test.ts": 2576,
"src/main/runtime/agent-session/structured-agent-session-runtime.test.ts": 2581,
"src/main/runtime/agent-session/structured-agent-session-startup-reconcile.test.ts": 6294,
"src/main/runtime/agent-session/installation/structured-agent-session-integration-replay.test.ts": 5400,
"src/main/runtime/rpc/methods/structured-sessions/structured-agent-session-paired-caller.test.ts": 5749,
"src/main/runtime/agent-state-rules/agent-state-rules-live-update.test.ts": 379,
"src/main/runtime/workspaces/sleep/automatic-activation-host-sleep.test.ts": 4073,
"src/main/runtime/browser-host/commands/browser-host-command-ledger-capacity.test.ts": 140,
@@ -2146,10 +2125,6 @@
"src/main/runtime/terminal/launch/claude-agent-teams-shim-env.test.ts": 84,
"src/main/runtime/terminal/wait/claude-dialog-interactive-wait.test.ts": 3975,
"src/main/runtime/terminal/wait/claude-open-dialog-hold.test.ts": 44,
"src/main/runtime/agent-session/lifecycle/claude-structured-exit-mid-response.test.ts": 2509,
"src/main/runtime/agent-session/lifecycle/claude-structured-failed-start-resume.test.ts": 2454,
"src/main/runtime/agent-session/lifecycle/claude-structured-resumed-start-failure.test.ts": 4153,
"src/main/runtime/agent-session/lifecycle/claude-structured-startup-fault-is-not-an-exit.test.ts": 2741,
"src/main/runtime/browser/client-pages/client-hosted-browser-page-persistence.integration.test.ts": 4022,
"src/main/runtime/browser/client-pages/client-hosted-browser-page-persistence.test.ts": 315,
"src/main/runtime/browser/client-pages/client-hosted-browser-row-publication.test.ts": 73,
@@ -2182,12 +2157,10 @@
"src/main/runtime/workspaces/session-hosts/folder-workspace-mixed-host-routing.test.ts": 5271,
"src/main/runtime/workspaces/session-hosts/folder-workspace-pty-identity.test.ts": 4131,
"src/main/runtime/session-graph/graph-sync-deletion-fence.test.ts": 4552,
"src/main/runtime/session-tabs/graph-sync-mobile-snapshot-gating.test.ts": 4333,
"src/main/runtime/terminal/surface/headless-create-terminal-handle-main.test.ts": 3873,
"src/main/runtime/terminal/recovery/held-pane-reopen-layout-owner.test.ts": 5093,
"src/main/runtime/terminal/wait/hermes-slash-readiness-transcript.test.ts": 4931,
"src/main/runtime/terminal/surface/host-pane-remount-terminal-handle.test.ts": 5293,
"src/main/runtime/session-tabs/host-terminal-close-persistence-durability.test.ts": 1953,
"src/main/runtime/terminal/output/host-terminal-scrollback-read.test.ts": 41,
"src/main/runtime/terminal/wait/launched-agent-composer-readiness-claude.test.ts": 4750,
"src/main/runtime/terminal/wait/launched-agent-crash-guard.live-shell.test.ts": 407,
@@ -2213,7 +2186,7 @@
"src/main/runtime/push/notifications/mobile-notification-dismissal-store.test.ts": 214,
"src/main/runtime/rpc/server/pairing/mobile-pairing-userdata-path.test.ts": 171,
"src/main/runtime/terminal/layout/mobile-presence-lock.test.ts": 25928,
"src/main/runtime/session-tabs/headless-editor-tabs.test.ts": 57,
"src/main/runtime/session-tabs/restoration/headless-editor-tabs.test.ts": 57,
"src/main/runtime/terminal/surface/mobile-session-terminal-persistence-retirement.test.ts": 278,
"src/main/runtime/terminal/layout/mobile-subscribe-idle-pane-hydrate.test.ts": 4782,
"src/main/runtime/client/navigation/multi-client-navigation-isolation.integration.test.ts": 5640,
@@ -2238,7 +2211,7 @@
"src/main/runtime/session-lifecycle/projection/orca-runtime-mobile-markdown-tab-routes.test.ts": 8386,
"src/main/runtime/files/paths/orca-runtime-read-kitty-file.test.ts": 4304,
"src/main/runtime/browser/headless/orca-runtime-serve-browser-restore.test.ts": 4469,
"src/main/runtime/session-tabs/orca-runtime-session-tabs-path-alias.test.ts": 4827,
"src/main/runtime/session-tabs/publication/orca-runtime-session-tabs-path-alias.test.ts": 4827,
"src/main/runtime/terminal/surface/orca-runtime-terminal-close-continuity.test.ts": 4439,
"src/main/runtime/terminal/surface/orca-runtime-terminal-close-no-widening-layout-owner.test.ts": 4997,
"src/main/runtime/terminal/surface/orca-runtime-terminal-close-no-widening.test.ts": 4509,
@@ -2339,7 +2312,6 @@
"src/main/runtime/orchestration/workers/transcripts/worker-transcript-read.test.ts": 466,
"src/main/runtime/orchestration/workers/turn-stops/worker-turn-stops.test.ts": 979,
"src/main/runtime/workspaces/removal/owned-session-teardown-policy.test.ts": 9728,
"src/main/runtime/session-tabs/paired-host-terminal-close.test.ts": 4284,
"src/main/runtime/client/peer-desktops.integration.test.ts": 4695,
"src/main/runtime/terminal/wait/prime-agent-screen-readiness-transcripts.test.ts": 7843,
"src/main/runtime/repositories/project-group-folder-workspace-selectors.test.ts": 3915,
@@ -2366,7 +2338,6 @@
"src/main/runtime/rpc/server/remote-runtime-request-connection.integration.test.ts": 3961,
"src/main/runtime/browser/client-pages/renderer-browser-lifecycle.test.ts": 3851,
"src/main/runtime/browser/client-pages/renderer-browser-ownership.test.ts": 3800,
"src/main/runtime/session-tabs/renderer-owned-tab-properties.test.ts": 15027,
"src/main/runtime/repositories/repo-icon-fork-backfill.test.ts": 4159,
"src/main/runtime/workspaces/catalog/repo-worktree-row-resolution.test.ts": 664,
"src/main/runtime/terminal/layout/restored-editor-move-restart.test.ts": 5390,
@@ -2467,7 +2438,6 @@
"src/main/runtime/rpc/methods/orchestration/worker/follow-up/helper-follow-up-ownership-cli.integration.test.ts": 8091,
"src/main/runtime/rpc/methods/orchestration/worker/observation/manual-dispatch-observation.test.ts": 5272,
"src/main/runtime/rpc/methods/orchestration/worker/stop/manual-dispatch-release.test.ts": 5196,
"src/main/runtime/rpc/methods/orchestration/worker/release/worker-auto-release-turns.test.ts": 3578,
"src/main/runtime/rpc/methods/orchestration/worker/release/worker-auto-release.test.ts": 4863,
"src/main/runtime/rpc/methods/orchestration/worker/fleet/worker-list-pagination.test.ts": 4740,
"src/main/runtime/rpc/methods/orchestration/worker/output/worker-output.test.ts": 541,
@@ -2494,7 +2464,6 @@
"src/main/runtime/rpc/methods/ssh/ssh.test.ts": 938,
"src/main/runtime/rpc/methods/host-management/status-machine-name-publish-budget.test.ts": 4191,
"src/main/runtime/rpc/methods/structured-sessions/creation/structured-agent-session-adoption-replay.test.ts": 6090,
"src/main/runtime/rpc/methods/structured-sessions/protocol/structured-agent-session-at-rest-options.test.ts": 6634,
"src/main/runtime/rpc/methods/structured-sessions/attachments/structured-agent-session-attachments.test.ts": 2006,
"src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-legacy-command-wait.test.ts": 2712,
"src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-options-read.test.ts": 1676,
@@ -2657,14 +2626,6 @@
"src/main/runtime/workspaces/startup/runtime-worktree-startup-readiness.test.ts": 289,
"src/main/runtime/workspaces/process-listing/runtime-worktree-structured-agent-rows-liveness.test.ts": 1412,
"src/main/runtime/session-lifecycle/projection/pane-sleeping-record.test.ts": 76,
"src/main/runtime/session-tabs/session-tab-close-force.test.ts": 7089,
"src/main/runtime/session-tabs/runtime-inventory-publication-authority.test.ts": 5775,
"src/main/runtime/session-tabs/session-tab-prototype-dispatch.test.ts": 4888,
"src/main/runtime/session-tabs/session-tabs-headless-main-change.test.ts": 4320,
"src/main/runtime/session-tabs/session-tabs-inventory-publication.test.ts": 4166,
"src/main/runtime/session-tabs/session-tabs-main-rows-parity.test.ts": 4606,
"src/main/runtime/session-tabs/session-tabs-phone-layout-moves.test.ts": 4153,
"src/main/runtime/session-tabs/session-tabs-windowed-main-change.test.ts": 4444,
"src/main/runtime/orchestration/terminal-authority/settled-worker-process-replacement.test.ts": 5013,
"src/main/runtime/sidebar-inputs/temporal/orca-runtime-closed-tab-retention.test.ts": 5233,
"src/main/runtime/sidebar-inputs/catalog/orca-runtime-project-catalog.test.ts": 4975,
@@ -2687,10 +2648,8 @@
"src/main/runtime/sidebar-inputs/temporal/workspace-viewers.test.ts": 65,
"src/main/runtime/terminal/output/stale-title-display-surfaces.test.ts": 4456,
"src/main/runtime/agent-session/lifecycle/structured-agent-session-history-close-race.test.ts": 5020,
"src/main/runtime/agent-session/naming/structured-agent-session-provider-naming-shutdown.test.ts": 1987,
"src/main/runtime/agent-session/environment/structured-agent-shell-environment-catalog.test.ts": 720,
"src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-coordinator-mail.test.ts": 38220,
"src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-dispatch-worker-lifecycle.test.ts": 9312,
"src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-dispatch-worker-mail.test.ts": 6125,
"src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-dispatch-worker.test.ts": 6981,
"src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-worker-helpers.test.ts": 8057,
@@ -2698,15 +2657,12 @@
"src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-worker-start-unknown.test.ts": 7813,
"src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-worker-start.test.ts": 6239,
"src/main/runtime/agent-session/lifecycle/structured-claude-thinking-display-refusal.test.ts": 1295,
"src/main/runtime/agent-session/lifecycle/structured-codex-child-work-runtime.test.ts": 5959,
"src/main/runtime/agent-session/environment/structured-session-cli-login-shell.test.ts": 307,
"src/main/runtime/workspaces/removal/structured-session-worktree-teardown.test.ts": 476,
"src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-worker-at-rest.test.ts": 2297,
"src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-worker-cleared-session.test.ts": 6104,
"src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-worker-hook-attestation.test.ts": 3455,
"src/main/runtime/terminal/input/terminal-agent-fenced-keys.test.ts": 74,
"src/main/runtime/terminal/input/terminal-agent-interrupt.test.ts": 54,
"src/main/runtime/session-tabs/terminal-close-observed-exit.test.ts": 5914,
"src/main/runtime/orchestration/terminal-authority/release/terminal-close-slow-agent-exit.test.ts": 15751,
"src/main/runtime/session-tabs/terminal-create-closed-tab-durability.test.ts": 5767,
"src/main/runtime/terminal/focus/terminal-focus-navigation-coalescer.test.ts": 55,
@@ -2719,7 +2675,7 @@
"src/main/runtime/terminal/recovery/terminal-pane-recovery-liveness-gate.test.ts": 4411,
"src/main/runtime/terminal/output/terminal-query-responder.test.ts": 27968,
"src/main/runtime/terminal/output/terminal-restore-record-seed.test.ts": 4073,
"src/main/runtime/session-tabs/terminal-retirement-async-durability.test.ts": 5903,
"src/main/runtime/session-tabs/terminal-retirement/terminal-retirement-async-durability.test.ts": 5903,
"src/main/runtime/terminal/lifecycle/terminal-run-facts.test.ts": 68,
"src/main/runtime/terminal/view/terminal-screen-row-metadata.test.ts": 175,
"src/main/runtime/terminal/wait/terminal-start-failure-readiness.test.ts": 3416,
@@ -4637,7 +4593,6 @@
"tests/e2e/multi-workspace-typing-bench.unit.test.ts": 550,
"tests/e2e/native-chat-live-history.unit.test.ts": 3258,
"tests/e2e/native-chat-ssh-transcript.unit.test.ts": 1166,
"tests/e2e/native-chat-startup-option-pickers.unit.test.ts": 9377,
"tests/e2e/nested-agent-idle-owner.unit.test.ts": 2469,
"tests/e2e/omp-retired-host-renderer.unit.test.ts": 2546,
"tests/e2e/omp-risk-remote-review.unit.test.ts": 1137,
@@ -13,7 +13,9 @@ const NON_TEST_FILES = new Set([
'config/scripts/workflow/source-routing/pr-layout-oracle-route.mjs',
'config/scripts/workflow/source-routing/pr-shell-contract-prefixes.mjs',
'config/scripts/mobile-web/check-entry/mobile-release-check-scope.mjs',
'config/scripts/mobile-web/check-entry/mobile-release-check-scope.test.mjs'
'config/scripts/mobile-web/check-entry/mobile-release-check-scope.test.mjs',
'src/main/runtime/agent-session/launch/agent-session-launch-directory.test.ts',
'src/main/runtime/session-tabs/chat/agent-session-tab-layout.test.ts'
])
const DESKTOP_SUITE_PREFIXES = [
@@ -21,17 +23,8 @@ const DESKTOP_SUITE_PREFIXES = [
'src/packages/process-host/',
'src/main/agent-launch/',
'src/main/runtime/rpc/',
'src/main/runtime/agent-session/agent-session-',
'src/main/runtime/agent-session/ownership/agent-session-',
'src/main/runtime/agent-session/records/agent-session-',
'src/main/runtime/agent-session/agent-session-account-',
'src/main/runtime/agent-session/agent-session-acquisition-',
'src/main/runtime/agent-session/agent-session-conversation-',
'src/main/runtime/agent-session/agent-session-launch-',
'src/main/runtime/agent-session/agent-session-operation-',
'src/main/runtime/agent-session/agent-session-rewind-',
'src/main/runtime/agent-session/agent-session-runtime-',
'src/main/runtime/agent-session/agent-session-unsaved-',
'src/main/native-chat/agent-session-wire/'
]
@@ -14,7 +14,7 @@ export const COMPAT_FOLDERS = [
'old-client-session-tabs-projection'
],
importers: [
'src/main/runtime/session-tabs/main-layout-session-tab-move.ts',
'src/main/runtime/session-tabs/layout/main-layout-session-tab-move.ts',
'src/main/runtime/terminal/launch/mobile-terminal-chat-fork-create.ts',
'src/main/runtime/terminal/surface/terminal-surface-index.ts'
]
@@ -29,8 +29,6 @@ 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/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/runtime/rpc/server/orchestration-cli-subprocess.test.ts',
'src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-delivery.test.ts',
@@ -118,7 +116,6 @@ const NODE_RUNTIME_INCLUDE = [
'src/main/ipc/settings-delayed-response.test.ts',
'src/main/ipc/session-window-view-save.test.ts',
'src/main/ipc/renderer-shutdown-checkpoint-sleep-records.test.ts',
'src/main/runtime/agent-session/records/structured-agent-session-startup-tab-restore.test.ts',
'src/shared/remote-runtime/control/remote-runtime-shared-control-connection.test.ts',
'src/main/runtime/mobile-cloud-relay/control-channel/relay-control-client.test.ts',
'src/main/ipc/filesystem/watchers/filesystem-watcher-ignore-real.test.ts',
@@ -37,7 +37,7 @@ export const SQLITE_MODULES = [
'src/main/native-chat/agent-session-journal/database/journal-host-database',
'src/main/runtime/orchestration/db',
'src/main/runtime/orchestration/db/orchestration-db',
'src/main/runtime/agent-session/structured-agent-session-runtime',
'src/main/runtime/agent-session/installation/structured-agent-session-runtime',
'src/main/runtime/agent-session/records/agent-session-record-store-slot'
]
const SQLITE_MODULE_PATHS = new Set(SQLITE_MODULES.map((module) => resolve(root, module)))
@@ -44,9 +44,9 @@ const LAYOUT_ORACLE_PREFIXES = [
'src/main/runtime/terminal/output/terminal-derived-agent-facts.ts',
'src/main/runtime/terminal/output/terminal-output-generation.ts',
'src/main/runtime/session-graph/session-window-graph.ts',
'src/main/runtime/session-tabs/mobile-session-hydration.ts',
'src/main/runtime/session-tabs/mobile-session-reconciliation.ts',
'src/main/runtime/session-tabs/mobile-session-preservation.ts',
'src/main/runtime/session-tabs/restoration/mobile-session-hydration.ts',
'src/main/runtime/session-tabs/restoration/mobile-session-reconciliation.ts',
'src/main/runtime/session-tabs/restoration/mobile-session-preservation.ts',
'src/main/runtime/workspaces/session-hosts/get-runtime-id.ts',
'src/renderer/src/components/terminal/terminal-tab-actions.ts',
'src/renderer/src/runtime/web-session-tabs-sync/placement/web-runtime-tab-move-mirror.ts',
@@ -82,8 +82,8 @@ const RUNTIME_LAYOUT_WRITERS = [
'src/main/runtime/workspaces/persisted-surfaces/has-exact-persisted-terminal-surface-identity.ts',
'src/main/runtime/terminal/adoption/runtime-terminal-orphan-adoption.ts',
'src/main/runtime/terminal/adoption/adopt-terminal-orphans-from-inventory.ts',
'src/main/runtime/session-tabs/mobile-session-membership.ts',
'src/main/runtime/session-tabs/pty-backed-session-publication.ts'
'src/main/runtime/session-tabs/restoration/mobile-session-membership.ts',
'src/main/runtime/session-tabs/publication/pty-backed-session-publication.ts'
]
// Runtime matches only the modules that create, move, close, persist or publish layout.
-1
View File
@@ -5,7 +5,6 @@ import baseConfig from './vitest.config.ts'
import { nodeRuntimePool } from './scripts/test-runtime/node-worker/vitest-node-runtime-pool.ts'
const contracts = [
'src/main/runtime/session-tabs/session-tabs-phone-layout-moves.test.ts',
'src/renderer/src/components/agent/launch-menu/use-new-tab-agent-menu-host-preferences.test.tsx',
'src/main/codex-usage/codex-rollout-file-lifetime.test.ts',
'src/main/codex-usage/scanner-incremental-append.test.ts',
@@ -21,7 +21,7 @@ import {
} from '../../../shared/ai-vault/search/ai-vault-search-transport'
import type { AiVaultPrepareSessionResumeArgs } from '../../../shared/ai-vault/resume/ai-vault-resume-preparation'
import { getStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/host/structured-agent-session-registry'
import { ensureStructuredAgentSessionHostUnlessRefused } from '../../runtime/agent-session/structured-agent-session-host-refusal'
import { ensureStructuredAgentSessionHostUnlessRefused } from '../../runtime/agent-session/installation/structured-agent-session-host-refusal'
import {
listStructuredProviderSessionOwnership,
terminalResumeBlocked,
@@ -12,7 +12,7 @@ import {
structuredAgentSessionSendBody
} from '../../../shared/agent-session/requests/structured-agent-session-send-mutation'
import { automationRunAcceptedTarget } from './automation-agent-run-result'
import { publishChatTabInBackground } from '../../runtime/session-tabs/background-chat-tab-publication'
import { publishChatTabInBackground } from '../../runtime/session-tabs/chat/background-chat-tab-publication'
export async function reuseAutomationChat(
runtime: OrcaRuntimeService,
File diff suppressed because one or more lines are too long
@@ -10,7 +10,7 @@ import type {
} 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 type { ClaudeStructuredSessionEvent } from '../structured/lifecycle/claude-structured-session-event'
import { deriveToolInputPreview } from '../../../shared/agent-hook-listener/tool-input-preview'
import {
claudeRecord,
@@ -1,6 +1,6 @@
import { activeProviderContext } from '../../../shared/agent-session/conversation-context/agent-session-provider-context'
import type { AgentSessionRecord } from '../../../shared/agent-session/lifecycle/agent-session-record'
import { claudeSessionIdForOrcaSession } from '../structured/claude-structured-session-id'
import { claudeSessionIdForOrcaSession } from '../structured/lifecycle/claude-structured-session-id'
import {
createClaudeNamingGeneration,
type ClaudeNamingGeneration
@@ -1,77 +0,0 @@
import { describe, expect, it } from 'vitest'
import { acquired, fakeClaude, USER_MESSAGE } from './claude-structured-session-test-support'
function interrupts(claude: ReturnType<typeof fakeClaude>): number {
return claude.connections[0]!.calls.filter((call) => call.subtype === 'interrupt').length
}
async function written(claude: ReturnType<typeof fakeClaude>) {
const adapter = await acquired(claude)
await expect(
adapter.dispatch({
sessionId: 'session-1',
clientMessageId: 'client-1',
body: USER_MESSAGE,
fence: 7
})
).resolves.toMatchObject({ state: 'admitted' })
return adapter
}
describe('Claude Stop that names no turn', () => {
it('interrupts a written message before its turn opens', async () => {
const claude = fakeClaude({ replayUuid: null })
const adapter = await written(claude)
await expect(adapter.cancelTurn({ sessionId: 'session-1', fence: 7 })).resolves.toEqual({
cancelled: true
})
expect(interrupts(claude)).toBe(1)
})
it('does nothing for another fence, or with nothing in flight', async () => {
const claude = fakeClaude({ replayUuid: null })
const adapter = await acquired(claude)
await expect(adapter.cancelTurn({ sessionId: 'session-1', fence: 7 })).resolves.toEqual({
cancelled: false
})
await adapter.dispatch({
sessionId: 'session-1',
clientMessageId: 'client-1',
body: USER_MESSAGE,
fence: 7
})
await expect(adapter.cancelTurn({ sessionId: 'session-1', fence: 6 })).resolves.toEqual({
cancelled: false
})
expect(interrupts(claude)).toBe(0)
})
it('ends a turn that opens while the interrupt is on its way once, and the next send lands', async () => {
const claude = fakeClaude({ replayUuid: null })
const adapter = await written(claude)
const connection = claude.connections[0]!
// Deliver the echo between the interrupt write and its acknowledgement.
claude.routes.interrupt = () => {
connection.handlers.onMessage?.({ ...connection.sent[0]!, uuid: 'turn-late' })
return undefined
}
await expect(adapter.cancelTurn({ sessionId: 'session-1', fence: 7 })).resolves.toEqual({
cancelled: true
})
expect(interrupts(claude)).toBe(1)
delete claude.routes.interrupt
await expect(
adapter.dispatch({
sessionId: 'session-1',
clientMessageId: 'client-2',
body: USER_MESSAGE,
fence: 7
})
).resolves.toMatchObject({ state: 'admitted' })
expect(connection.sent).toHaveLength(2)
})
})
@@ -1,76 +0,0 @@
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 '../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'
export function sessionFor(send: Mock = vi.fn().mockResolvedValue(undefined)): ClaudeSession {
return {
connection: { send } as unknown 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()
}
}
}
export function userMessage(blocks: AgentJournalMessageItem['blocks']): AgentJournalMessageItem {
return { kind: 'message', role: 'user', blocks }
}
export function childExited(session: ClaudeSession): void {
retireClaudeDispatchWaiters(session)
}
export function userReplayFrame(uuid: string, text: string): Record<string, unknown> {
return {
type: 'user',
parent_tool_use_id: null,
session_id: 'provider-session',
uuid,
message: { role: 'user', content: [{ type: 'text', text }] }
}
}
@@ -1,170 +0,0 @@
import { expect, it } from 'vitest'
import {
acquired,
claudeFrame,
fakeClaude,
USER_MESSAGE
} from './claude-structured-session-test-support'
import { recordAgentSessionRanOptions } from '../../runtime/agent-session/records/agent-session-record-options'
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.test-fixture'
/** Claude ends a turn; a message sent before this joins the running turn on its choices. */
const claudeTurnEnds = (connection: Parameters<typeof claudeFrame>[0]) =>
claudeFrame(connection, { type: 'system', subtype: 'session_state_changed', state: 'idle' })
it.each(['high', undefined])(
'admits accepted high independently of resolved effort (effective %s)',
async (effective) => {
const models = [
{
value: 'sonnet',
supportsEffort: true,
supportedEffortLevels: ['low', 'high'],
supportsFastMode: true
}
]
const claude = fakeClaude({
initModels: models,
routes: { list_models: () => models },
settings: {
...(effective ? { applied: { model: 'sonnet', effort: 'low' } } : {}),
effective: { effortLevel: effective, fastMode: false }
}
})
const adapter = await acquired(claude)
const rig = await createQueuedMessageTestRig()
const choices = { model: 'sonnet', effort: 'high', fastMode: 'true' } as const
try {
rig.dispatch.mockImplementation((input) =>
adapter.dispatch({ ...input, sessionId: 'session-1', fence: 7 })
)
const first = rig.send('first', undefined, { carried: choices })
expect(await first.result).toMatchObject({ ok: true })
await eventually(() => expect(rig.dispatch).toHaveBeenCalledTimes(1))
await eventually(() =>
expect(rig.store.getRecord(SESSION)?.options).toEqual(
effective ? { model: 'sonnet', effort: 'low' } : undefined
)
)
const outcome = await rig.dispatch.mock.results[0]!.value
expect(outcome).toEqual({
state: 'admitted',
ranOptions: effective ? { model: 'sonnet', effort: 'low' } : {}
})
expect(outcome.ranOptions).not.toHaveProperty('fastMode')
const record = rig.store.getRecord(SESSION)!
expect(
recordAgentSessionRanOptions(
{ ...record, options: { model: 'sonnet', effort: 'high' } },
{
sessionId: SESSION,
fence: record.lease.runtimeFence,
model: 'sonnet',
options: outcome.ranOptions!,
models: undefined,
now: record.updatedAt
}
).options
).toEqual({ model: 'sonnet', effort: 'high' })
claudeTurnEnds(claude.connections[0]!)
await adapter.dispatch({
sessionId: 'session-1',
clientMessageId: 'again',
body: USER_MESSAGE,
executionOptions: choices,
fence: 7
})
expect(
claude.connections[0]!.calls.filter(
(call) =>
call.subtype === 'apply_flag_settings' && JSON.stringify(call.params).includes('high')
)
).toHaveLength(2)
expect(claude.connections[0]!.sent).toHaveLength(2)
} finally {
await adapter.closeAll()
await rig.dispose()
}
}
)
it('never pairs an earlier unknown-model low run with the next prepared model', async () => {
const applied: { model?: string; effort: string } = { effort: 'low' }
const claude = fakeClaude({ initModel: '', settings: { applied } })
const events: Parameters<typeof acquired>[2] = []
const adapter = await acquired(claude, {}, events)
const rig = await createQueuedMessageTestRig()
try {
rig.dispatch.mockImplementation((input) =>
adapter.dispatch({ ...input, sessionId: 'session-1', fence: 7 })
)
const first = rig.send('first')
await first.result
await eventually(async () =>
expect((await rig.submission(first.id))?.handedOverAt).toBeDefined()
)
expect(await rig.dispatch.mock.results[0]!.value).toEqual({
state: 'admitted',
ranOptions: { effort: 'low' }
})
expect(rig.store.getRecord(SESSION)?.options).toBeUndefined()
await rig.settleAccepted(first.id, 'a')
claudeTurnEnds(claude.connections[0]!)
claude.routes.set_model = async () => {
claudeFrame(claude.connections[0]!, { type: 'system', subtype: 'init', model: 'B' })
const report = events.findLast((event) => event.type === 'options-reported')!
await rig.host.handleAdapterEvent({
...report,
sessionId: SESSION,
fence: rig.store.getRecord(SESSION)!.lease.runtimeFence,
acquisitionGeneration: 'generation-1'
})
expect(rig.store.getRecord(SESSION)?.options).toBeUndefined()
Object.assign(applied, { model: 'B', effort: 'high' })
}
await rig.send('second', undefined, { carried: { model: 'B', effort: 'high' } }).result
await eventually(() =>
expect(rig.store.getRecord(SESSION)?.options).toEqual({ model: 'B', effort: 'high' })
)
expect(claude.connections[0]!.sent).toHaveLength(2)
} finally {
await adapter.closeAll()
await rig.dispose()
}
})
it('does not save a deferred model with a live unknown-model turn’s observed effort through handover', async () => {
// Same partial get_settings shape as the CLI capture: applied effort without model.
const claude = fakeClaude({
initModel: '',
settings: { applied: { effort: 'low' }, effective: { effortLevel: 'low' } }
})
const adapter = await acquired(claude)
const rig = await createQueuedMessageTestRig()
try {
rig.dispatch.mockImplementation((input) =>
adapter.dispatch({ ...input, sessionId: 'session-1', fence: 7 })
)
const first = rig.send('open the turn')
await first.result
await eventually(async () =>
expect((await rig.submission(first.id))?.handedOverAt).toBeDefined()
)
await rig.settleAccepted(first.id, 'first')
const followup = rig.send('keep working', undefined, { carried: { model: 'opus[1m]' } })
await followup.result
await eventually(() => expect(claude.connections[0]!.sent).toHaveLength(2))
await rig.host.collaboratorsForTests().conversationDelivery.loop.wake(SESSION)
expect(await rig.dispatch.mock.results[1]!.value).toEqual({
state: 'admitted',
ranOptions: { effort: 'low' }
})
expect(claude.connections[0]!.calls.filter((call) => call.subtype === 'set_model')).toEqual([])
expect(rig.store.getRecord(SESSION)?.options).toBeUndefined()
} finally {
await adapter.closeAll()
await rig.dispose()
}
})
@@ -1,92 +0,0 @@
import { describe, expect, it, vi } from 'vitest'
import { setClaudeStructuredOption } from './launch/claude-structured-options'
import {
readClaudeStructuredSessionOptions,
refreshClaudeStructuredSessionOptions
} from './launch/claude-structured-session-options'
import type { ClaudeSession } from './claude-structured-session-state'
/** Claude Code 2.1.260 list_models fixture; Haiku omits both effort keys. */
const CATALOG = [
{
value: 'sonnet',
resolvedModel: 'claude-sonnet-5',
displayName: 'Sonnet',
supportsEffort: true,
supportedEffortLevels: ['low', 'medium', 'high', 'xhigh', 'max']
},
{ value: 'haiku', resolvedModel: 'claude-haiku-4-5-20251001', displayName: 'Haiku' }
]
describe('confirmation never outlives the write it belongs to', () => {
it('corroborates only the current held effort across fresh native observations', async () => {
const calls: string[] = []
let settings: unknown = { applied: { effort: 'high' } }
// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixture supplies every session member the option paths under test read.
const session = {
options: new Map<string, string>([['model', 'sonnet']]),
reportedOptions: {},
optionMutationSequence: 0,
confirmedOptions: new Set<string>(),
appliedInputOptions: new Map(),
connection: {
supportedModels: async () => CATALOG,
applyFlagSettings: async (s: { effortLevel?: string }) => {
calls.push(`apply:${s.effortLevel}`)
},
getSettings: async () => settings
},
startup: { state: 'proven' }
} as unknown as ClaudeSession
const current = async () => (await readClaudeStructuredSessionOptions(session)).current
await expect(
setClaudeStructuredOption(session, { key: 'effort', value: 'high' }, undefined)
).resolves.toMatchObject({ effort: 'high' })
await vi.waitFor(async () => expect((await current()).confirmed).toContain('effort'))
const refresh = async (next: unknown) => {
settings = next
await refreshClaudeStructuredSessionOptions(
session,
undefined,
() => true,
() => {}
)
expect((await current()).effort).toBe('high')
expect(session.appliedInputOptions.get('effort')).toBe('high')
}
await refresh({})
expect((await current()).confirmed).toContain('effort')
await refresh({ applied: { effort: 'low' } })
expect((await current()).confirmed ?? []).not.toContain('effort')
await refresh({ applied: { effort: 'high' } })
expect((await current()).confirmed).toContain('effort')
await refresh({ applied: { effort: null } })
expect((await current()).confirmed ?? []).not.toContain('effort')
await refresh({ applied: { effort: 'high' } })
expect((await current()).confirmed).toContain('effort')
let releaseRead!: (value: unknown) => void
session.connection.getSettings = () =>
new Promise((resolve) => {
releaseRead = resolve
})
const lateRead = refreshClaudeStructuredSessionOptions(
session,
undefined,
() => true,
() => {}
)
await expect(
setClaudeStructuredOption(session, { key: 'effort', value: 'max' }, undefined)
).resolves.toMatchObject({ effort: 'max' })
expect((await current()).effort).toBe('max')
expect((await current()).confirmed ?? []).not.toContain('effort')
releaseRead({ applied: { effort: 'max' } })
await lateRead
expect((await current()).effort).toBe('max')
expect(session.appliedInputOptions.get('effort')).toBe('max')
expect((await current()).confirmed ?? []).not.toContain('effort')
expect(calls).toEqual(['apply:high', 'apply:max'])
})
})
@@ -1,87 +0,0 @@
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 { readAgentJournalTurn } from '../../../shared/agent-session/lifecycle/records/agent-session-turn-record'
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 {
PROVIDER_SESSION_ID,
USER_MESSAGE,
adapterFor,
fakeClaude,
identityFor
} from './claude-structured-session-test-support'
function journalSink() {
const items: { identity: AgentJournalItemIdentity; body: AgentJournalItemBody }[] = []
const sink: StructuredAgentSessionEventSink = {
appendItem: (identity, body) => items.push({ identity, body }),
appendTombstone: () => {},
publish: () => {}
}
return { sink, items }
}
function frame(type: 'assistant' | 'user', uuid: string, content: unknown[]) {
return {
type,
uuid,
session_id: PROVIDER_SESSION_ID,
parent_tool_use_id: null,
message: { role: type, content }
}
}
describe('a requested stop of a structured Claude chat', () => {
it('reads interrupted, not failed or crashed, through the frames the stop makes Claude emit', async () => {
const claude = fakeClaude({ replayUuid: 'turn-1' })
const events: ClaudeStructuredSessionEvent[] = []
const adapter = adapterFor(claude, {}, events)
const journal = journalSink()
await adapter.acquire({
identity: identityFor(),
fence: 7,
spawnToken: 'spawn-9',
events: journal.sink
})
await adapter.dispatch({
sessionId: 'session-1',
clientMessageId: 'client-1',
body: USER_MESSAGE,
fence: 7
})
const connection = claude.connections[0]!
connection.handlers.onMessage?.(
frame('assistant', 'assistant-1', [
{ type: 'tool_use', id: 'tool-1', name: 'Bash', input: { command: 'sleep 120' } }
])
)
// Captured from Claude 2.1.283 after mid-tool SIGTERM: tool/status frames without a result.
connection.close = async () => {
connection.handlers.onMessage?.(
frame('user', 'user-2', [
{ type: 'tool_result', tool_use_id: 'tool-1', is_error: true, content: 'Exit code 137' }
])
)
connection.handlers.onMessage?.({
type: 'system',
subtype: 'status',
uuid: 'status-1',
session_id: PROVIDER_SESSION_ID
})
connection.closed = true
return true
}
await expect(adapter.closeSession('session-1')).resolves.toBe(true)
const turns = journal.items.flatMap((item) => {
const turn = readAgentJournalTurn(item.body)
return turn ? [turn] : []
})
expect(turns.at(-1)).toMatchObject({ turnId: 'turn-1', state: 'interrupted' })
const ended = events.filter((event) => event.type === 'ended')
expect(ended).toEqual([expect.objectContaining({ reason: 'claude session closed' })])
expect(ended[0]).toMatchObject({ cause: 'requested-close' })
})
})
@@ -1,189 +0,0 @@
import { followTestSinkSnapshots } from '../../native-chat/agent-session-wire/host/testing/structured-agent-session-direct-sink.test-fixture'
import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
import { tmpdir } from 'node:os'
import { join } from 'node:path'
import { afterEach, describe, expect, it, vi } from 'vitest'
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-fixture'
import type { ClaudeStructuredSessionEvent } from './claude-structured-session-state'
import {
adapterFor,
fakeClaude,
identityFor,
PROVIDER_SESSION_ID,
recordingJournalSink,
tick
} from './claude-structured-session-test-support'
import { claudeOpened } from './claude-structured-startup-settled-test-support'
const journals = createTrackedJournalOpener()
const cleanups: (() => Promise<void>)[] = []
async function ownerMidSecondTurn(persisted: unknown[]) {
const root = await mkdtemp(join(tmpdir(), 'orca-claude-completed-leaf-'))
const claudeConfigDir = join(root, 'claude')
const project = join(claudeConfigDir, 'projects', '-work-repo')
await mkdir(project, { recursive: true })
await writeFile(
join(project, `${PROVIDER_SESSION_ID}.jsonl`),
`${JSON.stringify({
type: 'assistant',
uuid: 'a3',
parentUuid: null,
sessionId: PROVIDER_SESSION_ID,
message: { role: 'assistant', content: [{ type: 'text', text: 'previous answer' }] }
})}\n`
)
const journal = await journals.open({ identity: identityFor(), stateDirectory: root })
const deferred = createDeferredStructuredAgentSessionEventSink(testEventSinkLogging())
await followTestSinkSnapshots(deferred, journal)
deferred.bind({ journal, fence: 7, publish: () => {} })
const claude = fakeClaude()
const adapter = adapterFor(
claude,
{
resumesTranscript: true,
continuesChain: true,
resumeLeafUuid: 'a3',
claudeConfigDir,
options: { resume: PROVIDER_SESSION_ID }
},
[],
persisted
)
cleanups.push(async () => {
await adapter.closeAll()
deferred.close()
await journals.closeAll()
await rm(root, { recursive: true, force: true })
})
await adapter.acquire({
identity: identityFor(),
fence: 7,
spawnToken: 'spawn-7',
events: deferred.sink
})
const frame = (message: Record<string, unknown>) =>
claude.connections[0]!.handlers.onMessage?.({ session_id: PROVIDER_SESSION_ID, ...message })
frame({ type: 'user', uuid: 'u4', message: { role: 'user', content: 'ask' } })
frame({
type: 'assistant',
uuid: 'a4',
message: { role: 'assistant', content: [{ type: 'text', text: 'answer' }] }
})
frame({ type: 'result', subtype: 'success', uuid: 'a4-result' })
frame({ type: 'user', uuid: 'u5', message: { role: 'user', content: 'next' } })
return { adapter, claude, frame }
}
const lastCompletedTurn = { providerSessionId: PROVIDER_SESSION_ID, leafUuid: 'a4', fence: 7 }
afterEach(async () => {
for (const cleanup of cleanups.splice(0)) {
await cleanup()
}
vi.restoreAllMocks()
})
describe('Claude resume point is the last completed turn on every exit path', () => {
it('on close', async () => {
const persisted: unknown[] = []
const { adapter } = await ownerMidSecondTurn(persisted)
await expect(adapter.closeSession('session-1')).resolves.toBe(true)
await vi.waitFor(() => expect(persisted).toEqual([expect.objectContaining(lastCompletedTurn)]))
})
it('on an unexpected exit', async () => {
const persisted: unknown[] = []
const { adapter, claude } = await ownerMidSecondTurn(persisted)
claude.connections[0]!.handlers.onExit?.(new Error('claude crashed'))
await adapter.drainObservedExits()
await tick()
expect(persisted).toEqual([expect.objectContaining(lastCompletedTurn)])
})
it('on an acquisition release', async () => {
const persisted: unknown[] = []
const { adapter } = await ownerMidSecondTurn(persisted)
await expect(adapter.releaseAcquisition({ sessionId: 'session-1' })).resolves.toBe(true)
await vi.waitFor(() => expect(persisted).toEqual([expect.objectContaining(lastCompletedTurn)]))
})
it('carries the launch leaf forward when no turn completed', async () => {
const persisted: unknown[] = []
const claude = fakeClaude()
const adapter = adapterFor(
claude,
{
resumesTranscript: true,
continuesChain: true,
resumeLeafUuid: 'a3',
options: { resume: PROVIDER_SESSION_ID }
},
[],
persisted
)
await adapter.acquire({
identity: identityFor(),
fence: 7,
spawnToken: 'spawn-7',
events: recordingJournalSink()
})
expect((await claudeOpened(adapter, 'session-1')).link?.handle).toMatchObject({
resumeCursor: 'a3'
})
await expect(adapter.closeSession('session-1')).resolves.toBe(true)
expect(persisted).toEqual([expect.objectContaining({ leafUuid: 'a3' })])
})
it('saves only real messages: hook, attachment, and result frames never become the leaf', async () => {
const persisted: unknown[] = []
const { adapter, frame } = await ownerMidSecondTurn(persisted)
frame({
type: 'assistant',
uuid: 'a5',
message: { role: 'assistant', content: [{ type: 'text', text: 'next answer' }] }
})
frame({ type: 'system', subtype: 'stop_hook_summary', uuid: 'a5-hook-summary' })
frame({ type: 'attachment', uuid: 'a5-attachment' })
frame({ type: 'result', subtype: 'success', uuid: 'a5-result' })
await expect(adapter.closeSession('session-1')).resolves.toBe(true)
await vi.waitFor(() => expect(persisted).toEqual([expect.objectContaining({ leafUuid: 'a5' })]))
})
it('on an unexpected exit whose durable write fails, still ends the session and logs', async () => {
const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
const events: ClaudeStructuredSessionEvent[] = []
const claude = fakeClaude()
const adapter = adapterFor(
claude,
{
resumesTranscript: true,
continuesChain: true,
resumeLeafUuid: 'a3',
options: { resume: PROVIDER_SESSION_ID }
},
events,
[],
undefined,
async () => {
throw new Error('record write failed')
}
)
await adapter.acquire({
identity: identityFor(),
fence: 7,
spawnToken: 'spawn-7',
events: recordingJournalSink()
})
claude.connections[0]!.handlers.onExit?.(new Error('claude crashed'))
await adapter.drainObservedExits()
await tick()
expect(events.at(-1)).toMatchObject({ type: 'ended', cause: 'unexpected-exit' })
expect(warn).toHaveBeenCalledWith(
'[claude-resume-point] exit cursor was not persisted:',
expect.objectContaining({ sessionId: 'session-1', error: expect.any(Error) })
)
})
})
@@ -1,77 +0,0 @@
import { describe, expect, it, vi } from 'vitest'
import type { AgentSessionJournalIdentity } from '../../../shared/agent-session/journal/agent-session-journal-identity'
import { AgentSessionPreSpawnError } from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter-errors'
import type {
ClaudeStreamJsonConnection,
openClaudeStreamJsonConnection
} from '../claude-stream-json-connection'
import { ClaudeStructuredSessionAdapter } from './claude-structured-session-adapter'
const PROVIDER_SESSION_ID = '819cf9f8-e43c-4ad7-b50f-54aa158a726a'
const IDENTITY: AgentSessionJournalIdentity = {
sessionId: 'session-processless',
workspaceId: 'workspace-1',
hostId: 'local',
agent: 'claude',
providerHandle: null
}
describe('Claude structured processless acquisition', () => {
it('classifies pre-pid error and close as processless with idempotent cleanup', async () => {
const fault = new Error('spawn claude ENOENT')
const close = vi.fn(async () => true)
const openConnection: typeof openClaudeStreamJsonConnection = async (
_launch,
handlers = {}
) => {
// A failed spawn reports its error on a later tick, as child_process does.
setTimeout(() => handlers.onFault?.(fault), 0)
const connection: ClaudeStreamJsonConnection = {
pid: undefined,
closed: true,
exitVerdict: { root: 'exited', tree: 'exited', processless: true },
initializationResult: async () => {
throw fault
},
getSettings: async () => ({}),
getContextUsage: async () => ({}),
renameSession: async () => {},
supportedModels: async () => [],
interrupt: async () => undefined,
cancelAsyncMessage: async () => false,
setModel: async () => {},
setPermissionMode: async () => {},
applyFlagSettings: async () => {},
send: async () => {},
stopTask: async () => {},
backgroundTask: async () => false,
close
}
return connection
}
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
})
const error = await adapter
.acquire({ identity: IDENTITY, fence: 7, spawnToken: 'spawn-9' })
.catch((cause: unknown) => cause)
expect(error).toBeInstanceOf(AgentSessionPreSpawnError)
expect(error).toMatchObject({ message: fault.message })
expect(close).toHaveBeenCalledOnce()
await expect(adapter.releaseAcquisition({ sessionId: IDENTITY.sessionId })).resolves.toBe(true)
expect(close).toHaveBeenCalledOnce()
})
})
@@ -1,20 +1,20 @@
import { dispatchClaudeCommand } from './claude-structured-command-dispatch'
import { isKillDeliveredExitReceipt } from './claude-kill-delivered-exit-receipt'
import { manageClaudeMcp } from './claude-structured-mcp'
import { dispatchClaudeCommand } from './turns/claude-structured-command-dispatch'
import { isKillDeliveredExitReceipt } from './lifecycle/claude-kill-delivered-exit-receipt'
import { manageClaudeMcp } from './lifecycle/claude-structured-mcp'
import { claudeAcquireFailure } from '../sdk-transport/claude-startup-failure'
import { claudeStartPublication, openClaudeStart } from './claude-structured-start-ending'
import { claudeStartPublication, openClaudeStart } from './startup/claude-structured-start-ending'
import { AgentSessionStartEndings } from '../../native-chat/agent-session-wire/startup/structured-agent-session-start-failure'
import type {
StructuredAgentSessionAcquireInput,
StructuredAgentSessionAdapter
} from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter'
import { stopCurrentClaudeBackgroundTasks } from './claude-structured-control-actions'
import { stopCurrentClaudeBackgroundTasks } from './turns/claude-structured-control-actions'
import { claudeHeldSends, claudeHoldsDispatch } from './turns/claude-command-lifecycle'
import {
releaseClaudeAcquisition,
type ClaudeReleaseRequest
} from './claude-structured-acquisition-release'
import { acquireClaudeSession } from './claude-structured-session-acquisition'
} from './lifecycle/claude-structured-acquisition-release'
import { acquireClaudeSession } from './lifecycle/claude-structured-session-acquisition'
import { supportsClaudeStructuredLocation } from './launch/claude-structured-location-support'
import * as claudeOptions from './launch/claude-structured-options'
import { dispatchClaudeMessage } from './launch/claude-structured-message-options'
@@ -23,10 +23,10 @@ import {
ClaudeAcquisitionRegistry,
type ClaudeSession,
type ClaudeSessionExit,
type ClaudeStructuredSessionAdapterDeps,
type ClaudeStructuredSessionEvent
type ClaudeStructuredSessionAdapterDeps
} from './claude-structured-session-state'
import { closeAllClaudeSessions } from './claude-structured-session-close'
import type { ClaudeStructuredSessionEvent } from './lifecycle/claude-structured-session-event'
import { closeAllClaudeSessions } from './lifecycle/claude-structured-session-close'
import { claudeStoppedRequestEndWait } from './turns/claude-request-end-wait'
import {
finishClaudeCloseAfterExit,
@@ -35,12 +35,12 @@ import {
observeClaudeSessionExit,
settleClaudeUnexpectedExit,
type ClaudeExitLifecycle
} from './claude-structured-session-exit-lifecycle'
} from './lifecycle/claude-structured-session-exit-lifecycle'
import { drainClaudeChildWork } from '../child-work/claude-child-work-evidence'
import {
deliverClaudeConnectionEvent,
emitClaudeStructuredSessionEvent
} from './claude-structured-event-delivery'
} from './lifecycle/claude-structured-event-delivery'
import {
answerClaudeStructuredPrompt,
cancelClaudeStructuredTurn,
@@ -1,108 +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 {
ClaudeStructuredSessionAdapterDeps,
ClaudeStructuredSessionEvent
} from './claude-structured-session-state'
import {
PROVIDER_SESSION_ID,
adapterFor,
fakeClaude,
identityFor
} from './claude-structured-session-test-support'
import type { AgentChildWorkEvidence } from '../../../shared/agent-status/child-work/agent-status-child-work-evidence'
import { AgentSessionAcquisitionRootExitObservedError } from '../../native-chat/agent-session-wire/acquisition/structured-agent-session-acquisition-errors'
describe('Claude published session close lifecycle', () => {
it('lets the chat start again after a close that saw the root exit', async () => {
const claude = fakeClaude()
const adapter = adapterFor(claude)
await adapter.acquire({ identity: identityFor(), fence: 7, spawnToken: 'spawn-9' })
const first = claude.connections[0]!
first.exitVerdict = { root: 'exited', tree: 'unverifiable' }
first.close = vi.fn<() => Promise<boolean>>().mockResolvedValue(false)
await expect(adapter.closeSession('session-1')).rejects.toBeInstanceOf(
AgentSessionAcquisitionRootExitObservedError
)
await adapter.acquire({ identity: identityFor(), fence: 8, spawnToken: 'spawn-10' })
expect(claude.connections).toHaveLength(2)
expect(first.close).toHaveBeenCalledTimes(1)
})
it('starts the chat over a live session whose close saw the root exit', async () => {
const claude = fakeClaude()
const events: ClaudeStructuredSessionEvent[] = []
const adapter = adapterFor(claude, {}, events)
await adapter.acquire({ identity: identityFor(), fence: 7, spawnToken: 'spawn-9' })
const first = claude.connections[0]!
first.exitVerdict = { root: 'exited', tree: 'unverifiable' }
first.close = vi.fn<() => Promise<boolean>>().mockResolvedValue(false)
await adapter.acquire({ identity: identityFor(), fence: 8, spawnToken: 'spawn-10' })
expect(claude.connections).toHaveLength(2)
expect(events.filter((event) => event.type === 'ended')).toHaveLength(1)
})
it('ends the session even when the durable handle write rejects', async () => {
const claude = fakeClaude()
const events: ClaudeStructuredSessionEvent[] = []
const persistenceError = new Error('store unavailable')
const persistHandle = vi
.fn<NonNullable<ClaudeStructuredSessionAdapterDeps['persistHandle']>>()
.mockRejectedValueOnce(persistenceError)
.mockResolvedValueOnce(undefined)
const childWork: AgentChildWorkEvidence['type'][] = []
const adapter = adapterFor(
claude,
{},
events,
[],
undefined,
persistHandle,
(_sessionId, evidence) => childWork.push(...evidence.map((edge) => edge.type))
)
const journalSink: StructuredAgentSessionEventSink = {
appendItem: () => {},
appendTombstone: () => {},
publish: () => {}
}
await adapter.acquire({
identity: identityFor(),
fence: 7,
spawnToken: 'spawn-9',
events: journalSink
})
claude.connections[0]!.handlers.onMessage?.({
type: 'system',
subtype: 'task_started',
session_id: PROVIDER_SESSION_ID,
uuid: 'task-start',
task_id: 'background-1',
task_type: 'local_agent',
is_backgrounded: true
})
expect(childWork).toEqual(['live'])
const session = (
adapter as unknown as {
sessions: Map<string, { translator: { dispose: () => void } | null }>
}
).sessions.get('session-1')
const disposeTranslator = vi.spyOn(session!.translator!, 'dispose')
await expect(adapter.closeSession('session-1')).resolves.toBe(true)
await vi.waitFor(() => expect(persistHandle).toHaveBeenCalledOnce())
expect(events.filter((event) => event.type === 'ended')).toHaveLength(1)
expect(events.filter((event) => event.type === 'handle')).toHaveLength(0)
expect(disposeTranslator).toHaveBeenCalledOnce()
// Session close cannot prove how unfinished child work ended.
expect(childWork).toEqual(['live', 'session-ended'])
await expect(adapter.closeSession('session-1')).resolves.toBe(true)
expect(persistHandle).toHaveBeenCalledOnce()
expect(events.filter((event) => event.type === 'ended')).toHaveLength(1)
expect(disposeTranslator).toHaveBeenCalledOnce()
})
})
@@ -1,5 +1,5 @@
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 { ClaudeStartupOutcome } from './startup/claude-structured-startup-outcome'
import type {
ClaudeCliFlagCheck,
ClaudeCliFlagFact
@@ -24,17 +24,13 @@ import type { ClaudeBackgroundTaskTracker } from '../background-tasks/claude-bac
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 { ClaudeInitProof } from './startup/claude-structured-init-proof'
import type { AgentSessionProviderHandleLink } from '../../../shared/agent-session/lifecycle/provider-handles/agent-session-provider-handle'
import type { AgentSessionRecord } from '../../../shared/agent-session/lifecycle/agent-session-record'
import type { ClaudeNamingInputs } from '../conversation-naming/claude-naming-invocation'
import type { ClaudeInitializeFacts } from './claude-structured-session-startup'
import type { ClaudeInitializeFacts } from './startup/claude-structured-session-startup'
export type {
ClaudeAuthDiagnostic,
ClaudeStructuredSessionEvent
} from './claude-structured-session-event'
import type { ClaudeStructuredSessionEvent } from './claude-structured-session-event'
import type { ClaudeStructuredSessionEvent } from './lifecycle/claude-structured-session-event'
export type ClaudeStartedSend = { clientMessageId: string; requestedAt?: number }
@@ -9,17 +9,15 @@ import type {
} from '../claude-stream-json-connection'
import { ClaudeStructuredSessionAdapter } from './claude-structured-session-adapter'
import type { ClaudeStructuredLaunch } from './launch/claude-structured-launch-resolution'
import type {
ClaudeStructuredSessionAdapterDeps,
ClaudeStructuredSessionEvent
} from './claude-structured-session-state'
import type { ClaudeStructuredSessionAdapterDeps } from './claude-structured-session-state'
import type { ClaudeStructuredSessionEvent } from './lifecycle/claude-structured-session-event'
import type { StructuredAgentSessionEventSink } from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink'
import { claudeProviderHandle } from '../../../shared/agent-session/lifecycle/provider-handles/agent-session-provider-handle-encoding'
import {
type claudeInitialization,
claudeInitializationScope,
claudeStartupSettled
} from './claude-structured-startup-settled-test-support'
} from './startup/claude-structured-startup-settled-test-support'
export const PROVIDER_SESSION_ID = '819cf9f8-e43c-4ad7-b50f-54aa158a726a'
@@ -1,82 +0,0 @@
import { describe, expect, it, vi } from 'vitest'
import { dispatchClaudeMessage } from './launch/claude-structured-message-options'
import { sessionFor, userMessage } from './claude-structured-dispatch-test-support'
import type { ClaudeSession } from './claude-structured-session-state'
const SESSION = '819cf9f8-e43c-4ad7-b50f-54aa158a726a'
function runningSession(): { session: ClaudeSession; steps: string[]; sent: unknown[] } {
const steps: string[] = []
const sent: unknown[] = []
const session = sessionFor(
vi.fn(async (message: Record<string, unknown>, beforeDispatch?: () => Promise<void>) => {
await beforeDispatch?.()
steps.push('write')
sent.push(structuredClone(message))
})
)
Object.assign(session.connection, {
backgroundTask: vi.fn(async (toolUseId: string) => {
steps.push(`background ${toolUseId}`)
return true
})
})
// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: dispatch reads only these translator flags.
session.translator = {
openTurnHasInputWork: true,
commandTurnId: null
} as unknown as ClaudeSession['translator']
// Shapes from Claude CLI 2.1.319: a foreground subagent, and a foreground command it runs.
session.childWork.observe({
type: 'system',
subtype: 'task_started',
task_id: 'agent-parent',
tool_use_id: 'toolu_parent',
is_backgrounded: false,
spawn_depth: 1,
task_type: 'local_agent',
session_id: SESSION
})
session.childWork.observe({
type: 'system',
subtype: 'task_started',
task_id: 'shell-child',
owned_by_subagent: true,
tool_use_id: 'toolu_shell',
is_backgrounded: false,
parent_task_id: 'agent-parent',
task_type: 'local_bash',
session_id: SESSION
})
return { session, steps, sent }
}
const steer = {
sessionId: 'session-1',
clientMessageId: 'client-1',
body: userMessage([{ type: 'text', text: 'change course' }]),
fence: 1
}
describe('Claude steer dispatch', () => {
it('backgrounds only top-level foreground work, then interrupts the running step', async () => {
const { session, steps, sent } = runningSession()
await expect(dispatchClaudeMessage(session, steer, undefined)).resolves.toMatchObject({
state: 'admitted'
})
// The subagent's own command must stay in its foreground, or it dies when the subagent ends.
expect(steps).toEqual(['background toolu_parent', 'write'])
expect(sent).toEqual([expect.objectContaining({ priority: 'now' })])
})
it('still steers when Claude refuses the background request', async () => {
const { session, sent } = runningSession()
session.connection.backgroundTask = vi.fn(async () => {
throw new Error('background tasks are disabled')
})
await dispatchClaudeMessage(session, steer, undefined, { warn: () => {}, error: () => {} })
expect(sent).toEqual([expect.objectContaining({ priority: 'now' })])
})
})
@@ -1,236 +0,0 @@
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 { readAgentJournalTurn } from '../../../shared/agent-session/lifecycle/records/agent-session-turn-record'
import { createClaudeJournalTranslator } from './journal/claude-structured-journal-translation'
import type { StructuredAgentSessionEventSink } from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink'
import {
PROVIDER_SESSION_ID,
USER_MESSAGE,
adapterFor,
fakeClaude,
identityFor
} from './claude-structured-session-test-support'
function journalSink() {
const items: { identity: AgentJournalItemIdentity; body: AgentJournalItemBody }[] = []
const sink: StructuredAgentSessionEventSink = {
appendItem: (identity, body) => items.push({ identity, body }),
appendTombstone: () => {},
publish: () => {}
}
return { sink, items }
}
const root = { session_id: PROVIDER_SESSION_ID, parent_tool_use_id: null }
async function steeredDuringSubagent() {
// The steer's echo arrives after its interrupt, so the fake does not echo it on send.
const claude = fakeClaude({ replayUuids: ['turn-1', null] })
const adapter = adapterFor(claude, {})
const journal = journalSink()
await adapter.acquire({
identity: identityFor(),
fence: 7,
spawnToken: 'spawn-9',
events: journal.sink
})
await adapter.dispatch({
sessionId: 'session-1',
clientMessageId: 'client-1',
body: USER_MESSAGE,
fence: 7
})
const connection = claude.connections[0]!
const emit = (message: Record<string, unknown>) => connection.handlers.onMessage?.(message)
emit({
...root,
type: 'assistant',
uuid: 'assistant-1',
message: {
role: 'assistant',
content: [{ type: 'tool_use', id: 'agent-tool', name: 'Agent', input: { prompt: 'wait' } }]
}
})
emit({
...root,
type: 'system',
subtype: 'task_started',
task_id: 'agent-task',
tool_use_id: 'agent-tool',
is_backgrounded: false,
task_type: 'local_agent',
uuid: 'task-started-1'
})
await expect(
adapter.dispatch({
sessionId: 'session-1',
clientMessageId: 'client-2',
body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'change course' }] },
fence: 7
})
).resolves.toMatchObject({ state: 'admitted' })
const steer = connection.sent[1]!
expect(steer).toMatchObject({ priority: 'now' })
expect(connection.calls).toContainEqual({
subtype: 'background_tasks',
params: { toolUseId: 'agent-tool' }
})
// Frame order recorded from Claude CLI 2.1.310 for a `now` steer: the cut-off step's result first.
emit({
...root,
type: 'result',
subtype: 'success',
uuid: 'result-1',
is_error: false,
num_turns: 1,
terminal_reason: 'aborted_tools'
})
const turns = () =>
journal.items.flatMap((item) => {
const turn = readAgentJournalTurn(item.body)
return turn ? [turn] : []
})
return { emit, steer, turns }
}
describe('a Claude steer during foreground work', () => {
it('continues the running turn through the interrupt, not as a second or superseded turn', async () => {
const { emit, steer, turns } = await steeredDuringSubagent()
emit({
...root,
type: 'system',
subtype: 'init',
uuid: 'init-2',
model: 'claude-sonnet-5',
apiKeySource: 'none'
})
emit({ ...steer, uuid: steer.uuid })
emit({
...root,
type: 'assistant',
uuid: 'assistant-2',
message: { role: 'assistant', content: [{ type: 'text', text: 'Changed course.' }] }
})
emit({
...root,
type: 'result',
subtype: 'success',
uuid: 'result-2',
is_error: false,
num_turns: 1,
terminal_reason: 'completed'
})
expect(new Set(turns().map((turn) => turn.turnId))).toEqual(new Set(['turn-1']))
expect(turns().at(-1)).toMatchObject({
turnId: 'turn-1',
state: 'completed',
outcome: 'success'
})
})
it("keeps a real result's own ending after the hand-off", async () => {
const { emit, turns } = await steeredDuringSubagent()
emit({
...root,
type: 'result',
subtype: 'error_during_execution',
uuid: 'result-2',
is_error: true,
num_turns: 1,
terminal_reason: 'api_error'
})
expect(turns().at(-1)).toMatchObject({ turnId: 'turn-1', outcome: 'failure' })
})
it('ends the turn as interrupted when it goes idle before the steer runs', async () => {
const { emit, turns } = await steeredDuringSubagent()
// A Stop can withdraw the queued steer, so Claude goes idle without another result.
emit({
...root,
type: 'system',
subtype: 'session_state_changed',
state: 'idle',
uuid: 'idle-1'
})
expect(turns().at(-1)).toMatchObject({
turnId: 'turn-1',
state: 'interrupted',
outcome: 'cancellation'
})
})
})
function childStreamAfterHandoff() {
const writes: { body: AgentJournalItemBody; lifecycle?: boolean }[] = []
const translator = createClaudeJournalTranslator({
sink: {
appendItem: (_identity, body, options) =>
writes.push({ body, lifecycle: options?.lifecycle }),
appendTombstone: () => {},
publish: () => {}
},
steerAwaitingEcho: () => true
})
const frame = (message: Record<string, unknown>, observedAt: number, startsTurn = false) =>
translator.handle({
type: 'message',
sessionId: 'orca-session',
observedAt,
...(startsTurn ? { startsTurn: true } : {}),
message: { session_id: 'claude-session', parent_tool_use_id: null, ...message }
})
frame({ type: 'user', uuid: 'prompt', message: { role: 'user', content: 'go' } }, 1_000, true)
frame(
{
type: 'stream_event',
uuid: 'child-delta',
parent_tool_use_id: 'agent-tool',
event: { type: 'content_block_delta', index: 0, delta: { type: 'text_delta', text: 'Half' } }
},
2_000
)
frame(
{
type: 'result',
subtype: 'success',
uuid: 'r',
is_error: false,
terminal_reason: 'aborted_tools'
},
3_000
)
return { translator, frame, writes }
}
describe('a subagent text stream after a steer hand-off', () => {
it('ends when the turn goes idle, so cancelled turns retain no blocks', () => {
const { translator, frame, writes } = childStreamAfterHandoff()
expect(translator.pendingStreamedBlocks).toBe(1)
frame({ type: 'system', subtype: 'session_state_changed', state: 'idle', uuid: 'idle' }, 9_000)
expect(translator.pendingStreamedBlocks).toBe(0)
// The ending write must survive backpressure: no later frame would end the row.
expect(writes.at(-2)).toMatchObject({
body: { role: 'assistant', blocks: [{ type: 'text', text: 'Half' }] },
lifecycle: true
})
})
it('keeps streaming into the next turn when a new prompt supersedes this one', () => {
const { translator, frame, writes } = childStreamAfterHandoff()
frame(
{ type: 'user', uuid: 'prompt-2', message: { role: 'user', content: 'next' } },
5_000,
true
)
expect(translator.pendingStreamedBlocks).toBe(1)
expect(writes.some((write) => write.lifecycle && write.body.kind === 'message')).toBe(false)
})
})
@@ -1,25 +1,25 @@
import { createHash } from 'node:crypto'
import { open } from 'node:fs/promises'
import { extname } from 'node:path'
import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types'
import type { NativeChatBlock } from '../../../shared/native-chat/native-chat-types'
import type { AgentJournalMessageItem } from '../../../../shared/agent-session/journal/agent-session-journal-types'
import type { NativeChatBlock } from '../../../../shared/native-chat/native-chat-types'
import {
agentSessionFailureFact,
type AgentSessionAttachmentProblem,
type SubmissionRejectionFact
} from '../../../shared/agent-session/failures/agent-session-failure'
} from '../../../../shared/agent-session/failures/agent-session-failure'
import {
agentSessionFailureWords,
type AgentJournalDispatchRejection
} from '../../../shared/agent-session/failures/agent-session-failure-words'
import { TUI_AGENT_DISPLAY_NAMES } from '../../../shared/agent-launch/catalog/tui-agent-display-names'
} from '../../../../shared/agent-session/failures/agent-session-failure-words'
import { TUI_AGENT_DISPLAY_NAMES } from '../../../../shared/agent-launch/catalog/tui-agent-display-names'
import {
AGENT_SESSION_ATTACHMENT_MAX_BYTES,
AGENT_SESSION_MESSAGE_IMAGE_MAX_COUNT,
AGENT_SESSION_MESSAGE_IMAGE_MAX_TOTAL_BYTES
} from '../../../shared/agent-session/agent-session-attachments'
import { agentInlineImageMimeType } from '../../../shared/native-chat/input/composer/agent-inline-image-types'
import { claudeRecord } from './journal/claude-structured-item-translation'
} from '../../../../shared/agent-session/agent-session-attachments'
import { agentInlineImageMimeType } from '../../../../shared/native-chat/input/composer/agent-inline-image-types'
import { claudeRecord } from '../journal/claude-structured-item-translation'
export class ClaudeDispatchContentError extends Error {
readonly failure: SubmissionRejectionFact
@@ -1,4 +1,4 @@
import type { ClaudeDispatchWaiter, ClaudeSession } from './claude-structured-session-state'
import type { ClaudeDispatchWaiter, ClaudeSession } from '../claude-structured-session-state'
const MAX_RETIRED_DISPATCH_WAITERS = 64
@@ -1,17 +1,17 @@
import { randomUUID } from 'node:crypto'
import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key'
import { claudePromptUuidForSubmission } from './claude-structured-session-id'
import { isAbortSignalReason } from '../../../shared/concurrency/abort-signal-reason'
import { agentJournalSubmissionKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key'
import { claudePromptUuidForSubmission } from '../lifecycle/claude-structured-session-id'
import { isAbortSignalReason } from '../../../../shared/concurrency/abort-signal-reason'
import {
forgetRetiredWaiter,
forgetWaiter,
retireWaiter,
waitForReplay
} from './claude-structured-dispatch-waiters'
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 './turns/claude-replay-turn-resolution'
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 '../turns/claude-replay-turn-resolution'
import {
claudeDispatchContentKey,
claudeDispatchContentRejection,
@@ -19,29 +19,29 @@ import {
claudeDispatchMessageContent,
claudeDispatchRejection
} from './claude-structured-dispatch-content'
import { dispatchWriteOutcomeUnknownReason } from '../../native-chat/agent-session-journal/projection/journal-dispatch-doubt-reasons'
import { DISPATCH_REJECTED_QUEUE_FULL } from '../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection'
import { dispatchWriteOutcomeUnknownReason } from '../../../native-chat/agent-session-journal/projection/journal-dispatch-doubt-reasons'
import { DISPATCH_REJECTED_QUEUE_FULL } from '../../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection'
import {
agentSessionFailureFact,
providerDiagnostic,
type SubmissionRejectionFact
} from '../../../shared/agent-session/failures/agent-session-failure'
import type { AgentJournalDispatchRejection } from '../../../shared/agent-session/failures/agent-session-failure-words'
} from '../../../../shared/agent-session/failures/agent-session-failure'
import type { AgentJournalDispatchRejection } from '../../../../shared/agent-session/failures/agent-session-failure-words'
import {
claudeUnwrittenUserMessageError,
claudeUserMessageWasProvablyUnwritten
} from '../sdk-transport/claude-agent-sdk-user-message-queue'
import { AgentSessionPreDispatchError } from '../../native-chat/agent-session-wire/operations/structured-agent-session-operation-settlement'
} 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 '../sdk-transport/claude-agent-sdk-control-requests'
} from '../../../native-chat/agent-session-wire/options/structured-agent-session-option-error'
import { ClaudeControlRequestError } from '../../sdk-transport/claude-agent-sdk-control-requests'
import {
admitStructuredAgentSessionInput,
StructuredAgentSessionInputNotAdmitted,
type StructuredAgentSessionAdmitFreshInput
} from '../../native-chat/agent-session-wire/delivery/structured-agent-session-input-admission'
} from '../../../native-chat/agent-session-wire/delivery/structured-agent-session-input-admission'
const MAX_ACTIVE_DISPATCH_WAITERS = 64
@@ -12,7 +12,7 @@ import type {
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 { ClaudeStructuredSessionEvent } from '../lifecycle/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'
@@ -5,7 +5,7 @@ import type { StructuredAgentSessionEventSink } from '../../../native-chat/agent
import type { ClaudeOpenTurn } from '../turns/claude-open-turn'
import { writeClaudeStopReadings, type ClaudeStopCheck } from '../../claude-stop-readings'
import { estimateStructuredAgentSessionItemBytes } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink-estimate'
import type { ClaudeStructuredSessionEvent } from '../claude-structured-session-state'
import type { ClaudeStructuredSessionEvent } from '../lifecycle/claude-structured-session-event'
export function journalClaudePluginInputFailure({
event,
@@ -2,7 +2,7 @@ import { describe, expect, it, vi } from 'vitest'
import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../shared/agent-session/journal/agent-session-journal-types'
import type { StructuredAgentSessionSinkBarrier } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink'
import { ClaudeJournalPrompts } from './claude-structured-journal-prompts'
import type { ClaudeStructuredSessionEvent } from '../claude-structured-session-state'
import type { ClaudeStructuredSessionEvent } from '../lifecycle/claude-structured-session-event'
const PROMPT: Extract<ClaudeStructuredSessionEvent, { type: 'prompt' }> = {
type: 'prompt',
@@ -17,7 +17,7 @@ import {
claudeQuestionItems,
type ClaudeQuestionItem
} from './claude-structured-prompt-items'
import type { ClaudeStructuredSessionEvent } from '../claude-structured-session-state'
import type { ClaudeStructuredSessionEvent } from '../lifecycle/claude-structured-session-event'
const ADMITTED = { accepted: true } as const
@@ -7,7 +7,7 @@ import type {
} from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink'
import { readAgentJournalTurn } from '../../../../shared/agent-session/lifecycle/records/agent-session-turn-record'
import { createClaudeJournalTranslator } from './claude-structured-journal-translation'
import type { ClaudeStructuredSessionEvent } from '../claude-structured-session-state'
import type { ClaudeStructuredSessionEvent } from '../lifecycle/claude-structured-session-event'
type Append = {
identity: AgentJournalItemIdentity
@@ -4,7 +4,7 @@ import {
} from '../../../native-chat/agent-session-wire/providers/structured-agent-session-adapter-errors'
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 { answerClaudePrompt, cancelClaudeTurn } from '../turns/claude-structured-control-actions'
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'
@@ -9,7 +9,7 @@ import type {
import type { ClaudeStreamJsonConnection } from '../../claude-stream-json-connection'
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 { ClaudeInitProof } from '../startup/claude-structured-init-proof'
import type { ClaudeJournalBoundDelivery } from './claude-journal-bound-delivery'
import type {
ClaudeAcquisitionAttempt,
@@ -28,7 +28,7 @@ import {
import {
claudeCloseReport,
closeClaudePublishedSessionForDeps
} from '../claude-structured-session-close'
} from '../lifecycle/claude-structured-session-close'
export type ClaudeAcquisitionLaunch = ClaudeStructuredLaunch & {
savedOptions: Omit<ClaudeStructuredSpawnOptions, 'sdkOptions'>
@@ -34,7 +34,7 @@ import { resolveClaudeLaunchFlags } from './claude-structured-launch-flags'
import { withNativeChatVisualsEnv } from '../../../native-chat/conversation-files/native-chat-visuals-delivery'
import { claudeLaunchResumesTranscript } from './claude-structured-launch-home'
import type { StructuredAgentLaunchPartResolver } from '../../../runtime/agent-session/launch/structured-agent-launch-composition'
import { claudeSessionIdForOrcaSession } from '../claude-structured-session-id'
import { claudeSessionIdForOrcaSession } from '../lifecycle/claude-structured-session-id'
import {
pendingAgentSessionRewindFork,
type AgentSessionRewindFork
@@ -1,7 +1,7 @@
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 { claudeExecutionObservations } from '../turns/claude-structured-execution-observations'
import { dispatchClaudeTurn } from '../dispatch/claude-structured-dispatch'
import type { StructuredAgentSessionAdapter } from '../../../native-chat/agent-session-wire/providers/structured-agent-session-adapter'
import type { AgentSessionExecutionOptions } from '../../../../shared/agent-session/options/protocol/agent-session-execution-options'
import { AgentSessionOptionRejectedError } from '../../../native-chat/agent-session-wire/options/structured-agent-session-option-error'
@@ -12,7 +12,7 @@ import type { ClaudeSession } from '../claude-structured-session-state'
import type { StructuredAgentSessionAdapter } from '../../../native-chat/agent-session-wire/providers/structured-agent-session-adapter'
import { decodeStructuredAgentSessionOptionValue } from '../../../../shared/agent-session/options/selection/structured-agent-session-option-codec'
import { beginClaudeOptionMutation } from '../claude-structured-execution-observations'
import { beginClaudeOptionMutation } from '../turns/claude-structured-execution-observations'
import {
CLAUDE_APPLY_FLAG_SETTINGS_CONTROL,
CLAUDE_CACHED_FLAG_CHECK_BUDGET_MS
@@ -1,55 +1,8 @@
import { followTestSinkSnapshots } from '../../../native-chat/agent-session-wire/host/testing/structured-agent-session-direct-sink.test-fixture'
import { readTestJournalItems } from '../../../native-chat/agent-session-journal/journal-observation.test-support'
import { openTestAgentSessionDatabase } from '../../../runtime/agent-session/records/agent-session-record-store-test-harness'
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 { 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 '../journal/claude-structured-journal-translation'
import type { ClaudeStructuredSessionEvent } from '../claude-structured-session-state'
import { closeTestJournalHostDatabases } 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-fixture'
import { claudeProviderHandle } from '../../../../shared/agent-session/lifecycle/provider-handles/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')
}
let root = ''
function message(
role: 'assistant' | 'user',
uuid: string,
content: unknown[]
): ClaudeStructuredSessionEvent {
return {
type: 'message',
sessionId: 'orca-session',
message: {
type: role,
uuid,
session_id: 'provider-1',
message: { role, content }
}
}
}
beforeEach(async () => {
root = await mkdtemp(join(tmpdir(), 'orca-claude-provider-fallback-'))
})
afterEach(async () => {
await closeTestJournalHostDatabases()
await rm(root, { recursive: true, force: true })
})
import type { ClaudeStructuredSessionEvent } from '../lifecycle/claude-structured-session-event'
describe('Claude provider fallback', () => {
it('drops suppressed init frames instead of dereferencing a null translation', () => {
@@ -76,162 +29,4 @@ describe('Claude provider fallback', () => {
expect(() => translator.handle(initEvent)).not.toThrow()
expect(items).toEqual([])
})
it('journals the captured model fallback as a notice and continues the same turn', () => {
const items: AgentJournalItemBody[] = []
const translator = createClaudeJournalTranslator({
sink: {
appendItem: (_identity, body) => {
items.push(body)
},
appendTombstone: vi.fn(),
publish: vi.fn()
}
})
translator.handle(
message('assistant', 'fallback-1', [
{ type: 'fallback', from: { model: 'claude-opus-5-5' }, to: { model: 'claude-opus-4-8' } }
])
)
translator.handle(
message('assistant', 'answer-1', [{ type: 'text', text: 'Continuing the answer.' }])
)
translator.handle({
type: 'message',
sessionId: 'orca-session',
message: {
type: 'result',
subtype: 'success',
session_id: 'provider-1',
uuid: 'result-1',
result: 'Continuing the answer.'
}
})
const notices = items.filter((body) => body.kind === 'status')
expect(notices).toHaveLength(1)
expect(notices[0]).toMatchObject({
text: 'Claude switched models: Claude Opus 5.5 → Claude Opus 4.8.',
tone: 'notice',
presentation: 'turn-notice',
providerFrame: { provider: 'claude', kind: 'message:assistant:content:fallback' }
})
expect(items).toContainEqual(
expect.objectContaining({
kind: 'message',
role: 'assistant',
blocks: [{ type: 'text', text: 'Continuing the answer.' }]
})
)
expect(items).toContainEqual(expect.objectContaining({ kind: 'turn', state: 'completed' }))
})
it('keeps provider-fallback rows distinct across acquisitions', async () => {
const journal = await openAgentSessionJournal({
identity: IDENTITY,
database: await openTestAgentSessionDatabase(root),
now: () => 1_700_000_000_000,
mintEpoch: () => 'epoch-1'
})
const deferred = createDeferredStructuredAgentSessionEventSink(testEventSinkLogging())
await followTestSinkSnapshots(deferred, journal)
deferred.bind({
journal,
fence: 1,
publish: vi.fn()
})
const first = createClaudeJournalTranslator({ sink: deferred.sink, fallbackIdPrefix: '1' })
const second = createClaudeJournalTranslator({ sink: deferred.sink, fallbackIdPrefix: '2' })
first.handle(message('assistant', 'assistant-1', [{ type: 'future_event', message: 'first' }]))
await deferred.drained()
second.handle(
message('assistant', 'assistant-2', [{ type: 'future_event', message: 'second' }])
)
await deferred.drained()
const fallbackRows = (await readTestJournalItems(journal)).filter(
(item) =>
item.body.kind === 'status' &&
item.body.providerFrame?.kind === 'message:assistant:content:future_event'
)
expect(fallbackRows).toHaveLength(2)
expect(fallbackRows.map(statusText)).toEqual(['first', 'second'])
})
it.each([false, true])(
'keeps unknown quota result disclosure only for a stopped turn (stopped: %s)',
async (stopped) => {
const journal = await openAgentSessionJournal({
identity: IDENTITY,
database: await openTestAgentSessionDatabase(root),
now: () => 1_000
})
const deferred = createDeferredStructuredAgentSessionEventSink(testEventSinkLogging())
await followTestSinkSnapshots(deferred, journal)
deferred.bind({ journal, fence: 1, publish: () => {} })
const translator = createClaudeJournalTranslator({ sink: deferred.sink })
const quota = message('assistant', 'quota', [{ type: 'text', text: 'Usage exhausted' }])
if (quota.type !== 'message') {
throw new Error('expected provider message')
}
translator.handle({
...quota,
observedAt: 100,
message: { ...quota.message, api_error: 'usage_limit_reached' }
})
await deferred.drained()
if (stopped) {
await journal.appendStopEvent({ reason: 'user-stop', turnId: 'quota' }, 1)
}
translator.handle({
type: 'message',
sessionId: 'orca-session',
observedAt: 2_000,
message: {
type: 'result',
subtype: 'future_error',
is_error: true,
session_id: 'provider-1',
uuid: 'quota-result',
result: 'Usage exhausted',
terminal_reason: 'api_error'
}
})
await deferred.drained()
const items = await readTestJournalItems(journal)
const disclosure = items.filter(
(item) =>
item.body.kind === 'status' &&
item.body.providerFrame?.kind === 'message:result:future_error'
)
expect(disclosure).toHaveLength(stopped ? 1 : 0)
if (stopped) {
expect(disclosure[0]?.body).not.toHaveProperty('tone')
expect(disclosure[0]?.body).not.toHaveProperty('failure')
}
expect(items.find((item) => item.body.kind === 'turn')?.body).toMatchObject({
kind: 'turn',
state: stopped ? 'interrupted' : 'completed',
...(stopped ? {} : { outcome: 'failure' })
})
deferred.close()
await journal.close()
const reopened = await openAgentSessionJournal({
identity: IDENTITY,
database: await openTestAgentSessionDatabase(root)
})
expect(await readTestJournalItems(reopened)).toEqual(items)
await reopened.close()
}
)
})
function statusText(row: { body: AgentJournalItemBody }): string {
if (row.body.kind !== 'status') {
throw new Error('expected status row')
}
return row.body.text
}
@@ -1,4 +1,4 @@
import { AgentSessionAcquisitionRootExitObservedError } from '../../native-chat/agent-session-wire/acquisition/structured-agent-session-acquisition-errors'
import { AgentSessionAcquisitionRootExitObservedError } from '../../../native-chat/agent-session-wire/acquisition/structured-agent-session-acquisition-errors'
export function isKillDeliveredExitReceipt(
receipt: Error | undefined
@@ -3,14 +3,14 @@ import {
claudeCloseReport,
claudeAcquisitionCleanupError
} from './claude-structured-session-close'
import { AgentSessionAcquisitionExitUnprovenError } from '../../native-chat/agent-session-wire/acquisition/structured-agent-session-acquisition-errors'
import { AgentSessionAcquisitionExitUnprovenError } from '../../../native-chat/agent-session-wire/acquisition/structured-agent-session-acquisition-errors'
import type {
ClaudeAcquisitionRegistry,
ClaudeSession,
ClaudeSessionExit,
ClaudeStructuredSessionAdapterDeps
} from './claude-structured-session-state'
import type { ProviderProcessCloseOptions } from '../../provider-process/provider-process-close'
} from '../claude-structured-session-state'
import type { ProviderProcessCloseOptions } from '../../../provider-process/provider-process-close'
export type ClaudeReleaseRequest = { sessionId: string; closeOptions?: ProviderProcessCloseOptions }
@@ -1,12 +1,12 @@
import { ClaudePluginInputError } from '../sdk-transport/claude-plugin-ui'
import { claudePromptCardWritten } from '../child-work/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,
ClaudeSession,
ClaudeStructuredSessionAdapterDeps,
ClaudeStructuredSessionEvent
} from './claude-structured-session-state'
ClaudeStructuredSessionAdapterDeps
} from '../claude-structured-session-state'
import type { ClaudeStructuredSessionEvent } from './claude-structured-session-event'
type ClaudeEventDelivery = {
session: ClaudeSession | null
@@ -6,12 +6,12 @@ import {
type AgentSessionMcpResult,
type AgentSessionMcpServer,
type AgentSessionMcpSignIn
} from '../../../shared/agent-session/options/protocol/agent-session-mcp'
} from '../../../../shared/agent-session/options/protocol/agent-session-mcp'
import {
isClaudeQueryClosed,
type ClaudeMcpControls
} from '../sdk-transport/claude-agent-sdk-control-requests'
import type { ClaudeSession } from './claude-structured-session-state'
} from '../../sdk-transport/claude-agent-sdk-control-requests'
import type { ClaudeSession } from '../claude-structured-session-state'
// The CLI refuses OAuth for stdio and sdk servers.
const SIGN_IN_TRANSPORTS = new Set(['http', 'sse', 'claudeai-proxy'])
@@ -1,8 +1,8 @@
import type { AgentSessionJournalIdentity } from '../../../shared/agent-session/journal/agent-session-journal-identity'
import type { AgentSessionProviderHandleLink } from '../../../shared/agent-session/lifecycle/provider-handles/agent-session-provider-handle'
import { claudeProviderHandle } from '../../../shared/agent-session/lifecycle/provider-handles/agent-session-provider-handle-encoding'
import type { AgentSessionProcessIdentity } from '../../../shared/agent-session/lifecycle/agent-session-record'
import { readProcessStartTimeMs } from '../../runtime/agent-session/ownership/agent-session-process-identity-probe'
import type { AgentSessionJournalIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity'
import type { AgentSessionProviderHandleLink } from '../../../../shared/agent-session/lifecycle/provider-handles/agent-session-provider-handle'
import { claudeProviderHandle } from '../../../../shared/agent-session/lifecycle/provider-handles/agent-session-provider-handle-encoding'
import type { AgentSessionProcessIdentity } from '../../../../shared/agent-session/lifecycle/agent-session-record'
import { readProcessStartTimeMs } from '../../../runtime/agent-session/ownership/agent-session-process-identity-probe'
export function claudeProviderHandleLink(input: {
sessionId: string
@@ -1,10 +1,10 @@
import { claudeFocusedPlugin, ClaudePluginInputError } from '../sdk-transport/claude-plugin-ui'
import { claudeFocusedPlugin, ClaudePluginInputError } from '../../sdk-transport/claude-plugin-ui'
import type {
ClaudeAcquisitionAttempt,
ClaudeAcquireCallbacks,
ClaudeSession,
ClaudeSessionExit
} from './claude-structured-session-state'
} from '../claude-structured-session-state'
export function claudePluginUiRecovery(
{
@@ -1,33 +1,33 @@
import type { AgentSessionAcquisition } from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter'
import { openClaudeStreamJsonConnection } from '../claude-stream-json-connection'
import { claudeLaunchPermissions } from './claude-structured-inbound-control'
import * as replay 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 './launch/claude-config-dir-pin'
import type { AgentSessionAcquisition } from '../../../native-chat/agent-session-wire/providers/structured-agent-session-adapter'
import { openClaudeStreamJsonConnection } from '../../claude-stream-json-connection'
import { claudeLaunchPermissions } from '../permissions/claude-structured-inbound-control'
import * as replay 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 '../startup/claude-structured-init-proof'
import { claudeConfigDirEnvPatch } from '../launch/claude-config-dir-pin'
import { claudeProcessIdentity } from './claude-structured-owner-identity'
import { ClaudePromptRegistry } from './permissions/claude-prompt-registry'
import { adoptClaudeStructuredSpawnOptions } from './launch/claude-structured-spawn-options'
import { observeClaudeExecutionModel } from './claude-structured-execution-observations'
import { observeClaudeFastModeFacts } from './launch/claude-structured-session-options'
import { ClaudePromptRegistry } from '../permissions/claude-prompt-registry'
import { adoptClaudeStructuredSpawnOptions } from '../launch/claude-structured-spawn-options'
import { observeClaudeExecutionModel } from '../turns/claude-structured-execution-observations'
import { observeClaudeFastModeFacts } from '../launch/claude-structured-session-options'
import {
createClaudeSessionPublication,
reportClaudeOptions,
publishClaudeSessionAttempt
} from './claude-structured-session-publication'
import type * as sessionState from './claude-structured-session-state'
} from '../startup/claude-structured-session-publication'
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 '../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 './turns/claude-turn-opening'
import { createClaudeStartupOutcome, endsClaudeStartup } from './claude-structured-startup-outcome'
import { claudeStartupResultError } from '../sdk-transport/claude-stream-json-exit-error'
import * as startupExit from '../startup/claude-structured-session-startup-exit'
import { readClaudeTranscriptEntryUuid } from '../../transcripts/claude-transcript-entry-uuid'
import { claudeTurnResumePointWriter } from '../turns/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 '../turns/claude-turn-opening'
import * as outcome from '../startup/claude-structured-startup-outcome'
import { claudeStartupResultError } from '../../sdk-transport/claude-stream-json-exit-error'
import * as ui from './claude-structured-plugin-ui-recovery'
export async function acquireClaudeSession({
@@ -54,11 +54,13 @@ export async function acquireClaudeSession({
let childEnded: Error | null = null
const initProof = proof.createClaudeInitProof()
// Owned by this acquisition alone, so a late frame cannot fail a replacement's open.
const startup = createClaudeStartupOutcome()
const startup = outcome.createClaudeStartupOutcome()
const childFailed = (error: Error, ended?: Promise<unknown>): void => {
liveSession?.historyCatchUp?.abort()
childEnded ??= error
void (ended ? ended.then(startup.fail) : endsClaudeStartup(error) && startup.fail(error))
void (ended
? ended.then(startup.fail)
: outcome.endsClaudeStartup(error) && startup.fail(error))
initProof.reject(error)
}
const delivery = { attempt, initProof, callbacks, sessionId, sessions }
@@ -213,7 +215,7 @@ export async function acquireClaudeSession({
callbacks.finishClose(sessionId, attempt)
return
}
childFailed(...claudeStartupExit(error, attempt.connection, input.events))
childFailed(...startupExit.claudeStartupExit(error, attempt.connection, input.events))
if (exits.get(sessionId)?.connection === attempt.connection) {
callbacks.finishClose(sessionId, attempt)
} else {
@@ -295,7 +297,7 @@ export async function acquireClaudeSession({
attempt.delivery.dispose()
unbindReadingControl?.()
throw await resolveClaudeAcquisitionError({
error: await claudeStartupError(error, attempt.connection),
error: await startupExit.claudeStartupError(error, attempt.connection),
sessionId,
sessions,
attempt,
@@ -3,25 +3,25 @@ import {
type ClaudeAcquisitionRegistry,
type ClaudeSession,
type ClaudeSessionExit,
type ClaudeStructuredSessionEvent,
cancelClaudeAcquisitionAttempt
} from './claude-structured-session-state'
} from '../claude-structured-session-state'
import type { ClaudeStructuredSessionEvent } from './claude-structured-session-event'
import {
AgentSessionAcquisitionExitProvenError,
AgentSessionAcquisitionExitUnprovenError,
AgentSessionAcquisitionRootExitObservedError
} 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 './journal/claude-journal-translator-contract'
import type { ClaudePromptRegistry } from './permissions/claude-prompt-registry'
} 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 '../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 './turns/claude-command-lifecycle'
import { settledClaudeTurnEndLeaf } from './claude-structured-resume-point'
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'
import { retireClaudeDispatchWaiters } from '../dispatch/claude-structured-dispatch'
import { claudeHeldSends } from '../turns/claude-command-lifecycle'
import { settledClaudeTurnEndLeaf } from '../turns/claude-structured-resume-point'
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'
/** Root exit releases the lease even with unverified descendants; a failed spawn proves no exit. */
export function claudeRootExitObserved(
@@ -1,7 +1,7 @@
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 './permissions/claude-prompt-registry'
import type { ClaudeStartedSend } from './claude-structured-session-state'
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 '../permissions/claude-prompt-registry'
import type { ClaudeStartedSend } from '../claude-structured-session-state'
export type ClaudeAuthDiagnostic = {
apiKeySourceConfigured: boolean
@@ -1,41 +1,41 @@
import type { ClaudeStreamJsonConnection } from '../claude-stream-json-connection'
import { withTimeout } from '../../../shared/concurrency/promise-timeout-fallback'
import type { ClaudeStreamJsonConnection } from '../../claude-stream-json-connection'
import { withTimeout } from '../../../../shared/concurrency/promise-timeout-fallback'
import {
agentSessionFailureFact,
providerDiagnosticOf
} from '../../../shared/agent-session/failures/agent-session-failure'
} from '../../../../shared/agent-session/failures/agent-session-failure'
import {
providerExitObserved,
providerStartupFailureFact,
startupAcquisitionRefusal
} from '../../native-chat/agent-session-wire/startup/structured-agent-session-failure-text'
import { providerSpawnAbsent } from '../../provider-process/provider-executable-missing'
import { providerOutcomeLost } from '../../provider-process/provider-process-exit-status'
} from '../../../native-chat/agent-session-wire/startup/structured-agent-session-failure-text'
import { providerSpawnAbsent } from '../../../provider-process/provider-executable-missing'
import { providerOutcomeLost } from '../../../provider-process/provider-process-exit-status'
import {
claudeSessionHasTurnWork,
settledClaudeTurnEndLeaf
} from './claude-structured-resume-point'
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'
} from '../turns/claude-structured-resume-point'
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 '../startup/claude-structured-start-ending'
import {
closeClaudePublishedSessionForDeps,
claudeCloseReport,
settleClaudeExitedSession
} from './claude-structured-session-close'
import { retireClaudeDispatchWaiters } from './claude-structured-dispatch'
import { retireClaudeDispatchWaiters } from '../dispatch/claude-structured-dispatch'
import {
AgentSessionAcquisitionExitUnprovenError,
AgentSessionAcquisitionRootExitObservedError
} from '../../native-chat/agent-session-wire/acquisition/structured-agent-session-acquisition-errors'
} from '../../../native-chat/agent-session-wire/acquisition/structured-agent-session-acquisition-errors'
import type {
ClaudeAcquisitionAttempt,
ClaudeSession,
ClaudeSessionExit,
ClaudeStructuredSessionAdapterDeps,
ClaudeStructuredSessionEvent
} from './claude-structured-session-state'
ClaudeStructuredSessionAdapterDeps
} from '../claude-structured-session-state'
import type { ClaudeStructuredSessionEvent } from './claude-structured-session-event'
export type ClaudeExitLifecycle = {
sessions: Map<string, ClaudeSession>
@@ -1,9 +1,9 @@
import { StringDecoder } from 'node:string_decoder'
import { isRootClaudeFrame } from './turns/claude-turn-opening'
import { isRootClaudeFrame } from '../turns/claude-turn-opening'
import {
readClaudeFrameString,
readClaudeReportedPermissionMode
} from './claude-structured-init-proof'
} from '../startup/claude-structured-init-proof'
export type ClaudeFullAccessPolicy = {
/** Each raw stdout chunk, no later than the SDK reads it. */
@@ -1,6 +1,6 @@
import { describe, expect, it, vi } from 'vitest'
import type { CanUseTool } from '@anthropic-ai/claude-agent-sdk'
import { ClaudePromptRegistry } from './permissions/claude-prompt-registry'
import { ClaudePromptRegistry } from './claude-prompt-registry'
import { buildClaudePermissionCallbacks } from './claude-structured-inbound-control'
type CanUseToolOptions = Parameters<CanUseTool>[2]
@@ -1,14 +1,14 @@
import type { CanUseTool, OnUserDialog, PermissionResult } from '@anthropic-ai/claude-agent-sdk'
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'
import { claudeLaunchSkipsPermissions } from './launch/claude-structured-spawn-options'
import type { ClaudePromptRegistry } from './claude-prompt-registry'
import type { ClaudeStructuredSessionEvent } from '../lifecycle/claude-structured-session-event'
import type { ClaudeStreamJsonConnectionHandlers } from '../../claude-stream-json-connection'
import type { ClaudeStructuredLaunch } from '../launch/claude-structured-launch-resolution'
import { claudeLaunchSkipsPermissions } from '../launch/claude-structured-spawn-options'
import { createClaudeFullAccessPolicy } from './claude-full-access-policy'
import {
claudePermissionPresentation,
claudePermissionSubject
} from './permissions/claude-permission-presentation'
} from './claude-permission-presentation'
export type ClaudePermissionCallbackDeps = {
sessionId: string
@@ -1,7 +1,8 @@
import type { AgentSessionAccountKind } from '../../../shared/agent-session/failures/agent-session-availability'
import { CLAUDE_DEFAULT_SETTING_SOURCES } from './launch/claude-structured-launch-resolution'
import type { ClaudeAuthDiagnostic, ClaudeSession } from './claude-structured-session-state'
import { AgentSessionAcquisitionRefusal } from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter-errors'
import type { AgentSessionAccountKind } from '../../../../shared/agent-session/failures/agent-session-availability'
import { CLAUDE_DEFAULT_SETTING_SOURCES } from '../launch/claude-structured-launch-resolution'
import type { ClaudeSession } from '../claude-structured-session-state'
import type { ClaudeAuthDiagnostic } from '../lifecycle/claude-structured-session-event'
import { AgentSessionAcquisitionRefusal } from '../../../native-chat/agent-session-wire/providers/structured-agent-session-adapter-errors'
export type ClaudeInitObservation = {
providerSessionId: string
@@ -1,18 +1,18 @@
import { withStructuredHistoryInvocation } from '../../native-chat/agent-session-wire/acquisition/structured-agent-session-history-invocation'
import { usableJournalHistoryOrigin } from '../../native-chat/agent-session-journal/context-epochs/journal-history-origin'
import { withStructuredHistoryInvocation } from '../../../native-chat/agent-session-wire/acquisition/structured-agent-session-history-invocation'
import { usableJournalHistoryOrigin } from '../../../native-chat/agent-session-journal/context-epochs/journal-history-origin'
import type {
StructuredAgentSessionProviderOpenInput,
StructuredAgentSessionProviderOpenResult
} from '../../native-chat/agent-session-wire/startup/structured-agent-session-provider-open-contract'
import { waitForPromiseWithSignal } from '../../../shared/concurrency/abort-signal-reason'
import { readClaudeStructuredSessionSettings } from './launch/claude-structured-session-acquisition-options'
} from '../../../native-chat/agent-session-wire/startup/structured-agent-session-provider-open-contract'
import { waitForPromiseWithSignal } from '../../../../shared/concurrency/abort-signal-reason'
import { readClaudeStructuredSessionSettings } from '../launch/claude-structured-session-acquisition-options'
import { openClaudeSession, readClaudeStartupFacts } from './claude-structured-session-startup'
import { catchUpClaudeTranscript } from '../transcripts/claude-transcript-catch-up'
import { catchUpClaudeTranscript } from '../../transcripts/claude-transcript-catch-up'
import type {
ClaudeSession,
ClaudeStructuredSessionAdapterDeps,
ClaudeStructuredSessionEvent
} from './claude-structured-session-state'
ClaudeStructuredSessionAdapterDeps
} from '../claude-structured-session-state'
import type { ClaudeStructuredSessionEvent } from '../lifecycle/claude-structured-session-event'
type ClaudeOpenInput = {
request: StructuredAgentSessionProviderOpenInput
@@ -1,29 +1,29 @@
import { withAgentSessionCreatePhase } from '../../observability/agent-session-instrumentation'
import { agentSessionAccountHome } from '../../../shared/agent-session/lifecycle/accounts/agent-session-account-home'
import { CLAUDE_STRUCTURED_AGENT } from './claude-structured-agent-definition'
import { withAgentSessionCreatePhase } from '../../../observability/agent-session-instrumentation'
import { agentSessionAccountHome } from '../../../../shared/agent-session/lifecycle/accounts/agent-session-account-home'
import { CLAUDE_STRUCTURED_AGENT } from '../claude-structured-agent-definition'
import { randomUUID } from 'node:crypto'
import { refreshClaudeStructuredSessionOptions } from './launch/claude-structured-session-options'
import { refreshClaudeStructuredSessionOptions } from '../launch/claude-structured-session-options'
import type {
AgentSessionAcquisition,
StructuredAgentSessionAcquireInput
} from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter'
import { claudeProviderHandleLink } from './claude-structured-owner-identity'
import type { ClaudePromptRegistry } from './permissions/claude-prompt-registry'
import type { ClaudeJournalTranslator } from './journal/claude-journal-translator-contract'
} from '../../../native-chat/agent-session-wire/providers/structured-agent-session-adapter'
import { claudeProviderHandleLink } from '../lifecycle/claude-structured-owner-identity'
import type { ClaudePromptRegistry } from '../permissions/claude-prompt-registry'
import type { ClaudeJournalTranslator } from '../journal/claude-journal-translator-contract'
import type {
ClaudeSession,
ClaudeSessionExit,
ClaudeAcquisitionAttempt,
ClaudeAcquireCallbacks,
ClaudeStructuredSessionEvent,
ClaudeStructuredSessionAdapterDeps
} from './claude-structured-session-state'
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 '../conversation-naming/claude-naming-generation'
} from '../claude-structured-session-state'
import type { ClaudeStructuredSessionEvent } from '../lifecycle/claude-structured-session-event'
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 '../../conversation-naming/claude-naming-generation'
import { readClaudeStartupFacts } from './claude-structured-session-startup'
function claudeSessionInitialization(input: {
@@ -1,14 +1,14 @@
import { isClaudeQueryClosed } from '../sdk-transport/claude-agent-sdk-control-requests'
import { withTimeout } from '../../../shared/concurrency/promise-timeout-fallback'
import { isClaudeQueryClosed } from '../../sdk-transport/claude-agent-sdk-control-requests'
import { withTimeout } from '../../../../shared/concurrency/promise-timeout-fallback'
import {
providerExitObserved,
startupAcquisitionRefusal,
withObservedProviderExit
} 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 '../sdk-transport/claude-startup-failure'
import type { AgentSessionStartFailure } from '../../native-chat/agent-session-wire/startup/structured-agent-session-start-failure'
} 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 '../../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
* against the exit; a query closed by that exit is no answer. */
@@ -6,12 +6,11 @@ import {
claudeFrame,
identityFor,
recordingJournalSink,
USER_MESSAGE,
PROVIDER_SESSION_ID
} from './claude-structured-session-test-support'
import { claudeOpened } from './claude-structured-startup-settled-test-support'
import type { ClaudeStructuredSessionEvent } from './claude-structured-session-state'
import type { ClaudeStructuredLaunch } from './launch/claude-structured-launch-resolution'
} from '../claude-structured-session-test-support'
import type { ClaudeStructuredSessionEvent } from '../lifecycle/claude-structured-session-event'
import type { ClaudeStructuredLaunch } from '../launch/claude-structured-launch-resolution'
const owned: {
claude: ReturnType<typeof fakeClaude>
@@ -22,7 +21,7 @@ const owned: {
const ACQUIRE = { identity: identityFor(), fence: 7, spawnToken: 'spawn-9' }
const fixture = (name: string): Record<string, unknown>[] =>
readFileSync(new URL(`../__fixtures__/${name}.jsonl`, import.meta.url), 'utf8')
readFileSync(new URL(`../../__fixtures__/${name}.jsonl`, import.meta.url), 'utf8')
.trim()
.split('\n')
.map((line) => JSON.parse(line))
@@ -86,51 +85,4 @@ describe('Claude host-awaited open', () => {
})
// SDK-typed shape; ordering constructed
it('returns from open without waiting for optional settings', async () => {
let answerSettings: (value: unknown) => void = () => {}
const settings = new Promise<unknown>((resolve) => {
answerSettings = resolve
})
const claude = fakeClaude({ settings })
const { adapter, events } = adapterFor(claude)
try {
await adapter.acquire(ACQUIRE)
const opened = await claudeOpened(adapter, 'session-1')
expect(opened.reportedOptions).toBeDefined()
expect(claude.connections[0].calls.map((call) => call.subtype)).toContain('get_settings')
expect(events.some((event) => event.type === 'options-reported')).toBe(false)
answerSettings({ applied: { model: 'claude-haiku-4-5' }, effective: {} })
await vi.waitFor(() =>
expect(events.find((event) => event.type === 'options-reported')).toMatchObject({
reportedOptions: { model: 'claude-haiku-4-5' }
})
)
await adapter.closeAll()
} finally {
answerSettings({})
}
})
it('opens a healthy Claude session whose initialize takes longer than a minute', async () => {
const claude = fakeClaude({ initDelayMs: 75_000 })
const { adapter } = adapterFor(claude)
await adapter.acquire(ACQUIRE)
const opened = expect(claudeOpened(adapter, 'session-1')).resolves.toMatchObject({
reportedOptions: expect.any(Object)
})
await vi.advanceTimersByTimeAsync(75_000)
await opened
await expect(
adapter.dispatch({
sessionId: 'session-1',
fence: 7,
clientMessageId: 'slow-start',
body: USER_MESSAGE
})
).resolves.toMatchObject({ state: 'admitted' })
expect(claude.connections[0].sent).toMatchObject([
{ message: { content: [{ type: 'text', text: 'ship it' }] } }
])
})
})
@@ -1,15 +1,15 @@
import { isClaudeQueryClosed } from '../sdk-transport/claude-agent-sdk-control-requests'
import { claudeStartFailure } from '../sdk-transport/claude-startup-failure'
import { isClaudeQueryClosed } from '../../sdk-transport/claude-agent-sdk-control-requests'
import { claudeStartFailure } from '../../sdk-transport/claude-startup-failure'
import {
startupAcquisitionRefusal,
providerExitObserved
} from '../../native-chat/agent-session-wire/startup/structured-agent-session-failure-text'
} from '../../../native-chat/agent-session-wire/startup/structured-agent-session-failure-text'
// Initialize gates host open after process publication; settings enrichment runs independently.
import type { AgentSessionAccountKind } from '../../../shared/agent-session/failures/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 '../command-catalog/claude-slash-command-catalog'
import type { AgentSessionAccountKind } from '../../../../shared/agent-session/failures/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 '../../command-catalog/claude-slash-command-catalog'
import {
claudeAuthDiagnostic,
claudeInitializationAuthError,
@@ -22,24 +22,24 @@ import {
import {
claudeStructuredSessionPublicationOptions,
prepareClaudeStructuredSessionAcquisitionOptions
} from './launch/claude-structured-session-acquisition-options'
} from '../launch/claude-structured-session-acquisition-options'
import {
claudeStructuredSessionOptionsFrom,
observeClaudeSettingsApplied,
readClaudeSettingsApplied,
readClaudeFastModeFacts,
observeClaudeSettingsEffort
} from './launch/claude-structured-session-options'
import { claudeExecutionObservations } from './claude-structured-execution-observations'
} from '../launch/claude-structured-session-options'
import { claudeExecutionObservations } from '../turns/claude-structured-execution-observations'
import {
claudeExitForReport,
claudeStartupAnswerAfterExit
} from './claude-structured-session-startup-exit'
import type { ClaudeSession } from '../claude-structured-session-state'
import type {
ClaudeAuthDiagnostic,
ClaudeSession,
ClaudeStructuredSessionEvent
} from './claude-structured-session-state'
} from '../lifecycle/claude-structured-session-event'
export type ClaudeOpenFacts = Pick<StructuredAgentSessionProviderOpenResult, 'reportedOptions'>
@@ -1,16 +1,16 @@
import { waitForPromiseWithSignal } from '../../../shared/concurrency/abort-signal-reason'
import { withObservedProviderExit } from '../../native-chat/agent-session-wire/startup/structured-agent-session-failure-text'
import { waitForPromiseWithSignal } from '../../../../shared/concurrency/abort-signal-reason'
import { withObservedProviderExit } from '../../../native-chat/agent-session-wire/startup/structured-agent-session-failure-text'
import type {
AgentSessionStartEndings,
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'
import type {
StructuredAgentSessionProviderOpenInput,
StructuredAgentSessionProviderOpenResult
} from '../../native-chat/agent-session-wire/startup/structured-agent-session-provider-open-contract'
} from '../../../native-chat/agent-session-wire/startup/structured-agent-session-provider-open-contract'
import { openClaudeStructuredSession } from './claude-structured-session-open'
import { claudeStartFailure } from '../sdk-transport/claude-startup-failure'
import type { ClaudeSession, ClaudeSessionExit } from './claude-structured-session-state'
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
* missed. A failed acquire has no start owner left, so it retires exactly that admission. */
@@ -1,7 +1,7 @@
import {
providerExitObserved,
startupAcquisitionRefusal
} from '../../native-chat/agent-session-wire/startup/structured-agent-session-failure-text'
} from '../../../native-chat/agent-session-wire/startup/structured-agent-session-failure-text'
/** One acquisition's startup: its first ending cause is the one its open rejects with. */
export type ClaudeStartupOutcome = {
@@ -1,5 +1,5 @@
import type { StructuredAgentSessionProviderOpenResult } from '../../native-chat/agent-session-wire/startup/structured-agent-session-provider-open-contract'
import type { ClaudeStructuredSessionAdapter } from './claude-structured-session-adapter'
import type { StructuredAgentSessionProviderOpenResult } from '../../../native-chat/agent-session-wire/startup/structured-agent-session-provider-open-contract'
import type { ClaudeStructuredSessionAdapter } from '../claude-structured-session-adapter'
const opened = new WeakMap<
ClaudeStructuredSessionAdapter,
@@ -14,7 +14,7 @@ import {
PROVIDER_SESSION_ID,
type FakeConnection
} from '../claude-structured-session-test-support'
import { claudeStartupSettled } from '../claude-structured-startup-settled-test-support'
import { claudeStartupSettled } from '../startup/claude-structured-startup-settled-test-support'
type CapturedEvent =
| { kind: 'meta'; providerSessionId: string }
@@ -11,8 +11,8 @@ import {
import {
rejectClaudeDispatchWaiters,
releaseClaudeDispatchWaitersInDoubt
} from '../claude-structured-dispatch'
import { readClaudeFrameString } from '../claude-structured-init-proof'
} from '../dispatch/claude-structured-dispatch'
import { readClaudeFrameString } from '../startup/claude-structured-init-proof'
import type { ClaudeLateDispatchSettlement } from './claude-replay-turn-resolution'
import type { ClaudeSession, ClaudeStartedSend } from '../claude-structured-session-state'
@@ -3,7 +3,7 @@ import {
releaseClaudeDispatchesUnansweredAtIdle
} from './claude-command-lifecycle'
import { claudeSessionStateEndsTurn } from './claude-session-state-turn-over'
import { forgetRetiredWaiter } from '../claude-structured-dispatch-waiters'
import { forgetRetiredWaiter } from '../dispatch/claude-structured-dispatch-waiters'
import {
claudeHasReplayContent,
readClaudeMessageEnvelope
@@ -13,8 +13,8 @@ import type {
ClaudeLateDispatchOutcome,
ClaudeSession
} from '../claude-structured-session-state'
import { readClaudeFrameString } from '../claude-structured-init-proof'
import { claudeDispatchContentKey } from '../claude-structured-dispatch-content'
import { readClaudeFrameString } from '../startup/claude-structured-init-proof'
import { claudeDispatchContentKey } from '../dispatch/claude-structured-dispatch-content'
/** Settle provider-proven delivery independently of replay-row acceptance reconciliation. */
export type ClaudeLateDispatchSettlement = (input: ClaudeLateDispatchOutcome) => void
@@ -1,11 +1,11 @@
import { randomUUID } from 'node:crypto'
import { agentSessionCompactCommandText } from '../../../shared/agent-session/conversation-context/agent-session-conversation-command'
import { agentSessionCompactCommandText } from '../../../../shared/agent-session/conversation-context/agent-session-conversation-command'
import type {
AgentSessionCommandAdmission,
StructuredAgentSessionCommandRun
} from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter'
import { dispatchClaudeTurn } from './claude-structured-dispatch'
import type { ClaudeSession } from './claude-structured-session-state'
} from '../../../native-chat/agent-session-wire/providers/structured-agent-session-adapter'
import { dispatchClaudeTurn } from '../dispatch/claude-structured-dispatch'
import type { ClaudeSession } from '../claude-structured-session-state'
/** Open the command turn before sending; its result settles the waiter and closes that turn. */
export async function dispatchClaudeCommand(
@@ -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 './permissions/claude-prompt-registry'
import type { AgentChildWorkStopAcknowledgement } from '../../../../shared/agent-status/child-work/agent-child-work-stop-targets'
import type { ClaudePromptClaim } from '../permissions/claude-prompt-registry'
import {
ClaudeControlRequestError,
ClaudeControlRequestTimeoutError
} from '../sdk-transport/claude-agent-sdk-control-requests'
import { settleCancelledClaudeDispatchWaiters } from './claude-structured-dispatch'
import type { ClaudeLateDispatchSettlement } from './turns/claude-replay-turn-resolution'
import type { ClaudeSession } from './claude-structured-session-state'
import { CLAUDE_STOP_GRACE_MS } from './turns/claude-request-end-wait'
} from '../../sdk-transport/claude-agent-sdk-control-requests'
import { settleCancelledClaudeDispatchWaiters } from '../dispatch/claude-structured-dispatch'
import type { ClaudeLateDispatchSettlement } from './claude-replay-turn-resolution'
import type { ClaudeSession } from '../claude-structured-session-state'
import { CLAUDE_STOP_GRACE_MS } from './claude-request-end-wait'
const INTERRUPT_CANCEL_QUEUED_CAPABILITY = 'interrupt_cancel_queued_v1'
@@ -1,5 +1,5 @@
import { claudeObservedEffort } from './launch/claude-structured-session-options'
import type { ClaudeSession } from './claude-structured-session-state'
import { claudeObservedEffort } from '../launch/claude-structured-session-options'
import type { ClaudeSession } from '../claude-structured-session-state'
/** Fast routing reports precede this input and cannot vouch for its execution. */
export function claudeExecutionObservations(session: ClaudeSession): Record<string, string> {
@@ -1,9 +1,9 @@
import type {
ClaudeSession,
ClaudeStructuredSessionAdapterDeps
} from './claude-structured-session-state'
import { settleClaudeTurnEndWaiters } from './turns/claude-request-end-wait'
import { isRootClaudeFrame } from './turns/claude-turn-opening'
} from '../claude-structured-session-state'
import { settleClaudeTurnEndWaiters } from './claude-request-end-wait'
import { isRootClaudeFrame } from './claude-turn-opening'
export function claudeTurnResumePointWriter(
sessionId: string,
@@ -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 '../launch/claude-structured-provider-fallback'
import type { ClaudeStructuredSessionEvent } from '../claude-structured-session-event'
import type { ClaudeStructuredSessionEvent } from '../lifecycle/claude-structured-session-event'
import type { ClaudeOpenTurn } from './claude-open-turn'
import { claudeStreamTurnSource, isRootClaudeFrame } from './claude-turn-opening'
@@ -1,22 +0,0 @@
import type * as WorkerThreads from 'node:worker_threads'
import type { WorkerOptions } from 'node:worker_threads'
import { vi } from 'vitest'
vi.mock('node:worker_threads', async (importOriginal) => {
const actual = await importOriginal<typeof WorkerThreads>()
return {
...actual,
Worker: class extends actual.Worker {
constructor(filename: string | URL, options?: WorkerOptions) {
super(filename, {
...options,
execArgv: [
...(options?.execArgv ?? []),
'--import',
new URL('./claude-conversation-worker.test-loader.mjs', import.meta.url).href
]
})
}
}
}
})
@@ -1,41 +0,0 @@
import { readFileSync } from 'node:fs'
import { registerHooks } from 'node:module'
import { dirname, extname } from 'node:path'
import { fileURLToPath } from 'node:url'
import { transformSync } from 'esbuild'
// Exercise the unbuilt worker and its production dependencies in Node.
registerHooks({
resolve(specifier, context, nextResolve) {
try {
return nextResolve(specifier, context)
} catch (error) {
if (
(error.code === 'ERR_MODULE_NOT_FOUND' || error.code === 'ERR_UNSUPPORTED_DIR_IMPORT') &&
specifier.startsWith('.') &&
!extname(specifier)
) {
return nextResolve(`${specifier}.ts`, context)
}
throw error
}
},
load(url, context, nextLoad) {
if (url.endsWith('.ts')) {
return {
format: 'module',
shortCircuit: true,
source: transformSync(readFileSync(new URL(url), 'utf8'), {
loader: 'ts',
format: 'esm',
target: 'esnext',
define: {
__filename: JSON.stringify(fileURLToPath(url)),
__dirname: JSON.stringify(dirname(fileURLToPath(url)))
}
}).code
}
}
return nextLoad(url, context)
}
})
@@ -10,7 +10,7 @@ import { getClaudeProfileRouter } from '../../claude-accounts/profiles/routing/c
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-streaming/transcript-stream-lines'
import { claudeSessionIdForRewind } from '../structured/claude-structured-session-id'
import { claudeSessionIdForRewind } from '../structured/lifecycle/claude-structured-session-id'
import { materializeClaudeRewindTranscript } from './claude-rewind-transcript'
type TranscriptUserRow = {
@@ -1,266 +0,0 @@
import { readTestJournalItems } from '../../native-chat/agent-session-journal/journal-observation.test-support'
// Shared real disk/journal fixture for catch-up and historical-duration contracts.
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/provider-handles/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-fixture'
import { createClaudeJournalTranslator } from '../structured/journal/claude-structured-journal-translation'
import { catchUpClaudeTranscript } from './claude-transcript-catch-up'
import { StructuredAgentSessionSnapshotRoutes } from '../../native-chat/agent-session-wire/host/structured-agent-session-snapshot-routes'
export const SESSION = 'session-claude-catch-up'
export const SID = '402eff2b-84dc-4e05-8fe8-49fffb2cd3c3'
/** One content block of a saved assistant row. */
type ClaudeContentPart = { type: string } & Record<string, unknown>
export const at = (n: number) => new Date(Date.UTC(2026, 9, 21, 12, 0, n)).toISOString()
export const prompt = (uuid: string, parentUuid: string | null, text: string, n: number) => ({
type: 'user',
uuid,
parentUuid,
isSidechain: false,
sessionId: SID,
promptSource: 'cli',
timestamp: at(n),
message: { role: 'user', content: text }
})
export const reply = (
uuid: string,
parentUuid: string,
messageId: string,
part: ClaudeContentPart,
n: number
) => ({
type: 'assistant',
uuid,
parentUuid,
isSidechain: false,
sessionId: SID,
apiBlockIndex: 0,
timestamp: at(n),
message: { id: messageId, role: 'assistant', content: [part] }
})
export const attachment = (uuid: string, parentUuid: string) => ({
type: 'attachment',
uuid,
parentUuid,
isSidechain: false,
sessionId: SID,
attachment: { type: 'total_tokens_reminder' }
})
export const bookkeeping = [
{ type: 'last-prompt', leafUuid: 'x', sessionId: SID },
{ type: 'cost-state' }
]
/** The chat's own turn as Claude saves it; its reply is the streamed `msg_a`. */
export const chatTurn = [
prompt('p1', null, 'ask 1', 1),
attachment('t1', 'p1'),
reply('a1', 't1', 'msg_a', { type: 'text', text: 'answer 1' }, 2),
...bookkeeping
]
/** A terminal turn on the same conversation: a prompt, a tool call and its result, then a reply. */
export const outsideTurn = [
{ type: 'queue-operation', operation: 'enqueue', sessionId: SID },
prompt('p2', 'a1', 'ask 2', 3),
attachment('t2', 'p2'),
reply('a2', 't2', 'msg_b', { type: 'tool_use', id: 'toolu_1', name: 'Read', input: {} }, 4),
{
type: 'user',
uuid: 'r2',
parentUuid: 'a2',
isSidechain: false,
sessionId: SID,
timestamp: at(5),
message: {
role: 'user',
content: [{ type: 'tool_result', tool_use_id: 'toolu_1', content: 'hello' }]
}
},
reply('a3', 'r2', 'msg_c', { type: 'text', text: 'answer 2' }, 6),
...bookkeeping
]
const journals = createTrackedJournalOpener()
const cleanups: (() => Promise<void>)[] = []
afterEach(async () => {
vi.restoreAllMocks()
for (const cleanup of cleanups.splice(0)) {
await cleanup()
}
})
export async function chat(project = '-work', cwd = '/work') {
const root = await mkdtemp(join(tmpdir(), 'orca-claude-catch-up-'))
const projects = join(root, 'claude-home', 'projects', project)
await mkdir(projects, { recursive: true })
const transcript = join(projects, `${SID}.jsonl`)
await writeFile(transcript, '')
const identity = {
sessionId: SESSION,
workspaceId: 'workspace-1',
hostId: 'local',
agent: 'claude',
providerHandle: claudeProviderHandle(SID, 'a1')
} satisfies AgentSessionJournalIdentity
let journal = await journals.open({
identity,
stateDirectory: root,
now: () => 1_000
})
const deferred = createDeferredStructuredAgentSessionEventSink(testEventSinkLogging())
const routes = new StructuredAgentSessionSnapshotRoutes(testEventSinkLogging().logger)
let releaseReplacement = journal.epochReplacements.observe((replaced) =>
routes.replacing(SESSION, journal, replaced)
)
await deferred.followSnapshots(routes.observe(SESSION, journal))
deferred.bind({ journal, fence: 1, publish: () => {} })
cleanups.push(async () => {
releaseReplacement()
deferred.close()
await journals.closeAll()
await rm(root, { recursive: true, force: true })
})
const warn: Mock<(...args: unknown[]) => void> = vi.fn()
return {
root,
identity,
get journal() {
return journal
},
replay: async () => {
await deferred.drained()
releaseReplacement()
await journal.close()
journal = await journals.open({ identity, stateDirectory: root, now: () => 1_000 })
releaseReplacement = journal.epochReplacements.observe((replaced) =>
routes.replacing(SESSION, journal, replaced)
)
await deferred.followSnapshots(routes.observe(SESSION, journal))
deferred.bind({ journal, fence: 1, publish: () => {} })
return journal
},
warn,
deferred,
write: (rows: readonly Record<string, unknown>[]) =>
appendFile(transcript, rows.map((row) => `${JSON.stringify(row)}\n`).join('')),
/** The chat's own turn, sent and streamed live the way the SDK reports it. */
live: async (
options: { interrupted?: boolean; tool?: boolean; text?: string; thinking?: string } = {}
) => {
const text = options.text ?? 'answer 1'
await journal.appendSubmission({
clientMessageId: 'send-1',
body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'ask 1' }] },
payloadFingerprint: 'send-1',
fence: 1
})
await journal.resolveDispatch({
clientMessageId: 'send-1',
state: 'accepted',
providerIdentity: { provider: 'claude', sessionId: SID, uuid: 'p1' },
fence: 1
})
const translator = createClaudeJournalTranslator({ sink: deferred.sink })
const frame = (message: Record<string, unknown>) =>
translator.handle({ type: 'message', sessionId: SESSION, message, observedAt: 2_000 })
const stream = (uuid: string, event: Record<string, unknown>) =>
frame({ type: 'stream_event', uuid, session_id: SID, parent_tool_use_id: null, event })
stream('s1', { type: 'message_start', message: { id: 'msg_a' } })
stream('s2', {
type: 'content_block_start',
index: 0,
content_block: { type: 'text', text: '' }
})
stream('s3', {
type: 'content_block_delta',
index: 0,
delta: { type: 'text_delta', text }
})
if (!options.interrupted) {
frame({
type: 'assistant',
uuid: 'a1',
session_id: SID,
parent_tool_use_id: null,
message: { id: 'msg_a', role: 'assistant', content: [{ type: 'text', text }] }
})
}
if (options.tool) {
frame({
type: 'assistant',
uuid: 'call',
session_id: SID,
parent_tool_use_id: null,
message: {
id: 'call',
role: 'assistant',
content: [
{ type: 'tool_use', id: 'toolu_1', name: 'Read', input: { path: 'original' } }
]
}
})
}
if (options.thinking) {
stream('thought-start', { type: 'message_start', message: { id: 'msg_thought' } })
stream('thought-block', {
type: 'content_block_start',
index: 0,
content_block: { type: 'thinking', thinking: '' }
})
stream('thought-delta', {
type: 'content_block_delta',
index: 0,
delta: { type: 'thinking_delta', thinking: options.thinking }
})
}
if (options.interrupted) {
translator.handle({ type: 'ended', sessionId: SESSION, reason: 'crash', observedAt: 3_000 })
} else {
frame({ type: 'result', subtype: 'success', session_id: SID, parent_tool_use_id: null })
}
translator.flush()
translator.dispose()
await deferred.drained()
},
open: async (
leafUuid: string,
options: Pick<
Parameters<typeof catchUpClaudeTranscript>[0],
'signal' | 'timeoutMs' | 'assertCurrent'
> = {}
) => {
const covered = await catchUpClaudeTranscript({
sessionId: SESSION,
providerSessionId: SID,
leafUuid,
claudeConfigDir: join(root, 'claude-home'),
cwd,
sink: deferred.sink,
logger: { warn, error: vi.fn() },
...options
})
await deferred.drained()
return covered
},
rows: async () =>
(await readTestJournalItems(journal)).flatMap((item) => {
const { body } = item
if (body.kind === 'message') {
const text = body.blocks.map((block) => (block.type === 'text' ? block.text : ''))
return [`${body.role}:${text.join('')}`]
}
if (body.kind === 'tool-call') {
return [`tool:${body.name}:${body.state}`]
}
return body.kind === 'status' && body.presentation ? [`(${body.presentation})`] : []
})
}
}
@@ -1,167 +0,0 @@
import {
readTestJournalItems,
readTestJournalSnapshot,
readTestJournalSubmissions
} from '../../native-chat/agent-session-journal/journal-observation.test-support'
import './claude-conversation-worker.test-fixture'
import { describe, expect, it, vi } from 'vitest'
import { createClaudeJournalTranslator } from '../structured/journal/claude-structured-journal-translation'
import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key'
import { claudePromptUuidForSubmission } from '../structured/claude-structured-session-id'
import {
SESSION,
SID,
chatTurn,
outsideTurn,
prompt,
reply,
attachment,
chat
} from './claude-transcript-catch-up-test-support'
// Real disk tail → isolated translator → deferred sink → on-disk journal contracts.
import * as transcriptTail from './claude-transcript-tail'
import {
withStructuredHistoryInvocation,
type StructuredHistoryInvocationOwner
} from '../../native-chat/agent-session-wire/acquisition/structured-agent-session-history-invocation'
describe('Claude chat catch-up', () => {
it('revokes a queued catch-up on context activity without a journal write', async () => {
const c = await chat()
await c.live()
await c.write([...chatTurn, ...outsideTurn])
const translator = createClaudeJournalTranslator({ sink: c.deferred.sink })
const owner: StructuredHistoryInvocationOwner = {}
const append = c.deferred.sink.tryAppendTransition!.bind(c.deferred.sink)
vi.spyOn(c.deferred.sink, 'tryAppendTransition').mockImplementationOnce((transition) =>
append({
...transition,
beforeRun: () => {
const allowed = transition.beforeRun?.() !== false
translator.markContextActivity()
return allowed
}
})
)
const before = await readTestJournalSnapshot(c.journal)
try {
const covered = await withStructuredHistoryInvocation(
owner,
new AbortController().signal,
async (signal, revoke) => {
const release = translator.subscribeContextActivity(revoke)
try {
return await c.open('a1', { signal })
} finally {
release()
}
}
)
expect(covered).toBe(false)
expect(await readTestJournalSnapshot(c.journal)).toEqual(before)
expect(await c.open('a1')).toBe(true)
expect((await readTestJournalItems(c.journal)).length).toBeGreaterThan(before.items.length)
} finally {
translator.dispose()
}
})
it('does not place historical lifecycle after live work that arrives during its read', async () => {
const c = await chat()
await c.live()
await c.write([...chatTurn, ...outsideTurn])
const read = transcriptTail.readClaudeTranscriptTail
const live = createClaudeJournalTranslator({ sink: c.deferred.sink })
vi.spyOn(transcriptTail, 'readClaudeTranscriptTail').mockImplementationOnce(async (input) => {
const tail = await read(input)
live.handle({
type: 'message',
sessionId: SESSION,
message: {
type: 'stream_event',
uuid: 'wake',
session_id: SID,
parent_tool_use_id: null,
event: { type: 'message_start', message: { id: 'live-wake' } }
}
})
return tail
})
expect(await c.open('a1')).toBe(false)
expect(await c.rows()).not.toContain('user:ask 2')
const running = (await readTestJournalItems(c.journal)).findLast(
(item) => item.body.kind === 'turn'
)
expect(running?.body).toMatchObject({ state: 'running' })
live.dispose()
})
it('keeps retained aliases and unacknowledged queued prompts deduplicated', async () => {
const prompts = 100,
items = 10_000
const c = await chat()
await c.live()
const expected = [...(await c.rows()), '(continued-outside)']
const rows: Record<string, unknown>[] = [
reply('saved-leaf', 'earlier-prompt', 'msg_saved', { type: 'text', text: 'earlier' }, 0),
prompt('p1', 'saved-leaf', 'ask 1', 1),
...chatTurn.slice(1)
]
for (let n = 1; n < prompts; n++) {
rows.push(
prompt(`outside-p${n}`, n === 1 ? 'a1' : `outside-a${n - 1}`, `ask ${n}`, n * 2 + 1),
reply(
`outside-a${n}`,
`outside-p${n}`,
`msg_outside${n}`,
{ type: 'text', text: `answer ${n}` },
n * 2 + 2
)
)
expected.push(`user:ask ${n}`, `assistant:answer ${n}`)
}
const alias = agentJournalItemKey({ provider: 'claude', sessionId: SID, uuid: 'p1' })
const canonical = await c.journal.reads.canonicalItemId(alias)
expect(canonical).not.toBe(alias)
const submissions = await readTestJournalSubmissions(c.journal)
await c.write(rows)
expect(await c.open('saved-leaf')).toBe(true)
expect(await c.rows()).toEqual(expected)
expect(await readTestJournalSubmissions(c.journal)).toEqual(submissions)
await c.journal.appendLifecycleBatch({
settlementId: 'perf-padding',
fence: 1,
mutations: Array.from(
{ length: items - (await readTestJournalItems(c.journal)).length },
(_, n) => ({
kind: 'item' as const,
identity: { provider: 'orca' as const, clientMessageId: `padding${n}` },
body: { kind: 'message' as const, role: 'user' as const, blocks: [] },
turnScope: { kind: 'thread' as const }
})
)
})
for (let n = 0; n < prompts; n++) {
const key = agentJournalItemKey({ provider: 'orca', clientMessageId: `padding${n}` })
await c.write([
{
...attachment(`queued${n}`, n ? `queued${n - 1}` : `outside-a${prompts - 1}`),
attachment: {
type: 'queued_command',
source_uuid: claudePromptUuidForSubmission(SESSION, key),
commandMode: 'prompt',
prompt: 'local'
}
}
])
}
const before = await readTestJournalSnapshot(c.journal)
const itemCount = before.items.length
expect(itemCount).toBe(items)
expect(await c.open('saved-leaf')).toBe(true)
expect(await readTestJournalSnapshot(c.journal)).toEqual(before)
expect(await c.journal.reads.canonicalItemId(alias)).toBe(canonical)
expect(c.warn).not.toHaveBeenCalled()
})
})
+1 -1
View File
@@ -12,7 +12,7 @@ import {
} from '../../../shared/execution-host/execution-host'
import { isWslUncPath } from '../../../shared/file-access/wsl-paths'
import { assertLegacyAiVaultResumeAllowed } from '../../ai-vault/structured-sessions/structured-session-ownership'
import { tryEnsureStructuredAgentSessionHostForResume } from '../../runtime/agent-session/structured-agent-session-host-refusal'
import { tryEnsureStructuredAgentSessionHostForResume } from '../../runtime/agent-session/installation/structured-agent-session-host-refusal'
import { copyStructuredChatConversation } from '../../ai-vault/structured-sessions/structured-chat-conversation-copy'
import { wakeNativeChatTranscriptDistro } from '../../native-chat/transcript-discovery/native-chat-open-wake'
import { wslDistroForPath } from '../../wsl/filesystem/wsl-unc-access-gate'
@@ -95,7 +95,7 @@ import {
} from '../../ai-vault/runtime-hosts/runtime-session-scanner'
import { callRuntimeSessionSearch } from '../../ai-vault/runtime-hosts/runtime-session-search-call'
import { configureRuntimeAiVaultSessionDelete } from '../ai-vault/ai-vault-delete'
import { ensureStructuredAgentSessionHostUnlessRefused } from '../../runtime/agent-session/structured-agent-session-host-refusal'
import { ensureStructuredAgentSessionHostUnlessRefused } from '../../runtime/agent-session/installation/structured-agent-session-host-refusal'
import { getAgentSessionAttachmentStore } from '../../native-chat/agent-session-attachments/agent-session-attachment-store-registry'
import type { PluginService } from '../../plugins/plugin-service'
import type { PluginMarketplaceHandlerServices } from '../plugin-marketplaces'
@@ -2,7 +2,7 @@ import { JournalSqlForkCopy } from '../journal-sql-fork-copy'
import type { JournalForkPreparationInput } from '../journal-fork-preparation'
import { randomUUID } from 'node:crypto'
import type { AgentSessionJournalIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity'
import { AgentSessionTabTable } from '../../../runtime/agent-session/agent-session-tab-table'
import { AgentSessionTabTable } from '../../../runtime/agent-session/records/agent-session-tab-table'
import type { AgentSessionStoreState } from '../../../runtime/agent-session/records/agent-session-store-state'
import { JournalSqlOwner } from '../journal-sql-owner'
import { JournalSqlReaderPool } from '../journal-sql-reader-pool'
@@ -3,7 +3,7 @@ import { tmpdir } from 'node:os'
import { join } from 'node:path'
import { afterEach, expect, it } from 'vitest'
import { codexProviderHandle } from '../../../shared/agent-session/lifecycle/provider-handles/agent-session-provider-handle-encoding'
import { openStructuredAgentSessionSqlJournalDatabase } from '../../runtime/agent-session/structured-agent-session-journal-open'
import { openStructuredAgentSessionSqlJournalDatabase } from '../../runtime/agent-session/installation/structured-agent-session-journal-open'
import type { JournalSqlDatabase } from './database/journal-sql-database'
import type { AgentSessionJournal } from './journal-store'
import { SqlAgentSessionJournal } from './journal-sql-store'
@@ -3,7 +3,7 @@ import type {
AgentJournalRenderItem
} from '../../../shared/agent-session/journal/agent-session-journal-types'
import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key'
import { claudePromptUuidForSubmission } from '../../claude/structured/claude-structured-session-id'
import { claudePromptUuidForSubmission } from '../../claude/structured/lifecycle/claude-structured-session-id'
export const JOURNAL_HISTORY_ITEMS_LIMIT = 4_096
const JOURNAL_HISTORY_ITEMS_BYTES = 16 * 1024 * 1024
@@ -4,7 +4,7 @@ import { join } from 'node:path'
import { afterEach, expect, it } from 'vitest'
import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types'
import { claudeProviderHandle } from '../../../shared/agent-session/lifecycle/provider-handles/agent-session-provider-handle-encoding'
import { openStructuredAgentSessionSqlJournalDatabase } from '../../runtime/agent-session/structured-agent-session-journal-open'
import { openStructuredAgentSessionSqlJournalDatabase } from '../../runtime/agent-session/installation/structured-agent-session-journal-open'
import type { JournalSqlDatabase } from './database/journal-sql-database'
import { SqlAgentSessionJournal } from './journal-sql-store'
import {
@@ -4,7 +4,7 @@ import { join } from 'node:path'
import { afterEach, expect, it } from 'vitest'
import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key'
import { claudeProviderHandle } from '../../../shared/agent-session/lifecycle/provider-handles/agent-session-provider-handle-encoding'
import { openStructuredAgentSessionSqlJournalDatabase } from '../../runtime/agent-session/structured-agent-session-journal-open'
import { openStructuredAgentSessionSqlJournalDatabase } from '../../runtime/agent-session/installation/structured-agent-session-journal-open'
import type { JournalSqlDatabase } from './database/journal-sql-database'
import { SqlAgentSessionJournal } from './journal-sql-store'
import {
@@ -4,7 +4,7 @@ import { join } from 'node:path'
import { afterEach, expect, it, vi } from 'vitest'
import { codexProviderHandle } from '../../../shared/agent-session/lifecycle/provider-handles/agent-session-provider-handle-encoding'
import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types'
import { openStructuredAgentSessionSqlJournalDatabase } from '../../runtime/agent-session/structured-agent-session-journal-open'
import { openStructuredAgentSessionSqlJournalDatabase } from '../../runtime/agent-session/installation/structured-agent-session-journal-open'
import type { JournalSqlDatabase } from './database/journal-sql-database'
import { SqlAgentSessionJournal } from './journal-sql-store'
import {
@@ -121,62 +121,6 @@ it('keeps one ordered queue in SQL and pauses cards from before a reopen until r
expect((await after.queuedMessages.nextInputCard())?.messageId).toBe('C')
})
it('retains a conservative reopen floor when the mark fails, apart from the opening cursor', async () => {
const { root, database, journal } = await fixture()
await journal.queuedMessages.insert({ messageId: 'A', body: message('A') })
const restarted = await reopen(root, database, journal)
const after = restarted.journal
const opening = after.openingCursor()
const failure = new Error('disk full')
await restarted.database.serialize('session', (writer) => {
vi.spyOn(writer, 'write').mockRejectedValueOnce(failure)
})
await expect(after.markQueueReopen(1)).rejects.toBe(failure)
const floor = after.reopenFloor()
expect(floor).toEqual({
epoch: after.physicalCursor().epoch,
sequence: after.physicalCursor().sequence + 1
})
expect(after.openingCursor()).toEqual(opening)
expect((await after.queuedMessages.pauses()).map((pause) => pause.reason)).toEqual(['restarted'])
await after.markQueueReopen(1)
expect(after.reopenFloor()).toBeNull()
})
it('reads the latest Stop from SQL and keeps its settlement in host memory only', async () => {
const { root, database, journal } = await fixture()
await journal.queuedMessages.insert({ messageId: 'A', body: message('A') })
const accepted = await journal.acceptStop({
event: { reason: 'user-stop' },
fence: 1,
liveTurnId: 'turn-1'
})
expect(accepted.turnId).toBe('turn-1')
expect(await journal.stopMarks.latest()).toMatchObject({
event: { reason: 'user-stop', turnId: 'turn-1' }
})
expect(await journal.stopMarks.personStopDecides('turn-1')).toBe(true)
expect(await journal.stopMarks.personStopDecides(null)).toBe(false)
expect(await journal.queuedMessages.nextInputCard()).toBeNull()
const edges: number[] = []
journal.stopMarks.observeSettleEdges(() => edges.push(journal.stopMarks.revision()))
const settle = await journal.stopMarks.beginSettle(true)
expect(settle).toEqual({ settling: true })
expect(await journal.stopMarks.personStopDecides(null)).toBe(true)
journal.stopMarks.settled(settle, 'turn-2')
expect(edges).toEqual([1, 2])
expect((await journal.stopMarks.latest())?.settle).toEqual({ settling: false, turnId: 'turn-2' })
expect(await journal.stopMarks.personStopDecides('turn-2')).toBe(true)
const restarted = await reopen(root, database, journal)
const stop = await restarted.journal.stopMarks.latest()
expect(stop).toMatchObject({ event: { reason: 'user-stop', turnId: 'turn-1' } })
expect(stop?.settle).toBeUndefined()
expect(restarted.journal.stopMarks.revision()).toBe(0)
})
it("lets every writer command plan with the host's unsaved Stop settlement", async () => {
const { root, database, journal } = await fixture()
const turn = (turnId: string, state: 'running' | 'interrupted') =>
@@ -216,46 +160,3 @@ it("lets every writer command plan with the host's unsaved Stop settlement", asy
const restarted = await reopen(root, database, journal)
expect((await restarted.journal.stopMarks.latest())?.settle).toBeUndefined()
})
it('orders a later turn end behind the Stop settlement read', async () => {
const { database, journal } = await fixture()
await journal.appendItem(
{ provider: 'orca', clientMessageId: 'later' },
{ kind: 'turn', turnId: 'later', state: 'running' },
{ fence: 1, turnScope: { kind: 'thread' } }
)
await journal.appendStopEvent({ reason: 'user-stop', turnId: 'earlier' }, 1)
const stop = await journal.reads.latestStop()
const reached = Promise.withResolvers<void>()
const release = Promise.withResolvers<typeof stop>()
vi.spyOn(journal.reads, 'latestStop').mockImplementationOnce(() => {
reached.resolve()
return release.promise
})
const settling = journal.stopMarks.beginSettle(true)
await reached.promise
const ended = database.serialize('session', (writer) =>
writer.write({
target: {
sessionId: 'session',
epoch: journal.physicalCursor().epoch,
ownerToken: journal.observationHandle()
},
operation: {
kind: 'item',
identity: { provider: 'orca', clientMessageId: 'later' },
body: { kind: 'turn', turnId: 'later', state: 'interrupted', completedAt: 100 },
options: { fence: 1, turnScope: { kind: 'thread' } }
},
facts: { identity, stopSettle: journal.stopMarks.fact() },
savedAt: 100
})
)
release.resolve(stop)
await settling
await ended
expect((await journal.reads.item('orca:later'))?.body).toMatchObject({
state: 'interrupted',
outcome: 'cancellation'
})
})
@@ -1,15 +1,14 @@
import { AgentSessionSubscribers } from '../agent-session-wire/publication/subscribers/structured-agent-session-subscribers'
import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session/agent-session-wire'
import Database from '../../sqlite/sync-database'
import { StructuredAgentSessionStatusFeed } from '../agent-session-wire/observations/structured-agent-session-status-feed'
import type { StatusFeedSession } from '../agent-session-wire/observations/structured-agent-session-status-feed-deps'
import type { JournalCurrentWorkAuthority } from './journal-observer-read'
import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
import { tmpdir } from 'node:os'
import { join } from 'node:path'
import { afterEach, expect, it, vi } from 'vitest'
import { codexProviderHandle } from '../../../shared/agent-session/lifecycle/provider-handles/agent-session-provider-handle-encoding'
import { openStructuredAgentSessionSqlJournalDatabase } from '../../runtime/agent-session/structured-agent-session-journal-open'
import { openStructuredAgentSessionSqlJournalDatabase } from '../../runtime/agent-session/installation/structured-agent-session-journal-open'
import { journalDatabasePath } from './database/journal-host-database'
import { journalDomainDatabasePath } from './database/journal-domain-database'
import type { JournalSqlDatabase } from './database/journal-sql-database'
@@ -68,68 +67,6 @@ async function fixture(now: () => number = () => 100) {
return { root, database, journal }
}
it('holds automatic delivery for every editor until committed release, expiry or handle close', async () => {
let now = 100
const { database, journal } = await fixture(() => now)
const card = await journal.queuedMessages.insert({
messageId: 'draft',
body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'hello' }] }
})
const desktop = { callerKey: 'desktop', editId: 'editing' }
const phone = { callerKey: 'phone', editId: 'editing' }
await journal.queuedMessages.editLeases.acquire(desktop, {
messageId: 'draft',
fingerprint: card.fingerprint
})
now = 200
expect(
await journal.queuedMessages.editLeases.acquire(phone, {
messageId: 'draft',
fingerprint: card.fingerprint
})
).toMatchObject({ status: 'held', remainingMs: 120_000 })
await journal.queuedMessages.editLeases.release(desktop, 'draft')
expect(await journal.queuedMessages.nextInputCard()).toBeNull()
const heldRevision = journal.queuedMessages.revision()
await journal.appendSteps([
{
kind: 'resolved-item',
resolution: {
kind: 'text-snapshot',
identity: { provider: 'orca', clientMessageId: 'text' },
body: {
kind: 'message',
role: 'assistant',
blocks: [{ type: 'text', text: 'Still writing' }]
}
},
options: { fence: 1, turnScope: { kind: 'thread' } },
reservedBytes: 4096
}
])
expect(journal.queuedMessages.revision()).toBe(heldRevision)
now = 120_200
const opening = journal.physicalCursor()
const expired = await SqlAgentSessionJournal.open({ database, identity, now: () => now })
expect(expired.openingCursor()).toEqual(opening)
expect(expired.physicalCursor().sequence).toBe(opening.sequence + 1)
expect(await expired.queuedMessages.nextInputCard()).toMatchObject({ messageId: 'draft' })
await expired.close()
await journal.queuedMessages.editLeases.expire()
expect(journal.queuedMessages.revision()).not.toBe(heldRevision)
expect(await journal.queuedMessages.nextInputCard()).toMatchObject({ messageId: 'draft' })
await journal.queuedMessages.editLeases.acquire(phone, {
messageId: 'draft',
fingerprint: card.fingerprint
})
await journal.close()
const reopened = await SqlAgentSessionJournal.open({ database, identity, now: () => now })
expect(await reopened.queuedMessages.editLeases.renew(phone, 'draft')).toEqual({
status: 'expired'
})
await reopened.close()
})
function receipt(adopt: (committed: boolean) => void): JournalOperationReceipt {
return {
write: () => {
@@ -361,98 +298,6 @@ it('rechecks row-free owner death before answering an attempt-end action read',
})
})
it('publishes SQL status only with recaptured live owners through the existing refresh path', async () => {
const { journal } = await fixture()
await journal.write({
kind: 'item',
identity: { provider: 'orca', clientMessageId: 'prompt' },
body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'Read my chat' }] },
options: { fence: 0, turnScope: { kind: 'thread' } }
})
await journal.appendItem(
{ provider: 'orca', clientMessageId: 'turn' },
{ kind: 'turn', turnId: 'turn', state: 'running', userItemId: 'orca:prompt' },
{ fence: 0, turnScope: { kind: 'thread' } }
)
const held = new Set<string>()
const session: StatusFeedSession = {
journal,
params: {
provider: 'codex',
location: {
executionHostId: 'local',
wslDistro: null,
workspaceId: 'workspace',
workspaceKind: 'git-worktree'
}
},
child: { fence: 0, phase: 'ready', generation: 'generation', heldSends: () => held }
}
const logger = { warn: vi.fn(), error: vi.fn() }
const feed = new StructuredAgentSessionStatusFeed({
sessions: new Map([['session-1', session]]),
getConversation: () => null,
now: () => 999,
logger
})
expect(await feed.journalProjection('session-1', journal)).toMatchObject({ stopping: false })
await journal.appendStopEvent({ reason: 'user-stop' }, 0)
const reached = Promise.withResolvers<void>()
const release = Promise.withResolvers<void>()
const published = Promise.withResolvers<void>()
const alsoPublished = Promise.withResolvers<void>()
const read = journal.reads.observer.bind(journal.reads)
vi.spyOn(journal.reads, 'observer').mockImplementationOnce(async (input) => {
const result = await read(input)
reached.resolve()
await release.promise
return result
})
const observations: unknown[] = []
const pending = feed.publish('session-1', journal, { replay: true }, (projection) => {
observations.push({
revision: projection.workRevision,
held: projection.authority?.child?.heldSends,
stopping: projection.stopping
})
published.resolve()
})
const alsoPending = feed.publish('session-1', journal, { replay: true }, (projection) => {
expect(projection).toMatchObject({
workRevision: 1,
stopping: true,
authority: { child: { heldSends: ['held-without-row'] } }
})
alsoPublished.resolve()
})
await reached.promise
expect(feed.readPublished('session-1')).toBeUndefined()
session.operationalRevision = 1
held.add('held-without-row')
const settle = await journal.stopMarks.beginSettle(true)
release.resolve()
await pending
await published.promise
await alsoPending
await alsoPublished.promise
expect(observations).toEqual([{ revision: 1, held: ['held-without-row'], stopping: true }])
expect(feed.readPublished('session-1')).toMatchObject({
latestPrompt: 'Read my chat',
status: 'working',
stopping: true,
updatedAt: 100
})
expect(logger.warn).not.toHaveBeenCalled()
const cursor = journal.cursor()
const stopping = await feed.journalProjection('session-1', journal)
journal.stopMarks.settled(settle, 'other-turn')
await feed.publish('session-1', journal, { replay: true })
expect(feed.readPublished('session-1')).toMatchObject({ status: 'working' })
expect(feed.readPublished('session-1')).not.toHaveProperty('stopping')
expect(journal.cursor()).toEqual(cursor)
expect(stopping?.authority?.stop?.settle).toEqual({ settling: true })
})
it('drops a revoked history invocation after worker dispatch and preserves deduplicated verdicts', async () => {
const { root, database, journal } = await fixture()
const cursor = journal.physicalCursor()
@@ -6,13 +6,9 @@ import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent
import type { AgentJournalApprovalItem } from '../../../shared/agent-session/journal/agent-session-journal-types'
import { codexProviderHandle } from '../../../shared/agent-session/lifecycle/provider-handles/agent-session-provider-handle-encoding'
import { agentJournalTurnBody } from '../../../shared/agent-session/lifecycle/records/agent-session-turn-record'
import { openStructuredAgentSessionSqlJournalDatabase } from '../../runtime/agent-session/structured-agent-session-journal-open'
import { openStructuredAgentSessionSqlJournalDatabase } from '../../runtime/agent-session/installation/structured-agent-session-journal-open'
import type { JournalSqlDatabase } from './database/journal-sql-database'
import { claudeBackgroundTaskIdentity } from '../../claude/background-tasks/claude-background-task-identity'
import {
codexGoalJournalDigest,
codexGoalJournalIdentity
} from '../../codex/structured/journal/codex-goal-journal-identity'
import { SqlAgentSessionJournal } from './journal-sql-store'
import {
journalSqlReaderPath,
@@ -141,106 +137,3 @@ it('chooses request incarnations and settles the session from its unsettled rows
completedAt: 300
})
})
it("follows a thread's newest saved goal row when choosing a goal identity", async () => {
const sql = await journal()
const goal = (timeUsedSeconds: number, objective = 'Ship it') => ({
kind: 'status' as const,
text: `Goal set: ${objective}`,
threadGoal: {
state: 'set' as const,
goal: {
objective,
status: 'active' as const,
tokenBudget: null,
tokensUsed: 0,
timeUsedSeconds,
createdAt: 1,
updatedAt: timeUsedSeconds
}
}
})
const thread = 'a'.repeat(64)
const step = (signature: string, body: ReturnType<typeof goal>) => ({
kind: 'resolved-item' as const,
resolution: {
kind: 'thread-goal' as const,
choice: { thread, signature, body, requirePrevious: false }
},
options: { fence: 1, turnScope: { kind: 'thread' as const }, lifecycle: true },
reservedBytes: 8192
})
const first = 'b'.repeat(64)
const second = 'c'.repeat(64)
expect(await appendOutcomes(sql, [step(first, goal(0)), step(first, goal(0))])).toEqual({
outcomes: [{ kind: 'committed', wrote: true }, { kind: 'dropped' }]
})
expect(await appendOutcomes(sql, [step(first, goal(60)), step(second, goal(0, 'Next'))])).toEqual(
{
outcomes: [
{ kind: 'committed', wrote: true },
{ kind: 'committed', wrote: true }
]
}
)
const occurrence = codexGoalJournalDigest(JSON.stringify([thread, first]))
const firstRow = agentJournalItemKey(codexGoalJournalIdentity(thread, first, occurrence))
const secondRow = agentJournalItemKey(
codexGoalJournalIdentity(
thread,
second,
codexGoalJournalDigest(JSON.stringify([occurrence, second]))
)
)
expect(await sql.reads.item(firstRow)).toMatchObject({
revision: 2,
body: { threadGoal: { goal: { timeUsedSeconds: 60 } } }
})
expect(await sql.reads.item(secondRow)).toMatchObject({
revision: 1,
body: { text: 'Goal set: Next' }
})
})
it("chooses a background task's generation from its saved incarnations on the writer", async () => {
const sql = await journal()
const task = (state: 'working' | 'done', parentToolUseId: string) => ({
kind: 'resolved-item' as const,
resolution: {
kind: 'background-task' as const,
taskId: 'task-1',
toolUseId: parentToolUseId,
body: {
kind: 'message' as const,
role: 'system' as const,
blocks: [
{
type: 'background-task' as const,
taskId: 'task-1',
kind: 'command' as const,
label: 'Build',
state,
parentToolUseId
}
]
}
},
options: { fence: 1, turnScope: { kind: 'thread' as const } },
reservedBytes: 8192
})
await appendOutcomes(sql, [
task('working', 'tool-1'),
task('done', 'tool-1'),
task('working', 'tool-2')
])
const first = agentJournalItemKey(claudeBackgroundTaskIdentity('task-1'))
const second = agentJournalItemKey(claudeBackgroundTaskIdentity('task-1', 2))
expect(await sql.reads.item(first)).toMatchObject({
revision: 2,
body: { blocks: [{ state: 'done', parentToolUseId: 'tool-1' }] }
})
expect(await sql.reads.item(second)).toMatchObject({
revision: 1,
body: { blocks: [{ state: 'working', parentToolUseId: 'tool-2' }] }
})
})
@@ -6,7 +6,7 @@ import { agentSessionFailureFact } from '../../../shared/agent-session/failures/
import { agentSessionFailureWords } from '../../../shared/agent-session/failures/agent-session-failure-words'
import { codexProviderHandle } from '../../../shared/agent-session/lifecycle/provider-handles/agent-session-provider-handle-encoding'
import { recordStructuredAgentSessionStartFailure } from '../agent-session-wire/startup/structured-agent-session-start-failure-row'
import { openStructuredAgentSessionSqlJournalDatabase } from '../../runtime/agent-session/structured-agent-session-journal-open'
import { openStructuredAgentSessionSqlJournalDatabase } from '../../runtime/agent-session/installation/structured-agent-session-journal-open'
import type { JournalSqlDatabase } from './database/journal-sql-database'
import type { AgentSessionJournal } from './journal-store'
import { SqlAgentSessionJournal } from './journal-sql-store'
@@ -4,7 +4,7 @@ import { join } from 'node:path'
import { afterEach, expect, it } from 'vitest'
import { codexProviderHandle } from '../../../shared/agent-session/lifecycle/provider-handles/agent-session-provider-handle-encoding'
import type { AgentJournalProducerLinkage } from '../../../shared/agent-session/journal/agent-session-journal-types'
import { openStructuredAgentSessionSqlJournalDatabase } from '../../runtime/agent-session/structured-agent-session-journal-open'
import { openStructuredAgentSessionSqlJournalDatabase } from '../../runtime/agent-session/installation/structured-agent-session-journal-open'
import type { JournalSqlDatabase } from './database/journal-sql-database'
import type { AgentSessionJournal } from './journal-store'
import { SqlAgentSessionJournal } from './journal-sql-store'
@@ -8,7 +8,7 @@ import {
} from '../../github/pr-watch/pr-watch-storage'
import type { AgentSessionStoreRowWrites } from './journal-writer-store-row-changes'
import type { AgentSessionStoreMutation } from '../../runtime/agent-session/records/agent-session-store-mutation'
import type { AgentSessionRuntimeFacts } from '../../runtime/agent-session/agent-session-runtime-attribution'
import type { AgentSessionRuntimeFacts } from '../../runtime/agent-session/records/agent-session-runtime-attribution'
import { applyJournalWriterStoreEffect } from './journal-writer-store-effect'
import {
claimAgentSessionAttachmentsInTransaction,
@@ -25,7 +25,7 @@ import { readJournalSqlUsageLimitContinueIdentity } from './journal-sql-status-c
import {
attributeAgentSessionRuntimeRecord,
type AgentSessionRuntimeFacts
} from '../../runtime/agent-session/agent-session-runtime-attribution'
} from '../../runtime/agent-session/records/agent-session-runtime-attribution'
export function emptyJournalWriterStoreRows(): AgentSessionStoreRowWrites {
return {
@@ -11,7 +11,7 @@ import {
isReadableAgentSessionStoreTab,
isReadableRetiredAgentSessionClaimKey
} from '../../runtime/agent-session/records/agent-session-store-row-rules'
import type { PersistedAgentSessionTab } from '../../runtime/agent-session/agent-session-tab-table'
import type { PersistedAgentSessionTab } from '../../runtime/agent-session/records/agent-session-tab-table'
type KeyedRowWrites = { upsert: [key: string, json: string][]; remove: string[] }
@@ -1,7 +1,7 @@
import { parseAgentJournalItemKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key'
import type { AgentSessionRecord } from '../../../../shared/agent-session/lifecycle/agent-session-record'
import { prepareLegacyTranscriptImport } from '../../agent-session-journal/history-import/journal-legacy-import'
import { resolveStructuredAgentSessionAdoptionForCreate } from '../../../runtime/agent-session/structured-agent-session-create-adoption'
import { resolveStructuredAgentSessionAdoptionForCreate } from '../../../runtime/agent-session/ownership/structured-agent-session-create-adoption'
import { structuredAgentRuntimeMetadata } from '../../../runtime/agent-session/installation/structured-agent-runtime-metadata'
/** An imported root has no hosted turn receipt; ask the same pinned native history importer. */
@@ -16,7 +16,7 @@ import type {
} from '../../../../shared/agent-session/lifecycle/operations/agent-session-operation-ledger'
import { agentSessionLeaseOwnerVerdict } from '../../../../shared/agent-session/lifecycle/leases/agent-session-lease-adjudication'
import type { AgentSessionRecord } from '../../../../shared/agent-session/lifecycle/agent-session-record'
import type { AgentSessionAcquisitionExitProof } from '../../../runtime/agent-session/agent-session-acquisition-failure-settlement'
import type { AgentSessionAcquisitionExitProof } from '../../../runtime/agent-session/ownership/agent-session-acquisition-failure-settlement'
import '../providers/structured-agent-session-adapter'
import {
AgentSessionAcquisitionExitProvenError,

Some files were not shown because too many files have changed in this diff Show More