acpx 0.3.1 → 0.4.0

package/dist/cli.js

@@ -1,186 +1,14 @@
 #!/usr/bin/env node
-import { A as OUTPUT_FORMATS, C as exitCodeForOutputErrorCode, D as AUTH_POLICIES, E as normalizeOutputError, I as textPrompt, M as PromptInputValidationError, N as mergePromptSourceWithText, O as EXIT_CODES, P as parsePromptSource, k as NON_INTERACTIVE_PERMISSION_POLICIES } from "./queue-ipc-EQLpBMKv.js";
-import { a as findGitRepositoryRoot, c as flushPerfMetricsCapture, l as installPerfMetricsCapture, o as findSession, r as runSessionQueueOwner, s as findSessionByDirectoryWalk, u as InterruptedError } from "./session-C2Q8ktsN.js";
-import { t as formatPromptSessionBannerLine } from "./output-render-DEAaMxg8.js";
+import { _ as DEFAULT_AGENT_NAME, 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, v as listBuiltInAgents, y as normalizeAgentName } from "./flags-BkWInxAq.js";
+import { A as OUTPUT_FORMATS, E as normalizeOutputError, F as mergePromptSourceWithText, I as parsePromptSource, O as EXIT_CODES, P as PromptInputValidationError, R as textPrompt, S as exitCodeForOutputErrorCode, s as probeQueueOwnerHealth } from "./queue-ipc-CgWf63GN.js";
+import { S as InterruptedError, b as flushPerfMetricsCapture, c as buildQueueOwnerArgOverride, d as findSession, f as findSessionByDirectoryWalk, o as runSessionQueueOwner, u as findGitRepositoryRoot, x as installPerfMetricsCapture } from "./session-BtpTC2pM.js";
+import { i as emitJsonResult, n as formatPromptSessionBannerLine, t as agentSessionIdPayload } from "./output-render-C7w9NZ2H.js";
 import { readFileSync, realpathSync } from "node:fs";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import fs$1 from "node:fs/promises";
 import path from "node:path";
 import { Command, CommanderError, InvalidArgumentError } from "commander";
 import os from "node:os";
