@gt-fe/eap-runtime 0.0.22 → 0.0.24

package/dist/tool/model-visible-tool-content.js

@@ -0,0 +1,266 @@
+/**
+ * 模型可见 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 const MAX_MODEL_RESULT_ROWS = 200;
+export const MAX_MODEL_CONTENT_CHARS = 64_000;
+export const MAX_MODEL_RESULT_CHARS = 120_000;
+const PRIMARY_ARRAY_KEYS = ['rows', 'data', 'records', 'result', 'dataset', 'items', 'results'];
+const TEXT_CLIP_SUFFIX = '...[文本已截断]';
+export function formatMcpOutput(result) {
+    const r = result;
+    const count = finiteCount(r?._meta?.recordCount) ?? finiteCount(r?._meta?.totalCount);
+    if (r?.structuredContent !== undefined) {
+        return JSON.stringify(attachCount(redactFileLocators(r.structuredContent), count));
+    }
+    const text = r?.content?.[0]?.text;
+    if (text) {
+        try {
+            return JSON.stringify(attachCount(redactFileLocators(JSON.parse(text)), count));
+        }
+        catch {
+            if (count == null)
+                return text;
+            return JSON.stringify({ recordCount: count, content: text });
+        }
+    }
+    return JSON.stringify(attachCount(redactFileLocators(result), count));
+}
+export function toModelVisibleToolContent(content) {
+    if (content === '')
+        return content;
+    const parsed = parseJson(content);
+    if (parsed === undefined) {
+        if (content.length <= MAX_MODEL_CONTENT_CHARS)
+            return content;
+        return `${content.slice(0, MAX_MODEL_CONTENT_CHARS)}${TEXT_CLIP_SUFFIX}`;
+    }
+    const clipped = clipParsed(parsed);
+    if (!clipped.needEnvelope)
+        return content;
+    let out = clipped.value;
+    if (isPlainObject(clipped.value)) {
+        out = {
+            ...clipped.value,
+            recordCount: clipped.recordCount,
+            previewCount: clipped.previewCount,
+            truncated: clipped.truncated,
+        };
+    }
+    else if (Array.isArray(clipped.value)) {
+        out = {
+            truncated: clipped.truncated,
+            recordCount: clipped.recordCount,
+            previewCount: clipped.previewCount,
+            data: clipped.value,
+        };
+    }
+    if (typeof out === 'string') {
+        if (out.length <= MAX_MODEL_CONTENT_CHARS)
+            return JSON.stringify(out);
+        return JSON.stringify(`${out.slice(0, MAX_MODEL_CONTENT_CHARS)}${TEXT_CLIP_SUFFIX}`);
+    }
+    return stringifyWithinLimit(out, clipped.recordCount);
+}
+function clipParsed(value) {
+    if (Array.isArray(value)) {
+        const recordCount = value.length;
+        const clipped = value.length > MAX_MODEL_RESULT_ROWS;
+        const next = clipped ? value.slice(0, MAX_MODEL_RESULT_ROWS) : value;
+        return {
+            value: next,
+            needEnvelope: clipped,
+            recordCount,
+            previewCount: next.length,
+            truncated: clipped,
+        };
+    }
+    if (isPlainObject(value)) {
+        const obj = value;
+        const next = {};
+        let didClip = false;
+        for (const [key, child] of Object.entries(obj)) {
+            if (typeof child === 'string' && child.length > MAX_MODEL_CONTENT_CHARS) {
+                next[key] = `${child.slice(0, MAX_MODEL_CONTENT_CHARS)}${TEXT_CLIP_SUFFIX}`;
+                didClip = true;
+            }
+            else if (Array.isArray(child) && isPrimaryArrayKey(key) && child.length > MAX_MODEL_RESULT_ROWS) {
+                next[key] = child.slice(0, MAX_MODEL_RESULT_ROWS);
+                didClip = true;
+            }
+            else {
+                next[key] = child;
+            }
+        }
+        const prePrimary = primaryArrayLength(obj);
+        const recordCount = finiteCount(obj.recordCount) ?? finiteCount(obj.rowCount) ?? prePrimary;
+        const previewCount = primaryArrayLength(next);
+        const truncated = didClip
+            || obj.truncated === true
+            || (recordCount != null && previewCount != null && previewCount < recordCount);
+        const needEnvelope = didClip
+            || truncated
+            || finiteCount(obj.recordCount) != null
+            || finiteCount(obj.rowCount) != null;
+        return {
+            value: next,
+            needEnvelope,
+            recordCount,
+            previewCount,
+            truncated,
+        };
+    }
+    if (typeof value === 'string' && value.length > MAX_MODEL_CONTENT_CHARS) {
+        return {
+            value: `${value.slice(0, MAX_MODEL_CONTENT_CHARS)}${TEXT_CLIP_SUFFIX}`,
+            needEnvelope: false,
+            truncated: true,
+        };
+    }
+    return { value, needEnvelope: false, truncated: false };
+}
+function stringifyWithinLimit(value, recordCount) {
+    let current = value;
+    let json = JSON.stringify(current);
+    if (json.length <= MAX_MODEL_RESULT_CHARS)
+        return json;
+    if (isPlainObject(current)) {
+        current = shrinkPrimaryArray(current, recordCount);
+        json = JSON.stringify(current);
+        if (json.length <= MAX_MODEL_RESULT_CHARS)
+            return json;
+        const shortened = clipLongStrings(current, 256);
+        json = JSON.stringify(shortened);
+        if (json.length <= MAX_MODEL_RESULT_CHARS)
+            return json;
+        const count = isPlainObject(shortened)
+            ? (finiteCount(shortened.recordCount) ?? recordCount)
+            : recordCount;
+        json = JSON.stringify({
+            truncated: true,
+            recordCount: count,
+            previewCount: 0,
+            message: '结果过大，模型侧不返回行数据；请用 aggregate_dataset_data / export_dataset_data 处理全量',
+        });
+    }
+    if (json.length <= MAX_MODEL_RESULT_CHARS)
+        return json;
+    return JSON.stringify({ truncated: true, previewCount: 0, message: '结果过大' });
+}
+function clipLongStrings(value, maxChars) {
+    if (typeof value === 'string') {
+        return value.length > maxChars ? `${value.slice(0, maxChars)}${TEXT_CLIP_SUFFIX}` : value;
+    }
+    if (Array.isArray(value))
+        return value.map((item) => clipLongStrings(item, maxChars));
+    if (!isPlainObject(value))
+        return value;
+    const out = {};
+    for (const [key, child] of Object.entries(value)) {
+        out[key] = clipLongStrings(child, maxChars);
+    }
+    return out;
+}
+function isPrimaryArrayKey(key) {
+    return PRIMARY_ARRAY_KEYS.includes(key);
+}
+function shrinkPrimaryArray(obj, recordCount) {
+    const key = primaryArrayKey(obj);
+    const rows = key ? obj[key] : undefined;
+    if (!key || !Array.isArray(rows) || rows.length <= 1)
+        return obj;
+    let low = 1;
+    let high = rows.length;
+    let best = 1;
+    while (low <= high) {
+        const mid = Math.floor((low + high) / 2);
+        const candidate = withPreview(obj, key, rows.slice(0, mid), recordCount);
+        if (JSON.stringify(candidate).length <= MAX_MODEL_RESULT_CHARS) {
+            best = mid;
+            low = mid + 1;
+        }
+        else {
+            high = mid - 1;
+        }
+    }
+    return withPreview(obj, key, rows.slice(0, best), recordCount);
+}
+function withPreview(obj, key, rows, recordCount) {
+    const full = recordCount ?? finiteCount(obj.recordCount) ?? finiteCount(obj.rowCount) ?? rows.length;
+    return {
+        ...obj,
+        [key]: rows,
+        recordCount: full,
+        previewCount: rows.length,
+        truncated: true,
+    };
+}
+function primaryArrayKey(obj) {
+    for (const key of PRIMARY_ARRAY_KEYS) {
+        if (Array.isArray(obj[key]))
+            return key;
+    }
+    return undefined;
+}
+function attachCount(value, count) {
+    if (count == null || !isPlainObject(value))
+        return value;
+    const obj = value;
+    if (finiteCount(obj.recordCount) != null || finiteCount(obj.rowCount) != null)
+        return value;
+    return { ...obj, recordCount: count };
+}
+function primaryArrayLength(obj) {
+    for (const key of PRIMARY_ARRAY_KEYS) {
+        const child = obj[key];
+        if (Array.isArray(child))
+            return child.length;
+    }
+    return undefined;
+}
+function finiteCount(value) {
+    return typeof value === 'number' && Number.isFinite(value) ? value : undefined;
+}
+function parseJson(text) {
+    const trimmed = text.trim();
+    if (!trimmed.startsWith('{') && !trimmed.startsWith('['))
+        return undefined;
+    try {
+        return JSON.parse(trimmed);
+    }
+    catch {
+        return undefined;
+    }
+}
+function isPlainObject(value) {
+    return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+}
+function redactFileLocators(value) {
+    if (Array.isArray(value))
+        return value.map(redactFileLocators);
+    if (!isPlainObject(value))
+        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' && isPlainObject(child)) {
+            const ref = { ...child };
+            delete ref.url;
+            out[key] = ref;
+            continue;
+        }
+        if (fileShaped && key === 'url')
+            continue;
+        out[key] = redactFileLocators(child);
+    }
+    return out;
+}

package/dist/tool/timeout.d.ts

@@ -1,14 +1,7 @@
 /**
- * Tool / toolset `timeout`：秒。
- * 与 `@gt-fe/eap-contracts` `src/tool/timeout.ts` 同语义；Runtime 钉的是 contracts 0.0.9，
- * 尚未含这些导出。发版 contracts 后改为从 `@gt-fe/eap-contracts` 引用。
+ * 秒钳制与 abort 识别从 `@gt-fe/eap-contracts` 来。
+ * 本文件保留：本次工具 execution.timeout → 毫秒。
  */
