@iowarp/clio-coder 0.3.7 → 0.3.9

package/dist/{chunk-GWS3VEIW.js → chunk-FWDFM5ZU.js}

@@ -150,10 +150,13 @@ function readOutOfTurnUsageRows(stateDir) {
 function asOutOfTurnUsageRow(value) {
   if (!isRecord(value)) return null;
   const label = value.label;
-  if (label !== "side-question" && label !== "handoff") return null;
+  if (label !== "side-question" && label !== "handoff" && label !== "prewarm" && label !== "background-memory")
+    return null;
   if (typeof value.timestamp !== "string" || value.timestamp.length === 0) return null;
   if (!isRecord(value.usage)) return null;
   const usage = value.usage;
+  const timing = asTiming(value.timing);
+  const promptCache = asPromptCache(value.promptCache);
   return {
     label,
     sessionId: typeof value.sessionId === "string" ? value.sessionId : null,
@@ -170,7 +173,25 @@ function asOutOfTurnUsageRow(value) {
       totalTokens: numberOr0(usage.totalTokens),
       costUsd: numberOr0(usage.costUsd),
       costProvenance: asCostProvenance(usage.costProvenance)
-    }
+    },
+    ...timing === null ? {} : { timing },
+    ...promptCache === null ? {} : { promptCache }
+  };
+}
+function asTiming(value) {
+  if (!isRecord(value)) return null;
+  const durationMs = numberOr0(value.durationMs);
+  return durationMs === 0 ? null : { durationMs };
+}
+function asPromptCache(value) {
+  if (!isRecord(value)) return null;
+  if (typeof value.source !== "string" || value.source.length === 0) return null;
+  return {
+    promptTokens: numberOr0(value.promptTokens),
+    cachedTokens: typeof value.cachedTokens === "number" ? value.cachedTokens : null,
+    uncachedPrefillTokens: typeof value.uncachedPrefillTokens === "number" ? value.uncachedPrefillTokens : null,
+    promptMs: numberOr0(value.promptMs),
+    source: value.source
   };
 }
 function asCostProvenance(value) {
@@ -192,4 +213,4 @@ export {
   appendOutOfTurnUsageRow,
   readOutOfTurnUsageRows
 };
-//# sourceMappingURL=chunk-GWS3VEIW.js.map
+//# sourceMappingURL=chunk-FWDFM5ZU.js.map

package/dist/{chunk-XEGB6BCN.js → chunk-GAYUJ7LE.js}

@@ -7,17 +7,17 @@ import {
   TASK_MEMORY_POLICY_DEFAULT_TIMEOUT_MS,
   runTaskMemoryPolicy,
   taskMemoryBankDelta
-} from "./chunk-WHGPSPT5.js";
+} from "./chunk-O6I4CIEU.js";
 import {
   isTerminalRunEnvelope
-} from "./chunk-CEYBNUGC.js";
+} from "./chunk-4H6ULJ3H.js";
 import {
   taskBoardCounts
-} from "./chunk-5FR74PWO.js";
+} from "./chunk-2JDWVJND.js";
 import {
   SKILL_SUGGESTION_ANCHOR,
   SKILL_SUGGESTION_PREFIX
-} from "./chunk-GOXNB3AO.js";
+} from "./chunk-RAPCMZL4.js";
 import {
   legacyToolResultDigest,
   sanitizeToolResultDigest
@@ -25,13 +25,19 @@ import {
 import {
   ToolNames
 } from "./chunk-CGKSTWHD.js";
+import {
+  registerForegroundStream
+} from "./chunk-MIX5N5AC.js";
 import {
   ceilChars
-} from "./chunk-GEYXPTRF.js";
+} from "./chunk-AEYBF3TB.js";
 import {
   reportCommitAttributionDiagnostic,
   withManagedGitCommitAttributionEnvironment
-} from "./chunk-D4MDIG46.js";
+} from "./chunk-B5CSFE7B.js";
+import {
+  BusChannels
+} from "./chunk-RKRLDWD3.js";
 import {
   require_dist
 } from "./chunk-APJ265NV.js";
@@ -1559,6 +1565,7 @@ function createMemoryInterventionRegistration(deps) {
       reminder: null,
       inputTokens: 0,
       outputTokens: 0,
+      usage: null,
       effects: NO_EFFECTS
     });
     const live = settings();
