@wichayutdew/pi-workflows 3.1.0 → 3.3.0

package/dist/index.js

@@ -1496,6 +1496,182 @@ ${artifact}`, [APPROVE, REQUEST_CHANGES, PAUSE], ...selectionOptions(signal));
 // src/integrations/subagents/client.ts
 import { spawn } from "node:child_process";
 import { StringDecoder } from "node:string_decoder";
+
+// src/engine/usage.ts
+var isRecord3 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+var emptyUsage = () => ({
+  inputTokens: 0,
+  outputTokens: 0,
+  cacheReadTokens: 0,
+  cacheWriteTokens: 0,
+  inputCostUsd: 0,
+  outputCostUsd: 0,
+  cacheReadCostUsd: 0,
+  cacheWriteCostUsd: 0,
+  otherCostUsd: 0,
+  totalCostUsd: 0
+});
+var emptyUsageAggregate = () => ({
+  usage: emptyUsage(),
+  models: []
+});
+var fields = [
+  "inputTokens",
+  "outputTokens",
+  "cacheReadTokens",
+  "cacheWriteTokens",
+  "inputCostUsd",
+  "outputCostUsd",
+  "cacheReadCostUsd",
+  "cacheWriteCostUsd",
+  "otherCostUsd",
+  "totalCostUsd"
+];
+function finiteNonNegative(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : undefined;
+}
+function numberAt(value, ...keys) {
+  for (const key of keys) {
+    const candidate = finiteNonNegative(value[key]);
+    if (candidate !== undefined)
+      return candidate;
+  }
+  return 0;
+}
+function costNumber(value, costObj, flatKeys, nestedKey) {
+  for (const key of flatKeys) {
+    const candidate = finiteNonNegative(value[key]);
+    if (candidate !== undefined)
+      return candidate;
+  }
+  if (costObj) {
+    const candidate = finiteNonNegative(costObj[nestedKey]);
+    if (candidate !== undefined)
+      return candidate;
+  }
+  return 0;
+}
+function hasMalformedNumber(value) {
+  for (const candidate of Object.values(value)) {
+    if (typeof candidate === "number" && (!Number.isFinite(candidate) || candidate < 0)) {
+      return true;
+    }
+    if (isRecord3(candidate)) {
+      for (const nested of Object.values(candidate)) {
+        if (typeof nested === "number" && (!Number.isFinite(nested) || nested < 0)) {
+          return true;
+        }
+      }
+    }
+  }
+  return false;
+}
+function normalizeUsage(value) {
+  if (!isRecord3(value))
+    return;
+  if (hasMalformedNumber(value))
+    return;
+  const costObj = isRecord3(value.cost) ? value.cost : undefined;
+  const flatTotal = finiteNonNegative(value.totalCostUsd) ?? (typeof value.cost === "number" ? finiteNonNegative(value.cost) : undefined) ?? finiteNonNegative(value.costUsd);
+  const nestedTotal = costObj ? finiteNonNegative(costObj.total) : undefined;
+  const hasTotal = flatTotal !== undefined || nestedTotal !== undefined;
+  const totalCostUsd = flatTotal ?? nestedTotal ?? 0;
+  let usage = {
+    inputTokens: numberAt(value, "inputTokens", "input"),
+    outputTokens: numberAt(value, "outputTokens", "output"),
+    cacheReadTokens: numberAt(value, "cacheReadTokens", "cacheRead"),
+    cacheWriteTokens: numberAt(value, "cacheWriteTokens", "cacheWrite"),
+    inputCostUsd: costNumber(value, costObj, ["inputCostUsd", "inputCost"], "input"),
+    outputCostUsd: costNumber(value, costObj, ["outputCostUsd", "outputCost"], "output"),
+    cacheReadCostUsd: costNumber(value, costObj, ["cacheReadCostUsd", "cacheReadCost"], "cacheRead"),
+    cacheWriteCostUsd: costNumber(value, costObj, ["cacheWriteCostUsd", "cacheWriteCost"], "cacheWrite"),
+    otherCostUsd: 0,
+    totalCostUsd
+  };
+  const recognized = [
+    "inputTokens",
+    "input",
+    "outputTokens",
+    "output",
+    "cacheReadTokens",
+    "cacheRead",
+    "cacheWriteTokens",
+    "cacheWrite",
+    "inputCostUsd",
+    "inputCost",
+    "outputCostUsd",
+    "outputCost",
+    "cacheReadCostUsd",
+    "cacheReadCost",
+    "cacheWriteCostUsd",
+    "cacheWriteCost",
+    "totalCostUsd",
+    "cost",
+    "costUsd"
+  ].some((key) => (key in value));
+  if (!recognized)
+    return;
+  const componentCost = usage.inputCostUsd + usage.outputCostUsd + usage.cacheReadCostUsd + usage.cacheWriteCostUsd;
+  if (hasTotal) {
+    if (componentCost > usage.totalCostUsd + 0.000000001)
+      return;
+    usage = { ...usage, otherCostUsd: usage.totalCostUsd - componentCost };
+  } else {
+    usage = { ...usage, totalCostUsd: componentCost };
+  }
+  return usage;
+}
+function isUsageTotals(value) {
+  if (!isRecord3(value) || !fields.every((field) => finiteNonNegative(value[field]) !== undefined))
+    return false;
+  return Math.abs(value.inputCostUsd + value.outputCostUsd + value.cacheReadCostUsd + value.cacheWriteCostUsd + value.otherCostUsd - value.totalCostUsd) <= 0.000000001;
+}
+function addUsage(left, right) {
+  return Object.fromEntries(fields.map((field) => [field, left[field] + right[field]]));
+}
+function mergeUsage(aggregate, entries) {
+  const byModel = new Map(aggregate.models.map((entry) => [
+    `${entry.provider}\x00${entry.model}`,
+    entry.usage
+  ]));
+  for (const entry of entries) {
+    if (!entry.provider || !entry.model || !isUsageTotals(entry.usage))
+      continue;
+    const key = `${entry.provider}\x00${entry.model}`;
+    byModel.set(key, addUsage(byModel.get(key) ?? emptyUsage(), entry.usage));
+  }
+  const models = [...byModel.entries()].map(([key, usage]) => {
+    const [provider, model] = key.split("\x00");
+    return { provider: provider ?? "", model: model ?? "", usage };
+  }).sort((left, right) => `${left.provider}/${left.model}`.localeCompare(`${right.provider}/${right.model}`));
+  return {
+    usage: models.reduce((total, entry) => addUsage(total, entry.usage), emptyUsage()),
+    models
+  };
+}
+function isUsageAggregate(value) {
+  const usage = value && typeof value === "object" ? value.usage : undefined;
+  const models = value && typeof value === "object" ? value.models : undefined;
+  if (!isRecord3(value) || !isUsageTotals(usage) || !Array.isArray(models))
+    return false;
+  if (!models.every((entry) => isRecord3(entry) && typeof entry.provider === "string" && entry.provider.length > 0 && typeof entry.model === "string" && entry.model.length > 0 && isUsageTotals(entry.usage)))
+    return false;
+  if (new Set(models.map((entry) => `${entry.provider}\x00${entry.model}`)).size !== models.length)
+    return false;
+  const typedModels = models;
+  const total = typedModels.reduce((sum, entry) => addUsage(sum, entry.usage), emptyUsage());
+  return fields.every((field) => Math.abs(total[field] - usage[field]) <= 0.000000001);
+}
+function modelUsageFromMessage(value, fallbackProvider, fallbackModel) {
+  if (!isRecord3(value))
+    return;
+  const usage = normalizeUsage(value.usage);
+  const provider = typeof value.provider === "string" ? value.provider : fallbackProvider;
+  const model = typeof value.model === "string" ? value.model : fallbackModel;
+  return usage && provider && model ? { provider, model, usage } : undefined;
+}
+
+// src/integrations/subagents/client.ts
 var directWorkerCommand = (request) => [
   "--no-session",
   "--mode",
@@ -1505,7 +1681,7 @@ var directWorkerCommand = (request) => [
   "--print",
   request.task
 ];
-function directWorkerResponse(request, code, signal, stderr, diagnostic) {
+function directWorkerResponse(request, code, signal, stderr, diagnostic, usage = []) {
   const status = code === 0 ? "completed" : signal ? "cancelled" : "failed";
   return {
     requestId: request.requestId,
@@ -1513,11 +1689,30 @@ function directWorkerResponse(request, code, signal, stderr, diagnostic) {
     status,
     ...code === null ? {} : { exitCode: code },
     ...status !== "completed" && stderr.trim() ? { error: stderr.trim().slice(-4000) } : {},
-    ...diagnostic ? { diagnostic } : {}
+    ...diagnostic ? { diagnostic } : {},
+    ...usage.length > 0 ? { usage } : {}
   };
 }
 var MAX_PROGRESS_DETAIL_CHARS = 480;
 var MAX_DIAGNOSTIC_CALLS = 64;
+function workerUsageFromJsonLine(line, fallbackProvider, fallbackModel) {
+  let event;
+  try {
+    const parsed = JSON.parse(line);
+    if (typeof parsed !== "object" || parsed === null)
+      return [];
+    event = parsed;
+  } catch {
+    return [];
+  }
+  if (event.type !== "message_end" || !event.message)
+    return [];
+  const role = event.message.role;
+  if (role !== "assistant" && role !== "toolResult" && role !== "tool")
+    return [];
+  const usage = modelUsageFromMessage(event.message, fallbackProvider, fallbackModel);
+  return usage ? [usage] : [];
+}
 var SECRET_KEY = /authorization|cookie|password|secret|token|api[-_]?key/i;
 function redactProgressValue(value, key = "") {
   if (SECRET_KEY.test(key))
@@ -1648,6 +1843,7 @@ function createSubagentDelegationClient(spawnWorker = spawn) {
         env: {
           ...process.env,
           PI_WORKFLOWS_CHILD: "1",
+          PI_WORKFLOWS_CHILD_RUNTIME: "1",
           PI_WORKFLOWS_CHILD_AGENT: request.agent
         },
         stdio: ["ignore", "pipe", "pipe"]
@@ -1658,7 +1854,27 @@ function createSubagentDelegationClient(spawnWorker = spawn) {
       let toolCount = 0;
       let responseText = "";
       const diagnostic = createDiagnostic2();
+      let lastProvider;
+      let lastModel;
+      let usage = emptyUsageAggregate();
       const stdoutDecoder = new StringDecoder("utf8");
+      const updateLastModel = (line) => {
+        let event;
+        try {
+          const parsed = JSON.parse(line);
+          if (typeof parsed !== "object" || parsed === null)
+            return;
+          event = parsed;
+        } catch {
+          return;
+        }
+        if (event.type === "message_end" && event.message && event.message.role === "assistant") {
+          if (typeof event.message.provider === "string")
+            lastProvider = event.message.provider;
+          if (typeof event.message.model === "string")
+            lastModel = event.message.model;
+        }
+      };
       const consumeWorkerLines = () => {
         while (true) {
           const newline = stdoutBuffer.indexOf(`
