ai-helper-agent 1.3.4 → 1.4.0

package/src/server.js

@@ -12,6 +12,34 @@ import { checkPath, checkCommand } from './security.js';
 import { executeCommand, executeCommandSync, addWsClient, killProcess, getRunningProcesses } from './executor.js';
 import { setConsoleOutput, logAuth, logFs, logExec, logSecurity, logSystem, logError, queryLogs, getLogDates } from './logger.js';
 import { initSearchTools, getSearchToolsAvailable, searchFiles, searchContent } from './search.js';
+import {
+  initializeMcpRegistry,
+  shutdownMcpRegistry,
+  getMcpServersStatus,
+  getMcpTools,
+  callMcpTool,
+  connectMcpServer,
+  disconnectMcpServer,
+  loadMcpConfig,
+  addMcpServer,
+  removeMcpServer,
+  toggleMcpServer
+} from './mcp/registry.js';
+import {
+  initializeSkillRegistry,
+  getSkillList,
+  getSkill,
+  toggleSkill,
+  runSkill,
+  importSkill,
+  removeSkill,
+  reloadSkills,
+  getAgentSkillPrompts,
+  getAgentSkillPrompt,
+  getSkillsDir
+} from './skill/registry.js';
+import { getSkillExecutionStatus } from './skill/executor.js';
+import { saveMarkdownSkill, importMarkdownSkillFromZip, importMarkdownSkillFromUrl } from './skill/loader.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const AGENT_VERSION = JSON.parse(readFileSync(join(__dirname, '..', 'package.json'), 'utf-8')).version;
@@ -196,7 +224,7 @@ export function startServer() {
       });
     }
 
