gnhf 0.1.26 → 0.1.27

package/dist/cli.mjs

@@ -15,7 +15,9 @@ const AGENT_NAMES = [
 	"claude",
 	"codex",
 	"rovodev",
-	"opencode"
+	"opencode",
+	"copilot",
+	"pi"
 ];
 const DEFAULT_CONFIG = {
 	agent: "claude",
@@ -25,6 +27,10 @@ const DEFAULT_CONFIG = {
 	preventSleep: true
 };
 var InvalidConfigError = class extends Error {};
+function formatAgentNameList() {
+	const quoted = AGENT_NAMES.map((name) => `"${name}"`);
+	return `${quoted.slice(0, -1).join(", ")}, or ${quoted[quoted.length - 1]}`;
+}
 function normalizePreventSleep(value) {
 	if (typeof value === "boolean") return value;
 	if (typeof value !== "string") return void 0;
@@ -39,6 +45,8 @@ function isReservedAgentArg(agent, arg) {
 		case "codex": return arg === "exec" || arg === "--json" || arg === "--output-schema" || arg.startsWith("--output-schema=") || arg === "--color" || arg.startsWith("--color=");
 		case "opencode": return arg === "serve" || arg === "--hostname" || arg.startsWith("--hostname=") || arg === "--port" || arg.startsWith("--port=") || arg === "--print-logs";
 		case "rovodev": return arg === "rovodev" || arg === "serve" || arg === "--disable-session-token";
+		case "copilot": return arg === "-p" || arg === "--prompt" || arg.startsWith("--prompt=") || arg === "-i" || arg === "--interactive" || arg.startsWith("--interactive=") || arg === "-s" || arg === "--silent" || arg === "--output-format" || arg.startsWith("--output-format=") || arg === "--stream" || arg.startsWith("--stream=") || arg === "--no-color" || arg === "--share" || arg.startsWith("--share=") || arg === "--share-gist";
+		case "pi": return arg === "--mode" || arg.startsWith("--mode=") || arg === "--print" || arg === "-p" || arg === "--continue" || arg === "-c" || arg === "--resume" || arg === "-r" || arg === "--session" || arg.startsWith("--session=") || arg === "--fork" || arg.startsWith("--fork=") || arg === "--session-dir" || arg.startsWith("--session-dir=") || arg === "--no-session" || arg === "--export" || arg.startsWith("--export=") || arg === "--list-models" || arg.startsWith("--list-models=") || arg === "--help" || arg === "-h" || arg === "--version" || arg === "-v" || arg === "--api-key" || arg.startsWith("--api-key=");
 	}
 }
 /**
@@ -62,7 +70,7 @@ function normalizeAgentPathOverride(value, configDir) {
 	const validNames = new Set(AGENT_NAMES);
 	const result = {};
 	for (const [key, val] of Object.entries(value)) {
-		if (!validNames.has(key)) throw new InvalidConfigError(`Invalid agent name in agentPathOverride: "${key}". Use "claude", "codex", "rovodev", or "opencode".`);
+		if (!validNames.has(key)) throw new InvalidConfigError(`Invalid agent name in agentPathOverride: "${key}". Use ${formatAgentNameList()}.`);
 		if (typeof val !== "string") throw new InvalidConfigError(`Invalid path for agentPathOverride.${key}: expected a string`);
 		if (val.trim() === "") throw new InvalidConfigError(`Invalid path for agentPathOverride.${key}: expected a non-empty string`);
 		result[key] = resolveConfigPath(val, configDir);
@@ -86,7 +94,7 @@ function normalizeAgentArgsOverride(value) {
 	const validNames = new Set(AGENT_NAMES);
 	const result = {};
 	for (const [key, rawConfig] of Object.entries(value)) {
-		if (!validNames.has(key)) throw new InvalidConfigError(`Invalid agent name in agentArgsOverride: "${key}". Use "claude", "codex", "rovodev", or "opencode".`);
+		if (!validNames.has(key)) throw new InvalidConfigError(`Invalid agent name in agentArgsOverride: "${key}". Use ${formatAgentNameList()}.`);
 		const args = normalizeAgentExtraArgs(rawConfig, `agentArgsOverride.${key}`, key);
 		if (args !== void 0) result[key] = args;
 	}
@@ -151,6 +159,8 @@ function serializeConfig(config) {
 		"# agentPathOverride:",
 		"#   claude: /path/to/custom-claude",
 		"#   codex: /path/to/custom-codex",
+		"#   copilot: /path/to/custom-copilot",
+		"#   pi: /path/to/custom-pi",
 		"",
 		"# Per-agent CLI arg overrides (optional)",
 		"# agentArgsOverride:",
@@ -159,7 +169,17 @@ function serializeConfig(config) {
 		"#     - gpt-5.4",
 		"#     - -c",
 		"#     - model_reasoning_effort=\"high\"",
-		"#     - --full-auto"
+		"#     - --full-auto",
+		"#   copilot:",
+		"#     - --model",
+		"#     - gpt-5.4",
+		"#   pi:",
+		"#     - --provider",
+		"#     - openai-codex",
+		"#     - --model",
+		"#     - gpt-5.5",
+		"#     - --thinking",
+		"#     - high"
 	];
 	if (agentPathOverrideSection) lines.push(...agentPathOverrideSection.split("\n"));
 	if (agentArgsOverrideSection) lines.push(...agentArgsOverrideSection.split("\n"));
@@ -425,6 +445,21 @@ function removeWorktree(baseCwd, worktreePath) {
 		worktreePath
 	], baseCwd);
 }
+function worktreeExists(baseCwd, worktreePath) {
+	let output;
+	try {
+		output = git([
+			"worktree",
+			"list",
+			"--porcelain"
+		], baseCwd);
+	} catch {
+		return false;
+	}
+	const target = resolve(worktreePath);
+	for (const line of output.split("\n")) if (line.startsWith("worktree ") && resolve(line.slice(9)) === target) return true;
+	return false;
+}
 //#endregion
 //#region src/core/agents/types.ts
 function buildAgentOutputSchema(opts) {
@@ -460,9 +495,15 @@ function buildAgentOutputSchema(opts) {
 //#endregion
 //#region src/core/run.ts
 const LOG_FILENAME = "gnhf.log";
+const STOP_WHEN_FILENAME = "stop-when";
 function writeSchemaFile(schemaPath, includeStopField) {
 	writeFileSync(schemaPath, JSON.stringify(buildAgentOutputSchema({ includeStopField }), null, 2), "utf-8");
 }
+function readStopWhen(stopWhenPath) {
+	if (!existsSync(stopWhenPath)) return void 0;
+	const stopWhen = readFileSync(stopWhenPath, "utf-8").trim();
+	return stopWhen.length > 0 ? stopWhen : void 0;
+}
 function ensureRunMetadataIgnored(cwd) {
 	const excludePath = execFileSync("git", [
 		"rev-parse",
@@ -496,6 +537,9 @@ function setupRun(runId, prompt, baseCommit, cwd, schemaOptions) {
 	const hasStoredBaseCommit = existsSync(baseCommitPath);
 	const resolvedBaseCommit = hasStoredBaseCommit ? readFileSync(baseCommitPath, "utf-8").trim() : baseCommit;
 	if (!hasStoredBaseCommit) writeFileSync(baseCommitPath, `${baseCommit}\n`, "utf-8");
+	const stopWhenPath = join(runDir, STOP_WHEN_FILENAME);
+	const stopWhen = schemaOptions.stopWhen;
+	if (stopWhen !== void 0) writeFileSync(stopWhenPath, `${stopWhen}\n`, "utf-8");
 	return {
 		runId,
 		runDir,
@@ -504,7 +548,9 @@ function setupRun(runId, prompt, baseCommit, cwd, schemaOptions) {
 		schemaPath,
 		logPath,
 		baseCommit: resolvedBaseCommit,
-		baseCommitPath
+		baseCommitPath,
+		stopWhenPath,
+		stopWhen
 	};
 }
 function resumeRun(runId, cwd, schemaOptions) {
@@ -513,9 +559,19 @@ function resumeRun(runId, cwd, schemaOptions) {
 	const promptPath = join(runDir, "prompt.md");
 	const notesPath = join(runDir, "notes.md");
 	const schemaPath = join(runDir, "output-schema.json");
-	writeSchemaFile(schemaPath, schemaOptions.includeStopField);
 	const logPath = join(runDir, LOG_FILENAME);
 	const baseCommitPath = join(runDir, "base-commit");
+	const baseCommit = existsSync(baseCommitPath) ? readFileSync(baseCommitPath, "utf-8").trim() : backfillLegacyBaseCommit(runId, baseCommitPath, cwd);
+	const stopWhenPath = join(runDir, STOP_WHEN_FILENAME);
+	let stopWhen = readStopWhen(stopWhenPath);
+	if (schemaOptions.clearStopWhen) {
+		rmSync(stopWhenPath, { force: true });
+		stopWhen = void 0;
+	} else if (schemaOptions.stopWhen !== void 0) {
+		stopWhen = schemaOptions.stopWhen;
+		writeFileSync(stopWhenPath, `${stopWhen}\n`, "utf-8");
+	}
+	writeSchemaFile(schemaPath, schemaOptions.includeStopField || stopWhen !== void 0);
 	return {
 		runId,
 		runDir,
@@ -523,8 +579,10 @@ function resumeRun(runId, cwd, schemaOptions) {
 		notesPath,
 		schemaPath,
 		logPath,
-		baseCommit: existsSync(baseCommitPath) ? readFileSync(baseCommitPath, "utf-8").trim() : backfillLegacyBaseCommit(runId, baseCommitPath, cwd),
-		baseCommitPath
+		baseCommit,
+		baseCommitPath,
+		stopWhenPath,
+		stopWhen
 	};
 }
 function backfillLegacyBaseCommit(runId, baseCommitPath, cwd) {
@@ -1044,7 +1102,7 @@ function setupAbortHandler(signal, child, reject, abortChild = () => {
 //#endregion
 //#region src/core/agents/claude.ts
 const DEFAULT_FINAL_RESULT_EXIT_GRACE_MS = 15e3;
-function shouldUseWindowsShell$2(bin, platform) {
+function shouldUseWindowsShell$4(bin, platform) {
 	if (platform !== "win32") return false;
 	if (/\.(cmd|bat)$/i.test(bin)) return true;
 	if (/[\\/]/.test(bin)) return false;
@@ -1105,7 +1163,7 @@ function buildClaudeArgs(prompt, schema, extraArgs) {
 		...userSpecifiedPermissionMode ? [] : ["--dangerously-skip-permissions"]
 	];
 }
-function toTokenUsage(usage) {
+function toTokenUsage$1(usage) {
 	return {
 		inputTokens: (usage.input_tokens ?? 0) + (usage.cache_read_input_tokens ?? 0),
 		outputTokens: usage.output_tokens ?? 0,
@@ -1113,11 +1171,11 @@ function toTokenUsage(usage) {
 		cacheCreationTokens: usage.cache_creation_input_tokens ?? 0
 	};
 }
-function isSameUsage(a, b) {
+function isSameUsage$1(a, b) {
 	return a.inputTokens === b.inputTokens && a.outputTokens === b.outputTokens && a.cacheReadTokens === b.cacheReadTokens && a.cacheCreationTokens === b.cacheCreationTokens;
 }
 function extendsUsage(next, previous) {
-	return next.inputTokens >= previous.inputTokens && next.outputTokens >= previous.outputTokens && next.cacheReadTokens >= previous.cacheReadTokens && next.cacheCreationTokens >= previous.cacheCreationTokens && !isSameUsage(next, previous);
+	return next.inputTokens >= previous.inputTokens && next.outputTokens >= previous.outputTokens && next.cacheReadTokens >= previous.cacheReadTokens && next.cacheCreationTokens >= previous.cacheCreationTokens && !isSameUsage$1(next, previous);
 }
 var ClaudeAgent = class {
 	name = "claude";
@@ -1141,7 +1199,7 @@ var ClaudeAgent = class {
 			const child = spawn(this.bin, buildClaudeArgs(prompt, this.schema, this.extraArgs), {
 				cwd,
 				detached: this.platform !== "win32",
-				shell: shouldUseWindowsShell$2(this.bin, this.platform),
+				shell: shouldUseWindowsShell$4(this.bin, this.platform),
 				stdio: [
 					"ignore",
 					"pipe",
@@ -1176,7 +1234,7 @@ var ClaudeAgent = class {
 			parseJSONLStream(child.stdout, logStream, (event) => {
 				if (event.type === "assistant") {
 					const msg = event.message;
-					const nextUsage = toTokenUsage(msg.usage);
+					const nextUsage = toTokenUsage$1(msg.usage);
 					let messageId = msg.id;
 					let previousUsage;
 					if (messageId) {
@@ -1200,7 +1258,7 @@ var ClaudeAgent = class {
 						previousUsage = usageByMessageId.get(messageId);
 						pendingAnonymousAssistantUsage = null;
 						lastAnonymousAssistantUsage = nextUsage;
-					} else if (lastAnonymousAssistantId && lastAnonymousAssistantUsage && isSameUsage(nextUsage, lastAnonymousAssistantUsage)) {
+					} else if (lastAnonymousAssistantId && lastAnonymousAssistantUsage && isSameUsage$1(nextUsage, lastAnonymousAssistantUsage)) {
 						messageId = lastAnonymousAssistantId;
 						previousUsage = usageByMessageId.get(messageId);
 						pendingAnonymousAssistantUsage ??= nextUsage;
@@ -1264,7 +1322,7 @@ var ClaudeAgent = class {
 					return;
 				}
 				const output = terminalResultEvent.structured_output;
-				const usage = toTokenUsage(latestResultUsage ?? terminalResultEvent.usage);
+				const usage = toTokenUsage$1(latestResultUsage ?? terminalResultEvent.usage);
 				onUsage?.(usage);
 				resolve({
 					output,
@@ -1275,8 +1333,180 @@ var ClaudeAgent = class {
 	}
 };
 //#endregion
+//#region src/core/agents/copilot.ts
+function shouldUseWindowsShell$3(bin, platform) {
+	if (platform !== "win32") return false;
+	if (/\.(cmd|bat)$/i.test(bin)) return true;
+	if (/[\\/]/.test(bin)) return false;
+	try {
+		const firstMatch = execFileSync("where", [bin], {
+			encoding: "utf8",
+			stdio: [
+				"ignore",
+				"pipe",
+				"ignore"
+			]
+		}).split(/\r?\n/).map((line) => line.trim()).find(Boolean);
+		return firstMatch ? /\.(cmd|bat)$/i.test(firstMatch) : false;
+	} catch {
+		return false;
+	}
+}
+function terminateCopilotProcess(child, platform) {
+	if (platform === "win32" && child.pid) {
+		try {
+			execFileSync("taskkill", [
+				"/T",
+				"/F",
+				"/PID",
+				String(child.pid)
+			], { stdio: "ignore" });
+		} catch {}
+		return;
+	}
+	child.kill("SIGTERM");
+}
+function userSpecifiedPermissionMode(userArgs) {
+	return userArgs.some((arg) => arg === "--allow-all" || arg === "--yolo" || arg === "--allow-all-tools" || arg === "--allow-all-paths" || arg === "--allow-all-urls" || arg === "--allow-tool" || arg.startsWith("--allow-tool=") || arg === "--allow-url" || arg.startsWith("--allow-url=") || arg === "--deny-tool" || arg.startsWith("--deny-tool=") || arg === "--deny-url" || arg.startsWith("--deny-url=") || arg === "--available-tools" || arg.startsWith("--available-tools=") || arg === "--excluded-tools" || arg.startsWith("--excluded-tools="));
+}
+function buildCopilotPrompt(prompt, schema) {
+	return `${prompt}
+
+## gnhf final output contract
+
+When the iteration is complete, your final answer must be a single JSON object that matches this JSON Schema:
+
+\`\`\`json
+${JSON.stringify(schema, null, 2)}
+\`\`\`
+
+Return only the JSON object in the final answer. Do not wrap it in Markdown. Do not include explanatory prose outside the JSON object.`;
+}
+function buildCopilotArgs(prompt, schema, extraArgs) {
+	const userArgs = extraArgs ?? [];
+	return [
+		...userArgs,
+		"-p",
+		buildCopilotPrompt(prompt, schema),
+		"--output-format",
+		"json",
+		"--stream",
+		"off",
+		"--no-color",
+		...userSpecifiedPermissionMode(userArgs) ? [] : ["--allow-all"]
+	];
+}
+function stripJsonFence(text) {
+	const trimmed = text.trim();
+	return trimmed.match(/^```(?:json)?\s*\n([\s\S]*?)\n```$/i)?.[1]?.trim() ?? trimmed;
+}
+function numberField$1(usage, names) {
+	for (const name of names) {
+		const value = usage[name];
+		if (typeof value === "number") return value;
+	}
+}
+function usageFromRecord(usage) {
+	const inputTokens = numberField$1(usage, ["inputTokens", "input_tokens"]);
+	const outputTokens = numberField$1(usage, ["outputTokens", "output_tokens"]);
+	const cacheReadTokens = numberField$1(usage, [
+		"cacheReadTokens",
+		"cache_read_tokens",
+		"cache_read_input_tokens"
+	]);
+	const cacheCreationTokens = numberField$1(usage, [
+		"cacheCreationTokens",
+		"cacheWriteTokens",
+		"cache_creation_tokens",
+		"cache_creation_input_tokens",
+		"cache_write_tokens"
+	]);
+	if (inputTokens === void 0 && outputTokens === void 0 && cacheReadTokens === void 0 && cacheCreationTokens === void 0) return null;
+	return {
+		inputTokens: inputTokens ?? 0,
+		outputTokens: outputTokens ?? 0,
+		cacheReadTokens: cacheReadTokens ?? 0,
+		cacheCreationTokens: cacheCreationTokens ?? 0
+	};
+}
+var CopilotAgent = class {
+	name = "copilot";
+	bin;
+	extraArgs;
+	platform;
+	schema;
+	constructor(binOrDeps = {}) {
+		const deps = typeof binOrDeps === "string" ? { bin: binOrDeps } : binOrDeps;
+		this.bin = deps.bin ?? "copilot";
+		this.extraArgs = deps.extraArgs;
+		this.platform = deps.platform ?? process.platform;
+		this.schema = deps.schema ?? buildAgentOutputSchema({ includeStopField: false });
+	}
+	run(prompt, cwd, options) {
+		const { onUsage, onMessage, signal, logPath } = options ?? {};
+		return new Promise((resolve, reject) => {
+			const logStream = logPath ? createWriteStream(logPath) : null;
+			const child = spawn(this.bin, buildCopilotArgs(prompt, this.schema, this.extraArgs), {
+				cwd,
+				shell: shouldUseWindowsShell$3(this.bin, this.platform),
+				stdio: [
+					"ignore",
+					"pipe",
+					"pipe"
+				],
+				env: process.env
+			});
+			if (setupAbortHandler(signal, child, reject, () => terminateCopilotProcess(child, this.platform))) return;
+			let lastAgentMessage = null;
+			const cumulative = {
+				inputTokens: 0,
+				outputTokens: 0,
+				cacheReadTokens: 0,
+				cacheCreationTokens: 0
+			};
+			parseJSONLStream(child.stdout, logStream, (event) => {
+				if (event.type === "assistant.message") {
+					const data = event.data;
+					if (typeof data.content === "string") {
+						lastAgentMessage = data.content;
+						onMessage?.(data.content);
+					}
+					if (typeof data.outputTokens === "number") {
+						cumulative.outputTokens += data.outputTokens;
+						onUsage?.({ ...cumulative });
+					}
+				}
+				if ("usage" in event && event.usage) {
+					const usage = usageFromRecord(event.usage);
+					if (usage) {
+						cumulative.inputTokens = usage.inputTokens;
+						cumulative.outputTokens = Math.max(cumulative.outputTokens, usage.outputTokens);
+						cumulative.cacheReadTokens = usage.cacheReadTokens;
+						cumulative.cacheCreationTokens = usage.cacheCreationTokens;
+						onUsage?.({ ...cumulative });
+					}
+				}
+			});
+			setupChildProcessHandlers(child, "copilot", logStream, reject, () => {
+				if (!lastAgentMessage) {
+					reject(/* @__PURE__ */ new Error("copilot returned no agent message"));
+					return;
+				}
+				try {
+					resolve({
+						output: JSON.parse(stripJsonFence(lastAgentMessage)),
+						usage: cumulative
+					});
+				} catch (err) {
+					reject(/* @__PURE__ */ new Error(`Failed to parse copilot output: ${err instanceof Error ? err.message : err}`));
+				}
+			});
+		});
+	}
+};
+//#endregion
 //#region src/core/agents/codex.ts
