jinzd-ai-cli 0.1.14 → 0.1.16

package/CLAUDE.md

@@ -5,6 +5,7 @@
 一个跨平台的 REPL 风格 AI 对话工具，支持多个主流 AI 提供商（Claude、Gemini、DeepSeek、智谱清言、Kimi），
 带有 **AI 工具调用（Agentic）** 能力，支持执行 bash 命令、读写文件、运行交互式程序、流式生成大文档。
 代理支持（`proxy` 配置字段 + 环境变量），Gemini 完整支持（2.5 Pro/Flash，array items schema 修复）。
+**MCP 协议支持**：可接入外部 MCP 服务器，自动发现并注册工具，无缝融入 agentic 循环。
 设计上可扩展至 Electron/Tauri 桌面 GUI。
 
 ## 技术栈
@@ -44,7 +45,11 @@ src/
 │   ├── dev-state.ts                # 开发状态交接（provider/model 切换时快照生成、save/load/clear）
 │   ├── setup-wizard.ts             # @inquirer/prompts 首次运行交互式设置
 │   └── commands/
-│       └── index.ts                # CommandRegistry + 15个命令（/help /about /provider /model /clear /session /system /context /status /search /undo /export /tools /config /exit）
+│       └── index.ts                # CommandRegistry + 17个命令（/help /about /provider /model /clear /session /system /context /status /search /undo /export /tools /plugins /mcp /config /exit）
+├── mcp/
+│   ├── types.ts                    # MCP 协议类型定义（JSON-RPC、工具 schema、服务器配置）
+│   ├── client.ts                   # McpClient（单个 MCP 服务器 STDIO 连接，JSON-RPC 通信）
+│   └── manager.ts                  # McpManager（多服务器管理，工具发现与注册，MCP→Tool 转换）
 └── tools/
     ├── types.ts                    # ToolDefinition / ToolCall / ToolResult / DangerLevel / getDangerLevel
     ├── registry.ts                 # ToolRegistry（注册全部内置工具，共14个）
@@ -117,6 +122,30 @@ npm run pack:all        # 同时打包所有平台
 }
 ```
 
+### MCP 服务器配置
+
+在 `config.json` 中声明 `mcpServers` 字段，启动时自动连接、发现工具并注册。格式兼容 Claude Desktop。
+
+```json
+{
+  "mcpServers": {
+    "filesystem": {
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-filesystem", "D:/projects"],
+      "timeout": 30000
+    },
+    "github": {
+      "command": "node",
+      "args": ["path/to/github-server.js"],
+      "env": { "GITHUB_TOKEN": "ghp_xxx" }
+    }
+  }
+}
+```
+
+MCP 工具名格式：`mcp__<serverId>__<toolName>`，如 `mcp__filesystem__read_file`。
+所有 MCP 工具默认 `safe` 级别（用户主动配置即表示信任）。
+
 ## 环境变量（优先级高于配置文件）
 
 ```
@@ -176,6 +205,7 @@ AICLI_NO_STREAM          设为 1 禁用流式输出
 | `ask_user` | safe | AI 在 agentic 循环中向用户提问，等待文本回答后继续执行 |
 | `write_todos` | safe | AI 拆解复杂任务为子任务列表，终端实时渲染进度（pending/in_progress/completed） |
 | `google_search` | safe | Google Custom Search API 搜索网页，需配置 API Key + Search Engine ID (cx) |
+| `mcp__*` | safe | MCP 服务器暴露的动态工具（命名格式：`mcp__<serverId>__<toolName>`） |
 
 ### 危险级别与确认机制
 
@@ -271,8 +301,9 @@ const stdinLines = Array.isArray(rawStdin) ? rawStdin.map(String)
 - [x] **`write_todos` 工具**（2026-02-23）：AI 拆解复杂任务为子任务列表，终端实时渲染进度。参数采用 JSON 字符串（因 ToolParameterSchema 不支持嵌套对象数组），容错处理 AI 直接传数组。`execute()` 内直接 `console.log()` 渲染（绕过 executor 8 行截断），模块级变量保持会话内状态。
 - [x] **Google 搜索集成**（2026-02-23）：`google_search` 工具通过 Google Custom Search JSON API 搜索网页。需配置 API Key（`apiKeys['google-search']` 或 `AICLI_API_KEY_GOOGLESEARCH`）和 Search Engine ID（`googleSearchEngineId` 或 `AICLI_GOOGLE_CX`）。自动走全局 proxy，15s 超时，返回 Markdown 格式结果列表。配置向导新增 `Configure Google Search` 入口。
 
