@adversity/coding-tool-x 2.2.0 → 2.4.0

package/src/server/api/skills.js

@@ -83,11 +83,13 @@ router.get('/installed', (req, res) => {
 /**
  * 安装技能
  * POST /api/skills/install
- * Body: { directory, repo: { owner, name, branch } }
+ * Body: { directory, fullDirectory, repo: { owner, name, branch } }
+ * - directory: 本地安装目录（相对路径）
+ * - fullDirectory: 仓库中的完整路径（当指定了仓库子目录时使用）
  */
 router.post('/install', async (req, res) => {
   try {
-    const { directory, repo } = req.body;
+    const { directory, fullDirectory, repo } = req.body;
 
     if (!directory) {
       return res.status(400).json({
@@ -103,11 +105,15 @@ router.post('/install', async (req, res) => {
       });
     }
 
-    const result = await skillService.installSkill(directory, {
-      owner: repo.owner,
-      name: repo.name,
-      branch: repo.branch || 'main'
-    });
+    const result = await skillService.installSkill(
+      directory,
+      {
+        owner: repo.owner,
+        name: repo.name,
+        branch: repo.branch || 'main'
+      },
+      fullDirectory || null  // 传递 fullDirectory 用于从仓库子目录下载
+    );
 
     res.json({
       success: true,
@@ -227,11 +233,12 @@ router.get('/repos', (req, res) => {
 /**
  * 添加仓库
  * POST /api/skills/repos
- * Body: { owner, name, branch, enabled }
+ * Body: { owner, name, branch, directory, enabled }
+ * - directory: 可选，指定扫描的子目录路径
  */
 router.post('/repos', (req, res) => {
   try {
-    const { owner, name, branch = 'main', enabled = true } = req.body;
+    const { owner, name, branch = 'main', directory = '', enabled = true } = req.body;
 
     if (!owner || !name) {
       return res.status(400).json({
@@ -240,7 +247,7 @@ router.post('/repos', (req, res) => {
       });
     }
 
-    const repos = skillService.addRepo({ owner, name, branch, enabled });
+    const repos = skillService.addRepo({ owner, name, branch, directory, enabled });
 
     res.json({
       success: true,
@@ -258,11 +265,13 @@ router.post('/repos', (req, res) => {
 /**
  * 删除仓库
  * DELETE /api/skills/repos/:owner/:name
+ * Query: directory - 可选，子目录路径
  */
 router.delete('/repos/:owner/:name', (req, res) => {
   try {
     const { owner, name } = req.params;
-    const repos = skillService.removeRepo(owner, name);
+    const { directory = '' } = req.query;
+    const repos = skillService.removeRepo(owner, name, directory);
 
     res.json({
       success: true,
@@ -280,14 +289,15 @@ router.delete('/repos/:owner/:name', (req, res) => {
 /**
  * 切换仓库启用状态
  * PUT /api/skills/repos/:owner/:name/toggle
- * Body: { enabled }
+ * Body: { enabled, directory }
+ * - directory: 可选，子目录路径
  */
 router.put('/repos/:owner/:name/toggle', (req, res) => {
   try {
     const { owner, name } = req.params;
-    const { enabled } = req.body;
+    const { enabled, directory = '' } = req.body;
 
-    const repos = skillService.toggleRepo(owner, name, enabled);
+    const repos = skillService.toggleRepo(owner, name, directory, enabled);
 
     res.json({
       success: true,
@@ -302,4 +312,46 @@ router.put('/repos/:owner/:name/toggle', (req, res) => {
   }
 });
 
+// ==================== 格式转换 API ====================
+
+/**
+ * 转换技能格式
+ * POST /api/skills/convert
+ * Body: { content, targetFormat }
+ * - content: 技能内容
+ * - targetFormat: 目标格式 ('claude' | 'codex')
+ */
+router.post('/convert', (req, res) => {
+  try {
+    const { content, targetFormat } = req.body;
+
+    if (!content) {
+      return res.status(400).json({
+        success: false,
+        message: '请提供技能内容'
+      });
+    }
+
+    if (!['claude', 'codex'].includes(targetFormat)) {
+      return res.status(400).json({
+        success: false,
+        message: '目标格式必须是 claude 或 codex'
+      });
+    }
+
+    const result = skillService.convertSkillFormat(content, targetFormat);
+
+    res.json({
+      success: true,
+      ...result
+    });
+  } catch (err) {
+    console.error('[Skills API] Convert skill error:', err);
+    res.status(500).json({
+      success: false,
+      message: err.message
+    });
+  }
+});
+
 module.exports = router;

package/src/server/api/workspaces.js

@@ -105,12 +105,38 @@ router.get('/check-git/*', (req, res) => {
   }
 });
 
+/**
+ * GET /api/workspaces/available-projects
+ * 获取所有渠道（Claude/Codex/Gemini）的项目并集
+ */
+router.get('/available-projects', (req, res) => {
+  try {
+    const projects = workspaceService.getAllAvailableProjects();
+    res.json({
+      success: true,
+      data: projects
+    });
+  } catch (error) {
+    res.status(500).json({
+      success: false,
+      message: error.message
+    });
+  }
+});
+
 /**
  * GET /api/workspaces/:id
  * 获取单个工作区详情
  */
-router.get('/:id', (req, res) => {
+// 注意：此路由需要放在所有静态子路由之后，避免把 /available-projects 等路径当成 id
+router.get('/:id', (req, res, next) => {
   try {
+    // 兜底：即便路由顺序被改动，也避免把保留路径当成工作区 ID
+    const reservedIds = new Set(['available-projects', 'read-file']);
+    if (reservedIds.has(req.params.id)) {
+      return next();
+    }
+
     const workspace = workspaceService.getWorkspace(req.params.id);
     if (!workspace) {
       return res.status(404).json({
@@ -147,7 +173,7 @@ router.get('/:id', (req, res) => {
  */
 router.post('/', (req, res) => {
   try {
-    const { name, description, baseDir, projects, configTemplateId } = req.body;
+    const { name, description, baseDir, projects, configTemplateId, permissionTemplate } = req.body;
 
     if (!name || !name.trim()) {
       return res.status(400).json({
@@ -185,7 +211,8 @@ router.post('/', (req, res) => {
       description,
       baseDir,
       projects,
-      configTemplateId
+      configTemplateId,
+      permissionTemplate
     });
 
     res.json({
@@ -322,25 +349,6 @@ router.delete('/:id/projects/:projectName', (req, res) => {
   }
 });
 
-/**
- * GET /api/workspaces/available-projects
- * 获取所有渠道（Claude/Codex/Gemini）的项目并集
- */
-router.get('/available-projects', (req, res) => {
-  try {
-    const projects = workspaceService.getAllAvailableProjects();
-    res.json({
-      success: true,
-      data: projects
-    });
-  } catch (error) {
-    res.status(500).json({
-      success: false,
-      message: error.message
-    });
-  }
-});
-
 /**
  * POST /api/workspaces/:id/launch
  * 获取在工作区启动 CLI 工具的命令
@@ -371,37 +379,4 @@ router.post('/:id/launch', (req, res) => {
   }
 });
 
-/**
- * GET /api/workspaces/check-git/:projectPath
- * 检查项目是否是 git 仓库并获取 worktrees
- */
-router.get('/check-git/*', (req, res) => {
-  try {
-    const projectPath = req.params[0];
-
-    if (!projectPath) {
-      return res.status(400).json({
-        success: false,
-        message: '项目路径不能为空'
-      });
-    }
-
-    const isGit = workspaceService.isGitRepo(projectPath);
-    const worktrees = isGit ? workspaceService.getGitWorktrees(projectPath) : [];
-
-    res.json({
-      success: true,
-      data: {
-        isGitRepo: isGit,
-        worktrees
-      }
-    });
-  } catch (error) {
-    res.status(500).json({
-      success: false,
-      message: error.message
-    });
-  }
-});
-
 module.exports = router;

package/src/server/index.js

@@ -143,6 +143,12 @@ async function startServer(port) {
   // 配置模板 API
   app.use('/api/config-templates', require('./api/config-templates'));
 
+  // 命令执行权限 API
+  app.use('/api/permissions', require('./api/permissions'));
+
+  // 配置导出/导入 API
+  app.use('/api/config-export', require('./api/config-export'));
+
   // 健康检查 API
   app.use('/api/health-check', require('./api/health-check')(config));
 
@@ -256,7 +262,7 @@ function autoRestoreProxies() {
 
 // 启动时执行健康检查
 function performStartupHealthCheck() {
-  const { healthCheckAllProjects, scanLegacySessionFiles } = require('./services/health-check');
+  const { healthCheckAllProjects } = require('./services/health-check');
   const { getProjects } = require('./services/sessions');
 
   try {
@@ -286,16 +292,6 @@ function performStartupHealthCheck() {
       console.log(chalk.green(`   ✓ 所有 ${healthResult.summary.healthy} 个项目状态正常`));
     }
 
-    // 扫描旧文件
-    const legacyResult = scanLegacySessionFiles();
-
-    if (legacyResult.found && legacyResult.projectCount > 0) {
-      console.log(chalk.yellow(`\n   ⚠ 发现 ${legacyResult.projectCount} 个项目的旧会话文件在全局目录`));
-      console.log(chalk.gray('   💡 提示: 可通过 Web UI 或 API 清理这些文件'));
-      console.log(chalk.gray(`      - Web UI: 设置 -> 系统维护 -> 清理旧文件`));
-      console.log(chalk.gray(`      - API: POST /api/health-check/clean-legacy`));
-    }
-
     console.log('');
   } catch (err) {
     console.error(chalk.red('   ✗ 健康检查失败:'), err.message);

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

@@ -5,15 +5,21 @@
  * 代理目录:
  * - 用户级: ~/.claude/agents/
  * - 项目级: .claude/agents/
+ *
+ * 支持从 GitHub 仓库扫描和安装代理
  */
 
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const { RepoScannerBase } = require('./repo-scanner-base');
 
 // 代理目录路径
 const USER_AGENTS_DIR = path.join(os.homedir(), '.claude', 'agents');
 
+// 默认仓库源
+const DEFAULT_REPOS = [];
+
 /**
  * 确保目录存在
  */
@@ -154,12 +160,97 @@ function scanAgentsDir(dir, basePath, scope) {
   return agents;
 }
 
+/**
+ * Agents 仓库扫描器
+ */
+class AgentsRepoScanner extends RepoScannerBase {
+  constructor() {
+    super({
+      type: 'agents',
+      installDir: USER_AGENTS_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 content = await this.fetchRawContent(repo, file.path);
+      const { frontmatter, body } = this.parseFrontmatter(content);
+
+      return {
+        key: `${repo.owner}/${repo.name}:${relativePath}`,
+        name: frontmatter.name || fileName,
+        fileName,
+        scope: 'remote',
+        path: relativePath,
+        repoPath: file.path,
+        description: frontmatter.description || '',
+        tools: frontmatter.tools || '',
+        model: frontmatter.model || '',
+        permissionMode: frontmatter.permissionMode || '',
+        skills: frontmatter.skills || '',
+        systemPrompt: body,
+        fullContent: content,
+        installed: this.isInstalled(fileName),
+        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(`[AgentsRepoScanner] Parse agent ${file.path} error:`, err.message);
+      return null;
+    }
+  }
+
+  /**
+   * 检查代理是否已安装
+   */
+  isInstalled(fileName) {
+    const fullPath = path.join(this.installDir, `${fileName}.md`);
+    return fs.existsSync(fullPath);
+  }
+
+  /**
+   * 获取去重 key
+   */
+  getDedupeKey(item) {
+    return item.fileName.toLowerCase();
+  }
+
+  /**
+   * 安装代理
+   */
+  async installAgent(item) {
+    const repo = {
+      owner: item.repoOwner,
+      name: item.repoName,
+      branch: item.repoBranch
+    };
+
+    // 代理安装到根目录，使用文件名
+    return this.installFromRepo(item.repoPath, repo, `${item.fileName}.md`);
+  }
+}
+
 /**
  * Agents 服务类
  */
 class AgentsService {
   constructor() {
     this.userAgentsDir = USER_AGENTS_DIR;
+    this.repoScanner = new AgentsRepoScanner();
     ensureDir(this.userAgentsDir);
   }
 
@@ -192,6 +283,48 @@ class AgentsService {
     };
   }
 
+  /**
+   * 获取所有代理（包括远程仓库）
+   */
+  async listAllAgents(projectPath = null, forceRefresh = false) {
+    // 获取本地代理
+    const { agents: localAgents, userCount, projectCount } = this.listAgents(projectPath);
+
+    // 获取远程代理
+    let remoteAgents = [];
+    try {
+      remoteAgents = await this.repoScanner.listRemoteItems(forceRefresh);
+
+      // 更新安装状态
+      for (const agent of remoteAgents) {
+        agent.installed = this.repoScanner.isInstalled(agent.fileName);
+      }
+    } catch (err) {
+      console.warn('[AgentsService] Failed to fetch remote agents:', err.message);
+    }
+
+    // 合并列表（本地优先）
+    const allAgents = [...localAgents];
+    const localKeys = new Set(localAgents.map(a => a.fileName.toLowerCase()));
+
+    for (const remote of remoteAgents) {
+      if (!localKeys.has(remote.fileName.toLowerCase())) {
+        allAgents.push(remote);
+      }
+    }
+
+    // 排序
+    allAgents.sort((a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase()));
+
+    return {
+      agents: allAgents,
+      total: allAgents.length,
+      userCount,
+      projectCount,
+      remoteCount: remoteAgents.length
+    };
+  }
+
   /**
    * 获取单个代理详情
    */
@@ -347,8 +480,53 @@ class AgentsService {
       models
     };
   }
+
+  // ==================== 仓库管理 ====================
+
+  /**
+   * 获取仓库列表
+   */
+  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(agent) {
+    return this.repoScanner.installAgent(agent);
+  }
+
+  /**
+   * 卸载代理
+   */
+  uninstallAgent(fileName) {
+    return this.repoScanner.uninstall(`${fileName}.md`);
+  }
 }
 
 module.exports = {
-  AgentsService
+  AgentsService,
+  DEFAULT_REPOS
 };