@iowarp/clio-coder 0.3.6 → 0.3.8

package/dist/support-MIETYA5E.js

@@ -0,0 +1,38 @@
+import { createRequire as __clioCreateRequire } from "node:module"; const require = __clioCreateRequire(import.meta.url);
+import {
+  buildProviderSupportEntry,
+  compareProviderSupportEntries,
+  configuredTargetsForRuntime,
+  defaultModelForRuntime,
+  describeRuntimeModels,
+  listKnownModelsForRuntime,
+  listProviderSupportEntries,
+  resolveProviderReference,
+  runtimeModelListSource,
+  supportGroupLabel
+} from "./chunk-IIZWH4XA.js";
+import "./chunk-EQ63NRB7.js";
+import "./chunk-SST6Z5JA.js";
+import "./chunk-IKCO5N3L.js";
+import "./chunk-3I7MS7N2.js";
+import "./chunk-APJ265NV.js";
+import "./chunk-BNAZZHFG.js";
+import "./chunk-WEPFGWHJ.js";
+import "./chunk-NUGM5KR6.js";
+import "./chunk-PT7HYKEM.js";
+import "./chunk-FCSXB6T2.js";
+import "./chunk-YXLYO42X.js";
+import "./chunk-3R73A4XB.js";
+export {
+  buildProviderSupportEntry,
+  compareProviderSupportEntries,
+  configuredTargetsForRuntime,
+  defaultModelForRuntime,
+  describeRuntimeModels,
+  listKnownModelsForRuntime,
+  listProviderSupportEntries,
+  resolveProviderReference,
+  runtimeModelListSource,
+  supportGroupLabel
+};
+//# sourceMappingURL=support-MIETYA5E.js.map

package/dist/{targets-54SWINWB.js → targets-VGNXIR3S.js}

@@ -1,47 +1,51 @@
 import { createRequire as __clioCreateRequire } from "node:module"; const require = __clioCreateRequire(import.meta.url);
-import "./chunk-6XXKFVSN.js";
+import "./chunk-5Q2VVUKB.js";
 import {
   ensureClioState
-} from "./chunk-KHSFENX2.js";
+} from "./chunk-WWCZ5F23.js";
 import {
   ConfigDomainModule,
   loadDomains
-} from "./chunk-R46L2BIR.js";
-import "./chunk-E25LMLRW.js";
-import "./chunk-4BPJXDWC.js";
-import "./chunk-2SFS6XQE.js";
-import "./chunk-ZWLZP4ZT.js";
+} from "./chunk-FHJEP5SW.js";
+import "./chunk-DR52UMZW.js";
+import "./chunk-TANS5ZJS.js";
+import "./chunk-DGSYXYMX.js";
+import "./chunk-26LEYJZH.js";
+import "./chunk-WXY7KU3G.js";
+import "./chunk-DYIM5TJT.js";
 import "./chunk-CGKSTWHD.js";
 import "./chunk-XPLRXC72.js";
 import {
   runConfigureCommand,
   runTargetRemove,
   runTargetRename
-} from "./chunk-QNQHSOLF.js";
-import "./chunk-RD5U66HV.js";
-import "./chunk-KOHPCX4K.js";
+} from "./chunk-IGWKHNIQ.js";
 import "./chunk-2STGEDFV.js";
 import {
   column,
   terminalColumns,
   truncate
 } from "./chunk-2IR2NMPA.js";
-import "./chunk-24I7BN55.js";
+import "./chunk-IFBNV6H6.js";
+import "./chunk-GPIEI3LY.js";
+import "./chunk-XWSF374K.js";
 import {
   printError,
   printOk
-} from "./chunk-PPAMZ32Z.js";
+} from "./chunk-XK56QHLX.js";
 import {
   source_default
 } from "./chunk-5TSRNF4G.js";
 import {
   ProvidersDomainModule,
-  getRuntimeRegistry,
   isDispatchEligibleRuntime,
-  isOrchestratorEligibleRuntime,
-  registerBuiltinRuntimes
-} from "./chunk-DJVECN66.js";
+  isOrchestratorEligibleRuntime
+} from "./chunk-7RFXX52T.js";
 import "./chunk-CFGTUFWB.js";
