skillsmgr 0.2.0 → 0.3.1

package/README.md

@@ -2,6 +2,8 @@
 
 Unified skills manager for AI coding tools. Manage skills in `~/.skills-manager/` and deploy them to multiple AI tools.
 
+[中文文档](./README.zh-CN.md)
+
 ## Supported Tools
 
 | Tool | Skills Directory | Mode-Specific |
@@ -12,84 +14,73 @@ Unified skills manager for AI coding tools. Manage skills in `~/.skills-manager/
 | Cline | `.cline/skills/` | No |
 | Roo Code | `.roo/skills/` | Yes |
 | Kilo Code | `.kilocode/skills/` | Yes |
+| OpenCode | `.opencode/skills/` | No |
+| Trae | `.trae/skills/` | No |
 | Antigravity | `.agent/skills/` | No |
 
-## Installation
-
-```bash
-npm install -g skillsmgr
-```
-
-Or use directly with npx (no installation required):
-
-```bash
-npx skillsmgr setup
-npx skillsmgr install anthropic
-```
-
 ## Quick Start
 
 ```bash
 # Initialize skills manager
-skillsmgr setup
+npx skillsmgr setup
 
 # Install official Anthropic skills
-skillsmgr install anthropic
+npx skillsmgr install anthropic
 
 # Deploy skills to your project
 cd your-project
-skillsmgr init
+npx skillsmgr init
 ```
 
 ## Commands
 
-### `skillsmgr setup`
+### `npx skillsmgr setup`
 
 Initialize `~/.skills-manager/` directory structure with example skill.
 
 ```bash
-skillsmgr setup
+npx skillsmgr setup
 ```
 
-### `skillsmgr install <source>`
+### `npx skillsmgr install <source>`
 
 Download skills from a repository.
 
 ```bash
 # Install official Anthropic skills
-skillsmgr install anthropic
+npx skillsmgr install anthropic
 
 # Install from any GitHub repository
-skillsmgr install https://github.com/user/skills-repo
+npx skillsmgr install https://github.com/user/skills-repo
 
 # Install specific skill
-skillsmgr install https://github.com/anthropics/skills/tree/main/skills/code-review
+npx skillsmgr install https://github.com/anthropics/skills/tree/main/skills/code-review
 
 # Install all skills without prompting
-skillsmgr install anthropic --all
+npx skillsmgr install anthropic --all
 
 # Install to custom/ instead of community/
-skillsmgr install https://github.com/user/repo --custom
+npx skillsmgr install https://github.com/user/repo --custom
 ```
 
-### `skillsmgr list`
+### `npx skillsmgr list`
 
 List available skills.
 
 ```bash
 # List all available skills
-skillsmgr list
+npx skillsmgr list
 
 # List deployed skills in current project
-skillsmgr list --deployed
+npx skillsmgr list --deployed
 ```
 
-### `skillsmgr init`
+### `npx skillsmgr init`
 
 Interactive deployment of skills to current project.
 
 ```bash
-skillsmgr init
+npx skillsmgr init
 ```
 
 Features:
@@ -98,39 +89,39 @@ Features:
 - Choose skills to deploy with search filter
 - Incremental updates (add/remove skills)
 
-### `skillsmgr add <skill>`
+### `npx skillsmgr add <skill>`
 
 Quick add a skill to project.
 
 ```bash
 # Add to all configured tools
-skillsmgr add code-review
+npx skillsmgr add code-review
 
 # Add to specific tool
-skillsmgr add code-review --tool claude-code
+npx skillsmgr add code-review --tool claude-code
 
 # Use copy mode instead of symlink
-skillsmgr add code-review --copy
+npx skillsmgr add code-review --copy
 ```
 
-### `skillsmgr remove <skill>`
+### `npx skillsmgr remove <skill>`
 
 Remove a skill from project.
 
 ```bash
 # Remove from all tools
-skillsmgr remove code-review
+npx skillsmgr remove code-review
 
 # Remove from specific tool
-skillsmgr remove code-review --tool claude-code
+npx skillsmgr remove code-review --tool claude-code
 ```
 
-### `skillsmgr sync`
+### `npx skillsmgr sync`
 
 Sync and verify deployed skills.
 
 ```bash
