pi-landstrip 0.18.9 → 0.18.10

package/dist/index.ts

@@ -1865,6 +1865,7 @@ function taskDetails(task, state = task.state) {
     currentTool: task.currentTool,
     toolCalls: task.toolCalls,
     retryAttempt: task.retryAttempt,
+    usage: task.usage ? { ...task.usage } : undefined,
     startedAt: task.startedAt,
     finishedAt: task.finishedAt,
     output: task.output,
@@ -1878,6 +1879,78 @@ function taskDuration(details) {
   const seconds = Math.max(0, end - details.startedAt) / 1000;
   return seconds < 10 ? `${seconds.toFixed(1)}s` : `${Math.round(seconds)}s`;
 }
+function usageNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0;
+}
+function isTaskUsage(value) {
+  return isRecord2(value) && usageNumber(value.input) && usageNumber(value.output) && usageNumber(value.cacheRead) && usageNumber(value.cacheWrite) && usageNumber(value.cost) && usageNumber(value.turns) && Number.isInteger(value.turns);
+}
+function taskUsageFromMessage(message) {
+  if (!isRecord2(message) || message.role !== "assistant" || !isRecord2(message.usage))
+    return;
+  const usage = message.usage;
+  if (!usageNumber(usage.input) || !usageNumber(usage.output) || !usageNumber(usage.cacheRead) || !usageNumber(usage.cacheWrite) || !isRecord2(usage.cost) || !usageNumber(usage.cost.total)) {
+    return;
+  }
+  return {
+    input: usage.input,
+    output: usage.output,
+    cacheRead: usage.cacheRead,
+    cacheWrite: usage.cacheWrite,
+    cost: usage.cost.total,
+    turns: 1
+  };
+}
+function addTaskUsage(current, added) {
+  return {
+    input: (current?.input ?? 0) + added.input,
+    output: (current?.output ?? 0) + added.output,
+    cacheRead: (current?.cacheRead ?? 0) + added.cacheRead,
+    cacheWrite: (current?.cacheWrite ?? 0) + added.cacheWrite,
+    cost: (current?.cost ?? 0) + added.cost,
+    turns: (current?.turns ?? 0) + added.turns
+  };
+}
+function formatTokens(count) {
+  if (count < 1000)
+    return String(count);
+  if (count < 1e4)
+    return `${(count / 1000).toFixed(1)}k`;
+  if (count < 1e6)
+    return `${Math.round(count / 1000)}k`;
+  if (count < 1e7)
+    return `${(count / 1e6).toFixed(1)}M`;
+  return `${Math.round(count / 1e6)}M`;
+}
+function formatTaskUsage(usage) {
+  if (!usage)
+    return;
+  const parts = [];
+  if (usage.turns)
+    parts.push(`${usage.turns} turn${usage.turns === 1 ? "" : "s"}`);
+  if (usage.input)
+    parts.push(`in:${formatTokens(usage.input)}`);
+  if (usage.output)
+    parts.push(`out:${formatTokens(usage.output)}`);
+  if (usage.cacheRead)
+    parts.push(`R${formatTokens(usage.cacheRead)}`);
+  if (usage.cacheWrite)
+    parts.push(`W${formatTokens(usage.cacheWrite)}`);
+  if (usage.cost)
+    parts.push(`$${usage.cost.toFixed(4)}`);
+  return parts.length > 0 ? parts.join(" ") : undefined;
+}
+function formatTaskUsageSummary(usage) {
+  if (!usage)
+    return;
+  const parts = [];
+  const tokens = usage.input + usage.output;
+  if (tokens)
+    parts.push(`${formatTokens(tokens)} tok`);
+  if (usage.cost)
+    parts.push(`$${usage.cost.toFixed(4)}`);
+  return parts.length > 0 ? parts.join(" ") : undefined;
+}
 function activeTaskRecords(tasks) {
   const byId = new Map(tasks.map((task) => [task.id, task]));
   const visibleIds = new Set;
@@ -1905,6 +1978,9 @@ function taskProgress(task) {
   if (task.toolCalls !== undefined) {
     progress.push(`${task.toolCalls} call${task.toolCalls === 1 ? "" : "s"}`);
   }
+  const usage = formatTaskUsageSummary(task.usage);
+  if (usage)
+    progress.push(usage);
   const duration = taskDuration(taskDetails(task));
   if (duration)
     progress.push(duration);
@@ -2256,8 +2332,10 @@ function parseControlResponse(value) {
   if (response.value !== undefined && typeof response.value !== "string") {
     throw new Error("Invalid supervisor response value");
   }
-  if (response.task !== undefined && (!isRecord2(response.task) || typeof response.task.taskId !== "string" || typeof response.task.state !== "string" || !TASK_STATES.has(response.task.state) || typeof response.task.agent !== "string")) {
-    throw new Error("Invalid supervisor task response");
+  if (response.task !== undefined) {
+    if (!isRecord2(response.task) || typeof response.task.taskId !== "string" || typeof response.task.state !== "string" || !TASK_STATES.has(response.task.state) || typeof response.task.agent !== "string" || response.task.usage !== undefined && !isTaskUsage(response.task.usage)) {
+      throw new Error("Invalid supervisor task response");
+    }
   }
   return response;
 }
@@ -2675,11 +2753,13 @@ ${this.primaryAgent.prompt}` };
           task.toolCalls === undefined ? undefined : `${task.toolCalls} tool call${task.toolCalls === 1 ? "" : "s"}`,
           duration
         ].filter(Boolean);
+        const usage = formatTaskUsage(task.usage);
         const lines = [
           tabs,
           "",
           `${theme.fg("accent", theme.bold(`@${task.agent}`))} ${theme.fg("text", task.description)}`,
           `${taskState(theme, task)} ${theme.fg("dim", metrics.join(" · "))} ${theme.fg("dim", "·")} ${theme.fg(follow ? "accent" : "muted", `Follow: ${follow ? "on" : "off"}`)}`,
+          ...usage ? [theme.fg("dim", usage)] : [],
           "",
           ...shown.map((line) => theme.fg("toolOutput", line))
         ];
@@ -3086,6 +3166,9 @@ ${descriptions}` : ""),
         const duration = taskDuration(details);
         if (duration)
           metrics.push(duration);
+        const usage = formatTaskUsage(details.usage);
+        if (usage)
+          metrics.push(usage);
         if (metrics.length > 0)
           text += `
 ${theme.fg("dim", metrics.join(" · "))}`;
@@ -3334,6 +3417,15 @@ ${catalog.diagnostics.join(`
             update(streamedText);
           }
         }
+        if (event.type === "message_end") {
+          const usage = taskUsageFromMessage(event.message);
+          if (usage) {
+            task.usage = addTaskUsage(task.usage, usage);
+            this.persist(task);
+            this.updateTaskWidget(ctx);
+            update(streamedText || "Subagent running");
+          }
+        }
         if (event.type === "tool_execution_start" && typeof event.toolName === "string") {
           task.currentTool = event.toolName;
           task.toolCalls = (task.toolCalls ?? 0) + 1;
@@ -3750,11 +3842,15 @@ ${renderTaskResult(task.id, "error", message)}`);
       render: (width) => {
         const header = theme.fg("accent", theme.bold("Subagents")) + theme.fg("dim", `  ${summary}`);
         const tree = taskTreeLines(visible, (task) => {
+          const state = taskState(theme, task);
           const agent = theme.fg("accent", `@${task.agent}`);
-          const description = theme.fg("text", task.description);
-          const progress = taskProgress(byId.get(task.id));
+          const record = byId.get(task.id);
+          const progress = taskProgress(record);
           const suffix = progress.length > 0 ? theme.fg("dim", `  ·  ${progress.join(" · ")}`) : "";
-          return `${taskState(theme, task)}  ${agent}  ${description}${suffix}`;
+          const indentWidth = 3 + Math.max(0, record.depth) * 3;
+          const descriptionWidth = Math.max(1, width - indentWidth - visibleWidth2(`${state}  ${agent}  ${suffix}`));
+          const description = theme.fg("text", truncateToWidth2(task.description, descriptionWidth));
+          return `${state}  ${agent}  ${description}${suffix}`;
         });
         const shown = tree.slice(0, 8);
         if (tree.length > shown.length) {
@@ -3775,6 +3871,7 @@ ${renderTaskResult(task.id, "error", message)}`);
         continue;
       this.tasks.set(task.id, {
         ...task,
+        usage: isTaskUsage(task.usage) ? { ...task.usage } : undefined,
         state: task.state === "running" || task.state === "queued" ? "interrupted" : task.state
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-landstrip",
-  "version": "0.18.9",
+  "version": "0.18.10",
   "description": "Sandboxed Bash and process-backed agents for Pi",
   "keywords": [
     "landstrip",
@@ -39,7 +39,7 @@
     "ci:test": "npm run test"
   },
   "dependencies": {
-    "@landstrip/landstrip": "^0.18.9",
+    "@landstrip/landstrip": "^0.18.10",
     "jsonc-parser": "^3.3.1",
     "minimatch": "^10.2.5",
     "yaml": "^2.9.0"