@iowarp/clio-coder 0.3.4 → 0.3.7

package/dist/{targets-PIIRAOYS.js → targets-4CIFKCTW.js}

@@ -1,14 +1,15 @@
 import { createRequire as __clioCreateRequire } from "node:module"; const require = __clioCreateRequire(import.meta.url);
-import "./chunk-K6WL7QZT.js";
+import "./chunk-JTSEDYVQ.js";
 import {
   ensureClioState
-} from "./chunk-VAWWTKDP.js";
+} from "./chunk-3HAPLH5M.js";
 import {
   ConfigDomainModule,
   loadDomains
-} from "./chunk-KRPY7NTG.js";
-import "./chunk-E25LMLRW.js";
-import "./chunk-4BPJXDWC.js";
+} from "./chunk-BMWK7ZIZ.js";
+import "./chunk-YD734TPH.js";
+import "./chunk-DR52UMZW.js";
+import "./chunk-C4JBQ5SR.js";
 import "./chunk-2SFS6XQE.js";
 import "./chunk-ZWLZP4ZT.js";
 import "./chunk-CGKSTWHD.js";
@@ -17,20 +18,20 @@ import {
   runConfigureCommand,
   runTargetRemove,
   runTargetRename
-} from "./chunk-A2GZF7DC.js";
-import "./chunk-RD5U66HV.js";
-import "./chunk-KOHPCX4K.js";
+} from "./chunk-LADCF22A.js";
+import "./chunk-SROCI7ZU.js";
+import "./chunk-DOOEX22V.js";
 import "./chunk-2STGEDFV.js";
 import {
   column,
   terminalColumns,
   truncate
 } from "./chunk-2IR2NMPA.js";
-import "./chunk-YCWGATWI.js";
+import "./chunk-465YSENW.js";
 import {
   printError,
   printOk
-} from "./chunk-ED4KHGC3.js";
+} from "./chunk-PPAMZ32Z.js";
 import {
   source_default
 } from "./chunk-5TSRNF4G.js";
@@ -40,8 +41,11 @@ import {
   isDispatchEligibleRuntime,
   isOrchestratorEligibleRuntime,
   registerBuiltinRuntimes
-} from "./chunk-QWU7ZBO7.js";
+} from "./chunk-VQNODYQ4.js";
 import "./chunk-CFGTUFWB.js";
+import "./chunk-JRIO5UD2.js";
+import "./chunk-IHXBNWMM.js";
+import "./chunk-GEYXPTRF.js";
 import {
   bindAgentProfileInSettings,
   readSettings,
@@ -49,31 +53,28 @@ import {
   setFleetProfileInSettings,
   updateSettings,
   useTargetInSettings
-} from "./chunk-AD2SYQYC.js";
+} from "./chunk-UHXRNZ2J.js";
 import {
   THINKING_LEVELS
-} from "./chunk-4OC57DA6.js";
+} from "./chunk-4DGYLA73.js";
 import "./chunk-LL4KHSZI.js";
-import "./chunk-4VP4KH3K.js";
-import "./chunk-VEZEGCGW.js";
-import "./chunk-FQ4SKYE4.js";
-import "./chunk-IKCO5N3L.js";
-import "./chunk-3I7MS7N2.js";
-import "./chunk-IHXBNWMM.js";
-import "./chunk-BPGS2WCQ.js";
 import "./chunk-SST6Z5JA.js";
 import "./chunk-FO5ZOVUY.js";
 import "./chunk-R346GLFC.js";
+import "./chunk-D4MDIG46.js";
+import "./chunk-FQ4SKYE4.js";
 import "./chunk-4ZG3XFUR.js";
+import "./chunk-IKCO5N3L.js";
+import "./chunk-3I7MS7N2.js";
 import "./chunk-FCSXB6T2.js";
 import "./chunk-APJ265NV.js";
 import "./chunk-YXLYO42X.js";
 import "./chunk-BNAZZHFG.js";
 import "./chunk-6EJMN2Y3.js";
 import "./chunk-WEPFGWHJ.js";