+import "./chunk-LU7P4LHA.js";
+import "./chunk-RWSI4YD7.js";
+import "./chunk-IHXBNWMM.js";
+import "./chunk-B5CSFE7B.js";
 import {
   bindAgentProfileInSettings,
   readSettings,
@@ -49,32 +53,36 @@ import {
   setFleetProfileInSettings,
   updateSettings,
   useTargetInSettings
-} from "./chunk-AD2SYQYC.js";
+} from "./chunk-IJ7RPIYJ.js";
+import "./chunk-FQ4SKYE4.js";
+import "./chunk-ZGVHUX3M.js";
+import "./chunk-TT36MB5S.js";
+import "./chunk-3BINW3FP.js";
+import "./chunk-R346GLFC.js";
+import "./chunk-6EJMN2Y3.js";
+import "./chunk-IWHMRKLL.js";
+import {
+  registerBuiltinRuntimes
+} from "./chunk-NMPKI6XL.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-4ZG3XFUR.js";
+import "./chunk-IIZWH4XA.js";
+import "./chunk-EQ63NRB7.js";
+import "./chunk-SST6Z5JA.js";
 import "./chunk-IKCO5N3L.js";
 import "./chunk-3I7MS7N2.js";
-import "./chunk-IHXBNWMM.js";
-import "./chunk-GEYXPTRF.js";
-import "./chunk-SST6Z5JA.js";
-import "./chunk-FO5ZOVUY.js";
-import "./chunk-R346GLFC.js";
-import "./chunk-4ZG3XFUR.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-XE2VEJHX.js";
-import "./chunk-ZGVHUX3M.js";
-import "./chunk-G7MUEIGA.js";
-import "./chunk-IWHMRKLL.js";
+import {
+  getRuntimeRegistry
+} from "./chunk-NUGM5KR6.js";
+import "./chunk-PT7HYKEM.js";
+import "./chunk-FCSXB6T2.js";
+import "./chunk-YXLYO42X.js";
 import {
   init_esm_shims
 } from "./chunk-3R73A4XB.js";
@@ -913,6 +921,7 @@ function formatNotes(status) {
   if (status.runtime?.auth === "claude-cli") parts.push("claude-cli");
   if (status.capabilities.contextWindow > 0) parts.push(formatContextWindow(status));
   if (!status.available && status.reason) parts.push(status.reason);
+  if (status.health.status === "degraded" && status.health.lastError) parts.push(status.health.lastError);
   const residency = residentModelsSummary(status.discoveredModelStates);
   if (residency) parts.push(residency);
   if (status.probeNotes && status.probeNotes.length > 0) parts.push(`note: ${status.probeNotes.join("; ")}`);
@@ -995,6 +1004,7 @@ export {
   formatContextWindow,
   formatTargetTable,
   residentModelsSummary,
-  runTargetsCommand
+  runTargetsCommand,
+  targetTableRow
 };
-//# sourceMappingURL=targets-54SWINWB.js.map
+//# sourceMappingURL=targets-VGNXIR3S.js.map

package/dist/{terminal-lease-SAIF2OGY.js → terminal-lease-WOBR64YA.js}

@@ -10,12 +10,12 @@ import {
   createKeybindingManager,
   createProcessInteractiveShell,
   matchesKey
-} from "./chunk-E2ER4LJF.js";
+} from "./chunk-5C3AQNDW.js";
 import {
   getTerminationCoordinator
-} from "./chunk-XE2VEJHX.js";
+} from "./chunk-WXY7KU3G.js";
 import "./chunk-ZGVHUX3M.js";
-import "./chunk-G7MUEIGA.js";
+import "./chunk-TT36MB5S.js";
 import {
   init_esm_shims
 } from "./chunk-3R73A4XB.js";
@@ -394,4 +394,4 @@ export {
   createProcessTerminalLease,
   instantShellEnabled
 };
