@ordewell/core 0.10.9 → 0.10.11

package/dist/{chunk-O6LQU3W6.mjs → chunk-ESKK5I4F.mjs}

@@ -15,7 +15,7 @@ import {
   stripTrailingCommas,
   taggedReadOnlyMode,
   taskWhere
-} from "./chunk-H7QX32BH.mjs";
+} from "./chunk-24EL4Z2W.mjs";
 import {
   addTaskToPlan,
   canSetDependencies,
@@ -36,7 +36,7 @@ import {
   titledTaskRefOf,
   updateTaskInPlan,
   walkPlan
-} from "./chunk-EEE2GBLG.mjs";
+} from "./chunk-PFH7WFIB.mjs";
 
 // src/models/Usage.ts
 function partedPromptUsage(parts) {
@@ -55,25 +55,66 @@ function addUsage(totals, record) {
   }
   if (record.reportedCost) {
     const { amount, currency } = record.reportedCost;
-    next.reportedCost = { ...totals.reportedCost, [currency]: (totals.reportedCost?.[currency] ?? 0) + amount };
+    const provenance = record.reportedCost.kind || record.sessionBilling ? {
+      kind: record.reportedCost.kind ?? "unknown",
+      billing: record.sessionBilling?.type ?? "unknown",
+      ...record.reportedCost.basis ? { basis: record.reportedCost.basis } : {}
+    } : void 0;
+    addCost(next, currency, amount, provenance);
   }
   return next;
 }
