ai-helper-agent 1.7.0 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-helper-agent",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "description": "AI Helper 代理服务 - 为 Chrome 扩展提供本地文件读写和系统命令执行能力",
   "type": "module",
   "main": "./src/server.js",

package/src/config.js

@@ -8,6 +8,7 @@ const CONFIG_FILE = join(AGENT_DIR, 'config.json');
 const PAIRINGS_FILE = join(AGENT_DIR, 'pairings.json');
 const SKILLS_DIR = join(AGENT_DIR, 'skills');
 const WORKSPACE_DIR = join(AGENT_DIR, 'workspace');
+const MEMORY_DIR = join(AGENT_DIR, 'memory');
 
 const DEFAULTS = {
   port: 18910,
@@ -44,8 +45,8 @@ function ensureAgentDir() {
     if (!existsSync(AGENT_DIR)) {
       mkdirSync(AGENT_DIR, { recursive: true });
     }
-    // 确保 skills 和 workspace 子目录存在
-    for (const dir of [SKILLS_DIR, WORKSPACE_DIR]) {
+    // 确保 skills、workspace 和 memory 子目录存在
+    for (const dir of [SKILLS_DIR, WORKSPACE_DIR, MEMORY_DIR]) {
       if (!existsSync(dir)) {
         mkdirSync(dir, { recursive: true });
       }
@@ -198,4 +199,4 @@ export async function savePairing(extensionId, token) {
   });
 }
 
-export { AGENT_DIR, CONFIG_FILE };
+export { AGENT_DIR, CONFIG_FILE, MEMORY_DIR };

package/src/mcp/client.js

@@ -1,5 +1,14 @@
 import { Client } from '@modelcontextprotocol/sdk/client';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
+import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
+import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { WebSocketClientTransport } from '@modelcontextprotocol/sdk/client/websocket.js';
+
+// 支持的传输协议类型
+const TRANSPORT_STDIO = 'stdio';
+const TRANSPORT_SSE = 'sse';
+const TRANSPORT_STREAMABLE_HTTP = 'streamableHttp';
+const TRANSPORT_WEBSOCKET = 'websocket';
 
 export class McpClient {
   constructor(serverConfig) {
@@ -13,17 +22,64 @@ export class McpClient {
     this.serverInfo = null;
   }
 
+  /**
+   * 根据配置创建对应的传输层实例
+   */
+  _createTransport() {
+    const transportType = this.serverConfig.transport || TRANSPORT_STDIO;
+    const headers = this.serverConfig.headers || {};
+
+    switch (transportType) {
+      case TRANSPORT_SSE: {
+        const url = this.serverConfig.url;
+        if (!url) throw new Error('SSE 传输需要提供 url');
+        console.log(`[MCP:${this.serverId}] 使用 SSE 传输，URL: ${url}`);
+        const opts = {};
+        if (Object.keys(headers).length > 0) {
+          opts.requestInit = { headers };
+        }
+        return new SSEClientTransport(new URL(url), opts);
+      }
+
+      case TRANSPORT_STREAMABLE_HTTP: {
+        const url = this.serverConfig.url;
+        if (!url) throw new Error('StreamableHTTP 传输需要提供 url');
+        console.log(`[MCP:${this.serverId}] 使用 StreamableHTTP 传输，URL: ${url}`);
+        const opts = {};
+        if (Object.keys(headers).length > 0) {
+          opts.requestInit = { headers };
+        }
+        return new StreamableHTTPClientTransport(new URL(url), opts);
+      }
+
+      case TRANSPORT_WEBSOCKET: {
+        const url = this.serverConfig.url;
+        if (!url) throw new Error('WebSocket 传输需要提供 url');
+        console.log(`[MCP:${this.serverId}] 使用 WebSocket 传输，URL: ${url}`);
+        return new WebSocketClientTransport(new URL(url));
+      }
+
+      case TRANSPORT_STDIO:
+      default: {
+        const command = this.serverConfig.command;
+        if (!command) throw new Error('stdio 传输需要提供 command');
+        console.log(`[MCP:${this.serverId}] 使用 stdio 传输，命令: ${command}`);
+        return new StdioClientTransport({
+          command: this.serverConfig.command,
+          args: this.serverConfig.args || [],
+          env: { ...(this.serverConfig.env || {}) },
+          cwd: this.serverConfig.cwd,
+          stderr: 'pipe'
+        });
+      }
+    }
+  }
+
   async connect() {
     if (this.connected) return { success: true };
 
     try {
-      this.transport = new StdioClientTransport({
-        command: this.serverConfig.command,
-        args: this.serverConfig.args || [],
-        env: { ...(this.serverConfig.env || {}) },
-        cwd: this.serverConfig.cwd,
-        stderr: 'pipe'
-      });
+      this.transport = this._createTransport();
 
       this.client = new Client({
         name: 'ai-helper-agent',

package/src/security.js

@@ -2,7 +2,7 @@
 import { resolve, normalize, sep, isAbsolute, join, dirname } from 'path';
 import { realpathSync } from 'fs';
 import { homedir, platform } from 'os';
-import { loadConfig } from './config.js';
+import { loadConfig, MEMORY_DIR } from './config.js';
 
 const isWin32 = platform() === 'win32';
 
@@ -60,6 +60,13 @@ function checkPath(pathStr) {
     return { allowed: false, reason: '路径无效' };
   }
 
+  // 展开 ~ 到用户主目录（扩展端无法知道 Agent 所在机器的 home 路径）
+  if (pathStr === '~') {
+    pathStr = homedir();
+  } else if (pathStr.startsWith('~/')) {
+    pathStr = join(homedir(), pathStr.slice(2));
+  }
+
   try {
     const config = loadConfig();
 
@@ -74,6 +81,12 @@ function checkPath(pathStr) {
       return { allowed: false, reason: '禁止访问代理系统文件' };
     }
 
+    // 0.5. 系统目录白名单：记忆存储目录（Agent 内部管理，可读写）
+    const memoryPrefix = normalize(join(MEMORY_DIR, sep));
+    if (normalized.startsWith(memoryPrefix) || normalized === normalize(MEMORY_DIR)) {
+      return { allowed: true, resolved: normalized };
+    }
+
     const allowedPaths = config.allowedPaths.length > 0 ? config.allowedPaths.map(p => normalizePathFormat(p)) : [normalizedWorkdir];
 
     // 先做前缀检查（快速路径，兼容 Windows/Unix）

package/src/server.js

@@ -769,8 +769,15 @@ export function startServer() {
 
       // 添加 MCP 服务器
       if (pathname === '/api/mcp/servers' && req.method === 'POST') {
-        if (!body.id || !body.command) {
-          return jsonResponse(res, 400, { success: false, error: '缺少必要参数: id, command' });
+        const isHttp = body.transport === 'sse' || body.transport === 'streamableHttp' || body.transport === 'websocket';
+        if (!body.id) {
+          return jsonResponse(res, 400, { success: false, error: '缺少必要参数: id' });
+        }
+        if (isHttp && !body.url) {
+          return jsonResponse(res, 400, { success: false, error: 'HTTP 传输需要提供 url' });
+        }
+        if (!isHttp && !body.command) {
+          return jsonResponse(res, 400, { success: false, error: 'stdio 传输需要提供 command' });
         }
         const result = await addMcpServer(body);
         logSystem('mcp_server_add', { serverId: body.id });

package/src/skill/registry.js

@@ -12,6 +12,35 @@ const skills = new Map();
 // 内置技能状态持久化文件
 const BUILTIN_STATE_FILE = join(dirname(SKILLS_DIR), 'builtin_skills_state.json');
 
+// 用户停用技能状态持久化文件（比直接写 SKILL.md 更可靠，避免文件写入失败导致状态丢失）
+const DISABLED_STATE_FILE = join(dirname(SKILLS_DIR), 'disabled_skills.json');
+
+/**
+ * 读取用户停用的技能列表
+ * @returns {Set<string>}
+ */
+function loadDisabledState() {
+  try {
+    if (existsSync(DISABLED_STATE_FILE)) {
+      const data = JSON.parse(readFileSync(DISABLED_STATE_FILE, 'utf-8'));
+      return new Set(data.disabled || []);
+    }
+  } catch (e) { /* 忽略 */ }
+  return new Set();
+}
+
+/**
+ * 保存用户停用的技能列表
+ * @param {Set<string>} disabledSet
+ */
+function saveDisabledState(disabledSet) {
+  try {
+    writeFileSync(DISABLED_STATE_FILE, JSON.stringify({ disabled: [...disabledSet] }, null, 2), 'utf-8');
+  } catch (e) {
+    console.error('[Skill Registry] 无法保存停用状态:', e.message);
+  }
+}
+
 /**
  * 读取内置技能的启用状态
  * @returns {Record<string, boolean>} name → enabled
@@ -83,6 +112,15 @@ export function initializeSkillRegistry() {
     }
   }
 
+  // 5. 恢复用户手动停用的技能状态（所有类型，比 SKILL.md frontmatter 更可靠）
+  const disabledSet = loadDisabledState();
+  for (const name of disabledSet) {
+    const skill = skills.get(name);
+    if (skill) {
+      skill.enabled = false;
+    }
+  }
+
   const workflowCount = [...skills.values()].filter(s => s.type === 'workflow').length;
   const agentCount = [...skills.values()].filter(s => s.type === 'agent').length;
   const enabledCount = [...skills.values()].filter(s => s.enabled !== false).length;
@@ -200,6 +238,11 @@ export function getAgentSkillPrompt(name) {
   if (!skill || skill.type !== 'agent') {
     return { success: false, error: `Skill "${name}" 不存在或不是 Agent Skill` };
   }
+  // 如果 skill 有 dirPath，在 prompt 前注入工作目录信息，方便 AI 解析相对路径引用
+  let prompt = skill.fullPrompt || skill.prompt || '';
+  if (skill.dirPath) {
+    prompt = `[技能工作目录: ${skill.dirPath}]\n\n${prompt}`;
+  }
   return {
     success: true,
     skill: {
@@ -208,7 +251,7 @@ export function getAgentSkillPrompt(name) {
       version: skill.version,
       resources: skill.resources
     },
-    prompt: skill.fullPrompt || skill.prompt || ''
+    prompt
   };
 }
 
@@ -271,17 +314,25 @@ export function toggleSkill(name) {
   const newEnabled = skill.enabled === false;
   skill.enabled = newEnabled;
 
-  // 内置技能无需持久化到文件（它们没有物理文件），但需要记住启用状态
+  // 1. 持久化到 disabled_skills.json（所有类型统一使用，比直接写 SKILL.md 更可靠）
+  const disabledSet = loadDisabledState();
+  if (newEnabled) {
+    disabledSet.delete(name);
+  } else {
+    disabledSet.add(name);
+  }
+  saveDisabledState(disabledSet);
+
+  // 2. 内置技能额外保存到 builtin_skills_state.json
   if (skill.builtin) {
     const state = loadBuiltinState();
     state[name] = newEnabled;
     saveBuiltinState(state);
-    return { success: true, enabled: newEnabled };
   }
 
+  // 3. 尝试更新技能源文件（best-effort，失败不影响状态）
   try {
     if (skill.type === 'agent' && skill.skillMdPath) {
-      // 更新 SKILL.md 的 frontmatter
       const content = readFileSync(skill.skillMdPath, 'utf-8');
       const frontmatterMatch = content.match(/^---\n([\s\S]*?)\n---/);
       if (frontmatterMatch) {
@@ -295,15 +346,14 @@ export function toggleSkill(name) {
         writeFileSync(skill.skillMdPath, newContent, 'utf-8');
       }
     } else if (skill.type === 'workflow' && skill._filePath) {
-      // 更新 JSON 文件
       const content = readFileSync(skill._filePath, 'utf-8');
       const parsed = JSON.parse(content);
       parsed.enabled = newEnabled;
       writeFileSync(skill._filePath, JSON.stringify(parsed, null, 2), 'utf-8');
     }
   } catch (err) {
-    // 文件写入失败不影响内存状态，仅记录警告
-    console.warn(`[Skill Registry] 持久化 "${name}" 的启用状态失败:`, err.message);
+    // 写源文件失败不影响状态，disabled_skills.json 已经持久化
+    console.warn(`[Skill Registry] 更新 "${name}" 源文件失败（状态已通过 disabled_skills.json 保存）:`, err.message);
   }
 
   return { success: true, enabled: newEnabled };