@iowarp/clio-coder 0.4.2 → 0.4.3

package/dist/upgrade-M4WXY6KN.js

@@ -0,0 +1,303 @@
+import { createRequire as __clioCreateRequire } from "node:module"; const require = __clioCreateRequire(import.meta.url);
+import {
+  detectInstallMethod
+} from "./chunk-UOIZ7DA4.js";
+import {
+  listMigrations,
+  readMigrationManifest,
+  runPending
+} from "./chunk-GWZNEVM2.js";
+import "./chunk-5ICU3EUH.js";
+import {
+  readStateInfo
+} from "./chunk-IGLP3ODT.js";
+import "./chunk-3M6DQK6S.js";
+import "./chunk-LCGCVYZ4.js";
+import "./chunk-NDDGJUXD.js";
+import "./chunk-5MEZN6CB.js";
+import {
+  createLifecyclePresenter,
+  shortenPath
+} from "./chunk-SKHCAU7K.js";
+import "./chunk-2IR2NMPA.js";
+import {
+  initializeClioHome
+} from "./chunk-I7XBWTYH.js";
+import "./chunk-PUVDKJ2Y.js";
+import {
+  printError
+} from "./chunk-VPKWYKEY.js";
+import "./chunk-5TSRNF4G.js";
+import "./chunk-QSNYB6ZV.js";
+import "./chunk-QDC3K2U3.js";
+import "./chunk-KXDSS5WJ.js";
+import "./chunk-GHS5EBTQ.js";
+import "./chunk-D7E7WCDF.js";
+import {
+  getVersionInfo
+} from "./chunk-XPLRXC72.js";
+import "./chunk-IWHMRKLL.js";
+import "./chunk-UXCU4E3T.js";
+import "./chunk-LL4KHSZI.js";
+import "./chunk-S66XZJOF.js";
+import "./chunk-EBY63B7G.js";
+import "./chunk-ID64D7PE.js";
+import "./chunk-336NSSKI.js";
+import "./chunk-IKCO5N3L.js";
+import "./chunk-3I7MS7N2.js";
+import "./chunk-APJ265NV.js";
+import "./chunk-WEPFGWHJ.js";
+import "./chunk-YXLYO42X.js";
+import {
+  clioStateDir
+} from "./chunk-BYP5D4HI.js";
+import {
+  init_esm_shims
+} from "./chunk-3R73A4XB.js";
+
+// src/cli/upgrade.ts
+init_esm_shims();
+import { spawn } from "node:child_process";
+var CHANNELS = ["latest", "beta", "dev"];
+var HELP = `clio-coder upgrade [--dry-run] [--channel=<latest|beta|dev>] [--skip-migrations] [--json]
+
+Upgrade Clio Coder and apply pending state migrations. An npm-installed
+binary is reinstalled via npm; a source-checkout install instead prints
+the git-based update steps and never touches the global npm prefix.
+
+Flags:
+  --dry-run             print planned actions without changing anything
+  --channel=<chan>      npm dist-tag to install (latest|beta|dev). npm installs only.
+  --skip-migrations     skip migrations after the install step
+  --json                emit machine-readable JSON output
+  --help, -h            show this message
+`;
+var SOURCE_UPGRADE_STEPS = ["git pull", "npm run install:local", "hash -r"];
+var SOURCE_UPGRADE_LEAD = "To update the checkout itself, run:";
+function parseUpgradeArgs(argv) {
+  let dryRun = false;
+  let channel = "latest";
+  let skipMigrations = false;
+  let help = false;
+  let postInstall = false;
+  let json = false;
+  const toChannel = (value) => {
+    if (value === void 0 || !CHANNELS.includes(value)) {
+      throw new Error(`--channel must be one of ${CHANNELS.join("|")}, got '${value ?? ""}'`);
+    }
+    return value;
+  };
+  for (let i = 0; i < argv.length; i += 1) {
+    const arg = argv[i];
+    if (arg === void 0 || arg === "upgrade") continue;
+    if (arg === "--help" || arg === "-h") help = true;
+    else if (arg === "--dry-run") dryRun = true;
+    else if (arg === "--skip-migrations") skipMigrations = true;
+    else if (arg === "--post-install") postInstall = true;
+    else if (arg === "--json") json = true;
+    else if (arg.startsWith("--channel=")) channel = toChannel(arg.slice("--channel=".length));
+    else if (arg === "--channel") {
+      channel = toChannel(argv[i + 1]);
+      i += 1;
+    } else throw new Error(`unknown upgrade argument: ${arg}`);
+  }
+  return { dryRun, channel, skipMigrations, help, postInstall, json };
+}
+async function lookUpAvailableVersion(channel, method, noNetwork) {
+  const seam = process.env.CLIO_CODER_TEST_UPGRADE_AVAILABLE;
+  if (seam) return { asked: true, version: seam === "unreachable" ? null : seam };
+  if (noNetwork) return { asked: false, reason: "network checks are disabled" };
+  if (method === "source") return { asked: false, reason: "source checkout" };
+  try {
+    const res = await fetch(`https://registry.npmjs.org/@iowarp/clio-coder/${channel}`, {
+      headers: { Accept: "application/json" },
+      signal: AbortSignal.timeout(2500)
+    });
+    if (!res.ok) return { asked: true, version: null };
+    const data = await res.json();
+    return { asked: true, version: typeof data.version === "string" ? data.version : null };
+  } catch {
+    return { asked: true, version: null };
+  }
+}
+async function runChild(command, args, label) {
+  await new Promise((resolve, reject) => {
+    const child = spawn(command, [...args], { stdio: ["ignore", "pipe", "pipe"] });
+    let tail = "";
+    const keepTail = (chunk) => {
+      tail = `${tail}${chunk.toString("utf8")}`.slice(-2e3);
+    };
+    child.stdout?.on("data", keepTail);
+    child.stderr?.on("data", keepTail);
+    child.on("error", reject);
+    child.on("close", (code) => {
+      if (code === 0) {
+        resolve();
+        return;
+      }
+      const lastLine = tail.trimEnd().split("\n").at(-1) ?? "";
+      reject(new Error(`${label} exited with code ${code ?? -1}${lastLine ? `: ${lastLine}` : ""}`));
+    });
+  });
+}
+async function runNpmInstall(channel) {
+  if (process.env.CLIO_CODER_TEST_UPGRADE_FAIL === "npm") {
+    throw new Error("npm ERR! 404 Not Found (mock failure)");
+  }
+  await runChild("npm", ["install", "-g", `@iowarp/clio-coder@${channel}`], "npm install");
+}
+async function runDoctorFixAfterInstall() {
+  if (process.env.CLIO_CODER_TEST_UPGRADE_FAIL === "doctor") {
+    throw new Error("mock doctor fix failure");
+  }
+  await runChild("clio-coder", ["doctor", "--fix"], "clio-coder doctor --fix");
+}
+async function runPostInstallUpgrade(opts) {
+  const args = ["upgrade", "--post-install", `--channel=${opts.channel}`];
+  if (opts.skipMigrations) args.push("--skip-migrations");
+  await runChild("clio-coder", args, "clio-coder upgrade --post-install");
+}
+async function runUpgradeCommand(argv) {
+  let opts;
+  try {
+    opts = parseUpgradeArgs(argv);
+  } catch (err) {
+    printError(err instanceof Error ? err.message : String(err));
+    return 2;
+  }
+  if (opts.help) {
+    process.stdout.write(HELP);
+    return 0;
+  }
+  const presenter = createLifecyclePresenter({ json: opts.json });
+  presenter.header("Upgrade", "upgrade");
+  const before = getVersionInfo().clio;
+  const stateDir = clioStateDir();
+  const method = detectInstallMethod();
+  const methodLabel = method === "source" ? "source checkout" : "npm global";
+  presenter.setMethod(methodLabel);
+  const noNetwork = Boolean(process.env.CLIO_CODER_TEST_UPGRADE_NO_NETWORK);
+  const lookup = await lookUpAvailableVersion(opts.channel, method, noNetwork);
+  const availableVersion = lookup.asked ? lookup.version : null;
+  presenter.step(`Installation method: ${methodLabel}`);
+  presenter.step(`Current version: ${before}`);
+  if (availableVersion !== null) presenter.step(`Available version: ${availableVersion}`);
+  else if (!lookup.asked) presenter.step(`Available version: not checked (${lookup.reason})`);
+  else presenter.step("Available version: unknown (the registry could not be reached)");
+  if (method === "npm") presenter.step(`Channel: ${opts.channel}`);
+  presenter.step(`State dir: ${shortenPath(stateDir)}`);
+  const migrations = listMigrations();
+  const migrationIds = migrations.map((m) => m.id);
+  const appliedIds = new Set(readMigrationManifest(stateDir).applied);
+  const pendingMigrationIds = opts.skipMigrations ? [] : migrationIds.filter((id) => !appliedIds.has(id));
+  const recorded = readStateInfo()?.version ?? null;
+  const describeRefresh = () => recorded === null ? "state metadata (none recorded)" : recorded === before ? `state metadata (already ${before})` : `state metadata ${recorded} -> ${before}`;
+  const versionIsCurrent = (lookup.asked ? lookup.version === before : true) && (recorded === null || recorded === before);
+  const hasPendingMigrations = pendingMigrationIds.length > 0;
+  if (versionIsCurrent && !hasPendingMigrations) {
+    presenter.warn(`Already on ${before}, with no pending migrations. Nothing to do.`);
+    if (method === "source") presenter.commandAdvice(SOURCE_UPGRADE_LEAD, SOURCE_UPGRADE_STEPS.join("\n"));
+    if (opts.dryRun) presenter.warn("Dry run: no changes made");
+    presenter.done("Done");
+    return 0;
+  }
+  if (opts.dryRun) {
+    if (method === "source") presenter.commandAdvice(SOURCE_UPGRADE_LEAD, SOURCE_UPGRADE_STEPS.join("\n"));
+    else presenter.note(`Would run: npm install -g @iowarp/clio-coder@${opts.channel}`);
+    if (opts.skipMigrations) presenter.note("Would skip migrations (--skip-migrations).");
+    else if (pendingMigrationIds.length === 0) presenter.note("No pending migrations.");
+    else {
+      presenter.note(
+        `Would apply ${pendingMigrationIds.length} pending migration${pendingMigrationIds.length === 1 ? "" : "s"}:`
+      );
+      for (const id of pendingMigrationIds) presenter.substep(id, "\u2013");
+    }
+    presenter.note(`Would refresh ${describeRefresh()}.`);
+    presenter.warn("Dry run: no changes made");
+    presenter.done("Done");
+    return 0;
+  }
+  if (opts.postInstall) {
+    presenter.note("Running post-install checks with the active clio-coder binary.");
+  } else if (method === "source") {
+    presenter.note("Source checkout: no npm install to run.");
+  } else if (noNetwork) {
+    presenter.note("CLIO_CODER_TEST_UPGRADE_NO_NETWORK is set; skipping npm install.");
+  } else {
+    try {
+      await runNpmInstall(opts.channel);
+      presenter.completedStep(`Installed @iowarp/clio-coder@${opts.channel}`);
+    } catch (err) {
+      presenter.fail("npm install failed", err instanceof Error ? err.message : String(err));
+      presenter.commandAdvice(
+        "To upgrade by hand, run:",
+        `npm install -g @iowarp/clio-coder@${opts.channel}
+clio-coder doctor --fix`
+      );
+      presenter.finish();
+      return 1;
+    }
+    try {
+      await runPostInstallUpgrade(opts);
+      presenter.done("Done");
+      return 0;
+    } catch (err) {
+      presenter.fail("post-install checks failed", err instanceof Error ? err.message : String(err));
+      presenter.commandAdvice("To finish the upgrade by hand, run:", "clio-coder doctor --fix");
+      presenter.finish();
+      return 1;
+    }
+  }
+  let appliedCount = 0;
+  if (opts.skipMigrations) {
+    presenter.note("Skipping migrations (--skip-migrations).");
+  } else {
+    let result;
+    try {
+      if (process.env.CLIO_CODER_TEST_UPGRADE_FAIL === "migration") {
+        throw new Error("mock migration failure in 2026-09-01-settings-v2");
+      }
+      result = await runPending(stateDir);
+    } catch (err) {
+      presenter.fail("migration failed", err instanceof Error ? err.message : String(err));
+      presenter.commandAdvice(
+        "The rest of the upgrade does not depend on it. To continue, run:",
+        "clio-coder upgrade --skip-migrations"
+      );
+      presenter.finish();
+      return 1;
+    }
+    const applied = [...result.applied];
+    appliedCount = applied.length;
+    if (appliedCount === 0) presenter.note("No pending migrations.");
+    else for (const id of applied) presenter.completedStep(`Applied migration ${id}`);
+  }
+  if (method === "source" || noNetwork) {
+    const refresh = describeRefresh();
+    initializeClioHome();
+    presenter.completedStep(`Refreshed ${refresh}`);
+  } else {
+    try {
+      await runDoctorFixAfterInstall();
+      presenter.completedStep("Checked the install with clio-coder doctor --fix");
+    } catch (err) {
+      presenter.fail("doctor fix failed", err instanceof Error ? err.message : String(err));
+      presenter.commandAdvice("To resolve the findings by hand, run:", "clio-coder doctor --fix");
+      presenter.finish();
+      return 1;
+    }
+  }
+  if (method === "source") presenter.commandAdvice(SOURCE_UPGRADE_LEAD, SOURCE_UPGRADE_STEPS.join("\n"));
+  const after = getVersionInfo().clio;
+  if (appliedCount > 0 || (recorded ?? before) !== after) {
+    presenter.note(
+      `Now on ${after}${appliedCount > 0 ? `, ${appliedCount} migration${appliedCount === 1 ? "" : "s"} applied` : ""}.`
+    );
+  }
+  presenter.done("Done");
+  return 0;
+}
+export {
+  runUpgradeCommand
+};
+//# sourceMappingURL=upgrade-M4WXY6KN.js.map

