acpx 0.17.1 → 0.19.0

package/dist/cli.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
-import { n as getTextErrorRemediationHints, o as __exportAll, t as createOutputFormatter } from "./output-D2xL6wdp.js";
-import { A as listSessions, At as AgentSpawnError, C as textPrompt, D as findSession, E as findGitRepositoryRoot, I as writeSessionRecord, M as normalizeName, O as findSessionByDirectoryWalk, Ot as AcpxOperationalError, R as parseSessionRecord, V as normalizeAgentSessionId, b as mergePromptSourceWithText, bt as EXIT_CODES, ct as defaultSessionEventLog, dt as sessionEventLockPath, ht as isProcessAlive, pt as writePrivateFile, u as probeQueueOwnerHealth, ut as sessionEventActivePath, v as PromptInputValidationError, wt as OUTPUT_FORMATS, x as parsePromptSource, z as serializeSessionRecordForDisk } from "./ipc-D2rstexT.js";
-import { X as getAcpxVersion, ct as normalizeOutputError, d as flushPerfMetricsCapture, et as listSessionEvents, f as installPerfMetricsCapture, i as runOnce, n as runSessionQueueOwner, nt as InterruptedError, rt as TimeoutError, s as DISCARD_OUTPUT_FORMATTER, st as exitCodeForOutputErrorCode, tt as isLegacyZedCodexAcpInvocation, u as buildQueueOwnerArgOverride } from "./queue-owner-runtime-Dgv3e2Tp.js";
-import { O as renderArgvIdentity, i as DEFAULT_AGENT_NAME, l as normalizeAgentName$1, s as listBuiltInAgents } from "./agent-registry-evUoJINz.js";
-import { C as resolvePermissionMode, S as resolveOutputPolicy, T as toTimerMilliseconds, _ as parseSessionName, a as addGlobalFlags, b as resolveAgentInvocation, c as addSessionOption, d as parseDaysOlderThan, f as parseHistoryLimit, g as parsePruneBeforeDate, h as parseOutputFormat$1, i as addExecConfigOption, m as parseNonEmptyValue, n as sessionConnectionOptions, o as addPromptInputOption, p as parseMaxTurns, r as sessionOptionsFromGlobalFlags, s as addSessionNameOption, t as resolvePermissionPolicyFromFlags, u as parseAllowedTools, v as parseTimeoutSeconds, w as resolveSessionNameFromFlags, x as resolveGlobalFlags, y as parseTtlSeconds } from "./invocation-options-eZEBh4vd.js";
+import { n as getTextErrorRemediationHints, o as __exportAll, t as createOutputFormatter } from "./output-D6kDs8BN.js";
+import { A as findGitRepositoryRoot, B as writeSessionRecord, D as textPrompt, G as normalizeAgentSessionId, H as parseSessionRecord, I as normalizeName, M as findSessionByDirectoryWalk, Mt as AcpxOperationalError, Ot as OUTPUT_FORMATS, P as listSessions, Pt as AgentSpawnError, S as PromptInputValidationError, T as parsePromptSource, U as serializeSessionRecordForDisk, _t as writePrivateFile, ft as defaultSessionEventLog, ht as sessionEventLockPath, j as findSession, mt as sessionEventActivePath, u as probeQueueOwnerHealth, w as mergePromptSourceWithText, wt as EXIT_CODES, yt as isProcessAlive } from "./ipc-fMgj5vrO.js";
+import { $ as getAcpxVersion, at as InterruptedError, d as flushPerfMetricsCapture, dt as normalizeOutputError, f as installPerfMetricsCapture, i as runOnce, it as isLegacyZedCodexAcpInvocation, n as runSessionQueueOwner, ot as TimeoutError, rt as listSessionEvents, s as DISCARD_OUTPUT_FORMATTER, u as buildQueueOwnerArgOverride, ut as exitCodeForOutputErrorCode } from "./queue-owner-runtime-CLwjMYNL.js";
+import { O as renderArgvIdentity, i as DEFAULT_AGENT_NAME, l as normalizeAgentName$1, s as listBuiltInAgents } from "./agent-registry-Ct2yWPW7.js";
+import { C as resolvePermissionMode, D as toTimerMilliseconds, E as resolveSessionsListFlags, S as resolveOutputPolicy, T as resolveSessionNameFromFlags, _ as parseSessionName, a as addGlobalFlags, b as resolveAgentInvocation, c as addSessionOption, d as parseDaysOlderThan, f as parseHistoryLimit, g as parsePruneBeforeDate, h as parseOutputFormat$1, i as addExecConfigOption, m as parseNonEmptyValue, n as sessionConnectionOptions, o as addPromptInputOption, p as parseMaxTurns, r as sessionOptionsFromGlobalFlags, s as addSessionNameOption, t as resolvePermissionPolicyFromFlags, u as parseAllowedTools, v as parseTimeoutSeconds, w as resolvePromptFlags, x as resolveGlobalFlags, y as parseTtlSeconds } from "./invocation-options-DRzxHZmr.js";
 import { realpathSync } from "node:fs";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import path from "node:path";
