tines 0.0.165 → 0.0.167

package/dist/index.js

@@ -3130,9 +3130,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
       helpWidth: context.helpWidth,
       outputHasColors: context.hasColors
     });
-    const text2 = helper.formatHelp(this, helper);
-    if (context.hasColors) return text2;
-    return this._outputConfiguration.stripColor(text2);
+    const text3 = helper.formatHelp(this, helper);
+    if (context.hasColors) return text3;
+    return this._outputConfiguration.stripColor(text3);
   }
   /**
    * @typedef HelpContext
@@ -3292,7 +3292,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
    * @param {(string | Function)} text - string to add, or a function returning a string
    * @return {Command} `this` command for chaining
    */
-  addHelpText(position, text2) {
+  addHelpText(position, text3) {
     const allowedValues = ["beforeAll", "before", "after", "afterAll"];
     if (!allowedValues.includes(position)) {
       throw new Error(`Unexpected value for position to addHelpText.
@@ -3301,10 +3301,10 @@ Expecting one of '${allowedValues.join("', '")}'`);
     const helpEvent = `${position}Help`;
     this.on(helpEvent, (context) => {
       let helpStr;
-      if (typeof text2 === "function") {
-        helpStr = text2({ error: context.error, command: context.command });
+      if (typeof text3 === "function") {
+        helpStr = text3({ error: context.error, command: context.command });
       } else {
-        helpStr = text2;
+        helpStr = text3;
       }
       if (helpStr) {
         context.write(`${helpStr}
@@ -3527,7 +3527,7 @@ function runCostLabel(run) {
   if (!usage) return null;
   if (usage.cost_usd !== void 0) return `$${usage.cost_usd.toFixed(2)}`;
   if (usage.cost_source === "none") return "unreported";
-  const tokens = (usage.input_tokens ?? 0) + (usage.output_tokens ?? 0);
+  const tokens = (usage.input_tokens ?? 0) + (usage.output_tokens ?? 0) + (usage.cache_read_tokens ?? 0) + (usage.cache_write_tokens ?? 0);
   return tokens > 0 ? `${tokens.toLocaleString()} tok` : null;
 }
 function utilizationLabel(quota, activeRuns, stateName = (id) => id) {
@@ -6366,12 +6366,12 @@ start one: tines journal append ${issue.project_name}/${issue.number} "- <date>:
   ).action(
     async (ref, markdown, opts, command) => {
       if (helpGuard(command, markdown)) return;
-      const text2 = readBodyValue(markdown);
+      const text3 = readBodyValue(markdown);
       const api = client(opts);
       const { scope, note, item } = await resolveJournal(api, ref, opts.state);
       printNote(note);
       if (item) {
-        const updated = await api.appendContextItem(item.id, { text: text2 });
+        const updated = await api.appendContextItem(item.id, { text: text3 });
         if (opts.json) return printJson(updated);
         return console.log(`appended to the ${scope.label} journal (now v${updated.version})`);
       }
@@ -6381,7 +6381,7 @@ start one: tines journal append ${issue.project_name}/${issue.number} "- <date>:
           name: JOURNAL_NAME,
           project_id: scope.project_id ?? void 0,
           workflow_state_id: scope.workflow_state_id ?? void 0,
-          body: text2.trim()
+          body: text3.trim()
         });
         if (opts.json) return printJson(created);
         console.log(`started the ${scope.label} journal (${created.id})`);
@@ -6389,7 +6389,7 @@ start one: tines journal append ${issue.project_name}/${issue.number} "- <date>:
         if (!(err instanceof ApiError) || err.code !== "duplicate_context_name") throw err;
         const { item: fresh } = await resolveJournal(api, ref, opts.state);
         if (!fresh) throw err;
-        const updated = await api.appendContextItem(fresh.id, { text: text2 });
+        const updated = await api.appendContextItem(fresh.id, { text: text3 });
         if (opts.json) return printJson(updated);
         console.log(`appended to the ${scope.label} journal (now v${updated.version})`);
       }
@@ -6938,6 +6938,7 @@ import {
 } from "node:fs";
 import { hostname, platform, arch } from "node:os";
 import { dirname as dirname4, join as join5 } from "node:path";
+import { StringDecoder } from "node:string_decoder";
 
 // src/version.ts
 import { readFileSync as readFileSync6 } from "node:fs";
@@ -6950,6 +6951,17 @@ function cliVersion() {
   }
 }
 
+// src/daemon/stream-summary.ts
+function validMetric(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0;
+}
+function validProviderSessionId(value) {
+  return typeof value === "string" && value.length >= 1 && value.length <= 255 && Boolean(value.trim()) && !/[\x00-\x1f\x7f]/.test(value);
+}
+function copySummary(value) {
+  return { ...value, ...value.usage ? { usage: { ...value.usage } } : {} };
+}
+
 // src/daemon/claude-stream.ts
 function clip(value, max) {
   return value.length > max ? `${value.slice(0, max)}\u2026` : value;
@@ -7021,6 +7033,8 @@ var ClaudeStreamRenderer = class {
   emit;
   onEvent;
   pending = "";
+  collected = {};
+  finished = false;
   write(chunk) {
     this.pending += chunk;
     let nl = this.pending.indexOf("\n");
@@ -7032,11 +7046,16 @@ var ClaudeStreamRenderer = class {
   }
   /** Renders any trailing partial line. Call once the harness has exited. */
   finish() {
+    if (this.finished) return;
+    this.finished = true;
     if (this.pending) {
       this.line(this.pending);
       this.pending = "";
     }
   }
+  summary() {
+    return copySummary(this.collected);
+  }
   line(raw) {
     const trimmed = raw.trim();
     if (!trimmed) return;
@@ -7053,10 +7072,152 @@ var ClaudeStreamRenderer = class {
 `);
       return;
     }
+    if (!event || typeof event !== "object" || Array.isArray(event)) return;
+    if (event.type === "result") this.collectResult(event);
     this.onEvent?.(event);
     for (const line of renderStreamEvent(event)) this.emit(`${line}
 `);
   }
+  collectResult(event) {
+    if (!this.collected.providerSessionId && validProviderSessionId(event.session_id)) {
+      this.collected.providerSessionId = event.session_id;
+    }
+    if (validMetric(event.num_turns)) this.collected.numTurns = event.num_turns;
+    if (validMetric(event.duration_ms)) this.collected.durationMs = event.duration_ms;
+    const usage = { cost_source: "provider" };
+    let measured = false;
+    if (validMetric(event.total_cost_usd)) {
+      usage.cost_usd = event.total_cost_usd;
+      measured = true;
+    }
+    const raw = event.usage;
+    if (raw && typeof raw === "object" && !Array.isArray(raw)) {
+      for (const [source, destination] of [
+        ["input_tokens", "input_tokens"],
+        ["output_tokens", "output_tokens"],
+        ["cache_read_input_tokens", "cache_read_tokens"],
+        ["cache_creation_input_tokens", "cache_write_tokens"]
+      ]) {
+        if (validMetric(raw[source])) {
+          usage[destination] = raw[source];
+          measured = true;
+        }
+      }
+    }
+    if (measured) this.collected.usage = usage;
+  }
+};
+
+// src/daemon/codex-stream.ts
+function object(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function text2(value) {
+  return typeof value === "string" && value.trim() ? value.trim() : void 0;
+}
+function renderCodexEvent(event) {
+  const type = event.type;
+  if (type === "thread.started") return ["[session] started"];
+  if (type === "turn.started") return ["[session] turn started"];
+  if (type === "turn.completed") return ["[session] turn completed"];
+  if (type === "turn.failed") {
+    const error = object(event.error);
+    return [`[error] ${clip(text2(error?.message) ?? text2(event.message) ?? "turn failed", 2e3)}`];
+  }
+  if (type === "error") return [`[error] ${clip(text2(event.message) ?? "unknown error", 2e3)}`];
+  if (type !== "item.completed") return [];
+  const item = object(event.item);
+  if (!item) return [];
+  switch (item.type) {
+    case "agent_message":
+      return text2(item.text) ? [`[agent] ${clip(text2(item.text), 2e3)}`] : [];
+    case "command_execution": {
+      const command = text2(item.command) ?? "command";
+      const failed = validMetric(item.exit_code) && item.exit_code !== 0;
+      const output = failed ? text2(item.aggregated_output) : void 0;
+      return [
+        `[tool] ${clip(command, 300)}${failed ? ` (exit ${item.exit_code}${output ? `: ${clip(output, 300)}` : ""})` : ""}`
+      ];
+    }
+    case "file_change": {
+      const changes = Array.isArray(item.changes) ? item.changes : [];
+      const paths = changes.map((change) => text2(object(change)?.path)).filter((path2) => Boolean(path2));
+      return [`[tool] file change${paths.length ? `: ${clip(paths.join(", "), 300)}` : ""}`];
+    }
+    case "mcp_tool_call":
+      return [
+        `[tool] ${clip([text2(item.server), text2(item.tool)].filter(Boolean).join("/") || "MCP call", 300)}`
+      ];
+    case "web_search":
+      return [`[tool] web search${text2(item.query) ? `: ${clip(text2(item.query), 300)}` : ""}`];
+    default:
+      return [];
+  }
+}
+var CodexStreamRenderer = class {
+  constructor(emit) {
+    this.emit = emit;
+  }
+  emit;
+  pending = "";
+  collected = {};
+  finished = false;
+  write(chunk) {
+    this.pending += chunk;
+    let nl = this.pending.indexOf("\n");
+    while (nl !== -1) {
+      this.line(this.pending.slice(0, nl));
+      this.pending = this.pending.slice(nl + 1);
+      nl = this.pending.indexOf("\n");
+    }
+  }
+  finish() {
+    if (this.finished) return;
+    this.finished = true;
+    if (this.pending) this.line(this.pending);
+    this.pending = "";
+  }
+  summary() {
+    return copySummary(this.collected);
+  }
+  line(raw) {
+    const trimmed = raw.trim();
+    if (!trimmed) return;
+    let event;
+    try {
+      const parsed = JSON.parse(trimmed);
+      const parsedObject = object(parsed);
+      if (!parsedObject) return;
+      event = parsedObject;
+    } catch {
+      this.emit(`${raw}
+`);
+      return;
+    }
+    this.collect(event);
+    for (const line of renderCodexEvent(event)) this.emit(`${line}
+`);
+  }
+  collect(event) {
+    if (event.type === "thread.started" && !this.collected.providerSessionId && validProviderSessionId(event.thread_id)) {
+      this.collected.providerSessionId = event.thread_id;
+    }
+    if (event.type !== "turn.completed") return;
+    const raw = object(event.usage);
+    if (!raw) return;
+    const totalInput = validMetric(raw.input_tokens) ? raw.input_tokens : void 0;
+    const rawCached = validMetric(raw.cached_input_tokens) ? raw.cached_input_tokens : void 0;
+    const output = validMetric(raw.output_tokens) ? raw.output_tokens : void 0;
+    if (totalInput === void 0 && rawCached === void 0 && output === void 0) return;
+    const usage = {};
+    if (totalInput !== void 0) {
+      const cached = rawCached === void 0 ? void 0 : Math.min(rawCached, totalInput);
+      usage.input_tokens = totalInput - (cached ?? 0);
+      if (cached !== void 0) usage.cache_read_tokens = cached;
+    } else if (rawCached !== void 0) usage.cache_read_tokens = rawCached;
+    if (output !== void 0) usage.output_tokens = output;
+    this.collected.usage = usage;
+  }
 };
 
 // src/daemon/rate-limit.ts
@@ -7159,8 +7320,8 @@ function zonedDate(zone, at) {
   return { y: get("year"), m: get("month") - 1, d: get("day") };
 }
 var DURATION = /(\d+)\s*([dhms])/g;
-function parseResetTime(text2, now) {
-  const raw = text2.trim();
+function parseResetTime(text3, now) {
+  const raw = text3.trim();
   if (!raw) return null;
   const relative = raw.match(/^in\s+(.+)$/i);
   if (relative) {
@@ -7279,6 +7440,7 @@ function buildHarnessInvocation(spec, input) {
         file: "codex",
         args: [
           "exec",
+          "--json",
           "--skip-git-repo-check",
           ...input.model ? ["--model", input.model] : [],
           input.prompt
@@ -7432,9 +7594,9 @@ var LogBatcher = class {
   seq = 0;
   /** Chunks awaiting a successful send, oldest first. */
   pending = [];
-  append(text2) {
-    if (!text2) return;
-    this.buffer += text2;
+  append(text3) {
+    if (!text3) return;
+    this.buffer += text3;
     if (Buffer.byteLength(this.buffer, "utf8") >= (this.opts.maxBytes ?? 32 * 1024)) {
       void this.flush();
     } else if (!this.timer) {
@@ -7924,10 +8086,13 @@ async function runDaemon(opts) {
   const table2 = new RunTable(
     {
       finish: async (run, status, error, judgment) => {
+        const summary = run.renderer?.summary();
         await client2.finishRun(run.runId, {
           status,
           ...error ? { error } : {},
-          ...judgment
+          ...judgment,
+          usage: summary?.usage ?? { cost_source: "none" },
+          ...summary?.providerSessionId ? { provider_session_id: summary.providerSessionId } : {}
         });
       },
       release: (run, { keep, outcome }) => {
@@ -7976,7 +8141,8 @@ async function runDaemon(opts) {
       await client2.finishRun(orphan.run_id, {
         status: "failed",
         error: "daemon restarted; orphaned harness killed",
-        judgment: "interrupted"
+        judgment: "interrupted",
+        usage: { cost_source: "none" }
       });
     } catch {
     }
@@ -8107,23 +8273,38 @@ async function runDaemon(opts) {
           (event) => limiter.noteStreamEvent(event)
         );
         run.renderer = renderer;
-        run.drain = () => renderer.finish();
         const spoolPath = join5(opts.configDir, "rawlogs", `${runId}.ndjson`);
         mkdirSync4(dirname4(spoolPath), { recursive: true });
         run.rawSpoolPath = spoolPath;
         run.rawSpool = createWriteStream(spoolPath);
         run.rawUpload = (body) => client2.putRunLogRaw(runId, body);
+        const decoder = new StringDecoder("utf8");
+        run.drain = () => {
+          const trailing = decoder.end();
+          if (trailing) renderer.write(trailing);
+          renderer.finish();
+        };
         child.stdout?.on("data", (data) => {
           run.rawSpool?.write(data);
-          renderer.write(data.toString("utf8"));
+          renderer.write(decoder.write(data));
         });
+      } else if (opts.harness === "codex") {
+        const renderer = new CodexStreamRenderer((line) => run.batcher.append(line));
+        const decoder = new StringDecoder("utf8");
+        run.renderer = renderer;
+        run.drain = () => {
+          const trailing = decoder.end();
+          if (trailing) renderer.write(trailing);
+          renderer.finish();
+        };
+        child.stdout?.on("data", (data) => renderer.write(decoder.write(data)));
       } else {
         child.stdout?.on("data", (data) => run.batcher.append(data.toString("utf8")));
       }
       child.stderr?.on("data", (data) => {
-        const text2 = data.toString("utf8");
-        run.batcher.append(text2);
-        run.limiter?.noteStderr(text2);
+        const text3 = data.toString("utf8");
+        run.batcher.append(text3);
+        run.limiter?.noteStderr(text3);
       });
       run.timeout = setTimeout(() => {
         if (run.settled) return;
@@ -8135,7 +8316,7 @@ async function runDaemon(opts) {
       child.on("error", (err) => {
         void table2.finishAndCleanup(run, "failed", `failed to launch harness: ${message2(err)}`);
       });
-      child.on("exit", (code, signal) => {
+      child.on("close", (code, signal) => {
         run.drain?.();
         run.limiter?.finish();
         const closing = exitLineForRun(run, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tines",
-  "version": "0.0.165",
+  "version": "0.0.167",
   "description": "CLI for Tines, an orchestration layer for AI agents",
   "repository": {
     "type": "git",