@kurokeita/add-skill 2.6.1 → 3.0.1

package/dist/bin/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // bin/cli.ts
-import { intro as intro5, isCancel as isCancel6, outro as outro5, select as select6 } from "@clack/prompts";
+import { intro as intro5, isCancel as isCancel6, outro as outro5, select as select3 } from "@clack/prompts";
 import { Command } from "commander";
 import pc6 from "picocolors";
 
@@ -17,7 +17,6 @@ import {
   multiselect,
   note as note2,
   outro,
-  select as select2,
   spinner
 } from "@clack/prompts";
 import fs5 from "fs-extra";
@@ -37,9 +36,7 @@ import { fileURLToPath } from "node:url";
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = path.dirname(__filename);
 function hasBundledAssets(rootDir) {
-  return ["skills", "agents", "workflows"].some(
-    (dir) => fs.existsSync(path.join(rootDir, dir))
-  );
+  return fs.existsSync(path.join(rootDir, "skills"));
 }
 function resolveProjectRoot(moduleDir) {
   const sourceRoot = path.resolve(moduleDir, "../..");
@@ -65,20 +62,6 @@ var PLATFORM_PATHS_SKILLS = {
   gemini: path.join(os.homedir(), ".gemini/skills"),
   windsurf: path.join(os.homedir(), ".codeium/windsurf/skills")
 };
-var PLATFORM_PATHS_AGENTS = {
-  "claude-code": path.join(os.homedir(), ".claude/agents"),
-  codex: path.join(os.homedir(), ".codex/skills"),
-  copilot: path.join(os.homedir(), ".copilot/agents"),
-  gemini: path.join(os.homedir(), ".gemini/agents")
-};
-var PLATFORM_PATHS_WORKFLOWS = {
-  antigravity: path.join(os.homedir(), ".gemini/antigravity/global_workflows"),
-  "claude-code": path.join(os.homedir(), ".claude/commands"),
-  codex: path.join(os.homedir(), ".codex/skills"),
-  copilot: path.join(os.homedir(), ".copilot/prompts"),
-  gemini: path.join(os.homedir(), ".gemini/commands"),
-  windsurf: path.join(os.homedir(), ".codeium/windsurf/global_workflows")
-};
 var PROJECT_RELATIVE_PLATFORM_PATHS_SKILLS = {
   antigravity: ".gemini/antigravity/skills",
   "claude-code": ".claude/skills",
@@ -87,20 +70,6 @@ var PROJECT_RELATIVE_PLATFORM_PATHS_SKILLS = {
   gemini: ".gemini/skills",
   windsurf: ".codeium/windsurf/skills"
 };
-var PROJECT_RELATIVE_PLATFORM_PATHS_AGENTS = {
-  "claude-code": ".claude/agents",
-  codex: ".codex/skills",
-  copilot: ".copilot/agents",
-  gemini: ".gemini/agents"
-};
-var PROJECT_RELATIVE_PLATFORM_PATHS_WORKFLOWS = {
-  antigravity: ".gemini/antigravity/workflows",
-  "claude-code": ".claude/commands",
-  codex: ".codex/skills",
-  copilot: ".copilot/prompts",
-  gemini: ".gemini/commands",
-  windsurf: ".codeium/windsurf/workflows"
-};
 function resolveProjectPaths(relative, root) {
   const out = {};
   for (const [platform, rel] of Object.entries(relative)) {
@@ -111,21 +80,8 @@ function resolveProjectPaths(relative, root) {
 function getProjectPlatformPathsSkills(root) {
   return resolveProjectPaths(PROJECT_RELATIVE_PLATFORM_PATHS_SKILLS, root);
 }
-function getProjectPlatformPathsAgents(root) {
-  return resolveProjectPaths(PROJECT_RELATIVE_PLATFORM_PATHS_AGENTS, root);
-}
-function getProjectPlatformPathsWorkflows(root) {
-  return resolveProjectPaths(PROJECT_RELATIVE_PLATFORM_PATHS_WORKFLOWS, root);
-}
 var TYPE_DIRS = {
-  skill: path.join(PROJECT_ROOT, "skills"),
-  agent: path.join(PROJECT_ROOT, "agents"),
-  workflow: path.join(PROJECT_ROOT, "workflows")
-};
-var TYPE_SUBDIRS = {
-  skill: "skills",
-  agent: "agents",
-  workflow: "commands"
+  skill: path.join(PROJECT_ROOT, "skills")
 };
 var AGENT_SETUP_SCRIPTS_DIR = path.join(
   PROJECT_ROOT,
@@ -143,25 +99,16 @@ function getAgentsBase(scope, root) {
 }
 
 // src/utils/agent-setup.ts
-var LINK_SUBDIRS = ["skills", "agents", "commands"];
+var LINK_SUBDIRS = ["skills"];
 function getScopePaths(scope, root) {
   if (scope === "project") {
-    return {
-      skills: getProjectPlatformPathsSkills(root),
-      agents: getProjectPlatformPathsAgents(root),
-      commands: getProjectPlatformPathsWorkflows(root)
-    };
+    return { skills: getProjectPlatformPathsSkills(root) };
   }
-  return {
-    skills: PLATFORM_PATHS_SKILLS,
-    agents: PLATFORM_PATHS_AGENTS,
-    commands: PLATFORM_PATHS_WORKFLOWS
-  };
+  return { skills: PLATFORM_PATHS_SKILLS };
 }
 function buildLinkMap(scope, root, presentSubdirs, platforms) {
   const scopePaths = getScopePaths(scope, root);
   const lines = [];
-  const seen = /* @__PURE__ */ new Set();
   for (const sub of LINK_SUBDIRS) {
     if (!presentSubdirs.includes(sub)) continue;
     const platformDirs = scopePaths[sub];
@@ -169,10 +116,7 @@ function buildLinkMap(scope, root, presentSubdirs, platforms) {
       if (!dest) continue;
       if (platforms && !platforms.includes(platform)) continue;
       const formattedDest = scope === "project" ? path2.relative(root, dest).replace(/\\/g, "/") : dest;
-      const line = `${sub}|${formattedDest}`;
-      if (seen.has(line)) continue;
-      seen.add(line);
-      lines.push(line);
+      lines.push(`${sub}|${formattedDest}`);
     }
   }
   return lines.join("\n");
@@ -894,196 +838,156 @@ async function add(type, url, options) {
   if (!options?.skipIntro) {
     intro(pc2.bgCyan(pc2.black(" AI Manager : Add ")));
   }
-  let currentType = type;
-  const isSingleShot = !!type || !!url;
-  while (true) {
-    if (!currentType && !url) {
-      const selectedType = await select2({
-        message: "What would you like to add?",
-        options: [
-          { label: "Skills", value: "skill" },
-          { label: "Agents", value: "agent" },
-          { label: "Workflows", value: "workflow" },
-          { label: "Exit", value: "exit" }
-        ]
-      });
-      if (isCancel2(selectedType) || selectedType === "exit") {
-        break;
+  await installSkills(type, url, options);
+  if (!options?.skipIntro) {
+    outro("You're all set!");
+  }
+}
+async function installSkills(type, url, options) {
+  const normalizedType = type ? type.toLowerCase().endsWith("s") && type.length > 1 ? type.slice(0, -1) : type : "skill";
+  if (!TYPE_DIRS[normalizedType]) {
+    cancel(`Unknown type: ${type}. Supported: skill`);
+    process.exit(1);
+    return;
+  }
+  let tempDir = null;
+  let isGitHubFile = false;
+  let selectedItems = [];
+  try {
+    if (url) {
+      const s2 = spinner();
+      s2.start("Fetching skill from GitHub...");
+      try {
+        const result = await fetchSkillFromGitHub(url);
+        tempDir = result.tempDir;
+        isGitHubFile = result.isFile;
+        selectedItems = [result.skillName];
+        s2.stop(pc2.green(`Fetched skill: ${result.skillName}`));
+      } catch (e) {
+        s2.error("Failed to fetch");
+        throw e;
       }
-      currentType = selectedType;
+    } else {
+      const sourceDir = TYPE_DIRS.skill;
+      if (!await fs5.pathExists(sourceDir)) {
+        cancel("skill directory not found!");
+        process.exit(1);
+        return;
+      }
+      const entries = await fs5.readdir(sourceDir, { withFileTypes: true });
+      const availableItems = entries.filter((entry) => entry.isDirectory()).map((entry) => ({ label: entry.name, value: entry.name })).sort((a, b) => a.label.localeCompare(b.label));
+      if (availableItems.length === 0) {
+        note2("No skills found in directory.", "Information");
+        return;
+      }
+      const items = await autocompleteMultiselect({
+        message: "Select skills to install:",
+        options: availableItems
+      });
+      if (isCancel2(items)) return;
+      selectedItems = items;
     }
-    const normalizedType = currentType?.toLowerCase().endsWith("s") && currentType.length > 1 ? currentType.slice(0, -1) : currentType ?? "";
-    if (!TYPE_DIRS[normalizedType] && !url) {
-      cancel(`Unknown type: ${currentType}. Supported: skill, agent, workflow`);
+    const scopeChoice = await chooseInstallScope({ flag: options?.scope });
+    if ("rejected" in scopeChoice) {
+      if (tempDir) await fs5.remove(tempDir);
+      cancel(
+        `Scope --scope=${options?.scope} unavailable: ${scopeChoice.reason}`
+      );
       process.exit(1);
       return;
     }
-    let tempDir = null;
-    let isGitHubFile = false;
-    let selectedItems = [];
-    try {
-      if (url) {
-        const s2 = spinner();
-        s2.start(`Fetching ${normalizedType} from GitHub...`);
-        try {
-          const result = await fetchSkillFromGitHub(url);
-          tempDir = result.tempDir;
-          isGitHubFile = result.isFile;
-          selectedItems = [result.skillName];
-          s2.stop(pc2.green(`Fetched ${normalizedType}: ${result.skillName}`));
-        } catch (e) {
-          s2.error("Failed to fetch");
-          throw e;
-        }
-      } else {
-        const sourceDir = TYPE_DIRS[normalizedType];
-        if (!await fs5.pathExists(sourceDir)) {
-          cancel(`${normalizedType} directory not found!`);
-          process.exit(1);
-          return;
-        }
-        const entries = await fs5.readdir(sourceDir, { withFileTypes: true });
-        const availableItems = entries.filter(
-          (entry) => entry.isDirectory() || (normalizedType === "workflow" || normalizedType === "agent") && entry.isFile() && entry.name.endsWith(".md")
-        ).map((entry) => ({ label: entry.name, value: entry.name })).sort((a, b) => a.label.localeCompare(b.label));
-        if (availableItems.length === 0) {
-          note2(`No ${normalizedType}s found in directory.`, "Information");
-          if (isSingleShot) break;
-          currentType = void 0;
-          continue;
-        }
-        const items = await autocompleteMultiselect({
-          message: `Select ${normalizedType}s to install:`,
-          options: availableItems
-        });
-        if (isCancel2(items)) {
-          if (isSingleShot) break;
-          currentType = void 0;
-          continue;
-        }
-        selectedItems = items;
-      }
-      const scopeChoice = await chooseInstallScope({ flag: options?.scope });
-      if ("rejected" in scopeChoice) {
+    if (scopeChoice.cancelled) {
+      if (tempDir) await fs5.remove(tempDir);
+      return;
+    }
+    const { scope: chosenScope, root: scopeRoot } = scopeChoice;
+    const agentsBase = getAgentsBase(chosenScope, scopeRoot);
+    const targetBase = path5.join(agentsBase, "skills");
+    if (chosenScope === "project") {
+      const proceed = await confirm({
+        message: `Install to project scope at ${pc2.cyan(scopeRoot)}?`,
+        initialValue: true
+      });
+      if (isCancel2(proceed) || !proceed) {
         if (tempDir) await fs5.remove(tempDir);
-        cancel(
-          `Scope --scope=${options?.scope} unavailable: ${scopeChoice.reason}`
-        );
-        process.exit(1);
         return;
       }
-      if (scopeChoice.cancelled) {
-        if (tempDir) await fs5.remove(tempDir);
-        if (isSingleShot) break;
-        currentType = void 0;
-        continue;
+    }
+    const preExisting = [];
+    for (const item of selectedItems) {
+      const targetName = path5.parse(item).name;
+      if (await fs5.pathExists(path5.join(targetBase, targetName))) {
+        preExisting.push({ entry: targetName, subdir: "skills" });
       }
-      const { scope: chosenScope, root: scopeRoot } = scopeChoice;
-      const agentsBase = getAgentsBase(chosenScope, scopeRoot);
-      const subdir = TYPE_SUBDIRS[normalizedType] ?? "skills";
-      const targetBase = path5.join(agentsBase, subdir);
-      if (chosenScope === "project") {
-        const proceed = await confirm({
-          message: `Install to project scope at ${pc2.cyan(scopeRoot)}?`,
-          initialValue: true
-        });
-        if (isCancel2(proceed) || !proceed) {
-          if (tempDir) await fs5.remove(tempDir);
-          if (isSingleShot) break;
-          currentType = void 0;
-          continue;
-        }
+    }
+    const skipEntries = /* @__PURE__ */ new Set();
+    if (preExisting.length > 0) {
+      const toOverwrite = await multiselect({
+        message: "These entries already exist in .agents. Choose which to OVERWRITE (unselected entries are kept and skipped):",
+        options: preExisting.map((p) => ({ label: p.entry, value: p.entry })),
+        required: false
+      });
+      if (isCancel2(toOverwrite)) {
+        if (tempDir) await fs5.remove(tempDir);
+        return;
       }
-      const subdirName = subdir;
-      const preExisting = [];
-      for (const item of selectedItems) {
-        const targetName = normalizedType === "skill" ? path5.parse(item).name : item;
-        if (await fs5.pathExists(path5.join(targetBase, targetName))) {
-          preExisting.push({ entry: targetName, subdir: subdirName });
-        }
+      const keep = new Set(toOverwrite);
+      for (const { entry } of preExisting) {
+        if (!keep.has(entry)) skipEntries.add(entry);
       }
-      const skipEntries = /* @__PURE__ */ new Set();
-      if (preExisting.length > 0) {
-        const toOverwrite = await multiselect({
-          message: "These entries already exist in .agents. Choose which to OVERWRITE (unselected entries are kept and skipped):",
-          options: preExisting.map((p) => ({ label: p.entry, value: p.entry })),
-          required: false
-        });
-        if (isCancel2(toOverwrite)) {
-          if (tempDir) await fs5.remove(tempDir);
-          if (isSingleShot) break;
-          currentType = void 0;
-          continue;
-        }
-        const keep = new Set(toOverwrite);
-        for (const { entry } of preExisting) {
-          if (!keep.has(entry)) skipEntries.add(entry);
+    }
+    note2(
+      `Installing ${selectedItems.length} skills to ${targetBase} (scope: ${chosenScope})...`,
+      "Summary"
+    );
+    const s = spinner();
+    s.start("Installing...");
+    const errors = [];
+    const installed = [];
+    await fs5.ensureDir(targetBase);
+    for (const item of selectedItems) {
+      const targetName = path5.parse(item).name;
+      if (skipEntries.has(targetName)) continue;
+      s.message(`Installing ${pc2.bold(item)}...`);
+      try {
+        const sourcePath = url && tempDir ? isGitHubFile ? path5.join(tempDir, item) : tempDir : path5.join(TYPE_DIRS.skill, item);
+        if (!await fs5.pathExists(sourcePath)) {
+          throw new Error(`Item '${item}' not found at ${sourcePath}`);
         }
+        const targetPath = path5.join(targetBase, targetName);
+        await fs5.copy(sourcePath, targetPath, { overwrite: true });
+        installed.push(targetPath);
+      } catch (err) {
+        const errorMessage = err instanceof Error ? err.message : String(err);
+        errors.push(`${item}: ${errorMessage}`);
       }
-      note2(
-        `Installing ${selectedItems.length} ${normalizedType}s to ${targetBase} (scope: ${chosenScope})...`,
-        "Summary"
+    }
+    if (tempDir) {
+      await fs5.remove(tempDir);
+      tempDir = null;
+    }
+    if (errors.length > 0) {
+      s.stop(
+        pc2.yellow(
+          `Completed with errors. Installed: ${installed.length}, Errors: ${errors.length}`
+        )
       );
-      const s = spinner();
-      s.start("Installing...");
-      const errors = [];
-      const installed = [];
-      await fs5.ensureDir(targetBase);
-      for (const item of selectedItems) {
-        const targetName = normalizedType === "skill" ? path5.parse(item).name : item;
-        if (skipEntries.has(targetName)) continue;
-        s.message(`Installing ${pc2.bold(item)}...`);
-        try {
-          const sourcePath = url && tempDir ? isGitHubFile ? path5.join(tempDir, item) : tempDir : path5.join(TYPE_DIRS[normalizedType], item);
-          if (!await fs5.pathExists(sourcePath)) {
-            throw new Error(`Item '${item}' not found at ${sourcePath}`);
-          }
-          const targetPath = path5.join(targetBase, targetName);
-          await fs5.copy(sourcePath, targetPath, { overwrite: true });
-          installed.push(targetPath);
-        } catch (err) {
-          const errorMessage = err instanceof Error ? err.message : String(err);
-          errors.push(`${item}: ${errorMessage}`);
-        }
-      }
-      if (tempDir) {
-        await fs5.remove(tempDir);
-        tempDir = null;
-      }
-      if (errors.length > 0) {
-        s.stop(
-          pc2.yellow(
-            `Completed with errors. Installed: ${installed.length}, Errors: ${errors.length}`
-          )
-        );
-        console.error(pc2.red("\nErrors encountered:"));
-        for (const e of errors) {
-          console.error(pc2.red(`- ${e}`));
-        }
-      } else {
-        s.stop(
-          pc2.green(
-            `Successfully installed ${installed.length} ${normalizedType}s.`
-          )
-        );
-      }
-      if (installed.length > 0) {
-        await maybeWireAgentSetup(agentsBase, chosenScope, scopeRoot);
-        if (normalizedType === "skill") {
-          await maybeInstallSkillHooks(installed, chosenScope, scopeRoot, !!url);
-        }
+      console.error(pc2.red("\nErrors encountered:"));
+      for (const e of errors) {
+        console.error(pc2.red(`- ${e}`));
       }
-    } catch (error) {
-      if (tempDir) await fs5.remove(tempDir);
-      cancel(`An error occurred: ${error}`);
-      process.exit(1);
-      return;
+    } else {
+      s.stop(pc2.green(`Successfully installed ${installed.length} skills.`));
     }
-    if (isSingleShot) break;
-    currentType = void 0;
-  }
-  if (!options?.skipIntro) {
-    outro("You're all set!");
+    if (installed.length > 0) {
+      await maybeWireAgentSetup(agentsBase, chosenScope, scopeRoot);
+      await maybeInstallSkillHooks(installed, chosenScope, scopeRoot, !!url);
+    }
+  } catch (error) {
+    if (tempDir) await fs5.remove(tempDir);
+    cancel(`An error occurred: ${error}`);
+    process.exit(1);
+    return;
   }
 }
 async function maybeWireAgentSetup(agentsBase, scope, root) {
@@ -1175,7 +1079,6 @@ import {
   intro as intro2,
   isCancel as isCancel3,
   outro as outro2,
-  select as select3,
   spinner as spinner2,
   text
 } from "@clack/prompts";
@@ -1185,23 +1088,11 @@ async function importItem(type, url, options) {
   if (!options?.skipIntro) {
     intro2(pc3.bgCyan(pc3.black(" AI Manager : Import ")));
   }
-  let currentType = type;
-  if (!currentType) {
-    const selectedType = await select3({
-      message: "What would you like to import?",
-      options: [
-        { label: "Skill", value: "skill" },
-        { label: "Agent", value: "agent" },
-        { label: "Workflow", value: "workflow" }
-      ]
-    });
-    if (isCancel3(selectedType)) return;
-    currentType = selectedType;
-  }
+  const currentType = type || "skill";
   const normalizedType = currentType.toLowerCase().endsWith("s") ? currentType.slice(0, -1) : currentType;
   const targetBaseDir = TYPE_DIRS[normalizedType];
   if (!targetBaseDir) {
-    cancel2(`Unknown type: ${currentType}. Supported: skill, agent, workflow`);
+    cancel2(`Unknown type: ${currentType}. Supported: skill`);
     process.exit(1);
     return;
   }
@@ -1236,31 +1127,8 @@ async function importItem(type, url, options) {
       s.error("Failed to fetch");
       throw e;
     }
-    const shouldFlatten = (normalizedType === "agent" || normalizedType === "workflow") && !isFile;
-    const targetPath = shouldFlatten ? targetBaseDir : path6.join(targetBaseDir, itemName);
-    if (shouldFlatten) {
-      const srcFiles = await fs6.readdir(tempDir);
-      const conflicts = [];
-      for (const file of srcFiles) {
-        if (await fs6.pathExists(path6.join(targetBaseDir, file))) {
-          conflicts.push(file);
-        }
-      }
-      if (conflicts.length > 0) {
-        const limit = 5;
-        const displayList = conflicts.slice(0, limit).join(", ");
-        const remainder = conflicts.length - limit;
-        const message = remainder > 0 ? `Files ${displayList} (and ${remainder} others) already exist in ${targetBaseDir}. Overwrite?` : `Files ${displayList} already exist in ${targetBaseDir}. Overwrite?`;
-        const shouldOverwrite = await confirm2({
-          message,
-          initialValue: false
-        });
-        if (isCancel3(shouldOverwrite) || !shouldOverwrite) {
-          await fs6.remove(tempDir);
-          return;
-        }
-      }
-    } else if (await fs6.pathExists(targetPath)) {
+    const targetPath = path6.join(targetBaseDir, itemName);
+    if (await fs6.pathExists(targetPath)) {
       const shouldOverwrite = await confirm2({
         message: `${normalizedType} '${itemName}' already exists in the repo. Overwrite?`,
         initialValue: false
@@ -1277,11 +1145,7 @@ async function importItem(type, url, options) {
         overwrite: true
       });
     } else {
-      if (shouldFlatten) {
-        await fs6.copy(tempDir, targetBaseDir, { overwrite: true });
-      } else {
-        await fs6.copy(tempDir, targetPath, { overwrite: true });
-      }
+      await fs6.copy(tempDir, targetPath, { overwrite: true });
     }
     s.stop(pc3.green(`Successfully imported ${itemName}!`));
     await fs6.remove(tempDir);
@@ -1299,7 +1163,7 @@ async function importItem(type, url, options) {
 // src/commands/list.ts
 import os6 from "node:os";
 import path7 from "node:path";
-import { cancel as cancel3, intro as intro3, isCancel as isCancel4, outro as outro3, select as select4 } from "@clack/prompts";
+import { cancel as cancel3, intro as intro3, isCancel as isCancel4, outro as outro3, select as select2 } from "@clack/prompts";
 import fs7 from "fs-extra";
 import pc4 from "picocolors";
 async function collectEntries(subdirPath) {
@@ -1312,12 +1176,11 @@ function displayBase(base, scope) {
   if (scope === "global") return base.replace(os6.homedir(), "~");
   return base;
 }
-async function listLocalForScopes(normalizedType, sections) {
-  const subdir = TYPE_SUBDIRS[normalizedType];
-  console.log(pc4.bold(pc4.blue(`Installed ${normalizedType}s (Local):`)));
+async function listLocalForScopes(sections) {
+  console.log(pc4.bold(pc4.blue("Installed skills (Local):")));
   let foundAny = false;
   for (const section of sections) {
-    const subdirPath = path7.join(section.base, subdir);
+    const subdirPath = path7.join(section.base, "skills");
     if (!await fs7.pathExists(subdirPath)) continue;
     const items = await collectEntries(subdirPath);
     if (items.length === 0) continue;
@@ -1336,7 +1199,7 @@ async function listLocalForScopes(normalizedType, sections) {
     }
   }
   if (!foundAny) {
-    console.log(pc4.dim(`  No installed ${normalizedType}s found.`));
+    console.log(pc4.dim("  No installed skills found."));
   }
   console.log("");
 }
@@ -1353,14 +1216,7 @@ function buildSections(scope, projectRoot) {
   }
   return sections;
 }
-async function performListing(type) {
-  const normalizedType = type.toLowerCase().endsWith("s") ? type.slice(0, -1) : type.toLowerCase();
-  if (!TYPE_DIRS[normalizedType]) {
-    console.error(
-      pc4.red(`Unknown type: ${type}. Supported types: skill, agent, workflow`)
-    );
-    return;
-  }
+async function performListing(normalizedType) {
   const dirPath = TYPE_DIRS[normalizedType];
   if (!await fs7.pathExists(dirPath)) {
     console.log(
@@ -1369,9 +1225,7 @@ async function performListing(type) {
     return;
   }
   const entries = await fs7.readdir(dirPath, { withFileTypes: true });
-  const items = entries.filter(
-    (entry) => entry.isDirectory() || normalizedType !== "skill" && entry.isFile() && entry.name.endsWith(".md")
-  ).map((entry) => entry.name).sort();
+  const items = entries.filter((entry) => entry.isDirectory()).map((entry) => entry.name).sort();
   if (items.length > 0) {
     console.log(pc4.bold(pc4.blue(`Available ${normalizedType}s:`)));
     for (const item of items) {
@@ -1393,12 +1247,10 @@ async function list(type, options) {
   try {
     while (true) {
       if (!currentType) {
-        const selected = await select4({
+        const selected = await select2({
           message: `What would you like to list? (View: ${isLocal ? "Local" : "Repository"})`,
           options: [
             { label: "All Skills", value: "skill" },
-            { label: "All Agents", value: "agent" },
-            { label: "All Workflows", value: "workflow" },
             {
               label: `Switch to ${isLocal ? "Repository" : "Local"} View`,
               value: "toggle"
@@ -1415,7 +1267,13 @@ async function list(type, options) {
         }
         currentType = selected;
       }
-      const typesToList = currentType === "all" ? ["skill", "agent", "workflow"] : [currentType];
+      const normalizedType = currentType.toLowerCase().endsWith("s") ? currentType.slice(0, -1) : currentType.toLowerCase();
+      if (!TYPE_DIRS[normalizedType]) {
+        console.error(
+          pc4.red(`Unknown type: ${currentType}. Supported types: skill`)
+        );
+        break;
+      }
       if (isLocal) {
         const scopeChoice = await chooseListRemoveScope({
           action: "list",
@@ -1433,18 +1291,11 @@ async function list(type, options) {
           currentType = void 0;
           continue;
         }
-        for (const t of typesToList) {
-          const normalizedType = t.toLowerCase().endsWith("s") ? t.slice(0, -1) : t.toLowerCase();
-          const sections = buildSections(
-            scopeChoice.scope,
-            scopeChoice.projectRoot
-          );
-          await listLocalForScopes(normalizedType, sections);
-        }
+        await listLocalForScopes(
+          buildSections(scopeChoice.scope, scopeChoice.projectRoot)
+        );
       } else {
-        for (const t of typesToList) {
-          await performListing(t);
-        }
+        await performListing(normalizedType);
       }
       if (isSingleShot) break;
       currentType = void 0;
@@ -1467,7 +1318,6 @@ import {
   isCancel as isCancel5,
   note as note3,
   outro as outro4,
-  select as select5,
   spinner as spinner3
 } from "@clack/prompts";
 import fs8 from "fs-extra";
@@ -1491,17 +1341,16 @@ function buildScopedBases(scope, homedir, projectRoot) {
   }
   return out;
 }
-async function scanInstalledItems(scopedBases, subdir, normalizedType) {
+async function scanInstalledItems(scopedBases) {
   const seen = /* @__PURE__ */ new Set();
   const items = [];
   const showScopePrefix = scopedBases.length > 1;
   for (const { scope, base } of scopedBases) {
-    const subdirPath = path8.join(base, subdir);
+    const subdirPath = path8.join(base, "skills");
     if (!await fs8.pathExists(subdirPath)) continue;
     const entries = await fs8.readdir(subdirPath, { withFileTypes: true });
     for (const entry of entries) {
-      const qualifies = entry.isDirectory() || normalizedType !== "skill" && entry.isFile() && entry.name.endsWith(".md");
-      if (!qualifies) continue;
+      if (!entry.isDirectory()) continue;
       const key = showScopePrefix ? `${scope}:${entry.name}` : entry.name;
       if (seen.has(key)) continue;
       seen.add(key);
@@ -1515,25 +1364,8 @@ async function scanInstalledItems(scopedBases, subdir, normalizedType) {
   }
   return items.sort((a, b) => a.label.localeCompare(b.label));
 }
-function getPlatformDirs(scope, root, normalizedType) {
-  if (scope === "project") {
-    switch (normalizedType) {
-      case "agent":
-        return getProjectPlatformPathsAgents(root);
-      case "workflow":
-        return getProjectPlatformPathsWorkflows(root);
-      default:
-        return getProjectPlatformPathsSkills(root);
-    }
-  }
-  switch (normalizedType) {
-    case "agent":
-      return PLATFORM_PATHS_AGENTS;
-    case "workflow":
-      return PLATFORM_PATHS_WORKFLOWS;
-    default:
-      return PLATFORM_PATHS_SKILLS;
-  }
+function getPlatformDirs(scope, root) {
+  return scope === "project" ? getProjectPlatformPathsSkills(root) : PLATFORM_PATHS_SKILLS;
 }
 async function pruneDanglingLinks(platformDirs, entry, removedAgentsPath) {
   for (const dir of Object.values(platformDirs)) {
@@ -1554,147 +1386,109 @@ async function remove(type, options) {
   if (!options?.skipIntro) {
     intro4(pc5.bgCyan(pc5.black(" AI Manager : Remove ")));
   }
-  let currentType = type;
-  const isSingleShot = !!type;
-  while (true) {
-    if (!currentType) {
-      const selectedType = await select5({
-        message: "What would you like to remove?",
-        options: [
-          { label: "Skills", value: "skill" },
-          { label: "Agents", value: "agent" },
-          { label: "Workflows", value: "workflow" },
-          { label: "Exit", value: "exit" }
-        ]
-      });
-      if (isCancel5(selectedType) || selectedType === "exit") {
-        break;
-      }
-      currentType = selectedType;
-    }
-    const normalizedType = currentType.toLowerCase().endsWith("s") ? currentType.slice(0, -1) : currentType;
-    const subdir = TYPE_SUBDIRS[normalizedType] ?? "skills";
-    const scopeChoice = await chooseListRemoveScope({
-      action: "remove",
-      flag: options?.scope
-    });
-    if ("rejected" in scopeChoice) {
-      cancel4(
-        `Scope --scope=${options?.scope} unavailable: ${scopeChoice.reason}`
-      );
-      process.exit(1);
-      return;
-    }
-    if (scopeChoice.cancelled) {
-      if (isSingleShot) break;
-      currentType = void 0;
-      continue;
-    }
-    const scopedBases = buildScopedBases(
-      scopeChoice.scope,
-      scopeChoice.homedir,
-      scopeChoice.projectRoot
-    );
-    const s = spinner3();
-    s.start("Scanning for installed items...");
-    const scannedItems = await scanInstalledItems(
-      scopedBases,
-      subdir,
-      normalizedType
-    );
-    s.stop(`Found ${scannedItems.length} installed ${normalizedType}s.`);
-    if (scannedItems.length === 0) {
-      note3(`No installed ${normalizedType}s found.`, "Information");
-      if (isSingleShot) break;
-      currentType = void 0;
-      continue;
-    }
-    const itemSelections = await autocompleteMultiselect2({
-      message: `Select ${normalizedType}s to remove:`,
-      options: scannedItems.map((item) => ({
-        value: item.key,
-        label: item.label
-      }))
-    });
-    if (isCancel5(itemSelections)) {
-      if (isSingleShot) break;
-      currentType = void 0;
-      continue;
-    }
-    const itemsByKey = new Map(scannedItems.map((i) => [i.key, i]));
-    const selectedScannedItems = itemSelections.map((key) => itemsByKey.get(key)).filter((i) => !!i);
-    const confirmDelete = await confirm3({
-      message: `Are you sure you want to remove ${selectedScannedItems.length} item(s) from .agents?`,
-      initialValue: false
-    });
-    if (isCancel5(confirmDelete) || !confirmDelete) {
-      if (isSingleShot) break;
-      currentType = void 0;
-      continue;
-    }
-    const sDel = spinner3();
-    sDel.start("Removing items...");
-    let removedCount = 0;
-    let notFoundCount = 0;
-    const errors = [];
-    const basesByScope = /* @__PURE__ */ new Map();
-    for (const sb of scopedBases) {
-      basesByScope.set(sb.scope, sb);
-    }
-    for (const item of selectedScannedItems) {
-      const scoped = basesByScope.get(item.scope);
-      if (!scoped) continue;
-      const agentsPath = path8.join(scoped.base, subdir, item.name);
-      if (await fs8.pathExists(agentsPath)) {
-        sDel.message(`Removing ${pc5.bold(item.label)} from .agents...`);
-        try {
-          await fs8.remove(agentsPath);
-          removedCount++;
-          const platformDirs = getPlatformDirs(
-            item.scope,
-            scoped.root,
-            normalizedType
-          );
-          await pruneDanglingLinks(platformDirs, item.name, agentsPath);
-        } catch (err) {
-          const msg = err instanceof Error ? err.message : String(err);
-          errors.push(`${item.label}: ${msg}`);
-        }
-      } else {
-        notFoundCount++;
-      }
-    }
-    if (errors.length > 0) {
-      sDel.stop(
-        pc5.yellow(
-          `Completed with errors. Removed: ${removedCount}, Not Found: ${notFoundCount}, Errors: ${errors.length}`
-        )
-      );
-      console.error(pc5.red("\nErrors encountered:"));
-      for (const e of errors) {
-        console.error(pc5.red(`- ${e}`));
+  await removeSkills(type, options);
+  if (!options?.skipIntro) {
+    outro4("Done!");
+  }
+}
+async function removeSkills(type, options) {
+  const normalizedType = type?.toLowerCase().endsWith("s") ? type.slice(0, -1) : type;
+  if (normalizedType && !TYPE_DIRS[normalizedType]) {
+    cancel4(`Unknown type: ${type}. Supported: skill`);
+    process.exit(1);
+    return;
+  }
+  const scopeChoice = await chooseListRemoveScope({
+    action: "remove",
+    flag: options?.scope
+  });
+  if ("rejected" in scopeChoice) {
+    cancel4(`Scope --scope=${options?.scope} unavailable: ${scopeChoice.reason}`);
+    process.exit(1);
+    return;
+  }
+  if (scopeChoice.cancelled) return;
+  const scopedBases = buildScopedBases(
+    scopeChoice.scope,
+    scopeChoice.homedir,
+    scopeChoice.projectRoot
+  );
+  const s = spinner3();
+  s.start("Scanning for installed items...");
+  const scannedItems = await scanInstalledItems(scopedBases);
+  s.stop(`Found ${scannedItems.length} installed skills.`);
+  if (scannedItems.length === 0) {
+    note3("No installed skills found.", "Information");
+    return;
+  }
+  const itemSelections = await autocompleteMultiselect2({
+    message: "Select skills to remove:",
+    options: scannedItems.map((item) => ({
+      value: item.key,
+      label: item.label
+    }))
+  });
+  if (isCancel5(itemSelections)) return;
+  const itemsByKey = new Map(scannedItems.map((i) => [i.key, i]));
+  const selectedScannedItems = itemSelections.map((key) => itemsByKey.get(key)).filter((i) => !!i);
+  const confirmDelete = await confirm3({
+    message: `Are you sure you want to remove ${selectedScannedItems.length} item(s) from .agents?`,
+    initialValue: false
+  });
+  if (isCancel5(confirmDelete) || !confirmDelete) return;
+  const sDel = spinner3();
+  sDel.start("Removing items...");
+  let removedCount = 0;
+  let notFoundCount = 0;
+  const errors = [];
+  const basesByScope = /* @__PURE__ */ new Map();
+  for (const sb of scopedBases) {
+    basesByScope.set(sb.scope, sb);
+  }
+  for (const item of selectedScannedItems) {
+    const scoped = basesByScope.get(item.scope);
+    if (!scoped) continue;
+    const agentsPath = path8.join(scoped.base, "skills", item.name);
+    if (await fs8.pathExists(agentsPath)) {
+      sDel.message(`Removing ${pc5.bold(item.label)} from .agents...`);
+      try {
+        await fs8.remove(agentsPath);
+        removedCount++;
+        const platformDirs = getPlatformDirs(item.scope, scoped.root);
+        await pruneDanglingLinks(platformDirs, item.name, agentsPath);
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        errors.push(`${item.label}: ${msg}`);
       }
     } else {
-      sDel.stop(
-        pc5.green(
-          `Successfully removed ${removedCount} items. (${notFoundCount} not found)`
-        )
-      );
+      notFoundCount++;
     }
-    if (isSingleShot) break;
-    currentType = void 0;
   }
-  if (!options?.skipIntro) {
-    outro4("Done!");
+  if (errors.length > 0) {
+    sDel.stop(
+      pc5.yellow(
+        `Completed with errors. Removed: ${removedCount}, Not Found: ${notFoundCount}, Errors: ${errors.length}`
+      )
+    );
+    console.error(pc5.red("\nErrors encountered:"));
+    for (const e of errors) {
+      console.error(pc5.red(`- ${e}`));
+    }
+  } else {
+    sDel.stop(
+      pc5.green(
+        `Successfully removed ${removedCount} items. (${notFoundCount} not found)`
+      )
+    );
   }
 }
 
 // package.json
-var version = "2.6.1";
+var version = "3.0.1";
 
 // bin/cli.ts
 var program = new Command();
-program.name("ai-agent").description("CLI to manage AI agents, skills, and workflows").version(version);
+program.name("ai-agent").description("CLI to manage AI agent skills").version(version);
 function parseScopeFlag(value) {
   if (value === void 0) return void 0;
   if (isValidScopeFlag(value)) return value;
@@ -1716,13 +1510,13 @@ function parseListRemoveScopeFlag(value) {
 async function interactiveMain() {
   intro5(pc6.bgCyan(pc6.black(" AI Manager ")));
   while (true) {
-    const action = await select6({
+    const action = await select3({
       message: "What would you like to do?",
       options: [
-        { label: "Add Item (Install)", value: "add" },
-        { label: "List Items", value: "list" },
+        { label: "Add Skills (Install)", value: "add" },
+        { label: "List Skills", value: "list" },
         { label: "Import from GitHub", value: "import" },
-        { label: "Remove Items", value: "remove" },
+        { label: "Remove Skills", value: "remove" },
         { label: "Exit", value: "exit" }
       ]
     });
@@ -1746,23 +1540,21 @@ async function interactiveMain() {
   }
   outro5("Goodbye!");
 }
-program.command("list [type]").description("List available items (skills, agents, workflows)").option("-l, --local", "List installed items locally").option(
+program.command("list [type]").description("List available skills").option("-l, --local", "List installed items locally").option(
   "-s, --scope <scope>",
   'Scope when listing local installs: "global", "project", or "both"'
 ).action(async (type, opts) => {
   const scope = parseListRemoveScopeFlag(opts?.scope);
   await list(type, { local: opts?.local, scope });
 });
-program.command("add [type] [url]").description(
-  "Add an item (skill, agent, workflow) to platforms (Interactive or from GitHub URL)"
-).option("-s, --scope <scope>", 'Install scope: "global" or "project"').action(async (type, url, opts) => {
+program.command("add [type] [url]").description("Add a skill to platforms (Interactive or from GitHub URL)").option("-s, --scope <scope>", 'Install scope: "global" or "project"').action(async (type, url, opts) => {
   const scope = parseScopeFlag(opts?.scope);
   await add(type, url, { scope });
 });
-program.command("import [type] [url]").description("Import an item from GitHub to the repo").action(async (type, url) => {
+program.command("import [type] [url]").description("Import a skill from GitHub to the repo").action(async (type, url) => {
   await importItem(type || "", url || "");
 });
-program.command("remove [type]").description("Remove locally installed items (skills, agents, workflows)").option(
+program.command("remove [type]").description("Remove locally installed skills").option(
   "-s, --scope <scope>",
   'Scope to remove from: "global", "project", or "both"'
 ).action(async (type, opts) => {