@adversity/coding-tool-x 2.2.0 → 2.4.0

package/src/server/services/rules-service.js

@@ -5,15 +5,21 @@
  * 规则目录:
  * - 用户级: ~/.claude/rules/
  * - 项目级: .claude/rules/
+ *
+ * 支持从 GitHub 仓库扫描和安装规则
  */
 
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const { RepoScannerBase } = require('./repo-scanner-base');
 
 // 规则目录路径
 const USER_RULES_DIR = path.join(os.homedir(), '.claude', 'rules');
 
+// 默认仓库源
+const DEFAULT_REPOS = [];
+
 /**
  * 确保目录存在
  */
@@ -134,12 +140,94 @@ function scanRulesDir(dir, basePath, scope) {
   return rules;
 }
 
+/**
+ * Rules 仓库扫描器
+ */
+class RulesRepoScanner extends RepoScannerBase {
+  constructor() {
+    super({
+      type: 'rules',
+      installDir: USER_RULES_DIR,
+      markerFile: null, // 直接扫描 .md 文件
+      fileExtension: '.md',
+      defaultRepos: DEFAULT_REPOS
+    });
+  }
+
+  /**
+   * 获取并解析单个规则文件
+   */
+  async fetchAndParseItem(file, repo, baseDir) {
+    try {
+      // 计算相对路径
+      const relativePath = baseDir ? file.path.slice(baseDir.length + 1) : file.path;
+      const fileName = path.basename(file.path, '.md');
+      const directory = path.dirname(relativePath);
+
+      // 获取文件内容
+      const content = await this.fetchRawContent(repo, file.path);
+      const { frontmatter, body } = this.parseFrontmatter(content);
+
+      return {
+        key: `${repo.owner}/${repo.name}:${relativePath}`,
+        name: fileName,
+        fileName,
+        directory: directory === '.' ? null : directory,
+        scope: 'remote',
+        path: relativePath,
+        repoPath: file.path,
+        paths: frontmatter.paths || '',
+        body,
+        fullContent: content,
+        installed: this.isInstalled(relativePath),
+        readmeUrl: `https://github.com/${repo.owner}/${repo.name}/blob/${repo.branch}/${file.path}`,
+        repoOwner: repo.owner,
+        repoName: repo.name,
+        repoBranch: repo.branch,
+        repoDirectory: repo.directory || ''
+      };
+    } catch (err) {
+      console.warn(`[RulesRepoScanner] Parse rule ${file.path} error:`, err.message);
+      return null;
+    }
+  }
+
+  /**
+   * 检查规则是否已安装
+   */
+  isInstalled(relativePath) {
+    const fullPath = path.join(this.installDir, relativePath);
+    return fs.existsSync(fullPath);
+  }
+
+  /**
+   * 获取去重 key
+   */
+  getDedupeKey(item) {
+    return item.directory ? `${item.directory}/${item.fileName}`.toLowerCase() : item.fileName.toLowerCase();
+  }
+
+  /**
+   * 安装规则
+   */
+  async installRule(item) {
+    const repo = {
+      owner: item.repoOwner,
+      name: item.repoName,
+      branch: item.repoBranch
+    };
+
+    return this.installFromRepo(item.repoPath, repo, item.path);
+  }
+}
+
 /**
  * Rules 服务类
  */
 class RulesService {
   constructor() {
     this.userRulesDir = USER_RULES_DIR;
+    this.repoScanner = new RulesRepoScanner();
     ensureDir(this.userRulesDir);
   }
 
@@ -172,6 +260,51 @@ class RulesService {
     };
   }
 
