@gethmy/agent 1.10.0 → 1.10.2

package/dist/cli.js

@@ -1559,14 +1559,6 @@ class BudgetGuard {
         detail: `${card.attempts} of ${this.config.maxAttemptsPerCard} attempts exhausted`
       };
     }
-    const dailySpent = this.store.getDailyCostCents();
-    if (dailySpent >= this.config.dailyBudgetCents) {
-      return {
-        allow: false,
-        reason: "daily_budget",
-        detail: `daily budget ${formatCents(dailySpent)}/${formatCents(this.config.dailyBudgetCents)} exhausted`
-      };
-    }
     return { allow: true };
   }
 }
@@ -1590,9 +1582,6 @@ function buildGaveUpComment(maxAttempts, failures) {
   return lines.join(`
 `);
 }
-function formatCents(cents) {
-  return `$${(cents / 100).toFixed(2)}`;
-}
 
 // src/error-classifier.ts
 function parseRetryAfterMs(message) {
@@ -2329,7 +2318,8 @@ function buildTokenPayload(stats) {
     outputTokens: stats.cost.totalOutputTokens,
     cacheCreationInputTokens: stats.cost.totalCacheCreationInputTokens,
     cacheReadInputTokens: stats.cost.totalCacheReadInputTokens,
-    modelName: stats.cost.modelName
+    modelName: stats.cost.modelName,
+    numTurns: stats.cost.numTurns
   };
 }
 async function runCompletion(client, card, branchName, worktreePath, config, workerId, sessionStats, workspaceId, agentSessionId, stateStore, onMovedToCompletion) {
@@ -2915,7 +2905,8 @@ class ProgressTracker {
       outputTokens: this.lastCost?.totalOutputTokens ?? 0,
       cacheCreationInputTokens: this.lastCost?.totalCacheCreationInputTokens ?? 0,
       cacheReadInputTokens: this.lastCost?.totalCacheReadInputTokens ?? 0,
-      modelName: this.lastCost?.modelName
+      modelName: this.lastCost?.modelName,
+      numTurns: this.lastCost?.numTurns ?? 0
     }).catch((err) => {
       log.warn(TAG14, `Failed to send progress update: ${err}`);
     });
