gnhf 0.1.20 → 0.1.22

package/README.md

@@ -46,6 +46,7 @@ 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
+- **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
 
 ## Quick Start
@@ -166,14 +167,14 @@ Pass `--worktree` to run each agent in an isolated [git worktree](https://git-sc
 
 ### Flags
 
-| Flag                     | Description                                                        | Default                |
-| ------------------------ | ------------------------------------------------------------------ | ---------------------- |
-| `--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              |
-| `--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                                                       |                        |
+| Flag                     | Description                                                           | Default                |
+| ------------------------ | --------------------------------------------------------------------- | ---------------------- |
+| `--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              |
+| `--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

@@ -1082,6 +1082,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 +1129,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 +1207,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,
@@ -3530,6 +3586,24 @@ const DONE_HINT = "[ctrl+c to exit]";
 function spacedLabel(text) {
 	return text.split("").join(" ");
 }
+function formatTokenCount(tokens, direction) {
+	return `${formatTokens(tokens)} ${direction}`;
+}
+function formatCommitCount(commitCount) {
+	return `${commitCount} ${commitCount === 1 ? "commit" : "commits"}`;
+}
+function buildTerminalTitle(state, now) {
+	return `gnhf ${state.status === "running" || state.status === "waiting" ? getMoonPhase("active", now, MOON_PHASE_PERIOD) : state.status} · ${formatTokenCount(state.totalInputTokens, "in")} · ${formatTokenCount(state.totalOutputTokens, "out")} · ${formatCommitCount(state.commitCount)}`;
+}
+function emitTerminalTitle(title) {
+	return `\x1b]2;${title}\x07`;
+}
+function saveTerminalTitle() {
+	return "\x1B[22;0t";
+}
+function restoreTerminalTitle() {
+	return "\x1B[23;0t";
+}
 function renderTitleCells(agentName) {
 	return [
 		[...textToCells(spacedLabel("gnhf"), "dim"), ...agentName ? [
@@ -3545,21 +3619,20 @@ function renderTitleCells(agentName) {
 	];
 }
 function renderStatsCells(elapsed, inputTokens, outputTokens, commitCount) {
-	const commitLabel = commitCount === 1 ? "commit" : "commits";
 	return [
 		...textToCells(elapsed, "bold"),
 		...textToCells("  ", "normal"),
 		...textToCells("·", "dim"),
 		...textToCells("  ", "normal"),
-		...textToCells(`${formatTokens(inputTokens)} in`, "normal"),
+		...textToCells(formatTokenCount(inputTokens, "in"), "normal"),
 		...textToCells("  ", "normal"),
 		...textToCells("·", "dim"),
 		...textToCells("  ", "normal"),
-		...textToCells(`${formatTokens(outputTokens)} out`, "normal"),
+		...textToCells(formatTokenCount(outputTokens, "out"), "normal"),
 		...textToCells("  ", "normal"),
 		...textToCells("·", "dim"),
 		...textToCells("  ", "normal"),
-		...textToCells(`${commitCount} ${commitLabel}`, "normal")
+		...textToCells(formatCommitCount(commitCount), "normal")
 	];
 }
 function renderAgentMessageCells(message, status) {
@@ -3775,10 +3848,22 @@ var Renderer = class {
 	cachedWidth = 0;
 	cachedHeight = 0;
 	prevCells = [];
+	prevTitle = null;
+	titleSaved = false;
 	isFirstFrame = true;
 	seedTop;
 	seedBottom;
 	seedSide;
+	handleState = (newState) => {
+		this.state = {
+			...newState,
+			iterations: [...newState.iterations]
+		};
+		this.updateTerminalTitle();
+	};
+	handleStopped = () => {
+		this.stop("stopped");
+	};
 	constructor(orchestrator, prompt, agentName) {
 		this.orchestrator = orchestrator;
 		this.prompt = prompt;
@@ -3792,15 +3877,8 @@ var Renderer = class {
 		});
 	}
 	start() {
-		this.orchestrator.on("state", (newState) => {
-			this.state = {
-				...newState,
-				iterations: [...newState.iterations]
-			};
-		});
-		this.orchestrator.on("stopped", () => {
-			this.stop("stopped");
-		});
+		this.orchestrator.on("state", this.handleState);
+		this.orchestrator.on("stopped", this.handleStopped);
 		if (process$1.stdin.isTTY) {
 			process$1.stdin.setRawMode(true);
 			process$1.stdin.resume();
@@ -3819,11 +3897,18 @@ var Renderer = class {
 			clearInterval(this.interval);
 			this.interval = null;
 		}
+		this.orchestrator.off("state", this.handleState);
+		this.orchestrator.off("stopped", this.handleStopped);
 		if (process$1.stdin.isTTY) {
 			process$1.stdin.setRawMode(false);
 			process$1.stdin.pause();
 			process$1.stdin.removeAllListeners("data");
 		}
+		if (this.titleSaved) {
+			process$1.stdout.write(restoreTerminalTitle());
+			this.titleSaved = false;
+			this.prevTitle = null;
+		}
 		this.exitResolve(reason);
 	}
 	waitUntilExit() {
@@ -3862,6 +3947,7 @@ var Renderer = class {
 		const w = process$1.stdout.columns || 80;
 		const h = process$1.stdout.rows || 24;
 		const resized = this.ensureStarFields(w, h);
+		this.updateTerminalTitle(now);
 		const nextCells = buildFrameCells(this.prompt, this.agentName, this.state, this.topStars, this.bottomStars, this.sideStars, now, w, h);
 		if (this.isFirstFrame || resized) {
 			process$1.stdout.write("\x1B[H" + nextCells.map(rowToString).join("\n"));
@@ -3872,6 +3958,17 @@ var Renderer = class {
 		}
 		this.prevCells = nextCells;
 	}
+	updateTerminalTitle(now = Date.now()) {
+		if (!process$1.stdout.isTTY) return;
+		const nextTitle = buildTerminalTitle(this.state, now);
+		if (!this.titleSaved) {
+			process$1.stdout.write(saveTerminalTitle());
+			this.titleSaved = true;
+		}
+		if (nextTitle === this.prevTitle) return;
+		process$1.stdout.write(emitTerminalTitle(nextTitle));
+		this.prevTitle = nextTitle;
+	}
 };
 //#endregion
 //#region src/utils/slugify.ts

package/package.json

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