gnhf 0.1.10 → 0.1.11

package/README.md

@@ -47,7 +47,6 @@ You wake up to a branch full of clean work and a log of everything that happened
 - **Dead simple** — one command starts an autonomous loop that runs until you Ctrl+C or a configured runtime cap is reached
 - **Long running** — each iteration is committed on success, rolled back on failure, with sensible retries and exponential backoff
 - **Agent-agnostic** — works with Claude Code, Codex, Rovo Dev, or OpenCode out of the box
-- **Terminal-safe rendering** — the live UI keeps wide Unicode text such as emoji and CJK glyphs aligned instead of clipping or shifting the frame
 
 ## Quick Start
 
@@ -161,6 +160,11 @@ Config lives at `~/.gnhf/config.yml`:
 # Agent to use by default (claude, codex, rovodev, or opencode)
 agent: claude
 
+# Custom paths to agent binaries (optional)
+# agentPathOverride:
+#   claude: /path/to/custom-claude
+#   codex: /path/to/custom-codex
+
 # Abort after this many consecutive failures
 maxConsecutiveFailures: 3
 
@@ -172,6 +176,18 @@ If the file does not exist yet, `gnhf` creates it on first run using the resolve
 
 CLI flags override config file values. `--prevent-sleep` accepts `on`/`off` as well as `true`/`false`; the config file always uses a boolean.
 The iteration and token caps are runtime-only flags and are not persisted in `config.yml`.
+
+### Custom Agent Paths
+
+Use `agentPathOverride` to point any agent at a custom binary — useful for wrappers like Claude Code Switch or custom Codex builds that accept the same flags and arguments as the original:
+
+```yaml
+agentPathOverride:
+  claude: ~/bin/claude-code-switch
+  codex: /usr/local/bin/my-codex-wrapper
+```
+
+Paths may be absolute, bare executable names already on your `PATH`, `~`-prefixed, or relative to the config directory (`~/.gnhf/`). The override replaces only the binary name; all standard arguments are preserved, so the replacement must be CLI-compatible with the original agent. On Windows, `.cmd` and `.bat` wrappers are supported, including bare names resolved from `PATH`. For `rovodev`, the override must point to an `acli`-compatible binary since gnhf invokes it as `<bin> rovodev serve ...`.
 When sleep prevention is enabled, `gnhf` uses the native mechanism for your OS: `caffeinate` on macOS, `systemd-inhibit` on Linux, and a small PowerShell helper backed by `SetThreadExecutionState` on Windows.
 
 ## Debug Logs

package/dist/cli.mjs

@@ -11,8 +11,15 @@ import { createServer } from "node:net";
 import { EventEmitter } from "node:events";
 import { createHash } from "node:crypto";
 //#region src/core/config.ts
+const AGENT_NAMES = [
+	"claude",
+	"codex",
+	"rovodev",
+	"opencode"
+];
 const DEFAULT_CONFIG = {
 	agent: "claude",
+	agentPathOverride: {},
 	maxConsecutiveFailures: 3,
 	preventSleep: true
 };
@@ -25,7 +32,35 @@ function normalizePreventSleep(value) {
 	if (value === "on") return true;
 	if (value === "off") return false;
 }
-function normalizeConfig(config) {
+/**
+* Resolve a user-supplied path against the config directory (~/.gnhf).
+* Expands leading `~` or `~/` to the home directory, then resolves relative
+* paths against `baseDir` so that entries like `./bin/codex` work predictably
+* regardless of the repo's cwd. Bare executable names and absolute paths pass
+* through unchanged.
+*/
+function resolveConfigPath(raw, baseDir) {
+	if (raw !== "~" && !raw.startsWith("~/") && !raw.startsWith("~\\") && !raw.includes("/") && !raw.includes("\\")) return raw;
+	const home = homedir();
+	let expanded = raw;
+	if (expanded === "~") expanded = home;
+	else if (expanded.startsWith("~/") || expanded.startsWith("~\\")) expanded = join(home, expanded.slice(2));
+	return resolve(baseDir, expanded);
+}
+function normalizeAgentPathOverride(value, configDir) {
+	if (value === void 0 || value === null) return void 0;
+	if (typeof value !== "object" || Array.isArray(value)) throw new InvalidConfigError(`Invalid config value for agentPathOverride: expected an object mapping agent names to paths`);
+	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 (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);
+	}
+	return result;
+}
+function normalizeConfig(config, configDir) {
 	const normalized = { ...config };
 	const hasPreventSleep = Object.prototype.hasOwnProperty.call(config, "preventSleep");
 	const preventSleep = normalizePreventSleep(config.preventSleep);
@@ -33,22 +68,47 @@ function normalizeConfig(config) {
 		if (hasPreventSleep && config.preventSleep !== void 0) throw new InvalidConfigError(`Invalid config value for preventSleep: ${String(config.preventSleep)}`);
 		delete normalized.preventSleep;
 	} else normalized.preventSleep = preventSleep;
+	if (Object.prototype.hasOwnProperty.call(config, "agentPathOverride")) {
+		const resolveDir = configDir ?? join(homedir(), ".gnhf");
+		const agentPathOverride = normalizeAgentPathOverride(config.agentPathOverride, resolveDir);
+		if (agentPathOverride === void 0) delete normalized.agentPathOverride;
+		else normalized.agentPathOverride = agentPathOverride;
+	} else delete normalized.agentPathOverride;
 	return normalized;
 }
 function isMissingConfigError(error) {
 	if (!(error instanceof Error)) return false;
 	return "code" in error ? error.code === "ENOENT" : error.message.includes("ENOENT");
 }
