acpx 0.5.3 → 0.6.1

package/README.md

@@ -33,7 +33,7 @@ One command surface for Pi, OpenClaw ACP, Codex, Claude, and other ACP-compatibl
 - **Prompt from file/stdin**: `--file <path>` or piped stdin for prompt content
 - **Config files**: global + project JSON config with `acpx config show|init`
 - **Session inspect/history**: `sessions show` and `sessions history --limit <n>`
-- **Local status checks**: `status` reports running/dead/no-session, pid, uptime, last prompt
+- **Local status checks**: `status` reports running/idle/dead/no-session, pid, uptime, last prompt
 - **Client methods**: stable `fs/*` and `terminal/*` handlers with permission controls and cwd sandboxing
 - **Auth handshake**: stable `authenticate` support via env/config credentials
 - **Structured output**: typed ACP messages (thinking, tool calls, diffs) instead of ANSI scraping
@@ -271,7 +271,7 @@ Supported keys:
   "timeout": null,
   "format": "text",
   "agents": {
-    "my-custom": { "command": "./bin/my-acp-server" }
+    "my-custom": { "command": "./bin/my-acp-server", "args": ["acp"] }
   },
   "auth": {
     "my_auth_method_id": "credential-value"
@@ -281,6 +281,11 @@ Supported keys:
 
 Use `acpx config show` to inspect the resolved result and `acpx config init` to create the global template.
 
+For ACP `authenticate` handshakes, use either config `auth` entries or explicit
+`ACPX_AUTH_<METHOD_ID>` environment variables such as `ACPX_AUTH_OPENAI_API_KEY`.
+Ambient provider env vars such as `OPENAI_API_KEY` are still passed through to
+child agents, but they do not trigger ACP auth-method selection on their own.
+
 ## Output formats
 
 ```bash
@@ -319,8 +324,11 @@ JSON events include a stable envelope for correlation:
 }
 ```
 
-Session-control JSON payloads (`sessions new|ensure`, `status`) may also include
-`runtimeSessionId` when the adapter exposes a provider-native session ID.
+Session-control JSON payloads (`sessions new|ensure`, `status`) always include
+`acpxRecordId` and `acpxSessionId`. They include `agentSessionId` only when the
+adapter exposes a provider-native session ID. The text/quiet session id is the
+local acpx record id; do not assume it can be passed to the native provider CLI
+unless `agentSessionId` is present.
 
 ## Built-in agents and custom servers
 

package/dist/{cli-ChWsO-bb.js → cli-Ddxpnz9X.js}

@@ -1,6 +1,6 @@
-import { b as permissionModeSatisfies } from "./prompt-turn-CXMtXBl-.js";
-import { a as hasExplicitPermissionModeFlag, f as resolveAgentInvocation, h as resolvePermissionMode, m as resolveOutputPolicy, p as resolveGlobalFlags } from "./flags-ceSqz2T6.js";
-import { i as FlowRunner, o as validateFlowDefinition, p as isDefinedFlow } from "./flows-_KmnuUXd.js";
+import { C as permissionModeSatisfies } from "./prompt-turn-BY5SwU1F.js";
+import { _ as resolvePermissionMode, a as hasExplicitPermissionModeFlag, g as resolveOutputPolicy, h as resolveGlobalFlags, m as resolveAgentInvocation } from "./flags-yXzUm7Aq.js";
+import { i as FlowRunner, o as validateFlowDefinition, p as isDefinedFlow } from "./flows-CDsfbaA2.js";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import path from "node:path";
 import { InvalidArgumentError } from "commander";
@@ -169,4 +169,4 @@ function printFlowRunResult(result, globalFlags) {
 //#endregion
 export { handleFlowRun };
 
-//# sourceMappingURL=cli-ChWsO-bb.js.map
+//# sourceMappingURL=cli-Ddxpnz9X.js.map

package/dist/{cli-ChWsO-bb.js.map → cli-Ddxpnz9X.js.map}

@@ -1 +1 @@
-{"version":3,"file":"cli-ChWsO-bb.js","names":[],"sources":["../src/flows/cli.ts"],"sourcesContent":["import { randomUUID } from \"node:crypto\";\nimport fs from \"node:fs/promises\";\nimport path from \"node:path\";\nimport { fileURLToPath, pathToFileURL } from \"node:url\";\nimport { InvalidArgumentError, type Command } from \"commander\";\nimport type { ResolvedAcpxConfig } from \"../cli/config.js\";\nimport {\n  hasExplicitPermissionModeFlag,\n  resolveAgentInvocation,\n  resolveGlobalFlags,\n  resolveOutputPolicy,\n  resolvePermissionMode,\n  type GlobalFlags,\n} from \"../cli/flags.js\";\nimport { type FlowDefinition, FlowRunner } from \"../flows.js\";\nimport { permissionModeSatisfies } from \"../permissions.js\";\nimport type { PermissionMode } from \"../types.js\";\nimport { isDefinedFlow } from \"./authoring.js\";\nimport { validateFlowDefinition } from \"./graph.js\";\n\ntype FlowRunFlags = {\n  inputJson?: string;\n  inputFile?: string;\n  defaultAgent?: string;\n};\n\nconst FLOW_RUNTIME_SPECIFIER = \"acpx/flows\";\nconst TEXT_MODULE_EXTENSIONS = new Set([\".js\", \".mjs\", \".cjs\", \".ts\", \".tsx\", \".mts\", \".cts\"]);\n\nexport async function handleFlowRun(\n  flowFile: string,\n  flags: FlowRunFlags,\n  command: Command,\n  config: ResolvedAcpxConfig,\n): Promise<void> {\n  const globalFlags = resolveGlobalFlags(command, config);\n  const permissionMode = resolvePermissionMode(globalFlags, config.defaultPermissions);\n  const outputPolicy = resolveOutputPolicy(globalFlags.format, globalFlags.jsonStrict === true);\n  const input = await readFlowInput(flags);\n  const flowPath = path.resolve(flowFile);\n  const flow = await loadFlowModule(flowPath);\n  assertFlowPermissionRequirements(flow, permissionMode, globalFlags);\n\n  const runner = new FlowRunner({\n    resolveAgent: (profile?: string) => {\n      return resolveAgentInvocation(profile ?? flags.defaultAgent, globalFlags, config);\n    },\n    permissionMode,\n    mcpServers: config.mcpServers,\n    nonInteractivePermissions: globalFlags.nonInteractivePermissions,\n    authCredentials: config.auth,\n    authPolicy: globalFlags.authPolicy,\n    timeoutMs: globalFlags.timeout,\n    ttlMs: globalFlags.ttl,\n    verbose: globalFlags.verbose,\n    suppressSdkConsoleErrors: outputPolicy.suppressSdkConsoleErrors,\n    sessionOptions: {\n      model: globalFlags.model,\n      allowedTools: globalFlags.allowedTools,\n      maxTurns: globalFlags.maxTurns,\n    },\n  });\n\n  const result = await runner.run(flow, input, {\n    flowPath,\n  });\n\n  printFlowRunResult(result, globalFlags);\n}\n\nfunction assertFlowPermissionRequirements(\n  flow: FlowDefinition,\n  permissionMode: PermissionMode,\n  globalFlags: GlobalFlags,\n): void {\n  const permissions = flow.permissions;\n  if (!permissions) {\n    return;\n  }\n\n  if (permissions.requireExplicitGrant && !hasExplicitPermissionModeFlag(globalFlags)) {\n    throw new InvalidArgumentError(\n      buildFlowPermissionFailureMessage(flow, permissions.requiredMode, permissions.reason, true),\n    );\n  }\n\n  if (!permissionModeSatisfies(permissionMode, permissions.requiredMode)) {\n    throw new InvalidArgumentError(\n      buildFlowPermissionFailureMessage(flow, permissions.requiredMode, permissions.reason, false),\n    );\n  }\n}\n\nfunction buildFlowPermissionFailureMessage(\n  flow: FlowDefinition,\n  requiredMode: PermissionMode,\n  reason?: string,\n  explicit = false,\n): string {\n  return [\n    explicit\n      ? `Flow \"${flow.name}\" requires an explicit ${requiredMode} grant.`\n      : `Flow \"${flow.name}\" requires permission mode ${requiredMode}.`,\n    `Rerun with --${requiredMode}.`,\n    ...(reason ? [`Reason: ${reason}`] : []),\n  ].join(\" \");\n}\n\nasync function readFlowInput(flags: FlowRunFlags): Promise<unknown> {\n  if (flags.inputJson && flags.inputFile) {\n    throw new InvalidArgumentError(\"Use only one of --input-json or --input-file\");\n  }\n\n  if (flags.inputJson) {\n    return parseJsonInput(flags.inputJson, \"--input-json\");\n  }\n\n  if (flags.inputFile) {\n    const inputPath = path.resolve(flags.inputFile);\n    const payload = await fs.readFile(inputPath, \"utf8\");\n    return parseJsonInput(payload, \"--input-file\");\n  }\n\n  return {};\n}\n\nasync function loadFlowModule(flowPath: string): Promise<FlowDefinition> {\n  const extension = path.extname(flowPath).toLowerCase();\n  const prepared = await prepareFlowModuleImport(flowPath, extension);\n  try {\n    const module = await loadFlowRuntimeModule(prepared.flowUrl, extension);\n\n    const candidate = findFlowDefinition(module);\n    if (!candidate) {\n      throw new Error(\n        `Flow module must export default defineFlow({...}) from \"acpx/flows\": ${flowPath}`,\n      );\n    }\n    validateFlowDefinition(candidate);\n    return candidate;\n  } finally {\n    await prepared.cleanup?.();\n  }\n}\n\nasync function prepareFlowModuleImport(\n  flowPath: string,\n  extension: string,\n): Promise<{\n  flowUrl: string;\n  cleanup?: () => Promise<void>;\n}> {\n  const flowUrl = pathToFileURL(flowPath).href;\n  if (!TEXT_MODULE_EXTENSIONS.has(extension)) {\n    return { flowUrl };\n  }\n\n  const source = await fs.readFile(flowPath, \"utf8\");\n  if (!source.includes(FLOW_RUNTIME_SPECIFIER)) {\n    return { flowUrl };\n  }\n\n  const runtimeSpecifier = resolveFlowRuntimeImportSpecifier();\n  const rewritten = source.replaceAll(\n    /([\"'])acpx\\/flows\\1/g,\n    (_match, quote: string) => `${quote}${runtimeSpecifier}${quote}`,\n  );\n  if (rewritten === source) {\n    return { flowUrl };\n  }\n\n  const tempPath = path.join(path.dirname(flowPath), `.acpx-flow-load-${randomUUID()}${extension}`);\n  await fs.writeFile(tempPath, rewritten, \"utf8\");\n  return {\n    flowUrl: pathToFileURL(tempPath).href,\n    cleanup: async () => {\n      await fs.rm(tempPath, { force: true });\n    },\n  };\n}\n\nfunction resolveFlowRuntimeImportSpecifier(): string {\n  const selfPath = fileURLToPath(import.meta.url);\n\n  if (selfPath.endsWith(`${path.sep}src${path.sep}flows${path.sep}cli.ts`)) {\n    return new URL(\"../flows.ts\", import.meta.url).href;\n  }\n  if (selfPath.endsWith(`${path.sep}src${path.sep}flows${path.sep}cli.js`)) {\n    return new URL(\"../flows.js\", import.meta.url).href;\n  }\n  return new URL(\"./flows.js\", import.meta.url).href;\n}\n\nasync function loadFlowRuntimeModule(\n  flowUrl: string,\n  extension: string,\n): Promise<{\n  default?: unknown;\n  \"module.exports\"?: unknown;\n}> {\n  if (extension === \".ts\" || extension === \".tsx\" || extension === \".mts\" || extension === \".cts\") {\n    const { tsImport } = (await import(\"tsx/esm/api\")) as {\n      tsImport: (\n        specifier: string,\n        parentURL: string,\n      ) => Promise<{\n        default?: unknown;\n        \"module.exports\"?: unknown;\n      }>;\n    };\n    return (await tsImport(flowUrl, import.meta.url)) as {\n      default?: unknown;\n      \"module.exports\"?: unknown;\n    };\n  }\n\n  return (await import(flowUrl)) as {\n    default?: unknown;\n    \"module.exports\"?: unknown;\n  };\n}\n\nfunction findFlowDefinition(module: {\n  default?: unknown;\n  \"module.exports\"?: unknown;\n}): FlowDefinition | null {\n  const candidates = [\n    module.default,\n    module[\"module.exports\"],\n    getNestedDefault(module.default),\n    getNestedDefault(module[\"module.exports\"]),\n  ];\n\n  for (const candidate of candidates) {\n    if (isDefinedFlow(candidate)) {\n      return candidate;\n    }\n  }\n\n  return null;\n}\n\nfunction getNestedDefault(value: unknown): unknown {\n  if (!value || typeof value !== \"object\" || !(\"default\" in value)) {\n    return null;\n  }\n  return (value as { default?: unknown }).default ?? null;\n}\n\nfunction parseJsonInput(raw: string, label: string): unknown {\n  try {\n    return JSON.parse(raw);\n  } catch (error) {\n    throw new InvalidArgumentError(\n      `${label} must contain valid JSON: ${error instanceof Error ? error.message : String(error)}`,\n    );\n  }\n}\n\nfunction printFlowRunResult(\n  result: Awaited<ReturnType<FlowRunner[\"run\"]>>,\n  globalFlags: GlobalFlags,\n): void {\n  const payload = {\n    action: \"flow_run_result\",\n    runId: result.state.runId,\n    flowName: result.state.flowName,\n    runTitle: result.state.runTitle,\n    flowPath: result.state.flowPath,\n    status: result.state.status,\n    currentNode: result.state.currentNode,\n    currentNodeType: result.state.currentNodeType,\n    currentNodeStartedAt: result.state.currentNodeStartedAt,\n    lastHeartbeatAt: result.state.lastHeartbeatAt,\n    statusDetail: result.state.statusDetail,\n    waitingOn: result.state.waitingOn,\n    runDir: result.runDir,\n    outputs: result.state.outputs,\n    sessionBindings: result.state.sessionBindings,\n  };\n\n  if (globalFlags.format === \"json\") {\n    process.stdout.write(`${JSON.stringify(payload)}\\n`);\n    return;\n  }\n\n  if (globalFlags.format === \"quiet\") {\n    process.stdout.write(`${result.state.runId}\\n`);\n    return;\n  }\n\n  process.stdout.write(`runId: ${payload.runId}\\n`);\n  process.stdout.write(`flow: ${payload.flowName}\\n`);\n  if (payload.runTitle) {\n    process.stdout.write(`title: ${payload.runTitle}\\n`);\n  }\n  process.stdout.write(`status: ${payload.status}\\n`);\n  process.stdout.write(`runDir: ${payload.runDir}\\n`);\n  if (payload.currentNode) {\n    process.stdout.write(`currentNode: ${payload.currentNode}\\n`);\n  }\n  if (payload.statusDetail) {\n    process.stdout.write(`statusDetail: ${payload.statusDetail}\\n`);\n  }\n  if (payload.waitingOn) {\n    process.stdout.write(`waitingOn: ${payload.waitingOn}\\n`);\n  }\n  process.stdout.write(`${JSON.stringify(payload.outputs, null, 2)}\\n`);\n}\n"],"mappings":"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"}
+{"version":3,"file":"cli-Ddxpnz9X.js","names":[],"sources":["../src/flows/cli.ts"],"sourcesContent":["import { randomUUID } from \"node:crypto\";\nimport fs from \"node:fs/promises\";\nimport path from \"node:path\";\nimport { fileURLToPath, pathToFileURL } from \"node:url\";\nimport { InvalidArgumentError, type Command } from \"commander\";\nimport type { ResolvedAcpxConfig } from \"../cli/config.js\";\nimport {\n  hasExplicitPermissionModeFlag,\n  resolveAgentInvocation,\n  resolveGlobalFlags,\n  resolveOutputPolicy,\n  resolvePermissionMode,\n  type GlobalFlags,\n} from \"../cli/flags.js\";\nimport { type FlowDefinition, FlowRunner } from \"../flows.js\";\nimport { permissionModeSatisfies } from \"../permissions.js\";\nimport type { PermissionMode } from \"../types.js\";\nimport { isDefinedFlow } from \"./authoring.js\";\nimport { validateFlowDefinition } from \"./graph.js\";\n\ntype FlowRunFlags = {\n  inputJson?: string;\n  inputFile?: string;\n  defaultAgent?: string;\n};\n\nconst FLOW_RUNTIME_SPECIFIER = \"acpx/flows\";\nconst TEXT_MODULE_EXTENSIONS = new Set([\".js\", \".mjs\", \".cjs\", \".ts\", \".tsx\", \".mts\", \".cts\"]);\n\nexport async function handleFlowRun(\n  flowFile: string,\n  flags: FlowRunFlags,\n  command: Command,\n  config: ResolvedAcpxConfig,\n): Promise<void> {\n  const globalFlags = resolveGlobalFlags(command, config);\n  const permissionMode = resolvePermissionMode(globalFlags, config.defaultPermissions);\n  const outputPolicy = resolveOutputPolicy(globalFlags.format, globalFlags.jsonStrict === true);\n  const input = await readFlowInput(flags);\n  const flowPath = path.resolve(flowFile);\n  const flow = await loadFlowModule(flowPath);\n  assertFlowPermissionRequirements(flow, permissionMode, globalFlags);\n\n  const runner = new FlowRunner({\n    resolveAgent: (profile?: string) => {\n      return resolveAgentInvocation(profile ?? flags.defaultAgent, globalFlags, config);\n    },\n    permissionMode,\n    mcpServers: config.mcpServers,\n    nonInteractivePermissions: globalFlags.nonInteractivePermissions,\n    authCredentials: config.auth,\n    authPolicy: globalFlags.authPolicy,\n    timeoutMs: globalFlags.timeout,\n    ttlMs: globalFlags.ttl,\n    verbose: globalFlags.verbose,\n    suppressSdkConsoleErrors: outputPolicy.suppressSdkConsoleErrors,\n    sessionOptions: {\n      model: globalFlags.model,\n      allowedTools: globalFlags.allowedTools,\n      maxTurns: globalFlags.maxTurns,\n    },\n  });\n\n  const result = await runner.run(flow, input, {\n    flowPath,\n  });\n\n  printFlowRunResult(result, globalFlags);\n}\n\nfunction assertFlowPermissionRequirements(\n  flow: FlowDefinition,\n  permissionMode: PermissionMode,\n  globalFlags: GlobalFlags,\n): void {\n  const permissions = flow.permissions;\n  if (!permissions) {\n    return;\n  }\n\n  if (permissions.requireExplicitGrant && !hasExplicitPermissionModeFlag(globalFlags)) {\n    throw new InvalidArgumentError(\n      buildFlowPermissionFailureMessage(flow, permissions.requiredMode, permissions.reason, true),\n    );\n  }\n\n  if (!permissionModeSatisfies(permissionMode, permissions.requiredMode)) {\n    throw new InvalidArgumentError(\n      buildFlowPermissionFailureMessage(flow, permissions.requiredMode, permissions.reason, false),\n    );\n  }\n}\n\nfunction buildFlowPermissionFailureMessage(\n  flow: FlowDefinition,\n  requiredMode: PermissionMode,\n  reason?: string,\n  explicit = false,\n): string {\n  return [\n    explicit\n      ? `Flow \"${flow.name}\" requires an explicit ${requiredMode} grant.`\n      : `Flow \"${flow.name}\" requires permission mode ${requiredMode}.`,\n    `Rerun with --${requiredMode}.`,\n    ...(reason ? [`Reason: ${reason}`] : []),\n  ].join(\" \");\n}\n\nasync function readFlowInput(flags: FlowRunFlags): Promise<unknown> {\n  if (flags.inputJson && flags.inputFile) {\n    throw new InvalidArgumentError(\"Use only one of --input-json or --input-file\");\n  }\n\n  if (flags.inputJson) {\n    return parseJsonInput(flags.inputJson, \"--input-json\");\n  }\n\n  if (flags.inputFile) {\n    const inputPath = path.resolve(flags.inputFile);\n    const payload = await fs.readFile(inputPath, \"utf8\");\n    return parseJsonInput(payload, \"--input-file\");\n  }\n\n  return {};\n}\n\nasync function loadFlowModule(flowPath: string): Promise<FlowDefinition> {\n  const extension = path.extname(flowPath).toLowerCase();\n  const prepared = await prepareFlowModuleImport(flowPath, extension);\n  try {\n    const module = await loadFlowRuntimeModule(prepared.flowUrl, extension);\n\n    const candidate = findFlowDefinition(module);\n    if (!candidate) {\n      throw new Error(\n        `Flow module must export default defineFlow({...}) from \"acpx/flows\": ${flowPath}`,\n      );\n    }\n    validateFlowDefinition(candidate);\n    return candidate;\n  } finally {\n    await prepared.cleanup?.();\n  }\n}\n\nasync function prepareFlowModuleImport(\n  flowPath: string,\n  extension: string,\n): Promise<{\n  flowUrl: string;\n  cleanup?: () => Promise<void>;\n}> {\n  const flowUrl = pathToFileURL(flowPath).href;\n  if (!TEXT_MODULE_EXTENSIONS.has(extension)) {\n    return { flowUrl };\n  }\n\n  const source = await fs.readFile(flowPath, \"utf8\");\n  if (!source.includes(FLOW_RUNTIME_SPECIFIER)) {\n    return { flowUrl };\n  }\n\n  const runtimeSpecifier = resolveFlowRuntimeImportSpecifier();\n  const rewritten = source.replaceAll(\n    /([\"'])acpx\\/flows\\1/g,\n    (_match, quote: string) => `${quote}${runtimeSpecifier}${quote}`,\n  );\n  if (rewritten === source) {\n    return { flowUrl };\n  }\n\n  const tempPath = path.join(path.dirname(flowPath), `.acpx-flow-load-${randomUUID()}${extension}`);\n  await fs.writeFile(tempPath, rewritten, \"utf8\");\n  return {\n    flowUrl: pathToFileURL(tempPath).href,\n    cleanup: async () => {\n      await fs.rm(tempPath, { force: true });\n    },\n  };\n}\n\nfunction resolveFlowRuntimeImportSpecifier(): string {\n  const selfPath = fileURLToPath(import.meta.url);\n\n  if (selfPath.endsWith(`${path.sep}src${path.sep}flows${path.sep}cli.ts`)) {\n    return new URL(\"../flows.ts\", import.meta.url).href;\n  }\n  if (selfPath.endsWith(`${path.sep}src${path.sep}flows${path.sep}cli.js`)) {\n    return new URL(\"../flows.js\", import.meta.url).href;\n  }\n  return new URL(\"./flows.js\", import.meta.url).href;\n}\n\nasync function loadFlowRuntimeModule(\n  flowUrl: string,\n  extension: string,\n): Promise<{\n  default?: unknown;\n  \"module.exports\"?: unknown;\n}> {\n  if (extension === \".ts\" || extension === \".tsx\" || extension === \".mts\" || extension === \".cts\") {\n    const { tsImport } = (await import(\"tsx/esm/api\")) as {\n      tsImport: (\n        specifier: string,\n        parentURL: string,\n      ) => Promise<{\n        default?: unknown;\n        \"module.exports\"?: unknown;\n      }>;\n    };\n    return (await tsImport(flowUrl, import.meta.url)) as {\n      default?: unknown;\n      \"module.exports\"?: unknown;\n    };\n  }\n\n  return (await import(flowUrl)) as {\n    default?: unknown;\n    \"module.exports\"?: unknown;\n  };\n}\n\nfunction findFlowDefinition(module: {\n  default?: unknown;\n  \"module.exports\"?: unknown;\n}): FlowDefinition | null {\n  const candidates = [\n    module.default,\n    module[\"module.exports\"],\n    getNestedDefault(module.default),\n    getNestedDefault(module[\"module.exports\"]),\n  ];\n\n  for (const candidate of candidates) {\n    if (isDefinedFlow(candidate)) {\n      return candidate;\n    }\n  }\n\n  return null;\n}\n\nfunction getNestedDefault(value: unknown): unknown {\n  if (!value || typeof value !== \"object\" || !(\"default\" in value)) {\n    return null;\n  }\n  return (value as { default?: unknown }).default ?? null;\n}\n\nfunction parseJsonInput(raw: string, label: string): unknown {\n  try {\n    return JSON.parse(raw);\n  } catch (error) {\n    throw new InvalidArgumentError(\n      `${label} must contain valid JSON: ${error instanceof Error ? error.message : String(error)}`,\n    );\n  }\n}\n\nfunction printFlowRunResult(\n  result: Awaited<ReturnType<FlowRunner[\"run\"]>>,\n  globalFlags: GlobalFlags,\n): void {\n  const payload = {\n    action: \"flow_run_result\",\n    runId: result.state.runId,\n    flowName: result.state.flowName,\n    runTitle: result.state.runTitle,\n    flowPath: result.state.flowPath,\n    status: result.state.status,\n    currentNode: result.state.currentNode,\n    currentNodeType: result.state.currentNodeType,\n    currentNodeStartedAt: result.state.currentNodeStartedAt,\n    lastHeartbeatAt: result.state.lastHeartbeatAt,\n    statusDetail: result.state.statusDetail,\n    waitingOn: result.state.waitingOn,\n    runDir: result.runDir,\n    outputs: result.state.outputs,\n    sessionBindings: result.state.sessionBindings,\n  };\n\n  if (globalFlags.format === \"json\") {\n    process.stdout.write(`${JSON.stringify(payload)}\\n`);\n    return;\n  }\n\n  if (globalFlags.format === \"quiet\") {\n    process.stdout.write(`${result.state.runId}\\n`);\n    return;\n  }\n\n  process.stdout.write(`runId: ${payload.runId}\\n`);\n  process.stdout.write(`flow: ${payload.flowName}\\n`);\n  if (payload.runTitle) {\n    process.stdout.write(`title: ${payload.runTitle}\\n`);\n  }\n  process.stdout.write(`status: ${payload.status}\\n`);\n  process.stdout.write(`runDir: ${payload.runDir}\\n`);\n  if (payload.currentNode) {\n    process.stdout.write(`currentNode: ${payload.currentNode}\\n`);\n  }\n  if (payload.statusDetail) {\n    process.stdout.write(`statusDetail: ${payload.statusDetail}\\n`);\n  }\n  if (payload.waitingOn) {\n    process.stdout.write(`waitingOn: ${payload.waitingOn}\\n`);\n  }\n  process.stdout.write(`${JSON.stringify(payload.outputs, null, 2)}\\n`);\n}\n"],"mappings":"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"}

package/dist/cli.d.ts

@@ -1,4 +1,4 @@
-import { s as SessionRecord } from "./types-yxf-gcOE.js";
+import { s as SessionRecord } from "./types-CVBeQyi3.js";
 import { Command } from "commander";
 
 //#region src/cli/flags.d.ts

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","names":[],"sources":["../src/cli/flags.ts","../src/cli/output/render.ts"],"mappings":";;;;iBAyGgB,eAAA,CAAgB,KAAA;AAAA,iBAgChB,iBAAA,CAAkB,KAAA;AAAA,iBAgBlB,aAAA,CAAc,KAAA;;;KCvIzB,uBAAA;AAAA,iBA0IW,6BAAA,CACd,MAAA,EAAQ,aAAA,EACR,UAAA,UACA,gBAAA,GAAkB,uBAAA"}
+{"version":3,"file":"cli.d.ts","names":[],"sources":["../src/cli/flags.ts","../src/cli/output/render.ts"],"mappings":";;;;iBAmHgB,eAAA,CAAgB,KAAA;AAAA,iBAkDhB,iBAAA,CAAkB,KAAA;AAAA,iBAgBlB,aAAA,CAAc,KAAA;;;KCnKzB,uBAAA;AAAA,iBA0IW,6BAAA,CACd,MAAA,EAAQ,aAAA,EACR,UAAA,UACA,gBAAA,GAAkB,uBAAA"}

package/dist/cli.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
-import { T as EXIT_CODES, _ as exitCodeForOutputErrorCode, d as PromptInputValidationError, g as textPrompt, k as OUTPUT_FORMATS, m as parsePromptSource, p as mergePromptSourceWithText, x as normalizeOutputError } from "./perf-metrics-D0um6IR6.js";
-import { C as findGitRepositoryRoot, G as DEFAULT_AGENT_NAME, K as listBuiltInAgents, T as findSessionByDirectoryWalk, V as InterruptedError, q as normalizeAgentName, w as findSession } from "./prompt-turn-CXMtXBl-.js";
-import { a as buildQueueOwnerArgOverride, n as runSessionQueueOwner, o as flushPerfMetricsCapture, s as installPerfMetricsCapture } from "./session-BtwAKtJ3.js";
-import { s as probeQueueOwnerHealth } from "./ipc-BM335WFg.js";
-import { c as parseMaxTurns, d as parseTtlSeconds, f as resolveAgentInvocation, g as resolveSessionNameFromFlags, h as resolvePermissionMode, i as addSessionOption, l as parseNonEmptyValue, m as resolveOutputPolicy, n as addPromptInputOption, o as parseAllowedTools, p as resolveGlobalFlags, r as addSessionNameOption, s as parseHistoryLimit, t as addGlobalFlags, u as parseSessionName } from "./flags-ceSqz2T6.js";
-import { i as emitJsonResult, n as formatPromptSessionBannerLine, t as agentSessionIdPayload } from "./render-Br-kVPK_.js";
-import { t as createOutputFormatter } from "./output-C4QhjpM6.js";
+import { A as OUTPUT_FORMATS, E as EXIT_CODES, _ as exitCodeForOutputErrorCode, d as PromptInputValidationError, g as textPrompt, m as parsePromptSource, p as mergePromptSourceWithText, x as normalizeOutputError } from "./perf-metrics-C2pXfxvR.js";
+import { D as findSession, E as findGitRepositoryRoot, G as InterruptedError, O as findSessionByDirectoryWalk, X as listBuiltInAgents, Y as DEFAULT_AGENT_NAME, Z as normalizeAgentName } from "./prompt-turn-BY5SwU1F.js";
+import { a as buildQueueOwnerArgOverride, n as runSessionQueueOwner, o as flushPerfMetricsCapture, s as installPerfMetricsCapture } from "./session-BwgaPK8-.js";
+import { s as probeQueueOwnerHealth } from "./ipc-BruTG5Fb.js";
+import { _ as resolvePermissionMode, c as parseHistoryLimit, d as parsePruneBeforeDate, f as parseSessionName, g as resolveOutputPolicy, h as resolveGlobalFlags, i as addSessionOption, l as parseMaxTurns, m as resolveAgentInvocation, n as addPromptInputOption, o as parseAllowedTools, p as parseTtlSeconds, r as addSessionNameOption, s as parseDaysOlderThan, t as addGlobalFlags, u as parseNonEmptyValue, v as resolveSessionNameFromFlags } from "./flags-yXzUm7Aq.js";
+import { i as emitJsonResult, n as formatPromptSessionBannerLine, t as agentSessionIdPayload } from "./render-yqwtaOX4.js";
+import { n as getTextErrorRemediationHints, t as createOutputFormatter } from "./output-DmHvT8vm.js";
 import { readFileSync, realpathSync } from "node:fs";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import path from "node:path";
@@ -69,15 +69,15 @@ let sessionModulePromise;
 let outputModulePromise;
 let outputRenderModulePromise;
 function loadSessionModule() {
-	sessionModulePromise ??= import("./session-BtwAKtJ3.js").then((n) => n.t);
+	sessionModulePromise ??= import("./session-BwgaPK8-.js").then((n) => n.t);
 	return sessionModulePromise;
 }
 function loadOutputModule() {
-	outputModulePromise ??= import("./output-C4QhjpM6.js").then((n) => n.n);
+	outputModulePromise ??= import("./output-DmHvT8vm.js").then((n) => n.r);
 	return outputModulePromise;
 }
 function loadOutputRenderModule() {
-	outputRenderModulePromise ??= import("./render-Br-kVPK_.js").then((n) => n.r);
+	outputRenderModulePromise ??= import("./render-yqwtaOX4.js").then((n) => n.r);
 	return outputRenderModulePromise;
 }
 async function readPromptInputFromStdin() {
@@ -118,6 +118,44 @@ function resolveRequestedOutputPolicy(globalFlags) {
 		suppressReads: globalFlags.suppressReads === true
 	};
 }
+function sessionOptionsFromGlobalFlags(globalFlags) {
+	return {
+		model: globalFlags.model,
+		allowedTools: globalFlags.allowedTools,
+		maxTurns: globalFlags.maxTurns,
+		systemPrompt: globalFlags.systemPrompt
+	};
+}
+function buildSessionStartOptions(params) {
+	return {
+		agentCommand: params.agent.agentCommand,
+		cwd: params.agent.cwd,
+		name: params.flags.name,
+		resumeSessionId: params.flags.resumeSession,
+		mcpServers: params.config.mcpServers,
+		permissionMode: params.permissionMode,
+		nonInteractivePermissions: params.globalFlags.nonInteractivePermissions,
+		authCredentials: params.config.auth,
+		authPolicy: params.globalFlags.authPolicy,
+		terminal: params.globalFlags.terminal,
+		timeoutMs: params.globalFlags.timeout,
+		verbose: params.globalFlags.verbose,
+		sessionOptions: sessionOptionsFromGlobalFlags(params.globalFlags)
+	};
+}
+function missingScopedSessionMessage(agent, sessionName) {
+	return sessionName ? `No named session "${sessionName}" for cwd ${agent.cwd} and agent ${agent.agentName}` : `No cwd session for ${agent.cwd} and agent ${agent.agentName}`;
+}
+async function findScopedSessionOrThrow(agent, sessionName) {
+	const record = await findSession({
+		agentCommand: agent.agentCommand,
+		cwd: agent.cwd,
+		name: sessionName,
+		includeClosed: true
+	});
+	if (!record) throw new Error(missingScopedSessionMessage(agent, sessionName));
+	return record;
+}
 async function findRoutedSessionOrThrow(agentCommand, agentName, cwd, sessionName) {
 	const walkBoundary = findGitRepositoryRoot(cwd) ?? cwd;
 	const record = await findSessionByDirectoryWalk({
@@ -154,6 +192,7 @@ async function handlePrompt(explicitAgentName, promptParts, flags, command, conf
 		nonInteractivePermissions: globalFlags.nonInteractivePermissions,
 		authCredentials: config.auth,
 		authPolicy: globalFlags.authPolicy,
+		terminal: globalFlags.terminal,
 		outputFormatter,
 		errorEmissionPolicy: { queueErrorAlreadyEmitted: outputPolicy.queueErrorAlreadyEmitted },
 		suppressSdkConsoleErrors: outputPolicy.suppressSdkConsoleErrors,
@@ -162,7 +201,13 @@ async function handlePrompt(explicitAgentName, promptParts, flags, command, conf
 		maxQueueDepth: config.queueMaxDepth,
 		promptRetries: globalFlags.promptRetries,
 		verbose: globalFlags.verbose,
-		waitForCompletion: flags.wait !== false
+		waitForCompletion: flags.wait !== false,
+		sessionOptions: {
+			model: globalFlags.model,
+			allowedTools: globalFlags.allowedTools,
+			maxTurns: globalFlags.maxTurns,
+			systemPrompt: globalFlags.systemPrompt
+		}
 	});
 	if ("queued" in result) {
 		printQueuedPromptByFormat(result, outputPolicy.format);
@@ -201,6 +246,7 @@ async function handleExec(explicitAgentName, promptParts, flags, command, config
 		nonInteractivePermissions: globalFlags.nonInteractivePermissions,
 		authCredentials: config.auth,
 		authPolicy: globalFlags.authPolicy,
+		terminal: globalFlags.terminal,
 		outputFormatter,
 		suppressSdkConsoleErrors: outputPolicy.suppressSdkConsoleErrors,
 		timeoutMs: globalFlags.timeout,
@@ -209,7 +255,8 @@ async function handleExec(explicitAgentName, promptParts, flags, command, config
 		sessionOptions: {
 			model: globalFlags.model,
 			allowedTools: globalFlags.allowedTools,
-			maxTurns: globalFlags.maxTurns
+			maxTurns: globalFlags.maxTurns,
+			systemPrompt: globalFlags.systemPrompt
 		}
 	}));
 }
@@ -290,6 +337,7 @@ async function handleSetMode(explicitAgentName, modeId, flags, command, config)
 		nonInteractivePermissions: globalFlags.nonInteractivePermissions,
 		authCredentials: config.auth,
 		authPolicy: globalFlags.authPolicy,
+		terminal: globalFlags.terminal,
 		timeoutMs: globalFlags.timeout,
 		verbose: globalFlags.verbose
 	});
@@ -307,6 +355,7 @@ async function handleSetModel(explicitAgentName, modelId, flags, command, config
 		nonInteractivePermissions: globalFlags.nonInteractivePermissions,
 		authCredentials: config.auth,
 		authPolicy: globalFlags.authPolicy,
+		terminal: globalFlags.terminal,
 		timeoutMs: globalFlags.timeout,
 		verbose: globalFlags.verbose
 	});
@@ -330,6 +379,7 @@ async function handleSetConfigOption(explicitAgentName, configId, value, flags,
 		nonInteractivePermissions: globalFlags.nonInteractivePermissions,
 		authCredentials: config.auth,
 		authPolicy: globalFlags.authPolicy,
+		terminal: globalFlags.terminal,
 		timeoutMs: globalFlags.timeout,
 		verbose: globalFlags.verbose
 	});