+  /**
+   * 获取所有规则（包括远程仓库）
+   */
+  async listAllRules(projectPath = null, forceRefresh = false) {
+    // 获取本地规则
+    const { rules: localRules, userCount, projectCount } = this.listRules(projectPath);
+
+    // 获取远程规则
+    let remoteRules = [];
+    try {
+      remoteRules = await this.repoScanner.listRemoteItems(forceRefresh);
+
+      // 更新安装状态
+      for (const rule of remoteRules) {
+        rule.installed = this.repoScanner.isInstalled(rule.path);
+      }
+    } catch (err) {
+      console.warn('[RulesService] Failed to fetch remote rules:', err.message);
+    }
+
+    // 合并列表（本地优先）
+    const allRules = [...localRules];
+    const localKeys = new Set(localRules.map(r =>
+      r.directory ? `${r.directory}/${r.fileName}`.toLowerCase() : r.fileName.toLowerCase()
+    ));
+
+    for (const remote of remoteRules) {
+      const key = remote.directory ? `${remote.directory}/${remote.fileName}`.toLowerCase() : remote.fileName.toLowerCase();
+      if (!localKeys.has(key)) {
+        allRules.push(remote);
+      }
+    }
+
+    // 排序
+    allRules.sort((a, b) => a.path.toLowerCase().localeCompare(b.path.toLowerCase()));
+
+    return {
+      rules: allRules,
+      total: allRules.length,
+      userCount,
+      projectCount,
+      remoteCount: remoteRules.length
+    };
+  }
+
   /**
    * 获取单个规则详情
    */
@@ -394,8 +527,53 @@ class RulesService {
       directories
     };
   }
+
+  // ==================== 仓库管理 ====================
+
+  /**
+   * 获取仓库列表
+   */
+  getRepos() {
+    return this.repoScanner.loadRepos();
+  }
+
+  /**
+   * 添加仓库
+   */
+  addRepo(repo) {
+    return this.repoScanner.addRepo(repo);
+  }
+
+  /**
+   * 删除仓库
+   */
+  removeRepo(owner, name, directory = '') {
+    return this.repoScanner.removeRepo(owner, name, directory);
+  }
+
+  /**
+   * 切换仓库启用状态
+   */
+  toggleRepo(owner, name, directory = '', enabled) {
+    return this.repoScanner.toggleRepo(owner, name, directory, enabled);
+  }
+
+  /**
+   * 从远程仓库安装规则
+   */
+  async installFromRemote(rule) {
+    return this.repoScanner.installRule(rule);
+  }
+
+  /**
+   * 卸载规则
+   */
+  uninstallRule(relativePath) {
+    return this.repoScanner.uninstall(relativePath);
+  }
 }
 
 module.exports = {
-  RulesService
+  RulesService,
+  DEFAULT_REPOS
 };

package/src/server/services/skill-service.js

@@ -13,10 +13,17 @@ const http = require('http');
 const { createWriteStream } = require('fs');
 const { pipeline } = require('stream/promises');
 const AdmZip = require('adm-zip');
+const {
+  parseSkillContent,
+  detectSkillFormat,
+  convertSkillToCodex,
+  convertSkillToClaude
+} = require('./format-converter');
 
 // 默认仓库源 - 只预设官方仓库，其他由用户手动添加
+// directory 字段支持指定仓库子目录
 const DEFAULT_REPOS = [
-  { owner: 'anthropics', name: 'skills', branch: 'main', enabled: true }
+  { owner: 'anthropics', name: 'skills', branch: 'main', directory: '', enabled: true }
 ];
 
 // 缓存有效期（5分钟）
