skillops-cli 1.3.4 → 1.3.6

package/dist/cli.js

@@ -10,7 +10,7 @@ import YAML6 from "yaml";
 import fs from "fs";
 import YAML from "yaml";
 import { z } from "zod";
-var SKILLOPS_VERSION = "1.3.4";
+var SKILLOPS_VERSION = "1.3.6";
 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]*)$/;
@@ -87,7 +87,15 @@ var RuntimeTargetSchema = z.enum([
   "kiro",
   "trae",
   "amazonq",
-  "junie"
+  "junie",
+  "gemini",
+  "factory",
+  "qwen",
+  "augment",
+  "vibe",
+  "warp",
+  "crush",
+  "idx"
 ]);
 var CORE_RUNTIME_TARGETS = [
   "claude",
@@ -116,7 +124,15 @@ var ALL_RUNTIME_TARGETS = [
   "kiro",
   "trae",
   "amazonq",
-  "junie"
+  "junie",
+  "gemini",
+  "factory",
+  "qwen",
+  "augment",
+  "vibe",
+  "warp",
+  "crush",
+  "idx"
 ];
 var RUNTIME_HARNESS_SPECS = {
   claude: {
@@ -134,15 +150,15 @@ var RUNTIME_HARNESS_SPECS = {
   },
   antigravity: {
     id: "antigravity",
-    displayName: "Google Antigravity / Gemini CLI",
+    displayName: "Google Antigravity IDE",
     vendor: "Google DeepMind",
     category: "ai-ide",
     skillFormat: "progressive-skill-dir",
     skillsDir: ".agent/skills",
     subagentsDir: ".agent/agents",
-    detectionPaths: [".agent", ".gemini", "GEMINI.md"],
-    alwaysOnFiles: ["GEMINI.md", ".gemini/GEMINI.md"],
-    mcpConfigPath: ".gemini/settings.json",
+    detectionPaths: [".agent", "GEMINI.md"],
+    alwaysOnFiles: ["GEMINI.md"],
+    mcpConfigPath: ".agent/mcp_config.json",
     supportsMcp: true
   },
   cursor: {
@@ -387,6 +403,110 @@ var RUNTIME_HARNESS_SPECS = {
     alwaysOnFiles: [".junie/guidelines.md"],
     mcpConfigPath: null,
     supportsMcp: false
+  },
+  gemini: {
+    id: "gemini",
+    displayName: "Google Gemini CLI",
+    vendor: "Google",
+    category: "cli-agent",
+    skillFormat: "progressive-skill-dir",
+    skillsDir: ".gemini/skills",
+    subagentsDir: ".gemini/agents",
+    detectionPaths: [".gemini", "GEMINI.md"],
+    alwaysOnFiles: ["GEMINI.md", ".gemini/GEMINI.md", ".gemini/STYLEGUIDE.md"],
+    mcpConfigPath: ".gemini/settings.json",
+    supportsMcp: true
+  },
+  factory: {
+    id: "factory",
+    displayName: "Factory AI Droid",
+    vendor: "Factory AI",
+    category: "cli-agent",
+    skillFormat: "progressive-skill-dir",
+    skillsDir: ".factory/skills",
+    subagentsDir: ".factory/droids",
+    detectionPaths: [".factory"],
+    alwaysOnFiles: ["AGENTS.md", ".factory/instructions.md"],
+    mcpConfigPath: ".factory/mcp.json",
+    supportsMcp: true
+  },
+  qwen: {
+    id: "qwen",
+    displayName: "Qwen Code CLI",
+    vendor: "Alibaba Cloud / Qwen",
+    category: "cli-agent",
+    skillFormat: "progressive-skill-dir",
+    skillsDir: ".qwen/skills",
+    subagentsDir: ".qwen/agents",
+    detectionPaths: [".qwen", "QWEN.md"],
+    alwaysOnFiles: ["QWEN.md", "AGENTS.md"],
+    mcpConfigPath: ".qwen/settings.json",
+    supportsMcp: true
+  },
+  augment: {
+    id: "augment",
+    displayName: "Augment Code",
+    vendor: "Augment",
+    category: "ide-extension",
+    skillFormat: "markdown-rule",
+    skillsDir: ".augment/rules",
+    subagentsDir: ".augment/agents",
+    detectionPaths: [".augment", ".augment-guidelines"],
+    alwaysOnFiles: [".augment-guidelines", "AGENTS.md"],
+    mcpConfigPath: ".augment/settings.json",
+    supportsMcp: true
+  },
+  vibe: {
+    id: "vibe",
+    displayName: "Mistral Vibe CLI",
+    vendor: "Mistral AI",
+    category: "cli-agent",
+    skillFormat: "progressive-skill-dir",
+    skillsDir: ".vibe/skills",
+    subagentsDir: ".vibe/agents",
+    detectionPaths: [".vibe"],
+    alwaysOnFiles: [".vibe/config.toml", "AGENTS.md"],
+    mcpConfigPath: ".vibe/config.toml",
+    supportsMcp: true
+  },
+  warp: {
+    id: "warp",
+    displayName: "Warp AI Terminal",
+    vendor: "Warp",
+    category: "cli-agent",
+    skillFormat: "progressive-skill-dir",
+    skillsDir: ".warp/skills",
+    subagentsDir: ".warp/agents",
+    detectionPaths: [".warp", "WARP.md"],
+    alwaysOnFiles: ["WARP.md", "AGENTS.md"],
+    mcpConfigPath: null,
+    supportsMcp: false
+  },
+  crush: {
+    id: "crush",
+    displayName: "Charmbracelet Crush",
+    vendor: "Charmbracelet",
+    category: "cli-agent",
+    skillFormat: "progressive-skill-dir",
+    skillsDir: ".crush/skills",
+    subagentsDir: ".crush/agents",
+    detectionPaths: [".crush", ".crush.json", "CRUSH.md"],
+    alwaysOnFiles: ["CRUSH.md", "AGENTS.md"],
+    mcpConfigPath: ".crush.json",
+    supportsMcp: true
+  },
+  idx: {
+    id: "idx",
+    displayName: "Firebase Studio (Project IDX)",
+    vendor: "Google",
+    category: "ai-ide",
+    skillFormat: "markdown-rule",
+    skillsDir: ".idx/rules",
+    subagentsDir: ".idx/agents",
+    detectionPaths: [".idx"],
+    alwaysOnFiles: [".idx/airules.md", "GEMINI.md"],
+    mcpConfigPath: ".idx/mcp.json",
+    supportsMcp: true
   }
 };
 function detectInstalledHarnesses(repoPath) {
@@ -418,7 +538,7 @@ function resolveRuntimeTargets(rawSpec, repoPath, fallbackTargets = CORE_RUNTIME
     }
   };
   for (const token of tokens) {
-    if (token === "all" || token === "*" || token === "top20") {
+    if (token === "all" || token === "*" || token === "top20" || token === "top28") {
       for (const t of ALL_RUNTIME_TARGETS) {
         pushUnique(t);
       }
@@ -1613,6 +1733,10 @@ var ALWAYS_ON_INSTRUCTION_CANDIDATES = [
   "AGENTS.md",
   "GEMINI.md",
   ".gemini/GEMINI.md",
+  ".gemini/STYLEGUIDE.md",
+  "QWEN.md",
+  "WARP.md",
+  "CRUSH.md",
   "AGENT.md",
   "CONVENTIONS.md",
   ".github/copilot-instructions.md",
@@ -1622,17 +1746,22 @@ var ALWAYS_ON_INSTRUCTION_CANDIDATES = [
   ".roorules",
   ".kilocoderules",
   ".continuerules",
+  ".augment-guidelines",
   ".rules",
   ".goosehints",
   ".junie/guidelines.md",
   ".openhands/microagents/repo.md",
   ".trae/rules/project_rules.md",
+  ".factory/instructions.md",
+  ".idx/airules.md",
+  ".vibe/config.toml",
   ".kiro/steering/product.md",
   ".kiro/steering/tech.md",
   ".kiro/steering/structure.md"
 ];
 var MCP_CONFIG_CANDIDATES = [
   ".mcp.json",
+  ".agent/mcp_config.json",
   ".cursor/mcp.json",
   ".vscode/mcp.json",
   ".gemini/settings.json",
@@ -1644,7 +1773,13 @@ var MCP_CONFIG_CANDIDATES = [
   ".amp/settings.json",
   "opencode.json",
   ".kiro/settings/mcp.json",
-  ".amazonq/mcp.json"
+  ".amazonq/mcp.json",
+  ".factory/mcp.json",
+  ".qwen/settings.json",
+  ".augment/settings.json",
+  ".vibe/config.toml",
+  ".crush.json",
+  ".idx/mcp.json"
 ];
 function countMcpServersInConfig(rawText, relPath) {
   if (relPath.endsWith(".toml")) {
@@ -2074,9 +2209,9 @@ function diagnoseRepository(repoPath, options = {}) {
   const detectedHarnesses = detectInstalledHarnesses(resolvedRepo);
   checks.push({
     id: "detected_harnesses",
-    title: "Detected AI Coding Harnesses (Top 20)",
+    title: "Detected AI Coding Harnesses (Top 28)",
     status: "pass",
-    summary: detectedHarnesses.length > 0 ? `Detected ${detectedHarnesses.length} AI coding harness(es): ${detectedHarnesses.join(", ")}.` : "No repo-local AI harness folders detected yet (ready to sync all 20 agents)."
+    summary: detectedHarnesses.length > 0 ? `Detected ${detectedHarnesses.length} AI coding harness(es): ${detectedHarnesses.join(", ")}.` : "No repo-local AI harness folders detected yet (ready to sync all 28 agents)."
   });
   const loadedCfg = loadSkillOpsConfig(resolvedRepo);
   const configPresent = loadedCfg.exists;
@@ -2259,7 +2394,7 @@ function formatHarnessInspectionReport(report, format = "table") {
   }
   if (format === "markdown") {
     const lines2 = [
-      `## SkillOps Universal Top-20 AI Coding Agent Harnesses (\`${report.repo_path}\`)`,
+      `## SkillOps Universal Top-28 AI Coding Agent Harnesses (\`${report.repo_path}\`)`,
       "",
       `- **Supported AI Coding Harnesses:** \`${report.total_supported}\``,
       `- **Detected in Repository:** \`${report.detected_count}\` (${report.detected_harnesses.length > 0 ? report.detected_harnesses.join(", ") : "none"})`,
@@ -2274,7 +2409,7 @@ function formatHarnessInspectionReport(report, format = "table") {
     return lines2.join("\n");
   }
   const lines = [
-    `=== SkillOps Universal Top-20 AI Coding Harnesses (${report.repo_path}) ===`,
+    `=== SkillOps Universal Top-28 AI Coding Harnesses (${report.repo_path}) ===`,
     `Supported Harnesses : ${report.total_supported}`,
     `Detected in Repo    : ${report.detected_count} (${report.detected_harnesses.length > 0 ? report.detected_harnesses.join(", ") : "none"})`,
     "-".repeat(92),
@@ -3345,7 +3480,7 @@ var MCP_TOOLS = [
   },
   {
     name: "list_supported_harnesses",
-    description: "Inspect all 20 supported AI coding agents, IDEs, and CLI harnesses (target paths, MCP support, and repository auto-detection).",
+    description: "Inspect all 28 supported AI coding agents, IDEs, and CLI harnesses (target paths, MCP support, and repository auto-detection).",
     inputSchema: {
       type: "object",
       properties: {
@@ -3517,7 +3652,7 @@ function startMcpStdioServer(context) {
 }
 function buildUpdatedMcpConfigContent(target, existingRaw, serverName) {
   const mcpArgs = ["-y", "skillops-cli@latest", "mcp"];
-  if (target === "codex") {
+  if (target === "codex" || target === "vibe") {
     const tomlBlock = [
       `[mcp_servers.${serverName}]`,
       'command = "npx"',
@@ -3610,6 +3745,20 @@ ${tomlBlock}
     };
     parsedObj.mcp = mcpMap;
     return `${JSON.stringify(parsedObj, null, 2)}
+`;
+  }
+  if (target === "crush") {
+    if (!("$schema" in parsedObj)) {
+      parsedObj.$schema = "https://charm.land/crush.json";
+    }
+    const mcpMap = parsedObj.mcp && typeof parsedObj.mcp === "object" && !Array.isArray(parsedObj.mcp) ? { ...parsedObj.mcp } : {};
+    mcpMap[serverName] = {
+      type: "stdio",
+      command: "npx",
+      args: mcpArgs
+    };
+    parsedObj.mcp = mcpMap;
+    return `${JSON.stringify(parsedObj, null, 2)}
 `;
   }
   const mcpServers = parsedObj.mcpServers && typeof parsedObj.mcpServers === "object" && !Array.isArray(parsedObj.mcpServers) ? { ...parsedObj.mcpServers } : {};
@@ -3860,6 +4009,24 @@ ${body}
 ${kiroFrontmatter}
 ---
 
+${body}
+`
+    });
+    return files;
+  }
+  if (target === "augment") {
+    const augFrontmatter = YAML4.stringify({
+      type: "agent_requested",
+      description: parsed.manifest.description
+    }).trim();
+    files.push({
+      target,
+      itemName: name,
+      relativePath: `.augment/rules/skillops-${name}.md`,
+      content: `---
+${augFrontmatter}
+---
+
 ${body}
 `
     });
@@ -3893,6 +4060,7 @@ function renderSubagentFilesForRuntime(subagent, target) {
   const fm = YAML4.stringify({
     name: subagent.manifest.name,
     description: subagent.manifest.description,
+    model: "inherit",
     model_tier: subagent.manifest.model_tier,
     tools: subagent.manifest.tools,
     max_output_tokens: subagent.manifest.max_output_tokens
@@ -3903,7 +4071,7 @@ ${fm}
 
 ${promptBody}
 `;
-  if (target === "claude" || target === "antigravity" || target === "codex" || target === "amp" || target === "goose" || target === "opencode") {
+  if (target === "claude" || target === "antigravity" || target === "gemini" || target === "codex" || target === "amp" || target === "goose" || target === "opencode" || target === "qwen" || target === "warp" || target === "crush") {
     return [
       {
         target,
@@ -3913,6 +4081,44 @@ ${promptBody}
       }
     ];
   }
+  if (target === "factory") {
+    const droidFm = YAML4.stringify({
+      name,
+      description: subagent.manifest.description,
+      model: "inherit"
+    }).trim();
+    return [
+      {
+        target,
+        itemName: name,
+        relativePath: `.factory/droids/skillops-agent-${name}.md`,
+        content: `---
+${droidFm}
+---
+
+${promptBody}
+`
+      }
+    ];
+  }
+  if (target === "vibe") {
+    const escapedDesc = JSON.stringify(subagent.manifest.description);
+    const escapedPrompt = JSON.stringify(promptBody);
+    const tomlDoc = [
+      `name = "${name}"`,
+      `description = ${escapedDesc}`,
+      `system_prompt = ${escapedPrompt}`,
+      ""
+    ].join("\n");
+    return [
+      {
+        target,
+        itemName: name,
+        relativePath: `.vibe/agents/skillops-agent-${name}.toml`,
+        content: tomlDoc
+      }
+    ];
+  }
   if (target === "copilot") {
     return [
       {
@@ -4719,8 +4925,8 @@ var COMMAND_HELP_SPECS = [
     name: "remove",
     aliases: ["uninstall", "rm"],
     pillar: "library",
-    summary: "Remove a Skill/Subagent from harnesses",
-    usage: "npx skillops-cli remove <name...> [options]",
+    summary: "Remove imported Skills/Subagents from harnesses",
+    usage: "npx skillops-cli remove [name...] [options]",
     options: [
       {
         flags: "-p, --project <dir>",
@@ -4730,12 +4936,20 @@ var COMMAND_HELP_SPECS = [
         flags: "-t, --harness <list>",
         description: "Restrict removal to specific harnesses"
       },
+      {
+        flags: "--all",
+        description: "Remove all imported Skills & Agents from project"
+      },
       {
         flags: "--force",
         description: "Remove even if SHA-256 drift is detected"
       }
     ],
     examples: [
+      {
+        command: "npx skillops-cli remove",
+        description: "Interactive selector of installed Skills & Agents"
+      },
       {
         command: "npx skillops-cli uninstall mcp-architect",
         description: "Remove runtime files & update lockfile"
@@ -4913,7 +5127,7 @@ var COMMAND_HELP_SPECS = [
     name: "sync",
     aliases: [],
     pillar: "runtime",
-    summary: "Transpile bundle across 20 AI agents",
+    summary: "Transpile bundle across 28 AI agents",
     usage: "npx skillops-cli sync [options]",
     options: [
       {
@@ -4944,7 +5158,7 @@ var COMMAND_HELP_SPECS = [
       },
       {
         command: "npx skillops-cli sync --harness all",
-        description: "Transpile across all 20 supported AI agents"
+        description: "Transpile across all 28 supported AI agents"
       }
     ]
   },
@@ -5037,7 +5251,7 @@ var COMMAND_HELP_SPECS = [
     name: "harnesses",
     aliases: [],
     pillar: "runtime",
-    summary: "List 20 supported AI agents & repo status",
+    summary: "List 28 supported AI agents & repo status",
     usage: "npx skillops-cli harnesses [options]",
     options: [
       {
@@ -5052,7 +5266,7 @@ var COMMAND_HELP_SPECS = [
     examples: [
       {
         command: "npx skillops-cli harnesses",
-        description: "View all 20 supported AI IDEs/CLI agents"
+        description: "View all 28 supported AI IDEs/CLI agents"
       }
     ]
   },
@@ -5060,7 +5274,7 @@ var COMMAND_HELP_SPECS = [
     name: "mcp-setup",
     aliases: [],
     pillar: "runtime",
-    summary: "Wire MCP server across 13 AI IDEs & agents",
+    summary: "Wire MCP server across 20 AI IDEs & agents",
     usage: "npx skillops-cli mcp-setup [options]",
     options: [
       {
@@ -5125,24 +5339,20 @@ function renderGlobalHelp(version, colorEnabled) {
       desc: "Import Skills or Agents (interactive if no name given)"
     },
     {
-      cmd: "search <query>",
-      desc: "Search Skills & Agents by keyword, stack, or domain"
+      cmd: "remove [name...]",
+      desc: "Remove 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: "search <query>",
+      desc: "Search Skills & Agents by keyword, stack, or domain"
     },
     {
-      cmd: "init",
-      desc: "Auto-detect stack & IDE and import recommended bundle"
+      cmd: "info <name>",
+      desc: "View details and how to use a Skill or Agent"
     }
   ];
   const cmdRows = coreCmds.map(
@@ -5154,12 +5364,12 @@ function renderGlobalHelp(version, colorEnabled) {
     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("-t, --target <ide>", c), 22, "left")}AI IDE (cursor, claude, copilot, antigravity...)`,
     `${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`,
+    `${bar}  ${padVisible(style.cyan("--all", c), 22, "left")}Import or remove all Skills & 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 add", c)}                                  ${style.dim("\u2014 Interactive import", c)}`,
+    `${bar}  ${style.dim("$", c)} ${style.green("skillops remove", c)}                               ${style.dim("\u2014 Interactive removal", 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)}`
@@ -5269,6 +5479,12 @@ function applyMultiSelectKey(state, key, options = {}) {
   }
   if (key === "\x1B[D" || key === "\x1BOD" || key === "\x1B[C" || key === "\x1BOC" || key === "	" || !state.searchMode && (key === "h" || key === "H" || key === "l" || key === "L")) {
     const nextTab = state.activeTab === "skill" ? "agent" : "skill";
+    const hasNextTabOptions = state.options.some(
+      (opt) => optionMatchesTab(opt, nextTab)
+    );
+    if (!hasNextTabOptions) {
+      return state;
+    }
     return {
       ...state,
       activeTab: nextTab,
@@ -5405,8 +5621,10 @@ function renderMultiSelectFrame(title, state, options = {}) {
   const skillTabTitle = options.tabLabels?.skill ?? "Skills";
   const agentTabTitle = options.tabLabels?.agent ?? "Agents";
   const submitVerb = options.submitActionLabel ?? "import";
+  const isSinglePage = totalAgents === 0 || totalSkills === 0;
   const header = `${style.bold(style.cyan(`\u25C6 ${title}`, c), c)}`;
-  const instructions = state.searchMode ? `${bar}  ${style.dim(`\u2191/\u2193 move \xB7 \u2190/\u2192 tab \xB7 Space select \xB7 Esc clear \xB7 Enter ${submitVerb}`, c)}` : `${bar}  ${style.dim(`\u2191/\u2193 move \xB7 \u2190/\u2192 tab \xB7 Space select \xB7 / search \xB7 a all \xB7 Enter ${submitVerb}`, c)}`;
+  const tabHint = isSinglePage ? "" : " \xB7 \u2190/\u2192 tab";
+  const instructions = state.searchMode ? `${bar}  ${style.dim(`\u2191/\u2193 move${tabHint} \xB7 Space select \xB7 Esc clear \xB7 Enter ${submitVerb}`, c)}` : `${bar}  ${style.dim(`\u2191/\u2193 move${tabHint} \xB7 Space select \xB7 / search \xB7 a all \xB7 Enter ${submitVerb}`, c)}`;
   const lines = [header];
   if (options.subtitle) {
     lines.push(`${bar}  ${options.subtitle}`);
@@ -5415,12 +5633,19 @@ function renderMultiSelectFrame(title, state, options = {}) {
   const hasQuery = state.searchQuery.length > 0;
   const skillCountStr = hasQuery ? `${filteredSkills.length}/${totalSkills}` : `${totalSkills}`;
   const agentCountStr = hasQuery ? `${filteredAgents.length}/${totalAgents}` : `${totalAgents}`;
-  const skillTabLabel = state.activeTab === "skill" ? style.bold(style.cyan(`[ \u25C6 ${skillTabTitle} (${skillCountStr}) ]`, c), c) : style.dim(`\u25CB ${skillTabTitle} (${skillCountStr})`, c);
-  const agentTabLabel = state.activeTab === "agent" ? style.bold(style.magenta(`[ \u25C6 ${agentTabTitle} (${agentCountStr}) ]`, c), c) : style.dim(`\u25CB ${agentTabTitle} (${agentCountStr})`, c);
+  const skillTabLabel = state.activeTab === "skill" ? style.bold(
+    style.cyan(`[ \u25C6 ${skillTabTitle} (${skillCountStr}) ]`, c),
+    c
+  ) : style.dim(`\u25CB ${skillTabTitle} (${skillCountStr})`, c);
+  const agentTabLabel = state.activeTab === "agent" ? style.bold(
+    style.magenta(`[ \u25C6 ${agentTabTitle} (${agentCountStr}) ]`, c),
+    c
+  ) : style.dim(`\u25CB ${agentTabTitle} (${agentCountStr})`, c);
   const rawQuerySlice = state.searchQuery.length > 14 ? `\u2026${state.searchQuery.slice(-13)}` : state.searchQuery;
   const searchSuffix = state.searchMode || hasQuery ? `   ${style.yellow(`/ Filter: ${rawQuerySlice}${state.searchMode ? "\u2588" : ""}`, c)}` : `   ${style.dim("(/ search)", c)}`;
+  const singleTabLabel = totalSkills > 0 ? skillTabLabel : agentTabLabel;
   lines.push(
-    `${style.dim("\u251C\u2500", c)} ${skillTabLabel}   ${agentTabLabel}${searchSuffix}`,
+    isSinglePage ? `${style.dim("\u251C\u2500", c)} ${singleTabLabel}${searchSuffix}` : `${style.dim("\u251C\u2500", c)} ${skillTabLabel}   ${agentTabLabel}${searchSuffix}`,
     bar
   );
   if (total === 0) {
@@ -6353,14 +6578,32 @@ function resolveCatalogDir(args, repoPath, loadedConfig) {
 var POPULAR_AI_ORDER = [
   "cursor",
   "claude",
-  "antigravity",
   "copilot",
+  "antigravity",
   "windsurf",
   "codex",
+  "gemini",
   "cline",
   "roocode",
   "kilocode",
-  "zed"
+  "zed",
+  "continue",
+  "aider",
+  "kiro",
+  "trae",
+  "augment",
+  "factory",
+  "qwen",
+  "opencode",
+  "openhands",
+  "amp",
+  "goose",
+  "warp",
+  "crush",
+  "vibe",
+  "junie",
+  "amazonq",
+  "idx"
 ];
 function buildInteractiveTargetOptions() {
   const popularSet = new Set(POPULAR_AI_ORDER);
@@ -6368,13 +6611,13 @@ function buildInteractiveTargetOptions() {
     ...POPULAR_AI_ORDER,
     ...ALL_RUNTIME_TARGETS.filter((t) => !popularSet.has(t))
   ];
-  return orderedTargets.map((targetId, index) => {
+  return orderedTargets.map((targetId) => {
     const spec = RUNTIME_HARNESS_SPECS[targetId];
     return {
       value: spec.id,
       label: spec.id,
       kind: "ide",
-      tab: index < 10 ? "skill" : "agent",
+      tab: "skill",
       hint: `${spec.displayName} (${spec.skillsDir})`
     };
   });
@@ -6414,6 +6657,66 @@ function buildInteractiveCatalogOptions(catalogDir) {
   }
   return options;
 }
+function buildInteractiveInstalledOptions(repoPath, catalogDir, targetFilter) {
+  const lockfilePath = path10.join(path10.resolve(repoPath), ".skillops-lock.json");
+  if (!fs10.existsSync(lockfilePath)) {
+    return [];
+  }
+  let parsedLock;
+  try {
+    const raw = JSON.parse(fs10.readFileSync(lockfilePath, "utf-8"));
+    parsedLock = SyncLockfileSchema.safeParse(raw);
+  } catch {
+    return [];
+  }
+  if (!parsedLock.success) {
+    return [];
+  }
+  const lock = parsedLock.data;
+  const targetSet = targetFilter && targetFilter.length > 0 ? new Set(targetFilter) : null;
+  const targetsByItem = /* @__PURE__ */ new Map();
+  for (const entry of Object.values(lock.artifacts)) {
+    if (entry.skill_name === "codex-agents-index") {
+      continue;
+    }
+    if (targetSet && !targetSet.has(entry.target)) {
+      continue;
+    }
+    let itemTargets = targetsByItem.get(entry.skill_name);
+    if (!itemTargets) {
+      itemTargets = /* @__PURE__ */ new Set();
+      targetsByItem.set(entry.skill_name, itemTargets);
+    }
+    itemTargets.add(entry.target);
+  }
+  if (targetsByItem.size === 0) {
+    return [];
+  }
+  const catalogOptions = buildInteractiveCatalogOptions(catalogDir);
+  const catalogMap = new Map(catalogOptions.map((o) => [o.value, o]));
+  const subagentSet = new Set(lock.selected_subagents);
+  const skills = [];
+  const agents = [];
+  for (const [itemName, itemTargets] of targetsByItem.entries()) {
+    const catalogOpt = catalogMap.get(itemName);
+    const isAgent = catalogOpt ? catalogOpt.kind === "agent" : subagentSet.has(itemName);
+    const targetsLabel = [...itemTargets].join(", ");
+    const baseHint = catalogOpt?.hint ?? "Installed in project";
+    const option = {
+      value: itemName,
+      label: itemName,
+      kind: isAgent ? "agent" : "skill",
+      tab: isAgent ? "agent" : "skill",
+      hint: `[${targetsLabel}] \xB7 ${baseHint}`
+    };
+    if (isAgent) {
+      agents.push(option);
+    } else {
+      skills.push(option);
+    }
+  }
+  return [...skills, ...agents];
+}
 function runCli(argv) {
   const args = argv.slice(2);
   if (args.includes("--version") || args.includes("-V") || args[0] === "version") {
@@ -6681,6 +6984,10 @@ function runCli(argv) {
         (a) => `  [SUBAGENT] ${a.subagentName} (prompt=${a.systemPromptTokens}t, max_out<=${a.maxOutputTokens}t, tools=${a.tools.length})`
       ),
       renderNextSteps([
+        {
+          command: "npx skillops-cli add",
+          description: "Interactive import into your AI IDE"
+        },
         {
           command: `npx skillops-cli info ${firstSkill}`,
           description: "Inspect triggers & usage"
@@ -6688,10 +6995,6 @@ function runCli(argv) {
         {
           command: "npx skillops-cli search <keyword>",
           description: "Search Skills & Subagents"
-        },
-        {
-          command: "npx skillops-cli quickstart",
-          description: "Auto-detect & install"
         }
       ])
     ];
@@ -6932,12 +7235,7 @@ function runCli(argv) {
   }
   if (command === "remove" || command === "uninstall" || command === "rm") {
     const positionals = getPositionalArgs(args);
-    if (positionals.length === 0) {
-      process.stderr.write(
-        "Usage: npx skillops-cli remove <skill-or-subagent-name> [options]\n"
-      );
-      return ExitCode.ERROR;
-    }
+    const removeAll = args.includes("--all");
     const repoPath = getFlagValue(args, "--repo", "--project", "-p") ?? process.cwd();
     const cfgRes = loadSkillOpsConfig(repoPath);
     if (cfgRes.error) {
@@ -6955,19 +7253,44 @@ function runCli(argv) {
     const format = rawFormat === "json" || rawFormat === "markdown" ? rawFormat : "table";
     try {
       const targets = rawTargetsArg ? resolveRuntimeTargets(rawTargetsArg, repoPath) : void 0;
-      let allPassed = true;
-      for (const itemName of positionals) {
-        const report = removeSkillOrSubagent(repoPath, catalogDir, itemName, {
-          targets,
+      if (removeAll && positionals.length === 0 && !targets) {
+        const report = cleanSyncedArtifacts(repoPath, catalogDir, {
           dryRun,
           force
         });
         process.stdout.write(formatSyncReport(report, format));
-        if (!report.passed) {
-          allPassed = false;
-        }
+        return report.passed ? ExitCode.SUCCESS : ExitCode.ERROR;
+      }
+      const itemsToRemove = removeAll && positionals.length === 0 ? buildInteractiveInstalledOptions(repoPath, catalogDir, targets).map(
+        (o) => o.value
+      ) : positionals;
+      if (itemsToRemove.length === 0) {
+        process.stderr.write(
+          "Usage: npx skillops-cli remove <skill-or-subagent-name> [options]\n"
+        );
+        return ExitCode.ERROR;
+      }
+      const reports = itemsToRemove.map(
+        (itemName) => removeSkillOrSubagent(repoPath, catalogDir, itemName, {
+          targets,
+          dryRun,
+          force
+        })
+      );
+      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}
@@ -7125,8 +7448,8 @@ async function runCliInteractive(argv) {
         targetOptions,
         {
           tabLabels: {
-            skill: "Popular AIs",
-            agent: "More AIs"
+            skill: "AI IDEs & Agents",
+            agent: ""
           },
           submitActionLabel: "continue",
           selectCursorOnEmptySubmit: true
@@ -7165,6 +7488,57 @@ async function runCliInteractive(argv) {
     }
     return runCli([...argv, ...extraArgs]);
   }
+  if ((command === "remove" || command === "uninstall" || command === "rm") && !args.includes("--help") && !args.includes("-h") && !args.includes("--all") && process.stdin.isTTY && process.stdout.isTTY) {
+    const positionals = getPositionalArgs(args);
+    if (positionals.length === 0) {
+      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 explicitTargetsArg = resolveTargetsArg(args);
+      let targets;
+      if (explicitTargetsArg) {
+        try {
+          targets = resolveRuntimeTargets(explicitTargetsArg, repoPath);
+        } catch (err) {
+          const msg = err instanceof Error ? err.message : String(err);
+          process.stderr.write(`Invalid --targets: ${msg}
+`);
+          return ExitCode.BUDGET_OR_CONTRACT_ERROR;
+        }
+      }
+      const installedOptions = buildInteractiveInstalledOptions(
+        repoPath,
+        catalogDir,
+        targets
+      );
+      if (installedOptions.length === 0) {
+        process.stdout.write(
+          "No imported Skills or Agents found in this project.\n"
+        );
+        return ExitCode.SUCCESS;
+      }
+      const selected = await runMultiSelectPrompt(
+        "SkillOps \u2014 Select Installed Skills & Agents to Remove",
+        installedOptions,
+        {
+          submitActionLabel: "remove",
+          targetHint: targets ? targets.join(", ") : void 0
+        }
+      );
+      if (!selected || selected.length === 0) {
+        process.stdout.write("No Skills or Agents selected for removal.\n");
+        return ExitCode.SUCCESS;
+      }
+      return runCli([...argv, ...selected]);
+    }
+  }
   return runCli(argv);
 }
 function isDirectCliInvocation() {
@@ -7189,6 +7563,7 @@ if (isDirectCliInvocation()) {
 }
 export {
   buildInteractiveCatalogOptions,
+  buildInteractiveInstalledOptions,
   buildInteractiveTargetOptions,
   runCli,
   runCliInteractive