diff --git a/.github/workflows/pi-provider-runtime.yml b/.github/workflows/pi-provider-runtime.yml index 6cf69ad911a..a3dbbcdcbbf 100644 --- a/.github/workflows/pi-provider-runtime.yml +++ b/.github/workflows/pi-provider-runtime.yml @@ -5,7 +5,7 @@ on: paths: - 'src/shared/source-control/ai/generation/commit-message-agent-specs-primary.ts' - 'tests/tools/pi-provider-runtime-smoke.mjs' - - 'src/main/pi/rpc-history-*.ts' + - 'src/main/pi/rpc/history/rpc-history-*.ts' - '.github/workflows/pi-provider-runtime.yml' permissions: contents: read diff --git a/config/flaky-test-pattern-baseline.txt b/config/flaky-test-pattern-baseline.txt index 8ec9d5bc999..0461f256b27 100644 --- a/config/flaky-test-pattern-baseline.txt +++ b/config/flaky-test-pattern-baseline.txt @@ -638,7 +638,6 @@ 4 test-no-wall-clock:tests/e2e/cross-version-wire/release-checkout.unit.test.ts 2 test-no-wall-clock:tests/e2e/cross-version-wire/release-source-retention.unit.test.ts 1 test-no-wall-clock:tests/e2e/host-cold-park-remote-subscriber.unit.test.ts -2 test-no-wall-clock:tests/e2e/omp-child-session-recovery.unit.test.ts 2 test-timeout-needs-reason:mobile/src/terminal/document/native-document-bundle.test.ts 1 test-timeout-needs-reason:mobile/src/test-support/rpc-recording/family-recordings.test.ts 1 test-timeout-needs-reason:mobile/src/test-support/rpc-recording/mutants/family-mutants.test.ts diff --git a/config/main-sync-fs-baseline.txt b/config/main-sync-fs-baseline.txt index 26f5c12abe2..20c3674a66d 100644 --- a/config/main-sync-fs-baseline.txt +++ b/config/main-sync-fs-baseline.txt @@ -419,8 +419,8 @@ 2 src/main/persistence/restoring-sessions/floating-workspace-normalization.ts 1 src/main/persistence/tracking-repos/worktree-metadata-normalization.ts 1 src/main/persistence/window-save-divergence.ts -8 src/main/pi/legacy-omp-overlay-migration.ts -5 src/main/pi/titlebar-extension-service.ts +8 src/main/pi/managed-extensions/legacy-omp-overlay-migration.ts +5 src/main/pi/managed-extensions/titlebar-extension-service.ts 3 src/main/plugins/appearance/plugin-appearance-service.ts 2 src/main/plugins/installation/plugin-install-staging.ts 1 src/main/plugins/installation/plugin-install.ts diff --git a/config/scripts/ci/sharding/ci-shard-timings.json b/config/scripts/ci/sharding/ci-shard-timings.json index 48b7a195cc2..08a7628248a 100644 --- a/config/scripts/ci/sharding/ci-shard-timings.json +++ b/config/scripts/ci/sharding/ci-shard-timings.json @@ -2166,8 +2166,6 @@ "src/main/ipc/preflight-wsl-agent-detection.test.ts": 94, "src/main/ipc/preflight-wsl-command.test.ts": 57, "src/main/ipc/preflight-wsl-stopped-distro.test.ts": 538, - "src/main/ipc/pty-claude-agent-view-readiness.test.ts": 4953, - "src/main/ipc/pty-degraded-fallback-single-ingest.test.ts": 4355, "src/main/ipc/pty-spawn-saved-resume-admission.test.ts": 11308, "src/main/ipc/pty/host-env/claude-agent-view.test.ts": 49, "src/main/ipc/pty/host-env/opencode-hook-installation.test.ts": 668, @@ -2475,7 +2473,6 @@ "src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-late-settlement-cancelled.test.ts": 2020, "src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-lease-renewer.test.ts": 875, "src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-newer-content-host.test.ts": 1997, - "src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-options-read-scaling.test.ts": 1006, "src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-prompt-cancel-repeat.test.ts": 1493, "src/main/native-chat/agent-session-wire/providers/testing/structured-agent-session-provider-naming.test.ts": 297, "src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-queue-import-retained-history.test.ts": 2790, @@ -2834,24 +2831,18 @@ "src/main/persistence/tracking-repos/worktree-metadata-normalization.test.ts": 372, "src/main/persistence/window-save-reconnect-facts.test.ts": 372, "src/main/persistence/window-save-sleep-records.test.ts": 60, - "src/main/pi/agent-status-compaction.test.ts": 463, - "src/main/pi/agent-status-completion-delivery.test.ts": 423, - "src/main/pi/agent-status-extension-nested-run-settlement.test.ts": 335, - "src/main/pi/agent-status-extension-session-change.test.ts": 613, - "src/main/pi/agent-status-input-redaction.test.ts": 573, - "src/main/pi/agent-status-omp-plan-review.test.ts": 426, - "src/main/pi/agent-status-reload-delivery.test.ts": 364, - "src/main/pi/omp-model-command-source.test.ts": 640, - "src/main/pi/omp-transcript-metadata.test.ts": 753, - "src/main/pi/rpc-launch.test.ts": 305, - "src/main/pi/rpc-prompt-delivery.test.ts": 204, - "src/main/pi/rpc-prompt.test.ts": 228, - "src/main/pi/rpc-session-adapter.test.ts": 4038, - "src/main/pi/rpc-session-rename.test.ts": 1172, - "src/main/pi/rpc-session-startup.test.ts": 4955, - "src/main/pi/rpc-turn-races.test.ts": 2191, - "src/main/pi/titlebar-extension-service.test.ts": 263, - "src/main/pi/titlebar-extension-source.test.ts": 1016, + "src/main/pi/managed-extensions/agent-status/agent-status-completion-delivery.test.ts": 423, + "src/main/pi/managed-extensions/agent-status/agent-status-extension-nested-run-settlement.test.ts": 335, + "src/main/pi/managed-extensions/agent-status/agent-status-extension-session-change.test.ts": 613, + "src/main/pi/managed-extensions/agent-status/agent-status-input-redaction.test.ts": 573, + "src/main/pi/managed-extensions/agent-status/omp-model-command-source.test.ts": 640, + "src/main/pi/rpc/launch/rpc-launch.test.ts": 305, + "src/main/pi/rpc/prompts/rpc-prompt-delivery.test.ts": 204, + "src/main/pi/rpc/prompts/rpc-prompt.test.ts": 228, + "src/main/pi/rpc/rpc-session-rename.test.ts": 1172, + "src/main/pi/rpc/rpc-session-startup.test.ts": 4955, + "src/main/pi/rpc/rpc-turn-races.test.ts": 2191, + "src/main/pi/managed-extensions/titlebar-extension-service.test.ts": 263, "src/main/plugins/catalog/plugin-catalog-monorepo-images.test.ts": 216, "src/main/plugins/catalog/plugin-install-stats-service.test.ts": 196, "src/main/plugins/catalog/plugin-kill-list-content-revocation.test.ts": 3680, @@ -3008,7 +2999,6 @@ "src/main/pty/shell-startup/legacy-terminal-shim-dir.test.ts": 263, "src/main/pty/process-retirement/node-pty-master-fd-retirement.test.ts": 2401, "src/main/pty/scrollback/overlay-mirror.test.ts": 69, - "src/main/pty/shell-startup/pi-process-owner-env.test.ts": 630, "src/main/pty/process-retirement/posix-pty-foreground-group-libproc.test.ts": 46, "src/main/pty/process-retirement/posix-pty-foreground-group.test.ts": 89, "src/main/pty/process-retirement/posix-pty-process-groups.integration.test.ts": 215, @@ -3097,7 +3087,6 @@ "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-adapter-start-failure.test.ts": 11764, "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-codex-compact-exit.test.ts": 6616, @@ -3111,7 +3100,6 @@ "src/main/runtime/agent-session/structured-agent-session-lifecycle-delivery.test.ts": 149, "src/main/runtime/agent-session/structured-agent-session-mobile-retirement.test.ts": 281, "src/main/runtime/agent-session/structured-agent-session-paired-caller.test.ts": 5749, - "src/main/runtime/agent-session/structured-agent-session-pi-signed-out-start.test.ts": 2702, "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, @@ -3568,7 +3556,6 @@ "src/main/runtime/rpc/methods/structured-sessions/protocol/structured-agent-session-at-rest.test.ts": 8371, "src/main/runtime/rpc/methods/structured-sessions/attachments/structured-agent-session-attachments.test.ts": 2006, "src/main/runtime/rpc/methods/structured-sessions/subscriptions/structured-agent-session-attention-ack.test.ts": 1596, - "src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-continuation-context.test.ts": 5567, "src/main/runtime/rpc/methods/structured-sessions/creation/structured-agent-session-create-message.test.ts": 3071, "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, @@ -7371,7 +7358,6 @@ "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-child-session-recovery.unit.test.ts": 2205, "tests/e2e/omp-retired-host-renderer.unit.test.ts": 2546, "tests/e2e/omp-risk-remote-review.unit.test.ts": 1137, "tests/e2e/orchestration-worker-workspace-resolution.unit.test.ts": 5936, @@ -7380,7 +7366,6 @@ "tests/e2e/paired-worktree-agent-command-owner.unit.test.ts": 1767, "tests/e2e/pdf-detail-dimension-reads.unit.test.ts": 438, "tests/e2e/persistence-automation-target-dispatch.unit.test.ts": 8084, - "tests/e2e/pty-spawn-cwd-folder-owner.unit.test.ts": 4454, "tests/e2e/remote-agent-completion-authority.unit.test.ts": 1742, "tests/e2e/remote-terminal-input-delivery-model.unit.test.ts": 23690, "tests/e2e/remote-terminal-tab-retirement.unit.test.ts": 5828, @@ -7404,7 +7389,6 @@ "tests/e2e/worktree-status-warning.unit.test.ts": 2331, "tests/tools/branch-line-total-renderer.test.mjs": 1222, "tests/tools/omp-close-lifecycle.test.mjs": 403, - "tests/tools/omp-config-root-local-shell.test.mjs": 308, "tests/tools/omp-config-root-relay-shell.test.mjs": 297, "tests/tools/relay-bench/phone-e2ee-desktop-parity.test.mjs": 111, "tests/tools/relay-bench/region-probe-replay.test.mjs": 79, diff --git a/config/scripts/test-runtime/sqlite-admission/vitest-node-runtime-files.mjs b/config/scripts/test-runtime/sqlite-admission/vitest-node-runtime-files.mjs index 23a24017a42..d0229799136 100644 --- a/config/scripts/test-runtime/sqlite-admission/vitest-node-runtime-files.mjs +++ b/config/scripts/test-runtime/sqlite-admission/vitest-node-runtime-files.mjs @@ -49,13 +49,12 @@ const NODE_RUNTIME_INCLUDE = [ 'tests/e2e/cross-version-wire/agent-session-clear-old-client.unit.test.ts', 'tests/e2e/cross-version-wire/agent-session-clear-old-tab-mirror.unit.test.ts', 'tests/e2e/cross-version-wire/host-model-catalog-released-phone.unit.test.ts', - 'src/main/pi/rpc-session-adapter.test.ts', - 'src/main/pi/rpc-session-startup.test.ts', + 'src/main/pi/rpc/rpc-session-startup.test.ts', 'src/main/acp/session/acp-structured-omp-recordings.test.ts', 'src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-clear-queued-command.test.ts', 'src/main/acp/session/acp-structured-session-adapter.test.ts', 'src/main/acp/session/acp-structured-session-adapter-resume.test.ts', - 'src/main/pi/rpc-turn-races.test.ts', + 'src/main/pi/rpc/rpc-turn-races.test.ts', 'src/main/acp/session/children/acp-structured-child-stop.test.ts', 'src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-background-stop-unreadable.test.ts', 'src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-exit-delivery.test.ts', diff --git a/config/tsconfig.tc.web.json b/config/tsconfig.tc.web.json index c95aa8aaabf..0c4e66706e0 100644 --- a/config/tsconfig.tc.web.json +++ b/config/tsconfig.tc.web.json @@ -25,8 +25,8 @@ "../src/preload/renderer-restart-wiring.ts", "../src/preload/runtime-environment-subscriptions.ts", "../src/preload/usage-provider-api.ts", - "../src/main/pi/rpc-model-schema.ts", - "../src/main/pi/rpc-model-options.ts", + "../src/main/pi/rpc/options/rpc-model-schema.ts", + "../src/main/pi/rpc/options/rpc-model-options.ts", "../src/shared/**/*", "../mobile/src/worktree/worktree-agent-child-rows.ts", "../src/packages/process-host/src/__fixtures__/**/*", diff --git a/config/tsconfig.web.json b/config/tsconfig.web.json index 97a75ba3e28..b8af840abf1 100644 --- a/config/tsconfig.web.json +++ b/config/tsconfig.web.json @@ -6,8 +6,8 @@ "../src/renderer/src/**/*.tsx", "../src/preload/api-types.ts", "../src/preload/api/**/*", - "../src/main/pi/rpc-model-schema.ts", - "../src/main/pi/rpc-model-options.ts", + "../src/main/pi/rpc/options/rpc-model-schema.ts", + "../src/main/pi/rpc/options/rpc-model-options.ts", "../src/shared/**/*" ], "exclude": [ diff --git a/src/main/agent-hooks/wsl-relay/wsl-hook-relay-deps.ts b/src/main/agent-hooks/wsl-relay/wsl-hook-relay-deps.ts index 5c74107a65b..042454db10f 100644 --- a/src/main/agent-hooks/wsl-relay/wsl-hook-relay-deps.ts +++ b/src/main/agent-hooks/wsl-relay/wsl-hook-relay-deps.ts @@ -15,7 +15,7 @@ import { getLocalPtyProvider } from '../../ipc/pty/provider/registry' import type { ManagedHookDetectionSettings } from '../installation/managed-hook-detection-commands' import { installRemoteManagedAgentHooks } from '../installation/remote-managed-hook-installers' import { getOpenCode2PluginSource, getOpenCodePluginSource } from '../../opencode/hook-service' -import { getPiAgentStatusExtensionSource } from '../../pi/agent-status-extension-source' +import { getPiAgentStatusExtensionSource } from '../../pi/managed-extensions/agent-status/agent-status-extension-source' import { codexHookService } from '../../codex/hooks/installation/hook-service' import type { AgentHookInstallStatus } from '../../../shared/agent-hook-listener/configuration/agent-hook-types' import type { PluginSources } from '../../../wsl-guest/plugin-sources' diff --git a/src/main/ai-vault/structured-chat-cli-fork.ts b/src/main/ai-vault/structured-chat-cli-fork.ts index 90af8d1dfa7..f44c0585500 100644 --- a/src/main/ai-vault/structured-chat-cli-fork.ts +++ b/src/main/ai-vault/structured-chat-cli-fork.ts @@ -18,7 +18,7 @@ import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host' import { isWslUncPath } from '../../shared/wsl-paths' import { getStructuredAgentSessionHost } from '../native-chat/agent-session-wire/host/structured-agent-session-registry' import { structuredAgentRuntimeMetadata } from '../runtime/agent-session/installation/structured-agent-runtime-metadata' -import { readPiSessionHeader } from '../pi/rpc-launch-resolution' +import { readPiSessionHeader } from '../pi/rpc/launch/rpc-launch-resolution' import { copyStructuredChatRecordConversation } from './structured-chat-conversation-copy' import { isAiVaultAgent } from './session-list-result-validation' import type { AgentJournalSnapshot } from '../../shared/agent-session/journal/agent-session-journal-types' diff --git a/src/main/ipc/pty-claude-agent-view-readiness.test.ts b/src/main/ipc/pty-claude-agent-view-readiness.test.ts deleted file mode 100644 index cb678ed7ea3..00000000000 --- a/src/main/ipc/pty-claude-agent-view-readiness.test.ts +++ /dev/null @@ -1,93 +0,0 @@ -import { describe, expect, it, onTestFinished, vi } from 'vitest' -import { join } from 'node:path' -import { tmpdir } from 'node:os' -import * as agentView from '../claude/agent-view/agent-view-service' -import { createGlobalSettingsFixture } from '../../shared/global-settings-test-fixture' -import { setupPtyIpcSuite } from './pty/pty-ipc-test-harness' -import { createDaemonActiveProviderFixtures } from './pty/pty-ipc-daemon-provider-fixtures' - -vi.mock('electron', () => import('./pty/pty-ipc-mock-registry').then((m) => m.electronModuleMock())) -vi.mock('fs', () => import('./pty/pty-ipc-mock-registry').then((m) => m.fsModuleMock())) -vi.mock('node-pty', () => import('./pty/pty-ipc-mock-registry').then((m) => m.nodePtyModuleMock())) -vi.mock('node:child_process', async (importOriginal) => - (await import('./pty/pty-ipc-mock-registry')).childProcessModuleMock(await importOriginal()) -) -vi.mock('../opencode/hook-service', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.openCodeHookServiceModuleMock()) -) -vi.mock('../mimo/hook-service', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.mimoHookServiceModuleMock()) -) -vi.mock('../agent-hooks/server/agent-hook-server', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.agentHookServerModuleMock()) -) -vi.mock('../pi/titlebar-extension-service', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.piTitlebarExtensionModuleMock()) -) -vi.mock('../pty/shell-startup/pwsh', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.pwshModuleMock()) -) -vi.mock('../wsl/filesystem/unc-path-access', async (importOriginal) => - (await import('./pty/pty-ipc-mock-registry')).wslModuleMock(await importOriginal()) -) -vi.mock('../telemetry/client', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.telemetryClientModuleMock()) -) -vi.mock('../telemetry/classify-error', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.classifyErrorModuleMock()) -) -vi.mock('../cli/launchers/linux-terminal-orca-cli-shim', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.linuxCliShimModuleMock()) -) -vi.mock('../memory/pty-registry', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.ptyRegistryModuleMock()) -) -vi.mock('../agent-hooks/observations/migration-unsupported-pty-state', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.migrationUnsupportedPtyModuleMock()) -) -vi.mock('../codex/configuration/homes/codex-pane-account-registry', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.codexPaneAccountRegistryModuleMock()) -) -vi.mock('../codex/history/index/codex-state-db-backfill-recovery', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.codexBackfillRecoveryModuleMock()) -) - -describe.each(['local', 'daemon'] as const)('%s PTY navigation readiness', (provider) => { - const { handlers, mainWindow, spawnAndGetEnv } = setupPtyIpcSuite() - const { daemonSpawnAndGetEnv } = createDaemonActiveProviderFixtures({ handlers, mainWindow }) - - it('spawns a plain shell while reconciliation is pending', async () => { - const gate = Promise.withResolvers() - const reconcileStarted = Promise.withResolvers() - const config = join(tmpdir(), 'orca-spawn-pending-agent-view-config') - vi.stubEnv('CLAUDE_CONFIG_DIR', config) - const service = new agentView.ClaudeAgentViewService( - join(tmpdir(), 'orca-spawn-pending-agent-view'), - { - reconcileConfig: () => { - reconcileStarted.resolve() - return gate.promise - }, - ensurePlugin: async () => join(tmpdir(), 'orca-spawn-agent-view-plugin'), - loginEnv: async () => ({ CLAUDE_CONFIG_DIR: config }), - listProfiles: async () => [] - } - ) - const serviceSpy = vi.spyOn(agentView, 'getClaudeAgentViewService').mockReturnValue(service) - // Runs on timeout too, when a regressed spawn never settles. - onTestFinished(() => { - gate.resolve() - serviceSpy.mockRestore() - vi.unstubAllEnvs() - }) - const settings = createGlobalSettingsFixture({ claudeSubagentNavigationEnabled: true }) - const reconcile = service.reconcile(settings) - await reconcileStarted.promise - const env = await (provider === 'daemon' - ? daemonSpawnAndGetEnv({}, undefined, () => settings) - : spawnAndGetEnv({}, undefined, undefined, () => settings)) - expect(env).not.toHaveProperty('ORCA_CLAUDE_AGENT_VIEW_PLUGIN_DIR') - gate.resolve() - await reconcile - }) -}) diff --git a/src/main/ipc/pty-degraded-fallback-single-ingest.test.ts b/src/main/ipc/pty-degraded-fallback-single-ingest.test.ts deleted file mode 100644 index e88c9e85c39..00000000000 --- a/src/main/ipc/pty-degraded-fallback-single-ingest.test.ts +++ /dev/null @@ -1,138 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' -import { spawnMock } from './pty/pty-ipc-mock-registry' -import { setupPtyIpcSuite } from './pty/pty-ipc-test-harness' -import { registerPtyHandlers } from './pty/register-handlers' -import { getLocalPtyProvider, setLocalPtyProvider } from './pty/provider/registry' -import { rebindLocalProviderListeners } from './pty/provider/listener-lifecycle' -import { DegradedDaemonPtyProvider } from '../daemon/providers/routing/degraded-daemon-pty-provider' -import type { DaemonPtyAdapter } from '../daemon/providers/adapter/daemon-pty-adapter' -import type { PtyDataEvent } from '../providers/pty-provider-events' -import { OrcaRuntimeService } from '../runtime/orca-runtime' - -vi.mock('electron', () => import('./pty/pty-ipc-mock-registry').then((m) => m.electronModuleMock())) -vi.mock('fs', () => import('./pty/pty-ipc-mock-registry').then((m) => m.fsModuleMock())) -vi.mock('node-pty', () => import('./pty/pty-ipc-mock-registry').then((m) => m.nodePtyModuleMock())) -vi.mock('node:child_process', async (importOriginal) => - (await import('./pty/pty-ipc-mock-registry')).childProcessModuleMock(await importOriginal()) -) -vi.mock('../opencode/hook-service', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.openCodeHookServiceModuleMock()) -) -vi.mock('../mimo/hook-service', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.mimoHookServiceModuleMock()) -) -vi.mock('../agent-hooks/server/agent-hook-server', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.agentHookServerModuleMock()) -) -vi.mock('../pi/titlebar-extension-service', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.piTitlebarExtensionModuleMock()) -) -vi.mock('../pty/shell-startup/pwsh', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.pwshModuleMock()) -) -vi.mock('../wsl/filesystem/unc-path-access', async (importOriginal) => - (await import('./pty/pty-ipc-mock-registry')).wslModuleMock(await importOriginal()) -) -vi.mock('../telemetry/client', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.telemetryClientModuleMock()) -) -vi.mock('../telemetry/classify-error', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.classifyErrorModuleMock()) -) -vi.mock('../cli/launchers/linux-terminal-orca-cli-shim', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.linuxCliShimModuleMock()) -) -vi.mock('../memory/pty-registry', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.ptyRegistryModuleMock()) -) -vi.mock('../agent-hooks/observations/migration-unsupported-pty-state', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.migrationUnsupportedPtyModuleMock()) -) -vi.mock('../codex/configuration/homes/codex-pane-account-registry', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.codexPaneAccountRegistryModuleMock()) -) -vi.mock('../codex/history/index/codex-state-db-backfill-recovery', () => - import('./pty/pty-ipc-mock-registry').then((m) => m.codexBackfillRecoveryModuleMock()) -) - -// A daemon whose PTY spawn check failed: fresh terminals go to the in-process fallback. -function createUnhealthyDaemonAdapter(daemonData: ((payload: PtyDataEvent) => void)[]) { - return { - spawn: vi.fn(async () => { - throw new Error('fresh spawns must not reach the unhealthy daemon') - }), - listProcesses: vi.fn(async () => []), - onData: vi.fn((cb: (payload: PtyDataEvent) => void) => { - daemonData.push(cb) - return () => {} - }), - onReplay: vi.fn(() => () => {}), - onExit: vi.fn(() => () => {}), - onWriteUnavailable: vi.fn(() => () => {}) - } -} - -describe('degraded daemon with in-process fallback', () => { - const { handlers, mainWindow, createMockProc } = setupPtyIpcSuite() - - it('feeds each fallback PTY chunk and exit to the runtime once', async () => { - vi.useFakeTimers() - const mockProc = createMockProc() - spawnMock.mockReturnValue(mockProc.proc) - const runtime = new OrcaRuntimeService() - const onPtyData = vi.spyOn(runtime, 'onPtyData') - const onPtyExit = vi.spyOn(runtime, 'onPtyExit') - const daemonData: ((payload: PtyDataEvent) => void)[] = [] - try { - handlers.clear() - // The window registers first, so the in-process provider is configured to feed the runtime. - registerPtyHandlers(mainWindow, runtime) - setLocalPtyProvider( - new DegradedDaemonPtyProvider({ - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the degraded provider reaches only these adapter members on this spawn/data/exit path. - current: createUnhealthyDaemonAdapter(daemonData) as unknown as DaemonPtyAdapter, - legacy: [], - fallback: getLocalPtyProvider() - }) - ) - rebindLocalProviderListeners() - - const spawned: unknown = await handlers.get('pty:spawn')!(null, { - cols: 80, - rows: 24, - cwd: '/tmp' - }) - if ( - !spawned || - typeof spawned !== 'object' || - !('id' in spawned) || - typeof spawned.id !== 'string' - ) { - throw new Error('pty:spawn returned no id') - } - const { id } = spawned - mockProc.emitData('frame') - daemonData.forEach((cb) => cb({ id: 'daemon-pty', data: 'daemon' })) - await vi.advanceTimersByTimeAsync(50) - - expect(onPtyData.mock.calls).toEqual([ - [id, 'frame', expect.any(Number), 5, undefined], - ['daemon-pty', 'daemon', expect.any(Number), 6, undefined] - ]) - expect(runtime.getPtyOutputSequence(id)).toBe(5) - expect(runtime.getPtyOutputSequence('daemon-pty')).toBe(6) - expect(mainWindow.webContents.send).toHaveBeenCalledWith('pty:data', { - id, - data: 'frame', - seq: 5, - rawLength: 5 - }) - - mockProc.emitExit(0) - await vi.advanceTimersByTimeAsync(50) - expect(onPtyExit).toHaveBeenCalledTimes(1) - } finally { - vi.useRealTimers() - } - }) -}) diff --git a/src/main/ipc/pty-spawn-saved-resume-admission.test.ts b/src/main/ipc/pty-spawn-saved-resume-admission.test.ts index 2ebabc0eb7e..4a42b8c61ac 100644 --- a/src/main/ipc/pty-spawn-saved-resume-admission.test.ts +++ b/src/main/ipc/pty-spawn-saved-resume-admission.test.ts @@ -27,7 +27,7 @@ vi.mock('../mimo/hook-service', () => vi.mock('../agent-hooks/server/agent-hook-server', () => import('./pty/pty-ipc-mock-registry').then((m) => m.agentHookServerModuleMock()) ) -vi.mock('../pi/titlebar-extension-service', () => +vi.mock('../pi/managed-extensions/titlebar-extension-service', () => import('./pty/pty-ipc-mock-registry').then((m) => m.piTitlebarExtensionModuleMock()) ) vi.mock('../pty/shell-startup/pwsh', () => diff --git a/src/main/ipc/pty/host-env/assembly.ts b/src/main/ipc/pty/host-env/assembly.ts index 2e2b35582de..76de0e5e8cd 100644 --- a/src/main/ipc/pty/host-env/assembly.ts +++ b/src/main/ipc/pty/host-env/assembly.ts @@ -11,7 +11,7 @@ import { mimoCodeHookService } from '../../../mimo/hook-service' import { agentHookServer } from '../../../agent-hooks/server/agent-hook-server' import { wslHookRelayManager } from '../../../agent-hooks/wsl-relay/wsl-hook-relay-manager' import { wslInteropHealthMonitor } from '../../../wsl/execution/wsl-interop-health' -import { piTitlebarExtensionService } from '../../../pi/titlebar-extension-service' +import { piTitlebarExtensionService } from '../../../pi/managed-extensions/titlebar-extension-service' import { prependOrcaCliDirToChildPath } from '../../../cli/launchers/orca-cli-child-path' import { getManagedWslCliDir, getWslCliCommandName } from '../../../cli/wsl/wsl-managed-cli' import { stripLegacyTerminalShimEnv } from '../../../pty/shell-startup/legacy-terminal-shim-dir' diff --git a/src/main/ipc/pty/host-env/opencode-hook-installation.test.ts b/src/main/ipc/pty/host-env/opencode-hook-installation.test.ts index 15106d5b651..99bed2cf87a 100644 --- a/src/main/ipc/pty/host-env/opencode-hook-installation.test.ts +++ b/src/main/ipc/pty/host-env/opencode-hook-installation.test.ts @@ -21,7 +21,7 @@ vi.mock('../../../agent-hooks/wsl-relay/wsl-hook-relay-manager', () => ({ getGuestAgentPath: () => null } })) -vi.mock('../../../pi/titlebar-extension-service', () => ({ +vi.mock('../../../pi/managed-extensions/titlebar-extension-service', () => ({ piTitlebarExtensionService: { buildPtyEnv: () => ({}), buildFreshOmpEnv: () => ({}) } })) vi.mock('../../../cli/launchers/orca-cli-child-path', () => ({ diff --git a/src/main/ipc/pty/provider/state-cleanup.ts b/src/main/ipc/pty/provider/state-cleanup.ts index 59a9b1bfbe3..b5c679a2aa0 100644 --- a/src/main/ipc/pty/provider/state-cleanup.ts +++ b/src/main/ipc/pty/provider/state-cleanup.ts @@ -2,7 +2,7 @@ import { advertisedUrlWatcher } from '../../../ports/advertised-url-watcher' import { unregisterPty } from '../../../memory/pty-registry' import { forgetCodexPaneAccount } from '../../../codex/configuration/homes/codex-pane-account-registry' import { openCodeHookService } from '../../../opencode/hook-service' -import { piTitlebarExtensionService } from '../../../pi/titlebar-extension-service' +import { piTitlebarExtensionService } from '../../../pi/managed-extensions/titlebar-extension-service' import { agentHookServer } from '../../../agent-hooks/server/agent-hook-server' import { clearMigrationUnsupportedPty } from '../../../agent-hooks/observations/migration-unsupported-pty-state' import { clearNativeWindowsConptyPty } from '../../../runtime/terminal/output/terminal-model-query-authority' diff --git a/src/main/ipc/pty/pty-closed-pane-spawn-refusal.test.ts b/src/main/ipc/pty/pty-closed-pane-spawn-refusal.test.ts index 2f0e6ce96da..a9d56c5f29f 100644 --- a/src/main/ipc/pty/pty-closed-pane-spawn-refusal.test.ts +++ b/src/main/ipc/pty/pty-closed-pane-spawn-refusal.test.ts @@ -27,7 +27,7 @@ vi.mock('../../mimo/hook-service', () => vi.mock('../../agent-hooks/server/agent-hook-server', () => import('./pty-ipc-mock-registry').then((m) => m.agentHookServerModuleMock()) ) -vi.mock('../../pi/titlebar-extension-service', () => +vi.mock('../../pi/managed-extensions/titlebar-extension-service', () => import('./pty-ipc-mock-registry').then((m) => m.piTitlebarExtensionModuleMock()) ) vi.mock('../../pty/shell-startup/pwsh', () => diff --git a/src/main/ipc/pty/pty-controller-ownership-routing.test.ts b/src/main/ipc/pty/pty-controller-ownership-routing.test.ts index 7766d3392c3..cd63e35691c 100644 --- a/src/main/ipc/pty/pty-controller-ownership-routing.test.ts +++ b/src/main/ipc/pty/pty-controller-ownership-routing.test.ts @@ -1,7 +1,6 @@ import { describe, expect, it, vi } from 'vitest' import { setupPtyIpcSuite } from './pty-ipc-test-harness' -import type { AgentSessionOwnerBinding } from '../../../shared/agent-session/agent-session-host-authority' -import { registerPtyHandlers } from './register-handlers' + import { clearProviderPtyState } from './provider/state-cleanup' import { setLocalPtyProvider } from './provider/registry' @@ -20,7 +19,7 @@ vi.mock('../../mimo/hook-service', () => vi.mock('../../agent-hooks/server/agent-hook-server', () => import('./pty-ipc-mock-registry').then((m) => m.agentHookServerModuleMock()) ) -vi.mock('../../pi/titlebar-extension-service', () => +vi.mock('../../pi/managed-extensions/titlebar-extension-service', () => import('./pty-ipc-mock-registry').then((m) => m.piTitlebarExtensionModuleMock()) ) vi.mock('../../pty/shell-startup/pwsh', () => @@ -52,13 +51,7 @@ vi.mock('../../codex/history/index/codex-state-db-backfill-recovery', () => ) describe('registerPtyHandlers', () => { - const { - mainWindow, - createAgentClaimProvider, - recoveredAgentClaim, - recoveredAgentSurface, - registerAgentClaimController - } = setupPtyIpcSuite() + const { createAgentClaimProvider, registerAgentClaimController } = setupPtyIpcSuite() it('fails closed instead of routing encoded SSH PTY writes locally', () => { const ptyId = 'ssh:ssh-1@@remote-pty' @@ -85,55 +78,4 @@ describe('registerPtyHandlers', () => { ).rejects.toThrow('client_disconnected') expect(provider.spawn).not.toHaveBeenCalled() }) - it('rejects a canonical daemon owner that exited before its spawn reply', async () => { - const claim = { - ...recoveredAgentClaim, - identityDigest: 'ededededededededededededededededededededede' - } - const canonicalOwner: AgentSessionOwnerBinding = { - claim, - generation: 'generation-canonical-exited', - phase: 'live', - ptyId: 'pty-canonical-exited', - surface: recoveredAgentSurface - } - const physicalSpawn = vi.fn(async () => ({ - id: canonicalOwner.ptyId, - incarnationId: 'incarnation-canonical-exited', - exitedBeforeSpawnReply: true as const, - agentSessionEnsure: { disposition: 'adopted' as const, owner: canonicalOwner } - })) - const provider = createAgentClaimProvider({ spawn: physicalSpawn }) - setLocalPtyProvider(provider as never) - let controller: { spawn(args: Record): Promise } | undefined - const runtime = { - setPtyController: vi.fn((next) => { - controller = next - }), - beginPtyRegistration: vi.fn(), - cancelPendingPtyRegistration: vi.fn(), - registerPreAllocatedHandleForPty: vi.fn(), - registerPty: vi.fn() - } - registerPtyHandlers(mainWindow as never, runtime as never) - - await expect( - controller!.spawn({ - cols: 80, - rows: 24, - cwd: '/tmp/recovered-worktree', - sessionId: 'different-requested-id', - agentSessionEnsure: { claim, surface: recoveredAgentSurface } - }) - ).rejects.toThrow('agent_session_exited_during_start') - - expect(physicalSpawn).toHaveBeenCalledOnce() - expect(runtime.registerPty).not.toHaveBeenCalled() - expect(runtime.registerPreAllocatedHandleForPty).not.toHaveBeenCalled() - expect(runtime.cancelPendingPtyRegistration).toHaveBeenCalledWith( - 'different-requested-id', - 'incarnation-canonical-exited', - undefined - ) - }) }) diff --git a/src/main/ipc/pty/pty-controller-spawn-admission.test.ts b/src/main/ipc/pty/pty-controller-spawn-admission.test.ts index 594e4a22394..605b063fefe 100644 --- a/src/main/ipc/pty/pty-controller-spawn-admission.test.ts +++ b/src/main/ipc/pty/pty-controller-spawn-admission.test.ts @@ -18,7 +18,7 @@ vi.mock('../../mimo/hook-service', () => vi.mock('../../agent-hooks/server/agent-hook-server', () => import('./pty-ipc-mock-registry').then((m) => m.agentHookServerModuleMock()) ) -vi.mock('../../pi/titlebar-extension-service', () => +vi.mock('../../pi/managed-extensions/titlebar-extension-service', () => import('./pty-ipc-mock-registry').then((m) => m.piTitlebarExtensionModuleMock()) ) vi.mock('../../pty/shell-startup/pwsh', () => diff --git a/src/main/ipc/pty/pty-daemon-spawn-session-identity.test.ts b/src/main/ipc/pty/pty-daemon-spawn-session-identity.test.ts index 3ae41c7b8a3..e715524904a 100644 --- a/src/main/ipc/pty/pty-daemon-spawn-session-identity.test.ts +++ b/src/main/ipc/pty/pty-daemon-spawn-session-identity.test.ts @@ -18,7 +18,7 @@ vi.mock('../../mimo/hook-service', () => vi.mock('../../agent-hooks/server/agent-hook-server', () => import('./pty-ipc-mock-registry').then((m) => m.agentHookServerModuleMock()) ) -vi.mock('../../pi/titlebar-extension-service', () => +vi.mock('../../pi/managed-extensions/titlebar-extension-service', () => import('./pty-ipc-mock-registry').then((m) => m.piTitlebarExtensionModuleMock()) ) vi.mock('../../pty/shell-startup/pwsh', () => diff --git a/src/main/ipc/pty/pty-pane-reservation-settlement.test.ts b/src/main/ipc/pty/pty-pane-reservation-settlement.test.ts index eaa4f871787..ba6e5986ca4 100644 --- a/src/main/ipc/pty/pty-pane-reservation-settlement.test.ts +++ b/src/main/ipc/pty/pty-pane-reservation-settlement.test.ts @@ -19,7 +19,7 @@ vi.mock('../../mimo/hook-service', () => vi.mock('../../agent-hooks/server/agent-hook-server', () => import('./pty-ipc-mock-registry').then((m) => m.agentHookServerModuleMock()) ) -vi.mock('../../pi/titlebar-extension-service', () => +vi.mock('../../pi/managed-extensions/titlebar-extension-service', () => import('./pty-ipc-mock-registry').then((m) => m.piTitlebarExtensionModuleMock()) ) vi.mock('../../pty/shell-startup/pwsh', () => diff --git a/src/main/ipc/pty/pty-pane-restart-replace.test.ts b/src/main/ipc/pty/pty-pane-restart-replace.test.ts index 12150e52464..b5552544710 100644 --- a/src/main/ipc/pty/pty-pane-restart-replace.test.ts +++ b/src/main/ipc/pty/pty-pane-restart-replace.test.ts @@ -23,7 +23,7 @@ vi.mock('../../mimo/hook-service', () => vi.mock('../../agent-hooks/server/agent-hook-server', () => import('./pty-ipc-mock-registry').then((m) => m.agentHookServerModuleMock()) ) -vi.mock('../../pi/titlebar-extension-service', () => +vi.mock('../../pi/managed-extensions/titlebar-extension-service', () => import('./pty-ipc-mock-registry').then((m) => m.piTitlebarExtensionModuleMock()) ) vi.mock('../../pty/shell-startup/pwsh', () => diff --git a/src/main/ipc/pty/pty-runtime-kill-and-exit.test.ts b/src/main/ipc/pty/pty-runtime-kill-and-exit.test.ts index 1487ae1f706..c19a09eca5c 100644 --- a/src/main/ipc/pty/pty-runtime-kill-and-exit.test.ts +++ b/src/main/ipc/pty/pty-runtime-kill-and-exit.test.ts @@ -18,7 +18,7 @@ vi.mock('../../mimo/hook-service', () => vi.mock('../../agent-hooks/server/agent-hook-server', () => import('./pty-ipc-mock-registry').then((m) => m.agentHookServerModuleMock()) ) -vi.mock('../../pi/titlebar-extension-service', () => +vi.mock('../../pi/managed-extensions/titlebar-extension-service', () => import('./pty-ipc-mock-registry').then((m) => m.piTitlebarExtensionModuleMock()) ) vi.mock('../../pty/shell-startup/pwsh', () => diff --git a/src/main/ipc/pty/pty-runtime-ssh-binding-persistence.test.ts b/src/main/ipc/pty/pty-runtime-ssh-binding-persistence.test.ts index a26d14744c9..50bc73adce8 100644 --- a/src/main/ipc/pty/pty-runtime-ssh-binding-persistence.test.ts +++ b/src/main/ipc/pty/pty-runtime-ssh-binding-persistence.test.ts @@ -18,7 +18,7 @@ vi.mock('../../mimo/hook-service', () => vi.mock('../../agent-hooks/server/agent-hook-server', () => import('./pty-ipc-mock-registry').then((m) => m.agentHookServerModuleMock()) ) -vi.mock('../../pi/titlebar-extension-service', () => +vi.mock('../../pi/managed-extensions/titlebar-extension-service', () => import('./pty-ipc-mock-registry').then((m) => m.piTitlebarExtensionModuleMock()) ) vi.mock('../../pty/shell-startup/pwsh', () => diff --git a/src/main/ipc/pty/pty-session-liveness-and-ownership.test.ts b/src/main/ipc/pty/pty-session-liveness-and-ownership.test.ts index a98a4cd2f43..5be68cca32b 100644 --- a/src/main/ipc/pty/pty-session-liveness-and-ownership.test.ts +++ b/src/main/ipc/pty/pty-session-liveness-and-ownership.test.ts @@ -18,7 +18,7 @@ vi.mock('../../mimo/hook-service', () => vi.mock('../../agent-hooks/server/agent-hook-server', () => import('./pty-ipc-mock-registry').then((m) => m.agentHookServerModuleMock()) ) -vi.mock('../../pi/titlebar-extension-service', () => +vi.mock('../../pi/managed-extensions/titlebar-extension-service', () => import('./pty-ipc-mock-registry').then((m) => m.piTitlebarExtensionModuleMock()) ) vi.mock('../../pty/shell-startup/pwsh', () => @@ -50,31 +50,7 @@ vi.mock('../../codex/history/index/codex-state-db-backfill-recovery', () => ) describe('registerPtyHandlers', () => { - const { handlers, mainWindow, installDaemonTestProvider } = setupPtyIpcSuite() - - it('reports only daemon-minted local sessions the provider answers are absent', async () => { - const minted = (name: string): string => `repo::/worktree@@${name}` - registerPtyHandlers(mainWindow as never) - installDaemonTestProvider({ - canProvideAuthoritativeBufferSnapshot: (id: string) => id === minted('snapshot'), - probePtyLiveness: async (id: string) => - id === minted('live') ? true : id === minted('unobserved') ? null : false - }) - - await expect( - handlers.get('pty:getGoneSessionIds')!(null, { - ids: [ - minted('dead'), - minted('live'), - minted('unobserved'), - minted('snapshot'), - // A legacy bare id resolves local by fallback but may be an old SSH pane. - 'legacy-bare-pty', - 'remote:env-1@@terminal-1' - ] - }) - ).resolves.toEqual([minted('dead')]) - }) + const { handlers, mainWindow } = setupPtyIpcSuite() it('never answers liveness for a paired-runtime handle from the local registry', async () => { const hasPty = vi.fn(() => false) diff --git a/src/main/ipc/pty/pty-spawn-cwd-fallback.test.ts b/src/main/ipc/pty/pty-spawn-cwd-fallback.test.ts index 2321328f301..228238fbc0d 100644 --- a/src/main/ipc/pty/pty-spawn-cwd-fallback.test.ts +++ b/src/main/ipc/pty/pty-spawn-cwd-fallback.test.ts @@ -20,7 +20,7 @@ vi.mock('../../mimo/hook-service', () => vi.mock('../../agent-hooks/server/agent-hook-server', () => import('./pty-ipc-mock-registry').then((m) => m.agentHookServerModuleMock()) ) -vi.mock('../../pi/titlebar-extension-service', () => +vi.mock('../../pi/managed-extensions/titlebar-extension-service', () => import('./pty-ipc-mock-registry').then((m) => m.piTitlebarExtensionModuleMock()) ) vi.mock('../../pty/shell-startup/pwsh', () => diff --git a/src/main/ipc/pty/pty-ssh-stop-verdict.test.ts b/src/main/ipc/pty/pty-ssh-stop-verdict.test.ts index c3008c54838..802c875ffd9 100644 --- a/src/main/ipc/pty/pty-ssh-stop-verdict.test.ts +++ b/src/main/ipc/pty/pty-ssh-stop-verdict.test.ts @@ -2,12 +2,7 @@ import { describe, expect, it, vi } from 'vitest' import { setupPtyIpcSuite } from './pty-ipc-test-harness' import { registerPtyHandlers } from './register-handlers' -import { - deletePtyOwnership, - ptyIncarnationById, - ptyOwnership, - setPtyOwnership -} from './provider/ownership-state' +import { deletePtyOwnership, setPtyOwnership } from './provider/ownership-state' vi.mock('electron', () => import('./pty-ipc-mock-registry').then((m) => m.electronModuleMock())) vi.mock('fs', () => import('./pty-ipc-mock-registry').then((m) => m.fsModuleMock())) @@ -24,7 +19,7 @@ vi.mock('../../mimo/hook-service', () => vi.mock('../../agent-hooks/server/agent-hook-server', () => import('./pty-ipc-mock-registry').then((m) => m.agentHookServerModuleMock()) ) -vi.mock('../../pi/titlebar-extension-service', () => +vi.mock('../../pi/managed-extensions/titlebar-extension-service', () => import('./pty-ipc-mock-registry').then((m) => m.piTitlebarExtensionModuleMock()) ) vi.mock('../../pty/shell-startup/pwsh', () => @@ -103,24 +98,4 @@ describe('stopping a PTY whose SSH provider is unregistered', () => { ) deletePtyOwnership('ssh-detached-stop') }) - - it('leaves a same-id respawn alone when the rejected incarnation is retired', () => { - const ptyId = 'ssh-respawned-split' - // The rejected spawn's stop already retired its incarnation; a respawn took the id since. - setPtyOwnership(ptyId, 'ssh:ssh-live') - ptyIncarnationById.set(ptyId, 'inc-respawn') - const { controller, runtime } = installController() - try { - controller.retireRejectedPty(ptyId, true, 'inc-rejected') - controller.retireRejectedPty(ptyId, false, 'inc-rejected') - - expect(ptyOwnership.get(ptyId)).toBe('ssh:ssh-live') - expect(ptyIncarnationById.get(ptyId)).toBe('inc-respawn') - expect(runtime.onPtyExit).not.toHaveBeenCalled() - expect(runtime.markPtyLivenessUnverifiable).not.toHaveBeenCalled() - } finally { - ptyIncarnationById.delete(ptyId) - deletePtyOwnership(ptyId) - } - }) }) diff --git a/src/main/ipc/pty/pty-write-ipc-validation.test.ts b/src/main/ipc/pty/pty-write-ipc-validation.test.ts index 28e7899473d..7823629061a 100644 --- a/src/main/ipc/pty/pty-write-ipc-validation.test.ts +++ b/src/main/ipc/pty/pty-write-ipc-validation.test.ts @@ -19,7 +19,7 @@ vi.mock('../../mimo/hook-service', () => vi.mock('../../agent-hooks/server/agent-hook-server', () => import('./pty-ipc-mock-registry').then((m) => m.agentHookServerModuleMock()) ) -vi.mock('../../pi/titlebar-extension-service', () => +vi.mock('../../pi/managed-extensions/titlebar-extension-service', () => import('./pty-ipc-mock-registry').then((m) => m.piTitlebarExtensionModuleMock()) ) vi.mock('../../pty/shell-startup/pwsh', () => diff --git a/src/main/native-chat/agent-session-journal/history-import/adopted-transcript-source.ts b/src/main/native-chat/agent-session-journal/history-import/adopted-transcript-source.ts index 48d03063648..36fff34b4b6 100644 --- a/src/main/native-chat/agent-session-journal/history-import/adopted-transcript-source.ts +++ b/src/main/native-chat/agent-session-journal/history-import/adopted-transcript-source.ts @@ -7,7 +7,7 @@ import { extractString, parseJsonObject } from '../../../ai-vault/session-scanne import { asRecord } from '../../../ai-vault/session-scanner-record-value' import { readOpenCodeTranscriptSignalViaWorker } from '../../../ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-sqlite-worker-spawn' -import { samePiDirectory } from '../../../pi/rpc-launch-resolution' +import { samePiDirectory } from '../../../pi/rpc/launch/rpc-launch-resolution' import { admitTranscriptPath } from '../../transcript-path-admission' import { adoptedDirectoryProbes } from './adopted-directory-probe' diff --git a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-options-read-scaling.test.ts b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-options-read-scaling.test.ts deleted file mode 100644 index 8e5f40c4fb2..00000000000 --- a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-options-read-scaling.test.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { expect, it } from 'vitest' -import { hostTestCatalogReadOperation } from './structured-agent-session-host-test-data' -import '../../../../../shared/agent-session/lifecycle/agent-session-conversation-view' -import '../../../agent-model-catalog/agent-model-catalog-service' -import '../../../agent-model-catalog/agent-model-catalog-store' -import { PiRpcOptionObservations, type PiRpcOptionProof } from '../../../../pi/rpc-options' -import { piOptionRefreshHost } from './structured-agent-session-option-refresh.test-fixture' - -it('pairs the latest saved input with its report only after the resting read completes', async () => { - const host = piOptionRefreshHost() - host.record.options.effort = 'off' - const proof: PiRpcOptionProof = { - current: new Map([ - ['model', host.record.options.model], - ['effort', 'off'] - ]), - writes: new Map() - } - const observations = new PiRpcOptionObservations(proof, () => true) - observations.prepare()({ - models: host.models, - current: { model: host.record.options.model, effort: 'minimal', confirmed: ['model', 'effort'] } - }) - host.live = observations.read() - const entered = Promise.withResolvers() - const catalog = - Promise.withResolvers['read']>>>() - host.modelCatalog = { - captureRead: hostTestCatalogReadOperation, - read: () => { - entered.resolve() - return catalog.promise - } - } - const answer = host.read() - await entered.promise - host.record.options.effort = 'high' - catalog.resolve(host.home) - const result = await answer - expect(result.current.effort).toBe('high') - expect(result.current.reportedEffort).toBeUndefined() - expect(result.current.confirmed).not.toContain('effort') - expect(result).not.toHaveProperty('projectCurrent') - expect(result).not.toHaveProperty('effortFixed') -}) diff --git a/src/main/pi/agent-status-compaction.test.ts b/src/main/pi/agent-status-compaction.test.ts deleted file mode 100644 index e16d5665bfd..00000000000 --- a/src/main/pi/agent-status-compaction.test.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' - -import { - createAgentStatusExtensionHarness, - type AgentStatusExtensionHarness -} from './agent-status-extension-test-harness' -import { idle } from './agent-status-subagent-event-fixtures' - -const busy = { isIdle: () => false } - -function reply(stopReason: string): { messages: unknown[] } { - return { messages: [{ role: 'user' }, { role: 'assistant', stopReason }] } -} - -// The posts after the run starts, reduced to the fields the host reads for a compaction tail. -function tail(harness: AgentStatusExtensionHarness): Record[] { - return harness.fetchMock.mock.calls - .map((call) => JSON.parse(String(call[1]?.body)).payload) - .filter((payload) => payload.hook_event_name !== 'agent_start') - .map(({ hook_event_name, turn_completed_at, is_idle }) => ({ - hook_event_name, - turn_completed_at, - is_idle - })) -} - -// Why: the post queue keeps only the latest pending snapshot, and Pi's compaction posts are minutes apart. -async function step( - harness: AgentStatusExtensionHarness, - name: string, - event?: unknown, - context?: { isIdle: () => boolean; hasPendingMessages?: () => boolean } -): Promise { - await harness.callHook(name, event, context) - await vi.advanceTimersByTimeAsync(0) -} - -describe('Pi compaction after a finished reply', () => { - beforeEach(() => vi.useFakeTimers()) - afterEach(() => vi.useRealTimers()) - - it('stamps a compaction before settle and the settled completion with the reply finish', async () => { - const harness = createAgentStatusExtensionHarness({ kind: 'pi' }) - await step(harness, 'agent_start') - await step(harness, 'agent_end', reply('stop'), busy) - await step(harness, 'session_before_compact', { reason: 'threshold', willRetry: false }) - await step(harness, 'session_compact', {}) - await step(harness, 'agent_settled', undefined, idle) - - const [start, settled] = tail(harness) - expect(start).toEqual({ - hook_event_name: 'compaction_start', - turn_completed_at: expect.any(Number) - }) - expect(settled).toEqual({ - hook_event_name: 'agent_end', - turn_completed_at: start?.turn_completed_at - }) - }) -}) diff --git a/src/main/pi/agent-status-omp-plan-review.test.ts b/src/main/pi/agent-status-omp-plan-review.test.ts deleted file mode 100644 index a1cf028d51b..00000000000 --- a/src/main/pi/agent-status-omp-plan-review.test.ts +++ /dev/null @@ -1,87 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' - -import { buildOmpPlanReviewAnswer } from '../../shared/omp-plan-review-prompt' -import { - createAgentStatusExtensionHarness, - type HookContext -} from './agent-status-extension-test-harness' - -// Shape captured from omp 18.12.2's plan_review_requested. -const REVIEW_ID = '86949d10-20aa-46d4-9359-4e1e71467d8f' -const PLAN_REVIEW_REQUEST = { - type: 'plan_review_requested', - reviewId: REVIEW_ID, - sessionId: 'session-1', - title: 'Add-a-greeting', - planFilePath: 'local://demo-plan.md', - planContent: '# Add a greeting\n\n1. Create hello.txt\n', - options: [ - { id: 'execute', label: 'Approve and execute', disabled: false }, - { id: 'keep', label: 'Approve and keep context (~7.1k / 8.2k)', disabled: true }, - { id: 'refine', label: 'Refine plan', disabled: false } - ] -} - -function createPlanReviewContext(): { - ctx: HookContext - resolvePlanReview: ReturnType - readInput: (data: string) => { consume?: boolean; data?: string } | undefined -} { - let listener: ((data: string) => { consume?: boolean; data?: string } | undefined) | null = null - const resolvePlanReview = vi.fn(() => true) - return { - ctx: { - isIdle: () => true, - resolvePlanReview, - ui: { - onTerminalInput: (handler) => { - listener = handler - return () => { - listener = null - } - } - } - }, - resolvePlanReview, - readInput: (data) => listener?.(data) - } -} - -describe('OMP plan review forwarding', () => { - it('posts the open review and answers it from the terminal input Orca writes', async () => { - const harness = createAgentStatusExtensionHarness({ kind: 'omp' }) - const { ctx, resolvePlanReview, readInput } = createPlanReviewContext() - - await harness.callHook('plan_review_requested', PLAN_REVIEW_REQUEST, ctx) - expect(readInput('x')).toBeUndefined() - expect(readInput(buildOmpPlanReviewAnswer('stale-review', 'execute'))).toEqual({ - consume: true - }) - expect(resolvePlanReview).not.toHaveBeenCalled() - expect(readInput(buildOmpPlanReviewAnswer(REVIEW_ID, 'execute'))).toEqual({ consume: true }) - expect(resolvePlanReview).toHaveBeenCalledWith(REVIEW_ID, 'execute') - - await harness.callHook( - 'plan_review_resolved', - { reviewId: REVIEW_ID, choice: 'execute', by: 'extension' }, - ctx - ) - expect(readInput(buildOmpPlanReviewAnswer(REVIEW_ID, 'execute'))).toBeUndefined() - - await vi.waitFor(() => expect(harness.fetchMock).toHaveBeenCalledTimes(2)) - expect( - harness.fetchMock.mock.calls.map(([, init]) => JSON.parse(String(init?.body)).payload) - ).toEqual([ - expect.objectContaining({ - hook_event_name: 'plan_review_requested', - review_id: REVIEW_ID, - plan: PLAN_REVIEW_REQUEST.planContent, - options: [ - { id: 'execute', label: 'Approve and execute' }, - { id: 'refine', label: 'Refine plan' } - ] - }), - expect.objectContaining({ hook_event_name: 'plan_review_resolved', is_idle: true }) - ]) - }) -}) diff --git a/src/main/pi/agent-status-reload-delivery.test.ts b/src/main/pi/agent-status-reload-delivery.test.ts deleted file mode 100644 index d8b4b9e4f7a..00000000000 --- a/src/main/pi/agent-status-reload-delivery.test.ts +++ /dev/null @@ -1,87 +0,0 @@ -import { afterEach, beforeEach, expect, it, vi } from 'vitest' -import { createAgentStatusExtensionHarness } from './agent-status-extension-test-harness' -import { agentEndCount, endTurn, posts } from './agent-status-subagent-event-fixtures' - -beforeEach(() => vi.useFakeTimers()) -afterEach(() => vi.useRealTimers()) - -it('does not overwrite the next turn with an old completion retried across reload', async () => { - const harness = createAgentStatusExtensionHarness({ kind: 'pi', existsSync: () => true }) - const ctx = { - isIdle: () => true, - sessionManager: { getSessionId: () => 'A', getSessionFile: () => '/sessions/A.jsonl' } - } - await harness.callHook('session_start', { reason: 'startup' }, ctx) - await harness.callHook('agent_start', {}, ctx) - await vi.advanceTimersByTimeAsync(0) - harness.fetchMock.mockRejectedValueOnce(new Error('offline')) - await endTurn(harness) - harness.fetchMock.mockRejectedValueOnce(new Error('still offline')) - await harness.reloadPi() - await vi.advanceTimersByTimeAsync(0) - await harness.callHook('session_start', { reason: 'reload' }, ctx) - const completionCount = agentEndCount(harness) - await harness.callHook('agent_start', {}, ctx) - await vi.advanceTimersByTimeAsync(1_000) - expect(agentEndCount(harness)).toBe(completionCount) - - expect(posts(harness).at(-1)).toMatchObject({ hook_event_name: 'agent_start', session_id: 'A' }) -}) - -it.each(['failure', 'success'] as const)( - 'serializes the next turn behind an in-flight completion on reload (%s)', - async (delivery) => { - const harness = createAgentStatusExtensionHarness({ kind: 'pi', existsSync: () => true }) - const ctx = { - isIdle: () => true, - sessionManager: { getSessionId: () => 'A', getSessionFile: () => '/sessions/A.jsonl' } - } - await harness.callHook('session_start', { reason: 'startup' }, ctx) - await harness.callHook('agent_start', {}, ctx) - await vi.advanceTimersByTimeAsync(0) - let acknowledge: ((value: { ok: boolean }) => void) | undefined - let fail: ((error: Error) => void) | undefined - harness.fetchMock.mockImplementationOnce( - () => - new Promise((resolve, reject) => { - acknowledge = resolve - fail = reject - }) - ) - await endTurn(harness) - await harness.reloadPi() - await harness.callHook('session_start', { reason: 'reload' }, ctx) - await harness.callHook('agent_start', {}, ctx) - await vi.advanceTimersByTimeAsync(0) - expect(posts(harness).at(-1)).toMatchObject({ hook_event_name: 'agent_end', session_id: 'A' }) - const completionCount = agentEndCount(harness) - if (delivery === 'failure') { - fail?.(new Error('late failure')) - } else { - acknowledge?.({ ok: true }) - } - await vi.advanceTimersByTimeAsync(5_000) - expect(agentEndCount(harness)).toBe(completionCount) - expect(posts(harness).at(-1)).toMatchObject({ hook_event_name: 'agent_start', session_id: 'A' }) - expect(vi.getTimerCount()).toBe(0) - } -) - -it('recovers a completion on reload without requiring a new turn', async () => { - const harness = createAgentStatusExtensionHarness({ kind: 'pi', existsSync: () => true }) - const ctx = { - isIdle: () => true, - sessionManager: { getSessionId: () => 'A', getSessionFile: () => '/sessions/A.jsonl' } - } - await harness.callHook('session_start', { reason: 'startup' }, ctx) - await harness.callHook('agent_start', {}, ctx) - await vi.advanceTimersByTimeAsync(0) - harness.fetchMock.mockRejectedValueOnce(new Error('offline')) - await endTurn(harness) - await harness.reloadPi() - await harness.callHook('session_start', { reason: 'reload' }, ctx) - await vi.advanceTimersByTimeAsync(5_000) - expect(agentEndCount(harness)).toBe(2) - expect(posts(harness).at(-1)).toMatchObject({ hook_event_name: 'agent_end', session_id: 'A' }) - expect(vi.getTimerCount()).toBe(0) -}) diff --git a/src/main/pi/agent-status-compaction-source.ts b/src/main/pi/managed-extensions/agent-status/agent-status-compaction-source.ts similarity index 96% rename from src/main/pi/agent-status-compaction-source.ts rename to src/main/pi/managed-extensions/agent-status/agent-status-compaction-source.ts index cff05f0f38d..b5445da4c90 100644 --- a/src/main/pi/agent-status-compaction-source.ts +++ b/src/main/pi/managed-extensions/agent-status/agent-status-compaction-source.ts @@ -1,4 +1,4 @@ -import type { PiAgentKind } from '../../shared/pi-agent-kind' +import type { PiAgentKind } from '../../../../shared/pi-agent-kind' /** Attribute between-turn compaction to the finished reply so the host can announce completion before compaction ends. */ export function getPiAgentStatusCompactionHandlerSourceLines(kind: PiAgentKind): string[] { diff --git a/src/main/pi/agent-status-completion-delivery.test.ts b/src/main/pi/managed-extensions/agent-status/agent-status-completion-delivery.test.ts similarity index 66% rename from src/main/pi/agent-status-completion-delivery.test.ts rename to src/main/pi/managed-extensions/agent-status/agent-status-completion-delivery.test.ts index 4088310d25f..fee8d1b0757 100644 --- a/src/main/pi/agent-status-completion-delivery.test.ts +++ b/src/main/pi/managed-extensions/agent-status/agent-status-completion-delivery.test.ts @@ -28,17 +28,4 @@ describe('OMP completion delivery', () => { { hook_event_name: 'agent_start' } ]) }) - - it('retries a timed out completion without blocking agent handlers', async () => { - const harness = createAgentStatusExtensionHarness({ kind: 'omp' }) - harness.fetchMock.mockImplementationOnce(() => new Promise(() => {})) - await harness.callHook('agent_end') - await vi.advanceTimersByTimeAsync(1251) - expect(events(harness.fetchMock)).toEqual([ - { hook_event_name: 'agent_end' }, - { hook_event_name: 'agent_end' } - ]) - expect(harness.fetchMock.mock.calls[0]?.[1]?.signal.aborted).toBe(true) - expect(vi.getTimerCount()).toBe(0) - }) }) diff --git a/src/main/pi/agent-status-extension-nested-run-settlement.test.ts b/src/main/pi/managed-extensions/agent-status/agent-status-extension-nested-run-settlement.test.ts similarity index 100% rename from src/main/pi/agent-status-extension-nested-run-settlement.test.ts rename to src/main/pi/managed-extensions/agent-status/agent-status-extension-nested-run-settlement.test.ts diff --git a/src/main/pi/agent-status-extension-session-change.test.ts b/src/main/pi/managed-extensions/agent-status/agent-status-extension-session-change.test.ts similarity index 100% rename from src/main/pi/agent-status-extension-session-change.test.ts rename to src/main/pi/managed-extensions/agent-status/agent-status-extension-session-change.test.ts diff --git a/src/main/pi/agent-status-extension-source.ts b/src/main/pi/managed-extensions/agent-status/agent-status-extension-source.ts similarity index 99% rename from src/main/pi/agent-status-extension-source.ts rename to src/main/pi/managed-extensions/agent-status/agent-status-extension-source.ts index 899ddfe0ede..a0ed87b0f63 100644 --- a/src/main/pi/agent-status-extension-source.ts +++ b/src/main/pi/managed-extensions/agent-status/agent-status-extension-source.ts @@ -1,6 +1,6 @@ import { getPiAgentStatusPostQueueSourceLines } from './agent-status-post-queue-source' // Pi has no settings hook surface; install a self-contained extension that posts through the pane's Orca endpoint. -import type { PiAgentKind } from '../../shared/pi-agent-kind' +import type { PiAgentKind } from '../../../../shared/pi-agent-kind' import { getPiAgentStatusHandlerSourceLines } from './agent-status-handler-source' import { getPiAgentStatusRuntimeDetectionSourceLines } from './agent-status-runtime-detection-source' import { getPiAgentStatusWslCurlSourceLines } from './agent-status-wsl-curl-source' diff --git a/src/main/pi/agent-status-extension-test-harness.ts b/src/main/pi/managed-extensions/agent-status/agent-status-extension-test-harness.ts similarity index 100% rename from src/main/pi/agent-status-extension-test-harness.ts rename to src/main/pi/managed-extensions/agent-status/agent-status-extension-test-harness.ts diff --git a/src/main/pi/agent-status-handler-source.ts b/src/main/pi/managed-extensions/agent-status/agent-status-handler-source.ts similarity index 98% rename from src/main/pi/agent-status-handler-source.ts rename to src/main/pi/managed-extensions/agent-status/agent-status-handler-source.ts index a56cc3eefe0..940ce71a497 100644 --- a/src/main/pi/agent-status-handler-source.ts +++ b/src/main/pi/managed-extensions/agent-status/agent-status-handler-source.ts @@ -1,7 +1,7 @@ import { getOmpModelCommandSourceLines } from './omp-model-command-source' -import { getPiPrefillHandlerSourceLines } from './prefill-extension-source' +import { getPiPrefillHandlerSourceLines } from '../prefill-extension-source' import { getAgentStatusInputRedactionSourceLines } from './agent-status-input-redaction-source' -import type { PiAgentKind } from '../../shared/pi-agent-kind' +import type { PiAgentKind } from '../../../../shared/pi-agent-kind' import { getOmpSessionOwnerHandlerSourceLines } from './omp-session-status-owner-source' import { getOmpPlanReviewHandlerSourceLines } from './omp-plan-review-source' import { getPiAgentStatusUiPromptHandlerSourceLines } from './agent-status-ui-prompt-source' diff --git a/src/main/pi/agent-status-input-redaction-source.ts b/src/main/pi/managed-extensions/agent-status/agent-status-input-redaction-source.ts similarity index 100% rename from src/main/pi/agent-status-input-redaction-source.ts rename to src/main/pi/managed-extensions/agent-status/agent-status-input-redaction-source.ts diff --git a/src/main/pi/agent-status-input-redaction.test.ts b/src/main/pi/managed-extensions/agent-status/agent-status-input-redaction.test.ts similarity index 89% rename from src/main/pi/agent-status-input-redaction.test.ts rename to src/main/pi/managed-extensions/agent-status/agent-status-input-redaction.test.ts index 3517c648846..9dd57918477 100644 --- a/src/main/pi/agent-status-input-redaction.test.ts +++ b/src/main/pi/managed-extensions/agent-status/agent-status-input-redaction.test.ts @@ -65,13 +65,4 @@ describe('generated status input redaction', () => { expect(await postedInput(input)).toEqual({ redacted: true }) } }) - - it('preserves ordinary questions, arrays, sibling paths and repeated data references', async () => { - const path = { path: '/tmp/.ssh-backup' } - const input = { - questions: [{ question: 'Choose', options: ['one', 'two'] }], - paths: [path, path] - } - expect(await postedInput(input)).toEqual(input) - }) }) diff --git a/src/main/pi/agent-status-post-queue-source.ts b/src/main/pi/managed-extensions/agent-status/agent-status-post-queue-source.ts similarity index 98% rename from src/main/pi/agent-status-post-queue-source.ts rename to src/main/pi/managed-extensions/agent-status/agent-status-post-queue-source.ts index e2b34d40113..2e02445384a 100644 --- a/src/main/pi/agent-status-post-queue-source.ts +++ b/src/main/pi/managed-extensions/agent-status/agent-status-post-queue-source.ts @@ -1,4 +1,4 @@ -import type { PiAgentKind } from '../../shared/pi-agent-kind' +import type { PiAgentKind } from '../../../../shared/pi-agent-kind' export function getPiAgentStatusPostQueueSourceLines(kind: PiAgentKind): string[] { return [ diff --git a/src/main/pi/agent-status-runtime-detection-source.ts b/src/main/pi/managed-extensions/agent-status/agent-status-runtime-detection-source.ts similarity index 96% rename from src/main/pi/agent-status-runtime-detection-source.ts rename to src/main/pi/managed-extensions/agent-status/agent-status-runtime-detection-source.ts index 1acdc3beed5..856d9e0720a 100644 --- a/src/main/pi/agent-status-runtime-detection-source.ts +++ b/src/main/pi/managed-extensions/agent-status/agent-status-runtime-detection-source.ts @@ -1,4 +1,4 @@ -import type { PiAgentKind } from '../../shared/pi-agent-kind' +import type { PiAgentKind } from '../../../../shared/pi-agent-kind' /** Bare-shell OMP can run inside a Pi-kind pane; every approval-aware extension needs runtime detection. */ export function getPiOmpRuntimeDetectionSourceLines(configuredHookPath: string): string[] { diff --git a/src/main/pi/agent-status-session-boundary-source.ts b/src/main/pi/managed-extensions/agent-status/agent-status-session-boundary-source.ts similarity index 98% rename from src/main/pi/agent-status-session-boundary-source.ts rename to src/main/pi/managed-extensions/agent-status/agent-status-session-boundary-source.ts index 49f3139fd2d..48cf5e300e9 100644 --- a/src/main/pi/agent-status-session-boundary-source.ts +++ b/src/main/pi/managed-extensions/agent-status/agent-status-session-boundary-source.ts @@ -1,4 +1,4 @@ -import type { PiAgentKind } from '../../shared/pi-agent-kind' +import type { PiAgentKind } from '../../../../shared/pi-agent-kind' // Runs belong to sessions; after replacement their children can no longer report to this registration. diff --git a/src/main/pi/agent-status-subagent-event-fixtures.ts b/src/main/pi/managed-extensions/agent-status/agent-status-subagent-event-fixtures.ts similarity index 100% rename from src/main/pi/agent-status-subagent-event-fixtures.ts rename to src/main/pi/managed-extensions/agent-status/agent-status-subagent-event-fixtures.ts diff --git a/src/main/pi/agent-status-subagent-roster-source.ts b/src/main/pi/managed-extensions/agent-status/agent-status-subagent-roster-source.ts similarity index 98% rename from src/main/pi/agent-status-subagent-roster-source.ts rename to src/main/pi/managed-extensions/agent-status/agent-status-subagent-roster-source.ts index 5016ae3f3bf..6f7c0b52f26 100644 --- a/src/main/pi/agent-status-subagent-roster-source.ts +++ b/src/main/pi/managed-extensions/agent-status/agent-status-subagent-roster-source.ts @@ -1,11 +1,11 @@ // Hold Pi completion until its observed subagents finish. -import type { PiAgentKind } from '../../shared/pi-agent-kind' -import { HOOK_REQUEST_MAX_BYTES } from '../../shared/agent-hook-listener/request-body' +import type { PiAgentKind } from '../../../../shared/pi-agent-kind' +import { HOOK_REQUEST_MAX_BYTES } from '../../../../shared/agent-hook-listener/request-body' import { AGENT_STATUS_TOOL_INPUT_MAX_LENGTH, AGENT_TYPE_MAX_LENGTH -} from '../../shared/agent-status/contracts/agent-status-field-normalization' +} from '../../../../shared/agent-status/contracts/agent-status-field-normalization' // Build retried/coalesced posts from the roster live at delivery. export function getPiSubagentSnapshotSourceLines(): string[] { diff --git a/src/main/pi/agent-status-ui-prompt-source.ts b/src/main/pi/managed-extensions/agent-status/agent-status-ui-prompt-source.ts similarity index 95% rename from src/main/pi/agent-status-ui-prompt-source.ts rename to src/main/pi/managed-extensions/agent-status/agent-status-ui-prompt-source.ts index ab3764e9f01..f4c2612e2ac 100644 --- a/src/main/pi/agent-status-ui-prompt-source.ts +++ b/src/main/pi/managed-extensions/agent-status/agent-status-ui-prompt-source.ts @@ -1,4 +1,4 @@ -import type { PiAgentKind } from '../../shared/pi-agent-kind' +import type { PiAgentKind } from '../../../../shared/pi-agent-kind' /** Mirrors the titlebar extension's dialog tracking so both agree on when the wait ends. */ export function getPiAgentStatusUiPromptHandlerSourceLines(kind: PiAgentKind): string[] { diff --git a/src/main/pi/agent-status-wsl-curl-source.ts b/src/main/pi/managed-extensions/agent-status/agent-status-wsl-curl-source.ts similarity index 100% rename from src/main/pi/agent-status-wsl-curl-source.ts rename to src/main/pi/managed-extensions/agent-status/agent-status-wsl-curl-source.ts diff --git a/src/main/pi/omp-model-command-source.test.ts b/src/main/pi/managed-extensions/agent-status/omp-model-command-source.test.ts similarity index 100% rename from src/main/pi/omp-model-command-source.test.ts rename to src/main/pi/managed-extensions/agent-status/omp-model-command-source.test.ts diff --git a/src/main/pi/omp-model-command-source.ts b/src/main/pi/managed-extensions/agent-status/omp-model-command-source.ts similarity index 100% rename from src/main/pi/omp-model-command-source.ts rename to src/main/pi/managed-extensions/agent-status/omp-model-command-source.ts diff --git a/src/main/pi/omp-plan-review-source.ts b/src/main/pi/managed-extensions/agent-status/omp-plan-review-source.ts similarity index 98% rename from src/main/pi/omp-plan-review-source.ts rename to src/main/pi/managed-extensions/agent-status/omp-plan-review-source.ts index c6f01de87b0..3a80614287f 100644 --- a/src/main/pi/omp-plan-review-source.ts +++ b/src/main/pi/managed-extensions/agent-status/omp-plan-review-source.ts @@ -1,7 +1,7 @@ import { OMP_PLAN_REVIEW_ANSWER_PREFIX, OMP_PLAN_REVIEW_DISMISS -} from '../../shared/omp-plan-review-prompt' +} from '../../../../shared/omp-plan-review-prompt' /** OMP 18.12+ reports its plan review overlay; older builds never fire these events. */ export function getOmpPlanReviewHandlerSourceLines(): string[] { diff --git a/src/main/pi/omp-session-status-owner-source.ts b/src/main/pi/managed-extensions/agent-status/omp-session-status-owner-source.ts similarity index 97% rename from src/main/pi/omp-session-status-owner-source.ts rename to src/main/pi/managed-extensions/agent-status/omp-session-status-owner-source.ts index d8202cb6e1e..1da51065981 100644 --- a/src/main/pi/omp-session-status-owner-source.ts +++ b/src/main/pi/managed-extensions/agent-status/omp-session-status-owner-source.ts @@ -1,4 +1,4 @@ -import type { PiAgentKind } from '../../shared/pi-agent-kind' +import type { PiAgentKind } from '../../../../shared/pi-agent-kind' // OMP task sessions and Pi subagents load the same extension in-process with their own SessionManager. export function getOmpSessionOwnerHandlerSourceLines(kind: PiAgentKind): string[] { diff --git a/src/main/pi/legacy-omp-overlay-migration.ts b/src/main/pi/managed-extensions/legacy-omp-overlay-migration.ts similarity index 98% rename from src/main/pi/legacy-omp-overlay-migration.ts rename to src/main/pi/managed-extensions/legacy-omp-overlay-migration.ts index 31f3db04e8a..46bb8fe80bc 100644 --- a/src/main/pi/legacy-omp-overlay-migration.ts +++ b/src/main/pi/managed-extensions/legacy-omp-overlay-migration.ts @@ -1,10 +1,10 @@ import { cpSync, lstatSync, mkdirSync, readdirSync, unlinkSync, writeFileSync } from 'node:fs' import type { Dirent, Stats } from 'node:fs' import { dirname, join } from 'node:path' -import { ORCA_PI_AGENT_STATUS_EXTENSION_FILE } from './agent-status-extension-source' +import { ORCA_PI_AGENT_STATUS_EXTENSION_FILE } from './agent-status/agent-status-extension-source' import { ORCA_PI_PREFILL_EXTENSION_FILE } from './prefill-extension-source' import { ORCA_PI_EXTENSION_FILE } from './titlebar-extension-source' -import { isSafeDescendCandidate } from '../pty/scrollback/overlay-mirror' +import { isSafeDescendCandidate } from '../../pty/scrollback/overlay-mirror' const LEGACY_PI_OVERLAY_MANIFEST_FILE = '.orca-pi-overlay-manifest.json' const LEGACY_OMP_OVERLAY_MIGRATION_MARKER_FILE = '.orca-omp-overlay-migration-complete' diff --git a/src/main/pi/prefill-extension-source.ts b/src/main/pi/managed-extensions/prefill-extension-source.ts similarity index 95% rename from src/main/pi/prefill-extension-source.ts rename to src/main/pi/managed-extensions/prefill-extension-source.ts index 1c9b375abff..98231623338 100644 --- a/src/main/pi/prefill-extension-source.ts +++ b/src/main/pi/managed-extensions/prefill-extension-source.ts @@ -1,4 +1,4 @@ -import type { PiAgentKind } from '../../shared/pi-agent-kind' +import type { PiAgentKind } from '../../../shared/pi-agent-kind' export const ORCA_PI_PREFILL_EXTENSION_FILE = 'orca-prefill.ts' diff --git a/src/main/pi/titlebar-extension-lifetime-source.ts b/src/main/pi/managed-extensions/titlebar-extension-lifetime-source.ts similarity index 100% rename from src/main/pi/titlebar-extension-lifetime-source.ts rename to src/main/pi/managed-extensions/titlebar-extension-lifetime-source.ts diff --git a/src/main/pi/titlebar-extension-service.test.ts b/src/main/pi/managed-extensions/titlebar-extension-service.test.ts similarity index 98% rename from src/main/pi/titlebar-extension-service.test.ts rename to src/main/pi/managed-extensions/titlebar-extension-service.test.ts index 8b3bab13690..7ec0bfbfdae 100644 --- a/src/main/pi/titlebar-extension-service.test.ts +++ b/src/main/pi/managed-extensions/titlebar-extension-service.test.ts @@ -14,7 +14,7 @@ import { tmpdir } from 'node:os' import type * as osModule from 'node:os' import type * as fsModule from 'node:fs' import { join } from 'node:path' -import { installFakeAppEnvironment } from '../../../config/scripts/test-runtime/environment/vitest-host-ports-setup' +import { installFakeAppEnvironment } from '../../../../config/scripts/test-runtime/environment/vitest-host-ports-setup' const userDataDir = mkdtempSync(join(tmpdir(), 'orca-pi-test-userdata-')) diff --git a/src/main/pi/titlebar-extension-service.ts b/src/main/pi/managed-extensions/titlebar-extension-service.ts similarity index 94% rename from src/main/pi/titlebar-extension-service.ts rename to src/main/pi/managed-extensions/titlebar-extension-service.ts index d29701eee1a..363853e7c60 100644 --- a/src/main/pi/titlebar-extension-service.ts +++ b/src/main/pi/managed-extensions/titlebar-extension-service.ts @@ -1,26 +1,21 @@ -import { materializeOmpFreshConfig } from '../../shared/agent-launch/startup/omp-fresh-config' +import { materializeOmpFreshConfig } from '../../../shared/agent-launch/startup/omp-fresh-config' import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs' import { homedir } from 'node:os' import { join } from 'node:path' -import { getAppEnvironment } from '../../shared/app-environment' +import { getAppEnvironment } from '../../../shared/app-environment' import { createHash } from 'node:crypto' import { ORCA_PI_AGENT_STATUS_EXTENSION_FILE, getPiAgentStatusExtensionSource -} from './agent-status-extension-source' +} from './agent-status/agent-status-extension-source' import { ORCA_PI_PREFILL_EXTENSION_FILE, getPiPrefillExtensionSource } from './prefill-extension-source' import { ORCA_PI_EXTENSION_FILE, getPiTitlebarExtensionSource } from './titlebar-extension-source' -import { - isSafeDescendCandidate as sharedIsSafeDescendCandidate, - safeRemoveOverlay -} from '../pty/scrollback/overlay-mirror' +import { safeRemoveOverlay } from '../../pty/scrollback/overlay-mirror' import { migrateLegacyOmpOverlayState } from './legacy-omp-overlay-migration' -import type { PiAgentKind } from '../../shared/pi-agent-kind' - -export const isSafeDescendCandidate = sharedIsSafeDescendCandidate +import type { PiAgentKind } from '../../../shared/pi-agent-kind' const PI_AGENT_SUBDIR = 'agent' const ORCA_MANAGED_EXTENSION_MARKER = '@orca-managed-pi-extension' diff --git a/src/main/pi/titlebar-extension-source.ts b/src/main/pi/managed-extensions/titlebar-extension-source.ts similarity index 99% rename from src/main/pi/titlebar-extension-source.ts rename to src/main/pi/managed-extensions/titlebar-extension-source.ts index c8c5fcd9d51..2492f42a7e2 100644 --- a/src/main/pi/titlebar-extension-source.ts +++ b/src/main/pi/managed-extensions/titlebar-extension-source.ts @@ -1,6 +1,6 @@ import { getPiTitlebarLifetimeSourceLines } from './titlebar-extension-lifetime-source' -import type { PiAgentKind } from '../../shared/pi-agent-kind' -import { getPiOmpRuntimeDetectionSourceLines } from './agent-status-runtime-detection-source' +import type { PiAgentKind } from '../../../shared/pi-agent-kind' +import { getPiOmpRuntimeDetectionSourceLines } from './agent-status/agent-status-runtime-detection-source' export const ORCA_PI_EXTENSION_FILE = 'orca-titlebar-spinner.ts' diff --git a/src/main/pi/omp-transcript-metadata.test.ts b/src/main/pi/omp-transcript-metadata.test.ts deleted file mode 100644 index 598cc31a8b9..00000000000 --- a/src/main/pi/omp-transcript-metadata.test.ts +++ /dev/null @@ -1,75 +0,0 @@ -import { mkdtemp, rm, writeFile } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { extractAgentProviderSession } from '../../shared/agent-session/lifecycle/agent-session-resume' -import { getAgentResumeArgv } from '../../shared/agent-launch/startup/agent-resume-argv' -import { resolveSessionFilePath } from '../native-chat/session-file-resolver' -import { createAgentStatusExtensionHarness } from './agent-status-extension-test-harness' - -let root: string -beforeEach(async () => { - root = await mkdtemp(join(tmpdir(), 'orca-omp-metadata-')) -}) -afterEach(async () => { - await rm(root, { recursive: true, force: true }) -}) - -describe.each([ - ['dedicated OMP', { kind: 'omp' as const }], - ['Pi-routed OMP', { kind: 'pi' as const, title: 'omp' }] -])('%s transcript metadata', (_name, args) => { - it('resolves custom files without scanning and retains path-based resume across switches', async () => { - const harness = createAgentStatusExtensionHarness(args) - let id = '' - let file = '' - const sessionManager = { getSessionId: () => id, getSessionFile: () => file } - for (const next of ['first', 'second']) { - id = next - file = join(root, `${id}.jsonl`) - await writeFile(file, `${JSON.stringify({ type: 'session', id })}\n`) - await harness.callHook('agent_start', undefined, { - sessionManager - }) - await vi.waitFor(() => - expect(harness.fetchMock).toHaveBeenCalledTimes(id === 'first' ? 1 : 2) - ) - const payload = JSON.parse(String(harness.fetchMock.mock.lastCall?.[1]?.body)).payload - const session = extractAgentProviderSession('omp', payload) - expect(session).toEqual({ key: 'session_id', id, transcriptPath: file }) - expect(getAgentResumeArgv('omp', session!)).toEqual(['omp', '--resume', file]) - expect(getAgentResumeArgv('omp', session!, 'explicit.jsonl')).toEqual([ - 'omp', - '--resume', - 'explicit.jsonl' - ]) - await expect( - resolveSessionFilePath('omp', id, { - transcriptPath: session!.transcriptPath, - ompSessionsDir: join(root, 'unused-default') - }) - ).resolves.toBe(file) - } - expect(harness.fsMock.existsSync).not.toHaveBeenCalled() - }) - - it('publishes planned persistent paths, then resolves after delayed creation', async () => { - const harness = createAgentStatusExtensionHarness(args) - const file = join(root, 'delayed.jsonl') - await harness.callHook('agent_start', undefined, { - sessionManager: { getSessionId: () => 'delayed', getSessionFile: () => file } - }) - const payload = JSON.parse(String(harness.fetchMock.mock.lastCall?.[1]?.body)).payload - const session = extractAgentProviderSession('omp', payload)! - expect(session.transcriptPath).toBe(file) - const options = { transcriptPath: session.transcriptPath, ompSessionsDir: join(root, 'empty') } - await expect(resolveSessionFilePath('omp', session.id, options)).resolves.toBeNull() - await writeFile(file, '{}\n') - await expect(resolveSessionFilePath('omp', session.id, options)).resolves.toBe(file) - const controller = new AbortController() - controller.abort() - await expect( - resolveSessionFilePath('omp', session.id, options, controller.signal) - ).rejects.toThrow() - }) -}) diff --git a/src/main/pi/rpc-launch.test.ts b/src/main/pi/rpc-launch.test.ts deleted file mode 100644 index aba66b2b77b..00000000000 --- a/src/main/pi/rpc-launch.test.ts +++ /dev/null @@ -1,118 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { resolveProviderChildEnv } from '../provider-process/provider-process-launch' -import { sealStructuredSessionChild } from '../runtime/agent-session/environment/structured-session-child-env' -import { - buildPiRpcLaunch, - PI_RPC_SESSION_ENV_TO_DELETE, - piRpcSessionlessEnvironment, - withoutPiCallerEnv -} from './rpc-launch' - -const options = { command: 'host-resolved-pi', cwd: '/host/folder', fullAccess: true } -describe('Pi RPC launch', () => { - it.each([ - '/host/.pi/agent/sessions/session.jsonl', - 'C:\\Users\\dev\\.pi\\agent\\sessions\\session.jsonl' - ])('passes the native session file unchanged: %s', (sessionFile) => { - expect(buildPiRpcLaunch({ ...options, sessionFile }).args).toEqual([ - '--mode', - 'rpc', - '--session', - sessionFile - ]) - }) - - it('retains selected account and user extension args, but strips inherited pane hook identities after overlays', () => { - const launch = buildPiRpcLaunch({ - ...options, - extraArgs: ['--extension', '/host/my extension.ts'], - ...piRpcSessionlessEnvironment({ - PI_CODING_AGENT_DIR: '/host/account', - ORCA_PANE_KEY: 'other-pane', - ORCA_AGENT_PANE: 'alias' - }) - }) - const env = resolveProviderChildEnv(launch, { - ORCA_AGENT_HOOK_TOKEN: 'inherited', - API_KEY: 'retained' - }) - expect(env).toEqual({ API_KEY: 'retained', PI_CODING_AGENT_DIR: '/host/account' }) - expect(launch.args).toEqual(['--mode', 'rpc', '--extension', '/host/my extension.ts']) - }) - - it.each([ - ['--provider', 'anthropic', '--model', 'model-id'], - ['--provider=anthropic', '--model=model-id'], - ['--provider=anthropic', '-m', 'model-id'], - ['--model', 'anthropic/model-id'] - ])('accepts paired model/provider selections: %j', (...extraArgs) => { - expect(buildPiRpcLaunch({ ...options, extraArgs }).args).toEqual([ - '--mode', - 'rpc', - ...extraArgs - ]) - }) - - it.each([['--provider', 'anthropic'], ['--provider=anthropic'], ['--model'], ['--model=']])( - 'rejects incomplete provider/model args: %j', - (...extraArgs) => { - expect(() => buildPiRpcLaunch({ ...options, extraArgs })).toThrow(/requires/) - } - ) - - it.each([ - '--mode=json', - '--print', - '-p', - '--no-session', - '--session=other', - '--resume', - '--continue' - ])('rejects arguments that bypass the chat mode or its session handle: %s', (arg) => { - expect(() => buildPiRpcLaunch({ ...options, extraArgs: [arg] })).toThrow('conflicts') - }) - - it('rejects a supervised permissions request instead of silently running in full access', () => { - expect(() => buildPiRpcLaunch({ ...options, fullAccess: false })).toThrow('full access only') - }) - - it('rejects an empty supplied resume handle', () => { - expect(() => buildPiRpcLaunch({ ...options, sessionFile: '' })).toThrow( - 'requires a session file' - ) - }) - - it('scrubs inherited structured identity and injects only this acquisition identity', () => { - const inherited = { - ORCA_AGENT_SESSION_ID: 'stale', - ORCA_STRUCTURED_SESSION: '1', - ORCA_TERMINAL_HANDLE: 'structworker_stale', - ORCA_AGENT_SESSION_SPAWN_TOKEN: 'old-token' - } - expect( - resolveProviderChildEnv( - buildPiRpcLaunch({ ...options, ...piRpcSessionlessEnvironment({}) }), - inherited - ) - ).toEqual({}) - // Seal inherited caller identity with this structured session's identity. - const childEnv = resolveProviderChildEnv( - buildPiRpcLaunch({ - ...options, - ...sealStructuredSessionChild({ - sessionId: 'this-session', - spawnToken: 'this-token', - env: withoutPiCallerEnv(inherited), - inheritedEnvToDelete: PI_RPC_SESSION_ENV_TO_DELETE - }) - }), - inherited - ) - expect(childEnv).toMatchObject({ - ORCA_AGENT_SESSION_ID: 'this-session', - ORCA_STRUCTURED_SESSION: '1', - ORCA_AGENT_SESSION_SPAWN_TOKEN: 'this-token' - }) - expect(childEnv).not.toHaveProperty('ORCA_TERMINAL_HANDLE') - }) -}) diff --git a/src/main/pi/rpc-prompt.test.ts b/src/main/pi/rpc-prompt.test.ts deleted file mode 100644 index c96f27b05ec..00000000000 --- a/src/main/pi/rpc-prompt.test.ts +++ /dev/null @@ -1,63 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' -import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types' -import { PiRpcPromptError, preparePiRpcPrompt } from './rpc-prompt' - -const PNG = Buffer.from( - 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+/lXcAAAAASUVORK5CYII=', - 'base64' -) - -function message(blocks: AgentJournalMessageItem['blocks']): AgentJournalMessageItem { - return { kind: 'message', role: 'user', blocks } -} - -describe('Pi RPC prompt preparation', () => { - it('encodes host-read image bytes and sends steer/followUp as prompt behavior', async () => { - const readLocal = vi.fn(async () => PNG) - const body = message([ - { type: 'text', text: 'Look at this' }, - { type: 'image-ref', path: '/workspace/screenshot.png' }, - { type: 'text', text: 'then reply' } - ]) - expect(await preparePiRpcPrompt(body, 'steer', { readLocal })).toEqual({ - type: 'prompt', - message: 'Look at this\nthen reply', - streamingBehavior: 'steer', - images: [{ type: 'image', data: PNG.toString('base64'), mimeType: 'image/png' }] - }) - expect(readLocal).toHaveBeenCalledWith('/workspace/screenshot.png') - expect( - (await preparePiRpcPrompt(message([{ type: 'text', text: 'next' }]), 'followUp')) - .streamingBehavior - ).toBe('followUp') - }) - - it('rejects URL refs with a typed unsupported attachment failure', async () => { - const readLocal = vi.fn(async () => PNG) - const rejected = await preparePiRpcPrompt( - message([{ type: 'image-ref', url: 'https://example.test/image.png' }]), - undefined, - { readLocal } - ).catch((error: unknown) => error) - expect(rejected).toBeInstanceOf(PiRpcPromptError) - expect(rejected).toMatchObject({ - failure: { kind: 'attachmentInvalid', attachment: { reason: 'unsupportedType' } } - }) - expect(readLocal).not.toHaveBeenCalled() - }) - - it('checks local image MIME against bytes and rejects empty prompts', async () => { - const readLocal = vi.fn(async () => PNG) - await expect( - preparePiRpcPrompt(message([{ type: 'image-ref', path: '/a.jpg' }]), undefined, { readLocal }) - ).rejects.toThrow() - await expect(preparePiRpcPrompt(message([{ type: 'text', text: '' }]))).rejects.toThrow() - }) - - it('rejects a prompt beyond the RPC writer budget', async () => { - const oversizedText = 'x'.repeat(32 * 1024 * 1024) - await expect( - preparePiRpcPrompt(message([{ type: 'text', text: oversizedText }])) - ).rejects.toThrow('RPC write limit') - }) -}) diff --git a/src/main/pi/rpc-runtime-metadata.ts b/src/main/pi/rpc-runtime-metadata.ts index 8d1d6460c81..3193edd9d28 100644 --- a/src/main/pi/rpc-runtime-metadata.ts +++ b/src/main/pi/rpc-runtime-metadata.ts @@ -4,10 +4,10 @@ import { agentSessionAccountHome } from '../../shared/agent-session/lifecycle/ag import { supportsSupervisedProviderChildLocation } from '../provider-process/supervised-provider-child-location' import type { StructuredAgentRuntimeMetadata } from '../runtime/agent-session/installation/structured-agent-runtime-registration-types' import { PI_RPC_AGENT } from './rpc-agent-definition' -import { PI_RPC_MINIMUM_VERSIONS, resolvePiRpcCommand } from './rpc-launch-resolution' -import { createPiModelCatalogProbe } from './rpc-model-catalog-probe' -import { PI_SESSION_HISTORY } from './pi-session-history' -import { PI_TRANSCRIPT_IMPORT } from './pi-transcript-import' +import { PI_RPC_MINIMUM_VERSIONS, resolvePiRpcCommand } from './rpc/launch/rpc-launch-resolution' +import { createPiModelCatalogProbe } from './rpc/options/rpc-model-catalog-probe' +import { PI_SESSION_HISTORY } from './transcripts/pi-session-history' +import { PI_TRANSCRIPT_IMPORT } from './transcripts/pi-transcript-import' export const PI_RPC_RUNTIME_METADATA: StructuredAgentRuntimeMetadata = { definition: PI_RPC_AGENT, diff --git a/src/main/pi/rpc-runtime-registration.ts b/src/main/pi/rpc-runtime-registration.ts index 365583bbfe0..e457bc8f648 100644 --- a/src/main/pi/rpc-runtime-registration.ts +++ b/src/main/pi/rpc-runtime-registration.ts @@ -8,8 +8,8 @@ import { structuredAgentLaunchSources } from '../runtime/agent-session/launch/structured-agent-launch-composition' import { PI_RPC_AGENT } from './rpc-agent-definition' -import { piRpcLaunchPart } from './rpc-launch-resolution' -import { PiRpcSessionAdapter } from './rpc-session-adapter' +import { piRpcLaunchPart } from './rpc/launch/rpc-launch-resolution' +import { PiRpcSessionAdapter } from './rpc/rpc-session-adapter' import { PI_RPC_RUNTIME_METADATA } from './rpc-runtime-metadata' import { reviseAgentSessionProviderResumePoint } from '../runtime/agent-session/ownership/agent-session-provider-handle-transition' diff --git a/src/main/pi/rpc-session-adapter.test.ts b/src/main/pi/rpc-session-adapter.test.ts deleted file mode 100644 index 09f4c094554..00000000000 --- a/src/main/pi/rpc-session-adapter.test.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { afterEach, describe, expect, it } from 'vitest' -import { closePiRpcAdapterFixtures, sessionId, setup } from './rpc-session-adapter.test-fixture' - -afterEach(closePiRpcAdapterFixtures) - -describe('Pi RPC session ownership and delivery', () => { - it('does not spawn a start cancelled while resolving its workspace', async () => { - const h = await setup() - await h.adapter.closeSession(sessionId) - const launch = await h.resolveLaunch.mock.results[0]?.value - const resolving = Promise.withResolvers>() - h.resolveLaunch.mockImplementationOnce(() => resolving.promise) - const controller = new AbortController() - const started = h.adapter.acquire({ ...h.input, fence: 8, signal: controller.signal }) - await Promise.resolve() - controller.abort(new Error('Pi closed while starting')) - await expect(started).rejects.toMatchObject({ - message: 'Pi closed while starting', - reason: undefined - }) - expect(h.connections).toHaveLength(1) - await expect(h.adapter.acquire({ ...h.input, fence: 9 })).resolves.toMatchObject({ - process: { pid: 4123 } - }) - resolving.resolve(launch!) - await Promise.resolve() - expect(h.connections).toHaveLength(2) - }) -}) diff --git a/src/main/pi/__fixtures__/background-work.jsonl b/src/main/pi/rpc/__fixtures__/background-work.jsonl similarity index 100% rename from src/main/pi/__fixtures__/background-work.jsonl rename to src/main/pi/rpc/__fixtures__/background-work.jsonl diff --git a/src/main/pi/__fixtures__/command-only.jsonl b/src/main/pi/rpc/__fixtures__/command-only.jsonl similarity index 100% rename from src/main/pi/__fixtures__/command-only.jsonl rename to src/main/pi/rpc/__fixtures__/command-only.jsonl diff --git a/src/main/pi/__fixtures__/compaction.jsonl b/src/main/pi/rpc/__fixtures__/compaction.jsonl similarity index 100% rename from src/main/pi/__fixtures__/compaction.jsonl rename to src/main/pi/rpc/__fixtures__/compaction.jsonl diff --git a/src/main/pi/__fixtures__/dialogs.jsonl b/src/main/pi/rpc/__fixtures__/dialogs.jsonl similarity index 100% rename from src/main/pi/__fixtures__/dialogs.jsonl rename to src/main/pi/rpc/__fixtures__/dialogs.jsonl diff --git a/src/main/pi/__fixtures__/provider-fetch-error.jsonl b/src/main/pi/rpc/__fixtures__/provider-fetch-error.jsonl similarity index 100% rename from src/main/pi/__fixtures__/provider-fetch-error.jsonl rename to src/main/pi/rpc/__fixtures__/provider-fetch-error.jsonl diff --git a/src/main/pi/__fixtures__/provider-socket-error.jsonl b/src/main/pi/rpc/__fixtures__/provider-socket-error.jsonl similarity index 100% rename from src/main/pi/__fixtures__/provider-socket-error.jsonl rename to src/main/pi/rpc/__fixtures__/provider-socket-error.jsonl diff --git a/src/main/pi/__fixtures__/signed-out.jsonl b/src/main/pi/rpc/__fixtures__/signed-out.jsonl similarity index 100% rename from src/main/pi/__fixtures__/signed-out.jsonl rename to src/main/pi/rpc/__fixtures__/signed-out.jsonl diff --git a/src/main/pi/__fixtures__/steer-followup.jsonl b/src/main/pi/rpc/__fixtures__/steer-followup.jsonl similarity index 100% rename from src/main/pi/__fixtures__/steer-followup.jsonl rename to src/main/pi/rpc/__fixtures__/steer-followup.jsonl diff --git a/src/main/pi/__fixtures__/stop-mid-tool.jsonl b/src/main/pi/rpc/__fixtures__/stop-mid-tool.jsonl similarity index 100% rename from src/main/pi/__fixtures__/stop-mid-tool.jsonl rename to src/main/pi/rpc/__fixtures__/stop-mid-tool.jsonl diff --git a/src/main/pi/__fixtures__/subagent-wake.jsonl b/src/main/pi/rpc/__fixtures__/subagent-wake.jsonl similarity index 100% rename from src/main/pi/__fixtures__/subagent-wake.jsonl rename to src/main/pi/rpc/__fixtures__/subagent-wake.jsonl diff --git a/src/main/pi/rpc-background-work-bridge-source.ts b/src/main/pi/rpc/background-work/rpc-background-work-bridge-source.ts similarity index 100% rename from src/main/pi/rpc-background-work-bridge-source.ts rename to src/main/pi/rpc/background-work/rpc-background-work-bridge-source.ts diff --git a/src/main/pi/rpc-background-work-bridge.ts b/src/main/pi/rpc/background-work/rpc-background-work-bridge.ts similarity index 92% rename from src/main/pi/rpc-background-work-bridge.ts rename to src/main/pi/rpc/background-work/rpc-background-work-bridge.ts index 3c260fc038c..62d1f03edba 100644 --- a/src/main/pi/rpc-background-work-bridge.ts +++ b/src/main/pi/rpc/background-work/rpc-background-work-bridge.ts @@ -1,8 +1,8 @@ import { randomUUID } from 'node:crypto' import { mkdir, readdir, readFile, rename, rm, writeFile } from 'node:fs/promises' import { join } from 'node:path' -import { getAppEnvironment } from '../../shared/app-environment' -import { inspectProcessLiveness } from '../daemon/endpoint/identity/daemon-process-inspection' +import { getAppEnvironment } from '../../../../shared/app-environment' +import { inspectProcessLiveness } from '../../../daemon/endpoint/identity/daemon-process-inspection' import { PI_BACKGROUND_WORK_BRIDGE_FILE, getPiBackgroundWorkBridgeSource diff --git a/src/main/pi/rpc-background-work.test.ts b/src/main/pi/rpc/background-work/rpc-background-work.test.ts similarity index 94% rename from src/main/pi/rpc-background-work.test.ts rename to src/main/pi/rpc/background-work/rpc-background-work.test.ts index c6c9742e3b2..98b6422bad2 100644 --- a/src/main/pi/rpc-background-work.test.ts +++ b/src/main/pi/rpc/background-work/rpc-background-work.test.ts @@ -2,7 +2,7 @@ import { mkdtempSync, readdirSync, readFileSync, rmSync } from 'node:fs' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, expect, it, vi } from 'vitest' -import type { JsonlRpcRecord } from '../jsonl-rpc/peer' +import type { JsonlRpcRecord } from '../../../jsonl-rpc/peer' import { PiRpcBackgroundWork } from './rpc-background-work' const folders: string[] = [] @@ -14,7 +14,7 @@ afterEach(() => { // Recorded on Windows from Pi 1.5.0 + pi-subagents 0.84.0 + the bridge: ready, an answer while a // worker ran, an answer after its wake turn settled, and shutdown. const [ready, busy, idle, gone] = readFileSync( - join(import.meta.dirname, '__fixtures__', 'background-work.jsonl'), + join(import.meta.dirname, '../__fixtures__', 'background-work.jsonl'), 'utf8' ) .split('\n') diff --git a/src/main/pi/rpc-background-work.ts b/src/main/pi/rpc/background-work/rpc-background-work.ts similarity index 94% rename from src/main/pi/rpc-background-work.ts rename to src/main/pi/rpc/background-work/rpc-background-work.ts index 9bf4f525b83..88c42e72604 100644 --- a/src/main/pi/rpc-background-work.ts +++ b/src/main/pi/rpc/background-work/rpc-background-work.ts @@ -1,8 +1,8 @@ import { randomUUID } from 'node:crypto' import { rename, rm, writeFile } from 'node:fs/promises' import { join } from 'node:path' -import type { JsonlRpcRecord } from '../jsonl-rpc/peer' -import type { AgentSessionIdleConfirmation } from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +import type { JsonlRpcRecord } from '../../../jsonl-rpc/peer' +import type { AgentSessionIdleConfirmation } from '../../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' import { PI_BACKGROUND_WORK_REQUEST_SUFFIX, PI_BACKGROUND_WORK_STATUS_KEY diff --git a/src/main/pi/rpc-history-capture.ts b/src/main/pi/rpc/history/rpc-history-capture.ts similarity index 90% rename from src/main/pi/rpc-history-capture.ts rename to src/main/pi/rpc/history/rpc-history-capture.ts index cf79e732cc8..36bc9102d49 100644 --- a/src/main/pi/rpc-history-capture.ts +++ b/src/main/pi/rpc/history/rpc-history-capture.ts @@ -1,10 +1,10 @@ -import type { AgentSessionProviderHandle } from '../../shared/agent-session/lifecycle/agent-session-provider-handle' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import type { StructuredAgentSessionLogger } from '../native-chat/agent-session-wire/host/structured-agent-session-logger' +import type { AgentSessionProviderHandle } from '../../../../shared/agent-session/lifecycle/agent-session-provider-handle' +import type { StructuredAgentSessionEventSink } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import type { StructuredAgentSessionLogger } from '../../../native-chat/agent-session-wire/host/structured-agent-session-logger' import { readPiEntries } from './rpc-history-catch-up' import { piBranchInTree, piBranchSince } from './rpc-history-import' import { encodePiHistoryClaim } from './rpc-history-journal-view' -import type { PiRpcConnection, PiRpcSession } from './rpc-session' +import type { PiRpcConnection, PiRpcSession } from '../rpc-session' export type PiHistoryResumePointWrite = { sessionId: string diff --git a/src/main/pi/rpc-history-catch-up.ts b/src/main/pi/rpc/history/rpc-history-catch-up.ts similarity index 89% rename from src/main/pi/rpc-history-catch-up.ts rename to src/main/pi/rpc/history/rpc-history-catch-up.ts index 8a2b112b7aa..62482b83154 100644 --- a/src/main/pi/rpc-history-catch-up.ts +++ b/src/main/pi/rpc/history/rpc-history-catch-up.ts @@ -1,8 +1,8 @@ -import { waitForPromiseWithSignal } from '../../shared/abort-signal-reason' -import { JsonlRpcResponseError } from '../jsonl-rpc/peer' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' -import type { StructuredAgentSessionLogger } from '../native-chat/agent-session-wire/host/structured-agent-session-logger' -import { runHistoryCatchUp } from '../native-chat/agent-session-wire/acquisition/structured-agent-session-history-catch-up' +import { waitForPromiseWithSignal } from '../../../../shared/abort-signal-reason' +import { JsonlRpcResponseError } from '../../../jsonl-rpc/peer-reply' +import type { StructuredAgentSessionEventSink } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import type { StructuredAgentSessionLogger } from '../../../native-chat/agent-session-wire/host/structured-agent-session-logger' +import { runHistoryCatchUp } from '../../../native-chat/agent-session-wire/acquisition/structured-agent-session-history-catch-up' import { createPiHistoryImportPlan, piBranchInTree, @@ -17,7 +17,7 @@ import { usablePiHistoryClaim, type PiHistoryClaim } from './rpc-history-journal-view' -import type { PiRpcConnection } from './rpc-session' +import type { PiRpcConnection } from '../rpc-session' import { readPiSessionLastEntryId } from './rpc-session-file-tail' export const PI_HISTORY_CATCH_UP_TIMEOUT_MS = 30_000 diff --git a/src/main/pi/rpc-history-import.ts b/src/main/pi/rpc/history/rpc-history-import.ts similarity index 81% rename from src/main/pi/rpc-history-import.ts rename to src/main/pi/rpc/history/rpc-history-import.ts index 2795a0e632c..7eecd60a459 100644 --- a/src/main/pi/rpc-history-import.ts +++ b/src/main/pi/rpc/history/rpc-history-import.ts @@ -1,18 +1,18 @@ import { z } from 'zod' -import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' -import type { AgentJournalItemIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity' -import { legacyItemBody } from '../native-chat/agent-session-journal/history-import/journal-legacy-import' -import { decodePiSessionEntryLine } from '../native-chat/agent-session-journal/history-import/journal-pi-active-branch' -import '../native-chat/agent-session-journal/writing/journal-row-builders' -import { journalLifecycleItemMutation } from '../native-chat/agent-session-journal/writing/journal-lifecycle-mutation' -import type { StructuredAgentSessionTransitionJournal } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-transition' +import { agentJournalItemKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity' +import { legacyItemBody } from '../../../native-chat/agent-session-journal/history-import/journal-legacy-import' +import { decodePiSessionEntryLine } from '../../../native-chat/agent-session-journal/history-import/journal-pi-active-branch' +import '../../../native-chat/agent-session-journal/writing/journal-row-builders' +import { journalLifecycleItemMutation } from '../../../native-chat/agent-session-journal/writing/journal-lifecycle-mutation' +import type { StructuredAgentSessionTransitionJournal } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-transition' import { continuedOutsideNotice, continuedOutsideRecordId, createHistoryCatchUpBatch, type HistoryCatchUpPlan -} from '../native-chat/agent-session-wire/acquisition/structured-agent-session-history-catch-up' +} from '../../../native-chat/agent-session-wire/acquisition/structured-agent-session-history-catch-up' const piEntrySchema = z.looseObject({ id: z.string().min(1), diff --git a/src/main/pi/rpc-history-journal-view.ts b/src/main/pi/rpc/history/rpc-history-journal-view.ts similarity index 88% rename from src/main/pi/rpc-history-journal-view.ts rename to src/main/pi/rpc/history/rpc-history-journal-view.ts index 7513c056295..25161748268 100644 --- a/src/main/pi/rpc-history-journal-view.ts +++ b/src/main/pi/rpc/history/rpc-history-journal-view.ts @@ -1,7 +1,7 @@ import { z } from 'zod' -import { parseAgentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' -import { isQueuedAgentJournalSubmission } from '../../shared/agent-session/requests/agent-session-queued-submission' -import type { StructuredAgentSessionHistoryJournal } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-journal-views' +import { parseAgentJournalItemKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' +import { isQueuedAgentJournalSubmission } from '../../../../shared/agent-session/requests/agent-session-queued-submission' +import type { StructuredAgentSessionHistoryJournal } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-journal-views' /** Pi entries through entry are accounted for through this journal epoch/sequence; encoded in the Pi resume cursor. */ export type PiHistoryClaim = { entry: string; epoch: string; sequence: number } diff --git a/src/main/pi/rpc-session-file-tail.ts b/src/main/pi/rpc/history/rpc-session-file-tail.ts similarity index 100% rename from src/main/pi/rpc-session-file-tail.ts rename to src/main/pi/rpc/history/rpc-session-file-tail.ts diff --git a/src/main/pi/rpc-launch-resolution.ts b/src/main/pi/rpc/launch/rpc-launch-resolution.ts similarity index 88% rename from src/main/pi/rpc-launch-resolution.ts rename to src/main/pi/rpc/launch/rpc-launch-resolution.ts index 2d92a9f7c3e..3f44e81d773 100644 --- a/src/main/pi/rpc-launch-resolution.ts +++ b/src/main/pi/rpc/launch/rpc-launch-resolution.ts @@ -1,21 +1,21 @@ import { open, realpath } from 'node:fs/promises' import { isAbsolute, normalize } from 'node:path' import { z } from 'zod' -import { agentSessionRefusalError } from '../../shared/agent-session/failures/agent-session-wire-refusals' +import { agentSessionRefusalError } from '../../../../shared/agent-session/failures/agent-session-wire-refusals' import { agentSessionProviderHandleChainHead, type AgentSessionProviderHandleChain, type AgentSessionProviderHandleLink -} from '../../shared/agent-session/lifecycle/agent-session-provider-handle' -import { agentSessionProviderHandleKey } from '../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding' -import { requireLegacyAgentSessionAccountHome } from '../../shared/agent-session/lifecycle/agent-session-account-home' -import type { resolveCliCommand } from '../../shared/node-cli-command-resolution' +} from '../../../../shared/agent-session/lifecycle/agent-session-provider-handle' +import { agentSessionProviderHandleKey } from '../../../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding' +import { requireLegacyAgentSessionAccountHome } from '../../../../shared/agent-session/lifecycle/agent-session-account-home' +import type { resolveCliCommand } from '../../../../shared/node-cli-command-resolution' import { checkAgentCliVersion, type AgentCliVersionCheck, type AgentCliVersionReader -} from '../agent-launch/preflight/agent-cli-version-probe' -import { AgentCliInstallationError } from '../native-chat/agent-cli-installation-error' +} from '../../../agent-launch/preflight/agent-cli-version-probe' +import { AgentCliInstallationError } from '../../../native-chat/agent-cli-installation-error' import { resolveAgainAfterRefreshOnMissingProgram, assertStructuredAgentResolutionCurrent, @@ -23,10 +23,10 @@ import { resolveStructuredAgentCommand, type StructuredAgentCommand, type StructuredAgentCommandSettings -} from '../native-chat/structured-agent-command-resolution' -import type { StructuredAgentLaunchPartResolver } from '../runtime/agent-session/launch/structured-agent-launch-composition' -import { isWindowsProcessStartTimeAvailable } from '../windows/windows-process-table' -import { sessionIdFromFileName } from '../ai-vault/session-scanner-accumulator' +} from '../../../native-chat/structured-agent-command-resolution' +import type { StructuredAgentLaunchPartResolver } from '../../../runtime/agent-session/launch/structured-agent-launch-composition' +import { isWindowsProcessStartTimeAvailable } from '../../../windows/windows-process-table' +import { sessionIdFromFileName } from '../../../ai-vault/session-scanner-accumulator' import { PI_RPC_SESSION_ENV_TO_DELETE, withoutPiCallerEnv, @@ -35,8 +35,8 @@ import { import { ensurePiBackgroundWorkBridge, type PiBackgroundWorkLaunch -} from './rpc-background-work-bridge' -import type { StructuredAgentSessionLogger } from '../native-chat/agent-session-wire/host/structured-agent-session-logger' +} from '../background-work/rpc-background-work-bridge' +import type { StructuredAgentSessionLogger } from '../../../native-chat/agent-session-wire/host/structured-agent-session-logger' export type PiRpcResolvedLaunch = PiRpcLaunchOptions & { previous: AgentSessionProviderHandleLink | null diff --git a/src/main/pi/rpc/launch/rpc-launch.test.ts b/src/main/pi/rpc/launch/rpc-launch.test.ts new file mode 100644 index 00000000000..c3e8dcae086 --- /dev/null +++ b/src/main/pi/rpc/launch/rpc-launch.test.ts @@ -0,0 +1,47 @@ +import { describe, expect, it } from 'vitest' + +import { buildPiRpcLaunch } from './rpc-launch' + +const options = { command: 'host-resolved-pi', cwd: '/host/folder', fullAccess: true } +describe('Pi RPC launch', () => { + it.each([ + '/host/.pi/agent/sessions/session.jsonl', + 'C:\\Users\\dev\\.pi\\agent\\sessions\\session.jsonl' + ])('passes the native session file unchanged: %s', (sessionFile) => { + expect(buildPiRpcLaunch({ ...options, sessionFile }).args).toEqual([ + '--mode', + 'rpc', + '--session', + sessionFile + ]) + }) + + it.each([['--provider', 'anthropic'], ['--provider=anthropic'], ['--model'], ['--model=']])( + 'rejects incomplete provider/model args: %j', + (...extraArgs) => { + expect(() => buildPiRpcLaunch({ ...options, extraArgs })).toThrow(/requires/) + } + ) + + it.each([ + '--mode=json', + '--print', + '-p', + '--no-session', + '--session=other', + '--resume', + '--continue' + ])('rejects arguments that bypass the chat mode or its session handle: %s', (arg) => { + expect(() => buildPiRpcLaunch({ ...options, extraArgs: [arg] })).toThrow('conflicts') + }) + + it('rejects a supervised permissions request instead of silently running in full access', () => { + expect(() => buildPiRpcLaunch({ ...options, fullAccess: false })).toThrow('full access only') + }) + + it('rejects an empty supplied resume handle', () => { + expect(() => buildPiRpcLaunch({ ...options, sessionFile: '' })).toThrow( + 'requires a session file' + ) + }) +}) diff --git a/src/main/pi/rpc-launch.ts b/src/main/pi/rpc/launch/rpc-launch.ts similarity index 85% rename from src/main/pi/rpc-launch.ts rename to src/main/pi/rpc/launch/rpc-launch.ts index 360bd69186a..22261916d02 100644 --- a/src/main/pi/rpc-launch.ts +++ b/src/main/pi/rpc/launch/rpc-launch.ts @@ -1,13 +1,16 @@ -import { ORCA_AGENT_SESSION_SPAWN_TOKEN_ENV } from '../../shared/agent-session/lifecycle/agent-session-caller-env' -import { ORCA_AGENT_SESSION_CALLER_ENV_KEYS } from '../ipc/pty/host-env/spawn-env-keys' +import { ORCA_AGENT_SESSION_SPAWN_TOKEN_ENV } from '../../../../shared/agent-session/lifecycle/agent-session-caller-env' +import { + ORCA_AGENT_SESSION_CALLER_ENV_KEYS, + AGENT_PANE_HOOK_ENV_KEYS as STRUCTURED_CHILD_ENV_TO_DELETE +} from '../../../ipc/pty/host-env/spawn-env-keys' import { LEGACY_NATIVE_CHAT_VISUALS_DIR_ENV, NATIVE_CHAT_SCRATCH_DIR_ENV -} from '../native-chat/native-chat-visuals-delivery' -import type { ProviderProcessLaunch } from '../provider-process/provider-process-launch' -import { STRUCTURED_CHILD_ENV_TO_DELETE } from '../runtime/agent-session/environment/structured-session-child-env' -import type { PiBackgroundWorkLaunch } from './rpc-background-work-bridge' -import { PI_BACKGROUND_WORK_DIR_ENV } from './rpc-background-work-bridge-source' +} from '../../../native-chat/native-chat-visuals-delivery' +import type { ProviderProcessLaunch } from '../../../provider-process/provider-process-launch' + +import type { PiBackgroundWorkLaunch } from '../background-work/rpc-background-work-bridge' +import { PI_BACKGROUND_WORK_DIR_ENV } from '../background-work/rpc-background-work-bridge-source' export type PiRpcLaunchOptions = { command: string diff --git a/src/main/pi/rpc-model-catalog-probe.ts b/src/main/pi/rpc/options/rpc-model-catalog-probe.ts similarity index 79% rename from src/main/pi/rpc-model-catalog-probe.ts rename to src/main/pi/rpc/options/rpc-model-catalog-probe.ts index 6c0a6cea628..4377321c924 100644 --- a/src/main/pi/rpc-model-catalog-probe.ts +++ b/src/main/pi/rpc/options/rpc-model-catalog-probe.ts @@ -1,24 +1,22 @@ import { assertStructuredAgentResolutionCurrent, type StructuredAgentCommandSettings -} from '../native-chat/structured-agent-command-resolution' +} from '../../../native-chat/structured-agent-command-resolution' import { homedir } from 'node:os' import { z } from 'zod' -import { requireLegacyAgentSessionAccountHome } from '../../shared/agent-session/lifecycle/agent-session-account-home' -import type { resolveCliCommand } from '../../shared/node-cli-command-resolution' -import type { AgentCliVersionReader } from '../agent-launch/preflight/agent-cli-version-probe' -import { JsonlRpcAgentConnection } from '../jsonl-rpc/agent-connection' -import type { - AgentModelCatalogProbe, - AgentModelCatalogSuccess -} from '../native-chat/agent-model-catalog/agent-model-catalog-store' -import { runAgentModelCatalogSession } from '../native-chat/agent-model-catalog/agent-model-catalog-probe-runner' -import { AgentModelCatalogUnavailableError } from '../native-chat/agent-model-catalog/agent-model-catalog-unavailable' -import type { ProviderProcessLaunch } from '../provider-process/provider-process-launch' -import { buildPiRpcLaunch, piRpcSessionlessEnvironment } from './rpc-launch' -import { checkPiRpcVersion, resolvePiRpcInvocation } from './rpc-launch-resolution' -import { piModelOptionId, readPiRpcModelOptions, type PiRpcRequester } from './rpc-options' -import { piRpcModelSchema } from './rpc-protocol' +import { requireLegacyAgentSessionAccountHome } from '../../../../shared/agent-session/lifecycle/agent-session-account-home' +import type { resolveCliCommand } from '../../../../shared/node-cli-command-resolution' +import type { AgentCliVersionReader } from '../../../agent-launch/preflight/agent-cli-version-probe' +import { JsonlRpcAgentConnection } from '../../../jsonl-rpc/agent-connection' +import type { AgentModelCatalogProbe } from '../../../native-chat/agent-model-catalog/agent-model-catalog-discovery' +import type { AgentModelCatalogSuccess } from '../../../native-chat/agent-model-catalog/agent-model-catalog-entry' +import { runAgentModelCatalogSession } from '../../../native-chat/agent-model-catalog/agent-model-catalog-probe-runner' +import { AgentModelCatalogUnavailableError } from '../../../native-chat/agent-model-catalog/agent-model-catalog-unavailable' +import type { ProviderProcessLaunch } from '../../../provider-process/provider-process-launch' +import { buildPiRpcLaunch, piRpcSessionlessEnvironment } from '../launch/rpc-launch' +import { checkPiRpcVersion, resolvePiRpcInvocation } from '../launch/rpc-launch-resolution' +import { piModelOptionId, readPiRpcModelOptions, type PiRpcRequester } from './rpc-model-options' +import { piRpcModelSchema } from './rpc-model-schema' type PiModelCatalogConnection = PiRpcRequester & { close(): Promise } diff --git a/src/main/pi/rpc-model-options.ts b/src/main/pi/rpc/options/rpc-model-options.ts similarity index 89% rename from src/main/pi/rpc-model-options.ts rename to src/main/pi/rpc/options/rpc-model-options.ts index fded4e5639b..1c1b0b45c40 100644 --- a/src/main/pi/rpc-model-options.ts +++ b/src/main/pi/rpc/options/rpc-model-options.ts @@ -1,6 +1,6 @@ import { z } from 'zod' -import { PI_THINKING_LEVELS } from '../../shared/agent-session/options/structured-agent-session-effective-effort' -import type { AgentSessionOptionsResult } from '../../shared/agent-session/options/agent-session-options-result' +import { PI_THINKING_LEVELS } from '../../../../shared/agent-session/options/structured-agent-session-effective-effort' +import type { AgentSessionOptionsResult } from '../../../../shared/agent-session/options/agent-session-options-result' import { piRpcModelSchema } from './rpc-model-schema' export type PiRpcRequester = { diff --git a/src/main/pi/rpc-model-schema.ts b/src/main/pi/rpc/options/rpc-model-schema.ts similarity index 100% rename from src/main/pi/rpc-model-schema.ts rename to src/main/pi/rpc/options/rpc-model-schema.ts diff --git a/src/main/pi/rpc-options.ts b/src/main/pi/rpc/options/rpc-options.ts similarity index 91% rename from src/main/pi/rpc-options.ts rename to src/main/pi/rpc/options/rpc-options.ts index c918e04188b..9f3eb11abf7 100644 --- a/src/main/pi/rpc-options.ts +++ b/src/main/pi/rpc/options/rpc-options.ts @@ -5,19 +5,14 @@ import { readPiRpcModelOptions, type PiRpcRequester } from './rpc-model-options' -export { - piModelOptionId, - parsePiModelOptionId, - readPiRpcModelOptions, - type PiRpcRequester -} from './rpc-model-options' -import { withLiveCatalogListing } from '../native-chat/agent-model-catalog/agent-model-catalog-entry' + +import { withLiveCatalogListing } from '../../../native-chat/agent-model-catalog/agent-model-catalog-entry' import { z } from 'zod' -import { PI_THINKING_LEVELS } from '../../shared/agent-session/options/structured-agent-session-effective-effort' -import { waitForPromiseWithSignal } from '../../shared/abort-signal-reason' -import type { AgentSessionCommandsResult } from '../../shared/agent-session/agent-session-wire' -import type { AgentSessionOptionsResult } from '../../shared/agent-session/options/agent-session-options-result' -import { piRpcStateSchema } from './rpc-protocol' +import { PI_THINKING_LEVELS } from '../../../../shared/agent-session/options/structured-agent-session-effective-effort' +import { waitForPromiseWithSignal } from '../../../../shared/abort-signal-reason' +import type { AgentSessionCommandsResult } from '../../../../shared/agent-session/agent-session-wire' +import type { AgentSessionOptionsResult } from '../../../../shared/agent-session/options/agent-session-options-result' +import { piRpcStateSchema } from '../rpc-protocol' const stateSchema = piRpcStateSchema.safeExtend({ model: modelSchema.nullish() diff --git a/src/main/pi/pi-scripted-child.test-fixture.ts b/src/main/pi/rpc/pi-scripted-child.test-fixture.ts similarity index 95% rename from src/main/pi/pi-scripted-child.test-fixture.ts rename to src/main/pi/rpc/pi-scripted-child.test-fixture.ts index a8a760bc94c..4c9f13142b4 100644 --- a/src/main/pi/pi-scripted-child.test-fixture.ts +++ b/src/main/pi/rpc/pi-scripted-child.test-fixture.ts @@ -3,14 +3,15 @@ import { join } from 'node:path' import { providerDiagnostic, withProviderDiagnostic -} from '../../shared/agent-session/failures/agent-session-failure' +} from '../../../shared/agent-session/failures/agent-session-failure' import { JsonlRpcAgentExitError, type JsonlRpcAgentConnectionOptions -} from '../jsonl-rpc/agent-connection' -import { JsonlRpcResponseError, type JsonlRpcRecord } from '../jsonl-rpc/peer' -import type { ProviderProcessLaunch } from '../provider-process/provider-process-launch' -import type { ScriptedAgentChild } from '../runtime/agent-session/installation/structured-agent-scripted-child.test-fixture' +} from '../../jsonl-rpc/agent-connection' +import { JsonlRpcResponseError } from '../../jsonl-rpc/peer-reply' +import type { JsonlRpcRecord } from '../../jsonl-rpc/peer' +import type { ProviderProcessLaunch } from '../../provider-process/provider-process-launch' +import type { ScriptedAgentChild } from '../../runtime/agent-session/installation/structured-agent-scripted-child.test-fixture' import type { PiRpcConnection } from './rpc-session' type PiScriptOptions = { diff --git a/src/main/pi/rpc-prompt-delivery.test.ts b/src/main/pi/rpc/prompts/rpc-prompt-delivery.test.ts similarity index 100% rename from src/main/pi/rpc-prompt-delivery.test.ts rename to src/main/pi/rpc/prompts/rpc-prompt-delivery.test.ts diff --git a/src/main/pi/rpc-prompt-delivery.ts b/src/main/pi/rpc/prompts/rpc-prompt-delivery.ts similarity index 95% rename from src/main/pi/rpc-prompt-delivery.ts rename to src/main/pi/rpc/prompts/rpc-prompt-delivery.ts index 77a2bff6383..f1d4f43804e 100644 --- a/src/main/pi/rpc-prompt-delivery.ts +++ b/src/main/pi/rpc/prompts/rpc-prompt-delivery.ts @@ -2,11 +2,11 @@ import { agentSessionFailureFact, providerDiagnostic, type SubmissionRejectionFact -} from '../../shared/agent-session/failures/agent-session-failure' -import { agentSessionFailureWords } from '../../shared/agent-session/failures/agent-session-failure-words' -import type { AgentSessionDispatchOutcome } from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' -import type { JsonlRpcRecord } from '../jsonl-rpc/peer' -import { piRpcPromptReplySchema } from './rpc-protocol' +} from '../../../../shared/agent-session/failures/agent-session-failure' +import { agentSessionFailureWords } from '../../../../shared/agent-session/failures/agent-session-failure-words' +import type { AgentSessionDispatchOutcome } from '../../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +import type { JsonlRpcRecord } from '../../../jsonl-rpc/peer' +import { piRpcPromptReplySchema } from '../rpc-protocol' type Submission = { id: string diff --git a/src/main/pi/rpc/prompts/rpc-prompt.test.ts b/src/main/pi/rpc/prompts/rpc-prompt.test.ts new file mode 100644 index 00000000000..2996b82911d --- /dev/null +++ b/src/main/pi/rpc/prompts/rpc-prompt.test.ts @@ -0,0 +1,35 @@ +import { describe, expect, it, vi } from 'vitest' +import type { AgentJournalMessageItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import { PiRpcPromptError, preparePiRpcPrompt } from './rpc-prompt' + +const PNG = Buffer.from( + 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+/lXcAAAAASUVORK5CYII=', + 'base64' +) + +function message(blocks: AgentJournalMessageItem['blocks']): AgentJournalMessageItem { + return { kind: 'message', role: 'user', blocks } +} + +describe('Pi RPC prompt preparation', () => { + it('rejects URL refs with a typed unsupported attachment failure', async () => { + const readLocal = vi.fn(async () => PNG) + const rejected = await preparePiRpcPrompt( + message([{ type: 'image-ref', url: 'https://example.test/image.png' }]), + undefined, + { readLocal } + ).catch((error: unknown) => error) + expect(rejected).toBeInstanceOf(PiRpcPromptError) + expect(rejected).toMatchObject({ + failure: { kind: 'attachmentInvalid', attachment: { reason: 'unsupportedType' } } + }) + expect(readLocal).not.toHaveBeenCalled() + }) + + it('rejects a prompt beyond the RPC writer budget', async () => { + const oversizedText = 'x'.repeat(32 * 1024 * 1024) + await expect( + preparePiRpcPrompt(message([{ type: 'text', text: oversizedText }])) + ).rejects.toThrow('RPC write limit') + }) +}) diff --git a/src/main/pi/rpc-prompt.ts b/src/main/pi/rpc/prompts/rpc-prompt.ts similarity index 89% rename from src/main/pi/rpc-prompt.ts rename to src/main/pi/rpc/prompts/rpc-prompt.ts index 134793eba70..dc43d62aae6 100644 --- a/src/main/pi/rpc-prompt.ts +++ b/src/main/pi/rpc/prompts/rpc-prompt.ts @@ -1,16 +1,16 @@ import { extname } from 'node:path' -import { resolveJsonlRpcPeerOptions } from '../jsonl-rpc/peer-limits' -import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types' -import type { NativeChatImageRefBlock } from '../../shared/native-chat/native-chat-types' +import { resolveJsonlRpcPeerOptions } from '../../../jsonl-rpc/peer-limits' +import type { AgentJournalMessageItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { NativeChatImageRefBlock } 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 type { AgentSessionAttachmentProblem } from '../../../../shared/agent-session/failures/agent-session-failure-details' import { ClaudeDispatchContentError, readClaudeImage -} from '../claude/structured/claude-structured-dispatch-content' +} from '../../../claude/structured/claude-structured-dispatch-content' const MAX_IMAGE_BYTES = 5 * 1024 * 1024 const MAX_IMAGE_COUNT = 20 diff --git a/src/main/pi/rpc-compaction.ts b/src/main/pi/rpc/rpc-compaction.ts similarity index 79% rename from src/main/pi/rpc-compaction.ts rename to src/main/pi/rpc/rpc-compaction.ts index 376c1da9814..24d52a4b0fd 100644 --- a/src/main/pi/rpc-compaction.ts +++ b/src/main/pi/rpc/rpc-compaction.ts @@ -1,16 +1,16 @@ -import { waitForPromiseWithSignal } from '../../shared/abort-signal-reason' +import { waitForPromiseWithSignal } from '../../../shared/abort-signal-reason' import { agentSessionFailureFact, providerDiagnostic -} from '../../shared/agent-session/failures/agent-session-failure' -import { agentSessionFailureWords } from '../../shared/agent-session/failures/agent-session-failure-words' +} from '../../../shared/agent-session/failures/agent-session-failure' +import { agentSessionFailureWords } from '../../../shared/agent-session/failures/agent-session-failure-words' import type { AgentSessionCommandAdmission, StructuredAgentSessionCommandRun -} from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' -import type { ProviderTimelineEvent } from '../native-chat/agent-session-timeline/provider-timeline-event' -import { PROVIDER_COMPACTING_ACTIVITY } from '../native-chat/agent-session-wire/providers/provider-frame-activity' -import { JsonlRpcResponseError } from '../jsonl-rpc/peer' +} from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +import type { ProviderTimelineEvent } from '../../native-chat/agent-session-timeline/provider-timeline-event' +import { PROVIDER_COMPACTING_ACTIVITY } from '../../native-chat/agent-session-wire/providers/provider-frame-activity' +import { JsonlRpcResponseError } from '../../jsonl-rpc/peer-reply' import type { PiRpcContextUsage } from './rpc-context-usage' import type { PiRpcSession } from './rpc-session' diff --git a/src/main/pi/rpc-context-usage.ts b/src/main/pi/rpc/rpc-context-usage.ts similarity index 93% rename from src/main/pi/rpc-context-usage.ts rename to src/main/pi/rpc/rpc-context-usage.ts index 9f9b19eaaed..27195eaf4ed 100644 --- a/src/main/pi/rpc-context-usage.ts +++ b/src/main/pi/rpc/rpc-context-usage.ts @@ -1,6 +1,7 @@ import { z } from 'zod' -import type { ProviderTimelineEvent } from '../native-chat/agent-session-timeline/provider-timeline-event' -import { piRpcUsageSchema, type PiRpcModel } from './rpc-protocol' +import type { ProviderTimelineEvent } from '../../native-chat/agent-session-timeline/provider-timeline-event' +import { piRpcUsageSchema } from './rpc-protocol' +import type { PiRpcModel } from './options/rpc-model-schema' const statsSchema = z.object({ contextUsage: z diff --git a/src/main/pi/rpc-dialog-callbacks.ts b/src/main/pi/rpc/rpc-dialog-callbacks.ts similarity index 87% rename from src/main/pi/rpc-dialog-callbacks.ts rename to src/main/pi/rpc/rpc-dialog-callbacks.ts index fdf8ebdd59a..efcd4efb0db 100644 --- a/src/main/pi/rpc-dialog-callbacks.ts +++ b/src/main/pi/rpc/rpc-dialog-callbacks.ts @@ -1,13 +1,13 @@ -import type { AgentSessionPromptResponse } from '../../shared/agent-session/agent-session-question-answer' -import '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +import type { AgentSessionPromptResponse } from '../../../shared/agent-session/agent-session-question-answer' +import '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' import { AgentSessionPromptAnswerRejectedError, AgentSessionPromptUnavailableError -} from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter-errors' -import type { JsonlRpcTimelineLane } from '../jsonl-rpc/timeline-lane' -import type { JsonlRpcRecord } from '../jsonl-rpc/peer' +} from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter-errors' +import type { JsonlRpcTimelineLane } from '../../jsonl-rpc/timeline-lane' +import type { JsonlRpcRecord } from '../../jsonl-rpc/peer' import { piRpcDialogPresentation, type PiRpcDialogPresentation } from './rpc-extension-dialogs' -import { PiRpcBackgroundWork } from './rpc-background-work' +import { PiRpcBackgroundWork } from './background-work/rpc-background-work' type Callback = { presentation: PiRpcDialogPresentation; claimed: boolean; bytes: number } const DECORATION = new Set(['notify', 'setStatus', 'setWidget', 'setTitle', 'setEditorText']) diff --git a/src/main/pi/rpc-exit-classification.ts b/src/main/pi/rpc/rpc-exit-classification.ts similarity index 77% rename from src/main/pi/rpc-exit-classification.ts rename to src/main/pi/rpc/rpc-exit-classification.ts index bd25e3e17e0..05b6003b335 100644 --- a/src/main/pi/rpc-exit-classification.ts +++ b/src/main/pi/rpc/rpc-exit-classification.ts @@ -3,18 +3,18 @@ import { providerDiagnostic, providerDiagnosticOf, type SubmissionRejectionFact -} from '../../shared/agent-session/failures/agent-session-failure' -import '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +} from '../../../shared/agent-session/failures/agent-session-failure' +import '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' import { AgentSessionAcquisitionExitProvenError, AgentSessionAcquisitionRootExitObservedError -} from '../native-chat/agent-session-wire/acquisition/structured-agent-session-acquisition-errors' -import { providerStartupFailureFact } from '../native-chat/agent-session-wire/startup/structured-agent-session-failure-text' +} from '../../native-chat/agent-session-wire/acquisition/structured-agent-session-acquisition-errors' +import { providerStartupFailureFact } from '../../native-chat/agent-session-wire/startup/structured-agent-session-failure-text' import { providerSpawnAbsent, withProviderSpawnAbsence -} from '../provider-process/provider-executable-missing' -import { JsonlRpcResponseError } from '../jsonl-rpc/peer' +} from '../../provider-process/provider-executable-missing' +import { JsonlRpcResponseError } from '../../jsonl-rpc/peer-reply' import type { PiRpcConnection } from './rpc-session' /** How an unexpected Pi exit reads; a Pi that never ran names its missing CLI or folder. */ diff --git a/src/main/pi/rpc-extension-dialogs.ts b/src/main/pi/rpc/rpc-extension-dialogs.ts similarity index 93% rename from src/main/pi/rpc-extension-dialogs.ts rename to src/main/pi/rpc/rpc-extension-dialogs.ts index 93609716120..15eb729d521 100644 --- a/src/main/pi/rpc-extension-dialogs.ts +++ b/src/main/pi/rpc/rpc-extension-dialogs.ts @@ -1,5 +1,5 @@ -import type { AgentSessionPromptResponse } from '../../shared/agent-session/agent-session-question-answer' -import type { ProviderTimelineRequestBody } from '../native-chat/agent-session-timeline/provider-timeline-event' +import type { AgentSessionPromptResponse } from '../../../shared/agent-session/agent-session-question-answer' +import type { ProviderTimelineRequestBody } from '../../native-chat/agent-session-timeline/provider-timeline-event' import { piRpcDialogSchema } from './rpc-protocol' const pendingResolution = { diff --git a/src/main/pi/rpc-failure-cleanup.ts b/src/main/pi/rpc/rpc-failure-cleanup.ts similarity index 84% rename from src/main/pi/rpc-failure-cleanup.ts rename to src/main/pi/rpc/rpc-failure-cleanup.ts index b9837979770..c54c21c40e7 100644 --- a/src/main/pi/rpc-failure-cleanup.ts +++ b/src/main/pi/rpc/rpc-failure-cleanup.ts @@ -1,4 +1,4 @@ -import type { StructuredAgentSessionLogger } from '../native-chat/agent-session-wire/host/structured-agent-session-logger' +import type { StructuredAgentSessionLogger } from '../../native-chat/agent-session-wire/host/structured-agent-session-logger' import type { PiRpcSession } from './rpc-session' export function closeFailedPiSession( diff --git a/src/main/pi/rpc-idle-check.ts b/src/main/pi/rpc/rpc-idle-check.ts similarity index 100% rename from src/main/pi/rpc-idle-check.ts rename to src/main/pi/rpc/rpc-idle-check.ts diff --git a/src/main/pi/rpc-message-dispatch.ts b/src/main/pi/rpc/rpc-message-dispatch.ts similarity index 84% rename from src/main/pi/rpc-message-dispatch.ts rename to src/main/pi/rpc/rpc-message-dispatch.ts index 2196005f5c0..c965914f39a 100644 --- a/src/main/pi/rpc-message-dispatch.ts +++ b/src/main/pi/rpc/rpc-message-dispatch.ts @@ -2,17 +2,17 @@ import { agentSessionFailureFact, providerDiagnostic, withProviderDiagnostic -} from '../../shared/agent-session/failures/agent-session-failure' -import { agentSessionFailureWords } from '../../shared/agent-session/failures/agent-session-failure-words' -import { ClaudeDispatchContentError } from '../claude/structured/claude-structured-dispatch-content' -import { JsonlRpcResponseError } from '../jsonl-rpc/peer' +} from '../../../shared/agent-session/failures/agent-session-failure' +import { agentSessionFailureWords } from '../../../shared/agent-session/failures/agent-session-failure-words' +import { ClaudeDispatchContentError } from '../../claude/structured/claude-structured-dispatch-content' +import { JsonlRpcResponseError } from '../../jsonl-rpc/peer-reply' import type { AgentSessionDispatchOutcome, StructuredAgentSessionAdapter -} from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' -import { AgentSessionOptionRejectedError } from '../native-chat/agent-session-wire/options/structured-agent-session-option-error' -import { applyPiRpcSessionOption } from './rpc-options' -import { PiRpcPromptError, preparePiRpcPrompt, type PiRpcPrompt } from './rpc-prompt' +} from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +import { AgentSessionOptionRejectedError } from '../../native-chat/agent-session-wire/options/structured-agent-session-option-error' +import { applyPiRpcSessionOption } from './options/rpc-options' +import { PiRpcPromptError, preparePiRpcPrompt, type PiRpcPrompt } from './prompts/rpc-prompt' import type { PiRpcSession, PiRpcSessionDeps } from './rpc-session' type DispatchInput = Parameters[0] diff --git a/src/main/pi/rpc-messages.test.ts b/src/main/pi/rpc/rpc-messages.test.ts similarity index 52% rename from src/main/pi/rpc-messages.test.ts rename to src/main/pi/rpc/rpc-messages.test.ts index 191c5220be0..1f429286c98 100644 --- a/src/main/pi/rpc-messages.test.ts +++ b/src/main/pi/rpc/rpc-messages.test.ts @@ -41,42 +41,3 @@ it('closes more than 128 concurrent text blocks without dropping early late text expect(closed).toHaveLength(160) expect(closed[0]).toEqual({ type: 'text.close', item: { id: 'message:g:1:0:assistant' } }) }) - -it('keeps complete tool fields past the former count and aggregate preview limits, then resets them', () => { - const messages = new PiRpcMessages('g', new PiRpcContextUsage()) - const output = 'x'.repeat(24_000) - for (let index = 0; index < 160; index += 1) { - messages.tool({ - type: 'tool_execution_start', - toolCallId: `call-${index}`, - toolName: 'read', - args: { path: 'large.txt' }, - partialResult: { content: [{ type: 'text', text: output }] } - }) - } - expect( - messages.tool({ type: 'tool_execution_end', toolCallId: 'call-0', toolName: 'read' }) - ).toMatchObject([ - { - type: 'item.close', - item: 'tool:call-0', - body: { - kind: 'tool-call', - name: 'read', - input: { path: 'large.txt' }, - state: 'completed', - output: { head: output, truncated: false } - } - } - ]) - messages.reset() - expect( - messages.tool({ type: 'tool_execution_start', toolCallId: 'call-1', toolName: 'read' }) - ).toEqual([ - { - type: 'item.open', - item: 'tool:call-1', - body: { kind: 'tool-call', callId: 'call-1', name: 'read', input: null, state: 'running' } - } - ]) -}) diff --git a/src/main/pi/rpc-messages.ts b/src/main/pi/rpc/rpc-messages.ts similarity index 95% rename from src/main/pi/rpc-messages.ts rename to src/main/pi/rpc/rpc-messages.ts index 38dd444a204..c10e0c62f57 100644 --- a/src/main/pi/rpc-messages.ts +++ b/src/main/pi/rpc/rpc-messages.ts @@ -1,11 +1,11 @@ import { z } from 'zod' -import type { AgentJournalToolCallItem } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalToolCallItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { boundToolInput, JOURNAL_RUNNING_PREVIEW_LIMITS, journalToolPayload -} from '../native-chat/agent-session-journal/item-lifecycle/journal-payload-bounds' -import type { ProviderTimelineEvent } from '../native-chat/agent-session-timeline/provider-timeline-event' +} from '../../native-chat/agent-session-journal/item-lifecycle/journal-payload-bounds' +import type { ProviderTimelineEvent } from '../../native-chat/agent-session-timeline/provider-timeline-event' import { piRpcMessageEventSchema, piRpcToolEventSchema } from './rpc-protocol' import type { PiRpcContextUsage } from './rpc-context-usage' diff --git a/src/main/pi/rpc-protocol.ts b/src/main/pi/rpc/rpc-protocol.ts similarity index 96% rename from src/main/pi/rpc-protocol.ts rename to src/main/pi/rpc/rpc-protocol.ts index 164df3865e2..f5cfa5bf9a8 100644 --- a/src/main/pi/rpc-protocol.ts +++ b/src/main/pi/rpc/rpc-protocol.ts @@ -1,8 +1,7 @@ import { z } from 'zod' -import type { JsonlRpcRecord } from '../jsonl-rpc/peer' +import type { JsonlRpcRecord } from '../../jsonl-rpc/peer' -import { piRpcModelSchema } from './rpc-model-schema' -export { piRpcModelSchema, type PiRpcModel } from './rpc-model-schema' +import { piRpcModelSchema } from './options/rpc-model-schema' export const piRpcStateSchema = z.looseObject({ model: piRpcModelSchema.nullish(), diff --git a/src/main/pi/rpc-retry-activity.ts b/src/main/pi/rpc/rpc-retry-activity.ts similarity index 63% rename from src/main/pi/rpc-retry-activity.ts rename to src/main/pi/rpc/rpc-retry-activity.ts index 503fa94e2fa..f21b3dd2cef 100644 --- a/src/main/pi/rpc-retry-activity.ts +++ b/src/main/pi/rpc/rpc-retry-activity.ts @@ -1,10 +1,10 @@ import { agentSessionFailureFact, providerDiagnostic -} from '../../shared/agent-session/failures/agent-session-failure' -import { agentSessionFailureWords } from '../../shared/agent-session/failures/agent-session-failure-words' -import type { JsonlRpcRecord } from '../jsonl-rpc/peer' -import type { ProviderTimelineEvent } from '../native-chat/agent-session-timeline/provider-timeline-event' +} from '../../../shared/agent-session/failures/agent-session-failure' +import { agentSessionFailureWords } from '../../../shared/agent-session/failures/agent-session-failure-words' +import type { JsonlRpcRecord } from '../../jsonl-rpc/peer' +import type { ProviderTimelineEvent } from '../../native-chat/agent-session-timeline/provider-timeline-event' export function piRpcRetryActivity(frame: JsonlRpcRecord): ProviderTimelineEvent { return { diff --git a/src/main/pi/rpc-session-adapter.test-fixture.ts b/src/main/pi/rpc/rpc-session-adapter.test-fixture.ts similarity index 88% rename from src/main/pi/rpc-session-adapter.test-fixture.ts rename to src/main/pi/rpc/rpc-session-adapter.test-fixture.ts index 529c36e2e60..28269e60101 100644 --- a/src/main/pi/rpc-session-adapter.test-fixture.ts +++ b/src/main/pi/rpc/rpc-session-adapter.test-fixture.ts @@ -1,17 +1,18 @@ import { expect, vi, type Mock } from 'vitest' -import type { AgentSessionProcessIdentity } from '../../shared/agent-session/lifecycle/agent-session-record' -import type { StructuredAgentSessionAcquireInput } from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +import type { AgentSessionProcessIdentity } from '../../../shared/agent-session/lifecycle/agent-session-record' +import type { StructuredAgentSessionAcquireInput } from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' import { closeProviderTimelineRigs, openProviderTimelineRig -} from '../native-chat/agent-session-timeline/provider-timeline-assembler-test-support' -import type { JsonlRpcAgentConnectionOptions } from '../jsonl-rpc/agent-connection' -import { type JsonlRpcRecord, JsonlRpcResponseError } from '../jsonl-rpc/peer' +} from '../../native-chat/agent-session-timeline/provider-timeline-assembler-test-support' +import type { JsonlRpcAgentConnectionOptions } from '../../jsonl-rpc/agent-connection' +import type { JsonlRpcRecord } from '../../jsonl-rpc/peer' +import { JsonlRpcResponseError } from '../../jsonl-rpc/peer-reply' import type { PiRpcConnection } from './rpc-session' -import type { ProviderProcessLaunch } from '../provider-process/provider-process-launch' -import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' +import type { ProviderProcessLaunch } from '../../provider-process/provider-process-launch' +import type { StructuredAgentSessionEventSink } from '../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' import { PiRpcSessionAdapter, type PiRpcSessionAdapterDeps } from './rpc-session-adapter' -import type { PiRpcResolvedLaunch } from './rpc-launch-resolution' +import type { PiRpcResolvedLaunch } from './launch/rpc-launch-resolution' export const sessionId = 'session-timeline' export const file = '/host/account/sessions/session.jsonl' diff --git a/src/main/pi/rpc-session-adapter.ts b/src/main/pi/rpc/rpc-session-adapter.ts similarity index 90% rename from src/main/pi/rpc-session-adapter.ts rename to src/main/pi/rpc/rpc-session-adapter.ts index b20cf8322bf..efbd4cc1c53 100644 --- a/src/main/pi/rpc-session-adapter.ts +++ b/src/main/pi/rpc/rpc-session-adapter.ts @@ -1,27 +1,27 @@ -import { stopAgentSessionProviderRoot } from '../native-chat/agent-session-wire/termination/structured-agent-session-provider-exit-proof' +import { stopAgentSessionProviderRoot } from '../../native-chat/agent-session-wire/termination/structured-agent-session-provider-exit-proof' import { randomUUID } from 'node:crypto' -import { waitForPromiseWithSignal } from '../../shared/abort-signal-reason' -import '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' -import * as provider from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter-errors' -import * as acquisition from '../native-chat/agent-session-wire/acquisition/structured-agent-session-acquisition-errors' +import { waitForPromiseWithSignal } from '../../../shared/abort-signal-reason' +import '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +import * as provider from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter-errors' +import * as acquisition from '../../native-chat/agent-session-wire/acquisition/structured-agent-session-acquisition-errors' import type { AgentSessionAcquisition, StructuredAgentSessionAcquireInput, StructuredAgentSessionAdapter -} from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' -import { providerSpawnedProcessIdentity } from '../provider-process/provider-spawned-process-identity' -import { ProviderAcquisitionStarts } from '../provider-process/provider-acquisition-starts' +} from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +import { providerSpawnedProcessIdentity } from '../../provider-process/provider-spawned-process-identity' +import { ProviderAcquisitionStarts } from '../../provider-process/provider-acquisition-starts' import { piStartExitError } from './rpc-exit-classification' import { compactPiRpcSession } from './rpc-compaction' -import { buildPiRpcLaunch } from './rpc-launch' -import type { PiRpcResolvedLaunch } from './rpc-launch-resolution' +import { buildPiRpcLaunch } from './launch/rpc-launch' +import type { PiRpcResolvedLaunch } from './launch/rpc-launch-resolution' import { PiRpcSession, type PiRpcSessionDeps, type PiRpcConnection } from './rpc-session' import { dispatchPiRpcMessage } from './rpc-message-dispatch' import { piAcquireFailure } from './rpc-startup-outcome' import { openPiStart, watchPiStartExit } from './rpc-startup-open' -import { AgentSessionStartEndings } from '../native-chat/agent-session-wire/startup/structured-agent-session-start-failure' -import { applyPiRpcSessionOption } from './rpc-options' -import { supportsSupervisedProviderChildLocation } from '../provider-process/supervised-provider-child-location' +import { AgentSessionStartEndings } from '../../native-chat/agent-session-wire/startup/structured-agent-session-start-failure' +import { applyPiRpcSessionOption } from './options/rpc-options' +import { supportsSupervisedProviderChildLocation } from '../../provider-process/supervised-provider-child-location' export type PiRpcSessionAdapterDeps = PiRpcSessionDeps & { resolveLaunch: (input: { diff --git a/src/main/pi/rpc-session-rename.test.ts b/src/main/pi/rpc/rpc-session-rename.test.ts similarity index 89% rename from src/main/pi/rpc-session-rename.test.ts rename to src/main/pi/rpc/rpc-session-rename.test.ts index 109bd43c01f..f7eceff56ee 100644 --- a/src/main/pi/rpc-session-rename.test.ts +++ b/src/main/pi/rpc/rpc-session-rename.test.ts @@ -1,7 +1,7 @@ import { PassThrough } from 'node:stream' import { afterEach, expect, it, vi } from 'vitest' -import { JsonlRpcPeer } from '../jsonl-rpc/peer' -import { agentSessionRecordFixture } from '../native-chat/agent-session-record-test-fixture' +import { JsonlRpcPeer } from '../../jsonl-rpc/peer' +import { agentSessionRecordFixture } from '../../native-chat/agent-session-record-test-fixture' import { closePiRpcAdapterFixtures, file, diff --git a/src/main/pi/rpc-session-startup.test.ts b/src/main/pi/rpc/rpc-session-startup.test.ts similarity index 98% rename from src/main/pi/rpc-session-startup.test.ts rename to src/main/pi/rpc/rpc-session-startup.test.ts index 6469812f8d1..0aac7866037 100644 --- a/src/main/pi/rpc-session-startup.test.ts +++ b/src/main/pi/rpc/rpc-session-startup.test.ts @@ -1,6 +1,6 @@ import { readFileSync } from 'node:fs' import { PassThrough } from 'node:stream' -import { JsonlRpcPeer } from '../jsonl-rpc/peer' +import { JsonlRpcPeer } from '../../jsonl-rpc/peer' import { afterEach, describe, expect, it, vi } from 'vitest' import { closePiRpcAdapterFixtures, diff --git a/src/main/pi/rpc-session-startup.ts b/src/main/pi/rpc/rpc-session-startup.ts similarity index 83% rename from src/main/pi/rpc-session-startup.ts rename to src/main/pi/rpc/rpc-session-startup.ts index 4f7582fd341..ca47330db17 100644 --- a/src/main/pi/rpc-session-startup.ts +++ b/src/main/pi/rpc/rpc-session-startup.ts @@ -1,26 +1,27 @@ import { randomUUID } from 'node:crypto' -import { waitForPromiseWithSignal } from '../../shared/abort-signal-reason' +import { waitForPromiseWithSignal } from '../../../shared/abort-signal-reason' import { providerDiagnostic, withProviderDiagnostic -} from '../../shared/agent-session/failures/agent-session-failure' -import type { AgentSessionOptionsResult } from '../../shared/agent-session/options/agent-session-options-result' -import type { AgentSessionSlashCommand } from '../../shared/agent-session/agent-session-wire' -import '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' -import { AgentSessionAcquisitionRefusal } from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter-errors' -import type { StructuredAgentSessionAcquireInput } from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' -import type { StructuredAgentSessionProviderOpenResult } from '../native-chat/agent-session-wire/startup/structured-agent-session-provider-open-contract' +} from '../../../shared/agent-session/failures/agent-session-failure' +import type { AgentSessionOptionsResult } from '../../../shared/agent-session/options/agent-session-options-result' +import type { AgentSessionSlashCommand } from '../../../shared/agent-session/agent-session-wire' +import '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +import { AgentSessionAcquisitionRefusal } from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter-errors' +import type { StructuredAgentSessionAcquireInput } from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +import type { StructuredAgentSessionProviderOpenResult } from '../../native-chat/agent-session-wire/startup/structured-agent-session-provider-open-contract' import { unpickedSessionConfiguredChoice, withLiveCatalogListing -} from '../native-chat/agent-model-catalog/agent-model-catalog-entry' -import { piRpcProviderLink, type PiRpcResolvedLaunch } from './rpc-launch-resolution' -import { piModelOptionId, readPiRpcCommands, readPiRpcSessionOptions } from './rpc-options' +} from '../../native-chat/agent-model-catalog/agent-model-catalog-entry' +import { piRpcProviderLink, type PiRpcResolvedLaunch } from './launch/rpc-launch-resolution' +import { piModelOptionId } from './options/rpc-model-options' +import { readPiRpcCommands, readPiRpcSessionOptions } from './options/rpc-options' import { piRpcStateSchema, type PiRpcState } from './rpc-protocol' import type { PiRpcConnection, PiRpcSessionDeps } from './rpc-session' -import { catchUpPiSession } from './rpc-history-catch-up' -import type { PiHistoryAnchor } from './rpc-history-capture' -import { decodePiHistoryClaim, encodePiHistoryClaim } from './rpc-history-journal-view' +import { catchUpPiSession } from './history/rpc-history-catch-up' +import type { PiHistoryAnchor } from './history/rpc-history-capture' +import { decodePiHistoryClaim, encodePiHistoryClaim } from './history/rpc-history-journal-view' export class PiRpcSessionStartup { commands?: AgentSessionSlashCommand[] diff --git a/src/main/pi/rpc-session.ts b/src/main/pi/rpc/rpc-session.ts similarity index 91% rename from src/main/pi/rpc-session.ts rename to src/main/pi/rpc/rpc-session.ts index c26fe77267b..bb828645d00 100644 --- a/src/main/pi/rpc-session.ts +++ b/src/main/pi/rpc/rpc-session.ts @@ -2,25 +2,25 @@ import type { StructuredAgentSessionAcquireInput, StructuredAgentSessionLifecycleEvent, AgentSessionDispatchOutcome -} from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' -import type { StructuredAgentSessionLogger } from '../native-chat/agent-session-wire/host/structured-agent-session-logger' -import { providerTimelineSink } from '../native-chat/agent-session-timeline/provider-timeline-plan' -import { JsonlRpcTimelineLane } from '../jsonl-rpc/timeline-lane' -import { ReaderPauseHolds } from '../jsonl-rpc/reader-pause-holds' +} from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +import type { StructuredAgentSessionLogger } from '../../native-chat/agent-session-wire/host/structured-agent-session-logger' +import { providerTimelineSink } from '../../native-chat/agent-session-timeline/provider-timeline-plan' +import { JsonlRpcTimelineLane } from '../../jsonl-rpc/timeline-lane' +import { ReaderPauseHolds } from '../../jsonl-rpc/reader-pause-holds' import { JsonlRpcAgentConnection, type JsonlRpcAgentConnectionOptions -} from '../jsonl-rpc/agent-connection' -import type { ProviderProcessLaunch } from '../provider-process/provider-process-launch' +} from '../../jsonl-rpc/agent-connection' +import type { ProviderProcessLaunch } from '../../provider-process/provider-process-launch' import { piExitFailure } from './rpc-exit-classification' import { PiRpcTurns } from './rpc-turns' import { PiRpcDialogCallbacks } from './rpc-dialog-callbacks' -import { PiRpcOptionObservations, type PiRpcOptionWrite } from './rpc-options' -import type { PiRpcResolvedLaunch } from './rpc-launch-resolution' -import type { StructuredAgentSessionProviderOpenResult } from '../native-chat/agent-session-wire/startup/structured-agent-session-provider-open-contract' -import type { AgentSessionProviderHandleLink } from '../../shared/agent-session/lifecycle/agent-session-provider-handle' +import { PiRpcOptionObservations, type PiRpcOptionWrite } from './options/rpc-options' +import type { PiRpcResolvedLaunch } from './launch/rpc-launch-resolution' +import type { StructuredAgentSessionProviderOpenResult } from '../../native-chat/agent-session-wire/startup/structured-agent-session-provider-open-contract' +import type { AgentSessionProviderHandleLink } from '../../../shared/agent-session/lifecycle/agent-session-provider-handle' import { PiRpcSessionStartup } from './rpc-session-startup' -import { PiHistoryCapture, type PiHistoryCaptureDeps } from './rpc-history-capture' +import { PiHistoryCapture, type PiHistoryCaptureDeps } from './history/rpc-history-capture' import { closeFailedPiSession } from './rpc-failure-cleanup' export type PiRpcConnection = Pick< diff --git a/src/main/pi/rpc-startup-open.ts b/src/main/pi/rpc/rpc-startup-open.ts similarity index 82% rename from src/main/pi/rpc-startup-open.ts rename to src/main/pi/rpc/rpc-startup-open.ts index 9979c2ae26d..f09978215b6 100644 --- a/src/main/pi/rpc-startup-open.ts +++ b/src/main/pi/rpc/rpc-startup-open.ts @@ -1,11 +1,11 @@ import type { StructuredAgentSessionAcquireInput, StructuredAgentSessionAdapter -} from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' -import type { AgentSessionStartEndings } from '../native-chat/agent-session-wire/startup/structured-agent-session-start-failure' -import type { StructuredAgentSessionProviderOpenInput } from '../native-chat/agent-session-wire/startup/structured-agent-session-provider-open-contract' -import { JsonlRpcAgentExitError } from '../jsonl-rpc/agent-connection' -import { withProviderSpawnAbsence } from '../provider-process/provider-executable-missing' +} from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +import type { AgentSessionStartEndings } from '../../native-chat/agent-session-wire/startup/structured-agent-session-start-failure' +import type { StructuredAgentSessionProviderOpenInput } from '../../native-chat/agent-session-wire/startup/structured-agent-session-provider-open-contract' +import { JsonlRpcAgentExitError } from '../../jsonl-rpc/agent-connection' +import { withProviderSpawnAbsence } from '../../provider-process/provider-executable-missing' import type { PiRpcSession } from './rpc-session' import { piStartFailure } from './rpc-startup-outcome' diff --git a/src/main/pi/rpc-startup-outcome.ts b/src/main/pi/rpc/rpc-startup-outcome.ts similarity index 77% rename from src/main/pi/rpc-startup-outcome.ts rename to src/main/pi/rpc/rpc-startup-outcome.ts index ca8fc8a6824..bc6192c4ad5 100644 --- a/src/main/pi/rpc-startup-outcome.ts +++ b/src/main/pi/rpc/rpc-startup-outcome.ts @@ -3,9 +3,9 @@ import { agentSessionStartFailure, type AgentSessionStartAnswer, type AgentSessionStartFailure -} from '../native-chat/agent-session-wire/startup/structured-agent-session-start-failure' -import { JsonlRpcAgentExitError } from '../jsonl-rpc/agent-connection' -import { JsonlRpcResponseError } from '../jsonl-rpc/peer' +} from '../../native-chat/agent-session-wire/startup/structured-agent-session-start-failure' +import { JsonlRpcAgentExitError } from '../../jsonl-rpc/agent-connection' +import { JsonlRpcResponseError } from '../../jsonl-rpc/peer-reply' /** Pi declares no temporary startup answers. Only its process's own exit, once its output * drained, leaves a start unanswered; a closed stream alone proves no exit. */ diff --git a/src/main/pi/rpc-turn-races.test.ts b/src/main/pi/rpc/rpc-turn-races.test.ts similarity index 77% rename from src/main/pi/rpc-turn-races.test.ts rename to src/main/pi/rpc/rpc-turn-races.test.ts index ab838176ce8..be59a7c07d4 100644 --- a/src/main/pi/rpc-turn-races.test.ts +++ b/src/main/pi/rpc/rpc-turn-races.test.ts @@ -1,9 +1,9 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import { JsonlRpcTimelineLane } from '../jsonl-rpc/timeline-lane' +import { JsonlRpcTimelineLane } from '../../jsonl-rpc/timeline-lane' import { closeProviderTimelineRigs, openProviderTimelineRig -} from '../native-chat/agent-session-timeline/provider-timeline-assembler-test-support' +} from '../../native-chat/agent-session-timeline/provider-timeline-assembler-test-support' import { PiRpcTurns } from './rpc-turns' const state = (overrides: Record = {}) => ({ @@ -83,32 +83,6 @@ describe('Pi turn settlement races', () => { }) }) - it('invalidates an old idle probe when detached compaction starts after settlement', async () => { - let release: ((value: unknown) => void) | undefined - const request = vi.fn( - (_command: string) => - new Promise((resolve) => { - release = resolve - }) - ) - const h = await setup(request) - await h.start() - h.turns.receive({ type: 'agent_settled' }) - await Promise.resolve() - expect(request).toHaveBeenCalledTimes(1) - h.turns.receive({ type: 'auto_compaction_start' }) - release?.(state()) - await h.flush() - expect(h.idle).not.toHaveBeenCalled() - expect((await h.rig.turns())[0]?.state).toBe('running') - h.turns.receive({ type: 'auto_compaction_end' }) - await Promise.resolve() - expect(request.mock.calls.filter(([command]) => command === 'get_state')).toHaveLength(2) - release?.(state()) - await h.flush() - expect((await h.rig.turns())[0]?.outcome).toBe('success') - }) - it('keeps an exhausted retry a failure when its records exceed the line limit', async () => { const h = await setup() await h.start() diff --git a/src/main/pi/rpc-turns.ts b/src/main/pi/rpc/rpc-turns.ts similarity index 93% rename from src/main/pi/rpc-turns.ts rename to src/main/pi/rpc/rpc-turns.ts index 59e94e07319..a2c3411675c 100644 --- a/src/main/pi/rpc-turns.ts +++ b/src/main/pi/rpc/rpc-turns.ts @@ -1,16 +1,16 @@ -import { agentSessionFailureWords } from '../../shared/agent-session/failures/agent-session-failure-words' +import { agentSessionFailureWords } from '../../../shared/agent-session/failures/agent-session-failure-words' import type { AgentSessionDispatchOutcome, StructuredAgentSessionCommandRun -} from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' -import type { ProviderTimelineEvent } from '../native-chat/agent-session-timeline/provider-timeline-event' -import type { JsonlRpcRecord } from '../jsonl-rpc/peer' -import type { JsonlRpcRequestOptions } from '../jsonl-rpc/peer-oversized-record' -import type { JsonlRpcTimelineLane } from '../jsonl-rpc/timeline-lane' +} from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +import type { ProviderTimelineEvent } from '../../native-chat/agent-session-timeline/provider-timeline-event' +import type { JsonlRpcRecord } from '../../jsonl-rpc/peer' +import type { JsonlRpcRequestOptions } from '../../jsonl-rpc/peer-oversized-record' +import type { JsonlRpcTimelineLane } from '../../jsonl-rpc/timeline-lane' import { PiRpcCompaction } from './rpc-compaction' import { PiRpcContextUsage } from './rpc-context-usage' import { PiRpcMessages, piRpcSkippedEventNotice } from './rpc-messages' -import { PiRpcPromptDelivery, piRpcFailureFact } from './rpc-prompt-delivery' +import { PiRpcPromptDelivery, piRpcFailureFact } from './prompts/rpc-prompt-delivery' import { PiRpcIdleCheck } from './rpc-idle-check' import { piRpcRetryActivity } from './rpc-retry-activity' import { type PiRpcState, piRpcMessageSchema, piRpcSkippedEvent } from './rpc-protocol' diff --git a/src/main/pi/titlebar-extension-source.test.ts b/src/main/pi/titlebar-extension-source.test.ts deleted file mode 100644 index 57b2401630a..00000000000 --- a/src/main/pi/titlebar-extension-source.test.ts +++ /dev/null @@ -1,224 +0,0 @@ -import { runInNewContext } from 'node:vm' -// TypeScript 7 is a native CLI; transpile tests still need the legacy JavaScript API. -import ts from 'typescript-api' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' - -import { detectAgentStatusFromTitle } from '../../shared/agent-status/title/agent-title-status' -import type { PiAgentKind } from '../../shared/pi-agent-kind' -import { getPiTitlebarExtensionSource } from './titlebar-extension-source' - -const BRAILLE_RE = /[โ €-โฃฟ]/ - -type TitlebarContext = { - ui: { setTitle: (title: string) => void } - isIdle?: () => boolean -} -type HookHandler = (event?: unknown, context?: TitlebarContext) => Promise | void - -type Harness = { - handlers: Record - titles: string[] - lastTitle: () => string | undefined - callHook: (name: string, event?: unknown) => Promise -} - -const CWD = '/repo/orca-app' -const SESSION = 'omp-session' -const IDLE_TITLE = `ฯ€ - ${SESSION} - orca-app` -const PROMPT_TITLE = `ฯ€ ! ${SESSION} - orca-app` - -function createHarness( - options: { - paneKey?: string - isIdle?: () => boolean - kind?: PiAgentKind - processTitle?: string - cwdImpl?: () => string - sessionNameImpl?: () => string - setTitle?: (title: string) => void - globals?: Record - env?: Record - } = {} -): Harness { - const titles: string[] = [] - const ctx: TitlebarContext = { - ui: { - setTitle: (title: string) => { - options.setTitle?.(title) - titles.push(title) - } - }, - isIdle: options.isIdle - } - - const module = { - exports: {} as { - default?: (pi: { - on: (name: string, handler: HookHandler) => void - getSessionName: () => string - }) => void - } - } - - const context = { - module, - exports: module.exports, - process: { - env: { ORCA_PANE_KEY: options.paneKey ?? 'pane-1', ...options.env }, - pid: options.env?.ORCA_PI_TITLE_MARKER_OWNED === undefined ? 111 : 222, - title: options.processTitle ?? 'pi', - argv: ['node', 'pi'], - cwd: options.cwdImpl ?? (() => CWD) - }, - console: { warn: vi.fn(), error: vi.fn(), log: vi.fn() }, - Promise, - // Why: forward to the test realm's timers so vi.useFakeTimers() drives the VM's interval. - setInterval: (...args: Parameters) => setInterval(...args), - clearInterval: (timer: ReturnType) => clearInterval(timer), - setTimeout: (...args: Parameters) => setTimeout(...args), - clearTimeout: (timer: ReturnType) => clearTimeout(timer) - } as Record - context.globalThis = options.globals ?? context - - const output = ts.transpileModule(getPiTitlebarExtensionSource(options.kind ?? 'pi'), { - compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2020 } - }).outputText - runInNewContext(output, context) - - const register = module.exports.default - if (!register) { - throw new Error('expected default export from generated source') - } - - const handlers: Record = {} - register({ - on(name: string, handler: HookHandler) { - handlers[name] = handler - }, - getSessionName: options.sessionNameImpl ?? (() => SESSION) - }) - - return { - handlers, - titles, - lastTitle: () => titles.at(-1), - callHook: async (name, event) => { - const handler = handlers[name] - if (!handler) { - throw new Error(`no handler registered for ${name}`) - } - await handler(event, ctx) - } - } -} - -describe('getPiTitlebarExtensionSource', () => { - beforeEach(() => { - vi.useFakeTimers() - }) - - afterEach(() => { - vi.useRealTimers() - }) - - it('does not let a stale idle-compaction completion stop a newer run', async () => { - const harness = createHarness() - - await harness.callHook('auto_compaction_start', { reason: 'idle' }) - await harness.callHook('agent_start') - await harness.callHook('auto_compaction_end', { reason: 'idle' }) - - expect(vi.getTimerCount()).toBe(1) - vi.advanceTimersByTime(80) - expect(harness.lastTitle()).toMatch(BRAILLE_RE) - }) - - it('marks a mid-turn dialog as needing input and holds it against the spinner', async () => { - const harness = createHarness() - - await harness.callHook('agent_start') - await harness.callHook('ui_prompt_start') - expect(harness.lastTitle()).toBe(PROMPT_TITLE) - expect(detectAgentStatusFromTitle(PROMPT_TITLE)).toBe('permission') - - await vi.advanceTimersByTimeAsync(800) - expect(harness.lastTitle()).toBe(PROMPT_TITLE) - - await harness.callHook('ui_prompt_end') - expect(harness.lastTitle()).toMatch(BRAILLE_RE) - expect(vi.getTimerCount()).toBe(1) - }) - - it('does not strand the marker when the closing ctx throws on ui access', async () => { - const harness = createHarness() - // Pi ctx.ui throws after session replacement invalidates its runner. - const stale = { - get ui(): never { - throw new Error('This extension ctx is stale') - } - } - - await harness.callHook('ui_prompt_start') - expect(harness.lastTitle()).toBe(PROMPT_TITLE) - - await expect(harness.handlers.ui_prompt_end?.({}, stale as never)).resolves.toBeUndefined() - expect(harness.lastTitle()).toBe(IDLE_TITLE) - - await harness.callHook('agent_start') - await vi.advanceTimersByTimeAsync(80) - expect(harness.lastTitle()).toMatch(BRAILLE_RE) - }) - - it('leaves the needs-input marker to the process that owns the pane', async () => { - // Child agents inherit pane identity; only its owning process may assert needs-input. - const harness = createHarness({ env: { ORCA_PI_TITLE_MARKER_OWNED: '111' } }) - - await harness.callHook('agent_start') - await harness.callHook('ui_prompt_start') - await vi.advanceTimersByTimeAsync(1000) - expect(harness.titles).not.toContain(PROMPT_TITLE) - expect(harness.lastTitle()).toMatch(BRAILLE_RE) - }) - - it('reload replaces only its pane owner and ignores late old-generation events', async () => { - const globals = {} - const old = createHarness({ globals, isIdle: () => false }) - const other = createHarness({ globals, paneKey: 'pane-2' }) - await old.callHook('agent_start') - await old.callHook('ui_prompt_start') - await old.callHook('agent_end') - await other.callHook('agent_start') - const replacement = createHarness({ globals }) - await replacement.callHook('session_start', { reason: 'reload' }) - expect(vi.getTimerCount()).toBe(1) - await replacement.callHook('agent_start') - const oldCount = old.titles.length - await old.callHook('session_shutdown') - await old.callHook('agent_start') - vi.advanceTimersByTime(80) - expect(old.titles).toHaveLength(oldCount) - expect(vi.getTimerCount()).toBe(2) - expect(replacement.lastTitle()).toMatch(BRAILLE_RE) - expect(other.lastTitle()).toMatch(BRAILLE_RE) - const third = createHarness({ globals }) - await third.callHook('session_start', { reason: 'new' }) - expect(vi.getTimerCount()).toBe(1) - await third.callHook('agent_start') - await replacement.callHook('session_shutdown') - expect(vi.getTimerCount()).toBe(2) - }) - - it('keeps the lead spinner when an in-process subagent session starts', async () => { - const globals = {} - const lead = createHarness({ globals, isIdle: () => false }) - await lead.callHook('agent_start') - const child = createHarness({ globals }) - await child.callHook('session_start', { reason: 'startup' }) - await child.callHook('agent_start') - const before = lead.titles.length - vi.advanceTimersByTime(160) - expect(lead.titles.length).toBeGreaterThan(before) - expect(child.titles).toHaveLength(0) - expect(vi.getTimerCount()).toBe(1) - }) -}) diff --git a/src/main/pi/pi-session-history.ts b/src/main/pi/transcripts/pi-session-history.ts similarity index 82% rename from src/main/pi/pi-session-history.ts rename to src/main/pi/transcripts/pi-session-history.ts index fe2b4cb3d34..9e86873a799 100644 --- a/src/main/pi/pi-session-history.ts +++ b/src/main/pi/transcripts/pi-session-history.ts @@ -1,9 +1,9 @@ -import { sessionIdFromFileName } from '../ai-vault/session-scanner-accumulator' +import { sessionIdFromFileName } from '../../ai-vault/session-scanner-accumulator' import { resumeInvocationFromOptions, sessionFileResumeTargetMatches, type StructuredAgentSessionHistory -} from '../native-chat/structured-agent-cli-conversations' +} from '../../native-chat/structured-agent-cli-conversations' export const PI_SESSION_HISTORY: StructuredAgentSessionHistory = { rowAgents: ['pi'], diff --git a/src/main/pi/pi-transcript-import.ts b/src/main/pi/transcripts/pi-transcript-import.ts similarity index 69% rename from src/main/pi/pi-transcript-import.ts rename to src/main/pi/transcripts/pi-transcript-import.ts index 183f73327ed..ace25d9dc76 100644 --- a/src/main/pi/pi-transcript-import.ts +++ b/src/main/pi/transcripts/pi-transcript-import.ts @@ -1,10 +1,10 @@ import { homedir } from 'node:os' import { join } from 'node:path' -import { sessionIdFromFileName } from '../ai-vault/session-scanner-accumulator' -import { walkSessionFiles } from '../ai-vault/session-scanner-discovery' -import { piSessionHistorySessionsDir } from '../ai-vault/session-scanner-agent-sources' -import { directoryTranscriptImport } from '../native-chat/structured-agent-cli-conversations' -import { readPiSessionHeader } from './rpc-launch-resolution' +import { sessionIdFromFileName } from '../../ai-vault/session-scanner-accumulator' +import { walkSessionFiles } from '../../ai-vault/session-scanner-discovery' +import { piSessionHistorySessionsDir } from '../../ai-vault/session-scanner-agent-sources' +import { directoryTranscriptImport } from '../../native-chat/structured-agent-cli-conversations' +import { readPiSessionHeader } from '../rpc/launch/rpc-launch-resolution' export const PI_TRANSCRIPT_IMPORT = directoryTranscriptImport({ conversationStore: () => piSessionHistorySessionsDir(), diff --git a/src/main/pty/shell-startup/pi-process-owner-env.test.ts b/src/main/pty/shell-startup/pi-process-owner-env.test.ts deleted file mode 100644 index 0c326bc3f29..00000000000 --- a/src/main/pty/shell-startup/pi-process-owner-env.test.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { afterEach, describe, expect, it, vi } from 'vitest' -import { createDaemonPtyEnvironment } from '../../daemon/pty-subprocess/spawn-environment' -import { - createAgentStatusExtensionHarness, - AGENT_STATUS_EXTENSION_SELF_PID -} from '../../pi/agent-status-extension-test-harness' - -const ownerEnv = { - ORCA_PI_STATUS_OWNED: String(AGENT_STATUS_EXTENSION_SELF_PID - 1), - ORCA_PRIME_AGENT_STATUS_OWNED: String(AGENT_STATUS_EXTENSION_SELF_PID - 1), - ORCA_PI_TITLE_MARKER_OWNED: String(AGENT_STATUS_EXTENSION_SELF_PID - 1) -} -const terminalEnv = { - ORCA_PANE_KEY: 'new-tab:new-leaf', - ORCA_TAB_ID: 'new-tab', - ORCA_WORKTREE_ID: 'folder:workspace', - ORCA_AGENT_LAUNCH_TOKEN: 'new-launch', - ORCA_AGENT_HOOK_PORT: '4321', - ORCA_AGENT_HOOK_TOKEN: 'receiver-token', - ORCA_PI_SOURCE_AGENT_DIR: 'user-config', - KEEP_ME: 'terminal-value' -} - -afterEach(() => vi.unstubAllEnvs()) - -describe('independent daemon terminal Pi ownership', () => { - it.each(['pi', 'omp', 'prime-agent'] as const)( - 'lets %s register hooks without weakening suppression of its own children', - async (kind) => { - for (const [key, value] of Object.entries(ownerEnv)) { - vi.stubEnv(key, value) - } - const env = createDaemonPtyEnvironment({ - sessionId: 'fresh-terminal', - cols: 80, - rows: 24, - env: terminalEnv - }) - - for (const [key, value] of Object.entries(ownerEnv)) { - expect(env[key]).toBeUndefined() - expect(process.env[key]).toBe(value) - } - expect(env).toMatchObject(terminalEnv) - - const parent = createAgentStatusExtensionHarness({ kind, env }) - expect(parent.handlers.before_agent_start).toBeTypeOf('function') - await parent.callHook('before_agent_start', { prompt: 'new turn' }) - expect(parent.fetchMock).toHaveBeenCalledOnce() - - const child = createAgentStatusExtensionHarness({ - kind, - env: parent.processEnv, - pid: AGENT_STATUS_EXTENSION_SELF_PID + 1 - }) - expect(child.handlers).toEqual({}) - parent.reload() - expect(parent.handlers.before_agent_start).toBeTypeOf('function') - } - ) -}) diff --git a/src/main/runtime/agent-session/launch/structured-agent-launch-composition.test-support.ts b/src/main/runtime/agent-session/launch/structured-agent-launch-composition.test-support.ts index a3547bd65b9..cf0b29098f4 100644 --- a/src/main/runtime/agent-session/launch/structured-agent-launch-composition.test-support.ts +++ b/src/main/runtime/agent-session/launch/structured-agent-launch-composition.test-support.ts @@ -24,7 +24,10 @@ import { import type { PrepareNativeChatVisuals } from '../../../native-chat/native-chat-visuals-delivery' import type { StructuredAgentCommandSettings } from '../../../native-chat/structured-agent-command-resolution' import { PI_RPC_AGENT } from '../../../pi/rpc-agent-definition' -import { piRpcLaunchPart, type PiRpcLaunchPartDeps } from '../../../pi/rpc-launch-resolution' +import { + piRpcLaunchPart, + type PiRpcLaunchPartDeps +} from '../../../pi/rpc/launch/rpc-launch-resolution' import type { StructuredAgentDefinition } from '../../../native-chat/agent-session-wire/providers/structured-agent-definition' import { composeStructuredLaunch, diff --git a/src/main/runtime/agent-session/model-catalog/structured-agent-model-catalog-owner.test.ts b/src/main/runtime/agent-session/model-catalog/structured-agent-model-catalog-owner.test.ts deleted file mode 100644 index e9e38698924..00000000000 --- a/src/main/runtime/agent-session/model-catalog/structured-agent-model-catalog-owner.test.ts +++ /dev/null @@ -1,150 +0,0 @@ -import type * as ProfilePaths from '../../../orca-profiles/profile-storage-paths' -import { readFileSync } from 'node:fs' -import { z } from 'zod' -import { mkdtemp, rm } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, beforeEach, expect, it, vi } from 'vitest' -import * as registry from '../../../native-chat/agent-session-wire/host/structured-agent-session-registry' -import * as environment from '../environment/structured-agent-shell-environment' -import type { ProviderProcessLaunch } from '../../../provider-process/provider-process-launch' -import * as pi from '../../../pi/rpc-model-catalog-probe' -import { ensureStructuredAgentModelCatalogOwner } from './structured-agent-model-catalog-wiring' -import { stopStructuredAgentSessionRuntime } from '../structured-agent-session-runtime' -import { createStructuredAgentSessionLogger } from '../../../native-chat/agent-session-wire/host/structured-agent-session-logger' - -const profile = vi.hoisted(() => ({ root: '' })) -vi.mock('../../../orca-profiles/profile-storage-paths', async (importOriginal) => ({ - ...(await importOriginal()), - getProfileUserDataPath: () => profile.root -})) -let root: string -let releases: ReturnType void>> -const installedDeps = () => ({ - stateDirectory: root, - hostId: 'local', - claimKeyId: 'catalog-test', - logger: createStructuredAgentSessionLogger(), - resolveWorkspacePath: async () => root, - resolveLaunchArgs: () => [], - resolveClaudeAuthPolicy: () => ({ account: 'system' as const }), - resolveEnvironment: async () => ({}), - resolveAgentAccountHome: async () => ({ variable: 'PI_CODING_AGENT_DIR', path: join(root, 'pi') }) -}) -beforeEach(async () => { - root = await mkdtemp(join(tmpdir(), 'orca-catalog-owner-')) - profile.root = root - releases = vi.fn() - const create = environment.createStructuredAgentEnvironmentResolvers - vi.spyOn(environment, 'createStructuredAgentEnvironmentResolvers').mockImplementation( - (sources) => { - const resolvers = create({ - ...sources, - resolveEnvironment: async () => ({ PATH: '/usr/bin' }) - }) - return { - ...resolvers, - bindCatalogSources: (agents) => { - const release = resolvers.bindCatalogSources(agents) - return () => { - release() - releases() - } - } - } - } - ) -}) -afterEach(async () => { - await stopStructuredAgentSessionRuntime() - vi.restoreAllMocks() - await rm(root, { recursive: true, force: true }) -}) - -function nativeProbe( - options: { request?: (command: string) => Promise; close?: () => Promise } = {} -) { - const close = vi.fn(options.close ?? (async () => {})) - const create = pi.createPiModelCatalogProbe - const responses = readFileSync('src/main/pi/__fixtures__/command-only.jsonl', 'utf8') - .trim() - .split('\n') - .map((line) => { - const row = z.object({ raw: z.string() }).parse(JSON.parse(line)) - return z - .object({ command: z.string().optional(), data: z.unknown().optional() }) - .parse(JSON.parse(row.raw)) - }) - const request = vi.fn( - options.request ?? - (async (command: string) => responses.find((row) => row.command === command)?.data) - ) - const connect = vi.fn((_launch: ProviderProcessLaunch) => ({ request, close })) - vi.spyOn(pi, 'createPiModelCatalogProbe').mockImplementation((deps) => - create({ - ...deps, - resolveCommand: () => '/fixture/pi', - probeVersion: async () => ({ version: '0.84.0' }), - homePath: root, - connect - }) - ) - return { request, close, connect } -} - -it('releases partial construction and retries, while shutdown fences initialization from resurrection', async () => { - const create = pi.createPiModelCatalogProbe - vi.spyOn(pi, 'createPiModelCatalogProbe') - .mockImplementationOnce(() => { - throw new Error('construction failed') - }) - .mockImplementation(create) - await expect(ensureStructuredAgentModelCatalogOwner(installedDeps())).rejects.toThrow( - 'construction failed' - ) - expect(releases).toHaveBeenCalledOnce() - const initializing = ensureStructuredAgentModelCatalogOwner(installedDeps()) - const stopped = stopStructuredAgentSessionRuntime() - await expect(initializing).rejects.toThrow('catalog runtime stopped during construction') - await stopped - expect(releases).toHaveBeenCalledTimes(2) - const next = await ensureStructuredAgentModelCatalogOwner(installedDeps()) - expect(next.modelCatalog).toBeDefined() - expect(environment.createStructuredAgentEnvironmentResolvers).toHaveBeenCalledTimes(3) -}) - -it('never-host shutdown aborts and drains actual native probe close before returning', async () => { - const requested = Promise.withResolvers(), - closing = Promise.withResolvers(), - drained = Promise.withResolvers() - const native = nativeProbe({ - request: async () => { - requested.resolve() - return new Promise(() => {}) - }, - close: async () => { - closing.resolve() - await drained.promise - } - }) - const owner = await ensureStructuredAgentModelCatalogOwner(installedDeps()) - const demand = owner.modelCatalog!.demand({ agent: 'pi' }) - await requested.promise - let stopped = false - const stop = stopStructuredAgentSessionRuntime().then(() => { - stopped = true - }) - try { - await closing.promise - await Promise.resolve() - expect(stopped).toBe(false) - expect(native.close).toHaveBeenCalledOnce() - expect(registry.getStructuredAgentSessionHost()).toBeNull() - } finally { - drained.resolve() - await stop - await demand - } - expect(stopped).toBe(true) - expect(releases).toHaveBeenCalledOnce() -}) diff --git a/src/main/runtime/agent-session/structured-agent-session-adapter-start-failure.test.ts b/src/main/runtime/agent-session/structured-agent-session-adapter-start-failure.test.ts deleted file mode 100644 index f6ed4c634ce..00000000000 --- a/src/main/runtime/agent-session/structured-agent-session-adapter-start-failure.test.ts +++ /dev/null @@ -1,162 +0,0 @@ -import { claudeScriptedChild } from '../../claude/claude-scripted-child.test-fixture' -import { mkdtemp, rm } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import type * as TimersPromises from 'node:timers/promises' -import { afterEach, beforeEach, expect, it, vi } from 'vitest' -import { readWholeAgentSessionFailureFact } from '../../../shared/agent-session/failures/agent-session-failure' -import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session/lifecycle/agent-session-mutation-envelope' -import { - hostTestAttachParams, - hostTestMessage, - HOST_TEST_SESSION as SESSION -} from '../../native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data' -import { createStructuredAgentSessionLogger } from '../../native-chat/agent-session-wire/host/structured-agent-session-logger' -import { piScriptedChild } from '../../pi/pi-scripted-child.test-fixture' -import { codexScriptedChild } from '../../codex/structured/session-lifecycle/codex-scripted-child.test-fixture' -import type { ScriptedAgentChild } from './installation/structured-agent-scripted-child.test-fixture' -import { - ensureStructuredAgentSessionHost, - stopStructuredAgentSessionRuntime -} from './structured-agent-session-runtime' - -// The start retry backoff's promise delay must use the fake clock this suite jumps. -vi.mock('node:timers/promises', async (importOriginal) => ({ - ...(await importOriginal()), - // ast-grep-ignore: test-no-real-time-wait -- Backed by the fake setTimeout installed per test. - setTimeout: (ms?: number) => new Promise((resolve) => setTimeout(resolve, ms)) -})) - -let directory: string | undefined -let operations = 0 -const operationId = () => `${Date.now()}-${(++operations).toString(16).padStart(32, '0')}` -const caller = { callerKey: 'adapter-start-failure-test' } - -beforeEach(() => { - // Real time still passes, so file and database work settles; waits jump the clock. - vi.useFakeTimers({ shouldAdvanceTime: true, toFake: ['setTimeout', 'clearTimeout'] }) -}) - -afterEach(async () => { - vi.useRealTimers() - await stopStructuredAgentSessionRuntime() - if (directory) { - await rm(directory, { recursive: true, force: true }) - directory = undefined - } -}) - -async function failedStart( - agent: 'pi' | 'codex' | 'grok' | 'claude', - script: ScriptedAgentChild, - unanswered = false -) { - directory = await mkdtemp(join(tmpdir(), 'orca-adapter-start-failure-')) - const root = directory - const host = await ensureStructuredAgentSessionHost({ - logger: createStructuredAgentSessionLogger(), - stateDirectory: root, - hostId: 'local', - claimKeyId: 'key-1', - resolveWorkspacePath: async () => root, - resolveClaudeAuthPolicy: () => ({ account: 'managed' }), - resolveLaunchArgs: () => [], - resolveEnvironment: async () => ({ PATH: '' }), - ...script.deps - }) - const params = hostTestAttachParams( - null, - agent === 'codex' - ? { providerHandle: undefined } - : { - provider: agent, - agent, - providerHandle: undefined, - accountHome: - agent === 'claude' - ? { variable: 'CLAUDE_CONFIG_DIR', path: root } - : agent === 'pi' - ? { variable: 'PI_CODING_AGENT_DIR', path: root } - : { variable: 'GROK_HOME', path: root }, - location: { - executionHostId: 'local', - wslDistro: null, - workspaceId: 'folder-1', - workspaceKind: 'folder' - } - } - ) - params.envelope.clientOperationId = operationId() - const attached = await host.create(caller, params) - if (!attached.ok) { - throw new Error(JSON.stringify(attached.refusal)) - } - const body = hostTestMessage('held during start') - const sent = await host.send(caller, { - envelope: { - sessionId: SESSION, - clientOperationId: operationId(), - expectedRuntimeFence: attached.value.fence, - payloadFingerprint: computeAgentSessionPayloadFingerprint({ - method: 'agentSession.send', - sessionId: SESSION, - fields: { body } - }) - }, - body - }) - if (!sent.ok) { - throw new Error(JSON.stringify(sent.refusal)) - } - const expectedAttempts = unanswered || agent === 'grok' || agent === 'claude' ? 5 : 1 - for (let attempt = 1; attempt <= expectedAttempts; attempt++) { - // Retries back off 100ยท2^n ms (800 ms before the fifth spawn); each poll jumps 100 ms. - await vi.waitFor( - () => { - vi.advanceTimersByTime(100) - expect(script.spawns()).toBe(attempt) - }, - { timeout: 5_000, interval: 10 } - ) - const fail = unanswered ? script.exitHandshake : script.failHandshake - if (!fail) { - throw new Error('fixture has no unanswered exit') - } - fail('provider config is invalid: bad key') - } - const submission = async () => { - await host.flushStreamedEvents(SESSION) - return (await host.journalSnapshot(SESSION)).submissions.find( - (entry) => entry.clientMessageId === sent.value.clientMessageId - ) - } - await vi.waitFor(async () => expect((await submission())?.dispatchState).toBe('rejected'), { - timeout: 5_000 - }) - const settled = await submission() - const snapshot = await host.journalSnapshot(SESSION) - const failureKind = agent === 'codex' && !unanswered ? 'startFailed' : 'providerStartFailed' - expect(readWholeAgentSessionFailureFact(settled?.rejection)).toMatchObject({ - kind: failureKind, - detail: { text: 'provider config is invalid: bad key' } - }) - expect( - snapshot.items.filter( - (item) => - item.body.kind === 'status' && - readWholeAgentSessionFailureFact(item.body.failure)?.kind === failureKind - ) - ).toHaveLength(1) - expect(script.prompts()).toEqual([]) - expect(script.spawns()).toBe(expectedAttempts) -} - -it('Claude keeps unanswered early exits within five attempts', async () => { - await failedStart('claude', claudeScriptedChild()) -}) -it('Codex keeps unanswered early exits within five attempts', async () => { - await failedStart('codex', codexScriptedChild(), true) -}) -it('Pi keeps unanswered early exits within five attempts', async () => { - await failedStart('pi', piScriptedChild(), true) -}) diff --git a/src/main/runtime/agent-session/structured-agent-session-pi-signed-out-start.test.ts b/src/main/runtime/agent-session/structured-agent-session-pi-signed-out-start.test.ts deleted file mode 100644 index 8cc0b8374bf..00000000000 --- a/src/main/runtime/agent-session/structured-agent-session-pi-signed-out-start.test.ts +++ /dev/null @@ -1,110 +0,0 @@ -import { mkdtemp, rm } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, expect, it, vi } from 'vitest' -import { readWholeAgentSessionFailureFact } from '../../../shared/agent-session/failures/agent-session-failure' -import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session/lifecycle/agent-session-mutation-envelope' -import { - hostTestMessage, - HOST_TEST_SESSION as SESSION -} from '../../native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data' -import { createTestParams } from '../../native-chat/agent-session-wire/host/testing/structured-agent-session-create-test-fixture' -import { createStructuredAgentSessionLogger } from '../../native-chat/agent-session-wire/host/structured-agent-session-logger' -import { piScriptedChild } from '../../pi/pi-scripted-child.test-fixture' -import { peekOpenedAgentSessionRecordStore } from './records/agent-session-record-store-slot' -import { - ensureStructuredAgentSessionHost, - stopStructuredAgentSessionRuntime -} from './structured-agent-session-runtime' - -let directory: string | undefined -let operations = 0 -const operationId = () => `${Date.now()}-${(++operations).toString(16).padStart(32, '0')}` -const caller = { callerKey: 'pi-signed-out-start-test' } - -afterEach(async () => { - await stopStructuredAgentSessionRuntime() - if (directory) { - await rm(directory, { recursive: true, force: true }) - directory = undefined - } -}) - -it('settles the held message once, closes Pi, and starts afresh for a later send after sign-in', async () => { - directory = await mkdtemp(join(tmpdir(), 'orca-pi-signed-out-')) - const root = directory - const script = piScriptedChild({ signedOut: true }) - const host = await ensureStructuredAgentSessionHost({ - logger: createStructuredAgentSessionLogger(), - stateDirectory: root, - hostId: 'local', - claimKeyId: 'key-1', - resolveWorkspacePath: async () => root, - resolveClaudeAuthPolicy: () => ({ account: 'managed' }), - resolveLaunchArgs: () => [], - resolveEnvironment: async () => ({}), - ...script.deps - }) - const firstMessage = { - clientMessageId: operationId(), - body: hostTestMessage('hello, signed-out Pi') - } - const params = createTestParams(firstMessage, { - provider: 'pi', - agent: 'pi', - accountHome: { variable: 'PI_CODING_AGENT_DIR', path: root }, - location: { - executionHostId: 'local', - wslDistro: null, - workspaceId: 'folder-1', - workspaceKind: 'folder' - } - }) - params.envelope.clientOperationId = operationId() - const created = await host.create(caller, params, { firstMessage }) - if (!created.ok) { - throw new Error(JSON.stringify(created.refusal)) - } - // Pi answers its start after the host has published it. - await vi.waitFor(() => - expect(host.collaboratorsForTests().sessions.get(SESSION)?.child?.phase).toBe('starting') - ) - script.releaseHandshake() - const submission = async () => { - await host.flushStreamedEvents(SESSION) - return (await host.journalSnapshot(SESSION)).submissions.find( - (entry) => entry.clientMessageId === firstMessage.clientMessageId - ) - } - - await vi.waitFor(async () => expect((await submission())?.dispatchState).toBe('rejected'), { - timeout: 5_000 - }) - expect(readWholeAgentSessionFailureFact((await submission())?.rejection)?.kind).toBe( - 'notSignedIn' - ) - await vi.waitFor(() => expect(script.closes()).toBe(1)) - expect(script.spawns()).toBe(1) - expect(script.prompts()).toEqual([]) - script.signIn() - const body = hostTestMessage('hello after sign-in') - const fields = { body } - const sent = await host.send(caller, { - envelope: { - sessionId: SESSION, - clientOperationId: operationId(), - expectedRuntimeFence: - peekOpenedAgentSessionRecordStore()?.getRecord(SESSION)?.lease.runtimeFence ?? null, - payloadFingerprint: computeAgentSessionPayloadFingerprint({ - method: 'agentSession.send', - sessionId: SESSION, - fields - }) - }, - body - }) - expect(sent.ok).toBe(true) - await vi.waitFor(() => expect(script.spawns()).toBe(2)) - script.releaseHandshake() - await vi.waitFor(() => expect(script.prompts()).toEqual(['hello after sign-in'])) -}) diff --git a/src/main/runtime/agent-session/structured-agent-session-transport-overrides.ts b/src/main/runtime/agent-session/structured-agent-session-transport-overrides.ts index 6d7611131d7..8d6ab2c62be 100644 --- a/src/main/runtime/agent-session/structured-agent-session-transport-overrides.ts +++ b/src/main/runtime/agent-session/structured-agent-session-transport-overrides.ts @@ -5,8 +5,8 @@ import type { ClaudeStructuredSessionAdapterDeps } from '../../claude/structured import type { CodexStructuredSessionAdapterDeps } from '../../codex/structured/session-lifecycle/codex-structured-session-state' import type { AgentCliVersionReader } from '../../agent-launch/preflight/agent-cli-version-probe' import type { StructuredAgentSessionStartupLimits } from '../../native-chat/agent-session-wire/startup/structured-agent-session-startup-attempt-contract' -import type { PiRpcSessionDeps } from '../../pi/rpc-session' -import type { PiRpcSessionAdapterDeps } from '../../pi/rpc-session-adapter' +import type { PiRpcSessionDeps } from '../../pi/rpc/rpc-session' +import type { PiRpcSessionAdapterDeps } from '../../pi/rpc/rpc-session-adapter' /** Provider transports are overridden only to drive the runtime against scripted children. */ export type StructuredAgentSessionTransportOverrides = { diff --git a/src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-continuation-context.test.ts b/src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-continuation-context.test.ts deleted file mode 100644 index 6a640bd52b1..00000000000 --- a/src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-continuation-context.test.ts +++ /dev/null @@ -1,484 +0,0 @@ -import * as fileOperations from 'node:fs/promises' -import { readFile, rm } from 'node:fs/promises' -import * as contextSnapshots from '../../../../../native-chat/agent-session-context-snapshots' -import { journalPayload } from '../../../../../native-chat/agent-session-journal/item-lifecycle/journal-payload-bounds' -import { piRpcDialogPresentation } from '../../../../../pi/rpc-extension-dialogs' -import { legacyAgentSessionSelectedOptionId } from '../../../../../../shared/agent-session/agent-session-question-answer' -import { - type AgentJournalItemBody, - type AgentJournalResolution, - type AgentJournalQuestionItem, - AGENT_JOURNAL_THREAD_SCOPE -} from '../../../../../../shared/agent-session/journal/agent-session-journal-types' -import { afterEach, beforeEach, expect, it, vi } from 'vitest' -import { STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY } from '../../../../../../shared/agent-session/agent-session-runtime-capabilities' -import { - hostTestMessage, - HOST_TEST_SESSION as SESSION -} from '../../../../../native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data' -import { setStructuredAgentSessionHost } from '../../../../../native-chat/agent-session-wire/host/structured-agent-session-registry' -import { - createRestTestRig, - foundRestTestChat -} from '../../../../../native-chat/agent-session-wire/host/testing/structured-agent-session-rest-test-rig' - -import type { RestTestRig } from '../../../../../native-chat/agent-session-wire/host/testing/structured-agent-session-rest-test-rig' -import { - editPersistedTestAgentSessionStore, - readPersistedTestAgentSessionStore -} from '../../../../agent-session/records/agent-session-record-store-test-harness' -import { OrcaRuntimeService } from '../../../../orca-runtime' -import type { RpcResponse } from '../../../core' -import { RpcDispatcher } from '../../../dispatcher' -import type { RpcDispatchStreamingOptions } from '../../../dispatcher-stream-options' -import { STRUCTURED_AGENT_SESSION_METHODS } from '../structured-agent-session' - -vi.mock('node:fs/promises', { spy: true }) -const actualFiles = await vi.importActual('node:fs/promises') - -const CLIENT = { - clientId: 'device-1', - clientKind: 'runtime' as const, - clientCapabilities: [STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY], - connectionId: 'connection-1' -} - -let rig: RestTestRig -let dispatcher: RpcDispatcher -let requests = 0 - -async function call( - method: string, - params: unknown, - client: RpcDispatchStreamingOptions = CLIENT -): Promise { - const replies: RpcResponse[] = [] - requests += 1 - await dispatcher.dispatchStreaming( - { id: `request-${requests}`, authToken: 'token', method, params }, - (raw) => replies.push(JSON.parse(raw) as RpcResponse), - client - ) - return replies -} - -/** A chat that once ran, reopened by a fresh host: nothing of it is in memory. */ -async function restingChat(): Promise { - await foundRestTestChat(rig) - await rig.store.replaceSessionOptions({ - sessionId: SESSION, - fence: rig.store.getRecord(SESSION)!.lease.runtimeFence, - options: { model: 'gpt-saved', effort: 'high' }, - now: rig.clock.now - }) - await rig.restart() - setStructuredAgentSessionHost(rig.host) - rig.adapter.acquire.mockClear() - rig.adapter.dispatch.mockClear() - rig.adapter.readOptions.mockClear() -} - -beforeEach(async () => { - requests = 0 - rig = await createRestTestRig({ idleSweep: { intervalMs: 3_600_000 } }) - setStructuredAgentSessionHost(rig.host) - const runtime = new OrcaRuntimeService() - dispatcher = new RpcDispatcher({ runtime, methods: STRUCTURED_AGENT_SESSION_METHODS }) -}) - -afterEach(async () => { - vi.restoreAllMocks() - setStructuredAgentSessionHost(null) - await rig.dispose() - await actualFiles.rm(contextSnapshots.agentSessionContextSnapshotRoot(rig.root), { - recursive: true, - force: true - }) -}) - -it('hands off the reduced saved chat after clear and rewind, budgets only the starter and overwrites its file', async () => { - await restingChat() - await rig.host.journalSnapshot(SESSION) - let journal = rig.host.collaboratorsForTests().sessions.get(SESSION)!.journal - const fence = rig.store.getRecord(SESSION)!.lease.runtimeFence - const receipt = { write: () => {}, committed: () => {} } - let ordinal = 100 - const append = (text: string | AgentJournalItemBody, itemOrdinal = ordinal++) => - journal.appendItem( - { provider: 'codex', threadId: 'saved-thread', turnId: 'saved-turn', ordinal: itemOrdinal }, - typeof text === 'string' ? hostTestMessage(text) : text, - { - fence: rig.store.getRecord(SESSION)!.lease.runtimeFence, - turnScope: AGENT_JOURNAL_THREAD_SCOPE - } - ) - await append('PRE_CLEAR_SECRET') - await journal.context.clear( - { operationId: 'pr-31782-clear', afterFence: fence, clearedAt: rig.clock.now }, - receipt - ) - await append('EARLY_SAVED_MARKER') - for (let index = 0; index < 205; index++) { - await append(`saved ${index} ${'context '.repeat(60)}`) - } - const floor = journal.cursor() - await append('DISCARDED_REWIND_SECRET') - await journal.context.rewind(floor, fence, [], () => receipt) - const resolution = ( - state: AgentJournalResolution['state'], - selectedOptionId: string | null = null - ): AgentJournalResolution => ({ state, selectedOptionId, resolvedBy: null, resolvedAt: null }) - const question = (name: string, answer?: string): AgentJournalQuestionItem => ({ - kind: 'question', - question: name, - options: [], - freeTextQuestionId: 'input', - freeTextInput: { allowEmpty: true }, - resolution: { - ...resolution('resolved'), - ...(answer !== undefined - ? { answers: [{ questionId: 'input', optionIds: [], other: answer }] } - : {}) - } - }) - for (const [name, value] of [ - ['deployment', ' deploy to staging '], - ['explicit empty', ''], - ['whitespace', ' \t'] - ]) { - await append(question(name, value)) - } - await append(question('unreadable')) - await append({ ...question('cancelled ask'), resolution: resolution('cancelled') }) - await append({ - ...question('legacy answer'), - resolution: resolution('resolved', 'input:legacy%20deployment') - }) - await append({ - kind: 'question', - question: 'Release choices', - options: [], - questions: [ - { - id: 'regions', - header: 'Region group', - question: 'Which regions?', - multiSelect: true, - options: [ - { id: 'east', label: 'East', description: 'Primary region' }, - { id: 'west', label: 'West' } - ] - }, - { - id: 'details', - question: 'Release detail?', - multiSelect: true, - options: [{ id: 'known', label: 'Known' }], - freeTextQuestionId: 'details' - } - ], - resolution: { - ...resolution('resolved'), - answers: [ - { questionId: 'regions', optionIds: ['east', 'west'] }, - { questionId: 'details', optionIds: ['known', 'missing'], other: 'partial text' } - ] - } - }) - for (const choice of ['yes', 'no']) { - await append({ - kind: 'approval', - title: `Confirm ${choice}`, - detail: 'Deploy?', - options: [ - { id: 'yes', label: 'Yes' }, - { id: 'no', label: 'No' } - ], - resolution: resolution('resolved', choice) - }) - } - await append({ - kind: 'approval', - title: 'Review plan', - description: 'Saved description', - decisionReason: 'Saved reason', - matchedAskRule: { source: 'workspace', toolName: 'Write', ruleContent: 'Saved ask rule' }, - blockedPath: '/work/target', - detail: 'Clipped detail', - subject: { kind: 'plan', text: 'RETAINED_PLAN_MARKER', filePath: '/work/plan.md' }, - options: [ - { id: 'plan', label: 'Approve plan' }, - { id: 'keep', label: 'Keep planning' } - ], - resolution: resolution('resolved', 'keep') - }) - const editor = piRpcDialogPresentation({ - id: 'editor', - method: 'editor', - title: 'Edit release notes', - prefill: 'RETAINED_EDITOR_MARKER\nHold deployment', - placeholder: 'Keep migration details' - }) - if (editor?.body.kind !== 'question') { - throw new Error('Pi editor missing') - } - const editorOrdinal = ordinal++ - await append(editor.body, editorOrdinal) - const editorParams = { - sessionId: SESSION, - workspaceId: 'workspace-1', - expectedCursor: { epoch: journal.cursor().epoch, sequence: 0 } - } - const pendingEditor = await rig.host.continuationContext(editorParams) - if (pendingEditor.status !== 'current' || !pendingEditor.transcriptPath) { - throw new Error('Pending editor snapshot missing') - } - for (const text of [ - await readFile(pendingEditor.transcriptPath, 'utf8'), - pendingEditor.capturedText ?? '' - ]) { - expect(text).toContain( - 'Prompt state: pending\nSaved prompt: {"kind":"question","question":"Edit release notes"' - ) - expect(text).toContain('"initialValue":"RETAINED_EDITOR_MARKER\\nHold deployment"') - expect(text).toContain('"placeholder":"Keep migration details"') - } - const answers = [{ questionId: 'editor', optionIds: [], other: 'REPLACEMENT_EDITOR_ANSWER' }] - const selectedOptionId = legacyAgentSessionSelectedOptionId(editor.body, answers) - await append( - { ...editor.body, resolution: { ...resolution('resolved', selectedOptionId), answers } }, - editorOrdinal - ) - await rig.restart() - setStructuredAgentSessionHost(rig.host) - const snapshot = await rig.host.journalSnapshot(SESSION) - journal = rig.host.collaboratorsForTests().sessions.get(SESSION)!.journal - await append({ ...question('pending ask'), resolution: resolution('pending') }) - const params = { - sessionId: SESSION, - workspaceId: 'workspace-1', - expectedCursor: { epoch: snapshot.cursor.epoch, sequence: 0 } - } - await call('agentSession.options', { sessionId: SESSION }) - const gate = Promise.withResolvers() - const write = actualFiles.writeFile - const writing = vi.spyOn(fileOperations, 'writeFile').mockImplementationOnce(async (...args) => { - await gate.promise - return write(...args) - }) - const pending = rig.host.continuationContext(params) - await vi.waitFor(() => expect(writing).toHaveBeenCalledOnce()) - const currentJournal = rig.host.collaboratorsForTests().sessions.get(SESSION)!.journal - await currentJournal.appendItem( - { provider: 'orca', clientMessageId: 'pr-31782-late' }, - hostTestMessage('LATER_SAVED_MARKER'), - { - fence: rig.store.getRecord(SESSION)!.lease.runtimeFence, - turnScope: AGENT_JOURNAL_THREAD_SCOPE - } - ) - gate.resolve() - const first = await pending - if (first.status !== 'current' || !first.transcriptPath) { - throw new Error('Snapshot missing') - } - const path = first.transcriptPath - try { - const file = await readFile(path, 'utf8') - expect(file).toContain('EARLY_SAVED_MARKER') - expect(file).not.toMatch(/PRE_CLEAR_SECRET|DISCARDED_REWIND_SECRET|LATER_SAVED_MARKER/) - expect(first.capturedText?.length).toBeLessThanOrEqual(36_000) - expect(first.capturedText).toContain('saved chat messages or tool details omitted') - expect(first.capturedText).not.toContain('EARLY_SAVED_MARKER') - for (const text of [file, first.capturedText ?? '']) { - const prompts: unknown[] = [...text.matchAll(/^Saved prompt: (.+)$/gm)].map((match) => - JSON.parse(match[1]!) - ) - for (const [name, value] of [ - ['deployment', ' deploy to staging '], - ['explicit empty', ''], - ['whitespace', ' \t'] - ]) { - expect(prompts).toContainEqual(expect.objectContaining(question(name, value))) - } - expect(text).toMatch( - /"question":"unreadable"[^\n]*\nQuestion "input"\nSubmitted answer: unavailable/ - ) - expect(text).toMatch(/Prompt state: pending\nSaved prompt: .*"question":"pending ask"/) - expect(text).toMatch(/Prompt state: cancelled\nSaved prompt: .*"question":"cancelled ask"/) - const legacy = text.split('\n\n').find((row) => row.includes('"question":"legacy answer"'))! - expect(legacy).toContain('"selectedOptionId":"input:legacy%20deployment"') - expect(legacy.split('Legacy free text: "legacy deployment"')).toHaveLength(2) - expect(text).toContain( - 'Question "regions" (Region group)\nSelected choice: East\nSelected choice: West' - ) - expect(text).toContain('"question":"Which regions?"') - expect(text).toContain('"label":"East","description":"Primary region"') - expect(text).toContain( - 'Question "details"\nSelected choice: Known\nSelected choice: unavailable\nSubmitted free text: resolution.answers[1].other' - ) - expect(text).toContain('"other":"partial text"') - expect(text).toMatch(/Confirm yes[\s\S]*Selected choice: Yes/) - expect(text).toMatch(/Confirm no[\s\S]*Selected choice: No/) - expect(text).toContain( - '"subject":{"kind":"plan","text":"RETAINED_PLAN_MARKER","filePath":"/work/plan.md"}' - ) - expect(text).toContain( - '"matchedAskRule":{"source":"workspace","toolName":"Write","ruleContent":"Saved ask rule"}' - ) - expect(text).toContain('Selected choice: Keep planning') - const row = text - .split('\n\n') - .find((entry) => entry.includes('"question":"Edit release notes"'))! - expect(row).toContain('Prompt state: resolved') - expect(row).toContain(JSON.stringify(editor.body.freeTextInput)) - expect(row).toContain(JSON.stringify(answers)) - expect(row).toContain(`"selectedOptionId":${JSON.stringify(selectedOptionId)}`) - expect(row.split('\n').slice(2).join('\n')).toBe( - 'Question "editor"\nSubmitted free text: resolution.answers[0].other' - ) - } - expect(await call('agentSession.continuationContext', params)).toMatchObject([ - { - ok: true, - result: { - status: 'current', - transcriptPath: path, - capturedText: expect.stringContaining('LATER_SAVED_MARKER') - } - } - ]) - expect(await readFile(path, 'utf8')).toContain('LATER_SAVED_MARKER') - expect(await rig.host.continuationContext({ ...params, workspaceId: 'other' })).toEqual({ - status: 'superseded' - }) - expect( - await rig.host.continuationContext({ - ...params, - expectedCursor: { epoch: 'other', sequence: 0 } - }) - ).toEqual({ status: 'superseded' }) - expect(rig.adapter.acquire).not.toHaveBeenCalled() - writing.mockRejectedValueOnce(new Error('disk unavailable')) - expect(await call('agentSession.continuationContext', params)).toMatchObject([{ ok: false }]) - } finally { - await rm(contextSnapshots.agentSessionContextSnapshotRoot(rig.root), { - recursive: true, - force: true - }) - } -}) - -it('hands off bounded tool evidence with the latest conversation while keeping the full saved output', async () => { - await restingChat() - await rig.host.journalSnapshot(SESSION) - const journal = rig.host.collaboratorsForTests().sessions.get(SESSION)!.journal - const output = `AssertionError: CURRENT PART\nReceived: ${'a'.repeat(200_000)}\nTests: 2 failed` - const toolOutput = `Error: SAVED_TOOL_FAILURE\n${'b'.repeat(200_000)}\nSAVED_TOOL_OUTPUT_END` - const bodies: AgentJournalItemBody[] = [ - hostTestMessage('Review the viewer'), - { - kind: 'message', - role: 'assistant', - blocks: [ - { - type: 'tool-call', - name: 'shell', - input: { command: 'pnpm test viewer.test.ts' }, - callId: 'test' - }, - { type: 'tool-result', output, callId: 'test', isError: true } - ] - }, - { - kind: 'tool-call', - name: 'shell', - input: { command: 'pnpm test saved-viewer.test.ts' }, - callId: 'saved-test', - state: 'failed', - output: journalPayload(toolOutput) - }, - { - kind: 'message', - role: 'assistant', - blocks: [{ type: 'text', text: 'The append resets reader position.' }] - }, - hostTestMessage('Should we redo the viewer?') - ] - for (const [ordinal, body] of bodies.entries()) { - await journal.appendItem( - { provider: 'codex', threadId: 'saved-thread', turnId: 'handoff-turn', ordinal }, - body, - { - fence: rig.store.getRecord(SESSION)!.lease.runtimeFence, - turnScope: AGENT_JOURNAL_THREAD_SCOPE - } - ) - } - const context = await rig.host.continuationContext({ - sessionId: SESSION, - workspaceId: 'workspace-1', - expectedCursor: journal.cursor() - }) - if (context.status !== 'current' || !context.transcriptPath) { - throw new Error('Snapshot missing') - } - expect(context.capturedText).toContain('[user] Review the viewer') - expect(context.capturedText).toContain('[tool shell input preview]') - expect(context.capturedText).toContain( - '[tool result error] call=test AssertionError: CURRENT PART' - ) - expect(context.capturedText).toContain('Tests: 2 failed') - expect(context.capturedText).toContain('[assistant] The append resets reader position.') - expect(context.capturedText).toContain('[user] Should we redo the viewer?') - expect(context.capturedText).not.toContain('a'.repeat(2_000)) - expect(context.capturedText).toContain( - '[tool shell failed input preview] call=saved-test {"command":"pnpm test saved-viewer.test.ts"}' - ) - expect(context.capturedText).toContain( - '[tool result error] call=saved-test Error: SAVED_TOOL_FAILURE' - ) - expect(context.capturedText).toContain('SAVED_TOOL_OUTPUT_END') - expect(context.capturedText).not.toContain('b'.repeat(2_000)) - expect(await readFile(context.transcriptPath, 'utf8')).toContain(output) - expect(await readFile(context.transcriptPath, 'utf8')).toContain(toolOutput) - expect(rig.adapter.acquire).not.toHaveBeenCalled() -}) - -it('hands off a readable saved conversation without granting its invalid execution lease authority', async () => { - await restingChat() - const { cursor } = await rig.host.journalSnapshot(SESSION) - await rig.host.flushAllStreamedEvents() - await editPersistedTestAgentSessionStore(rig.root, (persisted) => { - Object.assign(persisted.records[SESSION].lease, { minimumNextFence: 'bad' }) - }) - await rig.restart() - setStructuredAgentSessionHost(rig.host) - expect(rig.store.getRecord(SESSION)).toBeNull() - expect(rig.store.getConversation(SESSION)?.location.workspaceId).toBe('workspace-1') - const saved = (await readPersistedTestAgentSessionStore(rig.root)).records[SESSION] - const params = { sessionId: SESSION, workspaceId: 'workspace-1', expectedCursor: cursor } - const result = await rig.host.continuationContext(params) - expect(result).toMatchObject({ - status: 'current', - capturedText: expect.stringContaining('hello') - }) - if (result.status !== 'current' || !result.transcriptPath) { - throw new Error('Saved conversation snapshot missing') - } - expect(await readFile(result.transcriptPath, 'utf8')).toContain('hello') - expect(await call('agentSession.continuationContext', params)).toMatchObject([ - { ok: true, result } - ]) - for (const stale of [ - { ...params, workspaceId: 'other' }, - { ...params, expectedCursor: { ...cursor, epoch: 'other' } }, - { ...params, expectedCursor: { ...cursor, sequence: cursor.sequence + 1 } } - ]) { - expect(await rig.host.continuationContext(stale)).toEqual({ status: 'superseded' }) - } - expect(rig.store.getRecord(SESSION)).toBeNull() - expect((await readPersistedTestAgentSessionStore(rig.root)).records[SESSION]).toEqual(saved) - expect(rig.adapter.acquire).not.toHaveBeenCalled() - expect(rig.adapter.dispatch).not.toHaveBeenCalled() -}) diff --git a/tests/e2e/omp-child-session-recovery.unit.test.ts b/tests/e2e/omp-child-session-recovery.unit.test.ts deleted file mode 100644 index 016b1a519a4..00000000000 --- a/tests/e2e/omp-child-session-recovery.unit.test.ts +++ /dev/null @@ -1,126 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { createAgentStatusExtensionHarness } from '../../src/main/pi/agent-status-extension-test-harness' -import { normalizeHookPayload } from '../../src/shared/agent-hook-listener/normalization/normalize-hook-payload' -import { createHookListenerState } from '../../src/shared/agent-hook-listener/listener-state' -import { getAgentResumeArgv } from '../../src/shared/agent-launch/startup/agent-resume-argv' -import { buildAgentResumeStartupPlan } from '../../src/shared/agent-launch/startup/tui-agent-resume-startup' -import { sleepingAgentSessionsByPaneKeySchema } from '../../src/shared/workspace-session/workspace-session-sleeping-agents' -import { createTestStore } from '../../src/renderer/src/store/testing/app-store-test-fixture' -import { makeTab } from '../../src/renderer/src/store/terminals/terminal-tab.test-fixture' - -const PANE = 'tab-1:11111111-1111-4111-8111-111111111111' -const ROOT_SESSION = '22222222-2222-4222-8222-222222222222' -const ROOT_TRANSCRIPT_PATH = '/sessions/root.jsonl' -const CHILD_SESSION = '33333333-3333-4333-8333-333333333333' - -async function rootWithActiveChild(): Promise> { - const store = createTestStore() - store.setState({ tabsByWorktree: { 'wt-1': [makeTab({ id: 'tab-1', worktreeId: 'wt-1' })] } }) - const listener = createHookListenerState() - const harness = createAgentStatusExtensionHarness({ - kind: 'omp', - env: { - ORCA_PANE_KEY: PANE, - ORCA_WORKTREE_ID: 'wt-1', - ORCA_AGENT_HOOK_VERSION: '1', - ORCA_AGENT_HOOK_ENV: 'production' - }, - fetchImpl: async (_url, init) => { - const event = normalizeHookPayload( - listener, - 'omp', - JSON.parse(String(init?.body)), - 'production' - ) - if (!event) { - throw new Error('Expected a normalized OMP hook') - } - store - .getState() - .setAgentStatus( - PANE, - event.payload, - 'OMP', - { updatedAt: Date.now(), stateStartedAt: Date.now() }, - { tabId: 'tab-1', worktreeId: 'wt-1' }, - { providerSession: event.providerSession, launchToken: event.launchToken } - ) - return { ok: true } - } - }) - const emit = async ( - name: string, - event: unknown, - sessionManager: { - getSessionId: () => string - getSessionFile: () => string - } - ): Promise => { - await harness.callHook(name, event, { sessionManager }) - for (let i = 0; i < 10; i++) { - await Promise.resolve() - } - } - const root = { getSessionId: () => ROOT_SESSION, getSessionFile: () => ROOT_TRANSCRIPT_PATH } - await emit('session_start', {}, root) - await emit('before_agent_start', { prompt: 'ROOT distinctive user request' }, root) - await emit( - 'message_end', - { message: { role: 'assistant', content: 'ROOT assistant preview' } }, - root - ) - expect(store.getState().agentStatusByPaneKey[PANE]?.providerSession?.id).toBe(ROOT_SESSION) - - // OMP binds each task's extension factory to a different SessionManager in the same process. - harness.reload() - const child = { - getSessionId: () => CHILD_SESSION, - getSessionFile: () => '/sessions/root/worker.jsonl' - } - await emit('session_start', {}, child) - await emit('before_agent_start', { prompt: 'CHILD delegated bootstrap' }, child) - await emit( - 'message_end', - { message: { role: 'assistant', content: 'CHILD assistant preview' } }, - child - ) - return store -} - -describe('OMP child lifecycle recovery boundaries', () => { - it('retains the normalized root prompt and assistant preview while its child works (#9348)', async () => { - const store = await rootWithActiveChild() - expect(store.getState().agentStatusByPaneKey[PANE]).toMatchObject({ - prompt: 'ROOT distinctive user request', - lastAssistantMessage: 'ROOT assistant preview', - state: 'working', - providerSession: { id: ROOT_SESSION } - }) - }) - - it('captures and hydrates the root identity into resume startup after child hooks (#16353)', async () => { - const store = await rootWithActiveChild() - store.getState().captureAllSleepingAgentSessions('quit') - const serialized = JSON.stringify(store.getState().sleepingAgentSessionsByPaneKey) - const hydrated = sleepingAgentSessionsByPaneKeySchema.parse(JSON.parse(serialized)) - const record = hydrated?.[PANE] - if (!record) { - throw new Error('Expected the root sleeping record to survive hydration') - } - expect(record).toMatchObject({ origin: 'quit', providerSession: { id: ROOT_SESSION } }) - expect(getAgentResumeArgv(record.agent, record.providerSession)).toEqual([ - 'omp', - '--resume', - ROOT_TRANSCRIPT_PATH - ]) - const startup = buildAgentResumeStartupPlan({ - agent: record.agent, - providerSession: record.providerSession, - cmdOverrides: {}, - platform: 'linux', - ...record.launchConfig - }) - expect(startup?.launchCommand).toBe(`omp '--resume' '${ROOT_TRANSCRIPT_PATH}'`) - expect(serialized).not.toContain(CHILD_SESSION) - }) -}) diff --git a/tests/e2e/omp-completion-retry-status.spec.ts b/tests/e2e/omp-completion-retry-status.spec.ts index e264c6ff3ae..7994afb15e0 100644 --- a/tests/e2e/omp-completion-retry-status.spec.ts +++ b/tests/e2e/omp-completion-retry-status.spec.ts @@ -4,7 +4,7 @@ import { createRequire } from 'node:module' import { join } from 'node:path' import { runInNewContext } from 'node:vm' import { transform } from 'esbuild' -import { getPiAgentStatusExtensionSource } from '../../src/main/pi/agent-status-extension-source' +import { getPiAgentStatusExtensionSource } from '../../src/main/pi/managed-extensions/agent-status/agent-status-extension-source' import { test, expect } from './helpers/orca-app' import { readHookEndpoint } from './helpers/agent-hook-endpoint' import { ensureTerminalVisible, waitForActiveWorktree, waitForSessionReady } from './helpers/store' diff --git a/tests/e2e/omp-prefill-runtime.spec.ts b/tests/e2e/omp-prefill-runtime.spec.ts index 3afcfb2a5f7..ecffd6d9b64 100644 --- a/tests/e2e/omp-prefill-runtime.spec.ts +++ b/tests/e2e/omp-prefill-runtime.spec.ts @@ -1,7 +1,7 @@ import { readFile, writeFile } from 'node:fs/promises' import { buildShellCommandFromArgv } from '../../src/shared/agent-launch/startup/tui-agent-startup-shell' import { test, expect } from './helpers/orca-app' -import { getPiAgentStatusExtensionSource } from '../../src/main/pi/agent-status-extension-source' +import { getPiAgentStatusExtensionSource } from '../../src/main/pi/managed-extensions/agent-status/agent-status-extension-source' import { ensureTerminalVisible, waitForActiveWorktree, waitForSessionReady } from './helpers/store' import { execInTerminal, diff --git a/tests/e2e/pty-spawn-cwd-folder-owner.unit.test.ts b/tests/e2e/pty-spawn-cwd-folder-owner.unit.test.ts deleted file mode 100644 index 8163f207ddc..00000000000 --- a/tests/e2e/pty-spawn-cwd-folder-owner.unit.test.ts +++ /dev/null @@ -1,169 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' -import { - MIXED_FOLDER, - MIXED_GROUP -} from '../../src/shared/folder-workspaces/folder-workspace-host-routing.test-fixture' -import { getDefaultWorkspaceSession } from '../../src/shared/constants' -import type { RuntimePtyController } from '../../src/main/runtime/terminal/lifecycle/runtime-pty-controller-contract' -import { spawnMock } from '../../src/main/ipc/pty/pty-ipc-mock-registry' -import { setupPtyIpcSuite } from '../../src/main/ipc/pty/pty-ipc-test-harness' -import { registerPtyHandlers } from '../../src/main/ipc/pty/register-handlers' -import { getFolderWorkspacePathErrorCopy } from '../../src/renderer/src/lib/workspace/paths/folder-workspace-path-status' - -vi.mock('electron', () => - import('../../src/main/ipc/pty/pty-ipc-mock-registry').then((m) => m.electronModuleMock()) -) -vi.mock('fs', () => - import('../../src/main/ipc/pty/pty-ipc-mock-registry').then((m) => m.fsModuleMock()) -) -vi.mock('node-pty', () => - import('../../src/main/ipc/pty/pty-ipc-mock-registry').then((m) => m.nodePtyModuleMock()) -) -vi.mock('node:child_process', async (importOriginal) => - (await import('../../src/main/ipc/pty/pty-ipc-mock-registry')).childProcessModuleMock( - await importOriginal() - ) -) -vi.mock('../../src/main/opencode/hook-service', () => - import('../../src/main/ipc/pty/pty-ipc-mock-registry').then((m) => - m.openCodeHookServiceModuleMock() - ) -) -vi.mock('../../src/main/mimo/hook-service', () => - import('../../src/main/ipc/pty/pty-ipc-mock-registry').then((m) => m.mimoHookServiceModuleMock()) -) -vi.mock('../../src/main/agent-hooks/server/agent-hook-server', () => - import('../../src/main/ipc/pty/pty-ipc-mock-registry').then((m) => m.agentHookServerModuleMock()) -) -vi.mock('../../src/main/pi/titlebar-extension-service', () => - import('../../src/main/ipc/pty/pty-ipc-mock-registry').then((m) => - m.piTitlebarExtensionModuleMock() - ) -) -vi.mock('../../src/main/pty/shell-startup/pwsh', () => - import('../../src/main/ipc/pty/pty-ipc-mock-registry').then((m) => m.pwshModuleMock()) -) -vi.mock('../../src/main/wsl/filesystem/unc-path-access', async (importOriginal) => - (await import('../../src/main/ipc/pty/pty-ipc-mock-registry')).wslModuleMock( - await importOriginal() - ) -) -vi.mock('node:fs/promises', async (importOriginal) => - (await import('../../src/main/ipc/pty/pty-ipc-mock-registry')).fsPromisesModuleMock( - await importOriginal() - ) -) -vi.mock('../../src/main/telemetry/client', () => - import('../../src/main/ipc/pty/pty-ipc-mock-registry').then((m) => m.telemetryClientModuleMock()) -) -vi.mock('../../src/main/telemetry/classify-error', () => - import('../../src/main/ipc/pty/pty-ipc-mock-registry').then((m) => m.classifyErrorModuleMock()) -) -vi.mock('../../src/main/cli/launchers/linux-terminal-orca-cli-shim', () => - import('../../src/main/ipc/pty/pty-ipc-mock-registry').then((m) => m.linuxCliShimModuleMock()) -) -vi.mock('../../src/main/memory/pty-registry', () => - import('../../src/main/ipc/pty/pty-ipc-mock-registry').then((m) => m.ptyRegistryModuleMock()) -) -vi.mock('../../src/main/agent-hooks/observations/migration-unsupported-pty-state', () => - import('../../src/main/ipc/pty/pty-ipc-mock-registry').then((m) => - m.migrationUnsupportedPtyModuleMock() - ) -) -vi.mock('../../src/main/codex/configuration/homes/codex-pane-account-registry', () => - import('../../src/main/ipc/pty/pty-ipc-mock-registry').then((m) => - m.codexPaneAccountRegistryModuleMock() - ) -) -vi.mock('../../src/main/codex/history/index/codex-state-db-backfill-recovery', () => - import('../../src/main/ipc/pty/pty-ipc-mock-registry').then((m) => - m.codexBackfillRecoveryModuleMock() - ) -) - -describe('folder cwd ownership across IPC and renderer copy', () => { - const { handlers, mainWindow } = setupPtyIpcSuite() - - it.each([false, true])( - 'keeps the selected folder through real IPC/runtime admission and cwd fallback (%s)', - async (reverse) => { - const local = { - ...MIXED_FOLDER, - id: 'dup', - executionHostId: 'local' as const, - folderPath: '/selected' - } - const remote = { ...local, executionHostId: 'ssh:prod' as const, folderPath: '/foreign' } - let folders = reverse ? [local, remote] : [remote, local] - const store = { - getRepos: () => [], - getProjectGroups: () => [MIXED_GROUP], - getFolderWorkspaces: () => folders, - getFolderWorkspace: () => folders[0], - getWorkspaceSession: getDefaultWorkspaceSession - } - const runtime = { - preAllocateHandleForPty: vi.fn(), - setPtyController: vi.fn<(controller: RuntimePtyController) => void>(), - registerPty: vi.fn(), - onPtySpawned: vi.fn(), - onPtyExit: vi.fn(), - onPtyData: vi.fn() - } - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: registration/spawn reads these runtime and store members; no durable pane binding is requested. - registerPtyHandlers( - mainWindow as never, - runtime as never, - undefined, - undefined, - undefined, - store as never - ) - const controller = runtime.setPtyController.mock.calls[0]?.[0] - if (!controller?.spawn) { - throw new Error('Runtime PTY controller was not registered') - } - const spawn = async (cwd: string) => - handlers.get('pty:spawn')!(null, { - cols: 80, - rows: 24, - cwd, - worktreeId: 'folder:dup', - cwdFallback: 'worktree', - connectionId: null - }) - await spawn('.') - expect(spawnMock.mock.calls.at(-1)?.[2]).toMatchObject({ cwd: '/selected' }) - await controller.spawn({ - cols: 80, - rows: 24, - cwd: '.', - worktreeId: 'folder:dup', - connectionId: null, - env: {} - }) - expect(spawnMock.mock.calls.at(-1)?.[2]).toMatchObject({ cwd: '/selected' }) - folders = [remote] - spawnMock.mockClear() - await expect(spawn('.')).rejects.toThrow('folder_workspace_path_scope_not_found') - expect(spawnMock).not.toHaveBeenCalled() - folders = [local, { ...local }] - const failure = await spawn('.').then( - () => { - throw new Error('ambiguous spawn succeeded') - }, - (error: unknown) => { - if (!(error instanceof Error)) { - throw error - } - return error - } - ) - expect(failure.message).toContain('folder_workspace_connection_ambiguous:/selected') - expect(getFolderWorkspacePathErrorCopy(failure.message)?.title).toBe( - 'Cannot determine connection' - ) - expect(spawnMock).not.toHaveBeenCalled() - } - ) -}) diff --git a/tests/tools/omp-completion-runtime-smoke.mjs b/tests/tools/omp-completion-runtime-smoke.mjs index 6e9a2da65ad..0fda2a6a0e6 100644 --- a/tests/tools/omp-completion-runtime-smoke.mjs +++ b/tests/tools/omp-completion-runtime-smoke.mjs @@ -38,7 +38,7 @@ async function waitForRequests(count) { try { const bundle = join(scratch, 'source.cjs') await build({ - entryPoints: ['src/main/pi/agent-status-extension-source.ts'], + entryPoints: ['src/main/pi/managed-extensions/agent-status/agent-status-extension-source.ts'], bundle: true, platform: 'node', format: 'cjs', diff --git a/tests/tools/omp-config-root-local-shell.test.mjs b/tests/tools/omp-config-root-local-shell.test.mjs deleted file mode 100644 index c8a48cd0575..00000000000 --- a/tests/tools/omp-config-root-local-shell.test.mjs +++ /dev/null @@ -1,98 +0,0 @@ -import { existsSync, mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'node:fs' -import { tmpdir } from 'node:os' -import { delimiter, join } from 'node:path' -import { afterEach, expect, it, vi } from 'vitest' -import { runProcess } from '@orca/process-host' -import { inheritOmpLaunchEnvironment } from '../../src/main/ipc/pty/host-env/omp-launch-environment' -import { resetLoginShellEnvironmentCacheForTests } from '../../src/main/startup/login-shell-environment' -import { PiTitlebarExtensionService } from '../../src/main/pi/titlebar-extension-service' -const fixture = { home: '', shell: '' } -const shells = ['bash', 'zsh', 'fish'].map((name) => { - const path = (process.env.PATH ?? '') - .split(delimiter) - .map((dir) => join(dir, name)) - .find(existsSync) - return { name, path } -}) -afterEach(() => { - vi.unstubAllEnvs() - resetLoginShellEnvironmentCacheForTests() - if (fixture.home) { - rmSync(fixture.home, { recursive: true, force: true }) - } -}) -function prepare(shell) { - fixture.home = mkdtempSync(join(tmpdir(), 'omp20605-shell-root-')) - fixture.shell = shell.path - vi.stubEnv('HOME', fixture.home) - vi.stubEnv('SHELL', shell.path) - vi.stubEnv('ZDOTDIR', fixture.home) - vi.stubEnv('XDG_CONFIG_HOME', join(fixture.home, '.config')) - vi.stubEnv('PI_CONFIG_DIR', undefined) - const file = - shell.name === 'fish' - ? '.config/fish/config.fish' - : shell.name === 'zsh' - ? '.zprofile' - : '.bash_profile' - mkdirSync(join(fixture.home, '.config/fish'), { recursive: true }) - writeFileSync( - join(fixture.home, file), - shell.name === 'fish' - ? 'if not set -q PI_CONFIG_DIR; or test -z "$PI_CONFIG_DIR"\n set -gx PI_CONFIG_DIR .profile-omp\nend\n' - : 'export PI_CONFIG_DIR="${PI_CONFIG_DIR:-.profile-omp}"\n' - ) -} -for (const shell of shells) { - for (const config of [undefined, '.pane-omp', '']) { - it.skipIf(process.platform === 'win32' || !shell.path)( - `${shell.name}: local installer agrees with the launched shell, pane=${JSON.stringify(config)}`, - async () => { - prepare(shell) - const env = config === undefined ? {} : { PI_CONFIG_DIR: config } - await inheritOmpLaunchEnvironment(env, { launchAgent: 'omp', explicitEnv: { ...env } }) - const service = new PiTitlebarExtensionService() - const managed = service.buildPtyEnv('root-proof', undefined, 'omp', { - configDirName: env.PI_CONFIG_DIR - }) - const result = await runProcess({ - program: shell.path, - args: ['-ilc', 'printf "ROOT=%s\\n" "$PI_CONFIG_DIR"'], - env: { ...process.env, ...env } - }) - expect(result.code).toBe(0) - const actual = result.stdout.match(/ROOT=([^\r\n]*)/)?.[1] - if (config === '') { - expect(actual).toBe('.omp') - } - expect(managed.ORCA_OMP_SOURCE_AGENT_DIR).toBe( - join(fixture.home, actual || '.omp', 'agent') - ) - } - ) - } -} - -const selectedShell = shells.find((shell) => shell.name === 'zsh') -it.skipIf(process.platform === 'win32' || !selectedShell?.path).each(['provider', 'daemon'])( - '%s uses the selected pane shell instead of the process default', - async (route) => { - prepare(selectedShell) - vi.stubEnv('SHELL', '/bin/bash') - writeFileSync(join(fixture.home, '.bash_profile'), 'export PI_CONFIG_DIR=.wrong-shell\n') - const env = { SHELL: route === 'provider' ? '/bin/bash' : selectedShell.path } - await inheritOmpLaunchEnvironment(env, { - launchAgent: 'omp', - explicitEnv: { ...env }, - ...(route === 'provider' ? { shellPath: selectedShell.path } : {}) - }) - expect(env.PI_CONFIG_DIR).toBe('.profile-omp') - const launched = await runProcess({ - program: selectedShell.path, - args: ['-ilc', 'printf "ROOT=%s\\n" "$PI_CONFIG_DIR"'], - env: { ...process.env, ...env } - }) - expect(launched.code).toBe(0) - expect(launched.stdout).toContain('ROOT=.profile-omp') - } -) diff --git a/tests/tools/omp-model-runtime-smoke.mjs b/tests/tools/omp-model-runtime-smoke.mjs index 9579f5be47b..6de2726e472 100644 --- a/tests/tools/omp-model-runtime-smoke.mjs +++ b/tests/tools/omp-model-runtime-smoke.mjs @@ -2,7 +2,7 @@ import { mkdtemp, writeFile, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join, resolve } from 'node:path' import { pathToFileURL } from 'node:url' -import { getPiAgentStatusExtensionSource } from '../../src/main/pi/agent-status-extension-source.ts' +import { getPiAgentStatusExtensionSource } from '../../src/main/pi/managed-extensions/agent-status/agent-status-extension-source.ts' const reference = process.argv[2] if (!reference) { throw new Error('Pass a read-only oh-my-pi checkout path') diff --git a/tests/tools/omp-transcript-runtime-smoke.mjs b/tests/tools/omp-transcript-runtime-smoke.mjs index 06c5f927538..4f386c700f8 100644 --- a/tests/tools/omp-transcript-runtime-smoke.mjs +++ b/tests/tools/omp-transcript-runtime-smoke.mjs @@ -5,7 +5,7 @@ import { createServer } from 'node:http' import { tmpdir } from 'node:os' import { join, resolve } from 'node:path' import { pathToFileURL } from 'node:url' -import { getPiAgentStatusExtensionSource } from '../../src/main/pi/agent-status-extension-source.ts' +import { getPiAgentStatusExtensionSource } from '../../src/main/pi/managed-extensions/agent-status/agent-status-extension-source.ts' import { extractAgentProviderSession } from '../../src/shared/agent-session/lifecycle/agent-session-resume' import { getAgentResumeArgv } from '../../src/shared/agent-launch/startup/agent-resume-argv' import { readNativeChatTranscript } from '../../src/main/native-chat/transcript-reader.ts' diff --git a/tests/tools/pi-owner-runtime-smoke.mjs b/tests/tools/pi-owner-runtime-smoke.mjs index 1de6eb848c8..9b8f66d3e4f 100644 --- a/tests/tools/pi-owner-runtime-smoke.mjs +++ b/tests/tools/pi-owner-runtime-smoke.mjs @@ -27,7 +27,7 @@ try { await build({ stdin: { contents: - "export { getPiAgentStatusExtensionSource } from './src/main/pi/agent-status-extension-source';", + "export { getPiAgentStatusExtensionSource } from './src/main/pi/managed-extensions/agent-status/agent-status-extension-source';", resolveDir: process.cwd() }, bundle: true,