-import "./chunk-HXG4IURW.js";
+import "./chunk-X2KV5FXT.js";
 import "./chunk-ZGVHUX3M.js";
-import "./chunk-TTNYS3EA.js";
+import "./chunk-OB5HIGJY.js";
 import "./chunk-IWHMRKLL.js";
 import {
   init_esm_shims
@@ -902,7 +903,9 @@ function residentModelsSummary(states) {
 }
 function formatContextWindow(status) {
   const window = status.capabilities.contextWindow;
-  return status.contextWindowProvenance === "runtime-default" ? `ctx ${window} (unverified runtime default)` : `ctx ${window}`;
+  if (status.contextWindowProvenance === "runtime-default") return `ctx ${window} (unverified runtime default)`;
+  const slots = status.target?.defaultModel ? status.discoveredModelStates?.[status.target.defaultModel]?.contextSlots : void 0;
+  return slots && Math.floor(slots.totalContextSize / slots.slots) === window ? `ctx ${window} (${slots.totalContextSize} / ${slots.slots} slots)` : `ctx ${window}`;
 }
 function formatNotes(status) {
   const parts = [];
@@ -995,4 +998,4 @@ export {
   residentModelsSummary,
   runTargetsCommand
 };
-//# sourceMappingURL=targets-PIIRAOYS.js.map
+//# sourceMappingURL=targets-4CIFKCTW.js.map

package/dist/{terminal-lease-ULWXWNVY.js → terminal-lease-WUZY7ZV5.js}

@@ -10,12 +10,12 @@ import {
   createKeybindingManager,
   createProcessInteractiveShell,
   matchesKey
-} from "./chunk-ZWMF7253.js";
+} from "./chunk-5C3AQNDW.js";
 import {
   getTerminationCoordinator
-} from "./chunk-HXG4IURW.js";
+} from "./chunk-X2KV5FXT.js";
 import "./chunk-ZGVHUX3M.js";
-import "./chunk-TTNYS3EA.js";
+import "./chunk-OB5HIGJY.js";
 import {
   init_esm_shims
 } from "./chunk-3R73A4XB.js";
@@ -111,6 +111,7 @@ function createProcessTerminalLease(options) {
     getModelLabel: () => editorChrome.getModelLabel(),
     getThinkingLabel: () => editorChrome.getThinkingLabel(),
     isStreaming: () => editorChrome.isStreaming?.() ?? false,
+    isAwaitingApproval: () => editorChrome.isAwaitingApproval?.() ?? false,
     willEnterSteer: (text) => editorChrome.willEnterSteer?.(text) ?? false,
     getSubmitKeyLabel: () => editorChrome.getSubmitKeyLabel?.() ?? "Enter",
     getNewlineKeyLabel: () => editorChrome.getNewlineKeyLabel?.() ?? "Shift+Enter"
@@ -393,4 +394,4 @@ export {
   createProcessTerminalLease,
   instantShellEnabled
 };
-//# sourceMappingURL=terminal-lease-ULWXWNVY.js.map
+//# sourceMappingURL=terminal-lease-WUZY7ZV5.js.map

package/dist/{uninstall-FZCQCDKC.js → uninstall-7FV7IP4E.js}

@@ -3,17 +3,17 @@ import {
   removePath,
   reportRemovalFailures
 } from "./chunk-SVNXH4L2.js";
-import "./chunk-YCWGATWI.js";
+import "./chunk-465YSENW.js";
 import {
   printError,
   printHeader,
   printOk
-} from "./chunk-ED4KHGC3.js";
+} from "./chunk-PPAMZ32Z.js";
 import "./chunk-5TSRNF4G.js";