+- [x] **MCP 协议支持**（2026-02-23）：轻量级 MCP 客户端（不依赖 SDK），STDIO 传输 + JSON-RPC 2.0 通信。`src/mcp/` 模块：`types.ts`（协议类型）、`client.ts`（单服务器连接）、`manager.ts`（多服务器管理 + Tool 转换）。配置兼容 Claude Desktop（`config.json` 的 `mcpServers` 字段）。启动自动连接、发现工具并注册到 ToolRegistry，工具名格式 `mcp__<serverId>__<toolName>`。新增 `/mcp` REPL 命令查看连接状态和工具列表。
+
 ### 下一步待实现
-- [ ] **MCP 协议支持**：Model Context Protocol 扩展生态，接入外部工具
 - [ ] **Agent Skills 系统**：可复用的专业技能包（`.aicli/skills/`）
 
 ## 已知待改进项

package/dist/index.js

@@ -74,6 +74,16 @@ var ConfigSchema = z.object({
   // API Key 通过 apiKeys['google-search'] 或 AICLI_API_KEY_GOOGLESEARCH 环境变量配置
   // CX 也可通过 AICLI_GOOGLE_CX 环境变量覆盖
   googleSearchEngineId: z.string().optional(),
+  // MCP (Model Context Protocol) 服务器配置
+  // 声明外部 MCP 服务器，启动时自动连接、发现工具并注册
+  // 配置格式兼容 Claude Desktop（command + args + env）
+  // 示例：{ "filesystem": { "command": "npx", "args": ["-y", "@modelcontextprotocol/server-filesystem", "/path"] } }
+  mcpServers: z.record(z.object({
+    command: z.string(),
+    args: z.array(z.string()).default([]),
+    env: z.record(z.string()).optional(),
+    timeout: z.number().default(3e4)
+  })).default({}),
   // 插件加载开关（安全控制）
   // 默认 false：不自动加载 ~/.aicli/plugins/ 中的插件文件。
   // 插件以完整 Node.js 权限在主进程中执行（可读写文件、访问网络、执行命令），
@@ -119,7 +129,8 @@ var EnvLoader = class {
 };
 
 // src/core/constants.ts
-var VERSION = "0.1.13";
+var VERSION = "0.1.16";
+var APP_NAME = "ai-cli";
 var CONFIG_DIR_NAME = ".aicli";
 var CONFIG_FILE_NAME = "config.json";
 var HISTORY_DIR_NAME = "history";
@@ -129,6 +140,10 @@ var MEMORY_FILE_NAME = "memory.md";
 var MEMORY_MAX_CHARS = 1e4;
 var DEV_STATE_FILE_NAME = "dev-state.md";
 var DEFAULT_MAX_TOKENS = 8192;
+var MCP_TOOL_PREFIX = "mcp__";
+var MCP_CONNECT_TIMEOUT = 3e4;
+var MCP_CALL_TIMEOUT = 6e4;
+var MCP_PROTOCOL_VERSION = "2024-11-05";
 var AUTHOR = "\u664B\u6B63\u4E1C";
 var AUTHOR_EMAIL = "zhengdong.jin@gmail.com";
 var DESCRIPTION = "\u8DE8\u5E73\u53F0 REPL \u98CE\u683C AI \u5BF9\u8BDD\u5DE5\u5177\uFF0C\u652F\u6301\u591A Provider \u4E0E Agentic \u5DE5\u5177\u8C03\u7528";
@@ -1417,7 +1432,7 @@ var Renderer = class {
     console.log(chalk.gray("  Commands : ") + chalk.dim("/help \xB7 /about \xB7 Ctrl+C to exit"));
     console.log();
   }
-  printAbout(pluginCount = 0) {
+  printAbout(pluginCount = 0, mcpInfo) {
     const HR = chalk.dim("  " + "\u2500".repeat(56));
     const label = (s) => chalk.gray(`  ${s.padEnd(6)}`);
     const tool = (name, desc) => chalk.cyan(`    ${name.padEnd(22)}`) + chalk.dim(desc);
@@ -1434,8 +1449,12 @@ var Renderer = class {
     console.log(chalk.dim("    DeepSeek \xB7 Kimi (Moonshot) \xB7 Claude (Anthropic)"));
     console.log(chalk.dim("    Gemini (Google) \xB7 \u667A\u8C31\u6E05\u8A00 \xB7 \u81EA\u5B9A\u4E49 OpenAI \u517C\u5BB9"));
     console.log(HR);
-    const toolTotal = 14 + pluginCount;
-    const toolLabel = pluginCount > 0 ? `\uFF0C\u542B ${pluginCount} \u4E2A\u63D2\u4EF6` : "\uFF0C\u63D2\u4EF6\u53EF\u6269\u5C55";
+    const mcpToolCount = mcpInfo?.tools ?? 0;
+    const toolTotal = 14 + pluginCount + mcpToolCount;
+    const extras = [];
+    if (pluginCount > 0) extras.push(`${pluginCount} \u4E2A\u63D2\u4EF6`);
+    if (mcpToolCount > 0) extras.push(`${mcpToolCount} \u4E2A MCP`);
+    const toolLabel = extras.length > 0 ? `\uFF0C\u542B ${extras.join(" + ")}` : "\uFF0C\u63D2\u4EF6/MCP \u53EF\u6269\u5C55";
     console.log(chalk.gray(`  Agentic \u5DE5\u5177\uFF08${toolTotal}\u4E2A${toolLabel}\uFF09\uFF1A`));
     console.log(tool("bash", "\u6267\u884C Shell \u547D\u4EE4\uFF08PowerShell/bash\uFF0CWindows \u5F3A\u5236 UTF-8\uFF09"));
     console.log(tool("read_file", "\u8BFB\u53D6\u6587\u4EF6\u5185\u5BB9"));
@@ -1452,10 +1471,10 @@ var Renderer = class {
     console.log(tool("ask_user", "\u5411\u7528\u6237\u63D0\u95EE\u5E76\u7B49\u5F85\u56DE\u7B54\uFF08agentic \u5FAA\u73AF\u4E2D\u8BF7\u6C42\u6F84\u6E05\uFF09"));
     console.log(tool("write_todos", "\u62C6\u89E3\u4EFB\u52A1\u4E3A\u5B50\u4EFB\u52A1\u5217\u8868\uFF0C\u5B9E\u65F6\u663E\u793A\u8FDB\u5EA6"));
     console.log(HR);
-    console.log(chalk.gray("  REPL \u547D\u4EE4\uFF0816\u4E2A\uFF09\uFF1A"));
+    console.log(chalk.gray("  REPL \u547D\u4EE4\uFF0817\u4E2A\uFF09\uFF1A"));
     console.log(chalk.dim("    /help  /about  /provider  /model  /clear  /session"));
     console.log(chalk.dim("    /system  /context  /status  /search  /undo  /export"));
-    console.log(chalk.dim("    /tools  /plugins  /config  /exit"));
+    console.log(chalk.dim("    /tools  /plugins  /mcp  /config  /exit"));
     console.log(HR);
     console.log(chalk.gray("  \u4E3B\u8981\u7279\u6027\uFF1A"));
     console.log(feat("Agentic \u5FAA\u73AF\uFF08\u6700\u591A 20 \u8F6E\u5DE5\u5177\u8C03\u7528\uFF0C\u6700\u7EC8\u56DE\u7B54\u6D41\u5F0F\u8F93\u51FA\uFF09"));
@@ -1466,6 +1485,7 @@ var Renderer = class {
     console.log(feat("\u6587\u4EF6\u64CD\u4F5C\u64A4\u9500\uFF08/undo\uFF0C\u652F\u6301 write_file / edit_file\uFF09"));
     console.log(feat("Thinking \u6A21\u5F0F\u6298\u53E0\uFF08<think> \u5757\u81EA\u52A8\u6298\u53E0\uFF0CGLM-5 \u7B49\uFF09"));
     console.log(feat("Token \u7528\u91CF\u8FFD\u8E2A\uFF08\u6BCF\u6B21\u56DE\u590D + session \u7D2F\u8BA1\uFF0C\u652F\u6301 Gemini/Claude/DeepSeek \u7B49\uFF09"));
+    console.log(feat("MCP \u534F\u8BAE\u652F\u6301\uFF1A\u63A5\u5165\u5916\u90E8 MCP \u670D\u52A1\u5668\u5DE5\u5177\uFF08config.json mcpServers \u914D\u7F6E\uFF09"));
     console.log(feat("\u63D2\u4EF6\u7CFB\u7EDF\uFF1A~/.aicli/plugins/*.js \u81EA\u5B9A\u4E49\u5DE5\u5177\uFF08\u9700 allowPlugins:true \u542F\u7528\uFF0C\u9ED8\u8BA4\u5173\u95ED\uFF09"));
     console.log(feat("\u72EC\u7ACB\u53EF\u6267\u884C\u6587\u4EF6\u6253\u5305\uFF08~56MB\uFF0C\u65E0\u9700 Node.js \u73AF\u5883\uFF09"));
     console.log();
@@ -1725,6 +1745,7 @@ function createDefaultCommands() {
           "  /export [md|json] [file] - Export session to file (default: auto-named .md)",
           "  /tools                   - List all AI tools available",
           "  /plugins                 - Show plugin directory and loaded plugins",
+          "  /mcp                     - Show MCP server connections and tools",
           "  /config                  - Open configuration wizard (API keys, proxy, etc.)",
           "  /exit                    - Exit"
         ] : [];
@@ -1738,7 +1759,9 @@ function createDefaultCommands() {
       description: "Show information about ai-cli and its author",
       usage: "/about",
       execute(_args, ctx) {
-        ctx.renderer.printAbout(ctx.tools.listPluginTools().length);
+        const manager = ctx.getMcpManager();
+        const mcpInfo = manager ? { servers: manager.getConnectedCount(), tools: manager.getTotalToolCount() } : void 0;
+        ctx.renderer.printAbout(ctx.tools.listPluginTools().length, mcpInfo);
       }
     },
     {
@@ -2146,6 +2169,55 @@ ${text}
         console.log();
       }
     },
+    {
+      name: "mcp",
+      description: "Show MCP server connections and tools",
+      usage: "/mcp [reconnect]",
+      execute(args, ctx) {
+        const manager = ctx.getMcpManager();
+        if (!manager) {
+          console.log();
+          console.log(chalk2.dim("  No MCP servers configured."));
+          console.log(chalk2.dim('  Add "mcpServers" to ~/.aicli/config.json to connect MCP servers.'));
+          console.log(chalk2.dim("  Example:"));
+          console.log(chalk2.dim('    "mcpServers": {'));
+          console.log(chalk2.dim('      "filesystem": {'));
+          console.log(chalk2.dim('        "command": "npx",'));
+          console.log(chalk2.dim('        "args": ["-y", "@modelcontextprotocol/server-filesystem", "/path"]'));
+          console.log(chalk2.dim("      }"));
+          console.log(chalk2.dim("    }"));
+          console.log();
+          return;
+        }
+        const statuses = manager.getStatus();
+        console.log();
+        console.log(chalk2.bold("  \u{1F50C} MCP Servers:"));
+        console.log();
+        if (statuses.length === 0) {
+          console.log(chalk2.dim("  No MCP servers configured."));
+          console.log();
+          return;
+        }
+        for (const s of statuses) {
+          const statusBadge = s.connected ? chalk2.green("connected") : chalk2.red("disconnected");
+          const toolCountStr = s.connected ? chalk2.dim(` \u2014 ${s.toolCount} tool(s)`) : "";
+          const errorStr = s.error ? chalk2.red(`
+      Error: ${s.error}`) : "";
+          const serverLabel = s.serverName !== s.serverId ? ` (${s.serverName})` : "";
+          console.log(`    ${chalk2.cyan(s.serverId)}${chalk2.dim(serverLabel)} [${statusBadge}]${toolCountStr}${errorStr}`);
+          if (s.connected) {
+            const mcpTools = ctx.tools.listMcpTools().filter(
+              (t) => t.definition.name.startsWith(`mcp__${s.serverId}__`)
+            );
+            for (const t of mcpTools) {
+              const shortName = t.definition.name.replace(`mcp__${s.serverId}__`, "");
+              console.log(chalk2.dim(`      - ${shortName}`));
+            }
+          }
+        }
+        console.log();
+      }
+    },
     {
       name: "config",
       description: "Open configuration wizard (API keys, proxy, default provider)",
@@ -3798,6 +3870,7 @@ import { join as join7 } from "path";
 var ToolRegistry = class {
   tools = /* @__PURE__ */ new Map();
   pluginToolNames = /* @__PURE__ */ new Set();
+  mcpToolNames = /* @__PURE__ */ new Set();
   constructor() {
     this.register(bashTool);
     this.register(readFileTool);
@@ -3831,6 +3904,22 @@ var ToolRegistry = class {
   listPluginTools() {
     return [...this.tools.values()].filter((t) => this.pluginToolNames.has(t.definition.name));
   }
+  /** 注册一个 MCP 工具（名称以 mcp__ 开头） */
+  registerMcpTool(tool) {
+    this.tools.set(tool.definition.name, tool);
+    this.mcpToolNames.add(tool.definition.name);
+  }
+  /** 返回所有 MCP 工具 */
+  listMcpTools() {
+    return [...this.tools.values()].filter((t) => this.mcpToolNames.has(t.definition.name));
+  }
+  /** 清除所有已注册的 MCP 工具（重连时先清除再重新注册） */
+  unregisterMcpTools() {
+    for (const name of this.mcpToolNames) {
+      this.tools.delete(name);
+    }
+    this.mcpToolNames.clear();
+  }
   /**
    * Dynamically loads .js plugin files from pluginsDir.
    *
@@ -3908,6 +3997,7 @@ import { existsSync as existsSync12, readFileSync as readFileSync8 } from "fs";
 
 // src/tools/types.ts
 function getDangerLevel(toolName, args) {
+  if (toolName.startsWith("mcp__")) return "safe";
   if (toolName === "bash") {
     const cmd = String(args["command"] ?? "");
     if (/\brm\s+[^\n]*(?:-\w*[rRfF]\w*|--recursive|--force)\b/.test(cmd)) return "destructive";
@@ -4737,6 +4827,407 @@ function formatGitContextForPrompt(ctx) {
   return lines.join("\n");
 }
 
+// src/mcp/client.ts
+import { spawn as spawn2 } from "child_process";
+var McpClient = class {
+  serverId;
+  config;
+  process = null;
+  nextId = 1;
+  connected = false;
+  serverInfo = null;
+  /** stderr 收集（最多保留最后 2KB，用于错误报告） */
+  stderrBuffer = "";
+  /** 缓存已发现的工具列表 */
+  cachedTools = [];
+  /** 错误信息（连接失败时设置） */
+  errorMessage = null;
+  // ── JSON-RPC 请求/响应匹配 ──────────────────────────────────────
+  pendingRequests = /* @__PURE__ */ new Map();
+  /** stdout 残余缓冲区（处理不完整的 JSON 行） */
+  stdoutBuffer = "";
+  constructor(serverId, config) {
+    this.serverId = serverId;
+    this.config = config;
+  }
+  get isConnected() {
+    return this.connected;
+  }
+  get serverName() {
+    return this.serverInfo?.name ?? this.serverId;
+  }
+  get tools() {
+    return this.cachedTools;
+  }
+  // ══════════════════════════════════════════════════════════════════
+  // 连接与初始化
+  // ══════════════════════════════════════════════════════════════════
+  async connect() {
+    const timeout = this.config.timeout ?? MCP_CONNECT_TIMEOUT;
+    try {
+      this.process = spawn2(this.config.command, this.config.args ?? [], {
+        stdio: ["pipe", "pipe", "pipe"],
+        env: { ...process.env, ...this.config.env },
+        // Windows 上 npx 等是 .cmd 脚本，需要 shell 模式
+        shell: process.platform === "win32",
+        // 不让子进程阻止父进程退出
+        detached: false
+      });
+      this.process.on("error", (err) => {
+        this.errorMessage = err.message;
+        this.connected = false;
+        this.rejectAllPending(new Error(`MCP server [${this.serverId}] process error: ${err.message}`));
+      });
+      this.process.on("exit", (code, signal) => {
+        this.connected = false;
+        const reason = signal ? `signal ${signal}` : `code ${code}`;
+        this.rejectAllPending(new Error(`MCP server [${this.serverId}] exited: ${reason}`));
+      });
+      this.process.stdout.setEncoding("utf-8");
+      this.process.stdout.on("data", (chunk) => this.handleStdoutData(chunk));
+      this.process.stderr.setEncoding("utf-8");
+      this.process.stderr.on("data", (chunk) => {
+        this.stderrBuffer += chunk;
+        if (this.stderrBuffer.length > 2048) {
+          this.stderrBuffer = this.stderrBuffer.slice(-2048);
+        }
+      });
+      const initResult = await this.withTimeout(
+        this.sendRequest("initialize", {
+          protocolVersion: MCP_PROTOCOL_VERSION,
+          capabilities: {},
+          clientInfo: { name: APP_NAME, version: VERSION }
+        }),
+        timeout,
+        "initialize handshake"
+      );
+      this.serverInfo = initResult.serverInfo;
+      this.sendNotification("notifications/initialized");
+      this.connected = true;
+      await this.refreshTools();
+    } catch (err) {
+      this.errorMessage = err instanceof Error ? err.message : String(err);
+      this.connected = false;
+      this.killProcess();
+      throw err;
+    }
+  }
+  // ══════════════════════════════════════════════════════════════════
+  // 工具操作
+  // ══════════════════════════════════════════════════════════════════
+  /** 刷新工具列表（tools/list） */
+  async refreshTools() {
+    this.ensureConnected();
+    const result = await this.withTimeout(
+      this.sendRequest("tools/list", {}),
+      MCP_CALL_TIMEOUT,
+      "tools/list"
+    );
+    this.cachedTools = result.tools ?? [];
+    return this.cachedTools;
+  }
+  /** 调用工具（tools/call） */
+  async callTool(name, args) {
+    this.ensureConnected();
+    return this.withTimeout(
+      this.sendRequest("tools/call", { name, arguments: args }),
+      MCP_CALL_TIMEOUT,
+      `tools/call(${name})`
+    );
+  }
+  // ══════════════════════════════════════════════════════════════════
+  // 关闭连接
+  // ══════════════════════════════════════════════════════════════════
+  async close() {
+    this.connected = false;
+    this.rejectAllPending(new Error("Client closing"));
+    this.killProcess();
+  }
+  // ══════════════════════════════════════════════════════════════════
+  // 内部方法：JSON-RPC 通信
+  // ══════════════════════════════════════════════════════════════════
+  sendRequest(method, params) {
+    return new Promise((resolve5, reject) => {
+      if (!this.process?.stdin?.writable) {
+        return reject(new Error(`MCP server [${this.serverId}] stdin not writable`));
+      }
+      const id = this.nextId++;
+      const request = {
+        jsonrpc: "2.0",
+        id,
+        method,
+        ...params !== void 0 ? { params } : {}
+      };
+      const timer = setTimeout(() => {
+        this.pendingRequests.delete(id);
+        reject(new Error(`MCP request [${method}] timed out (internal)`));
+      }, MCP_CALL_TIMEOUT * 2);
+      this.pendingRequests.set(id, {
+        resolve: resolve5,
+        reject,
+        timer
+      });
+      const json = JSON.stringify(request) + "\n";
+      this.process.stdin.write(json, (err) => {
+        if (err) {
+          this.pendingRequests.delete(id);
+          clearTimeout(timer);
+          reject(new Error(`MCP write error: ${err.message}`));
+        }
+      });
+    });
+  }
+  sendNotification(method, params) {
+    if (!this.process?.stdin?.writable) return;
+    const notification = {
+      jsonrpc: "2.0",
+      method,
+      ...params !== void 0 ? { params } : {}
+    };
+    this.process.stdin.write(JSON.stringify(notification) + "\n");
+  }
+  /**
+   * 处理 stdout 数据：按行分割，每行解析为 JSON-RPC 响应。
+   * 处理不完整行：残余数据保留在 stdoutBuffer 中。
+   */
+  handleStdoutData(chunk) {
+    this.stdoutBuffer += chunk;
+    const lines = this.stdoutBuffer.split("\n");
+    this.stdoutBuffer = lines.pop() ?? "";
+    for (const line of lines) {
+      const trimmed = line.trim();
+      if (!trimmed) continue;
+      try {
+        const msg = JSON.parse(trimmed);
+        this.handleMessage(msg);
+      } catch {
+      }
+    }
+  }
+  /** 处理收到的 JSON-RPC 消息 */
+  handleMessage(msg) {
+    if ("id" in msg && typeof msg.id === "number") {
+      const pending = this.pendingRequests.get(msg.id);
+      if (!pending) return;
+      this.pendingRequests.delete(msg.id);
+      clearTimeout(pending.timer);
+      const response = msg;
+      if (response.error) {
+        pending.reject(new Error(
+          `MCP error [${response.error.code}]: ${response.error.message}`
+        ));
+      } else {
+        pending.resolve(response.result);
+      }
+    }
+  }
+  // ══════════════════════════════════════════════════════════════════
+  // 辅助方法
+  // ══════════════════════════════════════════════════════════════════
+  ensureConnected() {
+    if (!this.connected) {
+      throw new Error(`MCP server [${this.serverId}] is not connected`);
+    }
+  }
+  /** Promise 超时包装 */
+  withTimeout(promise, ms, label) {
+    return new Promise((resolve5, reject) => {
+      const timer = setTimeout(() => {
+        reject(new Error(`MCP [${this.serverId}] ${label} timed out after ${ms}ms`));
+      }, ms);
+      promise.then((val) => {
+        clearTimeout(timer);
+        resolve5(val);
+      }).catch((err) => {
+        clearTimeout(timer);
+        reject(err);
+      });
+    });
+  }
+  /** 拒绝所有挂起的请求 */
+  rejectAllPending(error) {
+    for (const [id, pending] of this.pendingRequests) {
+      clearTimeout(pending.timer);
+      pending.reject(error);
+    }
+    this.pendingRequests.clear();
+  }
+  /** 杀掉子进程 */
+  killProcess() {
+    if (this.process) {
+      try {
+        this.process.stdin?.end();
+        this.process.kill();
+      } catch {
+      }
+      this.process = null;
+    }
+  }
+};
+
+// src/mcp/manager.ts
+var McpManager = class {
+  clients = /* @__PURE__ */ new Map();
+  /**
+   * 连接所有配置的 MCP 服务器（并发连接，单个失败不阻塞其他）。
+   * 连接结果通过 getStatus() 查看。
+   */
+  async connectAll(servers) {
+    const entries = Object.entries(servers);
+    if (entries.length === 0) return;
+    const promises = entries.map(async ([serverId, config]) => {
+      const client = new McpClient(serverId, config);
+      this.clients.set(serverId, client);
+      try {
+        await client.connect();
+        process.stderr.write(`[mcp] \u2713 ${serverId}: connected (${client.serverName}, ${client.tools.length} tools)
+`);
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        process.stderr.write(`[mcp] \u2717 ${serverId}: ${msg}
+`);
+      }
+    });
+    await Promise.allSettled(promises);
+  }
+  /**
+   * 获取所有已连接服务器的工具，转换为 ai-cli 的 Tool 接口。
+   * 工具名格式：mcp__<serverId>__<toolName>
+   */
+  getAllTools() {
+    const tools = [];
+    for (const [serverId, client] of this.clients) {
+      if (!client.isConnected) continue;
+      for (const mcpTool of client.tools) {
+        tools.push(this.wrapMcpTool(serverId, client, mcpTool));
+      }
+    }
+    return tools;
+  }
+  /**
+   * 获取连接状态摘要。
+   */
+  getStatus() {
+    const statuses = [];
+    for (const [serverId, client] of this.clients) {
+      statuses.push({
+        serverId,
+        serverName: client.serverName,
+        toolCount: client.tools.length,
+        connected: client.isConnected,
+        error: client.errorMessage ?? void 0
+      });
+    }
+    return statuses;
+  }
+  /**
+   * 获取已连接服务器数量。
+   */
+  getConnectedCount() {
+    let count = 0;
+    for (const client of this.clients.values()) {
+      if (client.isConnected) count++;
+    }
+    return count;
+  }
+  /**
+   * 获取所有 MCP 工具的总数。
+   */
+  getTotalToolCount() {
+    let count = 0;
+    for (const client of this.clients.values()) {
+      if (client.isConnected) count += client.tools.length;
+    }
+    return count;
+  }
+  /**
+   * 关闭所有 MCP 服务器连接。
+   */
+  async closeAll() {
+    const promises = [...this.clients.values()].map((c) => c.close().catch(() => {
+    }));
+    await Promise.allSettled(promises);
+    this.clients.clear();
+  }
+  // ══════════════════════════════════════════════════════════════════
+  // 内部方法
+  // ══════════════════════════════════════════════════════════════════
+  /**
+   * 将 MCP 工具包装为 ai-cli 的 Tool 接口。
+   * execute() 方法委托给对应 McpClient.callTool()。
+   */
+  wrapMcpTool(serverId, client, mcpTool) {
+    const toolName = `${MCP_TOOL_PREFIX}${serverId}__${mcpTool.name}`;
+    const definition = this.convertDefinition(toolName, serverId, mcpTool);
+    return {
+      definition,
+      execute: async (args) => {
+        try {
+          const result = await client.callTool(mcpTool.name, args);
+          if (result.isError) {
+            const errorText = this.extractText(result.content);
+            throw new Error(errorText || "MCP tool returned error with no message");
+          }
+          return this.extractText(result.content) || "(no output)";
+        } catch (err) {
+          throw new Error(`MCP [${serverId}/${mcpTool.name}]: ${err instanceof Error ? err.message : String(err)}`);
+        }
+      }
+    };
+  }
+  /**
+   * 转换 MCP 工具定义为 ai-cli 的 ToolDefinition。
+   * MCP 使用 JSON Schema 的 inputSchema，ai-cli 使用扁平的 Record<string, ToolParameterSchema>。
+   */
+  convertDefinition(toolName, serverId, mcpTool) {
+    const parameters = {};
+    const props = mcpTool.inputSchema?.properties ?? {};
+    const required = new Set(mcpTool.inputSchema?.required ?? []);
+    for (const [key, schema] of Object.entries(props)) {
+      parameters[key] = {
+        type: this.normalizeType(schema.type),
+        description: schema.description ?? "",
+        ...schema.enum ? { enum: schema.enum } : {},
+        ...schema.items ? { items: { type: this.normalizeType(schema.items.type) } } : {},
+        ...required.has(key) ? { required: true } : {}
+      };
+    }
+    return {
+      name: toolName,
+      description: (mcpTool.description ?? mcpTool.name) + ` [MCP: ${serverId}]`,
+      parameters
+    };
+  }
+  /**
+   * 将 JSON Schema 类型映射到 ai-cli 的 ToolParameterType。
+   * integer → number（ai-cli 不区分整数/浮点）
+   */
+  normalizeType(jsonSchemaType) {
+    switch (jsonSchemaType) {
+      case "string":
+        return "string";
+      case "number":
+      case "integer":
+        return "number";
+      case "boolean":
+        return "boolean";
+      case "array":
+        return "array";
+      case "object":
+        return "object";
+      default:
+        return "string";
+    }
+  }
+  /**
+   * 从 MCP 响应的 content blocks 中提取纯文本。
+   * 只处理 type="text" 的块，其他类型（image 等）跳过。
+   */
+  extractText(content) {
+    return content.filter((block) => block.type === "text" && block.text).map((block) => block.text).join("\n");
+  }
+};
+
 // src/repl/repl.ts
 var IMAGE_MIME = {
   ".png": "image/png",
@@ -4832,6 +5323,8 @@ var Repl = class {
   sessionTokenUsage = { inputTokens: 0, outputTokens: 0 };
   /** 启动时检测到的 Git 分支（无 git 仓库时为 null） */
   gitBranch = null;
+  /** MCP 多服务器管理器（无 MCP 配置时为 null） */
+  mcpManager = null;
   /**
    * 交互式列表选择器进行中标志。
    * 与 toolExecutor.confirming 类似：主循环 line handler 在此为 true 时忽略 line 事件，
@@ -5107,6 +5600,23 @@ ${memory.content}`);
       process.stdout.write(chalk9.dim(`  \u{1F50C} Plugins loaded: ${pluginCount} tool(s) from plugins/
 `));
     }
+    const mcpServers = this.config.get("mcpServers");
+    if (mcpServers && Object.keys(mcpServers).length > 0) {
+      this.mcpManager = new McpManager();
+      await this.mcpManager.connectAll(mcpServers);
+      const mcpTools = this.mcpManager.getAllTools();
+      for (const tool of mcpTools) {
+        this.toolRegistry.registerMcpTool(tool);
+      }
+      const connectedCount = this.mcpManager.getConnectedCount();
+      const totalTools = this.mcpManager.getTotalToolCount();
+      if (connectedCount > 0) {
+        process.stdout.write(
+          chalk9.dim(`  \u{1F50C} MCP: ${connectedCount} server(s), ${totalTools} tool(s)
+`)
+        );
+      }
+    }
     this.rl.on("SIGINT", () => {
       if (this.toolExecutor.confirming) {
         this.toolExecutor.cancelConfirm();
@@ -5536,6 +6046,7 @@ ${memory.content}`);
       },
       generateDevStateSnapshot: () => this.generateDevStateSnapshot(),
       clearDevState: () => clearDevState(),
+      getMcpManager: () => this.mcpManager,
       exit: () => this.handleExit()
     };
     await cmd.execute(args, ctx);
@@ -5546,6 +6057,8 @@ ${memory.content}`);
     if (sessionId) {
       this.events.emit("session.end", { sessionId });
     }
+    this.mcpManager?.closeAll().catch(() => {
+    });
     this.rl.close();
     console.log(chalk9.gray("\nGoodbye!"));
     process.exit(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jinzd-ai-cli",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "Cross-platform REPL-style AI CLI with multi-provider support",
   "type": "module",
   "main": "./dist/index.js",