@gt-fe/eap-runtime 0.0.22 → 0.0.24

package/dist/task/task-timeout.js

@@ -9,11 +9,12 @@
  * @see design.md §1.1 任务管理 — Task级超时
  * @see requirements.md Requirement 7 AC4
  */
+import { DEFAULT_GRAPH_TIMEOUT_MS } from '../common/types.js';
 // ─────────────────────────────────────────────
 // Default Constants
 // ─────────────────────────────────────────────
-/** 默认超时：60 秒 */
-const DEFAULT_TIMEOUT_MS = 60_000;
+/** 默认超时：与图/请求缺省同一常数 */
+const DEFAULT_TIMEOUT_MS = DEFAULT_GRAPH_TIMEOUT_MS;
 /** 最大允许超时：3600 秒（1 小时） */
 const MAX_TIMEOUT_MS = 3_600_000;
 // ─────────────────────────────────────────────

package/dist/task/task.service.js

@@ -84,6 +84,7 @@ export class TaskService {
             userId: params.userId,
             correlationId: params.correlationId,
             input: params.input,
+            timeout: params.timeout,
             output: null,
             status: 'pending',
             traceId: null,

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

@@ -5,7 +5,7 @@
  * @see docs/contracts/cross-service-api.md §4.6
  */
 import { ErrorCodes } from '@gt-fe/eap-contracts';
-import { abortOrTimeoutMessage, isAbortError } from './timeout.js';
+import { abortOrTimeoutMessage, isAbortError, timeoutMsFromExecution } from './timeout.js';
 function mapGatewayHttpError(status, body, statusText) {
     const code = body?.error?.code;
     const bodyMessage = [body?.error?.message, body?.message].find((s) => typeof s === 'string' && s.trim()) ?? '';
@@ -81,13 +81,17 @@ export class HttpToolExecutor {
             Authorization: `Bearer ${request.authContext.delegationToken}`,
             'X-Agent-Id': agentCode,
             'X-Agent-Code': agentCode,
+            ...(request.authContext.agentVersion
+                ? { 'X-Agent-Version': request.authContext.agentVersion }
+                : {}),
             'X-User-Id': request.authContext.userId,
             userId: request.authContext.userId,
             'X-Correlation-Id': correlationId,
             'X-Task-Id': taskId,
         };
         const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), this.timeout);
