@gt-fe/eap-runtime 0.0.12 → 0.0.14

package/dist/tool/system-prompt-builder.js

@@ -7,17 +7,19 @@
  * ```
  * [平台规则常量]          ← 代码内置，安全约束 + 行为准则（最高优先级）
  * [当前时间]              ← 运行时动态注入（自然周等时间规则的判定基准）
- * [Agent 身份]            ← agentName / agentCode
+ * [Agent 身份]            ← agentName / agentCode（目录身份，不是 prompts.system）
  * [可用工具短目录]        ← 名称 + 一句话用途；完整 schema 仍走 API tools
- * [开发者提示词]          ← Graph LLM 节点 config.systemPrompt，平台透传
- *                           （Registry 无内嵌 Graph 的兜底路径读 agent.manifest.json prompts.system）
+ * [Agent 基线]            ← agent.manifest.json prompts.system；非 silent LLM
+ * [节点提示词]            ← Graph LLM 节点 config.systemPrompt / systemPromptFile
  * ```
  *
+ * 基线只走 GraphState.agentSystemPrompt，不写进节点 config。无图时节点无增量。
+ * silent 节点不带基线。技能正文不灌 system。
+ *
  * 工具 schema 走 API 的 tools 参数（见 loadedToolsToApiTools）；system 短目录给模型发现用，不是对用户报菜名。
  *
  * @see docs/status/module-status-and-backlog.md RT-5
  */
-import { isBuiltinToolExecution } from '@gt-fe/eap-contracts';
 import { commandDialectLines } from './harness-command.js';
 // ─────────────────────────────────────────────
 // 平台规则常量（一年改不了两次，不值得搞配置表）