-//# sourceMappingURL=terminal-lease-SAIF2OGY.js.map
+//# sourceMappingURL=terminal-lease-WOBR64YA.js.map

package/dist/{uninstall-BVLWXKBT.js → uninstall-ZJF5H5ZN.js}

@@ -3,27 +3,27 @@ import {
   removePath,
   reportRemovalFailures
 } from "./chunk-SVNXH4L2.js";
-import "./chunk-24I7BN55.js";
+import "./chunk-IFBNV6H6.js";
 import {
   printError,
   printHeader,
   printOk
-} from "./chunk-PPAMZ32Z.js";
+} from "./chunk-XK56QHLX.js";
 import "./chunk-5TSRNF4G.js";
-import "./chunk-4VP4KH3K.js";
+import {
+  resolvePackageRoot
+} from "./chunk-IWHMRKLL.js";
+import "./chunk-EQ63NRB7.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 {
   resetXdgCache,
   resolveClioDirs
 } from "./chunk-BNAZZHFG.js";
 import "./chunk-WEPFGWHJ.js";
-import {
-  resolvePackageRoot
-} from "./chunk-IWHMRKLL.js";
+import "./chunk-YXLYO42X.js";
 import {
   init_esm_shims
 } from "./chunk-3R73A4XB.js";
@@ -330,4 +330,4 @@ export {
   projectContextInventory,
   runUninstallCommand
 };
-//# sourceMappingURL=uninstall-BVLWXKBT.js.map
+//# sourceMappingURL=uninstall-ZJF5H5ZN.js.map

package/dist/{upgrade-JKAR27XC.js → upgrade-FUSUAGHR.js}

@@ -2,57 +2,60 @@ import { createRequire as __clioCreateRequire } from "node:module"; const requir
 import {
   LifecycleDomainModule,
   listMigrations
-} from "./chunk-6XXKFVSN.js";
+} from "./chunk-5Q2VVUKB.js";
 import {
   readStateInfo
-} from "./chunk-KHSFENX2.js";
+} from "./chunk-WWCZ5F23.js";
 import {
   ConfigDomainModule,
   loadDomains
-} from "./chunk-R46L2BIR.js";
-import "./chunk-E25LMLRW.js";
-import "./chunk-4BPJXDWC.js";
-import "./chunk-2SFS6XQE.js";
-import "./chunk-ZWLZP4ZT.js";
+} from "./chunk-FHJEP5SW.js";
+import "./chunk-DR52UMZW.js";
+import "./chunk-TANS5ZJS.js";
+import "./chunk-DGSYXYMX.js";
+import "./chunk-26LEYJZH.js";
+import "./chunk-WXY7KU3G.js";
+import "./chunk-DYIM5TJT.js";
 import "./chunk-CGKSTWHD.js";
 import {
   getVersionInfo
 } from "./chunk-XPLRXC72.js";
-import "./chunk-RD5U66HV.js";
+import "./chunk-IFBNV6H6.js";
+import "./chunk-GPIEI3LY.js";
 import {
   initializeClioHome
-} from "./chunk-KOHPCX4K.js";
-import "./chunk-24I7BN55.js";
+} from "./chunk-XWSF374K.js";
 import {
   printError,
   printHeader,
   printOk
-} from "./chunk-PPAMZ32Z.js";
+} from "./chunk-XK56QHLX.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-LU7P4LHA.js";
 import "./chunk-IHXBNWMM.js";
-import "./chunk-SST6Z5JA.js";
-import "./chunk-FO5ZOVUY.js";
+import "./chunk-B5CSFE7B.js";
+import "./chunk-IJ7RPIYJ.js";
+import "./chunk-FQ4SKYE4.js";
+import "./chunk-ZGVHUX3M.js";
+import "./chunk-TT36MB5S.js";
+import "./chunk-3BINW3FP.js";
 import "./chunk-R346GLFC.js";
+import "./chunk-6EJMN2Y3.js";
+import "./chunk-IWHMRKLL.js";
+import "./chunk-4DGYLA73.js";
+import "./chunk-LL4KHSZI.js";
 import "./chunk-4ZG3XFUR.js";