package/dist/{usage-ME5MPXGX.js → usage-N7ZNVLEM.js}

@@ -1,14 +1,23 @@
 import { createRequire as __clioCreateRequire } from "node:module"; const require = __clioCreateRequire(import.meta.url);
+import {
+  summarizeFailedCompactionUsage
+} from "./chunk-IJNZMHLA.js";
 import {
   readEvidenceIndex,
   readOutOfTurnUsageRows
-} from "./chunk-AK5XEFVZ.js";
+} from "./chunk-VA5FNYMT.js";
 import {
   loadMemoryRecordsSync
-} from "./chunk-JBCS7CRR.js";
-import "./chunk-I66ZTYNP.js";
-import "./chunk-ZGNYYXQ6.js";
-import "./chunk-B74PXLU7.js";
+} from "./chunk-BEPZRGGU.js";
+import "./chunk-G76U63X4.js";
+import "./chunk-UPZU6GE4.js";
+import "./chunk-RRNP2ANY.js";
+import "./chunk-DR52UMZW.js";
+import "./chunk-AF4YM7Z4.js";
+import "./chunk-B4VEBZKF.js";
+import "./chunk-E3TPLWFX.js";
+import "./chunk-WRBAGUNF.js";
+import "./chunk-IWT4SF4R.js";
 import {
   addResponseModelIdObservationCount,
   emptyResponseModelIdObservationCounts,
@@ -17,109 +26,104 @@ import {
   parseSessionEntries,
   readAuditRows,
   responseModelIdObservationCountsLabel
-} from "./chunk-X7IARSHT.js";
-import "./chunk-KPXDY6QF.js";
-import "./chunk-W6NIE6OW.js";
-import "./chunk-DZAW46HP.js";
+} from "./chunk-JKKCYP3C.js";
+import "./chunk-FTMGRKEF.js";
+import "./chunk-XRZT5WY5.js";
 import "./chunk-RVG5JXAL.js";
