@adversity/coding-tool-x 2.2.0 → 2.3.0

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,9 @@ 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/health-check', require('./api/health-check')(config));
 

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
 };

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

@@ -5,15 +5,28 @@
  * 命令目录:
  * - 用户级: ~/.claude/commands/
  * - 项目级: .claude/commands/
+ *
+ * 支持从 GitHub 仓库扫描和安装命令
  */
 
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const { RepoScannerBase } = require('./repo-scanner-base');
+const {
+  parseCommandContent,
+  detectCommandFormat,
+  convertCommandToCodex,
+  convertCommandToClaude,
+  parseFrontmatter
+} = require('./format-converter');
 
 // 命令目录路径
 const USER_COMMANDS_DIR = path.join(os.homedir(), '.claude', 'commands');
 
+// 默认仓库源
+const DEFAULT_REPOS = [];
+
 /**
  * 确保目录存在
  */
@@ -24,51 +37,9 @@ function ensureDir(dirPath) {
 }
 
 /**
- * 解析 YAML frontmatter
+ * 生成 frontmatter 字符串（用于命令创建/更新）
  */
-function parseFrontmatter(content) {
-  const result = {
-    frontmatter: {},
-    body: content
-  };
-
-  // 移除 BOM
-  content = content.trim().replace(/^\uFEFF/, '');
-
-  // 解析 YAML frontmatter
-  const match = content.match(/^---\s*\n([\s\S]*?)\n---\s*\n?([\s\S]*)$/);
-  if (!match) {
-    return result;
-  }
-
-  const frontmatterText = match[1];
-  result.body = match[2].trim();
-
-  // 简单解析 YAML（支持基本字段）
-  const lines = frontmatterText.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);
-    }
-
-    result.frontmatter[key] = value;
-  }
-
-  return result;
-}
-
-/**
- * 生成 frontmatter 字符串
- */
-function generateFrontmatter(data) {
+function generateCommandFrontmatter(data) {
   const lines = ['---'];
 
   if (data.description) {
@@ -80,6 +51,15 @@ function generateFrontmatter(data) {
   if (data['argument-hint']) {
     lines.push(`argument-hint: ${data['argument-hint']}`);
   }
+  if (data.model) {
+    lines.push(`model: ${data.model}`);
+  }
+  if (data.context) {
+    lines.push(`context: ${data.context}`);
+  }
+  if (data.agent) {
+    lines.push(`agent: ${data.agent}`);
+  }
 
   lines.push('---');
   return lines.join('\n');
@@ -141,12 +121,96 @@ function scanCommandsDir(dir, basePath, scope) {
   return commands;
 }
 
+/**
+ * Commands 仓库扫描器
+ */
+class CommandsRepoScanner extends RepoScannerBase {
+  constructor() {
+    super({
+      type: 'commands',
+      installDir: USER_COMMANDS_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 namespace = 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,
+        namespace: namespace === '.' ? null : namespace,
+        scope: 'remote',
+        path: relativePath,
+        repoPath: file.path,
+        description: frontmatter.description || '',
+        allowedTools: frontmatter['allowed-tools'] || '',
+        argumentHint: frontmatter['argument-hint'] || '',
+        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(`[CommandsRepoScanner] Parse command ${file.path} error:`, err.message);
+      return null;
+    }
+  }
+
+  /**
+   * 检查命令是否已安装
+   */
+  isInstalled(relativePath) {
+    const fullPath = path.join(this.installDir, relativePath);
+    return fs.existsSync(fullPath);
+  }
+
+  /**
+   * 获取去重 key
+   */
+  getDedupeKey(item) {
+    // 使用 namespace/name 作为去重 key
+    return item.namespace ? `${item.namespace}/${item.name}`.toLowerCase() : item.name.toLowerCase();
+  }
+
+  /**
+   * 安装命令
+   */
+  async installCommand(item) {
+    const repo = {
+      owner: item.repoOwner,
+      name: item.repoName,
+      branch: item.repoBranch
+    };
+
+    return this.installFromRepo(item.repoPath, repo, item.path);
+  }
+}
+
 /**
  * Commands 服务类
  */
 class CommandsService {
   constructor() {
     this.userCommandsDir = USER_COMMANDS_DIR;
+    this.repoScanner = new CommandsRepoScanner();
     ensureDir(this.userCommandsDir);
   }
 
@@ -179,6 +243,52 @@ class CommandsService {
     };
   }
 
+  /**
+   * 获取所有命令（包括远程仓库）
+   * @param {boolean} forceRefresh - 强制刷新远程缓存
+   */
+  async listAllCommands(projectPath = null, forceRefresh = false) {
+    // 获取本地命令
+    const { commands: localCommands, userCount, projectCount } = this.listCommands(projectPath);
+
+    // 获取远程命令
+    let remoteCommands = [];
+    try {
+      remoteCommands = await this.repoScanner.listRemoteItems(forceRefresh);
+
+      // 更新安装状态
+      for (const cmd of remoteCommands) {
+        cmd.installed = this.repoScanner.isInstalled(cmd.path);
+      }
+    } catch (err) {
+      console.warn('[CommandsService] Failed to fetch remote commands:', err.message);
+    }
+
+    // 合并列表（本地优先）
+    const allCommands = [...localCommands];
+    const localKeys = new Set(localCommands.map(c =>
+      c.namespace ? `${c.namespace}/${c.name}`.toLowerCase() : c.name.toLowerCase()
+    ));
+
+    for (const remote of remoteCommands) {
+      const key = remote.namespace ? `${remote.namespace}/${remote.name}`.toLowerCase() : remote.name.toLowerCase();
+      if (!localKeys.has(key)) {
+        allCommands.push(remote);
+      }
+    }
+
+    // 排序
+    allCommands.sort((a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase()));
+
+    return {
+      commands: allCommands,
+      total: allCommands.length,
+      userCount,
+      projectCount,
+      remoteCount: remoteCommands.length
+    };
+  }
+
   /**
    * 获取单个命令详情
    */
@@ -250,7 +360,7 @@ class CommandsService {
 
     let content = '';
     if (Object.keys(frontmatterData).length > 0) {
-      content = generateFrontmatter(frontmatterData) + '\n\n';
+      content = generateCommandFrontmatter(frontmatterData) + '\n\n';
     }
     content += body || '';
 
@@ -285,7 +395,7 @@ class CommandsService {
 
     let content = '';
     if (Object.keys(frontmatterData).length > 0) {
-      content = generateFrontmatter(frontmatterData) + '\n\n';
+      content = generateCommandFrontmatter(frontmatterData) + '\n\n';
     }
     content += body || '';
 
@@ -353,8 +463,82 @@ class CommandsService {
       namespaces
     };
   }
+
+  // ==================== 仓库管理 ====================
+
+  /**
+   * 获取仓库列表
+   */
+  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(command) {
+    return this.repoScanner.installCommand(command);
+  }
+
+  /**
+   * 卸载命令
+   */
+  uninstallCommand(relativePath) {
+    return this.repoScanner.uninstall(relativePath);
+  }
+
+  // ==================== 格式转换 ====================
+
+  /**
+   * 转换命令格式
+   * @param {string} content - 命令内容
+   * @param {string} targetFormat - 目标格式 ('claude' | 'codex')
+   */
+  convertCommandFormat(content, targetFormat) {
+    const sourceFormat = detectCommandFormat(content);
+
+    if (sourceFormat === targetFormat) {
+      return { content, warnings: [], format: targetFormat };
+    }
+
+    if (targetFormat === 'codex') {
+      return convertCommandToCodex(content);
+    } else {
+      return convertCommandToClaude(content);
+    }
+  }
+
+  /**
+   * 检测命令格式
+   * @param {string} content - 命令内容
+   */
+  detectFormat(content) {
+    return detectCommandFormat(content);
+  }
 }
 
 module.exports = {
-  CommandsService
+  CommandsService,
+  DEFAULT_REPOS
 };