-//#region src/agent-registry.ts
-const ACP_ADAPTER_PACKAGE_RANGES = {
-	pi: "^0.0.22",
-	codex: "^0.9.5",
-	claude: "^0.21.0"
-};
-const AGENT_REGISTRY = {
-	pi: `npx pi-acp@${ACP_ADAPTER_PACKAGE_RANGES.pi}`,
-	openclaw: "openclaw acp",
-	codex: `npx @zed-industries/codex-acp@${ACP_ADAPTER_PACKAGE_RANGES.codex}`,
-	claude: `npx -y @zed-industries/claude-agent-acp@${ACP_ADAPTER_PACKAGE_RANGES.claude}`,
-	gemini: "gemini --acp",
-	cursor: "cursor-agent acp",
-	copilot: "copilot --acp --stdio",
-	droid: "droid exec --output-format acp",
-	iflow: "iflow --experimental-acp",
-	kilocode: "npx -y @kilocode/cli acp",
-	kimi: "kimi acp",
-	kiro: "kiro-cli acp",
-	opencode: "npx -y opencode-ai acp",
-	qwen: "qwen --acp"
-};
-const AGENT_ALIASES = {
-	"factory-droid": "droid",
-	factorydroid: "droid"
-};
-const DEFAULT_AGENT_NAME = "codex";
-function normalizeAgentName(value) {
-	return value.trim().toLowerCase();
-}
-function mergeAgentRegistry(overrides) {
-	if (!overrides) return { ...AGENT_REGISTRY };
-	const merged = { ...AGENT_REGISTRY };
-	for (const [name, command] of Object.entries(overrides)) {
-		const normalized = normalizeAgentName(name);
-		if (!normalized || !command.trim()) continue;
-		merged[normalized] = command.trim();
-	}
-	return merged;
-}
-function resolveAgentCommand(agentName, overrides) {
-	const normalized = normalizeAgentName(agentName);
-	const registry = mergeAgentRegistry(overrides);
-	return registry[normalized] ?? registry[AGENT_ALIASES[normalized] ?? normalized] ?? agentName;
-}
-function listBuiltInAgents(overrides) {
-	return Object.keys(mergeAgentRegistry(overrides));
-}
-//#endregion
-//#region src/cli/flags.ts
-function parseOutputFormat$1(value) {
-	if (!OUTPUT_FORMATS.includes(value)) throw new InvalidArgumentError(`Invalid format "${value}". Expected one of: ${OUTPUT_FORMATS.join(", ")}`);
-	return value;
-}
-function parseAuthPolicy$1(value) {
-	if (!AUTH_POLICIES.includes(value)) throw new InvalidArgumentError(`Invalid auth policy "${value}". Expected one of: ${AUTH_POLICIES.join(", ")}`);
-	return value;
-}
-function parseNonInteractivePermissionPolicy$1(value) {
-	if (!NON_INTERACTIVE_PERMISSION_POLICIES.includes(value)) throw new InvalidArgumentError(`Invalid non-interactive permission policy "${value}". Expected one of: ${NON_INTERACTIVE_PERMISSION_POLICIES.join(", ")}`);
-	return value;
-}
-function parseTimeoutSeconds(value) {
-	const parsed = Number(value);
-	if (!Number.isFinite(parsed) || parsed <= 0) throw new InvalidArgumentError("Timeout must be a positive number of seconds");
-	return Math.round(parsed * 1e3);
-}
-function parseTtlSeconds(value) {
-	const parsed = Number(value);
-	if (!Number.isFinite(parsed) || parsed < 0) throw new InvalidArgumentError("TTL must be a non-negative number of seconds");
-	return Math.round(parsed * 1e3);
-}
-function parseSessionName(value) {
-	const trimmed = value.trim();
-	if (trimmed.length === 0) throw new InvalidArgumentError("Session name must not be empty");
-	return trimmed;
-}
-function parseNonEmptyValue(label, value) {
-	const trimmed = value.trim();
-	if (trimmed.length === 0) throw new InvalidArgumentError(`${label} must not be empty`);
-	return trimmed;
-}
-function parseHistoryLimit(value) {
-	const parsed = Number(value);
-	if (!Number.isInteger(parsed) || parsed <= 0) throw new InvalidArgumentError("Limit must be a positive integer");
-	return parsed;
-}
-function parseAllowedTools(value) {
-	const trimmed = value.trim();
-	if (trimmed.length === 0) return [];
-	const items = trimmed.split(",").map((item) => item.trim());
-	if (items.some((item) => item.length === 0)) throw new InvalidArgumentError("Allowed tools must be a comma-separated list without empty entries");
-	return items;
-}
-function parseMaxTurns(value) {
-	const parsed = Number(value);
-	if (!Number.isInteger(parsed) || parsed <= 0) throw new InvalidArgumentError("Max turns must be a positive integer");
-	return parsed;
-}
-function resolvePermissionMode(flags, defaultMode) {
-	if ([
-		flags.approveAll,
-		flags.approveReads,
-		flags.denyAll
-	].filter(Boolean).length > 1) throw new InvalidArgumentError("Use only one permission mode: --approve-all, --approve-reads, or --deny-all");
-	if (flags.approveAll) return "approve-all";
-	if (flags.denyAll) return "deny-all";
-	return defaultMode;
-}
-function addGlobalFlags(command) {
-	return command.option("--agent <command>", "Raw ACP agent command (escape hatch)").option("--cwd <dir>", "Working directory", process.cwd()).option("--auth-policy <policy>", "Authentication policy: skip or fail when auth is required", parseAuthPolicy$1).option("--approve-all", "Auto-approve all permission requests").option("--approve-reads", "Auto-approve read/search requests and prompt for writes").option("--deny-all", "Deny all permission requests").option("--non-interactive-permissions <policy>", "When prompting is unavailable: deny or fail", parseNonInteractivePermissionPolicy$1).option("--format <fmt>", "Output format: text, json, quiet", parseOutputFormat$1).option("--model <id>", "Agent model id").option("--allowed-tools <list>", "Allowed tool names as a comma-separated list (use \"\" for no tools)", parseAllowedTools).option("--max-turns <count>", "Maximum turns for the session", parseMaxTurns).option("--json-strict", "Strict JSON mode: requires --format json and suppresses non-JSON stderr output").option("--timeout <seconds>", "Maximum time to wait for agent response", parseTimeoutSeconds).option("--ttl <seconds>", "Queue owner idle TTL before shutdown (0 = keep alive forever) (default: 300)", parseTtlSeconds).option("--verbose", "Enable verbose debug logs");
-}
-function addSessionOption(command) {
-	return command.option("-s, --session <name>", "Use named session instead of cwd default", parseSessionName).option("--no-wait", "Queue prompt and return immediately when another prompt is already running");
-}
-function addSessionNameOption(command) {
-	return command.option("-s, --session <name>", "Use named session instead of cwd default", parseSessionName);
-}
-function resolveSessionNameFromFlags(flags, command) {
-	if (flags.session) return flags.session;
-	const allOpts = command.optsWithGlobals?.();
-	if (allOpts && typeof allOpts.session === "string") return parseSessionName(allOpts.session);
-	const parentOpts = command.parent?.opts?.();
-	if (parentOpts && typeof parentOpts.session === "string") return parseSessionName(parentOpts.session);
-}
-function addPromptInputOption(command) {
-	return command.option("-f, --file <path>", "Read prompt text from file path (use - for stdin)");
-}
-function resolveGlobalFlags(command, config) {
-	const opts = command.optsWithGlobals();
-	const format = opts.format ?? config.format ?? "text";
-	const jsonStrict = opts.jsonStrict === true;
-	const verbose = opts.verbose === true;
-	if (jsonStrict && format !== "json") throw new InvalidArgumentError("--json-strict requires --format json");
-	if (jsonStrict && verbose) throw new InvalidArgumentError("--json-strict cannot be combined with --verbose");
-	return {
-		agent: opts.agent,
-		cwd: opts.cwd ?? process.cwd(),
-		authPolicy: opts.authPolicy ?? config.authPolicy,
-		nonInteractivePermissions: opts.nonInteractivePermissions ?? config.nonInteractivePermissions,
-		jsonStrict,
-		timeout: opts.timeout ?? config.timeoutMs,
-		ttl: opts.ttl ?? config.ttlMs ?? 3e5,
-		verbose,
-		format,
-		model: typeof opts.model === "string" ? parseNonEmptyValue("Model", opts.model) : void 0,
-		allowedTools: Array.isArray(opts.allowedTools) ? opts.allowedTools : void 0,
-		maxTurns: typeof opts.maxTurns === "number" ? opts.maxTurns : void 0,
-		approveAll: opts.approveAll ? true : void 0,
-		approveReads: opts.approveReads ? true : void 0,
-		denyAll: opts.denyAll ? true : void 0
-	};
-}
-function resolveOutputPolicy(format, jsonStrict) {
-	return {
-		format,
-		jsonStrict,
-		suppressNonJsonStderr: jsonStrict,
-		queueErrorAlreadyEmitted: format !== "quiet",
-		suppressSdkConsoleErrors: jsonStrict
-	};
-}
-function resolveAgentInvocation(explicitAgentName, globalFlags, config) {
-	const override = globalFlags.agent?.trim();
-	if (override && explicitAgentName) throw new InvalidArgumentError("Do not combine positional agent with --agent override");
-	const agentName = explicitAgentName ?? config.defaultAgent ?? "codex";
-	return {
-		agentName,
-		agentCommand: override && override.length > 0 ? override : resolveAgentCommand(agentName, config.agents),
-		cwd: path.resolve(globalFlags.cwd)
-	};
-}
-//#endregion
 //#region src/mcp-servers.ts
 function asRecord$1(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
@@ -503,6 +331,163 @@ async function initGlobalConfigFile() {
 	};
 }
 //#endregion