-import "./chunk-4VP4KH3K.js";
+import "./chunk-JRIO5UD2.js";
+import "./chunk-SST6Z5JA.js";
 import "./chunk-IKCO5N3L.js";
 import "./chunk-3I7MS7N2.js";
-import "./chunk-SST6Z5JA.js";
 import "./chunk-APJ265NV.js";
 import "./chunk-YXLYO42X.js";
 import {
@@ -330,4 +330,4 @@ export {
   projectContextInventory,
   runUninstallCommand
 };
-//# sourceMappingURL=uninstall-FZCQCDKC.js.map
+//# sourceMappingURL=uninstall-7FV7IP4E.js.map

package/dist/{upgrade-346TZ6AV.js → upgrade-K2HVIVMQ.js}

@@ -2,46 +2,47 @@ import { createRequire as __clioCreateRequire } from "node:module"; const requir
 import {
   LifecycleDomainModule,
   listMigrations
-} from "./chunk-K6WL7QZT.js";
+} from "./chunk-JTSEDYVQ.js";
 import {
   readStateInfo
-} from "./chunk-VAWWTKDP.js";
+} from "./chunk-3HAPLH5M.js";
 import {
   ConfigDomainModule,
   loadDomains
-} from "./chunk-KRPY7NTG.js";
-import "./chunk-E25LMLRW.js";
-import "./chunk-4BPJXDWC.js";
+} from "./chunk-BMWK7ZIZ.js";
+import "./chunk-YD734TPH.js";
+import "./chunk-DR52UMZW.js";
+import "./chunk-C4JBQ5SR.js";
 import "./chunk-2SFS6XQE.js";
 import "./chunk-ZWLZP4ZT.js";
 import "./chunk-CGKSTWHD.js";
 import {
   getVersionInfo
 } from "./chunk-XPLRXC72.js";
-import "./chunk-RD5U66HV.js";
+import "./chunk-SROCI7ZU.js";
 import {
   initializeClioHome
-} from "./chunk-KOHPCX4K.js";
-import "./chunk-YCWGATWI.js";
+} from "./chunk-DOOEX22V.js";
+import "./chunk-465YSENW.js";
 import {
   printError,
   printHeader,
   printOk
-} from "./chunk-ED4KHGC3.js";
+} from "./chunk-PPAMZ32Z.js";
 import "./chunk-5TSRNF4G.js";
-import "./chunk-AD2SYQYC.js";
-import "./chunk-4OC57DA6.js";
-import "./chunk-LL4KHSZI.js";
-import "./chunk-4VP4KH3K.js";
-import "./chunk-VEZEGCGW.js";
-import "./chunk-FQ4SKYE4.js";
-import "./chunk-IKCO5N3L.js";
-import "./chunk-3I7MS7N2.js";
+import "./chunk-JRIO5UD2.js";
 import "./chunk-IHXBNWMM.js";
+import "./chunk-UHXRNZ2J.js";
+import "./chunk-4DGYLA73.js";
+import "./chunk-LL4KHSZI.js";
 import "./chunk-SST6Z5JA.js";
 import "./chunk-FO5ZOVUY.js";
 import "./chunk-R346GLFC.js";
+import "./chunk-D4MDIG46.js";
+import "./chunk-FQ4SKYE4.js";
 import "./chunk-4ZG3XFUR.js";
