@gt-fe/eap-runtime 0.0.27 → 0.0.28

package/dist/runtime/dev-runtime.js

@@ -85,12 +85,14 @@ export function createDevRuntime(options) {
         llmProvider = createDefaultLLMProvider(turnLog);
         llmProviderKind = 'echo';
     }
-    // ── Tool Executor（dev+mcp 直连，缺配置失败 → 通用路由）──
+    // ── Tool Executor（dev+mcp：server MCP 走 Gateway，其余直连）──
     // overlay 必须在此处捕获：SDK createAgent 返回后会恢复 process.env。
     const overlayJail = captureOverlayJailOptions();
     const needsHarnessWrap = toolExecutionMode === 'mcp' && deploymentContext === 'dev';
     const innerExecutor = toolExecutionMode === 'mcp' && deploymentContext === 'dev'
-        ? new DevToolExecutor()
+        ? new DevToolExecutor({
+            foundationUrl: foundationConfigured ? foundationUrl : undefined,
+        })
         : createToolExecutor({ foundationUrl, deploymentContext, jail: overlayJail });
     const toolExecutor = needsHarnessWrap
         ? withHarnessPrimitives(innerExecutor, overlayJail)

package/dist/tool/dev-tool-executor.d.ts

@@ -4,7 +4,8 @@
  * 仅在 `EAP_TOOL_EXECUTION_MODE=mcp` 且 `deploymentContext=dev` 装配。
  * 按清单分流，缺配置则失败，不回落 mock。
  *
- * - execution.protocol=mcp → DevMcpExecutor
+ * - execution.protocol=mcp 且 toolRuntime=server → McpToolExecutor（FOUNDATION_SERVICE_URL）
+ * - 其余 execution.protocol=mcp → DevMcpExecutor（直连 server.url / stdio）
  * - execution.protocol=http → DevHttpExecutor
  * - 能解析出 code handler → LocalToolExecutor
  * - 其余 → NOT_CONFIGURED
@@ -13,11 +14,14 @@ import { DevMcpExecutor } from './dev-mcp-executor.js';
 import type { IToolExecutor, McpListedTool, ToolCallRequest, ToolCallResult } from './tool-executor.interface.js';
 export interface DevToolExecutorOptions {
     mcp?: ConstructorParameters<typeof DevMcpExecutor>[0];
+    /** 绝对 http(s)。仅 toolRuntime=server 的 MCP 使用；缺省不直连 server.url。 */
+    foundationUrl?: string;
 }
 export declare class DevToolExecutor implements IToolExecutor {
     private readonly mcp;
     private readonly http;
     private readonly local;
+    private readonly gateway;
     constructor(options?: DevToolExecutorOptions);
     execute(request: ToolCallRequest): Promise<ToolCallResult>;
     listTools(request: ToolCallRequest): Promise<McpListedTool[]>;

package/dist/tool/dev-tool-executor.js

@@ -4,7 +4,8 @@
  * 仅在 `EAP_TOOL_EXECUTION_MODE=mcp` 且 `deploymentContext=dev` 装配。
  * 按清单分流，缺配置则失败，不回落 mock。
  *
- * - execution.protocol=mcp → DevMcpExecutor
+ * - execution.protocol=mcp 且 toolRuntime=server → McpToolExecutor（FOUNDATION_SERVICE_URL）
+ * - 其余 execution.protocol=mcp → DevMcpExecutor（直连 server.url / stdio）
  * - execution.protocol=http → DevHttpExecutor
  * - 能解析出 code handler → LocalToolExecutor
  * - 其余 → NOT_CONFIGURED
@@ -13,16 +14,37 @@ import { EmptyInstallStore } from './create-tool-executor.js';
 import { DevMcpExecutor } from './dev-mcp-executor.js';
 import { LocalToolExecutor, resolveCodeExecutionFromRequest, } from './local-tool-executor.js';
 import { DevHttpExecutor, resolveHttpExecutionFromRequest } from './dev-http-executor.js';
+import { isAbsoluteHttpUrl, McpToolExecutor } from './mcp-tool-executor.js';
 export class DevToolExecutor {
     mcp;
     http;
     local;
+    gateway;
     constructor(options = {}) {
         this.mcp = new DevMcpExecutor(options.mcp);
         this.http = new DevHttpExecutor();
         this.local = new LocalToolExecutor({ installStore: new EmptyInstallStore() });
+        const foundationUrl = options.foundationUrl?.trim();
+        this.gateway = foundationUrl && isAbsoluteHttpUrl(foundationUrl)
+            ? new McpToolExecutor({ baseUrl: foundationUrl })
+            : undefined;
     }
     async execute(request) {
+        if (hasMcpExecution(request.execution) && request.toolRuntime === 'server') {
+            if (!this.gateway) {
+                return {
+                    toolCallId: request.toolCallId,
+                    toolName: request.toolName,
+                    content: '',
+                    success: false,
+                    error: `Dev MCP: tool "${request.toolName}" is toolRuntime=server and requires ` +
+                        'FOUNDATION_SERVICE_URL (absolute http(s)); refusing to dial server.url',
+                    errorCode: 'NOT_CONFIGURED',
+                    runtime: 'local',
+                };
+            }
+            return this.gateway.execute(request);
+        }
         if (hasMcpExecution(request.execution)) {
             return this.mcp.execute(request);
         }
@@ -48,6 +70,13 @@ export class DevToolExecutor {
         };
     }
     async listTools(request) {
+        if (hasMcpExecution(request.execution) && request.toolRuntime === 'server') {
+            if (!this.gateway) {
+                throw new Error(`Dev MCP: tool "${request.toolName}" is toolRuntime=server and requires ` +
+                    'FOUNDATION_SERVICE_URL (absolute http(s)); refusing to dial server.url');
+            }
+            return this.gateway.listTools(request);
+        }
         if (hasMcpExecution(request.execution)) {
             return this.mcp.listTools(request);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gt-fe/eap-runtime",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "description": "Enterprise Agent Platform — Runtime核心：Graph执行引擎、Task生命周期、Session管理、Checkpoint持久化",
   "type": "module",
   "main": "dist/index.js",