@@ -1668,6 +1884,16 @@ function createSubagentDelegationClient(spawnWorker = spawn) {
           const line = stdoutBuffer.slice(0, newline);
           stdoutBuffer = stdoutBuffer.slice(newline + 1);
           recordWorkerDiagnostic(line, diagnostic);
+          updateLastModel(line);
+          const lineUsage = workerUsageFromJsonLine(line, lastProvider, lastModel);
+          if (lineUsage.length > 0) {
+            usage = mergeUsage(usage, lineUsage);
+            const latest = lineUsage[lineUsage.length - 1];
+            if (latest) {
+              lastProvider = latest.provider;
+              lastModel = latest.model;
+            }
+          }
           const progress = workerProgressFromJsonLine(line, request.requestId, toolCount, responseText);
           toolCount = progress.toolCount;
           responseText = progress.responseText;
@@ -1698,7 +1924,7 @@ function createSubagentDelegationClient(spawnWorker = spawn) {
         if (active?.process === child)
           active = undefined;
         options.signal?.removeEventListener("abort", abort);
-        resolve3(directWorkerResponse(request, code, signal, stderr, diagnosticSnapshot(diagnostic)));
+        resolve3(directWorkerResponse(request, code, signal, stderr, diagnosticSnapshot(diagnostic), usage.models));
       });
     });
   };
@@ -1722,13 +1948,13 @@ function createSubagentDelegationClient(spawnWorker = spawn) {
 }
 
 // src/policy/completion-batch.ts