+        const timeoutMs = timeoutMsFromExecution(request.execution, this.timeout);
+        const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
         try {
             const response = await fetch(url, {
                 method: 'POST',
@@ -137,7 +141,7 @@ export class HttpToolExecutor {
         }
         catch (error) {
             clearTimeout(timeoutId);
-            const timeoutSec = Math.max(1, Math.round(this.timeout / 1000));
+            const timeoutSec = Math.max(1, Math.round(timeoutMsFromExecution(request.execution, this.timeout) / 1000));
             const aborted = isAbortError(error);
             return {
                 toolCallId: request.toolCallId,

package/dist/tool/index.d.ts

@@ -1,5 +1,5 @@
 export type { AuthContext, ToolCallRequest, ToolCallResult, LLMToolCall, LLMToolCallResponse, IToolExecutor, McpListedTool, } from './tool-executor.interface.js';
-export { hydrateMcpTools, isMcpDiscoverStub, needsMcpHydration, parseListedTools, toolsetCodeFromLoaded, toolTraceIdentity, } from './mcp-list.js';
+export { assertScopedListEcho, hydrateMcpTools, isMcpDiscoverStub, mcpToolsetCode, needsMcpHydration, parseListedTools, toolsetCodeFromLoaded, toolTraceIdentity, } from './mcp-list.js';
 export { toLoadedToolMap, type LoadedToolDefinition, type LoadedToolMap, type LoadedToolManifestRef, } from './loaded-tool-definition.js';
 export { ToolOrchestrator } from './tool-orchestrator.js';
 export { isRetryableToolFailure, resolveToolRetryConfig, type ToolFailureShape, } from './tool-retry.js';
@@ -11,6 +11,7 @@ export { DevHttpExecutor, buildHttpToolUrl, resolveHttpExecutionFromRequest, typ
 export { DevToolExecutor, type DevToolExecutorOptions } from './dev-tool-executor.js';
 export { LocalMcpClient, type ILocalMcpClient, type LocalMcpInvokeContext, type LocalMcpInvokeResult, } from './local-mcp-client.js';
 export { fileArtifactFromToolOutput, extractFileReference, resolveFileArtifact, type FileArtifact, } from './file-artifact.js';
+export { formatMcpOutput, toModelVisibleToolContent, MAX_MODEL_RESULT_ROWS, MAX_MODEL_CONTENT_CHARS, MAX_MODEL_RESULT_CHARS, } from './model-visible-tool-content.js';
 export { ToolExecutionRouter, type DeploymentContext, type ToolExecutionRouterOptions, } from './tool-execution-router.js';
 export { createToolExecutor, EmptyInstallStore, type CreateToolExecutorOptions, } from './create-tool-executor.js';
 export { assembleLoadedTools, mergeHarnessPrimitives as mergeBuiltinTools, withHarnessPrimitives as withBuiltinTools, HarnessPrimitiveExecutor as BuiltinToolExecutor, resolveUserDir, resolveJailFromState, captureOverlayJailOptions, collectToolBundlePaths, type HarnessJailOptions as BuiltinJailOptions, } from './harness-primitives.js';

package/dist/tool/index.js

@@ -1,4 +1,4 @@
-export { hydrateMcpTools, isMcpDiscoverStub, needsMcpHydration, parseListedTools, toolsetCodeFromLoaded, toolTraceIdentity, } from './mcp-list.js';
+export { assertScopedListEcho, hydrateMcpTools, isMcpDiscoverStub, mcpToolsetCode, needsMcpHydration, parseListedTools, toolsetCodeFromLoaded, toolTraceIdentity, } from './mcp-list.js';
 export { toLoadedToolMap, } from './loaded-tool-definition.js';
 export { ToolOrchestrator } from './tool-orchestrator.js';
 export { isRetryableToolFailure, resolveToolRetryConfig, } from './tool-retry.js';
@@ -10,6 +10,7 @@ export { DevHttpExecutor, buildHttpToolUrl, resolveHttpExecutionFromRequest, } f
 export { DevToolExecutor } from './dev-tool-executor.js';
 export { LocalMcpClient, } from './local-mcp-client.js';
 export { fileArtifactFromToolOutput, extractFileReference, resolveFileArtifact, } from './file-artifact.js';
+export { formatMcpOutput, toModelVisibleToolContent, MAX_MODEL_RESULT_ROWS, MAX_MODEL_CONTENT_CHARS, MAX_MODEL_RESULT_CHARS, } from './model-visible-tool-content.js';
 export { ToolExecutionRouter, } from './tool-execution-router.js';
 export { createToolExecutor, EmptyInstallStore, } from './create-tool-executor.js';
 export { assembleLoadedTools, mergeHarnessPrimitives as mergeBuiltinTools, withHarnessPrimitives as withBuiltinTools, HarnessPrimitiveExecutor as BuiltinToolExecutor, resolveUserDir, resolveJailFromState, captureOverlayJailOptions, collectToolBundlePaths, } from './harness-primitives.js';

package/dist/tool/loaded-tool-definition.d.ts

@@ -21,7 +21,7 @@ export interface LoadedToolManifestRef {
      * MCP/HTTP 出站执行配置（来自 tool.manifest.execution）
      *
      * dev 上下文 DevMcpExecutor 消费此字段做直连（stdio / streamable_http / sse）；
-     * server 上下文 gateway 会忽略此字段，改由 foundation-service 侧根据 toolName 分派。
+     * server 上下文 Gateway 按 `params._meta.toolsetCode` / `version` 分派，不读清单 server。
      */
     execution?: unknown;
 }

package/dist/tool/local-mcp-client.d.ts

@@ -7,6 +7,7 @@
 import type { McpRuntimeExecution } from '@gt-fe/eap-contracts';
 import { type FileArtifact } from './file-artifact.js';
 import type { McpListedTool } from './tool-executor.interface.js';
+export { formatMcpOutput } from './model-visible-tool-content.js';
 export interface LocalMcpInvokeContext {
     /** Platform Token.sub / ExecutionContext.userId */
     userId?: string | null;
@@ -19,7 +20,6 @@ export interface ILocalMcpClient {
     invoke(execution: McpRuntimeExecution, args: Record<string, unknown>, context?: LocalMcpInvokeContext): Promise<LocalMcpInvokeResult>;
     list(execution: McpRuntimeExecution, context?: LocalMcpInvokeContext): Promise<McpListedTool[]>;
 }
-export declare function formatMcpOutput(result: unknown): string;
 export declare class LocalMcpClient implements ILocalMcpClient {
     invoke(execution: McpRuntimeExecution, args: Record<string, unknown>, context?: LocalMcpInvokeContext): Promise<LocalMcpInvokeResult>;
     list(execution: McpRuntimeExecution, context?: LocalMcpInvokeContext): Promise<McpListedTool[]>;

package/dist/tool/local-mcp-client.js

@@ -8,46 +8,9 @@ import { spawn } from 'node:child_process';
 import readline from 'node:readline';
 import { isAbortError, resolveToolTimeoutSec, toToolTimeoutMs, toolTimeoutErrorMessage, } from './timeout.js';
 import { fileArtifactFromToolOutput, fileBasesFromEnv } from './file-artifact.js';
+import { formatMcpOutput } from './model-visible-tool-content.js';
 import { nextListCursor, parseListedTools } from './mcp-list.js';
-export function formatMcpOutput(result) {
-    const r = result;
-    if (r?.structuredContent !== undefined) {
-        return JSON.stringify(redactFileLocators(r.structuredContent));
-    }
-    const text = r?.content?.[0]?.text;
-    if (text) {
-        try {
-            return JSON.stringify(redactFileLocators(JSON.parse(text)));
-        }
-        catch {
-            return text;
-        }
-    }
-    return JSON.stringify(redactFileLocators(result));
-}
-function redactFileLocators(value) {
-    if (Array.isArray(value))
-        return value.map(redactFileLocators);
-    if (!value || typeof value !== 'object')
-        return value;
-    const obj = value;
-    const fileShaped = typeof obj.fileName === 'string'
-        && (typeof obj.url === 'string' || typeof obj.relativePath === 'string');
-    const out = {};
-    for (const [key, child] of Object.entries(obj)) {
-        if (key === 'fileReference' && child && typeof child === 'object' && !Array.isArray(child)) {
-            const ref = { ...child };
-            delete ref.url;
-            delete ref.relativePath;
-            out[key] = ref;
-            continue;
-        }
-        if (fileShaped && (key === 'url' || key === 'relativePath'))
-            continue;
-        out[key] = redactFileLocators(child);
-    }
-    return out;
-}
+export { formatMcpOutput } from './model-visible-tool-content.js';
 function expandEnvRefs(value) {
     if (!value)
         return '';

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

@@ -5,7 +5,7 @@
  * 或 request.execution 带可解析的 code bundlePath+handler，则直接本机执行。
  */
 import { spawn } from 'node:child_process';
-import { existsSync } from 'node:fs';
+import { existsSync, mkdirSync } from 'node:fs';
 import path from 'node:path';
 import { ErrorCodes, resolveReadyInstallByToolName, resolveMcpExecutionFromInstall, resolveCodeHandlerFromInstall, } from '@gt-fe/eap-contracts';
 import { isAbortError, toToolTimeoutMs, toolTimeoutErrorMessage } from './timeout.js';
@@ -49,13 +49,21 @@ function formatCodeLaunchError(err, spec) {
     }
     return new Error(err instanceof Error ? err.message : String(err));
 }
-function runHandler(handlerPath, input, timeoutMs, execution) {
+function runHandler(handlerPath, input, timeoutMs, execution, spawnOpts) {
     if (!existsSync(handlerPath)) {
         return Promise.reject(new Error(`找不到 handler 文件：${handlerPath}。请检查 toolset.manifest.json 的 tools[].handler 与工具目录。`));
     }
     const { cmd, args } = resolveCommand(handlerPath, execution);
+    const cwd = spawnOpts?.cwd?.trim() || undefined;
+    if (cwd)
+        mkdirSync(cwd, { recursive: true });
+    const env = { ...process.env, ...(spawnOpts?.env ?? {}) };
+    if (spawnOpts?.userId)
+        env.EAP_USER_ID = spawnOpts.userId;
+    if (cwd)
+        env.EAP_ARTIFACT_ROOT = cwd;
     return new Promise((resolve, reject) => {
-        const child = spawn(cmd, args, { stdio: ['pipe', 'pipe', 'pipe'] });
+        const child = spawn(cmd, args, { stdio: ['pipe', 'pipe', 'pipe'], cwd, env });
         let stdout = '';
         let stderr = '';
         let settled = false;
@@ -92,6 +100,20 @@ function runHandler(handlerPath, input, timeoutMs, execution) {
         child.stdin.end();
     });
 }
+function executionEnvFromRequest(request) {
+    const raw = request.execution;
+    if (!raw || typeof raw !== 'object')
+        return undefined;
+    const env = raw.env;
+    if (!env || typeof env !== 'object' || Array.isArray(env))
+        return undefined;
+    const out = {};
+    for (const [key, value] of Object.entries(env)) {
+        if (typeof value === 'string')
+            out[key] = value;
+    }
+    return Object.keys(out).length > 0 ? out : undefined;
+}
 /** 是否为应本机执行的 code（显式 localPreferred，例如 DevToolExecutor） */
 export function isLocalPreferredExecution(raw) {
     if (!raw || typeof raw !== 'object')
@@ -188,14 +210,19 @@ export class LocalToolExecutor {
     }
     async executeCodeSpec(request, spec) {
         try {
-            const stdout = await runHandler(spec.handlerPath, request.arguments, spec.timeoutMs ?? this.options.timeoutMs ?? 30_000, { runtime: spec.runtime, args: spec.args });
+            const jail = request.jailWorkdir?.trim() || undefined;
+            const stdout = await runHandler(spec.handlerPath, request.arguments, spec.timeoutMs ?? this.options.timeoutMs ?? 30_000, { runtime: spec.runtime, args: spec.args }, {
+                cwd: jail,
+                userId: request.authContext?.userId,
+                env: executionEnvFromRequest(request),
+            });
             return {
                 toolCallId: request.toolCallId,
                 toolName: request.toolName,
                 content: stdout,
                 success: true,
                 runtime: 'local',
-                file: fileArtifactFromToolOutput(stdout, fileBasesFromEnv()),
+                file: fileArtifactFromToolOutput(stdout, [...fileBasesFromEnv(), jail]),
             };
         }
         catch (error) {

package/dist/tool/mcp-list.d.ts

@@ -8,6 +8,14 @@ import type { LoadedToolDefinition, LoadedToolMap } from './loaded-tool-definiti
 import type { AuthContext, IToolExecutor, McpListedTool } from './tool-executor.interface.js';
 export declare function parseListedTools(result: unknown): McpListedTool[];
 export declare function nextListCursor(result: unknown): string | undefined;
+/**
+ * 有 toolsetCode 的 tools/list：回包 `_meta` 必须与请求作用域一致（Gateway A16）。
+ * 无 `_meta` 或编码/版本不符视为本次 list 失败，不把全局目录当该工具集。
+ */
+export declare function assertScopedListEcho(result: unknown, expected: {
+    toolsetCode: string;
+    version?: string;
+}): void;
 export interface McpDiscoverExecution {
     protocol?: string;
     discover?: boolean;
@@ -32,6 +40,19 @@ export declare function toolsetCodeFromLoaded(loaded: {
         id?: string;
     };
 } | undefined): string | undefined;
+/**
+ * Gateway `params._meta.toolsetCode`：hydrate 后的 `toolset:toolName` 前缀，
+ * 或 MCP discover stub 自身的工具集编码。
+ */
+export declare function mcpToolsetCode(loaded: {
+    toolId?: string;
+    name?: string;
+    manifest?: {
+        id?: string;
+        type?: string;
+        execution?: unknown;
+    };
+} | undefined): string | undefined;
 /** Tool Span：工具集 code + 声明版本。与 Skill 的 skillSpace/version 同一假设。 */
 export declare function toolTraceIdentity(loaded: {
     toolId?: string;

package/dist/tool/mcp-list.js

@@ -16,8 +16,9 @@ export function parseListedTools(result) {
         const t = raw;
         if (typeof t.name !== 'string' || !t.name.trim())
             continue;
-        const inputSchema = t.inputSchema && typeof t.inputSchema === 'object' && !Array.isArray(t.inputSchema)
-            ? t.inputSchema
+        const schemaRaw = t.inputSchema ?? t.input;
+        const inputSchema = schemaRaw && typeof schemaRaw === 'object' && !Array.isArray(schemaRaw)
+            ? schemaRaw
             : undefined;
         out.push({
             name: t.name,
@@ -31,6 +32,30 @@ export function nextListCursor(result) {
     const cursor = result?.nextCursor;
     return typeof cursor === 'string' && cursor.trim() ? cursor : undefined;
 }
+/**
+ * 有 toolsetCode 的 tools/list：回包 `_meta` 必须与请求作用域一致（Gateway A16）。
+ * 无 `_meta` 或编码/版本不符视为本次 list 失败，不把全局目录当该工具集。
+ */
+export function assertScopedListEcho(result, expected) {
+    const root = result && typeof result === 'object' && !Array.isArray(result)
+        ? result
+        : {};
+    const echo = root._meta && typeof root._meta === 'object' && !Array.isArray(root._meta)
+        ? root._meta
+        : {};
+    const code = typeof echo.toolsetCode === 'string' ? echo.toolsetCode.trim() : '';
+    const version = typeof echo.version === 'string' ? echo.version.trim() : '';
+    const wantCode = expected.toolsetCode.trim();
+    const wantVersion = expected.version?.trim() ?? '';
+    if (!wantCode)
+        return;
+    if (code !== wantCode) {
+        throw new Error(`MCP tools/list 回包 toolsetCode 与请求不一致: 期望 ${wantCode}, 实际 ${code || '<missing>'}`);
+    }
+    if (wantVersion && version !== wantVersion) {
+        throw new Error(`MCP tools/list 回包 version 与请求不一致: 期望 ${wantVersion}, 实际 ${version || '<missing>'}`);
+    }
+}
 export function readMcpDiscoverExecution(raw) {
     if (!raw || typeof raw !== 'object' || Array.isArray(raw))
         return null;
@@ -84,6 +109,21 @@ export function toolsetCodeFromLoaded(loaded) {
     }
     return undefined;
 }
+/**
+ * Gateway `params._meta.toolsetCode`：hydrate 后的 `toolset:toolName` 前缀，
+ * 或 MCP discover stub 自身的工具集编码。
+ */
+export function mcpToolsetCode(loaded) {
+    const fromPrefix = toolsetCodeFromLoaded(loaded);
+    if (fromPrefix)
+        return fromPrefix;
+    if (!loaded || loaded.manifest?.type !== 'mcp')
+        return undefined;
+    if (!readMcpDiscoverExecution(loaded.manifest.execution))
+        return undefined;
+    const id = (loaded.manifest.id || loaded.toolId || loaded.name || '').trim();
+    return id || undefined;
+}
 function declaredToolVersion(toolName, version) {
     const raw = version?.trim();
     if (!raw || raw === toolName)
@@ -120,7 +160,10 @@ export async function hydrateMcpTools(loadedTools, executor, auth) {
     }
     const groups = new Map();
     for (const stub of stubs) {
-        const key = mcpEndpointKey(stub.manifest.execution);
+        const endpoint = mcpEndpointKey(stub.manifest.execution);
+        const toolsetCode = mcpToolsetCode(stub) ?? stub.name;
+        const version = stub.manifest.version?.trim() ?? '';
+        const key = `${endpoint}\0${toolsetCode}\0${version}`;
         const list = groups.get(key);
         if (list)
             list.push(stub);
@@ -132,6 +175,7 @@ export async function hydrateMcpTools(loadedTools, executor, auth) {
     for (const [, group] of groups) {
         const primary = group[0];
         const endpoint = mcpEndpointKey(primary.manifest.execution, primary.name);
+        const toolsetCode = mcpToolsetCode(primary);
         let listed;
         try {
             listed = await executor.listTools({
@@ -144,6 +188,8 @@ export async function hydrateMcpTools(loadedTools, executor, auth) {
                 toolType: 'mcp',
                 toolRuntime: primary.manifest.toolRuntime,
                 execution: primary.manifest.execution,
+                ...(toolsetCode ? { toolsetCode } : {}),
+                ...(primary.manifest.version ? { toolVersion: primary.manifest.version } : {}),
             });
         }
         catch (err) {

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

@@ -18,7 +18,7 @@ export declare class McpToolExecutor implements IToolExecutor {
     private readonly mcpUrl;
     private rpcId;
     private initialized;
-    /** endpoint+user+agent → in-flight / completed tools/list */
+    /** endpoint+user+agent+toolset+version → in-flight / completed tools/list */
     private readonly listCache;
     constructor(options: McpToolExecutorOptions);
     execute(request: ToolCallRequest): Promise<ToolCallResult>;

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

@@ -5,8 +5,10 @@
  */
 import { ErrorCodes } from '@gt-fe/eap-contracts';
 import { emitRuntimeLog } from '../common/logger.js';
-import { abortOrTimeoutMessage, isAbortError } from './timeout.js';
-import { nextListCursor, parseListedTools } from './mcp-list.js';
+import { abortOrTimeoutMessage, isAbortError, timeoutMsFromExecution } from './timeout.js';
+import { formatMcpOutput } from './model-visible-tool-content.js';
+import { fileArtifactFromToolOutput, fileBasesFromEnv } from './file-artifact.js';
+import { assertScopedListEcho, nextListCursor, parseListedTools } from './mcp-list.js';
 /** Tool Gateway 基址：必须是绝对 http(s)。空串 / 相对路径禁止 fetch。 */
 export function isAbsoluteHttpUrl(value) {
     if (typeof value !== 'string')
@@ -26,10 +28,7 @@ function resolveAgentCode(request) {
     return request.authContext.agentCode;
 }
 function formatContent(result) {
-    const text = result?.content?.[0]?.text;
-    if (text != null)
-        return text;
-    return JSON.stringify(result ?? {});
+    return formatMcpOutput(result ?? {});
 }
 function mapMcpError(status, body) {
     const eapCode = body?.error?.data?.eapCode;
@@ -56,13 +55,41 @@ function mapMcpError(status, body) {
     }
     return { error: message, errorCode: eapCode ?? 'EXECUTION_FAILED', retryable: false };
 }
+/** Gateway 作用域只在 params._meta；name / arguments / cursor 是协议字段。 */
+function mcpScopeMeta(request) {
+    const toolsetCode = request.toolsetCode?.trim();
+    const version = request.toolVersion?.trim();
+    const meta = {};
+    if (toolsetCode)
+        meta.toolsetCode = toolsetCode;
+    if (version)
+        meta.version = version;
+    return Object.keys(meta).length > 0 ? meta : undefined;
+}
+function mcpCallParams(request) {
+    const _meta = mcpScopeMeta(request);
+    return {
+        name: request.toolName,
+        arguments: request.arguments,
+        ...(_meta ? { _meta } : {}),
+    };
+}
+function mcpListCacheKey(mcpUrl, request) {
+    return [
+        mcpUrl,
+        request.authContext.userId ?? '',
+        request.authContext.agentCode,
+        request.toolsetCode?.trim() ?? '',
+        request.toolVersion?.trim() ?? '',
+    ].join('\0');
+}
 export class McpToolExecutor {
     baseUrl;
     timeout;
     mcpUrl;
     rpcId = 1;
     initialized = false;
-    /** endpoint+user+agent → in-flight / completed tools/list */
+    /** endpoint+user+agent+toolset+version → in-flight / completed tools/list */
     listCache = new Map();
     constructor(options) {
         if (!isAbsoluteHttpUrl(options.baseUrl)) {
@@ -87,16 +114,7 @@ export class McpToolExecutor {
                 jsonrpc: '2.0',
                 id,
                 method: 'tools/call',
-                params: {
-                    name: request.toolName,
-                    arguments: request.arguments,
-                    ...(request.toolVersion
-                        ? {
-                            version: request.toolVersion,
-                            _meta: { version: request.toolVersion },
-                        }
-                        : {}),
-                },
+                params: mcpCallParams(request),
             }, request, agentCode, correlationId);
             if (!response.ok) {
                 let body = null;
@@ -128,16 +146,18 @@ export class McpToolExecutor {
                     ...mapped,
                 };
             }
+            const raw = body.result;
             return {
                 toolCallId: request.toolCallId,
                 toolName: request.toolName,
-                content: formatContent(body.result),
+                content: formatContent(raw),
                 success: true,
                 runtime: 'server',
+                file: fileArtifactFromToolOutput(raw?.structuredContent ?? raw?.content?.[0]?.text ?? raw, [...fileBasesFromEnv(), request.jailWorkdir]),
             };
         }
         catch (err) {
-            const timeoutSec = Math.max(1, Math.round(this.timeout / 1000));
+            const timeoutSec = Math.max(1, Math.round(timeoutMsFromExecution(request.execution, this.timeout) / 1000));
             const aborted = isAbortError(err);
             return {
                 toolCallId: request.toolCallId,
@@ -152,7 +172,7 @@ export class McpToolExecutor {
         }
     }
     async listTools(request) {
-        const key = `${this.mcpUrl}\0${request.authContext.userId}\0${request.authContext.agentCode}`;
+        const key = mcpListCacheKey(this.mcpUrl, request);
         const cached = this.listCache.get(key);
         if (cached)
             return cached;
@@ -168,10 +188,22 @@ export class McpToolExecutor {
     }
     async listAllTools(request) {
         await this.ensureInitialized(request);
+        const meta = mcpScopeMeta(request);
+        if (meta?.toolsetCode) {
+            const result = await this.rpcResult(request, 'tools/list', { _meta: meta });
+            assertScopedListEcho(result, {
+                toolsetCode: meta.toolsetCode,
+                version: meta.version,
+            });
+            return parseListedTools(result);
+        }
         const tools = [];
         let cursor;
         do {
-            const result = await this.rpcResult(request, 'tools/list', cursor ? { cursor } : {});
+            const result = await this.rpcResult(request, 'tools/list', {
+                ...(cursor ? { cursor } : {}),
+                ...(meta ? { _meta: meta } : {}),
+            });
             tools.push(...parseListedTools(result));
             cursor = nextListCursor(result);
         } while (cursor);
@@ -223,7 +255,8 @@ export class McpToolExecutor {
     }
     async postRpc(payload, request, agentCode, correlationId) {
         const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), this.timeout);
+        const timeoutMs = timeoutMsFromExecution(request.execution, this.timeout);
+        const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
         try {
             return await fetch(this.mcpUrl, {
                 method: 'POST',
@@ -234,6 +267,9 @@ export class McpToolExecutor {
                     Authorization: `Bearer ${request.authContext.delegationToken}`,
                     'X-Agent-Code': agentCode,
                     'X-Agent-Id': agentCode,
+                    ...(request.authContext.agentVersion
+                        ? { 'X-Agent-Version': request.authContext.agentVersion }
+                        : {}),
                     'X-User-Id': request.authContext.userId,
                     // 上游 mcp-data-service 认 `userId`；Gateway 侧亦保留 X-User-Id
                     userId: request.authContext.userId,

package/dist/tool/model-visible-tool-content.d.ts

@@ -0,0 +1,16 @@
+/**
+ * 模型可见 Tool 结果：MCP / Code 成功正文在写入 GraphState 前统一裁到最多 200 行，并写 recordCount / previewCount / truncated。
+ *
+ * 假设：模型看到的永远可能是预览；全量条数与是否裁过只在这一处写。
+ * 不按工具名分支。fileReference 路径仍由 format 阶段剔除，下载走 result.file。
+ *
+ * 预览行数按 DeepSeek V4 Pro（约 1M 上下文）估：单次工具结果要够看列和分布，
+ * 又不能看起来像全表。200 行约 3–8 万 token（视列宽）；多轮 5–6 次查询仍远低于窗口。
+ * 50 行只够看样例。1000 行接近聚合工具自己的预览上限，模型容易拿来排名。
+ * 超宽表先按行裁，再按体积把行数压到整段 JSON 仍合法。
+ */
+export declare const MAX_MODEL_RESULT_ROWS = 200;
+export declare const MAX_MODEL_CONTENT_CHARS = 64000;
+export declare const MAX_MODEL_RESULT_CHARS = 120000;
+export declare function formatMcpOutput(result: unknown): string;
+export declare function toModelVisibleToolContent(content: string): string;