acpx 0.4.1 → 0.5.0

package/dist/cli.js

@@ -1,1083 +1,1015 @@
 #!/usr/bin/env node
-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-CCcX9fZj.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-CE8_QGX3.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-RO_LZUnv.js";
-import { i as emitJsonResult, n as formatPromptSessionBannerLine, t as agentSessionIdPayload } from "./output-render-Bz58qaQn.js";
+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-D9QC81lB.js";
+import { n as listBuiltInAgents, r as normalizeAgentName, t as DEFAULT_AGENT_NAME } from "./agent-registry-DGw0-3Tc.js";
+import { C as findGitRepositoryRoot, T as findSessionByDirectoryWalk, V as InterruptedError, w as findSession } from "./prompt-turn-Bt8T3SRR.js";
+import { a as buildQueueOwnerArgOverride, n as runSessionQueueOwner, o as flushPerfMetricsCapture, s as installPerfMetricsCapture } from "./session-BbN0SBgf.js";
+import { s as probeQueueOwnerHealth } from "./ipc-DN6M4Ui9.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-BmubjvOw.js";
+import { i as emitJsonResult, n as formatPromptSessionBannerLine, t as agentSessionIdPayload } from "./render-BL5ynRkN.js";
+import { t as createOutputFormatter } from "./output-Di0M9Et8.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 fs$1 from "node:fs/promises";
 import os from "node:os";
