refactor: group Pi provider modules by owner

This commit is contained in:
Neil
2026-11-11 08:31:18 -08:00
parent f820fdf8d4
commit 2d4dfd5303
136 changed files with 377 additions and 2889 deletions
+1 -1
View File
@@ -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
-1
View File
@@ -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
+2 -2
View File
@@ -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
@@ -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,
@@ -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',
+2 -2
View File
@@ -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__/**/*",
+2 -2
View File
@@ -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": [
@@ -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'
@@ -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'
@@ -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<void>()
const reconcileStarted = Promise.withResolvers<void>()
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
})
})
@@ -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()
}
})
})
@@ -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', () =>
+1 -1
View File
@@ -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'
@@ -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', () => ({
+1 -1
View File
@@ -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'
@@ -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', () =>
@@ -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<string, unknown>): Promise<unknown> } | 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
)
})
})
@@ -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', () =>
@@ -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', () =>
@@ -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', () =>
@@ -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', () =>
@@ -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', () =>
@@ -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', () =>
@@ -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)
@@ -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', () =>
+2 -27
View File
@@ -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)
}
})
})
@@ -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', () =>
@@ -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'
@@ -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<void>()
const catalog =
Promise.withResolvers<Awaited<ReturnType<NonNullable<typeof host.modelCatalog>['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')
})
@@ -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<string, unknown>[] {
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<void> {
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
})
})
})
@@ -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<typeof vi.fn>
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 })
])
})
})
@@ -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)
})
@@ -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[] {
@@ -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)
})
})
@@ -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'
@@ -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'
@@ -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)
})
})
@@ -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 [
@@ -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[] {
@@ -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.
@@ -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[] {
@@ -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[] {
@@ -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[] {
@@ -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[] {
@@ -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'
@@ -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'
@@ -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-'))
@@ -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'
@@ -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'
@@ -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()
})
})
-118
View File
@@ -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')
})
})
-63
View File
@@ -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')
})
})
+4 -4
View File
@@ -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,
+2 -2
View File
@@ -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'
-29
View File
@@ -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<NonNullable<typeof launch>>()
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)
})
})
@@ -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
@@ -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')
@@ -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
@@ -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
@@ -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
@@ -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),
@@ -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 }
@@ -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
+47
View File
@@ -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'
)
})
})
@@ -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
@@ -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<unknown> }
@@ -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 = {
@@ -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()
@@ -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 = {
@@ -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
@@ -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')
})
})
@@ -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
@@ -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'
@@ -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
@@ -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'])
@@ -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. */
@@ -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 = {

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