-export declare const DEFAULT_TOOL_TIMEOUT_SEC = 30;
-export declare const DEFAULT_HTTP_TOOL_TIMEOUT_SEC = 10;
-export declare const MIN_TOOL_TIMEOUT_SEC = 1;
-export declare const MAX_TOOL_TIMEOUT_SEC = 300;
-export declare function resolveToolTimeoutSec(timeoutSec: unknown, fallbackSec?: number): number;
-export declare function toToolTimeoutMs(timeoutSec: unknown, fallbackSec?: number): number;
-export declare function isAbortError(error: unknown): boolean;
-export declare function toolTimeoutErrorMessage(timeoutSec: number): string;
-export declare function abortOrTimeoutMessage(error: unknown, timeoutSec: number): string;
+export { DEFAULT_HTTP_TOOL_TIMEOUT_SEC, DEFAULT_TOOL_TIMEOUT_SEC, MAX_TOOL_TIMEOUT_SEC, MIN_TOOL_TIMEOUT_SEC, abortOrTimeoutMessage, isAbortError, resolveToolTimeoutSec, toToolTimeoutMs, toolTimeoutErrorMessage, } from '@gt-fe/eap-contracts';
+/** 清单 tools[].timeout / 展开后 execution.timeout（秒）→ 本次调用毫秒；没有则用装配默认。 */
+export declare function timeoutMsFromExecution(execution: unknown, fallbackMs: number): number;