@@ -3686,13 +3677,19 @@ class StateStore {
   heartbeat(runId) {
     return this.updateRun(runId, { lastHeartbeatAt: Date.now() });
   }
-  endRun(runId, status, errorMessage) {
+  endRun(runId, status, opts = {}) {
     const patch = {
       status,
       endedAt: Date.now()
     };
-    if (errorMessage !== undefined)
-      patch.errorMessage = errorMessage;
+    if (opts.errorMessage !== undefined)
+      patch.errorMessage = opts.errorMessage;
+    if (opts.costCents !== undefined && opts.costCents > 0) {
+      patch.costCents = opts.costCents;
+    }
+    if (opts.numTurns !== undefined && opts.numTurns > 0) {
+      patch.numTurns = opts.numTurns;
+    }
     return this.updateRun(runId, patch);
   }
   getRun(runId) {
@@ -4124,6 +4121,19 @@ class ReviewWorker {
   get isActive() {
     return this.state === "preparing" || this.state === "running" || this.state === "verifying" || this.state === "completing";
   }
+  get costCents() {
+    const cost = (this.progressTracker?.stats ?? this.lastSessionStats)?.cost;
+    return cost ? Math.round(cost.totalCostUsd * 100) : 0;
+  }
+  endLedger() {
+    const cost = (this.lastSessionStats ?? this.progressTracker?.stats)?.cost;
+    if (!cost)
+      return { costCents: 0, numTurns: 0 };
+    return {
+      costCents: Math.round(cost.totalCostUsd * 100),
+      numTurns: cost.numTurns
+    };
+  }
   async run(card, column, labels, subtasks) {
     this.aborted = false;
     this.timedOut = false;
@@ -4149,7 +4159,8 @@ class ReviewWorker {
         lastHeartbeatAt: this.startedAt,
         endedAt: null,
         status: "active",
-        costCents: 0
+        costCents: 0,
+        numTurns: 0
       });
       this.branchName = extractBranchFromDescription(card.description);
       const localMode = !this.branchName;
@@ -4320,7 +4331,7 @@ class ReviewWorker {
       }
       if (this.runId) {
         try {
-          await this.stateStore.endRun(this.runId, this.state === "error" ? "paused" : "completed");
+          await this.stateStore.endRun(this.runId, this.state === "error" ? "paused" : "completed", this.endLedger());
         } catch {}
       }
     } finally {
@@ -4329,7 +4340,7 @@ class ReviewWorker {
           const run = this.stateStore.getRun(this.runId);
           if (run && run.endedAt === null) {
             const status = this.timedOut ? "failed" : this.state === "error" || this.aborted ? "paused" : "completed";
-            await this.stateStore.endRun(this.runId, status);
+            await this.stateStore.endRun(this.runId, status, this.endLedger());
           }
         } catch {}
       }
@@ -5000,6 +5011,8 @@ class Worker {
   verificationFailed = false;
   sessionId = null;
   runId = null;
+  runCostCents = 0;
+  runTurns = 0;
   constructor(id, config, client, agentId, onDone, workspaceId, projectId, stateStore, onCardCompleted, onApiError) {
     this.config = config;
     this.client = client;
@@ -5052,10 +5065,20 @@ class Worker {
   get isActive() {
     return this.state === "preparing" || this.state === "planning" || this.state === "running" || this.state === "verifying" || this.state === "completing";
   }
+  get costCents() {
+    const live = this.progressTracker?.stats.cost;
+    const liveCents = live ? Math.round(live.totalCostUsd * 100) : 0;
+    return this.runCostCents + liveCents;
+  }
+  runLedger() {
+    return { costCents: this.runCostCents, numTurns: this.runTurns };
+  }
   async run(card, column, labels, subtasks) {
     this.aborted = false;
     this.timedOut = false;
     this.verificationFailed = false;
+    this.runCostCents = 0;
+    this.runTurns = 0;
     this.cardId = card.id;
     this.startedAt = Date.now();
     this.runId = newRunId();
@@ -5080,7 +5103,8 @@ class Worker {
         lastHeartbeatAt: this.startedAt,
         endedAt: null,
         status: "active",
-        costCents: 0
+        costCents: 0,
+        numTurns: 0
       });
       const { session } = await this.client.startAgentSession(card.id, {
         agentIdentifier: agentIdentifier(this.id),
@@ -5196,7 +5220,10 @@ class Worker {
       }
       if (this.runId) {
         try {
-          await this.stateStore.endRun(this.runId, "failed", errClass.kind ?? msg);
+          await this.stateStore.endRun(this.runId, "failed", {
+            errorMessage: errClass.kind ?? msg,
+            ...this.runLedger()
+          });
         } catch {}
         if (apiError) {
           await this.stateStore.decrementAttempt(card.id);
@@ -5208,7 +5235,7 @@ class Worker {
       const succeeded = this.runId && this.state !== "error" && !this.aborted && !this.verificationFailed;
       if (succeeded) {
         try {
-          await this.stateStore.endRun(this.runId, "completed");
+          await this.stateStore.endRun(this.runId, "completed", this.runLedger());
         } catch {}
         await this.recordOutcome(card.id, "success");
       } else if (this.runId && this.timedOut) {
@@ -5234,16 +5261,25 @@ class Worker {
           log.error(this.tag, `timeout transition failed on #${card.short_id}: ${tErr instanceof TransitionError ? tErr.detail : tErr}`);
         }
         try {
-          await this.stateStore.endRun(this.runId, "failed", "timeout");
+          await this.stateStore.endRun(this.runId, "failed", {
+            errorMessage: "timeout",
+            ...this.runLedger()
+          });
         } catch {}
         await this.recordOutcome(card.id, "failure");
       } else if (this.runId && this.aborted) {
         try {
-          await this.stateStore.endRun(this.runId, "paused", "cancelled");
+          await this.stateStore.endRun(this.runId, "paused", {
+            errorMessage: "cancelled",
+            ...this.runLedger()
+          });
         } catch {}
       } else if (this.runId && this.verificationFailed) {
         try {
-          await this.stateStore.endRun(this.runId, "paused", "verification");
+          await this.stateStore.endRun(this.runId, "paused", {
+            errorMessage: "verification",
+            ...this.runLedger()
+          });
         } catch {}
         await this.recordOutcome(card.id, "failure");
       }
@@ -5522,6 +5558,11 @@ class Worker {
       this.process.on("close", (code) => {
         this.process = null;
         this.lastSessionStats = this.progressTracker?.stats;
+        const spawnCost = this.lastSessionStats?.cost;
+        if (spawnCost) {
+          this.runCostCents += Math.round(spawnCost.totalCostUsd * 100);
+          this.runTurns += spawnCost.numTurns;
+        }
         this.progressTracker?.flushFinal();
         this.progressTracker?.stop();
         this.progressTracker = null;
@@ -5569,6 +5610,8 @@ class Worker {
     this.startedAt = null;
     this.runId = null;
     this.sessionId = null;
+    this.runCostCents = 0;
+    this.runTurns = 0;
   }
 }
 var TAG23 = "worker", CANCEL_SIGINT_TIMEOUT2 = 30000, CANCEL_SIGTERM_TIMEOUT2 = 1e4, PLAN_ALLOWED_TOOLS = "Read,Grep,Glob,mcp__harmony__*", IMPLEMENT_ALLOWED_TOOLS = "Bash,Read,Write,Edit,Glob,Grep,Agent,mcp__harmony__*", PLAN_PHASE_TIMEOUT;
@@ -5791,7 +5834,8 @@ class Pool {
         cardId: w.cardId,
         cardShortId: null,
         startedAt: w.startedAt,
-        branchName: w.branchName
+        branchName: w.branchName,
+        costCents: w.costCents
       });
     }
     for (const w of this.reviewWorkers) {
@@ -5802,7 +5846,8 @@ class Pool {
         cardId: w.cardId,
         cardShortId: null,
         startedAt: w.startedAt,
-        branchName: w.branchName
+        branchName: w.branchName,
+        costCents: w.costCents
       });
     }
     return out;
@@ -6029,7 +6074,9 @@ async function recoverRun(run, store, client, config, outcome) {
     }
   }
   try {
-    await store.endRun(run.runId, "orphaned", "recovered after daemon restart");
+    await store.endRun(run.runId, "orphaned", {
+      errorMessage: "recovered after daemon restart"
+    });
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     outcome.errors.push(`endRun: ${msg}`);
@@ -7193,14 +7240,16 @@ function printStatus(body) {
   const uptime = formatDuration(body.uptimeMs);
   out.write(`daemon   ${body.daemonId} (pid ${body.daemonPid}, up ${uptime})
 `);
-  out.write(`budget   $${(body.budget.todayCents / 100).toFixed(2)} / $${(body.budget.dailyCapCents / 100).toFixed(2)} today
+  const activeCents = body.workers.reduce((sum, w) => sum + (w.costCents ?? 0), 0);
+  out.write(`budget   $${(body.budget.todayCents / 100).toFixed(2)} / $${(body.budget.dailyCapCents / 100).toFixed(2)} today · $${(activeCents / 100).toFixed(2)} in-flight
 `);
   out.write(`workers  (${body.workers.length})
 `);
   for (const w of body.workers) {
     const card = w.cardId ? ` card=${w.cardId}` : "";
     const br = w.branchName ? ` branch=${w.branchName}` : "";
-    out.write(`  #${w.id} ${w.pipeline.padEnd(9)} ${w.state}${card}${br}
+    const spend = w.costCents ? ` $${(w.costCents / 100).toFixed(2)}` : "";
+    out.write(`  #${w.id} ${w.pipeline.padEnd(9)} ${w.state}${card}${br}${spend}
 `);
   }
   out.write(`impl queue   (${body.implQueue.length})

package/dist/index.js

@@ -1558,14 +1558,6 @@ class BudgetGuard {
         detail: `${card.attempts} of ${this.config.maxAttemptsPerCard} attempts exhausted`
       };
     }
-    const dailySpent = this.store.getDailyCostCents();
-    if (dailySpent >= this.config.dailyBudgetCents) {
-      return {
-        allow: false,
-        reason: "daily_budget",
-        detail: `daily budget ${formatCents(dailySpent)}/${formatCents(this.config.dailyBudgetCents)} exhausted`
-      };
-    }
     return { allow: true };
   }
 }
@@ -1589,9 +1581,6 @@ function buildGaveUpComment(maxAttempts, failures) {
   return lines.join(`
 `);
 }
-function formatCents(cents) {
-  return `$${(cents / 100).toFixed(2)}`;
-}
 
 // src/error-classifier.ts
 function parseRetryAfterMs(message) {
@@ -2328,7 +2317,8 @@ function buildTokenPayload(stats) {
     outputTokens: stats.cost.totalOutputTokens,
     cacheCreationInputTokens: stats.cost.totalCacheCreationInputTokens,
     cacheReadInputTokens: stats.cost.totalCacheReadInputTokens,
-    modelName: stats.cost.modelName
+    modelName: stats.cost.modelName,
+    numTurns: stats.cost.numTurns
   };
 }
 async function runCompletion(client, card, branchName, worktreePath, config, workerId, sessionStats, workspaceId, agentSessionId, stateStore, onMovedToCompletion) {
@@ -2914,7 +2904,8 @@ class ProgressTracker {
       outputTokens: this.lastCost?.totalOutputTokens ?? 0,
       cacheCreationInputTokens: this.lastCost?.totalCacheCreationInputTokens ?? 0,
       cacheReadInputTokens: this.lastCost?.totalCacheReadInputTokens ?? 0,
-      modelName: this.lastCost?.modelName
+      modelName: this.lastCost?.modelName,
+      numTurns: this.lastCost?.numTurns ?? 0
     }).catch((err) => {
       log.warn(TAG14, `Failed to send progress update: ${err}`);
     });
@@ -3685,13 +3676,19 @@ class StateStore {
   heartbeat(runId) {
     return this.updateRun(runId, { lastHeartbeatAt: Date.now() });
   }
-  endRun(runId, status, errorMessage) {
+  endRun(runId, status, opts = {}) {
     const patch = {
       status,
       endedAt: Date.now()
     };
-    if (errorMessage !== undefined)
-      patch.errorMessage = errorMessage;
+    if (opts.errorMessage !== undefined)
+      patch.errorMessage = opts.errorMessage;
+    if (opts.costCents !== undefined && opts.costCents > 0) {
+      patch.costCents = opts.costCents;
+    }
+    if (opts.numTurns !== undefined && opts.numTurns > 0) {
+      patch.numTurns = opts.numTurns;
+    }
     return this.updateRun(runId, patch);
   }
   getRun(runId) {
@@ -4123,6 +4120,19 @@ class ReviewWorker {
   get isActive() {
     return this.state === "preparing" || this.state === "running" || this.state === "verifying" || this.state === "completing";
   }
+  get costCents() {
+    const cost = (this.progressTracker?.stats ?? this.lastSessionStats)?.cost;
+    return cost ? Math.round(cost.totalCostUsd * 100) : 0;
+  }
+  endLedger() {
+    const cost = (this.lastSessionStats ?? this.progressTracker?.stats)?.cost;
+    if (!cost)
+      return { costCents: 0, numTurns: 0 };
+    return {
+      costCents: Math.round(cost.totalCostUsd * 100),
+      numTurns: cost.numTurns
+    };
+  }
   async run(card, column, labels, subtasks) {
     this.aborted = false;
     this.timedOut = false;
@@ -4148,7 +4158,8 @@ class ReviewWorker {
         lastHeartbeatAt: this.startedAt,
         endedAt: null,
         status: "active",
-        costCents: 0
+        costCents: 0,
+        numTurns: 0
       });
       this.branchName = extractBranchFromDescription(card.description);
       const localMode = !this.branchName;
@@ -4319,7 +4330,7 @@ class ReviewWorker {
       }
       if (this.runId) {
         try {
-          await this.stateStore.endRun(this.runId, this.state === "error" ? "paused" : "completed");
+          await this.stateStore.endRun(this.runId, this.state === "error" ? "paused" : "completed", this.endLedger());
         } catch {}
       }
     } finally {
@@ -4328,7 +4339,7 @@ class ReviewWorker {
           const run = this.stateStore.getRun(this.runId);
           if (run && run.endedAt === null) {
             const status = this.timedOut ? "failed" : this.state === "error" || this.aborted ? "paused" : "completed";
-            await this.stateStore.endRun(this.runId, status);
+            await this.stateStore.endRun(this.runId, status, this.endLedger());
           }
         } catch {}
       }
@@ -4999,6 +5010,8 @@ class Worker {
   verificationFailed = false;
   sessionId = null;
   runId = null;
+  runCostCents = 0;
+  runTurns = 0;
   constructor(id, config, client, agentId, onDone, workspaceId, projectId, stateStore, onCardCompleted, onApiError) {
     this.config = config;
     this.client = client;
@@ -5051,10 +5064,20 @@ class Worker {
   get isActive() {
     return this.state === "preparing" || this.state === "planning" || this.state === "running" || this.state === "verifying" || this.state === "completing";
   }
+  get costCents() {
+    const live = this.progressTracker?.stats.cost;
+    const liveCents = live ? Math.round(live.totalCostUsd * 100) : 0;
+    return this.runCostCents + liveCents;
+  }
+  runLedger() {
+    return { costCents: this.runCostCents, numTurns: this.runTurns };
+  }
   async run(card, column, labels, subtasks) {
     this.aborted = false;
     this.timedOut = false;
     this.verificationFailed = false;
+    this.runCostCents = 0;
+    this.runTurns = 0;
     this.cardId = card.id;
     this.startedAt = Date.now();
     this.runId = newRunId();
@@ -5079,7 +5102,8 @@ class Worker {
         lastHeartbeatAt: this.startedAt,
         endedAt: null,
         status: "active",
-        costCents: 0
+        costCents: 0,
+        numTurns: 0
       });
       const { session } = await this.client.startAgentSession(card.id, {
         agentIdentifier: agentIdentifier(this.id),
@@ -5195,7 +5219,10 @@ class Worker {
       }
       if (this.runId) {
         try {
-          await this.stateStore.endRun(this.runId, "failed", errClass.kind ?? msg);
+          await this.stateStore.endRun(this.runId, "failed", {
+            errorMessage: errClass.kind ?? msg,
+            ...this.runLedger()
+          });
         } catch {}
         if (apiError) {
           await this.stateStore.decrementAttempt(card.id);
@@ -5207,7 +5234,7 @@ class Worker {
       const succeeded = this.runId && this.state !== "error" && !this.aborted && !this.verificationFailed;
       if (succeeded) {
         try {
-          await this.stateStore.endRun(this.runId, "completed");
+          await this.stateStore.endRun(this.runId, "completed", this.runLedger());
         } catch {}
         await this.recordOutcome(card.id, "success");
       } else if (this.runId && this.timedOut) {
@@ -5233,16 +5260,25 @@ class Worker {
           log.error(this.tag, `timeout transition failed on #${card.short_id}: ${tErr instanceof TransitionError ? tErr.detail : tErr}`);
         }
         try {
-          await this.stateStore.endRun(this.runId, "failed", "timeout");
+          await this.stateStore.endRun(this.runId, "failed", {
+            errorMessage: "timeout",
+            ...this.runLedger()
+          });
         } catch {}
         await this.recordOutcome(card.id, "failure");
       } else if (this.runId && this.aborted) {
         try {
-          await this.stateStore.endRun(this.runId, "paused", "cancelled");
+          await this.stateStore.endRun(this.runId, "paused", {
+            errorMessage: "cancelled",
+            ...this.runLedger()
+          });
         } catch {}
       } else if (this.runId && this.verificationFailed) {
         try {
-          await this.stateStore.endRun(this.runId, "paused", "verification");
+          await this.stateStore.endRun(this.runId, "paused", {
+            errorMessage: "verification",
+            ...this.runLedger()
+          });
         } catch {}
         await this.recordOutcome(card.id, "failure");
       }
@@ -5521,6 +5557,11 @@ class Worker {
       this.process.on("close", (code) => {
         this.process = null;
         this.lastSessionStats = this.progressTracker?.stats;
+        const spawnCost = this.lastSessionStats?.cost;
+        if (spawnCost) {
+          this.runCostCents += Math.round(spawnCost.totalCostUsd * 100);
+          this.runTurns += spawnCost.numTurns;
+        }
         this.progressTracker?.flushFinal();
         this.progressTracker?.stop();
         this.progressTracker = null;
@@ -5568,6 +5609,8 @@ class Worker {
     this.startedAt = null;
     this.runId = null;
     this.sessionId = null;
+    this.runCostCents = 0;
+    this.runTurns = 0;
   }
 }
 var TAG23 = "worker", CANCEL_SIGINT_TIMEOUT2 = 30000, CANCEL_SIGTERM_TIMEOUT2 = 1e4, PLAN_ALLOWED_TOOLS = "Read,Grep,Glob,mcp__harmony__*", IMPLEMENT_ALLOWED_TOOLS = "Bash,Read,Write,Edit,Glob,Grep,Agent,mcp__harmony__*", PLAN_PHASE_TIMEOUT;
@@ -5790,7 +5833,8 @@ class Pool {
         cardId: w.cardId,
         cardShortId: null,
         startedAt: w.startedAt,
-        branchName: w.branchName
+        branchName: w.branchName,
+        costCents: w.costCents
       });
     }
     for (const w of this.reviewWorkers) {
@@ -5801,7 +5845,8 @@ class Pool {
         cardId: w.cardId,
         cardShortId: null,
         startedAt: w.startedAt,
-        branchName: w.branchName
+        branchName: w.branchName,
+        costCents: w.costCents
       });
     }
     return out;
@@ -6028,7 +6073,9 @@ async function recoverRun(run, store, client, config, outcome) {
     }
   }
   try {
-    await store.endRun(run.runId, "orphaned", "recovered after daemon restart");
+    await store.endRun(run.runId, "orphaned", {
+      errorMessage: "recovered after daemon restart"
+    });
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     outcome.errors.push(`endRun: ${msg}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethmy/agent",
-  "version": "1.10.0",
+  "version": "1.10.2",
   "description": "Push-based agent daemon for Harmony — watches board assignments and spawns Claude CLI workers",
   "type": "module",
   "main": "dist/index.js",