-    if (req.method === 'POST') {
+    if (['POST', 'PUT', 'DELETE'].includes(req.method)) {
       let body;
       try { body = await parseBody(req); }
       catch (err) { return jsonResponse(res, 400, { success: false, error: err.message }); }
@@ -411,6 +439,184 @@ export function startServer() {
         logExec('stopped', { execId: body.execId, success: stopped });
         return jsonResponse(res, 200, { success: stopped, execId: body.execId });
       }
+
+      // === Skill 操作（需要 body） ===
+
+      // 执行 Skill
+      if (pathname === '/api/skill/run') {
+        if (!body.name) return jsonResponse(res, 400, { success: false, error: '缺少 name 参数' });
+        const result = await runSkill(body.name, body.params || {});
+        logSystem('skill_run', { skillName: body.name, success: result.success });
+        return jsonResponse(res, result.success ? 200 : 400, result);
+      }
+
+      // 导入 Skill
+      if (pathname === '/api/skill/import') {
+        if (!body.name || !body.steps) {
+          return jsonResponse(res, 400, { success: false, error: '缺少必要参数: name, steps' });
+        }
+        const result = await importSkill(body);
+        logSystem('skill_import', { skillName: body.name });
+        return jsonResponse(res, result.success ? 200 : 400, result);
+      }
+
+      // 删除 Skill
+      if (pathname === '/api/skill/delete') {
+        if (!body.name) return jsonResponse(res, 400, { success: false, error: '缺少 name 参数' });
+        const result = await removeSkill(body.name);
+        logSystem('skill_remove', { skillName: body.name });
+        return jsonResponse(res, result.success ? 200 : 400, result);
+      }
+
+      // 切换 Skill 启用/停用
+      if (pathname === '/api/skill/toggle') {
+        if (!body.name) return jsonResponse(res, 400, { success: false, error: '缺少 name 参数' });
+        const result = toggleSkill(body.name);
+        logSystem('skill_toggle', { skillName: body.name, enabled: result.enabled });
+        return jsonResponse(res, result.success ? 200 : 400, result);
+      }
+
+      // 重新加载 Skill
+      if (pathname === '/api/skill/reload') {
+        const count = await reloadSkills();
+        logSystem('skill_reload', { count });
+        return jsonResponse(res, 200, { success: true, count });
+      }
+
+      // === Agent Skill Markdown 管理 ===
+
+      // 创建/更新 Agent Skill Markdown
+      if (pathname === '/api/skill/save-markdown') {
+        if (!body.name) {
+          return jsonResponse(res, 400, { success: false, error: '缺少 name 参数' });
+        }
+        if (!body.markdown && !body.prompt) {
+          return jsonResponse(res, 400, { success: false, error: '缺少 markdown/prompt 参数' });
+        }
+        // 检查是否为不可编辑的内置技能
+        const { skills: skillsMap } = await import('./skill/registry.js');
+        const existingSkill = skillsMap.get(body.name);
+        if (existingSkill?.builtin && existingSkill?.editable === false) {
+          return jsonResponse(res, 403, { success: false, error: `"${body.name}" 是内置技能，不可编辑` });
+        }
+        const skillDef = {
+          type: 'agent',
+          name: body.name,
+          description: body.description || '',
+          version: body.version || '1.0',
+          enabled: body.enabled !== false,
+          fullPrompt: body.markdown || body.prompt || '',
+          prompt: body.markdown || body.prompt || ''
+        };
+        const result = saveMarkdownSkill(getSkillsDir(), skillDef);
+        if (result.success) {
+          // 重新注册
+          const { loadMarkdownSkill } = await import('./skill/markdown-loader.js');
+          const skill = loadMarkdownSkill(result.dirPath);
+          if (skill) {
+            skillsMap.set(skill.name, skill);
+          }
+          logSystem('skill_save_markdown', { skillName: body.name });
+        }
+        return jsonResponse(res, result.success ? 200 : 400, result);
+      }
+
+      // 从 Zip 导入 Agent Skill（base64 编码的 zip 内容）
+      if (pathname === '/api/skill/import-zip') {
+        if (!body.zipData) {
+          return jsonResponse(res, 400, { success: false, error: '缺少 zipData 参数（base64 编码的 zip 内容）' });
+        }
+        try {
+          const zipBuffer = Buffer.from(body.zipData, 'base64');
+          const result = await importMarkdownSkillFromZip(getSkillsDir(), zipBuffer, body.name);
+          if (result.success && result.skill) {
+            const { skills } = await import('./skill/registry.js');
+            skills.set(result.skill.name, result.skill);
+            logSystem('skill_import_zip', { skillName: result.skill.name });
+          }
+          return jsonResponse(res, result.success ? 200 : 400, result);
+        } catch (err) {
+          return jsonResponse(res, 400, { success: false, error: `Zip 导入失败: ${err.message}` });
+        }
+      }
+
+      // 从 URL 导入 Agent Skill
+      if (pathname === '/api/skill/import-url') {
+        if (!body.url) {
+          return jsonResponse(res, 400, { success: false, error: '缺少 url 参数' });
+        }
+        try {
+          const result = await importMarkdownSkillFromUrl(getSkillsDir(), body.url);
+          if (result.success && result.skill) {
+            const { skills } = await import('./skill/registry.js');
+            skills.set(result.skill.name, result.skill);
+            logSystem('skill_import_url', { skillName: result.skill.name, url: body.url });
+          }
+          return jsonResponse(res, result.success ? 200 : 400, result);
+        } catch (err) {
+          return jsonResponse(res, 400, { success: false, error: `URL 导入失败: ${err.message}` });
+        }
+      }
+
+      // === MCP 操作（需要 body） ===
+
+      // 添加 MCP 服务器
+      if (pathname === '/api/mcp/servers' && req.method === 'POST') {
+        if (!body.id || !body.command) {
+          return jsonResponse(res, 400, { success: false, error: '缺少必要参数: id, command' });
+        }
+        const result = await addMcpServer(body);
+        logSystem('mcp_server_add', { serverId: body.id });
+        return jsonResponse(res, result.success ? 200 : 400, result);
+      }
+
+      // 删除 MCP 服务器
+      if (pathname === '/api/mcp/servers' && req.method === 'DELETE') {
+        if (!body.id) return jsonResponse(res, 400, { success: false, error: '缺少 id 参数' });
+        const result = await removeMcpServer(body.id);
+        logSystem('mcp_server_remove', { serverId: body.id });
+        return jsonResponse(res, result.success ? 200 : 400, result);
+      }
+
+      // MCP 连接
+      if (pathname === '/api/mcp/servers/connect') {
+        if (!body.id) return jsonResponse(res, 400, { success: false, error: '缺少 id 参数' });
+        const result = await connectMcpServer(body.id);
+        logSystem('mcp_server_connect', { serverId: body.id, success: result.success });
+        return jsonResponse(res, result.success ? 200 : 500, result);
+      }
+
+      // MCP 断开
+      if (pathname === '/api/mcp/servers/disconnect') {
+        if (!body.id) return jsonResponse(res, 400, { success: false, error: '缺少 id 参数' });
+        const result = await disconnectMcpServer(body.id);
+        logSystem('mcp_server_disconnect', { serverId: body.id });
+        return jsonResponse(res, 200, result);
+      }
+
+      // MCP 启用/禁用切换
+      if (pathname === '/api/mcp/servers/toggle') {
+        if (body.id === undefined || body.enabled === undefined) {
+          return jsonResponse(res, 400, { success: false, error: '缺少参数: id, enabled' });
+        }
+        // 禁用时先断开连接，确保工具立即可用/不可用
+        if (!body.enabled) {
+          await disconnectMcpServer(body.id);
+        }
+        const result = await toggleMcpServer(body.id, body.enabled);
+        logSystem('mcp_server_toggle', { serverId: body.id, enabled: body.enabled });
+        return jsonResponse(res, result.success ? 200 : 400, result);
+      }
+
+      // MCP 工具调用
+      if (pathname === '/api/mcp/call') {
+        if (!body.serverId || !body.toolName) {
+          return jsonResponse(res, 400, { success: false, error: '缺少参数: serverId, toolName' });
+        }
+        const result = await callMcpTool(body.serverId, body.toolName, body.args || {});
+        logSystem('mcp_tool_call', { serverId: body.serverId, toolName: body.toolName, success: result.success });
+        return jsonResponse(res, result.success ? 200 : 500, result);
+      }
     }
 
     // 运行中进程列表（需认证）
@@ -434,6 +640,104 @@ export function startServer() {
       return jsonResponse(res, 200, { success: true, dates: getLogDates() });
     }
 
+    // ========== Skill 管理接口（仅 GET 路由） ==========
+
+    // Skill 列表
+    if (req.method === 'GET' && pathname === '/api/skill/list') {
+      return jsonResponse(res, 200, getSkillList());
+    }
+
+    // Skill 详情
+    if (req.method === 'GET' && pathname === '/api/skill/detail') {
+      const name = url.searchParams.get('name');
+      if (!name) return jsonResponse(res, 400, { success: false, error: '缺少 name 参数' });
+      return jsonResponse(res, 200, getSkill(name));
+    }
+
+    // Skill 执行状态查询
+    if (req.method === 'GET' && pathname === '/api/skill/status') {
+      const execId = url.searchParams.get('execId');
+      if (!execId) return jsonResponse(res, 400, { success: false, error: '缺少 execId 参数' });
+      return jsonResponse(res, 200, getSkillExecutionStatus(execId));
+    }
+
+    // Agent Skill Prompts（用于 AI System Prompt 注入）
+    if (req.method === 'GET' && pathname === '/api/skill/agent-prompts') {
+      const prompts = getAgentSkillPrompts();
+      return jsonResponse(res, 200, { success: true, prompts });
+    }
+
+    // 按需加载单个 Agent Skill 的完整内容
+    if (req.method === 'GET' && pathname === '/api/skill/agent-prompt') {
+      const skillName = url.searchParams.get('name');
+      if (!skillName) return jsonResponse(res, 400, { success: false, error: '缺少 name 参数' });
+      const result = getAgentSkillPrompt(skillName);
+      return jsonResponse(res, result.success ? 200 : 404, result);
+    }
+
+    // Agent Skill 的 SKILL.md 内容
+    if (req.method === 'GET' && pathname === '/api/skill/markdown') {
+      const name = url.searchParams.get('name');
+      if (!name) return jsonResponse(res, 400, { success: false, error: '缺少 name 参数' });
+      const result = getSkill(name);
+      if (!result.success) return jsonResponse(res, 404, result);
+      const skill = result.skill;
+      if (skill.type !== 'agent') {
+        return jsonResponse(res, 400, { success: false, error: '该 Skill 不是 Agent 类型' });
+      }
+      return jsonResponse(res, 200, {
+        success: true,
+        name: skill.name,
+        markdown: skill.fullPrompt || skill.prompt || '',
+        frontmatter: {
+          name: skill.name,
+          description: skill.description,
+          version: skill.version,
+          enabled: skill.enabled
+        },
+        resources: skill.resources || [],
+        dirPath: skill.dirPath
+      });
+    }
+
+    // Skill 资源文件内容
+    if (req.method === 'GET' && pathname === '/api/skill/resource') {
+      const name = url.searchParams.get('name');
+      const resource = url.searchParams.get('resource');
+      if (!name || !resource) {
+        return jsonResponse(res, 400, { success: false, error: '缺少 name 或 resource 参数' });
+      }
+      const result = getSkill(name);
+      if (!result.success) return jsonResponse(res, 404, result);
+      const skill = result.skill;
+      if (skill.type !== 'agent') {
+        return jsonResponse(res, 400, { success: false, error: '该 Skill 不是 Agent 类型' });
+      }
+      const resInfo = skill.resources?.find(r => r.name === resource);
+      if (!resInfo) {
+        return jsonResponse(res, 404, { success: false, error: `资源 "${resource}" 不存在` });
+      }
+      try {
+        const content = readFileSync(resInfo.path, 'utf-8');
+        return jsonResponse(res, 200, { success: true, name: resource, content, size: resInfo.size });
+      } catch (err) {
+        return jsonResponse(res, 500, { success: false, error: `读取资源失败: ${err.message}` });
+      }
+    }
+
+    // ========== MCP 管理接口（仅 GET 路由） ==========
+
+    // MCP Servers 列表
+    if (req.method === 'GET' && pathname === '/api/mcp/servers') {
+      return jsonResponse(res, 200, getMcpServersStatus());
+    }
+
+    // MCP 工具列表
+    if (req.method === 'GET' && pathname === '/api/mcp/tools') {
+      const serverId = url.searchParams.get('serverId') || undefined;
+      return jsonResponse(res, 200, getMcpTools(serverId));
+    }
+
     // 404
     jsonResponse(res, 404, { success: false, error: '未知的 API 路径' });
   }