-var isRecord3 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+var isRecord4 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 var toolCalls = (message) => {
-  if (!isRecord3(message))
+  if (!isRecord4(message))
     return [];
   if (message.role !== "assistant" || !Array.isArray(message.content))
     return [];
-  return message.content.filter((item) => isRecord3(item) && item.type === "toolCall" && typeof item.id === "string" && typeof item.name === "string");
+  return message.content.filter((item) => isRecord4(item) && item.type === "toolCall" && typeof item.id === "string" && typeof item.name === "string");
 };
 function invalidCompletionCallIds(message, completionTool) {
   const calls = toolCalls(message);
@@ -2152,7 +2378,7 @@ var MAX_WORKFLOW_TRACE_CHARS = 2000000;
 var REDACTED = "[redacted]";
 var SECRET_KEY2 = /(?:^|[-_])(authorization|cookie|set-cookie|api[-_]?key|access[-_]?token|refresh[-_]?token|token|secret|password|passwd|credential|private[-_]?key|client[-_]?secret)(?:$|[-_])/i;
 var LABELED_VALUE = /(^|[^A-Za-z0-9_])([A-Za-z0-9_-]*(?:authorization|proxy[-_]?authorization|cookie|set[-_]?cookie|api[-_]?key|access[-_]?token|refresh[-_]?token|client[-_]?secret|private[-_]?key|password|passwd|credential|token|secret)[A-Za-z0-9_-]*)\s*[:=]\s*(?:"[^"]*"|'[^']*'|[^\s,;]+)/gim;
-var isRecord4 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+var isRecord5 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 var sanitizeControls = (value) => {
   let safe = "";
   for (const character of value) {
@@ -2178,7 +2404,7 @@ var redactStructured = (value, depth = 0) => {
   if (Array.isArray(value)) {
     return value.map((item) => redactStructured(item, depth + 1));
   }
-  if (!isRecord4(value)) {
+  if (!isRecord5(value)) {
     return typeof value === "string" ? sanitizeStepLogText(value) : value;
   }
   return Object.fromEntries(Object.entries(value).map(([key, item]) => [
@@ -2208,7 +2434,7 @@ var contentText = (content) => {
   if (!Array.isArray(content))
     return "";
   return content.flatMap((item) => {
-    if (!isRecord4(item))
+    if (!isRecord5(item))
       return [];
     if (item.type === "text" && typeof item.text === "string") {
       return [item.text];
@@ -2222,24 +2448,24 @@ var contentText = (content) => {
 `);
 };
 function textOnlyUserMessage(message) {
-  if (!isRecord4(message) || message.role !== "user")
+  if (!isRecord5(message) || message.role !== "user")
     return;
   if (typeof message.content === "string")
     return message.content;
-  if (!Array.isArray(message.content) || message.content.some((item) => !isRecord4(item) || item.type !== "text" || typeof item.text !== "string")) {
+  if (!Array.isArray(message.content) || message.content.some((item) => !isRecord5(item) || item.type !== "text" || typeof item.text !== "string")) {
     return;
   }
   return message.content.map((item) => item.text).join(`
 `);
 }
 function stepLogLinesFromMessage(message) {
-  if (!isRecord4(message))
+  if (!isRecord5(message))
     return [];
   if (message.role === "assistant") {
     if (!Array.isArray(message.content))
       return [];
     const contentLines = message.content.flatMap((item) => {
-      if (!isRecord4(item))
+      if (!isRecord5(item))
         return [];
       if (item.type === "text" && typeof item.text === "string") {
         const text = redactStepLogText(item.text);
@@ -2275,6 +2501,19 @@ function stepLogLinesFromTurn(message, toolResults) {
 }
 
 // src/runtime/main-step-trace.ts
+var isRecord6 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+function mainTurnUsage(event) {
+  const messageUsage = modelUsageFromMessage(event.message);
+  const fallbackProvider = messageUsage?.provider ?? (isRecord6(event.message) && typeof event.message.provider === "string" ? event.message.provider : undefined);
+  const fallbackModel = messageUsage?.model ?? (isRecord6(event.message) && typeof event.message.model === "string" ? event.message.model : undefined);
+  const entries = messageUsage ? [messageUsage] : [];
+  for (const toolResult of event.toolResults ?? []) {
+    const toolUsage = modelUsageFromMessage(toolResult, fallbackProvider, fallbackModel);
+    if (toolUsage)
+      entries.push(toolUsage);
+  }
+  return entries;
+}
 function armMainStepTrace(state, message) {
   if (!state.active || state.traceArmed || state.traceClosed)
     return;
@@ -2292,8 +2531,9 @@ function registerMainStepTrace({
       return;
     const lines = stepLogLinesFromTurn(event.message, event.toolResults);
     try {
-      if (lines.length > 0)
-        await active.onTrace(lines, context);
+      const usage = mainTurnUsage(event);
+      if (lines.length > 0 || usage.length > 0)
+        await active.onTrace(lines, context, usage);
     } catch {} finally {
       if (state.active === active && state.pendingResult) {
         state.traceClosed = true;
@@ -2691,6 +2931,31 @@ function padAnsi(value, width) {
 
 // src/workflow-status/render-path.ts
 import { truncateToWidth as truncateToWidth2 } from "@earendil-works/pi-tui";
+
+// src/workflow-status/format-usage.ts
+function workflowUsage(run) {
+  return [
+    ...run.history.map((entry) => entry.usage),
+    run.currentStepUsage
+  ].reduce((total, usage) => usage ? mergeUsage(total, usage.models) : total, emptyUsageAggregate());
+}
+function formatUsd(value) {
+  if (value === 0)
+    return "$0.00";
+  return value < 0.01 ? `$${value.toFixed(4)}` : `$${value.toFixed(2)}`;
+}
+function formatTokens(usage) {
+  const parts = [`${usage.inputTokens} in`, `${usage.outputTokens} out`];
+  const cache = usage.cacheReadTokens + usage.cacheWriteTokens;
+  if (cache > 0)
+    parts.push(`${cache} cache`);
+  return parts.join(" · ");
+}
+function formatUsage(usage) {
+  return `${formatUsd(usage.usage.totalCostUsd)} · ${formatTokens(usage.usage)}`;
+}
+
+// src/workflow-status/render-path.ts
 var MAX_PATH_ROWS = 16;
 function historyPathEntry(workflow, entry, visit, index) {
   return {
@@ -2701,6 +2966,7 @@ function historyPathEntry(workflow, entry, visit, index) {
     status: "completed",
     visit,
     outcome: entry.outcome,
+    ...entry.usage ? { usage: entry.usage } : {},
     isCurrent: false
   };
 }
@@ -2721,6 +2987,7 @@ function buildPathEntries(snapshot) {
         title: stepTitle(workflow, run.currentStepId),
         status: runDisplayStatus(run),
         visit: Math.max(visits.get(run.currentStepId) ?? 0, run.visits[run.currentStepId] ?? 1),
+        ...run.currentStepUsage ? { usage: run.currentStepUsage } : {},
         isCurrent: true
       }
     ];
@@ -2734,6 +3001,7 @@ function buildPathEntries(snapshot) {
         title: stepTitle(workflow, run.currentStepId),
         status: "completed",
         visit: Math.max(1, run.visits[run.currentStepId] ?? 1),
+        ...run.currentStepUsage ? { usage: run.currentStepUsage } : {},
         isCurrent: true
       }
     ];
@@ -2756,7 +3024,8 @@ function renderPathLines(theme, snapshot, width, selectedIndex) {
   const visibleRows = entries.slice(windowStart, windowStart + MAX_PATH_ROWS).map((entry) => {
     const visit = entry.visit > 1 ? theme.fg("dim", ` · visit ${entry.visit}`) : "";
     const left = `${statusGlyph(theme, entry.status, snapshot.now)} ${theme.fg(entry.isCurrent ? "text" : "muted", entry.title)}${visit}`;
-    const right = entry.outcome ? `${statusLabel(entry.status)} · ${inline(entry.outcome)}` : statusLabel(entry.status);
+    const cost = entry.usage?.models.length ? ` · ${formatUsd(entry.usage.usage.totalCostUsd)}` : "";
+    const right = entry.outcome ? `${statusLabel(entry.status)} · ${inline(entry.outcome)}${cost}` : `${statusLabel(entry.status)}${cost}`;
     const row = joinColumns(left, theme.fg(statusColor(entry.status), right), width, Math.max(12, Math.floor(width * 0.58)));
     return entry.index === selection ? theme.bg("selectedBg", padAnsi(row, width)) : truncateToWidth2(row, width);
   });
@@ -2808,6 +3077,11 @@ function renderSummaryLines(theme, snapshot, width) {
     ...keyValueLines(theme, "started", formatTimestamp(run.startedAt), width),
     ...keyValueLines(theme, "updated", `${formatTimestamp(run.updatedAt)} · ${formatElapsed(elapsedMs(snapshot))}`, width)
   ];
+  const usage = workflowUsage(run);
+  if (usage.models.length > 0) {
+    lines.push(...keyValueLines(theme, "usage", formatUsage(usage), width));
+    lines.push(...usage.models.flatMap((entry) => keyValueLines(theme, "model", `${entry.provider}/${entry.model} · ${formatUsage({ usage: entry.usage, models: [] })}`, width, "muted")));
+  }
   if (run.cwd && run.startCwd && run.cwd !== run.startCwd) {
     lines.push(...keyValueLines(theme, "workspace", run.cwd, width, "accent"));
   }
@@ -2870,8 +3144,11 @@ function formatWorkflowProgressStatus(snapshot, statusShortcutLabel) {
   const { run, workflow } = snapshot;
   const currentStep = formatStepName(stepTitle(workflow, run.currentStepId), run.currentStepId);
   const activity = run.status === "awaiting-gate" ? "awaiting review" : "working";
+  const workerModel = snapshot.execution?.kind === "subagent" && snapshot.execution.model ? ` · model ${snapshot.execution.model}` : "";
   const workerProgress = snapshot.execution?.kind === "subagent" ? ` · ${snapshot.execution.progress}` : "";
-  return `${workflowStatusIcon(run, snapshot.now)} ${run.workflowId} · step ${currentStep} · ${activity}${workerProgress} · ${statusShortcutLabel}`;
+  const usage = workflowUsage(run);
+  const usageText = usage.models.length > 0 ? ` · ${formatUsage(usage)}` : "";
+  return `${workflowStatusIcon(run, snapshot.now)} ${run.workflowId} · step ${currentStep} · ${activity}${workerModel}${workerProgress}${usageText} · ${statusShortcutLabel}`;
 }
 // src/workflow-status/view.ts
 import {
@@ -2998,6 +3275,10 @@ function renderAttempt(theme, snapshot, attempt, attemptNumber, cache, width) {
   return [
     theme.bold(theme.fg("accent", `Attempt ${attemptNumber} · ${actor}`)),
     ...keyValueLines(theme, "request", attempt.requestId, width, "muted"),
+    ...attempt.usage ? [
+      ...keyValueLines(theme, "usage", formatUsage(attempt.usage), width),
+      ...attempt.usage.models.flatMap((entry) => keyValueLines(theme, "model", `${entry.provider}/${entry.model} · ${formatUsage({ usage: entry.usage, models: [] })}`, width, "muted"))
+    ] : [],
     "",
     theme.bold("Requirement fed to the agent"),
     ...wrapPlain(`${attempt.task}${truncation}`, width, theme),
@@ -3035,6 +3316,7 @@ function renderLiveWorkerSession(theme, snapshot, detail, width) {
     "",
     theme.bold(theme.fg("accent", "Live Worker Session")),
     ...keyValueLines(theme, "worker", snapshot.execution.agent, width, "accent"),
+    ...snapshot.execution.model ? keyValueLines(theme, "model", snapshot.execution.model, width, "muted") : [],
     ...keyValueLines(theme, "state", snapshot.execution.progress, width, "accent"),
     "",
     theme.bold(theme.fg("accent", "● Input prompt")),
@@ -3076,6 +3358,10 @@ function renderStepDetail(theme, snapshot, selectedIndex, cache, width) {
     ...keyValueLines(theme, "step", entry.stepId, width),
     ...keyValueLines(theme, "visit", String(entry.visit), width),
     ...keyValueLines(theme, "status", entry.status, width),
+    ...entry.usage ? [
+      ...keyValueLines(theme, "usage", formatUsage(entry.usage), width),
+      ...entry.usage.models.flatMap((model) => keyValueLines(theme, "model", `${model.provider}/${model.model} · ${formatUsage({ usage: model.usage, models: [] })}`, width, "muted"))
+    ] : [],
     ...history ? [
       ...keyValueLines(theme, "outcome", history.outcome, width, "success"),
       ...keyValueLines(theme, "summary", history.summary, width)
@@ -3143,7 +3429,7 @@ function logChars(lines) {
   return lines?.reduce((total, line) => total + line.length, 0) ?? 0;
 }
 function attemptSize(attempt) {
-  return attempt.requestId.length + attempt.task.length + (attempt.kind === "subagent" ? attempt.agent.length : 0) + (attempt.kind === "main" ? logChars(attempt.log) : 0) + (attempt.result?.outcome.length ?? 0) + (attempt.result?.summary.length ?? 0) + (attempt.result?.artifact?.length ?? 0) + (attempt.result?.workspaceCwd?.length ?? 0) + (attempt.kind === "subagent" ? (attempt.transcript?.trustedRoot.length ?? 0) + (attempt.transcript?.sessionFile.length ?? 0) + (attempt.transcript?.runId.length ?? 0) : 0) + (attempt.gateDecision?.requestId.length ?? 0) + (attempt.gateDecision?.feedback.length ?? 0) + (attempt.gateDecision?.reviewId?.length ?? 0);
+  return attempt.requestId.length + attempt.task.length + (attempt.kind === "subagent" ? attempt.agent.length : 0) + (attempt.kind === "main" ? logChars(attempt.log) : 0) + (attempt.result?.outcome.length ?? 0) + (attempt.result?.summary.length ?? 0) + (attempt.result?.artifact?.length ?? 0) + (attempt.result?.workspaceCwd?.length ?? 0) + (attempt.kind === "subagent" ? (attempt.transcript?.trustedRoot.length ?? 0) + (attempt.transcript?.sessionFile.length ?? 0) + (attempt.transcript?.runId.length ?? 0) : 0) + (attempt.gateDecision?.requestId.length ?? 0) + (attempt.gateDecision?.feedback.length ?? 0) + (attempt.gateDecision?.reviewId?.length ?? 0) + (attempt.usage ? JSON.stringify(attempt.usage).length : 0);
 }
 function compactMainLog(attempt) {
   if (attempt.kind !== "main" || !attempt.log)
@@ -3194,10 +3480,15 @@ function compactAttempt(attempt) {
   };
 }
 function workflowTraceChars(run) {
-  return [
+  const attempts = [
     ...run.history.flatMap((entry) => entry.attempts ?? []),
     ...run.currentStepAttempts ?? []
   ].reduce((total, attempt) => total + attemptSize(attempt), 0);
+  const aggregates = [
+    ...run.history.map((entry) => entry.usage),
+    run.currentStepUsage
+  ].reduce((total, usage) => total + (usage ? JSON.stringify(usage).length : 0), 0);
+  return attempts + aggregates;
 }
 function compactRunTraceBudget(run) {
   let remaining = workflowTraceChars(run);
@@ -3381,6 +3672,29 @@ function attemptResult(result, workspaceCwd) {
     ...workspaceCwd ? { workspaceCwd } : {}
   };
 }
+function recordCurrentStepUsage(run, requestId, usage, now) {
+  const attempts = run.currentStepAttempts;
+  const index = attempts?.findIndex((attempt2) => attempt2.requestId === requestId);
+  if (index === undefined || index < 0 || !attempts)
+    return run;
+  const attempt = attempts[index];
+  if (!attempt)
+    return run;
+  const currentStepAttempts = [...attempts];
+  currentStepAttempts[index] = {
+    ...attempt,
+    usage: mergeUsage(attempt.usage ?? emptyUsageAggregate(), usage.models)
+  };
+  return compactRunTraceBudget({
+    ...run,
+    currentStepAttempts,
+    currentStepUsage: mergeUsage(run.currentStepUsage ?? emptyUsageAggregate(), usage.models),
+    updatedAt: now
+  });
+}
+function usageAggregateFromModels(entries) {
+  return mergeUsage(emptyUsageAggregate(), entries);
+}
 function recordCurrentStepResult(run, result, now, workspaceCwd) {
   const attempts = run.currentStepAttempts;
   if (!attempts || attempts.length === 0)
@@ -3426,11 +3740,11 @@ function recordCurrentGateDecision(run, decision, now) {
 }
 
 // src/engine/run-validation.ts
-var isRecord5 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+var isRecord7 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 var isAbsoluteCwd = (value) => typeof value === "string" && value.length > 0 && isAbsolute4(value) && !value.includes("\x00");
-var isGateApproval = (value) => isRecord5(value) && typeof value.requestId === "string" && value.requestId.length > 0 && typeof value.artifact === "string" && value.artifact.trim().length > 0 && typeof value.feedback === "string" && value.feedback.length <= MAX_GATE_FEEDBACK_CHARS && typeof value.stepStructuralDigest === "string" && value.stepStructuralDigest.length > 0;
-var isStepAttemptResult = (value) => isRecord5(value) && typeof value.outcome === "string" && typeof value.summary === "string" && value.summary.length <= MAX_STEP_TRACE_SUMMARY_CHARS && (value.summaryTruncated === undefined || value.summaryTruncated === true) && (value.artifact === undefined || typeof value.artifact === "string") && (typeof value.artifact !== "string" || value.artifact.length <= MAX_STEP_TRACE_ARTIFACT_CHARS) && (value.artifactTruncated === undefined || value.artifactTruncated === true) && !(value.artifactTruncated === true && value.artifact === undefined) && (value.workspaceCwd === undefined || isAbsoluteCwd(value.workspaceCwd));
-var isStepGateDecision = (value) => isRecord5(value) && (value.provider === "prompt" || value.provider === "plannotator") && typeof value.requestId === "string" && value.requestId.length > 0 && typeof value.approved === "boolean" && typeof value.feedback === "string" && value.feedback.length <= MAX_STEP_TRACE_SUMMARY_CHARS && (value.feedbackTruncated === undefined || value.feedbackTruncated === true) && typeof value.resolvedAt === "number" && (value.reviewId === undefined || typeof value.reviewId === "string");
+var isGateApproval = (value) => isRecord7(value) && typeof value.requestId === "string" && value.requestId.length > 0 && typeof value.artifact === "string" && value.artifact.trim().length > 0 && typeof value.feedback === "string" && value.feedback.length <= MAX_GATE_FEEDBACK_CHARS && typeof value.stepStructuralDigest === "string" && value.stepStructuralDigest.length > 0;
+var isStepAttemptResult = (value) => isRecord7(value) && typeof value.outcome === "string" && typeof value.summary === "string" && value.summary.length <= MAX_STEP_TRACE_SUMMARY_CHARS && (value.summaryTruncated === undefined || value.summaryTruncated === true) && (value.artifact === undefined || typeof value.artifact === "string") && (typeof value.artifact !== "string" || value.artifact.length <= MAX_STEP_TRACE_ARTIFACT_CHARS) && (value.artifactTruncated === undefined || value.artifactTruncated === true) && !(value.artifactTruncated === true && value.artifact === undefined) && (value.workspaceCwd === undefined || isAbsoluteCwd(value.workspaceCwd));
+var isStepGateDecision = (value) => isRecord7(value) && (value.provider === "prompt" || value.provider === "plannotator") && typeof value.requestId === "string" && value.requestId.length > 0 && typeof value.approved === "boolean" && typeof value.feedback === "string" && value.feedback.length <= MAX_STEP_TRACE_SUMMARY_CHARS && (value.feedbackTruncated === undefined || value.feedbackTruncated === true) && typeof value.resolvedAt === "number" && (value.reviewId === undefined || typeof value.reviewId === "string");
 var isSafeTraceIdentityField = (value) => typeof value === "string" && value.length > 0 && !value.includes("\x00") && !value.includes("/") && !value.includes("\\") && value !== "." && value !== "..";
 var hasValidMainStepLog = (value) => {
   const log = value.log;
@@ -3446,7 +3760,7 @@ var hasValidMainStepLog = (value) => {
   return value.logTruncated === true === (typeof value.omittedLogEvents === "number") && !(log === undefined && (value.logTruncated !== undefined || value.omittedLogEvents !== undefined));
 };
 var isStepExecutionAttempt = (value) => {
-  if (!isRecord5(value) || value.kind !== "main" && value.kind !== "subagent" || typeof value.requestId !== "string" || value.requestId.length === 0 || value.requestId.includes("\x00") || value.ordinal !== undefined && (!Number.isSafeInteger(value.ordinal) || value.ordinal <= 0) || typeof value.task !== "string" || value.task.trim().length === 0 || value.task.length > MAX_STEP_TRACE_TASK_CHARS || value.taskTruncated !== undefined && value.taskTruncated !== true || value.omittedTaskChars !== undefined && (!Number.isSafeInteger(value.omittedTaskChars) || value.omittedTaskChars <= 0) || value.taskTruncated === true !== (typeof value.omittedTaskChars === "number") || typeof value.startedAt !== "number" || value.result !== undefined && !isStepAttemptResult(value.result) || value.gateDecision !== undefined && !isStepGateDecision(value.gateDecision)) {
+  if (!isRecord7(value) || value.kind !== "main" && value.kind !== "subagent" || typeof value.requestId !== "string" || value.requestId.length === 0 || value.requestId.includes("\x00") || value.ordinal !== undefined && (!Number.isSafeInteger(value.ordinal) || value.ordinal <= 0) || typeof value.task !== "string" || value.task.trim().length === 0 || value.task.length > MAX_STEP_TRACE_TASK_CHARS || value.taskTruncated !== undefined && value.taskTruncated !== true || value.omittedTaskChars !== undefined && (!Number.isSafeInteger(value.omittedTaskChars) || value.omittedTaskChars <= 0) || value.taskTruncated === true !== (typeof value.omittedTaskChars === "number") || typeof value.startedAt !== "number" || value.usage !== undefined && !isUsageAggregate(value.usage) || value.result !== undefined && !isStepAttemptResult(value.result) || value.gateDecision !== undefined && !isStepGateDecision(value.gateDecision)) {
     return false;
   }
   if (value.kind === "main") {
@@ -3460,7 +3774,7 @@ var isStepExecutionAttempt = (value) => {
   }
   if (value.transcript === undefined)
     return true;
-  if (!isRecord5(value.transcript))
+  if (!isRecord7(value.transcript))
     return false;
   const transcript = value.transcript;
   if (!isAbsoluteCwd(transcript.trustedRoot) || !isAbsoluteCwd(transcript.sessionFile) || !isSafeTraceIdentityField(transcript.runId) || !Number.isSafeInteger(transcript.childIndex) || transcript.childIndex < 0) {
@@ -3474,10 +3788,16 @@ var isStepExecutionAttempts = (value) => Array.isArray(value) && value.length <=
   const ordinal = attempt.ordinal;
   return value.slice(0, index).every((earlier) => earlier.ordinal === undefined || earlier.ordinal < ordinal);
 });
-var isStepHistoryEntry = (value) => isRecord5(value) && typeof value.stepId === "string" && typeof value.stepDigest === "string" && typeof value.outcome === "string" && typeof value.summary === "string" && (value.workspaceCwd === undefined || isAbsoluteCwd(value.workspaceCwd)) && (value.artifact === undefined || typeof value.artifact === "string") && (value.approval === undefined || isGateApproval(value.approval) && value.artifact === value.approval.artifact) && (value.attempts === undefined || isStepExecutionAttempts(value.attempts)) && (value.omittedAttempts === undefined || Number.isSafeInteger(value.omittedAttempts) && value.omittedAttempts > 0) && typeof value.completedAt === "number";
-var isGateResolution = (value) => isRecord5(value) && typeof value.approved === "boolean" && typeof value.feedback === "string" && value.feedback.length <= MAX_GATE_FEEDBACK_CHARS && typeof value.resolvedAt === "number";
-var isPendingGate = (value) => isRecord5(value) && (value.provider === "prompt" || value.provider === "plannotator") && typeof value.requestId === "string" && value.requestId.length > 0 && typeof value.stepId === "string" && typeof value.artifact === "string" && (value.summary === undefined || typeof value.summary === "string") && typeof value.submittedOutcome === "string" && typeof value.requestedAt === "number" && (value.reviewId === undefined || typeof value.reviewId === "string") && (value.resolution === undefined || isGateResolution(value.resolution));
-var isVisitCounts = (value) => isRecord5(value) && Object.values(value).every((count) => typeof count === "number" && Number.isInteger(count) && count >= 0);
+var usageMatchesAttempts = (attempts, aggregate, omittedAttempts) => {
+  if (!aggregate || omittedAttempts !== undefined)
+    return true;
+  const fromAttempts = (attempts ?? []).reduce((total, attempt) => attempt.usage ? mergeUsage(total, attempt.usage.models) : total, emptyUsageAggregate());
+  return JSON.stringify(fromAttempts) === JSON.stringify(aggregate);
+};
+var isStepHistoryEntry = (value) => isRecord7(value) && typeof value.stepId === "string" && typeof value.stepDigest === "string" && typeof value.outcome === "string" && typeof value.summary === "string" && (value.workspaceCwd === undefined || isAbsoluteCwd(value.workspaceCwd)) && (value.artifact === undefined || typeof value.artifact === "string") && (value.approval === undefined || isGateApproval(value.approval) && value.artifact === value.approval.artifact) && (value.attempts === undefined || isStepExecutionAttempts(value.attempts)) && (value.omittedAttempts === undefined || typeof value.omittedAttempts === "number" && Number.isSafeInteger(value.omittedAttempts) && value.omittedAttempts > 0) && (value.usage === undefined || isUsageAggregate(value.usage)) && usageMatchesAttempts(value.attempts, value.usage, value.omittedAttempts) && typeof value.completedAt === "number";
+var isGateResolution = (value) => isRecord7(value) && typeof value.approved === "boolean" && typeof value.feedback === "string" && value.feedback.length <= MAX_GATE_FEEDBACK_CHARS && typeof value.resolvedAt === "number";
+var isPendingGate = (value) => isRecord7(value) && (value.provider === "prompt" || value.provider === "plannotator") && typeof value.requestId === "string" && value.requestId.length > 0 && typeof value.stepId === "string" && typeof value.artifact === "string" && (value.summary === undefined || typeof value.summary === "string") && typeof value.submittedOutcome === "string" && typeof value.requestedAt === "number" && (value.reviewId === undefined || typeof value.reviewId === "string") && (value.resolution === undefined || isGateResolution(value.resolution));
+var isVisitCounts = (value) => isRecord7(value) && Object.values(value).every((count) => typeof count === "number" && Number.isInteger(count) && count >= 0);
 var isOptionalString = (value) => value === undefined || typeof value === "string";
 var isOptionalResumeInput = (value) => value === undefined || typeof value === "string" && value.length <= MAX_RESUME_INPUT_CHARS;
 var isOptionalIteration = (value) => value === undefined || Number.isSafeInteger(value) && value >= 1;
@@ -3502,14 +3822,16 @@ var hasValidWorkspaceState = (run, history) => {
   return startCwd === undefined || cwd === startCwd;
 };
 var isWorkflowRun = (value) => {
-  if (!isRecord5(value))
+  if (!isRecord7(value))
     return false;
-  const hasValidRequiredFields = value.stateVersion === RUN_STATE_VERSION && typeof value.runId === "string" && typeof value.workflowId === "string" && typeof value.workflowDigest === "string" && typeof value.input === "string" && isWorkflowRunStatus(value.status) && typeof value.currentStepId === "string" && typeof value.currentStepDigest === "string" && Array.isArray(value.baselineTools) && value.baselineTools.every((tool) => typeof tool === "string") && Array.isArray(value.history) && value.history.every(isStepHistoryEntry) && (value.currentStepAttempts === undefined || isStepExecutionAttempts(value.currentStepAttempts)) && (value.currentStepOmittedAttempts === undefined || Number.isSafeInteger(value.currentStepOmittedAttempts) && value.currentStepOmittedAttempts > 0) && isVisitCounts(value.visits) && typeof value.startedAt === "number" && typeof value.updatedAt === "number" && typeof value.lastSummary === "string" && typeof value.gateFeedback === "string" && value.gateFeedback.length <= MAX_GATE_FEEDBACK_CHARS;
+  const hasValidRequiredFields = value.stateVersion === RUN_STATE_VERSION && typeof value.runId === "string" && typeof value.workflowId === "string" && typeof value.workflowDigest === "string" && typeof value.input === "string" && isWorkflowRunStatus(value.status) && typeof value.currentStepId === "string" && typeof value.currentStepDigest === "string" && Array.isArray(value.baselineTools) && value.baselineTools.every((tool) => typeof tool === "string") && Array.isArray(value.history) && value.history.every(isStepHistoryEntry) && (value.currentStepAttempts === undefined || isStepExecutionAttempts(value.currentStepAttempts)) && (value.currentStepOmittedAttempts === undefined || Number.isSafeInteger(value.currentStepOmittedAttempts) && value.currentStepOmittedAttempts > 0) && (value.currentStepUsage === undefined || isUsageAggregate(value.currentStepUsage)) && isVisitCounts(value.visits) && typeof value.startedAt === "number" && typeof value.updatedAt === "number" && typeof value.lastSummary === "string" && typeof value.gateFeedback === "string" && value.gateFeedback.length <= MAX_GATE_FEEDBACK_CHARS;
   if (!hasValidRequiredFields)
     return false;
   const hasValidOptionalFields = isOptionalIteration(value.iteration) && isOptionalString(value.reviewedArtifact) && isOptionalString(value.reviewedFeedback) && (typeof value.reviewedFeedback !== "string" || value.reviewedFeedback.length <= MAX_GATE_FEEDBACK_CHARS) && isOptionalString(value.stepHandoff) && isOptionalString(value.gateArtifact) && (value.restartWorkspaceCwd === undefined || isAbsoluteCwd(value.restartWorkspaceCwd)) && isOptionalResumeInput(value.resumeInput) && isOptionalString(value.pauseReason) && isOptionalString(value.failedStepId) && (value.pausedFrom === undefined || value.pausedFrom === "running" || value.pausedFrom === "awaiting-gate");
   if (!hasValidOptionalFields)
     return false;
+  if (!usageMatchesAttempts(value.currentStepAttempts, value.currentStepUsage, value.currentStepOmittedAttempts))
+    return false;
   const pendingGate = value.pendingGate;
   if (pendingGate !== undefined && !isPendingGate(pendingGate))
     return false;
@@ -3520,7 +3842,7 @@ var isWorkflowRun = (value) => {
 };
 // src/workflow-status/transcript-reader.ts
 var MAX_TRANSCRIPT_BYTES = 2 * 1024 * 1024;
-function isRecord6(value) {
+function isRecord8(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function isWithin(root, candidate) {
@@ -3531,7 +3853,7 @@ function hasSafeIdentity(reference) {
   return isAbsolute5(reference.trustedRoot) && isAbsolute5(reference.sessionFile) && !reference.trustedRoot.includes("\x00") && !reference.sessionFile.includes("\x00") && reference.runId.length > 0 && !reference.runId.includes("\x00") && !reference.runId.includes("/") && !reference.runId.includes("\\") && reference.runId !== "." && reference.runId !== ".." && Number.isSafeInteger(reference.childIndex) && reference.childIndex >= 0 && resolve4(reference.sessionFile) === resolve4(reference.trustedRoot, reference.runId, `run-${reference.childIndex}`, "session.jsonl");
 }
 function transcriptEntryLines(entry) {
-  if (!isRecord6(entry))
+  if (!isRecord8(entry))
     return [];
   if (entry.type === "custom_message") {
     const customType = typeof entry.customType === "string" ? entry.customType : "custom";
@@ -3539,7 +3861,7 @@ function transcriptEntryLines(entry) {
     return content ? [`event ${sanitizeStepLogText(customType)}
 ${content}`] : [];
   }
-  if (entry.type !== "message" || !isRecord6(entry.message))
+  if (entry.type !== "message" || !isRecord8(entry.message))
     return [];
   return stepLogLinesFromMessage(entry.message);
 }
@@ -4102,7 +4424,8 @@ function workflowStatusSnapshot() {
       agent: this.activeDelegation.agent,
       requestId: this.activeDelegation.requestId,
       progress: this.activeDelegation.progress ?? "starting",
-      activityLog: this.activeDelegation.activityLog ?? []
+      activityLog: this.activeDelegation.activityLog ?? [],
+      ...this.activeDelegation.model ? { model: this.activeDelegation.model } : {}
     };
   } else if (this.mainSteps.activeStepId) {
     execution = { kind: "main" };
@@ -4215,6 +4538,7 @@ var completedStep = (run, outcome, summary, now, effects) => ({
   ...effects.workspaceCwd ? { workspaceCwd: effects.workspaceCwd } : {},
   ...run.currentStepAttempts?.length ? { attempts: run.currentStepAttempts } : {},
   ...run.currentStepOmittedAttempts ? { omittedAttempts: run.currentStepOmittedAttempts } : {},
+  ...run.currentStepUsage ? { usage: run.currentStepUsage } : {},
   completedAt: now
 });
 var advanceRun = (workflow, run, outcome, summary, now, effects = {}, options = {}) => {
@@ -4259,6 +4583,7 @@ var advanceRun = (workflow, run, outcome, summary, now, effects = {}, options =
       history: [...run.history, completed],
       currentStepAttempts: undefined,
       currentStepOmittedAttempts: undefined,
+      currentStepUsage: undefined,
       ...cwd ? { cwd } : {},
       ...effects.workspaceCwd ? { restartWorkspaceCwd: undefined } : {},
       stepHandoff: summary,
@@ -4295,6 +4620,7 @@ var advanceRun = (workflow, run, outcome, summary, now, effects = {}, options =
     history: [...run.history, completed],
     currentStepAttempts: undefined,
     currentStepOmittedAttempts: undefined,
+    currentStepUsage: undefined,
     ...cwd ? { cwd } : {},
     ...effects.workspaceCwd ? { restartWorkspaceCwd: undefined } : {},
     stepHandoff: preservesGateRevisionContext ? run.stepHandoff : summary,
@@ -4745,6 +5071,7 @@ var reconcileRun = (run, workflow, now) => {
         history: retainedHistory,
         currentStepAttempts: changedEntry.attempts,
         currentStepOmittedAttempts: changedEntry.omittedAttempts,
+        currentStepUsage: changedEntry.usage,
         visits: rebuildVisits(retainedHistory, restartedStep),
         cwd: retainedWorkspaceCwd(reconciledRun, retainedHistory),
         reviewedArtifact: reviewedApproval?.artifact ?? "",
@@ -5522,7 +5849,7 @@ var THINKING_LEVELS = [
   "xhigh",
   "max"
 ];
-var isRecord7 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+var isRecord9 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 function parseAgentProfile(source, name) {
   if (!source.startsWith(`---
 `))
@@ -5534,7 +5861,7 @@ function parseAgentProfile(source, name) {
     throw new Error(`workflow agent profile is invalid: ${name}`);
   }
   const metadata = parse(source.slice(4, end));
-  if (!isRecord7(metadata)) {
+  if (!isRecord9(metadata)) {
     throw new Error(`workflow agent profile metadata must be an object: ${name}`);
   }
   const unknownKey = Object.keys(metadata).find((key) => key !== "model" && key !== "thinking");
@@ -5973,16 +6300,16 @@ import { dirname as dirname3, isAbsolute as isAbsolute8, resolve as resolve7 } f
 
 // src/integrations/subagents/child-policy-sections.ts
 import { isAbsolute as isAbsolute7, win32 as win323 } from "node:path";
-var isRecord8 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+var isRecord10 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 var isStringArray = (value) => Array.isArray(value) && value.every((item) => typeof item === "string");
 var hasOnlyKeys = (value, allowed) => Object.keys(value).every((key) => allowed.has(key));
 var isStepPermissions = (value) => {
-  if (!isRecord8(value) || !isRecord8(value.bash))
+  if (!isRecord10(value) || !isRecord10(value.bash))
     return false;
   const bash = value.bash;
   const bashRules = Array.isArray(bash.allow) ? bash.allow : undefined;
   const isValidMode = bash.mode === "deny" || bash.mode === "allow-list" || bash.mode === "unrestricted";
-  const hasValidRules = bashRules !== undefined && bashRules.every((rule) => isRecord8(rule) && hasOnlyKeys(rule, new Set(["executable", "argsPrefix"])) && typeof rule.executable === "string" && isStringArray(rule.argsPrefix));
+  const hasValidRules = bashRules !== undefined && bashRules.every((rule) => isRecord10(rule) && hasOnlyKeys(rule, new Set(["executable", "argsPrefix"])) && typeof rule.executable === "string" && isStringArray(rule.argsPrefix));
   return hasOnlyKeys(value, new Set(["tools", "mcp", "extensions", "skills", "bash"])) && hasOnlyKeys(bash, new Set(["mode", "allow"])) && isStringArray(value.tools) && isStringArray(value.mcp) && isStringArray(value.extensions) && isStringArray(value.skills) && isValidMode && hasValidRules && (bash.mode !== "allow-list" || bashRules.length > 0);
 };
 var parsePermissions2 = (value) => {
@@ -6018,7 +6345,7 @@ var parseOutcomes = (value) => {
 var parseWorkspace2 = (value, outcomes) => {
   if (value.workspace === undefined)
     return {};
-  if (!isRecord8(value.workspace) || !hasOnlyKeys(value.workspace, new Set(["bindOn", "allowedRoots"]))) {
+  if (!isRecord10(value.workspace) || !hasOnlyKeys(value.workspace, new Set(["bindOn", "allowedRoots"]))) {
     throw new Error("child policy workspace is invalid");
   }
   const bindOn = value.workspace.bindOn;
@@ -6063,7 +6390,7 @@ var POLICY_KEYS = new Set([
   "gateSubmitOutcome",
   "workspace"
 ]);
-var isRecord9 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+var isRecord11 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 var requiredString = (value, field) => {
   const candidate = value[field];
   if (typeof candidate !== "string" || !candidate) {
@@ -6129,7 +6456,7 @@ var parseIdentityAndPaths = (value, environment) => {
   };
 };
 var parseChildPolicy = (value, environment = DEFAULT_CHILD_POLICY_ENVIRONMENT) => {
-  if (!isRecord9(value))
+  if (!isRecord11(value))
     throw new Error("child policy must be an object");
   rejectUnknownProperties(value);
   return {
@@ -6369,7 +6696,8 @@ function createDelegationPlan(input, dependencies) {
     resultDirectory: workspace.resultDirectory,
     policy,
     transcriptTask: task,
-    agent
+    agent,
+    ...agentProfile.model ? { model: agentProfile.model } : {}
   };
   const request = {
     version: 1,
@@ -6525,7 +6853,7 @@ function launchMainStep(workflow, run, step) {
     summaryMaxChars: workflow.definition.summaryMaxChars,
     ...step.gate ? { gateSubmitOutcome: step.gate.submitOutcome } : {},
     ...step.workspace ? { workspace: structuredClone(step.workspace) } : {},
-    onTrace: (lines, context) => this.queueMainStepLog(identity, lines, context),
+    onTrace: (lines, context, usage) => this.queueMainStepLog(identity, lines, context, usage),
     onSettled: (result, context) => this.queueMainStepResult(identity, result, context)
   };
   try {
@@ -6551,10 +6879,10 @@ function matchesLatestMainStepAttempt(run, identity) {
   const attempt = run.currentStepAttempts?.at(-1);
   return attempt === undefined || attempt.kind === "main" && attempt.requestId === identity.requestId;
 }
-function queueMainStepLog(identity, lines, context) {
-  return this.mutationQueue.run(() => this.recordMainStepLog(identity, lines, context)).catch(() => {});
+function queueMainStepLog(identity, lines, context, usage) {
+  return this.mutationQueue.run(() => this.recordMainStepLog(identity, lines, context, usage)).catch(() => {});
 }
-async function recordMainStepLog(identity, lines, context) {
+async function recordMainStepLog(identity, lines, context, usage) {
   if (!hasCurrentMainStepIdentity(this, identity) || !matchesLatestMainStepAttempt(this.run, identity)) {
     return;
   }
@@ -6563,7 +6891,10 @@ async function recordMainStepLog(identity, lines, context) {
     return;
   }
   this.latestContext = context;
-  const traced = appendMainStepLog(this.run, identity.requestId, lines, this.dependencies.now());
+  let traced = appendMainStepLog(this.run, identity.requestId, lines, this.dependencies.now());
+  if (usage && usage.length > 0) {
+    traced = recordCurrentStepUsage(traced, identity.requestId, usageAggregateFromModels(usage), this.dependencies.now());
+  }
   if (traced === this.run)
     return;
   this.run = traced;
@@ -6690,7 +7021,15 @@ async function finishDelegation(active, response) {
     if (!this.isSessionActive || this.sessionEpoch !== active.sessionEpoch || !this.run || this.run.status !== "running" || this.run.runId !== active.runId || this.run.currentStepId !== active.stepId || this.run.currentStepDigest !== active.stepDigest) {
       return;
     }
+    if (response.requestId !== active.requestId) {
+      throw new Error("Workflow worker returned an uncorrelated terminal response");
+    }
     const terminalAt = this.dependencies.now();
+    if (response.usage && response.usage.length > 0) {
+      this.run = recordCurrentStepUsage(this.run, active.requestId, usageAggregateFromModels(response.usage), terminalAt);
+      this.persist();
+      this.updateStatus();
+    }
     const workflow = this.catalog.workflows.get(this.run.workflowId);
     const step = workflow?.definition.steps[this.run.currentStepId];
     if (!workflow || !step) {
@@ -7532,18 +7871,18 @@ var STRUCTURED_RESULT_KEYS = new Set([
   "artifact",
   "workspace"
 ]);
-var isRecord10 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+var isRecord12 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 var parseChildStructuredResult = ({
   input,
   policy
 }) => {
-  if (!isRecord10(input)) {
+  if (!isRecord12(input)) {
     throw new Error("structured_output input must be an object");
   }
   if (Object.keys(input).length !== 1 || !Object.hasOwn(input, "value")) {
     throw new Error("structured_output input must contain only value");
   }
-  if (!isRecord10(input.value)) {
+  if (!isRecord12(input.value)) {
     throw new Error("structured_output value must be an object");
   }
   const unknownKey = Object.keys(input.value).find((key) => !STRUCTURED_RESULT_KEYS.has(key));
@@ -7907,7 +8246,7 @@ var DEFAULT_DEPENDENCIES4 = {
   loadSettings: loadSettings2,
   userWorkflowDirectory: defaultUserWorkflowDirectory2,
   runtimeEnvironment: () => ({
-    isSubagentChild: process.env.PI_WORKFLOWS_CHILD === "1",
+    isSubagentChild: process.env.PI_WORKFLOWS_CHILD === "1" && process.env.PI_WORKFLOWS_CHILD_RUNTIME === "1",
     childAgent: process.env.PI_WORKFLOWS_CHILD_AGENT?.trim()
   }),
   registerChildRuntime: (pi, childAgent) => {