@gt-fe/eap-runtime 0.0.13 → 0.0.15

package/README.md

@@ -8,6 +8,7 @@ Enterprise Agent Platform **执行引擎**（LangGraph.js）：Agent Graph 编
 
 | 日期 | 摘要 |
 |------|------|
+| 2026-08-29 | 待办收口：[`docs/TODO.md`](./docs/TODO.md)。压缩主路径未接；窗口展示不在 Runtime；Gateway 须 `tools/list` |
 | 2026-08-24 | 0.0.10：官方 Skill / Harness、`ForkParams`、对话详情、存储两档。依赖 `@eap/contracts@0.0.9`。详见 [CHANGELOG.md](./CHANGELOG.md) |
 | 2026-08-21 | 0.0.9：Gateway `/mcp` JSON-RPC 补 `Accept`；`tools/call` 透传工具版本。详见 [CHANGELOG.md](./CHANGELOG.md) |
 | 2026-08-19 | 0.0.8：Skill 子图 SSE 闭环；`ExecuteParams.traceId`；`tool.called` 改为 Tool 节点开始执行。依赖 `@eap/contracts@0.0.8`。详见 [CHANGELOG.md](./CHANGELOG.md) |
@@ -28,6 +29,7 @@ Enterprise Agent Platform **执行引擎**（LangGraph.js）：Agent Graph 编
 | 环境变量总表 | [`docs/governance/governance-env-config.md`](../docs/governance/governance-env-config.md) |
 | 预装联调契约 | [`docs/contracts/preload-hosting-runtime-contract.md`](../docs/contracts/preload-hosting-runtime-contract.md) |
 | 预装加载与请求流转 | [`docs/contracts/runtime-preinstall-load-flow.md`](../docs/contracts/runtime-preinstall-load-flow.md) |
+| Runtime 待办 | [`docs/TODO.md`](./docs/TODO.md) | 压缩主路径、窗口展示、Gateway `tools/list` |
 | 技能 FS 待办 | [`docs/TODO-skill-fs.md`](./docs/TODO-skill-fs.md) |
 | 本地 Agent 闭环 | [`docs/workflows/local-agent-dev-loop.md`](../docs/workflows/local-agent-dev-loop.md) |
 
@@ -131,7 +133,7 @@ dev-tools (eap chat / eap dev)
 
 - **引擎**：`LangGraphAdapter`（`IStateGraphEngine`）将平台 Graph DSL 编成 LangGraph StateGraph
 - **节点**：`llm`、`tool`、`subgraph`（Skill）、并行/条件边、HITL 等待
-- **Skill 子图**：节点可带内嵌 `subgraphDsl`；或仅 `skillId`，从 state.`skillDefinitions` 取 `workflow` 执行；技能 `prompt` 经 `activeSkillPrompt` 注入子图入口 LLM
+- **Skill 子图**：节点可带内嵌 `subgraphDsl`；或仅 `skillId`，从 state.`skillDefinitions` 取 `workflow` 执行。技能正文用短目录 + `read_file`，不灌 system
 - **权限**：子图执行前 `skill:{skillId}:use`（Governance）
 - **流式**：`stream()` 产出 RuntimeEvent，再映射为 SSE（`response.chunk`、`tool.*`、`task.*` 等）
 

package/dist/api/handlers/invoke.handler.d.ts

@@ -22,7 +22,7 @@ import type { TokenStatsService } from '../../token/token-stats.service.js';
 import type { TokenBudgetGuard } from '../../token/token-budget-guard.js';
 import type { SessionBudgetChecker } from '../../token/session-budget-checker.js';
 import type { InvokeRequest, InvokeResponse } from '../routes/agent.routes.js';
