@skill-map/cli 0.28.0 → 0.30.0

package/dist/cli.js

@@ -1,5 +1,5 @@
 // cli/entry.ts
-import { existsSync as existsSync29 } from "fs";
+import { existsSync as existsSync30 } from "fs";
 import { Builtins, Cli as Cli2 } from "clipanion";
 
 // kernel/adapters/in-memory-progress.ts
@@ -150,14 +150,6 @@ function makeHookDispatcher(hooks, emitter) {
   }
   const byTrigger = /* @__PURE__ */ new Map();
   for (const hook of hooks) {
-    if (hook.mode === "probabilistic") {
-      const qualifiedId2 = qualifiedExtensionId(hook.pluginId, hook.id);
-      log.warn(
-        `Probabilistic hook ${qualifiedId2} deferred to job subsystem (future job subsystem). The hook is registered but will not dispatch in-scan.`,
-        { hookId: qualifiedId2, mode: "probabilistic" }
-      );
-      continue;
-    }
     for (const trig of hook.triggers) {
       const bucket = byTrigger.get(trig);
       if (bucket) bucket.push(hook);
@@ -249,7 +241,7 @@ function bucketByKind(kind, instance, bag) {
   }
 }
 
-// built-in-plugins/providers/claude/schemas/skill.schema.json
+// plugins/claude/providers/claude/schemas/skill.schema.json
 var skill_schema_default = {
   $schema: "https://json-schema.org/draft/2020-12/schema",
   $id: "https://skill-map.dev/providers/claude/v1/frontmatter/skill.schema.json",
@@ -263,7 +255,7 @@ var skill_schema_default = {
   properties: {}
 };
 
-// built-in-plugins/providers/claude/schemas/skill-base.schema.json
+// plugins/claude/providers/claude/schemas/skill-base.schema.json
 var skill_base_schema_default = {
   $schema: "https://json-schema.org/draft/2020-12/schema",
   $id: "https://skill-map.dev/providers/claude/v1/frontmatter/skill-base.schema.json",
@@ -342,7 +334,7 @@ var skill_base_schema_default = {
   }
 };
 
-// built-in-plugins/providers/claude/schemas/agent.schema.json
+// plugins/claude/providers/claude/schemas/agent.schema.json
 var agent_schema_default = {
   $schema: "https://json-schema.org/draft/2020-12/schema",
   $id: "https://skill-map.dev/providers/claude/v1/frontmatter/agent.schema.json",
@@ -423,7 +415,7 @@ var agent_schema_default = {
   }
 };
 
-// built-in-plugins/providers/claude/schemas/command.schema.json
+// plugins/claude/providers/claude/schemas/command.schema.json
 var command_schema_default = {
   $schema: "https://json-schema.org/draft/2020-12/schema",
   $id: "https://skill-map.dev/providers/claude/v1/frontmatter/command.schema.json",
@@ -437,14 +429,13 @@ var command_schema_default = {
   properties: {}
 };
 
-// built-in-plugins/providers/claude/index.ts
+// plugins/claude/providers/claude/index.ts
 var claudeProvider = {
   id: "claude",
   pluginId: "claude",
   kind: "provider",
   version: "1.0.0",
   description: "Walks Claude Code scope conventions (.claude/{agents,commands,skills}).",
-  stability: "stable",
   // Declarative discovery: `.md` files parsed via the kernel's
   // `frontmatter-yaml` built-in. Equals the kernel's default but stated
   // explicitly so the Provider doubles as a copy-paste template for
@@ -474,7 +465,6 @@ var claudeProvider = {
     agent: {
       schema: "./schemas/agent.schema.json",
       schemaJson: agent_schema_default,
-      defaultRefreshAction: "claude/summarize-agent",
       ui: {
         label: "Agents",
         color: "#3b82f6",
@@ -485,7 +475,6 @@ var claudeProvider = {
     command: {
       schema: "./schemas/command.schema.json",
       schemaJson: command_schema_default,
-      defaultRefreshAction: "claude/summarize-command",
       ui: {
         label: "Commands",
         color: "#f59e0b",
@@ -499,7 +488,6 @@ var claudeProvider = {
     skill: {
       schema: "./schemas/skill.schema.json",
       schemaJson: skill_schema_default,
-      defaultRefreshAction: "claude/summarize-skill",
       ui: {
         label: "Skills",
         color: "#10b981",
@@ -523,7 +511,7 @@ var claudeProvider = {
   }
 };
 
-// built-in-plugins/providers/gemini/schemas/agent.schema.json
+// plugins/gemini/providers/gemini/schemas/agent.schema.json
 var agent_schema_default2 = {
   $schema: "https://json-schema.org/draft/2020-12/schema",
   $id: "https://skill-map.dev/providers/gemini/v1/frontmatter/agent.schema.json",
@@ -577,7 +565,7 @@ var agent_schema_default2 = {
   }
 };
 
-// built-in-plugins/providers/gemini/schemas/skill.schema.json
+// plugins/gemini/providers/gemini/schemas/skill.schema.json
 var skill_schema_default2 = {
   $schema: "https://json-schema.org/draft/2020-12/schema",
   $id: "https://skill-map.dev/providers/gemini/v1/frontmatter/skill.schema.json",
@@ -591,14 +579,13 @@ var skill_schema_default2 = {
   properties: {}
 };
 
-// built-in-plugins/providers/gemini/index.ts
+// plugins/gemini/providers/gemini/index.ts
 var geminiProvider = {
   id: "gemini",
   pluginId: "gemini",
   kind: "provider",
   version: "1.0.0",
   description: "Walks Gemini CLI scope conventions (.gemini/{agents,skills}).",
-  stability: "stable",
   read: { extensions: [".md"], parser: "frontmatter-yaml" },
   // Per spec § A.6, defaultRefreshAction values MUST be qualified
   // action ids. The summarize-* actions are not yet implemented as
@@ -616,7 +603,6 @@ var geminiProvider = {
     agent: {
       schema: "./schemas/agent.schema.json",
       schemaJson: agent_schema_default2,
-      defaultRefreshAction: "gemini/summarize-agent",
       ui: {
         label: "Agents",
         color: "#3b82f6",
@@ -627,7 +613,6 @@ var geminiProvider = {
     skill: {
       schema: "./schemas/skill.schema.json",
       schemaJson: skill_schema_default2,
-      defaultRefreshAction: "gemini/summarize-skill",
       ui: {
         label: "Skills",
         color: "#10b981",
@@ -644,7 +629,7 @@ var geminiProvider = {
   }
 };
 
-// built-in-plugins/providers/agent-skills/schemas/skill.schema.json
+// plugins/agent-skills/providers/agent-skills/schemas/skill.schema.json
 var skill_schema_default3 = {
   $schema: "https://json-schema.org/draft/2020-12/schema",
   $id: "https://skill-map.dev/providers/agent-skills/v1/frontmatter/skill.schema.json",
@@ -658,20 +643,18 @@ var skill_schema_default3 = {
   properties: {}
 };
 
-// built-in-plugins/providers/agent-skills/index.ts
+// plugins/agent-skills/providers/agent-skills/index.ts
 var agentSkillsProvider = {
   id: "agent-skills",
   pluginId: "agent-skills",
   kind: "provider",
   version: "1.0.0",
   description: "Agent Skills open standard. Vendor-neutral path `.agents/skills/<name>/SKILL.md` (Anthropic, OpenAI, Google). See agentskills.io.",
-  stability: "stable",
   read: { extensions: [".md"], parser: "frontmatter-yaml" },
   kinds: {
     skill: {
       schema: "./schemas/skill.schema.json",
       schemaJson: skill_schema_default3,
-      defaultRefreshAction: "agent-skills/summarize-skill",
       ui: {
         label: "Skills",
         color: "#10b981",
@@ -686,7 +669,7 @@ var agentSkillsProvider = {
   }
 };
 
-// built-in-plugins/providers/core-markdown/schemas/markdown.schema.json
+// plugins/core/providers/core-markdown/schemas/markdown.schema.json
 var markdown_schema_default = {
   $schema: "https://json-schema.org/draft/2020-12/schema",
   $id: "https://skill-map.dev/providers/core/v1/frontmatter/markdown.schema.json",
@@ -699,14 +682,13 @@ var markdown_schema_default = {
   additionalProperties: true
 };
 
-// built-in-plugins/providers/core-markdown/index.ts
+// plugins/core/providers/core-markdown/index.ts
 var coreMarkdownProvider = {
   id: "markdown",
   pluginId: "core",
   kind: "provider",
   version: "1.0.0",
   description: "Universal `.md` fallback. Claims any markdown file no vendor-specific Provider classifies.",
-  stability: "stable",
   read: { extensions: [".md"], parser: "frontmatter-yaml" },
   // Per spec § A.6, defaultRefreshAction values MUST be qualified
   // action ids. The summarize-markdown action is not yet implemented
@@ -723,7 +705,6 @@ var coreMarkdownProvider = {
     markdown: {
       schema: "./schemas/markdown.schema.json",
       schemaJson: markdown_schema_default,
-      defaultRefreshAction: "core/summarize-markdown",
       ui: {
         label: "Markdown",
         color: "#5b908c",
@@ -740,7 +721,7 @@ var coreMarkdownProvider = {
   }
 };
 
-// built-in-plugins/extractors/annotations/index.ts
+// plugins/core/extractors/annotations/index.ts
 var ID = "annotations";
 var annotationsExtractor = {
   id: ID,
@@ -748,9 +729,6 @@ var annotationsExtractor = {
   kind: "extractor",
   version: "1.0.0",
   description: "Turns the `supersedes` and `supersededBy` entries you write in a node's `.sm` sidecar into the arrows (edges) shown between nodes in the graph.",
-  stability: "stable",
-  emitsLinkKinds: ["supersedes"],
-  defaultConfidence: "high",
   scope: "frontmatter",
   extract(ctx) {
     const sourcePath = ctx.node.path;
@@ -797,6 +775,53 @@ function link(source, target) {
   };
 }
 
+// kernel/util/strip-code-blocks.ts
+var FENCE_RE = /^(?<indent> {0,3})(?<fence>`{3,}|~{3,})/;
+function stripCodeBlocks(input) {
+  if (!input) return input;
+  const fenceless = stripFences(input);
+  return stripInline(fenceless);
+}
+function stripFences(input) {
+  const out = [];
+  const lines = input.split("\n");
+  let openFence = null;
+  for (const line of lines) {
+    if (openFence) {
+      const closer = matchClosingFence(line, openFence);
+      if (closer) {
+        out.push(blank(line));
+        openFence = null;
+      } else {
+        out.push(blank(line));
+      }
+      continue;
+    }
+    const open = FENCE_RE.exec(line);
+    if (open?.groups) {
+      openFence = open.groups["fence"];
+      out.push(blank(line));
+      continue;
+    }
+    out.push(line);
+  }
+  return out.join("\n");
+}
+function matchClosingFence(line, openFence) {
+  const m = FENCE_RE.exec(line);
+  if (!m?.groups) return false;
+  const fence = m.groups["fence"];
+  return fence[0] === openFence[0] && fence.length >= openFence.length;
+}
+function stripInline(input) {
+  return input.replace(/(`+)([\s\S]*?)\1/g, (_full, ticks, body) => {
+    return ticks.replace(/`/g, " ") + blank(body) + ticks.replace(/`/g, " ");
+  });
+}
+function blank(s) {
+  return s.replace(/[^\s]/g, " ");
+}
+
 // kernel/trigger-normalize.ts
 function normalizeTrigger(source) {
   let out = source.normalize("NFD");
@@ -807,67 +832,51 @@ function normalizeTrigger(source) {
   return out.trim();
 }
 
-// built-in-plugins/extractors/slash/index.ts
-var ID2 = "slash";
-var SLASH_RE = /(?<![A-Za-z0-9_/.:?#])(\/[a-z0-9][a-z0-9_-]*(?::[a-z0-9][a-z0-9_-]*)?)/gi;
-var slashExtractor = {
-  id: ID2,
-  pluginId: "core",
-  kind: "extractor",
-  version: "1.0.0",
-  description: "Detects `/command` invocations in a node's body and turns each one into an arrow between nodes in the graph.",
-  stability: "stable",
-  emitsLinkKinds: ["invokes"],
-  defaultConfidence: "medium",
-  scope: "body",
-  extract(ctx) {
-    const seen = /* @__PURE__ */ new Set();
-    for (const match of ctx.body.matchAll(SLASH_RE)) {
-      const original = match[1];
-      const normalized = normalizeTrigger(original);
-      if (seen.has(normalized)) continue;
-      seen.add(normalized);
-      ctx.emitLink({
-        source: ctx.node.path,
-        target: original,
-        kind: "invokes",
-        confidence: "medium",
-        sources: [ID2],
-        trigger: {
-          originalTrigger: original,
-          normalizedTrigger: normalized
-        }
-      });
-    }
-  }
-};
-
-// built-in-plugins/extractors/at-directive/index.ts
-var ID3 = "at-directive";
-var AT_RE = /(?:^|[^A-Za-z0-9_@])(@[a-z0-9][a-z0-9_-]*(?:[/:][a-z0-9][a-z0-9_-]*)?)/gi;
+// plugins/core/extractors/at-directive/index.ts
+var ID2 = "at-directive";
+var AT_RE = /(?:^|[^A-Za-z0-9_@])(@(?:\.{1,2}\/|\/)?[a-z0-9](?:[a-z0-9_\-./]*[a-z0-9_])?(?::[a-z0-9][a-z0-9_-]*)?)/gi;
+var FILE_EXT_RE = /\.(md|mdx|js|jsx|ts|tsx|json|yml|yaml|toml|txt|html|css|scss|less|py|rb|go|rs|java|c|cpp|h|hpp|sh|sql|svg|png|jpg|jpeg|gif|webp|pdf)$/i;
 var atDirectiveExtractor = {
-  id: ID3,
+  id: ID2,
   pluginId: "core",
   kind: "extractor",
   version: "1.0.0",
-  description: "Detects `@agent-name` mentions in a node's body and turns each one into an arrow between nodes in the graph.",
-  stability: "stable",
-  emitsLinkKinds: ["mentions"],
-  defaultConfidence: "medium",
+  description: "Detects `@<token>` directives in a node's body. A bare handle (e.g. `@team`) becomes a `mentions` link; a file-flavoured token (e.g. `@docs/api.md`, `@./readme.md`) becomes a `references` link, matching how Claude Code / Gemini CLI / Cursor read the same syntax.",
   scope: "body",
   extract(ctx) {
-    const seen = /* @__PURE__ */ new Set();
-    for (const match of ctx.body.matchAll(AT_RE)) {
+    const seenMentions = /* @__PURE__ */ new Set();
+    const seenReferences = /* @__PURE__ */ new Set();
+    const body = stripCodeBlocks(ctx.body);
+    for (const match of body.matchAll(AT_RE)) {
       const original = match[1];
+      const bare = original.slice(1);
+      const isReference = bare.startsWith("./") || bare.startsWith("../") || bare.startsWith("/") || FILE_EXT_RE.test(bare);
+      if (isReference) {
+        const target = bare.replace(/^\.\//, "");
+        if (seenReferences.has(target)) continue;
+        seenReferences.add(target);
+        ctx.emitLink({
+          source: ctx.node.path,
+          target,
+          kind: "references",
+          confidence: "medium",
+          sources: [ID2],
+          trigger: {
+            originalTrigger: original,
+            normalizedTrigger: target.toLowerCase()
+          }
+        });
+        continue;
+      }
       const normalized = normalizeTrigger(original);
-      if (seen.has(normalized)) continue;
-      seen.add(normalized);
+      if (seenMentions.has(normalized)) continue;
+      seenMentions.add(normalized);
       ctx.emitLink({
         source: ctx.node.path,
         target: original,
         kind: "mentions",
         confidence: "medium",
-        sources: [ID3],
+        sources: [ID2],
         trigger: {
           originalTrigger: original,
           normalizedTrigger: normalized
@@ -877,19 +886,16 @@ var atDirectiveExtractor = {
   }
 };
 
-// built-in-plugins/extractors/external-url-counter/index.ts
-var ID4 = "external-url-counter";
+// plugins/core/extractors/external-url-counter/index.ts
+var ID3 = "external-url-counter";
 var URL_RE = /https?:\/\/[^\s<>"'`)\]]+/g;
 var TRAILING_PUNCT = /[.,;:!?]+$/;
 var externalUrlCounterExtractor = {
-  id: ID4,
+  id: ID3,
   pluginId: "core",
   kind: "extractor",
   version: "1.0.0",
   description: "Counts the distinct external URLs in a node's body and shows the total on the card.",
-  stability: "stable",
-  emitsLinkKinds: ["references"],
-  defaultConfidence: "low",
   scope: "body",
   /**
    * Phase 6 / View contribution system, surface the distinct-URL
@@ -907,7 +913,7 @@ var externalUrlCounterExtractor = {
    * inherited from the footer `.sm-gnode__stat` styles cloned by
    * the `NodeCounter` renderer.
    */
-  viewContributions: {
+  ui: {
     count: {
       slot: "card.footer.left",
       icon: "pi-link",
@@ -932,7 +938,7 @@ var externalUrlCounterExtractor = {
         target: normalized,
         kind: "references",
         confidence: "low",
-        sources: [ID4],
+        sources: [ID3],
         trigger: {
           originalTrigger: original,
           normalizedTrigger: normalized
@@ -977,20 +983,17 @@ function lineFor(lineStarts, offset) {
   return lo + 1;
 }
 
-// built-in-plugins/extractors/markdown-link/index.ts
+// plugins/core/extractors/markdown-link/index.ts
 import { posix as pathPosix } from "path";
-var ID5 = "markdown-link";
+var ID4 = "markdown-link";
 var LINK_RE = /(?<!!)\[([^\]]*)\]\(([^)\s]+)(?:\s+"[^"]*")?\)/g;
 var URL_SCHEME_RE = /^[a-z][a-z0-9+.-]*:/i;
 var markdownLinkExtractor = {
-  id: ID5,
+  id: ID4,
   pluginId: "core",
   kind: "extractor",
   version: "1.0.0",
   description: "Detects markdown links (`[text](path)`) in a node's body and turns each one into an arrow between nodes in the graph.",
-  stability: "stable",
-  emitsLinkKinds: ["references"],
-  defaultConfidence: "high",
   scope: "body",
   extract(ctx) {
     const seen = /* @__PURE__ */ new Set();
@@ -1008,7 +1011,7 @@ var markdownLinkExtractor = {
         target: resolved,
         kind: "references",
         confidence: "high",
-        sources: [ID5],
+        sources: [ID4],
         trigger: {
           originalTrigger: original,
           normalizedTrigger: resolved
@@ -1047,99 +1050,54 @@ function lineFor2(lineStarts, offset) {
   return lo + 1;
 }
 
-// built-in-plugins/analyzers/stability/index.ts
-var ID6 = "stability";
-var EXPERIMENTAL_TOOLTIP = "Experimental: API may change";
-var DEPRECATED_TOOLTIP = "Deprecated: avoid in new code";
-var stabilityAnalyzer = {
-  id: ID6,
+// plugins/core/extractors/slash/index.ts
+var ID5 = "slash";
+var SLASH_RE = /(?<![A-Za-z0-9_/.:?#])(\/[a-z0-9][a-z0-9_-]*(?::[a-z0-9][a-z0-9_-]*)?)/gi;
+var slashExtractor = {
+  id: ID5,
   pluginId: "core",
-  kind: "analyzer",
+  kind: "extractor",
   version: "1.0.0",
-  description: "Reports node lifecycle stage (`experimental`, `deprecated`) on the card.",
-  stability: "stable",
-  mode: "deterministic",
-  viewContributions: {
-    experimental: {
-      slot: "card.footer.right",
-      icon: "fa-solid fa-flask",
-      label: "experimental",
-      emitWhenEmpty: false,
-      priority: 10
-    },
-    deprecated: {
-      slot: "card.footer.right",
-      icon: "pi-ban",
-      label: "deprecated",
-      emitWhenEmpty: false,
-      priority: 10
-    }
-  },
-  evaluate(ctx) {
-    const issues = [];
-    for (const node of ctx.nodes) {
-      const stability = readStability(node);
-      if (stability === "experimental") {
-        ctx.emitContribution(node.path, "experimental", {
-          value: 0,
-          tooltip: EXPERIMENTAL_TOOLTIP
-        });
-        issues.push({
-          analyzerId: ID6,
-          severity: "info",
-          nodeIds: [node.path],
-          message: `Node '${node.path}' is marked experimental: API may change.`,
-          data: { stability }
-        });
-      } else if (stability === "deprecated") {
-        ctx.emitContribution(node.path, "deprecated", {
-          value: 0,
-          tooltip: DEPRECATED_TOOLTIP,
-          severity: "warn"
-        });
-        issues.push({
-          analyzerId: ID6,
-          severity: "warn",
-          nodeIds: [node.path],
-          message: `Node '${node.path}' is marked deprecated: avoid in new code.`,
-          data: { stability }
-        });
-      }
+  description: "Detects `/command` invocations in a node's body and turns each one into an arrow between nodes in the graph.",
+  scope: "body",
+  extract(ctx) {
+    const seen = /* @__PURE__ */ new Set();
+    const body = stripCodeBlocks(ctx.body);
+    for (const match of body.matchAll(SLASH_RE)) {
+      const original = match[1];
+      const endIdx = (match.index ?? 0) + match[0].length;
+      const nextChar = body[endIdx];
+      if (nextChar && /[A-Za-z0-9_/-]/.test(nextChar)) continue;
+      const normalized = normalizeTrigger(original);
+      if (seen.has(normalized)) continue;
+      seen.add(normalized);
+      ctx.emitLink({
+        source: ctx.node.path,
+        target: original,
+        kind: "invokes",
+        confidence: "medium",
+        sources: [ID5],
+        trigger: {
+          originalTrigger: original,
+          normalizedTrigger: normalized
+        }
+      });
     }
-    return issues;
   }
 };
-function readStability(node) {
-  const fromAnn = node.sidecar?.annotations?.["stability"];
-  if (isStability(fromAnn)) return fromAnn;
-  const legacy = readLegacyMetadataStability(node.frontmatter);
-  return isStability(legacy) ? legacy : null;
-}
-function readLegacyMetadataStability(fm) {
-  if (!fm) return void 0;
-  const meta = fm["metadata"];
-  if (!meta || typeof meta !== "object" || Array.isArray(meta)) return void 0;
-  return meta["stability"];
-}
-function isStability(value) {
-  return value === "experimental" || value === "deprecated" || value === "stable";
-}
 
-// built-in-plugins/extractors/tools-count/index.ts
-var ID7 = "tools-count";
+// plugins/core/extractors/tools-count/index.ts
+var ID6 = "tools-count";
 var TOOLTIP_MAX = 255;
 var toolsCountExtractor = {
-  id: ID7,
+  id: ID6,
   pluginId: "core",
   kind: "extractor",
   version: "1.0.0",
   description: "Counts the tools an agent declares in its frontmatter and shows the total on the agent card.",
-  stability: "stable",
-  emitsLinkKinds: [],
-  defaultConfidence: "high",
   scope: "frontmatter",
-  applicableKinds: ["agent"],
-  viewContributions: {
+  precondition: { kind: ["claude/agent"] },
+  ui: {
     count: {
       slot: "card.footer.left",
       icon: "pi-wrench",
@@ -1168,165 +1126,148 @@ function buildTooltip(names) {
   return `${joined.slice(0, TOOLTIP_MAX - 1)}\u2026`;
 }
 
-// built-in-plugins/i18n/trigger-collision.texts.ts
-var TRIGGER_COLLISION_TEXTS = {
-  /**
-   * Top-level message when `analyzeTriggerBucket` accumulated exactly one
-   * cause part. Used for the advertiser-ambiguous-only, invocation-
-   * ambiguous-only, and cross-kind-only branches.
-   */
-  messageOnePart: 'Trigger "{{normalized}}" has {{part}}.',
-  /**
-   * Top-level message when `analyzeTriggerBucket` accumulated two cause
-   * parts (advertiser-ambiguous AND invocation-ambiguous fire together).
-   * The joiner lives inside the template so future locales can adapt it
-   * (e.g. `'; y '` in Spanish) without touching the rule code.
-   */
-  messageTwoParts: 'Trigger "{{normalized}}" has {{first}}; and {{second}}.',
-  /** `<n> nodes advertise it: <list>` part, fires on the advertiser-ambiguous branch. */
-  partAdvertisers: "{{count}} nodes advertise it: {{paths}}",
-  /** `<n> distinct invocation forms: <list>` part, fires on the invocation-ambiguous branch. */
-  partInvocations: "{{count}} distinct invocation forms: {{forms}}",
-  /** Singular cross-kind cause: `non-canonical invocation <form> against advertiser <path>`. */
-  partNonCanonicalSingular: "non-canonical invocation {{forms}} against advertiser {{advertiser}}",
-  /** Plural cross-kind cause: `non-canonical invocations <forms> against advertiser <path>`. */
-  partNonCanonicalPlural: "non-canonical invocations {{forms}} against advertiser {{advertiser}}"
+// plugins/core/analyzers/annotation-orphan/text.ts
+var ANNOTATION_ORPHAN_TEXTS = {
+  /** Sidecar `<path>.sm` has no matching `<path>.md`. */
+  message: "Orphan sidecar: {{sidecarPath}} has no matching markdown node at {{expectedMdPath}}."
 };
 
-// built-in-plugins/analyzers/trigger-collision/index.ts
-var ID8 = "trigger-collision";
-var ADVERTISING_KINDS = /* @__PURE__ */ new Set([
-  "command",
-  "skill",
-  "agent"
-]);
-var triggerCollisionAnalyzer = {
-  id: ID8,
+// plugins/core/analyzers/annotation-orphan/index.ts
+var ID7 = "annotation-orphan";
+var annotationOrphanAnalyzer = {
+  id: ID7,
   pluginId: "core",
   kind: "analyzer",
-  mode: "deterministic",
   version: "1.0.0",
-  description: "Detects and flags two or more nodes claiming the same `/command` or `@agent` name.",
-  stability: "stable",
-  // Two claim-collection passes (advertisement + invocation) feeding
-  // the bucket map. Per-bucket analysis lives in `analyzeTriggerBucket`.
-  // eslint-disable-next-line complexity
+  description: "Detects and flags sidecars (`.sm`) whose `.md` no longer exists.",
+  mode: "deterministic",
   evaluate(ctx) {
-    const buckets = /* @__PURE__ */ new Map();
-    const push = (key, claim) => {
-      const bucket = buckets.get(key) ?? [];
-      bucket.push(claim);
-      buckets.set(key, bucket);
-    };
-    for (const node of ctx.nodes) {
-      if (!ADVERTISING_KINDS.has(node.kind)) continue;
-      const raw = node.frontmatter?.["name"];
-      if (typeof raw !== "string" || raw.length === 0) continue;
-      const normalized = `/${normalizeTrigger(raw)}`;
-      if (normalized === "/") continue;
-      push(normalized, {
-        kind: "advertiser",
-        token: node.path,
-        nodeId: node.path,
-        canonicalForm: `/${raw}`
-      });
-    }
-    for (const link2 of ctx.links) {
-      const normalized = link2.trigger?.normalizedTrigger;
-      if (!normalized) continue;
-      push(normalized, {
-        kind: "invocation",
-        token: link2.target,
-        nodeId: link2.source
-      });
-    }
+    const orphans = ctx.orphanSidecars;
+    if (!orphans || orphans.length === 0) return [];
     const issues = [];
-    for (const [normalized, claims] of buckets) {
-      const issue = analyzeTriggerBucket(normalized, claims);
-      if (issue) issues.push(issue);
+    for (const orphan of orphans) {
+      const expectedMdRelative = orphan.relativePath.endsWith(".sm") ? `${orphan.relativePath.slice(0, -".sm".length)}.md` : `${orphan.relativePath}.md`;
+      issues.push({
+        analyzerId: ID7,
+        severity: "warn",
+        nodeIds: [expectedMdRelative],
+        message: tx(ANNOTATION_ORPHAN_TEXTS.message, {
+          sidecarPath: orphan.relativePath,
+          expectedMdPath: orphan.expectedMdPath
+        }),
+        data: {
+          sidecarPath: orphan.relativePath,
+          expectedMdPath: orphan.expectedMdPath
+        }
+      });
     }
     return issues;
   }
 };
-function analyzeTriggerBucket(normalized, claims) {
-  const advertiserPaths = [
-    ...new Set(claims.filter((c) => c.kind === "advertiser").map((c) => c.token))
-  ].sort();
-  const invocationTargets = [
-    ...new Set(claims.filter((c) => c.kind === "invocation").map((c) => c.token))
-  ].sort();
-  const advertisers = claims.filter(
-    (c) => c.kind === "advertiser"
-  );
-  const advertiserAmbiguous = advertiserPaths.length >= 2;
-  const invocationAmbiguous = invocationTargets.length >= 2;
-  const canonicalForms = new Set(advertisers.map((a) => a.canonicalForm));
-  const nonCanonicalInvocations = invocationTargets.filter((t) => !canonicalForms.has(t));
-  const crossKindAmbiguous = advertiserPaths.length === 1 && nonCanonicalInvocations.length >= 1;
-  if (!advertiserAmbiguous && !invocationAmbiguous && !crossKindAmbiguous) {
-    return null;
-  }
-  const nodeIds = [...new Set(claims.map((c) => c.nodeId))].sort();
-  const parts = [];
-  if (advertiserAmbiguous) {
-    parts.push(
-      tx(TRIGGER_COLLISION_TEXTS.partAdvertisers, {
-        count: advertiserPaths.length,
-        paths: advertiserPaths.join(", ")
-      })
-    );
+
+// plugins/core/analyzers/annotation-stale/text.ts
+var ANNOTATION_STALE_TEXTS = {
+  /** body changed since last bump */
+  bodyDrift: "{{path}}: sidecar `.sm` is stale (body changed since last bump).",
+  /** frontmatter changed since last bump */
+  frontmatterDrift: "{{path}}: sidecar `.sm` is stale (frontmatter changed since last bump).",
+  /** both body and frontmatter changed */
+  bothDrift: "{{path}}: sidecar `.sm` is stale (body and frontmatter changed since last bump).",
+  // Tooltips for the `card.footer.right` clock chip emitted alongside
+  // the issue. Lists only the drifted face(s), in-sync faces are
+  // omitted so the operator immediately sees what's modified without
+  // scanning prose. No `{{path}}` placeholder, the chip already sits
+  // on the affected node. The hint `sm bump <path>` keeps `<path>` as
+  // a literal placeholder the operator substitutes.
+  bodyTooltip: "Sidecar drift since last bump:\n  \u2022 body\nRun `sm bump <path>` to refresh.",
+  frontmatterTooltip: "Sidecar drift since last bump:\n  \u2022 frontmatter\nRun `sm bump <path>` to refresh.",
+  bothTooltip: "Sidecar drift since last bump:\n  \u2022 body\n  \u2022 frontmatter\nRun `sm bump <path>` to refresh."
+};
+
+// plugins/core/analyzers/annotation-stale/index.ts
+var ID8 = "annotation-stale";
+var annotationStaleAnalyzer = {
+  id: ID8,
+  pluginId: "core",
+  kind: "analyzer",
+  version: "1.0.0",
+  description: "Detects and marks sidecars (`.sm`) out of date of their `.md`.",
+  mode: "deterministic",
+  // The natural fix is to bump the node: refreshes `for` hashes,
+  // increments `annotations.version`, and stamps the audit block. The
+  // UI surfaces `core/bump` in the node inspector under "Recommended
+  // for issues" whenever this analyzer fires.
+  ui: {
+    // A `pi-clock` chip in the footer-right cluster so the operator
+    // spots drift in the list / inspector view (and on the graph card
+    // body). Emitted with `value: 0` and `emitWhenEmpty: true` so the
+    // renderer treats it as icon-only, drift severity is binary at
+    // this surface (the tooltip carries the per-face detail body /
+    // frontmatter / both). The corner badge on `graph.node.alert` was
+    // dropped on purpose: a tooltip on the footer chip is enough, and
+    // the corner badge stacked on top of broken-ref / unknown-field
+    // alerts produced visual noise.
+    staleIcon: {
+      slot: "card.footer.right",
+      icon: "pi-clock",
+      emitWhenEmpty: true,
+      priority: 20
+    }
+  },
+  evaluate(ctx) {
+    const issues = [];
+    for (const node of ctx.nodes) {
+      const status = node.sidecar?.status;
+      if (status === void 0 || status === null) continue;
+      if (status === "fresh") continue;
+      const message = status === "stale-body" ? tx(ANNOTATION_STALE_TEXTS.bodyDrift, { path: node.path }) : status === "stale-frontmatter" ? tx(ANNOTATION_STALE_TEXTS.frontmatterDrift, { path: node.path }) : tx(ANNOTATION_STALE_TEXTS.bothDrift, { path: node.path });
+      issues.push({
+        analyzerId: ID8,
+        severity: "warn",
+        nodeIds: [node.path],
+        message,
+        data: { status }
+      });
+      ctx.emitContribution(node.path, "staleIcon", {
+        value: 0,
+        severity: "warn",
+        tooltip: tooltipFor(status)
+      });
+    }
+    return issues;
   }
-  if (invocationAmbiguous) {
-    parts.push(
-      tx(TRIGGER_COLLISION_TEXTS.partInvocations, {
-        count: invocationTargets.length,
-        forms: invocationTargets.join(", ")
-      })
-    );
-  } else if (crossKindAmbiguous) {
-    const template = nonCanonicalInvocations.length > 1 ? TRIGGER_COLLISION_TEXTS.partNonCanonicalPlural : TRIGGER_COLLISION_TEXTS.partNonCanonicalSingular;
-    parts.push(
-      tx(template, {
-        forms: nonCanonicalInvocations.join(", "),
-        advertiser: advertiserPaths[0]
-      })
-    );
+};
+function tooltipFor(status) {
+  switch (status) {
+    case "stale-body":
+      return ANNOTATION_STALE_TEXTS.bodyTooltip;
+    case "stale-frontmatter":
+      return ANNOTATION_STALE_TEXTS.frontmatterTooltip;
+    case "stale-both":
+      return ANNOTATION_STALE_TEXTS.bothTooltip;
   }
-  const message = parts.length === 2 ? tx(TRIGGER_COLLISION_TEXTS.messageTwoParts, {
-    normalized,
-    first: parts[0],
-    second: parts[1]
-  }) : tx(TRIGGER_COLLISION_TEXTS.messageOnePart, {
-    normalized,
-    part: parts[0]
-  });
-  return {
-    analyzerId: ID8,
-    severity: "error",
-    nodeIds,
-    message,
-    data: {
-      normalizedTrigger: normalized,
-      invocationTargets,
-      advertiserPaths
-    }
-  };
 }
 
-// built-in-plugins/analyzers/broken-ref/index.ts
-import { resolve } from "path";
+// plugins/core/analyzers/broken-ref/index.ts
+import { posix as pathPosix2, resolve } from "path";
 
-// built-in-plugins/i18n/broken-ref.texts.ts
+// plugins/core/analyzers/broken-ref/text.ts
 var BROKEN_REF_TEXTS = {
   /** `Broken <kind> reference from <source> → <target>` */
   message: "Broken {{kind}} reference from {{source}} \u2192 {{target}}",
   // Tooltips for the per-node view-contribution badges. Singular vs
   // plural keeps the count grammar correct without a sub-template.
   alertTooltipSingle: "This node has a broken reference. Open the inspector for details.",
-  alertTooltipMany: "This node has {{count}} broken references. Open the inspector for details."
+  alertTooltipMany: "This node has {{count}} broken references. Open the inspector for details.",
+  // Fix-summary copy when the broken trigger has a same-named file on
+  // disk that does not advertise `name:` in its frontmatter. Two
+  // variants for single vs multiple candidates; same template family
+  // as the alert tooltips above.
+  hintSummarySingle: "Add `name: {{name}}` to the frontmatter of {{candidate}} so this reference resolves.",
+  hintSummaryMany: "Add `name: {{name}}` to the frontmatter of one of these files so this reference resolves: {{candidates}}."
 };
 
-// built-in-plugins/analyzers/broken-ref/index.ts
+// plugins/core/analyzers/broken-ref/index.ts
 var ID9 = "broken-ref";
 var brokenRefAnalyzer = {
   id: ID9,
@@ -1334,9 +1275,8 @@ var brokenRefAnalyzer = {
   kind: "analyzer",
   version: "1.0.0",
   description: "Detects and flags arrows pointing at a node not part of the current scan.",
-  stability: "stable",
   mode: "deterministic",
-  viewContributions: {
+  ui: {
     // Corner badge on the graph card; count omitted when there is a
     // single broken ref (avoids a noisy "icon + 1" chip).
     alert: {
@@ -1364,13 +1304,15 @@ var brokenRefAnalyzer = {
   evaluate(ctx) {
     const byPath3 = new Set(ctx.nodes.map((n) => n.path));
     const byNormalizedName = indexByNormalizedName(ctx.nodes);
+    const byBasenameWithoutName = indexByBasenameWithoutName(ctx.nodes);
     const refIndex = ctx.referenceablePaths && ctx.referenceablePaths.size > 0 && ctx.cwd ? { paths: ctx.referenceablePaths, cwd: ctx.cwd } : null;
     const issues = [];
     const perNode = /* @__PURE__ */ new Map();
     for (const link2 of ctx.links) {
       if (isResolved(link2, byPath3, byNormalizedName)) continue;
       if (refIndex && resolvesViaReferencePaths(link2, refIndex)) continue;
-      issues.push(buildIssue(link2));
+      const candidates = findHintCandidates(link2, byBasenameWithoutName);
+      issues.push(buildIssue(link2, candidates));
       perNode.set(link2.source, (perNode.get(link2.source) ?? 0) + 1);
     }
     for (const [nodePath, count] of perNode) {
@@ -1390,8 +1332,13 @@ var brokenRefAnalyzer = {
     return issues;
   }
 };
-function buildIssue(link2) {
-  return {
+function buildIssue(link2, hintCandidates = []) {
+  const data = {
+    target: link2.target,
+    kind: link2.kind,
+    trigger: link2.trigger?.normalizedTrigger ?? null
+  };
+  const issue = {
     analyzerId: ID9,
     severity: "warn",
     nodeIds: [link2.source],
@@ -1400,12 +1347,28 @@ function buildIssue(link2) {
       source: link2.source,
       target: link2.target
     }),
-    data: {
-      target: link2.target,
-      kind: link2.kind,
-      trigger: link2.trigger?.normalizedTrigger ?? null
-    }
+    data
   };
+  if (hintCandidates.length > 0) {
+    const suggestedName = (link2.trigger?.normalizedTrigger ?? "").replace(/^[/@]/, "").trim();
+    const candidatePaths = hintCandidates.map((n) => n.path);
+    data["hint"] = {
+      kind: "missing-frontmatter-name",
+      suggestedName,
+      candidates: candidatePaths
+    };
+    issue.fix = {
+      summary: candidatePaths.length === 1 ? tx(BROKEN_REF_TEXTS.hintSummarySingle, {
+        name: suggestedName,
+        candidate: candidatePaths[0]
+      }) : tx(BROKEN_REF_TEXTS.hintSummaryMany, {
+        name: suggestedName,
+        candidates: candidatePaths.join(", ")
+      }),
+      autofixable: false
+    };
+  }
+  return issue;
 }
 function resolvesViaReferencePaths(link2, refIndex) {
   if (!isPathStyleLink(link2)) return false;
@@ -1424,6 +1387,36 @@ function indexByNormalizedName(nodes) {
   }
   return out;
 }
+function basenameWithoutExt(path) {
+  const base = pathPosix2.basename(path);
+  const ext = pathPosix2.extname(base);
+  return ext ? base.slice(0, -ext.length) : base;
+}
+function indexByBasenameWithoutName(nodes) {
+  const out = /* @__PURE__ */ new Map();
+  for (const node of nodes) {
+    const raw = node.frontmatter?.["name"];
+    const name = typeof raw === "string" ? raw : "";
+    if (name) continue;
+    const bare = basenameWithoutExt(node.path);
+    if (!bare) continue;
+    const key = normalizeTrigger(bare);
+    if (!key) continue;
+    const bucket = out.get(key) ?? [];
+    bucket.push(node);
+    out.set(key, bucket);
+  }
+  return out;
+}
+function findHintCandidates(link2, idx) {
+  const normalized = link2.trigger?.normalizedTrigger;
+  if (!normalized) return [];
+  const sigil = normalized.charAt(0);
+  if (sigil !== "/" && sigil !== "@") return [];
+  const withoutSigil = normalized.slice(1).trim();
+  if (!withoutSigil) return [];
+  return idx.get(withoutSigil) ?? [];
+}
 function isResolved(link2, byPath3, byNormalizedName) {
   const normalized = link2.trigger?.normalizedTrigger;
   if (normalized) {
@@ -1439,66 +1432,69 @@ function isPathStyleLink(link2) {
   return true;
 }
 
-// built-in-plugins/i18n/superseded.texts.ts
-var SUPERSEDED_TEXTS = {
-  /** `<path> is superseded by <supersededBy>` */
-  message: "{{path}} is superseded by {{supersededBy}}"
+// plugins/core/analyzers/contribution-orphan/index.ts
+var ID10 = "contribution-orphan";
+var contributionOrphanAnalyzer = {
+  id: ID10,
+  pluginId: "core",
+  kind: "analyzer",
+  version: "0.0.0",
+  description: "Detects and warns about plugin data referencing nodes renamed or deleted in the latest scan.",
+  mode: "deterministic",
+  evaluate(_ctx) {
+    return [];
+  }
 };
 
-// built-in-plugins/analyzers/superseded/index.ts
-var ID10 = "superseded";
-var supersededAnalyzer = {
-  id: ID10,
+// plugins/core/analyzers/job-orphan-file/text.ts
+var JOB_ORPHAN_FILE_TEXTS = {
+  /**
+   * `<path>.md` lives under `.skill-map/jobs/` but no `state_jobs.filePath`
+   * row references it. Run `sm job prune --orphan-files` to remove.
+   */
+  message: "Orphan job file: {{filePath}} is not referenced by any state_jobs row. Run `sm job prune --orphan-files` to remove it."
+};
+
+// plugins/core/analyzers/job-orphan-file/index.ts
+var ID11 = "job-orphan-file";
+var jobOrphanFileAnalyzer = {
+  id: ID11,
   pluginId: "core",
   kind: "analyzer",
   version: "1.0.0",
-  description: "Detects and marks nodes replaced by a newer one via `supersededBy`.",
-  stability: "stable",
+  description: "Detects and flags leftover job result files (no live job references them). Cleanup via `sm job prune --orphan-files`.",
   mode: "deterministic",
   evaluate(ctx) {
+    const orphans = ctx.orphanJobFiles;
+    if (!orphans || orphans.length === 0) return [];
     const issues = [];
-    for (const node of ctx.nodes) {
-      const supersededBy = pickSupersededBy(node);
-      if (supersededBy === null) continue;
+    for (const filePath of orphans) {
       issues.push({
-        analyzerId: ID10,
-        severity: "info",
-        nodeIds: [node.path],
-        message: tx(SUPERSEDED_TEXTS.message, {
-          path: node.path,
-          supersededBy
-        }),
-        data: { supersededBy }
+        analyzerId: ID11,
+        severity: "warn",
+        nodeIds: [filePath],
+        message: tx(JOB_ORPHAN_FILE_TEXTS.message, { filePath }),
+        data: { filePath }
       });
     }
     return issues;
   }
 };
-function pickSupersededBy(node) {
-  const sidecar = node.sidecar;
-  if (!sidecar || sidecar.present !== true) return null;
-  const ann = sidecar.annotations;
-  if (!ann || typeof ann !== "object" || Array.isArray(ann)) return null;
-  const value = ann["supersededBy"];
-  if (typeof value !== "string" || value.length === 0) return null;
-  return value;
-}
 
-// built-in-plugins/i18n/link-conflict.texts.ts
+// plugins/core/analyzers/link-conflict/text.ts
 var LINK_CONFLICT_TEXTS = {
   /** `Detectors disagree on link kind for <source> → <target> (<kindList>)` */
   message: "Detectors disagree on link kind for {{source}} \u2192 {{target}} ({{kindList}})"
 };
 
-// built-in-plugins/analyzers/link-conflict/index.ts
-var ID11 = "link-conflict";
+// plugins/core/analyzers/link-conflict/index.ts
+var ID12 = "link-conflict";
 var linkConflictAnalyzer = {
-  id: ID11,
+  id: ID12,
   pluginId: "core",
   kind: "analyzer",
   version: "1.0.0",
   description: 'Detects and flags conflicting arrow meanings between extractors (e.g. "references" vs "invokes").',
-  stability: "stable",
   mode: "deterministic",
   // Bucket links by (source, target), then per-bucket detect distinct
   // kinds. The branching is intrinsic to the per-bucket conflict
@@ -1542,7 +1538,7 @@ var linkConflictAnalyzer = {
       const [source, target] = key.split("\0");
       const kindList = variants.map((v) => v.kind).join(" / ");
       issues.push({
-        analyzerId: ID11,
+        analyzerId: ID12,
         severity: "warn",
         nodeIds: [source, target],
         message: tx(LINK_CONFLICT_TEXTS.message, {
@@ -1567,168 +1563,386 @@ function rankConfidence(c) {
   }
 }
 
-// built-in-plugins/i18n/annotation-stale.texts.ts
-var ANNOTATION_STALE_TEXTS = {
-  /** body changed since last bump */
-  bodyDrift: "{{path}}: sidecar `.sm` is stale (body changed since last bump).",
-  /** frontmatter changed since last bump */
-  frontmatterDrift: "{{path}}: sidecar `.sm` is stale (frontmatter changed since last bump).",
-  /** both body and frontmatter changed */
-  bothDrift: "{{path}}: sidecar `.sm` is stale (body and frontmatter changed since last bump).",
-  // Tooltips for the `card.footer.right` clock chip emitted alongside
-  // the issue. Lists only the drifted face(s), in-sync faces are
-  // omitted so the operator immediately sees what's modified without
-  // scanning prose. No `{{path}}` placeholder, the chip already sits
-  // on the affected node. The hint `sm bump <path>` keeps `<path>` as
-  // a literal placeholder the operator substitutes.
-  bodyTooltip: "Sidecar drift since last bump:\n  \u2022 body\nRun `sm bump <path>` to refresh.",
-  frontmatterTooltip: "Sidecar drift since last bump:\n  \u2022 frontmatter\nRun `sm bump <path>` to refresh.",
-  bothTooltip: "Sidecar drift since last bump:\n  \u2022 body\n  \u2022 frontmatter\nRun `sm bump <path>` to refresh."
-};
-
-// built-in-plugins/analyzers/annotation-stale/index.ts
-var ID12 = "annotation-stale";
-var annotationStaleAnalyzer = {
-  id: ID12,
-  pluginId: "core",
-  kind: "analyzer",
-  version: "1.0.0",
-  description: "Detects and marks sidecars (`.sm`) out of date of their `.md`.",
-  stability: "stable",
-  mode: "deterministic",
-  // The natural fix is to bump the node: refreshes `for` hashes,
-  // increments `annotations.version`, and stamps the audit block. The
-  // UI surfaces `core/bump` in the node inspector under "Recommended
-  // for issues" whenever this analyzer fires.
-  recommendedActions: ["core/bump"],
-  viewContributions: {
-    // A `pi-clock` chip in the footer-right cluster so the operator
-    // spots drift in the list / inspector view (and on the graph card
-    // body). Emitted with `value: 0` and `emitWhenEmpty: true` so the
-    // renderer treats it as icon-only, drift severity is binary at
-    // this surface (the tooltip carries the per-face detail body /
-    // frontmatter / both). The corner badge on `graph.node.alert` was
-    // dropped on purpose: a tooltip on the footer chip is enough, and
-    // the corner badge stacked on top of broken-ref / unknown-field
-    // alerts produced visual noise.
-    staleIcon: {
-      slot: "card.footer.right",
-      icon: "pi-clock",
-      emitWhenEmpty: true,
+// kernel/util/trigger-resolve.ts
+function buildNameIndex(nodes) {
+  const out = /* @__PURE__ */ new Map();
+  indexByCanonicalName(nodes, out);
+  fillIndexWithPathBasename(nodes, out);
+  return out;
+}
+function indexByCanonicalName(nodes, out) {
+  for (const node of nodes) {
+    const raw = canonicalName(node);
+    if (raw === null) continue;
+    const key = normalizeTrigger(raw);
+    if (!out.has(key)) out.set(key, node.path);
+  }
+}
+function fillIndexWithPathBasename(nodes, out) {
+  for (const node of nodes) {
+    if (canonicalName(node) !== null) continue;
+    const derived = pathBasenameForLink(node.path);
+    if (derived.length === 0) continue;
+    const key = normalizeTrigger(derived);
+    if (!out.has(key)) out.set(key, node.path);
+  }
+}
+function canonicalName(node) {
+  const raw = node.frontmatter?.["name"];
+  if (typeof raw !== "string" || raw.length === 0) return null;
+  return raw;
+}
+function pathBasenameForLink(path) {
+  const segments = path.split("/").filter((s) => s.length > 0);
+  if (segments.length === 0) return path;
+  const last = segments[segments.length - 1];
+  if (last === "SKILL.md" && segments.length >= 2) {
+    return segments[segments.length - 2];
+  }
+  return last.replace(/\.md$/, "");
+}
+function resolveLinkTargetToPath(link2, nameIndex) {
+  const raw = link2.target;
+  const sigil = raw.charAt(0);
+  if (sigil !== "/" && sigil !== "@") return raw;
+  const normalizedTrigger = link2.trigger?.normalizedTrigger;
+  const normalized = typeof normalizedTrigger === "string" ? normalizedTrigger.replace(/^[/@]/, "").trim() : normalizeTrigger(raw.slice(1));
+  const resolved = nameIndex.get(normalized);
+  return resolved ?? raw;
+}
+
+// plugins/core/analyzers/link-counts/index.ts
+var ID13 = "link-counts";
+var linkCountsAnalyzer = {
+  id: ID13,
+  pluginId: "core",
+  kind: "analyzer",
+  version: "1.0.0",
+  description: "Counts incoming and outgoing links per node.",
+  mode: "deterministic",
+  ui: {
+    linksIn: {
+      slot: "card.footer.left",
+      icon: "pi-download",
+      label: "incoming links",
+      emitWhenEmpty: false,
+      priority: 10
+    },
+    linksOut: {
+      slot: "card.footer.left",
+      icon: "pi-upload",
+      label: "outgoing links",
+      emitWhenEmpty: false,
       priority: 20
     }
   },
+  evaluate(ctx) {
+    const nameIndex = buildNameIndex(ctx.nodes);
+    const perTarget = /* @__PURE__ */ new Map();
+    const perSource = /* @__PURE__ */ new Map();
+    for (const link2 of ctx.links) {
+      const resolvedTarget = resolveLinkTargetToPath(link2, nameIndex);
+      bump(perTarget, resolvedTarget, link2.kind);
+      bump(perSource, link2.source, link2.kind);
+    }
+    for (const node of ctx.nodes) {
+      emitChip(ctx, node.path, "linksIn", perTarget.get(node.path));
+      emitChip(ctx, node.path, "linksOut", perSource.get(node.path));
+    }
+    return [];
+  }
+};
+function bump(map, key, kind) {
+  let byKind = map.get(key);
+  if (!byKind) {
+    byKind = /* @__PURE__ */ new Map();
+    map.set(key, byKind);
+  }
+  byKind.set(kind, (byKind.get(kind) ?? 0) + 1);
+}
+function emitChip(ctx, nodePath, contributionId, byKind) {
+  if (!byKind) return;
+  let total = 0;
+  for (const n of byKind.values()) total += n;
+  if (total === 0) return;
+  const capped = Math.min(total, 99);
+  const direction = contributionId === "linksIn" ? "in" : "out";
+  ctx.emitContribution(nodePath, contributionId, {
+    value: capped,
+    tooltip: formatBreakdown(byKind, direction)
+  });
+}
+function formatBreakdown(byKind, direction) {
+  const lines = [...byKind.entries()].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([kind, n]) => `${kind}: ${n}`);
+  return [direction, ...lines].join("\n");
+}
+
+// plugins/core/analyzers/stability/index.ts
+var ID14 = "stability";
+var EXPERIMENTAL_TOOLTIP = "Experimental: API may change";
+var DEPRECATED_TOOLTIP = "Deprecated: avoid in new code";
+var stabilityAnalyzer = {
+  id: ID14,
+  pluginId: "core",
+  kind: "analyzer",
+  version: "1.0.0",
+  description: "Reports node lifecycle stage (`experimental`, `deprecated`) on the card.",
+  mode: "deterministic",
+  ui: {
+    experimental: {
+      slot: "card.footer.right",
+      icon: "fa-solid fa-flask",
+      label: "experimental",
+      emitWhenEmpty: false,
+      priority: 10
+    },
+    deprecated: {
+      slot: "card.footer.right",
+      icon: "pi-ban",
+      label: "deprecated",
+      emitWhenEmpty: false,
+      priority: 10
+    }
+  },
   evaluate(ctx) {
     const issues = [];
     for (const node of ctx.nodes) {
-      const status = node.sidecar?.status;
-      if (status === void 0 || status === null) continue;
-      if (status === "fresh") continue;
-      const message = status === "stale-body" ? tx(ANNOTATION_STALE_TEXTS.bodyDrift, { path: node.path }) : status === "stale-frontmatter" ? tx(ANNOTATION_STALE_TEXTS.frontmatterDrift, { path: node.path }) : tx(ANNOTATION_STALE_TEXTS.bothDrift, { path: node.path });
-      issues.push({
-        analyzerId: ID12,
-        severity: "warn",
-        nodeIds: [node.path],
-        message,
-        data: { status }
-      });
-      ctx.emitContribution(node.path, "staleIcon", {
-        value: 0,
-        severity: "warn",
-        tooltip: tooltipFor(status)
-      });
+      const stability = readStability(node);
+      if (stability === "experimental") {
+        ctx.emitContribution(node.path, "experimental", {
+          value: 0,
+          tooltip: EXPERIMENTAL_TOOLTIP
+        });
+        issues.push({
+          analyzerId: ID14,
+          severity: "info",
+          nodeIds: [node.path],
+          message: `Node '${node.path}' is marked experimental: API may change.`,
+          data: { stability }
+        });
+      } else if (stability === "deprecated") {
+        ctx.emitContribution(node.path, "deprecated", {
+          value: 0,
+          tooltip: DEPRECATED_TOOLTIP,
+          severity: "warn"
+        });
+        issues.push({
+          analyzerId: ID14,
+          severity: "warn",
+          nodeIds: [node.path],
+          message: `Node '${node.path}' is marked deprecated: avoid in new code.`,
+          data: { stability }
+        });
+      }
     }
     return issues;
   }
 };
-function tooltipFor(status) {
-  switch (status) {
-    case "stale-body":
-      return ANNOTATION_STALE_TEXTS.bodyTooltip;
-    case "stale-frontmatter":
-      return ANNOTATION_STALE_TEXTS.frontmatterTooltip;
-    case "stale-both":
-      return ANNOTATION_STALE_TEXTS.bothTooltip;
-  }
+function readStability(node) {
+  const fromAnn = node.sidecar?.annotations?.["stability"];
+  if (isStability(fromAnn)) return fromAnn;
+  const legacy = readLegacyMetadataStability(node.frontmatter);
+  return isStability(legacy) ? legacy : null;
+}
+function readLegacyMetadataStability(fm) {
+  if (!fm) return void 0;
+  const meta = fm["metadata"];
+  if (!meta || typeof meta !== "object" || Array.isArray(meta)) return void 0;
+  return meta["stability"];
+}
+function isStability(value) {
+  return value === "experimental" || value === "deprecated" || value === "stable";
 }
 
-// built-in-plugins/i18n/annotation-orphan.texts.ts
-var ANNOTATION_ORPHAN_TEXTS = {
-  /** Sidecar `<path>.sm` has no matching `<path>.md`. */
-  message: "Orphan sidecar: {{sidecarPath}} has no matching markdown node at {{expectedMdPath}}."
+// plugins/core/analyzers/superseded/text.ts
+var SUPERSEDED_TEXTS = {
+  /** `<path> is superseded by <supersededBy>` */
+  message: "{{path}} is superseded by {{supersededBy}}"
 };
 
-// built-in-plugins/analyzers/annotation-orphan/index.ts
-var ID13 = "annotation-orphan";
-var annotationOrphanAnalyzer = {
-  id: ID13,
+// plugins/core/analyzers/superseded/index.ts
+var ID15 = "superseded";
+var supersededAnalyzer = {
+  id: ID15,
   pluginId: "core",
   kind: "analyzer",
   version: "1.0.0",
-  description: "Detects and flags sidecars (`.sm`) whose `.md` no longer exists.",
-  stability: "stable",
+  description: "Detects and marks nodes replaced by a newer one via `supersededBy`.",
   mode: "deterministic",
   evaluate(ctx) {
-    const orphans = ctx.orphanSidecars;
-    if (!orphans || orphans.length === 0) return [];
     const issues = [];
-    for (const orphan of orphans) {
-      const expectedMdRelative = orphan.relativePath.endsWith(".sm") ? `${orphan.relativePath.slice(0, -".sm".length)}.md` : `${orphan.relativePath}.md`;
+    for (const node of ctx.nodes) {
+      const supersededBy = pickSupersededBy(node);
+      if (supersededBy === null) continue;
       issues.push({
-        analyzerId: ID13,
-        severity: "warn",
-        nodeIds: [expectedMdRelative],
-        message: tx(ANNOTATION_ORPHAN_TEXTS.message, {
-          sidecarPath: orphan.relativePath,
-          expectedMdPath: orphan.expectedMdPath
+        analyzerId: ID15,
+        severity: "info",
+        nodeIds: [node.path],
+        message: tx(SUPERSEDED_TEXTS.message, {
+          path: node.path,
+          supersededBy
         }),
-        data: {
-          sidecarPath: orphan.relativePath,
-          expectedMdPath: orphan.expectedMdPath
-        }
+        data: { supersededBy }
       });
     }
     return issues;
   }
 };
+function pickSupersededBy(node) {
+  const sidecar = node.sidecar;
+  if (!sidecar || sidecar.present !== true) return null;
+  const ann = sidecar.annotations;
+  if (!ann || typeof ann !== "object" || Array.isArray(ann)) return null;
+  const value = ann["supersededBy"];
+  if (typeof value !== "string" || value.length === 0) return null;
+  return value;
+}
 
-// built-in-plugins/i18n/job-orphan-file.texts.ts
-var JOB_ORPHAN_FILE_TEXTS = {
+// plugins/core/analyzers/trigger-collision/text.ts
+var TRIGGER_COLLISION_TEXTS = {
   /**
-   * `<path>.md` lives under `.skill-map/jobs/` but no `state_jobs.filePath`
-   * row references it. Run `sm job prune --orphan-files` to remove.
+   * Top-level message when `analyzeTriggerBucket` accumulated exactly one
+   * cause part. Used for the advertiser-ambiguous-only, invocation-
+   * ambiguous-only, and cross-kind-only branches.
    */
-  message: "Orphan job file: {{filePath}} is not referenced by any state_jobs row. Run `sm job prune --orphan-files` to remove it."
+  messageOnePart: 'Trigger "{{normalized}}" has {{part}}.',
+  /**
+   * Top-level message when `analyzeTriggerBucket` accumulated two cause
+   * parts (advertiser-ambiguous AND invocation-ambiguous fire together).
+   * The joiner lives inside the template so future locales can adapt it
+   * (e.g. `'; y '` in Spanish) without touching the rule code.
+   */
+  messageTwoParts: 'Trigger "{{normalized}}" has {{first}}; and {{second}}.',
+  /** `<n> nodes advertise it: <list>` part, fires on the advertiser-ambiguous branch. */
+  partAdvertisers: "{{count}} nodes advertise it: {{paths}}",
+  /** `<n> distinct invocation forms: <list>` part, fires on the invocation-ambiguous branch. */
+  partInvocations: "{{count}} distinct invocation forms: {{forms}}",
+  /** Singular cross-kind cause: `non-canonical invocation <form> against advertiser <path>`. */
+  partNonCanonicalSingular: "non-canonical invocation {{forms}} against advertiser {{advertiser}}",
+  /** Plural cross-kind cause: `non-canonical invocations <forms> against advertiser <path>`. */
+  partNonCanonicalPlural: "non-canonical invocations {{forms}} against advertiser {{advertiser}}"
 };
 
-// built-in-plugins/analyzers/job-orphan-file/index.ts
-var ID14 = "job-orphan-file";
-var jobOrphanFileAnalyzer = {
-  id: ID14,
+// plugins/core/analyzers/trigger-collision/index.ts
+var ID16 = "trigger-collision";
+var ADVERTISING_KINDS = /* @__PURE__ */ new Set([
+  "command",
+  "skill",
+  "agent"
+]);
+var triggerCollisionAnalyzer = {
+  id: ID16,
   pluginId: "core",
   kind: "analyzer",
-  version: "1.0.0",
-  description: "Detects and flags leftover job result files (no live job references them). Cleanup via `sm job prune --orphan-files`.",
-  stability: "stable",
   mode: "deterministic",
+  version: "1.0.0",
+  description: "Detects and flags two or more nodes claiming the same `/command` or `@agent` name.",
+  // Two claim-collection passes (advertisement + invocation) feeding
+  // the bucket map. Per-bucket analysis lives in `analyzeTriggerBucket`.
+  // eslint-disable-next-line complexity
   evaluate(ctx) {
-    const orphans = ctx.orphanJobFiles;
-    if (!orphans || orphans.length === 0) return [];
-    const issues = [];
-    for (const filePath of orphans) {
-      issues.push({
-        analyzerId: ID14,
-        severity: "warn",
-        nodeIds: [filePath],
-        message: tx(JOB_ORPHAN_FILE_TEXTS.message, { filePath }),
-        data: { filePath }
+    const buckets = /* @__PURE__ */ new Map();
+    const push = (key, claim) => {
+      const bucket = buckets.get(key) ?? [];
+      bucket.push(claim);
+      buckets.set(key, bucket);
+    };
+    for (const node of ctx.nodes) {
+      if (!ADVERTISING_KINDS.has(node.kind)) continue;
+      const raw = node.frontmatter?.["name"];
+      if (typeof raw !== "string" || raw.length === 0) continue;
+      const normalized = `/${normalizeTrigger(raw)}`;
+      if (normalized === "/") continue;
+      push(normalized, {
+        kind: "advertiser",
+        token: node.path,
+        nodeId: node.path,
+        canonicalForm: `/${raw}`
+      });
+    }
+    for (const link2 of ctx.links) {
+      const normalized = link2.trigger?.normalizedTrigger;
+      if (!normalized) continue;
+      push(normalized, {
+        kind: "invocation",
+        token: link2.target,
+        nodeId: link2.source
       });
     }
+    const issues = [];
+    for (const [normalized, claims] of buckets) {
+      const issue = analyzeTriggerBucket(normalized, claims);
+      if (issue) issues.push(issue);
+    }
     return issues;
   }
 };
+function analyzeTriggerBucket(normalized, claims) {
+  const advertiserPaths = [
+    ...new Set(claims.filter((c) => c.kind === "advertiser").map((c) => c.token))
+  ].sort();
+  const invocationTargets = [
+    ...new Set(claims.filter((c) => c.kind === "invocation").map((c) => c.token))
+  ].sort();
+  const advertisers = claims.filter(
+    (c) => c.kind === "advertiser"
+  );
+  const advertiserAmbiguous = advertiserPaths.length >= 2;
+  const invocationAmbiguous = invocationTargets.length >= 2;
+  const canonicalForms = new Set(advertisers.map((a) => a.canonicalForm));
+  const nonCanonicalInvocations = invocationTargets.filter((t) => !canonicalForms.has(t));
+  const crossKindAmbiguous = advertiserPaths.length === 1 && nonCanonicalInvocations.length >= 1;
+  if (!advertiserAmbiguous && !invocationAmbiguous && !crossKindAmbiguous) {
+    return null;
+  }
+  const nodeIds = [...new Set(claims.map((c) => c.nodeId))].sort();
+  const parts = [];
+  if (advertiserAmbiguous) {
+    parts.push(
+      tx(TRIGGER_COLLISION_TEXTS.partAdvertisers, {
+        count: advertiserPaths.length,
+        paths: advertiserPaths.join(", ")
+      })
+    );
+  }
+  if (invocationAmbiguous) {
+    parts.push(
+      tx(TRIGGER_COLLISION_TEXTS.partInvocations, {
+        count: invocationTargets.length,
+        forms: invocationTargets.join(", ")
+      })
+    );
+  } else if (crossKindAmbiguous) {
+    const template = nonCanonicalInvocations.length > 1 ? TRIGGER_COLLISION_TEXTS.partNonCanonicalPlural : TRIGGER_COLLISION_TEXTS.partNonCanonicalSingular;
+    parts.push(
+      tx(template, {
+        forms: nonCanonicalInvocations.join(", "),
+        advertiser: advertiserPaths[0]
+      })
+    );
+  }
+  const message = parts.length === 2 ? tx(TRIGGER_COLLISION_TEXTS.messageTwoParts, {
+    normalized,
+    first: parts[0],
+    second: parts[1]
+  }) : tx(TRIGGER_COLLISION_TEXTS.messageOnePart, {
+    normalized,
+    part: parts[0]
+  });
+  return {
+    analyzerId: ID16,
+    severity: "error",
+    nodeIds,
+    message,
+    data: {
+      normalizedTrigger: normalized,
+      invocationTargets,
+      advertiserPaths
+    }
+  };
+}
 
-// built-in-plugins/analyzers/unknown-field/index.ts
+// plugins/core/analyzers/unknown-field/index.ts
 import { readFileSync } from "fs";
 import { dirname, resolve as resolve2 } from "path";
 import { createRequire } from "module";
@@ -1741,7 +1955,7 @@ function applyAjvFormats(ajv) {
   addFormats(ajv);
 }
 
-// built-in-plugins/i18n/unknown-field.texts.ts
+// plugins/core/analyzers/unknown-field/text.ts
 var UNKNOWN_FIELD_TEXTS = {
   /** Key inside `annotations:` is not in the curated catalog. */
   unknownAnnotationKey: "{{path}}: sidecar annotations contain unknown key '{{key}}' (not in annotations.schema.json catalog).",
@@ -1755,18 +1969,17 @@ var UNKNOWN_FIELD_TEXTS = {
   alertTooltipMany: "This node has {{count}} unknown fields in its sidecar. Open the inspector for details."
 };
 
-// built-in-plugins/analyzers/unknown-field/index.ts
-var ID15 = "unknown-field";
+// plugins/core/analyzers/unknown-field/index.ts
+var ID17 = "unknown-field";
 var RESERVED_ROOT_BLOCKS = /* @__PURE__ */ new Set(["identity", "annotations", "settings", "audit"]);
 var unknownFieldAnalyzer = {
-  id: ID15,
+  id: ID17,
   pluginId: "core",
   kind: "analyzer",
   version: "1.0.0",
   description: "Detects and flags typos or unrecognized keys in sidecars (`.sm`).",
-  stability: "stable",
   mode: "deterministic",
-  viewContributions: {
+  ui: {
     // Corner badge on the graph card; count omitted when there is a
     // single unknown field (avoids a noisy "icon + 1" chip).
     alert: {
@@ -1818,7 +2031,7 @@ var unknownFieldAnalyzer = {
         for (const key of Object.keys(annotations)) {
           if (!knownAnnotationKeys.has(key)) {
             issues.push({
-              analyzerId: ID15,
+              analyzerId: ID17,
               severity: "warn",
               nodeIds: [node.path],
               message: tx(UNKNOWN_FIELD_TEXTS.unknownAnnotationKey, {
@@ -1845,7 +2058,7 @@ var unknownFieldAnalyzer = {
             if (validator(value)) continue;
             const errors = (validator.errors ?? []).map((e) => `${e.instancePath || "(root)"} ${e.message ?? e.keyword}`).join("; ");
             issues.push({
-              analyzerId: ID15,
+              analyzerId: ID17,
               severity: "warn",
               nodeIds: [node.path],
               message: tx(UNKNOWN_FIELD_TEXTS.pluginNamespaceInvalid, {
@@ -1861,7 +2074,7 @@ var unknownFieldAnalyzer = {
           continue;
         }
         issues.push({
-          analyzerId: ID15,
+          analyzerId: ID17,
           severity: "warn",
           nodeIds: [node.path],
           message: tx(UNKNOWN_FIELD_TEXTS.unknownRootKey, {
@@ -1922,181 +2135,15 @@ function indexNamespacedContributions(contributions) {
 function indexRootContributions(contributions) {
   const out = /* @__PURE__ */ new Set();
   for (const entry of contributions) {
-    if (entry.location === "root") out.add(entry.key);
-  }
-  return out;
-}
-function collectPluginIds(contributions) {
-  const out = /* @__PURE__ */ new Set();
-  for (const entry of contributions) out.add(entry.pluginId);
-  return out;
-}
-
-// built-in-plugins/analyzers/contribution-orphan/index.ts
-var ID16 = "contribution-orphan";
-var contributionOrphanAnalyzer = {
-  id: ID16,
-  pluginId: "core",
-  kind: "analyzer",
-  version: "0.0.0",
-  description: "Detects and warns about plugin data referencing nodes renamed or deleted in the latest scan.",
-  stability: "experimental",
-  mode: "deterministic",
-  evaluate(_ctx) {
-    return [];
-  }
-};
-
-// kernel/util/safe-text.ts
-var ANSI_ESCAPE_RE = /[›][[\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\d/#&.:=?%@~_]+)*|[a-zA-Z\d]+(?:;[-a-zA-Z\d/#&.:=?%@~_]*)*)?)|(?:(?:\d{1,4}(?:;\d{0,4})*)?[\dA-PR-TZcf-nq-uy=><~]))/g;
-var C0_CONTROL_RE = /[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g;
-function sanitizeForTerminal(text) {
-  return text.replace(ANSI_ESCAPE_RE, "").replace(C0_CONTROL_RE, "");
-}
-
-// built-in-plugins/i18n/ascii.texts.ts
-var ASCII_FORMATTER_TEXTS = {
-  /** Header line: `skill-map graph: N nodes, M links, K issues`. */
-  header: "skill-map graph: {{nodes}} nodes, {{links}} links, {{issues}} issues",
-  /** Per-node-kind section header: `## <kind> (<count>)`. */
-  kindSectionHeader: "## {{kind}} ({{count}})",
-  /** Plain node bullet: `- <path>`. */
-  nodeBullet: "- {{path}}",
-  /** Node bullet with title suffix: `- <path>: "<title>"`. */
-  nodeBulletWithTitle: '- {{path}}: "{{title}}"',
-  /** `## links (<count>)` section header. */
-  linksSectionHeader: "## links ({{count}})",
-  /** Link bullet: `- <source> --<kind>--> <target>  [<confidence>]`. */
-  linkBullet: "- {{source}} --{{kind}}--> {{target}}  [{{confidence}}]",
-  /** `## issues (<count>)` section header. */
-  issuesSectionHeader: "## issues ({{count}})",
-  /** Issue bullet: `- [<severity>] <analyzerId>: <message>`. */
-  issueBullet: "- [{{severity}}] {{analyzerId}}: {{message}}"
-};
-
-// built-in-plugins/formatters/ascii/index.ts
-var ID17 = "ascii";
-var KIND_ORDER = ["agent", "command", "skill", "markdown"];
-var asciiFormatter = {
-  id: ID17,
-  pluginId: "core",
-  kind: "formatter",
-  version: "1.0.0",
-  description: "Renders the scan as plain text, grouped by kind, arrows, and issues. Used by `sm scan --format=ascii`.",
-  stability: "stable",
-  formatId: "ascii",
-  // ASCII tree formatter, header + per-kind sections + per-issue
-  // section. Each section iterates and renders; splitting per section
-  // would multiply the for-loop boilerplate.
-  // eslint-disable-next-line complexity
-  format(ctx) {
-    const out = [];
-    out.push(
-      tx(ASCII_FORMATTER_TEXTS.header, {
-        nodes: ctx.nodes.length,
-        links: ctx.links.length,
-        issues: ctx.issues.length
-      }),
-      ""
-    );
-    const byKind = /* @__PURE__ */ new Map();
-    for (const node of ctx.nodes) {
-      if (!byKind.has(node.kind)) byKind.set(node.kind, []);
-      byKind.get(node.kind).push(node);
-    }
-    const renderedKinds = /* @__PURE__ */ new Set();
-    for (const kind of KIND_ORDER) {
-      const group = byKind.get(kind);
-      if (!group || group.length === 0) continue;
-      renderSection(out, kind, group);
-      renderedKinds.add(kind);
-    }
-    const extraKinds = [...byKind.keys()].filter((k) => !renderedKinds.has(k)).sort();
-    for (const kind of extraKinds) {
-      const group = byKind.get(kind);
-      if (!group || group.length === 0) continue;
-      renderSection(out, kind, group);
-    }
-    if (ctx.links.length > 0) {
-      out.push(tx(ASCII_FORMATTER_TEXTS.linksSectionHeader, { count: ctx.links.length }));
-      const sorted = [...ctx.links].sort((a, b) => {
-        const aKey = `${a.source}\0${a.kind}\0${a.target}`;
-        const bKey = `${b.source}\0${b.kind}\0${b.target}`;
-        return aKey.localeCompare(bKey);
-      });
-      for (const link2 of sorted) {
-        out.push(
-          tx(ASCII_FORMATTER_TEXTS.linkBullet, {
-            source: sanitizeForTerminal(link2.source),
-            kind: sanitizeForTerminal(link2.kind),
-            target: sanitizeForTerminal(link2.target),
-            confidence: link2.confidence
-          })
-        );
-      }
-      out.push("");
-    }
-    if (ctx.issues.length > 0) {
-      out.push(tx(ASCII_FORMATTER_TEXTS.issuesSectionHeader, { count: ctx.issues.length }));
-      for (const issue of ctx.issues) {
-        out.push(
-          tx(ASCII_FORMATTER_TEXTS.issueBullet, {
-            severity: issue.severity,
-            analyzerId: sanitizeForTerminal(issue.analyzerId),
-            message: sanitizeForTerminal(issue.message)
-          })
-        );
-      }
-      out.push("");
-    }
-    return out.join("\n");
-  }
-};
-function pickTitle(node) {
-  const name = node.frontmatter?.["name"];
-  return typeof name === "string" && name.length > 0 ? name : null;
-}
-function renderSection(out, kind, group) {
-  const sorted = [...group].sort((a, b) => a.path.localeCompare(b.path));
-  out.push(
-    tx(ASCII_FORMATTER_TEXTS.kindSectionHeader, {
-      kind: sanitizeForTerminal(kind),
-      count: sorted.length
-    })
-  );
-  for (const node of sorted) {
-    const title = pickTitle(node);
-    out.push(
-      title ? tx(ASCII_FORMATTER_TEXTS.nodeBulletWithTitle, {
-        path: sanitizeForTerminal(node.path),
-        title: sanitizeForTerminal(title)
-      }) : tx(ASCII_FORMATTER_TEXTS.nodeBullet, { path: sanitizeForTerminal(node.path) })
-    );
-  }
-  out.push("");
-}
-
-// built-in-plugins/formatters/json/index.ts
-var ID18 = "json";
-var jsonFormatter = {
-  id: ID18,
-  pluginId: "core",
-  kind: "formatter",
-  version: "1.0.0",
-  description: "Renders the persisted scan as JSON (conforms to `scan-result.schema.json` when the full ScanResult is available). Used by `sm graph --format json` and `GET /api/graph?format=json`.",
-  stability: "stable",
-  formatId: ID18,
-  format(ctx) {
-    if (ctx.scanResult !== void 0) {
-      return JSON.stringify(ctx.scanResult);
-    }
-    return JSON.stringify({
-      nodes: ctx.nodes,
-      links: ctx.links,
-      issues: ctx.issues
-    });
+    if (entry.location === "root") out.add(entry.key);
   }
-};
+  return out;
+}
+function collectPluginIds(contributions) {
+  const out = /* @__PURE__ */ new Set();
+  for (const entry of contributions) out.add(entry.pluginId);
+  return out;
+}
 
 // kernel/adapters/schema-validators.ts
 import { readFileSync as readFileSync2 } from "fs";
@@ -2138,6 +2185,7 @@ var SCHEMA_FILES = {
   "conformance-case": "schemas/conformance-case.schema.json",
   "history-stats": "schemas/history-stats.schema.json",
   "extension-provider": "schemas/extensions/provider.schema.json",
+  "extension-provider-kind": "schemas/extensions/provider-kind.schema.json",
   "extension-extractor": "schemas/extensions/extractor.schema.json",
   "extension-analyzer": "schemas/extensions/analyzer.schema.json",
   "extension-action": "schemas/extensions/action.schema.json",
@@ -2304,7 +2352,7 @@ function existsSyncSafe(path) {
   }
 }
 
-// built-in-plugins/i18n/validate-all.texts.ts
+// plugins/core/analyzers/validate-all/text.ts
 var VALIDATE_ALL_TEXTS = {
   /** `Node <path> failed schema validation: <errors>` */
   nodeFailure: "Node {{path}} failed schema validation: {{errors}}",
@@ -2318,17 +2366,16 @@ var VALIDATE_ALL_TEXTS = {
   alertTooltipMany: "{{count}} schema validation issues on this node."
 };
 
-// built-in-plugins/analyzers/validate-all/index.ts
-var ID19 = "validate-all";
+// plugins/core/analyzers/validate-all/index.ts
+var ID18 = "validate-all";
 var validateAllAnalyzer = {
-  id: ID19,
+  id: ID18,
   pluginId: "core",
   kind: "analyzer",
   version: "1.0.0",
   description: "Detects and flags nodes or links violating the project schemas.",
-  stability: "stable",
   mode: "deterministic",
-  viewContributions: {
+  ui: {
     // Corner badge on the graph card; surfaces when the node body /
     // frontmatter fails schema validation (parse error, missing
     // `name`/`description`, malformed YAML, etc.). Same visual
@@ -2385,7 +2432,7 @@ function collectNodeFindings(v, node, out) {
   const result = v.validate("node", toNodeForSchema(node));
   if (result.ok) return;
   out.push({
-    analyzerId: ID19,
+    analyzerId: ID18,
     severity: "error",
     nodeIds: [node.path],
     message: tx(VALIDATE_ALL_TEXTS.nodeFailure, {
@@ -2404,7 +2451,7 @@ function collectFrontmatterBaseFindings(node, out) {
   if (isMissingStringField(fm, "description")) missing.push("description");
   if (missing.length === 0) return;
   out.push({
-    analyzerId: ID19,
+    analyzerId: ID18,
     // `warn` (not `error`) so the default `sm scan` exit code stays
     // 0 even when nodes are missing frontmatter base fields. Strict
     // mode (`sm scan --strict`) still escalates to exit 1. Matches
@@ -2426,7 +2473,7 @@ function collectLinkFindings(v, link2, out) {
   const result = v.validate("link", toLinkForSchema(link2));
   if (result.ok) return;
   out.push({
-    analyzerId: ID19,
+    analyzerId: ID18,
     severity: "error",
     nodeIds: [link2.source],
     message: tx(VALIDATE_ALL_TEXTS.linkFailure, {
@@ -2466,120 +2513,154 @@ function toLinkForSchema(link2) {
   };
 }
 
-// kernel/util/trigger-resolve.ts
-function buildNameIndex(nodes) {
-  const out = /* @__PURE__ */ new Map();
-  indexByCanonicalName(nodes, out);
-  fillIndexWithPathBasename(nodes, out);
-  return out;
-}
-function indexByCanonicalName(nodes, out) {
-  for (const node of nodes) {
-    const raw = canonicalName(node);
-    if (raw === null) continue;
-    const key = normalizeTrigger(raw);
-    if (!out.has(key)) out.set(key, node.path);
-  }
+// kernel/util/safe-text.ts
+var ANSI_ESCAPE_RE = /[›][[\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\d/#&.:=?%@~_]+)*|[a-zA-Z\d]+(?:;[-a-zA-Z\d/#&.:=?%@~_]*)*)?)|(?:(?:\d{1,4}(?:;\d{0,4})*)?[\dA-PR-TZcf-nq-uy=><~]))/g;
+var C0_CONTROL_RE = /[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g;
+function sanitizeForTerminal(text) {
+  return text.replace(ANSI_ESCAPE_RE, "").replace(C0_CONTROL_RE, "");
 }
-function fillIndexWithPathBasename(nodes, out) {
-  for (const node of nodes) {
-    if (canonicalName(node) !== null) continue;
-    const derived = pathBasenameForLink(node.path);
-    if (derived.length === 0) continue;
-    const key = normalizeTrigger(derived);
-    if (!out.has(key)) out.set(key, node.path);
+
+// plugins/core/formatters/ascii/text.ts
+var ASCII_FORMATTER_TEXTS = {
+  /** Header line: `skill-map graph: N nodes, M links, K issues`. */
+  header: "skill-map graph: {{nodes}} nodes, {{links}} links, {{issues}} issues",
+  /** Per-node-kind section header: `## <kind> (<count>)`. */
+  kindSectionHeader: "## {{kind}} ({{count}})",
+  /** Plain node bullet: `- <path>`. */
+  nodeBullet: "- {{path}}",
+  /** Node bullet with title suffix: `- <path>: "<title>"`. */
+  nodeBulletWithTitle: '- {{path}}: "{{title}}"',
+  /** `## links (<count>)` section header. */
+  linksSectionHeader: "## links ({{count}})",
+  /** Link bullet: `- <source> --<kind>--> <target>  [<confidence>]`. */
+  linkBullet: "- {{source}} --{{kind}}--> {{target}}  [{{confidence}}]",
+  /** `## issues (<count>)` section header. */
+  issuesSectionHeader: "## issues ({{count}})",
+  /** Issue bullet: `- [<severity>] <analyzerId>: <message>`. */
+  issueBullet: "- [{{severity}}] {{analyzerId}}: {{message}}"
+};
+
+// plugins/core/formatters/ascii/index.ts
+var ID19 = "ascii";
+var KIND_ORDER = ["agent", "command", "skill", "markdown"];
+var asciiFormatter = {
+  id: ID19,
+  pluginId: "core",
+  kind: "formatter",
+  formatId: ID19,
+  version: "1.0.0",
+  description: "Renders the scan as plain text, grouped by kind, arrows, and issues. Used by `sm scan --format=ascii`.",
+  // ASCII tree formatter, header + per-kind sections + per-issue
+  // section. Each section iterates and renders; splitting per section
+  // would multiply the for-loop boilerplate.
+  // eslint-disable-next-line complexity
+  format(ctx) {
+    const out = [];
+    out.push(
+      tx(ASCII_FORMATTER_TEXTS.header, {
+        nodes: ctx.nodes.length,
+        links: ctx.links.length,
+        issues: ctx.issues.length
+      }),
+      ""
+    );
+    const byKind = /* @__PURE__ */ new Map();
+    for (const node of ctx.nodes) {
+      if (!byKind.has(node.kind)) byKind.set(node.kind, []);
+      byKind.get(node.kind).push(node);
+    }
+    const renderedKinds = /* @__PURE__ */ new Set();
+    for (const kind of KIND_ORDER) {
+      const group = byKind.get(kind);
+      if (!group || group.length === 0) continue;
+      renderSection(out, kind, group);
+      renderedKinds.add(kind);
+    }
+    const extraKinds = [...byKind.keys()].filter((k) => !renderedKinds.has(k)).sort();
+    for (const kind of extraKinds) {
+      const group = byKind.get(kind);
+      if (!group || group.length === 0) continue;
+      renderSection(out, kind, group);
+    }
+    if (ctx.links.length > 0) {
+      out.push(tx(ASCII_FORMATTER_TEXTS.linksSectionHeader, { count: ctx.links.length }));
+      const sorted = [...ctx.links].sort((a, b) => {
+        const aKey = `${a.source}\0${a.kind}\0${a.target}`;
+        const bKey = `${b.source}\0${b.kind}\0${b.target}`;
+        return aKey.localeCompare(bKey);
+      });
+      for (const link2 of sorted) {
+        out.push(
+          tx(ASCII_FORMATTER_TEXTS.linkBullet, {
+            source: sanitizeForTerminal(link2.source),
+            kind: sanitizeForTerminal(link2.kind),
+            target: sanitizeForTerminal(link2.target),
+            confidence: link2.confidence
+          })
+        );
+      }
+      out.push("");
+    }
+    if (ctx.issues.length > 0) {
+      out.push(tx(ASCII_FORMATTER_TEXTS.issuesSectionHeader, { count: ctx.issues.length }));
+      for (const issue of ctx.issues) {
+        out.push(
+          tx(ASCII_FORMATTER_TEXTS.issueBullet, {
+            severity: issue.severity,
+            analyzerId: sanitizeForTerminal(issue.analyzerId),
+            message: sanitizeForTerminal(issue.message)
+          })
+        );
+      }
+      out.push("");
+    }
+    return out.join("\n");
   }
+};
+function pickTitle(node) {
+  const name = node.frontmatter?.["name"];
+  return typeof name === "string" && name.length > 0 ? name : null;
 }
-function canonicalName(node) {
-  const raw = node.frontmatter?.["name"];
-  if (typeof raw !== "string" || raw.length === 0) return null;
-  return raw;
-}
-function pathBasenameForLink(path) {
-  const segments = path.split("/").filter((s) => s.length > 0);
-  if (segments.length === 0) return path;
-  const last = segments[segments.length - 1];
-  if (last === "SKILL.md" && segments.length >= 2) {
-    return segments[segments.length - 2];
+function renderSection(out, kind, group) {
+  const sorted = [...group].sort((a, b) => a.path.localeCompare(b.path));
+  out.push(
+    tx(ASCII_FORMATTER_TEXTS.kindSectionHeader, {
+      kind: sanitizeForTerminal(kind),
+      count: sorted.length
+    })
+  );
+  for (const node of sorted) {
+    const title = pickTitle(node);
+    out.push(
+      title ? tx(ASCII_FORMATTER_TEXTS.nodeBulletWithTitle, {
+        path: sanitizeForTerminal(node.path),
+        title: sanitizeForTerminal(title)
+      }) : tx(ASCII_FORMATTER_TEXTS.nodeBullet, { path: sanitizeForTerminal(node.path) })
+    );
   }
-  return last.replace(/\.md$/, "");
-}
-function resolveLinkTargetToPath(link2, nameIndex) {
-  const raw = link2.target;
-  const sigil = raw.charAt(0);
-  if (sigil !== "/" && sigil !== "@") return raw;
-  const normalizedTrigger = link2.trigger?.normalizedTrigger;
-  const normalized = typeof normalizedTrigger === "string" ? normalizedTrigger.replace(/^[/@]/, "").trim() : normalizeTrigger(raw.slice(1));
-  const resolved = nameIndex.get(normalized);
-  return resolved ?? raw;
+  out.push("");
 }
 
-// built-in-plugins/analyzers/link-counts/index.ts
-var ID20 = "link-counts";
-var linkCountsAnalyzer = {
+// plugins/core/formatters/json/index.ts
+var ID20 = "json";
+var jsonFormatter = {
   id: ID20,
   pluginId: "core",
-  kind: "analyzer",
+  kind: "formatter",
   version: "1.0.0",
-  description: "Counts incoming and outgoing links per node.",
-  stability: "stable",
-  mode: "deterministic",
-  viewContributions: {
-    linksIn: {
-      slot: "card.footer.left",
-      icon: "pi-download",
-      label: "incoming links",
-      emitWhenEmpty: false,
-      priority: 10
-    },
-    linksOut: {
-      slot: "card.footer.left",
-      icon: "pi-upload",
-      label: "outgoing links",
-      emitWhenEmpty: false,
-      priority: 20
-    }
-  },
-  evaluate(ctx) {
-    const nameIndex = buildNameIndex(ctx.nodes);
-    const perTarget = /* @__PURE__ */ new Map();
-    const perSource = /* @__PURE__ */ new Map();
-    for (const link2 of ctx.links) {
-      const resolvedTarget = resolveLinkTargetToPath(link2, nameIndex);
-      bump(perTarget, resolvedTarget, link2.kind);
-      bump(perSource, link2.source, link2.kind);
-    }
-    for (const node of ctx.nodes) {
-      emitChip(ctx, node.path, "linksIn", perTarget.get(node.path));
-      emitChip(ctx, node.path, "linksOut", perSource.get(node.path));
+  description: "Renders the persisted scan as JSON (conforms to `scan-result.schema.json` when the full ScanResult is available). Used by `sm graph --format json` and `GET /api/graph?format=json`.",
+  formatId: ID20,
+  format(ctx) {
+    if (ctx.scanResult !== void 0) {
+      return JSON.stringify(ctx.scanResult);
     }
-    return [];
+    return JSON.stringify({
+      nodes: ctx.nodes,
+      links: ctx.links,
+      issues: ctx.issues
+    });
   }
 };
-function bump(map, key, kind) {
-  let byKind = map.get(key);
-  if (!byKind) {
-    byKind = /* @__PURE__ */ new Map();
-    map.set(key, byKind);
-  }
-  byKind.set(kind, (byKind.get(kind) ?? 0) + 1);
-}
-function emitChip(ctx, nodePath, contributionId, byKind) {
-  if (!byKind) return;
-  let total = 0;
-  for (const n of byKind.values()) total += n;
-  if (total === 0) return;
-  const capped = Math.min(total, 99);
-  const direction = contributionId === "linksIn" ? "in" : "out";
-  ctx.emitContribution(nodePath, contributionId, {
-    value: capped,
-    tooltip: formatBreakdown(byKind, direction)
-  });
-}
-function formatBreakdown(byKind, direction) {
-  const lines = [...byKind.entries()].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([kind, n]) => `${kind}: ${n}`);
-  return [direction, ...lines].join("\n");
-}
 
 // kernel/sidecar/parse.ts
 import { existsSync, readFileSync as readFileSync3 } from "fs";
@@ -2706,7 +2787,7 @@ function resolveSpecRoot2() {
   }
 }
 
-// built-in-plugins/actions/bump/index.ts
+// plugins/core/actions/bump/index.ts
 var ID21 = "bump";
 var PLUGIN_ID = "core";
 var bumpAction = {
@@ -2715,9 +2796,7 @@ var bumpAction = {
   kind: "action",
   version: "1.0.0",
   description: "Marks a node as updated: bumps version, refreshes sidecar hashes, records the timestamp.",
-  stability: "stable",
   mode: "deterministic",
-  reportSchemaRef: "https://skill-map.dev/spec/v0/bump-report.schema.json",
   // The runtime contract uses generic <TInput, TReport>; bump narrows
   // both. The cast is the standard pattern for built-ins that want
   // typed local I/O while staying compatible with the open generic.
@@ -2770,7 +2849,7 @@ function pickCurrentVersion(overlay) {
   return typeof v === "number" && Number.isFinite(v) ? v : 0;
 }
 
-// built-in-plugins/actions/mark-superseded/index.ts
+// plugins/core/actions/mark-superseded/index.ts
 var ID22 = "mark-superseded";
 var PLUGIN_ID2 = "core";
 var markSupersededAction = {
@@ -2779,9 +2858,7 @@ var markSupersededAction = {
   kind: "action",
   version: "0.0.0",
   description: "Declares the current node as superseded by another (writes `supersededBy` to the sidecar). Paired with the `core/superseded` analyzer.",
-  stability: "experimental",
   mode: "deterministic",
-  reportSchemaRef: "https://skill-map.dev/spec/v0/report-base-deterministic.schema.json",
   invoke(_input, _ctx) {
     const report = { ok: true, noop: true };
     return { report };
@@ -2886,7 +2963,7 @@ var UPDATE_CHECK_TEXTS = {
 // package.json
 var package_default = {
   name: "@skill-map/cli",
-  version: "0.28.0",
+  version: "0.30.0",
   description: "skill-map reference implementation \u2014 kernel + CLI + adapters.",
   license: "MIT",
   type: "module",
@@ -2939,16 +3016,19 @@ var package_default = {
     "lint:fix": "eslint . --fix",
     reference: "node scripts/build-reference.js",
     "reference:check": "node scripts/build-reference.js --check",
+    "build-built-ins": "node ../scripts/generate-built-ins.js",
+    "built-ins:check": "node ../scripts/generate-built-ins.js --check",
+    prebuild: "pnpm build-built-ins",
     validate: "pnpm validate:compile && pnpm validate:test",
-    "validate:compile": "pnpm typecheck && pnpm lint && pnpm build && pnpm reference:check",
+    "validate:compile": "pnpm typecheck && pnpm lint && pnpm build && pnpm reference:check && pnpm built-ins:check",
     "validate:test": "pnpm test:ci",
     pretest: "tsup",
     "pretest:coverage": "tsup",
     "pretest:coverage:html": "tsup",
-    test: "tsc --noEmit && node --import tsx --test --test-reporter=spec 'test/**/*.test.ts' 'built-in-plugins/**/*.test.ts' 'kernel/**/*.test.ts' 'server/**/*.test.ts'",
-    "test:ci": "node --import tsx --test 'test/**/*.test.ts' 'built-in-plugins/**/*.test.ts' 'kernel/**/*.test.ts' 'server/**/*.test.ts'",
-    "test:coverage": "tsc --noEmit && SKILL_MAP_SKIP_BENCHMARK=1 node --experimental-default-config-file --import tsx --test --experimental-test-coverage 'test/**/*.test.ts' 'built-in-plugins/**/*.test.ts' 'kernel/**/*.test.ts' 'server/**/*.test.ts'",
-    "test:coverage:html": "tsc --noEmit && SKILL_MAP_SKIP_BENCHMARK=1 c8 node --import tsx --test 'test/**/*.test.ts' 'built-in-plugins/**/*.test.ts' 'kernel/**/*.test.ts' 'server/**/*.test.ts'",
+    test: "tsc --noEmit && node --import tsx --test --test-reporter=spec '__tests__/**/*.spec.ts' 'kernel/**/__tests__/**/*.spec.ts' 'cli/**/__tests__/**/*.spec.ts' 'server/**/__tests__/**/*.spec.ts' 'plugins/**/__tests__/**/*.spec.ts' 'core/**/__tests__/**/*.spec.ts' 'conformance/**/__tests__/**/*.spec.ts'",
+    "test:ci": "node --import tsx --test '__tests__/**/*.spec.ts' 'kernel/**/__tests__/**/*.spec.ts' 'cli/**/__tests__/**/*.spec.ts' 'server/**/__tests__/**/*.spec.ts' 'plugins/**/__tests__/**/*.spec.ts' 'core/**/__tests__/**/*.spec.ts' 'conformance/**/__tests__/**/*.spec.ts'",
+    "test:coverage": "tsc --noEmit && SKILL_MAP_SKIP_BENCHMARK=1 node --experimental-default-config-file --import tsx --test --experimental-test-coverage '__tests__/**/*.spec.ts' 'kernel/**/__tests__/**/*.spec.ts' 'cli/**/__tests__/**/*.spec.ts' 'server/**/__tests__/**/*.spec.ts' 'plugins/**/__tests__/**/*.spec.ts' 'core/**/__tests__/**/*.spec.ts' 'conformance/**/__tests__/**/*.spec.ts'",
+    "test:coverage:html": "tsc --noEmit && SKILL_MAP_SKIP_BENCHMARK=1 c8 node --import tsx --test '__tests__/**/*.spec.ts' 'kernel/**/__tests__/**/*.spec.ts' 'cli/**/__tests__/**/*.spec.ts' 'server/**/__tests__/**/*.spec.ts' 'plugins/**/__tests__/**/*.spec.ts' 'core/**/__tests__/**/*.spec.ts' 'conformance/**/__tests__/**/*.spec.ts'",
     clean: "rm -rf dist coverage"
   },
   dependencies: {
@@ -3237,15 +3317,13 @@ ${footer}
 `);
 }
 
-// built-in-plugins/hooks/update-check/index.ts
+// plugins/core/hooks/update-check/index.ts
 var updateCheckHook = {
   id: "update-check",
   pluginId: "core",
   kind: "hook",
   version: "1.0.0",
   description: "Checks daily for a newer skill-map version on npm. Shows an `update available` banner when one is found.",
-  stability: "stable",
-  mode: "deterministic",
   triggers: ["boot"],
   async on(ctx) {
     const payload = ctx.event.data ?? {};
@@ -3259,14 +3337,41 @@ var updateCheckHook = {
   }
 };
 
-// built-in-plugins/built-ins.ts
+// plugins/built-ins.ts
+var claudeProvider2 = { ...claudeProvider, pluginId: "claude" };
+var geminiProvider2 = { ...geminiProvider, pluginId: "gemini" };
+var agentSkillsProvider2 = { ...agentSkillsProvider, pluginId: "agent-skills" };
+var coreMarkdownProvider2 = { ...coreMarkdownProvider, pluginId: "core" };
+var annotationsExtractor2 = { ...annotationsExtractor, pluginId: "core" };
+var atDirectiveExtractor2 = { ...atDirectiveExtractor, pluginId: "core" };
+var externalUrlCounterExtractor2 = { ...externalUrlCounterExtractor, pluginId: "core" };
+var markdownLinkExtractor2 = { ...markdownLinkExtractor, pluginId: "core" };
+var slashExtractor2 = { ...slashExtractor, pluginId: "core" };
+var toolsCountExtractor2 = { ...toolsCountExtractor, pluginId: "core" };
+var annotationOrphanAnalyzer2 = { ...annotationOrphanAnalyzer, pluginId: "core" };
+var annotationStaleAnalyzer2 = { ...annotationStaleAnalyzer, pluginId: "core" };
+var brokenRefAnalyzer2 = { ...brokenRefAnalyzer, pluginId: "core" };
+var contributionOrphanAnalyzer2 = { ...contributionOrphanAnalyzer, pluginId: "core" };
+var jobOrphanFileAnalyzer2 = { ...jobOrphanFileAnalyzer, pluginId: "core" };
+var linkConflictAnalyzer2 = { ...linkConflictAnalyzer, pluginId: "core" };
+var linkCountsAnalyzer2 = { ...linkCountsAnalyzer, pluginId: "core" };
+var stabilityAnalyzer2 = { ...stabilityAnalyzer, pluginId: "core" };
+var supersededAnalyzer2 = { ...supersededAnalyzer, pluginId: "core" };
+var triggerCollisionAnalyzer2 = { ...triggerCollisionAnalyzer, pluginId: "core" };
+var unknownFieldAnalyzer2 = { ...unknownFieldAnalyzer, pluginId: "core" };
+var validateAllAnalyzer2 = { ...validateAllAnalyzer, pluginId: "core" };
+var asciiFormatter2 = { ...asciiFormatter, pluginId: "core" };
+var jsonFormatter2 = { ...jsonFormatter, pluginId: "core" };
+var bumpAction2 = { ...bumpAction, pluginId: "core" };
+var markSupersededAction2 = { ...markSupersededAction, pluginId: "core" };
+var updateCheckHook2 = { ...updateCheckHook, pluginId: "core" };
 var builtInBundles = [
   {
     id: "claude",
     granularity: "bundle",
     description: "Claude Code platform integration. Classifies files under `.claude/{agents,commands,skills}` and parses Claude-flavored frontmatter.",
     extensions: [
-      claudeProvider
+      claudeProvider2
     ]
   },
   {
@@ -3274,7 +3379,7 @@ var builtInBundles = [
     granularity: "bundle",
     description: "Gemini CLI platform integration. Classifies files under `.gemini/{agents,skills}` and parses Gemini-flavored frontmatter.",
     extensions: [
-      geminiProvider
+      geminiProvider2
     ]
   },
   {
@@ -3282,7 +3387,7 @@ var builtInBundles = [
     granularity: "bundle",
     description: "Agent Skills open standard. Vendor-neutral path `.agents/skills/<name>/SKILL.md` (Anthropic, OpenAI, Google). See agentskills.io.",
     extensions: [
-      agentSkillsProvider
+      agentSkillsProvider2
     ]
   },
   {
@@ -3290,39 +3395,30 @@ var builtInBundles = [
     granularity: "extension",
     description: "Core extensions shared across providers: extractors, analyzers, formatters, the bump action, and the universal `.md` fallback Provider.",
     extensions: [
-      // Provider FIRST within the core bundle so the kindRegistry
-      // composer picks it up alongside other providers; orchestration
-      // ordering (vendor providers first, core/markdown LAST) is
-      // enforced by the bundle list above (claude / gemini /
-      // agent-skills precede core). Within the core bundle, the
-      // provider's slot among extractors / analyzers / formatter is
-      // irrelevant, the orchestrator buckets by kind before
-      // iterating, so this list defines registration order, not
-      // execution order.
-      coreMarkdownProvider,
-      annotationsExtractor,
-      atDirectiveExtractor,
-      externalUrlCounterExtractor,
-      markdownLinkExtractor,
-      slashExtractor,
-      toolsCountExtractor,
-      triggerCollisionAnalyzer,
-      brokenRefAnalyzer,
-      supersededAnalyzer,
-      linkConflictAnalyzer,
-      annotationStaleAnalyzer,
-      annotationOrphanAnalyzer,
-      jobOrphanFileAnalyzer,
-      stabilityAnalyzer,
-      unknownFieldAnalyzer,
-      contributionOrphanAnalyzer,
-      asciiFormatter,
-      jsonFormatter,
-      validateAllAnalyzer,
-      linkCountsAnalyzer,
-      bumpAction,
-      markSupersededAction,
-      updateCheckHook
+      coreMarkdownProvider2,
+      annotationsExtractor2,
+      atDirectiveExtractor2,
+      externalUrlCounterExtractor2,
+      markdownLinkExtractor2,
+      slashExtractor2,
+      toolsCountExtractor2,
+      annotationOrphanAnalyzer2,
+      annotationStaleAnalyzer2,
+      brokenRefAnalyzer2,
+      contributionOrphanAnalyzer2,
+      jobOrphanFileAnalyzer2,
+      linkConflictAnalyzer2,
+      linkCountsAnalyzer2,
+      stabilityAnalyzer2,
+      supersededAnalyzer2,
+      triggerCollisionAnalyzer2,
+      unknownFieldAnalyzer2,
+      validateAllAnalyzer2,
+      asciiFormatter2,
+      jsonFormatter2,
+      bumpAction2,
+      markSupersededAction2,
+      updateCheckHook2
     ]
   }
 ];
@@ -3331,8 +3427,8 @@ function builtIns() {
     providers: [],
     extractors: [],
     analyzers: [],
-    actions: [],
     formatters: [],
+    actions: [],
     hooks: []
   };
   for (const bundle of builtInBundles) {
@@ -3356,8 +3452,8 @@ function bucketBuiltIn(ext, out) {
     provider: out.providers,
     extractor: out.extractors,
     analyzer: out.analyzers,
-    action: out.actions,
     formatter: out.formatters,
+    action: out.actions,
     hook: out.hooks
   });
 }
@@ -3366,12 +3462,9 @@ function toExtensionRow(x) {
     id: x.id,
     pluginId: x.pluginId,
     kind: x.kind,
-    version: x.version
+    version: x.version,
+    description: x.description ?? ""
   };
-  if (x.description !== void 0) row.description = x.description;
-  if (x.stability !== void 0) row.stability = x.stability;
-  if (x.preconditions !== void 0) row.preconditions = x.preconditions;
-  if (x.entry !== void 0) row.entry = x.entry;
   return row;
 }
 
@@ -4131,14 +4224,14 @@ function readJsonObjectOrEmpty(path) {
   }
   return {};
 }
-function writeFileAtomicExclusive(path, content) {
+function writeFileAtomicExclusive(path, content, mode = 384) {
   const tmp = `${path}.tmp.${process.pid}.${randomBytes(8).toString("hex")}`;
   let fd = null;
   try {
     fd = openSync(
       tmp,
       fsConstants.O_WRONLY | fsConstants.O_CREAT | fsConstants.O_EXCL | fsConstants.O_NOFOLLOW,
-      384
+      mode
     );
     writeSync(fd, content);
     closeSync(fd);
@@ -7124,7 +7217,8 @@ function invokeBumpFor(node, absPath, force) {
     node,
     nodeAbsolutePath: absPath,
     invoker: "cli",
-    now: () => /* @__PURE__ */ new Date()
+    now: () => /* @__PURE__ */ new Date(),
+    settings: {}
   });
 }
 
@@ -7644,8 +7738,8 @@ var PLUGIN_LOADER_TEXTS = {
 
 // kernel/adapters/plugin-loader/index.ts
 import { createRequire as createRequire5 } from "module";
-import { existsSync as existsSync11, readFileSync as readFileSync11, readdirSync as readdirSync3 } from "fs";
-import { join as join7, resolve as resolve16 } from "path";
+import { existsSync as existsSync12, readFileSync as readFileSync12, readdirSync as readdirSync4, statSync as statSync2 } from "fs";
+import { join as join8, resolve as resolve16 } from "path";
 import { pathToFileURL } from "url";
 import semver from "semver";
 
@@ -7682,7 +7776,7 @@ function applyIdCollisions(plugins) {
   const buckets = /* @__PURE__ */ new Map();
   for (const p of plugins) {
     if (!p.manifest) continue;
-    const id = p.manifest.id;
+    const id = p.id;
     const bucket = buckets.get(id);
     if (bucket) bucket.push(p);
     else buckets.set(id, [p]);
@@ -7733,39 +7827,22 @@ function extractDefault(mod) {
   if (!isRecord(mod)) return mod;
   return "default" in mod ? mod["default"] : mod;
 }
-function stripFunctionsAndPluginId(input) {
-  if (!isRecord(input)) return input;
-  const out = {};
-  for (const [k, v] of Object.entries(input)) {
-    if (typeof v === "function") continue;
-    if (k === "pluginId") continue;
-    if (k === "kinds" && isRecord(v)) {
-      out[k] = stripKindsRuntimeFields(v);
-      continue;
-    }
-    out[k] = v;
-  }
-  return out;
-}
-function stripKindsRuntimeFields(kinds) {
+var LOADER_INJECTED_KEYS = /* @__PURE__ */ new Set(["pluginId", "id", "kind", "kinds", "formatId"]);
+function stripFunctionsAndPluginId(input) {
+  if (!isRecord(input)) return input;
   const out = {};
-  for (const [kind, entry] of Object.entries(kinds)) {
-    if (!isRecord(entry)) {
-      out[kind] = entry;
-      continue;
-    }
-    const cleaned = {};
-    for (const [k, v] of Object.entries(entry)) {
-      if (k === "schemaJson") continue;
-      if (typeof v === "function") continue;
-      cleaned[k] = v;
-    }
-    out[kind] = cleaned;
+  for (const [k, v] of Object.entries(input)) {
+    if (typeof v === "function") continue;
+    if (LOADER_INJECTED_KEYS.has(k)) continue;
+    out[k] = v;
   }
   return out;
 }
 
 // kernel/adapters/plugin-loader/validation.ts
+import * as nodeFs from "fs";
+import { existsSync as existsSync11 } from "fs";
+import { dirname as dirname9, join as join7 } from "path";
 import { Ajv2020 as Ajv20205 } from "ajv/dist/2020.js";
 
 // kernel/extensions/hook.ts
@@ -7793,76 +7870,73 @@ var KNOWN_KINDS = /* @__PURE__ */ new Set([
 ]);
 var KNOWN_KINDS_LIST = [...KNOWN_KINDS].join(" / ");
 var HOOKABLE_TRIGGERS_LIST = HOOK_TRIGGERS.join(", ");
-function validateAnnotationContributions(pluginPath, manifest, relEntry, manifestView) {
+function validateAnnotationContributions(pluginPath, pluginId, manifest, relEntry, manifestView) {
   if (!isRecord(manifestView)) return null;
-  const raw = manifestView["annotationContributions"];
+  const raw = manifestView["annotation"];
   if (raw === void 0) return null;
   if (!isRecord(raw)) return null;
-  for (const [key, value] of Object.entries(raw)) {
-    if (!isRecord(value)) continue;
-    const location = value["location"] ?? "namespaced";
-    const ownership = value["ownership"] ?? "shared";
-    if (location === "root" && ownership !== "exclusive") {
-      return {
-        ...fail(
-          pluginPath,
-          manifest.id,
-          "invalid-manifest",
-          tx(PLUGIN_LOADER_TEXTS.invalidManifestRootSharedAnnotation, {
-            relEntry,
-            key,
-            ownership
-          })
-        ),
-        manifest
-      };
-    }
-    const schema = value["schema"];
-    if (!isRecord(schema)) {
-      return {
-        ...fail(
-          pluginPath,
-          manifest.id,
-          "invalid-manifest",
-          tx(PLUGIN_LOADER_TEXTS.invalidManifestAnnotationSchemaCompile, {
-            relEntry,
-            key,
-            errDescription: "schema must be an object literal"
-          })
-        ),
-        manifest
-      };
-    }
-    try {
-      const ajv = new Ajv20205({ strict: false, allErrors: true, allowUnionTypes: true });
-      applyAjvFormats(ajv);
-      ajv.compile(schema);
-    } catch (err) {
-      return {
-        ...fail(
-          pluginPath,
-          manifest.id,
-          "invalid-manifest",
-          tx(PLUGIN_LOADER_TEXTS.invalidManifestAnnotationSchemaCompile, {
-            relEntry,
-            key,
-            errDescription: describe(err)
-          })
-        ),
-        manifest
-      };
-    }
+  const location = raw["location"] ?? "namespaced";
+  const ownership = raw["ownership"] ?? "shared";
+  if (location === "root" && ownership !== "exclusive") {
+    return {
+      ...fail(
+        pluginPath,
+        pluginId,
+        "invalid-manifest",
+        tx(PLUGIN_LOADER_TEXTS.invalidManifestRootSharedAnnotation, {
+          relEntry,
+          key: "<annotation>",
+          ownership
+        })
+      ),
+      manifest
+    };
+  }
+  const schema = raw["schema"];
+  if (!isRecord(schema)) {
+    return {
+      ...fail(
+        pluginPath,
+        pluginId,
+        "invalid-manifest",
+        tx(PLUGIN_LOADER_TEXTS.invalidManifestAnnotationSchemaCompile, {
+          relEntry,
+          key: "<annotation>",
+          errDescription: "schema must be an object literal"
+        })
+      ),
+      manifest
+    };
+  }
+  try {
+    const ajv = new Ajv20205({ strict: false, allErrors: true, allowUnionTypes: true });
+    applyAjvFormats(ajv);
+    ajv.compile(schema);
+  } catch (err) {
+    return {
+      ...fail(
+        pluginPath,
+        pluginId,
+        "invalid-manifest",
+        tx(PLUGIN_LOADER_TEXTS.invalidManifestAnnotationSchemaCompile, {
+          relEntry,
+          key: "<annotation>",
+          errDescription: describe(err)
+        })
+      ),
+      manifest
+    };
   }
   return null;
 }
-function validateHookTriggers(pluginPath, manifest, relEntry, exported, manifestView) {
+function validateHookTriggers(pluginPath, pluginId, manifest, relEntry, exported, manifestView) {
   const triggers = manifestView["triggers"];
   const hookId = exported["id"] ?? "?";
   if (!Array.isArray(triggers) || triggers.length === 0) {
     return {
       ...fail(
         pluginPath,
-        manifest.id,
+        pluginId,
         "invalid-manifest",
         tx(PLUGIN_LOADER_TEXTS.invalidManifestHookEmptyTriggers, { hookId })
       ),
@@ -7874,7 +7948,7 @@ function validateHookTriggers(pluginPath, manifest, relEntry, exported, manifest
       return {
         ...fail(
           pluginPath,
-          manifest.id,
+          pluginId,
           "invalid-manifest",
           tx(PLUGIN_LOADER_TEXTS.invalidManifestHookUnknownTrigger, {
             hookId,
@@ -7888,9 +7962,135 @@ function validateHookTriggers(pluginPath, manifest, relEntry, exported, manifest
   }
   return null;
 }
+function validateActionFileConventions(pluginPath, pluginId, manifest, relEntry, entryAbsPath, manifestView) {
+  const actionDir = dirname9(entryAbsPath);
+  const reportSchemaPath = join7(actionDir, "report.schema.json");
+  const promptPath = join7(actionDir, "prompt.md");
+  const mode = isRecord(manifestView) && typeof manifestView["mode"] === "string" ? manifestView["mode"] : "deterministic";
+  if (!existsSync11(reportSchemaPath)) {
+    return {
+      ...fail(
+        pluginPath,
+        pluginId,
+        "load-error",
+        `Action at \`${relEntry}\` is missing \`report.schema.json\` in its folder (structure-as-truth: every Action carries a report schema by convention).`
+      ),
+      manifest
+    };
+  }
+  const promptExists = existsSync11(promptPath);
+  if (mode === "probabilistic" && !promptExists) {
+    return {
+      ...fail(
+        pluginPath,
+        pluginId,
+        "load-error",
+        `Probabilistic Action at \`${relEntry}\` is missing \`prompt.md\` in its folder (structure-as-truth: probabilistic Actions carry a prompt template by convention).`
+      ),
+      manifest
+    };
+  }
+  if (mode === "deterministic" && promptExists) {
+    return {
+      ...fail(
+        pluginPath,
+        pluginId,
+        "invalid-manifest",
+        `Deterministic Action at \`${relEntry}\` carries an unexpected \`prompt.md\` (delete the file or switch \`mode\` to \`'probabilistic'\`).`
+      ),
+      manifest
+    };
+  }
+  return null;
+}
+function discoverProviderKinds(pluginPath, pluginId, manifest, relEntry, validatorForKind) {
+  const kindsRoot = join7(pluginPath, "kinds");
+  let entries;
+  try {
+    entries = nodeFs.readdirSync(kindsRoot);
+  } catch {
+    return { ok: true, kinds: {} };
+  }
+  const out = {};
+  for (const entry of entries.sort()) {
+    if (entry.startsWith(".")) continue;
+    const kindDir = join7(kindsRoot, entry);
+    if (!isDirectorySafe(kindDir, nodeFs.statSync)) continue;
+    const result = loadOneProviderKind({
+      pluginPath,
+      pluginId,
+      manifest,
+      relEntry,
+      entry,
+      kindDir,
+      validatorForKind
+    });
+    if (!result.ok) return result;
+    out[entry] = result.kind;
+  }
+  return { ok: true, kinds: out };
+}
+function loadOneProviderKind(opts) {
+  const schemaJson = readJsonFile(join7(opts.kindDir, "schema.json"));
+  if ("error" in schemaJson) {
+    return providerKindFailure(opts, "load-error", "schema.json", schemaJson.error);
+  }
+  const kindJson = readJsonFile(join7(opts.kindDir, "kind.json"));
+  if ("error" in kindJson) {
+    return providerKindFailure(opts, "invalid-manifest", "kind.json", kindJson.error);
+  }
+  const validation = opts.validatorForKind(kindJson.value);
+  if (!validation.ok) {
+    return {
+      ok: false,
+      failure: {
+        ...fail(
+          opts.pluginPath,
+          opts.pluginId,
+          "invalid-manifest",
+          `Provider kind \`${opts.entry}\` (declared at \`${opts.relEntry}\`) failed validation in \`kinds/${opts.entry}/kind.json\`: ${validation.errors}. See spec/schemas/extensions/provider-kind.schema.json.`
+        ),
+        manifest: opts.manifest
+      }
+    };
+  }
+  const ui = isRecord(kindJson.value) ? kindJson.value["ui"] : void 0;
+  return {
+    ok: true,
+    kind: { schema: `./kinds/${opts.entry}/schema.json`, schemaJson: schemaJson.value, ui }
+  };
+}
+function readJsonFile(path) {
+  try {
+    return { value: JSON.parse(nodeFs.readFileSync(path, "utf8")) };
+  } catch (err) {
+    return { error: describe(err) };
+  }
+}
+function providerKindFailure(opts, status, fileName, errDescription) {
+  return {
+    ok: false,
+    failure: {
+      ...fail(
+        opts.pluginPath,
+        opts.pluginId,
+        status,
+        `Provider kind \`${opts.entry}\` (declared at \`${opts.relEntry}\`) is missing or has an unparseable \`kinds/${opts.entry}/${fileName}\` (${errDescription}).`
+      ),
+      manifest: opts.manifest
+    }
+  };
+}
+function isDirectorySafe(path, statSync11) {
+  try {
+    return statSync11(path).isDirectory();
+  } catch {
+    return false;
+  }
+}
 
 // kernel/adapters/plugin-loader/storage-schemas.ts
-import { readFileSync as readFileSync10 } from "fs";
+import { readFileSync as readFileSync11 } from "fs";
 import { resolve as resolve15 } from "path";
 import { Ajv2020 as Ajv20206 } from "ajv/dist/2020.js";
 
@@ -7898,7 +8098,7 @@ import { Ajv2020 as Ajv20206 } from "ajv/dist/2020.js";
 var KV_SCHEMA_KEY = "__kv__";
 
 // kernel/adapters/plugin-loader/storage-schemas.ts
-function loadStorageSchemas(pluginPath, manifest) {
+function loadStorageSchemas(pluginPath, pluginId, manifest) {
   const storage = manifest.storage;
   if (!storage) return { ok: true };
   if (storage.mode === "kv") {
@@ -7908,7 +8108,7 @@ function loadStorageSchemas(pluginPath, manifest) {
       const reason = tx(
         compiled.phase === "read" ? PLUGIN_LOADER_TEXTS.loadErrorStorageKvSchemaRead : PLUGIN_LOADER_TEXTS.loadErrorStorageKvSchemaCompile,
         {
-          pluginId: manifest.id,
+          pluginId,
           schemaPath: storage.schema,
           errDescription: compiled.errDescription
         }
@@ -7935,7 +8135,7 @@ function loadStorageSchemas(pluginPath, manifest) {
       const reason = tx(
         compiled.phase === "read" ? PLUGIN_LOADER_TEXTS.loadErrorStorageSchemaRead : PLUGIN_LOADER_TEXTS.loadErrorStorageSchemaCompile,
         {
-          pluginId: manifest.id,
+          pluginId,
           table,
           schemaPath: relPath,
           errDescription: compiled.errDescription
@@ -7958,7 +8158,7 @@ function compilePluginSchema(pluginPath, relPath) {
   const abs = resolve15(pluginPath, relPath);
   let raw;
   try {
-    raw = JSON.parse(readFileSync10(abs, "utf8"));
+    raw = JSON.parse(readFileSync11(abs, "utf8"));
   } catch (err) {
     return { ok: false, phase: "read", errDescription: describe(err) };
   }
@@ -7992,11 +8192,11 @@ var PluginLoader = class {
   discoverPaths() {
     const out = [];
     for (const root of this.#options.searchPaths) {
-      if (!existsSync11(root)) continue;
-      for (const entry of readdirSync3(root, { withFileTypes: true })) {
+      if (!existsSync12(root)) continue;
+      for (const entry of readdirSync4(root, { withFileTypes: true })) {
         if (!entry.isDirectory()) continue;
-        const candidate = join7(root, entry.name);
-        if (existsSync11(join7(candidate, "plugin.json"))) {
+        const candidate = join8(root, entry.name);
+        if (existsSync12(join8(candidate, "plugin.json"))) {
           out.push(resolve16(candidate));
         }
       }
@@ -8006,7 +8206,7 @@ var PluginLoader = class {
   /**
    * Full pass, discover every plugin, attempt to load each, then apply
    * the cross-root id-collision pass over the results. Two plugins that
-   * survived their individual load with the same `manifest.id` both get
+   * survived their individual load with the same `pluginId` both get
    * downgraded to status `id-collision` (no precedence, the spec is
    * explicit that "no extension is privileged"). Plugins that already
    * failed their individual load (`invalid-manifest` /
@@ -8026,61 +8226,69 @@ var PluginLoader = class {
   /**
    * Load a single plugin from its directory. Never throws, a failure is
    * reported via the returned status.
+   *
+   * Cyclomatic count covers the four sequential phases (manifest parse,
+   * enabled resolution, per-extension load loop, storage output-schemas
+   * compile) plus their failure short-circuits. Splitting each phase
+   * into a helper would scatter the return-on-failure pattern without
+   * making the orchestration clearer.
    */
   // eslint-disable-next-line complexity
   async loadOne(pluginPath) {
-    const manifestResult = this.#parseAndValidateManifest(pluginPath);
+    const pluginId = pathId(pluginPath);
+    const manifestResult = this.#parseAndValidateManifest(pluginPath, pluginId);
     if (!manifestResult.ok) return manifestResult.failure;
     const manifest = manifestResult.manifest;
-    if (this.#options.resolveEnabled && !this.#options.resolveEnabled(manifest.id)) {
+    const granularity = manifest.granularity ?? "extension";
+    if (this.#options.resolveEnabled && !this.#options.resolveEnabled(pluginId)) {
       return {
         path: pluginPath,
-        id: manifest.id,
+        id: pluginId,
         status: "disabled",
         manifest,
-        granularity: manifest.granularity ?? "bundle",
+        granularity,
         reason: PLUGIN_LOADER_TEXTS.disabledByConfig
       };
     }
     const loaded = [];
-    for (const relEntry of manifest.extensions) {
-      const result = await this.#loadAndValidateExtensionEntry(pluginPath, manifest, relEntry);
+    for (const relEntry of discoverExtensionEntries(pluginPath)) {
+      const result = await this.#loadAndValidateExtensionEntry(pluginPath, pluginId, manifest, relEntry);
       if (!result.ok) return result.failure;
       loaded.push(result.extension);
     }
-    const storageSchemasResult = loadStorageSchemas(pluginPath, manifest);
+    const storageSchemasResult = loadStorageSchemas(pluginPath, pluginId, manifest);
     if (!storageSchemasResult.ok) {
       return {
-        ...fail(pluginPath, manifest.id, "load-error", storageSchemasResult.reason),
+        ...fail(pluginPath, pluginId, "load-error", storageSchemasResult.reason),
         manifest
       };
     }
     return {
       path: pluginPath,
-      id: manifest.id,
+      id: pluginId,
       status: "enabled",
       manifest,
-      granularity: manifest.granularity ?? "bundle",
+      granularity,
       extensions: loaded,
       ...storageSchemasResult.schemas ? { storageSchemas: storageSchemasResult.schemas } : {}
     };
   }
   /**
    * Phase 1 of `loadOne`, read `plugin.json`, AJV-validate the manifest,
-   * enforce the directory-name == manifest.id structural rule, and check
+   * enforce the directory-name == pluginId structural rule, and check
    * specCompat (range syntax + satisfies the installed spec version).
    * Returns either the validated manifest or an `IDiscoveredPlugin` with
    * the appropriate failure status.
    */
-  #parseAndValidateManifest(pluginPath) {
-    const manifestPath = join7(pluginPath, "plugin.json");
+  #parseAndValidateManifest(pluginPath, pluginId) {
+    const manifestPath = join8(pluginPath, "plugin.json");
     let raw;
     try {
-      raw = JSON.parse(readFileSync11(manifestPath, "utf8"));
+      raw = JSON.parse(readFileSync12(manifestPath, "utf8"));
     } catch (err) {
       return { ok: false, failure: fail(
         pluginPath,
-        pathId(pluginPath),
+        pluginId,
         "invalid-manifest",
         tx(PLUGIN_LOADER_TEXTS.invalidManifestJsonParse, {
           manifestPath,
@@ -8092,7 +8300,7 @@ var PluginLoader = class {
     if (!manifestResult.ok) {
       return { ok: false, failure: fail(
         pluginPath,
-        pathId(pluginPath),
+        pluginId,
         "invalid-manifest",
         tx(PLUGIN_LOADER_TEXTS.invalidManifestAjv, {
           manifestPath,
@@ -8101,26 +8309,11 @@ var PluginLoader = class {
       ) };
     }
     const manifest = manifestResult.data;
-    const dirName = pathId(pluginPath);
-    if (dirName !== manifest.id) {
-      return { ok: false, failure: {
-        ...fail(
-          pluginPath,
-          manifest.id,
-          "invalid-manifest",
-          tx(PLUGIN_LOADER_TEXTS.invalidManifestDirMismatch, {
-            dirName,
-            manifestId: manifest.id
-          })
-        ),
-        manifest
-      } };
-    }
     if (!semver.validRange(manifest.specCompat)) {
       return { ok: false, failure: {
         ...fail(
           pluginPath,
-          manifest.id,
+          pluginId,
           "invalid-manifest",
           tx(PLUGIN_LOADER_TEXTS.invalidSpecCompat, { specCompat: manifest.specCompat })
         ),
@@ -8130,10 +8323,10 @@ var PluginLoader = class {
     if (!semver.satisfies(this.#options.specVersion, manifest.specCompat, { includePrerelease: true })) {
       return { ok: false, failure: {
         path: pluginPath,
-        id: manifest.id,
+        id: pluginId,
         status: "incompatible-spec",
         manifest,
-        granularity: manifest.granularity ?? "bundle",
+        granularity: manifest.granularity ?? "extension",
         reason: tx(PLUGIN_LOADER_TEXTS.incompatibleSpec, {
           installedSpecVersion: this.#options.specVersion,
           specCompat: manifest.specCompat
@@ -8156,12 +8349,12 @@ var PluginLoader = class {
   // splitting per sub-check would multiply the discriminated-union
   // boilerplate without making the validation pipeline clearer.
   // eslint-disable-next-line complexity
-  async #loadAndValidateExtensionEntry(pluginPath, manifest, relEntry) {
+  async #loadAndValidateExtensionEntry(pluginPath, pluginId, manifest, relEntry) {
     if (!isInsidePlugin(pluginPath, relEntry)) {
       return { ok: false, failure: {
         ...fail(
           pluginPath,
-          manifest.id,
+          pluginId,
           "invalid-manifest",
           tx(PLUGIN_LOADER_TEXTS.loadErrorPathEscapesPlugin, { relEntry, pluginPath })
         ),
@@ -8169,11 +8362,11 @@ var PluginLoader = class {
       } };
     }
     const abs = resolve16(pluginPath, relEntry);
-    if (!existsSync11(abs)) {
+    if (!existsSync12(abs)) {
       return { ok: false, failure: {
         ...fail(
           pluginPath,
-          manifest.id,
+          pluginId,
           "load-error",
           tx(PLUGIN_LOADER_TEXTS.loadErrorFileNotFound, { relEntry, abs })
         ),
@@ -8187,7 +8380,7 @@ var PluginLoader = class {
       return { ok: false, failure: {
         ...fail(
           pluginPath,
-          manifest.id,
+          pluginId,
           "load-error",
           tx(PLUGIN_LOADER_TEXTS.loadErrorImportFailed, {
             relEntry,
@@ -8198,11 +8391,11 @@ var PluginLoader = class {
       } };
     }
     const exported = extractDefault(mod);
-    if (!isRecord(exported) || typeof exported["kind"] !== "string") {
+    if (!isRecord(exported)) {
       return { ok: false, failure: {
         ...fail(
           pluginPath,
-          manifest.id,
+          pluginId,
           "load-error",
           tx(PLUGIN_LOADER_TEXTS.loadErrorMissingKind, {
             relEntry,
@@ -8212,16 +8405,32 @@ var PluginLoader = class {
         manifest
       } };
     }
-    const kind = exported["kind"];
-    if (!KNOWN_KINDS.has(kind)) {
+    const [pathKindDir, pathId2] = relEntry.split("/");
+    const kindFromPath = pathKindDir && pathKindDir.endsWith("s") ? pathKindDir.slice(0, -1) : void 0;
+    if (!kindFromPath || !KNOWN_KINDS.has(kindFromPath)) {
       return { ok: false, failure: {
         ...fail(
           pluginPath,
-          manifest.id,
-          "load-error",
+          pluginId,
+          "invalid-manifest",
           tx(PLUGIN_LOADER_TEXTS.loadErrorUnknownKind, {
             relEntry,
-            kindReceived: String(exported["kind"]),
+            kindReceived: String(pathKindDir ?? "(missing)"),
+            knownKindsList: KNOWN_KINDS_LIST
+          })
+        ),
+        manifest
+      } };
+    }
+    const kind = kindFromPath;
+    if (!pathId2) {
+      return { ok: false, failure: {
+        ...fail(
+          pluginPath,
+          pluginId,
+          "invalid-manifest",
+          tx(PLUGIN_LOADER_TEXTS.loadErrorMissingKind, {
+            relEntry,
             knownKindsList: KNOWN_KINDS_LIST
           })
         ),
@@ -8229,16 +8438,16 @@ var PluginLoader = class {
       } };
     }
     const declaredPluginId = exported["pluginId"];
-    if (typeof declaredPluginId === "string" && declaredPluginId !== manifest.id) {
+    if (typeof declaredPluginId === "string" && declaredPluginId !== pluginId) {
       return { ok: false, failure: {
         ...fail(
           pluginPath,
-          manifest.id,
+          pluginId,
           "invalid-manifest",
           tx(PLUGIN_LOADER_TEXTS.loadErrorPluginIdMismatch, {
             relEntry,
             declared: declaredPluginId,
-            manifestId: manifest.id
+            manifestId: pluginId
           })
         ),
         manifest
@@ -8246,7 +8455,7 @@ var PluginLoader = class {
     }
     const manifestView = stripFunctionsAndPluginId(exported);
     if (kind === "hook") {
-      const hookFailure = validateHookTriggers(pluginPath, manifest, relEntry, exported, manifestView);
+      const hookFailure = validateHookTriggers(pluginPath, pluginId, manifest, relEntry, exported, manifestView);
       if (hookFailure) return { ok: false, failure: hookFailure };
     }
     const extValidator = this.#options.validators.validatorForExtension(kind);
@@ -8255,7 +8464,7 @@ var PluginLoader = class {
       return { ok: false, failure: {
         ...fail(
           pluginPath,
-          manifest.id,
+          pluginId,
           "invalid-manifest",
           tx(PLUGIN_LOADER_TEXTS.invalidManifestExtensionShape, { relEntry, kind, errors })
         ),
@@ -8264,16 +8473,49 @@ var PluginLoader = class {
     }
     const contribFailure = validateAnnotationContributions(
       pluginPath,
+      pluginId,
       manifest,
       relEntry,
       manifestView
     );
     if (contribFailure) return { ok: false, failure: contribFailure };
-    const instance = isRecord(exported) ? { ...exported, pluginId: manifest.id } : exported;
+    if (kind === "action") {
+      const actionFailure = validateActionFileConventions(
+        pluginPath,
+        pluginId,
+        manifest,
+        relEntry,
+        abs,
+        manifestView
+      );
+      if (actionFailure) return { ok: false, failure: actionFailure };
+    }
+    let discoveredKinds;
+    if (kind === "provider") {
+      const kindsResult = discoverProviderKinds(
+        pluginPath,
+        pluginId,
+        manifest,
+        relEntry,
+        (data) => {
+          const v = this.#options.validators.validate("extension-provider-kind", data);
+          if (v.ok) return { ok: true, errors: "" };
+          return { ok: false, errors: v.errors };
+        }
+      );
+      if (!kindsResult.ok) return { ok: false, failure: kindsResult.failure };
+      if (Object.keys(kindsResult.kinds).length > 0) discoveredKinds = kindsResult.kinds;
+    }
+    const instance = { ...exported, pluginId, id: pathId2, kind };
+    if (kind === "formatter") instance["formatId"] = pathId2;
+    if (kind === "provider" && discoveredKinds) {
+      const inlineKinds = isRecord(exported["kinds"]) ? exported["kinds"] : {};
+      instance["kinds"] = { ...inlineKinds, ...discoveredKinds };
+    }
     return { ok: true, extension: {
       kind,
-      id: exported["id"],
-      pluginId: manifest.id,
+      id: pathId2,
+      pluginId,
       version: exported["version"],
       entryPath: abs,
       module: mod,
@@ -8281,11 +8523,64 @@ var PluginLoader = class {
     } };
   }
 };
+var KIND_DIR_NAMES = [
+  "providers",
+  "extractors",
+  "analyzers",
+  "actions",
+  "formatters",
+  "hooks"
+];
+var INDEX_CANDIDATES = [
+  "index.js",
+  "index.mjs",
+  "index.ts"
+];
+function discoverExtensionEntries(pluginPath) {
+  const out = [];
+  for (const kindDir of KIND_DIR_NAMES) {
+    collectKindEntries(pluginPath, kindDir, out);
+  }
+  return out;
+}
+function collectKindEntries(pluginPath, kindDir, out) {
+  const kindAbs = resolve16(pluginPath, kindDir);
+  if (!existsSync12(kindAbs)) return;
+  let entries;
+  try {
+    entries = readdirSync4(kindAbs);
+  } catch {
+    return;
+  }
+  entries.sort();
+  for (const entry of entries) {
+    if (entry.startsWith(".")) continue;
+    const entryAbs = resolve16(kindAbs, entry);
+    if (!isDirectorySafe2(entryAbs)) continue;
+    const candidate = findIndexCandidate(entryAbs);
+    if (candidate !== null) {
+      out.push(`${kindDir}/${entry}/${candidate}`);
+    }
+  }
+}
+function isDirectorySafe2(path) {
+  try {
+    return statSync2(path).isDirectory();
+  } catch {
+    return false;
+  }
+}
+function findIndexCandidate(entryAbs) {
+  for (const candidate of INDEX_CANDIDATES) {
+    if (existsSync12(resolve16(entryAbs, candidate))) return candidate;
+  }
+  return null;
+}
 function installedSpecVersion() {
   const require2 = createRequire5(import.meta.url);
   const indexPath = require2.resolve("@skill-map/spec/index.json");
   const pkgPath = resolve16(indexPath, "..", "package.json");
-  const pkg = JSON.parse(readFileSync11(pkgPath, "utf8"));
+  const pkg = JSON.parse(readFileSync12(pkgPath, "utf8"));
   return pkg.version;
 }
 
@@ -8382,11 +8677,11 @@ async function buildEnabledResolver(ctx) {
 
 // kernel/scan/walk-content.ts
 import { readFile, readdir, lstat } from "fs/promises";
-import { join as join8, relative as relative2, sep as sep2 } from "path";
+import { join as join9, relative as relative2, sep as sep2 } from "path";
 
 // kernel/scan/ignore.ts
-import { existsSync as existsSync12, readFileSync as readFileSync12 } from "fs";
-import { dirname as dirname9, resolve as resolve17 } from "path";
+import { existsSync as existsSync13, readFileSync as readFileSync13 } from "fs";
+import { dirname as dirname10, resolve as resolve17 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import ignoreFactory from "ignore";
 function buildIgnoreFilter(opts = {}) {
@@ -8416,9 +8711,9 @@ function loadBundledIgnoreText() {
 }
 function readIgnoreFileText(scopeRoot) {
   const path = resolve17(scopeRoot, ".skillmapignore");
-  if (!existsSync12(path)) return void 0;
+  if (!existsSync13(path)) return void 0;
   try {
-    return readFileSync12(path, "utf8");
+    return readFileSync13(path, "utf8");
   } catch {
     return void 0;
   }
@@ -8442,7 +8737,7 @@ function loadDefaultsText() {
   return cachedDefaults;
 }
 function readDefaultsFromDisk() {
-  const here = dirname9(fileURLToPath2(import.meta.url));
+  const here = dirname10(fileURLToPath2(import.meta.url));
   const candidates = [
     resolve17(here, "../../config/defaults/skillmapignore"),
     // src/kernel/scan/ → src/config/defaults/
@@ -8451,9 +8746,9 @@ function readDefaultsFromDisk() {
     resolve17(here, "config/defaults/skillmapignore")
   ];
   for (const candidate of candidates) {
-    if (existsSync12(candidate)) {
+    if (existsSync13(candidate)) {
       try {
-        return readFileSync12(candidate, "utf8");
+        return readFileSync13(candidate, "utf8");
       } catch {
       }
     }
@@ -8461,7 +8756,7 @@ function readDefaultsFromDisk() {
   return "";
 }
 
-// built-in-plugins/parsers/frontmatter-yaml/index.ts
+// plugins/core/parsers/frontmatter-yaml/index.ts
 import yaml3 from "js-yaml";
 var FRONTMATTER_RE = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/;
 var frontmatterYamlParser = {
@@ -8496,7 +8791,7 @@ function sanitiseParseErrorMessage(err) {
   return raw.replace(/[-]+/g, " ").replace(/\s+/g, " ").trim();
 }
 
-// built-in-plugins/parsers/plain/index.ts
+// plugins/core/parsers/plain/index.ts
 var plainParser = {
   id: "plain",
   parse(raw, _path) {
@@ -8559,7 +8854,7 @@ async function* walkRoot(root, current, filter, extensions) {
   }
   for (const entry of entries) {
     const name = entry.name;
-    const full = join8(current, name);
+    const full = join9(current, name);
     const rel = relative2(root, full).split(sep2).join("/");
     if (filter.ignores(rel)) continue;
     if (entry.isSymbolicLink()) continue;
@@ -8605,7 +8900,7 @@ function resolveProviderWalk(provider) {
 // kernel/extensions/collect-view-contributions.ts
 function collectViewContributions(pluginId, extensionId, instance, out, options = {}) {
   if (typeof instance !== "object" || instance === null) return;
-  const raw = instance["viewContributions"];
+  const raw = instance["ui"];
   if (typeof raw !== "object" || raw === null) return;
   const exclude = options.excludeQualifiedIds;
   for (const [contributionId, value] of Object.entries(raw)) {
@@ -8649,6 +8944,7 @@ function bucketLoaded(loaded, bundle) {
       pluginId: ext.pluginId,
       kind: ext.kind,
       version: ext.version,
+      description: instance.description ?? "",
       ...ext.entryPath ? { entry: ext.entryPath } : {}
     });
     collectAnnotationContributions(ext.pluginId, instance, bundle.annotationContributions);
@@ -8656,21 +8952,25 @@ function bucketLoaded(loaded, bundle) {
   }
 }
 function collectAnnotationContributions(pluginId, instance, out) {
-  if (typeof instance !== "object" || instance === null) return;
-  const raw = instance["annotationContributions"];
-  if (typeof raw !== "object" || raw === null) return;
-  for (const [key, value] of Object.entries(raw)) {
-    if (typeof value !== "object" || value === null) continue;
-    const entry = value;
-    if (typeof entry.schema !== "object" || entry.schema === null) continue;
-    out.push({
-      pluginId,
-      key,
-      location: entry.location ?? "namespaced",
-      ownership: entry.ownership ?? "shared",
-      schema: entry.schema
-    });
-  }
+  const row = tryReadAnnotationRow(pluginId, instance);
+  if (row !== null) out.push(row);
+}
+function tryReadAnnotationRow(pluginId, instance) {
+  if (typeof instance !== "object" || instance === null) return null;
+  const inst = instance;
+  const raw = inst["annotation"];
+  if (typeof raw !== "object" || raw === null) return null;
+  const entry = raw;
+  if (typeof entry.schema !== "object" || entry.schema === null) return null;
+  const extId = inst["id"];
+  if (typeof extId !== "string" || extId.length === 0) return null;
+  return {
+    pluginId,
+    key: extId,
+    location: entry.location ?? "namespaced",
+    ownership: entry.ownership ?? "shared",
+    schema: entry.schema
+  };
 }
 function isExtensionInstance(v) {
   return typeof v === "object" && v !== null && typeof v["id"] === "string" && typeof v["kind"] === "string" && typeof v["version"] === "string";
@@ -8821,7 +9121,7 @@ function collectRegisteredContributionKeys(composed) {
   const keys = /* @__PURE__ */ new Set();
   if (!composed) return keys;
   for (const ext of [...composed.extractors, ...composed.analyzers]) {
-    const raw = ext.viewContributions;
+    const raw = ext.ui;
     if (typeof raw !== "object" || raw === null) continue;
     for (const [contributionId, value] of Object.entries(raw)) {
       if (typeof value !== "object" || value === null) continue;
@@ -9162,7 +9462,7 @@ function trimRedundantPath(message, primary) {
 }
 
 // cli/commands/config.ts
-import { existsSync as existsSync13 } from "fs";
+import { existsSync as existsSync14 } from "fs";
 import { Command as Command4, Option as Option4 } from "clipanion";
 
 // cli/util/path-display.ts
@@ -9690,7 +9990,7 @@ var ConfigResetCommand = class extends SmCommand {
     const path = targetSettingsPath2(target, ctx.cwd);
     const ansi = this.ansiFor("stdout");
     const okGlyph = ansi.green("\u2713");
-    if (!existsSync13(path)) {
+    if (!existsSync14(path)) {
       this.printer.data(
         tx(CONFIG_TEXTS.unsetNoOverride, {
           glyph: okGlyph,
@@ -9765,16 +10065,16 @@ var CONFIG_COMMANDS = [
 ];
 
 // cli/commands/conformance.ts
-import { existsSync as existsSync16, readFileSync as readFileSync14 } from "fs";
-import { dirname as dirname11, resolve as resolve21 } from "path";
+import { existsSync as existsSync17, readFileSync as readFileSync15 } from "fs";
+import { dirname as dirname12, resolve as resolve21 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 import { Command as Command5, Option as Option5 } from "clipanion";
 
 // conformance/index.ts
 import { spawnSync as spawnSync2 } from "child_process";
-import { cpSync, existsSync as existsSync14, mkdtempSync, readdirSync as readdirSync4, readFileSync as readFileSync13, rmSync, statSync } from "fs";
+import { cpSync, existsSync as existsSync15, mkdtempSync, readdirSync as readdirSync5, readFileSync as readFileSync14, rmSync, statSync as statSync3 } from "fs";
 import { tmpdir } from "os";
-import { isAbsolute as isAbsolute5, join as join9, relative as relative3, resolve as resolve19 } from "path";
+import { isAbsolute as isAbsolute5, join as join10, relative as relative3, resolve as resolve19 } from "path";
 
 // conformance/i18n/runner.texts.ts
 var CONFORMANCE_RUNNER_TEXTS = {
@@ -9808,11 +10108,11 @@ function disableEnv(setup) {
   return env;
 }
 function runConformanceCase(options) {
-  const raw = readFileSync13(options.casePath, "utf8");
+  const raw = readFileSync14(options.casePath, "utf8");
   const c = JSON.parse(raw);
-  const fixturesRoot = options.fixturesRoot ?? join9(options.specRoot, "conformance", "fixtures");
+  const fixturesRoot = options.fixturesRoot ?? join10(options.specRoot, "conformance", "fixtures");
   const safeId = c.id.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 32);
-  const scope = mkdtempSync(join9(tmpdir(), `sm-conformance-${safeId}-`));
+  const scope = mkdtempSync(join10(tmpdir(), `sm-conformance-${safeId}-`));
   const setupEnv = disableEnv(c.setup);
   try {
     const priorFailure = runPriorScansSetup(c, options, scope, fixturesRoot, setupEnv);
@@ -9882,11 +10182,11 @@ function runPriorScansSetup(c, options, scope, fixturesRoot, setupEnv) {
 }
 function replaceFixture(scope, fixturesRoot, fixture) {
   assertContained2(fixturesRoot, fixture, "fixture");
-  for (const entry of readdirSync4(scope)) {
+  for (const entry of readdirSync5(scope)) {
     if (entry === KERNEL_SKILL_MAP_DIR) continue;
-    rmSync(join9(scope, entry), { recursive: true, force: true });
+    rmSync(join10(scope, entry), { recursive: true, force: true });
   }
-  const src = join9(fixturesRoot, fixture);
+  const src = join10(fixturesRoot, fixture);
   cpSync(src, scope, { recursive: true });
 }
 function assertContained2(root, rel, label) {
@@ -9923,7 +10223,7 @@ function evaluateAssertion(a, ctx) {
         return { ok: false, type: a.type, reason: formatErrorMessage(err) };
       }
       const abs = resolve19(ctx.scope, a.path);
-      return existsSync14(abs) ? { ok: true, type: a.type } : {
+      return existsSync15(abs) ? { ok: true, type: a.type } : {
         ok: false,
         type: a.type,
         reason: tx(CONFORMANCE_RUNNER_TEXTS.fileNotFound, { path: a.path })
@@ -9936,17 +10236,17 @@ function evaluateAssertion(a, ctx) {
       } catch (err) {
         return { ok: false, type: a.type, reason: formatErrorMessage(err) };
       }
-      const fixturePath = join9(ctx.fixturesRoot, a.fixture);
+      const fixturePath = join10(ctx.fixturesRoot, a.fixture);
       const targetPath = resolve19(ctx.scope, a.path);
-      if (!existsSync14(targetPath)) {
+      if (!existsSync15(targetPath)) {
         return {
           ok: false,
           type: a.type,
           reason: tx(CONFORMANCE_RUNNER_TEXTS.targetNotFound, { path: a.path })
         };
       }
-      const needle = readFileSync13(fixturePath);
-      const haystack = readFileSync13(targetPath);
+      const needle = readFileSync14(fixturePath);
+      const haystack = readFileSync14(targetPath);
       return haystack.includes(needle) ? { ok: true, type: a.type } : {
         ok: false,
         type: a.type,
@@ -10119,15 +10419,15 @@ var CONFORMANCE_TEXTS = {
 };
 
 // cli/util/conformance-scopes.ts
-import { existsSync as existsSync15, readdirSync as readdirSync5, statSync as statSync2 } from "fs";
-import { dirname as dirname10, resolve as resolve20 } from "path";
+import { existsSync as existsSync16, readdirSync as readdirSync6, statSync as statSync4 } from "fs";
+import { dirname as dirname11, resolve as resolve20 } from "path";
 import { createRequire as createRequire6 } from "module";
 import { fileURLToPath as fileURLToPath3 } from "url";
 function resolveSpecRoot4() {
   const require2 = createRequire6(import.meta.url);
   try {
     const indexPath = require2.resolve("@skill-map/spec/index.json");
-    return dirname10(indexPath);
+    return dirname11(indexPath);
   } catch {
     throw new Error(
       "@skill-map/spec not resolvable: ensure the workspace is linked or the package is installed."
@@ -10135,19 +10435,19 @@ function resolveSpecRoot4() {
   }
 }
 function resolveCliWorkspaceRoot() {
-  const here = dirname10(fileURLToPath3(import.meta.url));
+  const here = dirname11(fileURLToPath3(import.meta.url));
   let cursor = here;
   for (let depth = 0; depth < 6; depth += 1) {
-    const candidate = resolve20(cursor, "built-in-plugins", "providers");
-    if (existsSync15(candidate) && statSync2(candidate).isDirectory()) {
+    const candidate = resolve20(cursor, "plugins");
+    if (existsSync16(candidate) && statSync4(candidate).isDirectory()) {
       return cursor;
     }
-    const parent = dirname10(cursor);
+    const parent = dirname11(cursor);
     if (parent === cursor) break;
     cursor = parent;
   }
   throw new Error(
-    `sm conformance: built-in Provider conformance assets not found (expected a 'built-in-plugins/providers/' directory above ${here}). The bundled CLI may not yet copy the assets; run from the source workspace, or rebuild after enabling the asset-copy step.`
+    `sm conformance: built-in Provider conformance assets not found (expected a 'plugins/' directory above ${here}). The bundled CLI may not yet copy the assets; run from the source workspace, or rebuild after enabling the asset-copy step.`
   );
 }
 function collectProviderScopes(specRoot) {
@@ -10158,16 +10458,33 @@ function collectProviderScopes(specRoot) {
   } catch {
     return out;
   }
-  const providersRoot = resolve20(workspaceRoot, "built-in-plugins", "providers");
-  if (!existsSync15(providersRoot)) return out;
-  for (const entry of readdirSync5(providersRoot)) {
+  const pluginsRoot = resolve20(workspaceRoot, "plugins");
+  if (!existsSync16(pluginsRoot)) return out;
+  for (const bundleEntry of readdirSync6(pluginsRoot)) {
+    const bundleDir = resolve20(pluginsRoot, bundleEntry);
+    if (!isDir(bundleDir)) continue;
+    const providersRoot = resolve20(bundleDir, "providers");
+    if (!isDir(providersRoot)) continue;
+    collectBundleProviderScopes(providersRoot, specRoot, out);
+  }
+  return out;
+}
+function isDir(path) {
+  try {
+    return existsSync16(path) && statSync4(path).isDirectory();
+  } catch {
+    return false;
+  }
+}
+function collectBundleProviderScopes(providersRoot, specRoot, out) {
+  for (const entry of readdirSync6(providersRoot)) {
     const providerDir = resolve20(providersRoot, entry);
-    if (!statSync2(providerDir).isDirectory()) continue;
+    if (!isDir(providerDir)) continue;
     const conformanceDir = resolve20(providerDir, "conformance");
-    if (!existsSync15(conformanceDir)) continue;
+    if (!existsSync16(conformanceDir)) continue;
     const casesDir = resolve20(conformanceDir, "cases");
     const fixturesDir = resolve20(conformanceDir, "fixtures");
-    if (!existsSync15(casesDir) || !existsSync15(fixturesDir)) continue;
+    if (!existsSync16(casesDir) || !existsSync16(fixturesDir)) continue;
     out.push({
       id: `provider:${entry}`,
       kind: "provider",
@@ -10177,7 +10494,6 @@ function collectProviderScopes(specRoot) {
       specRoot
     });
   }
-  return out;
 }
 function specScope(specRoot) {
   return {
@@ -10206,8 +10522,8 @@ function selectConformanceScopes(scope) {
   return [match];
 }
 function listCaseFiles(scope) {
-  if (!existsSync15(scope.casesDir)) return [];
-  return readdirSync5(scope.casesDir).filter((entry) => entry.endsWith(".json")).sort().map((entry) => resolve20(scope.casesDir, entry));
+  if (!existsSync16(scope.casesDir)) return [];
+  return readdirSync6(scope.casesDir).filter((entry) => entry.endsWith(".json")).sort().map((entry) => resolve20(scope.casesDir, entry));
 }
 
 // cli/commands/conformance.ts
@@ -10221,12 +10537,12 @@ function formatAssertionFailureDetail(type, reason) {
   });
 }
 function resolveBinary() {
-  const here = dirname11(fileURLToPath4(import.meta.url));
+  const here = dirname12(fileURLToPath4(import.meta.url));
   let cursor = here;
   for (let depth = 0; depth < 6; depth += 1) {
     const candidate = resolve21(cursor, "bin", "sm.js");
-    if (existsSync16(candidate)) return candidate;
-    const parent = dirname11(cursor);
+    if (existsSync17(candidate)) return candidate;
+    const parent = dirname12(cursor);
     if (parent === cursor) break;
     cursor = parent;
   }
@@ -10291,7 +10607,7 @@ var ConformanceRunCommand = class extends SmCommand {
       return ExitCode.Error;
     }
     const binary = resolveBinary();
-    if (!existsSync16(binary)) {
+    if (!existsSync17(binary)) {
       if (this.json) {
         this.#emitJsonError(
           "internal",
@@ -10465,7 +10781,7 @@ function projectAssertionFailures(assertions) {
 }
 function readCaseId(casePath) {
   try {
-    const raw = readFileSync14(casePath, "utf8");
+    const raw = readFileSync15(casePath, "utf8");
     const parsed = JSON.parse(raw);
     if (typeof parsed.id === "string") return parsed.id;
   } catch {
@@ -10483,7 +10799,7 @@ function writeStreamSnippet(stream, header, text) {
 var CONFORMANCE_COMMANDS = [ConformanceRunCommand];
 
 // cli/commands/db/backup.ts
-import { dirname as dirname12, join as join10, resolve as resolve22 } from "path";
+import { dirname as dirname13, join as join11, resolve as resolve22 } from "path";
 import { Command as Command6, Option as Option6 } from "clipanion";
 
 // cli/i18n/db.texts.ts
@@ -10569,7 +10885,7 @@ var DbBackupCommand = class extends SmCommand {
     const exit = requireDbOrExit(path, this.context.stderr);
     if (exit !== null) return exit;
     const ts = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-    const outPath = this.out ? resolve22(this.out) : join10(dirname12(path), "backups", `${ts}.db`);
+    const outPath = this.out ? resolve22(this.out) : join11(dirname13(path), "backups", `${ts}.db`);
     await withSqlite({ databasePath: path, autoMigrate: false }, async (storage) => {
       storage.migrations.writeBackup(outPath);
     });
@@ -10586,7 +10902,7 @@ var DbBackupCommand = class extends SmCommand {
 
 // cli/commands/db/restore.ts
 import { chmod, copyFile, mkdir, rm } from "fs/promises";
-import { dirname as dirname13, resolve as resolve23 } from "path";
+import { dirname as dirname14, resolve as resolve23 } from "path";
 import { Command as Command7, Option as Option7 } from "clipanion";
 
 // cli/util/fs.ts
@@ -10669,7 +10985,7 @@ var DbRestoreCommand = class extends SmCommand {
         return ExitCode.Error;
       }
     }
-    await mkdir(dirname13(target), { recursive: true });
+    await mkdir(dirname14(target), { recursive: true });
     await copyFile(sourcePath, target);
     await chmodOwnerOnlyBestEffort(target);
     for (const sidecar of [`${target}-wal`, `${target}-shm`]) {
@@ -11018,7 +11334,7 @@ function formatSqlValue(value) {
 
 // cli/commands/db/migrate.ts
 import { mkdir as mkdir2 } from "fs/promises";
-import { dirname as dirname14 } from "path";
+import { dirname as dirname15 } from "path";
 import { Command as Command12, Option as Option11 } from "clipanion";
 
 // cli/i18n/option-validators.texts.ts
@@ -11105,7 +11421,7 @@ var DbMigrateCommand = class extends SmCommand {
       return ExitCode.Error;
     }
     const path = resolveDbPath({ db: this.db, ...defaultRuntimeContext() });
-    if (path !== ":memory:") await mkdir2(dirname14(path), { recursive: true });
+    if (path !== ":memory:") await mkdir2(dirname15(path), { recursive: true });
     const adapter = createSqliteStorage({
       databasePath: path,
       autoMigrate: false
@@ -11758,7 +12074,7 @@ var GraphCommand = class extends SmCommand {
 };
 
 // cli/commands/help.ts
-import { readFileSync as readFileSync15 } from "fs";
+import { readFileSync as readFileSync16 } from "fs";
 import { createRequire as createRequire7 } from "module";
 import { resolve as resolve25 } from "path";
 import { Command as Command15, Option as Option14 } from "clipanion";
@@ -11981,7 +12297,7 @@ function resolveSpecVersion() {
     const req = createRequire7(import.meta.url);
     const indexPath = req.resolve("@skill-map/spec/index.json");
     const pkgPath = resolve25(indexPath, "..", "package.json");
-    const pkg = JSON.parse(readFileSync15(pkgPath, "utf8"));
+    const pkg = JSON.parse(readFileSync16(pkgPath, "utf8"));
     return pkg.version;
   } catch {
     return "unknown";
@@ -12233,13 +12549,13 @@ function registeredVerbPaths(cli2) {
 // cli/commands/hooks.ts
 import {
   chmodSync,
-  existsSync as existsSync17,
+  existsSync as existsSync18,
   mkdirSync as mkdirSync5,
-  readFileSync as readFileSync16,
-  statSync as statSync3,
+  readFileSync as readFileSync17,
+  statSync as statSync5,
   writeFileSync as writeFileSync2
 } from "fs";
-import { dirname as dirname15, resolve as resolve26 } from "path";
+import { dirname as dirname16, resolve as resolve26 } from "path";
 import { Command as Command16, Option as Option15 } from "clipanion";
 
 // cli/i18n/hooks.texts.ts
@@ -12332,7 +12648,7 @@ var HooksInstallCommand = class extends SmCommand {
     }
     const hooksDir = resolve26(repoRoot, ".git", "hooks");
     const hookPath = resolve26(hooksDir, "pre-commit");
-    const existing = existsSync17(hookPath) ? readFileSync16(hookPath, "utf8") : null;
+    const existing = existsSync18(hookPath) ? readFileSync17(hookPath, "utf8") : null;
     const planned2 = computePlannedHookContent(existing);
     if (planned2.kind === "already-installed") {
       this.printer.info(tx(HOOKS_TEXTS.alreadyInstalled, { glyph: okGlyph, hookPath }));
@@ -12358,7 +12674,7 @@ var HooksInstallCommand = class extends SmCommand {
       return ExitCode.Ok;
     }
     try {
-      if (!existsSync17(hooksDir)) mkdirSync5(hooksDir, { recursive: true });
+      if (!existsSync18(hooksDir)) mkdirSync5(hooksDir, { recursive: true });
       writeFileSync2(hookPath, planned2.content, { encoding: "utf8" });
       ensureExecutableBit(hookPath);
     } catch (err) {
@@ -12389,8 +12705,8 @@ var HooksInstallCommand = class extends SmCommand {
 function findGitRepoRoot(cwd) {
   let current = cwd;
   while (true) {
-    if (existsSync17(resolve26(current, ".git"))) return current;
-    const parent = dirname15(current);
+    if (existsSync18(resolve26(current, ".git"))) return current;
+    const parent = dirname16(current);
     if (parent === current) return null;
     current = parent;
   }
@@ -12404,18 +12720,18 @@ function computePlannedHookContent(existing) {
   return { kind: "chained", content: existing + sep6 + "\n" + SKILL_MAP_BLOCK };
 }
 function ensureExecutableBit(path) {
-  const mode = statSync3(path).mode;
+  const mode = statSync5(path).mode;
   chmodSync(path, mode | 73);
 }
 var HOOKS_COMMANDS = [HooksInstallCommand];
 
 // cli/commands/init.ts
 import { mkdir as mkdir3, readFile as readFile2, writeFile } from "fs/promises";
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 import { Command as Command17, Option as Option16 } from "clipanion";
 
 // kernel/orchestrator/index.ts
-import { existsSync as existsSync20, statSync as statSync5 } from "fs";
+import { existsSync as existsSync21, statSync as statSync7 } from "fs";
 import { Tiktoken as Tiktoken2 } from "js-tiktoken/lite";
 import cl100k_base from "js-tiktoken/ranks/cl100k_base";
 
@@ -12533,7 +12849,7 @@ async function runExtractorsForNode(opts) {
 }
 function readDeclaredContributions(extension) {
   const out = /* @__PURE__ */ new Map();
-  const raw = extension.viewContributions;
+  const raw = extension.ui;
   if (typeof raw !== "object" || raw === null) return out;
   for (const [id, value] of Object.entries(raw)) {
     if (typeof value !== "object" || value === null) continue;
@@ -12554,11 +12870,13 @@ function emitExtensionError(emitter, qualifiedId2, nodePath, data) {
   );
 }
 function buildExtractorContext(extractor, node, body, frontmatter, emitLink, enrichNode, emitContribution, store) {
-  const scope = extractor.scope;
+  const scope = extractor.scope ?? "both";
+  const settings = extractor.resolvedSettings ?? {};
   return {
     node,
     body: scope === "frontmatter" ? "" : body,
     frontmatter: scope === "body" ? {} : frontmatter,
+    settings,
     emitLink,
     enrichNode,
     emitContribution,
@@ -12566,25 +12884,26 @@ function buildExtractorContext(extractor, node, body, frontmatter, emitLink, enr
   };
 }
 function validateLink(extractor, link2, emitter) {
-  if (!extractor.emitsLinkKinds.includes(link2.kind)) {
+  const knownKinds = ["invokes", "references", "mentions", "supersedes"];
+  if (!knownKinds.includes(link2.kind)) {
     const qualifiedId2 = `${extractor.pluginId}/${extractor.id}`;
     emitter.emit(
       makeEvent("extension.error", {
         kind: "link-kind-not-declared",
         extensionId: qualifiedId2,
         linkKind: link2.kind,
-        declaredKinds: extractor.emitsLinkKinds,
+        declaredKinds: knownKinds,
         link: { source: link2.source, target: link2.target, kind: link2.kind },
         message: tx(ORCHESTRATOR_TEXTS.extensionErrorLinkKindNotDeclared, {
           extractorId: qualifiedId2,
           linkKind: link2.kind,
-          declaredKinds: extractor.emitsLinkKinds.join(", ")
+          declaredKinds: knownKinds.join(", ")
         })
       })
     );
     return null;
   }
-  const confidence = link2.confidence ?? extractor.defaultConfidence;
+  const confidence = link2.confidence ?? "medium";
   return { ...link2, confidence };
 }
 function dedupeLinks(links) {
@@ -12642,7 +12961,7 @@ async function runAnalyzers(analyzers, nodes, internalLinks, orphanSidecars, sid
   const issues = [];
   const contributions = [];
   const validators = loadSchemaValidators();
-  validateRecommendedActions(analyzers, registeredActionIds, emitter);
+  void registeredActionIds;
   const analyzerOrphans = orphanSidecars.map((o) => ({
     relativePath: o.relativePath,
     expectedMdPath: o.expectedMdPath
@@ -12714,27 +13033,6 @@ async function runAnalyzers(analyzers, nodes, internalLinks, orphanSidecars, sid
   }
   return { issues, contributions };
 }
-function validateRecommendedActions(analyzers, registeredActionIds, emitter) {
-  for (const analyzer of analyzers) {
-    const refs = analyzer.recommendedActions;
-    if (refs === void 0 || refs.length === 0) continue;
-    const analyzerId = qualifiedExtensionId(analyzer.pluginId, analyzer.id);
-    for (const actionId of refs) {
-      if (registeredActionIds.has(actionId)) continue;
-      emitter.emit(
-        makeEvent("extension.error", {
-          kind: "recommended-action-missing",
-          extensionId: analyzerId,
-          actionId,
-          message: tx(ORCHESTRATOR_TEXTS.extensionErrorRecommendedActionMissing, {
-            analyzerId,
-            actionId
-          })
-        })
-      );
-    }
-  }
-}
 function validateIssue(analyzer, issue, emitter) {
   const severity = issue.severity;
   if (severity !== "error" && severity !== "warn" && severity !== "info") {
@@ -12812,9 +13110,15 @@ function originatingNodeOf(link2, priorNodePaths) {
   return link2.source;
 }
 function computeCacheDecision(opts) {
-  const applicableExtractors = opts.extractors.filter(
-    (ex) => ex.applicableKinds === void 0 || ex.applicableKinds.includes(opts.kind)
-  );
+  const applicableExtractors = opts.extractors.filter((ex) => {
+    const kinds = ex.precondition?.kind;
+    if (!kinds || kinds.length === 0) return true;
+    return kinds.some((qualified) => {
+      const slashIdx = qualified.indexOf("/");
+      const kindOnly = slashIdx === -1 ? qualified : qualified.slice(slashIdx + 1);
+      return kindOnly === opts.kind;
+    });
+  });
   const applicableQualifiedIds = new Set(
     applicableExtractors.map((ex) => qualifiedExtensionId(ex.pluginId, ex.id))
   );
@@ -13005,6 +13309,7 @@ function flagAmbiguousRenames(opts) {
 function flagOrphans(opts) {
   for (const fromPath of opts.deletedPaths) {
     if (opts.claimedDeleted.has(fromPath)) continue;
+    if (opts.silenced?.(fromPath)) continue;
     opts.issues.push({
       analyzerId: "orphan",
       severity: "info",
@@ -13014,7 +13319,7 @@ function flagOrphans(opts) {
     });
   }
 }
-function detectRenamesAndOrphans(prior, current, issues) {
+function detectRenamesAndOrphans(prior, current, issues, silenced) {
   const priorByPath = /* @__PURE__ */ new Map();
   for (const n of prior.nodes) priorByPath.set(n.path, n);
   const currentByPath = /* @__PURE__ */ new Map();
@@ -13048,7 +13353,12 @@ function detectRenamesAndOrphans(prior, current, issues) {
     issues
   }));
   flagAmbiguousRenames({ newPaths, candidatesByNew, claimedDeleted, claimedNew, issues });
-  flagOrphans({ deletedPaths, claimedDeleted, issues });
+  flagOrphans({
+    deletedPaths,
+    claimedDeleted,
+    issues,
+    ...silenced ? { silenced } : {}
+  });
   return ops;
 }
 
@@ -13063,8 +13373,8 @@ function computeDriftStatus(args2) {
 }
 
 // kernel/sidecar/discover-orphans.ts
-import { existsSync as existsSync18, readdirSync as readdirSync6, statSync as statSync4 } from "fs";
-import { join as join11, relative as relative4, sep as sep3 } from "path";
+import { existsSync as existsSync19, readdirSync as readdirSync7, statSync as statSync6 } from "fs";
+import { join as join12, relative as relative4, sep as sep3 } from "path";
 function discoverOrphanSidecars(roots, shouldSkip) {
   const out = [];
   for (const root of roots) {
@@ -13075,12 +13385,12 @@ function discoverOrphanSidecars(roots, shouldSkip) {
 function walk(root, current, shouldSkip, out) {
   let entries;
   try {
-    entries = readdirSync6(current, { withFileTypes: true, encoding: "utf8" });
+    entries = readdirSync7(current, { withFileTypes: true, encoding: "utf8" });
   } catch {
     return;
   }
   for (const entry of entries) {
-    const full = join11(current, entry.name);
+    const full = join12(current, entry.name);
     const rel = relative4(root, full).split(sep3).join("/");
     if (shouldSkip(rel)) continue;
     if (entry.isSymbolicLink()) continue;
@@ -13091,13 +13401,13 @@ function walk(root, current, shouldSkip, out) {
     if (!entry.isFile()) continue;
     if (!entry.name.endsWith(".sm")) continue;
     const expectedMd = `${full.slice(0, -".sm".length)}.md`;
-    if (existsSync18(expectedMd) && safeIsFile(expectedMd)) continue;
+    if (existsSync19(expectedMd) && safeIsFile(expectedMd)) continue;
     out.push({ sidecarPath: full, relativePath: rel, expectedMdPath: expectedMd });
   }
 }
 function safeIsFile(path) {
   try {
-    return statSync4(path).isFile();
+    return statSync6(path).isFile();
   } catch {
     return false;
   }
@@ -13105,7 +13415,7 @@ function safeIsFile(path) {
 
 // kernel/orchestrator/node-build.ts
 import { createHash } from "crypto";
-import { existsSync as existsSync19 } from "fs";
+import { existsSync as existsSync20 } from "fs";
 import { isAbsolute as isAbsolute6, resolve as resolvePath } from "path";
 import "js-tiktoken/lite";
 import yaml4 from "js-yaml";
@@ -13269,11 +13579,11 @@ function resolveSidecarOverlay(relativePath2, nodePathForIssue, roots, liveBodyH
 }
 function resolveAbsoluteMdPath(relativePath2, roots) {
   if (isAbsolute6(relativePath2)) {
-    return existsSync19(relativePath2) ? relativePath2 : null;
+    return existsSync20(relativePath2) ? relativePath2 : null;
   }
   for (const root of roots) {
     const candidate = resolvePath(root, relativePath2);
-    if (existsSync19(candidate)) return candidate;
+    if (existsSync20(candidate)) return candidate;
   }
   return null;
 }
@@ -13386,6 +13696,9 @@ function buildWalkContext(opts) {
 async function processRawNode(raw, provider, wctx, accum, claimedPaths, nextIndex) {
   const bodyHash = sha256(raw.body);
   const frontmatterHash = sha256(canonicalFrontmatter(raw.frontmatter, raw.frontmatterRaw));
+  if (Array.isArray(provider.roots) && provider.roots.length > 0) {
+    if (!matchesAnyRoot(raw.path, provider.roots)) return false;
+  }
   const kind = provider.classify(raw.path, raw.frontmatter);
   if (kind === null) {
     return false;
@@ -13554,6 +13867,26 @@ function recordExtractorRuns(nodePath, ctx, accum) {
     });
   }
 }
+function matchesAnyRoot(relPath, roots) {
+  for (const r of roots) {
+    if (matchesOneRoot(relPath, r)) return true;
+  }
+  return false;
+}
+function matchesOneRoot(relPath, pattern) {
+  if (pattern.endsWith("/**")) return matchesDeepGlob(relPath, pattern.slice(0, -3));
+  if (pattern.endsWith("/*")) return matchesShallowGlob(relPath, pattern.slice(0, -2));
+  return relPath === pattern;
+}
+function matchesDeepGlob(relPath, prefix) {
+  if (prefix.length === 0) return true;
+  return relPath === prefix || relPath.startsWith(`${prefix}/`);
+}
+function matchesShallowGlob(relPath, prefix) {
+  if (!relPath.startsWith(`${prefix}/`)) return false;
+  const tail = relPath.slice(prefix.length + 1);
+  return tail.length > 0 && !tail.includes("/");
+}
 
 // kernel/orchestrator/index.ts
 var SCANNED_BY = {
@@ -13622,7 +13955,8 @@ async function runScanInternal(_kernel, options) {
   mergeAnalyzerEmissions(walked, analyzerResult, exts.analyzers);
   const issues = analyzerResult.issues;
   for (const issue of walked.frontmatterIssues) issues.push(issue);
-  const renameOps = prior ? detectRenamesAndOrphans(prior, walked.nodes, issues) : [];
+  const silenced = options.ignoreFilter ? (path) => options.ignoreFilter.ignores(path) : void 0;
+  const renameOps = prior ? detectRenamesAndOrphans(prior, walked.nodes, issues, silenced) : [];
   const stats = buildScanStats(walked, issues, start);
   const scanCompletedEvent = makeEvent("scan.completed", { stats });
   emitter.emit(scanCompletedEvent);
@@ -13665,7 +13999,7 @@ async function dispatchExtractorCompleted(extractors, emitter, hookDispatcher) {
 function mergeAnalyzerEmissions(walked, analyzerResult, analyzers) {
   for (const c of analyzerResult.contributions) walked.contributions.push(c);
   for (const analyzer of analyzers ?? []) {
-    if (analyzer.viewContributions === void 0) continue;
+    if (analyzer.ui === void 0) continue;
     for (const node of walked.nodes) {
       walked.freshlyRunTuples.add(`${analyzer.pluginId}\0${analyzer.id}\0${node.path}`);
     }
@@ -13712,7 +14046,7 @@ function validateRoots(roots) {
     throw new Error(ORCHESTRATOR_TEXTS.runScanRootEmptyArray);
   }
   for (const root of roots) {
-    if (!existsSync20(root) || !statSync5(root).isDirectory()) {
+    if (!existsSync21(root) || !statSync7(root).isDirectory()) {
       throw new Error(tx(ORCHESTRATOR_TEXTS.runScanRootMissing, { root }));
     }
   }
@@ -13940,16 +14274,16 @@ function createKernel() {
 }
 
 // kernel/jobs/orphan-files.ts
-import { readdirSync as readdirSync7, statSync as statSync6 } from "fs";
-import { join as join12, resolve as resolve28 } from "path";
+import { readdirSync as readdirSync8, statSync as statSync8 } from "fs";
+import { join as join13, resolve as resolve28 } from "path";
 function findOrphanJobFiles(jobsDir, referencedPaths) {
   let entries;
   try {
-    const stat2 = statSync6(jobsDir);
+    const stat2 = statSync8(jobsDir);
     if (!stat2.isDirectory()) {
       return { orphanFilePaths: [], referencedCount: referencedPaths.size };
     }
-    entries = readdirSync7(jobsDir, { withFileTypes: true });
+    entries = readdirSync8(jobsDir, { withFileTypes: true });
   } catch {
     return { orphanFilePaths: [], referencedCount: referencedPaths.size };
   }
@@ -13959,7 +14293,7 @@ function findOrphanJobFiles(jobsDir, referencedPaths) {
     if (!entry.isFile()) continue;
     const name = entry.name;
     if (!name.endsWith(".md")) continue;
-    const abs = resolve28(join12(jobsDir, name));
+    const abs = resolve28(join13(jobsDir, name));
     if (!referencedPaths.has(abs)) orphans.push(abs);
   }
   orphans.sort();
@@ -14033,9 +14367,9 @@ var SCAN_RUNNER_TEXTS = {
 };
 
 // core/runtime/reference-paths-walker.ts
-import { readdirSync as readdirSync8, statSync as statSync7 } from "fs";
+import { readdirSync as readdirSync9, statSync as statSync9 } from "fs";
 import { homedir as osHomedir2 } from "os";
-import { isAbsolute as isAbsolute7, join as join13, resolve as resolve29 } from "path";
+import { isAbsolute as isAbsolute7, join as join14, resolve as resolve29 } from "path";
 var REFERENCE_WALK_MAX_FILES = 5e4;
 var SKIPPED_DIR_NAMES = /* @__PURE__ */ new Set([
   "node_modules",
@@ -14043,7 +14377,7 @@ var SKIPPED_DIR_NAMES = /* @__PURE__ */ new Set([
   SKILL_MAP_DIR
 ]);
 function resolveScanPath(raw, cwd) {
-  if (raw.startsWith("~/")) return resolve29(join13(osHomedir2(), raw.slice(2)));
+  if (raw.startsWith("~/")) return resolve29(join14(osHomedir2(), raw.slice(2)));
   if (raw === "~") return resolve29(osHomedir2());
   if (isAbsolute7(raw)) return resolve29(raw);
   return resolve29(cwd, raw);
@@ -14068,14 +14402,14 @@ function walkInto(dir, out) {
   if (out.size >= REFERENCE_WALK_MAX_FILES) return true;
   let entries;
   try {
-    entries = readdirSync8(dir, { withFileTypes: true });
+    entries = readdirSync9(dir, { withFileTypes: true });
   } catch {
     return false;
   }
   for (const entry of entries) {
     if (out.size >= REFERENCE_WALK_MAX_FILES) return true;
     if (entry.isSymbolicLink()) continue;
-    const full = join13(dir, entry.name);
+    const full = join14(dir, entry.name);
     if (entry.isDirectory()) {
       if (SKIPPED_DIR_NAMES.has(entry.name)) continue;
       if (walkInto(full, out)) return true;
@@ -14087,7 +14421,7 @@ function walkInto(dir, out) {
 }
 function safeStat(path) {
   try {
-    return statSync7(path);
+    return statSync9(path);
   } catch {
     return null;
   }
@@ -14399,7 +14733,7 @@ var InitCommand = class extends SmCommand {
   async run() {
     const ctx = defaultRuntimeContext();
     const scopeRoot = ctx.cwd;
-    const skillMapDir = join14(scopeRoot, SKILL_MAP_DIR);
+    const skillMapDir = join15(scopeRoot, SKILL_MAP_DIR);
     const settingsPath = defaultSettingsPath(scopeRoot);
     const localPath = defaultLocalSettingsPath(scopeRoot);
     const ignorePath = defaultIgnoreFilePath(scopeRoot);
@@ -14439,13 +14773,13 @@ var InitCommand = class extends SmCommand {
       writeFileAtomicExclusive(localPath, "{}\n");
     }
     if (!await pathExists(ignorePath) || this.force) {
-      writeFileAtomicExclusive(ignorePath, loadBundledIgnoreText());
+      writeFileAtomicExclusive(ignorePath, loadBundledIgnoreText(), 420);
     }
     const ansi = this.ansiFor("stdout");
     const okGlyph = ansi.green("\u2713");
     const updated = await ensureGitignoreEntries(scopeRoot, GITIGNORE_ENTRIES);
     if (updated) {
-      const gitignorePath = join14(scopeRoot, ".gitignore");
+      const gitignorePath = join15(scopeRoot, ".gitignore");
       printer.info(
         GITIGNORE_ENTRIES.length === 1 ? tx(INIT_TEXTS.gitignoreUpdatedSingular, { glyph: okGlyph, path: gitignorePath }) : tx(INIT_TEXTS.gitignoreUpdatedPlural, {
           glyph: okGlyph,
@@ -14484,7 +14818,7 @@ async function dryRunFileMessage(path) {
 }
 async function writeDryRunGitignorePlan(printer, scopeRoot) {
   const wouldAdd = await previewGitignoreEntries(scopeRoot, GITIGNORE_ENTRIES);
-  const gitignorePath = join14(scopeRoot, ".gitignore");
+  const gitignorePath = join15(scopeRoot, ".gitignore");
   if (wouldAdd.length === 0) {
     printer.info(tx(INIT_TEXTS.dryRunWouldLeaveGitignoreUnchanged, { path: gitignorePath }));
   } else if (wouldAdd.length === 1) {
@@ -14559,7 +14893,7 @@ async function runFirstScan(scopeRoot, strict, printer, stderr, ansi) {
   return hasErrors ? ExitCode.Issues : ExitCode.Ok;
 }
 async function previewGitignoreEntries(scopeRoot, entries) {
-  const path = join14(scopeRoot, ".gitignore");
+  const path = join15(scopeRoot, ".gitignore");
   const body = await pathExists(path) ? await readFile2(path, "utf8") : "";
   const present = new Set(
     body.split("\n").map((line) => line.trim()).filter((line) => line.length > 0 && !line.startsWith("#"))
@@ -14567,7 +14901,7 @@ async function previewGitignoreEntries(scopeRoot, entries) {
   return entries.filter((entry) => !present.has(entry));
 }
 async function ensureGitignoreEntries(scopeRoot, entries) {
-  const path = join14(scopeRoot, ".gitignore");
+  const path = join15(scopeRoot, ".gitignore");
   let body = "";
   if (await pathExists(path)) {
     body = await readFile2(path, "utf8");
@@ -16222,7 +16556,7 @@ var PLUGINS_TEXTS = {
    * Success block printed after scaffolding. Follows the no-em-dash rule
    * across every line.
    */
-  createSuccess: "Created {{targetDir}}\nNext:\n  - Edit {{pluginId}}/extensions/extractor.js (the extract() body)\n  - Run sm scan to see the contribution surface\n  - sm plugins slots list: browse other slots\n",
+  createSuccess: "Created {{targetDir}}\nNext:\n  - Edit {{pluginId}}/extractors/{{pluginId}}-extractor/index.js (the extract() body)\n  - Run sm scan to see the contribution surface\n  - sm plugins slots list: browse other slots\n",
   // --- slots list verb -------------------------------------------------
   /** Section header for the view-slots catalogue. */
   slotsListHeaderViewSlots: "  View slots ({{count}})\n",
@@ -16282,11 +16616,9 @@ function extensionRowFromBuiltIn(ext, bundle, bundleEnabled, resolveEnabled) {
     id: ext.id,
     kind: ext.kind,
     version: ext.version,
-    enabled: bundle.granularity === "bundle" ? bundleEnabled : resolveEnabled(qualifiedExtensionId(bundle.id, ext.id))
+    enabled: bundle.granularity === "bundle" ? bundleEnabled : resolveEnabled(qualifiedExtensionId(bundle.id, ext.id)),
+    description: ext.description ?? ""
   };
-  if (ext.description !== void 0) row.description = ext.description;
-  if (ext.stability !== void 0) row.stability = ext.stability;
-  if (ext.preconditions !== void 0) row.preconditions = ext.preconditions;
   if (ext.entry !== void 0) row.entry = ext.entry;
   return row;
 }
@@ -16688,9 +17020,7 @@ function renderBuiltInExtensionDetail(bundleId, ext, ansi) {
     source: ansi.dim(PLUGINS_TEXTS.sourceBuiltIn)
   });
   const meta = { kind: ext.kind, version: ext.version };
-  if (ext.stability !== void 0) meta.stability = ext.stability;
-  if (ext.description !== void 0) meta.description = ext.description;
-  if (ext.preconditions !== void 0) meta.preconditions = ext.preconditions;
+  if (ext.description) meta.description = ext.description;
   if (ext.entry !== void 0) meta.entry = ext.entry;
   return header + "\n" + renderExtensionFields(meta);
 }
@@ -16991,11 +17321,12 @@ function collectBuiltInApplicableKindWarnings(out, knownKinds) {
     for (const ext of bundle.extensions) {
       if (ext.kind !== "extractor") continue;
       const extractor = ext;
-      if (!extractor.applicableKinds) continue;
+      const kinds = extractor.precondition?.kind;
+      if (!kinds || kinds.length === 0) continue;
       appendUnknownKindWarnings(
         out,
         qualifiedExtensionId(bundle.id, extractor.id),
-        extractor.applicableKinds,
+        kinds,
         knownKinds
       );
     }
@@ -17005,19 +17336,24 @@ function collectUserApplicableKindWarnings(out, plugins, knownKinds) {
   for (const p of plugins) {
     if (p.status !== "enabled" || !p.extensions) continue;
     for (const ext of p.extensions) {
-      if (ext.kind !== "extractor") continue;
-      const inst = extensionInstance(ext);
-      if (!inst) continue;
-      const ak = inst["applicableKinds"];
-      if (!Array.isArray(ak)) continue;
-      appendUnknownKindWarnings(
-        out,
-        qualifiedExtensionId(ext.pluginId, ext.id),
-        ak,
-        knownKinds
-      );
-    }
-  }
+      collectKindsFromExtension(ext, knownKinds, out);
+    }
+  }
+}
+function collectKindsFromExtension(ext, knownKinds, out) {
+  if (ext.kind !== "extractor") return;
+  const inst = extensionInstance(ext);
+  if (!inst) return;
+  const pre = inst["precondition"];
+  if (!pre || typeof pre !== "object") return;
+  const kinds = pre.kind;
+  if (!Array.isArray(kinds)) return;
+  appendUnknownKindWarnings(
+    out,
+    qualifiedExtensionId(ext.pluginId, ext.id),
+    kinds,
+    knownKinds
+  );
 }
 function appendUnknownKindWarnings(out, extractorQualifiedId, applicableKinds, knownKinds) {
   for (const k of applicableKinds) {
@@ -17370,8 +17706,8 @@ function resolveBareToggle(id, catalogue, verb, ansi) {
 }
 
 // cli/commands/plugins/create.ts
-import { existsSync as existsSync21, mkdirSync as mkdirSync6, writeFileSync as writeFileSync3 } from "fs";
-import { join as join15, resolve as resolve31 } from "path";
+import { existsSync as existsSync22, mkdirSync as mkdirSync6, writeFileSync as writeFileSync3 } from "fs";
+import { join as join16, resolve as resolve31 } from "path";
 import { Command as Command26, Option as Option25 } from "clipanion";
 var PluginsCreateCommand = class extends SmCommand {
   static paths = [["plugins", "create"]];
@@ -17397,8 +17733,8 @@ var PluginsCreateCommand = class extends SmCommand {
     }
     const ctx = defaultRuntimeContext();
     const baseDir = defaultProjectPluginsDir(ctx);
-    const targetDir = this.at ? resolve31(this.at) : join15(baseDir, this.pluginId);
-    if (existsSync21(targetDir) && !this.force) {
+    const targetDir = this.at ? resolve31(this.at) : join16(baseDir, this.pluginId);
+    if (existsSync22(targetDir) && !this.force) {
       this.printer.error(
         tx(PLUGINS_TEXTS.createRefuseOverwrite, {
           glyph: errGlyph,
@@ -17407,14 +17743,15 @@ var PluginsCreateCommand = class extends SmCommand {
       );
       return ExitCode.Error;
     }
-    mkdirSync6(join15(targetDir, "extensions"), { recursive: true });
+    const extractorName = `${this.pluginId}-extractor`;
+    mkdirSync6(join16(targetDir, "extractors", extractorName), { recursive: true });
     const specVersion = installedSpecVersion();
     const manifest = {
       id: this.pluginId,
       version: "0.1.0",
       specCompat: `^${specVersion}`,
       catalogCompat: "^1.0.0",
-      extensions: ["./extensions/extractor.js"],
+      granularity: "bundle",
       description: "Generated by `sm plugins create`. Edit to taste.",
       settings: {
         keywords: {
@@ -17427,14 +17764,14 @@ var PluginsCreateCommand = class extends SmCommand {
       }
     };
     writeFileSync3(
-      join15(targetDir, "plugin.json"),
+      join16(targetDir, "plugin.json"),
       JSON.stringify(manifest, null, 2) + "\n"
     );
     writeFileSync3(
-      join15(targetDir, "extensions", "extractor.js"),
-      scaffolderExtractorStub(this.pluginId)
+      join16(targetDir, "extractors", extractorName, "index.js"),
+      scaffolderExtractorStub(extractorName)
     );
-    writeFileSync3(join15(targetDir, "README.md"), scaffolderReadme(this.pluginId));
+    writeFileSync3(join16(targetDir, "README.md"), scaffolderReadme(this.pluginId));
     this.printer.data(
       tx(PLUGINS_TEXTS.createSuccess, {
         targetDir: sanitizeForTerminal(targetDir),
@@ -17444,7 +17781,7 @@ var PluginsCreateCommand = class extends SmCommand {
     return ExitCode.Ok;
   }
 };
-function scaffolderExtractorStub(pluginId) {
+function scaffolderExtractorStub(extractorId) {
   return `/**
  * Generated by \`sm plugins create\`. Edit the extract() body.
  *
@@ -17453,6 +17790,11 @@ function scaffolderExtractorStub(pluginId) {
  * splitting into a named export will surface as \`load-error: default
  * export missing a string \\\`kind\\\` field\`.
  *
+ * Folder convention: this file lives at
+ * \`extractors/${extractorId}/index.js\`. The bundle's plugin.json#/id
+ * provides the qualified id \`<plugin-id>/${extractorId}\`; the loader
+ * injects \`pluginId\` automatically, do NOT hardcode it here.
+ *
  * Declared view contributions (in plugin.json):
  *   - 'count' \u2192 slot \`card.footer.left\` (renders as a chip
  *     in the left footer of the node card)
@@ -17464,13 +17806,11 @@ function scaffolderExtractorStub(pluginId) {
  *      spec/view-slots.md
  */
 export default {
-  id: '${pluginId}-extractor',
-  pluginId: '${pluginId}',
+  id: '${extractorId}',
   kind: 'extractor',
   version: '0.1.0',
   description: 'Counts configured keywords per node.',
   stability: 'experimental',
-  mode: 'deterministic',
   emitsLinkKinds: [],
   defaultConfidence: 'high',
   scope: 'body',
@@ -17937,9 +18277,15 @@ var RefreshCommand = class extends SmCommand {
         continue;
       }
       const fm = node.frontmatter ?? {};
-      const applicable = allExtractors.filter(
-        (ex) => ex.applicableKinds === void 0 || ex.applicableKinds.includes(node.kind)
-      );
+      const applicable = allExtractors.filter((ex) => {
+        const kinds = ex.precondition?.kind;
+        if (!kinds || kinds.length === 0) return true;
+        return kinds.some((qualified) => {
+          const slashIdx = qualified.indexOf("/");
+          const kindOnly = slashIdx === -1 ? qualified : qualified.slice(slashIdx + 1);
+          return kindOnly === node.kind;
+        });
+      });
       for (const extractor of applicable) {
         const records = await runExtractorForEnrichment(extractor, node, body, fm);
         for (const record of records) nodeEnrichments.push(record);
@@ -18049,7 +18395,7 @@ var SCAN_TEXTS = {
 import { Command as Command30, Option as Option28 } from "clipanion";
 
 // core/watcher/runtime.ts
-import { dirname as dirname16 } from "path";
+import { dirname as dirname17 } from "path";
 
 // core/runtime/fresh-resolver.ts
 async function buildFreshResolver(deps) {
@@ -18274,7 +18620,7 @@ function createWatcherRuntime(opts) {
         roots: [
           cwd,
           // parent of `.skillmapignore`
-          dirname16(settingsPath)
+          dirname17(settingsPath)
           // parent of `.skill-map/settings.json`
         ],
         cwd,
@@ -18830,7 +19176,7 @@ function plural(count, word) {
 }
 
 // cli/commands/scan-compare.ts
-import { existsSync as existsSync22, readFileSync as readFileSync17 } from "fs";
+import { existsSync as existsSync23, readFileSync as readFileSync18 } from "fs";
 import { Command as Command32, Option as Option30 } from "clipanion";
 var ScanCompareCommand = class extends SmCommand {
   static paths = [["scan", "compare-with"]];
@@ -18942,12 +19288,12 @@ var ScanCompareCommand = class extends SmCommand {
   }
 };
 function loadAndValidateDump(path) {
-  if (!existsSync22(path)) {
+  if (!existsSync23(path)) {
     throw new Error(tx(SCAN_TEXTS.compareDumpNotFound, { path }));
   }
   let raw;
   try {
-    raw = readFileSync17(path, "utf8");
+    raw = readFileSync18(path, "utf8");
   } catch (err) {
     const message = formatErrorMessage(err);
     throw new Error(tx(SCAN_TEXTS.compareDumpReadFailed, { path, message }), { cause: err });
@@ -19072,7 +19418,7 @@ function renderDeltaIssues(issues) {
 
 // cli/commands/serve.ts
 import { spawn as spawn2 } from "child_process";
-import { existsSync as existsSync26 } from "fs";
+import { existsSync as existsSync27 } from "fs";
 import { Command as Command33, Option as Option31 } from "clipanion";
 
 // cli/util/browser-launch.ts
@@ -19725,7 +20071,7 @@ function contentTypeFor(format) {
 }
 
 // server/health.ts
-import { existsSync as existsSync23 } from "fs";
+import { existsSync as existsSync24 } from "fs";
 var FALLBACK_SCHEMA_VERSION = "1";
 function buildHealth(deps) {
   return {
@@ -19733,7 +20079,7 @@ function buildHealth(deps) {
     schemaVersion: FALLBACK_SCHEMA_VERSION,
     specVersion: deps.specVersion,
     implVersion: VERSION,
-    db: existsSync23(deps.dbPath) ? "present" : "missing",
+    db: existsSync24(deps.dbPath) ? "present" : "missing",
     cwd: deps.cwd,
     dbPath: deps.dbPath
   };
@@ -21097,7 +21443,8 @@ function invokeBump2(node, absPath, body) {
     node,
     nodeAbsolutePath: absPath,
     invoker: "ui",
-    now: () => /* @__PURE__ */ new Date()
+    now: () => /* @__PURE__ */ new Date(),
+    settings: {}
   });
 }
 function pickExistingVersion(node) {
@@ -21134,9 +21481,9 @@ function registerUpdateStatusRoute(app, deps) {
 }
 
 // server/static.ts
-import { existsSync as existsSync24 } from "fs";
+import { existsSync as existsSync25 } from "fs";
 import { readFile as readFile5 } from "fs/promises";
-import { extname, join as join16 } from "path";
+import { extname, join as join17 } from "path";
 import { serveStatic } from "@hono/node-server/serve-static";
 var INDEX_HTML = "index.html";
 var PLACEHOLDER_HTML = `<!doctype html>
@@ -21188,8 +21535,8 @@ function createSpaFallback(opts) {
   return async (c, _next) => {
     if (c.req.method !== "GET" && c.req.method !== "HEAD") return c.notFound();
     if (opts.uiDist === null) return htmlResponse(c, placeholder);
-    const indexPath = join16(opts.uiDist, INDEX_HTML);
-    if (!existsSync24(indexPath)) return htmlResponse(c, placeholder);
+    const indexPath = join17(opts.uiDist, INDEX_HTML);
+    if (!existsSync25(indexPath)) return htmlResponse(c, placeholder);
     return fileResponse(c, indexPath);
   };
 }
@@ -21758,10 +22105,10 @@ function validateNoUi(noUi, uiDist) {
 }
 
 // server/paths.ts
-import { existsSync as existsSync25, statSync as statSync8 } from "fs";
-import { dirname as dirname17, isAbsolute as isAbsolute9, join as join17, resolve as resolve34 } from "path";
+import { existsSync as existsSync26, statSync as statSync10 } from "fs";
+import { dirname as dirname18, isAbsolute as isAbsolute9, join as join18, resolve as resolve34 } from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
-var DEFAULT_UI_REL = join17("ui", "dist", "ui", "browser");
+var DEFAULT_UI_REL = join18("ui", "dist", "ui", "browser");
 var PACKAGE_UI_REL = "ui";
 var INDEX_HTML2 = "index.html";
 function resolveDefaultUiDist(ctx) {
@@ -21773,10 +22120,10 @@ function resolveExplicitUiDist(ctx, raw) {
   return isAbsolute9(raw) ? raw : resolve34(ctx.cwd, raw);
 }
 function isUiBundleDir(path) {
-  if (!existsSync25(path)) return false;
+  if (!existsSync26(path)) return false;
   try {
-    if (!statSync8(path).isDirectory()) return false;
-    return existsSync25(join17(path, INDEX_HTML2));
+    if (!statSync10(path).isDirectory()) return false;
+    return existsSync26(join18(path, INDEX_HTML2));
   } catch {
     return false;
   }
@@ -21784,7 +22131,7 @@ function isUiBundleDir(path) {
 function resolvePackageBundledUi() {
   let here;
   try {
-    here = dirname17(fileURLToPath5(import.meta.url));
+    here = dirname18(fileURLToPath5(import.meta.url));
   } catch {
     return null;
   }
@@ -21793,11 +22140,11 @@ function resolvePackageBundledUi() {
 function resolvePackageBundledUiFrom(here) {
   let current = here;
   for (let i = 0; i < 8; i++) {
-    const candidate = join17(current, PACKAGE_UI_REL);
+    const candidate = join18(current, PACKAGE_UI_REL);
     if (isUiBundleDir(candidate)) return candidate;
-    const distHere = join17(current, "dist", PACKAGE_UI_REL);
+    const distHere = join18(current, "dist", PACKAGE_UI_REL);
     if (isUiBundleDir(distHere)) return distHere;
-    const parent = dirname17(current);
+    const parent = dirname18(current);
     if (parent === current) return null;
     current = parent;
   }
@@ -21806,9 +22153,9 @@ function resolvePackageBundledUiFrom(here) {
 function walkUpForUi(startDir) {
   let current = resolve34(startDir);
   for (let i = 0; i < 64; i++) {
-    const candidate = join17(current, DEFAULT_UI_REL);
+    const candidate = join18(current, DEFAULT_UI_REL);
     if (isUiBundleDir(candidate)) return candidate;
-    const parent = dirname17(current);
+    const parent = dirname18(current);
     if (parent === current) return null;
     current = parent;
   }
@@ -22224,7 +22571,7 @@ var ServeCommand = class extends SmCommand {
       return ExitCode.Error;
     }
     const dbPath = resolveDbPath({ db: this.db, ...runtimeCtx });
-    if (this.db !== void 0 && !existsSync26(dbPath)) {
+    if (this.db !== void 0 && !existsSync27(dbPath)) {
       this.printer.info(
         tx(SERVE_TEXTS.dbNotFound, { path: sanitizeForTerminal(dbPath) })
       );
@@ -22720,7 +23067,7 @@ function rankConfidenceForGrouping(c) {
 }
 
 // cli/commands/sidecar.ts
-import { existsSync as existsSync27, unlinkSync as unlinkSync2 } from "fs";
+import { existsSync as existsSync28, unlinkSync as unlinkSync2 } from "fs";
 import { resolve as resolve35 } from "path";
 import { Command as Command35, Option as Option33 } from "clipanion";
 
@@ -23161,7 +23508,7 @@ var SidecarAnnotateCommand = class extends SmCommand {
       return ExitCode.Error;
     }
     const sidecarAbsPath = sidecarPathFor(absPath);
-    if (existsSync27(sidecarAbsPath) && this.force !== true) {
+    if (existsSync28(sidecarAbsPath) && this.force !== true) {
       this.printer.error(
         tx(SIDECAR_TEXTS.annotateExists, {
           glyph: errGlyph,
@@ -23171,7 +23518,7 @@ var SidecarAnnotateCommand = class extends SmCommand {
       );
       return ExitCode.Error;
     }
-    if (existsSync27(sidecarAbsPath) && this.force === true) {
+    if (existsSync28(sidecarAbsPath) && this.force === true) {
       try {
         unlinkSync2(sidecarAbsPath);
       } catch (err) {
@@ -23401,9 +23748,9 @@ var STUB_COMMANDS = [
 ];
 
 // cli/commands/tutorial.ts
-import { existsSync as existsSync28, readFileSync as readFileSync18 } from "fs";
+import { existsSync as existsSync29, readFileSync as readFileSync19 } from "fs";
 import { writeFile as writeFile2 } from "fs/promises";
-import { dirname as dirname18, join as join18, resolve as resolve36 } from "path";
+import { dirname as dirname19, join as join19, resolve as resolve36 } from "path";
 import { fileURLToPath as fileURLToPath6 } from "url";
 import { Command as Command37, Option as Option35 } from "clipanion";
 
@@ -23500,7 +23847,7 @@ var TutorialCommand = class extends SmCommand {
     }
     const variant = rawVariant ?? DEFAULT_VARIANT;
     const spec = VARIANT_SPECS[variant];
-    const target = join18(ctx.cwd, spec.filename);
+    const target = join19(ctx.cwd, spec.filename);
     if (await pathExists(target) && !this.force) {
       this.printer.error(
         tx(TUTORIAL_TEXTS.alreadyExists, {
@@ -23574,7 +23921,7 @@ function loadBundledTutorialText(variant) {
 }
 function readTutorialFromDisk(variant) {
   const spec = VARIANT_SPECS[variant];
-  const here = dirname18(fileURLToPath6(import.meta.url));
+  const here = dirname19(fileURLToPath6(import.meta.url));
   const candidates = [
     // dev: src/cli/commands/ → repo-root .claude/skills/<slug>/SKILL.md
     resolve36(here, "../../..", spec.sourcePath),
@@ -23584,8 +23931,8 @@ function readTutorialFromDisk(variant) {
     resolve36(here, "../cli/tutorial", spec.bundledName)
   ];
   for (const candidate of candidates) {
-    if (existsSync28(candidate)) {
-      return readFileSync18(candidate, "utf8");
+    if (existsSync29(candidate)) {
+      return readFileSync19(candidate, "utf8");
     }
   }
   throw new Error(`SKILL.md not found in any candidate location (last tried: ${candidates[candidates.length - 1]})`);
@@ -23758,7 +24105,7 @@ await lifecycleDispatcher.dispatch(
 process.exit(exitCode);
 function resolveBareDefault() {
   const ctx = defaultRuntimeContext();
-  if (existsSync29(defaultProjectDbPath(ctx))) {
+  if (existsSync30(defaultProjectDbPath(ctx))) {
     return ["serve"];
   }
   process.stderr.write(tx(ENTRY_TEXTS.bareNoProject, { cwd: ctx.cwd }));