@@ -70,10 +77,21 @@ class SkillService {
 
   /**
    * 添加仓库
+   * @param {Object} repo - 仓库配置
+   * @param {string} repo.owner - 仓库所有者
+   * @param {string} repo.name - 仓库名称
+   * @param {string} repo.branch - 分支名称
+   * @param {string} [repo.directory] - 扫描的子目录路径（可选）
+   * @param {boolean} repo.enabled - 是否启用
    */
   addRepo(repo) {
     const repos = this.loadRepos();
-    const existingIndex = repos.findIndex(r => r.owner === repo.owner && r.name === repo.name);
+    // 使用 owner/name/directory 作为唯一标识
+    const existingIndex = repos.findIndex(r =>
+      r.owner === repo.owner &&
+      r.name === repo.name &&
+      (r.directory || '') === (repo.directory || '')
+    );
 
     if (existingIndex >= 0) {
       repos[existingIndex] = repo;
@@ -82,28 +100,52 @@ class SkillService {
     }
 
     this.saveRepos(repos);
+    // 清除缓存
+    this.skillsCache = null;
+    this.cacheTime = 0;
     return repos;
   }
 
   /**
    * 删除仓库
+   * @param {string} owner - 仓库所有者
+   * @param {string} name - 仓库名称
+   * @param {string} [directory=''] - 子目录路径
    */
-  removeRepo(owner, name) {
+  removeRepo(owner, name, directory = '') {
     const repos = this.loadRepos();
-    const filtered = repos.filter(r => !(r.owner === owner && r.name === name));
+    const filtered = repos.filter(r => !(
+      r.owner === owner &&
+      r.name === name &&
+      (r.directory || '') === directory
+    ));
     this.saveRepos(filtered);
+    // 清除缓存
+    this.skillsCache = null;
+    this.cacheTime = 0;
     return filtered;
   }
 
   /**
    * 切换仓库启用状态
+   * @param {string} owner - 仓库所有者
+   * @param {string} name - 仓库名称
+   * @param {string} [directory=''] - 子目录路径
+   * @param {boolean} enabled - 是否启用
    */
-  toggleRepo(owner, name, enabled) {
+  toggleRepo(owner, name, directory = '', enabled) {
     const repos = this.loadRepos();
-    const repo = repos.find(r => r.owner === owner && r.name === name);
+    const repo = repos.find(r =>
+      r.owner === owner &&
+      r.name === name &&
+      (r.directory || '') === directory
+    );
     if (repo) {
       repo.enabled = enabled;
       this.saveRepos(repos);
+      // 清除缓存
+      this.skillsCache = null;
+      this.cacheTime = 0;
     }
     return repos;
   }
@@ -229,6 +271,7 @@ class SkillService {
 
   /**
    * 从 GitHub 仓库获取技能列表（使用 Tree API 一次性获取）
+   * 支持指定子目录扫描
    */
   async fetchRepoSkills(repo) {
     const skills = [];
@@ -243,10 +286,21 @@ class SkillService {
         return skills;
       }
 
-      // 找到所有 SKILL.md 文件
-      const skillFiles = tree.tree.filter(item =>
-        item.type === 'blob' && item.path.endsWith('/SKILL.md')
-      );
+      // 获取基础目录（如果配置了 directory）
+      const baseDir = repo.directory || '';
+      const baseDirPrefix = baseDir ? `${baseDir}/` : '';
+
+      // 找到所有 SKILL.md 文件（如果配置了子目录，只扫描该目录下的）
+      const skillFiles = tree.tree.filter(item => {
+        if (item.type !== 'blob' || !item.path.endsWith('/SKILL.md')) {
+          return false;
+        }
+        // 如果配置了子目录，只返回该子目录下的文件
+        if (baseDir && !item.path.startsWith(baseDirPrefix)) {
+          return false;
+        }
+        return true;
+      });
 
       // 并行获取所有 SKILL.md 的内容（限制并发数）
       const batchSize = 5;
@@ -254,7 +308,7 @@ class SkillService {
       for (let i = 0; i < skillFiles.length; i += batchSize) {
         const batch = skillFiles.slice(i, i + batchSize);
         const results = await Promise.allSettled(
-          batch.map(file => this.fetchAndParseSkill(file, repo))
+          batch.map(file => this.fetchAndParseSkill(file, repo, baseDir))
         );
 
         for (const result of results) {
@@ -273,26 +327,34 @@ class SkillService {
 
   /**
    * 获取并解析单个 SKILL.md
+   * @param {Object} file - GitHub tree 文件对象
+   * @param {Object} repo - 仓库配置
+   * @param {string} baseDir - 基础目录（用于计算相对路径）
    */
-  async fetchAndParseSkill(file, repo) {
+  async fetchAndParseSkill(file, repo, baseDir = '') {
     try {
       // 从路径提取目录名 (e.g., "algorithmic-art/SKILL.md" -> "algorithmic-art")
-      const directory = file.path.replace(/\/SKILL\.md$/, '');
+      const fullDirectory = file.path.replace(/\/SKILL\.md$/, '');
+
+      // 计算相对于 baseDir 的目录名（用于显示和安装）
+      const directory = baseDir ? fullDirectory.slice(baseDir.length + 1) : fullDirectory;
 
       // 使用 raw.githubusercontent.com 获取文件内容（不消耗 API 限额）
       const content = await this.fetchBlobContent(file.sha, repo, file.path);
       const metadata = this.parseSkillMd(content);
 
       return {
-        key: `${repo.owner}/${repo.name}:${directory}`,
+        key: `${repo.owner}/${repo.name}:${fullDirectory}`,
         name: metadata.name || directory.split('/').pop(),
         description: metadata.description || '',
-        directory,
+        directory,  // 相对目录（用于安装）
+        fullDirectory,  // 完整目录（用于从仓库下载）
         installed: this.isInstalled(directory),
-        readmeUrl: `https://github.com/${repo.owner}/${repo.name}/tree/${repo.branch}/${directory}`,
+        readmeUrl: `https://github.com/${repo.owner}/${repo.name}/tree/${repo.branch}/${fullDirectory}`,
         repoOwner: repo.owner,
         repoName: repo.name,
         repoBranch: repo.branch,
+        repoDirectory: repo.directory || '',  // 仓库配置的子目录
         license: metadata.license
       };
     } catch (err) {
@@ -545,55 +607,40 @@ class SkillService {
   }
 
   /**
-   * 解析 SKILL.md 文件
+   * 解析 SKILL.md 文件（支持 Claude Code 和 Codex CLI 格式）
    */
   parseSkillMd(content) {
-    const result = {
-      name: null,
-      description: null,
-      license: null,
-      allowedTools: [],
-      metadata: {}
+    // 使用格式转换器统一解析
+    const parsed = parseSkillContent(content);
+
+    return {
+      name: parsed.name || null,
+      description: parsed.description || null,
+      license: parsed.license || null,
+      allowedTools: parsed.allowedTools ? [parsed.allowedTools] : [],
+      metadata: parsed.metadata || {},
+      shortDescription: parsed.shortDescription || null,
+      format: parsed.format
     };
+  }
 
-    // 移除 BOM
-    content = content.trim().replace(/^\uFEFF/, '');
-
-    // 解析 YAML frontmatter
-    const match = content.match(/^---\s*\n([\s\S]*?)\n---/);
-    if (!match) return result;
-
-    const frontmatter = match[1];
-
-    // 简单解析 YAML
-    const lines = frontmatter.split('\n');
-    for (const line of lines) {
-      const colonIndex = line.indexOf(':');
-      if (colonIndex === -1) continue;
-
-      const key = line.slice(0, colonIndex).trim();
-      let value = line.slice(colonIndex + 1).trim();
-
-      // 去除引号
-      if ((value.startsWith('"') && value.endsWith('"')) ||
-          (value.startsWith("'") && value.endsWith("'"))) {
-        value = value.slice(1, -1);
-      }
+  /**
+   * 转换技能格式
+   * @param {string} content - 技能内容
+   * @param {string} targetFormat - 目标格式 ('claude' | 'codex')
+   */
+  convertSkillFormat(content, targetFormat) {
+    const sourceFormat = detectSkillFormat(content);
 
-      switch (key) {
-        case 'name':
-          result.name = value;
-          break;
-        case 'description':
-          result.description = value;
-          break;
-        case 'license':
-          result.license = value;
-          break;
-      }
+    if (sourceFormat === targetFormat) {
+      return { content, warnings: [], format: targetFormat };
     }
 
-    return result;
+    if (targetFormat === 'codex') {
+      return convertSkillToCodex(content);
+    } else {
+      return convertSkillToClaude(content);
+    }
   }
 
   /**
@@ -702,8 +749,11 @@ class SkillService {
 
   /**
    * 安装技能
+   * @param {string} directory - 本地安装目录（相对于 installDir）
+   * @param {Object} repo - 仓库配置
+   * @param {string} [fullDirectory] - 仓库中的完整路径（可选，默认与 directory 相同）
    */
-  async installSkill(directory, repo) {
+  async installSkill(directory, repo, fullDirectory = null) {
     const dest = path.join(this.installDir, directory);
 
     // 已安装则跳过
@@ -711,6 +761,9 @@ class SkillService {
       return { success: true, message: 'Already installed' };
     }
 
+    // 使用 fullDirectory（仓库中的完整路径）或 directory（向后兼容）
+    const sourcePath = fullDirectory || directory;
+
     // 下载仓库 ZIP
     const zipUrl = `https://github.com/${repo.owner}/${repo.name}/archive/refs/heads/${repo.branch}.zip`;
     const tempDir = path.join(os.tmpdir(), `skill-${Date.now()}`);
@@ -736,10 +789,10 @@ class SkillService {
       }
 
       const repoDir = path.join(tempDir, extractedDirs[0]);
-      const sourceDir = path.join(repoDir, directory);
+      const sourceDir = path.join(repoDir, sourcePath);
 
       if (!fs.existsSync(sourceDir)) {
-        throw new Error(`Skill directory not found: ${directory}`);
+        throw new Error(`Skill directory not found: ${sourcePath}`);
       }
 
       // 复制到安装目录

package/src/server/services/workspace-service.js

@@ -4,6 +4,7 @@ const path = require('path');
 const { execSync } = require('child_process');
 const { PATHS } = require('../../config/paths');
 const configTemplatesService = require('./config-templates-service');
+const permissionTemplatesService = require('./permission-templates-service');
 
 // 工作区配置文件路径
 const WORKSPACES_CONFIG = path.join(PATHS.base, 'workspaces.json');
@@ -151,7 +152,7 @@ function getGitWorktrees(repoPath) {
  * @param {Array} options.projects - 项目列表 [{sourcePath, name, createWorktree, branch}]
  */
 function createWorkspace(options) {
-  const { name, description = '', baseDir, projects = [], configTemplateId } = options;
+  const { name, description = '', baseDir, projects = [], configTemplateId, permissionTemplate } = options;
 
   if (!name || name.trim() === '') {
     throw new Error('工作区名称不能为空');
@@ -299,6 +300,55 @@ function createWorkspace(options) {
       }
     }
 
+    // 应用权限模板（如果指定）
+    let permissionInfo = null;
+    if (permissionTemplate) {
+      try {
+        // 从权限模板服务获取模板
+        const template = permissionTemplatesService.getTemplateById(permissionTemplate);
+
+        if (template && template.permissions) {
+          // 为工作区中的每个项目应用权限设置
+          for (const proj of workspaceProjects) {
+            const projSettingsDir = path.join(proj.targetPath, '.claude');
+            const projSettingsFile = path.join(projSettingsDir, 'settings.json');
+
+            // 确保 .claude 目录存在
+            if (!fs.existsSync(projSettingsDir)) {
+              fs.mkdirSync(projSettingsDir, { recursive: true });
+            }
+
+            // 读取现有设置或创建新的
+            let settings = {};
+            if (fs.existsSync(projSettingsFile)) {
+              try {
+                settings = JSON.parse(fs.readFileSync(projSettingsFile, 'utf8'));
+              } catch (e) {
+                settings = {};
+              }
+            }
+
+            // 更新权限设置
+            settings.permissions = {
+              allow: template.permissions.allow || [],
+              deny: template.permissions.deny || []
+            };
+
+            // 保存设置
+            fs.writeFileSync(projSettingsFile, JSON.stringify(settings, null, 2), 'utf8');
+          }
+
+          permissionInfo = {
+            template: permissionTemplate,
+            appliedAt: new Date().toISOString()
+          };
+        }
+      } catch (permError) {
+        console.warn('应用权限模板失败:', permError.message);
+        // 不中断工作区创建流程
+      }
+    }
+
     // 保存工作区配置
     const workspaceId = generateWorkspaceId();
     const workspace = {
@@ -308,6 +358,7 @@ function createWorkspace(options) {
       path: workspacePath,
       projects: workspaceProjects,
       configTemplate: templateInfo,
+      permissionTemplate: permissionInfo,
       createdAt: new Date().toISOString(),
       lastUsed: new Date().toISOString()
     };