+import "./chunk-EQ63NRB7.js";
+import "./chunk-SST6Z5JA.js";
+import "./chunk-IKCO5N3L.js";
+import "./chunk-3I7MS7N2.js";
 import "./chunk-APJ265NV.js";
-import "./chunk-YXLYO42X.js";
 import {
   clioStateDir
 } from "./chunk-BNAZZHFG.js";
-import "./chunk-6EJMN2Y3.js";
 import "./chunk-WEPFGWHJ.js";
-import "./chunk-XE2VEJHX.js";
-import "./chunk-ZGVHUX3M.js";
-import "./chunk-G7MUEIGA.js";
-import "./chunk-IWHMRKLL.js";
+import "./chunk-NUGM5KR6.js";
+import "./chunk-YXLYO42X.js";
 import {
   init_esm_shims
 } from "./chunk-3R73A4XB.js";
@@ -341,4 +344,4 @@ async function runUpgradeCommand(argv) {
 export {
   runUpgradeCommand
 };
-//# sourceMappingURL=upgrade-JKAR27XC.js.map
+//# sourceMappingURL=upgrade-FUSUAGHR.js.map

package/dist/{usage-MSAWCLX4.js → usage-N4MKVHKD.js}

@@ -1,11 +1,19 @@
 import { createRequire as __clioCreateRequire } from "node:module"; const require = __clioCreateRequire(import.meta.url);
+import "./chunk-U6MBIEMB.js";
+import "./chunk-FBVTI2TJ.js";
+import "./chunk-DR52UMZW.js";
 import {
-  readEvidenceIndex
-} from "./chunk-HC4CLZ2Y.js";
+  loadSkills
+} from "./chunk-TANS5ZJS.js";
+import "./chunk-DGSYXYMX.js";
+import {
+  readEvidenceIndex,
+  readOutOfTurnUsageRows
+} from "./chunk-GWS3VEIW.js";
 import {
   loadMemoryRecordsSync
-} from "./chunk-6US73PDB.js";
-import "./chunk-QM3F2GKX.js";
+} from "./chunk-TYPGUK6W.js";
+import "./chunk-TLQJPP24.js";
 import {
   addResponseModelIdObservationCount,
   emptyResponseModelIdObservationCounts,
@@ -14,79 +22,84 @@ import {
   parseSessionEntries,
   readAuditRows,
   responseModelIdObservationCountsLabel
-} from "./chunk-CJUB2JJ2.js";
-import "./chunk-QKMUKYO7.js";
-import "./chunk-OH3TOQTB.js";
-import "./chunk-TSHXZTOQ.js";
+} from "./chunk-YS5VLNH5.js";
+import "./chunk-K4XHGFR5.js";
+import "./chunk-MXKJU4JB.js";
+import "./chunk-J3YUBZWY.js";
+import "./chunk-RVG5JXAL.js";
+import "./chunk-W6GROXXM.js";
+import "./chunk-E77JEWSD.js";
+import "./chunk-DYIM5TJT.js";
+import "./chunk-2HEJ2F35.js";
 import "./chunk-TXOTCRLG.js";
 import "./chunk-HVDIIIQW.js";
-import "./chunk-MFFY33HR.js";
-import {
-  loadSkills
-} from "./chunk-4BPJXDWC.js";
-import "./chunk-2SFS6XQE.js";
-import "./chunk-ZWLZP4ZT.js";
-import "./chunk-W6GROXXM.js";
-import "./chunk-WHGPSPT5.js";
-import "./chunk-XXQNGV4M.js";
-import "./chunk-43AOLP7E.js";
-import "./chunk-EKY57CSP.js";
-import "./chunk-22NAGB7X.js";
-import "./chunk-AOCYTWAV.js";
-import "./chunk-MV3K5QF2.js";
-import "./chunk-CMZWFGD2.js";
-import "./chunk-I4HZDVNP.js";
-import "./chunk-FYYLNIL5.js";
-import "./chunk-UL3WSD3F.js";
+import "./chunk-ZVJ5BLO2.js";
+import "./chunk-A3WNZD3P.js";
+import "./chunk-5FR74PWO.js";
+import "./chunk-P43ETTHK.js";
+import "./chunk-H7IXIC72.js";
+import "./chunk-5H3GB5BO.js";
+import "./chunk-A2NJGIB3.js";
 import "./chunk-OQE5J4C6.js";