-import {
-  foldPromptCacheTelemetry,
-  hasPromptCacheTelemetry
-} from "./chunk-3DPEIQKN.js";
-import "./chunk-5PFYMY2V.js";
 import "./chunk-VIA6RFQZ.js";
 import "./chunk-T56WDKA5.js";
 import "./chunk-W6GROXXM.js";
-import "./chunk-4JDLP6ZS.js";
+import "./chunk-2VIKGWFZ.js";
+import "./chunk-RKKLTLYB.js";
+import "./chunk-6PTFB5VS.js";
 import "./chunk-TXOTCRLG.js";
-import "./chunk-HVDIIIQW.js";
-import "./chunk-ZNT2M6TG.js";
-import "./chunk-P75RZCJW.js";
-import "./chunk-CRFOIAX3.js";
-import "./chunk-DR52UMZW.js";
 import {
   loadSkills
-} from "./chunk-O3YUNJZ2.js";
+} from "./chunk-LDJG7DW3.js";
 import "./chunk-NDDGJUXD.js";
-import "./chunk-XGDPUNND.js";
-import "./chunk-3F7VUY77.js";
-import "./chunk-RKKLTLYB.js";
-import "./chunk-HLAFFSEK.js";
-import "./chunk-77QIVUZB.js";
-import "./chunk-I66EAJFY.js";
-import "./chunk-IKSLQ4XV.js";
-import "./chunk-HIICAHCJ.js";
-import "./chunk-Q4XWMHX6.js";
-import "./chunk-IDNA72AH.js";
-import "./chunk-FVDGR2ZL.js";
+import "./chunk-CE5AX47J.js";
+import {
+  foldPromptCacheTelemetry,
+  hasPromptCacheTelemetry
+} from "./chunk-3DPEIQKN.js";
+import "./chunk-7DRAWPTZ.js";
+import "./chunk-5MEZN6CB.js";
+import "./chunk-PUVDKJ2Y.js";
+import "./chunk-HVDIIIQW.js";
+import {
+  formatColumns,
+  printError
+} from "./chunk-VPKWYKEY.js";
+import "./chunk-5TSRNF4G.js";
+import "./chunk-2WZ546HR.js";
+import "./chunk-PAJQJ7BS.js";
+import "./chunk-EKCHAPYA.js";
+import "./chunk-L47TF46W.js";
+import "./chunk-RSJ25QSL.js";
+import "./chunk-XIVNBFZS.js";
 import "./chunk-NEDJ26B5.js";
 import "./chunk-42FMPA75.js";
 import "./chunk-H7IXIC72.js";