-import type { GraphLoader } from '../../registry/graph-loader.js';
+import { type GraphLoader } from '../../registry/graph-loader.js';
 import type { ICheckpointSaver } from '../../checkpoint/contracts/checkpoint-saver.contract.js';
 import type { ITraceCollector } from '../../contracts/trace-collector.js';
 /**

package/dist/api/handlers/invoke.handler.js

@@ -20,6 +20,7 @@ import { SessionBudgetExhaustedError } from '../../token/session-budget-checker.
 import { TokenBudgetExhaustedError } from '../../token/token-budget-guard.js';
 import { resolveExecutionContext } from '../../governance/governance-client.js';
 import { resolveSkillInputFromInvokeInput } from '../../registry/skill-io-guard.js';
+import { resolveAgentSystemPromptFromLoader } from '../../registry/graph-loader.js';
 import { toLoadedToolMap } from '../../tool/loaded-tool-definition.js';
 import { toLoadedSkillMap } from '../../tool/system-prompt-builder.js';
 import { assembleLoadedTools } from '../../tool/harness-primitives.js';
@@ -181,6 +182,7 @@ export class InvokeOrchestrator {
             const agentDir = this.graphLoader
                 ? (await this.graphLoader.resolveAgentDir(agentCode, req.agentVersion)) ?? undefined
                 : undefined;
+            const agentSystemPrompt = await resolveAgentSystemPromptFromLoader(this.graphLoader, agentCode, req.agentVersion);
             // 组装 GraphState：有 Checkpoint 历史则只追加本轮 user，避免双重 append
             const history = messageRecordsToGraphMessages(sessionContext.messages);
             const messages = await buildTurnGraphMessages({
@@ -208,6 +210,7 @@ export class InvokeOrchestrator {
                 skillInput,
                 promptRoots,
                 agentDir,
+                agentSystemPrompt,
                 traceId: resolveTraceId(req),
                 traceCollector: this.traceCollector,
             });

package/dist/api/handlers/stream.handler.d.ts

@@ -28,7 +28,7 @@ import type { TokenStatsService } from '../../token/token-stats.service.js';
 import type { TokenBudgetGuard } from '../../token/token-budget-guard.js';
 import type { SessionBudgetChecker } from '../../token/session-budget-checker.js';
 import type { StreamRequest } from '../routes/agent.routes.js';
-import type { GraphLoader } from '../../registry/graph-loader.js';
+import { type GraphLoader } from '../../registry/graph-loader.js';
 import type { ICheckpointSaver } from '../../checkpoint/contracts/checkpoint-saver.contract.js';
 import type { ITraceCollector } from '../../contracts/trace-collector.js';
 /**

package/dist/api/handlers/stream.handler.js

@@ -26,6 +26,7 @@ import { SSEEmitter } from '../../sse/sse-emitter.js';
 import { resolveExecutionContext } from '../../governance/governance-client.js';
 import { resolveSkillInputFromInvokeInput } from '../../registry/skill-io-guard.js';
 import { ErrorCodes } from '@gt-fe/eap-contracts';
+import { resolveAgentSystemPromptFromLoader } from '../../registry/graph-loader.js';
 import { classifyRuntimeError } from '../../utils/http-error.js';
 import { toLoadedToolMap } from '../../tool/loaded-tool-definition.js';
 import { toLoadedSkillMap } from '../../tool/system-prompt-builder.js';
@@ -203,6 +204,7 @@ export class StreamOrchestrator {
         const agentDir = this.graphLoader
             ? (await this.graphLoader.resolveAgentDir(agentCode, req.agentVersion)) ?? undefined
             : undefined;
+        const agentSystemPrompt = await resolveAgentSystemPromptFromLoader(this.graphLoader, agentCode, req.agentVersion);
         // 组装 GraphState：有 Checkpoint 历史则只追加本轮 user，避免双重 append
         const history = messageRecordsToGraphMessages(sessionContext.messages);
         const messages = await buildTurnGraphMessages({
@@ -236,6 +238,7 @@ export class StreamOrchestrator {
                 skillInput,
                 promptRoots,
                 agentDir,
+                agentSystemPrompt,
                 traceId: resolveTraceId(req),
                 traceCollector: this.traceCollector,
             });

package/dist/common/index.d.ts

@@ -3,3 +3,4 @@ export * from './logger.js';
 export * from './health.js';
 export * from './agent-code.js';
 export * from './trace-id.js';
+export { RUNTIME_PACKAGE_VERSION } from './runtime-package-version.js';

package/dist/common/index.js

@@ -3,3 +3,4 @@ export * from './logger.js';
 export * from './health.js';
 export * from './agent-code.js';
 export * from './trace-id.js';
+export { RUNTIME_PACKAGE_VERSION } from './runtime-package-version.js';

package/dist/common/logger.d.ts

@@ -1,5 +1,9 @@
 /**
- * 结构化日志接口 — A2
+ * 结构化 stdout JSON 日志。
+ *
+ * EAP_LOG_LEVEL=debug|info|warn|error，默认 info。
+ * info 不写 prompt / messages / systemPrompt；正文在 llm_turns。
+ * 关联字段：correlationId、taskId、sessionId、agentCode。
  */
 export type LogLevel = 'debug' | 'info' | 'warn' | 'error';
 export interface LogEntry {
@@ -7,8 +11,13 @@ export interface LogEntry {
     timestamp: string;
     module: string;
     message: string;
+    correlationId?: string;
+    taskId?: string;
+    sessionId?: string;
+    agentCode?: string;
+    userId?: string;
+    event?: string;
     context?: Record<string, unknown>;
-    error?: Error;
 }
 export interface ILogger {
     debug(message: string, context?: Record<string, unknown>): void;
@@ -16,6 +25,10 @@ export interface ILogger {
     warn(message: string, context?: Record<string, unknown>): void;
     error(message: string, context?: Record<string, unknown>): void;
 }
+export declare function resolveLogLevel(env?: NodeJS.ProcessEnv): LogLevel;
+export declare function shouldLog(level: LogLevel, min?: LogLevel): boolean;
+export declare function formatLogEntry(level: LogLevel, module: string, message: string, context?: Record<string, unknown>): LogEntry;
+export declare function emitRuntimeLog(level: LogLevel, module: string, message: string, context?: Record<string, unknown>): void;
 export declare class ConsoleLogger implements ILogger {
     private readonly module;
     constructor(module: string);
@@ -23,9 +36,8 @@ export declare class ConsoleLogger implements ILogger {
     info(message: string, context?: Record<string, unknown>): void;
     warn(message: string, context?: Record<string, unknown>): void;
     error(message: string, context?: Record<string, unknown>): void;
-    private log;
 }
-/** ponytail: 空实现，测试用 */
+/** 测试用空实现 */
 export declare class NoopLogger implements ILogger {
     debug(): void;
     info(): void;

package/dist/common/logger.js

@@ -1,35 +1,101 @@
 /**
- * 结构化日志接口 — A2
+ * 结构化 stdout JSON 日志。
+ *
+ * EAP_LOG_LEVEL=debug|info|warn|error，默认 info。
+ * info 不写 prompt / messages / systemPrompt；正文在 llm_turns。
+ * 关联字段：correlationId、taskId、sessionId、agentCode。
  */
+const LEVEL_RANK = {
+    debug: 10,
+    info: 20,
+    warn: 30,
+    error: 40,
+};
+const PROMPT_KEYS = new Set([
+    'systemPrompt',
+    'systemSections',
+    'messages',
+    'prompt',
+    'developerPrompt',
+    'agentPrompt',
+    'nodePrompt',
+    'agentSystemPrompt',
+    'apiKey',
+    'content',
+    'body',
+]);
+const ID_KEYS = ['correlationId', 'taskId', 'sessionId', 'agentCode', 'userId'];
+export function resolveLogLevel(env = process.env) {
+    const raw = env.EAP_LOG_LEVEL?.trim().toLowerCase();
+    if (raw === 'debug' || raw === 'info' || raw === 'warn' || raw === 'error')
+        return raw;
+    return 'info';
+}
+export function shouldLog(level, min = resolveLogLevel()) {
+    return LEVEL_RANK[level] >= LEVEL_RANK[min];
+}
+function asId(value) {
+    return typeof value === 'string' && value.trim() ? value : undefined;
+}
+function stripPromptFields(context, level) {
+    if (!context)
+        return undefined;
+    const out = {};
+    for (const [key, value] of Object.entries(context)) {
+        if (key === 'event' || ID_KEYS.includes(key))
+            continue;
+        if (level !== 'debug' && PROMPT_KEYS.has(key))
+            continue;
+        out[key] = value;
+    }
+    return Object.keys(out).length > 0 ? out : undefined;
+}
+export function formatLogEntry(level, module, message, context) {
+    const safe = stripPromptFields(context, level);
+    const event = asId(context?.event) ?? asId(safe?.event);
+    const entry = {
+        level,
+        timestamp: new Date().toISOString(),
+        module,
+        message,
+        correlationId: asId(context?.correlationId),
+        taskId: asId(context?.taskId),
+        sessionId: asId(context?.sessionId),
+        agentCode: asId(context?.agentCode),
+        userId: asId(context?.userId),
+        ...(event ? { event } : {}),
+        ...(safe ? { context: safe } : {}),
+    };
+    return entry;
+}
+export function emitRuntimeLog(level, module, message, context) {
+    if (!shouldLog(level))
+        return;
+    const line = JSON.stringify(formatLogEntry(level, module, message, context));
+    if (level === 'error')
+        console.error(line);
+    else
+        console.log(line);
+}
 export class ConsoleLogger {
     module;
     constructor(module) {
         this.module = module;
     }
     debug(message, context) {
-        this.log('debug', message, context);
+        emitRuntimeLog('debug', this.module, message, context);
     }
     info(message, context) {
-        this.log('info', message, context);
+        emitRuntimeLog('info', this.module, message, context);
     }
     warn(message, context) {
-        this.log('warn', message, context);
+        emitRuntimeLog('warn', this.module, message, context);
     }
     error(message, context) {
-        this.log('error', message, context);
-    }
-    log(level, message, context) {
-        const entry = {
-            level,
-            timestamp: new Date().toISOString(),
-            module: this.module,
-            message,
-            ...(context && { context }),
-        };
-        console[level](JSON.stringify(entry));
+        emitRuntimeLog('error', this.module, message, context);
     }
 }
-/** ponytail: 空实现，测试用 */
+/** 测试用空实现 */
 export class NoopLogger {
     debug() { }
     info() { }

package/dist/common/runtime-package-version.d.ts

@@ -0,0 +1,2 @@
+/** 当前加载的 Runtime 包版本（`package.json`；overlay 为 `@gt-fe/eap-runtime` 的 version） */
+export declare const RUNTIME_PACKAGE_VERSION: string;

package/dist/common/runtime-package-version.js

@@ -0,0 +1,5 @@
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);
+const pkg = require('../../package.json');
+/** 当前加载的 Runtime 包版本（`package.json`；overlay 为 `@gt-fe/eap-runtime` 的 version） */
+export const RUNTIME_PACKAGE_VERSION = typeof pkg.version === 'string' && pkg.version.trim() ? pkg.version.trim() : 'unknown';

package/dist/debug/llm-turn-log.d.ts

@@ -41,6 +41,16 @@ export interface LlmTurnRecord extends LlmTurnContext {
         error?: string;
     };
     latencyMs: number;
+    /** 本轮 prompt inputTokens / 模型上下文窗；parts 为字符比例拆分；缺 window 则省略 window */
+    context?: {
+        used: number;
+        window?: number;
+        parts?: {
+            system: number;
+            messages: number;
+            tools: number;
+        };
+    };
 }
 export interface LlmTurnIndexEntry {
     id: string;
@@ -53,6 +63,8 @@ export interface LlmTurnIndexEntry {
     file: string;
     inputTokens: number;
     outputTokens: number;
+    used?: number;
+    window?: number;
 }
 export type LlmTurnLogKind = 'memory' | 'file' | 'postgres';
 export interface ILlmTurnLog {

package/dist/debug/llm-turn-log.js

@@ -21,6 +21,7 @@ export function toLlmTurnIndexEntry(record, file) {
         file: file ?? `${sanitize(record.id)}.json`,
         inputTokens: record.response.inputTokens,
         outputTokens: record.response.outputTokens,
+        ...(record.context ?? {}),
     };
 }
 export function maskApiKey(key) {

package/dist/graph/adapters/langgraph.adapter.d.ts

@@ -15,6 +15,8 @@ import { type ILLMProvider } from '../nodes/llm-node.js';
 import type { IToolExecutor } from '../../tool/tool-executor.interface.js';
 import type { IGovernanceClient } from '../../governance/governance-client.js';
 import { type ConditionEvaluatorFn } from '../condition-evaluator.js';
+/** 图未写 `config.maxIterations` 时的 recursionLimit。`agent ⇄ tools` 一圈约 2，50 ≈ 24 次工具往返。 */
+export declare const DEFAULT_GRAPH_RECURSION_LIMIT = 50;
 /**
  * LangGraphAdapter — 基于 @langchain/langgraph 的 IStateGraphEngine 实现
  *
@@ -118,7 +120,7 @@ export declare class LangGraphAdapter implements IStateGraphEngine {
     private createLLMNodeFunction;
     /**
      * 子图节点：优先 config.subgraphDsl；否则按 skillId 从 state.skillDefinitions.workflow 解析。
-     * 技能 prompt 由 SubGraphCompiler 写入 activeSkillPrompt，供入口 LLM 拼接。
+     * 技能正文用短目录 + read_file，不灌 system。
      */
     private createSubGraphNodeFunction;
     /**

package/dist/graph/adapters/langgraph.adapter.js

@@ -18,17 +18,35 @@ import { ToolResultInjector } from '../../tool/tool-result-injector.js';
 import { fileArtifactFromToolOutput } from '../../tool/file-artifact.js';
 import { EchoLLMProvider } from '../../providers/echo-llm-provider.js';
 import { ConditionEvaluator } from '../condition-evaluator.js';
-import { SystemPromptBuilder, buildToolCatalog, loadedToolsToApiTools } from '../../tool/system-prompt-builder.js';
+import { SystemPromptBuilder, buildToolCatalog, loadedToolsToApiTools, resolveLlmPromptInputs } from '../../tool/system-prompt-builder.js';
 import { resolveJailFromState, resolveJailRoots } from '../../tool/harness-primitives.js';
 import os from 'node:os';
 import { bindSelectedSkill } from '../nodes/skill-bind-node.js';
 import { resolveGraphPrompt } from '../resolve-graph-prompt.js';
+import { hydrateMcpTools, MCP_LIST_TOOL_NAME } from '../../tool/mcp-list.js';
 import { SkillAuditRecorder } from '../skill-audit-recorder.js';
 import { preloadSkillNotFound } from '../../registry/preload-errors.js';
 import { AppError, ErrorCodes } from '@gt-fe/eap-contracts';
+import { pickContextFields } from '../../token/context-window.js';
 import { isHitlDecision, lastAssistantHasUnansweredToolCalls } from '../hitl/hitl-handler.js';
 import { classifySkillRead } from './skill-read.js';
 import { withGraphSpan } from '../trace-span.js';
+/** 图未写 `config.maxIterations` 时的 recursionLimit。`agent ⇄ tools` 一圈约 2，50 ≈ 24 次工具往返。 */
+export const DEFAULT_GRAPH_RECURSION_LIMIT = 50;
+/**
+ * LangGraph `recursionLimit` 计 superstep（每进一个节点 +1），不是 ReAct 圈数。
+ * 图上 `config.maxIterations` 优先；缺省 {@link DEFAULT_GRAPH_RECURSION_LIMIT}。
+ */
+function langGraphRunOptions(dsl, extra) {
+    const raw = dsl.config?.maxIterations;
+    const recursionLimit = typeof raw === 'number' && Number.isFinite(raw) && raw > 0
+        ? Math.trunc(raw)
+        : DEFAULT_GRAPH_RECURSION_LIMIT;
+    return {
+        ...extra,
+        recursionLimit,
+    };
+}
 // ─────────────────────────────────────────────
 // LangGraphAdapter
 // ─────────────────────────────────────────────
@@ -196,6 +214,7 @@ export class LangGraphAdapter {
                 payload: {
                     toolCallId: progress.toolCallId,
                     toolName: progress.toolName,
+                    ...(progress.toolset ? { toolset: progress.toolset } : {}),
                     arguments: progress.arguments ?? {},
                     ...loc,
                 },
@@ -217,6 +236,7 @@ export class LangGraphAdapter {
                 payload: {
                     toolCallId: progress.toolCallId,
                     toolName: progress.toolName,
+                    ...(progress.toolset ? { toolset: progress.toolset } : {}),
                     content: progress.content,
                     success: true,
                     ...loc,
@@ -232,6 +252,7 @@ export class LangGraphAdapter {
                 payload: {
                     toolCallId: progress.toolCallId,
                     toolName: progress.toolName,
+                    ...(progress.toolset ? { toolset: progress.toolset } : {}),
                     error: progress.error ?? 'Unknown error',
                     willRetry: false,
                     ...loc,
@@ -300,7 +321,7 @@ export class LangGraphAdapter {
                 loadedSkills: ephemeral(undefined),
                 skillDefinitions: ephemeral(undefined),
                 skillInput: ephemeral(undefined),
-                activeSkillPrompt: ephemeral(undefined),
+                agentSystemPrompt: ephemeral(undefined),
                 activatedSkill: ephemeral(undefined),
                 skillRoute: ephemeral(undefined),
                 silentOutput: ephemeral(undefined),
@@ -421,7 +442,7 @@ export class LangGraphAdapter {
         this.streamedTextThisTurn = false;
         const producer = (async () => {
             try {
-                const streamIterator = await ref.compiled.stream(input, {
+                const streamIterator = await ref.compiled.stream(input, langGraphRunOptions(ref.dsl, {
                     configurable: {
                         thread_id: resolveCheckpointThreadId({
                             sessionId: typeof state.sessionId === 'string' ? state.sessionId : undefined,
@@ -430,7 +451,7 @@ export class LangGraphAdapter {
                         }),
                     },
                     streamMode: 'updates',
-                });
+                }));
                 for await (const update of streamIterator) {
                     for (const event of this.convertUpdatesToEvents(update, graph.id, () => this.streamChunkIndex++, ref.silentNodeIds, ref.subgraphNodeIds)) {
                         enqueue(event);
@@ -467,7 +488,7 @@ export class LangGraphAdapter {
         const ref = this.getCompiledRef(graph);
         const input = this.graphStateToLangGraphInput(state);
         const startTime = Date.now();
-        const result = await ref.compiled.invoke(input, {
+        const result = await ref.compiled.invoke(input, langGraphRunOptions(ref.dsl, {
             configurable: {
                 thread_id: resolveCheckpointThreadId({
                     sessionId: typeof state.sessionId === 'string' ? state.sessionId : undefined,
@@ -475,7 +496,7 @@ export class LangGraphAdapter {
                     graphId: graph.id,
                 }),
             },
-        });
+        }));
         const duration = Date.now() - startTime;
         const messages = Array.isArray(result['messages']) ? result['messages'] : [];
         const lastMessage = messages[messages.length - 1];
@@ -492,6 +513,7 @@ export class LangGraphAdapter {
             model: u.model ?? 'unknown',
             inputTokens: u.inputTokens ?? 0,
             outputTokens: u.outputTokens ?? 0,
+            ...pickContextFields(u),
         }));
         const inputTokens = perNode.reduce((s, u) => s + u.inputTokens, 0);
         const outputTokens = perNode.reduce((s, u) => s + u.outputTokens, 0);
@@ -655,7 +677,6 @@ export class LangGraphAdapter {
                 currentNode: node.id,
                 skillRoute: patch.skillRoute,
                 activatedSkill: patch.activatedSkill,
-                activeSkillPrompt: patch.activeSkillPrompt,
                 skillInput: patch.skillInput,
                 messages: { __set: patch.messages },
             };
@@ -788,9 +809,34 @@ export class LangGraphAdapter {
             return withGraphSpan(state, { name: node.id, type: 'llm' }, async () => {
                 const promptRoots = Array.isArray(state['promptRoots']) ? state['promptRoots'] : [];
                 const resolvedPrompt = resolveGraphPrompt(baseConfig.systemPrompt, promptRoots);
-                const loadedTools = state['loadedTools'];
+                const loadedToolsBase = state['loadedTools'];
                 const agentCode = typeof state['agentCode'] === 'string' ? state['agentCode'] : undefined;
                 const skillDefs = state['skillDefinitions'];
+                const execCtx = state['executionContext'];
+                const userId = (typeof execCtx?.userId === 'string' && execCtx.userId) || state['userId'];
+                const loadedTools = disableTools
+                    ? loadedToolsBase
+                    : await hydrateMcpTools(loadedToolsBase, this.toolExecutor, {
+                        authContext: {
+                            userId: String(userId ?? ''),
+                            delegationToken: String(execCtx?.delegationToken ?? state['delegationToken'] ?? ''),
+                            agentCode: String(agentCode ?? ''),
+                        },
+                        correlationId: typeof state['correlationId'] === 'string' ? state['correlationId'] : undefined,
+                        taskId: typeof state['taskId'] === 'string' ? state['taskId'] : undefined,
+                        onListFailure: ({ toolset, error }) => {
+                            this.emitToolExecutionEvents({
+                                toolCallId: `mcp-list:${toolset}`,
+                                toolName: MCP_LIST_TOOL_NAME,
+                                toolset,
+                                status: 'error',
+                                error,
+                            });
+                        },
+                    });
+                if (loadedTools && loadedTools !== loadedToolsBase) {
+                    state['loadedTools'] = loadedTools;
+                }
                 // [DEBUG] 打印 loadedTools 实际状态
                 if (process.env.EAP_LLM_DEBUG === '1') {
                     const toolNames = loadedTools ? Object.keys(loadedTools) : [];
@@ -798,8 +844,6 @@ export class LangGraphAdapter {
                 }
                 const catalog = includeSkillCatalog ? this.buildSkillCatalog(skillDefs) : undefined;
                 const toolCatalog = disableTools ? undefined : buildToolCatalog(loadedTools);
-                const execCtx = state['executionContext'];
-                const userId = (typeof execCtx?.userId === 'string' && execCtx.userId) || state['userId'];
                 const jail = resolveJailFromState({
                     agentDir: state['agentDir'],
                     userId,
@@ -816,8 +860,14 @@ export class LangGraphAdapter {
                     bundlePath: skill.bundlePath,
                     entryFile: skill.entryFile,
                 }));
+                const promptInputs = resolveLlmPromptInputs({
+                    silent,
+                    agentSystemPrompt: state['agentSystemPrompt'],
+                    nodePrompt: resolvedPrompt,
+                });
                 const assembled = this.systemPromptBuilder.build({
-                    developerPrompt: resolvedPrompt || undefined,
+                    agentPrompt: promptInputs.agentPrompt,
+                    nodePrompt: promptInputs.nodePrompt,
                     skillCatalog: catalog,
                     toolCatalog,
                     agentCode,
@@ -880,8 +930,9 @@ export class LangGraphAdapter {
                     }
                     : undefined);
                 const next = await llmNode.execute(state);
+                const hydratedUpdate = loadedTools && loadedTools !== loadedToolsBase ? { loadedTools } : {};
                 if (!silent)
-                    return next;
+                    return { ...next, ...hydratedUpdate };
                 const added = Array.isArray(next.messages) ? next.messages[0] : undefined;
                 const raw = added && typeof added === 'object' && typeof added.content === 'string'
                     ? added.content
@@ -890,13 +941,14 @@ export class LangGraphAdapter {
                     ...next,
                     messages: [],
                     silentOutput: raw,
+                    ...hydratedUpdate,
                 };
             });
         };
     }
     /**
      * 子图节点：优先 config.subgraphDsl；否则按 skillId 从 state.skillDefinitions.workflow 解析。
-     * 技能 prompt 由 SubGraphCompiler 写入 activeSkillPrompt，供入口 LLM 拼接。
+     * 技能正文用短目录 + read_file，不灌 system。
      */
     createSubGraphNodeFunction(node) {
         const embeddedDsl = node.config?.['subgraphDsl'];
@@ -1199,6 +1251,7 @@ export class LangGraphAdapter {
                             costEstimate: Number(u['costEstimate'] ?? 0),
                             durationMs: typeof u['durationMs'] === 'number' ? u['durationMs'] : undefined,
                             graphId,
+                            ...pickContextFields(u),
                         },
                     };
                 }

package/dist/graph/adapters/subgraph-compiler.js

@@ -12,6 +12,7 @@ import { LangGraphAdapter } from './langgraph.adapter.js';
 import { resolveTraceId } from '../../common/trace-id.js';
 import { filterLoadedToolsForSkill, } from '../../tool/system-prompt-builder.js';
 import { unwrapHitlPaused } from '../hitl/hitl-handler.js';
+import { pickContextFields } from '../../token/context-window.js';
 import { assertSkillIoIfEnabled, coerceSkillInputFromMessages, } from '../../registry/skill-io-guard.js';
 /**
  * SubGraphCompiler — 子图编译器
@@ -99,7 +100,6 @@ export class SubGraphCompiler {
                 const agentCode = state['agentCode'] ?? state['agentId'];
                 const defs = state['skillDefinitions'];
                 const skillInfo = resolvedSkillId ? defs?.[resolvedSkillId] : undefined;
-                const skillPrompt = skillInfo?.prompt;
                 const parentTools = state['loadedTools'];
                 const scopedTools = filterLoadedToolsForSkill(parentTools, skillInfo);
                 const skillInput = skillInfo
@@ -132,7 +132,9 @@ export class SubGraphCompiler {
                     loadedTools: scopedTools,
                     loadedSkills: state['loadedSkills'],
                     skillDefinitions: defs,
-                    activeSkillPrompt: skillPrompt,
+                    agentSystemPrompt: typeof state['agentSystemPrompt'] === 'string'
+                        ? state['agentSystemPrompt']
+                        : undefined,
                     activatedSkill: resolvedSkillId || undefined,
                     skillInput,
                     traceId,
@@ -200,6 +202,7 @@ export class SubGraphCompiler {
                                 model: u.model,
                                 inputTokens: u.inputTokens,
                                 outputTokens: u.outputTokens,
+                                ...pickContextFields(u),
                             })),
                         }
                         : {}),

package/dist/graph/contracts/executable-graph.d.ts

@@ -189,14 +189,18 @@ export interface GraphState {
     loadedSkills?: import('../../tool/system-prompt-builder.js').LoadedSkillInfo[];
     /** GraphLoader 注入：skillId → 完整定义（子图解析 / prompt） */
     skillDefinitions?: import('../../tool/system-prompt-builder.js').LoadedSkillMap;
-    /** 当前子图 / 已绑定技能提示词（按 skillId 注入，入口 LLM 读取） */
-    activeSkillPrompt?: string;
+    /**
+     * Agent 基线系统提示词（manifest.prompts.system）。
+     * execute/stream 每轮注入；非 silent LLM 拼入 system 的 agent 段。
+     */
+    agentSystemPrompt?: string;
     /** silent LLM 的原始输出；不入对话 messages */
     silentOutput?: string;
     /** 解析 graph 内 ./prompts/*.md 的根目录（agentDir + 工程根） */
     promptRoots?: string[];
     /** 预装 Agent 包目录：`{EAP_PREINSTALL_ROOT}/agents/<code>/<ver>` */
     agentDir?: string;
+    /** bind / 子图选中的技能；harness 路径解析不写此字段 */
     activatedSkill?: string | null;
     skillRoute?: string;
     /** bind / invoke 解析出的 Skill 入参；子图 IO 校验读取 */
@@ -331,6 +335,13 @@ export interface GraphTokenUsage {
         model: string;
         inputTokens: number;
         outputTokens: number;
+        used?: number;
+        window?: number;
+        parts?: {
+            system: number;
+            messages: number;
+            tools: number;
+        };
     }>;
     /** 当前会话跨请求累计消耗（可选；由 session 层服务填充） */
     conversationTotal?: {

package/dist/graph/nodes/llm-node.d.ts

@@ -58,6 +58,8 @@ export interface LLMNodeConfig {
         agentCode?: string;
         correlationId?: string;
     };
+    /** ModelRecord.capabilities.maxContextTokens；缺省则不写 used/window */
+    maxContextTokens?: number;
 }
 /**
  * LLMResponse — LLM 完整响应
@@ -178,6 +180,7 @@ export declare class LLMNode {
      *
      * 根据 streaming 配置选择 invoke 或 stream 模式。
      * 失败时按 backoff 策略重试，最多重试 maxRetries 次。
+     * AbortError / 「This operation was aborted」（含 LLM HTTP 超时包装）立即失败，不重试。
      */
     private invokeWithRetry;
     /**