+import "./chunk-IKCO5N3L.js";
+import "./chunk-3I7MS7N2.js";
 import "./chunk-APJ265NV.js";
 import "./chunk-YXLYO42X.js";
 import {
@@ -49,9 +50,9 @@ import {
 } from "./chunk-BNAZZHFG.js";
 import "./chunk-6EJMN2Y3.js";
 import "./chunk-WEPFGWHJ.js";
-import "./chunk-HXG4IURW.js";
+import "./chunk-X2KV5FXT.js";
 import "./chunk-ZGVHUX3M.js";
-import "./chunk-TTNYS3EA.js";
+import "./chunk-OB5HIGJY.js";
 import "./chunk-IWHMRKLL.js";
 import {
   init_esm_shims
@@ -341,4 +342,4 @@ async function runUpgradeCommand(argv) {
 export {
   runUpgradeCommand
 };
-//# sourceMappingURL=upgrade-346TZ6AV.js.map
+//# sourceMappingURL=upgrade-K2HVIVMQ.js.map

package/dist/{usage-6KKXR32N.js → usage-GTZELZQX.js}

@@ -1,75 +1,87 @@
 import { createRequire as __clioCreateRequire } from "node:module"; const require = __clioCreateRequire(import.meta.url);
 import {
-  readEvidenceIndex
-} from "./chunk-HC4CLZ2Y.js";
+  readEvidenceIndex,
+  readOutOfTurnUsageRows
+} from "./chunk-GWS3VEIW.js";
 import {
   loadMemoryRecordsSync
-} from "./chunk-BRXQQJFP.js";
-import "./chunk-QQL5RT5M.js";
+} from "./chunk-6M7VS3J3.js";
+import "./chunk-UUANF5CR.js";
 import {
+  addResponseModelIdObservationCount,
+  emptyResponseModelIdObservationCounts,
   ledgerUsageCalls,
   listSessionLedgerRefs,
   parseSessionEntries,
-  readAuditRows
-} from "./chunk-QQK64KLB.js";
-import "./chunk-QKMUKYO7.js";
-import "./chunk-3JLKSKD7.js";
-import "./chunk-34475P3I.js";
+  readAuditRows,
+  responseModelIdObservationCountsLabel
+} from "./chunk-6TUKSZVF.js";
+import "./chunk-KZ2H5X4G.js";
+import "./chunk-M4AKACEO.js";
+import "./chunk-RVG5JXAL.js";
+import "./chunk-ZGH7FGS5.js";
+import "./chunk-TSHXZTOQ.js";
 import "./chunk-TXOTCRLG.js";
-import "./chunk-G4BMMOKF.js";
-import "./chunk-MFFY33HR.js";
+import "./chunk-HVDIIIQW.js";
+import "./chunk-THKY7CD7.js";
+import "./chunk-UVDSQ6LW.js";
+import "./chunk-DR52UMZW.js";
 import {
   loadSkills
-} from "./chunk-4BPJXDWC.js";
+} from "./chunk-C4JBQ5SR.js";
 import "./chunk-2SFS6XQE.js";
 import "./chunk-ZWLZP4ZT.js";
 import "./chunk-W6GROXXM.js";
-import "./chunk-2TZWSW76.js";
-import "./chunk-ZYKPLLNQ.js";
-import "./chunk-WPQLXFOZ.js";
-import "./chunk-7RXG6QRZ.js";
-import "./chunk-22NAGB7X.js";
-import "./chunk-AOCYTWAV.js";
-import "./chunk-MV3K5QF2.js";
+import "./chunk-KCMKRQX4.js";
+import "./chunk-WHGPSPT5.js";
+import "./chunk-CEYBNUGC.js";
+import "./chunk-5FR74PWO.js";
+import "./chunk-OBMAI2DP.js";
+import "./chunk-5C77SEEY.js";
+import "./chunk-UND3GU2L.js";
 import "./chunk-CMZWFGD2.js";
 import "./chunk-I4HZDVNP.js";
-import "./chunk-FYYLNIL5.js";
-import "./chunk-UL3WSD3F.js";
+import "./chunk-GH5622CP.js";
 import "./chunk-OQE5J4C6.js";
-import "./chunk-ECH6PKUQ.js";
-import "./chunk-BEY543CS.js";
-import "./chunk-5M54SPOL.js";
+import "./chunk-GOXNB3AO.js";
+import "./chunk-HWUFFB6L.js";
+import "./chunk-DJNLUABN.js";
+import "./chunk-AOCYTWAV.js";
+import "./chunk-MV3K5QF2.js";
+import "./chunk-UL3WSD3F.js";
+import "./chunk-ODFEOB4F.js";
 import "./chunk-OZNBF4L3.js";
 import "./chunk-4BJ5BYCE.js";