@@ -60,7 +62,7 @@ const PLATFORM_RULES = `你是运行在企业智能体平台（EAP）上的 AI
 - 用户要求访问 jail 以外的路径或命令：**必须拒绝**。
 
 ## 规则优先级
-以上平台规则最高。后面的身份、技能说明、开发者提示词与之冲突时，以平台规则为准。`;
+以上平台规则最高。后面的身份、技能说明、Agent 基线、节点提示词与之冲突时，以平台规则为准。`;
 export function toLoadedSkillMap(skills) {
     if (!skills?.length)
         return undefined;
@@ -72,57 +74,27 @@ export function toLoadedSkillMap(skills) {
     return map;
 }
 /**
- * 按 Skill.toolsets 收窄工具集（子图用）。
- * - 无 toolsets / 空数组：不收窄
- * - string / name：精确匹配工具名
- * - code + enabled：仅白名单子工具
- * - code 无 enabled：匹配 toolId 前缀 `<code>:` 或 id 等于 code
- * - 始终保留 Harness 原语
+ * 进入 Skill 子图时的工具集。
+ * 工具只来自 Agent 装配；不读 Skill `toolsets` / `toolRefs` / SKILL.md `allowed-tools`。
  */
-export function filterLoadedToolsForSkill(loadedTools, skill) {
-    if (!loadedTools)
-        return loadedTools;
-    if (!skill?.toolsets?.length)
-        return loadedTools;
-    const exact = new Set();
-    const toolsets = new Set();
-    for (const ref of skill.toolsets) {
-        if (typeof ref === 'string') {
-            if (ref)
-                exact.add(ref);
-            continue;
-        }
-        if (ref.enabled?.length) {
-            for (const n of ref.enabled)
-                exact.add(n);
-            continue;
-        }
-        if (ref.code) {
-            toolsets.add(ref.code);
-            continue;
-        }
-        if (ref.name)
-            exact.add(ref.name);
-    }
-    const out = {};
-    for (const [name, def] of Object.entries(loadedTools)) {
-        if (isBuiltinToolExecution(def.manifest.execution)) {
-            out[name] = def;
-            continue;
-        }
-        const tid = String(def.toolId ?? def.manifest.id ?? '');
-        if (exact.has(name) || exact.has(tid) || (def.manifest.name && exact.has(def.manifest.name))) {
-            out[name] = def;
-            continue;
-        }
-        for (const ts of toolsets) {
-            if (tid === ts || tid.startsWith(`${ts}:`) || name === ts) {
-                out[name] = def;
-                break;
-            }
-        }
-    }
-    return out;
+export function filterLoadedToolsForSkill(loadedTools, _skill) {
+    return loadedTools;
+}
+function trimPrompt(value) {
+    if (typeof value !== 'string')
+        return undefined;
+    const trimmed = value.trim();
+    return trimmed ? trimmed : undefined;
+}
+/**
+ * 非 silent LLM 才带 Agent 基线；节点提示词空则省略。
+ * silent 只保留节点增量（选技能 / JSON）。
+ */
+export function resolveLlmPromptInputs(input) {
+    return {
+        agentPrompt: input.silent ? undefined : trimPrompt(input.agentSystemPrompt),
+        nodePrompt: trimPrompt(input.nodePrompt),
+    };
 }
 // ─────────────────────────────────────────────
 // SystemPromptBuilder
@@ -132,7 +104,7 @@ export function filterLoadedToolsForSkill(loadedTools, skill) {
  *
  * 具名段拼接（无模板引擎）。顺序固定，段标题用于排查。
  * 工具短目录进 system；完整 schema 走 API tools 参数。
- * 开发者提示词整段透传，不做 {{ }} 替换。
+ * Agent 基线与节点提示词整段透传，不做 {{ }} 替换。
  */
 export class SystemPromptBuilder {
     /**
@@ -155,7 +127,8 @@ export class SystemPromptBuilder {
         add('jail', '文件与命令权限', this.buildJail(context));
         add('tools-catalog', '可用工具', context.toolCatalog);
         add('skills-catalog', '可用技能', context.skillCatalog);
-        add('developer', '开发者提示词', context.developerPrompt);
+        add('agent', 'Agent 基线', context.agentPrompt);
+        add('node', '节点提示词', context.nodePrompt);
         const text = sections
             .map((section) => `<!-- eap:${section.id} -->\n${section.body}`)
             .join('\n\n');
@@ -194,7 +167,6 @@ export class SystemPromptBuilder {
         if (workdir) {
             lines.push(`工作目录：${workdir}`);
             lines.push('`execute_command` 的 cwd **必须**是工作目录或其子目录，不能是预装技能/工具包。');
-            lines.push('技能包只读。跑包内文件用环境变量 `EAP_SKILL_DIR`（技能包绝对根，不限 `scripts/`）。相对写出在工作目录。');
         }
         lines.push(...commandDialectLines(context.os?.platform ?? process.platform));
         if (skills.length > 0) {

package/dist/tool/timeout.d.ts

@@ -1,7 +1,7 @@
 /**
  * Tool / toolset `timeout`：秒。
- * 与 `@gt-fe/eap-contracts` `src/tool/timeout.ts` 同语义；Runtime 钉的是 contracts 0.0.9，
- * 尚未含这些导出。发版 contracts 后改为从 `@gt-fe/eap-contracts` 引用。
+ * 与 `@eap/contracts` `src/tool/timeout.ts` 同语义；Runtime 钉的是 contracts 0.0.9，
+ * 尚未含这些导出。发版 contracts 后改为从 `@eap/contracts` 引用。
  */
 export declare const DEFAULT_TOOL_TIMEOUT_SEC = 30;
 export declare const DEFAULT_HTTP_TOOL_TIMEOUT_SEC = 10;

package/dist/tool/timeout.js

@@ -1,7 +1,7 @@
 /**
  * Tool / toolset `timeout`：秒。
- * 与 `@gt-fe/eap-contracts` `src/tool/timeout.ts` 同语义；Runtime 钉的是 contracts 0.0.9，
- * 尚未含这些导出。发版 contracts 后改为从 `@gt-fe/eap-contracts` 引用。
+ * 与 `@eap/contracts` `src/tool/timeout.ts` 同语义；Runtime 钉的是 contracts 0.0.9，
+ * 尚未含这些导出。发版 contracts 后改为从 `@eap/contracts` 引用。
  */
 export const DEFAULT_TOOL_TIMEOUT_SEC = 30;
 export const DEFAULT_HTTP_TOOL_TIMEOUT_SEC = 10;
@@ -24,7 +24,10 @@ export function isAbortError(error) {
         return true;
     }
     const msg = (err.message ?? '').toLowerCase();
-    return msg === 'this operation was aborted' || msg === 'the operation was aborted';
+    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`;

