sema-core 2.0.15 → 2.1.0

package/dist/services/mcp/MCPClient.js

@@ -9,6 +9,7 @@ const stdio_js_1 = require("@modelcontextprotocol/sdk/client/stdio.js");
 const sse_js_1 = require("@modelcontextprotocol/sdk/client/sse.js");
 const streamableHttp_js_1 = require("@modelcontextprotocol/sdk/client/streamableHttp.js");
 const log_1 = require("../../util/log");
+const i18n_1 = require("../../util/i18n");
 class MCPClient {
     constructor(config) {
         this.config = config;
@@ -37,9 +38,9 @@ class MCPClient {
             // 根据传输类型创建 transport
             this.transport = this.createTransport();
             // 带超时的连接
-            await this.withTimeout(this.client.connect(this.transport), MCPClient.CONNECT_TIMEOUT, `连接超时 (${MCPClient.CONNECT_TIMEOUT / 1000}s)`);
+            await this.withTimeout(this.client.connect(this.transport), MCPClient.CONNECT_TIMEOUT, (0, i18n_1.t)('mcp.connectTimeout', { seconds: MCPClient.CONNECT_TIMEOUT / 1000 }));
             // 获取能力（也需要超时保护）
-            await this.withTimeout(this.fetchCapabilities(), MCPClient.CONNECT_TIMEOUT, `获取能力超时 (${MCPClient.CONNECT_TIMEOUT / 1000}s)`);
+            await this.withTimeout(this.fetchCapabilities(), MCPClient.CONNECT_TIMEOUT, (0, i18n_1.t)('mcp.capabilitiesTimeout', { seconds: MCPClient.CONNECT_TIMEOUT / 1000 }));
             this._status = 'connected';
             (0, log_1.logDebug)(`MCP Server [${this.config.name}] 连接成功`);
         }
@@ -47,6 +48,14 @@ class MCPClient {
             this._status = 'error';
             const errorMsg = error instanceof Error ? error.message : String(error);
             (0, log_1.logError)(`MCP Server [${this.config.name}] 连接失败: ${errorMsg}`);
+            // 超时或失败时关掉 transport：stdio 方式已 spawn 的子进程否则会一直活着
+            try {
+                await this.transport?.close();
+            }
+            catch {
+                // 忽略清理错误
+            }
+            this.transport = null;
             throw error;
         }
     }
@@ -78,7 +87,7 @@ class MCPClient {
             // 先尝试优雅关闭客户端
             if (this.client) {
                 await this.withTimeout(this.client.close(), 5000, // 5秒超时
-                '关闭客户端超时');
+                (0, i18n_1.t)('mcp.closeTimeout'));
             }
             (0, log_1.logDebug)(`MCP Server [${this.config.name}] 已断开`);
         }