+import "./chunk-ECH6PKUQ.js";
 import "./chunk-6XLNIQDB.js";
 import "./chunk-5B2AEOW5.js";
 import "./chunk-CGKSTWHD.js";
-import "./chunk-YHZX5GEU.js";
-import "./chunk-EKMEHE4H.js";
-import "./chunk-YCWGATWI.js";
+import "./chunk-XAKHZX5N.js";
+import "./chunk-33YXPOE3.js";
+import "./chunk-465YSENW.js";
 import {
   formatColumns,
   printError
-} from "./chunk-ED4KHGC3.js";
+} from "./chunk-PPAMZ32Z.js";
 import "./chunk-5TSRNF4G.js";
-import "./chunk-QWU7ZBO7.js";
+import "./chunk-VQNODYQ4.js";
 import "./chunk-CFGTUFWB.js";
-import "./chunk-AD2SYQYC.js";
-import "./chunk-4OC57DA6.js";
-import "./chunk-LL4KHSZI.js";
-import "./chunk-4VP4KH3K.js";
-import "./chunk-VEZEGCGW.js";
-import "./chunk-FQ4SKYE4.js";
-import "./chunk-IKCO5N3L.js";
-import "./chunk-3I7MS7N2.js";
+import "./chunk-JRIO5UD2.js";
 import "./chunk-IHXBNWMM.js";
-import "./chunk-BPGS2WCQ.js";
+import "./chunk-GEYXPTRF.js";
+import "./chunk-UHXRNZ2J.js";
+import "./chunk-4DGYLA73.js";
+import "./chunk-LL4KHSZI.js";
 import "./chunk-SST6Z5JA.js";
 import {
   cwdHash
 } from "./chunk-FO5ZOVUY.js";
 import "./chunk-R346GLFC.js";
+import "./chunk-D4MDIG46.js";
+import "./chunk-FQ4SKYE4.js";
 import "./chunk-4ZG3XFUR.js";
+import "./chunk-IKCO5N3L.js";
+import "./chunk-3I7MS7N2.js";
 import "./chunk-FCSXB6T2.js";
 import "./chunk-APJ265NV.js";
 import "./chunk-YXLYO42X.js";