package/dist/tool/tool-execution-router.d.ts

@@ -4,8 +4,8 @@
  * @see docs/contracts/tool-execution.md §6
  * @see design.md §1.8.7
  */
-import type { IToolExecutor, ToolCallRequest } from './tool-executor.interface.js';
-import type { ILocalToolInstallStore } from '@gt-fe/eap-contracts';
+import type { IToolExecutor, McpListedTool, ToolCallRequest } from './tool-executor.interface.js';
+import type { ILocalToolInstallStore } from '@eap/contracts';
 export type DeploymentContext = 'server' | 'desktop' | 'dev';
 export interface ToolExecutionRouterOptions {
     httpExecutor: IToolExecutor;
@@ -21,5 +21,6 @@ export declare class ToolExecutionRouter implements IToolExecutor {
     private readonly options;
     constructor(options: ToolExecutionRouterOptions);
     execute(request: ToolCallRequest): Promise<import('./tool-executor.interface.js').ToolCallResult>;
+    listTools(request: ToolCallRequest): Promise<McpListedTool[]>;
     private pickExecutor;
 }

package/dist/tool/tool-execution-router.js

@@ -4,7 +4,7 @@
  * @see docs/contracts/tool-execution.md §6
  * @see design.md §1.8.7
  */
-import { resolveReadyInstallByToolName } from '@gt-fe/eap-contracts';
+import { resolveReadyInstallByToolName } from '@eap/contracts';
 import { isLocalPreferredExecution } from './local-tool-executor.js';
 export class ToolExecutionRouter {
     options;
@@ -19,6 +19,13 @@ export class ToolExecutionRouter {
         }
         return result;
     }
+    async listTools(request) {
+        const executor = await this.pickExecutor(request);
+        if (typeof executor.listTools !== 'function') {
+            throw new Error('当前执行器不支持 MCP tools/list');
+        }
+        return executor.listTools(request);
+    }
     async pickExecutor(request) {
         const { deploymentContext, installStore, httpExecutor, localExecutor, toolTypes, toolRuntimes, forceToolServer, } = this.options;
         const forcedServer = Boolean(request.forceServer) || Boolean(forceToolServer?.includes(request.toolName));

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

@@ -93,9 +93,20 @@ export interface LLMToolCall {
 export interface LLMToolCallResponse {
     toolCalls: LLMToolCall[];
 }
+/** MCP `tools/list` 条目（LLM function calling 的名称 / 描述 / schema） */
+export interface McpListedTool {
+    name: string;
+    description?: string;
+    inputSchema?: Record<string, unknown>;
+}
 /**
  * IToolExecutor — Tool 执行网关接口
  */
 export interface IToolExecutor {
     execute(request: ToolCallRequest): Promise<ToolCallResult>;
+    /**
+     * MCP `tools/list`。`type: mcp` 工具集忽略清单 `tools[]`，用本方法发现子工具。
+     * 未实现时 hydrate 在存在 discover stub 时失败。
+     */
+    listTools?(request: ToolCallRequest): Promise<McpListedTool[]>;
 }

package/dist/tool/tool-orchestrator.d.ts

@@ -4,7 +4,7 @@
  * @see design.md §1.1 Tool调用编排
  * @see requirements.md Requirement 8 AC1, AC3
  */
-import { type ExecutionContext } from '@gt-fe/eap-contracts';
+import { type ExecutionContext } from '@eap/contracts';
 import type { IGovernanceClient } from '../governance/governance-client.js';
 export type { AuthContext, ToolCallRequest, ToolCallResult, LLMToolCall, LLMToolCallResponse, IToolExecutor, } from './tool-executor.interface.js';
 import type { AuthContext, ToolCallRequest, ToolCallResult, LLMToolCallResponse, IToolExecutor } from './tool-executor.interface.js';

package/dist/tool/tool-orchestrator.js

@@ -4,7 +4,7 @@
  * @see design.md §1.1 Tool调用编排
  * @see requirements.md Requirement 8 AC1, AC3
  */
-import { isBuiltinToolExecution } from '@gt-fe/eap-contracts';
+import { isBuiltinToolExecution } from '@eap/contracts';
 import { assertToolPermission, GovernanceUnavailableError, PermissionDeniedError, } from '../governance/permission-guard.js';
 /**
  * ToolOrchestrator — Tool 调用编排主服务

package/dist/utils/format-error.d.ts

@@ -1,4 +1,4 @@
 /**
- * 将未知异常格式化为可读字符串 — 委托 @gt-fe/eap-contracts
+ * 将未知异常格式化为可读字符串 — 委托 @eap/contracts
  */
-export { formatUnknownError } from '@gt-fe/eap-contracts';
+export { formatUnknownError } from '@eap/contracts';

package/dist/utils/format-error.js

@@ -1,4 +1,4 @@
 /**
- * 将未知异常格式化为可读字符串 — 委托 @gt-fe/eap-contracts
+ * 将未知异常格式化为可读字符串 — 委托 @eap/contracts
  */
-export { formatUnknownError } from '@gt-fe/eap-contracts';
+export { formatUnknownError } from '@eap/contracts';

package/dist/utils/http-error.d.ts

@@ -1,7 +1,7 @@
 /**
- * Runtime HTTP 错误出口 — 对齐 @gt-fe/eap-contracts ErrorCodes / AppError
+ * Runtime HTTP 错误出口 — 对齐 @eap/contracts ErrorCodes / AppError
  */
-import { type ErrorCode, type AppError } from '@gt-fe/eap-contracts';
+import { type ErrorCode, type AppError } from '@eap/contracts';
 import type { ServerResponse } from 'node:http';
 /** 公共 classify；连接失败不再误标为 GOVERNANCE_UNAVAILABLE */
 export declare function classifyRuntimeError(error: unknown): AppError;

package/dist/utils/http-error.js

@@ -1,7 +1,7 @@
 /**
- * Runtime HTTP 错误出口 — 对齐 @gt-fe/eap-contracts ErrorCodes / AppError
+ * Runtime HTTP 错误出口 — 对齐 @eap/contracts ErrorCodes / AppError
  */
-import { classifyError, formatUnknownError, ErrorCodes, } from '@gt-fe/eap-contracts';
+import { classifyError, formatUnknownError, ErrorCodes, } from '@eap/contracts';
 /** 公共 classify；连接失败不再误标为 GOVERNANCE_UNAVAILABLE */
 export function classifyRuntimeError(error) {
     return classifyError(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gt-fe/eap-runtime",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "Enterprise Agent Platform — Runtime核心：Graph执行引擎、Task生命周期、Session管理、Checkpoint持久化",
   "type": "module",
   "main": "dist/index.js",
@@ -14,43 +14,16 @@
   "files": [
     "dist"
   ],
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/",
-    "access": "public"
-  },
-  "scripts": {
-    "build": "tsc",
-    "start": "node dist/server.js",
-    "dev": "npx tsx src/server.ts",
-    "clean": "rm -rf dist",
-    "prepublishOnly": "npm run clean && npm run build",
-    "lint": "eslint src --ext .ts",
-    "test": "vitest run"
-  },
-  "keywords": [
-    "eap",
-    "runtime",
-    "agent",
-    "langgraph",
-    "graph-engine"
-  ],
   "license": "UNLICENSED",
   "dependencies": {
     "@langchain/langgraph": "^0.2.0",
     "ioredis": "^5.4.0",
     "pg": "^8.13.0",
     "yaml": "^2.6.1",
-    "@gt-fe/eap-contracts": "0.0.10"
+    "@gt-fe/eap-contracts": "0.0.11"
   },
-  "devDependencies": {
-    "@types/node": "^22.0.0",
-    "typescript": "^5.5.0",
-    "vitest": "^2.0.0"
-  },
-  "pnpm": {
-    "onlyBuiltDependencies": [
-      "esbuild"
-    ]
-  },
-  "packageManager": "pnpm@9.15.9"
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/",
+    "access": "public"
+  }
 }