skillops-cli 1.3.0 → 1.3.2

package/dist/cli.js

@@ -6,15 +6,11 @@ import path10 from "path";
 import { fileURLToPath, pathToFileURL } from "url";
 import YAML6 from "yaml";
 
-// src/auditor/parser.ts
-import fs2 from "fs";
-import path from "path";
-
 // src/models.ts
 import fs from "fs";
 import YAML from "yaml";
 import { z } from "zod";
-var SKILLOPS_VERSION = "1.3.0";
+var SKILLOPS_VERSION = "1.3.2";
 var SKILL_NAME_REGEX = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 var SEMVER_REGEX = /^\d+\.\d+\.\d+$/;
 var FRONTMATTER_REGEX = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/;
@@ -30,7 +26,9 @@ function estimateTokenCount(text) {
     return 0;
   }
   const words = countWords(stripped);
-  const punctBonus = Math.floor((stripped.match(PUNCT_CODE_REGEX)?.length ?? 0) / 4);
+  const punctBonus = Math.floor(
+    (stripped.match(PUNCT_CODE_REGEX)?.length ?? 0) / 4
+  );
   return Math.max(1, Math.ceil(words * 1.33) + punctBonus);
 }
 function splitFrontmatter(rawText, sourceLabel) {
@@ -44,7 +42,9 @@ function splitFrontmatter(rawText, sourceLabel) {
   const body = match[2] ?? "";
   const parsed = YAML.parse(yamlText);
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-    throw new Error(`YAML frontmatter in '${sourceLabel}' must evaluate to a key-value mapping.`);
+    throw new Error(
+      `YAML frontmatter in '${sourceLabel}' must evaluate to a key-value mapping.`
+    );
   }
   return [parsed, body];
 }
@@ -543,7 +543,9 @@ var SubagentManifestSchema = z.object({
       });
     }
   }),
