ads-fe 0.0.1 → 0.0.2

package/README.md

@@ -38,6 +38,15 @@ ads-fe init cursor --project
 
 `ads-fe init <agent>` 会把这个包内置的 skill 安装到 AI agent 中。
 
+安装路径：
+
+- Codex 全局：`~/.codex/skills/ads-fe/SKILL.md`
+- Claude 全局：`~/.claude/skills/ads-fe/SKILL.md`
+- Cursor 全局：`~/.cursor/skills/ads-fe/SKILL.md`
+- Cursor 项目级：`.cursor/skills/ads-fe/SKILL.md`
+
+Cursor 使用 Agent Skills 目录结构，不再安装到 `.cursor/rules`。
+
 `ads-fe skill init` 与上面的命令不同：它会初始化外部 skill 源仓库，这些仓库用于维护本包。
 
 ## 命令
@@ -47,6 +56,9 @@ ads-fe init codex  # skill 安装到 codex 全局
 ads-fe init claude # skill 安装到 claude code 全局
 ads-fe init cursor                    # skill 安装到 cursor 全局
 ads-fe init all --project             # 项目级安装
+ads-fe remove all                     # 移除 codex/claude/cursor 全局 skill
+ads-fe remove codex                   # 只移除 codex 全局 skill
+ads-fe skill remove all               # remove 的等价别名
 
 # for ai 
 ads-fe skill list # 内置 skill 列表
@@ -70,8 +82,8 @@ ads-fe skill cleanup --dry-run
 
 发现顺序：
 
-1. 如果设置了 `ADSPOWER_SKILLS_DIR`，则按操作系统的路径分隔符拆分，并优先扫描这些目录。
-2. 否则扫描项目根目录下的 `skills/` 和 `skills/`。
+1. 如果设置了 `ADSPOWER_SKILL_DATA_DIR`，则按操作系统的路径分隔符拆分，并优先扫描这些目录。
+2. 否则扫描项目根目录下的 `skill-data/`。
 
 对于每个子目录，如果存在 `SKILL.md`，就会在运行时被发现。
 Frontmatter 字段：
@@ -90,10 +102,10 @@ Frontmatter 字段：
 外部仓库定义在 `src/meta.ts` 中。
 
 - `skill init` 会添加缺失的 `sources/<name>` 和 `vendor/<name>` git submodule。
-- `skill sync` 会更新 submodule，然后把配置的 `vendor/<name>/skills/<source>` 目录复制到 `skills/<output>`。
+- `skill sync` 会更新 submodule，然后把配置的 `vendor/<name>/skills/<source>` 目录复制到 `skill-data/<output>`。
 - `skill sync --no-update` 会从当前本地 vendor checkout 复制，不执行拉取。
 - `skill update` 是显式的更新并同步命令。
 - `skill check` 会 fetch 已初始化的 submodule，并报告每个 submodule 落后 upstream 多少个 commit。
-- `skill cleanup` 会删除不再列在 `src/meta.ts` 中的陈旧生成项；来自 `manual` 的手动 skills 会被保留。
+- `skill cleanup` 会删除 `skill-data/` 中不再列在 `src/meta.ts` 中的陈旧生成项；来自 `manual` 的手动 skills 会被保留。
 
 每个同步得到的 skill 都会获得一个 `SYNC.md` 文件，其中包含来源路径、git SHA 和同步日期。如果 vendor 仓库根目录存在 license 文件，它会被复制为 `LICENSE.md`。

package/dist/cli.js

@@ -6,10 +6,11 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { Command } from 'commander';
 import { manual, submodules, vendors } from './meta.js';
-const SKILL_DIRS = ['skills', 'skills'];
+const SKILL_DATA_DIR = 'skill-data';
+const SKILL_DIRS = [SKILL_DATA_DIR];
 const SKILL_FILE = 'SKILL.md';