-import "./chunk-ECH6PKUQ.js";
 import "./chunk-GOXNB3AO.js";
 import "./chunk-HWUFFB6L.js";
+import "./chunk-TTHACPOM.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-CMZWFGD2.js";
+import "./chunk-I4HZDVNP.js";
 import "./chunk-6XLNIQDB.js";
 import "./chunk-5B2AEOW5.js";
 import "./chunk-CGKSTWHD.js";
 import "./chunk-XAKHZX5N.js";
 import "./chunk-33YXPOE3.js";
-import "./chunk-24I7BN55.js";
+import "./chunk-7CR24IG7.js";
+import "./chunk-IFBNV6H6.js";
 import {
   formatColumns,
   printError
-} from "./chunk-PPAMZ32Z.js";
+} from "./chunk-XK56QHLX.js";
 import "./chunk-5TSRNF4G.js";
-import "./chunk-DJVECN66.js";
+import "./chunk-7RFXX52T.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-LU7P4LHA.js";
+import "./chunk-RWSI4YD7.js";
 import "./chunk-IHXBNWMM.js";
-import "./chunk-GEYXPTRF.js";
-import "./chunk-SST6Z5JA.js";
+import "./chunk-B5CSFE7B.js";
+import "./chunk-IJ7RPIYJ.js";
+import "./chunk-FQ4SKYE4.js";
+import "./chunk-ZGVHUX3M.js";
+import "./chunk-TT36MB5S.js";
 import {
   cwdHash
-} from "./chunk-FO5ZOVUY.js";
+} from "./chunk-3BINW3FP.js";
 import "./chunk-R346GLFC.js";
+import "./chunk-6EJMN2Y3.js";
+import "./chunk-IWHMRKLL.js";
+import "./chunk-NMPKI6XL.js";
+import "./chunk-4DGYLA73.js";
+import "./chunk-LL4KHSZI.js";
 import "./chunk-4ZG3XFUR.js";
-import "./chunk-FCSXB6T2.js";
+import "./chunk-IIZWH4XA.js";
+import "./chunk-EQ63NRB7.js";
+import "./chunk-SST6Z5JA.js";
+import "./chunk-IKCO5N3L.js";
+import "./chunk-3I7MS7N2.js";
 import "./chunk-APJ265NV.js";
-import "./chunk-YXLYO42X.js";
 import {
   clioDataDir,
   clioStateDir
 } from "./chunk-BNAZZHFG.js";
-import "./chunk-6EJMN2Y3.js";
 import "./chunk-WEPFGWHJ.js";
-import "./chunk-ZGVHUX3M.js";
-import "./chunk-G7MUEIGA.js";
-import "./chunk-7CR24IG7.js";
-import "./chunk-IWHMRKLL.js";
+import "./chunk-NUGM5KR6.js";
+import "./chunk-PT7HYKEM.js";
+import "./chunk-FCSXB6T2.js";
+import "./chunk-YXLYO42X.js";
 import {
   init_esm_shims
 } from "./chunk-3R73A4XB.js";
@@ -98,9 +111,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
@@ -134,6 +148,35 @@ function emptyUsageTotals() {
 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;
@@ -245,6 +288,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));
@@ -318,23 +366,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.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);
+      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)
   );
@@ -404,8 +462,17 @@ 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",
@@ -463,10 +530,15 @@ 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) {
@@ -834,4 +906,4 @@ export {
   inWindow,
   runUsageCommand
 };
-//# sourceMappingURL=usage-MSAWCLX4.js.map
+//# sourceMappingURL=usage-N4MKVHKD.js.map