@gobing-ai/superskill 0.1.4 → 0.1.6

package/dist/index.js

@@ -9378,8 +9378,339 @@ function getProposalsDir(opts) {
   return join2(getDataRoot(opts), ".superskill", "proposals");
 }
 var init_paths = () => {};
+// ../../packages/core/src/pipeline/frontmatter-walk.ts
+function walkFrontmatter(content, opts) {
+  const lines = content.split(`
+`);
+  const out = [];
+  const seenInBlock = [];
+  let inFrontmatter = false;
+  let pastOpener = false;
+  let injectedName = false;
+  for (const line of lines) {
+    if (!pastOpener) {
+      if (line.trim() === "---") {
+        inFrontmatter = true;
+        pastOpener = true;
+        out.push(line);
+        out.push(`name: ${opts.expectedName}`);
+        injectedName = true;
+        continue;
+      }
+      out.push(line);
+      continue;
+    }
+    if (inFrontmatter) {
+      if (line.trim() === "---") {
+        if (opts.closerInjection?.shouldInject(seenInBlock)) {
+          out.push(...opts.closerInjection.lines);
+        }
+        inFrontmatter = false;
+        out.push(line);
+        continue;
+      }
+      if (/^name:\s*/.test(line))
+        continue;
+      seenInBlock.push(line);
+      const rule = opts.lineRules?.find((r) => r.test(line));
+      if (rule) {
+        const rewritten = rule.rewrite(line);
+        if (rewritten !== null)
+          out.push(rewritten);
+        continue;
+      }
+      out.push(line);
+      continue;
+    }
+    out.push(line);
+  }
+  if (!injectedName) {
+    return `${opts.fallbackBlock}
+
+${content}`;
+  }
+  return out.join(`
+`);
+}
+
+// ../../packages/core/src/pipeline/rewrite-references.ts
+function rewriteSkillReferences(content, pluginPrefix) {
+  if (!pluginPrefix || !content)
+    return content;
+  const escaped = pluginPrefix.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const re = new RegExp(`\\b(${escaped}):([a-z][a-z0-9-]*)`, "gi");
+  return content.split(`
+`).map((line) => SLASH_COMMAND_LINE_RE.test(line) ? line : line.replace(re, "$1-$2")).join(`
+`);
+}
+var SLASH_COMMAND_LINE_RE;
+var init_rewrite_references = __esm(() => {
+  SLASH_COMMAND_LINE_RE = /^\s*\/[a-zA-Z0-9._-]+:[a-zA-Z0-9._-]+(\s|$)/;
+});
+
+// ../../packages/core/src/pipeline/adapt-command.ts
+function adaptCommandToSkill(source, expectedName, pluginPrefix) {
+  let result;
+  if (source.startsWith("---")) {
+    result = normalizeCommandFrontmatter(source, expectedName);
+  } else {
+    const firstLine = source.split(`
+`).slice(0, 5).find((l) => l.trim() && !l.startsWith("#"));
+    const description = firstLine?.trim() || `${expectedName} command`;
+    result = `---
+name: ${expectedName}
+description: "${description}"
+disable-model-invocation: true
+---
+
+${source}`;
+  }
+  return rewriteSkillReferences(result, pluginPrefix);
+}
+function normalizeCommandFrontmatter(content, expectedName) {
+  return walkFrontmatter(content, {
+    expectedName,
+    lineRules: [
+      {
+        test: (line) => /^argument-hint:\s*/.test(line),
+        rewrite: (line) => `argument-hint: ${quoteYaml(line.slice(line.indexOf(":") + 1).trim())}`
+      },
+      {
+        test: (line) => /^allowed-tools:\s*/.test(line),
+        rewrite: (line) => {
+          const value = line.slice(line.indexOf(":") + 1).trim();
+          if (value.startsWith("["))
+            return line;
+          const parts = value.split(/,\s*/).map((p) => p.trim()).filter(Boolean);
+          return `allowed-tools: [${parts.join(", ")}]`;
+        }
+      }
+    ],
+    closerInjection: {
+      lines: ["disable-model-invocation: true"],
+      shouldInject: (seen) => !seen.some((l) => /^disable-model-invocation:\s*/.test(l))
+    },
+    fallbackBlock: `---
+name: ${expectedName}
+disable-model-invocation: true
+---`
+  });
+}
+function quoteYaml(value) {
+  const escaped = value.replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
+  return `"${escaped}"`;
+}
+var init_adapt_command = __esm(() => {
+  init_rewrite_references();
+});
+
+// ../../packages/core/src/pipeline/pi-tools.ts
+function expandPiToolName(raw) {
+  const trimmed = raw.trim().replace(/^["']|["']$/g, "");
+  if (DROPPED_TOOLS.has(trimmed))
+    return "";
+  if (trimmed.startsWith("mcp__") || trimmed.startsWith("mcp:"))
+    return "mcp";
+  return PI_TOOL_MAP[trimmed] ?? "";
+}
+function parseToolsList(raw) {
+  const trimmed = raw.trim();
+  const cleaned = trimmed.replace(/^\[|\]$/g, "");
+  if (!cleaned.trim())
+    return [];
+  return cleaned.split(",").map((t) => t.trim()).filter(Boolean);
+}
+function normalizePiToolList(raw) {
+  const parts = parseToolsList(raw);
+  const mapped = [];
+  for (const part of parts) {
+    for (const token of expandPiToolName(part).split(",").map((t) => t.trim())) {
+      if (token && !mapped.includes(token))
+        mapped.push(token);
+    }
+  }
+  return mapped.join(", ");
+}
+var PI_TOOL_MAP, DROPPED_TOOLS;
+var init_pi_tools = __esm(() => {
+  PI_TOOL_MAP = {
+    Read: "read",
+    read: "read",
+    Write: "write",
+    write: "write",
+    Edit: "edit",
+    edit: "edit",
+    Bash: "bash",
+    bash: "bash",
+    Grep: "grep",
+    grep: "grep",
+    Glob: "find, ls",
+    glob: "find, ls",
+    Find: "find",
+    find: "find",
+    Ls: "ls",
+    LS: "ls",
+    ls: "ls",
+    Agent: "subagent",
+    agent: "subagent",
+    subagent: "subagent",
+    WebSearch: "web_search, fetch_content, get_search_content",
+    WebFetch: "web_search, fetch_content, get_search_content",
+    web_search: "web_search",
+    fetch_content: "fetch_content",
+    get_search_content: "get_search_content",
+    mcp: "mcp"
+  };
+  DROPPED_TOOLS = new Set(["Skill", "skill", "Task", "task", "AskUserQuestion", "askuserquestion"]);
+});
+
+// ../../packages/core/src/pipeline/adapt-subagent.ts
+function asString(value) {
+  if (typeof value === "string")
+    return value;
+  if (Array.isArray(value))
+    return value.join(", ");
+  return "";
+}
+function adaptSubagentToSkill(source, expectedName, pluginPrefix) {
+  let result;
+  if (source.startsWith("---")) {
+    result = normalizeSubagentFrontmatter(source, expectedName);
+  } else {
+    const firstLine = source.split(`
+`).slice(0, 5).find((l) => l.trim() && !l.startsWith("#"));
+    const description = firstLine?.trim() || `${expectedName} subagent`;
+    result = `---
+name: ${expectedName}
+description: "${description}"
+---
+
+${source}`;
+  }
+  return rewriteSkillReferences(result, pluginPrefix);
+}
+function normalizeSubagentFrontmatter(content, expectedName) {
+  return walkFrontmatter(content, {
+    expectedName,
+    fallbackBlock: `---
+name: ${expectedName}
+---`
+  });
+}
+function adaptSubagentToPi(source, expectedName, pluginPrefix, skillExists) {
+  let data;
+  let body;
+  try {
+    const fm = parseFrontmatter(source);
+    data = fm.data;
+    body = fm.body.trim();
+  } catch {
+    const minimal = `---
+name: ${expectedName}
+---
+
+${source}`;
+    return rewriteSkillReferences(minimal, pluginPrefix);
+  }
+  const rawToolsStr = asString(data.tools);
+  const piTools = normalizePiToolList(rawToolsStr);
+  const description = asString(data.description) || `${expectedName} subagent`;
+  let model = asString(data.model);
+  if (model === "inherit")
+    model = "";
+  const skillsList = resolvePiSkills(data, body, pluginPrefix, skillExists);
+  const skillsCsv = skillsList.join(", ");
+  const fields = [`name: ${expectedName}`];
+  if (description)
+    fields.push(`description: ${description}`);
+  if (piTools)
+    fields.push(`tools: ${piTools}`);
+  if (model)
+    fields.push(`model: ${model}`);
+  if (skillsCsv)
+    fields.push(`skill: ${skillsCsv}`);
+  const runtimeNotes = buildPiRuntimeNotes(parseToolsList(rawToolsStr), skillsCsv);
+  const finalBody = runtimeNotes ? `${body}
+
+${runtimeNotes}` : body;
+  const result = `---
+${fields.join(`
+`)}
+---
+
+${finalBody}
+`;
+  return rewriteSkillReferences(result, pluginPrefix);
+}
+function resolvePiSkills(data, body, pluginPrefix, skillExists) {
+  const rawSkillsStr = asString(data.skills) || asString(data.skill);
+  if (rawSkillsStr) {
+    const seen2 = new Set;
+    const out2 = [];
+    for (const s of rawSkillsStr.split(",")) {
+      const normalized = s.trim().replace(/:/g, "-");
+      if (normalized && !seen2.has(normalized)) {
+        seen2.add(normalized);
+        out2.push(normalized);
+      }
+    }
+    return out2;
+  }
+  const prefix = `${pluginPrefix}:`;
+  const seen = new Set;
+  const out = [];
+  const matches = body.matchAll(/\b([a-z][a-z0-9-]*):([a-z][a-z0-9-]*)\b/gi);
+  for (const m of matches) {
+    const fullRef = `${m[1]}-${m[2]}`;
+    if (`${m[1]}:${m[2]}`.startsWith(prefix) && !seen.has(fullRef)) {
+      const dirName = fullRef.startsWith(`${pluginPrefix}-`) ? fullRef.slice(pluginPrefix.length + 1) : fullRef;
+      if (skillExists(dirName)) {
+        seen.add(fullRef);
+        out.push(fullRef);
+      }
+    }
+  }
+  return out;
+}
+function buildPiRuntimeNotes(rawTools, skillsCsv) {
+  const toolSet = new Set(rawTools.map((t) => t.trim()));
+  const sections = [];
+  if ((toolSet.has("Skill") || toolSet.has("skill")) && skillsCsv) {
+    sections.push(`- Skills in \`skill:\` are injected into this prompt. Treat any mention of a Skill tool as applying those injected skills directly: \`${skillsCsv}\`.
+`);
+  }
+  if (toolSet.has("Agent") || toolSet.has("agent") || toolSet.has("subagent")) {
+    sections.push("- Any mention of an Agent tool or agent delegation maps to Pi's `subagent` tool.\n");
+  }
+  if (toolSet.has("AskUserQuestion") || toolSet.has("askuserquestion")) {
+    sections.push(`- Any AskUserQuestion-style step should be handled by asking the user directly in the conversation.
+`);
+  }
+  if (toolSet.has("Task") || toolSet.has("task")) {
+    sections.push(`- Any Task tool reference should be handled with repository files or CLI workflows.
+`);
+  }
+  if (toolSet.has("Glob") || toolSet.has("glob")) {
+    sections.push("- File discovery maps to Pi's `find` and `ls` tools instead of Claude-style Glob.\n");
+  }
+  if (toolSet.has("WebSearch") || toolSet.has("WebFetch") || toolSet.has("web_search") || rawTools.some((t) => t.startsWith("mcp__"))) {
+    sections.push("- Web research maps to Pi web-access style tools (`web_search`, `fetch_content`, `get_search_content`). Install `pi-web-access` if you want those capabilities available.\n");
+  }
+  if (sections.length === 0)
+    return "";
+  return `## Pi Runtime Adaptation
+
+${sections.join(`
+`)}`;
+}
+var init_adapt_subagent = __esm(() => {
+  init_frontmatter();
+  init_pi_tools();
+  init_rewrite_references();
+});
+
 // ../../packages/core/src/mapper.ts
-import { existsSync as existsSync3, mkdirSync, readdirSync, readFileSync as readFileSync2, writeFileSync } from "fs";
+import { existsSync as existsSync3, mkdirSync, readdirSync, readFileSync as readFileSync2, statSync, writeFileSync } from "fs";
 import { join as join3 } from "path";
 function mapPluginToRulesync(pluginPath, pluginName, outputDir) {
   assertSafePathSegment(pluginName, "plugin name");
@@ -9389,45 +9720,78 @@ function mapPluginToRulesync(pluginPath, pluginName, outputDir) {
   if (existsSync3(skillsDir)) {
     const skillsOut = join3(outputDir, "skills");
     for (const entry of readdirSync(skillsDir)) {
-      if (!entry.endsWith(".md"))
+      const flatPath = join3(skillsDir, entry);
+      const dirSkillPath = join3(skillsDir, entry, "SKILL.md");
+      let skillName = null;
+      let sourcePath = null;
+      let sourceDir = null;
+      if (entry.endsWith(".md")) {
+        skillName = entry.replace(/\.md$/, "");
+        sourcePath = flatPath;
+      } else if (existsSync3(dirSkillPath)) {
+        skillName = entry;
+        sourcePath = dirSkillPath;
+        sourceDir = join3(skillsDir, entry);
+      }
+      if (!skillName || !sourcePath)
         continue;
-      const skillName = entry.replace(/\.md$/, "");
       const dir = join3(skillsOut, `${pluginName}-${skillName}`);
       mkdirSync(dir, { recursive: true });
-      writeFileSync(join3(dir, "SKILL.md"), readFileSync2(join3(skillsDir, entry)));
+      const content = rewriteSkillReferences(readFileSync2(sourcePath, "utf-8"), pluginName);
+      writeFileSync(join3(dir, "SKILL.md"), content);
+      if (sourceDir) {
+        for (const subdir of ["scripts", "references", "templates", "assets"]) {
+          const subdirPath = join3(sourceDir, subdir);
+          if (existsSync3(subdirPath)) {
+            copyAndRewriteDirectory(subdirPath, join3(dir, subdir), pluginName);
+          }
+        }
+      }
       result.skills++;
     }
   }
   const commandsDir = join3(pluginPath, "commands");
   if (existsSync3(commandsDir)) {
-    const commandsOut = join3(outputDir, "commands");
-    mkdirSync(commandsOut, { recursive: true });
+    const skillsOut = join3(outputDir, "skills");
     for (const entry of readdirSync(commandsDir)) {
       if (!entry.endsWith(".md"))
         continue;
       const cmdName = entry.replace(/\.md$/, "");
-      writeFileSync(join3(commandsOut, `${pluginName}-${cmdName}.md`), readFileSync2(join3(commandsDir, entry)));
+      const expectedName = `${pluginName}-${cmdName}`;
+      const dir = join3(skillsOut, expectedName);
+      mkdirSync(dir, { recursive: true });
+      const source = readFileSync2(join3(commandsDir, entry), "utf-8");
+      const adapted = adaptCommandToSkill(source, expectedName, pluginName);
+      writeFileSync(join3(dir, "SKILL.md"), adapted);
       result.commands++;
     }
   }
   const agentsDir = join3(pluginPath, "agents");
   if (existsSync3(agentsDir)) {
-    const subagentsOut = join3(outputDir, "subagents");
-    mkdirSync(subagentsOut, { recursive: true });
+    const skillsOut = join3(outputDir, "skills");
     for (const entry of readdirSync(agentsDir)) {
       if (!entry.endsWith(".md"))
         continue;
       const agentName = entry.replace(/\.md$/, "");
-      writeFileSync(join3(subagentsOut, `${pluginName}-${agentName}.md`), readFileSync2(join3(agentsDir, entry)));
+      const expectedName = `${pluginName}-${agentName}`;
+      const dir = join3(skillsOut, expectedName);
+      mkdirSync(dir, { recursive: true });
+      const source = readFileSync2(join3(agentsDir, entry), "utf-8");
+      const adapted = adaptSubagentToSkill(source, expectedName, pluginName);
+      writeFileSync(join3(dir, "SKILL.md"), adapted);
       result.subagents++;
     }
   }
-  const hooksPath = join3(pluginPath, "hooks.json");
+  const hooksRootPath = join3(pluginPath, "hooks.json");
+  const hooksSubdirPath = join3(pluginPath, "hooks", "hooks.json");
+  const hooksPath = existsSync3(hooksRootPath) ? hooksRootPath : hooksSubdirPath;
   if (existsSync3(hooksPath)) {
     deepMergeJsonFile(hooksPath, join3(outputDir, "hooks.json"));
     result.hooks = true;
   }
-  const mcpPath = join3(pluginPath, "mcp.json");
+  const mcpRootPath = join3(pluginPath, "mcp.json");
+  const mcpSubdirPath = join3(pluginPath, "mcp", "mcp.json");
+  const mcpPath = existsSync3(mcpRootPath) ? mcpRootPath : mcpSubdirPath;
   if (existsSync3(mcpPath)) {
     deepMergeJsonFile(mcpPath, join3(outputDir, "mcp.json"));
     result.mcp = true;
@@ -9464,7 +9828,24 @@ function deepMerge2(target, source) {
 function isJsonObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-var init_mapper = () => {};
+function copyAndRewriteDirectory(source, destination, pluginName) {
+  mkdirSync(destination, { recursive: true });
+  for (const entry of readdirSync(source)) {
+    const srcPath = join3(source, entry);
+    const destPath = join3(destination, entry);
+    if (statSync(srcPath).isDirectory()) {
+      copyAndRewriteDirectory(srcPath, destPath, pluginName);
+    } else {
+      const content = readFileSync2(srcPath, "utf-8");
+      writeFileSync(destPath, rewriteSkillReferences(content, pluginName));
+    }
+  }
+}
+var init_mapper = __esm(() => {
+  init_adapt_command();
+  init_adapt_subagent();
+  init_rewrite_references();
+});
 
 // ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/helpers/util.js
 var util, objectUtil, ZodParsedType, getParsedType = (data) => {
@@ -13474,7 +13855,7 @@ function resolvePlugin(marketplacePath, pluginName) {
   if (!source.startsWith("./")) {
     throw new Error(`Remote sources not yet supported for plugin '${pluginName}'. Phase 1 only supports relative-path sources (starting with './').`);
   }
-  if (source.includes("..")) {
+  if (/(?:^|\/)\.\.(?:\/|$)/.test(source)) {
     throw new Error(`Plugin source for '${pluginName}' escapes the marketplace root: '${source}'.`);
   }
   const marketplaceRoot = resolve(manifestPath, "..", "..");
@@ -13578,7 +13959,7 @@ function mergeSkillBodies(sources) {
   return dedupeLines(concatenated);
 }
 function dedupeLines(text) {
-  const seen = new Set;
+  const seenHeadings = new Set;
   const out = [];
   let prevBlank = false;
   for (const line of text.split(`
@@ -13590,10 +13971,12 @@ function dedupeLines(text) {
       continue;
     }
     prevBlank = false;
-    if (!seen.has(line)) {
-      seen.add(line);
-      out.push(line);
+    if (/^#{1,6} /.test(line)) {
+      if (seenHeadings.has(line))
+        continue;
+      seenHeadings.add(line);
     }
+    out.push(line);
   }
   while (out.length > 0 && out[out.length - 1] === "")
     out.pop();
@@ -13630,7 +14013,7 @@ var init_migrate = __esm(() => {
 });
 
 // ../../packages/core/src/operations/package.ts
-import { cpSync, existsSync as existsSync6, mkdirSync as mkdirSync3, statSync } from "fs";
+import { cpSync, existsSync as existsSync6, mkdirSync as mkdirSync3, statSync as statSync2 } from "fs";
 import { basename as basename2, dirname as dirname3, join as join5 } from "path";
 import { cwd as cwd3 } from "process";
 function resolveSkillDir(name) {
@@ -13638,7 +14021,7 @@ function resolveSkillDir(name) {
   if (!skillPath) {
     throw Object.assign(new Error(`Skill not found: ${name}`), { code: "ENOENT" });
   }
-  const dir = statSync(skillPath).isDirectory() ? skillPath : dirname3(skillPath);
+  const dir = statSync2(skillPath).isDirectory() ? skillPath : dirname3(skillPath);
   return { dir, name: basename2(dir) };
 }
 function copyDirIfExists(src, dest) {
@@ -13719,13 +14102,43 @@ async function scaffold(type, name, opts = {}) {
 var PLACEHOLDER_NAME = "<!-- NAME -->", PLACEHOLDER_DESCRIPTION = "<!-- DESCRIPTION -->", PLACEHOLDER_TARGET = "<!-- TARGET -->", PLACEHOLDER_BODY = "<!-- BODY -->";
 var init_scaffold = () => {};
 
-// ../../packages/core/src/quality/dimensions.ts
+// ../../packages/core/src/quality/types.ts
 function computeAggregate(dimensions) {
   const scores = Object.values(dimensions).map((d) => d.score);
   if (scores.length === 0)
     return 0;
   return scores.reduce((a, b) => a + b, 0) / scores.length;
 }
+var DIMENSION_REGISTRY, IMPERATIVE_KEYWORDS, VAGUE_KEYWORDS, REQUIRED_FIELDS;
+var init_types2 = __esm(() => {
+  DIMENSION_REGISTRY = {
+    skill: ["completeness", "clarity", "trigger-accuracy", "anti-hallucination", "conciseness"],
+    command: ["completeness", "clarity", "argument-hints", "tool-references", "slash-syntax"],
+    agent: ["completeness", "role-clarity", "tool-selection", "skill-linkage", "model-fit"],
+    hook: ["correctness", "event-coverage", "safety", "pattern-match-quality"],
+    magent: ["completeness", "platform-coverage", "conciseness", "tone-consistency", "safety"]
+  };
+  IMPERATIVE_KEYWORDS = ["must", "should", "never", "always", "required", "ensure", "validate"];
+  VAGUE_KEYWORDS = ["maybe", "perhaps", "might", "could be", "probably"];
+  REQUIRED_FIELDS = {
+    skill: ["name", "description"],
+    command: ["name", "description"],
+    agent: ["name", "description", "model", "tools"],
+    hook: ["name", "description", "event"],
+    magent: ["name", "description"]
+  };
+});
+
+// ../../packages/core/src/quality/heuristics.ts
+function scoreClarityFromDensities(body) {
+  const imperative = keywordDensity(body, [...IMPERATIVE_KEYWORDS]);
+  const vague = keywordDensity(body, [...VAGUE_KEYWORDS]);
+  const score = clamp((imperative - vague) / 2 + 0.5);
+  const lower = body.toLowerCase();
+  const found = VAGUE_KEYWORDS.filter((t) => lower.includes(t));
+  const note = found.length === 0 ? "Good imperative style" : `Vague terms found: ${found.join(", ")}`;
+  return { score, note };
+}
 function parseFrontmatterSafe(content) {
   try {
     return parseFrontmatter(content).data;
@@ -13805,23 +14218,9 @@ function clamp(n) {
 function escapeRegex(s) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-var DIMENSION_REGISTRY, REQUIRED_FIELDS;
-var init_dimensions = __esm(() => {
+var init_heuristics = __esm(() => {
   init_frontmatter();
-  DIMENSION_REGISTRY = {
-    skill: ["completeness", "clarity", "trigger-accuracy", "anti-hallucination", "conciseness"],
-    command: ["completeness", "clarity", "argument-hints", "tool-references", "slash-syntax"],
-    agent: ["completeness", "role-clarity", "tool-selection", "skill-linkage", "model-fit"],
-    hook: ["correctness", "event-coverage", "safety", "pattern-match-quality"],
-    magent: ["completeness", "platform-coverage", "conciseness", "tone-consistency", "safety"]
-  };
-  REQUIRED_FIELDS = {
-    skill: ["name", "description"],
-    command: ["name", "description"],
-    agent: ["name", "description", "model", "tools"],
-    hook: ["name", "description", "event"],
-    magent: ["name", "description"]
-  };
+  init_types2();
 });
 
 // ../../packages/core/src/quality/hook.ts
@@ -13918,7 +14317,8 @@ function evaluateHook(content, target) {
 }
 var KNOWN_HOOK_EVENTS;
 var init_hook = __esm(() => {
-  init_dimensions();
+  init_heuristics();
+  init_types2();
   KNOWN_HOOK_EVENTS = [
     "PreToolUse",
     "PostToolUse",
@@ -13933,7 +14333,7 @@ var init_hook = __esm(() => {
 });
 
 // ../../packages/core/src/operations/validate.ts
-import { existsSync as existsSync8, statSync as statSync2 } from "fs";
+import { existsSync as existsSync8, statSync as statSync3 } from "fs";
 import { dirname as dirname4 } from "path";
 async function validate(type, nameOrPath, opts) {
   const resolvedPath = resolveContentPath(type, nameOrPath);
@@ -13945,7 +14345,7 @@ async function validate(type, nameOrPath, opts) {
   }
   let stat;
   try {
-    stat = statSync2(resolvedPath);
+    stat = statSync3(resolvedPath);
   } catch {
     return sentinelResult(`File not found: ${resolvedPath}`);
   }
@@ -14182,8 +14582,8 @@ var MODEL_ALIASES, FIELD_TYPES, DEPRECATED_FIELDS;
 var init_validate = __esm(() => {
   init_frontmatter();
   init_identity();
-  init_dimensions();
   init_hook();
+  init_types2();
   MODEL_ALIASES = ["inherit", "sonnet", "opus", "haiku"];
   FIELD_TYPES = {
     skill: {
@@ -14220,176 +14620,13 @@ var init_validate = __esm(() => {
     version: "Version is derived from the source repository."
   };
 });
-// ../../packages/core/src/pipeline/frontmatter.ts
-function normalizeFrontmatter(content, name) {
-  if (!content.startsWith(`---
-`)) {
-    return `---
-name: ${name}
----
-
-${content}`;
-  }
-  const end = content.indexOf(`
----`, 4);
-  if (end === -1) {
-    return content;
-  }
-  const frontmatter = content.slice(4, end);
-  if (/^name\s*:/m.test(frontmatter)) {
-    return content;
-  }
-  return `---
-name: ${name}
-${content.slice(4)}`;
-}
 
 // ../../packages/core/src/pipeline/pi-subagent.ts
-function expandPiTool(raw) {
-  const trimmed = raw.trim().replace(/^["']|["']$/g, "");
-  if (DROPPED_TOOLS.has(trimmed))
-    return "";
-  if (trimmed.startsWith("mcp__") || trimmed.startsWith("mcp:"))
-    return "mcp";
-  return PI_TOOL_MAP[trimmed] ?? "";
-}
-function parseToolsList(raw) {
-  const trimmed = raw.trim();
-  const cleaned = trimmed.replace(/^\[|\]$/g, "");
-  if (!cleaned.trim())
-    return [];
-  return cleaned.split(",").map((t) => t.trim()).filter(Boolean);
-}
-function extractSkillsFromBody(body) {
-  const matches = body.matchAll(/\b([a-z][a-z0-9-]*):([a-z][a-z0-9-]*)\b/gi);
-  const skills = new Set;
-  for (const m of matches) {
-    skills.add(`${m[1]}-${m[2]}`);
-  }
-  return [...skills];
-}
-function asString(value) {
-  if (typeof value === "string")
-    return value;
-  if (Array.isArray(value))
-    return value.join(", ");
-  return "";
-}
-function buildPiRuntimeNotes(rawTools, skillsCsv) {
-  const toolSet = new Set(rawTools.map((t) => t.trim()));
-  const sections = [];
-  if ((toolSet.has("Skill") || toolSet.has("skill")) && skillsCsv) {
-    sections.push(`- Skills in \`skill:\` are injected into this prompt. Treat any mention of a Skill tool as applying those injected skills directly: \`${skillsCsv}\`.
-`);
-  }
-  if (toolSet.has("Agent") || toolSet.has("agent") || toolSet.has("subagent")) {
-    sections.push("- Any mention of an Agent tool or agent delegation maps to Pi's `subagent` tool.\n");
-  }
-  if (toolSet.has("AskUserQuestion") || toolSet.has("askuserquestion")) {
-    sections.push(`- Any AskUserQuestion-style step should be handled by asking the user directly in the conversation.
-`);
-  }
-  if (toolSet.has("Task") || toolSet.has("task")) {
-    sections.push(`- Any Task tool reference should be handled with repository files or CLI workflows.
-`);
-  }
-  if (toolSet.has("Glob") || toolSet.has("glob")) {
-    sections.push("- File discovery maps to Pi's `find` and `ls` tools instead of Claude-style Glob.\n");
-  }
-  if (toolSet.has("WebSearch") || toolSet.has("WebFetch") || toolSet.has("web_search") || rawTools.some((t) => t.startsWith("mcp__"))) {
-    sections.push("- Web research maps to Pi web-access style tools (`web_search`, `fetch_content`, `get_search_content`). Install `pi-web-access` if you want those capabilities available.\n");
-  }
-  if (sections.length === 0)
-    return "";
-  return `## Pi Runtime Adaptation
-
-${sections.join(`
-`)}`;
-}
-function convertToPiSubagent(content) {
-  let data;
-  let body;
-  try {
-    const fm = parseFrontmatter(content);
-    data = fm.data;
-    body = fm.body.trim();
-  } catch {
-    return content;
-  }
-  const rawToolsStr = asString(data.tools);
-  const rawTools = parseToolsList(rawToolsStr);
-  const piTools = rawTools.map(expandPiTool).filter(Boolean).join(", ");
-  const rawSkillsStr = asString(data.skills) || asString(data.skill);
-  const explicitSkills = rawSkillsStr ? rawSkillsStr.split(",").map((s) => s.trim().replace(":", "-")) : [];
-  let skillsList = explicitSkills;
-  if (skillsList.length === 0) {
-    skillsList = extractSkillsFromBody(body);
-  }
-  const skillsCsv = skillsList.join(", ");
-  let model = asString(data.model);
-  if (model === "inherit")
-    model = "";
-  const piFields = [];
-  piFields.push(`name: ${asString(data.name)}`);
-  if (data.description)
-    piFields.push(`description: ${asString(data.description)}`);
-  if (piTools)
-    piFields.push(`tools: ${piTools}`);
-  if (skillsCsv)
-    piFields.push(`skill: ${skillsCsv}`);
-  if (model)
-    piFields.push(`model: ${model}`);
-  const runtimeNotes = buildPiRuntimeNotes(rawTools, skillsCsv);
-  const finalBody = runtimeNotes ? `${body}
-
-${runtimeNotes}` : body;
-  return `---
-${piFields.join(`
-`)}
----
-
-${finalBody}
-`;
-}
-var PI_TOOL_MAP, DROPPED_TOOLS;
 var init_pi_subagent = __esm(() => {
   init_frontmatter();
-  PI_TOOL_MAP = {
-    Read: "read",
-    read: "read",
-    Write: "write",
-    write: "write",
-    Edit: "edit",
-    edit: "edit",
-    Bash: "bash",
-    bash: "bash",
-    Grep: "grep",
-    grep: "grep",
-    Glob: "find, ls",
-    glob: "find, ls",
-    Find: "find",
-    find: "find",
-    Ls: "ls",
-    LS: "ls",
-    ls: "ls",
-    Agent: "subagent",
-    agent: "subagent",
-    subagent: "subagent",
-    WebSearch: "web_search, fetch_content, get_search_content",
-    WebFetch: "web_search, fetch_content, get_search_content",
-    web_search: "web_search",
-    fetch_content: "fetch_content",
-    get_search_content: "get_search_content",
-    mcp: "mcp"
-  };
-  DROPPED_TOOLS = new Set(["Skill", "skill", "Task", "task", "AskUserQuestion", "askuserquestion"]);
+  init_pi_tools();
 });
 
-// ../../packages/core/src/pipeline/rewrite-colons.ts
-function rewriteColonRefs(content) {
-  return content.replace(/\b(rd3|wt):([a-z][a-z0-9-]*)\b/gi, (_match, prefix, name) => `${prefix}-${name}`);
-}
-
 // ../../node_modules/.bun/@logtape+logtape@2.1.5/node_modules/@logtape/logtape/dist/context.js
 function getCategoryPrefix() {
   const rootLogger = LoggerImpl.getLogger();
@@ -31971,7 +32208,7 @@ var init_config = __esm(() => {
 });
 
 // ../../node_modules/.bun/@gobing-ai+ts-runtime@0.3.21/node_modules/@gobing-ai/ts-runtime/dist/file-system-node.js
-import { appendFileSync, cpSync as cpSync2, createWriteStream, existsSync as existsSync9, mkdirSync as mkdirSync5, readdirSync as readdirSync2, readFileSync as readFileSync6, renameSync, rmSync as rmSync2, statSync as statSync3, writeFileSync as writeFileSync4 } from "fs";
+import { appendFileSync, cpSync as cpSync2, createWriteStream, existsSync as existsSync9, mkdirSync as mkdirSync5, readdirSync as readdirSync2, readFileSync as readFileSync6, renameSync, rmSync as rmSync2, statSync as statSync4, writeFileSync as writeFileSync4 } from "fs";
 import { dirname as dirname5, resolve as resolvePath } from "path";
 function createNodeFileSystem(root) {
   const projectRoot = root ?? findProjectRoot(process.cwd());
@@ -32007,7 +32244,7 @@ function createNodeFileSystem(root) {
     },
     stat: (path) => {
       try {
-        const s = statSync3(path);
+        const s = statSync4(path);
         return {
           isFile: () => s.isFile(),
           isDirectory: () => s.isDirectory(),
@@ -34635,7 +34872,7 @@ var init_encoding_option = __esm(() => {
 });
 
 // ../../node_modules/.bun/execa@9.6.1/node_modules/execa/lib/arguments/cwd.js
-import { statSync as statSync4 } from "fs";
+import { statSync as statSync5 } from "fs";
 import path4 from "path";
 import process6 from "process";
 var normalizeCwd = (cwd5 = getDefaultCwd()) => {
@@ -34655,7 +34892,7 @@ ${error51.message}`;
   }
   let cwdStat;
   try {
-    cwdStat = statSync4(cwd5);
+    cwdStat = statSync5(cwd5);
   } catch (error51) {
     return `The "cwd" option is invalid: ${cwd5}.
 ${error51.message}
@@ -39608,7 +39845,7 @@ var init_schema_validation = __esm(() => {
 });
 
 // ../../node_modules/.bun/@gobing-ai+ts-runtime@0.3.21/node_modules/@gobing-ai/ts-runtime/dist/types.js
-var init_types2 = () => {};
+var init_types3 = () => {};
 
 // ../../node_modules/.bun/@gobing-ai+ts-runtime@0.3.21/node_modules/@gobing-ai/ts-runtime/dist/index.js
 var init_dist4 = __esm(() => {
@@ -39618,7 +39855,7 @@ var init_dist4 = __esm(() => {
   init_context2();
   init_path();
   init_schema_validation();
-  init_types2();
+  init_types3();
 });
 
 // ../../node_modules/.bun/@gobing-ai+ts-ai-runner@0.3.21+5a4f8cc6c6b198a4/node_modules/@gobing-ai/ts-ai-runner/dist/identity.js
@@ -40083,7 +40320,7 @@ var init_dist5 = __esm(() => {
 });
 
 // ../../packages/core/src/targets.ts
-var TARGETS, TARGET_TO_RULESYNC, TARGET_TO_AGENT_NAME;
+var TARGETS, TARGET_TO_RULESYNC, TARGET_SKILLS_RELDIR, TARGET_TO_AGENT_NAME;
 var init_targets = __esm(() => {
   TARGETS = [
     "claude",
@@ -40102,6 +40339,13 @@ var init_targets = __esm(() => {
     "antigravity-cli": "antigravity-cli",
     "antigravity-ide": "antigravity-ide"
   };
+  TARGET_SKILLS_RELDIR = {
+    codex: ".agents/skills",
+    pi: ".pi/skills",
+    opencode: ".opencode/skills",
+    "antigravity-cli": ".agents/skills",
+    "antigravity-ide": ".agents/skills"
+  };
   TARGET_TO_AGENT_NAME = {
     claude: "claude",
     codex: "codex",
@@ -40237,7 +40481,8 @@ function evaluateAgent(content, target) {
   };
 }
 var init_agent = __esm(() => {
-  init_dimensions();
+  init_heuristics();
+  init_types2();
 });
 
 // ../../packages/core/src/quality/command.ts
@@ -40255,17 +40500,7 @@ function scoreCompleteness2(data) {
   return { score, note };
 }
 function scoreClarity(body) {
-  const imperative = keywordDensity(body, ["must", "should", "never", "always", "required", "ensure", "validate"]);
-  const vague = keywordDensity(body, ["maybe", "perhaps", "might", "could be", "probably"]);
-  const score = clamp(imperative - vague);
-  const detectedVague = [];
-  for (const v of ["maybe", "perhaps", "might", "could be", "probably"]) {
-    if (new RegExp(`(?:^|\\s)${v.replace(/\s/g, "\\s")}(?:\\s|$|[.,;:!?])`, "i").test(body)) {
-      detectedVague.push(v);
-    }
-  }
-  const note = detectedVague.length > 0 ? `Uses vague language: ${detectedVague.join(", ")}` : "Good imperative style";
-  return { score, note };
+  return scoreClarityFromDensities(body);
 }
 function scoreArgumentHints(data) {
   const args = data.arguments;
@@ -40285,20 +40520,15 @@ function scoreArgumentHints(data) {
   return { score, note: `${withHints}/${args.length} arguments have hints` };
 }
 function scoreToolReferences(body) {
-  const toolRefs = [/`[a-z][a-z0-9_-]*`/g, /tool:/gi, /tools:/gi];
-  let count2 = 0;
-  for (const pattern of toolRefs) {
-    pattern.lastIndex = 0;
-    const matches = body.match(pattern);
-    if (matches)
-      count2 += matches.length;
-  }
+  const structuredCount = (body.match(/\btools?:/gi) ?? []).length;
+  const backtickCount = (body.match(/`[a-z][a-z0-9_-]*`/g) ?? []).length;
+  const weightedCount = structuredCount + Math.min(backtickCount, 1);
   let score;
   let note;
-  if (count2 >= 2) {
+  if (structuredCount >= 1 || weightedCount >= 2) {
     score = 1;
     note = "Uses tool references";
-  } else if (count2 === 1) {
+  } else if (weightedCount === 1) {
     score = 0.6;
     note = "Limited tool references";
   } else {
@@ -40344,7 +40574,8 @@ function evaluateCommand(content, target) {
   };
 }
 var init_command3 = __esm(() => {
-  init_dimensions();
+  init_heuristics();
+  init_types2();
 });
 
 // ../../packages/core/src/quality/magent.ts
@@ -40426,99 +40657,11 @@ function evaluateMagent(content, target) {
 }
 var MAGENT_SECTIONS;
 var init_magent = __esm(() => {
-  init_dimensions();
+  init_heuristics();
+  init_types2();
   MAGENT_SECTIONS = [/^## IDENTITY/m, /^## SOUL/m, /^## AGENTS/m, /^## USER/m];
 });
 
-// ../../packages/core/src/quality/rubric.ts
-import { existsSync as existsSync10, readFileSync as readFileSync9 } from "fs";
-import { homedir as homedir3 } from "os";
-import { join as join7 } from "path";
-function resolveRubricContent(type, opts) {
-  if (opts?.path) {
-    if (!existsSync10(opts.path)) {
-      throw new RubricError("path", `Rubric file not found: ${opts.path}`, opts.path);
-    }
-    return readFileSync9(opts.path, "utf-8");
-  }
-  const homeDir = process.env.HOME ?? homedir3();
-  const userPath = join7(homeDir, ".superskill", "rubrics", `${type}.yaml`);
-  if (existsSync10(userPath)) {
-    return readFileSync9(userPath, "utf-8");
-  }
-  const devPath = join7(import.meta.dir, "..", "rubrics", `${type}.yaml`);
-  if (existsSync10(devPath)) {
-    return readFileSync9(devPath, "utf-8");
-  }
-  const prodPath = join7(import.meta.dir, "..", "..", "rubrics", `${type}.yaml`);
-  if (existsSync10(prodPath)) {
-    return readFileSync9(prodPath, "utf-8");
-  }
-  throw new RubricError("path", `No rubric found for type "${type}". Searched: ${opts?.path ?? "(no explicit path)"}, ${userPath}, ${devPath}, ${prodPath}`, type);
-}
-function loadRubric(type, opts) {
-  const raw = resolveRubricContent(type, opts);
-  let parsed;
-  try {
-    parsed = $parse(raw);
-  } catch (e) {
-    throw new RubricError("yaml", `Failed to parse rubric YAML: ${e instanceof Error ? e.message : String(e)}`);
-  }
-  const result = RubricSchema.safeParse(parsed);
-  if (!result.success) {
-    const issue2 = result.error.issues[0];
-    if (!issue2) {
-      throw new RubricError("root", "Rubric schema validation failed with no issue reported.");
-    }
-    const field = issue2.path.length > 0 ? issue2.path.join(".") : "root";
-    throw new RubricError(field, `Rubric schema validation failed: ${issue2.message}`);
-  }
-  const rubric = result.data;
-  const allowed = DIMENSION_REGISTRY[rubric.type];
-  for (const [i2, dim2] of rubric.dimensions.entries()) {
-    if (!allowed.includes(dim2.name)) {
-      throw new RubricError(`dimensions[${i2}].name`, `Unknown dimension name "${dim2.name}" for type "${rubric.type}". Allowed: ${allowed.join(", ")}`, dim2.name);
-    }
-  }
-  const weightSum = rubric.dimensions.reduce((acc, d) => acc + d.weight, 0);
-  if (Math.abs(weightSum - 1) > WEIGHT_SUM_TOLERANCE) {
-    throw new RubricError("weights.sum", `Dimension weights sum to ${weightSum}, expected 1.0 (\xB1${WEIGHT_SUM_TOLERANCE}).`, weightSum);
-  }
-  return rubric;
-}
-var CONTENT_TYPES, RubricSchema, RubricError, WEIGHT_SUM_TOLERANCE = 0.001;
-var init_rubric = __esm(() => {
-  init_dist2();
-  init_zod();
-  init_dimensions();
-  CONTENT_TYPES = ["skill", "command", "agent", "hook", "magent"];
-  RubricSchema = exports_external.object({
-    version: exports_external.number().int().min(1),
-    type: exports_external.enum(CONTENT_TYPES),
-    dimensions: exports_external.array(exports_external.object({
-      name: exports_external.string().min(1),
-      weight: exports_external.number().min(0).max(1),
-      criterion: exports_external.string().min(1),
-      anchors: exports_external.object({
-        excellent: exports_external.string().optional(),
-        poor: exports_external.string().optional()
-      }).optional()
-    })).min(1)
-  });
-  RubricError = class RubricError extends Error {
-    field;
-    actual;
-    constructor(field, message, actual) {
-      super(message);
-      this.name = "RubricError";
-      this.field = field;
-      if (actual !== undefined) {
-        this.actual = actual;
-      }
-    }
-  };
-});
-
 // ../../packages/core/src/quality/skill.ts
 function evaluateSkill(content, target) {
   const data = parseFrontmatterSafe(content);
@@ -40554,21 +40697,7 @@ function scoreCompleteness4(content, data, body) {
   return { score, note };
 }
 function scoreClarity2(body) {
-  const imperativeDensity = keywordDensity(body, [
-    "must",
-    "should",
-    "never",
-    "always",
-    "required",
-    "ensure",
-    "validate"
-  ]);
-  const vagueDensity = keywordDensity(body, ["maybe", "perhaps", "might", "could be", "probably"]);
-  const score = clamp((imperativeDensity - vagueDensity) / 2 + 0.5);
-  const lower = body.toLowerCase();
-  const vagueTerms = ["maybe", "perhaps", "might", "could be", "probably"].filter((t) => lower.includes(t));
-  const note = vagueTerms.length === 0 ? "Good imperative style" : `Vague terms found: ${vagueTerms.join(", ")}`;
-  return { score, note };
+  return scoreClarityFromDensities(body);
 }
 function scoreTriggerAccuracy(body) {
   const count2 = countTriggerPhrases(body);
@@ -40635,7 +40764,117 @@ function countTriggerPhrases(body) {
   return count2;
 }
 var init_skill = __esm(() => {
-  init_dimensions();
+  init_heuristics();
+  init_types2();
+});
+
+// ../../packages/core/src/quality/evaluate.ts
+function evaluate(type, content, target) {
+  return EVALUATORS[type](content, target);
+}
+var EVALUATORS;
+var init_evaluate = __esm(() => {
+  init_agent();
+  init_command3();
+  init_hook();
+  init_magent();
+  init_skill();
+  EVALUATORS = {
+    skill: evaluateSkill,
+    command: evaluateCommand,
+    agent: evaluateAgent,
+    hook: evaluateHook,
+    magent: evaluateMagent
+  };
+});
+
+// ../../packages/core/src/quality/rubric.ts
+import { existsSync as existsSync10, readFileSync as readFileSync9 } from "fs";
+import { homedir as homedir3 } from "os";
+import { join as join7 } from "path";
+function resolveRubricContent(type, opts) {
+  if (opts?.path) {
+    if (!existsSync10(opts.path)) {
+      throw new RubricError("path", `Rubric file not found: ${opts.path}`, opts.path);
+    }
+    return readFileSync9(opts.path, "utf-8");
+  }
+  const homeDir = process.env.HOME ?? homedir3();
+  const userPath = join7(homeDir, ".superskill", "rubrics", `${type}.yaml`);
+  if (existsSync10(userPath)) {
+    return readFileSync9(userPath, "utf-8");
+  }
+  const devPath = join7(import.meta.dir, "..", "rubrics", `${type}.yaml`);
+  if (existsSync10(devPath)) {
+    return readFileSync9(devPath, "utf-8");
+  }
+  const prodPath = join7(import.meta.dir, "..", "..", "rubrics", `${type}.yaml`);
+  if (existsSync10(prodPath)) {
+    return readFileSync9(prodPath, "utf-8");
+  }
+  throw new RubricError("path", `No rubric found for type "${type}". Searched: ${opts?.path ?? "(no explicit path)"}, ${userPath}, ${devPath}, ${prodPath}`, type);
+}
+function loadRubric(type, opts) {
+  const raw = resolveRubricContent(type, opts);
+  let parsed;
+  try {
+    parsed = $parse(raw);
+  } catch (e) {
+    throw new RubricError("yaml", `Failed to parse rubric YAML: ${e instanceof Error ? e.message : String(e)}`);
+  }
+  const result = RubricSchema.safeParse(parsed);
+  if (!result.success) {
+    const issue2 = result.error.issues[0];
+    if (!issue2) {
+      throw new RubricError("root", "Rubric schema validation failed with no issue reported.");
+    }
+    const field = issue2.path.length > 0 ? issue2.path.join(".") : "root";
+    throw new RubricError(field, `Rubric schema validation failed: ${issue2.message}`);
+  }
+  const rubric = result.data;
+  const allowed = DIMENSION_REGISTRY[rubric.type];
+  for (const [i2, dim2] of rubric.dimensions.entries()) {
+    if (!allowed.includes(dim2.name)) {
+      throw new RubricError(`dimensions[${i2}].name`, `Unknown dimension name "${dim2.name}" for type "${rubric.type}". Allowed: ${allowed.join(", ")}`, dim2.name);
+    }
+  }
+  const weightSum = rubric.dimensions.reduce((acc, d) => acc + d.weight, 0);
+  if (Math.abs(weightSum - 1) > WEIGHT_SUM_TOLERANCE) {
+    throw new RubricError("weights.sum", `Dimension weights sum to ${weightSum}, expected 1.0 (\xB1${WEIGHT_SUM_TOLERANCE}).`, weightSum);
+  }
+  return rubric;
+}
+var CONTENT_TYPES, RubricSchema, RubricError, WEIGHT_SUM_TOLERANCE = 0.001;
+var init_rubric = __esm(() => {
+  init_dist2();
+  init_zod();
+  init_types2();
+  CONTENT_TYPES = ["skill", "command", "agent", "hook", "magent"];
+  RubricSchema = exports_external.object({
+    version: exports_external.number().int().min(1),
+    type: exports_external.enum(CONTENT_TYPES),
+    dimensions: exports_external.array(exports_external.object({
+      name: exports_external.string().min(1),
+      weight: exports_external.number().min(0).max(1),
+      criterion: exports_external.string().min(1),
+      anchors: exports_external.object({
+        excellent: exports_external.string().optional(),
+        poor: exports_external.string().optional()
+      }).optional()
+    })).min(1)
+  });
+  RubricError = class RubricError extends Error {
+    field;
+    actual;
+    constructor(field, message, actual) {
+      super(message);
+      this.name = "RubricError";
+      this.field = field;
+      if (actual !== undefined) {
+        this.actual = actual;
+      }
+    }
+  };
 });
 
 // ../../node_modules/.bun/zod@4.4.3/node_modules/zod/v4/mini/parse.js
@@ -46400,11 +46639,11 @@ var require_out = __commonJS((exports) => {
     async.read(path7, getSettings(optionsOrSettingsOrCallback), callback);
   }
   exports.stat = stat;
-  function statSync5(path7, optionsOrSettings) {
+  function statSync6(path7, optionsOrSettings) {
     const settings = getSettings(optionsOrSettings);
     return sync.read(path7, settings);
   }
-  exports.statSync = statSync5;
+  exports.statSync = statSync6;
   function getSettings(settingsOrOptions = {}) {
     if (settingsOrOptions instanceof settings_1.default) {
       return settingsOrOptions;
@@ -88643,12 +88882,14 @@ async function runRulesync(targets, features, inputRoot, options2) {
       hasDiff: false
     };
   }
+  const root = options2.outputRoot ?? (options2.global ? homedir4() : process.cwd());
+  const rulesyncGlobal = options2.outputRoot ? false : options2.global;
   return generate2({
     targets: mappedTargets,
     features,
     inputRoot,
-    outputRoots: [options2.global ? homedir4() : process.cwd()],
-    global: options2.global,
+    outputRoots: [root],
+    global: rulesyncGlobal,
     dryRun: options2.dryRun,
     verbose: options2.verbose,
     delete: false
@@ -88673,15 +88914,21 @@ var init_src = __esm(() => {
   init_package();
   init_scaffold();
   init_validate();
+  init_adapt_command();
+  init_adapt_subagent();
   init_pi_subagent();
+  init_pi_tools();
+  init_rewrite_references();
   init_slash_command2();
   init_agent();
   init_command3();
-  init_dimensions();
+  init_evaluate();
+  init_heuristics();
   init_hook();
   init_magent();
   init_rubric();
   init_skill();
+  init_types2();
   init_rulesync();
   init_targets();
 });
@@ -94413,14 +94660,7 @@ function deserializeEvaluation(row) {
 }
 
 // src/operations/evaluate.ts
-var EVALUATORS = {
-  skill: evaluateSkill,
-  command: evaluateCommand,
-  agent: evaluateAgent,
-  hook: evaluateHook,
-  magent: evaluateMagent
-};
-async function evaluate(type, nameOrPath, opts) {
+async function evaluate3(type, nameOrPath, opts) {
   const resolvedPath = resolveContentPath(type, nameOrPath);
   if (!resolvedPath) {
     throw Object.assign(new Error(`File not found: ${nameOrPath}`), { code: 2 });
@@ -94438,8 +94678,7 @@ async function evaluate(type, nameOrPath, opts) {
   if (opts?.rubric) {
     return emitEnvelope(type, resolvedPath, content, resolvedTarget, opts);
   }
-  const evaluator = EVALUATORS[type];
-  const report = evaluator(content, resolvedTarget);
+  const report = evaluate(type, content, resolvedTarget);
   report.content = resolveContentName(resolvedPath);
   if (opts?.save) {
     await persistEvaluation(type, resolvedPath, resolvedTarget, report, opts);
@@ -94459,7 +94698,7 @@ function computeWeightedAggregate(scores, rubric2) {
 function emitEnvelope(type, resolvedPath, content, resolvedTarget, opts) {
   const rubric2 = loadRubric(type, { path: opts.rubric });
   const contentName = resolveContentName(resolvedPath);
-  const baseline = EVALUATORS[type](content, resolvedTarget);
+  const baseline = evaluate(type, content, resolvedTarget);
   baseline.content = contentName;
   const envelope = {
     type,
@@ -94520,14 +94759,14 @@ async function ingestScores(type, resolvedPath, resolvedTarget, opts) {
       });
     }
   }
-  const dimensions2 = scores.dimensions;
-  const aggregate2 = computeWeightedAggregate(dimensions2, rubric2);
+  const dimensions = scores.dimensions;
+  const aggregate2 = computeWeightedAggregate(dimensions, rubric2);
   const report = {
     content: contentName,
     type,
     target: resolvedTarget,
     aggregate: aggregate2,
-    dimensions: dimensions2
+    dimensions
   };
   if (opts.save) {
     await persistEvaluation(type, resolvedPath, resolvedTarget, report, opts, "rubric", rubric2.version);
@@ -94742,11 +94981,11 @@ function computeAnchorHash(anchor) {
 }
 function computeBaselineAnchorHash(content) {
   const parsed = parseFrontmatter(content);
-  const frontmatter3 = parsed.data;
+  const frontmatter2 = parsed.data;
   return computeAnchorHash({
-    frontmatter: frontmatter3,
+    frontmatter: frontmatter2,
     rubric_criteria: "",
-    negative_constraints: extractNegativeConstraints(frontmatter3.description)
+    negative_constraints: extractNegativeConstraints(frontmatter2.description)
   });
 }
 async function runGate(input) {
@@ -94789,14 +95028,14 @@ async function runGate(input) {
 function emitGenerationEnvelope(type, resolvedPath, content, baseline, trends) {
   const rubric2 = loadRubric(type);
   const parsed = parseFrontmatter(content);
-  const frontmatter3 = parsed.data;
-  const description = frontmatter3.description;
+  const frontmatter2 = parsed.data;
+  const description = frontmatter2.description;
   const negativeConstraints = extractNegativeConstraints(description);
   const contentName = resolveContentName(resolvedPath);
   const dimMap = new Map(Object.entries(baseline.dimensions));
   const rubricByName = new Map(rubric2.dimensions.map((d) => [d.name, d]));
   const anchorHash = computeAnchorHash({
-    frontmatter: frontmatter3,
+    frontmatter: frontmatter2,
     rubric_criteria: "",
     negative_constraints: negativeConstraints
   });
@@ -94809,7 +95048,7 @@ function emitGenerationEnvelope(type, resolvedPath, content, baseline, trends) {
       current_text: typeof description === "string" ? description : "",
       target_criterion: rubricDim?.criterion ?? `Improve ${dimName}`,
       anchor: {
-        frontmatter: frontmatter3,
+        frontmatter: frontmatter2,
         rubric_criteria: rubricDim?.criterion ?? "",
         negative_constraints: negativeConstraints
       },
@@ -95079,7 +95318,7 @@ async function stepVerify(type, name, filePath, baselineScore, proposalDbId, opt
   let postScore = baselineScore;
   let postReport;
   try {
-    const report = await evaluate(type, filePath, {
+    const report = await evaluate3(type, filePath, {
       target: opts?.target,
       adapter: db2,
       save: true,
@@ -95157,7 +95396,7 @@ async function evolve(type, name, opts) {
   }
   let baselineReport;
   try {
-    const report = await evaluate(type, resolvedPath, { target: opts?.target });
+    const report = await evaluate3(type, resolvedPath, { target: opts?.target });
     if (!report)
       throw new Error("evaluate returned null in heuristic mode");
     baselineReport = report;
@@ -95430,7 +95669,7 @@ async function refine3(type, nameOrPath, opts) {
   let preScore;
   let preDimensions;
   try {
-    const report = await evaluate(type, resolvedPath ?? nameOrPath, { target: resolvedTarget });
+    const report = await evaluate3(type, resolvedPath ?? nameOrPath, { target: resolvedTarget });
     if (!report)
       throw new Error("evaluate returned null in heuristic mode");
     preScore = report.aggregate;
@@ -95488,7 +95727,7 @@ async function refine3(type, nameOrPath, opts) {
   }
   let postScore;
   try {
-    const postReport = await evaluate(type, resolvedPath ?? nameOrPath, { target: resolvedTarget });
+    const postReport = await evaluate3(type, resolvedPath ?? nameOrPath, { target: resolvedTarget });
     if (!postReport)
       throw new Error("evaluate returned null in heuristic mode");
     postScore = postReport.aggregate;
@@ -95505,7 +95744,7 @@ async function refine3(type, nameOrPath, opts) {
   }
   if (opts?.save) {
     try {
-      await evaluate(type, resolvedPath ?? nameOrPath, {
+      await evaluate3(type, resolvedPath ?? nameOrPath, {
         target: resolvedTarget,
         save: true,
         operation: "refine"
@@ -95597,7 +95836,7 @@ async function agentValidate(opts) {
 }
 async function agentEvaluate(opts) {
   const target = resolveTarget(opts);
-  const report = await evaluate("agent", opts.nameOrPath, {
+  const report = await evaluate3("agent", opts.nameOrPath, {
     target,
     save: opts.save,
     ...opts.rubric ? { rubric: opts.rubric } : {},
@@ -95687,7 +95926,7 @@ async function commandValidate(opts) {
 }
 async function commandEvaluate(opts) {
   const target = resolveTarget(opts);
-  const report = await evaluate("command", opts.nameOrPath, {
+  const report = await evaluate3("command", opts.nameOrPath, {
     target,
     save: opts.save,
     ...opts.rubric ? { rubric: opts.rubric } : {},
@@ -95768,11 +96007,11 @@ import {
   readdirSync as readdirSync3,
   readFileSync as readFileSync13,
   rmSync as rmSync4,
-  statSync as statSync5,
+  statSync as statSync6,
   writeFileSync as writeFileSync8
 } from "fs";
 import { homedir as homedir5 } from "os";
-import { basename as basename13, join as join223 } from "path";
+import { join as join223 } from "path";
 
 // src/hooks.ts
 import { copyFileSync, existsSync as existsSync13, mkdirSync as mkdirSync8, readFileSync as readFileSync12, writeFileSync as writeFileSync7 } from "fs";
@@ -95907,9 +96146,11 @@ function registerInstall(program2) {
 }
 async function executeInstall(plugin, targets2, options2, dependencies = {}) {
   const runRulesyncImpl = dependencies.runRulesync ?? runRulesync;
+  const runClaudeInstallImpl = dependencies.runClaudeInstall ?? defaultRunClaudeInstall;
   if (options2.verbose)
     echo(`Resolving plugin '${plugin}'...`);
-  const pluginRoot = resolvePluginRoot(plugin, options2.marketplacePath);
+  const resolution = resolvePluginRoot(plugin, options2.marketplacePath);
+  const pluginRoot = resolution.pluginRoot;
   if (options2.verbose)
     echo(`Plugin root: ${pluginRoot}`);
   const outputDir = ".rulesync";
@@ -95921,32 +96162,42 @@ async function executeInstall(plugin, targets2, options2, dependencies = {}) {
   }
   const targetInputRoots = new Map;
   for (const target of targets2) {
-    const targetInputRoot = prepareTargetRulesyncInput(outputDir, target);
+    const targetInputRoot = prepareTargetRulesyncInput(outputDir, target, plugin);
     targetInputRoots.set(target, targetInputRoot);
   }
-  const rulesyncFeatures = ["skills", "commands", "subagents", "hooks", "mcp"];
+  const rulesyncFeatures = ["skills", "hooks", ...mapResult.mcp ? ["mcp"] : []];
   const rulesyncTargets = targets2.filter((t) => t !== "claude" && t !== "hermes" && t !== "omp");
   if (targets2.includes("omp") && !targets2.includes("pi")) {
     if (!targetInputRoots.has("pi")) {
-      targetInputRoots.set("pi", prepareTargetRulesyncInput(outputDir, "pi"));
+      targetInputRoots.set("pi", prepareTargetRulesyncInput(outputDir, "pi", plugin));
     }
     rulesyncTargets.push("pi");
   }
   if (targets2.includes("hermes") && !targets2.includes("opencode")) {
     if (!targetInputRoots.has("opencode")) {
-      targetInputRoots.set("opencode", prepareTargetRulesyncInput(outputDir, "opencode"));
+      targetInputRoots.set("opencode", prepareTargetRulesyncInput(outputDir, "opencode", plugin));
     }
     rulesyncTargets.push("opencode");
   }
   const resultCounts = { skillsCount: 0, commandsCount: 0, subagentsCount: 0, hooksCount: 0 };
   if (rulesyncTargets.length > 0) {
+    const usesProjectLayout = !options2.global || options2.outputRoot !== undefined;
+    if (!options2.dryRun && usesProjectLayout) {
+      const rulesyncRoot = options2.outputRoot ?? process.cwd();
+      for (const target of rulesyncTargets) {
+        const reldir = TARGET_SKILLS_RELDIR[target];
+        if (reldir)
+          mkdirSync9(join223(rulesyncRoot, reldir), { recursive: true });
+      }
+    }
     if (options2.verbose)
       echo(`Running rulesync for ${rulesyncTargets.join(", ")}...`);
     for (const target of rulesyncTargets) {
       const result = await runRulesyncImpl([target], [...rulesyncFeatures], targetInputRoots.get(target) ?? outputDir, {
         global: options2.global,
         dryRun: options2.dryRun,
-        verbose: options2.verbose
+        verbose: options2.verbose,
+        outputRoot: options2.outputRoot
       });
       resultCounts.skillsCount += result.skillsCount;
       resultCounts.commandsCount += result.commandsCount;
@@ -95962,13 +96213,14 @@ async function executeInstall(plugin, targets2, options2, dependencies = {}) {
   for (const target of targets2) {
     if (target === "claude") {
       if (options2.verbose)
-        echo("Claude Code: plugin marketplace update...");
+        echo("Claude Code: registering marketplace and installing plugin...");
       if (!options2.dryRun) {
-        const proc = Bun.spawn(["claude", "plugin", "install", `${plugin}@local`, "--path", pluginRoot], {
-          stdout: "inherit",
-          stderr: "inherit"
-        });
-        await proc.exited;
+        const marketplaceName = resolution.marketplaceName ?? "superskill";
+        const marketplaceRoot = resolution.marketplaceRoot ?? process.cwd();
+        const cacheDir = join223(homedir5(), ".claude", "plugins", "cache", marketplaceName);
+        if (existsSync14(cacheDir))
+          rmSync4(cacheDir, { recursive: true, force: true });
+        await runClaudeInstallImpl(marketplaceRoot, marketplaceName, plugin);
       }
     }
     if (target === "hermes") {
@@ -96000,6 +96252,23 @@ async function executeInstall(plugin, targets2, options2, dependencies = {}) {
       hookEmitResults.push(hookResult);
       if (options2.verbose)
         echo(`  ${hookResult.message}`);
+      const agentsDir = join223(pluginRoot, "agents");
+      if (existsSync14(agentsDir) && !options2.dryRun) {
+        const piAgentsDir = join223(outputRoot, ".pi", "agent", "agents");
+        mkdirSync9(piAgentsDir, { recursive: true });
+        for (const entry of readdirSync3(agentsDir)) {
+          if (!entry.endsWith(".md"))
+            continue;
+          const agentName = entry.replace(/\.md$/, "");
+          const expectedName = `${plugin}-${agentName}`;
+          const source = readFileSync13(join223(agentsDir, entry), "utf-8");
+          const skillExists = (bare) => existsSync14(join223(pluginRoot, "skills", bare));
+          const adapted = adaptSubagentToPi(source, expectedName, plugin, skillExists);
+          writeFileSync8(join223(piAgentsDir, `${expectedName}.md`), adapted);
+        }
+        if (options2.verbose)
+          echo(`  Pi agents: dispatched to ${piAgentsDir}`);
+      }
     }
   }
   for (const result of hookEmitResults) {
@@ -96011,6 +96280,18 @@ async function executeInstall(plugin, targets2, options2, dependencies = {}) {
     echo(`Installed '${plugin}' to ${targets2.length} target(s).`);
   }
 }
+async function defaultRunClaudeInstall(marketplaceRoot, marketplaceName, plugin) {
+  const addProc = Bun.spawn(["claude", "plugin", "marketplace", "add", marketplaceRoot], {
+    stdout: "inherit",
+    stderr: "inherit"
+  });
+  await addProc.exited;
+  const installProc = Bun.spawn(["claude", "plugin", "install", `${plugin}@${marketplaceName}`], {
+    stdout: "inherit",
+    stderr: "inherit"
+  });
+  await installProc.exited;
+}
 function parseTargets(raw) {
   if (!raw)
     return [...TARGETS];
@@ -96026,21 +96307,32 @@ function parseTargets(raw) {
 }
 function resolvePluginRoot(plugin, marketplacePath) {
   const resolved = resolvePlugin(marketplacePath, plugin);
-  if (resolved)
-    return resolved.pluginRoot;
+  if (resolved) {
+    const manifestRoot = resolved.marketplaceRoot;
+    const manifestPath = join223(manifestRoot, ".claude-plugin", "marketplace.json");
+    let marketplaceName;
+    if (existsSync14(manifestPath)) {
+      try {
+        const raw = readFileSync13(manifestPath, "utf-8");
+        const parsed = JSON.parse(raw);
+        marketplaceName = parsed.name;
+      } catch {}
+    }
+    return { pluginRoot: resolved.pluginRoot, marketplaceRoot: manifestRoot, marketplaceName };
+  }
   const fallback = join223("plugins", plugin);
   if (existsSync14(join223(fallback, "plugin.json")))
-    return fallback;
+    return { pluginRoot: fallback };
   const available = listResolvablePlugins(marketplacePath);
   const msg = available.length > 0 ? `Available: ${available.join(", ")}` : "No marketplace manifest found and no plugins/<name>/ directory.";
   throw new Error(`Plugin '${plugin}' not found. ${msg}`);
 }
-function prepareTargetRulesyncInput(sourceRoot, target) {
+function prepareTargetRulesyncInput(sourceRoot, target, pluginName) {
   const targetRoot = join223(sourceRoot, ".targets", target);
   const targetRulesyncRoot = join223(targetRoot, ".rulesync");
   rmSync4(targetRoot, { recursive: true, force: true });
   copyDirectory(sourceRoot, targetRulesyncRoot, { skipDirectoryNames: new Set([".targets"]) });
-  transformRulesyncMarkdown(targetRulesyncRoot, target);
+  transformRulesyncMarkdown(targetRulesyncRoot, target, pluginName);
   return targetRoot;
 }
 function rulesyncSourceRoot(inputRoot, fallbackRoot) {
@@ -96060,36 +96352,25 @@ function emitHooksForSurrogateTarget(target, rulesyncSourceDir, outputRoot, opti
   }
   return null;
 }
-function transformRulesyncMarkdown(root, target) {
-  transformMarkdownDirectory(join223(root, "skills"), target);
-  transformMarkdownDirectory(join223(root, "commands"), target, { normalizeName: true, translateSlash: true });
-  transformMarkdownDirectory(join223(root, "subagents"), target, {
-    normalizeName: true,
-    piSubagent: target === "pi" || target === "omp"
-  });
+function transformRulesyncMarkdown(root, target, pluginName) {
+  transformMarkdownDirectory(join223(root, "skills"), target, pluginName);
 }
-function transformMarkdownDirectory(dir, target, options2 = {}) {
+function transformMarkdownDirectory(dir, target, pluginName) {
   if (!existsSync14(dir))
     return;
   for (const entry of readdirSync3(dir)) {
     const path11 = join223(dir, entry);
-    const stats = statSync5(path11);
+    const stats = statSync6(path11);
     if (stats.isDirectory()) {
-      transformMarkdownDirectory(path11, target, options2);
+      transformMarkdownDirectory(path11, target, pluginName);
       continue;
     }
     if (!entry.endsWith(".md"))
       continue;
-    const name = entry === "SKILL.md" ? basename13(dir) : entry.replace(/\.md$/, "");
-    let content = readFileSync13(path11, "utf-8");
-    if (options2.normalizeName)
-      content = normalizeFrontmatter(content, name);
-    if (options2.translateSlash)
-      content = translateSlashCommands(content, target);
-    content = rewriteColonRefs(content);
-    if (options2.piSubagent)
-      content = convertToPiSubagent(content);
-    writeFileSync8(path11, content);
+    const content = readFileSync13(path11, "utf-8");
+    const slashTranslated = translateSlashCommands(content, target);
+    const transformed = rewriteSkillReferences(slashTranslated, pluginName);
+    writeFileSync8(path11, transformed);
   }
 }
 function copyDirectory(source, destination, options2 = {}) {
@@ -96101,7 +96382,7 @@ function copyDirectory(source, destination, options2 = {}) {
       continue;
     const sourcePath = join223(source, entry);
     const destinationPath = join223(destination, entry);
-    if (statSync5(sourcePath).isDirectory()) {
+    if (statSync6(sourcePath).isDirectory()) {
       copyDirectory(sourcePath, destinationPath, options2);
     } else {
       copyFileSync2(sourcePath, destinationPath);
@@ -96125,7 +96406,7 @@ async function validateHook(nameOrPath, opts) {
 }
 async function evaluateHook2(nameOrPath, opts) {
   const target = resolveTarget(opts);
-  return evaluate("hook", nameOrPath, {
+  return evaluate3("hook", nameOrPath, {
     target,
     save: opts.save,
     ...opts.rubric ? { rubric: opts.rubric } : {},
@@ -96154,11 +96435,11 @@ async function emitHook(name, opts) {
   const global3 = opts.global !== false;
   const dryRun = opts.dryRun === true;
   const outputRoot = global3 ? homedir6() : process.cwd();
-  const pluginRoot = resolvePluginRoot(name);
+  const pluginRoot = resolvePluginRoot(name).pluginRoot;
   const outputDir = ".rulesync";
   mapPluginToRulesync(pluginRoot, name, outputDir);
   if (target !== "pi" && target !== "omp" && target !== "hermes") {
-    const targetInputRoot = prepareTargetRulesyncInput(outputDir, target);
+    const targetInputRoot = prepareTargetRulesyncInput(outputDir, target, name);
     const result = await runRulesync([target], ["hooks"], targetInputRoot, { global: global3, dryRun, verbose: false });
     return {
       count: result.hooksCount,
@@ -96166,7 +96447,7 @@ async function emitHook(name, opts) {
     };
   }
   const surrogateSourceTarget = target === "hermes" ? "opencode" : "pi";
-  const surrogateInputRoot = prepareTargetRulesyncInput(outputDir, surrogateSourceTarget);
+  const surrogateInputRoot = prepareTargetRulesyncInput(outputDir, surrogateSourceTarget, name);
   const surrogateSourceDir = join225(surrogateInputRoot, ".rulesync");
   const hookResult = emitHooksForSurrogateTarget(target, surrogateSourceDir, outputRoot, { dryRun, global: global3 });
   if (!hookResult) {
@@ -96256,7 +96537,7 @@ async function magentValidate(opts) {
 }
 async function magentEvaluate(opts) {
   const target = resolveTarget(opts);
-  const report = await evaluate("magent", opts.nameOrPath, {
+  const report = await evaluate3("magent", opts.nameOrPath, {
     target,
     save: opts.save,
     ...opts.rubric ? { rubric: opts.rubric } : {},
@@ -96400,7 +96681,7 @@ async function skillValidate(opts) {
 }
 async function skillEvaluate(opts) {
   const target = resolveTarget(opts);
-  const report = await evaluate("skill", opts.nameOrPath, {
+  const report = await evaluate3("skill", opts.nameOrPath, {
     target,
     save: opts.save,
     ...opts.rubric ? { rubric: opts.rubric } : {},