@@ -80,7 +92,7 @@ import {
 import "./chunk-6EJMN2Y3.js";
 import "./chunk-WEPFGWHJ.js";
 import "./chunk-ZGVHUX3M.js";
-import "./chunk-TTNYS3EA.js";
+import "./chunk-OB5HIGJY.js";
 import "./chunk-7CR24IG7.js";
 import "./chunk-IWHMRKLL.js";
 import {
@@ -94,9 +106,10 @@ import { join, resolve } from "node:path";
 var HELP = `clio-coder usage report [--repo <path>] [--days <n>] [--json]
 
 Cross-session usage analyzer (experimental, read-only). Reads the local usage
-archive (receipts, session ledgers, audit rows, evidence index, memory store)
-and reports facts plus improvement opportunities, every line citing ids and
-counts. Nothing is written or stored; suggestions are printed only.
+archive (receipts, session ledgers, the out-of-turn usage store, audit rows,
+evidence index, memory store) and reports facts plus improvement opportunities,
+every line citing ids and counts. Nothing is written or stored; suggestions are
+printed only.
 
 Flags:
   --repo <path>   restrict sessions (and runs via the run ledger) to one repo
@@ -127,6 +140,38 @@ function emptyUsageTotals() {
     costUsd: 0
   };
 }
+function addResponseModelIdObservation(counts, call) {
+  addResponseModelIdObservationCount(counts, call.responseModelIdObservation, call.apiCalls ?? 1);
+}
+function emptyCallOrigins() {
+  return { rows: 0, sideQuestions: 0, handoffs: 0 };
+}
+function turnsOf(origins) {
+  return origins.rows - origins.sideQuestions - origins.handoffs;
+}
+function hasLabelledCall(origins) {
+  return origins.sideQuestions > 0 || origins.handoffs > 0;
+}
+function addOutOfTurnRow(origins, row) {
+  origins.rows += 1;
+  if (row.label === "side-question") origins.sideQuestions += 1;
+  else origins.handoffs += 1;
+}
+function outOfTurnUsageCall(row) {
+  return {
+    providerId: row.target,
+    attributedModelId: row.attributedModelId,
+    requestedModelId: row.attributedModelId,
+    responseModelIdObservation: { state: "not-observed" },
+    input: row.usage.input,
+    output: row.usage.output,
+    cacheRead: row.usage.cacheRead,
+    cacheWrite: row.usage.cacheWrite,
+    reasoningTokens: row.usage.reasoning,
+    totalTokens: row.usage.totalTokens,
+    costUsd: row.usage.costUsd
+  };
+}
 function addUsageCall(totals, call) {
   totals.apiCalls += call.apiCalls ?? 1;
   totals.input += call.input;
@@ -238,6 +283,11 @@ async function runUsageCommand(argv) {
     (receipt) => repoRunIds === null || repoRunIds.has(receipt.runId)
   );
   const sessions = await readSessions(stateDir, windowStart, now, repoHash, diagnostics);
+  const outOfTurn = readOutOfTurnUsageRows(stateDir);
+  for (const error of outOfTurn.errors) diagnostics.notes.push(error);
+  const outOfTurnRows = outOfTurn.rows.filter(
+    (row) => inWindow(row.timestamp, windowStart, now) && (repoHash === void 0 || row.repoIdentity === repoHash)
+  );
   const auditRows = await readAuditRows(stateDir);
   diagnostics.malformedAuditRows = auditRows.errors.length;
   const auditInWindow = auditRows.rows.filter((row) => row.ts !== null && inWindow(row.ts, windowStart, now));
@@ -311,19 +361,33 @@ async function runUsageCommand(argv) {
   }
   const usageByModel = /* @__PURE__ */ new Map();
   const usageTotals = emptyUsageTotals();
+  const callOrigins = emptyCallOrigins();
+  const foldCall = (call) => {
+    addUsageCall(usageTotals, call);
+    const key = `${call.providerId}::${call.attributedModelId}`;
+    const entry = usageByModel.get(key) ?? {
+      providerId: call.providerId,
+      attributedModelId: call.attributedModelId,
+      requestedModelIds: /* @__PURE__ */ new Set(),
+      responseModelIdObservationCounts: emptyResponseModelIdObservationCounts(),
+      totals: emptyUsageTotals()
+    };
+    entry.requestedModelIds.add(call.requestedModelId);
+    addResponseModelIdObservation(entry.responseModelIdObservationCounts, call);
+    addUsageCall(entry.totals, call);
+    usageByModel.set(key, entry);
+  };
   for (const session of sessions) {
     for (const call of session.usageCalls) {
-      addUsageCall(usageTotals, call);
-      const key = `${call.providerId}::${call.modelId}`;
-      const entry = usageByModel.get(key) ?? {
-        providerId: call.providerId,
-        modelId: call.modelId,
-        totals: emptyUsageTotals()
-      };
-      addUsageCall(entry.totals, call);
-      usageByModel.set(key, entry);
+      foldCall(call);
+      callOrigins.rows += 1;
     }
   }
+  for (const row of outOfTurnRows) {
+    foldCall(outOfTurnUsageCall(row));
+    addOutOfTurnRow(callOrigins, row);
+  }
+  const usageMeasurable = presence.sessionsPresent || outOfTurnRows.length > 0;
   const usageRows = [...usageByModel.values()].sort(
     (a, b) => b.totals.totalTokens - a.totals.totalTokens || a.providerId.localeCompare(b.providerId)
   );
@@ -393,10 +457,27 @@ async function runUsageCommand(argv) {
     if (presence.receiptsPresent) emit({ kind: "fact", fact: "dispatch-runs", value: receipts.length });
     else emit({ kind: "fact", fact: "receipt-store-missing", path: presence.receiptsPath });
     emit({ kind: "fact", fact: "audit-tool-calls", value: auditToolCalls.length, blocked: auditBlocked.length });
-    if (presence.sessionsPresent) {
-      emit({ kind: "fact", fact: "tokens", ...usageTotals });
+    if (usageMeasurable) {
+      emit({
+        kind: "fact",
+        fact: "tokens",
+        ...usageTotals,
+        ...hasLabelledCall(callOrigins) ? {
+          turns: turnsOf(callOrigins),
+          sideQuestions: callOrigins.sideQuestions,
+          handoffs: callOrigins.handoffs
+        } : {}
+      });
       for (const row of usageRows) {
-        emit({ kind: "fact", fact: "model-usage", providerId: row.providerId, modelId: row.modelId, ...row.totals });
+        emit({
+          kind: "fact",
+          fact: "model-usage",
+          providerId: row.providerId,
+          attributedModelId: row.attributedModelId,
+          requestedModelIds: [...row.requestedModelIds].sort(),
+          responseModelIdObservationCounts: row.responseModelIdObservationCounts,
+          ...row.totals
+        });
       }
     }
     for (const [tool, totals] of topTools) emit({ kind: "fact", fact: "top-tool", tool, ...totals });
@@ -444,22 +525,41 @@ async function runUsageCommand(argv) {
     out(`  receipt store missing at ${presence.receiptsPath}`);
   }
   out(`  audited tool calls in window: ${auditToolCalls.length} (${auditBlocked.length} blocked/denied)`);
-  if (presence.sessionsPresent) {
+  if (usageMeasurable) {
     out(
       `  tokens in window: ${usageTotals.totalTokens} over ${usageTotals.apiCalls} model calls (input ${usageTotals.input}, output ${usageTotals.output}, cache read ${usageTotals.cacheRead}, cache write ${usageTotals.cacheWrite}, reasoning ${usageTotals.reasoningTokens})`
     );
+    if (hasLabelledCall(callOrigins)) {
+      out(`  turns in window: ${turnsOf(callOrigins)}`);
+      if (callOrigins.sideQuestions > 0) out(`  side questions in window: ${callOrigins.sideQuestions}`);
+      if (callOrigins.handoffs > 0) out(`  handoffs in window: ${callOrigins.handoffs}`);
+    }
     out(`  provider-reported cost in window: $${usageTotals.costUsd.toFixed(4)}`);
   }
   if (usageRows.length > 0) {
     out("");
-    out("  tokens by model (from session ledgers, provider-reported)");
+    out("  tokens by attributed model (from session ledgers and provider-reported usage)");
     process.stdout.write(
       indent(
         formatColumns([
-          ["provider", "model", "calls", "input", "output", "cache read", "reasoning", "tokens", "cost"],
+          [
+            "provider",
+            "attributed model",
+            "requested model ids",
+            "response model id observation",
+            "calls",
+            "input",
+            "output",
+            "cache read",
+            "reasoning",
+            "tokens",
+            "cost"
+          ],
           ...usageRows.map((row) => [
             row.providerId,
-            row.modelId,
+            row.attributedModelId,
+            [...row.requestedModelIds].sort().join(","),
+            responseModelIdObservationCountsLabel(row.responseModelIdObservationCounts),
             String(row.totals.apiCalls),
             String(row.totals.input),
             String(row.totals.output),
@@ -801,4 +901,4 @@ export {
   inWindow,
   runUsageCommand
 };
-//# sourceMappingURL=usage-6KKXR32N.js.map
+//# sourceMappingURL=usage-GTZELZQX.js.map