package/dist/tool/timeout.js

@@ -1,39 +1,17 @@
 /**
- * Tool / toolset `timeout`：秒。
- * 与 `@gt-fe/eap-contracts` `src/tool/timeout.ts` 同语义；Runtime 钉的是 contracts 0.0.9，
- * 尚未含这些导出。发版 contracts 后改为从 `@gt-fe/eap-contracts` 引用。
+ * 秒钳制与 abort 识别从 `@gt-fe/eap-contracts` 来。
+ * 本文件保留：本次工具 execution.timeout → 毫秒。
  */
-export const DEFAULT_TOOL_TIMEOUT_SEC = 30;
-export const DEFAULT_HTTP_TOOL_TIMEOUT_SEC = 10;
-export const MIN_TOOL_TIMEOUT_SEC = 1;
-export const MAX_TOOL_TIMEOUT_SEC = 300;
-export function resolveToolTimeoutSec(timeoutSec, fallbackSec = DEFAULT_TOOL_TIMEOUT_SEC) {
-    if (typeof timeoutSec !== 'number' || !Number.isFinite(timeoutSec) || timeoutSec <= 0) {
-        return fallbackSec;
+export { DEFAULT_HTTP_TOOL_TIMEOUT_SEC, DEFAULT_TOOL_TIMEOUT_SEC, MAX_TOOL_TIMEOUT_SEC, MIN_TOOL_TIMEOUT_SEC, abortOrTimeoutMessage, isAbortError, resolveToolTimeoutSec, toToolTimeoutMs, toolTimeoutErrorMessage, } from '@gt-fe/eap-contracts';
+import { toToolTimeoutMs } from '@gt-fe/eap-contracts';
+/** 清单 tools[].timeout / 展开后 execution.timeout（秒）→ 本次调用毫秒；没有则用装配默认。 */
+export function timeoutMsFromExecution(execution, fallbackMs) {
+    if (!execution || typeof execution !== 'object' || Array.isArray(execution)) {
+        return fallbackMs;
     }
-    return Math.min(MAX_TOOL_TIMEOUT_SEC, Math.max(MIN_TOOL_TIMEOUT_SEC, Math.trunc(timeoutSec)));
-}
-export function toToolTimeoutMs(timeoutSec, fallbackSec = DEFAULT_TOOL_TIMEOUT_SEC) {
-    return resolveToolTimeoutSec(timeoutSec, fallbackSec) * 1000;
-}
-export function isAbortError(error) {
-    if (!error || typeof error !== 'object')
-        return false;
-    const err = error;
-    if (err.name === 'AbortError' || err.name === 'TimeoutError' || err.code === 'ABORT_ERR') {
-        return true;
+    const timeout = execution.timeout;
+    if (typeof timeout !== 'number' || !Number.isFinite(timeout) || timeout <= 0) {
+        return fallbackMs;
     }
-    const msg = (err.message ?? '').toLowerCase();
-    return (msg === 'this operation was aborted'
-        || msg === 'the operation was aborted'
-        || msg.includes('this operation was aborted')
-        || msg.includes('the operation was aborted'));
-}
-export function toolTimeoutErrorMessage(timeoutSec) {
-    return `timeout after ${resolveToolTimeoutSec(timeoutSec)}s`;
-}
-export function abortOrTimeoutMessage(error, timeoutSec) {
-    if (isAbortError(error))
-        return toolTimeoutErrorMessage(timeoutSec);
-    return error instanceof Error ? error.message : String(error);
+    return toToolTimeoutMs(timeout);
 }

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

@@ -12,6 +12,8 @@ export interface AuthContext {
     delegationToken: string;
     /** Agent 对外主键 */
     agentCode: string;
+    /** 本次请求的 Agent 预装版本（目录名）；Gateway 写根用 */
+    agentVersion?: string;
 }
 /**
  * ToolCallRequest — Tool 调用请求
@@ -22,9 +24,13 @@ export interface ToolCallRequest {
     arguments: Record<string, unknown>;
     /**
      * 工具语义化版本（来自 LoadedToolDefinition.manifest.version）。
-     * McpToolExecutor 在 Gateway `tools/call` 中透传为 params.version。
+     * McpToolExecutor 只放进 Gateway `params._meta.version`，不写 params 顶层。
      */
     toolVersion?: string;
+    /**
+     * MCP 工具集编码。McpToolExecutor 只放进 Gateway `params._meta.toolsetCode`。
+     */
+    toolsetCode?: string;
     authContext: AuthContext;
     dataScope?: 'user-bound' | 'department-bound' | 'global';
     resourceOwnerId?: string;

package/dist/tool/tool-orchestrator.js

@@ -6,6 +6,7 @@
  */
 import { isBuiltinToolExecution } from '@gt-fe/eap-contracts';
 import { assertToolPermission, GovernanceUnavailableError, PermissionDeniedError, } from '../governance/permission-guard.js';
+import { toModelVisibleToolContent } from './model-visible-tool-content.js';
 /**
  * ToolOrchestrator — Tool 调用编排主服务
  */
@@ -70,7 +71,11 @@ export class ToolOrchestrator {
             }
         }
         try {
-            return await this.toolExecutor.execute(request);
+            const result = await this.toolExecutor.execute(request);
+            if (result.success && result.content) {
+                return { ...result, content: toModelVisibleToolContent(result.content) };
+            }
+            return result;
         }
         catch (error) {
             const message = error instanceof Error ? error.message : 'Unknown execution error';

package/dist/tool/tool-result-injector.js

@@ -10,6 +10,7 @@
  * @see design.md §1.2 Tool结果注入State → 回到LLM节点（ReAct循环）
  * @see requirements.md Requirement 8 AC4
  */
+import { toModelVisibleToolContent } from './model-visible-tool-content.js';
 // ─────────────────────────────────────────────
 // ToolResultInjector
 // ─────────────────────────────────────────────
@@ -51,7 +52,7 @@ export class ToolResultInjector {
      */
     buildToolMessage(result) {
         const content = result.success
-            ? result.content
+            ? toModelVisibleToolContent(result.content)
             : `[Tool Error] ${result.error ?? 'Unknown error'}`;
         return {
             role: 'tool',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gt-fe/eap-runtime",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "description": "Enterprise Agent Platform — Runtime核心：Graph执行引擎、Task生命周期、Session管理、Checkpoint持久化",
   "type": "module",
   "main": "dist/index.js",
@@ -20,7 +20,7 @@
     "ioredis": "^5.4.0",
     "pg": "^8.13.0",
     "yaml": "^2.6.1",
-    "@gt-fe/eap-contracts": "0.0.12"
+    "@gt-fe/eap-contracts": "0.0.14"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",