@iowarp/clio-coder 0.3.4 → 0.3.6

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

@@ -4,19 +4,22 @@ import {
 } from "./chunk-HC4CLZ2Y.js";
 import {
   loadMemoryRecordsSync
-} from "./chunk-BRXQQJFP.js";
-import "./chunk-QQL5RT5M.js";
+} from "./chunk-6US73PDB.js";
+import "./chunk-QM3F2GKX.js";
 import {
+  addResponseModelIdObservationCount,
+  emptyResponseModelIdObservationCounts,
   ledgerUsageCalls,
   listSessionLedgerRefs,
   parseSessionEntries,
-  readAuditRows
-} from "./chunk-QQK64KLB.js";
+  readAuditRows,
+  responseModelIdObservationCountsLabel
+} from "./chunk-CJUB2JJ2.js";
 import "./chunk-QKMUKYO7.js";
-import "./chunk-3JLKSKD7.js";
-import "./chunk-34475P3I.js";
+import "./chunk-OH3TOQTB.js";
+import "./chunk-TSHXZTOQ.js";
 import "./chunk-TXOTCRLG.js";
-import "./chunk-G4BMMOKF.js";
+import "./chunk-HVDIIIQW.js";
 import "./chunk-MFFY33HR.js";
 import {
   loadSkills
@@ -24,10 +27,10 @@ import {
 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-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";
@@ -37,22 +40,23 @@ import "./chunk-FYYLNIL5.js";
 import "./chunk-UL3WSD3F.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-ODFEOB4F.js";
 import "./chunk-OZNBF4L3.js";
 import "./chunk-4BJ5BYCE.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-24I7BN55.js";
 import {
   formatColumns,
   printError
-} from "./chunk-ED4KHGC3.js";
+} from "./chunk-PPAMZ32Z.js";
 import "./chunk-5TSRNF4G.js";
-import "./chunk-QWU7ZBO7.js";
+import "./chunk-DJVECN66.js";
 import "./chunk-CFGTUFWB.js";
 import "./chunk-AD2SYQYC.js";
 import "./chunk-4OC57DA6.js";
@@ -63,7 +67,7 @@ import "./chunk-FQ4SKYE4.js";
 import "./chunk-IKCO5N3L.js";
 import "./chunk-3I7MS7N2.js";
 import "./chunk-IHXBNWMM.js";
-import "./chunk-BPGS2WCQ.js";
+import "./chunk-GEYXPTRF.js";
 import "./chunk-SST6Z5JA.js";
 import {
   cwdHash
@@ -80,7 +84,7 @@ import {
 import "./chunk-6EJMN2Y3.js";
 import "./chunk-WEPFGWHJ.js";
 import "./chunk-ZGVHUX3M.js";
-import "./chunk-TTNYS3EA.js";
+import "./chunk-G7MUEIGA.js";
 import "./chunk-7CR24IG7.js";
 import "./chunk-IWHMRKLL.js";
 import {
@@ -127,6 +131,9 @@ function emptyUsageTotals() {
     costUsd: 0
   };
 }
+function addResponseModelIdObservation(counts, call) {
+  addResponseModelIdObservationCount(counts, call.responseModelIdObservation, call.apiCalls ?? 1);
+}
 function addUsageCall(totals, call) {
   totals.apiCalls += call.apiCalls ?? 1;
   totals.input += call.input;
@@ -314,12 +321,16 @@ async function runUsageCommand(argv) {
   for (const session of sessions) {
     for (const call of session.usageCalls) {
       addUsageCall(usageTotals, call);
-      const key = `${call.providerId}::${call.modelId}`;
+      const key = `${call.providerId}::${call.attributedModelId}`;
       const entry = usageByModel.get(key) ?? {
         providerId: call.providerId,
-        modelId: call.modelId,
+        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);
     }
@@ -396,7 +407,15 @@ async function runUsageCommand(argv) {
     if (presence.sessionsPresent) {
       emit({ kind: "fact", fact: "tokens", ...usageTotals });
       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 });
@@ -452,14 +471,28 @@ async function runUsageCommand(argv) {
   }
   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 +834,4 @@ export {
   inWindow,
   runUsageCommand
 };
-//# sourceMappingURL=usage-6KKXR32N.js.map
+//# sourceMappingURL=usage-MSAWCLX4.js.map

package/dist/{verifiers-4UUM6TEE.js → verifiers-NCBTHHN2.js}

@@ -1,4 +1,8 @@
 import { createRequire as __clioCreateRequire } from "node:module"; const require = __clioCreateRequire(import.meta.url);
+import {
+  parseTomlDocument,
+  tomlTableAt
+} from "./chunk-LCGCVYZ4.js";
 import {
   discoverDeclaredChecksAtRoot,
   verifyTool
@@ -24,7 +28,7 @@ import "./chunk-CGKSTWHD.js";
 import {
   printError,
   printOk
-} from "./chunk-ED4KHGC3.js";
+} from "./chunk-PPAMZ32Z.js";
 import "./chunk-5TSRNF4G.js";
 import {
   SAFE_EXEC_DEFAULT_TIMEOUT_MS,
@@ -166,8 +170,13 @@ function cargoProposals(workspaceRoot, diagnostics) {
     diagnostics.push(`${relative}: ${text.message}; Cargo discovery skipped.`);
     return [];
   }
-  const workspace = /^\s*\[workspace(?:\]|\.)/mu.test(text);
-  const packageManifest = /^\s*\[package\]/mu.test(text);
+  const document = parseTomlDocument(text);
+  if (document === null) {
+    diagnostics.push(`${relative}: invalid TOML; Cargo discovery skipped.`);
+    return [];
+  }
+  const workspace = tomlTableAt(document, ["workspace"]) !== null;
+  const packageManifest = tomlTableAt(document, ["package"]) !== null;
   if (!workspace && !packageManifest) {
     diagnostics.push(`${relative}: no [package] or [workspace] declaration was found; Cargo discovery skipped.`);
     return [];
@@ -240,71 +249,68 @@ function cmakeProposals(workspaceRoot, diagnostics) {
   if (proposals.length === 0) diagnostics.push(`${relative}: no visible buildPresets or testPresets were declared.`);
   return proposals;
 }
-function tomlSections(text) {
-  const sections = /* @__PURE__ */ new Map();
-  let active = "";
-  for (const line of text.split(/\r?\n/u)) {
-    const header = /^\s*\[([^\]]+)\]\s*(?:#.*)?$/u.exec(line);
-    if (header?.[1] !== void 0) {
-      active = header[1].trim();
-      if (!sections.has(active)) sections.set(active, []);
-      continue;
-    }
-    if (active.length > 0) sections.get(active)?.push(line);
-  }
-  return sections;
-}
-function declaredScriptName(line) {
-  const match = /^\s*(?:"([^"]+)"|'([^']+)'|([A-Za-z0-9_.:-]+))\s*=\s*(?:"[^"]+"|'[^']+')\s*(?:#.*)?$/u.exec(line);
-  return match?.[1] ?? match?.[2] ?? match?.[3] ?? null;
-}
 function pythonProposals(workspaceRoot, diagnostics) {
   const proposals = [];
   const pyprojectPath = "pyproject.toml";
   const pyproject = regularFileText(path.join(workspaceRoot, pyprojectPath), workspaceRoot);
   if (pyproject instanceof Error) diagnostics.push(`${pyprojectPath}: ${pyproject.message}; Python discovery skipped.`);
   if (typeof pyproject === "string") {
-    const sections = tomlSections(pyproject);
-    for (const [section, module, id, description, tags2] of [
-      ["tool.pytest.ini_options", "pytest", "python-pytest", "Run the declared pytest suite", ["python", "test"]],
-      ["tool.tox", "tox", "python-tox", "Run the declared tox environments", ["python", "test"]],
-      ["tool.nox", "nox", "python-nox", "Run the declared nox sessions", ["python", "test"]]
-    ]) {
-      if (!sections.has(section)) continue;
-      proposals.push({
-        preferredId: id,
-        description,
-        command: ["python", "-m", module],
-        cwd: ".",
-        timeoutMs: SAFE_EXEC_DEFAULT_TIMEOUT_MS,
-        tags: [...tags2],
-        provenance: {
-          kind: "python-runner",
-          path: pyprojectPath,
-          detail: `[${section}]`,
-          authority: "toolchain-defined"
-        }
-      });
-    }
-    for (const section of ["project.scripts", "tool.poetry.scripts"]) {
-      for (const line of sections.get(section) ?? []) {
-        const name = declaredScriptName(line);
-        if (name === null || !isVerificationScriptName(name)) continue;
+    const document = parseTomlDocument(pyproject);
+    if (document === null) {
+      diagnostics.push(`${pyprojectPath}: invalid TOML; Python discovery skipped.`);
+    } else {
+      for (const [path2, section, module, id, description, tags2] of [
+        [
+          ["tool", "pytest", "ini_options"],
+          "tool.pytest.ini_options",
+          "pytest",
+          "python-pytest",
+          "Run the declared pytest suite",
+          ["python", "test"]
+        ],
+        [["tool", "tox"], "tool.tox", "tox", "python-tox", "Run the declared tox environments", ["python", "test"]],
+        [["tool", "nox"], "tool.nox", "nox", "python-nox", "Run the declared nox sessions", ["python", "test"]]
+      ]) {
+        if (tomlTableAt(document, path2) === null) continue;
         proposals.push({
-          preferredId: `python-${slug(name, "check")}`,
-          description: `Run declared Python entry point '${name}'`,
-          command: [name],
+          preferredId: id,
+          description,
+          command: ["python", "-m", module],
           cwd: ".",
           timeoutMs: SAFE_EXEC_DEFAULT_TIMEOUT_MS,
-          tags: [slug(name.split(/[:.-]/u)[0] ?? "python", "python"), "python"],
+          tags: [...tags2],
           provenance: {
             kind: "python-runner",
             path: pyprojectPath,
-            detail: `[${section}] entry '${name}'`,
-            authority: "project-declared"
+            detail: `[${section}]`,
+            authority: "toolchain-defined"
           }
         });
       }
+      for (const [path2, section] of [
+        [["project", "scripts"], "project.scripts"],
+        [["tool", "poetry", "scripts"], "tool.poetry.scripts"]
+      ]) {
+        const scripts = tomlTableAt(document, path2);
+        if (scripts === null) continue;
+        for (const [name, target] of Object.entries(scripts)) {
+          if (typeof target !== "string" || !isVerificationScriptName(name)) continue;
+          proposals.push({
+            preferredId: `python-${slug(name, "check")}`,
+            description: `Run declared Python entry point '${name}'`,
+            command: [name],
+            cwd: ".",
+            timeoutMs: SAFE_EXEC_DEFAULT_TIMEOUT_MS,
+            tags: [slug(name.split(/[:.-]/u)[0] ?? "python", "python"), "python"],
+            provenance: {
+              kind: "python-runner",
+              path: pyprojectPath,
+              detail: `[${section}] entry '${name}'`,
+              authority: "project-declared"
+            }
+          });
+        }
+      }
     }
   }
   for (const [relative, marker, module, id, description] of [
@@ -1211,4 +1217,4 @@ async function runVerifiersCommand(argv) {
 export {
   runVerifiersCommand
 };
-//# sourceMappingURL=verifiers-4UUM6TEE.js.map
+//# sourceMappingURL=verifiers-NCBTHHN2.js.map

package/dist/{wiki-generate-7STOCIFZ.js → wiki-generate-GUSOQ6ZP.js}

@@ -5,18 +5,18 @@ import {
 import {
   SchedulingDomainModule,
   createPromptsDomainModule
-} from "./chunk-3HZ5RWN2.js";
+} from "./chunk-XF5N4U5A.js";
 import {
   AgentsDomainModule,
   SafetyDomainModule
-} from "./chunk-X6COSD2O.js";
+} from "./chunk-LYF7OHWH.js";
 import {
   ConfigDomainModule,
   loadDomains
-} from "./chunk-KRPY7NTG.js";
+} from "./chunk-R46L2BIR.js";
 import {
   createObservabilityDomainModule
-} from "./chunk-35MKKU5R.js";
+} from "./chunk-K7T3E2SR.js";
 import "./chunk-HC4CLZ2Y.js";
 import "./chunk-HFSBBKSQ.js";
 import "./chunk-E25LMLRW.js";
@@ -24,26 +24,27 @@ import {
   ContextDomainModule,
   buildWikiPagePrompt,
   buildWikiPlanPrompt
-} from "./chunk-UZHIZC5S.js";
+} from "./chunk-CYQKWTG3.js";
+import "./chunk-LCGCVYZ4.js";
 import "./chunk-5WIGXA4T.js";
-import "./chunk-BRXQQJFP.js";
+import "./chunk-6US73PDB.js";
 import {
   DispatchDomainModule
-} from "./chunk-QQL5RT5M.js";
+} from "./chunk-QM3F2GKX.js";
 import {
   SessionDomainModule
-} from "./chunk-QQK64KLB.js";
+} from "./chunk-CJUB2JJ2.js";
 import "./chunk-QKMUKYO7.js";
-import "./chunk-3JLKSKD7.js";
-import "./chunk-34475P3I.js";
+import "./chunk-OH3TOQTB.js";
+import "./chunk-TSHXZTOQ.js";
 import "./chunk-TXOTCRLG.js";
-import "./chunk-G4BMMOKF.js";
+import "./chunk-HVDIIIQW.js";
 import {
   MAX_PAGE_ATTEMPTS,
   pendingPages,
   readAuthoredWikiPlan,
   writeWikiPlanFile
-} from "./chunk-X4RCMKVQ.js";
+} from "./chunk-NDINPTJ4.js";
 import "./chunk-MVVUPGPW.js";
 import {
   ResourcesDomainModule
@@ -54,13 +55,13 @@ import "./chunk-ZWLZP4ZT.js";
 import "./chunk-W6GROXXM.js";
 import {
   MiddlewareDomainModule
-} from "./chunk-2LZI5CAG.js";
+} from "./chunk-ZXF4XRKW.js";
 import "./chunk-IR4CFBFN.js";
 import "./chunk-UOV2BYIW.js";
-import "./chunk-2TZWSW76.js";
-import "./chunk-ZYKPLLNQ.js";
-import "./chunk-WPQLXFOZ.js";
-import "./chunk-7RXG6QRZ.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";
@@ -71,8 +72,9 @@ import "./chunk-UL3WSD3F.js";
 import "./chunk-VG7TBQIY.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-ODFEOB4F.js";
 import "./chunk-OZNBF4L3.js";
 import "./chunk-4BJ5BYCE.js";
 import "./chunk-6XLNIQDB.js";
@@ -80,15 +82,15 @@ import "./chunk-5B2AEOW5.js";
 import {
   ToolNames
 } from "./chunk-CGKSTWHD.js";
-import "./chunk-POHLU5DW.js";
-import "./chunk-YHZX5GEU.js";
-import "./chunk-VJWL6YS5.js";
+import "./chunk-M6L6IDJG.js";
+import "./chunk-XAKHZX5N.js";
+import "./chunk-UUVG37B4.js";
 import "./chunk-LBMZMYH2.js";
-import "./chunk-EKMEHE4H.js";
+import "./chunk-33YXPOE3.js";
 import {
   ProvidersDomainModule,
   canonicalizeWireModelId
-} from "./chunk-QWU7ZBO7.js";
+} from "./chunk-DJVECN66.js";
 import "./chunk-CFGTUFWB.js";
 import "./chunk-AD2SYQYC.js";
 import "./chunk-4OC57DA6.js";
@@ -99,7 +101,7 @@ import "./chunk-FQ4SKYE4.js";
 import "./chunk-IKCO5N3L.js";
 import "./chunk-3I7MS7N2.js";
 import "./chunk-IHXBNWMM.js";
-import "./chunk-BPGS2WCQ.js";
+import "./chunk-GEYXPTRF.js";
 import "./chunk-SST6Z5JA.js";
 import "./chunk-FO5ZOVUY.js";
 import "./chunk-R346GLFC.js";
@@ -110,9 +112,9 @@ import "./chunk-YXLYO42X.js";
 import "./chunk-BNAZZHFG.js";
 import "./chunk-6EJMN2Y3.js";
 import "./chunk-WEPFGWHJ.js";
-import "./chunk-HXG4IURW.js";
+import "./chunk-XE2VEJHX.js";
 import "./chunk-ZGVHUX3M.js";
-import "./chunk-TTNYS3EA.js";
+import "./chunk-G7MUEIGA.js";
 import "./chunk-JVCV3ICN.js";
 import "./chunk-7CR24IG7.js";
 import "./chunk-IWHMRKLL.js";
@@ -435,4 +437,4 @@ export {
   resolveDocumenterModelId,
   runWikiDispatch
 };
-//# sourceMappingURL=wiki-generate-7STOCIFZ.js.map
+//# sourceMappingURL=wiki-generate-GUSOQ6ZP.js.map