@@ -489,10 +793,25 @@ export function startServer() {
     }
   });
 
-  server.listen(port, host, () => {
+  server.listen(port, host, async () => {
     console.log(`[Agent] HTTP 服务已启动: http://${host}:${port}`);
     console.log(`[Agent] WebSocket 服务已启动: ws://${host}:${port}`);
     startPairCodeRotation();
+
+    // 初始化 MCP 注册表（异步，不阻塞请求）
+    try {
+      await initializeMcpRegistry();
+    } catch (err) {
+      console.error('[Agent] MCP 注册表初始化失败:', err.message);
+    }
+
+    // 初始化 Skill 注册表
+    try {
+      const skillCount = initializeSkillRegistry();
+      console.log(`[Agent] Skill 注册表已初始化: ${skillCount} 个 Skill`);
+    } catch (err) {
+      console.error('[Agent] Skill 注册表初始化失败:', err.message);
+    }
   });
 
   // 优雅关闭（异步 + 防并发）
@@ -507,6 +826,9 @@ export function startServer() {
       killProcess(entry.execId);
     }
 
+    // 关闭所有 MCP 连接
+    try { shutdownMcpRegistry(); } catch {}
+
     // 等待 server 和 wss 关闭
     await Promise.all([
       new Promise(resolve => server.close(resolve)),