skillspp 0.2.0 → 1.2.0

package/dist/cli.js

@@ -20,9 +20,7 @@ function parseSource(input) {
   if (isLocalPath(input)) {
     return { type: "local", localPath: path.resolve(input) };
   }
-  const githubTreeWithPath = input.match(
-    /github\.com\/([^/]+)\/([^/]+)\/tree\/([^/]+)\/(.+)/
-  );
+  const githubTreeWithPath = input.match(/github\.com\/([^/]+)\/([^/]+)\/tree\/([^/]+)\/(.+)/);
   if (githubTreeWithPath) {
     const [, owner, repo, ref, subpath] = githubTreeWithPath;
     return {
@@ -32,9 +30,7 @@ function parseSource(input) {
       subpath
     };
   }
-  const githubTree = input.match(
-    /github\.com\/([^/]+)\/([^/]+)\/tree\/([^/]+)$/
-  );
+  const githubTree = input.match(/github\.com\/([^/]+)\/([^/]+)\/tree\/([^/]+)$/);
   if (githubTree) {
     const [, owner, repo, ref] = githubTree;
     return {
@@ -81,13 +77,7 @@ function parseSource(input) {
 import fs from "node:fs";
 import path2 from "node:path";
 import matter from "gray-matter";
-var SKIP_DIRS = /* @__PURE__ */ new Set([
-  ".git",
-  "node_modules",
-  "dist",
-  "build",
-  "__pycache__"
-]);
+var SKIP_DIRS = /* @__PURE__ */ new Set([".git", "node_modules", "dist", "build", "__pycache__"]);
 function resolveSourceLabel(parsedSource) {
   switch (parsedSource.type) {
     case "local":
@@ -136,12 +126,7 @@ function findSkillDirsRecursive(dir, depth, maxDepth, out) {
     if (!entry.isDirectory() || SKIP_DIRS.has(entry.name)) {
       continue;
     }
-    findSkillDirsRecursive(
-      path2.join(dir, entry.name),
-      depth + 1,
-      maxDepth,
-      out
-    );
+    findSkillDirsRecursive(path2.join(dir, entry.name), depth + 1, maxDepth, out);
   }
 }
 function discoverSkills(basePath) {
@@ -200,198 +185,264 @@ var STANDARD_AGENTS = {
     displayName: "Universal",
     projectSkillsDir: ".agents/skills",
     globalSkillsDir: ".agents/skills",
+    projectPluginsDir: ".agents/plugins/cache",
+    globalPluginsDir: ".agents/plugins/cache",
     installMarkers: [".agents"]
   },
   adal: {
     displayName: "AdaL",
     projectSkillsDir: ".adal/skills",
     globalSkillsDir: ".adal/skills",
+    projectPluginsDir: ".adal/plugins/cache",
+    globalPluginsDir: ".adal/plugins/cache",
     installMarkers: [".adal"]
   },
   antigravity: {
     displayName: "Antigravity",
     projectSkillsDir: ".agent/skills",
     globalSkillsDir: ".gemini/antigravity/skills",
+    projectPluginsDir: ".agent/plugins/cache",
+    globalPluginsDir: ".gemini/antigravity/plugins/cache",
     installMarkers: [".gemini/antigravity"]
   },
   augment: {
     displayName: "Augment",
     projectSkillsDir: ".augment/skills",
     globalSkillsDir: ".augment/skills",
+    projectPluginsDir: ".augment/plugins/cache",
+    globalPluginsDir: ".augment/plugins/cache",
     installMarkers: [".augment"]
   },
   "claude-code": {
     displayName: "Claude Code",
     projectSkillsDir: ".claude/skills",
     globalSkillsDir: ".claude/skills",
+    projectPluginsDir: ".claude/plugins/cache",
+    globalPluginsDir: ".claude/plugins/cache",
     installMarkers: [".claude"]
   },
   "cortex-code": {
     displayName: "Cortex Code",
     projectSkillsDir: ".cortex/skills",
     globalSkillsDir: ".cortex/skills",
+    projectPluginsDir: ".cortex/plugins/cache",
+    globalPluginsDir: ".cortex/plugins/cache",
     installMarkers: [".cortex"]
   },
   crush: {
     displayName: "Crush",
     projectSkillsDir: ".crush/skills",
     globalSkillsDir: ".crush/skills",
+    projectPluginsDir: ".crush/plugins/cache",
+    globalPluginsDir: ".crush/plugins/cache",
     installMarkers: [".crush"]
   },
   droid: {
     displayName: "Droid",
     projectSkillsDir: ".factory/skills",
     globalSkillsDir: ".factory/skills",
+    projectPluginsDir: ".factory/plugins/cache",
+    globalPluginsDir: ".factory/plugins/cache",
     installMarkers: [".factory"]
   },
   goose: {
     displayName: "Goose",
     projectSkillsDir: ".goose/skills",
     globalSkillsDir: ".config/goose/skills",
+    projectPluginsDir: ".goose/plugins/cache",
+    globalPluginsDir: ".config/goose/plugins/cache",
     installMarkers: [".config/goose"]
   },
   "iflow-cli": {
     displayName: "iFlow CLI",
     projectSkillsDir: ".iflow/skills",
     globalSkillsDir: ".iflow/skills",
+    projectPluginsDir: ".iflow/plugins/cache",
+    globalPluginsDir: ".iflow/plugins/cache",
     installMarkers: [".iflow"]
   },
   junie: {
     displayName: "Junie",
     projectSkillsDir: ".junie/skills",
     globalSkillsDir: ".junie/skills",
+    projectPluginsDir: ".junie/plugins/cache",
+    globalPluginsDir: ".junie/plugins/cache",
     installMarkers: [".junie"]
   },
   "kiro-cli": {
     displayName: "Kiro CLI",
     projectSkillsDir: ".kiro/skills",
     globalSkillsDir: ".kiro/skills",
+    projectPluginsDir: ".kiro/plugins/cache",
+    globalPluginsDir: ".kiro/plugins/cache",
     installMarkers: [".kiro"]
   },
   kode: {
     displayName: "Kode",
     projectSkillsDir: ".kode/skills",
     globalSkillsDir: ".kode/skills",
+    projectPluginsDir: ".kode/plugins/cache",
+    globalPluginsDir: ".kode/plugins/cache",
     installMarkers: [".kode"]
   },
   openclaw: {
     displayName: "OpenClaw",
     projectSkillsDir: "skills",
     globalSkillsDir: ".openclaw/skills",
+    projectPluginsDir: "plugins/cache",
+    globalPluginsDir: ".openclaw/plugins/cache",
     installMarkers: [".openclaw"]
   },
   openhands: {
     displayName: "OpenHands",
     projectSkillsDir: ".openhands/skills",
     globalSkillsDir: ".openhands/skills",
+    projectPluginsDir: ".openhands/plugins/cache",
+    globalPluginsDir: ".openhands/plugins/cache",
     installMarkers: [".openhands"]
   },
   "mistral-vibe": {
     displayName: "Mistral Vibe",
     projectSkillsDir: ".vibe/skills",
     globalSkillsDir: ".vibe/skills",
+    projectPluginsDir: ".vibe/plugins/cache",
+    globalPluginsDir: ".vibe/plugins/cache",
     installMarkers: [".vibe"]
   },
   neovate: {
     displayName: "Neovate",
     projectSkillsDir: ".neovate/skills",
     globalSkillsDir: ".neovate/skills",
+    projectPluginsDir: ".neovate/plugins/cache",
+    globalPluginsDir: ".neovate/plugins/cache",
     installMarkers: [".neovate"]
   },
   pochi: {
     displayName: "Pochi",
     projectSkillsDir: ".pochi/skills",
     globalSkillsDir: ".pochi/skills",
+    projectPluginsDir: ".pochi/plugins/cache",
+    globalPluginsDir: ".pochi/plugins/cache",
     installMarkers: [".pochi"]
   },
   qoder: {
     displayName: "Qoder",
     projectSkillsDir: ".qoder/skills",
     globalSkillsDir: ".qoder/skills",
+    projectPluginsDir: ".qoder/plugins/cache",
+    globalPluginsDir: ".qoder/plugins/cache",
     installMarkers: [".qoder"]
   },
   "qwen-code": {
     displayName: "Qwen Code",
     projectSkillsDir: ".qwen/skills",
     globalSkillsDir: ".qwen/skills",
+    projectPluginsDir: ".qwen/plugins/cache",
+    globalPluginsDir: ".qwen/plugins/cache",
     installMarkers: [".qwen"]
   },
   roo: {
     displayName: "Roo Code",
     projectSkillsDir: ".roo/skills",
     globalSkillsDir: ".roo/skills",
+    projectPluginsDir: ".roo/plugins/cache",
+    globalPluginsDir: ".roo/plugins/cache",
     installMarkers: [".roo"]
   },
   trae: {
     displayName: "Trae",
     projectSkillsDir: ".trae/skills",
     globalSkillsDir: ".trae/skills",
+    projectPluginsDir: ".trae/plugins/cache",
+    globalPluginsDir: ".trae/plugins/cache",
     installMarkers: [".trae"]
   },
   "trae-cn": {
     displayName: "Trae CN",
     projectSkillsDir: ".trae/skills",
     globalSkillsDir: ".trae/skills",
+    projectPluginsDir: ".trae/plugins/cache",
+    globalPluginsDir: ".trae/plugins/cache",
     installMarkers: [".trae"]
   },
   windsurf: {
     displayName: "Windsurf",
     projectSkillsDir: ".windsurf/skills",
     globalSkillsDir: ".codeium/windsurf/skills",
+    projectPluginsDir: ".windsurf/plugins/cache",
+    globalPluginsDir: ".codeium/windsurf/plugins/cache",
     installMarkers: [".windsurf", ".codeium/windsurf"]
   },
   zencoder: {
     displayName: "Zencoder",
     projectSkillsDir: ".zencoder/skills",
     globalSkillsDir: ".zencoder/skills",
+    projectPluginsDir: ".zencoder/plugins/cache",
+    globalPluginsDir: ".zencoder/plugins/cache",
     installMarkers: [".zencoder"]
   },
   continue: {
     displayName: "Continue",
     projectSkillsDir: ".continue/skills",
     globalSkillsDir: ".continue/skills",
+    projectPluginsDir: ".continue/plugins/cache",
+    globalPluginsDir: ".continue/plugins/cache",
     installMarkers: [".continue"]
   },
   codebuddy: {
     displayName: "CodeBuddy",
     projectSkillsDir: ".codebuddy/skills",
     globalSkillsDir: ".codebuddy/skills",
+    projectPluginsDir: ".codebuddy/plugins/cache",
+    globalPluginsDir: ".codebuddy/plugins/cache",
     installMarkers: [".codebuddy"]
   },
   "command-code": {
     displayName: "Command Code",
     projectSkillsDir: ".commandcode/skills",
     globalSkillsDir: ".commandcode/skills",
+    projectPluginsDir: ".commandcode/plugins/cache",
+    globalPluginsDir: ".commandcode/plugins/cache",
     installMarkers: [".commandcode"]
   },
   kilo: {
     displayName: "Kilo Code",
     projectSkillsDir: ".kilocode/skills",
     globalSkillsDir: ".kilocode/skills",
+    projectPluginsDir: ".kilocode/plugins/cache",
+    globalPluginsDir: ".kilocode/plugins/cache",
     installMarkers: [".kilocode"]
   },
   mcpjam: {
     displayName: "MCPJam",
     projectSkillsDir: ".mcpjam/skills",
     globalSkillsDir: ".mcpjam/skills",
+    projectPluginsDir: ".mcpjam/plugins/cache",
+    globalPluginsDir: ".mcpjam/plugins/cache",
     installMarkers: [".mcpjam"]
   },
   mux: {
     displayName: "Mux",
     projectSkillsDir: ".mux/skills",
     globalSkillsDir: ".mux/skills",
+    projectPluginsDir: ".mux/plugins/cache",
+    globalPluginsDir: ".mux/plugins/cache",
     installMarkers: [".mux"]
   },
   pi: {
     displayName: "Pi",
     projectSkillsDir: ".pi/skills",
     globalSkillsDir: ".pi/agent/skills",
+    projectPluginsDir: ".pi/plugins/cache",
+    globalPluginsDir: ".pi/agent/plugins/cache",
     installMarkers: [".pi"]
   },
   replit: {
     displayName: "Replit",
     projectSkillsDir: ".agents/skills",
     globalSkillsDir: ".config/agents/skills",
+    projectPluginsDir: ".agents/plugins/cache",
+    globalPluginsDir: ".config/agents/plugins/cache",
     installMarkers: [".config/agents"]
   }
 };
@@ -401,48 +452,64 @@ var AGENTS = {
     displayName: "Codex",
     projectSkillsDir: ".agents/skills",
     globalSkillsDir: ".codex/skills",
+    projectPluginsDir: ".agents/plugins/cache",
+    globalPluginsDir: ".codex/plugins/cache",
     installMarkers: [".codex"]
   },
   cursor: {
     displayName: "Cursor",
     projectSkillsDir: ".agents/skills",
     globalSkillsDir: ".cursor/skills",
+    projectPluginsDir: ".agents/plugins/cache",
+    globalPluginsDir: ".cursor/plugins/cache",
     installMarkers: [".cursor"]
   },
   "gemini-cli": {
     displayName: "Gemini CLI",
     projectSkillsDir: ".agents/skills",
     globalSkillsDir: ".gemini/skills",
+    projectPluginsDir: ".agents/plugins/cache",
+    globalPluginsDir: ".gemini/plugins/cache",
     installMarkers: [".gemini"]
   },
   "github-copilot": {
     displayName: "GitHub Copilot",
     projectSkillsDir: ".agents/skills",
     globalSkillsDir: ".copilot/skills",
+    projectPluginsDir: ".agents/plugins/cache",
+    globalPluginsDir: ".copilot/plugins/cache",
     installMarkers: [".copilot"]
   },
   amp: {
     displayName: "Amp",
     projectSkillsDir: ".agents/skills",
     globalSkillsDir: ".config/agents/skills",
+    projectPluginsDir: ".agents/plugins/cache",
+    globalPluginsDir: ".config/agents/plugins/cache",
     installMarkers: [".config/agents"]
   },
   opencode: {
     displayName: "OpenCode",
     projectSkillsDir: ".agents/skills",
     globalSkillsDir: ".config/opencode/skills",
+    projectPluginsDir: ".agents/plugins/cache",
+    globalPluginsDir: ".config/opencode/plugins/cache",
     installMarkers: [".config/opencode"]
   },
   windsurf: {
     displayName: "Windsurf",
     projectSkillsDir: ".windsurf/skills",
     globalSkillsDir: ".codeium/windsurf/skills",
+    projectPluginsDir: ".windsurf/plugins/cache",
+    globalPluginsDir: ".codeium/windsurf/plugins/cache",
     installMarkers: [".windsurf", ".codeium/windsurf"]
   },
   cline: {
     displayName: "Cline",
     projectSkillsDir: ".cline/skills",
     globalSkillsDir: ".cline/skills",
+    projectPluginsDir: ".cline/plugins/cache",
+    globalPluginsDir: ".cline/plugins/cache",
     installMarkers: [".cline"]
   }
 };
@@ -498,9 +565,7 @@ function normalizeAgentSelectionInput(values, cwd = process.cwd()) {
   if (unknown.length === 0) {
     return values;
   }
-  const expandedFromGlob = unknown.every(
-    (value) => fs2.existsSync(path3.resolve(cwd, value))
-  );
+  const expandedFromGlob = unknown.every((value) => fs2.existsSync(path3.resolve(cwd, value)));
   if (!expandedFromGlob) {
     return values;
   }
@@ -514,6 +579,11 @@ function getAgentSkillsDir(agent, globalInstall, cwd) {
   const base = globalInstall ? os.homedir() : cwd;
   return path3.join(base, relative);
 }
+function getAgentPluginsDir(agent, globalInstall, cwd) {
+  const relative = globalInstall ? AGENTS[agent].globalPluginsDir : AGENTS[agent].projectPluginsDir;
+  const base = globalInstall ? os.homedir() : cwd;
+  return path3.join(base, relative);
+}
 function detectInstalledAgents(cwd = process.cwd()) {
   const found = [];
   for (const agent of Object.keys(AGENTS)) {
@@ -544,22 +614,20 @@ function isAgentInstalled(agent, cwd) {
   return false;
 }
 
-// ../../packages/core/src/runtime/installer.ts
-function sanitizeSkillName(name) {
-  const sanitized = name.toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^[.-]+|[.-]+$/g, "");
-  return sanitized || "unnamed-skill";
-}
+// ../../packages/cli-shared/src/ui/selection-step.tsx
+import { useMemo, useState as useState2 } from "react";
+import { Box as Box2, Text as Text2, useInput as useInput2 } from "ink";
 
-// src/ui/screens.tsx
+// ../../packages/cli-shared/src/ui/screens.tsx
 import { stripVTControlCharacters } from "node:util";
 import React, { useEffect, useState } from "react";
 import { Box, Text, render, useInput, useStdout } from "ink";
 
-// src/ui/format.ts
+// ../../packages/cli-shared/src/ui/format.ts
 import os2 from "node:os";
 import path4 from "node:path";
 
-// src/ui/colors.ts
+// ../../packages/cli-shared/src/ui/colors.ts
 var ANSI_ESCAPE = "\x1B[";
 var ANSI_RESET = "\x1B[0m";
 var COLOR_TOKENS = {
@@ -593,7 +661,7 @@ function dim(text, colorEnabled) {
   return ansiStyle(text, "2", colorEnabled);
 }
 
-// src/ui/format.ts
+// ../../packages/cli-shared/src/ui/format.ts
 function shortenHomePath(value, homeDir = os2.homedir()) {
   if (value === homeDir || value.startsWith(`${homeDir}${path4.sep}`)) {
     return `~${value.slice(homeDir.length)}`;
@@ -620,25 +688,31 @@ function formatDriftChips(options) {
   )}`;
 }
 
-// src/ui/logo.ts
+// ../../packages/cli-shared/src/ui/logo.ts
 import fs3 from "node:fs";
-import path5 from "node:path";
-import { fileURLToPath } from "node:url";
 var DEFAULT_LOGO_FPS = 12;
 var EMPTY_TEXT_ONLY_LOGO = [];
 var animatedCache;
 var staticCache;
-function resolveLogoDir() {
-  const dirname = path5.dirname(fileURLToPath(import.meta.url));
-  return path5.resolve(dirname, "../assets/ascii/logo");
+var configuredSessionPath = null;
+var configuredStaticPath = null;
+function normalizeConfiguredPath(filePath) {
+  if (typeof filePath !== "string") {
+    return null;
+  }
+  const trimmed = filePath.trim();
+  return trimmed.length > 0 ? trimmed : null;
+}
+function configureLogoAssetPaths(paths) {
+  configuredSessionPath = normalizeConfiguredPath(paths.sessionPath);
+  configuredStaticPath = normalizeConfiguredPath(paths.textPath);
+  resetLogoCache();
 }
 function resolveSessionPath() {
-  const customPath = process.env.SKILLSPP_LOGO_SESSION_PATH;
-  return customPath || path5.join(resolveLogoDir(), "skillspp-logo.session.json");
+  return normalizeConfiguredPath(process.env.SKILLSPP_LOGO_SESSION_PATH) ?? configuredSessionPath;
 }
 function resolveStaticPath() {
-  const customPath = process.env.SKILLSPP_LOGO_TEXT_PATH;
-  return customPath || path5.join(resolveLogoDir(), "skillspp-logo.txt");
+  return normalizeConfiguredPath(process.env.SKILLSPP_LOGO_TEXT_PATH) ?? configuredStaticPath;
 }
 function trimOuterEmptyRows(lines) {
   let start = 0;
@@ -747,6 +821,10 @@ function readFileSafe(filePath) {
     return null;
   }
 }
+function resetLogoCache() {
+  animatedCache = void 0;
+  staticCache = void 0;
+}
 function getAnimatedLogoFrames() {
   if (animatedCache !== void 0) {
     return animatedCache;
@@ -783,7 +861,7 @@ function getBannerLogoLines() {
   return getStaticLogoLines() ?? EMPTY_TEXT_ONLY_LOGO;
 }
 
-// src/ui/screens.tsx
+// ../../packages/cli-shared/src/ui/screens.tsx
 import { jsx, jsxs } from "react/jsx-runtime";
 var DEFAULT_BANNER_WIDTH = 78;
 var DEFAULT_PANEL_MIN_WIDTH = 58;
@@ -906,10 +984,7 @@ function resolveTerminalColumns() {
   return Math.max(MIN_TERMINAL_WIDTH, process.stdout.columns || 80);
 }
 function resolveMaxInnerWidth(indent = "  ") {
-  return Math.max(
-    MIN_INNER_WIDTH,
-    resolveTerminalColumns() - indent.length - FRAME_OVERHEAD
-  );
+  return Math.max(MIN_INNER_WIDTH, resolveTerminalColumns() - indent.length - FRAME_OVERHEAD);
 }
 function clampToTerminalInnerWidth(idealWidth, minWidth, indent = "  ") {
   const maxInnerWidth = resolveMaxInnerWidth(indent);
@@ -917,9 +992,7 @@ function clampToTerminalInnerWidth(idealWidth, minWidth, indent = "  ") {
   return Math.max(lowerBound, Math.min(idealWidth, maxInnerWidth));
 }
 function resolvePanelWidth(options) {
-  const lineLengths = options.lines.map(
-    (line) => visibleLength(singleLine(line))
-  );
+  const lineLengths = options.lines.map((line) => visibleLength(singleLine(line)));
   return Math.max(
     options.minWidth ?? DEFAULT_PANEL_MIN_WIDTH,
     singleLine(options.title).length + 4,
@@ -928,10 +1001,7 @@ function resolvePanelWidth(options) {
 }
 function resolveSelectionColumnWidths(innerWidth, targetLabelWidth, targetDescWidth) {
   const availableColumns = Math.max(8, innerWidth - SELECTION_ROW_OVERHEAD);
-  const targetTotal = Math.max(
-    8,
-    targetLabelWidth + Math.max(0, targetDescWidth)
-  );
+  const targetTotal = Math.max(8, targetLabelWidth + Math.max(0, targetDescWidth));
   if (availableColumns >= targetTotal) {
     return {
       labelWidth: targetLabelWidth,
@@ -957,25 +1027,13 @@ function renderFramedPanel(options) {
   const bottomLeft = options.style === "rounded" ? "\u2570" : "\u2514";
   const bottomRight = options.style === "rounded" ? "\u256F" : "\u2518";
   const out = [];
-  out.push(
-    `${options.indent}${dim(
-      `${topLeft}\u2500 ${title} ${"\u2500".repeat(topTail)}${topRight}`
-    )}`
-  );
+  out.push(`${options.indent}${dim(`${topLeft}\u2500 ${title} ${"\u2500".repeat(topTail)}${topRight}`)}`);
   for (const line of options.lines) {
     for (const wrappedLine of wrapVisibleLine(line, width)) {
-      out.push(
-        `${options.indent}${dim("\u2502")} ${padRight(wrappedLine, width)} ${dim(
-          "\u2502"
-        )}`
-      );
+      out.push(`${options.indent}${dim("\u2502")} ${padRight(wrappedLine, width)} ${dim("\u2502")}`);
     }
   }
-  out.push(
-    `${options.indent}${dim(
-      `${bottomLeft}${"\u2500".repeat(bottomWidth)}${bottomRight}`
-    )}`
-  );
+  out.push(`${options.indent}${dim(`${bottomLeft}${"\u2500".repeat(bottomWidth)}${bottomRight}`)}`);
   return out.join("\n");
 }
 function toSelectedRows(rows, selectedIds) {
@@ -1022,11 +1080,7 @@ function resolveSelectionPanelLayout(options) {
     options.minWidth ?? DEFAULT_PANEL_MIN_WIDTH,
     indent
   );
-  const columns = resolveSelectionColumnWidths(
-    width,
-    options.labelWidth,
-    options.descWidth
-  );
+  const columns = resolveSelectionColumnWidths(width, options.labelWidth, options.descWidth);
   return {
     width,
     labelWidth: columns.labelWidth,
@@ -1045,10 +1099,7 @@ function renderSectionToText(section) {
   switch (section.type) {
     case "banner": {
       const logoLines = getBannerLogoLines();
-      const widestLogoLine = logoLines.reduce(
-        (max, line) => Math.max(max, visibleLength(line)),
-        0
-      );
+      const widestLogoLine = logoLines.reduce((max, line) => Math.max(max, visibleLength(line)), 0);
       const resolvedWidth = clampToTerminalInnerWidth(
         Math.max(
           section.width ?? DEFAULT_BANNER_WIDTH,
@@ -1075,7 +1126,7 @@ function renderSectionToText(section) {
       return renderPanelText(section);
     }
     case "source":
-      return finalizeUiBlock(`  Skills source: ${section.source}`);
+      return finalizeUiBlock(`  ${section.source}`);
     case "lines":
       return finalizeUiBlock(section.lines.join("\n"));
     case "text":
@@ -1096,10 +1147,7 @@ function HistoryText({ text }) {
   return /* @__PURE__ */ jsx(Text, { children: text.replace(/\n$/, "") });
 }
 function renderPinnedLogoHeaderText(lines) {
-  const widestLogoLine = lines.reduce(
-    (max, line) => Math.max(max, visibleLength(line)),
-    0
-  );
+  const widestLogoLine = lines.reduce((max, line) => Math.max(max, visibleLength(line)), 0);
   const resolvedWidth = clampToTerminalInnerWidth(
     Math.max(PINNED_LOGO_HEADER_WIDTH, widestLogoLine),
     Math.max(1, widestLogoLine)
@@ -1271,10 +1319,7 @@ function renderSectionToTextWithLogoLines(section, logoLinesOverride) {
     return renderSectionToText(section);
   }
   const logoLines = logoLinesOverride ?? getBannerLogoLines();
-  const widestLogoLine = logoLines.reduce(
-    (max, line) => Math.max(max, visibleLength(line)),
-    0
-  );
+  const widestLogoLine = logoLines.reduce((max, line) => Math.max(max, visibleLength(line)), 0);
   const resolvedWidth = clampToTerminalInnerWidth(
     Math.max(
       section.width ?? DEFAULT_BANNER_WIDTH,
@@ -1290,11 +1335,7 @@ function renderSectionToTextWithLogoLines(section, logoLinesOverride) {
     center(section.title, resolvedWidth)
   ];
   return finalizeUiBlock(
-    [
-      `\u256D${border}\u256E`,
-      ...bodyLines.map((line) => `\u2502${line}\u2502`),
-      `\u2570${border}\u256F`
-    ].join("\n")
+    [`\u256D${border}\u256E`, ...bodyLines.map((line) => `\u2502${line}\u2502`), `\u2570${border}\u256F`].join("\n")
   );
 }
 function freezeBannerSections(sections, logoLines) {
@@ -1350,17 +1391,13 @@ function statusStepsSection(steps) {
   );
 }
 function completedStepsSection(steps) {
-  return statusStepsSection(
-    steps.map((step) => ({ status: "completed", label: step }))
-  );
+  return statusStepsSection(steps.map((step) => ({ status: "completed", label: step })));
 }
 function failedStepsSection(steps) {
-  return statusStepsSection(
-    steps.map((step) => ({ status: "failed", label: step }))
-  );
+  return statusStepsSection(steps.map((step) => ({ status: "failed", label: step })));
 }
-function sourceSection(source) {
-  return { type: "source", source };
+function sourceSection(source, label = "Skills source") {
+  return { type: "source", source: `${label}: ${source}` };
 }
 function completionSummarySection(options) {
   const skillLabel = options.skillCount === 1 ? "skill" : "skills";
@@ -1383,10 +1420,7 @@ function installationSummarySection(options) {
     )}   ${bold("Agents:")} ${colorToken(
       options.agentCount.toString(),
       "primary"
-    )}   ${bold("Targets:")} ${colorToken(
-      options.targetCount.toString(),
-      "primary"
-    )}`,
+    )}   ${bold("Targets:")} ${colorToken(options.targetCount.toString(), "primary")}`,
     "",
     bold("Targets:")
   ];
@@ -1411,13 +1445,14 @@ function installationSummarySection(options) {
   });
 }
 function uninstallSummarySection(options) {
+  const itemLabel = options.itemLabel || "Skills";
   return panelSection({
     title: "Uninstall Summary",
     lines: [
       `Scope: ${options.globalInstall ? "global" : "current project"}`,
       "",
-      `Skills (${options.skillNames.length}):`,
-      ...options.skillNames.map((name) => `  - ${name}`),
+      `${itemLabel} (${options.itemNames.length}):`,
+      ...options.itemNames.map((name) => `  - ${name}`),
       "",
       `Agents (${options.agentDisplayNames.length}): ${compactAgentDisplayNames(
         [...options.agentDisplayNames].sort((a, b) => a.localeCompare(b)),
@@ -1534,9 +1569,7 @@ function Spinner({ label }) {
   return /* @__PURE__ */ jsx(Text, { children: `  ${colorToken(frames[frameIndex], "primary")} ${label}` });
 }
 
-// src/ui/selection-step.tsx
-import { useMemo, useState as useState2 } from "react";
-import { Box as Box2, Text as Text2, useInput as useInput2 } from "ink";
+// ../../packages/cli-shared/src/ui/selection-step.tsx
 import { jsx as jsx2 } from "react/jsx-runtime";
 var DEFAULT_REQUIRED_MESSAGE = "At least one choice must be selected";
 function assertPromptAllowed(shouldPrompt, interactive) {
@@ -1550,9 +1583,7 @@ function filterSelectionRowIndexes(rows, searchTerm) {
     return rows.map((_, index) => index);
   }
   return rows.reduce((acc, row, index) => {
-    const haystack = `${row.label} ${row.description || ""}`.toLocaleLowerCase(
-      "en-US"
-    );
+    const haystack = `${row.label} ${row.description || ""}`.toLocaleLowerCase("en-US");
     if (haystack.includes(normalized)) {
       acc.push(index);
     }
@@ -1611,9 +1642,7 @@ function buildRenderModel(options) {
       label: row.label,
       description: row.description
     })),
-    visibleRowIds: options.visibleIndexes.map(
-      (index) => options.rows[index].id
-    ),
+    visibleRowIds: options.visibleIndexes.map((index) => options.rows[index].id),
     activeVisibleIndex: options.activeVisibleIndex,
     selectedIds: options.selectedIds ?? selectedRowIds(options.rows),
     searchable: Boolean(options.request.searchable),
@@ -1689,14 +1718,8 @@ function renderManySelectionOpenPanel(config, model) {
 }
 function renderSingleSelectionOpenPanel(config, model) {
   const visibleRows = toVisibleRows(model);
-  const maxLabelWidth = visibleRows.reduce(
-    (max, row) => Math.max(max, row.label.length),
-    8
-  );
-  const maxDescWidth = visibleRows.reduce(
-    (max, row) => Math.max(max, row.description.length),
-    0
-  );
+  const maxLabelWidth = visibleRows.reduce((max, row) => Math.max(max, row.label.length), 8);
+  const maxDescWidth = visibleRows.reduce((max, row) => Math.max(max, row.description.length), 0);
   const layout = resolveSelectionPanelLayout({
     title: config.title,
     staticLines: [config.instructionLine, "\u2191\u2193 navigate   enter confirm"],
@@ -1731,9 +1754,7 @@ function SelectionRenderer({ content }) {
   return /* @__PURE__ */ jsx2(Box2, { flexDirection: "column", children: /* @__PURE__ */ jsx2(Text2, { children: content.replace(/\n$/, "") }) });
 }
 function MultiSelectPrompt(props) {
-  const initialSelectedIds = new Set(
-    props.options.initialSelectedIds || props.selectedIds || []
-  );
+  const initialSelectedIds = new Set(props.options.initialSelectedIds || props.selectedIds || []);
   const [rows, setRows] = useState2(
     props.rows.map((row) => ({
       ...row,
@@ -1744,16 +1765,10 @@ function MultiSelectPrompt(props) {
   const [activeVisibleIndex, setActiveVisibleIndex] = useState2(0);
   const [errorMessage, setErrorMessage] = useState2();
   const visibleIndexes = useMemo(
-    () => filterSelectionRowIndexes(
-      rows,
-      props.options.searchable !== false ? searchTerm : ""
-    ),
+    () => filterSelectionRowIndexes(rows, props.options.searchable !== false ? searchTerm : ""),
     [rows, searchTerm, props.options.searchable]
   );
-  const clampedIndex = clampActiveVisibleIndex(
-    activeVisibleIndex,
-    visibleIndexes.length
-  );
+  const clampedIndex = clampActiveVisibleIndex(activeVisibleIndex, visibleIndexes.length);
   useInput2((input, key) => {
     if (key.ctrl && input === "c") {
       props.onCancel(new PromptCancelledError());
@@ -1765,9 +1780,7 @@ function MultiSelectPrompt(props) {
     }
     if (key.upArrow) {
       if (visibleIndexes.length > 0) {
-        setActiveVisibleIndex(
-          (clampedIndex - 1 + visibleIndexes.length) % visibleIndexes.length
-        );
+        setActiveVisibleIndex((clampedIndex - 1 + visibleIndexes.length) % visibleIndexes.length);
       }
       setErrorMessage(void 0);
       return;
@@ -1780,9 +1793,7 @@ function MultiSelectPrompt(props) {
       return;
     }
     if (input === " ") {
-      setRows(
-        (prev) => toggleSelectionAtVisibleIndex(prev, visibleIndexes, clampedIndex)
-      );
+      setRows((prev) => toggleSelectionAtVisibleIndex(prev, visibleIndexes, clampedIndex));
       setErrorMessage(void 0);
       return;
     }
@@ -1810,9 +1821,7 @@ function MultiSelectPrompt(props) {
     if (key.return) {
       const selectedIds = selectedRowIds(rows);
       if ((props.options.required ?? true) && selectedIds.length === 0) {
-        setErrorMessage(
-          props.options.requiredMessage || DEFAULT_REQUIRED_MESSAGE
-        );
+        setErrorMessage(props.options.requiredMessage || DEFAULT_REQUIRED_MESSAGE);
         return;
       }
       props.onSubmit(selectedIds);
@@ -1875,9 +1884,7 @@ function SingleSelectPrompt(props) {
     if (key.return) {
       const selectedId2 = props.rows[activeVisibleIndex]?.id || "";
       if ((props.options.required ?? true) && !selectedId2) {
-        setErrorMessage(
-          props.options.requiredMessage || DEFAULT_REQUIRED_MESSAGE
-        );
+        setErrorMessage(props.options.requiredMessage || DEFAULT_REQUIRED_MESSAGE);
         return;
       }
       props.onSubmit(selectedId2);
@@ -1959,7 +1966,148 @@ async function runOneSelectionStep(options) {
   return selectedId;
 }
 
-// src/interactive.ts
+// ../../packages/cli-shared/src/add-command.ts
+function parseAddLockFormatValue(value) {
+  if (!value) {
+    return void 0;
+  }
+  if (value !== "json" && value !== "yaml") {
+    throw new Error(`Invalid --lock-format value: ${value}`);
+  }
+  return value;
+}
+function buildBaseAddOptions(input, presence = {}) {
+  const maxDownloadBytes = input.maxDownloadBytes ? Number(input.maxDownloadBytes) : void 0;
+  if (typeof maxDownloadBytes === "number" && (!Number.isFinite(maxDownloadBytes) || maxDownloadBytes <= 0)) {
+    throw new Error(`Invalid --max-download-bytes value: ${input.maxDownloadBytes}`);
+  }
+  const parsed = {
+    global: Boolean(input.global),
+    symlink: Boolean(input.symlink),
+    yaml: Boolean(input.yaml),
+    list: Boolean(input.list),
+    all: Boolean(input.all),
+    nonInteractive: Boolean(input.nonInteractive),
+    trustWellKnown: Boolean(input.trustWellKnown),
+    agent: normalizeAgentSelectionInput(input.agent),
+    skill: input.selectedNames,
+    allowHost: input.allowHost?.map((item) => item.toLowerCase()),
+    denyHost: input.denyHost?.map((item) => item.toLowerCase()),
+    maxDownloadBytes,
+    policyMode: input.policyMode,
+    lockFormat: parseAddLockFormatValue(input.lockFormat),
+    experimental: input.experimental ?? false
+  };
+  if (parsed.agent && parsed.agent.length > 0) {
+    parsed.agentFlagProvided = true;
+  }
+  if (presence.agentProvided) {
+    parsed.agentFlagProvided = true;
+  }
+  if (presence.globalProvided) {
+    parsed.globalFlagProvided = true;
+  }
+  if (presence.symlinkProvided) {
+    parsed.symlinkFlagProvided = true;
+  }
+  if (parsed.all) {
+    parsed.skill = ["*"];
+    parsed.agent = ["*"];
+  }
+  return parsed;
+}
+function buildNamedAddSelectionRows(items) {
+  return items.map((item) => ({
+    id: item.name,
+    label: item.name,
+    description: item.description
+  }));
+}
+function filterNamedAddSelection(items, requested) {
+  if (!requested || requested.length === 0) {
+    return [...items];
+  }
+  if (requested.includes("*")) {
+    return [...items];
+  }
+  const wanted = new Set(requested.map((item) => item.toLowerCase()));
+  return items.filter((item) => wanted.has(item.name.toLowerCase()));
+}
+async function resolveNamedAddSelection(options) {
+  const {
+    available,
+    interactive,
+    listMode,
+    requested,
+    rows,
+    keyHints,
+    view,
+    promptTitle,
+    requiredMessage,
+    emptyMessage,
+    multipleInNonInteractiveMessage,
+    renderClosed
+  } = options;
+  if (listMode) {
+    return filterNamedAddSelection(available, requested);
+  }
+  const prompt = {
+    title: promptTitle,
+    required: true,
+    requiredMessage,
+    searchable: true,
+    keyHints: [...keyHints],
+    view
+  };
+  if (requested) {
+    const selected = filterNamedAddSelection(available, requested);
+    if (selected.length > 0) {
+      await runManySelectionStep({
+        interactive,
+        rows: [...rows],
+        selectedIds: selected.map((item) => item.name),
+        shouldPrompt: false,
+        prompt,
+        renderClosed
+      });
+    }
+    return selected;
+  }
+  if (available.length === 0) {
+    throw new Error(emptyMessage);
+  }
+  if (available.length === 1) {
+    await runManySelectionStep({
+      interactive,
+      rows: [...rows],
+      selectedIds: [available[0].name],
+      shouldPrompt: false,
+      prompt,
+      renderClosed
+    });
+    return [...available];
+  }
+  if (!interactive) {
+    throw new Error(multipleInNonInteractiveMessage);
+  }
+  const selectedNames = await runManySelectionStep({
+    interactive,
+    rows: [...rows],
+    shouldPrompt: true,
+    prompt,
+    renderClosed
+  });
+  const wanted = new Set(selectedNames);
+  return available.filter((item) => wanted.has(item.name));
+}
+
+// ../../packages/core/src/runtime/installer.ts
+function sanitizeSkillName(name) {
+  const sanitized = name.toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^[.-]+|[.-]+$/g, "");
+  return sanitized || "unnamed-skill";
+}
+
+// ../../packages/cli-shared/src/interactive.ts
 function isPromptCancelledError(error) {
   return error instanceof PromptCancelledError;
 }
@@ -1997,7 +2145,7 @@ function parsePolicyMode(value) {
   throw new Error(`Invalid --policy-mode value: ${value}`);
 }
 
-// src/command-builder.ts
+// ../../packages/cli-shared/src/command-builder.ts
 import { CommanderError } from "commander";
 
 // ../../packages/core/src/runtime/telemetry.ts
@@ -2034,8 +2182,8 @@ function emitLifecycleEvent(emitter, event) {
   emitter.publish(row);
 }
 
-// src/command-builder.ts
-function createCliCommandContext(emitter, options) {
+// ../../packages/cli-shared/src/command-builder.ts
+function createCliCommandContext(emitter, options = {}) {
   const emitCommandEvent = (command, event) => {
     emitLifecycleEvent(emitter, {
       eventType: event.eventType,
@@ -2048,7 +2196,7 @@ function createCliCommandContext(emitter, options) {
     });
   };
   return {
-    experimental: options.experimental,
+    experimental: Boolean(options.experimental),
     emitCommandEvent,
     wrapAction: (command, action) => async (...args) => {
       emitCommandEvent(command, {
@@ -2075,12 +2223,52 @@ function createCliCommandContext(emitter, options) {
     }
   };
 }
+function applyExitOverride(command) {
+  command.exitOverride((error) => {
+    throw error;
+  });
+  for (const subcommand of command.commands) {
+    applyExitOverride(subcommand);
+  }
+}
+function isGracefulCommanderExit(error) {
+  return error instanceof CommanderError && (error.code === "commander.helpDisplayed" || error.code === "commander.version");
+}
+function inferCommandSource(argv, options = {}) {
+  const valueFlags = new Set(options.valueFlags ?? []);
+  for (let i = 0; i < argv.length; i += 1) {
+    const arg = argv[i];
+    if (valueFlags.has(arg)) {
+      i += 1;
+      continue;
+    }
+    if (arg.startsWith("-")) {
+      continue;
+    }
+    return arg;
+  }
+  return options.fallbackSource ?? "cli";
+}
+function emitCommanderParseErrorTelemetry(emitter, argv, error, options = {}) {
+  const source = inferCommandSource(argv, options);
+  emitLifecycleEvent(emitter, {
+    eventType: `${source}_failed`,
+    source,
+    reason: "commander_parse_error",
+    command: source,
+    status: "error",
+    error: error.message,
+    metadata: {
+      commanderCode: error.code
+    }
+  });
+}
 
 // ../../packages/platform-node/src/background-runner.ts
 import fs4 from "node:fs";
-import path6 from "node:path";
+import path5 from "node:path";
 import { spawn } from "node:child_process";
-import { fileURLToPath as fileURLToPath2 } from "node:url";
+import { fileURLToPath } from "node:url";
 var activeChildren = /* @__PURE__ */ new Set();
 var cleanupHandlersInstalled = false;
 function cleanupActiveChildren() {
@@ -2110,12 +2298,12 @@ function installCleanupHandlers() {
   }
 }
 function resolveWorkerEntry() {
-  const dir = path6.dirname(fileURLToPath2(import.meta.url));
-  const tsPath = path6.join(dir, "background-worker.ts");
+  const dir = path5.dirname(fileURLToPath(import.meta.url));
+  const tsPath = path5.join(dir, "background-worker.ts");
   if (fs4.existsSync(tsPath)) {
     return tsPath;
   }
-  return path6.join(dir, "background-worker.js");
+  return path5.join(dir, "background-worker.js");
 }
 function appendOutputChunk(chunks, chunk) {
   const next = chunk.toString();
@@ -2131,18 +2319,14 @@ async function runBackgroundTask(request, options) {
   installCleanupHandlers();
   return new Promise((resolve, reject) => {
     const childCwd = typeof request === "object" && request !== null && "payload" in request && typeof request.payload?.cwd === "string" ? request.payload.cwd : process.cwd();
-    const child = spawn(
-      process.execPath,
-      [...process.execArgv, resolveWorkerEntry()],
-      {
-        cwd: childCwd,
-        env: {
-          ...process.env,
-          SKILLSPP_BG_EXECUTOR: options.executorModule
-        },
-        stdio: ["ignore", "pipe", "pipe", "ipc"]
-      }
-    );
+    const child = spawn(process.execPath, [...process.execArgv, resolveWorkerEntry()], {
+      cwd: childCwd,
+      env: {
+        ...process.env,
+        SKILLSPP_BG_EXECUTOR: options.executorModule
+      },
+      stdio: ["ignore", "pipe", "pipe", "ipc"]
+    });
     activeChildren.add(child);
     const stdoutChunks = [];
     const stderrChunks = [];
@@ -2204,13 +2388,34 @@ async function runBackgroundTask(request, options) {
   });
 }
 
-// src/runtime/background-runner.ts
-async function runBackgroundTask2(request, options = {}) {
-  return runBackgroundTask(request, {
-    onProgress: options.onProgress,
-    executorModule: "@skillspp/core/runtime/background-tasks"
-  });
+// ../../packages/cli-shared/src/runtime/background-runner.ts
+import fs5 from "node:fs";
+import path6 from "node:path";
+import { fileURLToPath as fileURLToPath2, pathToFileURL } from "node:url";
+function resolveExecutorModule(importMetaUrl) {
+  const runtimeDir = path6.dirname(fileURLToPath2(importMetaUrl));
+  const localCandidates = [
+    path6.join(runtimeDir, "background-executor.js"),
+    path6.join(runtimeDir, "background-executor.ts")
+  ];
+  for (const candidate of localCandidates) {
+    if (fs5.existsSync(candidate)) {
+      return pathToFileURL(candidate).href;
+    }
+  }
+  return "@skillspp/core/runtime/background-tasks";
 }
+function createBackgroundTaskRunner(importMetaUrl) {
+  return async function runBackgroundTask3(request, options = {}) {
+    return runBackgroundTask(request, {
+      onProgress: options.onProgress,
+      executorModule: resolveExecutorModule(importMetaUrl)
+    });
+  };
+}
+
+// src/runtime/background-runner.ts
+var runBackgroundTask2 = createBackgroundTaskRunner(import.meta.url);
 
 // src/commands/add.ts
 var SKILL_NAME_WIDTH = 32;
@@ -2267,17 +2472,10 @@ var ADD_SCOPE_SELECTION_ROWS = [
     description: "Install into home-directory skills directories"
   }
 ];
-function buildAddSkillSelectionRows(skills) {
-  return skills.map((skill) => ({
-    id: skill.name,
-    label: skill.name,
-    description: skill.description
-  }));
-}
 function renderAddSkillsSection(options) {
   return manySelectionClosedSection(
     ADD_SKILLS_SELECTION_VIEW,
-    buildAddSkillSelectionRows(options.skills),
+    buildNamedAddSelectionRows(options.skills),
     options.selectedNames
   );
 }
@@ -2294,11 +2492,7 @@ function buildInstallationSummaryRows(options) {
   if (!canonicalAgent) {
     return rows;
   }
-  const canonicalBase = getAgentSkillsDir(
-    canonicalAgent,
-    options.globalInstall,
-    options.cwd
-  );
+  const canonicalBase = getAgentSkillsDir(canonicalAgent, options.globalInstall, options.cwd);
   for (const rawSkillName of options.skillNames) {
     const skillName = sanitizeSkillName(rawSkillName);
     const canonicalDir = path7.join(canonicalBase, skillName);
@@ -2354,95 +2548,33 @@ async function printAddListScreen(options) {
   ]);
 }
 async function resolveAddSkills(available, merged, interactive) {
-  const filterByRequestedName = (items, requested) => {
-    if (!requested || requested.length === 0) {
-      return items;
-    }
-    if (requested.includes("*")) {
-      return items;
-    }
-    const wanted2 = new Set(requested.map((item) => item.toLowerCase()));
-    return items.filter((item) => wanted2.has(item.name.toLowerCase()));
-  };
-  if (merged.list) {
-    return filterByRequestedName(available, merged.skill);
-  }
-  const skillRows = buildAddSkillSelectionRows(
+  const skillRows = buildNamedAddSelectionRows(
     available.map((item) => ({
       name: item.name,
       description: item.description
     }))
   );
-  const renderClosed = (selectedNames2) => renderAddSkillsSection({
+  const renderClosed = (selectedNames) => renderAddSkillsSection({
     skills: available.map((item) => ({
       name: item.name,
       description: item.description
     })),
-    selectedNames: selectedNames2
+    selectedNames
   });
-  if (merged.skill) {
-    const selected = filterByRequestedName(available, merged.skill);
-    if (selected.length > 0) {
-      await runManySelectionStep({
-        interactive,
-        rows: skillRows,
-        selectedIds: selected.map((item) => item.name),
-        shouldPrompt: false,
-        prompt: {
-          title: "Choose Skills",
-          required: true,
-          requiredMessage: "At least one skill must be selected",
-          searchable: true,
-          keyHints: ADD_SKILLS_KEY_HINTS,
-          view: ADD_SKILLS_SELECTION_VIEW
-        },
-        renderClosed
-      });
-    }
-    return selected;
-  }
-  if (available.length === 0) {
-    throw new Error("No skills available");
-  }
-  if (available.length === 1) {
-    await runManySelectionStep({
-      interactive,
-      rows: skillRows,
-      selectedIds: [available[0].name],
-      shouldPrompt: false,
-      prompt: {
-        title: "Choose Skills",
-        required: true,
-        requiredMessage: "At least one skill must be selected",
-        searchable: true,
-        keyHints: ADD_SKILLS_KEY_HINTS,
-        view: ADD_SKILLS_SELECTION_VIEW
-      },
-      renderClosed
-    });
-    return available;
-  }
-  if (!interactive) {
-    throw new Error(
-      "Multiple skills found. Use --skill <name> or run in TTY without --non-interactive."
-    );
-  }
-  const selectedNames = await runManySelectionStep({
+  return resolveNamedAddSelection({
+    available,
     interactive,
+    listMode: merged.list,
+    requested: merged.skill,
     rows: skillRows,
-    shouldPrompt: true,
-    prompt: {
-      title: "Choose Skills",
-      required: true,
-      requiredMessage: "At least one skill must be selected",
-      searchable: true,
-      keyHints: ADD_SKILLS_KEY_HINTS,
-      view: ADD_SKILLS_SELECTION_VIEW
-    },
+    keyHints: ADD_SKILLS_KEY_HINTS,
+    view: ADD_SKILLS_SELECTION_VIEW,
+    promptTitle: "Choose Skills",
+    requiredMessage: "At least one skill must be selected",
+    emptyMessage: "No skills available",
+    multipleInNonInteractiveMessage: "Multiple skills found. Use --skill <name> or run in TTY without --non-interactive.",
     renderClosed
   });
-  const wanted = new Set(selectedNames);
-  return available.filter((item) => wanted.has(item.name));
 }
 async function resolveAddAgents(merged, globalInstall, interactive) {
   const rows = resolveAddAgentSelectionRows(globalInstall ? "global" : "local");
@@ -2490,9 +2622,7 @@ async function resolveAddAgents(merged, globalInstall, interactive) {
     return selectedAgents;
   }
   if (!interactive) {
-    throw new Error(
-      "Missing --agent in non-interactive mode. Provide at least one agent."
-    );
+    throw new Error("Missing --agent in non-interactive mode. Provide at least one agent.");
   }
   if (allForScope.length === 1) {
     await runManySelectionStep({
@@ -2563,56 +2693,27 @@ function resolveAddInstallMode(merged) {
   }
   return "copy";
 }
-function parseLockFormatValue(value) {
-  if (!value) {
-    return void 0;
-  }
-  if (value !== "json" && value !== "yaml") {
-    throw new Error(`Invalid --lock-format value: ${value}`);
-  }
-  return value;
-}
 function toAddOptions(options, presence = {}) {
-  const maxDownloadBytes = options.maxDownloadBytes ? Number(options.maxDownloadBytes) : void 0;
-  if (typeof maxDownloadBytes === "number" && (!Number.isFinite(maxDownloadBytes) || maxDownloadBytes <= 0)) {
-    throw new Error(
-      `Invalid --max-download-bytes value: ${options.maxDownloadBytes}`
-    );
-  }
-  const parsed = {
-    global: Boolean(options.global),
-    symlink: Boolean(options.symlink),
-    yaml: Boolean(options.yaml),
-    list: Boolean(options.list),
-    all: Boolean(options.all),
-    nonInteractive: Boolean(options.nonInteractive),
-    trustWellKnown: Boolean(options.trustWellKnown),
-    agent: normalizeAgentSelectionInput(options.agent),
-    skill: options.skill,
-    allowHost: options.allowHost?.map((item) => item.toLowerCase()),
-    denyHost: options.denyHost?.map((item) => item.toLowerCase()),
-    maxDownloadBytes,
-    policyMode: parsePolicyMode(options.policyMode),
-    lockFormat: parseLockFormatValue(options.lockFormat),
-    experimental: false
-  };
-  if (parsed.agent && parsed.agent.length > 0) {
-    parsed.agentFlagProvided = true;
-  }
-  if (presence.agentProvided) {
-    parsed.agentFlagProvided = true;
-  }
-  if (presence.globalProvided) {
-    parsed.globalFlagProvided = true;
-  }
-  if (presence.symlinkProvided) {
-    parsed.symlinkFlagProvided = true;
-  }
-  if (parsed.all) {
-    parsed.skill = ["*"];
-    parsed.agent = ["*"];
-  }
-  return parsed;
+  return buildBaseAddOptions(
+    {
+      global: options.global,
+      symlink: options.symlink,
+      yaml: options.yaml,
+      list: options.list,
+      all: options.all,
+      nonInteractive: options.nonInteractive,
+      trustWellKnown: options.trustWellKnown,
+      agent: options.agent,
+      selectedNames: options.skill,
+      allowHost: options.allowHost,
+      denyHost: options.denyHost,
+      maxDownloadBytes: options.maxDownloadBytes,
+      policyMode: parsePolicyMode(options.policyMode),
+      lockFormat: options.lockFormat,
+      experimental: false
+    },
+    presence
+  );
 }
 async function executeAdd(sourceInput, merged) {
   const interactive = canUseInteractive(merged.nonInteractive);
@@ -2625,9 +2726,7 @@ async function executeAdd(sourceInput, merged) {
       sourceLabel = resolveSourceLabel(parsedSource);
     } catch (error) {
       hideLoader();
-      await renderStaticScreen([
-        failedStepsSection(["failed to parse source"])
-      ]);
+      await renderStaticScreen([failedStepsSection(["failed to parse source"])]);
       throw error;
     }
     hideLoader();
@@ -2653,26 +2752,17 @@ async function executeAdd(sourceInput, merged) {
       );
     } catch (error) {
       hideLoader();
-      await renderStaticScreen([
-        failedStepsSection(["failed to fetch skill index"])
-      ]);
+      await renderStaticScreen([failedStepsSection(["failed to fetch skill index"])]);
       throw error;
     }
     hideLoader();
     await renderStaticScreen([
-      completedStepsSection([
-        "skill index fetched",
-        "interactive session ready"
-      ])
+      completedStepsSection(["skill index fetched", "interactive session ready"])
     ]);
     if (!merged.list) {
       await renderStaticScreen([sourceSection(shortenHomePath(sourceLabel))]);
     }
-    const selected = await resolveAddSkills(
-      discovered.skills,
-      merged,
-      interactive
-    );
+    const selected = await resolveAddSkills(discovered.skills, merged, interactive);
     if (selected.length === 0) {
       if (parsedSource.type === "well-known" || parsedSource.type === "catalog") {
         throw new Error("No matching well-known skills found in source");
@@ -2695,11 +2785,7 @@ async function executeAdd(sourceInput, merged) {
       global: globalInstall,
       globalFlagProvided: true
     };
-    const agents = await resolveAddAgents(
-      installOptions,
-      globalInstall,
-      interactive
-    );
+    const agents = await resolveAddAgents(installOptions, globalInstall, interactive);
     const mode = resolveAddInstallMode(merged);
     await printInstallationSummary({
       skillNames: selected.map((item) => item.name),
@@ -2731,9 +2817,7 @@ async function executeAdd(sourceInput, merged) {
       );
     } catch (error) {
       hideLoader();
-      await renderStaticScreen([
-        failedStepsSection(["failed to install skills"])
-      ]);
+      await renderStaticScreen([failedStepsSection(["failed to install skills"])]);
       throw error;
     }
     hideLoader();
@@ -2754,13 +2838,7 @@ async function executeAdd(sourceInput, merged) {
   }
 }
 function configureAddCommand(command, action) {
-  return command.description("Install skills from local path or git source").argument("<source>", "Source path or URL").option("-a, --agent <agents...>", "Target agent(s) for installation").option("-s, --skill <skills...>", "Install only selected skill(s)").option("-l, --list", "List skills from source without installing").option("--symlink", "Install by symlinking files to all agents").option(
-    "--yaml",
-    "Create skill-installer.yaml when scaffolding missing installer config"
-  ).option("-g, --global", "Install globally").option("--trust-well-known", "Allow hook commands for well-known source").option("--allow-host <hosts...>", "Restrict well-known hosts to allowlist").option("--deny-host <hosts...>", "Block specific well-known hosts").option("--max-download-bytes <n>", "Set well-known download budget").option("--policy-mode <mode>", "Policy mode (enforce|warn)").option("--lock-format <format>", "Lockfile format output (json|yaml)").option(
-    "--non-interactive",
-    "Disable prompts and require explicit selection"
-  ).option("--all", "Install all skills and known agents").action(action);
+  return command.description("Install skills from local path or git source").argument("<source>", "Source path or URL").option("-a, --agent <agents...>", "Target agent(s) for installation").option("-s, --skill <skills...>", "Install only selected skill(s)").option("-l, --list", "List skills from source without installing").option("--symlink", "Install by symlinking files to all agents").option("--yaml", "Create skill-installer.yaml when scaffolding missing installer config").option("-g, --global", "Install globally").option("--trust-well-known", "Allow hook commands for well-known source").option("--allow-host <hosts...>", "Restrict well-known hosts to allowlist").option("--deny-host <hosts...>", "Block specific well-known hosts").option("--max-download-bytes <n>", "Set well-known download budget").option("--policy-mode <mode>", "Policy mode (enforce|warn)").option("--lock-format <format>", "Lockfile format output (json|yaml)").option("--non-interactive", "Disable prompts and require explicit selection").option("--all", "Install all skills and known agents").action(action);
 }
 function registerAddCommand(program, ctx) {
   configureAddCommand(
@@ -2786,7 +2864,7 @@ function registerAddCommand(program, ctx) {
 import { Command as Command3 } from "commander";
 
 // ../../packages/core/src/sources/git.ts
-import fs5 from "node:fs";
+import fs6 from "node:fs";
 import os3 from "node:os";
 import path8 from "node:path";
 import { spawn as spawn2, spawnSync } from "node:child_process";
@@ -2812,12 +2890,12 @@ function applyCheckoutRefSync(repoDir, ref) {
 }
 function prepareSourceDir(parsed) {
   if (parsed.type === "local") {
-    if (!fs5.existsSync(parsed.localPath)) {
+    if (!fs6.existsSync(parsed.localPath)) {
       throw new Error(`Local source not found: ${parsed.localPath}`);
     }
     return { basePath: parsed.localPath };
   }
-  const tmp = fs5.mkdtempSync(path8.join(os3.tmpdir(), "skillspp-cli-"));
+  const tmp = fs6.mkdtempSync(path8.join(os3.tmpdir(), "skillspp-cli-"));
   runGit(["clone", "--depth", "1", parsed.repoUrl, tmp]);
   const ref = parsed.type === "github" ? parsed.ref : void 0;
   applyCheckoutRefSync(tmp, ref);
@@ -2825,7 +2903,7 @@ function prepareSourceDir(parsed) {
   return {
     basePath,
     cleanup: () => {
-      fs5.rmSync(tmp, { recursive: true, force: true });
+      fs6.rmSync(tmp, { recursive: true, force: true });
     }
   };
 }
@@ -2872,11 +2950,54 @@ var DEFAULT_OPTIONS = {
   maxFilesPerSkill: 128,
   maxSkillFileBytes: 512 * 1024
 };
-var EXCLUDED_HOSTS = /* @__PURE__ */ new Set([
-  "github.com",
-  "gitlab.com",
-  "raw.githubusercontent.com"
-]);
+var EXCLUDED_HOSTS = /* @__PURE__ */ new Set(["github.com", "gitlab.com", "raw.githubusercontent.com"]);
+var SKILL_CONFIG = {
+  kind: "skills",
+  displayLabel: "well-known skills",
+  indexPath: "/.well-known/skills/index.json",
+  entryLabel: "skill",
+  requireDescription: true,
+  missingManifestMessage: (name) => `Well-known skill '${name}' is missing SKILL.md`,
+  validateName(name) {
+    if (!/^[a-z0-9]([a-z0-9-]{0,62}[a-z0-9])?$/.test(name)) {
+      throw new Error(`Invalid well-known skill name: ${name}`);
+    }
+  },
+  hasRequiredManifest(filePath) {
+    return filePath.toLowerCase() === "skill.md";
+  },
+  buildRemoteResult({ entry, files, sourceUrl }) {
+    return {
+      name: entry.name,
+      description: entry.description || "",
+      installName: entry.name,
+      sourceUrl,
+      sourceType: "well-known",
+      files
+    };
+  }
+};
+var PLUGIN_CONFIG = {
+  kind: "plugins",
+  displayLabel: "well-known plugins",
+  indexPath: "/.well-known/plugins/index.json",
+  entryLabel: "plugin",
+  requireDescription: false,
+  missingManifestMessage: (name) => `Well-known plugin '${name}' is missing plugin.json`,
+  hasRequiredManifest(filePath) {
+    return filePath.split("/").at(-1)?.toLowerCase() === "plugin.json";
+  },
+  buildRemoteResult({ entry, files, sourceUrl }) {
+    return {
+      name: entry.name,
+      description: entry.description || "",
+      installName: entry.name,
+      sourceUrl,
+      sourceType: "well-known",
+      files
+    };
+  }
+};
 var SecureWellKnownProvider = class {
   id = "well-known";
   displayName = "Secure Well-Known Skills";
@@ -2896,10 +3017,16 @@ var SecureWellKnownProvider = class {
   }
   getSourceIdentifier(url) {
     const parsed = new URL(url);
-    const path16 = parsed.pathname.replace(/\/$/, "");
-    return path16 && path16 !== "/" ? `wellknown/${parsed.hostname}${path16}` : `wellknown/${parsed.hostname}`;
+    const pathname = parsed.pathname.replace(/\/$/, "");
+    return pathname && pathname !== "/" ? `wellknown/${parsed.hostname}${pathname}` : `wellknown/${parsed.hostname}`;
   }
   async fetchAllSkills(url, options = {}) {
+    return this.fetchAllResources(url, options, SKILL_CONFIG);
+  }
+  async fetchAllPlugins(url, options = {}) {
+    return this.fetchAllResources(url, options, PLUGIN_CONFIG);
+  }
+  async fetchAllResources(url, options, config) {
     const normalized = this.normalizeOptions(options);
     const budget = { remaining: normalized.maxDownloadBytes };
     const parsed = new URL(url);
@@ -2907,29 +3034,19 @@ var SecureWellKnownProvider = class {
       throw new Error("Well-known provider requires HTTPS URLs");
     }
     await this.assertHostAllowed(parsed.hostname, normalized);
-    const { index, resolvedBase } = await this.fetchIndex(
-      parsed,
-      normalized,
-      budget
-    );
-    const skills = [];
-    for (const entry of index.skills) {
-      const skill = await this.fetchSkillByEntry(
-        resolvedBase,
-        entry,
-        normalized,
-        budget
+    const { index, resolvedBase } = await this.fetchIndex(parsed, normalized, budget, config);
+    const resources = [];
+    for (const entry of index) {
+      resources.push(
+        await this.fetchResourceByEntry(resolvedBase, entry, normalized, budget, config)
       );
-      if (skill) {
-        skills.push(skill);
-      }
     }
-    return skills;
+    return resources;
   }
   normalizeOptions(options) {
     return {
-      allowHosts: (options.allowHosts || []).map((x) => x.trim().toLowerCase()).filter(Boolean),
-      denyHosts: (options.denyHosts || []).map((x) => x.trim().toLowerCase()).filter(Boolean),
+      allowHosts: (options.allowHosts || []).map((value) => value.trim().toLowerCase()).filter(Boolean),
+      denyHosts: (options.denyHosts || []).map((value) => value.trim().toLowerCase()).filter(Boolean),
       maxDownloadBytes: options.maxDownloadBytes ?? DEFAULT_OPTIONS.maxDownloadBytes,
       timeoutMs: options.timeoutMs ?? DEFAULT_OPTIONS.timeoutMs,
       maxRedirects: options.maxRedirects ?? DEFAULT_OPTIONS.maxRedirects,
@@ -2937,10 +3054,10 @@ var SecureWellKnownProvider = class {
       maxSkillFileBytes: options.maxSkillFileBytes ?? DEFAULT_OPTIONS.maxSkillFileBytes
     };
   }
-  async fetchIndex(parsedUrl, options, budget) {
-    const candidates = this.buildBaseCandidates(parsedUrl);
+  async fetchIndex(parsedUrl, options, budget, config) {
+    const candidates = this.buildBaseCandidates(parsedUrl, config.indexPath);
     for (const base of candidates) {
-      const indexUrl = `${base}/.well-known/skills/index.json`;
+      const indexUrl = `${base}${config.indexPath}`;
       try {
         const jsonText = await this.fetchTextWithLimit(
           indexUrl,
@@ -2949,20 +3066,18 @@ var SecureWellKnownProvider = class {
           budget
         );
         const parsed = JSON.parse(jsonText);
-        const validated = this.validateIndex(parsed, options.maxFilesPerSkill);
+        const validated = this.validateIndex(parsed, options.maxFilesPerSkill, config);
         return { index: validated, resolvedBase: base };
       } catch {
         continue;
       }
     }
-    throw new Error(
-      "No valid well-known skills index found at /.well-known/skills/index.json"
-    );
+    throw new Error(`No valid ${config.displayLabel} index found at ${config.indexPath}`);
   }
-  buildBaseCandidates(parsed) {
+  buildBaseCandidates(parsed, indexPath) {
     const origin = parsed.origin;
     const pathname = parsed.pathname.replace(/\/$/, "");
-    const marker = "/.well-known/skills";
+    const marker = indexPath.replace(/\/index\.json$/, "");
     const out = [];
     if (pathname.includes(marker)) {
       const prefix = pathname.slice(0, pathname.indexOf(marker));
@@ -2977,53 +3092,52 @@ var SecureWellKnownProvider = class {
       }
     }
     return [
-      ...new Set(out.map((x) => x.endsWith("/") ? x.slice(0, -1) : x))
+      ...new Set(out.map((value) => value.endsWith("/") ? value.slice(0, -1) : value))
     ].filter(Boolean);
   }
-  validateIndex(raw, maxFilesPerSkill) {
+  validateIndex(raw, maxFilesPerSkill, config) {
     if (!raw || typeof raw !== "object") {
       throw new Error("Invalid well-known index: expected object");
     }
     const data = raw;
-    if (!Array.isArray(data.skills)) {
-      throw new Error("Invalid well-known index: 'skills' must be an array");
+    const rows = data[config.kind];
+    if (!Array.isArray(rows)) {
+      throw new Error(`Invalid well-known index: '${config.kind}' must be an array`);
     }
-    const skills = data.skills.map((item, idx) => {
+    return rows.map((item, idx) => {
       if (!item || typeof item !== "object") {
         throw new Error(`Invalid well-known index entry[${idx}]`);
       }
       const row = item;
       const name = String(row.name || "").trim();
-      const description = String(row.description || "").trim();
-      const files = Array.isArray(row.files) ? row.files.map((x) => String(x)) : [];
-      if (!name || !description || files.length === 0) {
-        throw new Error(
-          `Invalid well-known index entry[${idx}]: missing required fields`
-        );
+      const description = typeof row.description === "string" ? row.description.trim() : void 0;
+      const files = Array.isArray(row.files) ? row.files.map((value) => String(value)) : [];
+      if (!name || files.length === 0) {
+        throw new Error(`Invalid well-known index entry[${idx}]: missing required fields`);
       }
-      if (!/^[a-z0-9]([a-z0-9-]{0,62}[a-z0-9])?$/.test(name)) {
-        throw new Error(`Invalid well-known skill name: ${name}`);
+      if (config.requireDescription && !description) {
+        throw new Error(`Invalid well-known index entry[${idx}]: missing required fields`);
       }
+      config.validateName?.(name);
       if (files.length > maxFilesPerSkill) {
-        throw new Error(`Too many files in well-known skill '${name}'`);
+        throw new Error(`Too many files in well-known ${config.entryLabel} '${name}'`);
       }
-      if (!files.some((f) => f.toLowerCase() === "skill.md")) {
-        throw new Error(`Well-known skill '${name}' is missing SKILL.md`);
+      if (!files.some((filePath) => config.hasRequiredManifest(filePath))) {
+        throw new Error(config.missingManifestMessage(name));
       }
       for (const file of files) {
         this.assertSafeRelativePath(file);
       }
       return { name, description, files };
     });
-    return { skills };
   }
   assertSafeRelativePath(filePath) {
     if (!filePath || filePath.startsWith("/") || filePath.startsWith("\\") || filePath.includes("..") || filePath.includes("\\")) {
       throw new Error(`Unsafe well-known file path: ${filePath}`);
     }
   }
-  async fetchSkillByEntry(resolvedBase, entry, options, budget) {
-    const baseUrl = `${resolvedBase}/.well-known/skills/${entry.name}`;
+  async fetchResourceByEntry(resolvedBase, entry, options, budget, config) {
+    const baseUrl = `${resolvedBase}/.well-known/${config.kind}/${entry.name}`;
     const files = /* @__PURE__ */ new Map();
     for (const filePath of entry.files) {
       this.assertSafeRelativePath(filePath);
@@ -3035,24 +3149,31 @@ var SecureWellKnownProvider = class {
         budget
       );
       if (text.includes("\0")) {
-        throw new Error(
-          `Binary content is not allowed in well-known file: ${filePath}`
-        );
+        throw new Error(`Binary content is not allowed in well-known file: ${filePath}`);
       }
       files.set(filePath, text);
     }
-    const skillContent = files.get("SKILL.md") || files.get("skill.md");
-    if (!skillContent) {
-      return null;
+    const manifestPath = this.pickPrimaryManifestPath(entry.files, config);
+    return config.buildRemoteResult({
+      entry,
+      files,
+      sourceUrl: `${baseUrl}/${manifestPath}`
+    });
+  }
+  pickPrimaryManifestPath(filePaths, config) {
+    const manifests = filePaths.filter((filePath) => config.hasRequiredManifest(filePath)).sort((left, right) => {
+      const leftDepth = left.split("/").length;
+      const rightDepth = right.split("/").length;
+      if (leftDepth !== rightDepth) {
+        return leftDepth - rightDepth;
+      }
+      return left.localeCompare(right);
+    });
+    const manifestPath = manifests[0];
+    if (!manifestPath) {
+      throw new Error("Missing required manifest in well-known index entry");
     }
-    return {
-      name: entry.name,
-      description: entry.description,
-      installName: entry.name,
-      sourceUrl: `${baseUrl}/SKILL.md`,
-      sourceType: "well-known",
-      files
-    };
+    return manifestPath;
   }
   async fetchTextWithLimit(url, maxPerRequestBytes, options, budget) {
     let currentUrl = url;
@@ -3087,111 +3208,61 @@ var SecureWellKnownProvider = class {
         continue;
       }
       if (!response.ok) {
-        throw new Error(
-          `Fetch failed (${response.status} ${response.statusText}) for ${currentUrl}`
-        );
-      }
-      const contentLengthHeader = response.headers.get("content-length");
-      if (contentLengthHeader) {
-        const declared = Number(contentLengthHeader);
-        if (Number.isFinite(declared) && declared > maxPerRequestBytes) {
-          throw new Error(
-            `Response exceeds per-file size limit for ${currentUrl}`
-          );
-        }
-        if (Number.isFinite(declared) && declared > budget.remaining) {
-          throw new Error(
-            `Response exceeds remaining download budget for ${currentUrl}`
-          );
-        }
-      }
-      const reader = response.body?.getReader();
-      if (!reader) {
-        return "";
+        throw new Error(`Failed to fetch ${currentUrl}: ${response.status} ${response.statusText}`);
       }
-      let received = 0;
-      const chunks = [];
-      while (true) {
-        const result = await reader.read();
-        if (result.done) {
-          break;
-        }
-        const chunk = result.value;
-        received += chunk.byteLength;
-        if (received > maxPerRequestBytes) {
-          throw new Error(
-            `Response exceeded per-file size limit for ${currentUrl}`
-          );
-        }
-        if (received > budget.remaining) {
-          throw new Error(
-            `Response exceeded remaining download budget for ${currentUrl}`
-          );
-        }
-        chunks.push(chunk);
+      const bytes = new Uint8Array(await response.arrayBuffer());
+      if (bytes.byteLength > maxPerRequestBytes) {
+        throw new Error(`Exceeded per-file download limit for ${currentUrl}`);
       }
-      budget.remaining -= received;
-      const total = new Uint8Array(received);
-      let offset = 0;
-      for (const chunk of chunks) {
-        total.set(chunk, offset);
-        offset += chunk.byteLength;
+      budget.remaining -= bytes.byteLength;
+      if (budget.remaining < 0) {
+        throw new Error(`Exceeded total download budget while fetching ${url}`);
       }
-      return new TextDecoder("utf-8", { fatal: false }).decode(total);
+      return new TextDecoder("utf8").decode(bytes);
     }
   }
   async assertHostAllowed(hostname, options) {
-    const host = hostname.toLowerCase();
-    if (options.denyHosts.includes(host)) {
-      throw new Error(`Well-known host denied by policy: ${hostname}`);
+    const lowerHost = hostname.toLowerCase();
+    if (options.denyHosts.includes(lowerHost)) {
+      throw new Error(`Host '${hostname}' is explicitly denied`);
     }
-    if (options.allowHosts.length > 0 && !options.allowHosts.includes(host)) {
-      throw new Error(`Well-known host is not in allowlist: ${hostname}`);
+    if (options.allowHosts.length > 0 && !options.allowHosts.includes(lowerHost)) {
+      throw new Error(`Host '${hostname}' is not in allowed host list`);
     }
-    if (this.isLocalHostname(host)) {
-      throw new Error(`Well-known host is not allowed: ${hostname}`);
+    if (isLocalHostname(lowerHost)) {
+      throw new Error(`Local or loopback host '${hostname}' is not allowed`);
     }
-    const records = await this.resolveHostIps(host);
-    for (const ip of records) {
-      if (this.isPrivateOrLocalIp(ip)) {
-        throw new Error(
-          `Well-known host resolves to private/local address: ${hostname}`
-        );
-      }
+    const ips = await resolveHostIps(hostname);
+    if (ips.some((ip) => isPrivateOrLocalIp(ip))) {
+      throw new Error(`Host '${hostname}' resolves to a private/local address`);
     }
   }
-  isLocalHostname(host) {
-    return host === "localhost" || host.endsWith(".local") || host.endsWith(".internal") || host === "0.0.0.0";
-  }
-  async resolveHostIps(hostname) {
-    const out = /* @__PURE__ */ new Set();
-    try {
-      const records = await dns.lookup(hostname, { all: true });
-      for (const record of records) {
-        out.add(record.address);
-      }
-    } catch {
+};
+function isLocalHostname(hostname) {
+  return hostname === "localhost" || hostname.endsWith(".localhost") || hostname.endsWith(".local");
+}
+async function resolveHostIps(hostname) {
+  const out = /* @__PURE__ */ new Set();
+  try {
+    const entries = await dns.lookup(hostname, { all: true });
+    for (const entry of entries) {
+      out.add(entry.address);
     }
-    return [...out];
+  } catch {
   }
-  isPrivateOrLocalIp(ip) {
-    if (!net.isIP(ip)) {
-      return false;
-    }
-    if (net.isIPv4(ip)) {
-      const parts = ip.split(".").map((x) => Number(x));
-      const [a, b] = parts;
-      if (a === 10 || a === 127 || a === 0) return true;
-      if (a === 169 && b === 254) return true;
-      if (a === 172 && b >= 16 && b <= 31) return true;
-      if (a === 192 && b === 168) return true;
-      if (a >= 224) return true;
-      return false;
-    }
-    const value = ip.toLowerCase();
-    return value === "::1" || value === "::" || value.startsWith("fc") || value.startsWith("fd") || value.startsWith("fe80:");
+  return [...out];
+}
+function isPrivateOrLocalIp(ip) {
+  const family = net.isIP(ip);
+  if (family === 4) {
+    return ip.startsWith("10.") || ip.startsWith("127.") || ip.startsWith("169.254.") || ip.startsWith("192.168.") || /^172\.(1[6-9]|2\d|3[0-1])\./.test(ip);
   }
-};
+  if (family === 6) {
+    const normalized = ip.toLowerCase();
+    return normalized === "::1" || normalized.startsWith("fc") || normalized.startsWith("fd") || normalized.startsWith("fe80:");
+  }
+  return false;
+}
 var wellKnownProvider = new SecureWellKnownProvider();
 
 // ../../packages/core/src/providers/catalog.ts
@@ -3220,6 +3291,60 @@ var HttpCatalogProvider = class {
     return `catalog/${parsed.host}${parsed.pathname.replace(/\/+$/, "")}`;
   }
   async fetchAllSkills(url, options = {}) {
+    return this.fetchAllResources(url, options, {
+      kind: "skills",
+      indexLabel: "catalog skills",
+      resolveIndexUrl(parsed) {
+        return parsed.pathname.endsWith(".json") ? parsed.toString() : new URL(
+          "index.json",
+          parsed.toString().endsWith("/") ? parsed.toString() : `${parsed.toString()}/`
+        ).toString();
+      },
+      requireDescription: true,
+      missingManifestMessage: (name) => `Catalog skill '${name}' is missing SKILL.md`,
+      hasRequiredManifest(filePath) {
+        return filePath.toLowerCase() === "skill.md";
+      },
+      buildRemoteResult({ entry, files, sourceUrl }) {
+        return {
+          name: entry.name,
+          description: entry.description || "",
+          installName: entry.name,
+          sourceUrl,
+          sourceType: "catalog",
+          files
+        };
+      }
+    });
+  }
+  async fetchAllPlugins(url, options = {}) {
+    return this.fetchAllResources(url, options, {
+      kind: "plugins",
+      indexLabel: "catalog plugins",
+      resolveIndexUrl(parsed) {
+        return parsed.pathname.endsWith(".json") ? parsed.toString() : new URL(
+          "plugins/index.json",
+          parsed.toString().endsWith("/") ? parsed.toString() : `${parsed.toString()}/`
+        ).toString();
+      },
+      requireDescription: false,
+      missingManifestMessage: (name) => `Catalog plugin '${name}' is missing plugin.json`,
+      hasRequiredManifest(filePath) {
+        return filePath.split("/").at(-1)?.toLowerCase() === "plugin.json";
+      },
+      buildRemoteResult({ entry, files, sourceUrl }) {
+        return {
+          name: entry.name,
+          description: entry.description || "",
+          installName: entry.name,
+          sourceUrl,
+          sourceType: "catalog",
+          files
+        };
+      }
+    });
+  }
+  async fetchAllResources(url, options, config) {
     const parsed = new URL(url);
     if (parsed.protocol !== "https:") {
       throw new Error("Catalog provider requires HTTPS URLs");
@@ -3228,23 +3353,17 @@ var HttpCatalogProvider = class {
     const timeoutMs = options.timeoutMs ?? DEFAULT_OPTIONS2.timeoutMs;
     const maxFilesPerSkill = options.maxFilesPerSkill ?? DEFAULT_OPTIONS2.maxFilesPerSkill;
     const maxSkillFileBytes = options.maxSkillFileBytes ?? DEFAULT_OPTIONS2.maxSkillFileBytes;
-    const indexUrl = parsed.pathname.endsWith(".json") ? parsed.toString() : new URL(
-      "index.json",
-      parsed.toString().endsWith("/") ? parsed.toString() : `${parsed.toString()}/`
-    ).toString();
+    const indexUrl = config.resolveIndexUrl(parsed);
     const indexText = await this.fetchTextWithLimit(
       indexUrl,
       Math.min(maxDownloadBytes, maxSkillFileBytes),
       timeoutMs
     );
-    const index = this.validateIndex(
-      JSON.parse(indexText),
-      maxFilesPerSkill
-    );
+    const index = this.validateIndex(JSON.parse(indexText), maxFilesPerSkill, config);
     const out = [];
     let remaining = maxDownloadBytes - indexText.length;
     const indexBase = indexUrl.slice(0, indexUrl.lastIndexOf("/") + 1);
-    for (const row of index.skills) {
+    for (const row of index) {
       const files = /* @__PURE__ */ new Map();
       for (const rel of row.files) {
         this.assertSafeRelativePath(rel);
@@ -3260,14 +3379,16 @@ var HttpCatalogProvider = class {
         remaining -= text.length;
         files.set(rel, text);
       }
-      out.push({
-        name: row.name,
-        description: row.description,
-        installName: row.name,
-        sourceUrl: new URL(`${row.name}/SKILL.md`, indexBase).toString(),
-        sourceType: "catalog",
-        files
-      });
+      out.push(
+        config.buildRemoteResult({
+          entry: row,
+          files,
+          sourceUrl: new URL(
+            `${row.name}/${this.pickPrimaryManifestPath(row.files, config)}`,
+            indexBase
+          ).toString()
+        })
+      );
     }
     return out;
   }
@@ -3290,39 +3411,55 @@ var HttpCatalogProvider = class {
       clearTimeout(timeout);
     }
   }
-  validateIndex(raw, maxFilesPerSkill) {
+  validateIndex(raw, maxFilesPerSkill, config) {
     if (!raw || typeof raw !== "object") {
       throw new Error("Invalid catalog index: expected object");
     }
     const data = raw;
-    if (!Array.isArray(data.skills)) {
-      throw new Error("Invalid catalog index: 'skills' must be an array");
+    const rows = data[config.kind];
+    if (!Array.isArray(rows)) {
+      throw new Error(`Invalid catalog index: '${config.kind}' must be an array`);
     }
-    const skills = data.skills.map((item, idx) => {
+    return rows.map((item, idx) => {
       if (!item || typeof item !== "object") {
         throw new Error(`Invalid catalog index entry[${idx}]`);
       }
       const row = item;
       const name = String(row.name || "").trim();
-      const description = String(row.description || "").trim();
+      const description = typeof row.description === "string" ? row.description.trim() : void 0;
       const files = Array.isArray(row.files) ? row.files.map((x) => String(x)) : [];
-      if (!name || !description || files.length === 0) {
-        throw new Error(
-          `Invalid catalog index entry[${idx}]: missing required fields`
-        );
+      if (!name || files.length === 0) {
+        throw new Error(`Invalid catalog index entry[${idx}]: missing required fields`);
+      }
+      if (config.requireDescription && !description) {
+        throw new Error(`Invalid catalog index entry[${idx}]: missing required fields`);
       }
       if (files.length > maxFilesPerSkill) {
-        throw new Error(`Too many files in catalog skill '${name}'`);
+        throw new Error(`Too many files in catalog ${config.kind.slice(0, -1)} '${name}'`);
       }
-      if (!files.some((f) => f.toLowerCase() === "skill.md")) {
-        throw new Error(`Catalog skill '${name}' is missing SKILL.md`);
+      if (!files.some((filePath) => config.hasRequiredManifest(filePath))) {
+        throw new Error(config.missingManifestMessage(name));
       }
       for (const file of files) {
         this.assertSafeRelativePath(file);
       }
       return { name, description, files };
     });
-    return { skills };
+  }
+  pickPrimaryManifestPath(filePaths, config) {
+    const manifests = filePaths.filter((filePath) => config.hasRequiredManifest(filePath)).sort((left, right) => {
+      const leftDepth = left.split("/").length;
+      const rightDepth = right.split("/").length;
+      if (leftDepth !== rightDepth) {
+        return leftDepth - rightDepth;
+      }
+      return left.localeCompare(right);
+    });
+    const manifestPath = manifests[0];
+    if (!manifestPath) {
+      throw new Error("Catalog entry is missing required manifest");
+    }
+    return manifestPath;
   }
   assertSafeRelativePath(filePath) {
     if (!filePath || filePath.startsWith("/") || filePath.startsWith("\\") || filePath.includes("..") || filePath.includes("\\")) {
@@ -3349,9 +3486,7 @@ function assertExperimentalFeatureEnabled(feature, enabled) {
     return;
   }
   if (feature === "catalog") {
-    throw new Error(
-      "Catalog source is experimental and requires explicit experimental mode."
-    );
+    throw new Error("Catalog source is experimental and requires explicit experimental mode.");
   }
 }
 
@@ -3385,7 +3520,7 @@ async function resolveCatalogSkills(sourceUrl, options) {
 }
 
 // ../../packages/core/src/runtime/lockfile.ts
-import fs6 from "node:fs";
+import fs7 from "node:fs";
 import path9 from "node:path";
 import YAML from "yaml";
 function perSkillLockfilePath(canonicalDir, format = "json") {
@@ -3404,7 +3539,7 @@ function parseLockPayload(text, format) {
 function readPerSkillLockfile(canonicalDir) {
   const jsonPath = perSkillLockfilePath(canonicalDir, "json");
   const yamlPath = perSkillLockfilePath(canonicalDir, "yaml");
-  const raw = fs6.existsSync(jsonPath) ? parseLockPayload(fs6.readFileSync(jsonPath, "utf8"), "json") : fs6.existsSync(yamlPath) ? parseLockPayload(fs6.readFileSync(yamlPath, "utf8"), "yaml") : null;
+  const raw = fs7.existsSync(jsonPath) ? parseLockPayload(fs7.readFileSync(jsonPath, "utf8"), "json") : fs7.existsSync(yamlPath) ? parseLockPayload(fs7.readFileSync(yamlPath, "utf8"), "yaml") : null;
   if (!raw) {
     return null;
   }
@@ -3419,18 +3554,18 @@ function readPerSkillLockfile(canonicalDir) {
 function isSkillDirEntry(entry) {
   return entry.isDirectory() || entry.isSymbolicLink();
 }
-function listInstalledSkillDirs(globalInstall, cwd) {
+function listInstalledResourceDirs(kind, globalInstall, cwd) {
   const out = /* @__PURE__ */ new Set();
   for (const agent of Object.keys(AGENTS)) {
-    const skillsRoot = getAgentSkillsDir(agent, globalInstall, cwd);
-    if (!fs6.existsSync(skillsRoot) || !fs6.statSync(skillsRoot).isDirectory()) {
+    const resourceRoot = kind === "plugin" ? getAgentPluginsDir(agent, globalInstall, cwd) : getAgentSkillsDir(agent, globalInstall, cwd);
+    if (!fs7.existsSync(resourceRoot) || !fs7.statSync(resourceRoot).isDirectory()) {
       continue;
     }
-    for (const entry of fs6.readdirSync(skillsRoot, { withFileTypes: true })) {
+    for (const entry of fs7.readdirSync(resourceRoot, { withFileTypes: true })) {
       if (!isSkillDirEntry(entry)) {
         continue;
       }
-      out.add(path9.join(skillsRoot, entry.name));
+      out.add(path9.join(resourceRoot, entry.name));
     }
   }
   return [...out];
@@ -3440,8 +3575,11 @@ function lockEntrySortTime(entry) {
   return Number.isFinite(parsed) ? parsed : 0;
 }
 function readLockfile(globalInstall, cwd) {
+  return readResourceLockfile("skill", globalInstall, cwd);
+}
+function readResourceLockfile(kind, globalInstall, cwd) {
   const entriesBySkill = /* @__PURE__ */ new Map();
-  for (const skillDir of listInstalledSkillDirs(globalInstall, cwd)) {
+  for (const skillDir of listInstalledResourceDirs(kind, globalInstall, cwd)) {
     const entry = readPerSkillLockfile(skillDir);
     if (!entry || typeof entry.skillName !== "string") {
       continue;
@@ -3453,9 +3591,7 @@ function readLockfile(globalInstall, cwd) {
   }
   return {
     version: 1,
-    entries: [...entriesBySkill.values()].sort(
-      (a, b) => a.skillName.localeCompare(b.skillName)
-    )
+    entries: [...entriesBySkill.values()].sort((a, b) => a.skillName.localeCompare(b.skillName))
   };
 }
 
@@ -3492,9 +3628,7 @@ function buildCheckDriftSummaryLines(options) {
 function toCheckOptions(options) {
   const maxDownloadBytes = options.maxDownloadBytes ? Number(options.maxDownloadBytes) : void 0;
   if (typeof maxDownloadBytes === "number" && (!Number.isFinite(maxDownloadBytes) || maxDownloadBytes <= 0)) {
-    throw new Error(
-      `Invalid --max-download-bytes value: ${options.maxDownloadBytes}`
-    );
+    throw new Error(`Invalid --max-download-bytes value: ${options.maxDownloadBytes}`);
   }
   return {
     global: Boolean(options.global),
@@ -3599,9 +3733,7 @@ async function executeCheck(options) {
           detailLines.push("");
         }
         detailLines.push(`  ${kind}`);
-        for (const row of [...rows].sort(
-          (a, b) => a.skillName.localeCompare(b.skillName)
-        )) {
+        for (const row of [...rows].sort((a, b) => a.skillName.localeCompare(b.skillName))) {
           detailLines.push(`    ${row.skillName}: ${row.detail}`);
         }
       }
@@ -3619,9 +3751,7 @@ async function executeCheck(options) {
       if (conflicts.length > 0) {
         conflictLines.push("Local/global conflicts (local preferred):");
         for (const conflict of conflicts) {
-          conflictLines.push(
-            `  ${conflict.skillName}: winner=${conflict.winner}`
-          );
+          conflictLines.push(`  ${conflict.skillName}: winner=${conflict.winner}`);
         }
       }
       if (transitiveConflicts.length > 0) {
@@ -3651,9 +3781,7 @@ async function executeCheck(options) {
     }
     const updateSkillNames = [
       ...new Set(
-        drift.filter(
-          (item) => item.kind === "changed-source" || item.kind === "local-modified"
-        ).map((item) => item.skillName)
+        drift.filter((item) => item.kind === "changed-source" || item.kind === "local-modified").map((item) => item.skillName)
       )
     ].sort((a, b) => a.localeCompare(b));
     const migrateSkillNames = [
@@ -3666,9 +3794,7 @@ async function executeCheck(options) {
       if (migrateSkillNames.length > 0) {
         lines.push("Migration required:");
         for (const skillName of migrateSkillNames) {
-          lines.push(
-            `skillspp update ${skillName} --migrate <new-skill-source>`
-          );
+          lines.push(`skillspp update ${skillName} --migrate <new-skill-source>`);
         }
       }
       if (updateSkillNames.length > 0) {
@@ -3717,9 +3843,7 @@ import { Command as Command4 } from "commander";
 function toFindOptions(options) {
   const maxDownloadBytes = options.maxDownloadBytes ? Number(options.maxDownloadBytes) : void 0;
   if (typeof maxDownloadBytes === "number" && (!Number.isFinite(maxDownloadBytes) || maxDownloadBytes <= 0)) {
-    throw new Error(
-      `Invalid --max-download-bytes value: ${options.maxDownloadBytes}`
-    );
+    throw new Error(`Invalid --max-download-bytes value: ${options.maxDownloadBytes}`);
   }
   return {
     allowHost: options.allowHost?.map((item) => item.toLowerCase()),
@@ -3793,18 +3917,12 @@ async function executeFind(source, query, options) {
       filtered = inventory.skills.filter((item) => matchesQuery(item.name, item.description, query)).sort((a, b) => a.name.localeCompare(b.name));
     } catch (error) {
       hideLoader();
-      await renderStaticScreen([
-        failedStepsSection(["failed to apply query filter"])
-      ]);
+      await renderStaticScreen([failedStepsSection(["failed to apply query filter"])]);
       throw error;
     }
     hideLoader();
     const flowSections = [
-      completedStepsSection([
-        "source parsed",
-        "skill inventory fetched",
-        "query filter applied"
-      ]),
+      completedStepsSection(["source parsed", "skill inventory fetched", "query filter applied"]),
       sourceSection(shortenHomePath(inventory.sourceLabel))
     ];
     const queryTrimmed = query && query.trim().length > 0 ? query : "";
@@ -3905,7 +4023,7 @@ function registerFindCommand(program, ctx) {
 }
 
 // src/commands/init.ts
-import fs8 from "node:fs";
+import fs9 from "node:fs";
 import path11 from "node:path";
 import { Command as Command5 } from "commander";
 
@@ -3961,7 +4079,7 @@ function buildAgentConfigScaffoldPlan(agents, input) {
 }
 
 // ../../packages/core/src/runtime/installer-scaffold.ts
-import fs7 from "node:fs";
+import fs8 from "node:fs";
 import path10 from "node:path";
 import YAML3 from "yaml";
 function installerConfigSkeleton() {
@@ -3973,7 +4091,7 @@ function installerConfigSkeleton() {
   };
 }
 function isFile(filePath) {
-  return fs7.existsSync(filePath) && fs7.statSync(filePath).isFile();
+  return fs8.existsSync(filePath) && fs8.statSync(filePath).isFile();
 }
 function getInstallerConfigState(skillDir) {
   const yamlPath = path10.join(skillDir, "skill-installer.yaml");
@@ -4000,7 +4118,7 @@ function scaffoldInstallerConfigFile(skillDir, format) {
   }
   const content = format === "yaml" ? YAML3.stringify(installerConfigSkeleton()) : JSON.stringify(installerConfigSkeleton(), null, 2);
   const destinationPath = format === "yaml" ? state.yamlPath : state.jsonPath;
-  fs7.writeFileSync(destinationPath, `${content}
+  fs8.writeFileSync(destinationPath, `${content}
 `, "utf8");
   return { created: true, filePath: destinationPath };
 }
@@ -4068,9 +4186,7 @@ async function chooseInitOne(options) {
       description: choice.description
     }))
   );
-  const labelByValue = new Map(
-    options.choices.map((choice) => [choice.value, choice.label])
-  );
+  const labelByValue = new Map(options.choices.map((choice) => [choice.value, choice.label]));
   const selected = await runOneSelectionStep({
     interactive: true,
     rows,
@@ -4160,11 +4276,7 @@ async function collectAnswers(options) {
   const answers = { ...defaults };
   for (const question of initQuestions) {
     if (!question.when(interactive)) {
-      setAnswer(
-        answers,
-        question.id,
-        question.normalize(answers[question.id], defaults)
-      );
+      setAnswer(answers, question.id, question.normalize(answers[question.id], defaults));
       continue;
     }
     const value = await question.ask(defaults);
@@ -4198,9 +4310,7 @@ async function resolveInitAgents(options) {
     return selectedIds;
   }
   if (!interactive) {
-    throw new Error(
-      "Missing --agent in non-interactive mode. Provide at least one agent."
-    );
+    throw new Error("Missing --agent in non-interactive mode. Provide at least one agent.");
   }
   const selected = await runManySelectionStep({
     interactive,
@@ -4302,9 +4412,7 @@ async function executeInit(options, hooks) {
   ];
   if (agentConfigPlan.unmapped.length > 0) {
     summaryLines.push(
-      `Unmapped agents (skipped): ${agentConfigPlan.unmapped.join(
-        ", "
-      )} (no scaffold mapping)`
+      `Unmapped agents (skipped): ${agentConfigPlan.unmapped.join(", ")} (no scaffold mapping)`
     );
   }
   summaryLines.push("");
@@ -4333,16 +4441,16 @@ async function executeInit(options, hooks) {
   const completedSteps = [];
   let failedLabel = "failed to create directory";
   try {
-    const createDirectory = !fs8.existsSync(skillDir);
-    fs8.mkdirSync(skillDir, { recursive: true });
+    const createDirectory = !fs9.existsSync(skillDir);
+    fs9.mkdirSync(skillDir, { recursive: true });
     if (createDirectory) {
       completedSteps.push("directory created");
     }
     failedLabel = "failed to write SKILL.md";
-    if (fs8.existsSync(skillFile)) {
+    if (fs9.existsSync(skillFile)) {
       throw new Error(`SKILL.md already exists at: ${skillFile}`);
     }
-    fs8.writeFileSync(skillFile, `${renderSkillContent(answers)}
+    fs9.writeFileSync(skillFile, `${renderSkillContent(answers)}
 `, "utf8");
     completedSteps.push("SKILL.md written");
     failedLabel = "failed to scaffold installer config";
@@ -4351,11 +4459,11 @@ async function executeInit(options, hooks) {
     failedLabel = "failed to scaffold agent config";
     for (const row of agentConfigPlan.mapped) {
       const destination = ensureInsideSkillDir(skillDir, row.path);
-      if (fs8.existsSync(destination)) {
+      if (fs9.existsSync(destination)) {
         throw new Error(`Agent config already exists at: ${destination}`);
       }
-      fs8.mkdirSync(path11.dirname(destination), { recursive: true });
-      fs8.writeFileSync(destination, row.content, "utf8");
+      fs9.mkdirSync(path11.dirname(destination), { recursive: true });
+      fs9.writeFileSync(destination, row.content, "utf8");
     }
     if (agentConfigPlan.mapped.length > 0) {
       completedSteps.push("agent configs scaffolded");
@@ -4372,27 +4480,24 @@ async function executeInit(options, hooks) {
   await renderStaticScreen(sections);
 }
 function configureInitCommand(command, action) {
-  return command.description("Create a new SKILL.md template").argument("[name]", "Optional skill directory/name").option("-a, --agent <agents...>", "Target agent(s) for config scaffolding").option(
-    "--yaml",
-    "Create skill-installer.yaml when scaffolding installer config"
-  ).option("--non-interactive", "Disable prompts").action(action);
+  return command.description("Create a new SKILL.md template").argument("[name]", "Optional skill directory/name").option("-a, --agent <agents...>", "Target agent(s) for config scaffolding").option("--yaml", "Create skill-installer.yaml when scaffolding installer config").option("--non-interactive", "Disable prompts").action(action);
 }
 function registerInitCommand(program, ctx) {
   configureInitCommand(
     program.command("init"),
-    ctx.wrapAction(
-      "init",
-      async (name, options) => {
-        await executeInit({
+    ctx.wrapAction("init", async (name, options) => {
+      await executeInit(
+        {
           nameArg: name,
           nonInteractive: Boolean(options.nonInteractive),
           yaml: Boolean(options.yaml),
           agent: options.agent
-        }, {
+        },
+        {
           emitCommandEvent: (event) => ctx.emitCommandEvent("init", event)
-        });
-      }
-    )
+        }
+      );
+    })
   );
 }
 
@@ -4450,10 +4555,7 @@ function renderListScopePanel(options) {
 function renderListInventorySummary(skillCount) {
   return panelSection({
     title: "Inventory Summary",
-    lines: [
-      `${skillCount} unique skills found`,
-      "Grouped by (skill name + resolved path)"
-    ],
+    lines: [`${skillCount} unique skills found`, "Grouped by (skill name + resolved path)"],
     style: "square",
     minWidth: 74
   });
@@ -4467,17 +4569,12 @@ function renderListInstalledSkillsPanel(rows) {
     return a.resolvedPath.localeCompare(b.resolvedPath);
   });
   const uniqueSkillCount = new Set(sortedRows.map((row) => row.name)).size;
-  const targetCount = sortedRows.reduce(
-    (count, row) => count + row.agents.length,
-    0
-  );
+  const targetCount = sortedRows.reduce((count, row) => count + row.agents.length, 0);
   const lines = [];
   lines.push(
     `${bold("Skills:")} ${dim(uniqueSkillCount.toString())}   ${bold(
       "Entries:"
-    )} ${dim(sortedRows.length.toString())}   ${bold("Targets:")} ${dim(
-      targetCount.toString()
-    )}`
+    )} ${dim(sortedRows.length.toString())}   ${bold("Targets:")} ${dim(targetCount.toString())}`
   );
   lines.push("");
   lines.push("Targets");
@@ -4490,11 +4587,7 @@ function renderListInstalledSkillsPanel(rows) {
     }
     const agents = [...row.agents].sort((a, b) => a.localeCompare(b));
     for (const agent of agents) {
-      lines.push(
-        `    - ${agent.padEnd(16, " ")} ${dim(
-          shortenHomePath(row.resolvedPath)
-        )}`
-      );
+      lines.push(`    - ${agent.padEnd(16, " ")} ${dim(shortenHomePath(row.resolvedPath))}`);
     }
   }
   return panelSection({
@@ -4616,7 +4709,7 @@ function registerListCommand(program, ctx) {
 }
 
 // src/commands/remove.ts
-import fs9 from "node:fs";
+import fs10 from "node:fs";
 import path12 from "node:path";
 import { Command as Command7 } from "commander";
 function toRemoveOptions(options) {
@@ -4717,7 +4810,12 @@ function renderRemoveConfirmPanel(options) {
   );
 }
 function renderRemoveUninstallSummaryBox(options) {
-  return uninstallSummarySection(options);
+  return uninstallSummarySection({
+    globalInstall: options.globalInstall,
+    itemNames: options.skillNames,
+    itemLabel: "Skills",
+    agentDisplayNames: options.agentDisplayNames
+  });
 }
 function isSkillEntry(entry) {
   return entry.isDirectory() || entry.isSymbolicLink();
@@ -4728,11 +4826,11 @@ function buildInstallIndex(globalInstall, cwd) {
   const allAgents = Object.keys(AGENTS);
   for (const agent of allAgents) {
     const dir = getAgentSkillsDir(agent, globalInstall, cwd);
-    if (!fs9.existsSync(dir) || !fs9.statSync(dir).isDirectory()) {
+    if (!fs10.existsSync(dir) || !fs10.statSync(dir).isDirectory()) {
       continue;
     }
     const names = /* @__PURE__ */ new Set();
-    for (const entry of fs9.readdirSync(dir, { withFileTypes: true })) {
+    for (const entry of fs10.readdirSync(dir, { withFileTypes: true })) {
       if (!isSkillEntry(entry)) {
         continue;
       }
@@ -4763,9 +4861,7 @@ function orderAgentsForDisplay(agents) {
 }
 function resolveCandidateAgentsForSkills(skillNames, index) {
   return orderAgentsForDisplay(
-    skillNames.flatMap(
-      (name) => Array.from(index.agentsBySkill.get(name) ?? [])
-    )
+    skillNames.flatMap((name) => Array.from(index.agentsBySkill.get(name) ?? []))
   );
 }
 async function executeRemove(positional, options) {
@@ -4777,9 +4873,7 @@ async function executeRemove(positional, options) {
   try {
     index = buildInstallIndex(globalInstall, cwd);
   } catch (error) {
-    await renderStaticScreen([
-      failedStepsSection(["failed to index installed skills"])
-    ]);
+    await renderStaticScreen([failedStepsSection(["failed to index installed skills"])]);
     throw error;
   }
   if (index.agentsBySkill.size === 0) {
@@ -4816,20 +4910,14 @@ async function executeRemove(positional, options) {
   try {
     if (options.agent && options.agent.length > 0) {
       if (options.agent.includes("*")) {
-        candidateAgents = orderAgentsForDisplay(
-          Array.from(index.skillsByAgent.keys())
-        );
+        candidateAgents = orderAgentsForDisplay(Array.from(index.skillsByAgent.keys()));
         agents = candidateAgents;
       } else {
         const resolved = resolveAgents(options.agent);
-        const outOfScopeAgents = resolved.filter(
-          (agent) => !scopeAllowedAgents.has(agent)
-        );
+        const outOfScopeAgents = resolved.filter((agent) => !scopeAllowedAgents.has(agent));
         if (outOfScopeAgents.length > 0) {
           throw new Error(
-            `Agent(s) not available in ${scope} scope: ${outOfScopeAgents.join(
-              ", "
-            )}`
+            `Agent(s) not available in ${scope} scope: ${outOfScopeAgents.join(", ")}`
           );
         }
         candidateAgents = resolved;
@@ -4848,16 +4936,12 @@ async function executeRemove(positional, options) {
         );
       }
     }
-    candidateAgents = candidateAgents.filter(
-      (agent) => scopeAllowedAgents.has(agent)
-    );
+    candidateAgents = candidateAgents.filter((agent) => scopeAllowedAgents.has(agent));
     agents = agents.filter((agent) => scopeAllowedAgents.has(agent));
     candidateAgents = orderAgentsForDisplay(candidateAgents);
     agents = orderAgentsForDisplay(agents);
   } catch (error) {
-    await renderStaticScreen([
-      failedStepsSection(["failed to resolve target candidates"])
-    ]);
+    await renderStaticScreen([failedStepsSection(["failed to resolve target candidates"])]);
     throw error;
   }
   await renderStaticScreen([
@@ -4893,9 +4977,7 @@ async function executeRemove(positional, options) {
   if (!options.agent || options.agent.length === 0) {
     if (!options.all) {
       candidateAgents = resolveCandidateAgentsForSkills(finalSkills, index);
-      candidateAgents = candidateAgents.filter(
-        (agent) => scopeAllowedAgents.has(agent)
-      );
+      candidateAgents = candidateAgents.filter((agent) => scopeAllowedAgents.has(agent));
       candidateAgents = orderAgentsForDisplay(candidateAgents);
     }
     if (candidateAgents.length === 0) {
@@ -4908,15 +4990,10 @@ async function executeRemove(positional, options) {
     }
   }
   const shouldPromptAgents = interactive && (!options.agent || options.agent.length === 0);
-  const visibleCandidateAgents = candidateAgents.filter(
-    (agent) => scopeAllowedAgents.has(agent)
-  );
+  const visibleCandidateAgents = candidateAgents.filter((agent) => scopeAllowedAgents.has(agent));
   const selectedAgentIds = await runManySelectionStep({
     interactive,
-    rows: buildRemoveAgentSelectionRows(
-      visibleCandidateAgents,
-      scopedAgentRowsById
-    ),
+    rows: buildRemoveAgentSelectionRows(visibleCandidateAgents, scopedAgentRowsById),
     selectedIds: agents,
     shouldPrompt: shouldPromptAgents,
     prompt: {
@@ -4934,9 +5011,7 @@ async function executeRemove(positional, options) {
     })
   });
   const selectedAgentSet = new Set(selectedAgentIds);
-  agents = visibleCandidateAgents.filter(
-    (agent) => selectedAgentSet.has(agent)
-  );
+  agents = visibleCandidateAgents.filter((agent) => selectedAgentSet.has(agent));
   if (options.all) {
     const all = /* @__PURE__ */ new Set();
     for (const agent of agents) {
@@ -5022,10 +5097,10 @@ async function executeRemove(positional, options) {
   try {
     for (const agent of agents) {
       const dir = getAgentSkillsDir(agent, globalInstall, cwd);
-      if (!fs9.existsSync(dir) || !fs9.statSync(dir).isDirectory()) {
+      if (!fs10.existsSync(dir) || !fs10.statSync(dir).isDirectory()) {
         continue;
       }
-      for (const entry of fs9.readdirSync(dir, { withFileTypes: true })) {
+      for (const entry of fs10.readdirSync(dir, { withFileTypes: true })) {
         if (!entry.isDirectory() && !entry.isSymbolicLink()) {
           continue;
         }
@@ -5034,7 +5109,7 @@ async function executeRemove(positional, options) {
         }
         const fullPath = path12.join(dir, entry.name);
         failedLabel = `failed to remove ${entry.name} from ${agent}`;
-        fs9.rmSync(fullPath, { recursive: true, force: true });
+        fs10.rmSync(fullPath, { recursive: true, force: true });
         removedCount += 1;
         completedRemovalSteps.push(`removed ${entry.name} from ${agent}`);
       }
@@ -5056,12 +5131,9 @@ function configureRemoveCommand(command, action) {
 function registerRemoveCommand(program, ctx) {
   configureRemoveCommand(
     program.command("remove").alias("rm"),
-    ctx.wrapAction(
-      "remove",
-      async (skills, options) => {
-        await executeRemove(skills, toRemoveOptions(options));
-      }
-    )
+    ctx.wrapAction("remove", async (skills, options) => {
+      await executeRemove(skills, toRemoveOptions(options));
+    })
   );
 }
 
@@ -5070,9 +5142,7 @@ import { Command as Command8 } from "commander";
 function toUpdateOptions(options) {
   const maxDownloadBytes = options.maxDownloadBytes ? Number(options.maxDownloadBytes) : void 0;
   if (typeof maxDownloadBytes === "number" && (!Number.isFinite(maxDownloadBytes) || maxDownloadBytes <= 0)) {
-    throw new Error(
-      `Invalid --max-download-bytes value: ${options.maxDownloadBytes}`
-    );
+    throw new Error(`Invalid --max-download-bytes value: ${options.maxDownloadBytes}`);
   }
   const lockFormat = options.lockFormat;
   if (lockFormat && lockFormat !== "json" && lockFormat !== "yaml") {
@@ -5120,11 +5190,7 @@ function buildUpdateRows(assessments) {
   });
 }
 function renderUpdateSkillsClosedPanel(rows, selectedIds) {
-  return manySelectionClosedSection(
-    UPDATE_SKILLS_SELECTION_VIEW,
-    rows,
-    selectedIds
-  );
+  return manySelectionClosedSection(UPDATE_SKILLS_SELECTION_VIEW, rows, selectedIds);
 }
 function buildUpdateDriftSummaryLines(options) {
   return [
@@ -5201,10 +5267,7 @@ async function executeMigrateUpdate(options) {
   }
   hideLoader();
   await renderStaticScreen([
-    completedStepsSection([
-      `migrated ${options.skillName}`,
-      "lockfile written"
-    ]),
+    completedStepsSection([`migrated ${options.skillName}`, "lockfile written"]),
     linesSection(["Migration complete.", `Updated ${options.skillName}.`])
   ]);
 }
@@ -5216,9 +5279,7 @@ async function executeUpdate(options, positionalSkill) {
     ...options,
     skill: mergedSkills
   };
-  const requestedSkills = (effectiveOptions.skill || []).filter(
-    (skill) => skill !== "*"
-  );
+  const requestedSkills = (effectiveOptions.skill || []).filter((skill) => skill !== "*");
   if (effectiveOptions.migrate) {
     if (requestedSkills.length !== 1) {
       throw new Error(
@@ -5264,9 +5325,7 @@ async function executeUpdate(options, positionalSkill) {
       );
     } catch (error) {
       hideLoader();
-      await renderStaticScreen([
-        failedStepsSection(["failed to assess drift"])
-      ]);
+      await renderStaticScreen([failedStepsSection(["failed to assess drift"])]);
       throw error;
     }
     hideLoader();
@@ -5279,9 +5338,7 @@ async function executeUpdate(options, positionalSkill) {
         (item) => item.kind === "changed-source" || item.kind === "local-modified"
       );
     });
-    const migrateRequired = assessments.filter(
-      (assessment) => assessment.drift.some((item) => item.kind === "migrate-required")
-    ).map((assessment) => assessment.entry.skillName).sort((a, b) => a.localeCompare(b));
+    const migrateRequired = assessments.filter((assessment) => assessment.drift.some((item) => item.kind === "migrate-required")).map((assessment) => assessment.entry.skillName).sort((a, b) => a.localeCompare(b));
     let changedSourceCount = 0;
     let localModifiedCount = 0;
     for (const assessment of candidateAssessments) {
@@ -5375,9 +5432,7 @@ async function executeUpdate(options, positionalSkill) {
       })
     ]);
     if (effectiveOptions.dryRun) {
-      await renderStaticScreen([
-        linesSection(["Dry-run mode: no changes applied."])
-      ]);
+      await renderStaticScreen([linesSection(["Dry-run mode: no changes applied."])]);
       return;
     }
     showLoader("updating selected skills");
@@ -5391,9 +5446,7 @@ async function executeUpdate(options, positionalSkill) {
           payload: {
             cwd,
             options: effectiveOptions,
-            selectedSkillNames: selectedAssessments.map(
-              (assessment) => assessment.entry.skillName
-            ),
+            selectedSkillNames: selectedAssessments.map((assessment) => assessment.entry.skillName),
             lockFormat
           }
         },
@@ -5402,9 +5455,7 @@ async function executeUpdate(options, positionalSkill) {
             if (label === "writing lockfile") {
               failedLabel = "failed to write lockfile";
             } else if (label.startsWith("updating ")) {
-              failedLabel = `failed to update ${label.slice(
-                "updating ".length
-              )}`;
+              failedLabel = `failed to update ${label.slice("updating ".length)}`;
             } else {
               failedLabel = "failed to assess selected skills";
             }
@@ -5424,10 +5475,7 @@ async function executeUpdate(options, positionalSkill) {
         ...applied.updatedSkillNames.map((skillName) => `updated ${skillName}`),
         "lockfile written"
       ]),
-      linesSection([
-        "Update complete.",
-        `Updated ${applied.updatedSkillNames.length} skills.`
-      ])
+      linesSection(["Update complete.", `Updated ${applied.updatedSkillNames.length} skills.`])
     ]);
   } finally {
     hideLoader();
@@ -5439,23 +5487,20 @@ function configureUpdateCommand(command, action) {
 function registerUpdateCommand(program, ctx) {
   configureUpdateCommand(
     program.command("update"),
-    ctx.wrapAction(
-      "update",
-      async (skill, options) => {
-        await executeUpdate(
-          {
-            ...toUpdateOptions(options),
-            experimental: ctx.experimental
-          },
-          skill
-        );
-      }
-    )
+    ctx.wrapAction("update", async (skill, options) => {
+      await executeUpdate(
+        {
+          ...toUpdateOptions(options),
+          experimental: ctx.experimental
+        },
+        skill
+      );
+    })
   );
 }
 
 // src/commands/validate.ts
-import fs12 from "node:fs";
+import fs13 from "node:fs";
 import path15 from "node:path";
 import os5 from "node:os";
 import { Command as Command9 } from "commander";
@@ -5463,14 +5508,14 @@ import matter2 from "gray-matter";
 
 // ../../packages/core/src/runtime/skill-installer.ts
 import { spawnSync as spawnSync2 } from "node:child_process";
-import fs11 from "node:fs";
+import fs12 from "node:fs";
 import os4 from "node:os";
 import path14 from "node:path";
 import YAML4 from "yaml";
 import { z } from "zod";
 
 // ../../packages/core/src/runtime/installer-security.ts
-import fs10 from "node:fs";
+import fs11 from "node:fs";
 import path13 from "node:path";
 function isInsideRoot(rootDir, candidatePath) {
   const relative = path13.relative(rootDir, candidatePath);
@@ -5504,9 +5549,9 @@ function evaluateInstallerLocalDependency(input, _options = {}) {
       violation: toEscapeViolation(input.source)
     };
   }
-  if (fs10.existsSync(resolvedSourcePath)) {
-    const realRoot = fs10.realpathSync.native ? fs10.realpathSync.native(resolvedRoot) : fs10.realpathSync(resolvedRoot);
-    const realSource = fs10.realpathSync.native ? fs10.realpathSync.native(resolvedSourcePath) : fs10.realpathSync(resolvedSourcePath);
+  if (fs11.existsSync(resolvedSourcePath)) {
+    const realRoot = fs11.realpathSync.native ? fs11.realpathSync.native(resolvedRoot) : fs11.realpathSync(resolvedRoot);
+    const realSource = fs11.realpathSync.native ? fs11.realpathSync.native(resolvedSourcePath) : fs11.realpathSync(resolvedSourcePath);
     if (!isInsideRoot(realRoot, realSource)) {
       return {
         ok: false,
@@ -5539,10 +5584,7 @@ function applyMode(result, mode) {
   };
 }
 function evaluateInstallerLocalDependencyPolicy(input, mode) {
-  return applyMode(
-    evaluateInstallerLocalDependency(input, { policyMode: "fixed" }),
-    mode
-  );
+  return applyMode(evaluateInstallerLocalDependency(input, { policyMode: "fixed" }), mode);
 }
 function evaluateHookTrustPolicy(input) {
   if (input.sourceType !== "well-known") {
@@ -5628,9 +5670,7 @@ function sourceLooksLikeRepoShorthand(source) {
 }
 function parseRepoSource(source) {
   const withoutProtocol = source.trim().replace(/^https?:\/\//, "").replace(/\/+$/, "");
-  const match = withoutProtocol.match(
-    /^(github\.com|gitlab\.com)\/([^/]+)\/([^/]+?)(?:\.git)?$/
-  );
+  const match = withoutProtocol.match(/^(github\.com|gitlab\.com)\/([^/]+)\/([^/]+?)(?:\.git)?$/);
   if (!match) {
     throw new Error(`Unsupported repository dependency source: ${source}`);
   }
@@ -5648,9 +5688,7 @@ function deriveDestinationNameFromSource(source) {
     const parts = parsed.pathname.split("/").filter(Boolean);
     const leaf2 = parts[parts.length - 1];
     if (!leaf2) {
-      throw new Error(
-        `Cannot derive dependency name from URL source: ${source}`
-      );
+      throw new Error(`Cannot derive dependency name from URL source: ${source}`);
     }
     return leaf2;
   }
@@ -5674,9 +5712,7 @@ function classifyDependencySource(source) {
 }
 function parseConfigObject(raw) {
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
-    throw new Error(
-      "Invalid skill-installer config: expected an object with top-level keys"
-    );
+    throw new Error("Invalid skill-installer config: expected an object with top-level keys");
   }
   const parsed = raw;
   if (typeof parsed["skill-installer"] !== "undefined") {
@@ -5717,10 +5753,10 @@ function parseConfigObject(raw) {
 }
 function assertNoLegacyInstallerBlock(skillDir) {
   const openAiYamlPath = path14.join(skillDir, "agents", "openai.yaml");
-  if (!fs11.existsSync(openAiYamlPath) || !fs11.statSync(openAiYamlPath).isFile()) {
+  if (!fs12.existsSync(openAiYamlPath) || !fs12.statSync(openAiYamlPath).isFile()) {
     return;
   }
-  const parsed = YAML4.parse(fs11.readFileSync(openAiYamlPath, "utf8"));
+  const parsed = YAML4.parse(fs12.readFileSync(openAiYamlPath, "utf8"));
   if (parsed && typeof parsed === "object" && typeof parsed["skill-installer"] !== "undefined") {
     throw new Error(
       "Legacy skill-installer config detected in agents/openai.yaml. Move it to skill-installer.yaml or skill-installer.json."
@@ -5731,8 +5767,8 @@ function loadInstallerConfig(skillDir) {
   assertNoLegacyInstallerBlock(skillDir);
   const yamlPath = path14.join(skillDir, "skill-installer.yaml");
   const jsonPath = path14.join(skillDir, "skill-installer.json");
-  const hasYaml = fs11.existsSync(yamlPath) && fs11.statSync(yamlPath).isFile();
-  const hasJson = fs11.existsSync(jsonPath) && fs11.statSync(jsonPath).isFile();
+  const hasYaml = fs12.existsSync(yamlPath) && fs12.statSync(yamlPath).isFile();
+  const hasJson = fs12.existsSync(jsonPath) && fs12.statSync(jsonPath).isFile();
   if (hasYaml && hasJson) {
     throw new Error(
       "Both skill-installer.yaml and skill-installer.json exist. Keep only one installer config file."
@@ -5747,10 +5783,10 @@ function loadInstallerConfig(skillDir) {
     };
   }
   if (hasYaml) {
-    const parsed = YAML4.parse(fs11.readFileSync(yamlPath, "utf8"));
+    const parsed = YAML4.parse(fs12.readFileSync(yamlPath, "utf8"));
     return parseConfigObject(parsed);
   }
-  const raw = JSON.parse(fs11.readFileSync(jsonPath, "utf8"));
+  const raw = JSON.parse(fs12.readFileSync(jsonPath, "utf8"));
   return parseConfigObject(raw);
 }
 function resolveDependencySourceAndTarget(dep) {
@@ -5766,19 +5802,13 @@ function resolveDependencySourceAndTarget(dep) {
   };
 }
 function runGitClone(repoUrl, targetDir) {
-  const result = spawnSync2(
-    "git",
-    ["clone", "--depth", "1", repoUrl, targetDir],
-    {
-      encoding: "utf8",
-      stdio: "pipe"
-    }
-  );
+  const result = spawnSync2("git", ["clone", "--depth", "1", repoUrl, targetDir], {
+    encoding: "utf8",
+    stdio: "pipe"
+  });
   if (result.status !== 0) {
     const message = (result.stderr || result.stdout || "git clone failed").trim().split(/\r?\n/)[0] || "git clone failed";
-    throw new Error(
-      `Repository dependency clone failed: ${repoUrl} (${message})`
-    );
+    throw new Error(`Repository dependency clone failed: ${repoUrl} (${message})`);
   }
 }
 async function prepareDependency(source, targetPath, index, sourceCwd, stagingDir, policyMode, events) {
@@ -5794,9 +5824,7 @@ async function prepareDependency(source, targetPath, index, sourceCwd, stagingDi
     if (!evaluation.ok) {
       const violation = "violation" in evaluation ? evaluation.violation : void 0;
       if (!violation) {
-        throw new Error(
-          `Dependency[${index}] policy evaluation failed for source: ${source}`
-        );
+        throw new Error(`Dependency[${index}] policy evaluation failed for source: ${source}`);
       }
       if (violation.blocking) {
         throw new InstallerSecurityError(violation);
@@ -5807,12 +5835,10 @@ async function prepareDependency(source, targetPath, index, sourceCwd, stagingDi
       });
     }
     const sourcePath = evaluation.ok ? evaluation.resolvedPath : path14.resolve(sourceCwd, source);
-    if (!fs11.existsSync(sourcePath)) {
-      throw new Error(
-        `Dependency[${index}] (local) source not found: ${source}`
-      );
+    if (!fs12.existsSync(sourcePath)) {
+      throw new Error(`Dependency[${index}] (local) source not found: ${source}`);
     }
-    fs11.accessSync(sourcePath, fs11.constants.R_OK);
+    fs12.accessSync(sourcePath, fs12.constants.R_OK);
     events.push({
       level: "info",
       message: `[skills] dependency[${index}] preflight-validated: ${source}`
@@ -5846,9 +5872,7 @@ async function prepareDependency(source, targetPath, index, sourceCwd, stagingDi
   }
   const target = new URL(source);
   if (target.protocol !== "http:" && target.protocol !== "https:") {
-    throw new Error(
-      `Dependency[${index}] (remote) unsupported protocol: ${target.protocol}`
-    );
+    throw new Error(`Dependency[${index}] (remote) unsupported protocol: ${target.protocol}`);
   }
   const response = await fetch(target.toString());
   if (!response.ok) {
@@ -5860,8 +5884,8 @@ async function prepareDependency(source, targetPath, index, sourceCwd, stagingDi
     stagingDir,
     `remote-${index}-${path14.basename(targetPath)}`
   );
-  fs11.mkdirSync(path14.dirname(stagedFilePath), { recursive: true });
-  fs11.writeFileSync(stagedFilePath, Buffer.from(await response.arrayBuffer()));
+  fs12.mkdirSync(path14.dirname(stagedFilePath), { recursive: true });
+  fs12.writeFileSync(stagedFilePath, Buffer.from(await response.arrayBuffer()));
   events.push({
     level: "info",
     message: `[skills] dependency[${index}] staged: ${source}`
@@ -5910,9 +5934,7 @@ async function prepareInstallerArtifacts(skillDir, sourceCwd, options = {}) {
       events
     };
   }
-  const stagingDir = fs11.mkdtempSync(
-    path14.join(os4.tmpdir(), "skillspp-installer-stage-")
-  );
+  const stagingDir = fs12.mkdtempSync(path14.join(os4.tmpdir(), "skillspp-installer-stage-"));
   const preparedDependencies = [];
   const seenTargetPaths = /* @__PURE__ */ new Set();
   try {
@@ -5921,13 +5943,11 @@ async function prepareInstallerArtifacts(skillDir, sourceCwd, options = {}) {
       const { source, targetPath } = resolveDependencySourceAndTarget(dep);
       const normalizedTarget = targetPath.replace(/\\/g, "/");
       if (seenTargetPaths.has(normalizedTarget)) {
-        throw new Error(
-          `Dependency[${i}] duplicate target path: ${targetPath}`
-        );
+        throw new Error(`Dependency[${i}] duplicate target path: ${targetPath}`);
       }
       seenTargetPaths.add(normalizedTarget);
       const destinationInSkill = ensureInsideRoot(skillDir, targetPath);
-      if (fs11.existsSync(destinationInSkill)) {
+      if (fs12.existsSync(destinationInSkill)) {
         throw new Error(
           `Dependency[${i}] destination already exists: ${path14.relative(
             skillDir,
@@ -5954,13 +5974,13 @@ async function prepareInstallerArtifacts(skillDir, sourceCwd, options = {}) {
       events
     };
   } catch (error) {
-    fs11.rmSync(stagingDir, { recursive: true, force: true });
+    fs12.rmSync(stagingDir, { recursive: true, force: true });
     throw error;
   }
 }
 function cleanupPreparedInstallerArtifacts(prepared) {
   if (prepared.stagingDir) {
-    fs11.rmSync(prepared.stagingDir, { recursive: true, force: true });
+    fs12.rmSync(prepared.stagingDir, { recursive: true, force: true });
   }
 }
 
@@ -5974,15 +5994,11 @@ function toValidateOptions(source, options) {
   }
   const maxDescriptionChars = options.maxDescriptionChars ? Number(options.maxDescriptionChars) : void 0;
   if (typeof maxDescriptionChars === "number" && (!Number.isFinite(maxDescriptionChars) || maxDescriptionChars <= 0)) {
-    throw new Error(
-      `Invalid --max-description-chars value: ${options.maxDescriptionChars}`
-    );
+    throw new Error(`Invalid --max-description-chars value: ${options.maxDescriptionChars}`);
   }
   const maxDownloadBytes = options.maxDownloadBytes ? Number(options.maxDownloadBytes) : void 0;
   if (typeof maxDownloadBytes === "number" && (!Number.isFinite(maxDownloadBytes) || maxDownloadBytes <= 0)) {
-    throw new Error(
-      `Invalid --max-download-bytes value: ${options.maxDownloadBytes}`
-    );
+    throw new Error(`Invalid --max-download-bytes value: ${options.maxDownloadBytes}`);
   }
   return {
     source,
@@ -6001,10 +6017,10 @@ function toValidateOptions(source, options) {
 }
 function loadRepoValidateConfig(cwd) {
   const configPath = path15.join(cwd, ".skillspp-cli.json");
-  if (!fs12.existsSync(configPath) || !fs12.statSync(configPath).isFile()) {
+  if (!fs13.existsSync(configPath) || !fs13.statSync(configPath).isFile()) {
     return {};
   }
-  const parsed = JSON.parse(fs12.readFileSync(configPath, "utf8"));
+  const parsed = JSON.parse(fs13.readFileSync(configPath, "utf8"));
   return parsed.validate || {};
 }
 function resolveThresholds(options, cwd) {
@@ -6036,7 +6052,7 @@ var typeRules = [
     when: (frontmatter) => frontmatter.type === "framework",
     validate: ({ skillDir, skillName, diagnostics }) => {
       const referencesDir = path15.join(skillDir, "references");
-      if (!fs12.existsSync(referencesDir) || !fs12.statSync(referencesDir).isDirectory()) {
+      if (!fs13.existsSync(referencesDir) || !fs13.statSync(referencesDir).isDirectory()) {
         addDiagnostic(diagnostics, {
           severity: "error",
           skill: skillName,
@@ -6049,9 +6065,7 @@ var typeRules = [
   }
 ];
 async function validateInstallerDependencies(skillDir, sourceRoot, diagnostics, skillName) {
-  const installerConfigPath = fs12.existsSync(
-    path15.join(skillDir, "skill-installer.yaml")
-  ) ? path15.join(skillDir, "skill-installer.yaml") : path15.join(skillDir, "skill-installer.json");
+  const installerConfigPath = fs13.existsSync(path15.join(skillDir, "skill-installer.yaml")) ? path15.join(skillDir, "skill-installer.yaml") : path15.join(skillDir, "skill-installer.json");
   try {
     const installer = loadInstallerConfig(skillDir);
     const fallbackRoots = Array.from(
@@ -6095,24 +6109,18 @@ async function validateInstallerDependencies(skillDir, sourceRoot, diagnostics,
     if (hasSecurityViolation) {
       return;
     }
-    const tempSkillDir = fs12.mkdtempSync(
-      path15.join(os5.tmpdir(), "skillspp-validate-installer-")
-    );
+    const tempSkillDir = fs13.mkdtempSync(path15.join(os5.tmpdir(), "skillspp-validate-installer-"));
     try {
-      const filesToCopy = [
-        "SKILL.md",
-        "skill-installer.yaml",
-        "skill-installer.json"
-      ];
+      const filesToCopy = ["SKILL.md", "skill-installer.yaml", "skill-installer.json"];
       for (const fileName of filesToCopy) {
         const src = path15.join(skillDir, fileName);
-        if (fs12.existsSync(src) && fs12.statSync(src).isFile()) {
-          fs12.copyFileSync(src, path15.join(tempSkillDir, fileName));
+        if (fs13.existsSync(src) && fs13.statSync(src).isFile()) {
+          fs13.copyFileSync(src, path15.join(tempSkillDir, fileName));
         }
       }
       const agentsDir = path15.join(skillDir, "agents");
-      if (fs12.existsSync(agentsDir) && fs12.statSync(agentsDir).isDirectory()) {
-        fs12.cpSync(agentsDir, path15.join(tempSkillDir, "agents"), {
+      if (fs13.existsSync(agentsDir) && fs13.statSync(agentsDir).isDirectory()) {
+        fs13.cpSync(agentsDir, path15.join(tempSkillDir, "agents"), {
           recursive: true,
           force: true
         });
@@ -6154,7 +6162,7 @@ async function validateInstallerDependencies(skillDir, sourceRoot, diagnostics,
         throw lastMissingSourceError;
       }
     } finally {
-      fs12.rmSync(tempSkillDir, { recursive: true, force: true });
+      fs13.rmSync(tempSkillDir, { recursive: true, force: true });
     }
   } catch (error) {
     if (isInstallerSecurityError(error)) {
@@ -6189,7 +6197,7 @@ async function validateInstallerDependencies(skillDir, sourceRoot, diagnostics,
 async function validateSkillDir(skillDir, sourceRoot, diagnostics, strict, thresholds) {
   const skillMd = path15.join(skillDir, "SKILL.md");
   const skillName = path15.basename(skillDir);
-  if (!fs12.existsSync(skillMd)) {
+  if (!fs13.existsSync(skillMd)) {
     addDiagnostic(diagnostics, {
       severity: "error",
       skill: skillName,
@@ -6199,7 +6207,7 @@ async function validateSkillDir(skillDir, sourceRoot, diagnostics, strict, thres
     });
     return;
   }
-  const content = fs12.readFileSync(skillMd, "utf8");
+  const content = fs13.readFileSync(skillMd, "utf8");
   const lines = content.split(/\r?\n/);
   if (lines.length > thresholds.maxLines) {
     addDiagnostic(diagnostics, {
@@ -6270,7 +6278,7 @@ async function validateSkillDir(skillDir, sourceRoot, diagnostics, strict, thres
     if (!rel || rel.startsWith("..") || path15.isAbsolute(rel)) {
       continue;
     }
-    if (!fs12.existsSync(resolved)) {
+    if (!fs13.existsSync(resolved)) {
       addDiagnostic(diagnostics, {
         severity: "error",
         skill: skillName,
@@ -6285,18 +6293,13 @@ async function validateSkillDir(skillDir, sourceRoot, diagnostics, strict, thres
       rule.validate({ skillDir, skillName, diagnostics });
     }
   }
-  await validateInstallerDependencies(
-    skillDir,
-    sourceRoot,
-    diagnostics,
-    skillName
-  );
+  await validateInstallerDependencies(skillDir, sourceRoot, diagnostics, skillName);
 }
 function discoverFallbackRoots(cwd) {
   const candidates = [cwd, path15.join(cwd, "skills")];
   const packagesDir = path15.join(cwd, "packages");
-  if (fs12.existsSync(packagesDir) && fs12.statSync(packagesDir).isDirectory()) {
-    for (const entry of fs12.readdirSync(packagesDir, { withFileTypes: true })) {
+  if (fs13.existsSync(packagesDir) && fs13.statSync(packagesDir).isDirectory()) {
+    for (const entry of fs13.readdirSync(packagesDir, { withFileTypes: true })) {
       if (!entry.isDirectory()) {
         continue;
       }
@@ -6306,7 +6309,7 @@ function discoverFallbackRoots(cwd) {
   const seen = /* @__PURE__ */ new Set();
   const out = [];
   for (const item of candidates) {
-    if (!fs12.existsSync(item)) {
+    if (!fs13.existsSync(item)) {
       continue;
     }
     const resolved = path15.resolve(item);
@@ -6321,7 +6324,7 @@ function discoverFallbackRoots(cwd) {
 function discoverCiRoots(cwd) {
   const config = loadRepoValidateConfig(cwd);
   if (config.ciRoots && config.ciRoots.length > 0) {
-    const roots = config.ciRoots.map((item) => path15.resolve(cwd, item)).filter((item) => fs12.existsSync(item) && fs12.statSync(item).isDirectory());
+    const roots = config.ciRoots.map((item) => path15.resolve(cwd, item)).filter((item) => fs13.existsSync(item) && fs13.statSync(item).isDirectory());
     if (roots.length > 0) {
       return roots;
     }
@@ -6330,7 +6333,7 @@ function discoverCiRoots(cwd) {
 }
 async function stageAndValidateLocalRoot(rootPath, dependencyRoot, seenSkillPaths, diagnostics, strict, thresholds, emitProgress) {
   const resolvedRoot = path15.resolve(rootPath);
-  if (!fs12.existsSync(resolvedRoot) || !fs12.statSync(resolvedRoot).isDirectory()) {
+  if (!fs13.existsSync(resolvedRoot) || !fs13.statSync(resolvedRoot).isDirectory()) {
     addDiagnostic(diagnostics, {
       severity: "error",
       skill: path15.basename(resolvedRoot),
@@ -6359,13 +6362,7 @@ async function stageAndValidateLocalRoot(rootPath, dependencyRoot, seenSkillPath
     }
     seenSkillPaths.add(resolvedSkillPath);
     await emitProgress?.(`validating ${skill.name}`);
-    await validateSkillDir(
-      skill.path,
-      dependencyRoot,
-      diagnostics,
-      strict,
-      thresholds
-    );
+    await validateSkillDir(skill.path, dependencyRoot, diagnostics, strict, thresholds);
   }
 }
 async function stageAndValidateSource(options, diagnostics, thresholds, emitProgress) {
@@ -6400,27 +6397,19 @@ async function stageAndValidateSource(options, diagnostics, thresholds, emitProg
     const tempRoots = [];
     try {
       for (const remoteSkill of remote) {
-        const tmp = fs12.mkdtempSync(
-          path15.join(os5.tmpdir(), "skillspp-validate-")
-        );
+        const tmp = fs13.mkdtempSync(path15.join(os5.tmpdir(), "skillspp-validate-"));
         tempRoots.push(tmp);
         for (const [relativePath, content] of remoteSkill.files.entries()) {
           const target = path15.join(tmp, relativePath);
-          fs12.mkdirSync(path15.dirname(target), { recursive: true });
-          fs12.writeFileSync(target, content, "utf8");
+          fs13.mkdirSync(path15.dirname(target), { recursive: true });
+          fs13.writeFileSync(target, content, "utf8");
         }
         await emitProgress?.(`validating ${remoteSkill.installName}`);
-        await validateSkillDir(
-          tmp,
-          tmp,
-          diagnostics,
-          Boolean(options.strict),
-          thresholds
-        );
+        await validateSkillDir(tmp, tmp, diagnostics, Boolean(options.strict), thresholds);
       }
     } finally {
       for (const tmp of tempRoots) {
-        fs12.rmSync(tmp, { recursive: true, force: true });
+        fs13.rmSync(tmp, { recursive: true, force: true });
       }
     }
     return;
@@ -6466,12 +6455,7 @@ async function runValidateAnalysis(options, emitProgress) {
       );
     }
   } else {
-    await stageAndValidateSource(
-      options,
-      diagnostics,
-      thresholds,
-      emitProgress
-    );
+    await stageAndValidateSource(options, diagnostics, thresholds, emitProgress);
   }
   await emitProgress?.("collecting diagnostics");
   return { diagnostics };
@@ -6499,9 +6483,7 @@ function buildDiagnosticsPanelLines(diagnostics) {
     return [colorToken("No diagnostics found.", "success")];
   }
   const sorted = [...diagnostics].sort(
-    (a, b) => `${a.severity}:${a.skill}:${a.rule}`.localeCompare(
-      `${b.severity}:${b.skill}:${b.rule}`
-    )
+    (a, b) => `${a.severity}:${a.skill}:${a.rule}`.localeCompare(`${b.severity}:${b.skill}:${b.rule}`)
   );
   return sorted.map((row) => {
     const marker = row.severity === "error" ? colorToken("[error]", "danger") : colorToken("[warning]", "warning");
@@ -6572,38 +6554,23 @@ async function executeValidate(options) {
   const errors = diagnostics.filter((item) => item.severity === "error");
   const warnings = diagnostics.filter((item) => item.severity === "warning");
   const validatingSteps = [...runtimeSteps].filter((step) => step.startsWith("validating ")).sort((a, b) => a.localeCompare(b));
-  const runStepLines = [
-    "staging source",
-    ...validatingSteps,
-    "collecting diagnostics"
-  ];
+  const runStepLines = ["staging source", ...validatingSteps, "collecting diagnostics"];
   await renderStaticScreen([
     completedStepsSection([
       "source parsed",
       "candidate skills discovered",
       "validation session ready"
     ]),
-    linesSection([
-      `  Validation target: ${resolveValidateTargetLabel(options)}`
-    ]),
+    linesSection([`  Validation target: ${resolveValidateTargetLabel(options)}`]),
     panelSection({
       title: "Checks Included",
       lines: [
-        `  ${colorToken(
-          "\u25CF",
-          "primary"
-        )} SKILL.md exists + frontmatter parseability`,
+        `  ${colorToken("\u25CF", "primary")} SKILL.md exists + frontmatter parseability`,
         `  ${colorToken("\u25CF", "primary")} required fields: name, description`,
         `  ${colorToken("\u25CF", "primary")} name \u2194 directory consistency`,
         `  ${colorToken("\u25CF", "primary")} markdown reference existence`,
-        `  ${colorToken(
-          "\u25CF",
-          "primary"
-        )} type-specific rules (framework references dir)`,
-        `  ${colorToken(
-          "\u25CF",
-          "primary"
-        )} installer dependency security + preflight`,
+        `  ${colorToken("\u25CF", "primary")} type-specific rules (framework references dir)`,
+        `  ${colorToken("\u25CF", "primary")} installer dependency security + preflight`,
         `  ${colorToken("\u25CF", "primary")} line/description budget thresholds`
       ],
       style: "square",
@@ -6637,10 +6604,7 @@ async function executeValidate(options) {
   }
 }
 function configureValidateCommand(command, action) {
-  return command.description("Validate skill source structure and references").argument("[source]", "Source path or URL").option("--ci", "Validate multiple local roots for CI").option("--root <paths...>", "Root paths for CI mode").option("--strict", "Escalate warnings to errors").option("--json", "Emit JSON output").option("--max-lines <n>", "SKILL.md line budget threshold").option(
-    "--max-description-chars <n>",
-    "Description length budget threshold"
-  ).option("--allow-host <hosts...>", "Restrict well-known hosts to allowlist").option("--deny-host <hosts...>", "Block specific well-known hosts").option("--max-download-bytes <n>", "Set well-known download budget").option("--policy-mode <mode>", "Policy mode (enforce|warn)").action(action);
+  return command.description("Validate skill source structure and references").argument("[source]", "Source path or URL").option("--ci", "Validate multiple local roots for CI").option("--root <paths...>", "Root paths for CI mode").option("--strict", "Escalate warnings to errors").option("--json", "Emit JSON output").option("--max-lines <n>", "SKILL.md line budget threshold").option("--max-description-chars <n>", "Description length budget threshold").option("--allow-host <hosts...>", "Restrict well-known hosts to allowlist").option("--deny-host <hosts...>", "Block specific well-known hosts").option("--max-download-bytes <n>", "Set well-known download budget").option("--policy-mode <mode>", "Policy mode (enforce|warn)").action(action);
 }
 function registerValidateCommand(program, ctx) {
   configureValidateCommand(
@@ -6680,9 +6644,22 @@ function createCliTelemetryEmitter(sink) {
 
 // src/cli.ts
 import picocolors from "picocolors";
+import path16 from "node:path";
+import { fileURLToPath as fileURLToPath3 } from "node:url";
 var require2 = createRequire(import.meta.url);
 var packageJson = require2("../package.json");
 var CLI_VERSION = typeof packageJson.version === "string" ? packageJson.version : "0.1.0";
+function resolveSkillsppLogoDir() {
+  const moduleDir = path16.dirname(fileURLToPath3(import.meta.url));
+  return path16.resolve(moduleDir, "../src/assets/ascii/logo");
+}
+function configureSkillsppLogoAssetPaths() {
+  const logoDir = resolveSkillsppLogoDir();
+  configureLogoAssetPaths({
+    sessionPath: path16.join(logoDir, "skillspp-logo.session.json"),
+    textPath: path16.join(logoDir, "skillspp-logo.txt")
+  });
+}
 function formatCliError(error) {
   if (error && typeof error === "object" && "code" in error) {
     const code = String(error.code);
@@ -6706,14 +6683,6 @@ function createProgram(emitter, experimental) {
   applyExitOverride(program);
   return program;
 }
-function applyExitOverride(command) {
-  command.exitOverride((error) => {
-    throw error;
-  });
-  for (const subcommand of command.commands) {
-    applyExitOverride(subcommand);
-  }
-}
 function parseTelemetryFromArgv(argv) {
   for (let i = 0; i < argv.length; i += 1) {
     if (argv[i] !== "--telemetry") {
@@ -6723,35 +6692,8 @@ function parseTelemetryFromArgv(argv) {
   }
   return void 0;
 }
-function inferCommandSource(argv) {
-  for (let i = 0; i < argv.length; i += 1) {
-    const arg = argv[i];
-    if (arg === "--telemetry") {
-      i += 1;
-      continue;
-    }
-    if (arg.startsWith("-")) {
-      continue;
-    }
-    return arg;
-  }
-  return "cli";
-}
-function emitCommanderParseErrorTelemetry(emitter, argv, error) {
-  const source = inferCommandSource(argv);
-  emitLifecycleEvent(emitter, {
-    eventType: `${source}_failed`,
-    source,
-    reason: "commander_parse_error",
-    command: source,
-    status: "error",
-    error: error.message,
-    metadata: {
-      commanderCode: error.code
-    }
-  });
-}
 async function runCli(argv) {
+  configureSkillsppLogoAssetPaths();
   const telemetrySink = parseTelemetrySink(parseTelemetryFromArgv(argv));
   const emitter = createCliTelemetryEmitter(telemetrySink);
   const experimental = argv.includes("--experimental");
@@ -6764,11 +6706,13 @@ async function runCli(argv) {
     await program.parseAsync(argv, { from: "user" });
     return 0;
   } catch (error) {
-    if (error instanceof CommanderError2 && (error.code === "commander.helpDisplayed" || error.code === "commander.version")) {
+    if (isGracefulCommanderExit(error)) {
       return 0;
     }
     if (error instanceof CommanderError2) {
-      emitCommanderParseErrorTelemetry(emitter, argv, error);
+      emitCommanderParseErrorTelemetry(emitter, argv, error, {
+        valueFlags: ["--telemetry"]
+      });
       throw new Error(error.message);
     }
     throw error;
@@ -6797,6 +6741,7 @@ runCli(process.argv.slice(2)).then(
   }
 );
 export {
+  configureSkillsppLogoAssetPaths,
   runCli
 };
 //# sourceMappingURL=cli.js.map