-import "./chunk-VN3SHNBN.js";
+import "./chunk-7DICMOS6.js";
 import "./chunk-OQE5J4C6.js";
-import "./chunk-FSP7CMNU.js";
-import "./chunk-B7HM5Z7T.js";
-import "./chunk-OZNBF4L3.js";
-import "./chunk-4BJ5BYCE.js";
-import "./chunk-6XLNIQDB.js";
-import "./chunk-NMJXSHBJ.js";
-import "./chunk-VAVR4IJY.js";
-import "./chunk-2LEAKD4C.js";
 import "./chunk-HHV2GANA.js";
-import "./chunk-PGF63K6I.js";
-import "./chunk-IKOZFYBN.js";
+import "./chunk-B4OAX3SI.js";
+import "./chunk-I7ZPNEJM.js";
+import "./chunk-GYV6VZOC.js";
 import "./chunk-UL3WSD3F.js";
+import "./chunk-JDAY6FIL.js";
+import "./chunk-OZNBF4L3.js";
 import "./chunk-ECH6PKUQ.js";
+import "./chunk-6XLNIQDB.js";
 import "./chunk-5B2AEOW5.js";
+import "./chunk-VAVR4IJY.js";
+import "./chunk-JGRC33J2.js";
+import "./chunk-4BJ5BYCE.js";
 import "./chunk-K6BSR66V.js";