@@ -351,7 +401,7 @@ async function handleSessionsClose(explicitAgentName, sessionName, command, conf
 		cwd: agent.cwd,
 		name: sessionName
 	});
-	if (!record) throw new Error(sessionName ? `No named session "${sessionName}" for cwd ${agent.cwd} and agent ${agent.agentName}` : `No cwd session for ${agent.cwd} and agent ${agent.agentName}`);
+	if (!record) throw new Error(missingScopedSessionMessage(agent, sessionName));
 	printClosedSessionByFormat(await closeSession(record.acpxRecordId), globalFlags.format);
 }
 async function handleSessionsNew(explicitAgentName, flags, command, config) {
@@ -368,24 +418,13 @@ async function handleSessionsNew(explicitAgentName, flags, command, config) {
 		await closeSession(replaced.acpxRecordId);
 		if (globalFlags.verbose) process.stderr.write(`[acpx] soft-closed prior session: ${replaced.acpxRecordId}\n`);
 	}
-	const created = await createSession({
-		agentCommand: agent.agentCommand,
-		cwd: agent.cwd,
-		name: flags.name,
-		resumeSessionId: flags.resumeSession,
-		mcpServers: config.mcpServers,
-		permissionMode,
-		nonInteractivePermissions: globalFlags.nonInteractivePermissions,
-		authCredentials: config.auth,
-		authPolicy: globalFlags.authPolicy,
-		timeoutMs: globalFlags.timeout,
-		verbose: globalFlags.verbose,
-		sessionOptions: {
-			model: globalFlags.model,
-			allowedTools: globalFlags.allowedTools,
-			maxTurns: globalFlags.maxTurns
-		}
-	});
+	const created = await createSession(buildSessionStartOptions({
+		agent,
+		flags,
+		globalFlags,
+		config,
+		permissionMode
+	}));
 	printCreatedSessionBanner(created, agent.agentName, globalFlags.format, globalFlags.jsonStrict);
 	if (globalFlags.verbose) {
 		const scope = flags.name ? `named session "${flags.name}"` : "cwd session";
@@ -398,24 +437,13 @@ async function handleSessionsEnsure(explicitAgentName, flags, command, config) {
 	const permissionMode = resolvePermissionMode(globalFlags, config.defaultPermissions);
 	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
 	const [{ ensureSession }, { printCreatedSessionBanner, printEnsuredSessionByFormat }] = await Promise.all([loadSessionModule(), loadOutputRenderModule()]);
-	const result = await ensureSession({
-		agentCommand: agent.agentCommand,
-		cwd: agent.cwd,
-		name: flags.name,
-		resumeSessionId: flags.resumeSession,
-		mcpServers: config.mcpServers,
-		permissionMode,
-		nonInteractivePermissions: globalFlags.nonInteractivePermissions,
-		authCredentials: config.auth,
-		authPolicy: globalFlags.authPolicy,
-		timeoutMs: globalFlags.timeout,
-		verbose: globalFlags.verbose,
-		sessionOptions: {
-			model: globalFlags.model,
-			allowedTools: globalFlags.allowedTools,
-			maxTurns: globalFlags.maxTurns
-		}
-	});
+	const result = await ensureSession(buildSessionStartOptions({
+		agent,
+		flags,
+		globalFlags,
+		config,
+		permissionMode
+	}));
 	if (result.created) printCreatedSessionBanner(result.record, agent.agentName, globalFlags.format, globalFlags.jsonStrict);
 	printEnsuredSessionByFormat(result.record, result.created, globalFlags.format);
 }
@@ -512,27 +540,24 @@ function printSessionHistoryByFormat(record, limit, format) {
 }
 async function handleSessionsShow(explicitAgentName, sessionName, command, config) {
 	const globalFlags = resolveGlobalFlags(command, config);
-	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
-	const record = await findSession({
-		agentCommand: agent.agentCommand,
-		cwd: agent.cwd,
-		name: sessionName,
-		includeClosed: true
-	});
-	if (!record) throw new Error(sessionName ? `No named session "${sessionName}" for cwd ${agent.cwd} and agent ${agent.agentName}` : `No cwd session for ${agent.cwd} and agent ${agent.agentName}`);
-	printSessionDetailsByFormat(record, globalFlags.format);
+	printSessionDetailsByFormat(await findScopedSessionOrThrow(resolveAgentInvocation(explicitAgentName, globalFlags, config), sessionName), globalFlags.format);
 }
 async function handleSessionsHistory(explicitAgentName, sessionName, flags, command, config) {
+	const globalFlags = resolveGlobalFlags(command, config);
+	printSessionHistoryByFormat(await findScopedSessionOrThrow(resolveAgentInvocation(explicitAgentName, globalFlags, config), sessionName), flags.limit, globalFlags.format);
+}
+async function handleSessionsPrune(explicitAgentName, flags, command, config) {
 	const globalFlags = resolveGlobalFlags(command, config);
 	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
-	const record = await findSession({
+	const [{ pruneSessions }, { printPruneResultByFormat }] = await Promise.all([loadSessionModule(), loadOutputRenderModule()]);
+	const olderThanMs = flags.olderThan != null ? flags.olderThan * 24 * 60 * 60 * 1e3 : void 0;
+	printPruneResultByFormat(await pruneSessions({
 		agentCommand: agent.agentCommand,
-		cwd: agent.cwd,
-		name: sessionName,
-		includeClosed: true
-	});
-	if (!record) throw new Error(sessionName ? `No named session "${sessionName}" for cwd ${agent.cwd} and agent ${agent.agentName}` : `No cwd session for ${agent.cwd} and agent ${agent.agentName}`);
-	printSessionHistoryByFormat(record, flags.limit, globalFlags.format);
+		before: flags.before,
+		olderThanMs,
+		includeHistory: flags.includeHistory,
+		dryRun: flags.dryRun
+	}), globalFlags.format);
 }
 //#endregion
 //#region src/mcp-servers.ts
@@ -715,10 +740,22 @@ function parseAgents(value, sourcePath) {
 		if (!isObject(raw)) throw new Error(`Invalid config agents.${name} in ${sourcePath}: expected object with command`);
 		const command = raw.command;
 		if (typeof command !== "string" || command.trim().length === 0) throw new Error(`Invalid config agents.${name}.command in ${sourcePath}: expected non-empty string`);
-		parsed[normalizeAgentName(name)] = command.trim();
+		const args = parseAgentArgs(raw.args, name, sourcePath);
+		parsed[normalizeAgentName(name)] = args.length > 0 ? `${command.trim()} ${args.map(quoteCommandArg).join(" ")}` : command.trim();
 	}
 	return parsed;
 }
+function parseAgentArgs(value, agentName, sourcePath) {
+	if (value == null) return [];
+	if (!Array.isArray(value)) throw new Error(`Invalid config agents.${agentName}.args in ${sourcePath}: expected array of strings`);
+	return value.map((arg, index) => {
+		if (typeof arg !== "string") throw new Error(`Invalid config agents.${agentName}.args[${index}] in ${sourcePath}: expected string`);
+		return arg;
+	});
+}
+function quoteCommandArg(value) {
+	return JSON.stringify(value);
+}
 function parseAuth(value, sourcePath) {
 	if (value == null) return;
 	if (!isObject(value)) throw new Error(`Invalid config auth in ${sourcePath}: expected object`);
@@ -922,6 +959,20 @@ function formatUptime(startedAt) {
 	const remSeconds = seconds % 60;
 	return `${hours.toString().padStart(2, "0")}:${minutes.toString().padStart(2, "0")}:${remSeconds.toString().padStart(2, "0")}`;
 }
+function resolveStatusState(record, health) {
+	if (health.healthy) return "running";
+	if (health.hasLease) return "dead";
+	if (record.lastAgentExitSignal || (record.lastAgentExitCode ?? 0) !== 0) return "dead";
+	return "idle";
+}
+function statusSummary(state) {
+	switch (state) {
+		case "running": return "queue owner healthy";
+		case "idle": return "session idle; queue owner will start on next prompt";
+		case "dead": return "queue owner unavailable";
+	}
+	return "queue owner unavailable";
+}
 async function handleStatus(explicitAgentName, flags, command, config) {
 	const globalFlags = resolveGlobalFlags(command, config);
 	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
@@ -951,12 +1002,14 @@ async function handleStatus(explicitAgentName, flags, command, config) {
 		return;
 	}
 	const health = await probeQueueOwnerHealth(record.acpxRecordId);
-	const running = health.healthy;
+	const statusState = resolveStatusState(record, health);
+	const running = statusState === "running";
+	const dead = statusState === "dead";
 	const payload = {
 		sessionId: record.acpxRecordId,
 		agentCommand: record.agentCommand,
 		pid: health.pid ?? record.pid ?? null,
-		status: running ? "running" : "dead",
+		status: statusState,
 		model: record.acpx?.current_model_id ?? null,
 		mode: record.acpx?.current_mode_id ?? null,
 		availableModels: record.acpx?.available_models ?? null,
@@ -968,16 +1021,16 @@ async function handleStatus(explicitAgentName, flags, command, config) {
 	};
 	if (emitJsonResult(globalFlags.format, {
 		action: "status_snapshot",
-		status: running ? "alive" : "dead",
+		status: running ? "alive" : statusState,
 		pid: payload.pid ?? void 0,
-		summary: running ? "queue owner healthy" : "queue owner unavailable",
+		summary: statusSummary(statusState),
 		model: payload.model ?? void 0,
 		mode: payload.mode ?? void 0,
 		availableModels: payload.availableModels ?? void 0,
 		uptime: payload.uptime ?? void 0,
 		lastPromptTime: payload.lastPromptTime ?? void 0,
-		exitCode: payload.exitCode ?? void 0,
-		signal: payload.signal ?? void 0,
+		exitCode: dead ? payload.exitCode ?? void 0 : void 0,
+		signal: dead ? payload.signal ?? void 0 : void 0,
 		acpxRecordId: record.acpxRecordId,
 		acpxSessionId: record.acpSessionId,
 		agentSessionId: record.agentSessionId
@@ -995,7 +1048,7 @@ async function handleStatus(explicitAgentName, flags, command, config) {
 	process.stdout.write(`mode: ${payload.mode ?? "-"}\n`);
 	process.stdout.write(`uptime: ${payload.uptime ?? "-"}\n`);
 	process.stdout.write(`lastPromptTime: ${payload.lastPromptTime ?? "-"}\n`);
-	if (payload.status === "dead") {
+	if (dead) {
 		process.stdout.write(`exitCode: ${payload.exitCode ?? "-"}\n`);
 		process.stdout.write(`signal: ${payload.signal ?? "-"}\n`);
 	}
@@ -1035,6 +1088,9 @@ function registerSessionsCommand(parent, explicitAgentName, config) {
 	sessionsCommand.command("read").description("Read full session history").argument("[name]", "Session name", parseSessionName).option("--tail <count>", "Show only the last N entries instead of all history", parseHistoryLimit).action(async function(name, flags) {
 		await handleSessionsHistory(explicitAgentName, name, { limit: flags.tail ?? 0 }, this, config);
 	});
+	sessionsCommand.command("prune").description("Delete closed sessions and free disk space").option("--dry-run", "Preview what would be pruned without deleting anything").option("--before <date>", "Prune sessions closed before this date", parsePruneBeforeDate).option("--older-than <days>", "Prune sessions closed more than N days ago", parseDaysOlderThan).option("--include-history", "Also delete event stream files (.stream.ndjson)").action(async function(flags) {
+		await handleSessionsPrune(explicitAgentName, flags, this, config);
+	});
 }
 function registerSharedAgentSubcommands(parent, explicitAgentName, config, descriptions) {
 	const promptCommand = parent.command("prompt").description(descriptions.prompt).argument("[prompt...]", "Prompt text").showHelpAfterError();
@@ -1084,7 +1140,7 @@ function registerAgentCommand(program, agentName, config) {
 }
 function registerFlowCommand(program, config) {
 	program.command("flow").description("Run multi-step ACP workflows from flow files").command("run").description("Run a flow file").argument("<file>", "Flow module path").option("--input-json <json>", "Flow input as JSON").option("--input-file <path>", "Read flow input JSON from file").option("--default-agent <name>", "Default agent profile for ACP nodes without profile", (value) => parseNonEmptyValue("Default agent", value)).action(async function(file, flags) {
-		const { handleFlowRun } = await import("./cli-ChWsO-bb.js");
+		const { handleFlowRun } = await import("./cli-Ddxpnz9X.js");
 		await handleFlowRun(file, flags, this, config);
 	});
 }
@@ -1124,11 +1180,24 @@ function parseQueueOwnerPayload(raw) {
 		options.authCredentials = Object.fromEntries(entries);
 	}
 	if (record.authPolicy === "skip" || record.authPolicy === "fail") options.authPolicy = record.authPolicy;
+	if (typeof record.terminal === "boolean") options.terminal = record.terminal;
 	if (typeof record.suppressSdkConsoleErrors === "boolean") options.suppressSdkConsoleErrors = record.suppressSdkConsoleErrors;
 	if (typeof record.verbose === "boolean") options.verbose = record.verbose;
 	if (typeof record.ttlMs === "number" && Number.isFinite(record.ttlMs)) options.ttlMs = record.ttlMs;
 	if (typeof record.maxQueueDepth === "number" && Number.isFinite(record.maxQueueDepth)) options.maxQueueDepth = Math.max(1, Math.round(record.maxQueueDepth));
 	if (typeof record.promptRetries === "number" && Number.isFinite(record.promptRetries)) options.promptRetries = Math.max(0, Math.round(record.promptRetries));
+	const sessionOpts = asRecord(record.sessionOptions);
+	if (sessionOpts) {
+		options.sessionOptions = {};
+		if (typeof sessionOpts.model === "string" && sessionOpts.model.trim().length > 0) options.sessionOptions.model = sessionOpts.model;
+		if (Array.isArray(sessionOpts.allowedTools)) options.sessionOptions.allowedTools = sessionOpts.allowedTools.filter((tool) => typeof tool === "string");
+		if (typeof sessionOpts.maxTurns === "number" && Number.isFinite(sessionOpts.maxTurns)) options.sessionOptions.maxTurns = Math.max(1, Math.round(sessionOpts.maxTurns));
+		if (typeof sessionOpts.systemPrompt === "string") options.sessionOptions.systemPrompt = sessionOpts.systemPrompt;
+		else {
+			const systemPrompt = asRecord(sessionOpts.systemPrompt);
+			if (typeof systemPrompt?.append === "string") options.sessionOptions.systemPrompt = { append: systemPrompt.append };
+		}
+	}
 	return options;
 }
 async function runQueueOwnerFromEnv(env) {
@@ -1287,7 +1356,10 @@ async function emitRequestedError(error, normalized, outputPolicy) {
 		await emitJsonErrorEvent(normalized);
 		return;
 	}
-	if (!outputPolicy.suppressNonJsonStderr) process.stderr.write(`${normalized.message}\n`);
+	if (!outputPolicy.suppressNonJsonStderr) {
+		process.stderr.write(`${normalized.message}\n`);
+		if (outputPolicy.format === "text") for (const hint of getTextErrorRemediationHints(normalized)) process.stderr.write(`${hint}\n`);
+	}
 }
 async function runWithOutputPolicy(_outputPolicy, run) {
 	return await run();