+function addCost(totals, currency, amount, provenance) {
+  const hadCost = totals.reportedCost?.[currency] !== void 0;
+  const previous = totals.costProvenance?.[currency];
+  totals.reportedCost = { ...totals.reportedCost, [currency]: (totals.reportedCost?.[currency] ?? 0) + amount };
+  if (!previous && !provenance) return;
+  const unknown = { kind: "unknown", billing: "unknown" };
+  const a = previous ?? unknown;
+  const b = provenance ?? unknown;
+  const merged = !hadCost ? b : {
+    kind: a.kind === "estimate" || b.kind === "estimate" ? "estimate" : a.kind === "billed" && b.kind === "billed" ? "billed" : "unknown",
+    billing: a.billing === b.billing ? a.billing : "mixed",
+    ...a.basis && a.basis === b.basis ? { basis: a.basis } : {}
+  };
+  totals.costProvenance = { ...totals.costProvenance, [currency]: merged };
+}
 function addPlannerUsage(usage, record) {
-  const next = { ...usage, totals: addUsage(usage.totals, record), byModel: addModelUsage(usage.byModel ?? [], record) };
+  if (record.compacted) {
+    if (record.subagentId || record.aggregate) return usage;
+    const next2 = { ...usage };
+    if (record.source !== void 0) next2.source = record.source;
+    if (record.model !== void 0) {
+      if (record.source !== usage.source || record.model !== usage.model) delete next2.contextWindow;
+      next2.model = record.model;
+    }
+    if (record.contextTokens !== void 0) next2.lastPromptTokens = record.contextTokens;
+    else delete next2.lastPromptTokens;
+    if (record.contextWindow !== void 0) next2.contextWindow = record.contextWindow > 0 ? record.contextWindow : void 0;
+    return next2;
+  }
+  if (record.sessionBilling && !record.reportedCost && record.inputTokens === void 0 && record.outputTokens === void 0 && record.cachedInputTokens === void 0 && record.contextWindow === void 0) {
+    return record.subagentId ? usage : { ...usage, sessionBilling: record.sessionBilling, source: record.source };
+  }
+  record = { ...record, sessionBilling: record.sessionBilling ?? (usage.source === void 0 || record.source === usage.source ? usage.sessionBilling : void 0) };
+  const next = { ...usage, ...!record.subagentId && record.sessionBilling ? { sessionBilling: record.sessionBilling } : {}, totals: addUsage(usage.totals, record), byModel: addModelUsage(usage.byModel ?? [], record) };
   if (record.subagentId) {
     next.bySubagent = { ...usage.bySubagent, [record.subagentId]: addUsage(usage.bySubagent?.[record.subagentId] ?? {}, record) };
     return next;
   }
-  if (!record.aggregate) {
-    if (record.source !== usage.source || record.model !== usage.model) {
-      delete next.lastPromptTokens;
-      delete next.contextWindow;
-    }
-    next.source = record.source;
-    next.model = record.model;
+  if (record.aggregate) {
+    if (record.source !== usage.source && !record.sessionBilling) delete next.sessionBilling;
+    return next;
+  }
+  if (record.source !== usage.source || record.model !== usage.model) {
+    delete next.lastPromptTokens;
+    delete next.contextWindow;
   }
-  if (record.inputTokens !== void 0) next.lastPromptTokens = record.inputTokens;
+  if (record.source !== usage.source && !record.sessionBilling) delete next.sessionBilling;
+  next.source = record.source;
+  next.model = record.model;
+  const used = record.contextTokens ?? record.inputTokens;
+  if (used !== void 0) next.lastPromptTokens = used;
   if (record.contextWindow !== void 0) next.contextWindow = record.contextWindow > 0 ? record.contextWindow : void 0;
   return next;
 }
@@ -84,6 +125,7 @@ function usageLine(usage) {
   const contextFill = plannerContextFill(usage);
   return {
     totals: usage.totals,
+    ...usage.sessionBilling ? { sessionBilling: usage.sessionBilling } : {},
     ...usage.byModel ? { byModel: usage.byModel } : {},
     ...usage.model ? { model: usage.model } : {},
     ...usage.bySubagent ? { bySubagent: usage.bySubagent } : {},
@@ -91,8 +133,8 @@ function usageLine(usage) {
   };
 }
 function plannerContextFill(usage) {
-  if (usage.lastPromptTokens === void 0 || usage.contextWindow === void 0 || usage.contextWindow <= 0) return void 0;
-  return { usedTokens: usage.lastPromptTokens, windowTokens: usage.contextWindow };
+  if (usage.lastPromptTokens === void 0) return void 0;
+  return { usedTokens: usage.lastPromptTokens, ...usage.contextWindow !== void 0 && usage.contextWindow > 0 ? { windowTokens: usage.contextWindow } : {} };
 }
 function addModelUsage(models, record) {
   const index = models.findIndex((m) => m.source === record.source && m.model === record.model);
@@ -104,13 +146,14 @@ function startAttemptUsage(attempt, runner, startedAt) {
 }
 function addAttemptUsage(usage, record, now) {
   const folded = addPlannerUsage(usage, record);
-  return { ...usage, ...folded, lastPromptTokens: folded.lastPromptTokens, contextWindow: folded.contextWindow, wallTimeMs: Math.max(0, Date.parse(now) - Date.parse(usage.startedAt)) };
+  return { ...usage, ...folded, lastPromptTokens: folded.lastPromptTokens, contextWindow: folded.contextWindow, wallTimeMs: Math.max(0, Date.parse(usage.endedAt ?? now) - Date.parse(usage.startedAt)) };
 }
 function endAttemptUsage(usage, now, runnerSessionCost, sessionId) {
+  const endedAt = usage.endedAt ?? now;
   return {
     ...usage,
-    endedAt: now,
-    wallTimeMs: Math.max(0, Date.parse(now) - Date.parse(usage.startedAt)),
+    endedAt,
+    wallTimeMs: Math.max(0, Date.parse(endedAt) - Date.parse(usage.startedAt)),
     ...sessionId ? { sessionId } : {},
     ...runnerSessionCost ? { runnerSessionCost } : {}
   };
@@ -123,8 +166,8 @@ function resumedSessionWindow(attempts, runner, attempt, sessionId) {
   return last ? { source: last.source, model: last.model, contextWindow: last.contextWindow } : void 0;
 }
 function addUsageTotals(totals, addition) {
-  let next = addUsage(totals, { source: "", inputTokens: addition.inputTokens, outputTokens: addition.outputTokens, cachedInputTokens: addition.cachedInputTokens });
-  for (const [currency, amount] of Object.entries(addition.reportedCost ?? {})) next = addUsage(next, { source: "", reportedCost: { currency, amount } });
+  const next = addUsage(totals, { source: "", inputTokens: addition.inputTokens, outputTokens: addition.outputTokens, cachedInputTokens: addition.cachedInputTokens });
+  for (const [currency, amount] of Object.entries(addition.reportedCost ?? {})) addCost(next, currency, amount, addition.costProvenance?.[currency]);
   return next;
 }
 function planUsage(tasks) {
@@ -159,6 +202,71 @@ function taskUsageSummary(task) {
     ...contextFill ? { contextFill } : {}
   };
 }
+function formatTokenCount(n) {
+  if (n < 1e3) return String(n);
+  if (n < 1e4) return `${(n / 1e3).toFixed(1).replace(/\.0$/, "")}k`;
+  if (n < 999500) return `${Math.round(n / 1e3)}k`;
+  return `${(n / 1e6).toFixed(1).replace(/\.0$/, "")}M`;
+}
+function formatCost(currency, amount) {
+  const value = amount >= 1 ? amount.toFixed(2) : (([whole, frac = ""]) => `${whole}.${frac.padEnd(2, "0")}`)(amount.toFixed(4).replace(/0+$/, "").split("."));
+  return currency.toLowerCase() === "usd" ? `$${value}` : `${value} ${currency.toUpperCase()}`;
+}
+function contextMeterText(fill) {
+  if (!fill) return null;
+  const used = `ctx ${formatTokenCount(fill.usedTokens)}`;
+  if (!fill.windowTokens) return used;
+  const share = fill.usedTokens / fill.windowTokens * 100;
+  return `${used} (${share < 1 ? "<1" : Math.round(share)}%)`;
+}
+function contextMeterTitle(fill) {
+  const used = fill.usedTokens.toLocaleString("en-US");
+  return fill.windowTokens ? `${used} of ${fill.windowTokens.toLocaleString("en-US")} tokens` : `${used} tokens`;
+}
+function costParts(totals) {
+  const rank = (currency) => currency.toLowerCase() === "usd" ? "" : currency.toUpperCase();
+  return Object.entries(totals.reportedCost ?? {}).sort(([a], [b]) => rank(a).localeCompare(rank(b))).map(([currency, amount]) => {
+    const provenance = totals.costProvenance?.[currency];
+    const equivalent = provenance?.billing === "subscription";
+    return `${provenance?.kind === "estimate" || equivalent ? "\u2248" : ""}${formatCost(currency, amount)}${equivalent ? " API-equivalent" : ""}`;
+  });
+}
+function costText(totals) {
+  const parts = costParts(totals);
+  return parts.length > 0 ? parts.join(" \xB7 ") : null;
+}
+function usageText(usage) {
+  const parts = [contextMeterText(usage.contextFill), costText(usage.totals)].filter((p) => p !== null);
+  return parts.length > 0 ? parts.join(" \xB7 ") : null;
+}
+function modelCostTitle(byModel) {
+  const lines2 = byModel.flatMap((m) => {
+    const cost = costParts(m.totals);
+    const descriptions = [...new Set(Object.values(m.totals.costProvenance ?? {}).map((p) => {
+      const source = m.source === "claude-code" ? "Claude Code" : m.source === "opencode" ? "OpenCode" : m.source === "openrouter" ? "OpenRouter" : m.source;
+      const basis = p.basis === "list" ? " at list price" : p.basis === "managed" ? " at managed price" : "";
+      const kind = p.kind === "estimate" ? `${source}'s estimate${basis}` : p.kind === "billed" ? `Amount billed by ${source}` : "Reported cost";
+      return `${kind}${p.billing === "subscription" ? "; not billed on a subscription" : ""}`;
+    }))];
+    return cost.length > 0 ? [`${m.source} / ${m.model ?? "unattributed"}: ${cost.join(" \xB7 ")}${descriptions.length ? ` \u2014 ${descriptions.join("; ")}` : ""}`] : [];
+  });
+  return lines2.length > 0 ? lines2.join("\n") : void 0;
+}
+function subagentCostTitle(bySubagent) {
+  return Object.entries(bySubagent).map(([id, totals]) => `${id}: ${costParts(totals).join(" \xB7 ") || "reported no cost"}`).join("\n");
+}
+function runnersOf(tasks) {
+  return tasks.flatMap((task) => [...task.attemptUsage ?? [], ...runnersOf(task.subtasks ?? [])]);
+}
+function tasksTotalText(tasks) {
+  const attempts = runnersOf(tasks);
+  if (attempts.length === 0) return null;
+  const costed = (a) => Object.keys(a.totals.reportedCost ?? {}).length > 0;
+  const costless = [...new Set(attempts.filter((a) => a.endedAt !== void 0 && isMeasured(a.totals)).map((a) => a.runner))].filter((runner) => !attempts.some((a) => a.runner === runner && costed(a)));
+  const note = costless.length === 0 ? [] : [`${costless.length === 1 ? costless[0] : `${costless.slice(0, -1).join(", ")} and ${costless.at(-1)}`} ${costless.length === 1 ? "reports" : "report"} no cost`];
+  const parts = [...costParts(planUsage(tasks).totals), ...note];
+  return parts.length > 0 ? `Tasks total: ${parts.join(" \xB7 ")}` : null;
+}
 
 // src/services/harness/agentTools.ts
 var KNOWN_TOOLS = {
@@ -2075,7 +2183,7 @@ function openTurn(view, { turnId, prompt = "", skills = [], wakeUps = [], forced
   wakeUps = wakeUps.slice(adopted.wakeUps);
   if (wakeUps.length === 0) return adopted.prompt || prompt === "" && adopted.wakeUps > 0 ? view : promptLine(view, turnId, prompt, skills, forced);
   const said = prompt === "" || adopted.prompt ? view : promptLine(view, turnId, prompt, skills, forced);
-  const at = prompt === "" ? said.blocks.length : findLastIndex(said.blocks, (b) => b.type === "message" && b.role === "user" && b.turnId === turnId);
+  const at = prompt === "" ? said.blocks.length - (said.blocks.at(-1)?.type === "usage" ? 1 : 0) : findLastIndex(said.blocks, (b) => b.type === "message" && b.role === "user" && b.turnId === turnId);
   const updates = wakeUps.map((text2, n) => settledMessage(`b${said.nextId + n}`, "wake_up", text2, turnId));
   return { ...said, blocks: [...said.blocks.slice(0, at), ...updates, ...said.blocks.slice(at)], nextId: said.nextId + updates.length };
 }
@@ -2749,6 +2857,15 @@ export {
   addUsageTotals,
   planUsage,
   taskUsageSummary,
+  formatTokenCount,
+  formatCost,
+  contextMeterText,
+  contextMeterTitle,
+  costText,
+  usageText,
+  modelCostTitle,
+  subagentCostTitle,
+  tasksTotalText,
   sameMessage,
   mapAgentTool,
   normalizeAgentArgs,
@@ -2842,4 +2959,4 @@ export {
   pastGateConfirmation,
   newTaskFields
 };
-//# sourceMappingURL=chunk-O6LQU3W6.mjs.map
+//# sourceMappingURL=chunk-ESKK5I4F.mjs.map