-import "./chunk-XAKHZX5N.js";
-import "./chunk-33YXPOE3.js";
-import "./chunk-7CR24IG7.js";
-import "./chunk-XPLRXC72.js";
-import "./chunk-ZW55JB7N.js";
-import {
-  formatColumns,
-  printError
-} from "./chunk-VPKWYKEY.js";
-import "./chunk-5TSRNF4G.js";
-import "./chunk-BYMNWQ7O.js";
+import "./chunk-XPWWI35G.js";
 import "./chunk-CFGTUFWB.js";
-import "./chunk-72GZI5EV.js";
-import "./chunk-CWVRRIEI.js";
+import "./chunk-NZMNUPZZ.js";
+import "./chunk-2JH2WHGE.js";
 import {
   cwdHash
-} from "./chunk-MQXIVJ35.js";
+} from "./chunk-HAXOFFRH.js";
 import "./chunk-R346GLFC.js";
-import "./chunk-PMZVFWSR.js";
-import "./chunk-BTK3SSSK.js";
-import "./chunk-IHXBNWMM.js";
-import "./chunk-34BHNEE3.js";
+import "./chunk-KXDSS5WJ.js";
+import "./chunk-GHS5EBTQ.js";
 import "./chunk-D7E7WCDF.js";
-import "./chunk-HJWWJ6IL.js";
+import "./chunk-BTK3SSSK.js";
+import "./chunk-NMJXSHBJ.js";
+import "./chunk-PMZVFWSR.js";
 import "./chunk-F4EKGO4N.js";