-const ENV_SKILLS_DIR = 'ADSPOWER_SKILLS_DIR';
-const GENERATED_SKILL_DIR = 'skills';
+const ENV_SKILL_DATA_DIR = 'ADSPOWER_SKILL_DATA_DIR';
+const GENERATED_SKILL_DIR = SKILL_DATA_DIR;
 function readFrontmatter(content) {
     const fmMatch = content.match(/^---\n([\s\S]*?)\n---\n?/);
     if (!fmMatch)
@@ -112,13 +113,6 @@ function copyDirectory(sourceDir, outputDir) {
 function removePath(target) {
     fs.rmSync(target, { recursive: true, force: true });
 }
-function copyDirectoryIfExists(sourceDir, outputDir) {
-    if (!fs.existsSync(sourceDir) || !fs.statSync(sourceDir).isDirectory())
-        return false;
-    removePath(outputDir);
-    copyDirectory(sourceDir, outputDir);
-    return true;
-}
 function writeFileEnsured(filePath, content) {
     fs.mkdirSync(path.dirname(filePath), { recursive: true });
     fs.writeFileSync(filePath, content);
@@ -126,15 +120,8 @@ function writeFileEnsured(filePath, content) {
 function userHome() {
     return os.homedir();
 }
-function cursorUserRulesDir() {
-    if (process.platform === 'darwin')
-        return path.join(userHome(), 'Library', 'Application Support', 'Cursor', 'User', 'rules');
-    if (process.platform === 'win32') {
-        const base = process.env.APPDATA || path.join(userHome(), 'AppData', 'Roaming');
-        return path.join(base, 'Cursor', 'User', 'rules');
-    }
-    const base = process.env.XDG_CONFIG_HOME || path.join(userHome(), '.config');
-    return path.join(base, 'Cursor', 'User', 'rules');
+function cursorUserSkillsDir() {
+    return path.join(userHome(), '.cursor', 'skills');
 }
 function agentSkillDir(agent, scope) {
     if (scope === 'project') {
@@ -142,13 +129,13 @@ function agentSkillDir(agent, scope) {
             return path.join(process.cwd(), '.claude', 'skills', 'ads-fe');
         if (agent === 'codex')
             return path.join(process.cwd(), '.codex', 'skills', 'ads-fe');
-        return path.join(process.cwd(), '.cursor', 'rules');
+        return path.join(process.cwd(), '.cursor', 'skills', 'ads-fe');
     }
     if (agent === 'claude')
         return path.join(userHome(), '.claude', 'skills', 'ads-fe');
     if (agent === 'codex')
         return path.join(userHome(), '.codex', 'skills', 'ads-fe');
-    return cursorUserRulesDir();
+    return path.join(cursorUserSkillsDir(), 'ads-fe');
 }
 function readRootSkill(root) {
     const skillPath = path.join(root, 'skill.md');
@@ -162,44 +149,21 @@ function installSkillDirectory(agent, scope, root) {
     removePath(targetDir);
     fs.mkdirSync(targetDir, { recursive: true });
     fs.copyFileSync(path.join(root, 'skill.md'), path.join(targetDir, SKILL_FILE));
-    if (!copyDirectoryIfExists(path.join(root, 'skills'), path.join(targetDir, 'skills'))) {
-        warnings.push(`Missing skills directory: ${path.join(root, 'skills')}`);
-    }
     return { agent, scope, paths: [targetDir], warnings };
 }
-function cursorRuleContent(rootSkill, dataPath, isProject) {
-    const relOrAbsDataPath = isProject ? '.cursor/rules/ads-fe-skills' : dataPath;
-    return `---
-description: AdsPower frontend skill
-globs:
-alwaysApply: true
----
-
-# AdsPower Frontend Skill
-
-Supporting skill data is installed at \`${relOrAbsDataPath}\`.
-
-${rootSkill.trim()}
-`;
-}
-function installCursor(scope, root) {
-    const targetBase = agentSkillDir('cursor', scope);
-    const rulePath = path.join(targetBase, scope === 'project' ? 'ads-fe.mdc' : 'ads-fe.md');
-    const dataPath = path.join(targetBase, 'ads-fe-skills');
-    const warnings = [];
-    const rootSkill = readRootSkill(root);
-    if (!copyDirectoryIfExists(path.join(root, 'skills'), dataPath)) {
-        warnings.push(`Missing skills directory: ${path.join(root, 'skills')}`);
-    }
-    writeFileEnsured(rulePath, cursorRuleContent(rootSkill, dataPath, scope === 'project'));
-    return { agent: 'cursor', scope, paths: [rulePath, dataPath], warnings };
-}
 function installAgent(agent, scope, root) {
-    if (agent === 'cursor')
-        return installCursor(scope, root);
     readRootSkill(root);
     return installSkillDirectory(agent, scope, root);
 }
+function cursorInstallPaths(scope) {
+    return [agentSkillDir('cursor', scope)];
+}
+function removeAgent(agent, scope) {
+    const paths = agent === 'cursor' ? cursorInstallPaths(scope) : [agentSkillDir(agent, scope)];
+    for (const targetPath of paths)
+        removePath(targetPath);
+    return { agent, scope, paths };
+}
 function getGitSha(dir) {
     return runGitSafe(['rev-parse', 'HEAD'], dir);
 }
@@ -252,7 +216,7 @@ function expectedGeneratedSkillNames() {
     return expected;
 }
 function findSkillDirs() {
-    const fromEnv = process.env[ENV_SKILLS_DIR];
+    const fromEnv = process.env[ENV_SKILL_DATA_DIR];
     if (fromEnv) {
         const dirs = fromEnv
             .split(path.delimiter)
@@ -263,10 +227,19 @@ function findSkillDirs() {
         if (dirs.length > 0)
             return dirs;
     }
-    const root = detectPackageRoot();
-    return SKILL_DIRS
-        .map((d) => path.join(root, d))
-        .filter((p) => fs.existsSync(p) && fs.statSync(p).isDirectory());
+    const roots = [detectPackageRoot(), detectSkillPackageRoot()];
+    const seen = new Set();
+    const dirs = [];
+    for (const root of roots) {
+        for (const dir of SKILL_DIRS) {
+            const candidate = path.join(root, dir);
+            if (seen.has(candidate) || !fs.existsSync(candidate) || !fs.statSync(candidate).isDirectory())
+                continue;
+            seen.add(candidate);
+            dirs.push(candidate);
+        }
+    }
+    return dirs;
 }
 function discoverSkills(includeHidden = false) {
     const dirs = findSkillDirs();
@@ -320,6 +293,27 @@ function collectFilesRecursive(dir) {
 }
 const program = new Command();
 program.name('ads-fe');
+function addRemoveCommand(parent) {
+    parent
+        .command('remove <agent>')
+        .description('Remove the AdsPower skill from claude, codex, cursor, or all')
+        .option('--project', 'Remove from the current project instead of the global user location')
+        .action((agent, opts) => {
+        const allowed = new Set(['claude', 'codex', 'cursor', 'all']);
+        if (!allowed.has(agent)) {
+            process.stderr.write(`Unknown agent: ${agent}. Expected one of: claude, codex, cursor, all\n`);
+            process.exitCode = 1;
+            return;
+        }
+        const scope = opts.project ? 'project' : 'global';
+        const agents = agent === 'all' ? ['claude', 'codex', 'cursor'] : [agent];
+        for (const targetAgent of agents) {
+            const result = removeAgent(targetAgent, scope);
+            for (const targetPath of result.paths)
+                process.stdout.write(`Removed ${result.agent} ${result.scope}: ${targetPath}\n`);
+        }
+    });
+}
 program
     .command('init <agent>')
     .description('Install the bundled AdsPower skill into claude, codex, cursor, or all')
@@ -350,6 +344,8 @@ program
     }
 });
 const skill = program.command('skill').description('Manage skills');
+addRemoveCommand(program);
+addRemoveCommand(skill);
 skill
     .command('init')
     .description('Add missing external skill repositories as git submodules')
@@ -369,7 +365,7 @@ skill
 });
 skill
     .command('sync')
-    .description('Sync configured vendor skills into skills')
+    .description('Sync configured vendor skills into skill-data')
     .option('--no-update', 'Skip git submodule update before copying skills')
     .option('--json', 'Output JSON')
     .action((opts) => {
@@ -389,7 +385,7 @@ skill
 });
 skill
     .command('update')
-    .description('Update external repositories and sync vendor skills into skills')
+    .description('Update external repositories and sync vendor skills into skill-data')
     .option('--json', 'Output JSON')
     .action((opts) => {
     runGit(['submodule', 'update', '--remote', '--merge'], detectPackageRoot());
@@ -433,7 +429,7 @@ skill
 });
 skill
     .command('cleanup')
-    .description('Remove generated skills entries that are no longer listed in src/meta.ts')
+    .description('Remove generated skill-data entries that are no longer listed in src/meta.ts')
     .option('--dry-run', 'Print stale generated skills without removing them')
     .action((opts) => {
     const root = detectPackageRoot();

package/dist/meta.js

@@ -13,7 +13,7 @@ export const submodules = {
 // nitro: 'https://github.com/nitrojs/nitro',
 };
 /**
- * Already generated skills, sync with their `skills/` directory
+ * Already generated skills, sync from each vendor's `skills/` directory into `skill-data/`
  */
 export const vendors = {
     'vue': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ads-fe",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Dynamic skill discovery CLI",
   "type": "module",
   "bin": {
@@ -27,7 +27,7 @@
     "dist/cli.js",
     "dist/meta.js",
     "skill.md",
-    "skills",
+    "skill-data",
     "README.md"
   ],
   "license": "ISC",