@gt-fe/eap-runtime 0.0.12 → 0.0.14

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 { AppError, ErrorCodes } from '@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

@@ -2,17 +2,17 @@
  * Executable Graph 类型定义
  *
  * 定义 Graph 引擎核心的可执行图、DSL、节点、边等类型。
- * 与 @gt-fe/eap-contracts 的 GraphDSL 基础类型互补，在 Runtime 层提供更丰富的类型支持。
+ * 与 @eap/contracts 的 GraphDSL 基础类型互补，在 Runtime 层提供更丰富的类型支持。
  *
  * @see design.md §1.4 StateGraph Contract
  * @see requirements.md Requirement 1 AC1-AC2
  */
-import type { GraphDSL as BaseGraphDSL, GraphNode as BaseGraphNode, GraphEdge as BaseGraphEdge, GraphNodeType, GraphConfig } from '@gt-fe/eap-contracts';
+import type { GraphDSL as BaseGraphDSL, GraphNode as BaseGraphNode, GraphEdge as BaseGraphEdge, GraphNodeType, GraphConfig } from '@eap/contracts';
 export type { GraphNodeType, GraphConfig };
 /**
  * RuntimeGraphConfig — Runtime 层扩展的 Graph 配置
  *
- * 在 @gt-fe/eap-contracts GraphConfig 基础上增加 Runtime 执行所需的 maxRetries。
+ * 在 @eap/contracts GraphConfig 基础上增加 Runtime 执行所需的 maxRetries。
  */
 export interface RuntimeGraphConfig extends GraphConfig {
     /** Graph 级默认重试次数（节点级 retry 可覆盖） */
@@ -21,7 +21,7 @@ export interface RuntimeGraphConfig extends GraphConfig {
 /**
  * GraphNode — Runtime 层扩展的节点定义
  *
- * 继承 @gt-fe/eap-contracts 基础 GraphNode，增加 Runtime 执行所需的字段：
+ * 继承 @eap/contracts 基础 GraphNode，增加 Runtime 执行所需的字段：
  * - 重试配置（节点级 maxRetries + 退避策略）
  * - HITL 标记（interrupt_before / interrupt_after）
  * - 描述信息（调试/Trace 用）
@@ -79,7 +79,7 @@ export interface ConditionalBranch {
 /**
  * GraphDSL — Runtime 层扩展的声明式工作流定义
  *
- * 扩展 @gt-fe/eap-contracts 的 BaseGraphDSL，增加条件路由、入口/终止节点等。
+ * 扩展 @eap/contracts 的 BaseGraphDSL，增加条件路由、入口/终止节点等。
  */
 export interface GraphDSL extends Omit<BaseGraphDSL, 'config' | 'nodes' | 'edges'> {
     /** 覆盖节点类型为 Runtime 扩展版本 */
@@ -163,7 +163,7 @@ export interface ExecutableGraph {
     /** 底层引擎内部实例引用（opaque，由 adapter 管理） */
     _engineInstance?: unknown;
 }
-import type { ExecutionContext as PlatformExecutionContext } from '@gt-fe/eap-contracts';
+import type { ExecutionContext as PlatformExecutionContext } from '@eap/contracts';
 /**
  * GraphState — 传入 stream/invoke 的上下文数据
  */
@@ -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/contracts/executable-graph.js

@@ -2,7 +2,7 @@
  * Executable Graph 类型定义
  *
  * 定义 Graph 引擎核心的可执行图、DSL、节点、边等类型。
- * 与 @gt-fe/eap-contracts 的 GraphDSL 基础类型互补，在 Runtime 层提供更丰富的类型支持。
+ * 与 @eap/contracts 的 GraphDSL 基础类型互补，在 Runtime 层提供更丰富的类型支持。
  *
  * @see design.md §1.4 StateGraph Contract
  * @see requirements.md Requirement 1 AC1-AC2

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;
     /**

package/dist/graph/nodes/llm-node.js

@@ -10,6 +10,8 @@
  * @see requirements.md Requirement 1 AC6, Requirement 9
  */
 import { formatUnknownError } from '../../utils/format-error.js';
+import { buildContextUsage, turnSectionChars } from '../../token/context-window.js';
+import { isAbortError } from '../../tool/timeout.js';
 // ─────────────────────────────────────────────
 // Default retry config
 // ─────────────────────────────────────────────
@@ -94,6 +96,7 @@ export class LLMNode {
         // （即 user 消息重复的根因）。
         //
         // __llmTokenUsage channel 同样是 **数组累加器 reducer**，每次追加一条使用明细。
+        const context = buildContextUsage(response.inputTokens, this.config.maxContextTokens, turnSectionChars(this.config, messages));
         return {
             messages: [assistantMessage],
             currentNode: this.nodeId,
@@ -104,6 +107,7 @@ export class LLMNode {
                     inputTokens: response.inputTokens,
                     outputTokens: response.outputTokens,
                     durationMs,
+                    ...(context ?? {}),
                 },
             ],
         };
@@ -183,6 +187,7 @@ export class LLMNode {
      *
      * 根据 streaming 配置选择 invoke 或 stream 模式。
      * 失败时按 backoff 策略重试，最多重试 maxRetries 次。
+     * AbortError / 「This operation was aborted」（含 LLM HTTP 超时包装）立即失败，不重试。
      */
     async invokeWithRetry(messages) {
         let lastError;
@@ -195,6 +200,9 @@ export class LLMNode {
             }
             catch (error) {
                 lastError = error instanceof Error ? error : new Error(formatUnknownError(error));
+                if (isAbortError(error) || isAbortError(lastError)) {
+                    throw lastError;
+                }
                 // 最后一次尝试不需要等待
                 if (attempt < this.retryConfig.maxRetries) {
                     const delay = this.calculateBackoffDelay(attempt);

package/dist/graph/nodes/skill-bind-node.d.ts

@@ -1,6 +1,6 @@
 /**
- * 可选图胶水：把 silent LLM 的结构化输出写成 activeSkillPrompt / skillRoute。
- * 不是 Graph 节点类型。任何「多本手册互斥」的域图都可选用；字段是约定不是契约。
+ * 可选图胶水：把 silent LLM 的结构化输出写成 skillRoute / activatedSkill。
+ * 不是 Graph 节点类型。技能正文走短目录 + read_file，不灌 system。
  */
 import type { LoadedSkillInfo, LoadedSkillMap } from '../../tool/system-prompt-builder.js';
 export type SkillRoute = 'skill' | 'clarify' | 'none';
@@ -9,7 +9,6 @@ export interface SkillBindPatch {
     activatedSkill: string | null;
     /** 展示名；未选中时为空 */
     skillName?: string;
-    activeSkillPrompt?: string;
     skillInput?: Record<string, unknown>;
     messages: Array<Record<string, unknown>>;
     /** 用户写了 skill 名但清单里没有，才算 unmatched */
@@ -25,7 +24,7 @@ interface SkillSelectPayload {
 export declare function extractJsonObject(text: string): SkillSelectPayload | null;
 export declare function resolveSkillDefinition(defs: LoadedSkillMap | undefined, rawName: string): LoadedSkillInfo | undefined;
 /**
- * 消费选择节点刚写出的 assistant JSON，改写为路由 + Skill 提示词。
+ * 消费选择节点刚写出的 assistant JSON，改写为路由。
  * 返回的 messages 是**整段替换**（调用方须覆盖 messages channel 时改用 replace 语义）。
  */
 export declare function bindSelectedSkill(state: Record<string, unknown>): SkillBindPatch;

package/dist/graph/nodes/skill-bind-node.js

@@ -38,26 +38,8 @@ export function resolveSkillDefinition(defs, rawName) {
             (skill.name && skill.name.toLowerCase() === needle));
     });
 }
-function formatParams(params) {
-    return Object.entries(params)
-        .map(([key, value]) => `- ${key}: ${JSON.stringify(value)}`)
-        .join('\n');
-}
-function buildSkillPrompt(skill, params) {
-    const parts = [`# 技能：${skill.name || skill.skillId}`];
-    if (skill.description) {
-        parts.push(skill.description);
-    }
-    if (params && Object.keys(params).length > 0) {
-        parts.push(`# 提取的参数\n${formatParams(params)}`);
-    }
-    if (skill.prompt?.trim()) {
-        parts.push(skill.prompt.trim());
-    }
-    return parts.join('\n\n');
-}
 /**
- * 消费选择节点刚写出的 assistant JSON，改写为路由 + Skill 提示词。
+ * 消费选择节点刚写出的 assistant JSON，改写为路由。
  * 返回的 messages 是**整段替换**（调用方须覆盖 messages channel 时改用 replace 语义）。
  */
 export function bindSelectedSkill(state) {
@@ -108,7 +90,6 @@ export function bindSelectedSkill(state) {
         skillRoute: 'skill',
         activatedSkill: skill.skillId,
         skillName: skill.name || skill.skillId,
-        activeSkillPrompt: buildSkillPrompt(skill, params),
         skillInput: params,
         messages: nextMessages(),
     };

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

@@ -33,6 +33,8 @@ type LangGraphState = Record<string, unknown>;
 export interface ToolNodeProgress {
     toolCallId: string;
     toolName: string;
+    /** 工具集编码；与 toolName 一起给 UI 显示 `toolset/toolName` */
+    toolset?: string;
     status: 'started' | 'completed' | 'error';
     arguments?: Record<string, unknown>;
     content?: string;

package/dist/graph/nodes/tool-node.js

@@ -10,29 +10,18 @@
  * @see requirements.md Requirement 8 AC1, AC3, AC5
  */
 import { resolveJailFromState } from '../../tool/harness-primitives.js';
+import { inferHarnessSkillDir } from '../../tool/skill-dir-infer.js';
 import { isHitlDecision, unwrapHitlPaused } from '../hitl/hitl-handler.js';
 import { ToolConfirmationInterceptor } from '../../tool/tool-confirmation.js';
 import { resolveCheckpointThreadId } from '../../session/persist-turn-messages.js';
 import { resolveTraceId } from '../../common/trace-id.js';
+import { toolsetCodeFromLoaded } from '../../tool/mcp-list.js';
 function skillDirsFromState(state) {
     const defs = state['skillDefinitions'];
     return Object.values(defs ?? {})
         .filter((skill) => Boolean(skill.bundlePath))
         .map((skill) => ({ skillId: skill.skillId, bundlePath: skill.bundlePath }));
 }
-function resolveActiveSkillDir(state) {
-    const defs = state['skillDefinitions'];
-    if (!defs)
-        return undefined;
-    const activated = state['activatedSkill'];
-    if (typeof activated === 'string' && defs[activated]?.bundlePath) {
-        return defs[activated].bundlePath;
-    }
-    const paths = Object.values(defs)
-        .map((skill) => skill.bundlePath)
-        .filter((p) => Boolean(p));
-    return paths.length === 1 ? paths[0] : undefined;
-}
 export class ToolNode {
     orchestrator;
     injector;
@@ -75,12 +64,24 @@ export class ToolNode {
             skillDefinitions: state['skillDefinitions'],
         });
         const jailExtraRoots = jail.extraRoots ?? [];
-        const skillDir = resolveActiveSkillDir(state);
+        const batchCalls = lastAssistantMessage.toolCalls.map((tc) => ({
+            name: tc.name,
+            arguments: tc.arguments,
+        }));
+        const boundSkill = typeof state['activatedSkill'] === 'string' ? state['activatedSkill'] : undefined;
         // 4. 转换为 ToolCallRequest[]（附带 manifest 路由字段）
         const requests = lastAssistantMessage.toolCalls.map((tc) => {
             const loaded = loadedTools?.[tc.name];
             const correlationId = String(state['correlationId'] ?? tc.id);
             const taskId = String(state['taskId'] ?? state['correlationId'] ?? tc.id);
+            const command = typeof tc.arguments?.command === 'string' ? tc.arguments.command : undefined;
+            const skillDir = inferHarnessSkillDir({
+                command,
+                toolCalls: batchCalls,
+                messages,
+                skillDirs,
+                activatedSkill: boundSkill,
+            });
             return {
                 toolCallId: tc.id,
                 toolName: tc.name,
@@ -153,11 +154,13 @@ export class ToolNode {
         const needsHitl = Boolean(this.hitlHandler) &&
             requests.some((req) => confirmationTools.has(req.toolName));
         const runOne = async (req, i) => {
+            const toolset = toolsetCodeFromLoaded(loadedTools?.[req.toolName]);
             const resumingHitl = isHitlDecision(state['hitlChoice']);
             if (!resumingHitl) {
                 emitProgress({
                     toolCallId: req.toolCallId,
                     toolName: req.toolName,
+                    ...(toolset ? { toolset } : {}),
                     status: 'started',
                     arguments: req.arguments,
                 });
@@ -197,6 +200,7 @@ export class ToolNode {
                     emitProgress({
                         toolCallId: result.toolCallId,
                         toolName: result.toolName,
+                        ...(toolset ? { toolset } : {}),
                         status: 'completed',
                         arguments: req.arguments,
                         content: result.content,
@@ -207,6 +211,7 @@ export class ToolNode {
                     emitProgress({
                         toolCallId: result.toolCallId,
                         toolName: result.toolName,
+                        ...(toolset ? { toolset } : {}),
                         status: 'error',
                         arguments: req.arguments,
                         error: result.error ?? 'unknown error',
@@ -243,6 +248,7 @@ export class ToolNode {
                 emitProgress({
                     toolCallId: req.toolCallId,
                     toolName: req.toolName,
+                    ...(toolset ? { toolset } : {}),
                     status: 'error',
                     arguments: req.arguments,
                     error: message,

package/dist/index.d.ts

@@ -16,7 +16,7 @@ export * from './common/index.js';
 export * from './registry/index.js';
 export * from './providers/index.js';
 export type { ITraceCollector, TraceEvent, TraceSession, ExecutionFlowEvent, ExecutionNodeEvent, TraceLinkEvent, TraceLinkNodeEvent, } from './contracts/trace-collector.js';
-export type { ExecutionContext, CallerType, GovernancePermissionCheckParams, GovernancePermissionCheckResult, PermissionDenyReason, } from '@gt-fe/eap-contracts';
+export type { ExecutionContext, CallerType, GovernancePermissionCheckParams, GovernancePermissionCheckResult, PermissionDenyReason, } from '@eap/contracts';
 export { HttpGovernanceClient, AllowAllGovernanceClient, resolveExecutionContext, assertToolPermission, assertSkillPermission, permissionMessage, PermissionDeniedError, GovernanceUnavailableError, } from './governance/index.js';
 export type { IGovernanceClient } from './governance/index.js';
 export { FileLlmTurnLog, InMemoryLlmTurnLog, createFileLlmTurnLogFromEnv, maskApiKey, resolveLlmTurnDir, } from './debug/llm-turn-log.js';

package/dist/memory/compression/index.d.ts

@@ -3,7 +3,7 @@
  *
  * 提供多种压缩策略用于处理长对话历史。
  */
-export { type CompressionConfig, type CompressionResult, type CompressionRecord, type CompressionStrategy, type CompressionReason, type IMessageCompressionService, DEFAULT_COMPRESSION_CONFIG, estimateTokenCount, estimateMessagesTokens, countRounds, } from '../message-compression.service.js';
+export { type CompressionConfig, type CompressionResult, type CompressionRecord, type CompressionStrategy, type CompressionReason, type IMessageCompressionService, DEFAULT_COMPRESSION_CONFIG, COMPRESSION_WINDOW_FACTOR, COMPRESSION_MAX_TOKENS_FALLBACK, resolveCompressionMaxTokens, mergeCompressionConfig, estimateTokenCount, estimateMessagesTokens, countRounds, } from '../message-compression.service.js';
 export { SlidingWindowCompression, TruncateCompression, type SummarizeFunction, } from './sliding-window.compression.js';
 export { createLLMSummarize, createSimpleSummarize, type LLMCallFunction, } from './llm-summarize.js';
 export { PostgresCompressionRepository, InMemoryCompressionRepository, type ICompressionRepository, } from './compression.repository.js';

package/dist/memory/compression/index.js

@@ -4,7 +4,7 @@
  * 提供多种压缩策略用于处理长对话历史。
  */
 // 压缩接口和工具函数
-export { DEFAULT_COMPRESSION_CONFIG, estimateTokenCount, estimateMessagesTokens, countRounds, } from '../message-compression.service.js';
+export { DEFAULT_COMPRESSION_CONFIG, COMPRESSION_WINDOW_FACTOR, COMPRESSION_MAX_TOKENS_FALLBACK, resolveCompressionMaxTokens, mergeCompressionConfig, estimateTokenCount, estimateMessagesTokens, countRounds, } from '../message-compression.service.js';
 // 滑动窗口压缩策略
 export { SlidingWindowCompression, TruncateCompression, } from './sliding-window.compression.js';
 // LLM 摘要函数

package/dist/memory/compression/sliding-window.compression.js

@@ -9,7 +9,7 @@
  * @see message-compression.service.ts 压缩接口定义
  * @see requirements.md Requirement 4.3
  */
-import { DEFAULT_COMPRESSION_CONFIG, estimateMessagesTokens, countRounds, } from '../message-compression.service.js';
+import { DEFAULT_COMPRESSION_CONFIG, estimateMessagesTokens, countRounds, mergeCompressionConfig, } from '../message-compression.service.js';
 /**
  * 默认摘要函数（占位）
  *
@@ -30,14 +30,14 @@ export class SlidingWindowCompression {
     config;
     summarize;
     constructor(config, summarize) {
-        this.config = { ...DEFAULT_COMPRESSION_CONFIG, ...config };
+        this.config = mergeCompressionConfig(DEFAULT_COMPRESSION_CONFIG, config);
         this.summarize = summarize ?? defaultSummarize;
     }
     /**
      * 检查是否需要压缩
      */
     checkCompression(messages, config) {
-        const mergedConfig = { ...this.config, ...config };
+        const mergedConfig = mergeCompressionConfig(this.config, config);
         const currentTokens = this.estimateTokens(messages);
         const currentRounds = countRounds(messages);
         // 检查 Token 数是否超限
@@ -73,7 +73,7 @@ export class SlidingWindowCompression {
      * 3. 用摘要 + 最近 N 轮替换原始消息
      */
     async compress(messages, config) {
-        const mergedConfig = { ...this.config, ...config };
+        const mergedConfig = mergeCompressionConfig(this.config, config);
         // 1. 找到最近 N 轮的起始位置
         const splitIndex = this.findSplitIndex(messages, mergedConfig.preserveRecentRounds);
         // 如果消息太少，不需要压缩
@@ -134,10 +134,10 @@ export class SlidingWindowCompression {
 export class TruncateCompression {
     config;
     constructor(config) {
-        this.config = { ...DEFAULT_COMPRESSION_CONFIG, ...config };
+        this.config = mergeCompressionConfig(DEFAULT_COMPRESSION_CONFIG, config);
     }
     checkCompression(messages, config) {
-        const mergedConfig = { ...this.config, ...config };
+        const mergedConfig = mergeCompressionConfig(this.config, config);
         const currentTokens = this.estimateTokens(messages);
         const currentRounds = countRounds(messages);
         if (currentTokens > mergedConfig.maxTokens || currentRounds > mergedConfig.maxRounds) {
@@ -155,7 +155,7 @@ export class TruncateCompression {
         };
     }
     async compress(messages, config) {
-        const mergedConfig = { ...this.config, ...config };
+        const mergedConfig = mergeCompressionConfig(this.config, config);
         const preserveCount = mergedConfig.preserveRecentRounds * 2; // 每轮 2 条消息
         if (messages.length <= preserveCount) {
             return messages;