-import "./chunk-JIEGK6UF.js";
-import "./chunk-EBY63B7G.js";
-import "./chunk-6EJMN2Y3.js";
+import "./chunk-XAKHZX5N.js";
+import "./chunk-33YXPOE3.js";
+import "./chunk-7CR24IG7.js";
+import "./chunk-XPLRXC72.js";
 import "./chunk-IWHMRKLL.js";
-import "./chunk-IMXMHHMQ.js";
+import "./chunk-VW6DOEDG.js";
 import "./chunk-UXCU4E3T.js";
 import "./chunk-LL4KHSZI.js";
+import "./chunk-JSC3U7TI.js";
 import "./chunk-S66XZJOF.js";
-import "./chunk-CDNVLKUX.js";
-import "./chunk-WNP7O5WZ.js";
+import "./chunk-JIEGK6UF.js";
+import "./chunk-EBY63B7G.js";
+import "./chunk-6EJMN2Y3.js";
+import "./chunk-LLDJM5XK.js";
+import "./chunk-ID64D7PE.js";
 import "./chunk-336NSSKI.js";
 import "./chunk-IKCO5N3L.js";
 import "./chunk-3I7MS7N2.js";
 import "./chunk-APJ265NV.js";
+import "./chunk-WEPFGWHJ.js";
+import "./chunk-NUGM5KR6.js";
+import "./chunk-5OIVVPHF.js";
+import "./chunk-YPC6ZR5L.js";
+import "./chunk-YXLYO42X.js";
+import "./chunk-2LEAKD4C.js";
 import {
   clioDataDir,
   clioStateDir
 } from "./chunk-BYP5D4HI.js";
-import "./chunk-WEPFGWHJ.js";
-import "./chunk-NUGM5KR6.js";
-import "./chunk-O42A54GG.js";
-import "./chunk-VXMFAE2W.js";
-import "./chunk-YXLYO42X.js";
 import {
   init_esm_shims
 } from "./chunk-3R73A4XB.js";
