@iowarp/clio-coder 0.3.4 → 0.3.7

package/dist/{chunk-QQK64KLB.js → chunk-6TUKSZVF.js}

@@ -1,17 +1,17 @@
 import { createRequire as __clioCreateRequire } from "node:module"; const require = __clioCreateRequire(import.meta.url);
 import {
   probeWorkspace
-} from "./chunk-G4BMMOKF.js";
+} from "./chunk-HVDIIIQW.js";
 import {
   entryBelongsToPath
 } from "./chunk-W6GROXXM.js";
-import {
-  protectArtifact
-} from "./chunk-MV3K5QF2.js";
 import {
   isSessionEntry,
   isSessionHeader
-} from "./chunk-BEY543CS.js";
+} from "./chunk-GOXNB3AO.js";
+import {
+  protectArtifact
+} from "./chunk-MV3K5QF2.js";
 import {
   stripTokenizerSentinels
 } from "./chunk-CFGTUFWB.js";
@@ -33,11 +33,90 @@ import {
 } from "./chunk-BNAZZHFG.js";
 import {
   BusChannels
-} from "./chunk-TTNYS3EA.js";
+} from "./chunk-OB5HIGJY.js";
 import {
   init_esm_shims
 } from "./chunk-3R73A4XB.js";
 
+// src/core/response-model-id.ts
+init_esm_shims();
+function emptyResponseModelIdObservationCounts() {
+  return { reportedCalls: 0, notReportedCalls: 0, notObservedCalls: 0, legacyDifferenceOnlyCalls: 0 };
+}
+function addResponseModelIdObservationCount(counts, observation, calls = 1) {
+  switch (observation.state) {
+    case "reported":
+      counts.reportedCalls += calls;
+      break;
+    case "not-reported":
+      counts.notReportedCalls += calls;
+      break;
+    case "not-observed":
+      counts.notObservedCalls += calls;
+      break;
+    case "legacy-difference-only":
+      counts.legacyDifferenceOnlyCalls += calls;
+      break;
+  }
+}
+function addResponseModelIdObservationCounts(counts, additional) {
+  counts.reportedCalls += additional.reportedCalls;
+  counts.notReportedCalls += additional.notReportedCalls;
+  counts.notObservedCalls += additional.notObservedCalls;
+  counts.legacyDifferenceOnlyCalls += additional.legacyDifferenceOnlyCalls;
+}
+function responseModelIdObservationCountsLabel(counts) {
+  const parts = [];
+  if (counts.reportedCalls > 0) parts.push(`reported ${counts.reportedCalls}`);
+  if (counts.notReportedCalls > 0) parts.push(`not reported ${counts.notReportedCalls}`);
+  if (counts.notObservedCalls > 0) parts.push(`not observed ${counts.notObservedCalls}`);
+  if (counts.legacyDifferenceOnlyCalls > 0) parts.push(`legacy difference-only ${counts.legacyDifferenceOnlyCalls}`);
+  return parts.join(", ");
+}
+function nonEmptyString(value) {
+  return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
+}
+function parsedObservation(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return null;
+  const record = value;
+  switch (record.state) {
+    case "reported": {
+      const reportedModelId = nonEmptyString(record.reportedModelId);
+      return reportedModelId === null ? null : { state: "reported", reportedModelId };
+    }
+    case "not-reported":
+      return { state: "not-reported" };
+    case "not-observed":
+      return { state: "not-observed" };
+    case "legacy-difference-only":
+      return { state: "legacy-difference-only", differingModelId: nonEmptyString(record.differingModelId) };
+    default:
+      return null;
+  }
+}
+function responseModelIdObservationFromRecord(record, missing) {
+  const current = parsedObservation(record.responseModelIdObservation);
+  if (current !== null) return current;
+  if (Object.hasOwn(record, "servedModel")) {
+    const reportedModelId = nonEmptyString(record.servedModel);
+    return reportedModelId === null ? { state: "not-reported" } : { state: "reported", reportedModelId };
+  }
+  if (missing === "not-observed") return { state: "not-observed" };
+  return { state: "legacy-difference-only", differingModelId: nonEmptyString(record.responseModel) };
+}
+function attributedModelId(observation, requestedModelId, differingResponseModelId) {
+  switch (observation.state) {
+    case "reported":
+      return observation.reportedModelId;
+    case "not-reported":
+      return "unknown";
+    case "not-observed":
+      return differingResponseModelId ?? requestedModelId;
+    case "legacy-difference-only":
+      return observation.differingModelId ?? requestedModelId;
+  }
+}
+
 // src/domains/session/compaction/session-entries.ts
 init_esm_shims();
 function collectSessionEntries(turns, filePath) {
@@ -116,17 +195,11 @@ var PREVIEW_MAX_CHARS = 240;
 function collapseWhitespace(text) {
   return text.replace(/\s+/g, " ").trim();
 }
-function extractUserText(payload) {
-  if (typeof payload === "string") {
-    const collapsed = collapseWhitespace(payload);
-    return collapsed.length > 0 ? collapsed : null;
-  }
+function rawMessageText(payload) {
+  if (typeof payload === "string") return payload.trim().length > 0 ? payload : null;
   if (!payload || typeof payload !== "object") return null;
   const obj = payload;
-  if (typeof obj.text === "string") {
-    const collapsed = collapseWhitespace(obj.text);
-    if (collapsed.length > 0) return collapsed;
-  }
+  if (typeof obj.text === "string" && obj.text.trim().length > 0) return obj.text;
   if (Array.isArray(obj.content)) {
     const parts = [];
     for (const part of obj.content) {
@@ -134,14 +207,41 @@ function extractUserText(payload) {
         parts.push(part.text);
       }
     }
-    const joined = collapseWhitespace(parts.join(" "));
-    if (joined.length > 0) return joined;
+    const joined = parts.join("\n");
+    if (joined.trim().length > 0) return joined;
   }
   return null;
 }
+function extractMessageText(payload) {
+  const raw = rawMessageText(payload);
+  if (raw === null) return null;
+  const collapsed = collapseWhitespace(raw);
+  return collapsed.length > 0 ? collapsed : null;
+}
+function operatorTextOfUserPayload(payload) {
+  if (payload && typeof payload === "object" && typeof payload.operatorText === "string") {
+    const collapsed = collapseWhitespace(payload.operatorText);
+    return collapsed.length > 0 ? collapsed : null;
+  }
+  const text = rawMessageText(payload);
+  if (text === null) return null;
+  const stripped = collapseWhitespace(stripInjectedPreamble(text));
+  return stripped.length > 0 ? stripped : null;
+}
+var LEADING_SYSTEM_REMINDER = /^\s*<system-reminder>[\s\S]*?<\/system-reminder>\s*/u;
+var LEADING_SKILL_REQUEST = /^\s*\[Skill request\][\s\S]*?Only these pending skill names are allowed this turn\.[^\n]*\s*/u;
+function stripInjectedPreamble(text) {
+  let current = text;
+  for (; ; ) {
+    const next = current.replace(LEADING_SYSTEM_REMINDER, "").replace(LEADING_SKILL_REQUEST, "");
+    if (next === current) return current;
+    current = next;
+  }
+}
 function scanCurrentJsonl(currentPath) {
   const result = {
     firstUserMessage: null,
+    firstAssistantMessage: null,
     messageCount: 0,
     lastTimestamp: null,
     name: null,
@@ -156,10 +256,14 @@ function scanCurrentJsonl(currentPath) {
     if (parsed.kind === "message" && parsed.role === "user") {
       result.messageCount += 1;
       if (result.firstUserMessage === null) {
-        const text = extractUserText(parsed.payload);
+        const text = operatorTextOfUserPayload(parsed.payload);
         if (text !== null) result.firstUserMessage = text;
       }
     }
+    if (parsed.kind === "message" && parsed.role === "assistant" && result.firstAssistantMessage === null) {
+      const text = extractMessageText(parsed.payload);
+      if (text !== null) result.firstAssistantMessage = text;
+    }
     if (parsed.kind === "sessionInfo") {
       const info = parsed;
       if (info.name !== void 0) {
@@ -188,8 +292,9 @@ function enrichMetaForListing(meta, currentPath) {
   if (scan.name) meta.name = scan.name;
   const labelValues = [...scan.labels.values()].map((entry) => entry.label.trim()).filter((label) => label.length > 0);
   if (labelValues.length > 0) meta.labels = labelValues;
-  if (scan.firstUserMessage) {
-    meta.firstMessagePreview = scan.firstUserMessage.length > PREVIEW_MAX_CHARS ? `${scan.firstUserMessage.slice(0, PREVIEW_MAX_CHARS - 1)}\u2026` : scan.firstUserMessage;
+  const preview = scan.firstUserMessage ?? scan.firstAssistantMessage;
+  if (preview) {
+    meta.firstMessagePreview = preview.length > PREVIEW_MAX_CHARS ? `${preview.slice(0, PREVIEW_MAX_CHARS - 1)}\u2026` : preview;
   }
   if (scan.messageCount > 0) meta.messageCount = scan.messageCount;
   const fallbackMtime = readMtimeIso(currentPath);
@@ -1139,7 +1244,9 @@ function ledgerUsageCalls(entries, defaults = {}) {
       if (!usage2 || usage2.totalTokens <= 0) continue;
       calls.push({
         providerId: currentTarget ?? "unknown",
-        modelId: currentModel ?? "unknown",
+        attributedModelId: currentModel ?? "unknown",
+        requestedModelId: currentModel ?? "unknown",
+        responseModelIdObservation: { state: "not-observed" },
         input: usage2.input,
         output: usage2.output,
         cacheRead: usage2.cacheRead,
@@ -1177,9 +1284,14 @@ function ledgerUsageCalls(entries, defaults = {}) {
     if (totalTokens === 0) continue;
     const cost = usage.cost;
     const costUsd = cost && typeof cost === "object" ? numberAt(cost, "total") : 0;
+    const requestedModelId = currentModel ?? stringAt(record, "model") ?? "unknown";
+    const differingResponseModelId = stringAt(record, "responseModel");
+    const responseModelIdObservation = responseModelIdObservationFromRecord(record, "legacy-difference-only");
     calls.push({
       providerId: currentTarget ?? stringAt(record, "provider", "api") ?? "unknown",
-      modelId: currentModel ?? stringAt(record, "responseModel", "model") ?? "unknown",
+      attributedModelId: attributedModelId(responseModelIdObservation, requestedModelId, differingResponseModelId),
+      requestedModelId,
+      responseModelIdObservation,
       input,
       output,
       cacheRead,
@@ -1346,6 +1458,12 @@ function compareStrings2(a, b) {
 }
 
 export {
+  emptyResponseModelIdObservationCounts,
+  addResponseModelIdObservationCount,
+  addResponseModelIdObservationCounts,
+  responseModelIdObservationCountsLabel,
+  responseModelIdObservationFromRecord,
+  attributedModelId,
   collectSessionEntries,
   readAuditRows,
   readSessionEntriesForId,
@@ -1357,4 +1475,4 @@ export {
   ledgerUsageCalls,
   SessionDomainModule
 };
-//# sourceMappingURL=chunk-QQK64KLB.js.map
+//# sourceMappingURL=chunk-6TUKSZVF.js.map

package/dist/{chunk-N4CZJQRK.js → chunk-AB4XIIVB.js}

@@ -1,20 +1,22 @@
 import { createRequire as __clioCreateRequire } from "node:module"; const require = __clioCreateRequire(import.meta.url);
 import {
   assistantTextFromEvent
-} from "./chunk-EFADSJET.js";
+} from "./chunk-VREKEFLL.js";
 import {
-  compileExecutionPlan,
   durableAssistantTextFromEvent
-} from "./chunk-QQL5RT5M.js";
+} from "./chunk-UUANF5CR.js";
+import {
+  compileExecutionPlan
+} from "./chunk-M4AKACEO.js";
 import {
   deriveExecutionRole
-} from "./chunk-22NAGB7X.js";
+} from "./chunk-UND3GU2L.js";
 import {
   truncateUtf8
 } from "./chunk-6XLNIQDB.js";
 import {
   BusChannels
-} from "./chunk-TTNYS3EA.js";
+} from "./chunk-OB5HIGJY.js";
 import {
   init_esm_shims
 } from "./chunk-3R73A4XB.js";
@@ -274,4 +276,4 @@ export {
   compileScoutTransition,
   createDispatchRunEventRegistry
 };
-//# sourceMappingURL=chunk-N4CZJQRK.js.map
+//# sourceMappingURL=chunk-AB4XIIVB.js.map

package/dist/{chunk-KRPY7NTG.js → chunk-BMWK7ZIZ.js}

@@ -2,25 +2,28 @@ import { createRequire as __clioCreateRequire } from "node:module"; const requir
 import {
   readStrictLayeredSettings,
   updateLayeredSettings
-} from "./chunk-E25LMLRW.js";
+} from "./chunk-YD734TPH.js";
+import {
+  assertAgentIdNamespace
+} from "./chunk-DR52UMZW.js";
 import {
   formatSettingsFailure,
   settingsPath
-} from "./chunk-AD2SYQYC.js";
+} from "./chunk-UHXRNZ2J.js";
 import {
   setGitCommitAttributionEnabled
-} from "./chunk-VEZEGCGW.js";
+} from "./chunk-D4MDIG46.js";
 import {
   resolveShutdownHookBudgetMs,
   runWithBudget,
   writeShutdownNotice
-} from "./chunk-HXG4IURW.js";
+} from "./chunk-X2KV5FXT.js";
 import {
   getSharedBus
 } from "./chunk-ZGVHUX3M.js";
 import {
   BusChannels
-} from "./chunk-TTNYS3EA.js";
+} from "./chunk-OB5HIGJY.js";
 import {
   init_esm_shims
 } from "./chunk-3R73A4XB.js";
@@ -138,18 +141,6 @@ init_esm_shims();
 // src/domains/config/extension.ts
 init_esm_shims();
 
-// src/domains/config/agent-namespace.ts
-init_esm_shims();
-function assertAgentIdNamespace(nativeRecipes, acpDelegates) {
-  const native = new Set(nativeRecipes.map((recipe) => recipe.id));
-  const collision = acpDelegates.find((delegate) => native.has(delegate.id));
-  if (collision !== void 0) {
-    throw new Error(
-      `agent id collision: native recipe '${collision.id}' and ACP delegation agent '${collision.id}' share one namespace`
-    );
-  }
-}
-
 // src/domains/config/classify.ts
 init_esm_shims();
 var HOT_RELOAD_FIELDS = /* @__PURE__ */ new Set([
@@ -158,7 +149,11 @@ var HOT_RELOAD_FIELDS = /* @__PURE__ */ new Set([
   "autonomy",
   "modelSelector",
   "terminal.smoothStreaming",
-  "attribution.gitCommits"
+  "attribution.gitCommits",
+  // The watchdog registration reads its settings live on every trigger, so
+  // enabling it, retargeting it, or changing its cadence takes effect on the
+  // next turn boundary without a restart or a session-routing patch.
+  "watchdog"
 ]);
 var NEXT_TURN_FIELDS = /* @__PURE__ */ new Set([
   "identity",
@@ -380,8 +375,7 @@ function createConfigDomainModule(initialSettings) {
 
 export {
   loadDomains,
-  assertAgentIdNamespace,
   ConfigDomainModule,
   createConfigDomainModule
 };
-//# sourceMappingURL=chunk-KRPY7NTG.js.map
+//# sourceMappingURL=chunk-BMWK7ZIZ.js.map

package/dist/{chunk-4BPJXDWC.js → chunk-C4JBQ5SR.js}

@@ -159,24 +159,38 @@ function optionalString(value) {
 function indexAudit(value) {
   return value === "pass" || value === "warn" || value === "fail" || value === "unknown" ? value : void 0;
 }
-function indexSkills(indexPath, diagnostics) {
+function parseMarketplaceIndex(indexPath, diagnostics = []) {
   try {
     const parsed = JSON.parse(readFileSync(indexPath, "utf8"));
     const rawSkills = Array.isArray(parsed) ? parsed : parsed && typeof parsed === "object" && Array.isArray(parsed.skills) ? parsed.skills : [];
-    return rawSkills.filter(isIndexSkill).map((skill) => {
+    return rawSkills.filter(isIndexSkill).flatMap((skill) => {
       const record = skill;
       const version = optionalString(record.version);
       const audit = indexAudit(record.audit);
       const category = optionalString(record.category);
-      return {
-        name: skill.name.trim(),
-        description: skill.description.trim(),
-        sourceUrl: skill.sourceUrl.trim(),
-        ...version ? { version } : {},
-        ...audit ? { audit } : {},
-        ...category ? { category } : {},
-        origin: "index"
-      };
+      if (record.kind !== void 0 && !["skill", "agent", "prompt", "fleet"].includes(String(record.kind))) {
+        diagnostics.push(`skill marketplace index entry has unsupported kind: ${skill.name}`);
+        return [];
+      }
+      if (record.requires !== void 0 && (!Array.isArray(record.requires) || record.requires.some((entry) => typeof entry !== "string"))) {
+        diagnostics.push(`library_requirement_malformed: ${skill.name}`);
+        return [];
+      }
+      const kind = record.kind === "agent" || record.kind === "prompt" || record.kind === "fleet" ? record.kind : "skill";
+      const requires = Array.isArray(record.requires) ? record.requires.filter((entry) => typeof entry === "string") : void 0;
+      return [
+        {
+          kind,
+          name: skill.name.trim(),
+          description: skill.description.trim(),
+          sourceUrl: skill.sourceUrl.trim(),
+          ...version ? { version } : {},
+          ...audit ? { audit } : {},
+          ...category ? { category } : {},
+          ...requires ? { requires } : {},
+          origin: "index"
+        }
+      ];
     });
   } catch (err) {
     diagnostics.push(`skill marketplace index unreadable: ${err instanceof Error ? err.message : String(err)}`);
@@ -228,7 +242,8 @@ function catalogEntry(skill, catalogDir) {
     ...version ? { version } : {},
     ...skill.provenance?.audit ? { audit: skill.provenance.audit } : {},
     ...category ? { category } : {},
-    origin: "catalog"
+    origin: "catalog",
+    kind: "skill"
   };
 }
 function catalogSkills(dir, diagnostics) {
@@ -253,7 +268,7 @@ function discoverMarketplaceSkills(options = {}) {
   const indexPath = options.indexPath === null ? null : options.indexPath ?? process.env.CLIO_CODER_SKILL_MARKETPLACE_INDEX ?? null;
   const resolvedIndexPath = indexPath ?? defaultIndexPath();
   if (options.indexPath !== null && resolvedIndexPath && existsSync(resolvedIndexPath)) {
-    for (const skill of indexSkills(resolvedIndexPath, diagnostics)) {
+    for (const skill of parseMarketplaceIndex(resolvedIndexPath, diagnostics)) {
       if (seen.has(skill.name)) continue;
       seen.add(skill.name);
       skills.push(skill);
@@ -1167,6 +1182,7 @@ function updateSkills(input = {}) {
 }
 
 export {
+  normalizedSkillHash,
   updateSkills,
   MARKETPLACE_UNCONFIGURED,
   discoverMarketplaceSkills,
@@ -1179,4 +1195,4 @@ export {
   expandSkillInvocationInput,
   parsePendingSkillRequests
 };
-//# sourceMappingURL=chunk-4BPJXDWC.js.map
+//# sourceMappingURL=chunk-C4JBQ5SR.js.map