-  tools: z.array(z.string().min(1)).min(1, { message: "Subagent must declare an explicit non-empty tool allowlist per INV-SKILL-04." }).superRefine((tools, ctx) => {
+  tools: z.array(z.string().min(1)).min(1, {
+    message: "Subagent must declare an explicit non-empty tool allowlist per INV-SKILL-04."
+  }).superRefine((tools, ctx) => {
     for (const tool of tools) {
       if (FORBIDDEN_WILDCARD_TOOLS.has(tool.trim().toLowerCase())) {
         ctx.addIssue({
@@ -734,7 +736,14 @@ var SyncedArtifactSchema = z.object({
   skill_name: z.string().min(1),
   relative_path: z.string().min(1),
   sha256: z.string().regex(/^[0-9a-f]{64}$/),
-  action: z.enum(["created", "updated", "unchanged", "removed", "planned", "conflict"])
+  action: z.enum([
+    "created",
+    "updated",
+    "unchanged",
+    "removed",
+    "planned",
+    "conflict"
+  ])
 }).strict();
 var SyncLockEntrySchema = z.object({
   target: RuntimeTargetSchema,
@@ -820,6 +829,8 @@ function loadSkillOpsConfig(repoPath) {
 }
 
 // src/auditor/parser.ts
+import fs2 from "fs";
+import path from "path";
 function walkForFilesNamed(rootDir, targetFilename) {
   if (!fs2.existsSync(rootDir)) {
     return [];
@@ -852,7 +863,10 @@ function parseSkillDirectory(skillDir, options = {}) {
   const rawText = fs2.readFileSync(skillMdPath, "utf-8");
   const lines = rawText.split(/\r?\n/);
   const totalLines = rawText.endsWith("\n") ? lines.length - 1 : lines.length;
-  const [, markdownBody] = splitFrontmatter(rawText, skillMdPath.replace(/\\/g, "/"));
+  const [, markdownBody] = splitFrontmatter(
+    rawText,
+    skillMdPath.replace(/\\/g, "/")
+  );
   const manifest = parseSkillMdFile(skillMdPath);
   const declaredScripts = [];
   const missingDeclaredScripts = [];
@@ -886,7 +900,9 @@ function parseSkillDirectory(skillDir, options = {}) {
   const referencesDir = path.join(skillDir, "references");
   const referenceFiles = [];
   if (fs2.existsSync(referencesDir) && fs2.statSync(referencesDir).isDirectory()) {
-    for (const entry of fs2.readdirSync(referencesDir, { withFileTypes: true })) {
+    for (const entry of fs2.readdirSync(referencesDir, {
+      withFileTypes: true
+    })) {
       if (entry.isFile() && entry.name.endsWith(".md")) {
         referenceFiles.push(path.join(referencesDir, entry.name));
       }
@@ -951,112 +967,6 @@ function parseSubagentFile(filePath) {
   };
 }
 
-// src/auditor/token_budget.ts
-function auditSkillTokenBudget(skillDir, options = {}) {
-  const requireLayout = options.requireLayout ?? false;
-  try {
-    const parsed = parseSkillDirectory(skillDir, { requireLayout });
-    const warnings = [];
-    const errors = [];
-    if (parsed.manifest.routing_signals.negative_triggers.length === 0 && !parsed.manifest.description.toLowerCase().includes("do not trigger")) {
-      warnings.push(
-        `Skill '${parsed.manifest.name}' has no explicit negative triggers ('Do not trigger for...' or routing_signals.negative_triggers).`
-      );
-    }
-    if (requireLayout && parsed.missingDeclaredScripts.length > 0) {
-      errors.push(
-        `Skill '${parsed.manifest.name}' is missing declared script(s): ${parsed.missingDeclaredScripts.join(", ")}`
-      );
-    }
-    return {
-      skillName: parsed.manifest.name,
-      skillDir: skillDir.replace(/\\/g, "/"),
-      l1Words: parsed.manifest.description_words,
-      l1Tokens: parsed.manifest.description_tokens,
-      l2Lines: parsed.manifest.body_lines,
-      l2Tokens: parsed.manifest.body_tokens,
-      totalLines: parsed.totalLines,
-      scriptsCount: parsed.declaredScripts.length,
-      passed: errors.length === 0,
-      errors,
-      warnings
-    };
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    return {
-      skillName: skillDir.split(/[\\/]/).pop() ?? "unknown",
-      skillDir: skillDir.replace(/\\/g, "/"),
-      l1Words: 0,
-      l1Tokens: 0,
-      l2Lines: 0,
-      l2Tokens: 0,
-      totalLines: 0,
-      scriptsCount: 0,
-      passed: false,
-      errors: [message],
-      warnings: []
-    };
-  }
-}
-function auditSubagentTokenBudget(filePath) {
-  try {
-    const parsed = parseSubagentFile(filePath);
-    return {
-      subagentName: parsed.manifest.name,
-      filePath: filePath.replace(/\\/g, "/"),
-      descriptionTokens: parsed.manifest.description_tokens,
-      systemPromptLines: parsed.manifest.system_prompt_lines,
-      systemPromptTokens: parsed.manifest.system_prompt_tokens,
-      maxOutputTokens: parsed.manifest.max_output_tokens,
-      tools: parsed.manifest.tools,
-      passed: true,
-      errors: []
-    };
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    return {
-      subagentName: filePath.split(/[\\/]/).pop() ?? "unknown",
-      filePath: filePath.replace(/\\/g, "/"),
-      descriptionTokens: 0,
-      systemPromptLines: 0,
-      systemPromptTokens: 0,
-      maxOutputTokens: 0,
-      tools: [],
-      passed: false,
-      errors: [message]
-    };
-  }
-}
-function auditCatalogTokenBudgets(catalogDir, options = {}) {
-  const skillDirs = discoverSkillDirectories(catalogDir);
-  const subagentFiles = discoverSubagentFiles(catalogDir);
-  const skills = skillDirs.map((dir) => auditSkillTokenBudget(dir, options));
-  const subagents = subagentFiles.map((file) => auditSubagentTokenBudget(file));
-  const errors = [];
-  const warnings = [];
-  let totalL1Tokens = 0;
-  let totalSubagentPromptTokens = 0;
-  for (const s of skills) {
-    totalL1Tokens += s.l1Tokens;
-    errors.push(...s.errors);
-    warnings.push(...s.warnings);
-  }
-  for (const sa of subagents) {
-    totalSubagentPromptTokens += sa.systemPromptTokens;
-    errors.push(...sa.errors);
-  }
-  return {
-    catalogPath: catalogDir.replace(/\\/g, "/"),
-    skills,
-    subagents,
-    totalL1Tokens,
-    totalSubagentPromptTokens,
-    errors,
-    warnings,
-    passed: errors.length === 0
-  };
-}
-
 // src/auditor/collision.ts
 var ROUTING_STOPWORDS = /* @__PURE__ */ new Set([
   "a",
@@ -1385,6 +1295,12 @@ function auditCatalog(catalogDir, options = {}) {
   });
 }
 
+// src/auditor/doctor.ts
+import { spawnSync } from "child_process";
+import crypto from "crypto";
+import fs4 from "fs";
+import path3 from "path";
+
 // src/auditor/token_economy.ts
 import fs3 from "fs";
 import path2 from "path";
@@ -1456,42 +1372,10 @@ function padVisible(text, width, align = "left") {
   }
   return `${text}${" ".repeat(diff)}`;
 }
-function renderBox(lines, options) {
-  const paddingX = options?.paddingX ?? 2;
-  const minWidth = options?.minWidth ?? 64;
-  const colorEnabled = options?.colorEnabled;
-  const borderFn = options?.borderColor ?? style.cyan;
-  const titleText = options?.title ? ` ${options.title.trim()} ` : "";
-  const titleVisibleLen = visibleLength(titleText);
-  const maxLineLen = lines.reduce(
-    (max, line) => Math.max(max, visibleLength(line)),
-    0
-  );
-  const innerWidth = Math.max(
-    minWidth,
-    maxLineLen + paddingX * 2,
-    titleVisibleLen + 4
-  );
-  const contentWidth = innerWidth - paddingX * 2;
-  const padStr = " ".repeat(paddingX);
-  const topBorder = titleVisibleLen > 0 ? `${borderFn("\u256D\u2500", colorEnabled)}${style.bold(titleText, colorEnabled)}${borderFn(`${"\u2500".repeat(Math.max(1, innerWidth - titleVisibleLen - 1))}\u256E`, colorEnabled)}` : borderFn(`\u256D${"\u2500".repeat(innerWidth)}\u256E`, colorEnabled);
-  const bodyLines = lines.map((line) => {
-    const padded = padVisible(line, contentWidth, "left");
-    return `${borderFn("\u2502", colorEnabled)}${padStr}${padded}${padStr}${borderFn("\u2502", colorEnabled)}`;
-  });
-  const bottomBorder = borderFn(`\u2570${"\u2500".repeat(innerWidth)}\u256F`, colorEnabled);
-  return [topBorder, ...bodyLines, bottomBorder].join("\n");
-}
-function renderHeaderBanner(subtitle = "Framework & Library for High-End AI Coding Skills & Subagents", options) {
+function renderHeaderBanner(subtitle = "Framework & Library for AI Skills & Subagents", options) {
   const ver = options?.version ?? SKILLOPS_VERSION;
   const c = options?.colorEnabled;
-  const headline = `${style.bold(style.cyan(`\u26A1 SkillOps v${ver}`, c), c)} ${style.dim("\u2014", c)} ${subtitle}`;
-  return renderBox([headline], {
-    borderColor: style.cyan,
-    paddingX: 2,
-    minWidth: 72,
-    colorEnabled: c
-  });
+  return `${style.bold(style.cyan(`\u25C6 SkillOps v${ver}`, c), c)} ${style.dim("\u2014", c)} ${subtitle}`;
 }
 function renderTable(headers, rows, options) {
   const indent = " ".repeat(options?.indent ?? 2);
@@ -1524,7 +1408,7 @@ function renderTable(headers, rows, options) {
   ].join("\n");
 }
 function renderTokenBar(current, max, options) {
-  const width = options?.width ?? 18;
+  const width = options?.width ?? 10;
   const unit = options?.unit ?? "tokens";
   const c = options?.colorEnabled;
   const safeMax = max > 0 ? max : 1;
@@ -1542,9 +1426,8 @@ function renderTokenBar(current, max, options) {
 var renderProgressBar = renderTokenBar;
 function renderSectionHeader(title, colorEnabled) {
   const c = colorEnabled;
-  return `
-  ${style.bold(style.cyan(title, c), c)}
-  ${style.dim("\u2500".repeat(Math.max(24, visibleLength(title))), c)}`;
+  return `${style.dim("\u2502", c)}
+${style.dim("\u251C\u2500", c)} ${style.bold(style.cyan(title, c), c)}`;
 }
 function formatBadge(type, customLabel, colorEnabled) {
   switch (type) {
@@ -1583,73 +1466,72 @@ function formatBadge(type, customLabel, colorEnabled) {
 function renderStep(step, total, title, detail, status = "done", colorEnabled) {
   const icon = status === "done" ? style.green("\u2714", colorEnabled) : status === "warn" ? style.yellow("\u26A0", colorEnabled) : style.dim("\u25CB", colorEnabled);
   const stepBadge = style.dim(`[${step}/${total}]`, colorEnabled);
-  const titleStyled = style.bold(padVisible(title, 28, "left"), colorEnabled);
-  const detailStyled = detail ? ` ${style.dim("\u2022", colorEnabled)} ${detail}` : "";
-  return `  ${icon} ${stepBadge} ${titleStyled}${detailStyled}`;
+  const titleStyled = style.bold(padVisible(title, 20, "left"), colorEnabled);
+  const detailStyled = detail ? ` ${style.dim("\xB7", colorEnabled)} ${detail}` : "";
+  return `${style.dim("\u2502", colorEnabled)}  ${icon} ${stepBadge} ${titleStyled}${detailStyled}`;
 }
 function renderNextSteps(hints, colorEnabled) {
   if (hints.length === 0) {
     return "";
   }
   const c = colorEnabled;
-  const maxCmdLen = hints.reduce(
-    (m, h) => Math.max(m, visibleLength(h.command)),
-    0
+  const maxCmdLen = Math.min(
+    44,
+    hints.reduce((m, h) => Math.max(m, visibleLength(h.command)), 0)
   );
   const lines = [
-    "",
-    `  ${style.bold(style.cyan("\u{1F4A1} Next Steps:", c), c)}`,
-    ...hints.map(
-      (h) => `     ${style.green(padVisible(h.command, maxCmdLen + 2, "left"), c)} ${style.dim(`# ${h.description}`, c)}`
-    ),
-    ""
+    style.dim("\u2502", c),
+    `${style.dim("\u2570\u2500", c)} ${style.bold(style.cyan("Next Steps:", c), c)}`,
+    ...hints.map((h) => {
+      const cmdPadded = padVisible(h.command, maxCmdLen, "left");
+      const prefixCols = 5 + visibleLength(cmdPadded) + 3;
+      const maxDescCols = Math.max(10, 76 - prefixCols);
+      const desc = h.description.length > maxDescCols ? `${h.description.slice(0, maxDescCols - 1)}\u2026` : h.description;
+      return `   ${style.dim("$", c)} ${style.green(cmdPadded, c)} ${style.dim(`\u2014 ${desc}`, c)}`;
+    })
   ];
-  return lines.join("\n");
+  return `${lines.join("\n")}
+`;
 }
 function renderAiUsageGuide(targets, skills, subagents, colorEnabled) {
   const c = colorEnabled;
   const sampleSkill = skills[0] ?? "systematic-debugging";
   const sampleAgent = subagents[0] ?? "context-scout";
+  const bar = style.dim("\u2502", c);
   const lines = [
-    `${style.bold("How to use your installed Skills & Subagents inside your AI:", c)}`,
-    ""
+    bar,
+    `${style.dim("\u251C\u2500", c)} ${style.bold(style.cyan("Using Your Skills & Subagents", c), c)}`
   ];
   const targetSet = new Set(targets);
   if (targetSet.has("claude") || targetSet.size === 0) {
     lines.push(
-      `\u2022 ${style.bold("Claude Code:", c)} Ask naturally (auto-routed via .claude/skills/${sampleSkill}/SKILL.md) or delegate to @${sampleAgent}`
+      `${bar}  \u2022 ${style.bold("Claude Code:", c)} Auto-routed (${sampleSkill}) or @${sampleAgent}`
     );
   }
   if (targetSet.has("cursor")) {
     lines.push(
-      `\u2022 ${style.bold("Cursor IDE:", c)} Type ${style.cyan(`@${sampleSkill}`, c)} in Cursor Chat/Composer or let .cursor/rules/${sampleSkill}.mdc auto-attach`
+      `${bar}  \u2022 ${style.bold("Cursor IDE:", c)} Type ${style.cyan(`@${sampleSkill}`, c)} in Chat (.cursor/rules/)`
     );
   }
   if (targetSet.has("antigravity")) {
     lines.push(
-      `\u2022 ${style.bold("Antigravity / Gemini:", c)} Auto-activated from .agent/skills/${sampleSkill}/SKILL.md when your prompt matches its domain`
+      `${bar}  \u2022 ${style.bold("Antigravity:", c)} Auto-activated (.agent/skills/${sampleSkill})`
     );
   }
   if (targetSet.has("copilot")) {
     lines.push(
-      `\u2022 ${style.bold("GitHub Copilot:", c)} Use ${style.cyan(`/${sampleSkill}`, c)} prompt in Copilot Chat or reference .github/instructions/${sampleSkill}.instructions.md`
+      `${bar}  \u2022 ${style.bold("Copilot:", c)} Use ${style.cyan(`/${sampleSkill}`, c)} in Chat (.github/instructions/)`
     );
   }
   if (targetSet.has("windsurf") || targetSet.has("cline") || targetSet.has("roocode") || targetSet.has("kilocode")) {
     lines.push(
-      `\u2022 ${style.bold("Windsurf / Cline / Roo / Kilo:", c)} Rules in .windsurf/rules/, .clinerules/, .roo/rules/, .kilocode/rules/ activate automatically`
+      `${bar}  \u2022 ${style.bold("Windsurf/Cline/Roo/Kilo:", c)} Workspace rules load automatically`
     );
   }
   lines.push(
-    `\u2022 ${style.bold("Inspect any Skill/Agent:", c)} Run ${style.green(`npx skillops-cli info ${sampleSkill}`, c)} to view triggers, L3 scripts & prompts`
+    `${bar}  \u2022 ${style.bold("Inspect:", c)} ${style.green(`npx skillops-cli info ${sampleSkill}`, c)}`
   );
-  return renderBox(lines, {
-    title: "\u{1F680} Using Your Skills & Subagents",
-    borderColor: style.green,
-    paddingX: 2,
-    minWidth: 72,
-    colorEnabled: c
-  });
+  return lines.join("\n");
 }
 function levenshteinDistance(a, b) {
   const s1 = a.toLowerCase();
@@ -2087,7 +1969,7 @@ function formatTokenEconomyReport(report, format = "table") {
   const startupBar = renderProgressBar(
     report.startup_token_tax,
     report.startup_tax_budget,
-    { width: 18, unit: "tokens" }
+    { width: 10, unit: "tokens" }
   );
   const lines = [
     "=== SkillOps Token Economy & Startup Context Tax Analyzer ===",
@@ -2112,11 +1994,11 @@ function formatTokenEconomyReport(report, format = "table") {
     renderNextSteps([
       {
         command: "npx skillops-cli quickstart",
-        description: "Sync Progressive Disclosure Skills & Context-Isolated Subagents"
+        description: "Sync Progressive Disclosure Skills & Subagents"
       },
       {
         command: "npx skillops-cli doctor",
-        description: "Inspect repository lockfile & startup tax diagnostics"
+        description: "Inspect lockfile & startup tax diagnostics"
       }
     ]).trimEnd()
   );
@@ -2125,10 +2007,6 @@ function formatTokenEconomyReport(report, format = "table") {
 }
 
 // src/auditor/doctor.ts
-import { spawnSync } from "child_process";
-import crypto from "crypto";
-import fs4 from "fs";
-import path3 from "path";
 function computeFileSha256(content) {
   return crypto.createHash("sha256").update(content, "utf-8").digest("hex");
 }
@@ -2360,10 +2238,12 @@ function inspectHarnesses(repoPath) {
   const repoLabel = path3.basename(resolvedRepo) || ".";
   const detectedHarnesses = detectInstalledHarnesses(resolvedRepo);
   const detectedSet = new Set(detectedHarnesses);
-  const harnesses = ALL_RUNTIME_TARGETS.map((target) => ({
-    ...RUNTIME_HARNESS_SPECS[target],
-    detected: detectedSet.has(target)
-  }));
+  const harnesses = ALL_RUNTIME_TARGETS.map(
+    (target) => ({
+      ...RUNTIME_HARNESS_SPECS[target],
+      detected: detectedSet.has(target)
+    })
+  );
   return {
     repo_path: repoLabel,
     total_supported: harnesses.length,
@@ -2420,9 +2300,13 @@ function formatDoctorReport(report, format = "table") {
     }
     for (const check of report.checks) {
       if (check.status === "fail") {
-        lines2.push(`::error title=SkillOps Doctor (${check.title})::${check.summary}`);
+        lines2.push(
+          `::error title=SkillOps Doctor (${check.title})::${check.summary}`
+        );
       } else if (check.status === "warn") {
-        lines2.push(`::warning title=SkillOps Doctor (${check.title})::${check.summary}`);
+        lines2.push(
+          `::warning title=SkillOps Doctor (${check.title})::${check.summary}`
+        );
       }
     }
     lines2.push(
@@ -2492,7 +2376,9 @@ function formatDoctorReport(report, format = "table") {
     lines.push("-".repeat(64), "Tracked Lockfile Artifacts:");
     for (const art of report.artifacts) {
       const badge = art.status === "healthy" ? "[HEALTHY]" : art.status === "drifted" ? "[DRIFTED]" : "[MISSING]";
-      lines.push(`  ${badge} ${art.relative_path} (${art.target} :: ${art.item_name})`);
+      lines.push(
+        `  ${badge} ${art.relative_path} (${art.target} :: ${art.item_name})`
+      );
     }
   }
   if (report.remediation.length > 0) {
@@ -2504,6 +2390,112 @@ function formatDoctorReport(report, format = "table") {
   return lines.join("\n");
 }
 
+// src/auditor/token_budget.ts
+function auditSkillTokenBudget(skillDir, options = {}) {
+  const requireLayout = options.requireLayout ?? false;
+  try {
+    const parsed = parseSkillDirectory(skillDir, { requireLayout });
+    const warnings = [];
+    const errors = [];
+    if (parsed.manifest.routing_signals.negative_triggers.length === 0 && !parsed.manifest.description.toLowerCase().includes("do not trigger")) {
+      warnings.push(
+        `Skill '${parsed.manifest.name}' has no explicit negative triggers ('Do not trigger for...' or routing_signals.negative_triggers).`
+      );
+    }
+    if (requireLayout && parsed.missingDeclaredScripts.length > 0) {
+      errors.push(
+        `Skill '${parsed.manifest.name}' is missing declared script(s): ${parsed.missingDeclaredScripts.join(", ")}`
+      );
+    }
+    return {
+      skillName: parsed.manifest.name,
+      skillDir: skillDir.replace(/\\/g, "/"),
+      l1Words: parsed.manifest.description_words,
+      l1Tokens: parsed.manifest.description_tokens,
+      l2Lines: parsed.manifest.body_lines,
+      l2Tokens: parsed.manifest.body_tokens,
+      totalLines: parsed.totalLines,
+      scriptsCount: parsed.declaredScripts.length,
+      passed: errors.length === 0,
+      errors,
+      warnings
+    };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    return {
+      skillName: skillDir.split(/[\\/]/).pop() ?? "unknown",
+      skillDir: skillDir.replace(/\\/g, "/"),
+      l1Words: 0,
+      l1Tokens: 0,
+      l2Lines: 0,
+      l2Tokens: 0,
+      totalLines: 0,
+      scriptsCount: 0,
+      passed: false,
+      errors: [message],
+      warnings: []
+    };
+  }
+}
+function auditSubagentTokenBudget(filePath) {
+  try {
+    const parsed = parseSubagentFile(filePath);
+    return {
+      subagentName: parsed.manifest.name,
+      filePath: filePath.replace(/\\/g, "/"),
+      descriptionTokens: parsed.manifest.description_tokens,
+      systemPromptLines: parsed.manifest.system_prompt_lines,
+      systemPromptTokens: parsed.manifest.system_prompt_tokens,
+      maxOutputTokens: parsed.manifest.max_output_tokens,
+      tools: parsed.manifest.tools,
+      passed: true,
+      errors: []
+    };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    return {
+      subagentName: filePath.split(/[\\/]/).pop() ?? "unknown",
+      filePath: filePath.replace(/\\/g, "/"),
+      descriptionTokens: 0,
+      systemPromptLines: 0,
+      systemPromptTokens: 0,
+      maxOutputTokens: 0,
+      tools: [],
+      passed: false,
+      errors: [message]
+    };
+  }
+}
+function auditCatalogTokenBudgets(catalogDir, options = {}) {
+  const skillDirs = discoverSkillDirectories(catalogDir);
+  const subagentFiles = discoverSubagentFiles(catalogDir);
+  const skills = skillDirs.map((dir) => auditSkillTokenBudget(dir, options));
+  const subagents = subagentFiles.map((file) => auditSubagentTokenBudget(file));
+  const errors = [];
+  const warnings = [];
+  let totalL1Tokens = 0;
+  let totalSubagentPromptTokens = 0;
+  for (const s of skills) {
+    totalL1Tokens += s.l1Tokens;
+    errors.push(...s.errors);
+    warnings.push(...s.warnings);
+  }
+  for (const sa of subagents) {
+    totalSubagentPromptTokens += sa.systemPromptTokens;
+    errors.push(...sa.errors);
+  }
+  return {
+    catalogPath: catalogDir.replace(/\\/g, "/"),
+    skills,
+    subagents,
+    totalL1Tokens,
+    totalSubagentPromptTokens,
+    errors,
+    warnings,
+    passed: errors.length === 0
+  };
+}
+
 // src/eval/index.ts
 import fs5 from "fs";
 import path4 from "path";
@@ -2563,10 +2555,15 @@ function evaluateSkillDirectory(skillDir) {
   const evalsPath = path4.join(skillDir, "evals", "evals.json");
   const rawSuite = JSON.parse(fs5.readFileSync(evalsPath, "utf-8"));
   const suite = SkillEvalSuiteSchema.parse(rawSuite);
-  const assertionsCount = suite.evals.reduce((acc, c) => acc + c.assertions.length, 0);
+  const assertionsCount = suite.evals.reduce(
+    (acc, c) => acc + c.assertions.length,
+    0
+  );
   const benchmarkPath = path4.join(skillDir, "evals", "benchmark.json");
   if (fs5.existsSync(benchmarkPath) && fs5.statSync(benchmarkPath).isFile()) {
-    const rawBench = JSON.parse(fs5.readFileSync(benchmarkPath, "utf-8"));
+    const rawBench = JSON.parse(
+      fs5.readFileSync(benchmarkPath, "utf-8")
+    );
     const bench = SkillBenchmarkSchema.parse({
       ...rawBench,
       eval_cases_count: suite.evals.length,
@@ -2622,18 +2619,25 @@ function evaluateCatalog(catalogDir, options = {}) {
   }
   const count = benchmarks.length;
   const meanWith = count > 0 ? Number(
-    (benchmarks.reduce((acc, b) => acc + b.with_skill.pass_rate_mean, 0) / count).toFixed(4)
+    (benchmarks.reduce(
+      (acc, b) => acc + b.with_skill.pass_rate_mean,
+      0
+    ) / count).toFixed(4)
   ) : 0;
   const meanWithout = count > 0 ? Number(
-    (benchmarks.reduce((acc, b) => acc + b.without_skill.pass_rate_mean, 0) / count).toFixed(
-      4
-    )
+    (benchmarks.reduce(
+      (acc, b) => acc + b.without_skill.pass_rate_mean,
+      0
+    ) / count).toFixed(4)
   ) : 0;
   const meanGain = count > 0 ? Number(
     (benchmarks.reduce((acc, b) => acc + b.delta.pass_rate_gain, 0) / count).toFixed(4)
   ) : 0;
   const meanTokRed = count > 0 ? Number(
-    (benchmarks.reduce((acc, b) => acc + b.delta.token_reduction_pct, 0) / count).toFixed(2)
+    (benchmarks.reduce(
+      (acc, b) => acc + b.delta.token_reduction_pct,
+      0
+    ) / count).toFixed(2)
   ) : 0;
   return CatalogEvalSummarySchema.parse({
     catalog_path: resolvedCatalog.replace(/\\/g, "/"),
@@ -2739,6 +2743,9 @@ import path7 from "path";
 import readline from "readline";
 import YAML3 from "yaml";
 
+// src/router/bundle_compiler.ts
+import path6 from "path";
+
 // src/router/fingerprinter.ts
 import fs6 from "fs";
 import path5 from "path";
@@ -2838,13 +2845,17 @@ var RepoFingerprinter = class {
         python312Plus = true;
         signals.add("python3.12");
       }
-      const quotedSpecs = content.match(/["']([a-zA-Z0-9._-]+(?:\[[a-zA-Z0-9,_-]+\])?\s*(?:[><=~!][^"']+)?)["']/g) ?? [];
+      const quotedSpecs = content.match(
+        /["']([a-zA-Z0-9._-]+(?:\[[a-zA-Z0-9,_-]+\])?\s*(?:[><=~!][^"']+)?)["']/g
+      ) ?? [];
       for (const spec of quotedSpecs) {
         recordDep(spec);
       }
     }
     if (fs6.existsSync(this.repoPath)) {
-      for (const entry of fs6.readdirSync(this.repoPath, { withFileTypes: true })) {
+      for (const entry of fs6.readdirSync(this.repoPath, {
+        withFileTypes: true
+      })) {
         if (entry.isFile() && /^requirements.*\.txt$/i.test(entry.name)) {
           detectedFiles.add(entry.name);
           languages.add("python");
@@ -2864,8 +2875,14 @@ var RepoFingerprinter = class {
       signals.add("nodejs");
       signals.add("package.json");
       try {
-        const pkgJson = JSON.parse(fs6.readFileSync(pkgJsonPath, "utf-8"));
-        const depSections = ["dependencies", "devDependencies", "peerDependencies"];
+        const pkgJson = JSON.parse(
+          fs6.readFileSync(pkgJsonPath, "utf-8")
+        );
+        const depSections = [
+          "dependencies",
+          "devDependencies",
+          "peerDependencies"
+        ];
         for (const section of depSections) {
           const obj = pkgJson[section];
           if (obj && typeof obj === "object") {
@@ -2969,7 +2986,6 @@ function fingerprintRepository(repoPath) {
 }
 
 // src/router/bundle_compiler.ts
-import path6 from "path";
 function scoreSkillAgainstProfile(parsedSkill, profile, taskPrompt = "") {
   const manifest = parsedSkill.manifest;
   const repoSignalSet = new Set(
@@ -3190,7 +3206,7 @@ function formatRoutedBundle(bundle, format = "table", colorEnabled) {
     bundle.total_l1_tokens,
     bundle.max_l1_tokens,
     {
-      width: 18,
+      width: 10,
       unit: "tokens",
       colorEnabled
     }
@@ -3199,11 +3215,11 @@ function formatRoutedBundle(bundle, format = "table", colorEnabled) {
     [
       {
         command: "npx skillops-cli quickstart",
-        description: "Install this recommended bundle & wire MCP in 1 step"
+        description: "Install recommended bundle & wire MCP"
       },
       {
         command: `npx skillops-cli info ${topSkill}`,
-        description: `Inspect ${topSkill} triggers, L3 scripts & AI invocation guide`
+        description: `Inspect ${topSkill} triggers & L3 scripts`
       }
     ],
     colorEnabled
@@ -3230,7 +3246,10 @@ var MCP_TOOLS = [
     inputSchema: {
       type: "object",
       properties: {
-        catalog_dir: { type: "string", description: "Optional path to catalog directory." }
+        catalog_dir: {
+          type: "string",
+          description: "Optional path to catalog directory."
+        }
       },
       additionalProperties: false
     }
@@ -3241,8 +3260,14 @@ var MCP_TOOLS = [
     inputSchema: {
       type: "object",
       properties: {
-        repo_path: { type: "string", description: "Target repository root path." },
-        startup_tax_budget: { type: "number", description: "Max startup token budget." }
+        repo_path: {
+          type: "string",
+          description: "Target repository root path."
+        },
+        startup_tax_budget: {
+          type: "number",
+          description: "Max startup token budget."
+        }
       },
       additionalProperties: false
     }
@@ -3253,8 +3278,14 @@ var MCP_TOOLS = [
     inputSchema: {
       type: "object",
       properties: {
-        repo_path: { type: "string", description: "Target repository root path." },
-        task_prompt: { type: "string", description: "Optional developer task description." }
+        repo_path: {
+          type: "string",
+          description: "Target repository root path."
+        },
+        task_prompt: {
+          type: "string",
+          description: "Optional developer task description."
+        }
       },
       additionalProperties: false
     }
@@ -3277,7 +3308,10 @@ var MCP_TOOLS = [
     inputSchema: {
       type: "object",
       properties: {
-        skill_name: { type: "string", description: "Optional skill name filter." }
+        skill_name: {
+          type: "string",
+          description: "Optional skill name filter."
+        }
       },
       additionalProperties: false
     }
@@ -3297,8 +3331,14 @@ var MCP_TOOLS = [
     inputSchema: {
       type: "object",
       properties: {
-        repo_path: { type: "string", description: "Target repository root path." },
-        startup_tax_budget: { type: "number", description: "Optional startup token budget override." }
+        repo_path: {
+          type: "string",
+          description: "Target repository root path."
+        },
+        startup_tax_budget: {
+          type: "number",
+          description: "Optional startup token budget override."
+        }
       },
       additionalProperties: false
     }
@@ -3309,7 +3349,10 @@ var MCP_TOOLS = [
     inputSchema: {
       type: "object",
       properties: {
-        repo_path: { type: "string", description: "Target repository root path." }
+        repo_path: {
+          type: "string",
+          description: "Target repository root path."
+        }
       },
       additionalProperties: false
     }
@@ -3391,7 +3434,9 @@ function handleMcpJsonRpcRequest(request, context) {
         const skillFilter = typeof args.skill_name === "string" ? args.skill_name : void 0;
         payload = evaluateCatalog(context.catalogDir, { skillFilter });
       } else if (toolName === "list_catalog_items") {
-        payload = auditCatalogTokenBudgets(context.catalogDir, { requireLayout: false });
+        payload = auditCatalogTokenBudgets(context.catalogDir, {
+          requireLayout: false
+        });
       } else if (toolName === "diagnose_repo") {
         const repoPath = typeof args.repo_path === "string" ? args.repo_path : context.repoPath;
         const budget = typeof args.startup_tax_budget === "number" ? args.startup_tax_budget : void 0;
@@ -3596,7 +3641,11 @@ function setupMcpForHarnesses(repoPath, options = {}) {
     const absPath = path7.join(resolvedRepo, spec.mcpConfigPath);
     const exists = fs7.existsSync(absPath) && fs7.statSync(absPath).isFile();
     const existingRaw = exists ? fs7.readFileSync(absPath, "utf-8") : null;
-    const updatedRaw = buildUpdatedMcpConfigContent(target, existingRaw, serverName);
+    const updatedRaw = buildUpdatedMcpConfigContent(
+      target,
+      existingRaw,
+      serverName
+    );
     let status;
     if (!exists) {
       status = "created";
@@ -3616,7 +3665,9 @@ function setupMcpForHarnesses(repoPath, options = {}) {
       status
     });
   }
-  const configuredCount = actions.filter((a) => a.status !== "unsupported").length;
+  const configuredCount = actions.filter(
+    (a) => a.status !== "unsupported"
+  ).length;
   return {
     repo_path: path7.basename(resolvedRepo) || ".",
     dry_run: dryRun,
@@ -4460,29 +4511,21 @@ function formatSyncReport(report, format = "table", colorEnabled) {
     (a) => a.action === "created" || a.action === "updated" || a.action === "unchanged"
   );
   const firstSkill = activeArtifacts.find((a) => a.skill_name !== "codex-agents-index")?.skill_name ?? report.routed_bundle.selected_skills[0]?.name ?? "security-sast-gate";
-  const usageBox = activeArtifacts.length > 0 ? renderBox(
-    [
-      `${style.bold("How to use your installed Skills & Subagents inside your AI:", c)}`,
-      `  \u2022 ${style.cyan("Claude Code / Antigravity:", c)} Ask naturally (auto-routed via SKILL.md) or delegate to a Subagent`,
-      `  \u2022 ${style.cyan("Cursor / Windsurf / Cline / Copilot:", c)} Reference ${style.green(`@${firstSkill}`, c)} in Chat or let rules auto-attach`,
-      `  \u2022 ${style.cyan("Deep-Inspect:", c)} Run ${style.green(`npx skillops-cli info ${firstSkill}`, c)} to view triggers & Level 3 scripts`
-    ],
-    {
-      title: "\u{1F680} Using Your Skills & Subagents",
-      borderColor: style.cyan,
-      minWidth: 74,
-      colorEnabled: c
-    }
+  const usageBox = activeArtifacts.length > 0 ? renderAiUsageGuide(
+    report.targets,
+    [firstSkill],
+    report.routed_bundle.recommended_subagents,
+    c
   ) : "";
   const nextSteps = renderNextSteps(
     [
       {
         command: `npx skillops-cli info ${firstSkill}`,
-        description: "Inspect triggers, token budget & Level 3 scripts"
+        description: "Inspect triggers, token budget & L3 scripts"
       },
       {
         command: "npx skillops-cli doctor",
-        description: "Verify lockfile SHA-256 integrity & Startup Token Tax"
+        description: "Verify lockfile SHA-256 & Startup Token Tax"
       }
     ],
     c
@@ -4509,20 +4552,20 @@ var COMMAND_HELP_SPECS = [
     name: "quickstart",
     aliases: ["setup"],
     pillar: "library",
-    summary: "1-step onboarding: detect project stack, route optimal Skills & Subagents, sync to AI harnesses & wire MCP",
+    summary: "1-step onboarding: detect, route & sync",
     usage: "npx skillops-cli quickstart [options]",
     options: [
       {
-        flags: "--project, --repo, -p <dir>",
-        description: "Target repository directory (default: current directory)"
+        flags: "-p, --project <dir>",
+        description: "Target repository directory (default: cwd)"
       },
       {
-        flags: "--harness, --targets, -t <list|auto|all>",
-        description: "Target AI coding harnesses (e.g. claude,cursor,windsurf or auto/all)"
+        flags: "-t, --harness <list|auto|all>",
+        description: "Target AI coding harnesses (claude,cursor...)"
       },
       {
         flags: "--top, --max-skills <n>",
-        description: "Maximum number of Skills to activate in the bundle (default: 12)"
+        description: "Max Skills to activate in bundle (default: 12)"
       },
       {
         flags: "--skip-mcp, --no-mcp",
@@ -4530,25 +4573,25 @@ var COMMAND_HELP_SPECS = [
       },
       {
         flags: "--dry-run",
-        description: "Preview planned changes without writing files to disk"
+        description: "Preview planned changes without writing files"
       },
       {
         flags: "--force",
-        description: "Overwrite locally modified artifacts if drift is detected"
+        description: "Overwrite locally modified artifacts"
       },
       {
-        flags: "--format, -f <table|json|markdown>",
+        flags: "-f, --format <table|json|md>",
         description: "Output report format (default: table)"
       }
     ],
     examples: [
       {
         command: "npx skillops-cli quickstart",
-        description: "Auto-detect stack & harnesses, install optimal Skills/Subagents, and configure MCP"
+        description: "Auto-detect stack, sync Skills & wire MCP"
       },
       {
-        command: "npx skillops-cli quickstart --harness cursor,claude --top 6",
-        description: "Quickstart specifically for Cursor and Claude Code with top 6 Skills"
+        command: "npx skillops-cli quickstart -t cursor,claude --top 6",
+        description: "Sync top 6 Skills to Cursor & Claude Code"
       }
     ]
   },
@@ -4556,7 +4599,7 @@ var COMMAND_HELP_SPECS = [
     name: "list",
     aliases: [],
     pillar: "library",
-    summary: "Browse all bundled Hybrid Executable Skills & Context-Isolated Subagents with token budgets",
+    summary: "Browse all 10 Skills & 9 Subagents",
     usage: "npx skillops-cli list [options]",
     options: [
       {
@@ -4564,18 +4607,18 @@ var COMMAND_HELP_SPECS = [
         description: "Custom catalog directory to list"
       },
       {
-        flags: "--format, -f <table|json|markdown>",
+        flags: "-f, --format <table|json|md>",
         description: "Output format (default: table)"
       }
     ],
     examples: [
       {
         command: "npx skillops-cli list",
-        description: "Display all 10 Skills and 9 Subagents with L1/L2 token footprints"
+        description: "Display all 10 Skills & 9 Subagents"
       },
       {
         command: "npx skillops-cli info security-sast-gate",
-        description: "Deep-inspect a specific Skill from the Library after listing"
+        description: "Inspect a specific Skill from the Library"
       }
     ]
   },
@@ -4583,7 +4626,7 @@ var COMMAND_HELP_SPECS = [
     name: "search",
     aliases: ["find"],
     pillar: "library",
-    summary: "Search the Library of Skills & Subagents by keyword, domain, framework, or routing signal",
+    summary: "Search catalog by keyword, stack or domain",
     usage: "npx skillops-cli search <query> [options]",
     options: [
       {
@@ -4591,18 +4634,18 @@ var COMMAND_HELP_SPECS = [
         description: "Custom catalog directory to search"
       },
       {
-        flags: "--format, -f <table|json|markdown>",
+        flags: "-f, --format <table|json|md>",
         description: "Output format (default: table)"
       }
     ],
     examples: [
       {
         command: "npx skillops-cli search security",
-        description: "Find Skills and Subagents matching security/SAST/OWASP signals"
+        description: "Find Skills/Subagents matching security/SAST"
       },
       {
         command: "npx skillops-cli find postgres",
-        description: "Find database & PostgreSQL optimization Skills in the Library"
+        description: "Find database & PostgreSQL optimization Skills"
       }
     ]
   },
@@ -4610,65 +4653,65 @@ var COMMAND_HELP_SPECS = [
     name: "info",
     aliases: ["show", "inspect"],
     pillar: "library",
-    summary: "Inspect a Skill or Subagent's L1 routing triggers, L2 token budget, L3 scripts & how to use it in your AI",
-    usage: "npx skillops-cli info <skill-or-subagent-name> [options]",
+    summary: "Inspect triggers, L2 budget & AI usage",
+    usage: "npx skillops-cli info <name> [options]",
     options: [
       {
         flags: "--catalog <dir>",
         description: "Custom catalog directory"
       },
       {
-        flags: "--format, -f <table|json|markdown>",
+        flags: "-f, --format <table|json|md>",
         description: "Output format (default: table)"
       }
     ],
     examples: [
       {
         command: "npx skillops-cli info bug-reproducer-tdd",
-        description: "Inspect routing triggers, L3 scripts & IDE invocation guide for bug-reproducer-tdd"
+        description: "Inspect triggers, L3 scripts & IDE invocation"
       },
       {
         command: "npx skillops-cli show red-team-breaker",
-        description: "Inspect the red-team-breaker Context-Isolated Subagent card"
+        description: "Inspect the red-team-breaker Subagent card"
       }
     ]
   },
   {
     name: "add",
-    aliases: ["install", "i"],
+    aliases: ["install"],
     pillar: "library",
-    summary: "Install one or more Skills or Subagents into your active AI coding harnesses",
+    summary: "Install Skills/Subagents into AI harnesses",
     usage: "npx skillops-cli add <name...> [options]",
     options: [
       {
-        flags: "--project, --repo, -p <dir>",
+        flags: "-p, --project <dir>",
         description: "Target repository directory"
       },
       {
-        flags: "--harness, --targets, -t <list|auto|all>",
-        description: "Target AI coding harnesses (e.g. claude,cursor,windsurf or all)"
+        flags: "-t, --harness <list|auto|all>",
+        description: "Target AI harnesses (claude,cursor,all...)"
       },
       {
         flags: "--dry-run",
-        description: "Preview planned file writes without modifying disk"
+        description: "Preview planned writes without modifying disk"
       },
       {
         flags: "--force",
         description: "Overwrite locally drifted files"
       },
       {
-        flags: "--format, -f <table|json|markdown>",
+        flags: "-f, --format <table|json|md>",
         description: "Output format (default: table)"
       }
     ],
     examples: [
       {
         command: "npx skillops-cli install security-sast-gate",
-        description: "Install the security-sast-gate Skill into configured/default harnesses"
+        description: "Install security-sast-gate into harnesses"
       },
       {
-        command: "npx skillops-cli add mcp-architect context-scout --harness claude,cursor",
-        description: "Install both a Skill and a Subagent into Claude & Cursor"
+        command: "npx skillops-cli add mcp-architect -t claude,cursor",
+        description: "Install mcp-architect into Claude & Cursor"
       }
     ]
   },
@@ -4676,26 +4719,26 @@ var COMMAND_HELP_SPECS = [
     name: "remove",
     aliases: ["uninstall", "rm"],
     pillar: "library",
-    summary: "Surgically uninstall a synced Skill or Subagent from active AI harnesses",
+    summary: "Remove a Skill/Subagent from harnesses",
     usage: "npx skillops-cli remove <name...> [options]",
     options: [
       {
-        flags: "--project, --repo, -p <dir>",
+        flags: "-p, --project <dir>",
         description: "Target repository directory"
       },
       {
-        flags: "--harness, --targets, -t <list>",
+        flags: "-t, --harness <list>",
         description: "Restrict removal to specific harnesses"
       },
       {
         flags: "--force",
-        description: "Remove even if local SHA-256 drift is detected"
+        description: "Remove even if SHA-256 drift is detected"
       }
     ],
     examples: [
       {
         command: "npx skillops-cli uninstall mcp-architect",
-        description: "Remove all transpiled runtime files for mcp-architect and update .skillops-lock.json"
+        description: "Remove runtime files & update lockfile"
       }
     ]
   },
@@ -4703,16 +4746,16 @@ var COMMAND_HELP_SPECS = [
     name: "route",
     aliases: ["recommend"],
     pillar: "library",
-    summary: "Fingerprint repository stack and recommend the optimal collision-free <=12 Skill bundle",
+    summary: "Recommend optimal <=12 Skill bundle",
     usage: "npx skillops-cli recommend [options]",
     options: [
       {
-        flags: "--project, --repo, -p <dir>",
+        flags: "-p, --project <dir>",
         description: "Repository directory to fingerprint"
       },
       {
         flags: "--task <prompt>",
-        description: "Optional natural-language task prompt to boost task-specific Skills"
+        description: "Task prompt to boost task-specific Skills"
       },
       {
         flags: "--top, --max-skills <n>",
@@ -4720,21 +4763,21 @@ var COMMAND_HELP_SPECS = [
       },
       {
         flags: "--max-l1-tokens <n>",
-        description: "Maximum total L1 routing token budget (default: 1500)"
+        description: "Maximum L1 routing token budget (default: 1500)"
       },
       {
-        flags: "--format, -f <table|json|markdown>",
+        flags: "-f, --format <table|json|md>",
         description: "Output format (default: table)"
       }
     ],
     examples: [
       {
         command: "npx skillops-cli recommend",
-        description: "Recommend the best Skills & Subagents for the current repository stack"
+        description: "Recommend best Skills for current repo stack"
       },
       {
-        command: 'npx skillops-cli route --task "optimize slow postgres queries in FastAPI" --top 4',
-        description: "Route top 4 Skills tailored to a specific engineering task"
+        command: 'npx skillops-cli route --task "slow postgres" --top 4',
+        description: "Route top 4 Skills for a specific task"
       }
     ]
   },
@@ -4742,12 +4785,12 @@ var COMMAND_HELP_SPECS = [
     name: "create",
     aliases: ["new"],
     pillar: "framework",
-    summary: "Scaffold a custom Skill (SKILL.md + L3 script + evals.json) or Subagent (SUBAGENT.md) using the SkillOps Framework",
-    usage: "npx skillops-cli create <skill|subagent> <kebab-case-name> [options]",
+    summary: "Scaffold custom Skill or Subagent template",
+    usage: "npx skillops-cli create <skill|subagent> <name> [options]",
     options: [
       {
-        flags: "--description, -d <text>",
-        description: "Custom trigger description (automatically normalized to INV-SKILL-01..04 contracts)"
+        flags: "-d, --description <text>",
+        description: "Custom trigger description (INV-SKILL-01..04)"
       },
       {
         flags: "--catalog <dir>",
@@ -4758,18 +4801,18 @@ var COMMAND_HELP_SPECS = [
         description: "Overwrite existing Skill or Subagent template"
       },
       {
-        flags: "--format, -f <table|json|markdown>",
+        flags: "-f, --format <table|json|md>",
         description: "Output format (default: table)"
       }
     ],
     examples: [
       {
         command: "npx skillops-cli create skill graphql-schema-guard",
-        description: "Scaffold a new INV-SKILL-01..03 compliant Skill with Level 3 script & eval suite"
+        description: "Scaffold a new Skill with L3 script & evals"
       },
       {
         command: "npx skillops-cli create subagent migration-reviewer",
-        description: "Scaffold a new INV-SKILL-04 compliant Context-Isolated Subagent"
+        description: "Scaffold a new Context-Isolated Subagent"
       }
     ]
   },
@@ -4777,7 +4820,7 @@ var COMMAND_HELP_SPECS = [
     name: "audit",
     aliases: [],
     pillar: "framework",
-    summary: "Run L1/L2/L3 token budget linter, Subagent contract verifier & TF-IDF cosine collision matrix",
+    summary: "Verify L1/L2 budgets & TF-IDF collisions",
     usage: "npx skillops-cli audit [options]",
     options: [
       {
@@ -4786,21 +4829,21 @@ var COMMAND_HELP_SPECS = [
       },
       {
         flags: "--require-layout",
-        description: "Enforce full directory layout including evals/evals.json and executable L3 scripts"
+        description: "Enforce evals/evals.json and L3 scripts"
       },
       {
         flags: "--strict",
-        description: "Fail with non-zero exit code on HIGH_RISK collisions as well as BLOCKING collisions"
+        description: "Fail on HIGH_RISK as well as BLOCKING collisions"
       },
       {
-        flags: "--format, -f <table|json|github>",
+        flags: "-f, --format <table|json|gh>",
         description: "Output format (default: table)"
       }
     ],
     examples: [
       {
         command: "npx skillops-cli audit --require-layout --strict",
-        description: "Certify that all Skills & Subagents pass token budgets and zero-collision invariants"
+        description: "Certify token budgets & zero collisions"
       }
     ]
   },
@@ -4808,7 +4851,7 @@ var COMMAND_HELP_SPECS = [
     name: "eval",
     aliases: [],
     pillar: "framework",
-    summary: "Execute zero-API deterministic TDD benchmarks (with_skill vs without_skill) and export dashboards",
+    summary: "Run deterministic A/B TDD benchmarks",
     usage: "npx skillops-cli eval [options]",
     options: [
       {
@@ -4821,25 +4864,25 @@ var COMMAND_HELP_SPECS = [
       },
       {
         flags: "--out <file>",
-        description: "Write formatted benchmark report (e.g. HTML/Markdown) to disk"
+        description: "Write benchmark report (HTML/Markdown) to disk"
       },
       {
         flags: "--strict",
-        description: "Exit with code 4 if any Skill fails CERTIFIED_IMPROVEMENT"
+        description: "Exit 4 if any Skill fails CERTIFIED_IMPROVEMENT"
       },
       {
-        flags: "--format, -f <table|json|markdown|html|github>",
+        flags: "-f, --format <table|json|html>",
         description: "Output format (default: table)"
       }
     ],
     examples: [
       {
         command: "npx skillops-cli eval --strict",
-        description: "Run deterministic A/B evals across all Skills in the catalog"
+        description: "Run deterministic A/B evals across catalog"
       },
       {
-        command: "npx skillops-cli eval --format html --out benchmark.html",
-        description: "Export a standalone HTML benchmark dashboard"
+        command: "npx skillops-cli eval -f html --out benchmark.html",
+        description: "Export standalone HTML benchmark dashboard"
       }
     ]
   },
@@ -4847,22 +4890,22 @@ var COMMAND_HELP_SPECS = [
     name: "init",
     aliases: [],
     pillar: "runtime",
-    summary: "Scaffold declarative .skillops.yml and detect repository AI coding harnesses",
+    summary: "Create .skillops.yml and detect harnesses",
     usage: "npx skillops-cli init [options]",
     options: [
       {
-        flags: "--project, --repo, -p <dir>",
+        flags: "-p, --project <dir>",
         description: "Target repository directory"
       },
       {
-        flags: "--harness, --targets, -t <list|auto|all>",
-        description: "Initial target harnesses to record in .skillops.yml"
+        flags: "-t, --harness <list|auto|all>",
+        description: "Initial target harnesses for .skillops.yml"
       }
     ],
     examples: [
       {
         command: "npx skillops-cli init",
-        description: "Create .skillops.yml with auto-detected stack and harnesses"
+        description: "Create .skillops.yml with detected harnesses"
       }
     ]
   },
@@ -4870,16 +4913,16 @@ var COMMAND_HELP_SPECS = [
     name: "sync",
     aliases: [],
     pillar: "runtime",
-    summary: "Transpile routed Skills & Subagents across up to 20 AI coding agents with SHA-256 lockfile protection",
+    summary: "Transpile bundle across 20 AI agents",
     usage: "npx skillops-cli sync [options]",
     options: [
       {
-        flags: "--project, --repo, -p <dir>",
+        flags: "-p, --project <dir>",
         description: "Target repository directory"
       },
       {
-        flags: "--harness, --targets, -t <list|auto|all>",
-        description: "Target AI coding harnesses (default: .skillops.yml targets or core 5)"
+        flags: "-t, --harness <list|auto|all>",
+        description: "Target AI harnesses (default: .skillops.yml)"
       },
       {
         flags: "--top, --max-skills <n>",
@@ -4887,7 +4930,7 @@ var COMMAND_HELP_SPECS = [
       },
       {
         flags: "--dry-run",
-        description: "Preview planned artifacts without writing files"
+        description: "Preview planned artifacts without writing"
       },
       {
         flags: "--force",
@@ -4897,11 +4940,11 @@ var COMMAND_HELP_SPECS = [
     examples: [
       {
         command: "npx skillops-cli sync --auto",
-        description: "Sync optimal Skills & Subagents into all AI harnesses detected in the repo"
+        description: "Sync bundle into all detected AI harnesses"
       },
       {
         command: "npx skillops-cli sync --harness all",
-        description: "Transpile across all 20 supported AI coding agents"
+        description: "Transpile across all 20 supported AI agents"
       }
     ]
   },
@@ -4909,11 +4952,11 @@ var COMMAND_HELP_SPECS = [
     name: "clean",
     aliases: [],
     pillar: "runtime",
-    summary: "Remove all SkillOps-managed runtime artifacts tracked in .skillops-lock.json",
+    summary: "Remove all tracked runtime artifacts",
     usage: "npx skillops-cli clean [options]",
     options: [
       {
-        flags: "--project, --repo, -p <dir>",
+        flags: "-p, --project <dir>",
         description: "Target repository directory"
       },
       {
@@ -4928,7 +4971,7 @@ var COMMAND_HELP_SPECS = [
     examples: [
       {
         command: "npx skillops-cli clean",
-        description: "Cleanly remove all synced artifacts and .skillops-lock.json"
+        description: "Remove all synced artifacts & lockfile"
       }
     ]
   },
@@ -4936,11 +4979,11 @@ var COMMAND_HELP_SPECS = [
     name: "tokens",
     aliases: ["budget"],
     pillar: "runtime",
-    summary: "Analyze repository Startup Token Tax, Progressive Disclosure savings & context bloat hotspots",
+    summary: "Analyze Startup Token Tax & context bloat",
     usage: "npx skillops-cli budget [options]",
     options: [
       {
-        flags: "--project, --repo, -p <dir>",
+        flags: "-p, --project <dir>",
         description: "Repository directory to inspect"
       },
       {
@@ -4949,17 +4992,17 @@ var COMMAND_HELP_SPECS = [
       },
       {
         flags: "--strict",
-        description: "Fail with exit code 3 if Startup Token Tax exceeds budget"
+        description: "Exit 3 if Startup Token Tax exceeds budget"
       },
       {
-        flags: "--format, -f <table|json|markdown|github>",
+        flags: "-f, --format <table|json|md>",
         description: "Output format (default: table)"
       }
     ],
     examples: [
       {
         command: "npx skillops-cli budget",
-        description: "Inspect repository Startup Token Tax and Progressive Disclosure savings"
+        description: "Inspect repository Startup Token Tax & savings"
       }
     ]
   },
@@ -4967,11 +5010,11 @@ var COMMAND_HELP_SPECS = [
     name: "doctor",
     aliases: ["status"],
     pillar: "runtime",
-    summary: "Diagnose Node/Python environment, .skillops.yml validity, lockfile SHA-256 drift & Startup Token Tax",
+    summary: "Diagnose environment, drift & token budget",
     usage: "npx skillops-cli doctor [options]",
     options: [
       {
-        flags: "--project, --repo, -p <dir>",
+        flags: "-p, --project <dir>",
         description: "Repository directory to diagnose"
       },
       {
@@ -4979,7 +5022,7 @@ var COMMAND_HELP_SPECS = [
         description: "Fail on warnings as well as errors"
       },
       {
-        flags: "--format, -f <table|json|markdown|github>",
+        flags: "-f, --format <table|json|md>",
         description: "Output format (default: table)"
       }
     ],
@@ -4994,22 +5037,22 @@ var COMMAND_HELP_SPECS = [
     name: "harnesses",
     aliases: [],
     pillar: "runtime",
-    summary: "List all 20 supported AI coding agents, target paths, MCP support & repository detection status",
+    summary: "List 20 supported AI agents & repo status",
     usage: "npx skillops-cli harnesses [options]",
     options: [
       {
-        flags: "--project, --repo, -p <dir>",
+        flags: "-p, --project <dir>",
         description: "Repository directory to scan for AI harnesses"
       },
       {
-        flags: "--format, -f <table|json|markdown>",
+        flags: "-f, --format <table|json|md>",
         description: "Output format (default: table)"
       }
     ],
     examples: [
       {
         command: "npx skillops-cli harnesses",
-        description: "View all 20 supported AI coding IDEs/CLI agents and which ones are active in your repo"
+        description: "View all 20 supported AI IDEs/CLI agents"
       }
     ]
   },
@@ -5017,15 +5060,15 @@ var COMMAND_HELP_SPECS = [
     name: "mcp-setup",
     aliases: [],
     pillar: "runtime",
-    summary: "Register SkillOps MCP server across all 13 MCP-compatible AI coding IDEs & agents",
+    summary: "Wire MCP server across 13 AI IDEs & agents",
     usage: "npx skillops-cli mcp-setup [options]",
     options: [
       {
-        flags: "--project, --repo, -p <dir>",
+        flags: "-p, --project <dir>",
         description: "Target repository directory"
       },
       {
-        flags: "--harness, --targets, -t <list|auto|all>",
+        flags: "-t, --harness <list|auto|all>",
         description: "Target harnesses to configure MCP for"
       },
       {
@@ -5036,7 +5079,7 @@ var COMMAND_HELP_SPECS = [
     examples: [
       {
         command: "npx skillops-cli mcp-setup --auto",
-        description: "Automatically wire SkillOps MCP server into detected IDEs (.mcp.json, .cursor/mcp.json, etc.)"
+        description: "Wire SkillOps MCP into detected IDEs"
       }
     ]
   },
@@ -5044,18 +5087,18 @@ var COMMAND_HELP_SPECS = [
     name: "mcp",
     aliases: [],
     pillar: "runtime",
-    summary: "Start native JSON-RPC 2.0 stdio Model Context Protocol server",
+    summary: "Start stdio JSON-RPC 2.0 MCP server",
     usage: "npx skillops-cli mcp [options]",
     options: [
       {
-        flags: "--project, --repo, -p <dir>",
+        flags: "-p, --project <dir>",
         description: "Repository root served over MCP"
       }
     ],
     examples: [
       {
         command: "npx skillops-cli mcp",
-        description: "Start stdio MCP server (invoked automatically by AI IDEs)"
+        description: "Start stdio MCP server for AI IDEs"
       }
     ]
   }
@@ -5068,117 +5111,264 @@ function findCommandHelpSpec(commandOrAlias) {
 }
 function renderGlobalHelp(version, colorEnabled) {
   const c = colorEnabled;
+  const bar = style.dim("\u2502", c);
   const banner = renderHeaderBanner(
-    "The Zero-API Framework & Library for High-End AI Coding Skills & Context-Isolated Subagents",
+    "Skills & Agents Library for AI Coding IDEs",
     {
       version,
       colorEnabled: c
     }
   );
-  const quickstartBox = renderBox(
-    [
-      `${style.bold(style.green("npx skillops-cli quickstart", c), c)}    ${style.dim("# 1-step setup: detect stack, install Skills/Subagents & wire MCP", c)}`,
-      `${style.bold(style.cyan("npx skillops-cli info <name>", c), c)}   ${style.dim("# Inspect any Skill/Subagent & see how to invoke it in your AI", c)}`,
-      `${style.bold(style.magenta("npx skillops-cli create skill <name>", c), c)} ${style.dim("# Scaffold your own custom Skill using the SkillOps Framework", c)}`
-    ],
+  const coreCmds = [
     {
-      title: "\u{1F680} 10-Second Quickstart (Library + Framework)",
-      borderColor: style.cyan,
-      minWidth: 88,
-      colorEnabled: c
+      cmd: "add [name...]",
+      desc: "Import Skills or Agents (interactive if no name given)"
+    },
+    {
+      cmd: "list [query]",
+      desc: "List or filter available Skills & Agents in catalog"
+    },
+    {
+      cmd: "info <name>",
+      desc: "View details and how to use a Skill or Agent"
+    },
+    {
+      cmd: "remove <name>",
+      desc: "Remove an imported Skill or Agent from your project"
+    },
+    {
+      cmd: "init",
+      desc: "Auto-detect stack & IDE and import recommended bundle"
     }
-  );
-  const formatCmdSection = (pillar) => {
-    const specs = COMMAND_HELP_SPECS.filter((s) => s.pillar === pillar);
-    return renderTable(
-      ["Command", "Aliases", "Description"],
-      specs.map((s) => [
-        style.bold(style.cyan(s.name, c), c),
-        s.aliases.length > 0 ? style.dim(s.aliases.join(", "), c) : style.dim("\u2014", c),
-        s.summary
-      ]),
-      { colorEnabled: c, indent: 2 }
-    );
-  };
-  const globalFlagsTable = renderTable(
-    ["Global Flag", "Description"],
-    [
-      [
-        style.cyan("--project, --repo, -p <dir>", c),
-        "Target project/repository directory (default: current working directory)"
-      ],
-      [
-        style.cyan("--harness, --targets, -t <list|auto|all>", c),
-        "Target AI coding harnesses (e.g. claude,cursor,windsurf,copilot or auto/all)"
-      ],
-      [
-        style.cyan("--format, -f <table|json|markdown|github>", c),
-        "Output format for reports and CI pipelines (default: table)"
-      ],
-      [
-        style.cyan("--help, -h / --version, -V", c),
-        "Show global or per-command help (`npx skillops-cli <cmd> --help`) / CLI version"
-      ]
-    ],
-    { colorEnabled: c, indent: 2 }
-  );
+  ];
+  const cmdRows = coreCmds.map(
+    (item) => `${bar}  ${padVisible(style.bold(style.cyan(item.cmd, c), c), 18, "left")}${item.desc}`
+  ).join("\n");
   return [
-    `SkillOps v${version} \u2014 The Zero-API NPX Engine for High-End AI Skills & Subagents`,
-    "Usage: npx skillops-cli <command> [options]",
-    "",
     banner,
-    quickstartBox,
-    renderSectionHeader(
-      "\u{1F4DA} 1. Library of High-End Skills & Subagents (Explore, Search & Install)",
-      c
-    ),
-    formatCmdSection("library"),
-    renderSectionHeader(
-      "\u{1F6E0}\uFE0F 2. Framework for Building Custom Skills & Subagents (Scaffold, Audit & Certify)",
-      c
-    ),
-    formatCmdSection("framework"),
-    renderSectionHeader(
-      "\u2699\uFE0F 3. Universal Runtime Sync, Token Economy & Diagnostics (Top 20 AI Harnesses)",
-      c
-    ),
-    formatCmdSection("runtime"),
-    renderSectionHeader("\u{1F310} Global Options", c),
-    globalFlagsTable,
-    "",
-    `  ${style.dim("\u{1F4A1} Tip: Run", c)} ${style.bold(style.cyan("npx skillops-cli <command> --help", c), c)} ${style.dim("for detailed flags and copy-paste examples.", c)}`,
-    ""
+    `${bar}  Usage: skillops <command> [options]`,
+    renderSectionHeader("Commands", c),
+    cmdRows,
+    renderSectionHeader("Options", c),
+    `${bar}  ${padVisible(style.cyan("-t, --target <ide>", c), 22, "left")}AI IDE (cursor, claude, copilot, windsurf, auto)`,
+    `${bar}  ${padVisible(style.cyan("-p, --project <dir>", c), 22, "left")}Project folder (default: current directory)`,
+    `${bar}  ${padVisible(style.cyan("--all", c), 22, "left")}Import all 10 Skills & 9 Agents`,
+    renderSectionHeader("Examples", c),
+    `${bar}  ${style.dim("$", c)} ${style.green("skillops add", c)}                                  ${style.dim("\u2014 Interactive selector", c)}`,
+    `${bar}  ${style.dim("$", c)} ${style.green("skillops add bug-reproducer-tdd red-team-breaker", c)} ${style.dim("\u2014 Direct import", c)}`,
+    `${bar}  ${style.dim("$", c)} ${style.green("skillops list", c)}                                 ${style.dim("\u2014 Browse catalog", c)}`,
+    bar,
+    `${style.dim("\u2570\u2500", c)} ${style.dim("Run", c)} ${style.cyan("skillops <cmd> -h", c)} ${style.dim("for command options.", c)}`
   ].join("\n");
 }
 function renderCommandHelp(spec, version, colorEnabled) {
   const c = colorEnabled;
+  const bar = style.dim("\u2502", c);
   const pillarBadge = spec.pillar === "library" ? formatBadge("info", "LIBRARY", c) : spec.pillar === "framework" ? formatBadge("pass", "FRAMEWORK", c) : formatBadge("subagent", "RUNTIME", c);
   const aliasText = spec.aliases.length > 0 ? ` (aliases: ${spec.aliases.map((a) => style.cyan(a, c)).join(", ")})` : "";
-  const headerBox = renderBox(
-    [
-      `${pillarBadge} ${style.bold(style.cyan(`skillops ${spec.name}`, c), c)}${aliasText}`,
-      "",
-      spec.summary,
-      "",
-      `${style.bold("Usage:", c)} ${style.green(spec.usage, c)}`
-    ],
-    {
-      title: `SkillOps v${version} \u2014 Command Reference`,
-      borderColor: style.cyan,
-      minWidth: 78,
-      colorEnabled: c
-    }
-  );
+  const headerLines = [
+    `${style.bold(style.cyan(`\u25C6 SkillOps v${version}`, c), c)} ${style.dim("\u2014", c)} ${style.bold(`skillops ${spec.name}`, c)}${aliasText} ${pillarBadge}`,
+    `${bar}  ${spec.summary}`,
+    `${bar}  ${style.bold("Usage:", c)} ${style.green(spec.usage, c)}`
+  ].join("\n");
   const optionsSection = spec.options.length > 0 ? [
     renderSectionHeader("Options & Flags", c),
     renderTable(
       ["Flag", "Description"],
       spec.options.map((o) => [style.cyan(o.flags, c), o.description]),
-      { colorEnabled: c, indent: 2 }
+      { colorEnabled: c, indent: 3 }
     )
   ].join("\n") : "";
   const examplesSection = renderNextSteps(spec.examples, c);
-  return [headerBox, optionsSection, examplesSection].filter(Boolean).join("\n");
+  return [headerLines, optionsSection, examplesSection].filter(Boolean).join("\n");
+}
+
+// src/ui/prompt.ts
+function createMultiSelectState(options) {
+  const initial = /* @__PURE__ */ new Set();
+  for (const opt of options) {
+    if (opt.initialSelected) {
+      initial.add(opt.value);
+    }
+  }
+  return {
+    options,
+    cursor: 0,
+    selected: initial,
+    status: "active"
+  };
+}
+function applyMultiSelectKey(state, key) {
+  if (state.status !== "active" || state.options.length === 0) {
+    return state;
+  }
+  const count = state.options.length;
+  if (key === "" || key === "\x1B" || key === "q" || key === "Q") {
+    return {
+      ...state,
+      status: "cancelled"
+    };
+  }
+  if (key === "\r" || key === "\n") {
+    return {
+      ...state,
+      status: "submitted"
+    };
+  }
+  if (key === "\x1B[A" || key === "\x1BOA" || key === "k" || key === "K") {
+    const nextCursor = (state.cursor - 1 + count) % count;
+    return {
+      ...state,
+      cursor: nextCursor
+    };
+  }
+  if (key === "\x1B[B" || key === "\x1BOB" || key === "j" || key === "J") {
+    const nextCursor = (state.cursor + 1) % count;
+    return {
+      ...state,
+      cursor: nextCursor
+    };
+  }
+  if (key === " ") {
+    const currentOpt = state.options[state.cursor];
+    if (!currentOpt) {
+      return state;
+    }
+    const nextSelected = new Set(state.selected);
+    if (nextSelected.has(currentOpt.value)) {
+      nextSelected.delete(currentOpt.value);
+    } else {
+      nextSelected.add(currentOpt.value);
+    }
+    return {
+      ...state,
+      selected: nextSelected
+    };
+  }
+  if (key === "a" || key === "A") {
+    const allSelected = state.selected.size === count;
+    const nextSelected = /* @__PURE__ */ new Set();
+    if (!allSelected) {
+      for (const opt of state.options) {
+        nextSelected.add(opt.value);
+      }
+    }
+    return {
+      ...state,
+      selected: nextSelected
+    };
+  }
+  return state;
+}
+function renderMultiSelectFrame(title, state, options = {}) {
+  const c = options.colorEnabled;
+  const bar = style.dim("\u2502", c);
+  const maxVisible = options.maxVisible ?? 10;
+  const total = state.options.length;
+  const header = `${style.bold(style.cyan(`\u25C6 ${title}`, c), c)}`;
+  const instructions = `${bar}  ${style.dim("(\u2191/\u2193 move \xB7 Space select \xB7 'a' toggle all \xB7 Enter confirm)", c)}`;
+  const lines = [header];
+  if (options.subtitle) {
+    lines.push(`${bar}  ${options.subtitle}`);
+  }
+  lines.push(instructions, bar);
+  let startIdx = 0;
+  if (total > maxVisible) {
+    const half = Math.floor(maxVisible / 2);
+    startIdx = Math.max(0, Math.min(state.cursor - half, total - maxVisible));
+  }
+  const endIdx = Math.min(total, startIdx + maxVisible);
+  if (startIdx > 0) {
+    lines.push(`${bar}  ${style.dim(`\u2191 ${startIdx} more above...`, c)}`);
+  }
+  const maxLabelCols = Math.min(
+    26,
+    state.options.reduce((m, o) => Math.max(m, visibleLength(o.label)), 14)
+  );
+  for (let i = startIdx; i < endIdx; i++) {
+    const opt = state.options[i];
+    if (!opt) continue;
+    const isCurrent = i === state.cursor;
+    const isChecked = state.selected.has(opt.value);
+    const pointer = isCurrent ? style.cyan("\u276F", c) : " ";
+    const checkbox = isChecked ? style.green("\u25FC", c) : style.dim("\u25FB", c);
+    const kindTag = opt.kind === "skill" ? style.cyan("skill ", c) : opt.kind === "agent" ? style.magenta("agent ", c) : "";
+    const labelRaw = opt.label.length > maxLabelCols ? `${opt.label.slice(0, maxLabelCols - 1)}\u2026` : opt.label;
+    const labelPadded = padVisible(labelRaw, maxLabelCols + 1, "left");
+    const styledLabel = isCurrent ? style.bold(labelPadded, c) : isChecked ? style.green(labelPadded, c) : labelPadded;
+    const prefixWidth = 6 + (opt.kind === "skill" || opt.kind === "agent" ? 6 : 0) + maxLabelCols + 1;
+    const maxHintCols = Math.max(10, 75 - prefixWidth);
+    const rawHint = opt.hint ?? "";
+    const shortHint = rawHint.length > maxHintCols ? `${rawHint.slice(0, maxHintCols - 1)}\u2026` : rawHint;
+    const hintPart = shortHint ? ` ${style.dim(shortHint, c)}` : "";
+    lines.push(
+      `${bar}  ${pointer} ${checkbox} ${kindTag}${styledLabel}${hintPart}`
+    );
+  }
+  if (endIdx < total) {
+    lines.push(`${bar}  ${style.dim(`\u2193 ${total - endIdx} more below...`, c)}`);
+  }
+  lines.push(bar);
+  const targetSuffix = options.targetHint ? ` \xB7 IDE: ${options.targetHint}` : "";
+  lines.push(
+    `${style.dim("\u2570\u2500", c)} ${style.bold(`${state.selected.size} selected`, c)}${style.dim(`${targetSuffix} \u2014 Enter to import`, c)}`
+  );
+  return lines.join("\n");
+}
+async function runMultiSelectPrompt(title, options, renderOpts = {}) {
+  if (!process.stdin.isTTY || !process.stdout.isTTY) {
+    return null;
+  }
+  let state = createMultiSelectState(options);
+  let renderedLineCount = 0;
+  const render = () => {
+    const frame = renderMultiSelectFrame(title, state, renderOpts);
+    if (renderedLineCount > 0) {
+      process.stdout.write(`\x1B[${renderedLineCount}A\x1B[J`);
+    }
+    process.stdout.write(`${frame}
+`);
+    renderedLineCount = frame.split("\n").length;
+  };
+  return new Promise((resolve) => {
+    const stdin = process.stdin;
+    const wasRaw = stdin.isRaw;
+    stdin.setRawMode(true);
+    stdin.resume();
+    stdin.setEncoding("utf-8");
+    process.stdout.write("\x1B[?25l");
+    render();
+    const cleanup = () => {
+      stdin.removeListener("data", onData);
+      if (stdin.isTTY) {
+        stdin.setRawMode(Boolean(wasRaw));
+      }
+      stdin.pause();
+      process.stdout.write("\x1B[?25h");
+    };
+    const onData = (chunk) => {
+      const key = typeof chunk === "string" ? chunk : chunk.toString("utf-8");
+      state = applyMultiSelectKey(state, key);
+      if (state.status === "cancelled") {
+        if (renderedLineCount > 0) {
+          process.stdout.write(`\x1B[${renderedLineCount}A\x1B[J`);
+        }
+        cleanup();
+        resolve(null);
+        return;
+      }
+      if (state.status === "submitted") {
+        if (renderedLineCount > 0) {
+          process.stdout.write(`\x1B[${renderedLineCount}A\x1B[J`);
+        }
+        cleanup();
+        resolve([...state.selected]);
+        return;
+      }
+      render();
+    };
+    stdin.on("data", onData);
+  });
 }
 
 // src/framework/index.ts
@@ -5280,71 +5470,66 @@ function formatCatalogItemInfo(info, format = "table", colorEnabled) {
     return lines.join("\n");
   }
   const c = colorEnabled;
+  const bar = style.dim("\u2502", c);
   const badge = info.kind === "skill" ? formatBadge("skill", "HYBRID EXECUTABLE SKILL", c) : formatBadge("subagent", "CONTEXT-ISOLATED SUBAGENT", c);
+  const shortDesc = info.description.length > 68 ? `${info.description.slice(0, 65)}...` : info.description;
   const cardLines = [
-    `${badge}  ${style.bold(style.cyan(info.name, c), c)}`,
-    "",
-    `${style.bold("Description:", c)}`,
-    `  ${info.description}`,
-    ""
+    `${style.bold(style.cyan(`\u25C6 SkillOps Library Inspector \u2014 ${info.name}`, c), c)}`,
+    `${bar}  ${badge}`,
+    `${bar}  ${shortDesc}`,
+    bar
   ];
   if (info.kind === "skill") {
     cardLines.push(
-      `${style.bold("Token Economy (INV-SKILL-01..03):", c)}`,
-      `  \u2022 L1 Routing Footprint : ${style.green(`${info.l1Tokens} tokens`, c)} (<= 160 budget)`,
-      `  \u2022 L2 Playbook Body     : ${info.l2Lines} lines (${info.l2Tokens} tokens, <= 250 lines)`,
-      `  \u2022 Progressive Savings  : ${style.bold(style.green(`${info.savingsPct}%`, c), c)} Startup Token Tax saved until triggered`,
-      `  \u2022 L3 Scripts (${info.scripts.length})      : ${info.scripts.length > 0 ? style.cyan(info.scripts.join(", "), c) : "none"}`,
-      `  \u2022 TDD Eval Cases       : ${info.evalCasesCount} deterministic benchmark cases`
+      `${style.dim("\u251C\u2500", c)} ${style.bold(style.cyan("Token Economy (INV-SKILL-01..03)", c), c)}`,
+      `${bar}  \u2022 L1 Routing     : ${style.green(`${info.l1Tokens} tokens`, c)} (<= 160 budget)`,
+      `${bar}  \u2022 L2 Playbook    : ${info.l2Lines} lines (${info.l2Tokens}t, <= 250 lines)`,
+      `${bar}  \u2022 Token Savings  : ${style.bold(style.green(`${info.savingsPct}%`, c), c)} Startup Tax saved`,
+      `${bar}  \u2022 L3 Scripts (${info.scripts.length}) : ${info.scripts.length > 0 ? style.cyan(info.scripts.join(", "), c) : "none"}`,
+      `${bar}  \u2022 TDD Evals      : ${info.evalCasesCount} deterministic cases`
     );
   } else {
     cardLines.push(
-      `${style.bold("Context Isolation Contract (INV-SKILL-04):", c)}`,
-      `  \u2022 System Prompt Tokens : ${style.green(`${info.l1Tokens} tokens`, c)}`,
-      `  \u2022 Max Output Cap       : <= ${style.bold(`${info.maxOutputTokens} tokens`, c)}`,
-      `  \u2022 Isolation Mode       : ${style.cyan(info.isolation ?? "context-isolated", c)}`,
-      `  \u2022 Allowed Tools (${info.tools.length})    : ${info.tools.join(", ")}`
+      `${style.dim("\u251C\u2500", c)} ${style.bold(style.cyan("Context Isolation Contract (INV-SKILL-04)", c), c)}`,
+      `${bar}  \u2022 System Prompt  : ${style.green(`${info.l1Tokens} tokens`, c)}`,
+      `${bar}  \u2022 Max Output Cap : <= ${style.bold(`${info.maxOutputTokens} tokens`, c)}`,
+      `${bar}  \u2022 Isolation Mode : ${style.cyan(info.isolation ?? "context-isolated", c)}`,
+      `${bar}  \u2022 Allowed Tools  : ${info.tools.join(", ")}`
     );
   }
   if (info.headings.length > 0) {
     cardLines.push(
-      "",
-      `${style.bold("Workflow Playbook Sections:", c)}`,
-      ...info.headings.slice(0, 6).map((h) => `  \u2022 ${h}`)
+      bar,
+      `${style.dim("\u251C\u2500", c)} ${style.bold(style.cyan("Playbook Sections", c), c)}`,
+      ...info.headings.slice(0, 5).map((h) => `${bar}  \u2022 ${h}`)
     );
   }
   cardLines.push(
-    "",
-    `${style.bold("How to Invoke in Your AI Agent:", c)}`,
-    `  \u2022 ${style.bold("Install into repo:", c)} ${style.green(`npx skillops-cli add ${info.name}`, c)}`,
-    info.kind === "skill" ? `  \u2022 ${style.bold("Cursor / Copilot / Claude:", c)} Reference ${style.cyan(`@${info.name}`, c)} or ${style.cyan(`/${info.name}`, c)} in chat` : `  \u2022 ${style.bold("Delegate Subagent:", c)} Ask your main agent to delegate heavy exploration to ${style.magenta(`@${info.name}`, c)}`
+    bar,
+    `${style.dim("\u251C\u2500", c)} ${style.bold(style.cyan("How to Invoke in Your AI Agent", c), c)}`,
+    `${bar}  \u2022 ${style.bold("Install:", c)} ${style.green(`npx skillops-cli add ${info.name}`, c)}`,
+    info.kind === "skill" ? `${bar}  \u2022 ${style.bold("IDE Chat:", c)} Reference ${style.cyan(`@${info.name}`, c)} or ${style.cyan(`/${info.name}`, c)}` : `${bar}  \u2022 ${style.bold("Delegate:", c)} Ask main agent to run ${style.magenta(`@${info.name}`, c)}`
   );
-  const box = renderBox(cardLines, {
-    title: `\u{1F4E6} SkillOps Library Inspector \u2014 ${info.name}`,
-    borderColor: info.kind === "skill" ? style.cyan : style.magenta,
-    minWidth: 74,
-    colorEnabled: c
-  });
   const nextSteps = renderNextSteps(
     [
       {
         command: `npx skillops-cli add ${info.name}`,
-        description: `Install '${info.name}' into your active AI coding agents`
+        description: "Install into AI agents"
       },
       ...info.kind === "skill" ? [
         {
           command: `npx skillops-cli eval --skill ${info.name}`,
-          description: `Run deterministic TDD benchmark for '${info.name}'`
+          description: "Run TDD benchmark"
         }
       ] : [],
       {
         command: "npx skillops-cli list",
-        description: "Browse all 10 Skills & 9 Subagents in the Library"
+        description: "Browse 10 Skills & 9 Subagents"
       }
     ],
     c
   );
-  return `${box}
+  return `${cardLines.join("\n")}
 ${nextSteps}`;
 }
 function searchCatalog(catalogDir, query) {
@@ -5373,7 +5558,7 @@ function searchCatalog(catalogDir, query) {
         name: parsed.manifest.name,
         score,
         tokens: parsed.manifest.description_tokens,
-        summary: parsed.manifest.description.length > 78 ? `${parsed.manifest.description.slice(0, 75)}...` : parsed.manifest.description
+        summary: parsed.manifest.description.length > 30 ? `${parsed.manifest.description.slice(0, 27)}...` : parsed.manifest.description
       });
     }
   }
@@ -5400,7 +5585,7 @@ function searchCatalog(catalogDir, query) {
         name: parsed.manifest.name,
         score,
         tokens: parsed.manifest.system_prompt_tokens,
-        summary: parsed.manifest.description.length > 78 ? `${parsed.manifest.description.slice(0, 75)}...` : parsed.manifest.description
+        summary: parsed.manifest.description.length > 30 ? `${parsed.manifest.description.slice(0, 27)}...` : parsed.manifest.description
       });
     }
   }
@@ -5430,43 +5615,39 @@ function formatCatalogSearchReport(report, format = "table", colorEnabled) {
     return lines.join("\n");
   }
   const c = colorEnabled;
-  const header = renderBox(
-    [
-      `${style.bold(style.cyan("\u{1F50D} SkillOps Library Search", c), c)} \u2014 Query: ${style.bold(`"${report.query || "*"}"`, c)} (${report.total_matches} matches)`
-    ],
-    { minWidth: 74, colorEnabled: c }
-  );
+  const bar = style.dim("\u2502", c);
+  const header = `${style.bold(style.cyan("\u25C6 SkillOps Library Search", c), c)} ${style.dim("\u2014", c)} Query: ${style.bold(`"${report.query || "*"}"`, c)} (${report.total_matches} matches)`;
   if (report.matches.length === 0) {
     return `${header}
-  ${formatBadge("warn", "No matching Skills or Subagents found.", c)}
-${renderNextSteps([{ command: "npx skillops-cli list", description: "View all 10 Skills & 9 Subagents in the Library" }], c)}`;
+${bar}  ${formatBadge("warn", "No matching Skills or Subagents found.", c)}
+${renderNextSteps([{ command: "npx skillops-cli list", description: "View all 10 Skills & 9 Subagents" }], c)}`;
   }
   const table = renderTable(
-    ["Type", "Name", "Tokens", "When to Use / Summary"],
+    ["Type", "Name", "Tokens", "Summary"],
     report.matches.map((m) => [
       m.kind === "skill" ? formatBadge("skill", "SKILL", c) : formatBadge("subagent", "SUBAGENT", c),
       style.bold(m.name, c),
       `${m.tokens}t`,
       m.summary
     ]),
-    { align: ["left", "left", "right", "left"], colorEnabled: c }
+    { align: ["left", "left", "right", "left"], colorEnabled: c, indent: 3 }
   );
   const topItem = report.matches[0]?.name ?? "bug-reproducer-tdd";
   const nextSteps = renderNextSteps(
     [
       {
         command: `npx skillops-cli info ${topItem}`,
-        description: `Inspect '${topItem}' in detail`
+        description: "Inspect triggers & usage"
       },
       {
         command: `npx skillops-cli add ${topItem}`,
-        description: `Install '${topItem}' into your project's AI agents`
+        description: "Install into AI agents"
       }
     ],
     c
   );
   return `${header}
-
+${bar}
 ${table}
 ${nextSteps}`;
 }
@@ -5684,38 +5865,31 @@ function formatScaffoldReport(result, format = "table", colorEnabled) {
     ].join("\n");
   }
   const c = colorEnabled;
-  const box = renderBox(
-    [
-      `${formatBadge("pass", "CREATED", c)} Scaffolded new SkillOps Framework ${style.bold(result.kind.toUpperCase(), c)}: ${style.bold(style.cyan(result.name, c), c)}`,
-      "",
-      `${style.bold("Generated Files:", c)}`,
-      ...result.created_files.map((f) => `  \u2022 ${style.green(f, c)}`)
-    ],
-    {
-      title: "\u{1F6E0}\uFE0F SkillOps Framework Scaffolder",
-      borderColor: style.green,
-      minWidth: 74,
-      colorEnabled: c
-    }
-  );
+  const bar = style.dim("\u2502", c);
+  const treeHeader = [
+    `${style.bold(style.cyan("\u25C6 SkillOps Framework Scaffolder", c), c)} ${style.dim("\u2014", c)} ${formatBadge("pass", "CREATED", c)} ${style.bold(result.kind.toUpperCase(), c)} ${style.bold(style.cyan(result.name, c), c)}`,
+    bar,
+    `${style.dim("\u251C\u2500", c)} ${style.bold("Generated Files:", c)}`,
+    ...result.created_files.map((f) => `${bar}  \u2022 ${style.green(f, c)}`)
+  ].join("\n");
   const nextSteps = renderNextSteps(
     [
       {
         command: `npx skillops-cli info ${result.name}`,
-        description: `Inspect your new ${result.kind} metadata & token budget`
+        description: `Inspect new ${result.kind} metadata & budget`
       },
       {
         command: "npx skillops-cli audit --require-layout",
-        description: "Verify INV-SKILL-01..04 contract compliance & cosine collisions"
+        description: "Verify INV-SKILL-01..04 & collisions"
       },
       {
         command: `npx skillops-cli add ${result.name}`,
-        description: `Transpile & install '${result.name}' into your AI coding agents`
+        description: `Install '${result.name}' into AI agents`
       }
     ],
     c
   );
-  return `${box}
+  return `${treeHeader}
 ${nextSteps}`;
 }
 function runQuickstart(repoPath, catalogDir, options = {}) {
@@ -5814,34 +5988,35 @@ function formatQuickstartReport(report, format = "table", colorEnabled) {
     ].join("\n");
   }
   const c = colorEnabled;
-  const stackLabel = [...report.detected_languages, ...report.detected_frameworks].join(", ") || "general-purpose";
-  const targetsLabel = report.active_targets.length > 5 ? `${report.active_targets.slice(0, 5).join(", ")} (+${report.active_targets.length - 5} more)` : report.active_targets.join(", ");
+  const bar = style.dim("\u2502", c);
+  const stackLabel = [...report.detected_languages, ...report.detected_frameworks].join(", ") || "general";
+  const targetsLabel = report.active_targets.length > 4 ? `${report.active_targets.slice(0, 4).join(", ")} (+${report.active_targets.length - 4})` : report.active_targets.join(", ");
   const banner = renderHeaderBanner(
-    `1-Step Quickstart & AI Agent Library Setup ${report.dry_run ? "[DRY-RUN]" : "[READY]"}`,
+    `Quickstart Setup ${report.dry_run ? "[DRY-RUN]" : "[READY]"}`,
     { colorEnabled: c }
   );
   const stepsBlock = [
     renderStep(
       1,
       4,
-      "Detect Stack & AI Agents",
-      `Stack: ${style.cyan(stackLabel, c)} \u2022 Targets: ${style.bold(targetsLabel, c)}`,
+      "Detect Stack & Agents",
+      `${style.cyan(stackLabel, c)} \xB7 ${style.bold(targetsLabel, c)}`,
       "done",
       c
     ),
     renderStep(
       2,
       4,
-      "Route Optimal Library Bundle",
-      `${style.green(`${report.selected_skills.length} Skills`, c)} + ${style.magenta(`${report.selected_subagents.length} Subagents`, c)} selected`,
+      "Route Library Bundle",
+      `${style.green(`${report.selected_skills.length} Skills`, c)} + ${style.magenta(`${report.selected_subagents.length} Subagents`, c)}`,
       "done",
       c
     ),
     renderStep(
       3,
       4,
-      "Transpile & Sync Artifacts",
-      `${report.synced_files_count} files synced (${report.dry_run ? "dry-run" : ".skillops.yml + .skillops-lock.json"})`,
+      "Transpile & Sync",
+      `${report.synced_files_count} files (${report.dry_run ? "dry-run" : ".skillops.yml + lockfile"})`,
       "done",
       c
     ),
@@ -5849,12 +6024,12 @@ function formatQuickstartReport(report, format = "table", colorEnabled) {
       4,
       4,
       "Register MCP Server",
-      `${report.mcp_configured_count} MCP-compatible agent config(s) updated`,
+      `${report.mcp_configured_count} MCP agent config(s) wired`,
       "done",
       c
     )
   ].join("\n");
-  const tokenBar = `  ${renderTokenBar(
+  const tokenBar = `${bar}  ${renderTokenBar(
     report.total_l1_tokens,
     report.max_l1_budget,
     {
@@ -5862,21 +6037,16 @@ function formatQuickstartReport(report, format = "table", colorEnabled) {
       colorEnabled: c
     }
   )}`;
-  const bundleBox = renderBox(
-    [
-      `${style.bold("Installed Hybrid Executable Skills:", c)}`,
-      `  ${report.selected_skills.map((s) => style.cyan(s, c)).join(", ")}`,
-      "",
-      `${style.bold("Installed Context-Isolated Subagents:", c)}`,
-      `  ${report.selected_subagents.map((a) => style.magenta(a, c)).join(", ")}`
-    ],
-    {
-      title: "\u{1F4E6} Active Skills & Subagents Bundle",
-      borderColor: style.cyan,
-      minWidth: 72,
-      colorEnabled: c
-    }
-  );
+  const bundleTree = [
+    bar,
+    `${style.dim("\u251C\u2500", c)} ${style.bold(style.cyan(`Active Bundle (${report.selected_skills.length} Skills \xB7 ${report.selected_subagents.length} Subagents)`, c), c)}`,
+    `${bar}  \u2022 ${style.bold("Skills:", c)} ${report.selected_skills.slice(0, 2).map((s) => style.cyan(s, c)).join(
+      ", "
+    )}${report.selected_skills.length > 2 ? ` (+${report.selected_skills.length - 2} more)` : ""}`,
+    `${bar}  \u2022 ${style.bold("Subagents:", c)} ${report.selected_subagents.slice(0, 2).map((a) => style.magenta(a, c)).join(
+      ", "
+    )}${report.selected_subagents.length > 2 ? ` (+${report.selected_subagents.length - 2} more)` : ""}`
+  ].join("\n");
   const usageGuide = renderAiUsageGuide(
     report.active_targets,
     report.selected_skills,
@@ -5887,32 +6057,29 @@ function formatQuickstartReport(report, format = "table", colorEnabled) {
     [
       {
         command: `npx skillops-cli info ${report.selected_skills[0] ?? "bug-reproducer-tdd"}`,
-        description: "Inspect a Skill's triggers, L3 scripts & AI invocation syntax"
+        description: "Inspect Skill triggers & L3 scripts"
       },
       {
         command: "npx skillops-cli list",
-        description: "Browse all 10 Skills & 9 Subagents in the Library"
+        description: "Browse all 10 Skills & 9 Subagents"
       },
       {
-        command: "npx skillops-cli create skill my-custom-skill",
-        description: "Create your own custom Skill using the SkillOps Framework"
+        command: "npx skillops-cli create skill my-skill",
+        description: "Create a custom Skill"
       },
       {
         command: "npx skillops-cli doctor",
-        description: "Verify lockfile integrity & Startup Token Tax savings"
+        description: "Verify lockfile & Startup Token Tax"
       }
     ],
     c
   );
   return [
     banner,
-    "",
+    bar,
     stepsBlock,
-    "",
     tokenBar,
-    "",
-    bundleBox,
-    "",
+    bundleTree,
     usageGuide,
     nextSteps
   ].join("\n");
@@ -6014,6 +6181,41 @@ function resolveCatalogDir(args, repoPath, loadedConfig) {
   }
   return path10.join(PACKAGE_ROOT, "catalog");
 }
+function buildInteractiveCatalogOptions(catalogDir) {
+  const options = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const skillDir of discoverSkillDirectories(catalogDir)) {
+    try {
+      const parsed = parseSkillDirectory(skillDir, { requireLayout: false });
+      if (!seen.has(parsed.manifest.name)) {
+        seen.add(parsed.manifest.name);
+        options.push({
+          value: parsed.manifest.name,
+          label: parsed.manifest.name,
+          kind: "skill",
+          hint: parsed.manifest.description
+        });
+      }
+    } catch {
+    }
+  }
+  for (const saPath of discoverSubagentFiles(catalogDir)) {
+    try {
+      const parsed = parseSubagentFile(saPath);
+      if (!seen.has(parsed.manifest.name)) {
+        seen.add(parsed.manifest.name);
+        options.push({
+          value: parsed.manifest.name,
+          label: parsed.manifest.name,
+          kind: "agent",
+          hint: parsed.manifest.description
+        });
+      }
+    } catch {
+    }
+  }
+  return options;
+}
 function runCli(argv) {
   const args = argv.slice(2);
   if (args.includes("--version") || args.includes("-V") || args[0] === "version") {
@@ -6026,15 +6228,18 @@ function runCli(argv) {
     if (targetCmd && !targetCmd.startsWith("-")) {
       const spec = findCommandHelpSpec(targetCmd);
       if (spec) {
-        process.stdout.write(renderCommandHelp(spec, SKILLOPS_VERSION));
+        process.stdout.write(`${renderCommandHelp(spec, SKILLOPS_VERSION)}
+`);
         return ExitCode.SUCCESS;
       }
     }
-    process.stdout.write(renderGlobalHelp(SKILLOPS_VERSION));
+    process.stdout.write(`${renderGlobalHelp(SKILLOPS_VERSION)}
+`);
     return ExitCode.SUCCESS;
   }
   if (args.length === 0 || args[0] === "--help" || args[0] === "-h") {
-    process.stdout.write(renderGlobalHelp(SKILLOPS_VERSION));
+    process.stdout.write(`${renderGlobalHelp(SKILLOPS_VERSION)}
+`);
     return ExitCode.SUCCESS;
   }
   if (args.includes("--help") || args.includes("-h")) {
@@ -6042,11 +6247,13 @@ function runCli(argv) {
     if (firstCmd) {
       const spec = findCommandHelpSpec(firstCmd);
       if (spec) {
-        process.stdout.write(renderCommandHelp(spec, SKILLOPS_VERSION));
+        process.stdout.write(`${renderCommandHelp(spec, SKILLOPS_VERSION)}
+`);
         return ExitCode.SUCCESS;
       }
     }
-    process.stdout.write(renderGlobalHelp(SKILLOPS_VERSION));
+    process.stdout.write(`${renderGlobalHelp(SKILLOPS_VERSION)}
+`);
     return ExitCode.SUCCESS;
   }
   const command = args[0] ?? "";
@@ -6207,6 +6414,7 @@ function runCli(argv) {
     return ExitCode.SUCCESS;
   }
   if (command === "list") {
+    const positionals = getPositionalArgs(args);
     const repoPath = getFlagValue(args, "--repo", "--project", "-p") ?? process.cwd();
     const cfgRes = loadSkillOpsConfig(repoPath);
     if (cfgRes.error) {
@@ -6218,6 +6426,12 @@ function runCli(argv) {
     }
     const catalogDir = resolveCatalogDir(args, repoPath, cfgRes.config);
     const rawFormat = getFlagValue(args, "--format", "-f") ?? "table";
+    if (positionals.length > 0) {
+      const format = rawFormat === "json" || rawFormat === "markdown" ? rawFormat : "table";
+      const report = searchCatalog(catalogDir, positionals.join(" "));
+      process.stdout.write(formatCatalogSearchReport(report, format));
+      return ExitCode.SUCCESS;
+    }
     const summary = auditCatalogTokenBudgets(catalogDir, {
       requireLayout: false
     });
@@ -6253,7 +6467,7 @@ function runCli(argv) {
       return ExitCode.SUCCESS;
     }
     const l1Bar = renderProgressBar(summary.totalL1Tokens, 1500, {
-      width: 18,
+      width: 10,
       unit: "tokens"
     });
     const firstSkill = summary.skills[0]?.skillName ?? "security-sast-gate";
@@ -6271,15 +6485,15 @@ function runCli(argv) {
       renderNextSteps([
         {
           command: `npx skillops-cli info ${firstSkill}`,
-          description: "Inspect triggers, L3 scripts & how to invoke in your AI"
+          description: "Inspect triggers & usage"
         },
         {
           command: "npx skillops-cli search <keyword>",
-          description: "Search Skills & Subagents by domain or signal"
+          description: "Search Skills & Subagents"
         },
         {
           command: "npx skillops-cli quickstart",
-          description: "Auto-detect project stack & install optimal bundle"
+          description: "Auto-detect & install"
         }
       ])
     ];
@@ -6467,7 +6681,9 @@ function runCli(argv) {
     const force = args.includes("--force");
     const rawFormat = getFlagValue(args, "--format", "-f") ?? "table";
     const format = rawFormat === "json" || rawFormat === "markdown" ? rawFormat : "table";
-    if (positionals.length === 0) {
+    const importAll = args.includes("--all");
+    const itemsToAdd = importAll && positionals.length === 0 ? buildInteractiveCatalogOptions(catalogDir).map((o) => o.value) : positionals;
+    if (itemsToAdd.length === 0) {
       if (command === "add") {
         process.stderr.write(
           "Usage: npx skillops-cli add <skill-or-subagent-name> [more-names...] [options]\n"
@@ -6488,19 +6704,27 @@ function runCli(argv) {
       return report.passed ? ExitCode.SUCCESS : ExitCode.ERROR;
     }
     try {
-      let allPassed = true;
-      for (const itemName of positionals) {
-        const report = addSkillOrSubagent(repoPath, catalogDir, itemName, {
+      const reports = itemsToAdd.map(
+        (itemName) => addSkillOrSubagent(repoPath, catalogDir, itemName, {
           targets,
           dryRun,
           force
-        });
-        process.stdout.write(formatSyncReport(report, format));
-        if (!report.passed) {
-          allPassed = false;
-        }
+        })
+      );
+      const firstReport = reports[0];
+      if (!firstReport) {
+        return ExitCode.ERROR;
       }
-      return allPassed ? ExitCode.SUCCESS : ExitCode.ERROR;
+      const finalReport = reports.length === 1 ? firstReport : {
+        ...firstReport,
+        artifacts: reports.flatMap((r) => r.artifacts),
+        drift_conflicts: [
+          ...new Set(reports.flatMap((r) => r.drift_conflicts))
+        ],
+        passed: reports.every((r) => r.passed)
+      };
+      process.stdout.write(formatSyncReport(finalReport, format));
+      return finalReport.passed ? ExitCode.SUCCESS : ExitCode.ERROR;
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
       process.stderr.write(`Error: ${msg}
@@ -6677,6 +6901,46 @@ function runCli(argv) {
   );
   return ExitCode.ERROR;
 }
+async function runCliInteractive(argv) {
+  const args = argv.slice(2);
+  const command = args[0];
+  if (command === "add" && !args.includes("--help") && !args.includes("-h") && !args.includes("--all") && getPositionalArgs(args).length === 0 && process.stdin.isTTY && process.stdout.isTTY) {
+    const repoPath = getFlagValue(args, "--repo", "--project", "-p") ?? process.cwd();
+    const cfgRes = loadSkillOpsConfig(repoPath);
+    if (cfgRes.error) {
+      process.stderr.write(
+        `Invalid .skillops.yml at ${cfgRes.configPath}: ${cfgRes.error}
+`
+      );
+      return ExitCode.BUDGET_OR_CONTRACT_ERROR;
+    }
+    const catalogDir = resolveCatalogDir(args, repoPath, cfgRes.config);
+    const targetsArg = resolveTargetsArg(args);
+    let targets;
+    try {
+      targets = targetsArg ? resolveRuntimeTargets(targetsArg, repoPath) : cfgRes.config?.targets ?? [...CORE_RUNTIME_TARGETS];
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      process.stderr.write(`Invalid --targets: ${msg}
+`);
+      return ExitCode.BUDGET_OR_CONTRACT_ERROR;
+    }
+    const options = buildInteractiveCatalogOptions(catalogDir);
+    const selected = await runMultiSelectPrompt(
+      "SkillOps \u2014 Select Skills & Agents to Import",
+      options,
+      {
+        targetHint: `${targets.join(", ")} -> ${repoPath.replace(/\\/g, "/")}`
+      }
+    );
+    if (!selected || selected.length === 0) {
+      process.stdout.write("No Skills or Agents selected.\n");
+      return ExitCode.SUCCESS;
+    }
+    return runCli([...argv, ...selected]);
+  }
+  return runCli(argv);
+}
 function isDirectCliInvocation() {
   const entryArg = process.argv[1];
   if (!entryArg) {
@@ -6693,9 +6957,12 @@ function isDirectCliInvocation() {
   }
 }
 if (isDirectCliInvocation()) {
-  const code = runCli(process.argv);
-  process.exit(code);
+  runCliInteractive(process.argv).then((code) => {
+    process.exit(code);
+  });
 }
 export {
-  runCli
+  buildInteractiveCatalogOptions,
+  runCli,
+  runCliInteractive
 };