codealmanac 0.2.1 → 0.2.2

package/dist/{cli-MZEXRV6E.js → cli-3XAVBTYG.js}

@@ -448,7 +448,7 @@ async function run(argv, deps = {}) {
   if (await tryRunSqliteFreeCommand(argv.slice(2), runSetupFn)) {
     return;
   }
-  const { registerCommands } = await import("./register-commands-DPH4ZWEE.js");
+  const { registerCommands } = await import("./register-commands-7QCIENRZ.js");
   registerCommands(program);
   configureGroupedHelp(program);
   await program.parseAsync(argv);
@@ -604,4 +604,4 @@ export {
   run,
   tryParseSetupShortcut
 };
-//# sourceMappingURL=cli-MZEXRV6E.js.map
+//# sourceMappingURL=cli-3XAVBTYG.js.map

package/dist/codealmanac.js

@@ -59,7 +59,7 @@ if (shouldCheckSqliteAbi(process.argv)) {
     process.exit(1);
   }
 }
-var { run } = await import("./cli-MZEXRV6E.js");
+var { run } = await import("./cli-3XAVBTYG.js");
 run(process.argv).catch((err) => {
   const message = err instanceof Error ? err.message : String(err);
   process.stderr.write(`almanac: ${message}

package/dist/{register-commands-DPH4ZWEE.js → register-commands-7QCIENRZ.js}

@@ -2044,6 +2044,7 @@ function runJsonlCli(opts) {
     let turns = 0;
     let result = "";
     let sessionId;
+    let usage;
     let success = false;
     let finalSeen = false;
     let error;
@@ -2052,6 +2053,9 @@ function runJsonlCli(opts) {
       if (sessionId === void 0 && typeof msg.session_id === "string" && msg.session_id.length > 0) {
         sessionId = msg.session_id;
       }
+      if (sessionId === void 0 && typeof msg.thread_id === "string" && msg.thread_id.length > 0) {
+        sessionId = msg.thread_id;
+      }
       const final = opts.parseFinal(msg);
       if (final === null) return;
       finalSeen = true;
@@ -2059,6 +2063,7 @@ function runJsonlCli(opts) {
       if (final.turns !== void 0) turns = final.turns;
       if (final.result !== void 0) result = final.result;
       if (final.sessionId !== void 0) sessionId = final.sessionId;
+      if (final.usage !== void 0) usage = final.usage;
       if (final.success !== void 0) success = final.success;
       if (final.error !== void 0) error = final.error;
     };
@@ -2092,6 +2097,7 @@ function runJsonlCli(opts) {
         turns,
         result,
         sessionId,
+        usage,
         error: err.code === "ENOENT" ? `${opts.command} not found on PATH` : err.message
       });
     });
@@ -2104,7 +2110,7 @@ function runJsonlCli(opts) {
         }
       }
       if (code === 0 && finalSeen && success) {
-        resolve({ success, cost, turns, result, sessionId });
+        resolve({ success, cost, turns, result, sessionId, usage });
         return;
       }
       const firstStderr = stderr.trim().split("\n")[0];
@@ -2114,6 +2120,7 @@ function runJsonlCli(opts) {
         turns,
         result,
         sessionId,
+        usage,
         error: error ?? (firstStderr !== void 0 && firstStderr.length > 0 ? firstStderr : `${opts.command} exited ${code ?? 1}`)
       });
     });
@@ -2131,7 +2138,7 @@ function parseCodexFinal(msg) {
     return null;
   }
   if (msg.type === "turn.completed") {
-    return { success: true };
+    return { success: true, turns: 1, usage: parseUsage(msg.usage) };
   }
   if (msg.type === "turn.failed" || msg.type === "error") {
     return {
@@ -2141,13 +2148,29 @@ function parseCodexFinal(msg) {
   }
   return null;
 }
+function parseUsage(value) {
+  if (value === null || typeof value !== "object") return void 0;
+  const obj = value;
+  return {
+    inputTokens: numberField(obj, "input_tokens") ?? numberField(obj, "inputTokens"),
+    cachedInputTokens: numberField(obj, "cached_input_tokens") ?? numberField(obj, "cachedInputTokens") ?? numberField(obj, "cacheReadTokens"),
+    outputTokens: numberField(obj, "output_tokens") ?? numberField(obj, "outputTokens"),
+    reasoningOutputTokens: numberField(obj, "reasoning_output_tokens") ?? numberField(obj, "reasoningOutputTokens")
+  };
+}
+function numberField(input, key) {
+  const value = input[key];
+  return typeof value === "number" ? value : void 0;
+}
 function parseCursorFinal(msg) {
   if (msg.type !== "result") return null;
   const isError = msg.is_error === true || msg.subtype !== "success";
   return {
     success: !isError,
+    turns: 1,
     result: typeof msg.result === "string" ? msg.result : "",
     sessionId: typeof msg.session_id === "string" ? msg.session_id : void 0,
+    usage: parseUsage(msg.usage),
     error: isError ? typeof msg.result === "string" ? msg.result : `cursor result: ${String(msg.subtype ?? "error")}` : void 0
   };
 }
@@ -2416,8 +2439,39 @@ async function resolveAgentSelection(args) {
 function formatFinalLine(result, logPath, repoRoot) {
   const status = result.success ? "done" : "failed";
   const rel = relative(repoRoot, logPath);
-  const cost = `$${result.cost.toFixed(3)}`;
-  return `[${status}] cost: ${cost}, turns: ${result.turns} (transcript: ${rel})`;
+  const usage = formatRunUsage(result);
+  return `[${status}] ${usage} (transcript: ${rel})`;
+}
+function formatRunUsage(result) {
+  const parts = [];
+  if (result.cost > 0 || result.usage === void 0) {
+    parts.push(`cost: $${result.cost.toFixed(3)}`);
+  }
+  parts.push(`turns: ${result.turns}`);
+  const usage = result.usage;
+  if (usage !== void 0) {
+    const tokenParts = [];
+    if (usage.inputTokens !== void 0) {
+      tokenParts.push(`${usage.inputTokens.toLocaleString("en-US")} in`);
+    }
+    if (usage.outputTokens !== void 0) {
+      tokenParts.push(`${usage.outputTokens.toLocaleString("en-US")} out`);
+    }
+    if (usage.cachedInputTokens !== void 0) {
+      tokenParts.push(
+        `${usage.cachedInputTokens.toLocaleString("en-US")} cached`
+      );
+    }
+    if (usage.reasoningOutputTokens !== void 0) {
+      tokenParts.push(
+        `${usage.reasoningOutputTokens.toLocaleString("en-US")} reasoning`
+      );
+    }
+    if (tokenParts.length > 0) {
+      parts.push(`tokens: ${tokenParts.join(", ")}`);
+    }
+  }
+  return parts.join(", ");
 }
 async function countMarkdownPages(pagesDir) {
   try {
@@ -2474,14 +2528,16 @@ var StreamingFormatter = class {
       }
       return;
     }
-    if (msg.type === "result") {
-      const status = msg.subtype === "success" ? "done" : `failed (${msg.subtype})`;
-      const cost = typeof msg.total_cost_usd === "number" ? msg.total_cost_usd : 0;
-      const turns = typeof msg.num_turns === "number" ? msg.num_turns : 0;
-      this.sink.write(
-        `[${status}] cost: $${cost.toFixed(3)}, turns: ${turns}
-`
-      );
+    if (msg.type === "item.started" && isRecord(msg.item)) {
+      this.handleCodexItemStarted(msg.item);
+      return;
+    }
+    if (msg.type === "item.completed" && isRecord(msg.item)) {
+      this.handleCodexItemCompleted(msg.item);
+      return;
+    }
+    if (msg.type === "tool_call") {
+      this.handleCursorToolCall(msg);
       return;
     }
   }
@@ -2496,6 +2552,33 @@ var StreamingFormatter = class {
     }
     const summary = formatToolSummary(name, input);
     this.sink.write(`[${this.currentAgent}] ${summary}
+`);
+  }
+  handleCodexItemStarted(item) {
+    if (item.type !== "command_execution") return;
+    const command = stringField(item, "command") ?? "?";
+    this.sink.write(`[${this.currentAgent}] bash ${truncate(command, 80)}
+`);
+  }
+  handleCodexItemCompleted(item) {
+    if (item.type !== "file_change") return;
+    const changes = Array.isArray(item.changes) ? item.changes : [];
+    for (const change of changes) {
+      if (!isRecord(change)) continue;
+      const rawPath = stringField(change, "path") ?? "?";
+      const kind = stringField(change, "kind") ?? "edit";
+      const verb = kind === "add" ? "writing" : kind === "delete" ? "deleting" : "editing";
+      this.sink.write(
+        `[${this.currentAgent}] ${verb} ${formatCodexPath(rawPath)}
+`
+      );
+    }
+  }
+  handleCursorToolCall(msg) {
+    if (msg.subtype !== "started" || !isRecord(msg.tool_call)) return;
+    const summary = formatCursorToolSummary(msg.tool_call);
+    if (summary === void 0) return;
+    this.sink.write(`[${this.currentAgent}] ${summary}
 `);
   }
 };
@@ -2539,18 +2622,57 @@ function formatToolSummary(name, input) {
     }
     case "Bash": {
       const command = stringField(input, "command") ?? "?";
-      const trimmed = command.length > 80 ? `${command.slice(0, 77)}...` : command;
-      return `bash ${trimmed}`;
+      return `bash ${truncate(command, 80)}`;
     }
     default: {
       return name;
     }
   }
 }
+function formatCursorToolSummary(toolCall) {
+  if (isRecord(toolCall.readToolCall)) {
+    const args = recordField(toolCall.readToolCall, "args");
+    return `reading ${stringField(args, "path") ?? "?"}`;
+  }
+  if (isRecord(toolCall.editToolCall)) {
+    const args = recordField(toolCall.editToolCall, "args");
+    return `editing ${formatCodexPath(stringField(args, "path") ?? "?")}`;
+  }
+  if (isRecord(toolCall.globToolCall)) {
+    const args = recordField(toolCall.globToolCall, "args");
+    return `glob ${stringField(args, "globPattern") ?? "?"}`;
+  }
+  if (isRecord(toolCall.grepToolCall)) {
+    const args = recordField(toolCall.grepToolCall, "args");
+    return `grep ${stringField(args, "pattern") ?? "?"}`;
+  }
+  if (isRecord(toolCall.shellToolCall)) {
+    const args = recordField(toolCall.shellToolCall, "args");
+    const description = stringField(toolCall.shellToolCall, "description");
+    const command = stringField(args, "command") ?? description ?? "?";
+    return `bash ${truncate(command, 80)}`;
+  }
+  return void 0;
+}
+function truncate(value, max) {
+  return value.length > max ? `${value.slice(0, max - 3)}...` : value;
+}
+function formatCodexPath(value) {
+  const marker = "/.almanac/";
+  const idx = value.indexOf(marker);
+  if (idx !== -1) {
+    return `.almanac/${value.slice(idx + marker.length)}`;
+  }
+  return value;
+}
 function stringField(input, key) {
   const value = input[key];
   return typeof value === "string" ? value : void 0;
 }
+function recordField(input, key) {
+  const value = input[key];
+  return isRecord(value) ? value : {};
+}
 function isRecord(value) {
   return value !== null && typeof value === "object";
 }
@@ -3095,12 +3217,12 @@ function diffSnapshots(before, after) {
 }
 function formatSummary2(result, delta, logPath, repoRoot) {
   const rel = relative3(repoRoot, logPath);
-  const cost = `$${result.cost.toFixed(3)}`;
+  const usage = formatRunUsage(result);
   const { created, updated, archived } = delta;
   if (created === 0 && updated === 0 && archived === 0) {
-    return `[capture] no new knowledge met the notability bar (0 pages written), cost: ${cost}, turns: ${result.turns} (transcript: ${rel})`;
+    return `[capture] no new knowledge met the notability bar (0 pages written), ${usage} (transcript: ${rel})`;
   }
-  return `[done] ${updated} page${updated === 1 ? "" : "s"} updated, ${created} created, ${archived} archived, cost: ${cost}, turns: ${result.turns} (transcript: ${rel})`;
+  return `[done] ${updated} page${updated === 1 ? "" : "s"} updated, ${created} created, ${archived} archived, ${usage} (transcript: ${rel})`;
 }
 function formatTimestamp2(d) {
   const pad = (n) => n.toString().padStart(2, "0");
@@ -3213,4 +3335,4 @@ function registerCommands(program) {
 export {
   registerCommands
 };
-//# sourceMappingURL=register-commands-DPH4ZWEE.js.map
+//# sourceMappingURL=register-commands-7QCIENRZ.js.map