-skillsmgr sync
+npx skillsmgr sync
 ```
 
 ## Directory Structure
@@ -151,7 +142,7 @@ skillsmgr sync
 ## Features
 
 - **Unified Management**: Manage all skills in one place
-- **Multi-tool Support**: Deploy to 7 different AI tools
+- **Multi-tool Support**: Deploy to 9 different AI tools
 - **Symlink by Default**: Changes sync automatically
 - **Search Filter**: Quick search for large skill repositories
 - **Progress Indicators**: Visual feedback during downloads

package/README.zh-CN.md

@@ -0,0 +1,153 @@
+# skillsmgr
+
+AI 编码工具的统一 Skills 管理器。在 `~/.skills-manager/` 中管理 skills，并部署到多个 AI 工具。
+
+[English](./README.md)
+
+## 支持的工具
+
+| 工具 | Skills 目录 | 支持模式特定 |
+|------|------------|-------------|
+| Claude Code | `.claude/skills/` | 否 |
+| Cursor | `.cursor/skills/` | 否 |
+| Windsurf | `.windsurf/skills/` | 否 |
+| Cline | `.cline/skills/` | 否 |
+| Roo Code | `.roo/skills/` | 是 |
+| Kilo Code | `.kilocode/skills/` | 是 |
+| OpenCode | `.opencode/skills/` | 否 |
+| Trae | `.trae/skills/` | 否 |
+| Antigravity | `.agent/skills/` | 否 |
+
+## 快速开始
+
+```bash
+# 初始化 skills 管理器
+npx skillsmgr setup
+
+# 安装官方 Anthropic skills
+npx skillsmgr install anthropic
+
+# 部署 skills 到你的项目
+cd your-project
+npx skillsmgr init
+```
+
+## 命令
+
+### `npx skillsmgr setup`
+
+初始化 `~/.skills-manager/` 目录结构，包含示例 skill。
+
+```bash
+npx skillsmgr setup
+```
+
+### `npx skillsmgr install <source>`
+
+从仓库下载 skills。
+
+```bash
+# 安装官方 Anthropic skills
+npx skillsmgr install anthropic
+
+# 从任意 GitHub 仓库安装
+npx skillsmgr install https://github.com/user/skills-repo
+
+# 安装特定 skill
+npx skillsmgr install https://github.com/anthropics/skills/tree/main/skills/code-review
+
+# 安装所有 skills（无需确认）
+npx skillsmgr install anthropic --all
+
+# 安装到 custom/ 而非 community/
+npx skillsmgr install https://github.com/user/repo --custom
+```
+
+### `npx skillsmgr list`
+
+列出可用的 skills。
+
+```bash
+# 列出所有可用 skills
+npx skillsmgr list
+
+# 列出当前项目已部署的 skills
+npx skillsmgr list --deployed
+```
+
+### `npx skillsmgr init`
+
+交互式部署 skills 到当前项目。
+
+```bash
+npx skillsmgr init
+```
+
+功能：
+- 选择目标工具（Claude Code、Cursor 等）
+- 为 Roo Code / Kilo Code 选择模式
+- 通过搜索过滤选择要部署的 skills
+- 增量更新（添加/移除 skills）
+
+### `npx skillsmgr add <skill>`
+
+快速添加 skill 到项目。
+
+```bash
+# 添加到所有已配置的工具
+npx skillsmgr add code-review
+
+# 添加到特定工具
+npx skillsmgr add code-review --tool claude-code
+
+# 使用复制模式而非符号链接
+npx skillsmgr add code-review --copy
+```
+
+### `npx skillsmgr remove <skill>`
+
+从项目移除 skill。
+
+```bash
+# 从所有工具移除
+npx skillsmgr remove code-review
+
+# 从特定工具移除
+npx skillsmgr remove code-review --tool claude-code
+```
+
+### `npx skillsmgr sync`
+
+同步并验证已部署的 skills。
+
+```bash
+npx skillsmgr sync
+```
+
+## 目录结构
+
+```
+~/.skills-manager/
+├── official/           # 官方 skills (anthropic/skills)
+│   └── anthropic/
+│       ├── code-review/
+│       └── tdd/
+├── community/          # 社区 skills (其他仓库)
+│   └── awesome-skills/
+│       └── react-patterns/
+└── custom/             # 本地自定义 skills
+    └── my-skill/
+```
+
+## 特性
+
+- **统一管理**：在一处管理所有 skills
+- **多工具支持**：部署到 9 种不同的 AI 工具
+- **默认符号链接**：修改自动同步
+- **搜索过滤**：快速搜索大型 skill 仓库
+- **进度指示**：下载时显示可视化反馈
+- **增量更新**：无需完全重新部署即可添加/移除 skills
+
+## 许可证
+
+MIT

package/dist/index.js

@@ -13,7 +13,6 @@ import { dirname as dirname2 } from "path";
 import { homedir } from "os";
 import { join } from "path";
 var SKILLS_MANAGER_DIR = join(homedir(), ".skills-manager");
-var METADATA_FILENAME = ".skillsmgr.json";
 var SKILL_SOURCES = ["official", "community", "custom"];
 var SUPPORTED_TOOLS = [
   "antigravity",
@@ -39,7 +38,8 @@ import {
   readdirSync,
   unlinkSync,
   writeFileSync,
-  rmSync
+  rmSync,
+  readlinkSync
 } from "fs";
 import { dirname, join as join2 } from "path";
 function ensureDir(dir) {
@@ -58,13 +58,16 @@ function isSymlink(path) {
     return false;
   }
 }
+function readSymlinkTarget(path) {
+  try {
+    return readlinkSync(path);
+  } catch {
+    return null;
+  }
+}
 function readFileContent(path) {
   return readFileSync(path, "utf-8");
 }
-function writeFile(path, content) {
-  ensureDir(dirname(path));
-  writeFileSync(path, content, "utf-8");
-}
 function fileExists(path) {
   return existsSync(path);
 }
@@ -1199,61 +1202,148 @@ var SkillsService = class {
   }
 };
 
-// src/services/metadata.ts
+// src/services/scanner.ts
 import { join as join8 } from "path";
-var MetadataService = class {
-  constructor(projectDir) {
+import { readdirSync as readdirSync2 } from "fs";
+var DeploymentScanner = class {
+  constructor(projectDir, skillsManagerDir = SKILLS_MANAGER_DIR) {
     this.projectDir = projectDir;
-    this.metadataPath = join8(projectDir, METADATA_FILENAME);
+    this.skillsManagerDir = skillsManagerDir;
+    this.skillsService = new SkillsService(this.skillsManagerDir);
+  }
+  skillsService;
+  scanAllTools() {
+    const deployments = [];
+    for (const toolName of SUPPORTED_TOOLS) {
+      const config = TOOL_CONFIGS[toolName];
+      const toolDeployments = this.scanToolDeployment(toolName, config);
+      deployments.push(...toolDeployments);
+    }
+    return deployments.filter((d) => d.skills.length > 0);
+  }
+  scanToolDeployment(toolName, config) {
+    const deployments = [];
+    const baseDir = join8(this.projectDir, config.skillsDir);
+    const baseDeployment = this.scanDirectory(toolName, baseDir, config.skillsDir);
+    if (baseDeployment.skills.length > 0) {
+      deployments.push(baseDeployment);
+    }
+    if (config.supportsModeSpecific && config.availableModes) {
+      for (const mode of config.availableModes) {
+        const modeDir = getTargetDir(config, mode);
+        const fullModeDir = join8(this.projectDir, modeDir);
+        const modeDeployment = this.scanDirectory(toolName, fullModeDir, modeDir, mode);
+        if (modeDeployment.skills.length > 0) {
+          deployments.push(modeDeployment);
+        }
+      }
+    }
+    return deployments;
   }
-  metadataPath;
-  load() {
-    if (!fileExists(this.metadataPath)) {
-      return { version: "1.0", tools: {} };
+  getConfiguredTools() {
+    const tools = /* @__PURE__ */ new Set();
+    for (const toolName of SUPPORTED_TOOLS) {
+      const config = TOOL_CONFIGS[toolName];
+      const deployments = this.scanToolDeployment(toolName, config);
+      if (deployments.some((d) => d.skills.length > 0)) {
+        tools.add(toolName);
+      }
     }
-    const content = readFileContent(this.metadataPath);
-    return JSON.parse(content);
+    return Array.from(tools);
   }
-  save(metadata) {
-    writeFile(this.metadataPath, JSON.stringify(metadata, null, 2));
+  isToolConfigured(toolName) {
+    const config = TOOL_CONFIGS[toolName];
+    if (!config) return false;
+    const deployments = this.scanToolDeployment(toolName, config);
+    return deployments.some((d) => d.skills.length > 0);
   }
-  addDeployment(toolName, targetDir, mode, skills) {
-    const metadata = this.load();
-    metadata.tools[toolName] = {
-      targetDir,
+  getDeployedSkills(toolName) {
+    const config = TOOL_CONFIGS[toolName];
+    if (!config) return [];
+    const deployments = this.scanToolDeployment(toolName, config);
+    return deployments.flatMap((d) => d.skills);
+  }
+  scanDirectory(toolName, fullPath, relativePath, mode) {
+    const deployment = {
+      toolName,
+      targetDir: relativePath,
       mode,
-      deployedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      skills
+      skills: []
     };
-    this.save(metadata);
-  }
-  updateDeployment(toolName, skills) {
-    const metadata = this.load();
-    if (metadata.tools[toolName]) {
-      metadata.tools[toolName].skills = skills;
-      metadata.tools[toolName].deployedAt = (/* @__PURE__ */ new Date()).toISOString();
+    if (!fileExists(fullPath)) {
+      return deployment;
     }
-    this.save(metadata);
+    try {
+      const entries = readdirSync2(fullPath, { withFileTypes: true });
+      for (const entry of entries) {
+        const skillPath = join8(fullPath, entry.name);
+        const scanned = this.scanSkill(skillPath, entry.name);
+        if (scanned) {
+          deployment.skills.push(scanned);
+        }
+      }
+    } catch {
+    }
+    return deployment;
   }
-  removeDeployment(toolName) {
-    const metadata = this.load();
-    delete metadata.tools[toolName];
-    this.save(metadata);
+  scanSkill(skillPath, name) {
+    const skillMdPath = join8(skillPath, "SKILL.md");
+    if (!fileExists(skillMdPath)) {
+      return null;
+    }
+    if (isSymlink(skillPath)) {
+      return this.scanLinkedSkill(skillPath, name);
+    } else {
+      return this.scanCopiedSkill(skillPath, name);
+    }
   }
-  getDeployedSkills(toolName) {
-    const metadata = this.load();
-    return metadata.tools[toolName]?.skills || [];
+  scanLinkedSkill(skillPath, name) {
+    const linkTarget = readSymlinkTarget(skillPath);
+    if (!linkTarget) {
+      return null;
+    }
+    const source = this.extractSourceFromPath(linkTarget);
+    return {
+      name,
+      source: source || "unknown",
+      deployMode: "link",
+      path: skillPath
+    };
   }
-  getToolDeployment(toolName) {
-    const metadata = this.load();
-    return metadata.tools[toolName];
+  scanCopiedSkill(skillPath, name) {
+    const { source, conflict } = this.findSourceByName(name);
+    return {
+      name,
+      source: source || "unknown",
+      deployMode: "copy",
+      path: skillPath,
+      conflict
+    };
   }
-  getConfiguredTools() {
-    const metadata = this.load();
-    return Object.keys(metadata.tools);
+  extractSourceFromPath(linkTarget) {
+    const normalizedTarget = linkTarget.replace(/\\/g, "/");
+    const skillsManagerPattern = ".skills-manager/";
+    const idx = normalizedTarget.indexOf(skillsManagerPattern);
+    if (idx === -1) return null;
+    const afterManager = normalizedTarget.substring(idx + skillsManagerPattern.length);
+    const parts = afterManager.split("/");
+    if (parts[0] === "custom") {
+      return "custom";
+    }
+    if (parts.length >= 2) {
+      return `${parts[0]}/${parts[1]}`;
+    }
+    return null;
   }
-  hasMetadata() {
-    return fileExists(this.metadataPath);
+  findSourceByName(skillName) {
+    const matches = this.skillsService.findSkillsByName(skillName);
+    if (matches.length === 0) {
+      return { source: null, conflict: false };
+    }
+    if (matches.length > 1) {
+      return { source: null, conflict: true };
+    }
+    return { source: matches[0].source, conflict: false };
   }
 };
 
@@ -1288,29 +1378,32 @@ async function listAvailable() {
   for (const [source, sourceSkills] of Object.entries(grouped)) {
     console.log(`\u2500\u2500 ${source} (${sourceSkills.length} skill${sourceSkills.length > 1 ? "s" : ""}) \u2500\u2500`);
     for (const skill of sourceSkills) {
-      console.log(`  ${skill.name.padEnd(20)} ${skill.description}`);
+      console.log(`  ${skill.name}`);
     }
     console.log();
   }
 }
 async function listDeployed() {
-  const metadataService = new MetadataService(process.cwd());
-  if (!metadataService.hasMetadata()) {
+  const scanner = new DeploymentScanner(process.cwd(), SKILLS_MANAGER_DIR);
+  const deployments = scanner.scanAllTools();
+  if (deployments.length === 0) {
     console.log("No skills deployed in current project.");
     console.log("\nRun: skillsmgr init");
     return;
   }
   console.log("Deployed skills in current project:\n");
-  const configuredTools = metadataService.getConfiguredTools();
-  for (const toolName of configuredTools) {
-    const deployment = metadataService.getToolDeployment(toolName);
-    if (!deployment) continue;
-    const config = TOOL_CONFIGS[toolName];
-    const displayName = config?.displayName || toolName;
-    console.log(`${displayName} (${deployment.targetDir}/):`);
+  for (const deployment of deployments) {
+    const config = TOOL_CONFIGS[deployment.toolName];
+    const displayName = config?.displayName || deployment.toolName;
+    const dirSuffix = deployment.mode && deployment.mode !== "all" ? ` [${deployment.mode}]` : "";
+    console.log(`${displayName} (${deployment.targetDir}/)${dirSuffix}:`);
     for (const skill of deployment.skills) {
       const modeStr = skill.deployMode === "link" ? "link" : "copy";
-      console.log(`  \u25C9 ${skill.name.padEnd(16)} (${modeStr}) \u2190 ${skill.source}`);
+      if (skill.conflict) {
+        console.log(`  \u26A0 ${skill.name.padEnd(16)} (${modeStr}) \u2190 conflict`);
+      } else {
+        console.log(`  \u25C9 ${skill.name.padEnd(16)} (${modeStr}) \u2190 ${skill.source}`);
+      }
     }
     console.log();
   }
@@ -1369,14 +1462,14 @@ async function executeInit(options) {
     process.exit(1);
   }
   const skillsService = new SkillsService(SKILLS_MANAGER_DIR);
-  const metadataService = new MetadataService(process.cwd());
+  const scanner = new DeploymentScanner(process.cwd(), SKILLS_MANAGER_DIR);
   const deployer = new Deployer(process.cwd());
   const allSkills = skillsService.getAllSkills();
   if (allSkills.length === 0) {
     console.log("No skills found. Run: skillsmgr install anthropic");
     process.exit(1);
   }
-  const configuredTools = metadataService.getConfiguredTools();
+  const configuredTools = scanner.getConfiguredTools();
   const selectedTools = await promptTools(configuredTools);
   const toolModes = {};
   for (const toolName of selectedTools) {
@@ -1390,7 +1483,7 @@ async function executeInit(options) {
   }
   const deployedSkillNames = /* @__PURE__ */ new Set();
   for (const toolName of selectedTools) {
-    const deployed = metadataService.getDeployedSkills(toolName);
+    const deployed = scanner.getDeployedSkills(toolName);
     deployed.forEach((s) => deployedSkillNames.add(s.name));
   }
   const selectedSkillNames = await promptSkills(
@@ -1409,7 +1502,7 @@ async function executeInit(options) {
     const mode = toolModes[toolName];
     const targetDir = getTargetDir(config, mode);
     console.log(`${config.displayName}:`);
-    const previouslyDeployed = metadataService.getDeployedSkills(toolName);
+    const previouslyDeployed = scanner.getDeployedSkills(toolName);
     const previousNames = new Set(previouslyDeployed.map((s) => s.name));
     const toAdd = selectedSkills.filter((s) => !previousNames.has(s.name));
     const toKeep = selectedSkills.filter((s) => previousNames.has(s.name));
@@ -1427,12 +1520,6 @@ async function executeInit(options) {
       deployer.deploySkill(skill, config, deployMode, mode);
       console.log(`  \u2713 ${skill.name} (${deployMode === "link" ? "linked" : "copied"})`);
     }
-    const newDeployedSkills = selectedSkills.map((skill) => ({
-      name: skill.name,
-      source: skill.source,
-      deployMode
-    }));
-    metadataService.addDeployment(toolName, targetDir, mode, newDeployedSkills);
     console.log();
   }
   console.log(
@@ -1451,7 +1538,7 @@ async function executeAdd(skillName, options) {
     process.exit(1);
   }
   const skillsService = new SkillsService(SKILLS_MANAGER_DIR);
-  const metadataService = new MetadataService(process.cwd());
+  const scanner = new DeploymentScanner(process.cwd(), SKILLS_MANAGER_DIR);
   const deployer = new Deployer(process.cwd());
   const matchingSkills = skillsService.findSkillsByName(skillName);
   if (matchingSkills.length === 0) {
@@ -1476,7 +1563,7 @@ async function executeAdd(skillName, options) {
     }
     targetTools = [options.tool];
   } else {
-    targetTools = metadataService.getConfiguredTools();
+    targetTools = scanner.getConfiguredTools();
     if (targetTools.length === 0) {
       console.log("No tools configured. Run: skillsmgr init");
       process.exit(1);
@@ -1486,19 +1573,15 @@ async function executeAdd(skillName, options) {
   console.log(`Adding ${skillName} to configured tools...`);
   for (const toolName of targetTools) {
     const config = TOOL_CONFIGS[toolName];
-    const deployment = metadataService.getToolDeployment(toolName);
-    const mode = deployment?.mode || "all";
-    deployer.deploySkill(skill, config, deployMode, mode);
-    const existingSkills = metadataService.getDeployedSkills(toolName);
+    const deployments = scanner.scanToolDeployment(toolName, config);
+    const mode = deployments.length > 0 && deployments[0].mode ? deployments[0].mode : "all";
+    const existingSkills = scanner.getDeployedSkills(toolName);
     const alreadyExists = existingSkills.some((s) => s.name === skill.name);
-    if (!alreadyExists) {
-      const newSkill = {
-        name: skill.name,
-        source: skill.source,
-        deployMode
-      };
-      metadataService.updateDeployment(toolName, [...existingSkills, newSkill]);
+    if (alreadyExists) {
+      console.log(`  \xB7 ${config.displayName} (already deployed)`);
+      continue;
     }
+    deployer.deploySkill(skill, config, deployMode, mode);
     console.log(
       `  \u2713 ${config.displayName} (${deployMode === "link" ? "linked" : "copied"})`
     );
@@ -1511,9 +1594,10 @@ var addCommand = new Command5("add").description("Add a skill to the project").a
 // src/commands/remove.ts
 import { Command as Command6 } from "commander";
 async function executeRemove(skillName, options) {
-  const metadataService = new MetadataService(process.cwd());
+  const scanner = new DeploymentScanner(process.cwd(), SKILLS_MANAGER_DIR);
   const deployer = new Deployer(process.cwd());
-  if (!metadataService.hasMetadata()) {
+  const configuredTools = scanner.getConfiguredTools();
+  if (configuredTools.length === 0) {
     console.log("No skills deployed in current project.");
     process.exit(1);
   }
@@ -1525,22 +1609,21 @@ async function executeRemove(skillName, options) {
     }
     targetTools = [options.tool];
   } else {
-    targetTools = metadataService.getConfiguredTools();
+    targetTools = configuredTools;
   }
   console.log(`Removing ${skillName}...`);
   let removed = false;
   for (const toolName of targetTools) {
     const config = TOOL_CONFIGS[toolName];
-    const deployment = metadataService.getToolDeployment(toolName);
-    if (!deployment) continue;
-    const existingSkills = deployment.skills;
-    const skillToRemove = existingSkills.find((s) => s.name === skillName);
-    if (!skillToRemove) continue;
-    deployer.removeSkill(skillName, config, deployment.mode);
-    const remainingSkills = existingSkills.filter((s) => s.name !== skillName);
-    metadataService.updateDeployment(toolName, remainingSkills);
-    console.log(`  \u2713 Removed from ${config.displayName}`);
-    removed = true;
+    const deployments = scanner.scanToolDeployment(toolName, config);
+    for (const deployment of deployments) {
+      const skillToRemove = deployment.skills.find((s) => s.name === skillName);
+      if (!skillToRemove) continue;
+      const mode = deployment.mode || "all";
+      deployer.removeSkill(skillName, config, mode);
+      console.log(`  \u2713 Removed from ${config.displayName}`);
+      removed = true;
+    }
   }
   if (!removed) {
     console.log(`Skill '${skillName}' not found in any configured tool`);
@@ -1554,32 +1637,39 @@ var removeCommand = new Command6("remove").description("Remove a skill from the
 import { Command as Command7 } from "commander";
 import { join as join10 } from "path";
 async function executeSync() {
-  const metadataService = new MetadataService(process.cwd());
+  const scanner = new DeploymentScanner(process.cwd(), SKILLS_MANAGER_DIR);
   const deployer = new Deployer(process.cwd());
-  if (!metadataService.hasMetadata()) {
+  const skillsService = new SkillsService(SKILLS_MANAGER_DIR);
+  const deployments = scanner.scanAllTools();
+  if (deployments.length === 0) {
     console.log("No skills deployed in current project.");
     process.exit(1);
   }
   console.log("Checking deployed skills...\n");
-  const configuredTools = metadataService.getConfiguredTools();
   let updatedCount = 0;
   let removedCount = 0;
-  let untrackedCount = 0;
-  for (const toolName of configuredTools) {
-    const config = TOOL_CONFIGS[toolName];
-    const deployment = metadataService.getToolDeployment(toolName);
-    if (!deployment) continue;
+  for (const deployment of deployments) {
+    const config = TOOL_CONFIGS[deployment.toolName];
+    const mode = deployment.mode || "all";
     console.log(`${config.displayName} (${deployment.targetDir}/):`);
     for (const skill of deployment.skills) {
-      const deployedPath = join10(process.cwd(), deployment.targetDir, skill.name);
-      const sourcePath = join10(SKILLS_MANAGER_DIR, skill.source, skill.name);
-      if (!fileExists(sourcePath)) {
-        console.log(`  \u2717 ${skill.name}: orphaned (source deleted)`);
+      if (skill.conflict) {
+        console.log(`  \u26A0 ${skill.name}: conflict (skipped)`);
+        continue;
+      }
+      const deployedPath = skill.path;
+      let sourcePath = null;
+      if (skill.source !== "unknown") {
+        const sourceSkill = skillsService.getSkillByName(skill.name);
+        if (sourceSkill) {
+          sourcePath = sourceSkill.path;
+        }
+      }
+      if (!sourcePath || !fileExists(sourcePath)) {
+        console.log(`  \u2717 ${skill.name}: orphaned (source not found)`);
         const action = await promptOrphanAction(skill.name);
         if (action === "remove") {
-          deployer.removeSkill(skill.name, config, deployment.mode);
-          const remaining = deployment.skills.filter((s) => s.name !== skill.name);
-          metadataService.updateDeployment(toolName, remaining);
+          deployer.removeSkill(skill.name, config, mode);
           console.log(`  \u2713 Removed ${skill.name}`);
           removedCount++;
         }
@@ -1610,7 +1700,7 @@ async function executeSync() {
                   { name: skill.name, description: "", path: sourcePath, source: skill.source },
                   config,
                   "copy",
-                  deployment.mode
+                  mode
                 );
                 console.log(`  \u2713 Updated ${skill.name}`);
                 updatedCount++;
@@ -1620,7 +1710,7 @@ async function executeSync() {
                 { name: skill.name, description: "", path: sourcePath, source: skill.source },
                 config,
                 "copy",
-                deployment.mode
+                mode
               );
               console.log(`  \u2713 Updated ${skill.name}`);
               updatedCount++;
@@ -1634,7 +1724,7 @@ async function executeSync() {
     console.log();
   }
   console.log(
-    `Sync complete: ${updatedCount} updated, ${removedCount} removed, ${untrackedCount} untracked`
+    `Sync complete: ${updatedCount} updated, ${removedCount} removed`
   );
 }
 var syncCommand = new Command7("sync").description("Sync and verify deployed skills").action(async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skillsmgr",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "Unified skills manager for AI coding tools",
   "type": "module",
   "bin": {