gnhf 0.1.21 → 0.1.23

package/README.md

@@ -136,7 +136,7 @@ npm link
 ```
 
 - **Incremental commits** — each successful iteration is a separate git commit, so you can cherry-pick or revert individual changes
-- **Runtime caps** — `--max-iterations` stops before the next iteration begins, while `--max-tokens` can abort mid-iteration once reported usage reaches the cap; 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
+- **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
@@ -172,6 +172,7 @@ Pass `--worktree` to run each agent in an isolated [git worktree](https://git-sc
 | `--agent <agent>`        | Agent to use (`claude`, `codex`, `rovodev`, or `opencode`)            | config file (`claude`) |
 | `--max-iterations <n>`   | Abort after `n` total iterations                                      | unlimited              |
 | `--max-tokens <n>`       | Abort after `n` total input+output tokens                             | unlimited              |
+| `--stop-when <cond>`     | End the loop when the agent reports this natural-language condition is met | 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                                                          |                        |

package/dist/cli.mjs

@@ -440,7 +440,8 @@ const AGENT_OUTPUT_SCHEMA = {
 		key_learnings: {
 			type: "array",
 			items: { type: "string" }
-		}
+		},
+		should_fully_stop: { type: "boolean" }
 	},
 	required: [
 		"success",
@@ -1082,6 +1083,20 @@ function buildClaudeArgs(prompt, extraArgs) {
 		...userSpecifiedPermissionMode ? [] : ["--dangerously-skip-permissions"]
 	];
 }
+function toTokenUsage(usage) {
+	return {
+		inputTokens: (usage.input_tokens ?? 0) + (usage.cache_read_input_tokens ?? 0),
+		outputTokens: usage.output_tokens ?? 0,
+		cacheReadTokens: usage.cache_read_input_tokens ?? 0,
+		cacheCreationTokens: usage.cache_creation_input_tokens ?? 0
+	};
+}
+function isSameUsage(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);
+}
 var ClaudeAgent = class {
 	name = "claude";
 	bin;
@@ -1115,13 +1130,60 @@ var ClaudeAgent = class {
 				cacheReadTokens: 0,
 				cacheCreationTokens: 0
 			};
+			const usageByMessageId = /* @__PURE__ */ new Map();
+			let anonymousAssistantCount = 0;
+			let lastAnonymousAssistantId = null;
+			let lastAnonymousAssistantUsage = null;
+			let pendingAnonymousAssistantUsage = null;
 			parseJSONLStream(child.stdout, logStream, (event) => {
 				if (event.type === "assistant") {
 					const msg = event.message;
-					cumulative.inputTokens += (msg.usage.input_tokens ?? 0) + (msg.usage.cache_read_input_tokens ?? 0);
-					cumulative.outputTokens += msg.usage.output_tokens ?? 0;
-					cumulative.cacheReadTokens += msg.usage.cache_read_input_tokens ?? 0;
-					cumulative.cacheCreationTokens += msg.usage.cache_creation_input_tokens ?? 0;
+					const nextUsage = toTokenUsage(msg.usage);
+					let messageId = msg.id;
+					let previousUsage;
+					if (messageId) {
+						previousUsage = usageByMessageId.get(messageId);
+						lastAnonymousAssistantId = null;
+						lastAnonymousAssistantUsage = null;
+						pendingAnonymousAssistantUsage = null;
+					} else if (pendingAnonymousAssistantUsage && extendsUsage(nextUsage, pendingAnonymousAssistantUsage)) {
+						messageId = `assistant-${anonymousAssistantCount++}`;
+						previousUsage = pendingAnonymousAssistantUsage;
+						cumulative.inputTokens += pendingAnonymousAssistantUsage.inputTokens;
+						cumulative.outputTokens += pendingAnonymousAssistantUsage.outputTokens;
+						cumulative.cacheReadTokens += pendingAnonymousAssistantUsage.cacheReadTokens;
+						cumulative.cacheCreationTokens += pendingAnonymousAssistantUsage.cacheCreationTokens;
+						usageByMessageId.set(messageId, pendingAnonymousAssistantUsage);
+						pendingAnonymousAssistantUsage = null;
+						lastAnonymousAssistantId = messageId;
+						lastAnonymousAssistantUsage = nextUsage;
+					} else if (lastAnonymousAssistantId && lastAnonymousAssistantUsage && extendsUsage(nextUsage, lastAnonymousAssistantUsage)) {
+						messageId = lastAnonymousAssistantId;
+						previousUsage = usageByMessageId.get(messageId);
+						pendingAnonymousAssistantUsage = null;
+						lastAnonymousAssistantUsage = nextUsage;
+					} else if (lastAnonymousAssistantId && lastAnonymousAssistantUsage && isSameUsage(nextUsage, lastAnonymousAssistantUsage)) {
+						messageId = lastAnonymousAssistantId;
+						previousUsage = usageByMessageId.get(messageId);
+						pendingAnonymousAssistantUsage ??= nextUsage;
+					} else {
+						messageId = `assistant-${anonymousAssistantCount++}`;
+						pendingAnonymousAssistantUsage = null;
+						lastAnonymousAssistantId = messageId;
+						lastAnonymousAssistantUsage = nextUsage;
+					}
+					if (previousUsage) {
+						cumulative.inputTokens += nextUsage.inputTokens - previousUsage.inputTokens;
+						cumulative.outputTokens += nextUsage.outputTokens - previousUsage.outputTokens;
+						cumulative.cacheReadTokens += nextUsage.cacheReadTokens - previousUsage.cacheReadTokens;
+						cumulative.cacheCreationTokens += nextUsage.cacheCreationTokens - previousUsage.cacheCreationTokens;
+					} else {
+						cumulative.inputTokens += nextUsage.inputTokens;
+						cumulative.outputTokens += nextUsage.outputTokens;
+						cumulative.cacheReadTokens += nextUsage.cacheReadTokens;
+						cumulative.cacheCreationTokens += nextUsage.cacheCreationTokens;
+					}
+					usageByMessageId.set(messageId, nextUsage);
 					onUsage?.({ ...cumulative });
 					if (onMessage) {
 						const content = msg.content;
@@ -1146,12 +1208,7 @@ var ClaudeAgent = class {
 					return;
 				}
 				const output = resultEvent.structured_output;
-				const usage = {
-					inputTokens: (resultEvent.usage.input_tokens ?? 0) + (resultEvent.usage.cache_read_input_tokens ?? 0),
-					outputTokens: resultEvent.usage.output_tokens ?? 0,
-					cacheReadTokens: resultEvent.usage.cache_read_input_tokens ?? 0,
-					cacheCreationTokens: resultEvent.usage.cache_creation_input_tokens ?? 0
-				};
+				const usage = toTokenUsage(resultEvent.usage);
 				onUsage?.(usage);
 				resolve({
 					output,
@@ -2723,6 +2780,14 @@ function createAgent(name, runInfo, pathOverride, agentArgsOverride) {
 //#endregion
 //#region src/templates/iteration-prompt.ts
 function buildIterationPrompt(params) {
+	const outputFields = [
+		"- success: whether you were able to make a meaningful contribution that got us closer towards the objective. setting this to false means any code change you made should be discarded",
+		"- summary: a concise one-sentence summary of the accomplishment in this iteration",
+		"- key_changes_made: an array of descriptions for key changes you made. don't group this by file - group by logical units of work. don't describe activities - describe material outcomes",
+		"- key_learnings: an array of new learnings that were surprising, weren't captured by previous notes and would be informative for future iterations"
+	];
+	if (params.stopWhen !== void 0) outputFields.push("- should_fully_stop: set to true ONLY when the stop condition below is fully met and the entire loop should end. default to false");
+	const stopConditionSection = params.stopWhen !== void 0 ? `\n\n## Stop Condition\n\nThe user has configured a condition to end the loop: ${params.stopWhen}\nIf this condition is fully met after this iteration's work, set should_fully_stop=true in your output. Otherwise set it to false (or omit it).` : "";
 	return `You are working autonomously towards an objective given below.
 This is iteration ${params.n}. Each iteration aims to make an incremental step forward, not to complete the entire objective.
 
@@ -2736,10 +2801,7 @@ This is iteration ${params.n}. Each iteration aims to make an incremental step f
 
 ## Output
 
-- success: whether you were able to make a meaningful contribution that got us closer towards the objective. setting this to false means any code change you made should be discarded
-- summary: a concise one-sentence summary of the accomplishment in this iteration
-- key_changes_made: an array of descriptions for key changes you made. don't group this by file - group by logical units of work. don't describe activities - describe material outcomes
-- key_learnings: an array of new learnings that were surprising, weren't captured by previous notes and would be informative for future iterations
+${outputFields.join("\n")}${stopConditionSection}
 
 ## Objective
 
@@ -2854,7 +2916,8 @@ var Orchestrator = class extends EventEmitter {
 				const iterationPrompt = buildIterationPrompt({
 					n: this.state.currentIteration,
 					runId: this.runInfo.runId,
-					prompt: this.prompt
+					prompt: this.prompt,
+					stopWhen: this.limits.stopWhen
 				});
 				appendDebugLog("iteration:start", {
 					iteration: this.state.currentIteration,
@@ -2901,6 +2964,10 @@ var Orchestrator = class extends EventEmitter {
 					totalOutputTokens: this.state.totalOutputTokens,
 					commitCount: this.state.commitCount
 				});
+				if (this.limits.stopWhen !== void 0 && result.shouldFullyStop) {
+					this.abort("stop condition met");
+					break;
+				}
 				const postIterationAbortReason = this.getPostIterationAbortReason();
 				if (postIterationAbortReason) {
 					this.abort(postIterationAbortReason);
@@ -2997,13 +3064,16 @@ var Orchestrator = class extends EventEmitter {
 				cacheCreationTokens: result.usage.cacheCreationTokens
 			});
 			if (this.stopRequested) return { type: "stopped" };
+			const shouldFullyStop = result.output.should_fully_stop === true;
 			if (result.output.success) return {
 				type: "completed",
-				record: this.recordSuccess(result.output)
+				record: this.recordSuccess(result.output),
+				shouldFullyStop
 			};
 			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)),
+				shouldFullyStop
 			};
 		} catch (err) {
 			const elapsedMs = Date.now() - agentStartedAt;
@@ -3034,7 +3104,8 @@ 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, []),
+				shouldFullyStop: false
 			};
 		} finally {
 			this.activeAbortController = null;
@@ -4025,7 +4096,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("--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 (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) => {
 	if (options.mock) {
 		const mock = new MockOrchestrator();
 		enterAltScreen();
@@ -4137,6 +4208,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,
 		preventSleep: config.preventSleep,
 		agentArgsOverride: config.agentArgsOverride?.[config.agent],
 		worktree: options.worktree,
@@ -4147,7 +4219,8 @@ 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]), runInfo, prompt, effectiveCwd, startIteration, {
 		maxIterations: options.maxIterations,
-		maxTokens: options.maxTokens
+		maxTokens: options.maxTokens,
+		stopWhen: options.stopWhen
 	});
 	let shutdownSignal = null;
 	enterAltScreen();

package/package.json

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