@@ -402,11 +402,11 @@ let sessionModulePromise;
 let outputModulePromise;
 let outputRenderModulePromise;
 function loadSessionModule() {
-	sessionModulePromise ??= import("./output-D2xL6wdp.js").then((n) => n.a);
+	sessionModulePromise ??= import("./output-D6kDs8BN.js").then((n) => n.a);
 	return sessionModulePromise;
 }
 function loadOutputModule() {
-	outputModulePromise ??= import("./output-D2xL6wdp.js").then((n) => n.r);
+	outputModulePromise ??= import("./output-D6kDs8BN.js").then((n) => n.r);
 	return outputModulePromise;
 }
 function loadOutputRenderModule() {
@@ -483,11 +483,12 @@ async function findRoutedSessionOrThrow(agentCommand, agentName, cwd, sessionNam
 	throw new NoSessionError(`⚠ No acpx session found (searched up to ${walkBoundary}).\nCreate one: ${sessionName ? `acpx ${agentName} sessions new --name ${sessionName}` : `acpx ${agentName} sessions new`}`);
 }
 async function handlePrompt(explicitAgentName, promptParts, flags, command, config) {
+	const promptFlags = resolvePromptFlags(flags, command);
 	const globalFlags = resolveGlobalFlags(command, config);
 	const outputPolicy = resolveRequestedOutputPolicy(globalFlags);
 	const permissionMode = resolvePermissionMode(globalFlags, config.defaultPermissions);
 	const permissionPolicy = await resolvePermissionPolicyFromFlags(globalFlags);
-	const prompt = await readPromptInput(flags.file, promptParts.join(" "), globalFlags.cwd);
+	const prompt = await readPromptInput(promptFlags.file, promptParts.join(" "), globalFlags.cwd);
 	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
 	const [{ createOutputFormatter }, { printPromptSessionBanner, printQueuedPromptByFormat }, { sendSession }] = await Promise.all([
 		loadOutputModule(),
@@ -514,7 +515,7 @@ async function handlePrompt(explicitAgentName, promptParts, flags, command, conf
 		ttlMs: globalFlags.ttl,
 		maxQueueDepth: config.queueMaxDepth,
 		promptRetries: globalFlags.promptRetries,
-		waitForCompletion: flags.wait !== false,
+		waitForCompletion: promptFlags.wait,
 		sessionOptions: sessionOptionsFromGlobalFlags(globalFlags)
 	});
 	if ("queued" in result) {
@@ -525,24 +526,15 @@ async function handlePrompt(explicitAgentName, promptParts, flags, command, conf
 	if (globalFlags.verbose && result.loadError) process.stderr.write(`[acpx] session reconnect failed, started fresh session: ${result.loadError}\n`);
 }
 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);
+	if (config.disableExec) throw new AcpxOperationalError("exec subcommand is disabled by configuration (disableExec: true)", {
+		outputCode: "EXEC_DISABLED",
+		origin: "cli"
+	});
 	const outputPolicy = resolveRequestedOutputPolicy(globalFlags);
 	const permissionMode = resolvePermissionMode(globalFlags, config.defaultPermissions);
 	const permissionPolicy = await resolvePermissionPolicyFromFlags(globalFlags);
-	const prompt = await readPromptInput(flags.file, promptParts.join(" "), globalFlags.cwd);
+	const prompt = await readPromptInput(resolvePromptFlags(flags, command).file, promptParts.join(" "), globalFlags.cwd);
 	const [{ createOutputFormatter }, { runOnce }] = await Promise.all([loadOutputModule(), loadSessionModule()]);
 	const outputFormatter = createOutputFormatter(outputPolicy.format, { suppressReads: outputPolicy.suppressReads });
 	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
@@ -694,17 +686,18 @@ async function tryListAgentSessions(agent, flags, globalFlags, config) {
 	}
 }
 async function handleSessionsList(explicitAgentName, flags, command, config) {
+	const listFlags = resolveSessionsListFlags(flags, command);
 	const globalFlags = resolveGlobalFlags(command, config);
 	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
-	const filterCwd = resolveSessionListFilterCwd(flags, agent.cwd);
-	if (flags.local) {
-		if (flags.cursor) throw new InvalidArgumentError("--cursor cannot be combined with --local");
+	const filterCwd = resolveSessionListFilterCwd(listFlags, agent.cwd);
+	if (listFlags.local) {
+		if (listFlags.cursor) throw new InvalidArgumentError("--cursor cannot be combined with --local");
 		await printLocalSessionsList(agent.agentCommand, filterCwd, globalFlags.format);
 		return;
 	}
-	const [result, { printAgentSessionsByFormat }] = await Promise.all([tryListAgentSessions(agent, flags, globalFlags, config), loadOutputRenderModule()]);
+	const [result, { printAgentSessionsByFormat }] = await Promise.all([tryListAgentSessions(agent, listFlags, globalFlags, config), loadOutputRenderModule()]);
 	if (!result || result === "spawn-failed") {
-		if (result !== "spawn-failed" && (flags.cursor || flags.filterCwd)) throw new Error(`Agent command "${agent.agentCommand}" does not advertise sessionCapabilities.list; cannot use agent-side session/list filters`);
+		if (result !== "spawn-failed" && (listFlags.cursor || listFlags.filterCwd)) throw new Error(`Agent command "${agent.agentCommand}" does not advertise sessionCapabilities.list; cannot use agent-side session/list filters`);
 		await printLocalSessionsList(agent.agentCommand, void 0, globalFlags.format);
 		return;
 	}
@@ -880,18 +873,19 @@ async function handleSessionsHistory(explicitAgentName, sessionName, flags, comm
 async function handleSessionsWatch(explicitAgentName, flags, command, config) {
 	const globalFlags = resolveGlobalFlags(command, config);
 	const agent = resolveAgentInvocation(explicitAgentName, globalFlags, config);
+	const sessionName = resolveSessionNameFromFlags({ session: flags.name }, command);
 	const scope = {
 		agentCommand: agent.agentCommand,
 		cwd: agent.cwd,
-		name: flags.name,
+		name: sessionName,
 		readOnly: true
 	};
 	const record = await findSession(scope) ?? await findSession({
 		...scope,
 		includeClosed: true
 	});
-	if (!record) throw new Error(missingScopedSessionMessage(agent, flags.name));
-	const { runSessionWatch } = await import("./session-watch-CTe9Bnbc.js");
+	if (!record) throw new Error(missingScopedSessionMessage(agent, sessionName));
+	const { runSessionWatch } = await import("./session-watch-BfdIo-n4.js");
 	await runSessionWatch(record, {
 		cursor: flags.cursor,
 		policy: resolveRequestedOutputPolicy(globalFlags)
@@ -951,6 +945,37 @@ async function handleSessionsPrune(explicitAgentName, flags, command, config) {
 	}), globalFlags.format);
 }
 //#endregion
+//#region src/cli/compare-args.ts
+function addCompareOptions(command) {
+	return command.option("--cwd <dir>", "Target workspace").option("--approve-all", "Auto-approve all permission requests").option("--approve-reads", "Auto-approve read/search requests and prompt for writes").option("--deny-all", "Deny all permission requests").option("--timeout <seconds>", "Per-agent timeout in seconds", parseTimeoutSeconds).option("--format <fmt>", "Output format: text, json, quiet", parseOutputFormat$1).option("--json", "Alias for --format json").option("-f, --file <path>", "Read prompt text from file path (use - for stdin)", (value) => parseNonEmptyValue("Prompt file", value)).option("--prompt-file <path>", "Alias for --file", (value) => parseNonEmptyValue("Prompt file", value));
+}
+const VALUE_FLAGS = new Set(addCompareOptions(new Command()).options.filter((option) => option.required).flatMap((option) => [option.long, option.short].filter((flag) => flag !== void 0)));
+function captureCompareOutputFlag(output, token, nextToken) {
+	if (token === "--json") output.json = true;
+	else if (token === "--format") output.format = nextToken;
+	else if (token.startsWith("--format=")) output.format = token.slice(9);
+}
+function scanCompareArgs(argv) {
+	let cwd;
+	const output = {};
+	for (let index = 0; index < argv.length; index += 1) {
+		const token = argv[index];
+		if (token === "--") return {
+			cwd,
+			...output,
+			promptTokens: argv.slice(index + 1)
+		};
+		if (token === "--cwd") cwd = argv[index + 1];
+		else if (token.startsWith("--cwd=")) cwd = token.slice(6);
+		captureCompareOutputFlag(output, token, argv[index + 1]);
+		if (VALUE_FLAGS.has(token)) index += 1;
+	}
+	return {
+		cwd,
+		...output
+	};
+}
+//#endregion
 //#region src/cli/compare-command.ts
 const DEFAULT_COMPARE_TIMEOUT_MS = 3e5;
 const FINAL_MESSAGE_PREVIEW_CHARS = 200;
@@ -972,14 +997,15 @@ function truncate(value, maxChars) {
 	if (value.length <= maxChars) return value;
 	return `${value.slice(0, Math.max(0, maxChars - 3))}...`;
 }
-function promptTokensAfterDoubleDash(command) {
-	const commandName = command.name();
-	const commandIndex = process.argv.findIndex((token, index) => index >= 2 && token === commandName);
-	if (commandIndex < 0) return [];
-	const delimiterIndex = process.argv.findIndex((token, index) => index > commandIndex && token === "--");
-	return delimiterIndex < 0 ? [] : process.argv.slice(delimiterIndex + 1);
-}
-function splitCompareArgs(args, filePath, command) {
+function splitCompareArgs(args, filePath, promptTokens) {
+	if (promptTokens !== void 0) {
+		const agents = args.slice(0, args.length - promptTokens.length);
+		if (agents.length === 0) throw new InvalidArgumentError("At least one agent is required");
+		return {
+			agents,
+			promptText: promptTokens.join(" ")
+		};
+	}
 	if (filePath) {
 		if (args.length === 0) throw new InvalidArgumentError("At least one agent is required");
 		return {
@@ -987,15 +1013,6 @@ function splitCompareArgs(args, filePath, command) {
 			promptText: ""
 		};
 	}
-	const promptTokens = promptTokensAfterDoubleDash(command);
-	if (promptTokens.length > 0) {
-		const agents = args.slice(0, -promptTokens.length);
-		if (agents.length === 0) throw new InvalidArgumentError("At least one agent is required");
-		return {
-			agents,
-			promptText: promptTokens.join(" ")
-		};
-	}
 	if (args.length < 2) throw new InvalidArgumentError("Usage: acpx compare <agent>... '<prompt>'");
 	return {
 		agents: args.slice(0, -1),
@@ -1007,12 +1024,7 @@ function captureUsage(update, capture) {
 	capture.usage = {
 		input_tokens: numberField(source, ["input_tokens", "inputTokens"]) ?? void 0,
 		output_tokens: numberField(source, ["output_tokens", "outputTokens"]) ?? void 0,
-		total_tokens: numberField(source, [
-			"total_tokens",
-			"totalTokens",
-			"size",
-			"used"
-		]) ?? void 0
+		total_tokens: numberField(source, ["total_tokens", "totalTokens"]) ?? void 0
 	};
 }
 function captureSessionUpdate(notification, capture) {
@@ -1149,22 +1161,53 @@ function updateCompareExitCode(rows) {
 	}
 	if (rows.some((row) => row.status === "cancelled")) process.exitCode = EXIT_CODES.TIMEOUT;
 }
+async function runCompareAgents(agents, run) {
+	const rows = [];
+	let interrupted = false;
+	const onInterrupt = () => {
+		interrupted = true;
+	};
+	const signals = [
+		"SIGINT",
+		"SIGTERM",
+		"SIGHUP"
+	];
+	for (const signal of signals) process.once(signal, onInterrupt);
+	try {
+		for (const agentName of agents) {
+			if (interrupted) break;
+			const row = await run(agentName);
+			rows.push(interrupted ? {
+				...row,
+				status: "cancelled",
+				error: "Interrupted"
+			} : row);
+		}
+	} finally {
+		for (const signal of signals) process.off(signal, onInterrupt);
+	}
+	return {
+		rows,
+		interrupted
+	};
+}
 function resolvePromptFile(flags) {
 	if (flags.file && flags.promptFile && flags.file !== flags.promptFile) throw new InvalidArgumentError("Use only one prompt file flag: --file or --prompt-file");
 	return flags.file ?? flags.promptFile;
 }
 function registerCompareCommand(program, config) {
-	program.command("compare").description("Run one prompt across multiple agents and summarize the results").argument("<args...>", "Agents followed by prompt text, or agents with --file").option("--cwd <dir>", "Target workspace").option("--approve-all", "Auto-approve all permission requests").option("--approve-reads", "Auto-approve read/search requests and prompt for writes").option("--deny-all", "Deny all permission requests").option("--timeout <seconds>", "Per-agent timeout in seconds", parseTimeoutSeconds).option("--format <fmt>", "Output format: text, json, quiet", parseOutputFormat$1).option("--json", "Alias for --format json").option("-f, --file <path>", "Read prompt text from file path (use - for stdin)", (value) => parseNonEmptyValue("Prompt file", value)).option("--prompt-file <path>", "Alias for --file", (value) => parseNonEmptyValue("Prompt file", value)).action(async function(args, flags) {
+	addCompareOptions(program.command("compare").description("Run one prompt across multiple agents and summarize the results").argument("<args...>", "Agents followed by prompt text, or agents with --file")).action(async function(args, flags) {
 		if (config.disableExec) throw new Error("compare subcommand is disabled by configuration (disableExec: true)");
 		const globalFlags = resolveGlobalFlags(this, config);
+		if (flags.cwd !== void 0) globalFlags.cwd = path.resolve(flags.cwd);
 		if (globalFlags.agent) throw new InvalidArgumentError("Do not combine compare with --agent; pass agent names");
-		const outputPolicy = resolveOutputPolicy(flags.json === true ? "json" : globalFlags.format, globalFlags.jsonStrict === true);
+		const outputPolicy = resolveOutputPolicy(globalFlags.format, globalFlags.jsonStrict === true);
 		const promptFile = resolvePromptFile(flags);
-		const { agents, promptText } = splitCompareArgs(args, promptFile, this);
+		const { promptTokens } = scanCompareArgs(program.args.slice(1));
+		const { agents, promptText } = splitCompareArgs(args, promptFile, promptTokens);
 		const prompt = await readPromptInput(promptFile, promptText, globalFlags.cwd, "final argument");
 		const permissionPolicy = await resolvePermissionPolicyFromFlags(globalFlags);
-		const rows = [];
-		for (const agentName of agents) rows.push(await runAgentForCompare({
+		const { rows, interrupted } = await runCompareAgents(agents, async (agentName) => await runAgentForCompare({
 			agentName,
 			prompt,
 			config,
@@ -1172,7 +1215,8 @@ function registerCompareCommand(program, config) {
 			permissionPolicy
 		}));
 		printRows(rows, outputPolicy.format);
-		updateCompareExitCode(rows);
+		if (interrupted) process.exitCode = EXIT_CODES.INTERRUPTED;
+		else updateCompareExitCode(rows);
 	});
 }
 //#endregion
@@ -1185,6 +1229,10 @@ 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 parseString(value, path) {
+	if (typeof value !== "string") throw new Error(`Invalid ${path}: expected string`);
+	return value;
+}
 function parseNameValuePairs(value, path) {
 	if (value == null) return [];
 	if (!Array.isArray(value)) throw new Error(`Invalid ${path}: expected array`);
@@ -1194,7 +1242,7 @@ function parseNameValuePairs(value, path) {
 		if (!entry) throw new Error(`Invalid ${path}[${index}]: expected object`);
 		entries.push({
 			name: parseNonEmptyString(entry.name, `${path}[${index}].name`),
-			value: parseNonEmptyString(entry.value, `${path}[${index}].value`)
+			value: parseString(entry.value, `${path}[${index}].value`)
 		});
 	}
 	return entries;
@@ -1203,10 +1251,7 @@ 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);
-	}
+	for (const [index, rawArg] of value.entries()) args.push(parseString(rawArg, `${path}[${index}]`));
 	return args;
 }
 function parseMeta(value, path) {
@@ -1336,9 +1381,7 @@ function parseDefaultAgent(value, sourcePath) {
 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)) parsed[normalizeAgentName$1(name)] = parseAgentEntry(raw, name, sourcePath);
-	return parsed;
+	return Object.fromEntries(Object.entries(value).map(([name, raw]) => [normalizeAgentName$1(name), parseAgentEntry(raw, name, sourcePath)]));
 }
 function parseAgentEntry(raw, name, sourcePath) {
 	if (!isObject(raw)) throw new Error(`Invalid config agents.${name} in ${sourcePath}: expected object with command`);
@@ -1490,8 +1533,7 @@ function resolveMcpServers(projectConfig, projectPath, globalConfig, globalPath,
 	return [];
 }
 function toConfigDisplay(config) {
-	const agents = {};
-	for (const [name, agent] of Object.entries(config.agents)) agents[name] = agent.argv ? { argv: [...agent.argv] } : { command: agent.command };
+	const agents = Object.fromEntries(Object.entries(config.agents).map(([name, agent]) => [name, agent.argv ? { argv: [...agent.argv] } : { command: agent.command }]));
 	return {
 		defaultAgent: config.defaultAgent,
 		defaultPermissions: config.defaultPermissions,
@@ -2074,7 +2116,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-B2ycKzaO.js");
+		const { handleFlowRun } = await import("./cli-Bmki9cj5.js");
 		await handleFlowRun(file, flags, this, config);
 	});
 }
@@ -2280,57 +2322,41 @@ function detectAgentToken(argv) {
 	for (let index = 0; index < argv.length; index += 1) {
 		const token = argv[index];
 		const step = scanAgentTokenStep(token, hasAgentOverride);
-		if (step.result) return step.result;
+		if (step.result) return {
+			...step.result,
+			index
+		};
 		if (step.hasAgentOverride) hasAgentOverride = true;
 		index += step.indexDelta;
 	}
 	return { hasAgentOverride };
 }
-function detectInitialCwd(argv) {
+function lastTopLevelFlagValue(argv, flag) {
+	let value;
 	for (let index = 0; index < argv.length; index += 1) {
 		const token = argv[index];
 		const scan = classifyTopLevelFlagScan(token);
 		if (scan.stop) break;
-		const cwd = readCwdFlagValue(token, argv[index + 1]);
-		if (cwd) return path.resolve(cwd);
-		if (isCwdFlagToken(token)) break;
+		if (token === flag) value = argv[index + 1];
+		else if (token.startsWith(`${flag}=`)) value = token.slice(flag.length + 1);
 		if (scan.skipNext) index += 1;
 	}
-	return process.cwd();
+	return value;
 }
-function detectMcpConfigPath(argv, cwd) {
-	for (let index = 0; index < argv.length; index += 1) {
-		const scan = scanMcpConfigToken(argv[index], argv[index + 1], cwd);
-		if (scan.stop) return scan.path;
-		if (scan.skipNext) index += 1;
+function detectInitialCwd(argv) {
+	const command = detectAgentToken(argv);
+	if (command.token === "compare" && command.index !== void 0) {
+		const { cwd } = scanCompareArgs(argv.slice(command.index + 1));
+		if (cwd !== void 0) return path.resolve(cwd);
 	}
+	return path.resolve(lastTopLevelFlagValue(argv, "--cwd") ?? process.cwd());
 }
-function scanMcpConfigToken(token, nextToken, cwd) {
-	if (token === "--" || !token.startsWith("-") || token === "-") return { stop: true };
-	if (token === "--mcp-config") return {
-		path: resolveMcpConfigPath(nextToken, cwd),
-		stop: true
-	};
-	if (token.startsWith("--mcp-config=")) return {
-		path: resolveMcpConfigPath(token.slice(13), cwd),
-		stop: true
-	};
-	return { skipNext: TOP_LEVEL_VERSION_VALUE_FLAGS.has(token) };
-}
-function resolveMcpConfigPath(value, cwd) {
-	const trimmed = value?.trim();
-	return trimmed && trimmed !== "--" ? path.resolve(cwd, trimmed) : void 0;
-}
-function isCwdFlagToken(token) {
-	return token === "--cwd" || token.startsWith("--cwd=");
-}
-function readCwdFlagValue(token, nextToken) {
-	const value = (token === "--cwd" ? nextToken : readInlineFlagValue(token, "--cwd"))?.trim();
-	if (!value || value === "--") return;
-	return value;
+function detectMcpConfigPath(argv, cwd) {
+	const value = lastTopLevelFlagValue(argv, "--mcp-config");
+	return value ? path.resolve(cwd, value) : void 0;
 }
 function detectRequestedOutputFormat(argv, fallback) {
-	let detectedFormat = fallback;
+	let detectedFormat;
 	for (let index = 0; index < argv.length; index += 1) {
 		const token = argv[index];
 		const scan = classifyTopLevelFlagScan(token);
@@ -2340,7 +2366,14 @@ function detectRequestedOutputFormat(argv, fallback) {
 		if (format) detectedFormat = format;
 		if (scan.skipNext) index += 1;
 	}
-	return detectedFormat;
+	return detectCompareOutputFormat(argv, detectedFormat, fallback);
+}
+function detectCompareOutputFormat(argv, rootFormat, fallback) {
+	const command = detectAgentToken(argv);
+	if (command.token !== "compare" || command.index === void 0) return rootFormat ?? fallback;
+	const local = scanCompareArgs(argv.slice(command.index + 1));
+	const localFormat = isOutputFormat(local.format) ? local.format : void 0;
+	return local.json ? "json" : rootFormat ?? localFormat ?? fallback;
 }
 function classifyTopLevelFlagScan(token) {
 	if (token === "--" || !token.startsWith("-") || token === "-") return {
@@ -2487,34 +2520,37 @@ async function main(argv = process.argv) {
 		return;
 	}
 	await maybeHandleSkillflag(normalizedArgv);
-	const initialCwd = detectInitialCwd(rawArgs);
-	const config = await loadResolvedConfig(initialCwd, { mcpConfigPath: detectMcpConfigPath(rawArgs, initialCwd) });
 	const requestedJsonStrict = detectJsonStrict(rawArgs);
-	const requestedOutputFormat = detectRequestedOutputFormat(rawArgs, config.format);
-	const requestedOutputPolicy = {
-		...resolveOutputPolicy(requestedOutputFormat, requestedJsonStrict),
+	let requestedOutputPolicy = {
+		...resolveOutputPolicy(detectRequestedOutputFormat(rawArgs, "text"), requestedJsonStrict),
 		suppressReads: rawArgs.some((token) => token === "--suppress-reads")
 	};
-	const program = createProgram(requestedJsonStrict);
-	addGlobalFlags(program);
-	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);
-		}
-	});
-	program.exitOverride((error) => {
-		throw error;
-	});
 	try {
+		const initialCwd = detectInitialCwd(rawArgs);
+		const config = await loadResolvedConfig(initialCwd, { mcpConfigPath: detectMcpConfigPath(rawArgs, initialCwd) });
+		requestedOutputPolicy = {
+			...resolveOutputPolicy(detectRequestedOutputFormat(rawArgs, config.format), requestedJsonStrict),
+			suppressReads: requestedOutputPolicy.suppressReads
+		};
+		const program = createProgram(requestedJsonStrict);
+		addGlobalFlags(program);
+		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);
+			}
+		});
+		program.exitOverride((error) => {
+			throw error;
+		});
 		await program.parseAsync(normalizedArgv);
 	} catch (error) {
 		await handleProgramParseError(error, requestedOutputPolicy);