@@ -169,19 +173,20 @@ function addResponseModelIdObservation(counts, call) {
   addResponseModelIdObservationCount(counts, call.responseModelIdObservation, call.apiCalls ?? 1);
 }
 function emptyCallOrigins() {
-  return { rows: 0, sideQuestions: 0, handoffs: 0, prewarms: 0, backgroundMemory: 0 };
+  return { rows: 0, sideQuestions: 0, handoffs: 0, prewarms: 0, backgroundMemory: 0, failedCompaction: 0 };
 }
 function turnsOf(origins) {
-  return origins.rows - origins.sideQuestions - origins.handoffs - origins.prewarms - origins.backgroundMemory;
+  return origins.rows - origins.sideQuestions - origins.handoffs - origins.prewarms - origins.backgroundMemory - origins.failedCompaction;
 }
 function hasLabelledCall(origins) {
-  return origins.sideQuestions > 0 || origins.handoffs > 0 || origins.prewarms > 0 || origins.backgroundMemory > 0;
+  return origins.sideQuestions > 0 || origins.handoffs > 0 || origins.prewarms > 0 || origins.backgroundMemory > 0 || origins.failedCompaction > 0;
 }
 function addOutOfTurnRow(origins, row) {
   origins.rows += 1;
   if (row.label === "side-question") origins.sideQuestions += 1;
   else if (row.label === "prewarm") origins.prewarms += 1;
   else if (row.label === "background-memory") origins.backgroundMemory += 1;
+  else if (row.label === "failed-compaction") origins.failedCompaction += 1;
   else origins.handoffs += 1;
 }
 function outOfTurnUsageCall(row) {
@@ -190,15 +195,28 @@ function outOfTurnUsageCall(row) {
     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
+    input: row.usage.input ?? 0,
+    output: row.usage.output ?? 0,
+    cacheRead: row.usage.cacheRead ?? 0,
+    cacheWrite: row.usage.cacheWrite ?? 0,
+    reasoningTokens: row.usage.reasoning ?? 0,
+    totalTokens: row.usage.totalTokens ?? 0,
+    costUsd: row.usage.costUsd ?? 0
   };
 }