+function serializeAgentPathOverride(agentPathOverride) {
+	const serializedOverrides = Object.fromEntries(AGENT_NAMES.flatMap((name) => {
+		const value = agentPathOverride[name];
+		return value === void 0 ? [] : [[name, value]];
+	}));
+	if (Object.keys(serializedOverrides).length === 0) return "";
+	return yaml.dump({ agentPathOverride: serializedOverrides }, {
+		lineWidth: -1,
+		noRefs: true,
+		sortKeys: false
+	}).trimEnd();
+}
 function serializeConfig(config) {
-	return `# Agent to use by default
-agent: ${config.agent}
-
-# Abort after this many consecutive failures
-maxConsecutiveFailures: ${config.maxConsecutiveFailures}
-
-# Prevent the machine from sleeping during a run
-preventSleep: ${config.preventSleep}
-`;
+	const agentPathOverrideSection = serializeAgentPathOverride(config.agentPathOverride);
+	const lines = [
+		"# Agent to use by default",
+		`agent: ${config.agent}`,
+		"",
+		"# Custom paths to agent binaries (optional)",
+		"# Paths may be absolute, bare executable names on PATH,",
+		"# ~-prefixed, or relative to this config directory.",
+		"# Note: rovodev overrides must point to an acli-compatible binary.",
+		"# agentPathOverride:",
+		"#   claude: /path/to/custom-claude",
+		"#   codex: /path/to/custom-codex"
+	];
+	if (agentPathOverrideSection) lines.push(...agentPathOverrideSection.split("\n"));
+	lines.push("", "# Abort after this many consecutive failures", `maxConsecutiveFailures: ${config.maxConsecutiveFailures}`, "", "# Prevent the machine from sleeping during a run", `preventSleep: ${config.preventSleep}`, "");
+	return lines.join("\n");
 }
 function loadConfig(overrides) {
 	const configDir = join(homedir(), ".gnhf");
@@ -57,7 +117,7 @@ function loadConfig(overrides) {
 	let shouldBootstrapConfig = false;
 	try {
 		const raw = readFileSync(configPath, "utf-8");
-		fileConfig = normalizeConfig(yaml.load(raw) ?? {});
+		fileConfig = normalizeConfig(yaml.load(raw) ?? {}, configDir);
 	} catch (error) {
 		if (error instanceof InvalidConfigError) throw error;
 		if (isMissingConfigError(error)) shouldBootstrapConfig = true;
@@ -745,10 +805,12 @@ function parseJSONLStream(stream, logStream, callback) {
 * Wire an AbortSignal to kill a child process.
 * Returns true if the signal was already aborted (caller should return early).
 */
-function setupAbortHandler(signal, child, reject) {
+function setupAbortHandler(signal, child, reject, abortChild = () => {
+	child.kill("SIGTERM");
+}) {
 	if (!signal) return false;
 	const onAbort = () => {
-		child.kill("SIGTERM");
+		abortChild();
 		reject(/* @__PURE__ */ new Error("Agent was aborted"));
 	};
 	if (signal.aborted) {
@@ -761,13 +823,52 @@ function setupAbortHandler(signal, child, reject) {
 }
 //#endregion
 //#region src/core/agents/claude.ts
+function shouldUseWindowsShell$2(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 terminateClaudeProcess(child, platform) {
+	if (platform === "win32" && child.pid) {
+		try {
+			execFileSync("taskkill", [
+				"/T",
+				"/F",
+				"/PID",
+				String(child.pid)
+			], { stdio: "ignore" });
+		} catch {}
+		return;
+	}
+	child.kill("SIGTERM");
+}
 var ClaudeAgent = class {
 	name = "claude";
+	bin;
+	platform;
+	constructor(binOrDeps = {}) {
+		const deps = typeof binOrDeps === "string" ? { bin: binOrDeps } : binOrDeps;
+		this.bin = deps.bin ?? "claude";
+		this.platform = deps.platform ?? process.platform;
+	}
 	run(prompt, cwd, options) {
 		const { onUsage, onMessage, signal, logPath } = options ?? {};
 		return new Promise((resolve, reject) => {
 			const logStream = logPath ? createWriteStream(logPath) : null;
-			const child = spawn("claude", [
+			const child = spawn(this.bin, [
 				"-p",
 				prompt,
 				"--verbose",
@@ -778,6 +879,7 @@ var ClaudeAgent = class {
 				"--dangerously-skip-permissions"
 			], {
 				cwd,
+				shell: shouldUseWindowsShell$2(this.bin, this.platform),
 				stdio: [
 					"ignore",
 					"pipe",
@@ -785,7 +887,7 @@ var ClaudeAgent = class {
 				],
 				env: process.env
 			});
-			if (setupAbortHandler(signal, child, reject)) return;
+			if (setupAbortHandler(signal, child, reject, () => terminateClaudeProcess(child, this.platform))) return;
 			let resultEvent = null;
 			const cumulative = {
 				inputTokens: 0,
@@ -841,17 +943,54 @@ var ClaudeAgent = class {
 };
 //#endregion
 //#region src/core/agents/codex.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 terminateCodexProcess(child, platform) {
+	if (platform === "win32" && child.pid) {
+		try {
+			execFileSync("taskkill", [
+				"/T",
+				"/F",
+				"/PID",
+				String(child.pid)
+			], { stdio: "ignore" });
+		} catch {}
+		return;
+	}
+	child.kill("SIGTERM");
+}
 var CodexAgent = class {
 	name = "codex";
+	bin;
+	platform;
 	schemaPath;
-	constructor(schemaPath) {
+	constructor(schemaPath, binOrDeps = {}) {
+		const deps = typeof binOrDeps === "string" ? { bin: binOrDeps } : binOrDeps;
+		this.bin = deps.bin ?? "codex";
+		this.platform = deps.platform ?? process.platform;
 		this.schemaPath = schemaPath;
 	}
 	run(prompt, cwd, options) {
 		const { onUsage, onMessage, signal, logPath } = options ?? {};
 		return new Promise((resolve, reject) => {
 			const logStream = logPath ? createWriteStream(logPath) : null;
-			const child = spawn("codex", [
+			const child = spawn(this.bin, [
 				"exec",
 				prompt,
 				"--json",
@@ -862,6 +1001,7 @@ var CodexAgent = class {
 				"never"
 			], {
 				cwd,
+				shell: shouldUseWindowsShell$1(this.bin, this.platform),
 				stdio: [
 					"ignore",
 					"pipe",
@@ -869,7 +1009,7 @@ var CodexAgent = class {
 				],
 				env: process.env
 			});
-			if (setupAbortHandler(signal, child, reject)) return;
+			if (setupAbortHandler(signal, child, reject, () => terminateCodexProcess(child, this.platform))) return;
 			let lastAgentMessage = null;
 			const cumulative = {
 				inputTokens: 0,
@@ -1018,6 +1158,7 @@ function withTimeoutSignal$1(signal, timeoutMs) {
 }
 var OpenCodeAgent = class {
 	name = "opencode";
+	bin;
 	fetchFn;
 	getPortFn;
 	killProcessFn;
@@ -1026,6 +1167,7 @@ var OpenCodeAgent = class {
 	server = null;
 	closingPromise = null;
 	constructor(deps = {}) {
+		this.bin = deps.bin ?? "opencode";
 		this.fetchFn = deps.fetch ?? fetch;
 		this.getPortFn = deps.getPort ?? getAvailablePort$1;
 		this.killProcessFn = deps.killProcess ?? process.kill.bind(process);
@@ -1077,7 +1219,7 @@ var OpenCodeAgent = class {
 		const port = await this.getPortFn();
 		const isWindows = this.platform === "win32";
 		const detached = !isWindows;
-		const child = this.spawnFn("opencode", [
+		const child = this.spawnFn(this.bin, [
 			"serve",
 			"--hostname",
 			"127.0.0.1",
@@ -1463,6 +1605,38 @@ function createAbortError() {
 function isAbortError(error) {
 	return error instanceof Error && error.name === "AbortError";
 }
+function shouldUseWindowsShell(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 terminateRovoDevProcess(child, platform) {
+	if (platform === "win32" && child.pid) {
+		try {
+			execFileSync("taskkill", [
+				"/T",
+				"/F",
+				"/PID",
+				String(child.pid)
+			], { stdio: "ignore" });
+		} catch {}
+		return;
+	}
+	child.kill("SIGTERM");
+}
 function getAvailablePort() {
 	return new Promise((resolve, reject) => {
 		const server = createServer();
@@ -1509,18 +1683,22 @@ async function delay(ms, signal) {
 }
 var RovoDevAgent = class {
 	name = "rovodev";
+	bin;
 	schemaPath;
 	fetchFn;
 	getPortFn;
 	killProcessFn;
+	platform;
 	spawnFn;
 	server = null;
 	closingPromise = null;
 	constructor(schemaPath, deps = {}) {
+		this.bin = deps.bin ?? "acli";
 		this.schemaPath = schemaPath;
 		this.fetchFn = deps.fetch ?? fetch;
 		this.getPortFn = deps.getPort ?? getAvailablePort;
 		this.killProcessFn = deps.killProcess ?? process.kill.bind(process);
+		this.platform = deps.platform ?? process.platform;
 		this.spawnFn = deps.spawn ?? spawn;
 	}
 	async run(prompt, cwd, options) {
@@ -1564,8 +1742,8 @@ var RovoDevAgent = class {
 		}
 		if (this.server && !this.server.closed) await this.shutdownServer();
 		const port = await this.getPortFn();
-		const detached = process.platform !== "win32";
-		const child = this.spawnFn("acli", [
+		const detached = this.platform !== "win32";
+		const child = this.spawnFn(this.bin, [
 			"rovodev",
 			"serve",
 			"--disable-session-token",
@@ -1573,6 +1751,7 @@ var RovoDevAgent = class {
 		], {
 			cwd,
 			detached,
+			shell: shouldUseWindowsShell(this.bin, this.platform),
 			stdio: [
 				"ignore",
 				"pipe",
@@ -1837,11 +2016,29 @@ var RovoDevAgent = class {
 			cwd: server.cwd,
 			port: server.port
 		});
-		this.closingPromise = shutdownChildProcess(server.child, {
+		this.closingPromise = this.platform === "win32" ? new Promise((resolve) => {
+			const handleClose = () => {
+				server.child.off("close", handleClose);
+				resolve();
+			};
+			server.child.on("close", handleClose);
+			try {
+				terminateRovoDevProcess(server.child, this.platform);
+			} catch {
+				server.child.off("close", handleClose);
+				resolve();
+				return;
+			}
+			setTimeout(() => {
+				server.child.off("close", handleClose);
+				resolve();
+			}, 100).unref?.();
+		}) : shutdownChildProcess(server.child, {
 			detached: server.detached,
 			killProcess: this.killProcessFn,
 			timeoutMs: 3e3
-		}).finally(() => {
+		});
+		this.closingPromise = this.closingPromise.finally(() => {
 			if (this.server === server) this.server = null;
 			this.closingPromise = null;
 		});
@@ -1875,12 +2072,12 @@ function withTimeoutSignal(signal, timeoutMs) {
 }
 //#endregion
 //#region src/core/agents/factory.ts
-function createAgent(name, runInfo) {
+function createAgent(name, runInfo, pathOverride) {
 	switch (name) {
-		case "claude": return new ClaudeAgent();
-		case "codex": return new CodexAgent(runInfo.schemaPath);
-		case "opencode": return new OpenCodeAgent();
-		case "rovodev": return new RovoDevAgent(runInfo.schemaPath);
+		case "claude": return new ClaudeAgent(pathOverride);
+		case "codex": return new CodexAgent(runInfo.schemaPath, pathOverride);
+		case "opencode": return new OpenCodeAgent({ bin: pathOverride });
+		case "rovodev": return new RovoDevAgent(runInfo.schemaPath, { bin: pathOverride });
 	}
 }
 //#endregion
@@ -3081,7 +3278,7 @@ program.name("gnhf").description("Before I go to bed, I tell my agents: good nig
 		}
 	}
 	appendDebugLog("run:start", { args: process$1.argv.slice(2) });
-	const orchestrator = new Orchestrator(config, createAgent(config.agent, runInfo), runInfo, prompt, cwd, startIteration, {
+	const orchestrator = new Orchestrator(config, createAgent(config.agent, runInfo, config.agentPathOverride[config.agent]), runInfo, prompt, cwd, startIteration, {
 		maxIterations: options.maxIterations,
 		maxTokens: options.maxTokens
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gnhf",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "Before I go to bed, I tell my agents: good night, have fun",
   "type": "module",
   "bin": {