-function shouldUseWindowsShell$1(bin, platform) {
+function shouldUseWindowsShell$2(bin, platform) {
 	if (platform !== "win32") return false;
 	if (/\.(cmd|bat)$/i.test(bin)) return true;
 	if (/[\\/]/.test(bin)) return false;
@@ -1342,7 +1572,7 @@ var CodexAgent = class {
 			const logStream = logPath ? createWriteStream(logPath) : null;
 			const child = spawn(this.bin, buildCodexArgs(prompt, this.schemaPath, this.extraArgs), {
 				cwd,
-				shell: shouldUseWindowsShell$1(this.bin, this.platform),
+				shell: shouldUseWindowsShell$2(this.bin, this.platform),
 				stdio: [
 					"ignore",
 					"pipe",
@@ -2204,6 +2434,287 @@ var OpenCodeAgent = class {
 	}
 };
 //#endregion
+//#region src/core/agents/pi.ts
+function shouldUseWindowsShell$1(bin, platform) {
+	if (platform !== "win32") return false;
+	if (/\.(cmd|bat)$/i.test(bin)) return true;
+	if (/[\\/]/.test(bin)) return false;
+	try {
+		const firstMatch = execFileSync("where", [bin], {
+			encoding: "utf8",
+			stdio: [
+				"ignore",
+				"pipe",
+				"ignore"
+			]
+		}).split(/\r?\n/).map((line) => line.trim()).find(Boolean);
+		return firstMatch ? /\.(cmd|bat)$/i.test(firstMatch) : false;
+	} catch {
+		return false;
+	}
+}
+function terminatePiProcess(child, platform) {
+	if (platform === "win32" && child.pid) {
+		try {
+			execFileSync("taskkill", [
+				"/T",
+				"/F",
+				"/PID",
+				String(child.pid)
+			], { stdio: "ignore" });
+		} catch {}
+		return;
+	}
+	if (child.pid) try {
+		process.kill(-child.pid, "SIGTERM");
+		return;
+	} catch {}
+	child.kill("SIGTERM");
+}
+function buildPiPrompt(prompt, schema) {
+	return `${prompt}
+
+## gnhf final output contract
+
+When the iteration is complete, your final assistant response must be only valid JSON matching this JSON Schema. Do not wrap it in Markdown fences. Do not include prose before or after the JSON object.
+
+${JSON.stringify(schema, null, 2)}`;
+}
+function buildPiArgs(extraArgs) {
+	return [
+		...extraArgs ?? [],
+		"--mode",
+		"json",
+		"--no-session"
+	];
+}
+function isRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function stringField(record, names) {
+	for (const name of names) {
+		const value = record[name];
+		if (typeof value === "string") return value;
+	}
+}
+function numberField(record, names) {
+	for (const name of names) {
+		const value = record[name];
+		if (typeof value === "number") return value;
+	}
+}
+function toTokenUsage(usage) {
+	if (!usage) return null;
+	return {
+		inputTokens: numberField(usage, ["input"]) ?? 0,
+		outputTokens: numberField(usage, ["output"]) ?? 0,
+		cacheReadTokens: numberField(usage, ["cacheRead"]) ?? 0,
+		cacheCreationTokens: numberField(usage, ["cacheWrite"]) ?? 0
+	};
+}
+function isSameUsage(a, b) {
+	return a.inputTokens === b.inputTokens && a.outputTokens === b.outputTokens && a.cacheReadTokens === b.cacheReadTokens && a.cacheCreationTokens === b.cacheCreationTokens;
+}
+function messageKey(message) {
+	const responseId = stringField(message, ["responseId", "id"]);
+	if (responseId) return responseId;
+	const timestamp = message.timestamp;
+	if (typeof timestamp === "string" || typeof timestamp === "number") return `timestamp:${timestamp}`;
+	return null;
+}
+function roleOf(message) {
+	return isRecord(message) && typeof message.role === "string" ? message.role : void 0;
+}
+function textFromContentBlock(block) {
+	if (typeof block === "string") return block;
+	if (!isRecord(block)) return null;
+	if (typeof block.text === "string") return block.text;
+	if (typeof block.content === "string") return block.content;
+	return null;
+}
+function textFromAssistantMessage(message) {
+	if (!message) return "";
+	if (typeof message.text === "string") return message.text;
+	if (typeof message.content === "string") return message.content;
+	if (Array.isArray(message.content)) return message.content.map(textFromContentBlock).filter((text) => text !== null).join("");
+	return "";
+}
+function compactJson(value) {
+	try {
+		return JSON.stringify(value);
+	} catch {
+		return String(value);
+	}
+}
+function validatePiOutput(value, schema) {
+	if (!isRecord(value)) throw new Error("expected an object");
+	if (typeof value.success !== "boolean") throw new Error("success must be a boolean");
+	if (typeof value.summary !== "string") throw new Error("summary must be a string");
+	if (!Array.isArray(value.key_changes_made) || !value.key_changes_made.every((item) => typeof item === "string")) throw new Error("key_changes_made must be an array of strings");
+	if (!Array.isArray(value.key_learnings) || !value.key_learnings.every((item) => typeof item === "string")) throw new Error("key_learnings must be an array of strings");
+	if (schema.required.includes("should_fully_stop") && typeof value.should_fully_stop !== "boolean") throw new Error("should_fully_stop must be a boolean");
+	if (schema.additionalProperties === false) {
+		const allowed = new Set(Object.keys(schema.properties));
+		const extraKey = Object.keys(value).find((key) => !allowed.has(key));
+		if (extraKey) throw new Error(`unexpected property ${extraKey}`);
+	}
+	return value;
+}
+function textByIndexToString(textByIndex) {
+	return [...textByIndex.entries()].sort(([a], [b]) => a - b).map(([, text]) => text).join("");
+}
+var PiAgent = class {
+	name = "pi";
+	bin;
+	extraArgs;
+	platform;
+	schema;
+	constructor(deps = {}) {
+		this.bin = deps.bin ?? "pi";
+		this.extraArgs = deps.extraArgs;
+		this.platform = deps.platform ?? process.platform;
+		this.schema = deps.schema ?? buildAgentOutputSchema({ includeStopField: false });
+	}
+	run(prompt, cwd, options) {
+		const { onUsage, onMessage, signal, logPath } = options ?? {};
+		return new Promise((resolve, reject) => {
+			const logStream = logPath ? createWriteStream(logPath) : null;
+			const child = spawn(this.bin, buildPiArgs(this.extraArgs), {
+				cwd,
+				detached: this.platform !== "win32",
+				shell: shouldUseWindowsShell$1(this.bin, this.platform),
+				stdio: [
+					"pipe",
+					"pipe",
+					"pipe"
+				],
+				env: process.env
+			});
+			child.stdin?.write(buildPiPrompt(prompt, this.schema));
+			child.stdin?.end();
+			if (setupAbortHandler(signal, child, reject, () => terminatePiProcess(child, this.platform))) return;
+			let latestAssistantMessage = null;
+			const streamTextByIndex = /* @__PURE__ */ new Map();
+			const completeTextByIndex = /* @__PURE__ */ new Map();
+			const usageByMessageKey = /* @__PURE__ */ new Map();
+			let lastEmittedUsage = {
+				inputTokens: 0,
+				outputTokens: 0,
+				cacheReadTokens: 0,
+				cacheCreationTokens: 0
+			};
+			let anonymousKeySeq = 0;
+			let currentStreamingMessageKey = null;
+			const updateUsage = (message, streaming = false) => {
+				const usage = isRecord(message.usage) ? toTokenUsage(message.usage) : null;
+				if (!usage) return;
+				let key = messageKey(message);
+				if (key === null) if (streaming && currentStreamingMessageKey !== null) key = currentStreamingMessageKey;
+				else {
+					key = `assistant-anonymous-${anonymousKeySeq++}`;
+					if (streaming) currentStreamingMessageKey = key;
+				}
+				usageByMessageKey.set(key, usage);
+				const cumulative = {
+					inputTokens: 0,
+					outputTokens: 0,
+					cacheReadTokens: 0,
+					cacheCreationTokens: 0
+				};
+				for (const entry of usageByMessageKey.values()) {
+					cumulative.inputTokens += entry.inputTokens;
+					cumulative.outputTokens += entry.outputTokens;
+					cumulative.cacheReadTokens += entry.cacheReadTokens;
+					cumulative.cacheCreationTokens += entry.cacheCreationTokens;
+				}
+				if (!isSameUsage(cumulative, lastEmittedUsage)) {
+					lastEmittedUsage = cumulative;
+					onUsage?.({ ...cumulative });
+				}
+			};
+			const rememberAssistantMessage = (message, streaming = false) => {
+				if (!isRecord(message) || roleOf(message) !== "assistant") return;
+				latestAssistantMessage = message;
+				updateUsage(message, streaming);
+			};
+			parseJSONLStream(child.stdout, logStream, (event) => {
+				if (!isRecord(event)) return;
+				if (event.type === "message_update") {
+					rememberAssistantMessage(event.message, true);
+					if (isRecord(event.assistantMessageEvent)) {
+						const assistantEvent = event.assistantMessageEvent;
+						const contentIndex = numberField(assistantEvent, ["contentIndex", "content_index"]) ?? 0;
+						if (assistantEvent.type === "text_delta") {
+							const delta = stringField(assistantEvent, [
+								"delta",
+								"text",
+								"content"
+							]);
+							if (delta) {
+								const next = (streamTextByIndex.get(contentIndex) ?? "") + delta;
+								streamTextByIndex.set(contentIndex, next);
+								const visible = next.trim();
+								if (visible) onMessage?.(visible);
+							}
+						}
+						if (assistantEvent.type === "text_end") {
+							const text = stringField(assistantEvent, ["text", "content"]) ?? streamTextByIndex.get(contentIndex) ?? "";
+							completeTextByIndex.set(contentIndex, text);
+							const visible = text.trim();
+							if (visible) onMessage?.(visible);
+						}
+					}
+				}
+				if (event.type === "message_end" || event.type === "turn_end") {
+					rememberAssistantMessage(event.message, true);
+					currentStreamingMessageKey = null;
+				}
+				if (event.type === "agent_end" && Array.isArray(event.messages) && !latestAssistantMessage) for (let i = event.messages.length - 1; i >= 0; i -= 1) {
+					const message = event.messages[i];
+					if (roleOf(message) === "assistant") {
+						rememberAssistantMessage(message);
+						break;
+					}
+				}
+			});
+			setupChildProcessHandlers(child, "pi", logStream, reject, () => {
+				if (latestAssistantMessage) {
+					const stopReason = latestAssistantMessage.stopReason;
+					if (stopReason === "error" || stopReason === "aborted") {
+						const errorMessage = stringField(latestAssistantMessage, [
+							"errorMessage",
+							"error",
+							"message"
+						]) ?? compactJson(latestAssistantMessage);
+						reject(/* @__PURE__ */ new Error(`pi reported error: ${errorMessage}`));
+						return;
+					}
+				}
+				const finalText = textFromAssistantMessage(latestAssistantMessage).trim() || textByIndexToString(completeTextByIndex).trim() || textByIndexToString(streamTextByIndex).trim();
+				if (!finalText) {
+					reject(/* @__PURE__ */ new Error("pi returned no text output"));
+					return;
+				}
+				let parsed;
+				try {
+					parsed = JSON.parse(finalText);
+				} catch (err) {
+					reject(/* @__PURE__ */ new Error(`Failed to parse pi output: ${err instanceof Error ? err.message : err}`));
+					return;
+				}
+				try {
+					resolve({
+						output: validatePiOutput(parsed, this.schema),
+						usage: lastEmittedUsage
+					});
+				} catch (err) {
+					reject(/* @__PURE__ */ new Error(`Invalid pi output: ${err instanceof Error ? err.message : err}`));
+				}
+			});
+		});
+	}
+};
+//#endregion
 //#region src/core/agents/rovodev.ts
 function buildSystemPrompt(schema) {
 	return [
@@ -2829,11 +3340,21 @@ function createAgent(name, runInfo, pathOverride, agentArgsOverride, options) {
 			bin: pathOverride,
 			extraArgs: agentArgsOverride
 		});
+		case "copilot": return new CopilotAgent({
+			bin: pathOverride,
+			extraArgs: agentArgsOverride,
+			schema
+		});
 		case "opencode": return new OpenCodeAgent({
 			bin: pathOverride,
 			extraArgs: agentArgsOverride,
 			schema
 		});
+		case "pi": return new PiAgent({
+			bin: pathOverride,
+			extraArgs: agentArgsOverride,
+			schema
+		});
 		case "rovodev": return new RovoDevAgent(runInfo.schemaPath, {
 			bin: pathOverride,
 			extraArgs: agentArgsOverride
@@ -2841,6 +3362,19 @@ function createAgent(name, runInfo, pathOverride, agentArgsOverride, options) {
 	}
 }
 //#endregion
+//#region src/core/interrupt-state.ts
+function getInterruptDisposition(state) {
+	if (state.status === "aborted") return "exit";
+	if (state.gracefulStopRequested || state.status === "stopped") return "force-stop";
+	return "request-graceful-stop";
+}
+function getInterruptHint(state) {
+	const disposition = getInterruptDisposition(state);
+	if (disposition === "exit") return "exit";
+	if (disposition === "force-stop") return "force-stop";
+	return "resume";
+}
+//#endregion
 //#region src/templates/iteration-prompt.ts
 function buildIterationPrompt(params) {
 	const outputFields = [
@@ -2887,8 +3421,10 @@ var Orchestrator = class extends EventEmitter {
 	activeAbortController = null;
 	pendingAbortReason = null;
 	loopDone = false;
+	stoppedEventEmitted = false;
 	state = {
 		status: "running",
+		gracefulStopRequested: false,
 		currentIteration: 0,
 		totalInputTokens: 0,
 		totalOutputTokens: 0,
@@ -2914,7 +3450,27 @@ var Orchestrator = class extends EventEmitter {
 		this.state.commitCount = getBranchCommitCount(this.runInfo.baseCommit, this.cwd);
 	}
 	getState() {
-		return { ...this.state };
+		return {
+			...this.state,
+			interruptHint: getInterruptHint(this.state)
+		};
+	}
+	requestGracefulStop() {
+		if (this.stopRequested || this.state.gracefulStopRequested || this.loopDone) return;
+		this.state.gracefulStopRequested = true;
+		appendDebugLog("orchestrator:graceful-stop-requested", {
+			iteration: this.state.currentIteration,
+			hasActiveIteration: this.activeIterationPromise !== null,
+			status: this.state.status
+		});
+		this.emit("state", this.getState());
+		if (this.state.status === "waiting") this.activeAbortController?.abort();
+	}
+	handleInterrupt() {
+		const disposition = getInterruptDisposition(this.state);
+		if (disposition === "request-graceful-stop") this.requestGracefulStop();
+		else if (disposition === "force-stop") this.stop();
+		return disposition;
 	}
 	stop() {
 		this.stopRequested = true;
@@ -2924,8 +3480,9 @@ var Orchestrator = class extends EventEmitter {
 			loopDone: this.loopDone
 		});
 		this.activeAbortController?.abort();
+		this.state.gracefulStopRequested = false;
 		if (this.loopDone) {
-			this.emit("stopped");
+			this.emitStopped();
 			return;
 		}
 		if (this.stopPromise) return;
@@ -2950,7 +3507,7 @@ var Orchestrator = class extends EventEmitter {
 			resetHard(this.cwd);
 			this.state.status = "stopped";
 			this.emit("state", this.getState());
-			this.emit("stopped");
+			this.emitStopped();
 		})();
 	}
 	async start() {
@@ -2974,6 +3531,7 @@ var Orchestrator = class extends EventEmitter {
 					this.abort(preIterationAbortReason);
 					break;
 				}
+				if (this.stopForGracefulShutdown()) break;
 				this.state.currentIteration++;
 				this.state.status = "running";
 				this.emit("iteration:start", this.state.currentIteration);
@@ -3029,6 +3587,7 @@ var Orchestrator = class extends EventEmitter {
 					totalOutputTokens: this.state.totalOutputTokens,
 					commitCount: this.state.commitCount
 				});
+				if (this.stopForGracefulShutdown()) break;
 				if (this.limits.stopWhen !== void 0 && result.shouldFullyStop) {
 					this.abort("stop condition met");
 					break;
@@ -3059,6 +3618,7 @@ var Orchestrator = class extends EventEmitter {
 					});
 					this.state.waitingUntil = null;
 					if (!this.stopRequested) {
+						if (this.stopForGracefulShutdown()) break;
 						this.state.status = "running";
 						this.emit("state", this.getState());
 					}
@@ -3075,6 +3635,7 @@ var Orchestrator = class extends EventEmitter {
 			if (this.stopPromise) await this.stopPromise;
 			else await this.closeAgent();
 			this.loopDone = true;
+			if (this.didStopWithoutForce()) this.emitStopped();
 			appendDebugLog("orchestrator:end", {
 				status: this.state.status,
 				iterations: this.state.currentIteration,
@@ -3237,8 +3798,27 @@ var Orchestrator = class extends EventEmitter {
 		if (totalTokens < this.limits.maxTokens) return null;
 		return `max tokens reached (${totalTokens}/${this.limits.maxTokens})`;
 	}
+	finishGracefulStop() {
+		this.state.status = "stopped";
+		this.state.gracefulStopRequested = false;
+		this.state.waitingUntil = null;
+		appendDebugLog("orchestrator:graceful-stop-complete", {
+			iteration: this.state.currentIteration,
+			consecutiveFailures: this.state.consecutiveFailures
+		});
+		this.emit("state", this.getState());
+	}
+	stopForGracefulShutdown() {
+		if (!this.state.gracefulStopRequested) return false;
+		this.finishGracefulStop();
+		return true;
+	}
+	didStopWithoutForce() {
+		return this.stopPromise === null && this.state.status === "stopped";
+	}
 	abort(reason) {
 		this.state.status = "aborted";
+		this.state.gracefulStopRequested = false;
 		this.state.lastMessage = reason;
 		this.state.waitingUntil = null;
 		appendDebugLog("orchestrator:abort", {
@@ -3256,6 +3836,11 @@ var Orchestrator = class extends EventEmitter {
 			appendDebugLog("agent:close:error", { error: serializeError(err) });
 		}
 	}
+	emitStopped() {
+		if (this.stoppedEventEmitted) return;
+		this.stoppedEventEmitted = true;
+		this.emit("stopped");
+	}
 	snapshotGitState() {
 		try {
 			return {
@@ -3324,6 +3909,7 @@ const INITIAL_ELAPSED_MS = 29237e3;
 var MockOrchestrator = class extends EventEmitter {
 	state = {
 		status: "running",
+		gracefulStopRequested: false,
 		currentIteration: 14,
 		totalInputTokens: 873e5,
 		totalOutputTokens: 86e4,
@@ -3340,20 +3926,35 @@ var MockOrchestrator = class extends EventEmitter {
 	tokenTimer = null;
 	messageTimer = null;
 	messageIndex = 0;
+	stoppedEventEmitted = false;
 	getState() {
 		return {
 			...this.state,
+			interruptHint: getInterruptHint(this.state),
 			iterations: [...this.state.iterations]
 		};
 	}
 	stop() {
+		if (this.state.status === "stopped") return;
 		if (this.tokenTimer) clearTimeout(this.tokenTimer);
 		if (this.messageTimer) clearTimeout(this.messageTimer);
 		this.tokenTimer = null;
 		this.messageTimer = null;
 		this.state.status = "stopped";
+		this.state.gracefulStopRequested = false;
+		this.emit("state", this.getState());
+		this.emitStopped();
+	}
+	requestGracefulStop() {
+		if (this.state.gracefulStopRequested || this.state.status !== "running") return;
+		this.state.gracefulStopRequested = true;
 		this.emit("state", this.getState());
-		this.emit("stopped");
+	}
+	handleInterrupt() {
+		const disposition = getInterruptDisposition(this.state);
+		if (disposition === "request-graceful-stop") this.requestGracefulStop();
+		else if (disposition === "force-stop") this.stop();
+		return disposition;
 	}
 	start() {
 		this.emit("state", this.getState());
@@ -3362,6 +3963,10 @@ var MockOrchestrator = class extends EventEmitter {
 	}
 	scheduleTokenBump() {
 		this.tokenTimer = setTimeout(() => {
+			if (this.state.gracefulStopRequested) {
+				this.stop();
+				return;
+			}
 			this.state.totalInputTokens += randInt(4e4, 18e4);
 			this.state.totalOutputTokens += randInt(200, 2e3);
 			this.emit("state", this.getState());
@@ -3371,12 +3976,21 @@ var MockOrchestrator = class extends EventEmitter {
 	scheduleNextMessage() {
 		const delay = randInt(3e3, 7e3);
 		this.messageTimer = setTimeout(() => {
+			if (this.state.gracefulStopRequested) {
+				this.stop();
+				return;
+			}
 			this.messageIndex = (this.messageIndex + 1) % AGENT_MESSAGES.length;
 			this.state.lastMessage = AGENT_MESSAGES[this.messageIndex];
 			this.emit("state", this.getState());
 			this.scheduleNextMessage();
 		}, delay);
 	}
+	emitStopped() {
+		if (this.stoppedEventEmitted) return;
+		this.stoppedEventEmitted = true;
+		this.emit("stopped");
+	}
 };
 //#endregion
 //#region src/utils/stars.ts
@@ -3666,6 +4280,7 @@ const MOON_PHASE_PERIOD = 1600;
 const MAX_MSG_LINES = 3;
 const MAX_MSG_LINE_LEN = CONTENT_WIDTH;
 const RESUME_HINT = "[ctrl+c to stop, gnhf again to resume]";
+const GRACEFUL_STOP_HINT = "[graceful stop requested, ctrl+c again to force stop, gnhf again to resume]";
 const DONE_HINT = "[ctrl+c to exit]";
 function spacedLabel(text) {
 	return text.split("").join(" ");
@@ -3804,8 +4419,8 @@ function centerLineCells(content, width) {
 		...emptyCells(rightPad)
 	];
 }
-function renderResumeHintCells(width, done) {
-	return centerLineCells(textToCells(done ? DONE_HINT : RESUME_HINT, "dim"), width);
+function renderResumeHintCells(width, interruptHint) {
+	return centerLineCells(textToCells(interruptHint === "exit" ? DONE_HINT : interruptHint === "force-stop" ? GRACEFUL_STOP_HINT : RESUME_HINT, "dim"), width);
 }
 /**
 * Builds the centered content viewport for the renderer.
@@ -3913,8 +4528,7 @@ function buildFrameCells(prompt, agentName, state, topStars, bottomStars, sideSt
 		]);
 	}
 	for (let y = 0; y < bottomHeight; y++) frame.push(renderStarLineCells(bottomStars, terminalWidth, y, now));
-	const isDone = state.status === "aborted";
-	frame.push(renderResumeHintCells(terminalWidth, isDone));
+	frame.push(renderResumeHintCells(terminalWidth, state.interruptHint));
 	frame.push(emptyCells(terminalWidth));
 	return frame;
 }
@@ -3938,6 +4552,7 @@ var Renderer = class {
 	seedTop;
 	seedBottom;
 	seedSide;
+	onInterrupt;
 	handleState = (newState) => {
 		this.state = {
 			...newState,
@@ -3948,10 +4563,11 @@ var Renderer = class {
 	handleStopped = () => {
 		this.stop("stopped");
 	};
-	constructor(orchestrator, prompt, agentName) {
+	constructor(orchestrator, prompt, agentName, onInterrupt) {
 		this.orchestrator = orchestrator;
 		this.prompt = prompt;
 		this.agentName = agentName;
+		this.onInterrupt = onInterrupt;
 		this.state = orchestrator.getState();
 		this.seedTop = Math.floor(Math.random() * 2147483646) + 1;
 		this.seedBottom = Math.floor(Math.random() * 2147483646) + 1;
@@ -3967,10 +4583,7 @@ var Renderer = class {
 			process$1.stdin.setRawMode(true);
 			process$1.stdin.resume();
 			process$1.stdin.on("data", (data) => {
-				if (data[0] === 3) {
-					this.stop("interrupted");
-					this.orchestrator.stop();
-				}
+				if (data[0] === 3) this.onInterrupt();
 			});
 		}
 		this.interval = setInterval(() => this.render(), TICK_MS);
@@ -4067,6 +4680,8 @@ const GNHF_REEXEC_STDIN_PROMPT = "GNHF_REEXEC_STDIN_PROMPT";
 const GNHF_REEXEC_STDIN_PROMPT_FILE = "GNHF_REEXEC_STDIN_PROMPT_FILE";
 const GNHF_REEXEC_STDIN_PROMPT_DIR_PREFIX = "gnhf-stdin-";
 const GNHF_REEXEC_STDIN_PROMPT_FILENAME = "prompt.txt";
+const AGENT_NAME_SET = new Set(AGENT_NAMES);
+const AGENT_NAME_LIST = `"${AGENT_NAMES.slice(0, -1).join("\", \"")}", or "${AGENT_NAMES[AGENT_NAMES.length - 1]}"`;
 var PromptSignalError = class extends Error {
 	constructor(signal) {
 		super(signal);
@@ -4088,6 +4703,22 @@ function humanizeErrorMessage(message) {
 	if (message.includes("not a git repository")) return "This command must be run inside a Git repository. Change into a repo or run \"git init\" first.";
 	return message;
 }
+function isAgentName(name) {
+	return AGENT_NAME_SET.has(name);
+}
+function buildSchemaOptions(stopWhen) {
+	return stopWhen === void 0 ? { includeStopField: false } : {
+		includeStopField: true,
+		stopWhen
+	};
+}
+function buildResumeSchemaOptions(stopWhen) {
+	if (stopWhen === "") return {
+		includeStopField: false,
+		clearStopWhen: true
+	};
+	return buildSchemaOptions(stopWhen);
+}
 function initializeNewBranch(prompt, cwd, schemaOptions) {
 	ensureCleanWorkingTree(cwd);
 	const baseCommit = getHeadCommit(cwd);
@@ -4102,11 +4733,27 @@ function initializeWorktreeRun(prompt, cwd, schemaOptions) {
 	const branchName = slugifyPrompt(prompt);
 	const runId = branchName.split("/")[1];
 	const worktreePath = join(dirname(repoRoot), `${basename(repoRoot)}-gnhf-worktrees`, runId);
+	if (worktreeExists(repoRoot, worktreePath) && existsSync(join(worktreePath, ".gnhf", "runs", runId))) {
+		let worktreeBranch;
+		try {
+			worktreeBranch = getCurrentBranch(worktreePath);
+		} catch (error) {
+			throw new Error(`Preserved worktree at ${worktreePath} is in an unexpected state (${error instanceof Error ? error.message : String(error)}). Fix the worktree manually or remove it with "git worktree remove ${worktreePath}" before re-running.`);
+		}
+		if (worktreeBranch !== branchName) throw new Error(`Preserved worktree at ${worktreePath} is on branch "${worktreeBranch}" rather than "${branchName}". Restore it to "${branchName}" with "git -C ${worktreePath} checkout ${branchName}", or remove the worktree with "git worktree remove ${worktreePath}" to start fresh.`);
+		return {
+			runInfo: resumeRun(runId, worktreePath, schemaOptions),
+			worktreePath,
+			effectiveCwd: worktreePath,
+			resumed: true
+		};
+	}
 	createWorktree(repoRoot, worktreePath, branchName);
 	return {
 		runInfo: setupRun(runId, prompt, baseCommit, worktreePath, schemaOptions),
 		worktreePath,
-		effectiveCwd: worktreePath
+		effectiveCwd: worktreePath,
+		resumed: false
 	};
 }
 function openPromptTerminal() {
@@ -4232,11 +4879,13 @@ function readReexecStdinPrompt(env) {
 	}
 }
 const program = new Command();
-program.name("gnhf").description("Before I go to bed, I tell my agents: good night, have fun").version(packageVersion).argument("[prompt]", "The objective for the coding agent").option("--agent <agent>", "Agent to use (claude, codex, rovodev, or opencode)").option("--max-iterations <n>", "Abort after N total iterations", parseNonNegativeInteger).option("--max-tokens <n>", "Abort after N total input+output tokens", parseNonNegativeInteger).option("--stop-when <condition>", "End the loop when the agent reports this natural-language condition is met").option("--prevent-sleep <mode>", "Prevent system sleep during the run (\"on\" or \"off\")", parseOnOffBoolean).option("--worktree", "Run in a separate git worktree (enables multiple agents on the same repo)", false).option("--mock", "", false).action(async (promptArg, options) => {
+program.name("gnhf").description("Before I go to bed, I tell my agents: good night, have fun").version(packageVersion).argument("[prompt]", "The objective for the coding agent").option("--agent <agent>", `Agent to use (${AGENT_NAMES.join(", ")})`).option("--max-iterations <n>", "Abort after N total iterations", parseNonNegativeInteger).option("--max-tokens <n>", "Abort after N total input+output tokens", parseNonNegativeInteger).option("--stop-when <condition>", "End when the agent reports this condition; resumes reuse it, pass a new value to overwrite or \"\" to clear").option("--prevent-sleep <mode>", "Prevent system sleep during the run (\"on\" or \"off\")", parseOnOffBoolean).option("--worktree", "Run in a separate git worktree (enables multiple agents on the same repo)", false).option("--mock", "", false).action(async (promptArg, options) => {
 	if (options.mock) {
 		const mock = new MockOrchestrator();
 		enterAltScreen();
-		const renderer = new Renderer(mock, "let's minimize app startup latency without sacrificing any functionality", "claude");
+		const renderer = new Renderer(mock, "let's minimize app startup latency without sacrificing any functionality", "claude", () => {
+			mock.handleInterrupt();
+		});
 		renderer.start();
 		mock.start();
 		await renderer.waitUntilExit();
@@ -4248,16 +4897,16 @@ program.name("gnhf").description("Before I go to bed, I tell my agents: good nig
 	let prompt = promptArg;
 	let promptFromStdin = false;
 	const agentName = options.agent;
-	if (agentName !== void 0 && agentName !== "claude" && agentName !== "codex" && agentName !== "rovodev" && agentName !== "opencode") {
-		console.error(`Unknown agent: ${options.agent}. Use "claude", "codex", "rovodev", or "opencode".`);
+	if (agentName !== void 0 && !isAgentName(agentName)) {
+		console.error(`Unknown agent: ${options.agent}. Use ${AGENT_NAME_LIST}.`);
 		process$1.exit(1);
 	}
 	const config = {
 		...loadConfig(agentName ? { agent: agentName } : {}),
 		...options.preventSleep === void 0 ? {} : { preventSleep: options.preventSleep }
 	};
-	if (config.agent !== "claude" && config.agent !== "codex" && config.agent !== "rovodev" && config.agent !== "opencode") {
-		console.error(`Unknown agent: ${config.agent}. Use "claude", "codex", "rovodev", or "opencode".`);
+	if (!isAgentName(config.agent)) {
+		console.error(`Unknown agent: ${config.agent}. Use ${AGENT_NAME_LIST}.`);
 		process$1.exit(1);
 	}
 	if (!prompt && process$1.env.GNHF_SLEEP_INHIBITED === "1") prompt = readReexecStdinPrompt(process$1.env);
@@ -4271,7 +4920,9 @@ program.name("gnhf").description("Before I go to bed, I tell my agents: good nig
 	let worktreeCleanup = null;
 	const currentBranch = getCurrentBranch(cwd);
 	const onGnhfBranch = currentBranch.startsWith("gnhf/");
-	const schemaOptions = { includeStopField: options.stopWhen !== void 0 };
+	const cliStopWhen = options.stopWhen === "" ? void 0 : options.stopWhen;
+	let effectiveStopWhen = cliStopWhen;
+	let schemaOptions = buildSchemaOptions(effectiveStopWhen);
 	let runInfo;
 	let startIteration = 0;
 	if (options.worktree) {
@@ -4287,31 +4938,49 @@ program.name("gnhf").description("Before I go to bed, I tell my agents: good nig
 		runInfo = wt.runInfo;
 		effectiveCwd = wt.effectiveCwd;
 		worktreePath = wt.worktreePath;
-		worktreeCleanup = () => {
-			try {
-				removeWorktree(cwd, wt.worktreePath);
-			} catch {}
-		};
-		const exitCleanup = worktreeCleanup;
-		process$1.on("exit", () => {
-			if (worktreeCleanup === exitCleanup) exitCleanup();
-		});
+		if (wt.resumed) {
+			startIteration = getLastIterationNumber(runInfo);
+			console.error(`\n  gnhf: resuming preserved worktree at ${worktreePath}\n  gnhf: continuing run ${runInfo.runId} from iteration ${startIteration}\n`);
+		} else {
+			worktreeCleanup = () => {
+				try {
+					removeWorktree(cwd, wt.worktreePath);
+				} catch {}
+			};
+			const exitCleanup = worktreeCleanup;
+			process$1.on("exit", () => {
+				if (worktreeCleanup === exitCleanup) exitCleanup();
+			});
+		}
 	} else if (onGnhfBranch) {
 		const existingRunId = currentBranch.slice(5);
-		const existing = resumeRun(existingRunId, cwd, schemaOptions);
+		let existing = resumeRun(existingRunId, cwd, { includeStopField: false });
 		const existingPrompt = readFileSync(existing.promptPath, "utf-8");
 		if (!prompt || prompt === existingPrompt) {
+			existing = resumeRun(existingRunId, cwd, buildResumeSchemaOptions(options.stopWhen));
+			const resumeStopWhen = existing.stopWhen;
+			const resumeSchemaOptions = buildSchemaOptions(resumeStopWhen);
 			prompt = existingPrompt;
 			runInfo = existing;
+			effectiveStopWhen = resumeStopWhen;
+			schemaOptions = resumeSchemaOptions;
 			startIteration = getLastIterationNumber(existing);
 		} else {
 			const answer = await ask(`You are on gnhf branch "${currentBranch}".\n  (o) Update prompt and continue current run\n  (n) Start a new branch on top of this one\n  (q) Quit\nChoose [o/n/q]: `, "The overwrite prompt closed before a choice was entered. Re-run gnhf from an interactive terminal and choose o, n, or q.", "Cannot show the overwrite prompt because stdin is not interactive. Re-run gnhf from an interactive terminal and choose o, n, or q.");
 			if (answer === "o") {
 				ensureCleanWorkingTree(cwd);
-				runInfo = setupRun(existingRunId, prompt, existing.baseCommit, cwd, schemaOptions);
+				existing = resumeRun(existingRunId, cwd, buildResumeSchemaOptions(options.stopWhen));
+				const resumeStopWhen = existing.stopWhen;
+				const resumeSchemaOptions = buildSchemaOptions(resumeStopWhen);
+				runInfo = setupRun(existingRunId, prompt, existing.baseCommit, cwd, resumeSchemaOptions);
+				effectiveStopWhen = resumeStopWhen;
+				schemaOptions = resumeSchemaOptions;
 				startIteration = getLastIterationNumber(existing);
-			} else if (answer === "n") runInfo = initializeNewBranch(prompt, cwd, schemaOptions);
-			else process$1.exit(0);
+			} else if (answer === "n") {
+				effectiveStopWhen = cliStopWhen;
+				schemaOptions = buildSchemaOptions(effectiveStopWhen);
+				runInfo = initializeNewBranch(prompt, cwd, schemaOptions);
+			} else process$1.exit(0);
 		}
 	} else {
 		if (!prompt) {
@@ -4346,7 +5015,7 @@ program.name("gnhf").description("Before I go to bed, I tell my agents: good nig
 		startIteration,
 		maxIterations: options.maxIterations,
 		maxTokens: options.maxTokens,
-		stopWhen: options.stopWhen,
+		stopWhen: effectiveStopWhen,
 		preventSleep: config.preventSleep,
 		agentArgsOverride: config.agentArgsOverride?.[config.agent],
 		worktree: options.worktree,
@@ -4358,21 +5027,39 @@ program.name("gnhf").description("Before I go to bed, I tell my agents: good nig
 	const orchestrator = new Orchestrator(config, createAgent(config.agent, runInfo, config.agentPathOverride[config.agent], config.agentArgsOverride?.[config.agent], schemaOptions), runInfo, prompt, effectiveCwd, startIteration, {
 		maxIterations: options.maxIterations,
 		maxTokens: options.maxTokens,
-		stopWhen: options.stopWhen
+		stopWhen: effectiveStopWhen
 	});
 	let shutdownSignal = null;
-	enterAltScreen();
-	const renderer = new Renderer(orchestrator, prompt, config.agent);
-	renderer.start();
-	const requestShutdown = (signal) => {
-		if (shutdownSignal) return;
+	let forceShutdownRequested = false;
+	const requestForceShutdown = (signal) => {
+		if (forceShutdownRequested) return;
+		forceShutdownRequested = true;
 		shutdownSignal = signal;
 		appendDebugLog(`signal:${signal}`);
 		renderer.stop();
+	};
+	const handleSigInt = () => {
+		const disposition = orchestrator.handleInterrupt();
+		if (disposition === "force-stop") {
+			requestForceShutdown("SIGINT");
+			return;
+		}
+		if (disposition === "exit") {
+			shutdownSignal = "SIGINT";
+			appendDebugLog("signal:SIGINT");
+			renderer.stop("interrupted");
+			return;
+		}
+		shutdownSignal = "SIGINT";
+		appendDebugLog("signal:SIGINT");
+	};
+	const handleSigTerm = () => {
 		orchestrator.stop();
+		requestForceShutdown("SIGTERM");
 	};
-	const handleSigInt = () => requestShutdown("SIGINT");
-	const handleSigTerm = () => requestShutdown("SIGTERM");
+	enterAltScreen();
+	const renderer = new Renderer(orchestrator, prompt, config.agent, handleSigInt);
+	renderer.start();
 	process$1.on("SIGINT", handleSigInt);
 	process$1.on("SIGTERM", handleSigTerm);
 	const orchestratorPromise = orchestrator.start().finally(() => {