+function reportedUsageTotals(totals, rows) {
+  const failedCompaction = summarizeFailedCompactionUsage(rows);
+  if (failedCompaction.calls === 0) return totals;
+  const reported = { ...totals, knownSubtotals: true, failedCompaction };
+  for (const [field, missing] of Object.entries(failedCompaction.unobservedUsageCalls)) {
+    const key = field === "reasoning" ? "reasoningTokens" : field;
+    if (missing > 0 && reported[key] === 0) reported[key] = null;
+  }
+  return reported;
+}
+function usageAmount(value) {
+  return typeof value === "number" ? String(value) : "unknown";
+}
 function addUsageCall(totals, call) {
   totals.apiCalls += call.apiCalls ?? 1;
   totals.input += call.input;
@@ -415,6 +433,8 @@ async function runUsageCommand(argv) {
     addOutOfTurnRow(callOrigins, row);
   }
   const usageMeasurable = presence.sessionsPresent || outOfTurnRows.length > 0;
+  const reportedTotals = reportedUsageTotals(usageTotals, outOfTurnRows);
+  const failedCompaction = summarizeFailedCompactionUsage(outOfTurnRows);
   const usageRows = [...usageByModel.values()].sort(
     (a, b) => b.totals.totalTokens - a.totals.totalTokens || a.providerId.localeCompare(b.providerId)
   );
@@ -489,13 +509,14 @@ async function runUsageCommand(argv) {
       emit({
         kind: "fact",
         fact: "tokens",
-        ...usageTotals,
+        ...reportedTotals,
         ...hasLabelledCall(callOrigins) ? {
           turns: turnsOf(callOrigins),
           sideQuestions: callOrigins.sideQuestions,
           handoffs: callOrigins.handoffs,
           prewarms: callOrigins.prewarms,
-          backgroundMemorySteps: callOrigins.backgroundMemory
+          backgroundMemorySteps: callOrigins.backgroundMemory,
+          ...callOrigins.failedCompaction > 0 ? { failedCompactionCalls: callOrigins.failedCompaction } : {}
         } : {}
       });
       for (const row of usageRows) {
@@ -506,7 +527,12 @@ async function runUsageCommand(argv) {
           attributedModelId: row.attributedModelId,
           requestedModelIds: [...row.requestedModelIds].sort(),
           responseModelIdObservationCounts: row.responseModelIdObservationCounts,
-          ...row.totals
+          ...reportedUsageTotals(
+            row.totals,
+            outOfTurnRows.filter(
+              (call) => call.target === row.providerId && call.attributedModelId === row.attributedModelId
+            )
+          )
         });
       }
       for (const session of cacheSessions) {
@@ -566,7 +592,7 @@ async function runUsageCommand(argv) {
   out(`  audited tool calls in window: ${auditToolCalls.length} (${auditBlocked.length} blocked/denied)`);
   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})`
+      `  tokens in window: ${usageAmount(reportedTotals.totalTokens)} over ${usageTotals.apiCalls} model calls (input ${usageAmount(reportedTotals.input)}, output ${usageAmount(reportedTotals.output)}, cache read ${usageAmount(reportedTotals.cacheRead)}, cache write ${usageAmount(reportedTotals.cacheWrite)}, reasoning ${usageAmount(reportedTotals.reasoningTokens)})`
     );
     if (hasLabelledCall(callOrigins)) {
       out(`  turns in window: ${turnsOf(callOrigins)}`);
@@ -577,7 +603,18 @@ async function runUsageCommand(argv) {
         out(`  background memory steps in window: ${callOrigins.backgroundMemory}`);
       }
     }
-    out(`  provider-reported cost in window: $${usageTotals.costUsd.toFixed(4)}`);
+    if (failedCompaction.calls > 0) {
+      out(
+        `  failed-compaction streams: ${failedCompaction.calls} (${failedCompaction.erroredCalls} errored, ${failedCompaction.abortedCalls} aborted, ${failedCompaction.successfulCalls} completed before the attempt failed)`
+      );
+      out("  usage figures are known subtotals; missing compaction usage is not zero or a complete spending bound");
+      out(
+        `  errored compaction known cost: ${failedCompaction.erroredKnownUsage.costUsd === null ? "unknown" : `$${failedCompaction.erroredKnownUsage.costUsd.toFixed(4)}`}`
+      );
+    }
+    out(
+      `  ${failedCompaction.calls > 0 ? "known reported/estimated" : "provider-reported"} cost in window: ${typeof reportedTotals.costUsd === "number" ? `$${reportedTotals.costUsd.toFixed(4)}` : "unknown"}`
+    );
   }
   if (usageRows.length > 0) {
     out("");
@@ -598,19 +635,27 @@ async function runUsageCommand(argv) {
             "tokens",
             "cost"
           ],
-          ...usageRows.map((row) => [
-            row.providerId,
-            row.attributedModelId,
-            [...row.requestedModelIds].sort().join(","),
-            responseModelIdObservationCountsLabel(row.responseModelIdObservationCounts),
-            String(row.totals.apiCalls),
-            String(row.totals.input),
-            String(row.totals.output),
-            String(row.totals.cacheRead),
-            String(row.totals.reasoningTokens),
-            String(row.totals.totalTokens),
-            `$${row.totals.costUsd.toFixed(4)}`
-          ])
+          ...usageRows.map((row) => {
+            const reported = reportedUsageTotals(
+              row.totals,
+              outOfTurnRows.filter(
+                (call) => call.target === row.providerId && call.attributedModelId === row.attributedModelId
+              )
+            );
+            return [
+              row.providerId,
+              row.attributedModelId,
+              [...row.requestedModelIds].sort().join(","),
+              responseModelIdObservationCountsLabel(row.responseModelIdObservationCounts),
+              String(row.totals.apiCalls),
+              usageAmount(reported.input),
+              usageAmount(reported.output),
+              usageAmount(reported.cacheRead),
+              usageAmount(reported.reasoningTokens),
+              usageAmount(reported.totalTokens),
+              typeof reported.costUsd === "number" ? `$${reported.costUsd.toFixed(4)}` : "unknown"
+            ];
+          })
         ])
       )
     );
@@ -963,4 +1008,4 @@ function isRecord(value) {
 export {
   runUsageCommand
 };
-//# sourceMappingURL=usage-ME5MPXGX.js.map
+//# sourceMappingURL=usage-N7ZNVLEM.js.map