-//#region src/mcp-servers.ts
-function asRecord$1(value) {
-	if (!value || typeof value !== "object" || Array.isArray(value)) return;
-	return value;
+//#region src/cli-public.ts
+function configurePublicCli(options) {
+	const builtInAgents = options.listBuiltInAgents(options.config.agents);
+	for (const agentName of builtInAgents) options.registerAgentCommand(options.program, agentName, options.config);
+	options.registerDefaultCommands(options.program, options.config);
+	const scan = options.detectAgentToken(options.argv);
+	if (!scan.hasAgentOverride && scan.token && !options.topLevelVerbs.has(scan.token) && !builtInAgents.includes(scan.token)) options.registerAgentCommand(options.program, scan.token, options.config);
+	options.program.argument("[prompt...]", "Prompt text").action(async function(promptParts) {
+		if (promptParts.length === 0 && process.stdin.isTTY) {
+			if (options.requestedJsonStrict) throw new InvalidArgumentError("Prompt is required (pass as argument, --file, or pipe via stdin)");
+			this.outputHelp();
+			return;
+		}
+		await options.handlePromptAction(this, promptParts);
+	});
+	options.program.addHelpText("after", `
+Examples:
+  acpx pi "review recent changes"
+  acpx openclaw exec "summarize active session state"
+  acpx codex sessions new
+  acpx codex "fix the tests"
+  acpx codex prompt "fix the tests"
+  acpx codex --no-wait "queue follow-up task"
+  acpx codex exec "what does this repo do"
+  acpx codex cancel
+  acpx codex set-mode plan
+  acpx codex set thought_level high
+  acpx codex -s backend "fix the API"
+  acpx codex sessions
+  acpx codex sessions new --name backend
+  acpx codex sessions ensure --name backend
+  acpx codex sessions close backend
+  acpx codex status
+  acpx config show
+  acpx config init
+  acpx --ttl 30 codex "investigate flaky tests"
+  acpx claude "refactor auth"
+  acpx --agent ./my-custom-server "do something"`);
 }
-function parseNonEmptyString(value, path) {
-	if (typeof value !== "string" || value.trim().length === 0) throw new Error(`Invalid ${path}: expected non-empty string`);
-	return value.trim();
+//#endregion
+//#region src/acp/codex-compat.ts
+function isCodexInvocation(agentName, agentCommand) {
+	if (agentName === "codex") return true;
+	return /\bcodex-acp\b/u.test(agentCommand);
 }
-function parseHeaders(value, path) {
-	if (value == null) return [];
-	if (!Array.isArray(value)) throw new Error(`Invalid ${path}: expected array`);
-	const headers = [];
-	for (const [index, rawHeader] of value.entries()) {
-		const headerRecord = asRecord$1(rawHeader);
-		if (!headerRecord) throw new Error(`Invalid ${path}[${index}]: expected object`);
-		const name = parseNonEmptyString(headerRecord.name, `${path}[${index}].name`);
-		const headerValue = parseNonEmptyString(headerRecord.value, `${path}[${index}].value`);
-		headers.push({
-			name,
-			value: headerValue
-		});
+//#endregion
+//#region src/cli/command-handlers.ts
+var NoSessionError = class extends Error {
+	constructor(message) {
+		super(message);
+		this.name = "NoSessionError";
 	}
-	return headers;
+};
+let sessionModulePromise;
+let outputModulePromise;
+let outputRenderModulePromise;
+function loadSessionModule() {
+	sessionModulePromise ??= import("./session-BbN0SBgf.js").then((n) => n.t);
+	return sessionModulePromise;
 }
-function parseArgs(value, path) {
-	if (value == null) return [];
-	if (!Array.isArray(value)) throw new Error(`Invalid ${path}: expected array`);
-	const args = [];
-	for (const [index, rawArg] of value.entries()) {
-		if (typeof rawArg !== "string") throw new Error(`Invalid ${path}[${index}]: expected string`);
-		args.push(rawArg);
-	}
-	return args;
+function loadOutputModule() {
+	outputModulePromise ??= import("./output-Di0M9Et8.js").then((n) => n.n);
+	return outputModulePromise;
 }
-function parseEnv(value, path) {
-	if (value == null) return [];
-	if (!Array.isArray(value)) throw new Error(`Invalid ${path}: expected array`);
-	const env = [];
-	for (const [index, rawEntry] of value.entries()) {
-		const entry = asRecord$1(rawEntry);
-		if (!entry) throw new Error(`Invalid ${path}[${index}]: expected object`);
-		const name = parseNonEmptyString(entry.name, `${path}[${index}].name`);
-		const envValue = parseNonEmptyString(entry.value, `${path}[${index}].value`);
-		env.push({
-			name,
-			value: envValue
-		});
-	}
-	return env;
+function loadOutputRenderModule() {
+	outputRenderModulePromise ??= import("./render-BL5ynRkN.js").then((n) => n.r);
+	return outputRenderModulePromise;
 }
-function parseMeta(value, path) {
-	if (value === void 0) return;
-	if (value === null) return null;
-	if (!asRecord$1(value)) throw new Error(`Invalid ${path}: expected object or null`);
-	return value;
+async function readPromptInputFromStdin() {
+	let data = "";
+	for await (const chunk of process.stdin) data += String(chunk);
+	return data;
 }
-function parseServer(rawServer, path) {
-	const serverRecord = asRecord$1(rawServer);
-	if (!serverRecord) throw new Error(`Invalid ${path}: expected object`);
-	const name = parseNonEmptyString(serverRecord.name, `${path}.name`);
-	const _meta = parseMeta(serverRecord._meta, `${path}._meta`);
-	const rawType = serverRecord.type;
-	let typeValue;
-	if (rawType === void 0) typeValue = "stdio";
-	else {
-		const parsedType = parseNonEmptyString(rawType, `${path}.type`);
-		if (parsedType !== "http" && parsedType !== "sse" && parsedType !== "stdio") throw new Error(`Invalid ${path}.type: expected http, sse, or stdio`);
-		typeValue = parsedType;
-	}
-	if (typeValue === "http" || typeValue === "sse") {
-		const url = parseNonEmptyString(serverRecord.url, `${path}.url`);
-		const headers = parseHeaders(serverRecord.headers, `${path}.headers`);
-		return {
-			type: typeValue,
-			name,
-			url,
-			headers,
-			_meta
-		};
+async function readPrompt(promptParts, filePath, cwd) {
+	try {
+		if (filePath) {
+			const prompt = mergePromptSourceWithText(filePath === "-" ? await readPromptInputFromStdin() : await fs$1.readFile(path.resolve(cwd, filePath), "utf8"), promptParts.join(" "));
+			if (prompt.length === 0) throw new InvalidArgumentError("Prompt from --file is empty");
+			return prompt;
+		}
+		const joined = promptParts.join(" ").trim();
+		if (joined.length > 0) return textPrompt(joined);
+		if (process.stdin.isTTY) throw new InvalidArgumentError("Prompt is required (pass as argument, --file, or pipe via stdin)");
+		const prompt = parsePromptSource(await readPromptInputFromStdin());
+		if (prompt.length === 0) throw new InvalidArgumentError("Prompt from stdin is empty");
+		return prompt;
+	} catch (error) {
+		if (error instanceof PromptInputValidationError) throw new InvalidArgumentError(error.message);
+		throw error;
 	}
-	if (typeValue === "stdio") return {
-		name,
-		command: parseNonEmptyString(serverRecord.command, `${path}.command`),
-		args: parseArgs(serverRecord.args, `${path}.args`),
-		env: parseEnv(serverRecord.env, `${path}.env`),
-		_meta
-	};
-	throw new Error(`Invalid ${path}.type: expected http, sse, or stdio`);
-}
-function parseMcpServers(value, sourcePath, fieldName = "mcpServers") {
-	const fieldPath = `${fieldName} in ${sourcePath}`;
-	if (!Array.isArray(value)) throw new Error(`Invalid ${fieldPath}: expected array`);
-	const parsed = [];
-	for (const [index, rawServer] of value.entries()) parsed.push(parseServer(rawServer, `${fieldName}[${index}] in ${sourcePath}`));
-	return parsed;
 }
-function parseOptionalMcpServers(value, sourcePath, fieldName = "mcpServers") {
-	if (value === void 0) return;
-	return parseMcpServers(value, sourcePath, fieldName);
+function applyPermissionExitCode(result) {
+	const stats = result.permissionStats;
+	const deniedOrCancelled = stats.denied + stats.cancelled;
+	if (stats.requested > 0 && stats.approved === 0 && deniedOrCancelled > 0) process.exitCode = EXIT_CODES.PERMISSION_DENIED;
 }
-//#endregion
-//#region src/config.ts
-const DEFAULT_TIMEOUT_MS = void 0;
-const DEFAULT_TTL_MS = 3e5;
-const DEFAULT_PERMISSION_MODE = "approve-reads";
-const DEFAULT_NON_INTERACTIVE_PERMISSION_POLICY = "deny";
-const DEFAULT_AUTH_POLICY = "skip";
-const DEFAULT_OUTPUT_FORMAT = "text";
-const DEFAULT_QUEUE_MAX_DEPTH = 16;
-const DEFAULT_DISABLE_EXEC = false;
-const VALID_PERMISSION_MODES = new Set([
-	"approve-all",
-	"approve-reads",
-	"deny-all"
-]);
-const VALID_NON_INTERACTIVE_PERMISSION_POLICIES = new Set(["deny", "fail"]);
-const VALID_AUTH_POLICIES = new Set(["skip", "fail"]);
-const VALID_OUTPUT_FORMATS = new Set([
-	"text",
-	"json",
-	"quiet"
-]);
-function defaultGlobalConfigPath() {
-	return path.join(os.homedir(), ".acpx", "config.json");
+function resolveCompatibleConfigId(agent, configId) {
+	if (isCodexInvocation(agent.agentName, agent.agentCommand) && configId === "thought_level") return "reasoning_effort";
+	return configId;
 }
-function projectConfigPath(cwd) {
-	return path.join(path.resolve(cwd), ".acpxrc.json");
+function resolveRequestedOutputPolicy(globalFlags) {
+	return {
+		...resolveOutputPolicy(globalFlags.format, globalFlags.jsonStrict === true),
+		suppressReads: globalFlags.suppressReads === true
+	};
 }
-function isObject(value) {
-	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+async function findRoutedSessionOrThrow(agentCommand, agentName, cwd, sessionName) {
+	const walkBoundary = findGitRepositoryRoot(cwd) ?? cwd;
+	const record = await findSessionByDirectoryWalk({
+		agentCommand,
+		cwd,
+		name: sessionName,
+		boundary: walkBoundary
+	});
+	if (record) return record;
+	throw new NoSessionError(`⚠ No acpx session found (searched up to ${walkBoundary}).\nCreate one: ${sessionName ? `acpx ${agentName} sessions new --name ${sessionName}` : `acpx ${agentName} sessions new`}`);
 }
-function parseTtlMs(value, sourcePath) {
-	if (value == null) return;
-	if (typeof value !== "number" || !Number.isFinite(value) || value < 0) throw new Error(`Invalid config ttl in ${sourcePath}: expected non-negative seconds`);
-	return Math.round(value * 1e3);
+async function handlePrompt(explicitAgentName, promptParts, flags, command, config) {
+	const globalFlags = resolveGlobalFlags(command, config);
+	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);
+	const [{ createOutputFormatter }, { printPromptSessionBanner, printQueuedPromptByFormat }, { sendSession }] = await Promise.all([
+		loadOutputModule(),
+		loadOutputRenderModule(),
+		loadSessionModule()
+	]);
+	const record = await findRoutedSessionOrThrow(agent.agentCommand, agent.agentName, agent.cwd, flags.session);
+	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,
+		prompt,
+		mcpServers: config.mcpServers,
+		permissionMode,
+		nonInteractivePermissions: globalFlags.nonInteractivePermissions,
+		authCredentials: config.auth,
+		authPolicy: globalFlags.authPolicy,
+		outputFormatter,
+		errorEmissionPolicy: { queueErrorAlreadyEmitted: outputPolicy.queueErrorAlreadyEmitted },
+		suppressSdkConsoleErrors: outputPolicy.suppressSdkConsoleErrors,
+		timeoutMs: globalFlags.timeout,
+		ttlMs: globalFlags.ttl,
+		maxQueueDepth: config.queueMaxDepth,
+		promptRetries: globalFlags.promptRetries,
+		verbose: globalFlags.verbose,
+		waitForCompletion: flags.wait !== false
+	});
+	if ("queued" in result) {
+		printQueuedPromptByFormat(result, outputPolicy.format);
+		return;
+	}
+	applyPermissionExitCode(result);
+	if (globalFlags.verbose && result.loadError) process.stderr.write(`[acpx] loadSession failed, started fresh session: ${result.loadError}\n`);
 }
-function parseTimeoutMs(value, sourcePath) {
-	if (value == null) return;
-	if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) throw new Error(`Invalid config timeout in ${sourcePath}: expected positive seconds or null`);
-	return Math.round(value * 1e3);
-}
-function parseQueueMaxDepth(value, sourcePath) {
-	if (value == null) return;
-	if (!Number.isInteger(value) || value <= 0) throw new Error(`Invalid config queueMaxDepth in ${sourcePath}: expected positive integer`);
-	return value;
-}
-function parsePermissionMode(value, sourcePath) {
-	if (value == null) return;
-	if (typeof value !== "string" || !VALID_PERMISSION_MODES.has(value)) throw new Error(`Invalid config defaultPermissions in ${sourcePath}: expected approve-all, approve-reads, or deny-all`);
-	return value;
+async function handleExec(explicitAgentName, promptParts, flags, command, config) {
+	if (config.disableExec) {
+		if (resolveRequestedOutputPolicy(resolveGlobalFlags(command, config)).format === "json") process.stdout.write(`${JSON.stringify({
+			jsonrpc: "2.0",
+			error: {
+				code: -32603,
+				message: "exec subcommand is disabled by configuration (disableExec: true)",
+				data: { acpxCode: "EXEC_DISABLED" }
+			}
+		})}\n`);
+		else process.stderr.write("Error: exec subcommand is disabled by configuration (disableExec: true)\n");
+		process.exitCode = 1;
+		return;
+	}
+	const globalFlags = resolveGlobalFlags(command, config);
+	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, { suppressReads: outputPolicy.suppressReads });
+	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
+	applyPermissionExitCode(await runOnce({
+		agentCommand: agent.agentCommand,
+		cwd: agent.cwd,
+		prompt,
+		mcpServers: config.mcpServers,
+		permissionMode,
+		nonInteractivePermissions: globalFlags.nonInteractivePermissions,
+		authCredentials: config.auth,
+		authPolicy: globalFlags.authPolicy,
+		outputFormatter,
+		suppressSdkConsoleErrors: outputPolicy.suppressSdkConsoleErrors,
+		timeoutMs: globalFlags.timeout,
+		verbose: globalFlags.verbose,
+		promptRetries: globalFlags.promptRetries,
+		sessionOptions: {
+			model: globalFlags.model,
+			allowedTools: globalFlags.allowedTools,
+			maxTurns: globalFlags.maxTurns
+		}
+	}));
 }
-function parseNonInteractivePermissionPolicy(value, sourcePath) {
-	if (value == null) return;
-	if (typeof value !== "string" || !VALID_NON_INTERACTIVE_PERMISSION_POLICIES.has(value)) throw new Error(`Invalid config nonInteractivePermissions in ${sourcePath}: expected deny or fail`);
-	return value;
+function printCancelResultByFormat(result, format) {
+	if (emitJsonResult(format, {
+		action: "cancel_result",
+		acpxRecordId: result.sessionId || "unknown",
+		cancelled: result.cancelled
+	})) return;
+	process.stdout.write(result.cancelled ? "cancel requested\n" : "nothing to cancel\n");
 }
-function parseAuthPolicy(value, sourcePath) {
-	if (value == null) return;
-	if (typeof value !== "string" || !VALID_AUTH_POLICIES.has(value)) throw new Error(`Invalid config authPolicy in ${sourcePath}: expected skip or fail`);
-	return value;
+function printSetModeResultByFormat(modeId, result, format) {
+	if (emitJsonResult(format, {
+		action: "mode_set",
+		modeId,
+		resumed: result.resumed,
+		acpxRecordId: result.record.acpxRecordId,
+		acpxSessionId: result.record.acpSessionId,
+		agentSessionId: result.record.agentSessionId
+	})) return;
+	process.stdout.write(format === "quiet" ? `${modeId}\n` : `mode set: ${modeId}\n`);
 }
-function parseOutputFormat(value, sourcePath) {
-	if (value == null) return;
-	if (typeof value !== "string" || !VALID_OUTPUT_FORMATS.has(value)) throw new Error(`Invalid config format in ${sourcePath}: expected text, json, or quiet`);
-	return value;
+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;
+	process.stdout.write(format === "quiet" ? `${modelId}\n` : `model set: ${modelId}\n`);
 }
-function parseDefaultAgent(value, sourcePath) {
-	if (value == null) return;
-	if (typeof value !== "string" || value.trim().length === 0) throw new Error(`Invalid config defaultAgent in ${sourcePath}: expected non-empty string`);
-	return normalizeAgentName(value);
+function printSetConfigOptionResultByFormat(configId, value, result, format) {
+	if (emitJsonResult(format, {
+		action: "config_set",
+		configId,
+		value,
+		resumed: result.resumed,
+		configOptions: result.response.configOptions,
+		acpxRecordId: result.record.acpxRecordId,
+		acpxSessionId: result.record.acpSessionId,
+		agentSessionId: result.record.agentSessionId
+	})) return;
+	process.stdout.write(format === "quiet" ? `${value}\n` : `config set: ${configId}=${value} (${result.response.configOptions.length} options)\n`);
 }
-function parseAgents(value, sourcePath) {
-	if (value == null) return;
-	if (!isObject(value)) throw new Error(`Invalid config agents in ${sourcePath}: expected object`);
-	const parsed = {};
-	for (const [name, raw] of Object.entries(value)) {
-		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();
+async function handleCancel(explicitAgentName, flags, command, config) {
+	const globalFlags = resolveGlobalFlags(command, config);
+	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
+	const { cancelSessionPrompt } = await loadSessionModule();
+	const walkBoundary = findGitRepositoryRoot(agent.cwd) ?? agent.cwd;
+	const record = await findSessionByDirectoryWalk({
+		agentCommand: agent.agentCommand,
+		cwd: agent.cwd,
+		name: resolveSessionNameFromFlags(flags, command),
+		boundary: walkBoundary
+	});
+	if (!record) {
+		printCancelResultByFormat({
+			sessionId: "",
+			cancelled: false
+		}, globalFlags.format);
+		return;
 	}
-	return parsed;
+	printCancelResultByFormat(await cancelSessionPrompt({
+		sessionId: record.acpxRecordId,
+		verbose: globalFlags.verbose
+	}), globalFlags.format);
 }
-function parseAuth(value, sourcePath) {
-	if (value == null) return;
-	if (!isObject(value)) throw new Error(`Invalid config auth in ${sourcePath}: expected object`);
-	const parsed = {};
-	for (const [methodId, rawCredential] of Object.entries(value)) {
-		if (typeof rawCredential !== "string" || rawCredential.trim().length === 0) throw new Error(`Invalid config auth.${methodId} in ${sourcePath}: expected non-empty string`);
-		parsed[methodId] = rawCredential;
-	}
-	return parsed;
+async function handleSetMode(explicitAgentName, modeId, flags, command, config) {
+	const globalFlags = resolveGlobalFlags(command, config);
+	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
+	const { setSessionMode } = await loadSessionModule();
+	const result = await setSessionMode({
+		sessionId: (await findRoutedSessionOrThrow(agent.agentCommand, agent.agentName, agent.cwd, resolveSessionNameFromFlags(flags, command))).acpxRecordId,
+		modeId,
+		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`);
+	printSetModeResultByFormat(modeId, result, globalFlags.format);
 }
-function parseDisableExec(value, sourcePath) {
-	if (value == null) return;
-	if (typeof value !== "boolean") throw new Error(`Invalid config disableExec in ${sourcePath}: expected boolean`);
-	return value;
+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 readConfigFile(filePath) {
-	try {
-		const payload = await fs$1.readFile(filePath, "utf8");
-		let parsed;
-		try {
-			parsed = JSON.parse(payload);
-		} catch (error) {
-			const reason = error instanceof Error ? error.message : String(error);
-			throw new Error(`Invalid JSON in ${filePath}: ${reason}`, { cause: error });
-		}
-		if (!isObject(parsed)) throw new Error(`Invalid config in ${filePath}: expected top-level JSON object`);
-		return {
-			config: parsed,
-			exists: true
-		};
-	} catch (error) {
-		if (error.code === "ENOENT") return { exists: false };
-		throw error;
+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({
+		sessionId: (await findRoutedSessionOrThrow(agent.agentCommand, agent.agentName, agent.cwd, resolveSessionNameFromFlags(flags, command))).acpxRecordId,
+		configId: resolvedConfigId,
+		value,
+		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`);
+	printSetConfigOptionResultByFormat(configId, value, result, globalFlags.format);
 }
-function mergeAgents(globalAgents, projectAgents) {
-	return {
-		...globalAgents,
-		...projectAgents
-	};
+async function handleSessionsList(explicitAgentName, command, config) {
+	const globalFlags = resolveGlobalFlags(command, config);
+	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
+	const [{ listSessionsForAgent }, { printSessionsByFormat }] = await Promise.all([loadSessionModule(), loadOutputRenderModule()]);
+	printSessionsByFormat(await listSessionsForAgent(agent.agentCommand), globalFlags.format);
 }
-function mergeAuth(globalAuth, projectAuth) {
-	return {
-		...globalAuth,
-		...projectAuth
-	};
+async function handleSessionsClose(explicitAgentName, sessionName, command, config) {
+	const globalFlags = resolveGlobalFlags(command, config);
+	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
+	const [{ closeSession }, { printClosedSessionByFormat }] = await Promise.all([loadSessionModule(), loadOutputRenderModule()]);
+	const record = await findSession({
+		agentCommand: agent.agentCommand,
+		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}`);
+	printClosedSessionByFormat(await closeSession(record.acpxRecordId), globalFlags.format);
 }
-async function loadResolvedConfig(cwd) {
-	const globalPath = defaultGlobalConfigPath();
-	const projectPath = projectConfigPath(cwd);
-	const [globalResult, projectResult] = await Promise.all([readConfigFile(globalPath), readConfigFile(projectPath)]);
-	const globalConfig = globalResult.config;
-	const projectConfig = projectResult.config;
-	const defaultAgent = parseDefaultAgent(projectConfig?.defaultAgent, projectPath) ?? parseDefaultAgent(globalConfig?.defaultAgent, globalPath) ?? "codex";
-	const defaultPermissions = parsePermissionMode(projectConfig?.defaultPermissions, projectPath) ?? parsePermissionMode(globalConfig?.defaultPermissions, globalPath) ?? DEFAULT_PERMISSION_MODE;
-	const nonInteractivePermissions = parseNonInteractivePermissionPolicy(projectConfig?.nonInteractivePermissions, projectPath) ?? parseNonInteractivePermissionPolicy(globalConfig?.nonInteractivePermissions, globalPath) ?? DEFAULT_NON_INTERACTIVE_PERMISSION_POLICY;
-	const authPolicy = parseAuthPolicy(projectConfig?.authPolicy, projectPath) ?? parseAuthPolicy(globalConfig?.authPolicy, globalPath) ?? DEFAULT_AUTH_POLICY;
-	const ttlMs = parseTtlMs(projectConfig?.ttl, projectPath) ?? parseTtlMs(globalConfig?.ttl, globalPath) ?? DEFAULT_TTL_MS;
-	const timeoutConfiguredInProject = projectConfig != null && Object.prototype.hasOwnProperty.call(projectConfig, "timeout");
-	const timeoutConfiguredInGlobal = globalConfig != null && Object.prototype.hasOwnProperty.call(globalConfig, "timeout");
-	let timeoutMs = DEFAULT_TIMEOUT_MS;
-	if (timeoutConfiguredInProject) timeoutMs = parseTimeoutMs(projectConfig?.timeout, projectPath);
-	else if (timeoutConfiguredInGlobal) timeoutMs = parseTimeoutMs(globalConfig?.timeout, globalPath);
-	const format = parseOutputFormat(projectConfig?.format, projectPath) ?? parseOutputFormat(globalConfig?.format, globalPath) ?? DEFAULT_OUTPUT_FORMAT;
-	const queueMaxDepth = parseQueueMaxDepth(projectConfig?.queueMaxDepth, projectPath) ?? parseQueueMaxDepth(globalConfig?.queueMaxDepth, globalPath) ?? DEFAULT_QUEUE_MAX_DEPTH;
-	const agents = mergeAgents(parseAgents(globalConfig?.agents, globalPath), parseAgents(projectConfig?.agents, projectPath));
-	const auth = mergeAuth(parseAuth(globalConfig?.auth, globalPath), parseAuth(projectConfig?.auth, projectPath));
-	const mcpServersConfiguredInProject = projectConfig != null && Object.prototype.hasOwnProperty.call(projectConfig, "mcpServers");
-	const mcpServersConfiguredInGlobal = globalConfig != null && Object.prototype.hasOwnProperty.call(globalConfig, "mcpServers");
-	let mcpServers = [];
-	if (mcpServersConfiguredInProject) mcpServers = parseMcpServers(projectConfig?.mcpServers, projectPath);
-	else if (mcpServersConfiguredInGlobal) mcpServers = parseMcpServers(globalConfig?.mcpServers, globalPath);
-	const disableExec = parseDisableExec(projectConfig?.disableExec, projectPath) ?? parseDisableExec(globalConfig?.disableExec, globalPath) ?? DEFAULT_DISABLE_EXEC;
-	return {
-		defaultAgent,
-		defaultPermissions,
-		nonInteractivePermissions,
-		authPolicy,
-		ttlMs,
-		timeoutMs,
-		queueMaxDepth,
-		format,
-		agents,
-		auth,
-		disableExec,
-		mcpServers,
-		globalPath,
-		projectPath,
-		hasGlobalConfig: globalResult.exists,
-		hasProjectConfig: projectResult.exists
-	};
+async function handleSessionsNew(explicitAgentName, flags, command, config) {
+	const globalFlags = resolveGlobalFlags(command, config);
+	const permissionMode = resolvePermissionMode(globalFlags, config.defaultPermissions);
+	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
+	const [{ createSession, closeSession }, { printCreatedSessionBanner, printNewSessionByFormat }] = await Promise.all([loadSessionModule(), loadOutputRenderModule()]);
+	const replaced = await findSession({
+		agentCommand: agent.agentCommand,
+		cwd: agent.cwd,
+		name: flags.name
+	});
+	if (replaced) {
+		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
+		}
+	});
+	printCreatedSessionBanner(created, agent.agentName, globalFlags.format, globalFlags.jsonStrict);
+	if (globalFlags.verbose) {
+		const scope = flags.name ? `named session "${flags.name}"` : "cwd session";
+		process.stderr.write(`[acpx] created ${scope}: ${created.acpxRecordId}\n`);
+	}
+	printNewSessionByFormat(created, replaced, globalFlags.format);
 }
-function toConfigDisplay(config) {
-	const agents = {};
-	for (const [name, command] of Object.entries(config.agents)) agents[name] = { command };
-	return {
-		defaultAgent: config.defaultAgent,
-		defaultPermissions: config.defaultPermissions,
-		nonInteractivePermissions: config.nonInteractivePermissions,
-		authPolicy: config.authPolicy,
-		ttl: Math.round(config.ttlMs / 1e3),
-		timeout: config.timeoutMs == null ? null : config.timeoutMs / 1e3,
-		queueMaxDepth: config.queueMaxDepth,
-		format: config.format,
-		agents,
-		authMethods: Object.keys(config.auth).toSorted(),
-		disableExec: config.disableExec
-	};
+async function handleSessionsEnsure(explicitAgentName, flags, command, config) {
+	const globalFlags = resolveGlobalFlags(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
+		}
+	});
+	if (result.created) printCreatedSessionBanner(result.record, agent.agentName, globalFlags.format, globalFlags.jsonStrict);
+	printEnsuredSessionByFormat(result.record, result.created, globalFlags.format);
 }
-async function initGlobalConfigFile() {
-	const configPath = defaultGlobalConfigPath();
-	await fs$1.mkdir(path.dirname(configPath), { recursive: true });
-	try {
-		await fs$1.access(configPath);
-		return {
-			path: configPath,
-			created: false
-		};
-	} catch {}
-	const payload = {
-		defaultAgent: DEFAULT_AGENT_NAME,
-		defaultPermissions: "approve-all",
-		nonInteractivePermissions: "deny",
-		authPolicy: "skip",
-		ttl: 300,
-		timeout: null,
-		queueMaxDepth: DEFAULT_QUEUE_MAX_DEPTH,
-		format: "text",
-		agents: {},
-		auth: {}
-	};
-	await fs$1.writeFile(configPath, `${JSON.stringify(payload, null, 2)}\n`, "utf8");
-	return {
-		path: configPath,
-		created: true
-	};
+function userContentToText(content) {
+	if ("Text" in content) return content.Text;
+	if ("Mention" in content) return content.Mention.content;
+	if ("Image" in content) return content.Image.source || "[image]";
+	return "";
 }
-//#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
+function agentContentToText(content) {
+	if ("Text" in content) return content.Text;
+	if ("Thinking" in content) return content.Thinking.text;
+	if ("RedactedThinking" in content) return "[redacted_thinking]";
+	if ("ToolUse" in content) return `[tool:${content.ToolUse.name}]`;
+	return "";
+}
+function conversationHistoryEntries(record) {
+	const entries = [];
+	for (const message of record.messages) {
+		if (message === "Resume") continue;
+		if ("User" in message) {
+			const text = message.User.content.map((entry) => userContentToText(entry)).join(" ").trim();
+			if (!text) continue;
+			entries.push({
+				role: "user",
+				timestamp: record.updated_at,
+				textPreview: text
+			});
+			continue;
 		}
-	};
-	if (globalFlags.format === "json") {
-		process.stdout.write(`${JSON.stringify(payload)}\n`);
+		if ("Agent" in message) {
+			const text = message.Agent.content.map((entry) => agentContentToText(entry)).join(" ").trim();
+			if (!text) continue;
+			entries.push({
+				role: "assistant",
+				timestamp: record.updated_at,
+				textPreview: text
+			});
+		}
+	}
+	return entries;
+}
+function printSessionDetailsByFormat(record, format) {
+	if (format === "json") {
+		process.stdout.write(`${JSON.stringify(record)}\n`);
 		return;
 	}
-	process.stdout.write(`${JSON.stringify(payload, null, 2)}\n`);
+	if (format === "quiet") {
+		process.stdout.write(`${record.acpxRecordId}\n`);
+		return;
+	}
+	process.stdout.write(`id: ${record.acpxRecordId}\n`);
+	process.stdout.write(`sessionId: ${record.acpSessionId}\n`);
+	process.stdout.write(`agentSessionId: ${record.agentSessionId ?? "-"}\n`);
+	process.stdout.write(`agent: ${record.agentCommand}\n`);
+	process.stdout.write(`cwd: ${record.cwd}\n`);
+	process.stdout.write(`name: ${record.name ?? "-"}\n`);
+	process.stdout.write(`created: ${record.createdAt}\n`);
+	process.stdout.write(`lastActivity: ${record.lastUsedAt}\n`);
+	process.stdout.write(`lastPrompt: ${record.lastPromptAt ?? "-"}\n`);
+	process.stdout.write(`closed: ${record.closed ? "yes" : "no"}\n`);
+	process.stdout.write(`closedAt: ${record.closedAt ?? "-"}\n`);
+	process.stdout.write(`pid: ${record.pid ?? "-"}\n`);
+	process.stdout.write(`agentStartedAt: ${record.agentStartedAt ?? "-"}\n`);
+	process.stdout.write(`lastExitCode: ${record.lastAgentExitCode ?? "-"}\n`);
+	process.stdout.write(`lastExitSignal: ${record.lastAgentExitSignal ?? "-"}\n`);
+	process.stdout.write(`lastExitAt: ${record.lastAgentExitAt ?? "-"}\n`);
+	process.stdout.write(`disconnectReason: ${record.lastAgentDisconnectReason ?? "-"}\n`);
+	process.stdout.write(`historyEntries: ${conversationHistoryEntries(record).length}\n`);
 }
-async function handleConfigInit(command, config) {
-	const globalFlags = resolveGlobalFlags(command, config);
-	const result = await initGlobalConfigFile();
-	if (globalFlags.format === "json") {
+function printSessionHistoryByFormat(record, limit, format) {
+	const history = conversationHistoryEntries(record);
+	const visible = limit === 0 ? history : history.slice(Math.max(0, history.length - limit));
+	if (format === "json") {
 		process.stdout.write(`${JSON.stringify({
-			path: result.path,
-			created: result.created
+			id: record.acpxRecordId,
+			sessionId: record.acpSessionId,
+			limit,
+			count: visible.length,
+			entries: visible
 		})}\n`);
 		return;
 	}
-	if (globalFlags.format === "quiet") {
-		process.stdout.write(`${result.path}\n`);
+	if (format === "quiet") {
+		for (const entry of visible) process.stdout.write(`${entry.textPreview}\n`);
 		return;
 	}
-	if (result.created) {
-		process.stdout.write(`Created ${result.path}\n`);
+	process.stdout.write(`session: ${record.acpxRecordId} (${visible.length}/${history.length} shown)\n`);
+	if (visible.length === 0) {
+		process.stdout.write("No history\n");
 		return;
 	}
-	process.stdout.write(`Config already exists: ${result.path}\n`);
+	for (const entry of visible) process.stdout.write(`${entry.timestamp}\t${entry.role}\t${entry.textPreview}\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);
+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
 	});
-	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")}`;
+	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);
 }
-async function handleStatus(explicitAgentName, flags, command, config) {
+async function handleSessionsHistory(explicitAgentName, sessionName, 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);
+		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);
 }
 //#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) {
+//#region src/mcp-servers.ts
+function asRecord$1(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
 	return value;
 }
-function parseQueueOwnerPayload(raw) {
-	const record = asRecord(JSON.parse(raw));
-	if (!record) throw new Error("queue owner payload must be an object");
-	if (typeof record.sessionId !== "string" || record.sessionId.trim().length === 0) throw new Error("queue owner payload missing sessionId");
-	if (record.permissionMode !== "approve-all" && record.permissionMode !== "approve-reads" && record.permissionMode !== "deny-all") throw new Error("queue owner payload has invalid permissionMode");
-	const options = {
-		sessionId: record.sessionId,
-		permissionMode: record.permissionMode
-	};
-	const parsedMcpServers = parseOptionalMcpServers(record.mcpServers, "queue owner payload");
-	if (parsedMcpServers) options.mcpServers = parsedMcpServers;
-	if (typeof record.nonInteractivePermissions === "string") options.nonInteractivePermissions = record.nonInteractivePermissions === "deny" || record.nonInteractivePermissions === "fail" ? record.nonInteractivePermissions : void 0;
-	if (record.authCredentials && typeof record.authCredentials === "object") {
-		const entries = Object.entries(record.authCredentials).filter(([, value]) => typeof value === "string");
-		options.authCredentials = Object.fromEntries(entries);
-	}
-	if (record.authPolicy === "skip" || record.authPolicy === "fail") options.authPolicy = record.authPolicy;
-	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));
-	return options;
-}
-async function runQueueOwnerFromEnv(env) {
-	const payload = env.ACPX_QUEUE_OWNER_PAYLOAD;
-	if (!payload) throw new Error("missing ACPX_QUEUE_OWNER_PAYLOAD");
-	await runSessionQueueOwner(parseQueueOwnerPayload(payload));
-}
-//#endregion
-//#region src/version.ts
-const UNKNOWN_VERSION = "0.0.0-unknown";
-const MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
-let cachedVersion = null;
-function parseVersion(value) {
-	if (typeof value !== "string") return null;
-	const trimmed = value.trim();
-	return trimmed.length > 0 ? trimmed : null;
+function parseNonEmptyString(value, path) {
+	if (typeof value !== "string" || value.trim().length === 0) throw new Error(`Invalid ${path}: expected non-empty string`);
+	return value.trim();
 }
-function readPackageVersion(packageJsonPath) {
-	try {
-		return parseVersion(JSON.parse(readFileSync(packageJsonPath, "utf8")).version);
-	} catch {
-		return null;
+function parseHeaders(value, path) {
+	if (value == null) return [];
+	if (!Array.isArray(value)) throw new Error(`Invalid ${path}: expected array`);
+	const headers = [];
+	for (const [index, rawHeader] of value.entries()) {
+		const headerRecord = asRecord$1(rawHeader);
+		if (!headerRecord) throw new Error(`Invalid ${path}[${index}]: expected object`);
+		const name = parseNonEmptyString(headerRecord.name, `${path}[${index}].name`);
+		const headerValue = parseNonEmptyString(headerRecord.value, `${path}[${index}].value`);
+		headers.push({
+			name,
+			value: headerValue
+		});
 	}
+	return headers;
 }
-function resolveVersionFromAncestors(startDir) {
-	let current = startDir;
-	while (true) {
-		const packageVersion = readPackageVersion(path.join(current, "package.json"));
-		if (packageVersion) return packageVersion;
-		const parent = path.dirname(current);
-		if (parent === current) return null;
-		current = parent;
+function parseArgs(value, path) {
+	if (value == null) return [];
+	if (!Array.isArray(value)) throw new Error(`Invalid ${path}: expected array`);
+	const args = [];
+	for (const [index, rawArg] of value.entries()) {
+		if (typeof rawArg !== "string") throw new Error(`Invalid ${path}[${index}]: expected string`);
+		args.push(rawArg);
 	}
+	return args;
 }
-function resolveAcpxVersion(params) {
-	const env = params?.env ?? process.env;
-	const envPackageName = parseVersion(env.npm_package_name);
-	const envVersion = parseVersion(env.npm_package_version);
-	if (envPackageName === "acpx" && envVersion) return envVersion;
-	if (params?.packageJsonPath) return readPackageVersion(params.packageJsonPath) ?? UNKNOWN_VERSION;
-	return resolveVersionFromAncestors(MODULE_DIR) ?? UNKNOWN_VERSION;
+function parseEnv(value, path) {
+	if (value == null) return [];
+	if (!Array.isArray(value)) throw new Error(`Invalid ${path}: expected array`);
+	const env = [];
+	for (const [index, rawEntry] of value.entries()) {
+		const entry = asRecord$1(rawEntry);
+		if (!entry) throw new Error(`Invalid ${path}[${index}]: expected object`);
+		const name = parseNonEmptyString(entry.name, `${path}[${index}].name`);
+		const envValue = parseNonEmptyString(entry.value, `${path}[${index}].value`);
+		env.push({
+			name,
+			value: envValue
+		});
+	}
+	return env;
 }
-function getAcpxVersion() {
-	if (cachedVersion) return cachedVersion;
-	cachedVersion = resolveAcpxVersion();
-	return cachedVersion;
+function parseMeta(value, path) {
+	if (value === void 0) return;
+	if (value === null) return null;
+	if (!asRecord$1(value)) throw new Error(`Invalid ${path}: expected object or null`);
+	return value;
 }
-//#endregion
-//#region src/cli-core.ts
-var NoSessionError = class extends Error {
-	constructor(message) {
-		super(message);
-		this.name = "NoSessionError";
+function parseServer(rawServer, path) {
+	const serverRecord = asRecord$1(rawServer);
+	if (!serverRecord) throw new Error(`Invalid ${path}: expected object`);
+	const name = parseNonEmptyString(serverRecord.name, `${path}.name`);
+	const _meta = parseMeta(serverRecord._meta, `${path}._meta`);
+	const rawType = serverRecord.type;
+	let typeValue;
+	if (rawType === void 0) typeValue = "stdio";
+	else {
+		const parsedType = parseNonEmptyString(rawType, `${path}.type`);
+		if (parsedType !== "http" && parsedType !== "sse" && parsedType !== "stdio") throw new Error(`Invalid ${path}.type: expected http, sse, or stdio`);
+		typeValue = parsedType;
 	}
-};
-const TOP_LEVEL_VERBS = new Set([
-	"prompt",
-	"exec",
-	"cancel",
-	"flow",
-	"set-mode",
-	"set",
-	"sessions",
-	"status",
-	"config",
-	"help"
-]);
-async function readPromptInputFromStdin() {
-	let data = "";
-	for await (const chunk of process.stdin) data += String(chunk);
-	return data;
-}
-async function readPrompt(promptParts, filePath, cwd) {
-	try {
-		if (filePath) {
-			const prompt = mergePromptSourceWithText(filePath === "-" ? await readPromptInputFromStdin() : await fs$1.readFile(path.resolve(cwd, filePath), "utf8"), promptParts.join(" "));
-			if (prompt.length === 0) throw new InvalidArgumentError("Prompt from --file is empty");
-			return prompt;
-		}
-		const joined = promptParts.join(" ").trim();
-		if (joined.length > 0) return textPrompt(joined);
-		if (process.stdin.isTTY) throw new InvalidArgumentError("Prompt is required (pass as argument, --file, or pipe via stdin)");
-		const prompt = parsePromptSource(await readPromptInputFromStdin());
-		if (prompt.length === 0) throw new InvalidArgumentError("Prompt from stdin is empty");
-		return prompt;
-	} catch (error) {
-		if (error instanceof PromptInputValidationError) throw new InvalidArgumentError(error.message);
-		throw error;
+	if (typeValue === "http" || typeValue === "sse") {
+		const url = parseNonEmptyString(serverRecord.url, `${path}.url`);
+		const headers = parseHeaders(serverRecord.headers, `${path}.headers`);
+		return {
+			type: typeValue,
+			name,
+			url,
+			headers,
+			_meta
+		};
 	}
+	if (typeValue === "stdio") return {
+		name,
+		command: parseNonEmptyString(serverRecord.command, `${path}.command`),
+		args: parseArgs(serverRecord.args, `${path}.args`),
+		env: parseEnv(serverRecord.env, `${path}.env`),
+		_meta
+	};
+	throw new Error(`Invalid ${path}.type: expected http, sse, or stdio`);
 }
-function applyPermissionExitCode(result) {
-	const stats = result.permissionStats;
-	const deniedOrCancelled = stats.denied + stats.cancelled;
-	if (stats.requested > 0 && stats.approved === 0 && deniedOrCancelled > 0) process.exitCode = EXIT_CODES.PERMISSION_DENIED;
+function parseMcpServers(value, sourcePath, fieldName = "mcpServers") {
+	const fieldPath = `${fieldName} in ${sourcePath}`;
+	if (!Array.isArray(value)) throw new Error(`Invalid ${fieldPath}: expected array`);
+	const parsed = [];
+	for (const [index, rawServer] of value.entries()) parsed.push(parseServer(rawServer, `${fieldName}[${index}] in ${sourcePath}`));
+	return parsed;
 }
-function resolveCompatibleConfigId(agent, configId) {
-	if (isCodexInvocation(agent.agentName, agent.agentCommand) && configId === "thought_level") return "reasoning_effort";
-	return configId;
+function parseOptionalMcpServers(value, sourcePath, fieldName = "mcpServers") {
+	if (value === void 0) return;
+	return parseMcpServers(value, sourcePath, fieldName);
 }
-function resolveRequestedOutputPolicy(globalFlags) {
-	return {
-		...resolveOutputPolicy(globalFlags.format, globalFlags.jsonStrict === true),
-		suppressReads: globalFlags.suppressReads === true
-	};
+//#endregion
+//#region src/cli/config.ts
+const DEFAULT_TIMEOUT_MS = void 0;
+const DEFAULT_TTL_MS = 3e5;
+const DEFAULT_PERMISSION_MODE = "approve-reads";
+const DEFAULT_NON_INTERACTIVE_PERMISSION_POLICY = "deny";
+const DEFAULT_AUTH_POLICY = "skip";
+const DEFAULT_OUTPUT_FORMAT = "text";
+const DEFAULT_QUEUE_MAX_DEPTH = 16;
+const DEFAULT_DISABLE_EXEC = false;
+const VALID_PERMISSION_MODES = new Set([
+	"approve-all",
+	"approve-reads",
+	"deny-all"
+]);
+const VALID_NON_INTERACTIVE_PERMISSION_POLICIES = new Set(["deny", "fail"]);
+const VALID_AUTH_POLICIES = new Set(["skip", "fail"]);
+const VALID_OUTPUT_FORMATS = new Set([
+	"text",
+	"json",
+	"quiet"
+]);
+function defaultGlobalConfigPath() {
+	return path.join(os.homedir(), ".acpx", "config.json");
 }
-let sessionModulePromise;
-let outputModulePromise;
-let outputRenderModulePromise;
-let skillflagModulePromise;
-function loadSessionModule() {
-	sessionModulePromise ??= import("./session-RO_LZUnv.js").then((n) => n.t);
-	return sessionModulePromise;
+function projectConfigPath(cwd) {
+	return path.join(path.resolve(cwd), ".acpxrc.json");
 }
-function loadOutputModule() {
-	outputModulePromise ??= import("./output-Du3m6oPQ.js").then((n) => n.n);
-	return outputModulePromise;
+function isObject(value) {
+	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
-function loadOutputRenderModule() {
-	outputRenderModulePromise ??= import("./output-render-Bz58qaQn.js").then((n) => n.r);
-	return outputRenderModulePromise;
+function parseTtlMs(value, sourcePath) {
+	if (value == null) return;
+	if (typeof value !== "number" || !Number.isFinite(value) || value < 0) throw new Error(`Invalid config ttl in ${sourcePath}: expected non-negative seconds`);
+	return Math.round(value * 1e3);
 }
-function loadSkillflagModule() {
-	skillflagModulePromise ??= import("skillflag");
-	return skillflagModulePromise;
+function parseTimeoutMs(value, sourcePath) {
+	if (value == null) return;
+	if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) throw new Error(`Invalid config timeout in ${sourcePath}: expected positive seconds or null`);
+	return Math.round(value * 1e3);
 }
-function shouldMaybeHandleSkillflag(argv) {
-	return argv.some((token) => token === "--skill" || token.startsWith("--skill="));
+function parseQueueMaxDepth(value, sourcePath) {
+	if (value == null) return;
+	if (!Number.isInteger(value) || value <= 0) throw new Error(`Invalid config queueMaxDepth in ${sourcePath}: expected positive integer`);
+	return value;
 }
-async function findRoutedSessionOrThrow(agentCommand, agentName, cwd, sessionName) {
-	const walkBoundary = findGitRepositoryRoot(cwd) ?? cwd;
-	const record = await findSessionByDirectoryWalk({
-		agentCommand,
-		cwd,
-		name: sessionName,
-		boundary: walkBoundary
-	});
-	if (record) return record;
-	throw new NoSessionError(`⚠ No acpx session found (searched up to ${walkBoundary}).\nCreate one: ${sessionName ? `acpx ${agentName} sessions new --name ${sessionName}` : `acpx ${agentName} sessions new`}`);
+function parsePermissionMode(value, sourcePath) {
+	if (value == null) return;
+	if (typeof value !== "string" || !VALID_PERMISSION_MODES.has(value)) throw new Error(`Invalid config defaultPermissions in ${sourcePath}: expected approve-all, approve-reads, or deny-all`);
+	return value;
 }
-async function handlePrompt(explicitAgentName, promptParts, flags, command, config) {
-	const globalFlags = resolveGlobalFlags(command, config);
-	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);
-	const [{ createOutputFormatter }, { printPromptSessionBanner, printQueuedPromptByFormat }, { sendSession }] = await Promise.all([
-		loadOutputModule(),
-		loadOutputRenderModule(),
-		loadSessionModule()
-	]);
-	const record = await findRoutedSessionOrThrow(agent.agentCommand, agent.agentName, agent.cwd, flags.session);
-	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,
-		prompt,
-		mcpServers: config.mcpServers,
-		permissionMode,
-		nonInteractivePermissions: globalFlags.nonInteractivePermissions,
-		authCredentials: config.auth,
-		authPolicy: globalFlags.authPolicy,
-		outputFormatter,
-		errorEmissionPolicy: { queueErrorAlreadyEmitted: outputPolicy.queueErrorAlreadyEmitted },
-		suppressSdkConsoleErrors: outputPolicy.suppressSdkConsoleErrors,
-		timeoutMs: globalFlags.timeout,
-		ttlMs: globalFlags.ttl,
-		maxQueueDepth: config.queueMaxDepth,
-		promptRetries: globalFlags.promptRetries,
-		verbose: globalFlags.verbose,
-		waitForCompletion: flags.wait !== false
-	});
-	if ("queued" in result) {
-		printQueuedPromptByFormat(result, outputPolicy.format);
-		return;
-	}
-	applyPermissionExitCode(result);
-	if (globalFlags.verbose && result.loadError) process.stderr.write(`[acpx] loadSession failed, started fresh session: ${result.loadError}\n`);
+function parseNonInteractivePermissionPolicy(value, sourcePath) {
+	if (value == null) return;
+	if (typeof value !== "string" || !VALID_NON_INTERACTIVE_PERMISSION_POLICIES.has(value)) throw new Error(`Invalid config nonInteractivePermissions in ${sourcePath}: expected deny or fail`);
+	return value;
 }
-async function handleExec(explicitAgentName, promptParts, flags, command, config) {
-	if (config.disableExec) {
-		if (resolveRequestedOutputPolicy(resolveGlobalFlags(command, config)).format === "json") process.stdout.write(`${JSON.stringify({
-			jsonrpc: "2.0",
-			error: {
-				code: -32603,
-				message: "exec subcommand is disabled by configuration (disableExec: true)",
-				data: { acpxCode: "EXEC_DISABLED" }
-			}
-		})}\n`);
-		else process.stderr.write("Error: exec subcommand is disabled by configuration (disableExec: true)\n");
-		process.exitCode = EXIT_CODES.ERROR;
-		return;
-	}
-	const globalFlags = resolveGlobalFlags(command, config);
-	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, { suppressReads: outputPolicy.suppressReads });
-	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
-	applyPermissionExitCode(await runOnce({
-		agentCommand: agent.agentCommand,
-		cwd: agent.cwd,
-		prompt,
-		mcpServers: config.mcpServers,
-		permissionMode,
-		nonInteractivePermissions: globalFlags.nonInteractivePermissions,
-		authCredentials: config.auth,
-		authPolicy: globalFlags.authPolicy,
-		outputFormatter,
-		suppressSdkConsoleErrors: outputPolicy.suppressSdkConsoleErrors,
-		timeoutMs: globalFlags.timeout,
-		verbose: globalFlags.verbose,
-		promptRetries: globalFlags.promptRetries,
-		sessionOptions: {
-			model: globalFlags.model,
-			allowedTools: globalFlags.allowedTools,
-			maxTurns: globalFlags.maxTurns
-		}
-	}));
+function parseAuthPolicy(value, sourcePath) {
+	if (value == null) return;
+	if (typeof value !== "string" || !VALID_AUTH_POLICIES.has(value)) throw new Error(`Invalid config authPolicy in ${sourcePath}: expected skip or fail`);
+	return value;
 }
-function printCancelResultByFormat(result, format) {
-	if (emitJsonResult(format, {
-		action: "cancel_result",
-		acpxRecordId: result.sessionId || "unknown",
-		cancelled: result.cancelled
-	})) return;
-	if (result.cancelled) {
-		process.stdout.write("cancel requested\n");
-		return;
+function parseOutputFormat(value, sourcePath) {
+	if (value == null) return;
+	if (typeof value !== "string" || !VALID_OUTPUT_FORMATS.has(value)) throw new Error(`Invalid config format in ${sourcePath}: expected text, json, or quiet`);
+	return value;
+}
+function parseDefaultAgent(value, sourcePath) {
+	if (value == null) return;
+	if (typeof value !== "string" || value.trim().length === 0) throw new Error(`Invalid config defaultAgent in ${sourcePath}: expected non-empty string`);
+	return normalizeAgentName(value);
+}
+function parseAgents(value, sourcePath) {
+	if (value == null) return;
+	if (!isObject(value)) throw new Error(`Invalid config agents in ${sourcePath}: expected object`);
+	const parsed = {};
+	for (const [name, raw] of Object.entries(value)) {
+		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();
 	}
-	process.stdout.write("nothing to cancel\n");
+	return parsed;
 }
-function printSetModeResultByFormat(modeId, result, format) {
-	if (emitJsonResult(format, {
-		action: "mode_set",
-		modeId,
-		resumed: result.resumed,
-		acpxRecordId: result.record.acpxRecordId,
-		acpxSessionId: result.record.acpSessionId,
-		agentSessionId: result.record.agentSessionId
-	})) return;
-	if (format === "quiet") {
-		process.stdout.write(`${modeId}\n`);
-		return;
+function parseAuth(value, sourcePath) {
+	if (value == null) return;
+	if (!isObject(value)) throw new Error(`Invalid config auth in ${sourcePath}: expected object`);
+	const parsed = {};
+	for (const [methodId, rawCredential] of Object.entries(value)) {
+		if (typeof rawCredential !== "string" || rawCredential.trim().length === 0) throw new Error(`Invalid config auth.${methodId} in ${sourcePath}: expected non-empty string`);
+		parsed[methodId] = rawCredential;
 	}
-	process.stdout.write(`mode set: ${modeId}\n`);
+	return parsed;
 }
-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",
-		configId,
-		value,
-		resumed: result.resumed,
-		configOptions: result.response.configOptions,
-		acpxRecordId: result.record.acpxRecordId,
-		acpxSessionId: result.record.acpSessionId,
-		agentSessionId: result.record.agentSessionId
-	})) return;
-	if (format === "quiet") {
-		process.stdout.write(`${value}\n`);
-		return;
-	}
-	process.stdout.write(`config set: ${configId}=${value} (${result.response.configOptions.length} options)\n`);
+function parseDisableExec(value, sourcePath) {
+	if (value == null) return;
+	if (typeof value !== "boolean") throw new Error(`Invalid config disableExec in ${sourcePath}: expected boolean`);
+	return value;
 }
-async function handleCancel(explicitAgentName, flags, command, config) {
-	const globalFlags = resolveGlobalFlags(command, config);
-	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
-	const { cancelSessionPrompt } = await loadSessionModule();
-	const walkBoundary = findGitRepositoryRoot(agent.cwd) ?? agent.cwd;
-	const record = await findSessionByDirectoryWalk({
-		agentCommand: agent.agentCommand,
-		cwd: agent.cwd,
-		name: resolveSessionNameFromFlags(flags, command),
-		boundary: walkBoundary
-	});
-	if (!record) {
-		printCancelResultByFormat({
-			sessionId: "",
-			cancelled: false
-		}, globalFlags.format);
-		return;
+async function readConfigFile(filePath) {
+	try {
+		const payload = await fs$1.readFile(filePath, "utf8");
+		let parsed;
+		try {
+			parsed = JSON.parse(payload);
+		} catch (error) {
+			const reason = error instanceof Error ? error.message : String(error);
+			throw new Error(`Invalid JSON in ${filePath}: ${reason}`, { cause: error });
+		}
+		if (!isObject(parsed)) throw new Error(`Invalid config in ${filePath}: expected top-level JSON object`);
+		return {
+			config: parsed,
+			exists: true
+		};
+	} catch (error) {
+		if (error.code === "ENOENT") return { exists: false };
+		throw error;
 	}
-	printCancelResultByFormat(await cancelSessionPrompt({
-		sessionId: record.acpxRecordId,
-		verbose: globalFlags.verbose
-	}), globalFlags.format);
 }
-async function handleSetMode(explicitAgentName, modeId, flags, command, config) {
-	const globalFlags = resolveGlobalFlags(command, config);
-	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
-	const { setSessionMode } = await loadSessionModule();
-	const result = await setSessionMode({
-		sessionId: (await findRoutedSessionOrThrow(agent.agentCommand, agent.agentName, agent.cwd, resolveSessionNameFromFlags(flags, command))).acpxRecordId,
-		modeId,
-		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`);
-	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);
+function mergeAgents(globalAgents, projectAgents) {
+	return {
+		...globalAgents,
+		...projectAgents
+	};
 }
-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({
-		sessionId: (await findRoutedSessionOrThrow(agent.agentCommand, agent.agentName, agent.cwd, resolveSessionNameFromFlags(flags, command))).acpxRecordId,
-		configId: resolvedConfigId,
-		value,
-		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`);
-	printSetConfigOptionResultByFormat(configId, value, result, globalFlags.format);
+function mergeAuth(globalAuth, projectAuth) {
+	return {
+		...globalAuth,
+		...projectAuth
+	};
 }
-async function handleSessionsList(explicitAgentName, command, config) {
-	const globalFlags = resolveGlobalFlags(command, config);
-	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
-	const [{ listSessionsForAgent }, { printSessionsByFormat }] = await Promise.all([loadSessionModule(), loadOutputRenderModule()]);
-	printSessionsByFormat(await listSessionsForAgent(agent.agentCommand), globalFlags.format);
+async function loadResolvedConfig(cwd) {
+	const globalPath = defaultGlobalConfigPath();
+	const projectPath = projectConfigPath(cwd);
+	const [globalResult, projectResult] = await Promise.all([readConfigFile(globalPath), readConfigFile(projectPath)]);
+	const globalConfig = globalResult.config;
+	const projectConfig = projectResult.config;
+	const defaultAgent = parseDefaultAgent(projectConfig?.defaultAgent, projectPath) ?? parseDefaultAgent(globalConfig?.defaultAgent, globalPath) ?? "codex";
+	const defaultPermissions = parsePermissionMode(projectConfig?.defaultPermissions, projectPath) ?? parsePermissionMode(globalConfig?.defaultPermissions, globalPath) ?? DEFAULT_PERMISSION_MODE;
+	const nonInteractivePermissions = parseNonInteractivePermissionPolicy(projectConfig?.nonInteractivePermissions, projectPath) ?? parseNonInteractivePermissionPolicy(globalConfig?.nonInteractivePermissions, globalPath) ?? DEFAULT_NON_INTERACTIVE_PERMISSION_POLICY;
+	const authPolicy = parseAuthPolicy(projectConfig?.authPolicy, projectPath) ?? parseAuthPolicy(globalConfig?.authPolicy, globalPath) ?? DEFAULT_AUTH_POLICY;
+	const ttlMs = parseTtlMs(projectConfig?.ttl, projectPath) ?? parseTtlMs(globalConfig?.ttl, globalPath) ?? DEFAULT_TTL_MS;
+	const timeoutConfiguredInProject = projectConfig != null && Object.prototype.hasOwnProperty.call(projectConfig, "timeout");
+	const timeoutConfiguredInGlobal = globalConfig != null && Object.prototype.hasOwnProperty.call(globalConfig, "timeout");
+	let timeoutMs = DEFAULT_TIMEOUT_MS;
+	if (timeoutConfiguredInProject) timeoutMs = parseTimeoutMs(projectConfig?.timeout, projectPath);
+	else if (timeoutConfiguredInGlobal) timeoutMs = parseTimeoutMs(globalConfig?.timeout, globalPath);
+	const format = parseOutputFormat(projectConfig?.format, projectPath) ?? parseOutputFormat(globalConfig?.format, globalPath) ?? DEFAULT_OUTPUT_FORMAT;
+	const queueMaxDepth = parseQueueMaxDepth(projectConfig?.queueMaxDepth, projectPath) ?? parseQueueMaxDepth(globalConfig?.queueMaxDepth, globalPath) ?? DEFAULT_QUEUE_MAX_DEPTH;
+	const agents = mergeAgents(parseAgents(globalConfig?.agents, globalPath), parseAgents(projectConfig?.agents, projectPath));
+	const auth = mergeAuth(parseAuth(globalConfig?.auth, globalPath), parseAuth(projectConfig?.auth, projectPath));
+	const mcpServersConfiguredInProject = projectConfig != null && Object.prototype.hasOwnProperty.call(projectConfig, "mcpServers");
+	const mcpServersConfiguredInGlobal = globalConfig != null && Object.prototype.hasOwnProperty.call(globalConfig, "mcpServers");
+	let mcpServers = [];
+	if (mcpServersConfiguredInProject) mcpServers = parseMcpServers(projectConfig?.mcpServers, projectPath);
+	else if (mcpServersConfiguredInGlobal) mcpServers = parseMcpServers(globalConfig?.mcpServers, globalPath);
+	const disableExec = parseDisableExec(projectConfig?.disableExec, projectPath) ?? parseDisableExec(globalConfig?.disableExec, globalPath) ?? DEFAULT_DISABLE_EXEC;
+	return {
+		defaultAgent,
+		defaultPermissions,
+		nonInteractivePermissions,
+		authPolicy,
+		ttlMs,
+		timeoutMs,
+		queueMaxDepth,
+		format,
+		agents,
+		auth,
+		disableExec,
+		mcpServers,
+		globalPath,
+		projectPath,
+		hasGlobalConfig: globalResult.exists,
+		hasProjectConfig: projectResult.exists
+	};
 }
-async function handleSessionsClose(explicitAgentName, sessionName, command, config) {
-	const globalFlags = resolveGlobalFlags(command, config);
-	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
-	const [{ closeSession }, { printClosedSessionByFormat }] = await Promise.all([loadSessionModule(), loadOutputRenderModule()]);
-	const record = await findSession({
-		agentCommand: agent.agentCommand,
-		cwd: agent.cwd,
-		name: sessionName
-	});
-	if (!record) {
-		if (sessionName) throw new Error(`No named session "${sessionName}" for cwd ${agent.cwd} and agent ${agent.agentName}`);
-		throw new Error(`No cwd session for ${agent.cwd} and agent ${agent.agentName}`);
-	}
-	printClosedSessionByFormat(await closeSession(record.acpxRecordId), globalFlags.format);
+function toConfigDisplay(config) {
+	const agents = {};
+	for (const [name, command] of Object.entries(config.agents)) agents[name] = { command };
+	return {
+		defaultAgent: config.defaultAgent,
+		defaultPermissions: config.defaultPermissions,
+		nonInteractivePermissions: config.nonInteractivePermissions,
+		authPolicy: config.authPolicy,
+		ttl: Math.round(config.ttlMs / 1e3),
+		timeout: config.timeoutMs == null ? null : config.timeoutMs / 1e3,
+		queueMaxDepth: config.queueMaxDepth,
+		format: config.format,
+		agents,
+		authMethods: Object.keys(config.auth).toSorted(),
+		disableExec: config.disableExec
+	};
 }
-async function handleSessionsNew(explicitAgentName, flags, command, config) {
-	const globalFlags = resolveGlobalFlags(command, config);
-	const permissionMode = resolvePermissionMode(globalFlags, config.defaultPermissions);
-	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
-	const [{ createSession, closeSession }, { printCreatedSessionBanner, printNewSessionByFormat }] = await Promise.all([loadSessionModule(), loadOutputRenderModule()]);
-	const replaced = await findSession({
-		agentCommand: agent.agentCommand,
-		cwd: agent.cwd,
-		name: flags.name
-	});
-	if (replaced) {
-		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
-		}
-	});
-	printCreatedSessionBanner(created, agent.agentName, globalFlags.format, globalFlags.jsonStrict);
-	if (globalFlags.verbose) {
-		const scope = flags.name ? `named session "${flags.name}"` : "cwd session";
-		process.stderr.write(`[acpx] created ${scope}: ${created.acpxRecordId}\n`);
-	}
-	printNewSessionByFormat(created, replaced, globalFlags.format);
+async function initGlobalConfigFile() {
+	const configPath = defaultGlobalConfigPath();
+	await fs$1.mkdir(path.dirname(configPath), { recursive: true });
+	try {
+		await fs$1.access(configPath);
+		return {
+			path: configPath,
+			created: false
+		};
+	} catch {}
+	const payload = {
+		defaultAgent: DEFAULT_AGENT_NAME,
+		defaultPermissions: "approve-all",
+		nonInteractivePermissions: "deny",
+		authPolicy: "skip",
+		ttl: 300,
+		timeout: null,
+		queueMaxDepth: DEFAULT_QUEUE_MAX_DEPTH,
+		format: "text",
+		agents: {},
+		auth: {}
+	};
+	await fs$1.writeFile(configPath, `${JSON.stringify(payload, null, 2)}\n`, "utf8");
+	return {
+		path: configPath,
+		created: true
+	};
 }
-async function handleSessionsEnsure(explicitAgentName, flags, command, config) {
+//#endregion
+//#region src/cli/config-command.ts
+async function handleConfigShow(command, config) {
 	const globalFlags = resolveGlobalFlags(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
-		}
-	});
-	if (result.created) printCreatedSessionBanner(result.record, agent.agentName, globalFlags.format, globalFlags.jsonStrict);
-	printEnsuredSessionByFormat(result.record, result.created, globalFlags.format);
-}
-function userContentToText(content) {
-	if ("Text" in content) return content.Text;
-	if ("Mention" in content) return content.Mention.content;
-	if ("Image" in content) return content.Image.source || "[image]";
-	return "";
-}
-function agentContentToText(content) {
-	if ("Text" in content) return content.Text;
-	if ("Thinking" in content) return content.Thinking.text;
-	if ("RedactedThinking" in content) return "[redacted_thinking]";
-	if ("ToolUse" in content) return `[tool:${content.ToolUse.name}]`;
-	return "";
-}
-function conversationHistoryEntries(record) {
-	const entries = [];
-	for (const message of record.messages) {
-		if (message === "Resume") continue;
-		if ("User" in message) {
-			const text = message.User.content.map((entry) => userContentToText(entry)).join(" ").trim();
-			if (!text) continue;
-			entries.push({
-				role: "user",
-				timestamp: record.updated_at,
-				textPreview: text
-			});
-			continue;
-		}
-		if ("Agent" in message) {
-			const text = message.Agent.content.map((entry) => agentContentToText(entry)).join(" ").trim();
-			if (!text) continue;
-			entries.push({
-				role: "assistant",
-				timestamp: record.updated_at,
-				textPreview: text
-			});
+	const payload = {
+		...toConfigDisplay(config),
+		paths: {
+			global: config.globalPath,
+			project: config.projectPath
+		},
+		loaded: {
+			global: config.hasGlobalConfig,
+			project: config.hasProjectConfig
 		}
-	}
-	return entries;
-}
-function printSessionDetailsByFormat(record, format) {
-	if (format === "json") {
-		process.stdout.write(`${JSON.stringify(record)}\n`);
-		return;
-	}
-	if (format === "quiet") {
-		process.stdout.write(`${record.acpxRecordId}\n`);
+	};
+	if (globalFlags.format === "json") {
+		process.stdout.write(`${JSON.stringify(payload)}\n`);
 		return;
 	}
-	process.stdout.write(`id: ${record.acpxRecordId}\n`);
-	process.stdout.write(`sessionId: ${record.acpSessionId}\n`);
-	process.stdout.write(`agentSessionId: ${record.agentSessionId ?? "-"}\n`);
-	process.stdout.write(`agent: ${record.agentCommand}\n`);
-	process.stdout.write(`cwd: ${record.cwd}\n`);
-	process.stdout.write(`name: ${record.name ?? "-"}\n`);
-	process.stdout.write(`created: ${record.createdAt}\n`);
-	process.stdout.write(`lastActivity: ${record.lastUsedAt}\n`);
-	process.stdout.write(`lastPrompt: ${record.lastPromptAt ?? "-"}\n`);
-	process.stdout.write(`closed: ${record.closed ? "yes" : "no"}\n`);
-	process.stdout.write(`closedAt: ${record.closedAt ?? "-"}\n`);
-	process.stdout.write(`pid: ${record.pid ?? "-"}\n`);
-	process.stdout.write(`agentStartedAt: ${record.agentStartedAt ?? "-"}\n`);
-	process.stdout.write(`lastExitCode: ${record.lastAgentExitCode ?? "-"}\n`);
-	process.stdout.write(`lastExitSignal: ${record.lastAgentExitSignal ?? "-"}\n`);
-	process.stdout.write(`lastExitAt: ${record.lastAgentExitAt ?? "-"}\n`);
-	process.stdout.write(`disconnectReason: ${record.lastAgentDisconnectReason ?? "-"}\n`);
-	process.stdout.write(`historyEntries: ${conversationHistoryEntries(record).length}\n`);
+	process.stdout.write(`${JSON.stringify(payload, null, 2)}\n`);
 }
-function printSessionHistoryByFormat(record, limit, format) {
-	const history = conversationHistoryEntries(record);
-	const visible = limit === 0 ? history : history.slice(Math.max(0, history.length - limit));
-	if (format === "json") {
-		process.stdout.write(`${JSON.stringify({
-			id: record.acpxRecordId,
-			sessionId: record.acpSessionId,
-			limit,
-			count: visible.length,
-			entries: visible
+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 (format === "quiet") {
-		for (const entry of visible) process.stdout.write(`${entry.textPreview}\n`);
+	if (globalFlags.format === "quiet") {
+		process.stdout.write(`${result.path}\n`);
 		return;
 	}
-	process.stdout.write(`session: ${record.acpxRecordId} (${visible.length}/${history.length} shown)\n`);
-	if (visible.length === 0) {
-		process.stdout.write("No history\n");
+	if (result.created) {
+		process.stdout.write(`Created ${result.path}\n`);
 		return;
 	}
-	for (const entry of visible) process.stdout.write(`${entry.timestamp}\t${entry.role}\t${entry.textPreview}\n`);
+	process.stdout.write(`Config already exists: ${result.path}\n`);
 }
-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
+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);
 	});
-	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);
 }
-async function handleSessionsHistory(explicitAgentName, sessionName, flags, command, 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: sessionName,
-		includeClosed: true
+		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);
 	});
-	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);
 }
+//#endregion
+//#region src/cli/command-registration.ts
 function registerSessionsCommand(parent, explicitAgentName, config) {
 	const sessionsCommand = parent.command("sessions").description("List, ensure, create, or close sessions for this agent");
 	sessionsCommand.action(async function() {
@@ -1098,7 +1030,7 @@ function registerSessionsCommand(parent, explicitAgentName, config) {
 	sessionsCommand.command("show").description("Show session metadata for current cwd").argument("[name]", "Session name", parseSessionName).action(async function(name) {
 		await handleSessionsShow(explicitAgentName, name, this, config);
 	});
-	sessionsCommand.command("history").description("Show recent session history entries").argument("[name]", "Session name", parseSessionName).option("--limit <count>", "Maximum number of entries to show (default: 20)", parseHistoryLimit, 20).action(async function(name, flags) {
+	sessionsCommand.command("history").description("Show recent session history entries").argument("[name]", "Session name", parseSessionName).option("--limit <count>", `Maximum number of entries to show (default: 20)`, parseHistoryLimit, 20).action(async function(name, flags) {
 		await handleSessionsHistory(explicitAgentName, name, flags, this, 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) {
@@ -1153,7 +1085,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-idpWyCOs.js");
+		const { handleFlowRun } = await import("./cli-CLRrs6eQ.js");
 		await handleFlowRun(file, flags, this, config);
 	});
 }
@@ -1170,6 +1102,103 @@ function registerDefaultCommands(program, config) {
 	registerConfigCommand(program, config);
 	registerFlowCommand(program, config);
 }
+//#endregion
+//#region src/cli/queue/owner-env.ts
+function asRecord(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return;
+	return value;
+}
+function parseQueueOwnerPayload(raw) {
+	const record = asRecord(JSON.parse(raw));
+	if (!record) throw new Error("queue owner payload must be an object");
+	if (typeof record.sessionId !== "string" || record.sessionId.trim().length === 0) throw new Error("queue owner payload missing sessionId");
+	if (record.permissionMode !== "approve-all" && record.permissionMode !== "approve-reads" && record.permissionMode !== "deny-all") throw new Error("queue owner payload has invalid permissionMode");
+	const options = {
+		sessionId: record.sessionId,
+		permissionMode: record.permissionMode
+	};
+	const parsedMcpServers = parseOptionalMcpServers(record.mcpServers, "queue owner payload");
+	if (parsedMcpServers) options.mcpServers = parsedMcpServers;
+	if (typeof record.nonInteractivePermissions === "string") options.nonInteractivePermissions = record.nonInteractivePermissions === "deny" || record.nonInteractivePermissions === "fail" ? record.nonInteractivePermissions : void 0;
+	if (record.authCredentials && typeof record.authCredentials === "object") {
+		const entries = Object.entries(record.authCredentials).filter(([, value]) => typeof value === "string");
+		options.authCredentials = Object.fromEntries(entries);
+	}
+	if (record.authPolicy === "skip" || record.authPolicy === "fail") options.authPolicy = record.authPolicy;
+	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));
+	return options;
+}
+async function runQueueOwnerFromEnv(env) {
+	const payload = env.ACPX_QUEUE_OWNER_PAYLOAD;
+	if (!payload) throw new Error("missing ACPX_QUEUE_OWNER_PAYLOAD");
+	await runSessionQueueOwner(parseQueueOwnerPayload(payload));
+}
+//#endregion
+//#region src/version.ts
+const UNKNOWN_VERSION = "0.0.0-unknown";
+const MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
+let cachedVersion = null;
+function parseVersion(value) {
+	if (typeof value !== "string") return null;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : null;
+}
+function readPackageVersion(packageJsonPath) {
+	try {
+		return parseVersion(JSON.parse(readFileSync(packageJsonPath, "utf8")).version);
+	} catch {
+		return null;
+	}
+}
+function resolveVersionFromAncestors(startDir) {
+	let current = startDir;
+	while (true) {
+		const packageVersion = readPackageVersion(path.join(current, "package.json"));
+		if (packageVersion) return packageVersion;
+		const parent = path.dirname(current);
+		if (parent === current) return null;
+		current = parent;
+	}
+}
+function resolveAcpxVersion(params) {
+	const env = params?.env ?? process.env;
+	const envPackageName = parseVersion(env.npm_package_name);
+	const envVersion = parseVersion(env.npm_package_version);
+	if (envPackageName === "acpx" && envVersion) return envVersion;
+	if (params?.packageJsonPath) return readPackageVersion(params.packageJsonPath) ?? UNKNOWN_VERSION;
+	return resolveVersionFromAncestors(MODULE_DIR) ?? UNKNOWN_VERSION;
+}
+function getAcpxVersion() {
+	if (cachedVersion) return cachedVersion;
+	cachedVersion = resolveAcpxVersion();
+	return cachedVersion;
+}
+//#endregion
+//#region src/cli-core.ts
+const TOP_LEVEL_VERBS = new Set([
+	"prompt",
+	"exec",
+	"cancel",
+	"flow",
+	"set-mode",
+	"set",
+	"sessions",
+	"status",
+	"config",
+	"help"
+]);
+let skillflagModulePromise;
+function loadSkillflagModule() {
+	skillflagModulePromise ??= import("skillflag");
+	return skillflagModulePromise;
+}
+function shouldMaybeHandleSkillflag(argv) {
+	return argv.some((token) => token === "--skill" || token.startsWith("--skill="));
+}
 function detectAgentToken(argv) {
 	let hasAgentOverride = false;
 	for (let index = 0; index < argv.length; index += 1) {
@@ -1193,7 +1222,7 @@ function detectAgentToken(argv) {
 			continue;
 		}
 		if (token.startsWith("--cwd=") || token.startsWith("--auth-policy=") || token.startsWith("--non-interactive-permissions=") || token.startsWith("--format=") || token.startsWith("--model=") || token.startsWith("--allowed-tools=") || token.startsWith("--max-turns=") || token.startsWith("--json-strict=") || token.startsWith("--timeout=") || token.startsWith("--ttl=") || token.startsWith("--file=")) continue;
-		if (token === "--approve-all" || token === "--approve-reads" || token === "--deny-all" || token === "--json-strict" || token === "--verbose") continue;
+		if (token === "--approve-all" || token === "--approve-reads" || token === "--deny-all" || token === "--json-strict" || token === "--verbose" || token === "--suppress-reads") continue;
 		return { hasAgentOverride };
 	}
 	return { hasAgentOverride };
@@ -1237,13 +1266,11 @@ function detectJsonStrict(argv) {
 	for (let index = 0; index < argv.length; index += 1) {
 		const token = argv[index];
 		if (token === "--") break;
-		if (token === "--json-strict") return true;
-		if (token.startsWith("--json-strict=")) return true;
+		if (token === "--json-strict" || token.startsWith("--json-strict=")) return true;
 	}
 	return false;
 }
 async function emitJsonErrorEvent(error) {
-	const { createOutputFormatter } = await loadOutputModule();
 	const formatter = createOutputFormatter("json", {
 		jsonContext: { sessionId: "unknown" },
 		suppressReads: false
@@ -1257,8 +1284,11 @@ function isOutputAlreadyEmitted(error) {
 }
 async function emitRequestedError(error, normalized, outputPolicy) {
 	if (isOutputAlreadyEmitted(error)) return;
-	if (outputPolicy.format === "json") await emitJsonErrorEvent(normalized);
-	else if (!outputPolicy.suppressNonJsonStderr) process.stderr.write(`${normalized.message}\n`);
+	if (outputPolicy.format === "json") {
+		await emitJsonErrorEvent(normalized);
+		return;
+	}
+	if (!outputPolicy.suppressNonJsonStderr) process.stderr.write(`${normalized.message}\n`);
 }
 async function runWithOutputPolicy(_outputPolicy, run) {
 	return await run();
@@ -1287,13 +1317,13 @@ async function main(argv = process.argv) {
 			includeBundledSkill: false
 		});
 	}
-	const config = await loadResolvedConfig(detectInitialCwd(argv.slice(2)));
-	const requestedJsonStrict = detectJsonStrict(argv.slice(2));
+	const rawArgs = argv.slice(2);
+	const config = await loadResolvedConfig(detectInitialCwd(rawArgs));
+	const requestedJsonStrict = detectJsonStrict(rawArgs);
 	const requestedOutputPolicy = {
-		...resolveOutputPolicy(detectRequestedOutputFormat(argv.slice(2), config.format), requestedJsonStrict),
-		suppressReads: argv.slice(2).some((token) => token === "--suppress-reads")
+		...resolveOutputPolicy(detectRequestedOutputFormat(rawArgs, config.format), requestedJsonStrict),
+		suppressReads: rawArgs.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();
 	if (requestedJsonStrict) program.configureOutput({
@@ -1301,41 +1331,20 @@ async function main(argv = process.argv) {
 		writeErr: () => {}
 	});
 	addGlobalFlags(program);
-	for (const agentName of builtInAgents) registerAgentCommand(program, agentName, config);
-	registerDefaultCommands(program, config);
-	const scan = detectAgentToken(argv.slice(2));
-	if (!scan.hasAgentOverride && scan.token && !TOP_LEVEL_VERBS.has(scan.token) && !builtInAgents.includes(scan.token)) registerAgentCommand(program, scan.token, config);
-	program.argument("[prompt...]", "Prompt text").action(async function(promptParts) {
-		if (promptParts.length === 0 && process.stdin.isTTY) {
-			if (requestedJsonStrict) throw new InvalidArgumentError("Prompt is required (pass as argument, --file, or pipe via stdin)");
-			this.outputHelp();
-			return;
+	configurePublicCli({
+		program,
+		argv: rawArgs,
+		config,
+		requestedJsonStrict,
+		topLevelVerbs: TOP_LEVEL_VERBS,
+		listBuiltInAgents,
+		detectAgentToken,
+		registerAgentCommand,
+		registerDefaultCommands,
+		handlePromptAction: async (command, promptParts) => {
+			await handlePrompt(void 0, promptParts, {}, command, config);
 		}
-		await handlePrompt(void 0, promptParts, {}, this, config);
 	});
-	program.addHelpText("after", `
-Examples:
-  acpx pi "review recent changes"
-  acpx openclaw exec "summarize active session state"
-  acpx codex sessions new
-  acpx codex "fix the tests"
-  acpx codex prompt "fix the tests"
-  acpx codex --no-wait "queue follow-up task"
-  acpx codex exec "what does this repo do"
-  acpx codex cancel
-  acpx codex set-mode plan
-  acpx codex set thought_level high
-  acpx codex -s backend "fix the API"
-  acpx codex sessions
-  acpx codex sessions new --name backend
-  acpx codex sessions ensure --name backend
-  acpx codex sessions close backend
-  acpx codex status
-  acpx config show
-  acpx config init
-  acpx --ttl 30 codex "investigate flaky tests"
-  acpx claude "refactor auth"
-  acpx --agent ./my-custom-server "do something"`);
 	program.exitOverride((error) => {
 		throw error;
 	});