@ordewell/cli 0.10.8 → 0.10.10

package/dist/main.js

@@ -2574,7 +2574,7 @@ function runnerCommandLines(block2, cols, detailAll) {
   return [head, ...underHeader(shown.map(style.grey))];
 }
 function compactionLine(block2, cols) {
-  const sizes = block2.preTokens !== void 0 && block2.postTokens !== void 0 ? ` \xB7 ${compactCount(block2.preTokens)} \u2192 ${compactCount(block2.postTokens)} tokens` : "";
+  const sizes = block2.preTokens !== void 0 && block2.postTokens !== void 0 ? ` \xB7 ${(0, import_core14.formatTokenCount)(block2.preTokens)} \u2192 ${(0, import_core14.formatTokenCount)(block2.postTokens)} tokens` : "";
   const text = block2.trigger === "auto" && !sizes ? "\u2261 Context compacted by the runner on its own" : `\u2261 Context compacted${sizes}`;
   return style.grey(truncate(text, cols));
 }
@@ -2650,37 +2650,10 @@ function conversationLines(blocks2, cols, detailAll, answering) {
   }
   return lines;
 }
-function compactCount(n) {
-  if (n < 1e3) return String(n);
-  const [value, unit] = n < 999950 ? [n / 1e3, "k"] : [n / 1e6, "M"];
-  return `${value.toFixed(1).replace(/\.0$/, "")}${unit}`;
-}
-function formatCost(currency, amount) {
-  const [whole, frac = ""] = amount.toFixed(4).replace(/0+$/, "").split(".");
-  const value = `${whole}.${frac.padEnd(2, "0")}`;
-  return currency.toLowerCase() === "usd" ? `$${value}` : `${value} ${currency.toUpperCase()}`;
-}
 function tokenLine(blocks2, cols) {
   const usage = blocks2[blocks2.length - 1];
-  if (usage?.type !== "usage") return null;
-  const parts = usageMeasures(usage.totals);
-  if (usage.model && !usage.contextFill) parts.push("ctx unknown");
-  if (usage.contextFill) parts.splice(2, 0, `${Math.round(usage.contextFill.usedTokens / usage.contextFill.windowTokens * 100)}% ctx`);
-  return parts.length > 0 ? style.grey(truncate(parts.join(" \xB7 "), cols)) : null;
-}
-function usageMeasures(totals) {
-  return [
-    ...totals.inputTokens !== void 0 ? [`${compactCount(totals.inputTokens)} in`] : [],
-    ...totals.outputTokens !== void 0 ? [`${compactCount(totals.outputTokens)} out`] : [],
-    ...totals.cachedInputTokens !== void 0 ? [`${compactCount(totals.cachedInputTokens)} cached`] : [],
-    ...Object.entries(totals.reportedCost ?? {}).map(([currency, amount]) => formatCost(currency, amount))
-  ];
-}
-function taskUsageText(usage) {
-  return [
-    ...usageMeasures(usage.totals),
-    ...usage.attempt !== void 0 ? [usage.contextFill ? `ctx ${Math.round(usage.contextFill.usedTokens / usage.contextFill.windowTokens * 100)}%` : "ctx unknown"] : []
-  ].join(" \xB7 ");
+  const text = usage?.type === "usage" ? (0, import_core14.usageText)(usage) : null;
+  return text ? style.grey(truncate(text, cols)) : null;
 }
 function assignmentFlagText(row) {
   return `${row.assignmentFlag} \u2014 ${row.assignmentConsequence}`;
@@ -2767,8 +2740,8 @@ function printOneSession(sessionId, meta, plan, runnerScope) {
   if (isolation) console.log(`Base:     ${handoffBase(isolation.handoff, 8)}`);
   console.log(`Tasks:    ${everyTask.length} total  |  ${count("completed")} done  |  ${count("failed")} failed  |  ${count("in_progress")} running  |  ${count("blocked")} blocked  |  ${count("skipped")} skipped
 `);
-  const usage = (0, import_core15.planUsage)(allTasks);
-  if (usage.attempts) console.log(`Tasks total: ${taskUsageText(usage)}`);
+  const total = (0, import_core15.tasksTotalText)(allTasks);
+  if (total) console.log(total);
   const record = servedApprovalRecord(plan);
   const approval = (row, ref) => row.waitsForApproval ? `${row.waitsForApproval}: \`ordewell force-start ${ref}\` approves it, \`ordewell run\` approves all` : null;
   for (const t of allTasks) {
@@ -2782,7 +2755,8 @@ function printOneSession(sessionId, meta, plan, runnerScope) {
     if (row.assignmentFlag) console.log(`      \u26A0 ${assignmentFlagText(row)}`);
     if (row.blockedBy) console.log(`      ${(0, import_core15.blockedByLabel)(row.blockedBy)}`);
     if (row.status === "skipped") console.log(`      ${(0, import_core15.skippedLabel)(row.skipReason)}`);
-    if (row.usage) console.log(`      ${taskUsageText(row.usage)}`);
+    const usage = row.usage && (0, import_core15.usageText)(row.usage);
+    if (usage) console.log(`      ${usage}`);
     for (const sub of t.subtasks || []) {
       const subIcon = iconFor(blocked.has(sub.id) ? "blocked" : sub.status);
       const subModel = sub.assignedModel ? ` (${sub.assignedModel.modelLabel})` : "";
@@ -2794,7 +2768,8 @@ function printOneSession(sessionId, meta, plan, runnerScope) {
       if (subRow.assignmentFlag) console.log(`        \u26A0 ${assignmentFlagText(subRow)}`);
       if (subRow.blockedBy) console.log(`        ${(0, import_core15.blockedByLabel)(subRow.blockedBy)}`);
       if (subRow.status === "skipped") console.log(`        ${(0, import_core15.skippedLabel)(subRow.skipReason)}`);
-      if (subRow.usage) console.log(`        ${taskUsageText(subRow.usage)}`);
+      const subUsage = subRow.usage && (0, import_core15.usageText)(subRow.usage);
+      if (subUsage) console.log(`        ${subUsage}`);
     }
   }
 }
@@ -5373,11 +5348,11 @@ function taskUsageFooter(state, tv, blocks2, cols) {
   const reported = task?.attemptUsage ?? [];
   if (!task || reported.length === 0) return tokenRow(blocks2, cols);
   const onScreen = tv.attempt > 0 ? reported.find((a) => a.attempt === tv.attempt) : reported.at(-1);
-  const spend = (0, import_core34.taskUsageSummary)(task);
-  const total = taskUsageText({ ...spend, attempt: reported.at(-1)?.attempt ?? 0 });
-  if (onScreen === reported.at(-1)) return [style.grey(truncate(total, cols))];
-  const own = onScreen ? [style.grey(truncate(`attempt ${onScreen.attempt}: ${taskUsageText({ totals: onScreen.totals, contextFill: (0, import_core34.plannerContextFill)(onScreen), attempt: onScreen.attempt })}`, cols))] : tokenRow(blocks2, cols);
-  return [...own, style.grey(truncate(`task total: ${total}`, cols))];
+  const total = (0, import_core34.usageText)((0, import_core34.taskUsageSummary)(task));
+  const totalRow = total ? [style.grey(truncate(onScreen === reported.at(-1) ? total : `task total: ${total}`, cols))] : [];
+  if (onScreen === reported.at(-1)) return totalRow;
+  const own = onScreen ? (0, import_core34.usageText)({ totals: onScreen.totals, contextFill: (0, import_core34.plannerContextFill)(onScreen) }) : null;
+  return [...onScreen ? own ? [style.grey(truncate(`attempt ${onScreen.attempt}: ${own}`, cols))] : [] : tokenRow(blocks2, cols), ...totalRow];
 }
 function chatScrollMax(state) {
   return chatLayout(state, bodyRows(state), chatPaneWidth(state)).maxScroll;
@@ -5533,18 +5508,18 @@ var STATUS_ICON = {
 var inRow = (label) => label.charAt(0).toLowerCase() + label.slice(1);
 function planLayout(state, rows, cols) {
   const done = state.tasks.filter((t) => t.status === "completed").length;
-  const totalUsage = (0, import_core34.planUsage)(state.tasks);
+  const totalUsage = (0, import_core34.tasksTotalText)(state.tasks);
   const unmerged = state.runMerge?.handoff.landed.length ?? 0;
   const count = `${done}/${state.tasks.length}`;
   const hints = runHints(state);
   const hint = hints.find((h) => width(`Plan ${count} \xB7 ${h}`) <= cols) ?? hints.at(-1);
   const lines = [
     truncate(`${style.bold(style.brand("Plan"))} ${style.grey(`${count}${hint ? ` \xB7 ${hint}` : ""}`)}`, cols),
-    totalUsage.attempts ? style.grey(truncate(`Tasks total: ${taskUsageText(totalUsage)}`, cols)) : ""
+    totalUsage ? style.grey(truncate(totalUsage, cols)) : ""
   ];
   if (unmerged > 0) {
     const landed = style.dim(truncate(`${unmerged} landed task${unmerged === 1 ? "" : "s"} not merged: /handoff merge`, cols));
-    if (totalUsage.attempts) lines.push(landed);
+    if (totalUsage) lines.push(landed);
     else lines[1] = landed;
   }
   const firstRowLine = lines.length;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordewell/cli",
-  "version": "0.10.8",
+  "version": "0.10.10",
   "description": "Ordewell CLI and TUI — plan, run and verify coding-agent tasks from the terminal.",
   "license": "Apache-2.0",
   "author": "Alessandro Costanzo Ciano",
@@ -51,8 +51,8 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@ordewell/core": "^0.10.8",
-    "@ordewell/web": "^0.10.8",
+    "@ordewell/core": "^0.10.10",
+    "@ordewell/web": "^0.10.10",
     "string-width": "^7.2.0",
     "ws": "^8.18.0"
   },