skillops-cli 1.3.3 → 1.3.5

package/README.md

@@ -1,6 +1,6 @@
 # SkillOps (`npx skillops-cli@latest`)
 
-> **The Zero-API Framework & Benchmark-Verified Library for High-End AI Coding Skills & Context-Isolated Subagents (`v1.3.3`)**  
+> **The Zero-API Framework & Benchmark-Verified Library for High-End AI Coding Skills & Context-Isolated Subagents (`v1.3.4`)**  
 > *Explore, search, inspect, and install benchmark-verified AI Coding Skills and Context-Isolated Subagents in 10 seconds (`npx skillops-cli@latest quickstart`), scaffold and certify your own custom Skills & Subagents (`npx skillops-cli@latest create skill <name>`), enforce Startup Token Tax budgets (`npx skillops-cli@latest budget`), and transpile natively across the Top 20 AI coding agents & IDEs — 100% offline with zero API keys.*
 
 [![CI Governance](https://img.shields.io/badge/governance-1%20Issue%20%3D%201%20PR-blue.svg)](./AGENTS.md)

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.3";
+var SKILLOPS_VERSION = "1.3.5";
 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 [
       {
@@ -4913,7 +5119,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 +5150,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 +5243,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 +5258,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 +5266,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: [
       {
@@ -5189,6 +5395,9 @@ function renderCommandHelp(spec, version, colorEnabled) {
 
 // src/ui/prompt.ts
 function optionMatchesTab(opt, tab) {
+  if (opt.tab) {
+    return opt.tab === tab;
+  }
   if (opt.kind === "agent") {
     return tab === "agent";
   }
@@ -5224,7 +5433,7 @@ function createMultiSelectState(options) {
     status: "active"
   };
 }
-function applyMultiSelectKey(state, key) {
+function applyMultiSelectKey(state, key, options = {}) {
   if (state.status !== "active" || state.options.length === 0) {
     return state;
   }
@@ -5249,14 +5458,29 @@ function applyMultiSelectKey(state, key) {
     };
   }
   if (key === "\r" || key === "\n") {
+    let finalSelected = state.selected;
+    if (options.selectCursorOnEmptySubmit && state.selected.size === 0) {
+      const visibleOnSubmit = getFilteredTabOptions(state, state.activeTab);
+      const currentOpt = visibleOnSubmit[state.cursor];
+      if (currentOpt) {
+        finalSelected = /* @__PURE__ */ new Set([currentOpt.value]);
+      }
+    }
     return {
       ...state,
+      selected: finalSelected,
       searchMode: false,
       status: "submitted"
     };
   }
   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,
@@ -5390,8 +5614,13 @@ function renderMultiSelectFrame(title, state, options = {}) {
   const filteredAgents = getFilteredTabOptions(state, "agent");
   const visible = state.activeTab === "skill" ? filteredSkills : filteredAgents;
   const total = visible.length;
+  const skillTabTitle = options.tabLabels?.skill ?? "Skills";
+  const agentTabTitle = options.tabLabels?.agent ?? "Agents";
+  const submitVerb = options.submitActionLabel ?? "import";
+  const isSinglePage = totalAgents === 0;
   const header = `${style.bold(style.cyan(`\u25C6 ${title}`, c), c)}`;
-  const instructions = state.searchMode ? `${bar}  ${style.dim("\u2191/\u2193 move \xB7 \u2190/\u2192 switch tab \xB7 Space select \xB7 Esc clear search \xB7 Enter import", c)}` : `${bar}  ${style.dim("\u2191/\u2193 move \xB7 \u2190/\u2192 switch tab \xB7 Space select \xB7 / search \xB7 a all \xB7 Enter import", 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}`);
@@ -5400,16 +5629,22 @@ 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 Skills (${skillCountStr}) ]`, c), c) : style.dim(`\u25CB Skills (${skillCountStr})`, c);
-  const agentTabLabel = state.activeTab === "agent" ? style.bold(style.magenta(`[ \u25C6 Agents (${agentCountStr}) ]`, c), c) : style.dim(`\u25CB Agents (${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)}`;
   lines.push(
-    `${style.dim("\u251C\u2500", c)} ${skillTabLabel}   ${agentTabLabel}${searchSuffix}`,
+    isSinglePage ? `${style.dim("\u251C\u2500", c)} ${skillTabLabel}${searchSuffix}` : `${style.dim("\u251C\u2500", c)} ${skillTabLabel}   ${agentTabLabel}${searchSuffix}`,
     bar
   );
   if (total === 0) {
-    const tabName = state.activeTab === "skill" ? "Skills" : "Agents";
+    const tabName = state.activeTab === "skill" ? skillTabTitle : agentTabTitle;
     lines.push(
       `${bar}  ${style.dim(`No ${tabName} match "${state.searchQuery}". Press Esc to clear filter.`, c)}`
     );
@@ -5457,12 +5692,13 @@ function renderMultiSelectFrame(title, state, options = {}) {
   const selectedAgentsCount = state.options.filter(
     (o) => optionMatchesTab(o, "agent") && state.selected.has(o.value)
   ).length;
-  const summaryText = `${state.selected.size} selected (${selectedSkillsCount} Skills, ${selectedAgentsCount} Agents)`;
+  const currentOptLabel = visible[state.cursor]?.label ?? "";
+  const summaryText = options.tabLabels ? state.selected.size > 0 ? `${state.selected.size} selected` : options.selectCursorOnEmptySubmit && currentOptLabel ? `Target: ${currentOptLabel}` : "0 selected" : `${state.selected.size} selected (${selectedSkillsCount} ${skillTabTitle}, ${selectedAgentsCount} ${agentTabTitle})`;
   const rawTarget = options.targetHint ?? "";
   const shortTarget = rawTarget.length > 18 ? `${rawTarget.slice(0, 17)}\u2026` : rawTarget;
   const targetSuffix = shortTarget ? ` \xB7 IDE: ${shortTarget}` : "";
   lines.push(
-    `${style.dim("\u2570\u2500", c)} ${style.bold(summaryText, c)}${style.dim(`${targetSuffix} \u2014 Enter to import`, c)}`
+    `${style.dim("\u2570\u2500", c)} ${style.bold(summaryText, c)}${style.dim(`${targetSuffix} \u2014 Enter to ${submitVerb}`, c)}`
   );
   return lines.join("\n");
 }
@@ -5499,7 +5735,9 @@ async function runMultiSelectPrompt(title, options, renderOpts = {}) {
     };
     const onData = (chunk) => {
       const key = typeof chunk === "string" ? chunk : chunk.toString("utf-8");
-      state = applyMultiSelectKey(state, key);
+      state = applyMultiSelectKey(state, key, {
+        selectCursorOnEmptySubmit: renderOpts.selectCursorOnEmptySubmit
+      });
       if (state.status === "cancelled") {
         if (renderedLineCount > 0) {
           process.stdout.write(`\x1B[${renderedLineCount}A\x1B[J`);
@@ -6332,6 +6570,53 @@ function resolveCatalogDir(args, repoPath, loadedConfig) {
   }
   return path10.join(PACKAGE_ROOT, "catalog");
 }
+var POPULAR_AI_ORDER = [
+  "cursor",
+  "claude",
+  "copilot",
+  "antigravity",
+  "windsurf",
+  "codex",
+  "gemini",
+  "cline",
+  "roocode",
+  "kilocode",
+  "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);
+  const orderedTargets = [
+    ...POPULAR_AI_ORDER,
+    ...ALL_RUNTIME_TARGETS.filter((t) => !popularSet.has(t))
+  ];
+  return orderedTargets.map((targetId) => {
+    const spec = RUNTIME_HARNESS_SPECS[targetId];
+    return {
+      value: spec.id,
+      label: spec.id,
+      kind: "ide",
+      tab: "skill",
+      hint: `${spec.displayName} (${spec.skillsDir})`
+    };
+  });
+}
 function buildInteractiveCatalogOptions(catalogDir) {
   const options = [];
   const seen = /* @__PURE__ */ new Set();
@@ -7055,7 +7340,7 @@ function runCli(argv) {
 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) {
+  if (command === "add" && !args.includes("--help") && !args.includes("-h") && process.stdin.isTTY && process.stdout.isTTY) {
     const repoPath = getFlagValue(args, "--repo", "--project", "-p") ?? process.cwd();
     const cfgRes = loadSkillOpsConfig(repoPath);
     if (cfgRes.error) {
@@ -7066,29 +7351,57 @@ async function runCliInteractive(argv) {
       return ExitCode.BUDGET_OR_CONTRACT_ERROR;
     }
     const catalogDir = resolveCatalogDir(args, repoPath, cfgRes.config);
-    const targetsArg = resolveTargetsArg(args);
+    const explicitTargetsArg = resolveTargetsArg(args);
+    const positionals = getPositionalArgs(args);
+    const needsCatalogPrompt = !args.includes("--all") && positionals.length === 0;
+    let resolvedTargetsArg = explicitTargetsArg;
+    if (!resolvedTargetsArg) {
+      const targetOptions = buildInteractiveTargetOptions();
+      const step1Title = needsCatalogPrompt ? "SkillOps \u2014 Step 1/2: Select Your AI IDE / Agent" : "SkillOps \u2014 Select Your AI IDE / Agent";
+      const selectedTargets = await runMultiSelectPrompt(
+        step1Title,
+        targetOptions,
+        {
+          tabLabels: {
+            skill: "AI IDEs & Agents",
+            agent: ""
+          },
+          submitActionLabel: "continue",
+          selectCursorOnEmptySubmit: true
+        }
+      );
+      if (!selectedTargets || selectedTargets.length === 0) {
+        process.stdout.write("No AI IDE selected.\n");
+        return ExitCode.SUCCESS;
+      }
+      resolvedTargetsArg = selectedTargets.join(",");
+    }
     let targets;
     try {
-      targets = targetsArg ? resolveRuntimeTargets(targetsArg, repoPath) : cfgRes.config?.targets ?? [...CORE_RUNTIME_TARGETS];
+      targets = resolveRuntimeTargets(resolvedTargetsArg, 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 options = buildInteractiveCatalogOptions(catalogDir);
-    const selected = await runMultiSelectPrompt(
-      "SkillOps \u2014 Select Skills & Agents to Import",
-      options,
-      {
+    const extraArgs = [];
+    if (!explicitTargetsArg) {
+      extraArgs.push("-t", targets.join(","));
+    }
+    if (needsCatalogPrompt) {
+      const options = buildInteractiveCatalogOptions(catalogDir);
+      const step2Title = !explicitTargetsArg ? "SkillOps \u2014 Step 2/2: Select Skills & Agents to Import" : "SkillOps \u2014 Select Skills & Agents to Import";
+      const selected = await runMultiSelectPrompt(step2Title, options, {
         targetHint: targets.join(", ")
+      });
+      if (!selected || selected.length === 0) {
+        process.stdout.write("No Skills or Agents selected.\n");
+        return ExitCode.SUCCESS;
       }
-    );
-    if (!selected || selected.length === 0) {
-      process.stdout.write("No Skills or Agents selected.\n");
-      return ExitCode.SUCCESS;
+      extraArgs.push(...selected);
     }
-    return runCli([...argv, ...selected]);
+    return runCli([...argv, ...extraArgs]);
   }
   return runCli(argv);
 }
@@ -7114,6 +7427,7 @@ if (isDirectCliInvocation()) {
 }
 export {
   buildInteractiveCatalogOptions,
+  buildInteractiveTargetOptions,
   runCli,
   runCliInteractive
 };