Await ACP session opening under host ownership

config/scripts/vitest-sqlite-runtime-files.mjs

@@ -2,6 +2,8 @@ import { SQLITE_DATABASE_RUNTIME_INCLUDE } from './vitest-sqlite-database-runtim
 
 // Real SQLite fixtures keep Node publication and close semantics.
 export const SQLITE_RUNTIME_INCLUDE = [
+  'src/main/acp/acp-structured-publish-at-spawn.test.ts',
+  'tests/e2e/native-chat-startup-option-pickers.unit.test.ts',
   ...SQLITE_DATABASE_RUNTIME_INCLUDE,
   'src/main/acp/acp-structured-host-live-listing.test.ts',
   'src/main/acp/acp-structured-host-configured-default.test.ts',
@@ -22,6 +24,7 @@ export const SQLITE_RUNTIME_INCLUDE = [
   'src/main/acp/acp-structured-child-work.test.ts',
   'src/main/acp/acp-structured-host-subagent-stop.test.ts',
   'src/main/acp/acp-timeline-grok-subagent-retention.test.ts',
+  'src/main/acp/acp-scripted-child-runtime.test.ts',
   'src/main/active-view-persistence-boundary.test.ts',
   'src/main/automations/automation-dispatch-host-fence.test.ts',
   'src/main/automations/automation-owner-fencing.test.ts',
@@ -128,6 +131,8 @@ export const SQLITE_RUNTIME_INCLUDE = [
   'src/main/native-chat/agent-session-wire/structured-agent-session-provider-restore.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-provider-started-catalog.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-provider-started.test.ts',
+  'src/main/native-chat/agent-session-wire/structured-agent-session-provider-open.test.ts',
+  'src/main/native-chat/agent-session-wire/structured-agent-session-ready-operation-order.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-queued-action-receipts.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-queued-gate.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-queued-newer-orca.test.ts',
@@ -169,6 +174,8 @@ export const SQLITE_RUNTIME_INCLUDE = [
   'src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-writer.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt-host.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt-registrations.test.ts',
+  'src/main/native-chat/agent-session-wire/structured-agent-session-startup-picks.test.ts',
+  'src/main/native-chat/agent-session-wire/structured-agent-session-startup-permission-mode.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-startup-reconcile-failure.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-child-work.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-child.test.ts',
@@ -246,6 +253,8 @@ export const SQLITE_RUNTIME_INCLUDE = [
   'src/main/runtime/structured-agent-session-codex-interrupt-order.test.ts',
   'src/main/runtime/structured-agent-session-codex-opening-send-hold.test.ts',
   'src/main/runtime/runtime-client-agent-launch-settings-durability.test.ts',
+  'src/main/runtime/structured-agent-session-codex-scripted-child.test.ts',
+  'src/main/runtime/structured-agent-session-codex-start-deadline.test.ts',
   'src/main/runtime/structured-agent-session-codex-settlement-order.test.ts',
   'src/main/runtime/structured-agent-session-integration-replay.test.ts',
   'src/main/runtime/structured-agent-session-integration.test.ts',

src/main/acp/acp-prompt-content.ts

@@ -21,7 +21,7 @@ import {
 } from '../../shared/node-bounded-file-reader'
 import type { AcpLaunchSpec } from './acp-launch-specs'
 import { resolveAcpPeerOptions } from './acp-peer-limits'
-import { acpAgentName } from './acp-structured-acquire'
+import { acpAgentName } from './acp-structured-agent-definitions'
 import type { AcpStructuredConnection } from './acp-structured-connection'
 import { acpSessionAcceptsImages } from './acp-structured-options'
 import type { ContentBlock } from './generated/acp-protocol.generated'

src/main/acp/acp-scripted-child-runtime.test.ts

@@ -0,0 +1,88 @@
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope'
+import {
+  HOST_TEST_SESSION,
+  hostTestAttachParams,
+  hostTestMessage
+} from '../native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import { createStructuredAgentSessionLogger } from '../native-chat/agent-session-wire/structured-agent-session-logger'
+import {
+  ensureStructuredAgentSessionHost,
+  stopStructuredAgentSessionRuntime
+} from '../runtime/structured-agent-session-runtime'
+import { acpScriptedChild } from './acp-scripted-child.test-fixture'
+
+let stateDirectory: string | undefined
+let operation = 0
+const operationId = () => `${Date.now()}-${(++operation).toString(16).padStart(32, '0')}`
+const caller = { callerKey: 'scripted-acp-runtime' }
+
+afterEach(async () => {
+  await stopStructuredAgentSessionRuntime()
+  if (stateDirectory) {
+    await rm(stateDirectory, { recursive: true, force: true })
+  }
+  stateDirectory = undefined
+})
+
+describe.each(['grok', 'opencode'] as const)('%s runtime with a scripted ACP child', (agent) => {
+  it('attaches and accepts a send while startup is held, then delivers once the protocol session opens', async () => {
+    stateDirectory = await mkdtemp(join(tmpdir(), 'orca-scripted-acp-'))
+    const script = acpScriptedChild(agent)()
+    const host = await ensureStructuredAgentSessionHost({
+      logger: createStructuredAgentSessionLogger(),
+      stateDirectory,
+      hostId: 'local',
+      claimKeyId: 'key-1',
+      resolveWorkspacePath: async () => stateDirectory ?? '',
+      resolveLaunchArgs: () => [],
+      resolveClaudeAuthPolicy: () => ({ account: 'managed' }),
+      ...script.deps
+    })
+    const attach = hostTestAttachParams(null, {
+      provider: agent,
+      agent,
+      providerHandle: undefined,
+      location: {
+        executionHostId: 'local',
+        wslDistro: null,
+        workspaceId: 'folder-1',
+        workspaceKind: 'folder'
+      },
+      accountHome:
+        agent === 'grok'
+          ? { variable: 'GROK_HOME', path: stateDirectory }
+          : { kind: 'opencode', locator: { kind: 'unmanaged' } }
+    })
+    attach.envelope.clientOperationId = operationId()
+    const attached = await host.attach(caller, attach)
+    expect(attached).toMatchObject({ ok: true })
+    if (!attached.ok) {
+      throw new Error(JSON.stringify(attached.refusal))
+    }
+    const body = hostTestMessage('message during startup')
+    const sent = await host.send(caller, {
+      body,
+      envelope: {
+        sessionId: HOST_TEST_SESSION,
+        clientOperationId: operationId(),
+        expectedRuntimeFence: attached.value.fence,
+        payloadFingerprint: computeAgentSessionPayloadFingerprint({
+          method: 'agentSession.send',
+          sessionId: HOST_TEST_SESSION,
+          fields: { body }
+        })
+      }
+    })
+    expect(sent).toMatchObject({ ok: true })
+    expect(script.prompts()).toEqual([])
+    await vi.waitFor(() => expect(script.spawns()).toBe(1))
+    script.releaseHandshake()
+    await vi.waitFor(() => expect(script.prompts()).toEqual(['message during startup']))
+    await host.close(HOST_TEST_SESSION, 'user-close')
+    expect(script.closes()).toBe(1)
+  })
+})

src/main/acp/acp-scripted-child.test-fixture.ts

@@ -0,0 +1,151 @@
+import { z } from 'zod'
+import type {
+  ScriptedAgentChild,
+  ScriptedAgentChildFactory
+} from '../runtime/structured-agent-scripted-child.test-fixture'
+import { FakeAcpChild, GROK_CONFIG_OPTIONS } from './acp-structured-adapter.test-support'
+import type { FakeFrame } from './acp-scripted-agent.test-support'
+import type { AcpLaunchSpec } from './acp-launch-specs'
+
+const promptParams = z.object({
+  sessionId: z.string(),
+  prompt: z.array(z.object({ type: z.string(), text: z.string().optional() })),
+  _meta: z.object({ promptId: z.string() }).optional()
+})
+const loadParams = z.object({ sessionId: z.string() })
+const configParams = z.object({ configId: z.string(), value: z.string() })
+
+export function acpScriptedChild(agent: AcpLaunchSpec['agent']): ScriptedAgentChildFactory {
+  return () => {
+    let current: FakeAcpChild | undefined
+    let handshake: (() => void) | undefined
+    let released = false
+    let opened = 0
+    let reopened = 0
+    let closed = 0
+    const texts: string[] = []
+    const fixture: ScriptedAgentChild = {
+      holdHandshakes: true,
+      completeTurns: true,
+      deps: {
+        resolveEnvironment: async () => ({ PATH: '' }),
+        acpLaunchCommand: {
+          resolveCommand: () => 'scripted-acp-agent',
+          probeVersion: async () => true
+        },
+        readProcessStartTime: async () => 1_700_000_000_000 + opened,
+        openAcpConnection: (launch, options) => {
+          opened += 1
+          handshake = undefined
+          released = false
+          const child = new FakeAcpChild(launch, options)
+          current = child
+          let sessionId = `${agent}-scripted-session`
+          let running: FakeFrame | undefined
+          let configOptions = GROK_CONFIG_OPTIONS.map((option) => ({ ...option }))
+          const script = child.agent
+          script.on('initialize', (frame) =>
+            script.reply(frame, {
+              protocolVersion: 1,
+              agentCapabilities: { loadSession: true }
+            })
+          )
+          const start = (frame: FakeFrame, resumes: boolean): void => {
+            if (resumes) {
+              reopened += 1
+              sessionId = loadParams.parse(frame.params).sessionId
+            }
+            const answer = () => {
+              if (child.closed || child.exited) {
+                return
+              }
+              script.reply(frame, { ...(!resumes ? { sessionId } : {}), configOptions })
+            }
+            if (fixture.holdHandshakes && !released) {
+              handshake = answer
+            } else {
+              answer()
+            }
+          }
+          script.on('session/new', (frame) => start(frame, false))
+          script.on('session/load', (frame) => start(frame, true))
+          script.on('session/set_config_option', (frame) => {
+            const { configId, value } = configParams.parse(frame.params)
+            configOptions = configOptions.map((option) =>
+              option.id === configId ? { ...option, currentValue: value } : option
+            )
+            script.reply(frame, { configOptions })
+          })
+          script.on('session/set_model', (frame) => script.reply(frame, {}))
+          // Grok's subagent-stop probe: the handler refuses the missing id, so stops are offered.
+          script.on('_x.ai/subagent/cancel', (frame) =>
+            script.fail(
+              frame,
+              -32602,
+              'Invalid params',
+              'invalid params: missing field `subagentId`'
+            )
+          )
+          // Its background-task stop probe, answered the same way.
+          script.on('_x.ai/task/kill', (frame) =>
+            script.fail(
+              frame,
+              -32602,
+              'Invalid params',
+              'invalid params: missing field `sessionId`'
+            )
+          )
+          script.on('session/prompt', (frame) => {
+            const params = promptParams.parse(frame.params)
+            texts.push(params.prompt.map((block) => block.text ?? '').join(''))
+            running = frame
+            script.notify('session/update', {
+              sessionId,
+              update: {
+                sessionUpdate: 'agent_message_chunk',
+                content: { type: 'text', text: 'Scripted response' }
+              },
+              ...(params._meta ? { _meta: params._meta } : {})
+            })
+            if (fixture.completeTurns) {
+              script.reply(frame, { stopReason: 'end_turn' })
+              running = undefined
+            }
+          })
+          script.on('session/cancel', () => {
+            if (running) {
+              script.reply(running, { stopReason: 'cancelled' })
+            }
+            running = undefined
+          })
+          const prove = child.proveClose
+          child.proveClose = async () => {
+            if (!child.exited) {
+              closed += 1
+            }
+            return prove()
+          }
+          return child
+        }
+      },
+      releaseHandshake: () => {
+        released = true
+        handshake?.()
+        handshake = undefined
+      },
+      failHandshake: (message) => {
+        if (!current) {
+          throw new Error('no scripted ACP child')
+        }
+        current.stderr = message
+        current.exit()
+        handshake = undefined
+      },
+      prompts: () => texts,
+      spawns: () => opened,
+      resumes: () => reopened,
+      closes: () => closed
+    }
+    return fixture
+  }
+}

src/main/acp/acp-scripted-connection.test-fixture.ts

@@ -0,0 +1,93 @@
+import type { ProviderProcessExit } from '../provider-process/managed-provider-process'
+import type { ProviderProcessLaunch } from '../provider-process/provider-process-launch'
+import type { AcpAgentConnectionOptions } from './acp-agent-connection'
+import { AcpConnectionClosedError } from './acp-errors'
+import { AcpSessionRuntime } from './acp-session-runtime'
+import type { AcpStructuredConnection } from './acp-structured-connection'
+import { AcpScriptedAgent } from './acp-scripted-agent.test-support'
+export const PID = 4242
+
+/** A scripted agent behind the connection surface: the real protocol runtime over in-memory stdio,
+ *  with the process lifecycle `AcpAgentConnection` gives it (stdout EOF is not exit; the exit closes
+ *  the protocol with the agent's last words; a protocol failure while it runs is `onClose`). */
+export class FakeAcpChild extends AcpSessionRuntime implements AcpStructuredConnection {
+  readonly agent: AcpScriptedAgent
+  readonly pid: number | undefined = PID
+  readonly spawned = Promise.resolve()
+  stderr = ''
+  processTreeUnproven = false
+  private exitListeners: ((exit: ProviderProcessExit) => void)[] = []
+  private gone = false
+  private closing = false
+  private lostWith: Error | undefined
+  closes = 0
+
+  constructor(
+    readonly launch: ProviderProcessLaunch,
+    private readonly connectionOptions: AcpAgentConnectionOptions,
+    agent = new AcpScriptedAgent()
+  ) {
+    const lifecycle: { child: FakeAcpChild | null } = { child: null }
+    super(agent.stdout, agent.stdin, {
+      ...connectionOptions,
+      peer: { ...connectionOptions.peer, closeOnInputEnd: false },
+      onClose: (error) => lifecycle.child?.lost(error)
+    })
+    lifecycle.child = this
+    this.agent = agent
+  }
+
+  get exited() {
+    return this.gone
+  }
+  onExit(listener: (exit: ProviderProcessExit) => void): void {
+    if (this.gone) {
+      listener(FAKE_EXIT)
+    } else {
+      this.exitListeners.push(listener)
+    }
+  }
+  stderrTail(): string {
+    return this.stderr
+  }
+  pauseReading(): void {
+    this.agent.stdout.pause()
+  }
+  resumeReading(): void {
+    this.agent.stdout.resume()
+  }
+  /** What a close proves once the protocol is closed; replace it to leave the exit unproven. */
+  proveClose = async (): Promise<boolean> => {
+    this.exit()
+    return true
+  }
+  override close(error?: Error): Promise<boolean> {
+    this.closes += 1
+    this.closing ||= !this.gone
+    this.drainNotifications(error)
+    return this.proveClose().finally(() => super.close(error))
+  }
+  /** The agent process ends on its own (or Orca's close landed). */
+  exit(): void {
+    if (this.gone) {
+      return
+    }
+    this.gone = true
+    const error =
+      this.lostWith ?? new AcpConnectionClosedError(this.stderr || `${this.launch.command} exited`)
+    super.close(error)
+    this.connectionOptions.onExit?.(error, { expected: this.closing, exit: FAKE_EXIT })
+    for (const listener of this.exitListeners.splice(0)) {
+      listener(FAKE_EXIT)
+    }
+  }
+  private lost(error: Error): void {
+    this.lostWith ??= error
+    if (this.closing || this.gone) {
+      return
+    }
+    this.connectionOptions.onClose?.(error)
+  }
+}
+
+const FAKE_EXIT: ProviderProcessExit = { code: 0, signal: null, processless: false }