gnhf 0.1.24 → 0.1.25

package/README.md

@@ -45,7 +45,7 @@ gnhf is a [ralph](https://ghuntley.com/ralph/), [autoresearch](https://github.co
 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
+- **Long running** — each iteration is committed on success, rolled back on failure, with sensible retries; hard agent errors back off exponentially while agent-reported failures continue immediately
 - **Live terminal title** — interactive runs keep your terminal title updated with live status, token totals, and commit count, then restore the previous title on exit
 - **Agent-agnostic** — works with Claude Code, Codex, Rovo Dev, or OpenCode out of the box
 
@@ -122,7 +122,7 @@ npm link
               ┌──────────┐  ┌───────────┐                  │
               │  commit  │  │ git reset │                  │
               │  append  │  │  --hard   │                  │
-              │ notes.md │  │  backoff  │                  │
+              │ notes.md │  │ maybe wait│                  │
               └────┬─────┘  └─────┬─────┘                  │
                    │              │                        │
                    │   ┌──────────┘                        │
@@ -136,10 +136,11 @@ npm link
 ```
 
 - **Incremental commits** — each successful iteration is a separate git commit, so you can cherry-pick or revert individual changes
+- **Failure handling** - all failed iterations are rolled back with `git reset --hard`; agent-reported failures proceed to the next iteration immediately, while hard agent errors use exponential backoff
 - **Runtime caps** - `--max-iterations` stops before the next iteration begins, `--max-tokens` can abort mid-iteration once reported usage reaches the cap, and `--stop-when` ends the loop after an iteration whose agent output reports the natural-language condition is met; uncommitted work is rolled back in either case, and in the interactive TUI the final state remains visible until you press Ctrl+C to exit
 - **Shared memory** — the agent reads `notes.md` (built up from prior iterations) to communicate across iterations
 - **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; if you provide a different prompt, gnhf asks whether to overwrite the saved prompt, start a new branch, or quit
+- **Resume support** — run `gnhf` while on an existing `gnhf/` branch to pick up where a previous run left off; if you provide a different prompt, gnhf asks whether to update the saved prompt and continue with the existing history, start a new branch, or quit
 
 ### Worktree Mode
 
@@ -165,7 +166,7 @@ Pass `--worktree` to run each agent in an isolated [git worktree](https://git-sc
 | `echo "<prompt>" \| gnhf` | Pipe prompt via stdin                           |
 | `cat prd.md \| gnhf`      | Pipe a large spec or PRD via stdin              |
 
-If you run `gnhf` on an existing `gnhf/` branch with a different prompt, gnhf asks whether to overwrite the saved prompt, start a new branch, or quit. When the prompt came from stdin, that confirmation is read from the controlling terminal, so it must be available.
+If you run `gnhf` on an existing `gnhf/` branch with a different prompt, gnhf asks whether to update `prompt.md` and continue the existing run history, start a new branch, or quit. When the prompt came from stdin, that confirmation is read from the controlling terminal, so it must be available.
 
 ### Flags
 

package/dist/cli.mjs

@@ -488,7 +488,7 @@ function setupRun(runId, prompt, baseCommit, cwd, schemaOptions) {
 	const promptPath = join(runDir, "prompt.md");
 	writeFileSync(promptPath, prompt, "utf-8");
 	const notesPath = join(runDir, "notes.md");
-	writeFileSync(notesPath, `# gnhf run: ${runId}\n\nObjective: ${prompt}\n\n## Iteration Log\n`, "utf-8");
+	if (!existsSync(notesPath)) writeFileSync(notesPath, `# gnhf run: ${runId}\n\nObjective: see .gnhf/runs/${runId}/prompt.md\n\n## Iteration Log\n`, "utf-8");
 	const schemaPath = join(runDir, "output-schema.json");
 	writeSchemaFile(schemaPath, schemaOptions.includeStopField);
 	const logPath = join(runDir, LOG_FILENAME);
@@ -1133,6 +1133,7 @@ var ClaudeAgent = class {
 			});
 			if (setupAbortHandler(signal, child, reject, () => terminateClaudeProcess(child, this.platform))) return;
 			let resultEvent = null;
+			let latestResultUsage = null;
 			const cumulative = {
 				inputTokens: 0,
 				outputTokens: 0,
@@ -1201,7 +1202,11 @@ var ClaudeAgent = class {
 						}
 					}
 				}
