@iowarp/clio-coder 0.3.1 → 0.3.3

package/dist/{chunk-HQQID6OA.js → chunk-M6SHUN7Q.js}

@@ -2,14 +2,14 @@ import { createRequire as __clioCreateRequire } from "node:module"; const requir
 import {
   assertSafeId
 } from "./chunk-R346GLFC.js";
-import {
-  fsyncDirectory,
-  safeResourceWrite
-} from "./chunk-WEPFGWHJ.js";
 import {
   clioStateDir,
   stateRootRemoved
 } from "./chunk-BNAZZHFG.js";
+import {
+  fsyncDirectory,
+  safeResourceWrite
+} from "./chunk-WEPFGWHJ.js";
 import {
   readClioVersion,
   readPiMonoVersion
@@ -567,4 +567,4 @@ export {
   openSession,
   resumeSession
 };
-//# sourceMappingURL=chunk-HQQID6OA.js.map
+//# sourceMappingURL=chunk-M6SHUN7Q.js.map

package/dist/{chunk-FST4FYJB.js → chunk-MFFY33HR.js}

@@ -1,23 +1,27 @@
 import { createRequire as __clioCreateRequire } from "node:module"; const require = __clioCreateRequire(import.meta.url);
 import {
-  COMPAT_RESOURCE_PRECEDENCE,
-  defaultScopedResourceRoots,
   expandSkillInvocationInput,
   loadSkills,
   parsePendingSkillRequests,
-  projectCompatTrusted,
+  projectCompatTrusted
+} from "./chunk-4BPJXDWC.js";
+import {
+  COMPAT_RESOURCE_PRECEDENCE,
+  defaultScopedResourceRoots,
   readRootEntries,
   sourceInfoForRoot,
   splitYamlFrontmatter,
   stringField
-} from "./chunk-474KN5II.js";
+} from "./chunk-2SFS6XQE.js";
 import {
   INTEROP_AGENT_KINDS
 } from "./chunk-IHXBNWMM.js";
 import {
-  expandConfigPath,
+  expandConfigPath
+} from "./chunk-SST6Z5JA.js";
+import {
   require_dist
-} from "./chunk-GB6QRBXN.js";
+} from "./chunk-APJ265NV.js";
 import {
   __toESM,
   init_esm_shims
@@ -152,6 +156,66 @@ function extractExpected(block) {
   return bullets.map((bullet) => bullet.trim()).filter((bullet) => bullet.length > 0);
 }
 
+// src/domains/resources/skills/provenance-pin.ts
+init_esm_shims();
+var import_yaml = __toESM(require_dist(), 1);
+import { existsSync, readFileSync } from "node:fs";
+import path from "node:path";
+var SKILL_PIN_MANIFEST_FILENAME = "registry.yaml";
+function isPlainObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function resolveSkillPinManifestPath(cwd) {
+  const fromEnv = process.env.CLIO_CODER_SKILL_CATALOG_DIR;
+  const catalogDir = fromEnv && fromEnv.trim().length > 0 ? path.resolve(fromEnv.trim()) : path.join(cwd, "skills");
+  const manifestPath = path.join(catalogDir, SKILL_PIN_MANIFEST_FILENAME);
+  return existsSync(manifestPath) ? manifestPath : null;
+}
+function loadSkillPinManifest(manifestPath) {
+  let parsed;
+  try {
+    parsed = import_yaml.default.parse(readFileSync(manifestPath, "utf8"));
+  } catch {
+    return null;
+  }
+  if (!isPlainObject(parsed) || !Array.isArray(parsed.skills)) return null;
+  const entries = /* @__PURE__ */ new Map();
+  for (const raw of parsed.skills) {
+    if (!isPlainObject(raw)) continue;
+    const name = typeof raw.name === "string" ? raw.name.trim() : "";
+    const sha256 = typeof raw.sha256 === "string" ? raw.sha256.trim().toLowerCase() : "";
+    if (name.length === 0 || !/^[0-9a-f]{64}$/.test(sha256)) continue;
+    entries.set(name, {
+      name,
+      version: typeof raw.version === "string" && raw.version.trim().length > 0 ? raw.version.trim() : null,
+      sha256
+    });
+  }
+  return entries;
+}
+function checkSkillDrift(skill, cwd) {
+  const actual = skill.normalizedHash.toLowerCase();
+  const manifestPath = resolveSkillPinManifestPath(cwd);
+  const manifest = manifestPath === null ? null : loadSkillPinManifest(manifestPath);
+  const pinned = manifest?.get(skill.name);
+  if (pinned !== void 0) {
+    return {
+      verdict: pinned.sha256 === actual ? "match" : "mismatch",
+      authority: "pinned-manifest",
+      expected: pinned.sha256
+    };
+  }
+  const recorded = skill.provenance?.installedHash?.trim().toLowerCase();
+  if (recorded !== void 0 && /^[0-9a-f]{64}$/.test(recorded)) {
+    return {
+      verdict: recorded === actual ? "match" : "mismatch",
+      authority: "install-record",
+      expected: recorded
+    };
+  }
+  return null;
+}
+
 // src/domains/resources/index.ts
 init_esm_shims();
 
@@ -163,9 +227,13 @@ init_esm_shims();
 
 // src/domains/resources/prompts/loader.ts
 init_esm_shims();
-import { readFileSync } from "node:fs";
+import { readFileSync as readFileSync2 } from "node:fs";
 import { homedir } from "node:os";
-import path from "node:path";
+import path2 from "node:path";
+
+// src/engine/prompt-templates.ts
+init_esm_shims();
+import { parseCommandArgs, substituteArgs } from "@earendil-works/pi-agent-core";
 
 // src/domains/resources/collision.ts
 init_esm_shims();
@@ -217,66 +285,6 @@ function resolveResourceCollisions(candidates) {
   return { winners, diagnostics };
 }
 
-// src/domains/resources/prompts/substitute.ts
-init_esm_shims();
-function parseCommandArgs(input) {
-  const args = [];
-  let current = "";
-  let hasToken = false;
-  let quote = null;
-  const push = () => {
-    if (!hasToken) return;
-    args.push(current);
-    current = "";
-    hasToken = false;
-  };
-  for (let i = 0; i < input.length; i += 1) {
-    const ch = input[i];
-    if (!ch) continue;
-    if (quote) {
-      if (ch === quote) {
-        quote = null;
-      } else {
-        current += ch;
-      }
-      continue;
-    }
-    if (ch === "'" || ch === `"`) {
-      quote = ch;
-      hasToken = true;
-      continue;
-    }
-    if (/\s/.test(ch)) {
-      push();
-      continue;
-    }
-    current += ch;
-    hasToken = true;
-  }
-  push();
-  return args;
-}
-function sliceArgs(args, startText, lengthText) {
-  const start = Number.parseInt(startText, 10);
-  if (!Number.isFinite(start) || start <= 0) return "";
-  const zeroBased = start - 1;
-  if (lengthText === void 0) return args.slice(zeroBased).join(" ");
-  const length = Number.parseInt(lengthText, 10);
-  if (!Number.isFinite(length) || length <= 0) return "";
-  return args.slice(zeroBased, zeroBased + length).join(" ");
-}
-function substituteArgs(content, args) {
-  const allArgs = args.join(" ");
-  return content.replace(
-    /\$\{@:(\d+)(?::(\d+))?\}/g,
-    (_match, start, length) => sliceArgs(args, start, length)
-  ).replace(/\$ARGUMENTS/g, allArgs).replace(/\$@/g, allArgs).replace(/\$(\d+)/g, (_match, indexText) => {
-    const index = Number.parseInt(indexText, 10);
-    if (!Number.isFinite(index) || index <= 0) return "";
-    return args[index - 1] ?? "";
-  });
-}
-
 // src/domains/resources/prompts/loader.ts
 function defaultPromptTemplateRoots(input = {}) {
   const cwd = input.cwd ?? process.cwd();
@@ -286,7 +294,7 @@ function defaultPromptTemplateRoots(input = {}) {
   for (const kind of INTEROP_AGENT_KINDS) {
     if (kind.userPromptRoot !== void 0) {
       compat.push({
-        path: path.join(home, kind.userPromptRoot),
+        path: path2.join(home, kind.userPromptRoot),
         scope: "user",
         source: `${kind.id}-user`,
         precedence: COMPAT_RESOURCE_PRECEDENCE.userCompat,
@@ -295,7 +303,7 @@ function defaultPromptTemplateRoots(input = {}) {
     }
     if (kind.projectPromptRoot !== void 0) {
       compat.push({
-        path: path.join(cwd, kind.projectPromptRoot),
+        path: path2.join(cwd, kind.projectPromptRoot),
         scope: "project",
         source: `${kind.id}-project`,
         precedence: COMPAT_RESOURCE_PRECEDENCE.projectCompat,
@@ -320,17 +328,17 @@ function fallbackDescription(body) {
   return normalized.length > 60 ? `${normalized.slice(0, 57)}...` : normalized;
 }
 function loadPromptFile(filePath, root, diagnostics) {
-  const ext = path.extname(filePath).toLowerCase();
+  const ext = path2.extname(filePath).toLowerCase();
   if (ext !== ".md") return null;
   let raw;
   try {
-    raw = readFileSync(filePath, "utf8");
+    raw = readFileSync2(filePath, "utf8");
   } catch (err) {
     const reason = err instanceof Error ? err.message : String(err);
     diagnostics.push({ type: "warning", message: `prompt template could not be read: ${reason}`, path: filePath });
     return null;
   }
-  const name = path.basename(filePath, ext);
+  const name = path2.basename(filePath, ext);
   if (name.trim().length === 0) return null;
   const { frontmatter, body } = splitOptionalFrontmatter(raw, filePath, diagnostics);
   const description = stringField(frontmatter, "description") ?? fallbackDescription(body);
@@ -351,7 +359,7 @@ function loadPromptRoot(root, diagnostics) {
   const candidates = [];
   for (const entry of readRootEntries(root, "prompt template", diagnostics)) {
     if (!entry.isFile()) continue;
-    const candidate = loadPromptFile(path.join(root.path, entry.name), root, diagnostics);
+    const candidate = loadPromptFile(path2.join(root.path, entry.name), root, diagnostics);
     if (candidate) candidates.push(candidate);
   }
   return candidates;
@@ -361,8 +369,20 @@ function loadPromptTemplates(input = {}) {
   const diagnostics = [];
   const candidates = roots.flatMap((root) => loadPromptRoot(root, diagnostics));
   const resolved = resolveResourceCollisions(candidates);
+  const items = [];
+  for (const template of resolved.winners) {
+    if (input.reservedNames?.has(template.name) === true) {
+      diagnostics.push({
+        type: "collision",
+        message: `prompt template /${template.name} conflicts with the built-in slash command /${template.name} and was ignored`,
+        path: template.filePath
+      });
+      continue;
+    }
+    items.push(template);
+  }
   return {
-    items: [...resolved.winners].sort((a, b) => a.name.localeCompare(b.name)),
+    items: items.sort((a, b) => a.name.localeCompare(b.name)),
     diagnostics: [...diagnostics, ...resolved.diagnostics]
   };
 }
@@ -407,6 +427,7 @@ function createResourcesLoader(options = {}) {
   const skillOptions2 = () => options.skills?.() ?? {};
   const promptOptions = (cwd) => ({
     cwd,
+    ...options.reservedPromptNames !== void 0 ? { reservedNames: options.reservedPromptNames } : {},
     ...skillOptions2().trustProjectCompatRoots !== void 0 ? { trustProjectCompatRoots: skillOptions2().trustProjectCompatRoots === true } : {}
   });
   return {
@@ -425,9 +446,6 @@ function createResourcesLoader(options = {}) {
     expandPromptTemplate(text, cwd = defaultCwd) {
       return expandPromptTemplateInput(text, loadPromptTemplates(promptOptions(cwd)));
     },
-    themes() {
-      return { items: [], diagnostics: [] };
-    },
     resolvePath(value, cwd = defaultCwd) {
       return expandConfigPath(value, { cwd });
     },
@@ -442,6 +460,7 @@ function createResourcesBundle(context, options = {}) {
   const config = () => context.getContract("config");
   const loader = createResourcesLoader({
     ...options.cwd !== void 0 ? { cwd: options.cwd } : {},
+    ...options.reservedPromptNames !== void 0 ? { reservedPromptNames: options.reservedPromptNames } : {},
     skills: () => ({
       ...skillOptions(config()?.get().skills.trustProjectCompatRoots === true, options)
     })
@@ -467,9 +486,6 @@ function createResourcesBundle(context, options = {}) {
     expandPromptTemplate(text, cwd) {
       return loader.expandPromptTemplate(text, cwd);
     },
-    themes() {
-      return loader.themes();
-    },
     resolvePath(value, cwd) {
       return loader.resolvePath(value, cwd);
     },
@@ -495,65 +511,8 @@ var ResourcesManifest = {
   dependsOn: ["config"]
 };
 
-// src/domains/resources/skills/provenance-pin.ts
+// src/domains/resources/prompts/substitute.ts
 init_esm_shims();
-var import_yaml = __toESM(require_dist(), 1);
-import { existsSync, readFileSync as readFileSync2 } from "node:fs";
-import path2 from "node:path";
-var SKILL_PIN_MANIFEST_FILENAME = "registry.yaml";
-function isPlainObject(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function resolveSkillPinManifestPath(cwd) {
-  const fromEnv = process.env.CLIO_CODER_SKILL_CATALOG_DIR;
-  const catalogDir = fromEnv && fromEnv.trim().length > 0 ? path2.resolve(fromEnv.trim()) : path2.join(cwd, "skills");
-  const manifestPath = path2.join(catalogDir, SKILL_PIN_MANIFEST_FILENAME);
-  return existsSync(manifestPath) ? manifestPath : null;
-}
-function loadSkillPinManifest(manifestPath) {
-  let parsed;
-  try {
-    parsed = import_yaml.default.parse(readFileSync2(manifestPath, "utf8"));
-  } catch {
-    return null;
-  }
-  if (!isPlainObject(parsed) || !Array.isArray(parsed.skills)) return null;
-  const entries = /* @__PURE__ */ new Map();
-  for (const raw of parsed.skills) {
-    if (!isPlainObject(raw)) continue;
-    const name = typeof raw.name === "string" ? raw.name.trim() : "";
-    const sha256 = typeof raw.sha256 === "string" ? raw.sha256.trim().toLowerCase() : "";
-    if (name.length === 0 || !/^[0-9a-f]{64}$/.test(sha256)) continue;
-    entries.set(name, {
-      name,
-      version: typeof raw.version === "string" && raw.version.trim().length > 0 ? raw.version.trim() : null,
-      sha256
-    });
-  }
-  return entries;
-}
-function checkSkillDrift(skill, cwd) {
-  const actual = skill.normalizedHash.toLowerCase();
-  const manifestPath = resolveSkillPinManifestPath(cwd);
-  const manifest = manifestPath === null ? null : loadSkillPinManifest(manifestPath);
-  const pinned = manifest?.get(skill.name);
-  if (pinned !== void 0) {
-    return {
-      verdict: pinned.sha256 === actual ? "match" : "mismatch",
-      authority: "pinned-manifest",
-      expected: pinned.sha256
-    };
-  }
-  const recorded = skill.provenance?.installedHash?.trim().toLowerCase();
-  if (recorded !== void 0 && /^[0-9a-f]{64}$/.test(recorded)) {
-    return {
-      verdict: recorded === actual ? "match" : "mismatch",
-      authority: "install-record",
-      expected: recorded
-    };
-  }
-  return null;
-}
 
 // src/domains/resources/index.ts
 var ResourcesDomainModule = {
@@ -573,4 +532,4 @@ export {
   ResourcesDomainModule,
   createResourcesDomainModule
 };
-//# sourceMappingURL=chunk-FST4FYJB.js.map
+//# sourceMappingURL=chunk-MFFY33HR.js.map