+//#region src/cli/config-command.ts
+async function handleConfigShow(command, config) {
+	const globalFlags = resolveGlobalFlags(command, config);
+	const payload = {
+		...toConfigDisplay(config),
+		paths: {
+			global: config.globalPath,
+			project: config.projectPath
+		},
+		loaded: {
+			global: config.hasGlobalConfig,
+			project: config.hasProjectConfig
+		}
+	};
+	if (globalFlags.format === "json") {
+		process.stdout.write(`${JSON.stringify(payload)}\n`);
+		return;
+	}
+	process.stdout.write(`${JSON.stringify(payload, null, 2)}\n`);
+}
+async function handleConfigInit(command, config) {
+	const globalFlags = resolveGlobalFlags(command, config);
+	const result = await initGlobalConfigFile();
+	if (globalFlags.format === "json") {
+		process.stdout.write(`${JSON.stringify({
+			path: result.path,
+			created: result.created
+		})}\n`);
+		return;
+	}
+	if (globalFlags.format === "quiet") {
+		process.stdout.write(`${result.path}\n`);
+		return;
+	}
+	if (result.created) {
+		process.stdout.write(`Created ${result.path}\n`);
+		return;
+	}
+	process.stdout.write(`Config already exists: ${result.path}\n`);
+}
+function registerConfigCommand(program, config) {
+	const configCommand = program.command("config").description("Inspect and initialize acpx configuration");
+	configCommand.command("show").description("Show resolved config").action(async function() {
+		await handleConfigShow(this, config);
+	});
+	configCommand.command("init").description("Create global config template").action(async function() {
+		await handleConfigInit(this, config);
+	});
+	configCommand.action(async function() {
+		await handleConfigShow(this, config);
+	});
+}
+//#endregion
+//#region src/cli/status-command.ts
+function formatUptime(startedAt) {
+	if (!startedAt) return;
+	const startedMs = Date.parse(startedAt);
+	if (!Number.isFinite(startedMs)) return;
+	const elapsedMs = Math.max(0, Date.now() - startedMs);
+	const seconds = Math.floor(elapsedMs / 1e3);
+	const hours = Math.floor(seconds / 3600);
+	const minutes = Math.floor(seconds % 3600 / 60);
+	const remSeconds = seconds % 60;
+	return `${hours.toString().padStart(2, "0")}:${minutes.toString().padStart(2, "0")}:${remSeconds.toString().padStart(2, "0")}`;
+}
+async function handleStatus(explicitAgentName, flags, command, config) {
+	const globalFlags = resolveGlobalFlags(command, config);
+	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
+	const record = await findSession({
+		agentCommand: agent.agentCommand,
+		cwd: agent.cwd,
+		name: resolveSessionNameFromFlags(flags, command)
+	});
+	if (!record) {
+		if (emitJsonResult(globalFlags.format, {
+			action: "status_snapshot",
+			status: "no-session",
+			summary: "no active session"
+		})) return;
+		if (globalFlags.format === "quiet") {
+			process.stdout.write("no-session\n");
+			return;
+		}
+		process.stdout.write("session: -\n");
+		process.stdout.write(`agent: ${agent.agentCommand}\n`);
+		process.stdout.write("pid: -\n");
+		process.stdout.write("status: no-session\n");
+		process.stdout.write("model: -\n");
+		process.stdout.write("mode: -\n");
+		process.stdout.write("uptime: -\n");
+		process.stdout.write("lastPromptTime: -\n");
+		return;
+	}
+	const health = await probeQueueOwnerHealth(record.acpxRecordId);
+	const running = health.healthy;
+	const payload = {
+		sessionId: record.acpxRecordId,
+		agentCommand: record.agentCommand,
+		pid: health.pid ?? record.pid ?? null,
+		status: running ? "running" : "dead",
+		model: record.acpx?.current_model_id ?? null,
+		mode: record.acpx?.current_mode_id ?? null,
+		availableModels: record.acpx?.available_models ?? null,
+		uptime: running ? formatUptime(record.agentStartedAt) ?? null : null,
+		lastPromptTime: record.lastPromptAt ?? null,
+		exitCode: running ? null : record.lastAgentExitCode ?? null,
+		signal: running ? null : record.lastAgentExitSignal ?? null,
+		...agentSessionIdPayload(record.agentSessionId)
+	};
+	if (emitJsonResult(globalFlags.format, {
+		action: "status_snapshot",
+		status: running ? "alive" : "dead",
+		pid: payload.pid ?? void 0,
+		summary: running ? "queue owner healthy" : "queue owner unavailable",
+		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,
+		acpxRecordId: record.acpxRecordId,
+		acpxSessionId: record.acpSessionId,
+		agentSessionId: record.agentSessionId
+	})) return;
+	if (globalFlags.format === "quiet") {
+		process.stdout.write(`${payload.status}\n`);
+		return;
+	}
+	process.stdout.write(`session: ${payload.sessionId}\n`);
+	if ("agentSessionId" in payload) process.stdout.write(`agentSessionId: ${payload.agentSessionId}\n`);
+	process.stdout.write(`agent: ${payload.agentCommand}\n`);
+	process.stdout.write(`pid: ${payload.pid ?? "-"}\n`);
+	process.stdout.write(`status: ${payload.status}\n`);
+	process.stdout.write(`model: ${payload.model ?? "-"}\n`);
+	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") {
+		process.stdout.write(`exitCode: ${payload.exitCode ?? "-"}\n`);
+		process.stdout.write(`signal: ${payload.signal ?? "-"}\n`);
+	}
+}
+function registerStatusCommand(parent, explicitAgentName, config, description) {
+	const statusCommand = parent.command("status").description(description);
+	addSessionNameOption(statusCommand);
+	statusCommand.action(async function(flags) {
+		await handleStatus(explicitAgentName, flags, this, config);
+	});
+}
+//#endregion
+//#region src/codex-compat.ts
+function isCodexInvocation(agentName, agentCommand) {
+	if (agentName === "codex") return true;
+	return /\bcodex-acp\b/u.test(agentCommand);
+}
+//#endregion
 //#region src/queue-owner-env.ts
 function asRecord(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
@@ -529,6 +514,7 @@ function parseQueueOwnerPayload(raw) {
 	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));
 	return options;
 }
 async function runQueueOwnerFromEnv(env) {
@@ -588,6 +574,7 @@ const TOP_LEVEL_VERBS = new Set([
 	"prompt",
 	"exec",
 	"cancel",
+	"flow",
 	"set-mode",
 	"set",
 	"sessions",
@@ -623,40 +610,32 @@ function applyPermissionExitCode(result) {
 	const deniedOrCancelled = stats.denied + stats.cancelled;
 	if (stats.requested > 0 && stats.approved === 0 && deniedOrCancelled > 0) process.exitCode = EXIT_CODES.PERMISSION_DENIED;
 }
-function emitJsonResult(format, payload) {
-	if (format !== "json") return false;
-	process.stdout.write(`${JSON.stringify(payload)}\n`);
-	return true;
-}
-function isCodexAgentInvocation(agent) {
-	if (agent.agentName === "codex") return true;
-	return /\bcodex-acp\b/.test(agent.agentCommand);
-}
 function resolveCompatibleConfigId(agent, configId) {
-	if (isCodexAgentInvocation(agent) && configId === "thought_level") return "reasoning_effort";
+	if (isCodexInvocation(agent.agentName, agent.agentCommand) && configId === "thought_level") return "reasoning_effort";
 	return configId;
 }
+function resolveRequestedOutputPolicy(globalFlags) {
+	return {
+		...resolveOutputPolicy(globalFlags.format, globalFlags.jsonStrict === true),
+		suppressReads: globalFlags.suppressReads === true
+	};
+}
 let sessionModulePromise;
 let outputModulePromise;
 let outputRenderModulePromise;
-let queueIpcModulePromise;
 let skillflagModulePromise;
 function loadSessionModule() {
-	sessionModulePromise ??= import("./session-C2Q8ktsN.js").then((n) => n.t);
+	sessionModulePromise ??= import("./session-BtpTC2pM.js").then((n) => n.t);
 	return sessionModulePromise;
 }
 function loadOutputModule() {
-	outputModulePromise ??= import("./output-BmkPP7qE.js");
+	outputModulePromise ??= import("./output-C58ukIo3.js").then((n) => n.n);
 	return outputModulePromise;
 }
 function loadOutputRenderModule() {
-	outputRenderModulePromise ??= import("./output-render-DEAaMxg8.js").then((n) => n.n);
+	outputRenderModulePromise ??= import("./output-render-C7w9NZ2H.js").then((n) => n.r);
 	return outputRenderModulePromise;
 }
-function loadQueueIpcModule() {
-	queueIpcModulePromise ??= import("./queue-ipc-EQLpBMKv.js").then((n) => n.r);
-	return queueIpcModulePromise;
-}
 function loadSkillflagModule() {
 	skillflagModulePromise ??= import("skillflag");
 	return skillflagModulePromise;
@@ -677,7 +656,7 @@ async function findRoutedSessionOrThrow(agentCommand, agentName, cwd, sessionNam
 }
 async function handlePrompt(explicitAgentName, promptParts, flags, command, config) {
 	const globalFlags = resolveGlobalFlags(command, config);
-	const outputPolicy = resolveOutputPolicy(globalFlags.format, globalFlags.jsonStrict === true);
+	const outputPolicy = resolveRequestedOutputPolicy(globalFlags);
 	const permissionMode = resolvePermissionMode(globalFlags, config.defaultPermissions);
 	const prompt = await readPrompt(promptParts, flags.file, globalFlags.cwd);
 	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
@@ -687,7 +666,10 @@ async function handlePrompt(explicitAgentName, promptParts, flags, command, conf
 		loadSessionModule()
 	]);
 	const record = await findRoutedSessionOrThrow(agent.agentCommand, agent.agentName, agent.cwd, flags.session);
-	const outputFormatter = createOutputFormatter(outputPolicy.format, { jsonContext: { sessionId: record.acpxRecordId } });
+	const outputFormatter = createOutputFormatter(outputPolicy.format, {
+		jsonContext: { sessionId: record.acpxRecordId },
+		suppressReads: outputPolicy.suppressReads
+	});
 	await printPromptSessionBanner(record, agent.cwd, outputPolicy.format, outputPolicy.jsonStrict);
 	const result = await sendSession({
 		sessionId: record.acpxRecordId,
@@ -703,6 +685,7 @@ async function handlePrompt(explicitAgentName, promptParts, flags, command, conf
 		timeoutMs: globalFlags.timeout,
 		ttlMs: globalFlags.ttl,
 		maxQueueDepth: config.queueMaxDepth,
+		promptRetries: globalFlags.promptRetries,
 		verbose: globalFlags.verbose,
 		waitForCompletion: flags.wait !== false
 	});
@@ -715,8 +698,7 @@ async function handlePrompt(explicitAgentName, promptParts, flags, command, conf
 }
 async function handleExec(explicitAgentName, promptParts, flags, command, config) {
 	if (config.disableExec) {
-		const globalFlags = resolveGlobalFlags(command, config);
-		if (resolveOutputPolicy(globalFlags.format, globalFlags.jsonStrict === true).format === "json") process.stdout.write(`${JSON.stringify({
+		if (resolveRequestedOutputPolicy(resolveGlobalFlags(command, config)).format === "json") process.stdout.write(`${JSON.stringify({
 			jsonrpc: "2.0",
 			error: {
 				code: -32603,
@@ -729,11 +711,11 @@ async function handleExec(explicitAgentName, promptParts, flags, command, config
 		return;
 	}
 	const globalFlags = resolveGlobalFlags(command, config);
-	const outputPolicy = resolveOutputPolicy(globalFlags.format, globalFlags.jsonStrict === true);
+	const outputPolicy = resolveRequestedOutputPolicy(globalFlags);
 	const permissionMode = resolvePermissionMode(globalFlags, config.defaultPermissions);
 	const prompt = await readPrompt(promptParts, flags.file, globalFlags.cwd);
 	const [{ createOutputFormatter }, { runOnce }] = await Promise.all([loadOutputModule(), loadSessionModule()]);
-	const outputFormatter = createOutputFormatter(outputPolicy.format);
+	const outputFormatter = createOutputFormatter(outputPolicy.format, { suppressReads: outputPolicy.suppressReads });
 	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
 	applyPermissionExitCode(await runOnce({
 		agentCommand: agent.agentCommand,
@@ -748,6 +730,7 @@ async function handleExec(explicitAgentName, promptParts, flags, command, config
 		suppressSdkConsoleErrors: outputPolicy.suppressSdkConsoleErrors,
 		timeoutMs: globalFlags.timeout,
 		verbose: globalFlags.verbose,
+		promptRetries: globalFlags.promptRetries,
 		sessionOptions: {
 			model: globalFlags.model,
 			allowedTools: globalFlags.allowedTools,
@@ -782,6 +765,21 @@ function printSetModeResultByFormat(modeId, result, format) {
 	}
 	process.stdout.write(`mode set: ${modeId}\n`);
 }
+function printSetModelResultByFormat(modelId, result, format) {
+	if (emitJsonResult(format, {
+		action: "model_set",
+		modelId,
+		resumed: result.resumed,
+		acpxRecordId: result.record.acpxRecordId,
+		acpxSessionId: result.record.acpSessionId,
+		agentSessionId: result.record.agentSessionId
+	})) return;
+	if (format === "quiet") {
+		process.stdout.write(`${modelId}\n`);
+		return;
+	}
+	process.stdout.write(`model set: ${modelId}\n`);
+}
 function printSetConfigOptionResultByFormat(configId, value, result, format) {
 	if (emitJsonResult(format, {
 		action: "config_set",
@@ -839,9 +837,30 @@ async function handleSetMode(explicitAgentName, modeId, flags, command, config)
 	if (globalFlags.verbose && result.loadError) process.stderr.write(`[acpx] loadSession failed, started fresh session: ${result.loadError}\n`);
 	printSetModeResultByFormat(modeId, result, globalFlags.format);
 }
+async function handleSetModel(explicitAgentName, modelId, flags, command, config) {
+	const globalFlags = resolveGlobalFlags(command, config);
+	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
+	const { setSessionModel } = await loadSessionModule();
+	const result = await setSessionModel({
+		sessionId: (await findRoutedSessionOrThrow(agent.agentCommand, agent.agentName, agent.cwd, resolveSessionNameFromFlags(flags, command))).acpxRecordId,
+		modelId,
+		mcpServers: config.mcpServers,
+		nonInteractivePermissions: globalFlags.nonInteractivePermissions,
+		authCredentials: config.auth,
+		authPolicy: globalFlags.authPolicy,
+		timeoutMs: globalFlags.timeout,
+		verbose: globalFlags.verbose
+	});
+	if (globalFlags.verbose && result.loadError) process.stderr.write(`[acpx] loadSession failed, started fresh session: ${result.loadError}\n`);
+	printSetModelResultByFormat(modelId, result, globalFlags.format);
+}
 async function handleSetConfigOption(explicitAgentName, configId, value, flags, command, config) {
 	const globalFlags = resolveGlobalFlags(command, config);
 	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
+	if (configId === "model") {
+		await handleSetModel(explicitAgentName, value, flags, command, config);
+		return;
+	}
 	const resolvedConfigId = resolveCompatibleConfigId(agent, configId);
 	const { setSessionConfigOption } = await loadSessionModule();
 	const result = await setSessionConfigOption({
@@ -1059,125 +1078,6 @@ async function handleSessionsHistory(explicitAgentName, sessionName, flags, comm
 	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);
 }
-function formatUptime(startedAt) {
-	if (!startedAt) return;
-	const startedMs = Date.parse(startedAt);
-	if (!Number.isFinite(startedMs)) return;
-	const elapsedMs = Math.max(0, Date.now() - startedMs);
-	const seconds = Math.floor(elapsedMs / 1e3);
-	const hours = Math.floor(seconds / 3600);
-	const minutes = Math.floor(seconds % 3600 / 60);
-	const remSeconds = seconds % 60;
-	return `${hours.toString().padStart(2, "0")}:${minutes.toString().padStart(2, "0")}:${remSeconds.toString().padStart(2, "0")}`;
-}
-async function handleStatus(explicitAgentName, flags, command, config) {
-	const globalFlags = resolveGlobalFlags(command, config);
-	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
-	const [{ probeQueueOwnerHealth }, { agentSessionIdPayload, emitJsonResult }] = await Promise.all([loadQueueIpcModule(), loadOutputRenderModule()]);
-	const record = await findSession({
-		agentCommand: agent.agentCommand,
-		cwd: agent.cwd,
-		name: resolveSessionNameFromFlags(flags, command)
-	});
-	if (!record) {
-		if (emitJsonResult(globalFlags.format, {
-			action: "status_snapshot",
-			status: "no-session",
-			summary: "no active session"
-		})) return;
-		if (globalFlags.format === "quiet") {
-			process.stdout.write("no-session\n");
-			return;
-		}
-		process.stdout.write(`session: -\n`);
-		process.stdout.write(`agent: ${agent.agentCommand}\n`);
-		process.stdout.write(`pid: -\n`);
-		process.stdout.write(`status: no-session\n`);
-		process.stdout.write(`uptime: -\n`);
-		process.stdout.write(`lastPromptTime: -\n`);
-		return;
-	}
-	const health = await probeQueueOwnerHealth(record.acpxRecordId);
-	const running = health.healthy;
-	const payload = {
-		sessionId: record.acpxRecordId,
-		agentCommand: record.agentCommand,
-		pid: health.pid ?? record.pid ?? null,
-		status: running ? "running" : "dead",
-		uptime: running ? formatUptime(record.agentStartedAt) ?? null : null,
-		lastPromptTime: record.lastPromptAt ?? null,
-		exitCode: running ? null : record.lastAgentExitCode ?? null,
-		signal: running ? null : record.lastAgentExitSignal ?? null,
-		...agentSessionIdPayload(record.agentSessionId)
-	};
-	if (emitJsonResult(globalFlags.format, {
-		action: "status_snapshot",
-		status: running ? "alive" : "dead",
-		pid: payload.pid ?? void 0,
-		summary: running ? "queue owner healthy" : "queue owner unavailable",
-		uptime: payload.uptime ?? void 0,
-		lastPromptTime: payload.lastPromptTime ?? void 0,
-		exitCode: payload.exitCode ?? void 0,
-		signal: payload.signal ?? void 0,
-		acpxRecordId: record.acpxRecordId,
-		acpxSessionId: record.acpSessionId,
-		agentSessionId: record.agentSessionId
-	})) return;
-	if (globalFlags.format === "quiet") {
-		process.stdout.write(`${payload.status}\n`);
-		return;
-	}
-	process.stdout.write(`session: ${payload.sessionId}\n`);
-	if ("agentSessionId" in payload) process.stdout.write(`agentSessionId: ${payload.agentSessionId}\n`);
-	process.stdout.write(`agent: ${payload.agentCommand}\n`);
-	process.stdout.write(`pid: ${payload.pid ?? "-"}\n`);
-	process.stdout.write(`status: ${payload.status}\n`);
-	process.stdout.write(`uptime: ${payload.uptime ?? "-"}\n`);
-	process.stdout.write(`lastPromptTime: ${payload.lastPromptTime ?? "-"}\n`);
-	if (payload.status === "dead") {
-		process.stdout.write(`exitCode: ${payload.exitCode ?? "-"}\n`);
-		process.stdout.write(`signal: ${payload.signal ?? "-"}\n`);
-	}
-}
-async function handleConfigShow(command, config) {
-	const globalFlags = resolveGlobalFlags(command, config);
-	const payload = {
-		...toConfigDisplay(config),
-		paths: {
-			global: config.globalPath,
-			project: config.projectPath
-		},
-		loaded: {
-			global: config.hasGlobalConfig,
-			project: config.hasProjectConfig
-		}
-	};
-	if (globalFlags.format === "json") {
-		process.stdout.write(`${JSON.stringify(payload)}\n`);
-		return;
-	}
-	process.stdout.write(`${JSON.stringify(payload, null, 2)}\n`);
-}
-async function handleConfigInit(command, config) {
-	const globalFlags = resolveGlobalFlags(command, config);
-	const result = await initGlobalConfigFile();
-	if (globalFlags.format === "json") {
-		process.stdout.write(`${JSON.stringify({
-			path: result.path,
-			created: result.created
-		})}\n`);
-		return;
-	}
-	if (globalFlags.format === "quiet") {
-		process.stdout.write(`${result.path}\n`);
-		return;
-	}
-	if (result.created) {
-		process.stdout.write(`Created ${result.path}\n`);
-		return;
-	}
-	process.stdout.write(`Config already exists: ${result.path}\n`);
-}
 function registerSessionsCommand(parent, explicitAgentName, config) {
 	const sessionsCommand = parent.command("sessions").description("List, ensure, create, or close sessions for this agent");
 	sessionsCommand.action(async function() {
@@ -1232,11 +1132,7 @@ function registerSharedAgentSubcommands(parent, explicitAgentName, config, descr
 	setConfigCommand.action(async function(key, value, flags) {
 		await handleSetConfigOption(explicitAgentName, key, value, flags, this, config);
 	});
-	const statusCommand = parent.command("status").description(descriptions.status);
-	addSessionNameOption(statusCommand);
-	statusCommand.action(async function(flags) {
-		await handleStatus(explicitAgentName, flags, this, config);
-	});
+	registerStatusCommand(parent, explicitAgentName, config, descriptions.status);
 }
 function registerAgentCommand(program, agentName, config) {
 	const agentCommand = program.command(agentName).description(`Use ${agentName} agent`).argument("[prompt...]", "Prompt text").enablePositionalOptions().passThroughOptions().showHelpAfterError();
@@ -1255,16 +1151,10 @@ function registerAgentCommand(program, agentName, config) {
 	});
 	registerSessionsCommand(agentCommand, agentName, config);
 }
-function registerConfigCommand(program, config) {
-	const configCommand = program.command("config").description("Inspect and initialize acpx configuration");
-	configCommand.command("show").description("Show resolved config").action(async function() {
-		await handleConfigShow(this, config);
-	});
-	configCommand.command("init").description("Create global config template").action(async function() {
-		await handleConfigInit(this, config);
-	});
-	configCommand.action(async function() {
-		await handleConfigShow(this, 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-5s-E-Y99.js");
+		await handleFlowRun(file, flags, this, config);
 	});
 }
 function registerDefaultCommands(program, config) {
@@ -1278,6 +1168,7 @@ function registerDefaultCommands(program, config) {
 	});
 	registerSessionsCommand(program, void 0, config);
 	registerConfigCommand(program, config);
+	registerFlowCommand(program, config);
 }
 function detectAgentToken(argv) {
 	let hasAgentOverride = false;
@@ -1353,7 +1244,10 @@ function detectJsonStrict(argv) {
 }
 async function emitJsonErrorEvent(error) {
 	const { createOutputFormatter } = await loadOutputModule();
-	const formatter = createOutputFormatter("json", { jsonContext: { sessionId: "unknown" } });
+	const formatter = createOutputFormatter("json", {
+		jsonContext: { sessionId: "unknown" },
+		suppressReads: false
+	});
 	formatter.onError(error);
 	formatter.flush();
 }
@@ -1395,7 +1289,10 @@ async function main(argv = process.argv) {
 	}
 	const config = await loadResolvedConfig(detectInitialCwd(argv.slice(2)));
 	const requestedJsonStrict = detectJsonStrict(argv.slice(2));
-	const requestedOutputPolicy = resolveOutputPolicy(detectRequestedOutputFormat(argv.slice(2), config.format), requestedJsonStrict);
+	const requestedOutputPolicy = {
+		...resolveOutputPolicy(detectRequestedOutputFormat(argv.slice(2), config.format), requestedJsonStrict),
+		suppressReads: argv.slice(2).some((token) => token === "--suppress-reads")
+	};
 	const builtInAgents = listBuiltInAgents(config.agents);
 	const program = new Command();
 	program.name("acpx").description("Headless CLI client for the Agent Client Protocol").version(getAcpxVersion()).enablePositionalOptions().showHelpAfterError();
@@ -1468,6 +1365,8 @@ Examples:
 }
 //#endregion
 //#region src/cli.ts
+const queueOwnerArgOverride = buildQueueOwnerArgOverride(fileURLToPath(import.meta.url));
+if (queueOwnerArgOverride) process.env.ACPX_QUEUE_OWNER_ARGS ??= queueOwnerArgOverride;
 function isCliEntrypoint(argv) {
 	const entry = argv[1];
 	if (!entry) return false;