@@ -1572,10 +1579,16 @@ function createMemoryInterventionRegistration(deps) {
     let tier = "rules";
     promptedStepTier = tier;
     let promptedResult;
+    let telemetryDecision = null;
     try {
       const client = deps.getModelClient?.() ?? null;
       if (client === null) {
         promptedResult = silent("no_client");
+      } else if (deps.backgroundEndpointBusy?.() === true) {
+        tier = "llm";
+        promptedStepTier = tier;
+        promptedResult = silent("endpoint_busy");
+        telemetryDecision = "dropped";
       } else {
         tier = "llm";
         promptedStepTier = tier;
@@ -1605,10 +1618,17 @@ function createMemoryInterventionRegistration(deps) {
       });
     }
     lastDecision = promptedResult.decision;
+    if (promptedResult.usage !== null) {
+      try {
+        deps.onStepUsage?.(promptedResult.usage);
+      } catch {
+      }
+    }
+    if (promptedResult.decision === "injected") reportInjectedEntries(promptedResult.reminder);
     emitTelemetry(
       triggers,
       tier,
-      promptedResult.decision,
+      telemetryDecision ?? promptedResult.decision,
       promptedResult.reason,
       citedEntryCount(promptedResult.reminder),
       promptedResult.inputTokens,
@@ -1621,7 +1641,7 @@ function createMemoryInterventionRegistration(deps) {
       effects: promptedResult.reminder === null ? NO_EFFECTS : [{ kind: "inject_reminder", message: promptedResult.reminder, severity: "advisory" }]
     };
   }
-  function emitTelemetry(triggerReasons, tier, decision, reason, citedEntries, inputTokens, outputTokens, started, operations = { bankOperations: 0, droppedOperations: 0 }) {
+  function emitTelemetry(triggerReasons, tier, decision, reason, citedEntries2, inputTokens, outputTokens, started, operations = { bankOperations: 0, droppedOperations: 0 }) {
     const next = deps.bank.snapshot();
     const bankDelta = taskMemoryBankDelta(telemetryBankSnapshot, next);
     telemetryBankSnapshot = next;
@@ -1635,7 +1655,7 @@ function createMemoryInterventionRegistration(deps) {
         reason,
         bankOperations: operations.bankOperations,
         droppedOperations: operations.droppedOperations,
-        citedEntries,
+        citedEntries: citedEntries2,
         inputTokens,
         outputTokens,
         latencyMs
@@ -1648,17 +1668,29 @@ function createMemoryInterventionRegistration(deps) {
       tier,
       decision,
       reason,
-      citedEntries,
+      citedEntries: citedEntries2,
       bankWrites: countBankWrites(bankDelta),
       latencyMs
     };
     activity.unshift(event);
     if (activity.length > MEMORY_INTERVENTION_ACTIVITY_LIMIT) activity.length = MEMORY_INTERVENTION_ACTIVITY_LIMIT;
   }
-  function citedEntryCount(message) {
-    if (message === null) return 0;
+  function citedEntries(message) {
+    if (message === null) return [];
     const snapshot = deps.bank.snapshot();
-    return [...snapshot.knowledge, ...snapshot.procedural].filter((entry) => message.includes(`[${entry.id}]`)).length;
+    return [...snapshot.knowledge, ...snapshot.procedural].filter((entry) => message.includes(`[${entry.id}]`));
+  }
+  function citedEntryCount(message) {
+    return citedEntries(message).length;
+  }
+  function reportInjectedEntries(reminder) {
+    if (deps.onInjectedEntries === void 0) return;
+    const entries = citedEntries(reminder);
+    if (entries.length === 0) return;
+    try {
+      deps.onInjectedEntries(entries);
+    } catch {
+    }
   }
   function observeBeforeTool(input) {
     const prepared = prepareToolStep(input);
@@ -1867,6 +1899,27 @@ function setBounded(map, key, value, capacity) {
   map.set(key, value);
 }
 
+// src/domains/middleware/memory-step-endpoint.ts
+init_esm_shims();
+function announceMemoryStepEndpoint(deps, complete) {
+  const { bus, endpointKey, targetId } = deps;
+  if (endpointKey === null) return complete;
+  return async (request) => {
+    const releaseEndpointSlot = registerForegroundStream(endpointKey);
+    try {
+      return await complete(request);
+    } finally {
+      releaseEndpointSlot();
+      if (bus !== null) {
+        try {
+          bus.emit(BusChannels.MemoryStepCompleted, { endpointKey, targetId });
+        } catch {
+        }
+      }
+    }
+  };
+}
+
 // src/domains/middleware/skills-reminder.ts
 init_esm_shims();
 var SKILLS_REMINDER_REGISTRATION_ID = "observer.skills-reminder";
@@ -2395,6 +2448,7 @@ export {
   readHookSources,
   installUserHooks,
   createMemoryInterventionRegistration,
+  announceMemoryStepEndpoint,
   createSkillsReminderRegistration,
   createTaskBoardReminderRegistration,
   createTaskNudgeRegistration,
@@ -2404,4 +2458,4 @@ export {
   createWatchdogRegistration,
   MiddlewareDomainModule
 };
-//# sourceMappingURL=chunk-XEGB6BCN.js.map
+//# sourceMappingURL=chunk-GAYUJ7LE.js.map

package/dist/{chunk-UND3GU2L.js → chunk-H7IXIC72.js}

@@ -51,7 +51,7 @@ function gateDeciderAgentId(requested) {
   return trimmed.length > 0 ? trimmed : DEFAULT_GATE_DECIDER_AGENT_ID;
 }
 function appliesRecipeResultContract(gateRole) {
-  return gateRole !== "reviewer" && gateRole !== "judge";
+  return gateRole !== "reviewer" && gateRole !== "judge" && gateRole !== "synthesis";
 }
 function routeCorrelationFactsForRun(run) {
   return {
@@ -100,4 +100,4 @@ export {
   routeCorrelationFactsForRun,
   gateRouteCorrelation
 };
-//# sourceMappingURL=chunk-UND3GU2L.js.map
+//# sourceMappingURL=chunk-H7IXIC72.js.map

package/dist/{chunk-IR4CFBFN.js → chunk-HAY4ZE2P.js}

@@ -1,4 +1,9 @@
 import { createRequire as __clioCreateRequire } from "node:module"; const require = __clioCreateRequire(import.meta.url);
+import {
+  asDirectoryPathBoundary,
+  pathBoundaryEntryCovers,
+  resolvePathBoundary
+} from "./chunk-S4COXYBG.js";
 import {
   init_esm_shims
 } from "./chunk-3R73A4XB.js";
@@ -7,21 +12,16 @@ import {
 init_esm_shims();
 import path from "node:path";
 function normalizeRoot(root) {
-  return path.resolve(root);
-}
-function isUnder(child, parent) {
-  const c = normalizeRoot(child);
-  const p = normalizeRoot(parent);
-  if (c === p) return true;
-  const rel = path.relative(p, c);
-  return rel !== "" && !rel.startsWith("..") && !path.isAbsolute(rel);
+  return resolvePathBoundary(process.cwd(), root);
 }
 function isSubset(worker, orchestrator) {
   for (const action of worker.allowedActions) {
     if (!orchestrator.allowedActions.has(action)) return false;
   }
   for (const root of worker.allowedWriteRoots) {
-    const covered = orchestrator.allowedWriteRoots.some((outer) => isUnder(root, outer));
+    const covered = orchestrator.allowedWriteRoots.some(
+      (outer) => pathBoundaryEntryCovers(normalizeRoot(outer), normalizeRoot(root))
+    );
     if (!covered) return false;
   }
   if (worker.allowNetwork && !orchestrator.allowNetwork) return false;
@@ -36,13 +36,13 @@ var READONLY_SCOPE = {
 };
 var WORKSPACE_SCOPE = {
   allowedActions: /* @__PURE__ */ new Set(["read", "write", "execute", "dispatch"]),
-  allowedWriteRoots: [process.cwd()],
+  allowedWriteRoots: [asDirectoryPathBoundary(path.resolve(process.cwd()))],
   allowNetwork: true,
   allowDispatch: true
 };
 var CONFIRMED_SCOPE = {
   allowedActions: /* @__PURE__ */ new Set(["read", "write", "execute", "dispatch", "system_modify"]),
-  allowedWriteRoots: [process.cwd()],
+  allowedWriteRoots: [asDirectoryPathBoundary(path.resolve(process.cwd()))],
   allowNetwork: true,
   allowDispatch: true
 };
@@ -53,4 +53,4 @@ export {
   WORKSPACE_SCOPE,
   CONFIRMED_SCOPE
 };
-//# sourceMappingURL=chunk-IR4CFBFN.js.map
+//# sourceMappingURL=chunk-HAY4ZE2P.js.map

package/dist/{chunk-UVDSQ6LW.js → chunk-HCBCAYZU.js}

@@ -1,16 +1,13 @@
 import { createRequire as __clioCreateRequire } from "node:module"; const require = __clioCreateRequire(import.meta.url);
-import {
-  assertAgentIdNamespace
-} from "./chunk-DR52UMZW.js";
 import {
   loadSkills
-} from "./chunk-C4JBQ5SR.js";
+} from "./chunk-AD7Y7STJ.js";
 import {
   parseFrontmatter
-} from "./chunk-KCMKRQX4.js";
+} from "./chunk-RKKLTLYB.js";
 import {
-  parseResultContract
-} from "./chunk-DJNLUABN.js";
+  enabledExtensionResourceRoots
+} from "./chunk-5QKCQQ3E.js";
 import {
   assertAgentSpecPolicy,
   isAgentAudience,
@@ -20,30 +17,19 @@ import {
   isAgentProduct,
   isAgentProjectContextTier,
   isShadowAgent,
-  normalizeAgentSpec
-} from "./chunk-AOCYTWAV.js";
-import {
-  clioConfigDir
-} from "./chunk-BNAZZHFG.js";
+  normalizeAgentSpec,
+  parseResultContract
+} from "./chunk-S4COXYBG.js";
 import {
   resolvePackageRoot
 } from "./chunk-IWHMRKLL.js";
+import {
+  clioConfigDir
+} from "./chunk-BNAZZHFG.js";
 import {
   init_esm_shims
 } from "./chunk-3R73A4XB.js";
 
-// src/domains/agents/index.ts
-init_esm_shims();
-
-// src/domains/agents/extension.ts
-init_esm_shims();
-import path3 from "node:path";
-
-// src/domains/agents/registry.ts
-init_esm_shims();
-import { existsSync, readdirSync, readFileSync } from "node:fs";
-import path2 from "node:path";
-
 // src/domains/agents/recipe.ts
 init_esm_shims();
 import path from "node:path";
@@ -144,19 +130,19 @@ var RECIPE_KEYS = [
 ];
 var OPTIONAL_RECIPE_KEYS = ["product"];
 var ALL_RECIPE_KEYS = [...RECIPE_KEYS, ...OPTIONAL_RECIPE_KEYS];
-function requiredString(value, path4) {
+function requiredString(value, path3) {
   if (typeof value !== "string" || value.trim().length === 0)
-    throw new Error(`agent recipe: ${path4} must be a non-empty string`);
+    throw new Error(`agent recipe: ${path3} must be a non-empty string`);
   return value;
 }
-function requiredStringArray(value, path4) {
-  if (!Array.isArray(value)) throw new Error(`agent recipe: ${path4} must be an array of strings`);
-  const entries = value.map((entry, index) => requiredString(entry, `${path4}[${index}]`));
-  if (new Set(entries).size !== entries.length) throw new Error(`agent recipe: ${path4} must not contain duplicates`);
+function requiredStringArray(value, path3) {
+  if (!Array.isArray(value)) throw new Error(`agent recipe: ${path3} must be an array of strings`);
+  const entries = value.map((entry, index) => requiredString(entry, `${path3}[${index}]`));
+  if (new Set(entries).size !== entries.length) throw new Error(`agent recipe: ${path3} must not contain duplicates`);
   return entries;
 }
-function enumValue(value, path4, predicate) {
-  if (!predicate(value)) throw new Error(`agent recipe: ${path4} has an unsupported value`);
+function enumValue(value, path3, predicate) {
+  if (!predicate(value)) throw new Error(`agent recipe: ${path3} has an unsupported value`);
   return value;
 }
 function parseAudience(value, source, filepath) {
@@ -266,14 +252,33 @@ function parseAgentRecipeSchema(input) {
 }
 
 // src/domains/agents/registry.ts
+init_esm_shims();
+import { existsSync, readdirSync, readFileSync, realpathSync } from "node:fs";
+import path2 from "node:path";
 var RESERVED_CUSTOM_AGENT_IDS = /* @__PURE__ */ new Set(["worker", "delegate", "auto"]);
 function resolveBoundSkills(recipe, source) {
   if (recipe.skills.length === 0) return { ...recipe, boundSkillPaths: [] };
   const packageSkills = path2.resolve(source.dir, "..", "..", "..", "..", "skills");
-  const skills = loadSkills({
-    cwd: process.cwd(),
+  if (source.source === "extension" && source.skillRoot === void 0) {
+    throw new Error(`agent recipe: ${recipe.filepath}: extension declares bound skills but no skills resource root`);
+  }
+  const skills = source.source === "extension" ? loadSkills({
+    cwd: source.cwd ?? process.cwd(),
+    disableDiscovery: true,
+    explicitSkillPaths: source.skillRoot === void 0 ? [] : [source.skillRoot]
+  }) : loadSkills({
+    cwd: source.cwd ?? process.cwd(),
     ...source.source === "builtin" && existsSync(packageSkills) ? { explicitSkillPaths: [packageSkills] } : {}
   });
+  if (source.source === "extension" && source.skillRoot !== void 0) {
+    const canonicalRoot = realpathSync(source.skillRoot);
+    for (const skill of skills.items) {
+      const relative = path2.relative(canonicalRoot, realpathSync(skill.filePath));
+      if (relative === ".." || relative.startsWith(`..${path2.sep}`) || path2.isAbsolute(relative)) {
+        throw new Error(`agent recipe: ${recipe.filepath}: bound skill escapes its extension: ${skill.filePath}`);
+      }
+    }
+  }
   const byName = new Map(skills.items.map((skill) => [skill.name, skill.filePath]));
   const missing = recipe.skills.filter((skill) => !byName.has(skill));
   if (missing.length > 0) {
@@ -334,6 +339,11 @@ function mergeRecipes(...sources) {
         continue;
       }
       const builtin = builtinById.get(recipe.id);
+      if (recipe.source === "extension" && builtin) {
+        process.stderr.write(`[clio:agents] ignore override id=${recipe.id} by=extension reason=reserved-builtin
+`);
+        continue;
+      }
       if (recipe.source === "user" && builtin && isShadowAgent(normalizeAgentSpec(builtin))) {
         process.stderr.write(`[clio:agents] ignore override id=${recipe.id} by=user reason=reserved-shadow
 `);
@@ -351,122 +361,39 @@ function mergeRecipes(...sources) {
   }
   return Array.from(byId.values()).sort((left, right) => left.id.localeCompare(right.id));
 }
-
-// src/domains/agents/extension.ts
-function createAgentsBundle(_context) {
-  let recipes = [];
-  let specs = [];
-  let diagnostics = [];
-  function discover() {
-    const builtinDir = path3.join(resolvePackageRoot(), "src", "domains", "agents", "builtins");
-    const userDir = path3.join(clioConfigDir(), "agents");
-    const projectDir = path3.join(process.cwd(), ".clio-coder", "agents");
-    const nextDiagnostics = [];
-    const builtin = loadRecipesFromDir({ dir: builtinDir, source: "builtin" }, nextDiagnostics);
-    const user = loadRecipesFromDir({ dir: userDir, source: "user" }, nextDiagnostics);
-    const project = loadRecipesFromDir({ dir: projectDir, source: "project" }, nextDiagnostics);
-    const merged = mergeRecipes(builtin, user, project);
-    const config = _context.getContract("config");
-    assertAgentIdNamespace(merged, config?.get()?.delegation?.agents ?? []);
-    recipes = merged;
-    specs = recipes.map(normalizeAgentSpec);
-    diagnostics = nextDiagnostics;
-  }
-  const extension = {
-    async start() {
-      discover();
-    },
-    async stop() {
-    }
-  };
-  const contract = {
-    list() {
-      return recipes;
-    },
-    get(id) {
-      return recipes.find((r) => r.id === id) ?? null;
-    },
-    diagnostics() {
-      return diagnostics.map((diagnostic) => ({ ...diagnostic }));
-    },
-    listSpecs() {
-      const config = _context.getContract("config");
-      const delegationAgents = config?.get()?.delegation?.agents ?? [];
-      const delegationSpecs = delegationAgents.map((agent) => ({
-        version: 1,
-        id: agent.id,
-        name: agent.id,
-        description: `External ACP delegation agent: ${agent.command} ${(agent.args ?? []).join(" ")}`,
-        source: "custom",
-        filepath: "settings.yaml",
-        tools: [],
-        toolRequirements: { required: [], optional: [] },
-        category: "explore",
-        capabilityClass: "orchestration",
-        latencyClass: "deep",
-        projectContextTier: "none",
-        audience: "custom",
-        tags: ["delegation", "acp"],
-        skills: [],
-        resultContract: { kind: "external-delegation" },
-        budget: { toolCalls: 1, readReserve: 0, synthesis: false },
-        body: "External ACP delegation."
-      }));
-      return [...specs, ...delegationSpecs];
-    },
-    getSpec(id) {
-      const found = specs.find((r) => r.id === id);
-      if (found) return found;
-      const config = _context.getContract("config");
-      const agent = config?.get()?.delegation?.agents?.find((entry) => entry.id === id);
-      if (agent) {
-        return {
-          version: 1,
-          id: agent.id,
-          name: agent.id,
-          description: `External ACP delegation agent: ${agent.command} ${(agent.args ?? []).join(" ")}`,
-          source: "custom",
-          filepath: "settings.yaml",
-          tools: [],
-          toolRequirements: { required: [], optional: [] },
-          category: "explore",
-          capabilityClass: "orchestration",
-          latencyClass: "deep",
-          projectContextTier: "none",
-          audience: "custom",
-          tags: ["delegation", "acp"],
-          skills: [],
-          resultContract: { kind: "external-delegation" },
-          budget: { toolCalls: 1, readReserve: 0, synthesis: false },
-          body: "External ACP delegation."
-        };
-      }
-      return null;
+function discoverAgentRecipes(cwd = process.cwd(), diagnostics = []) {
+  const builtin = loadRecipesFromDir(
+    {
+      dir: path2.join(resolvePackageRoot(), "src", "domains", "agents", "builtins"),
+      source: "builtin",
+      cwd
     },
-    reload() {
-      discover();
-    }
-  };
-  return { extension, contract };
+    diagnostics
+  );
+  const skillRoots = new Map(enabledExtensionResourceRoots("skills", cwd).map((root) => [root.source, root.path]));
+  const extensionRecipes = enabledExtensionResourceRoots("agents", cwd).sort((left, right) => left.source.localeCompare(right.source)).map((root) => {
+    const skillRoot = skillRoots.get(root.source);
+    return loadRecipesFromDir(
+      {
+        dir: root.path,
+        source: "extension",
+        cwd,
+        origin: root.source,
+        ...skillRoot === void 0 ? {} : { skillRoot }
+      },
+      diagnostics
+    );
+  });
+  const user = loadRecipesFromDir({ dir: path2.join(clioConfigDir(), "agents"), source: "user", cwd }, diagnostics);
+  const project = loadRecipesFromDir(
+    { dir: path2.join(cwd, ".clio-coder", "agents"), source: "project", cwd },
+    diagnostics
+  );
+  return mergeRecipes(builtin, ...extensionRecipes, user, project);
 }
 
-// src/domains/agents/manifest.ts
-init_esm_shims();
-var AgentsManifest = {
-  name: "agents",
-  dependsOn: ["config"]
-};
-
-// src/domains/agents/index.ts
-var AgentsDomainModule = {
-  manifest: AgentsManifest,
-  createExtension: createAgentsBundle
-};
-
 export {
   parseAgentRecipeSchema,
-  loadRecipesFromDir,
-  mergeRecipes,
-  AgentsDomainModule
+  discoverAgentRecipes
 };
-//# sourceMappingURL=chunk-UVDSQ6LW.js.map
+//# sourceMappingURL=chunk-HCBCAYZU.js.map