gnhf 0.1.17 → 0.1.19

package/README.md

@@ -62,6 +62,13 @@ $ gnhf "reduce complexity of the codebase without changing functionality" \
 # have a good nap
 ```
 
+```sh
+# Run multiple agents on the same repo simultaneously using worktrees
+$ gnhf --worktree "implement feature X" &
+$ gnhf --worktree "add tests for module Y" &
+$ gnhf --worktree "refactor the API layer" &
+```
+
 Run `gnhf` from inside a Git repository with a clean working tree. If you are starting from a plain directory, run `git init` first.
 `gnhf` supports macOS, Linux, and Windows.
 
@@ -133,6 +140,21 @@ npm link
 - **Local run metadata** — gnhf stores prompt, notes, and resume metadata under `.gnhf/runs/` and ignores it locally, so your branch only contains intentional work
 - **Resume support** — run `gnhf` while on an existing `gnhf/` branch to pick up where a previous run left off
 
+### Worktree Mode
+
+Pass `--worktree` to run each agent in an isolated [git worktree](https://git-scm.com/docs/git-worktree). This lets you launch multiple agents on the same repo simultaneously — each gets its own working directory and branch without interfering with the others or your main checkout.
+
+```
+<repo>/                              ← your repo (unchanged)
+<repo>-gnhf-worktrees/
+  ├── <run-slug-1>/                  ← worktree for agent 1
+  └── <run-slug-2>/                  ← worktree for agent 2
+```
+
+- Worktrees with commits are **preserved** after the run so you can review, merge, or cherry-pick the work. gnhf prints the path and cleanup command.
+- Worktrees with **no commits** are automatically removed on exit.
+- `--worktree` must be run from a non-gnhf branch (typically `main`).
+
 ## CLI Reference
 
 | Command                   | Description                                     |
@@ -150,6 +172,7 @@ npm link
 | `--max-iterations <n>`   | Abort after `n` total iterations                                   | unlimited              |
 | `--max-tokens <n>`       | Abort after `n` total input+output tokens                          | unlimited              |
 | `--prevent-sleep <mode>` | Prevent system sleep during the run (`on`/`off` or `true`/`false`) | config file (`on`)     |
+| `--worktree`             | Run in a separate git worktree (enables multiple agents concurrently) | `false`             |
 | `--version`              | Show version                                                       |                        |
 
 ## Configuration

package/dist/cli.mjs

@@ -313,6 +313,10 @@ function git(args, cwd) {
 		throw translateGitError(error);
 	}
 }
+/** Wrap a value in single quotes, escaping embedded single quotes for POSIX shells. */
+function shellEscape(value) {
+	return `'${value.replace(/'/g, "'\\''")}'`;
+}
 function isGitRepository(cwd) {
 	try {
 		execSync("git rev-parse --git-dir", {
@@ -378,6 +382,15 @@ function resetHard(cwd) {
 	git("reset --hard HEAD", cwd);
 	git("clean -fd", cwd);
 }
+function getRepoRootDir(cwd) {
+	return git("rev-parse --show-toplevel", cwd);
+}
+function createWorktree(baseCwd, worktreePath, branchName) {
+	git(`worktree add -b ${shellEscape(branchName)} ${shellEscape(worktreePath)}`, baseCwd);
+}
+function removeWorktree(baseCwd, worktreePath) {
+	git(`worktree remove --force ${shellEscape(worktreePath)}`, baseCwd);
+}
 //#endregion
 //#region src/core/agents/types.ts
 const AGENT_OUTPUT_SCHEMA = {
@@ -2885,6 +2898,12 @@ var Orchestrator = class extends EventEmitter {
 					}
 				}
 			}
+		} catch (err) {
+			appendDebugLog("orchestrator:loop-error", {
+				iteration: this.state.currentIteration,
+				error: serializeError(err)
+			});
+			throw err;
 		} finally {
 			this.activeIterationPromise = null;
 			if (this.stopPromise) await this.stopPromise;
@@ -3856,6 +3875,19 @@ function initializeNewBranch(prompt, cwd) {
 	const runId = branchName.split("/")[1];
 	return setupRun(runId, prompt, baseCommit, cwd);
 }
+function initializeWorktreeRun(prompt, cwd) {
+	const repoRoot = getRepoRootDir(cwd);
+	const baseCommit = getHeadCommit(cwd);
+	const branchName = slugifyPrompt(prompt);
+	const runId = branchName.split("/")[1];
+	const worktreePath = join(dirname(repoRoot), `${basename(repoRoot)}-gnhf-worktrees`, runId);
+	createWorktree(repoRoot, worktreePath, branchName);
+	return {
+		runInfo: setupRun(runId, prompt, baseCommit, worktreePath),
+		worktreePath,
+		effectiveCwd: worktreePath
+	};
+}
 function ask(question) {
 	const rl = createInterface({
 		input: process$1.stdin,
@@ -3918,7 +3950,7 @@ 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("--prevent-sleep <mode>", "Prevent system sleep during the run (\"on\" or \"off\")", parseOnOffBoolean).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 (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("--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();
@@ -3952,11 +3984,36 @@ program.name("gnhf").description("Before I go to bed, I tell my agents: good nig
 		promptFromStdin = true;
 	}
 	const cwd = process$1.cwd();
+	let effectiveCwd = cwd;
+	let worktreePath = null;
+	let worktreeCleanup = null;
 	const currentBranch = getCurrentBranch(cwd);
 	const onGnhfBranch = currentBranch.startsWith("gnhf/");
 	let runInfo;
 	let startIteration = 0;
-	if (onGnhfBranch) {
+	if (options.worktree) {
+		if (!prompt) {
+			program.help();
+			return;
+		}
+		if (onGnhfBranch) {
+			console.error("Cannot use --worktree from a gnhf branch. Switch to the base branch first.");
+			process$1.exit(1);
+		}
+		const wt = initializeWorktreeRun(prompt, cwd);
+		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();
+		});
+	} else if (onGnhfBranch) {
 		const existingRunId = currentBranch.slice(5);
 		const existing = resumeRun(existingRunId, cwd);
 		const existingPrompt = readFileSync(existing.promptPath, "utf-8");
@@ -4007,11 +4064,13 @@ program.name("gnhf").description("Before I go to bed, I tell my agents: good nig
 		maxTokens: options.maxTokens,
 		preventSleep: config.preventSleep,
 		agentArgsOverride: config.agentArgsOverride?.[config.agent],
+		worktree: options.worktree,
+		worktreePath,
 		platform: process$1.platform,
 		nodeVersion: process$1.version,
 		gnhfVersion: packageVersion
 	});
-	const orchestrator = new Orchestrator(config, createAgent(config.agent, runInfo, config.agentPathOverride[config.agent], config.agentArgsOverride?.[config.agent]), runInfo, prompt, cwd, startIteration, {
+	const orchestrator = new Orchestrator(config, createAgent(config.agent, runInfo, config.agentPathOverride[config.agent], config.agentArgsOverride?.[config.agent]), runInfo, prompt, effectiveCwd, startIteration, {
 		maxIterations: options.maxIterations,
 		maxTokens: options.maxTokens
 	});
@@ -4065,8 +4124,17 @@ program.name("gnhf").description("Before I go to bed, I tell my agents: good nig
 			failCount: finalState.failCount,
 			totalInputTokens: finalState.totalInputTokens,
 			totalOutputTokens: finalState.totalOutputTokens,
-			commitCount: finalState.commitCount
+			commitCount: finalState.commitCount,
+			worktreePath
 		});
+		if (worktreePath) if (finalState.commitCount > 0) {
+			worktreeCleanup = null;
+			console.error(`\n  gnhf: worktree preserved at ${worktreePath}\n  gnhf: merge the branch and remove with: git worktree remove "${worktreePath}"\n`);
+		} else {
+			worktreeCleanup?.();
+			worktreeCleanup = null;
+			appendDebugLog("worktree:cleaned-up", { worktreePath });
+		}
 	}
 	if (shutdownSignal) process$1.exit(getSignalExitCode(shutdownSignal));
 });

package/package.json

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