-				if (event.type === "result") resultEvent = event;
+				if (event.type === "result") {
+					const next = event;
+					latestResultUsage = next.usage;
+					if (next.is_error || next.subtype !== "success" || next.structured_output || !resultEvent) resultEvent = next;
+				}
 			});
 			setupChildProcessHandlers(child, "claude", logStream, reject, () => {
 				if (!resultEvent) {
@@ -1217,7 +1222,7 @@ var ClaudeAgent = class {
 					return;
 				}
 				const output = resultEvent.structured_output;
-				const usage = toTokenUsage(resultEvent.usage);
+				const usage = toTokenUsage(latestResultUsage ?? resultEvent.usage);
 				onUsage?.(usage);
 				resolve({
 					output,
@@ -2849,6 +2854,7 @@ var Orchestrator = class extends EventEmitter {
 		successCount: 0,
 		failCount: 0,
 		consecutiveFailures: 0,
+		consecutiveErrors: 0,
 		startTime: /* @__PURE__ */ new Date(),
 		waitingUntil: null,
 		lastMessage: null
@@ -2993,14 +2999,14 @@ var Orchestrator = class extends EventEmitter {
 					this.abort(`${this.config.maxConsecutiveFailures} consecutive failures`);
 					break;
 				}
-				if (this.state.consecutiveFailures > 0 && !this.stopRequested) {
-					const backoffMs = 6e4 * Math.pow(2, this.state.consecutiveFailures - 1);
+				if (this.state.consecutiveErrors > 0 && !this.stopRequested) {
+					const backoffMs = 6e4 * Math.pow(2, this.state.consecutiveErrors - 1);
 					this.state.status = "waiting";
 					this.state.waitingUntil = new Date(Date.now() + backoffMs);
 					this.emit("state", this.getState());
 					appendDebugLog("backoff:start", {
 						iteration: this.state.currentIteration,
-						consecutiveFailures: this.state.consecutiveFailures,
+						consecutiveErrors: this.state.consecutiveErrors,
 						backoffMs
 					});
 					await this.interruptibleSleep(backoffMs);
@@ -3088,7 +3094,7 @@ var Orchestrator = class extends EventEmitter {
 			};
 			return {
 				type: "completed",
-				record: this.recordFailure(`[FAIL] ${result.output.summary}`, result.output.summary, toStringArray(result.output.key_learnings)),
+				record: this.recordFailure(`[FAIL] ${result.output.summary}`, result.output.summary, toStringArray(result.output.key_learnings), "reported"),
 				shouldFullyStop
 			};
 		} catch (err) {
@@ -3120,7 +3126,7 @@ var Orchestrator = class extends EventEmitter {
 			const summary = err instanceof Error ? err.message : String(err);
 			return {
 				type: "completed",
-				record: this.recordFailure(`[ERROR] ${summary}`, summary, []),
+				record: this.recordFailure(`[ERROR] ${summary}`, summary, [], "error"),
 				shouldFullyStop: false
 			};
 		} finally {
@@ -3134,6 +3140,7 @@ var Orchestrator = class extends EventEmitter {
 		this.state.commitCount = getBranchCommitCount(this.runInfo.baseCommit, this.cwd);
 		this.state.successCount++;
 		this.state.consecutiveFailures = 0;
+		this.state.consecutiveErrors = 0;
 		return {
 			number: this.state.currentIteration,
 			success: true,
@@ -3143,11 +3150,13 @@ var Orchestrator = class extends EventEmitter {
 			timestamp: /* @__PURE__ */ new Date()
 		};
 	}
-	recordFailure(notesSummary, recordSummary, learnings) {
+	recordFailure(notesSummary, recordSummary, learnings, kind) {
 		appendNotes(this.runInfo.notesPath, this.state.currentIteration, notesSummary, [], toStringArray(learnings));
 		resetHard(this.cwd);
 		this.state.failCount++;
 		this.state.consecutiveFailures++;
+		if (kind === "error") this.state.consecutiveErrors++;
+		else this.state.consecutiveErrors = 0;
 		return {
 			number: this.state.currentIteration,
 			success: false,
@@ -3280,6 +3289,7 @@ var MockOrchestrator = class extends EventEmitter {
 		successCount: 11,
 		failCount: 2,
 		consecutiveFailures: 0,
+		consecutiveErrors: 0,
 		startTime: new Date(Date.now() - INITIAL_ELAPSED_MS),
 		waitingUntil: null,
 		lastMessage: AGENT_MESSAGES[0]
@@ -4252,10 +4262,11 @@ program.name("gnhf").description("Before I go to bed, I tell my agents: good nig
 			runInfo = existing;
 			startIteration = getLastIterationNumber(existing);
 		} else {
-			const answer = await ask(`You are on gnhf branch "${currentBranch}".\n  (o) Overwrite current run with new prompt\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.");
+			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);
+				startIteration = getLastIterationNumber(existing);
 			} else if (answer === "n") runInfo = initializeNewBranch(prompt, cwd, schemaOptions);
 			else process$1.exit(0);
 		}

package/package.json

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