@@ -109,7 +118,7 @@ class MCPClient {
      */
     async callTool(toolName, args) {
         if (this._status !== 'connected') {
-            throw new Error(`MCP Server [${this.config.name}] 未连接`);
+            throw new Error((0, i18n_1.t)('mcp.notConnected', { name: this.config.name }));
         }
         const result = await this.client.callTool({
             name: toolName,
@@ -124,7 +133,7 @@ class MCPClient {
         switch (this.config.transport) {
             case 'stdio':
                 if (!this.config.command) {
-                    throw new Error('stdio 传输需要配置 command');
+                    throw new Error((0, i18n_1.t)('mcp.stdioNeedsCommand'));
                 }
                 return new stdio_js_1.StdioClientTransport({
                     command: this.config.command,
@@ -134,18 +143,18 @@ class MCPClient {
                 });
             case 'sse':
                 if (!this.config.url) {
-                    throw new Error('sse 传输需要配置 url');
+                    throw new Error((0, i18n_1.t)('mcp.sseNeedsUrl'));
                 }
                 return new sse_js_1.SSEClientTransport(new URL(this.config.url));
             case 'http':
                 if (!this.config.url) {
-                    throw new Error('http 传输需要配置 url');
+                    throw new Error((0, i18n_1.t)('mcp.httpNeedsUrl'));
                 }
                 return new streamableHttp_js_1.StreamableHTTPClientTransport(new URL(this.config.url), {
                     requestInit: this.config.headers ? { headers: this.config.headers } : undefined
                 });
             default:
-                throw new Error(`不支持的传输类型: ${this.config.transport}`);
+                throw new Error((0, i18n_1.t)('mcp.unsupportedTransport', { transport: String(this.config.transport) }));
         }
     }
     async fetchCapabilities() {
@@ -160,6 +169,7 @@ class MCPClient {
                         properties: tool.inputSchema.properties,
                         required: tool.inputSchema.required,
                     },
+                    annotations: tool.annotations,
                 }))
             };
         }

package/dist/services/mcp/MCPClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"MCPClient.js","sourceRoot":"","sources":["../../../src/services/mcp/MCPClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MCPClient.js","sourceRoot":"","sources":["../../../src/services/mcp/MCPClient.ts"],"names":[],"mappings":"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"}

package/dist/services/mcp/MCPManager.d.ts

@@ -5,8 +5,12 @@
  * 实现优先级：插件 < 用户级 < 项目级
  *
  * 状态管理：
- * - 服务启用/禁用：.sema/settings.json -> disabledMcpServers
- * - 可用工具列表：.sema/settings.json -> enabledMcpServerUseTools
+ * - 服务启用/禁用：settings.json -> disabledMcpServers（用户级 ~/.sema + 项目级 .sema 取并集生效）
+ * - 可用工具列表：settings.json -> enabledMcpServerUseTools（用户级打底、项目级同名覆盖）
+ *
+ * 变量展开：.mcp.json 条目的 command / args / env / url / headers 支持
+ * - ${SEMA_PLUGIN_ROOT}：该 .mcp.json 所属根目录（插件目录；<project>/.sema/.mcp.json 为 <project>）
+ * - ${VAR}、${VAR:-默认值}：进程环境变量，未定义且无默认值时原样保留
  */
 import { Tool } from '../../tools/base/Tool';
 import { MCPServerConfig, MCPServerInfo } from '../../types/mcp';
@@ -17,13 +21,9 @@ declare class MCPManager {
     private semaUserConfigPath;
     private semaProjectConfigPath;
     private serverInfoCache;
-    private loadingPromise;
+    private refreshChain;
     private clients;
     constructor();
-    /**
-     * 清空缓存
-     */
-    private invalidateCache;
     /**
      * 读取 JSON 文件，失败返回 null
      */
@@ -41,6 +41,14 @@ declare class MCPManager {
      * 写入 Sema 项目级 settings.json（合并写入，保留其他字段）
      */
     private writeSemaSettings;
+    /**
+     * 禁用的 MCP Server 集合：用户级 + 项目级并集（任一层禁用即禁用）
+     */
+    private readDisabledUnion;
+    /**
+     * MCP Server 可用工具映射：用户级打底、项目级同名覆盖（与 disabled 同样的分层思路）
+     */
+    private readUseToolsMerged;
     /**
      * 解析 Sema 来源的 MCP Server 配置条目
      */
@@ -99,14 +107,15 @@ declare class MCPManager {
      */
     init(): Promise<void>;
     /**
-     * 获取所有 MCP Server 信息（有缓存则直接返回，否则等待后台加载或重新加载）
+     * 获取所有 MCP Server 信息（有缓存则直接返回，否则等待正在进行的刷新或重新加载）
      */
     getMCPServerConfigs(): Promise<MCPServerInfo[]>;
     /**
-     * 刷新 MCP Server 信息
+     * 刷新 MCP Server 信息（串行排队，见 refreshChain）
      * 对比配置变化，仅重连配置有变动或新增的服务器，配置未变且已连接的保留现有连接
      */
     refreshMCPServerConfigs(): Promise<MCPServerInfo[]>;
+    private doRefresh;
     /**
      * 获取所有 MCP 工具（同步，基于当前已连接的客户端）
      */
@@ -123,19 +132,25 @@ declare class MCPManager {
      * 重新连接指定 MCP Server
      */
     reconnectMCPServer(name: string): Promise<MCPServerInfo[]>;
+    /**
+     * 启停写入哪层 settings：跟随 server 所在层
+     * （项目级/local 写项目级，用户级/插件写用户级，即全局生效）
+     */
+    private toggleScope;
     /**
      * 禁用指定 MCP Server
-     * 修改 .sema/settings.json 的 disabledMcpServers 字段
+     * 修改 settings.json 的 disabledMcpServers 字段（写入层见 toggleScope）
      */
     disableMCPServer(name: string): Promise<MCPServerInfo[]>;
     /**
      * 启用指定 MCP Server
-     * 修改 .sema/settings.json 的 disabledMcpServers 字段
+     * 只从目标层（见 toggleScope）的 disabledMcpServers 移除；若另一层仍禁用，最终仍为禁用
      */
     enableMCPServer(name: string): Promise<MCPServerInfo[]>;
     /**
      * 更新指定 MCP Server 的工具使用列表
-     * 修改 .sema/settings.json 的 enabledMcpServerUseTools 字段
+     * 修改 settings.json 的 enabledMcpServerUseTools 字段（写入层跟随 server 所在层，见 toggleScope；
+     * 生效值为用户级打底、项目级同名覆盖，toolNames 为 null 时删除该层记录=全部可用）
      */
     updateMCPUseTools(name: string, toolNames: string[] | null): Promise<MCPServerInfo[]>;
     /**

package/dist/services/mcp/MCPManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MCPManager.d.ts","sourceRoot":"","sources":["../../../src/services/mcp/MCPManager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAgB,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAU9E;;GAEG;AACH,cAAM,UAAU;IACd,OAAO,CAAC,kBAAkB,CAAQ;IAClC,OAAO,CAAC,qBAAqB,CAAQ;IAGrC,OAAO,CAAC,eAAe,CAA+B;IAEtD,OAAO,CAAC,cAAc,CAAwC;IAG9D,OAAO,CAAC,OAAO,CAAoC;;IAkBnD;;OAEG;IACH,OAAO,CAAC,eAAe;IAMvB;;OAEG;IACH,OAAO,CAAC,YAAY;IAUpB;;;OAGG;IACH,OAAO,CAAC,cAAc;IAStB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAIxB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAMzB;;OAEG;IACH,OAAO,CAAC,cAAc;IAetB;;OAEG;IACH,OAAO,CAAC,aAAa;IAsBrB;;;OAGG;YACW,mBAAmB;IAkDjC;;;;OAIG;YACW,WAAW;IAgDzB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IA2B5B;;OAEG;IACH,OAAO,CAAC,aAAa;IAWrB;;OAEG;YACW,aAAa;IAwB3B;;OAEG;YACW,gBAAgB;IAa9B;;OAEG;YACW,aAAa;IAM3B;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAa7B;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAY9B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAM5B;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ3B;;OAEG;IACG,mBAAmB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAMrD;;;OAGG;IACG,uBAAuB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IA0DzD;;OAEG;IACH,WAAW,IAAI,IAAI,EAAE;IAsBrB;;OAEG;IACG,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAWrE;;OAEG;IACG,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAe7D;;OAEG;IACG,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAUhE;;;OAGG;IACG,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAoB9D;;;OAGG;IACG,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAiB7D;;;OAGG;IACG,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAoB3F;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAI/B;AAMD;;GAEG;AACH,wBAAgB,aAAa,IAAI,UAAU,CAK1C;AAED;;;GAGG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAGpD;AAED,OAAO,EAAE,UAAU,EAAE,CAAA"}
+{"version":3,"file":"MCPManager.d.ts","sourceRoot":"","sources":["../../../src/services/mcp/MCPManager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAMH,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAgB,aAAa,EAAE,MAAM,iBAAiB,CAAA;AA2D9E;;GAEG;AACH,cAAM,UAAU;IACd,OAAO,CAAC,kBAAkB,CAAQ;IAClC,OAAO,CAAC,qBAAqB,CAAQ;IAGrC,OAAO,CAAC,eAAe,CAA+B;IAGtD,OAAO,CAAC,YAAY,CAAgD;IAGpE,OAAO,CAAC,OAAO,CAAoC;;IAiBnD;;OAEG;IACH,OAAO,CAAC,YAAY;IAUpB;;;OAGG;IACH,OAAO,CAAC,cAAc;IAOtB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAIxB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAMzB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAS1B;;OAEG;IACH,OAAO,CAAC,cAAc;IAetB;;OAEG;IACH,OAAO,CAAC,aAAa;IAsBrB;;;OAGG;YACW,mBAAmB;IAkDjC;;;;OAIG;YACW,WAAW;IAgDzB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IA2B5B;;OAEG;IACH,OAAO,CAAC,aAAa;IAWrB;;OAEG;YACW,aAAa;IA0C3B;;OAEG;YACW,gBAAgB;IAa9B;;OAEG;YACW,aAAa;IAM3B;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAa7B;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAY9B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAM5B;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3B;;OAEG;IACG,mBAAmB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAMrD;;;OAGG;IACH,uBAAuB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;YAOrC,SAAS;IAuDvB;;OAEG;IACH,WAAW,IAAI,IAAI,EAAE;IAsBrB;;OAEG;IACG,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAWrE;;OAEG;IACG,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IA4B7D;;OAEG;IACG,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAehE;;;OAGG;IACH,OAAO,CAAC,WAAW;IAKnB;;;OAGG;IACG,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAqB9D;;;OAGG;IACG,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAuB7D;;;;OAIG;IACG,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAsB3F;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAI/B;AAMD;;GAEG;AACH,wBAAgB,aAAa,IAAI,UAAU,CAK1C;AAED;;;GAGG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAGpD;AAED,OAAO,EAAE,UAAU,EAAE,CAAA"}