@gt-fe/eap-runtime 0.0.29 → 0.0.30

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

@@ -36,7 +36,7 @@ import { pickContextFields } from '../../token/context-window.js';
 import { isHitlDecision, lastAssistantHasUnansweredToolCalls } from '../hitl/hitl-handler.js';
 import { classifySkillRead } from './skill-read.js';
 import { skillEntryInvocationFromTool } from './skill-entry-span.js';
-import { withGraphSpan } from '../trace-span.js';
+import { llmSpanInput, llmSpanOutputFromResult, withGraphSpan } from '../trace-span.js';
 import { executionTraceFromState, getExecutionStream, getExecutionTrace, runWithExecutionTrace, } from '../execution-trace-context.js';
 import { isRetryableToolFailure, resolveToolRetryConfig, sleepToolRetry, toolRetryDelayMs, } from '../../tool/tool-retry.js';
 /**
@@ -788,17 +788,30 @@ export class LangGraphAdapter {
             case 'tool':
                 return this.createToolNodeFunction(node);
             case 'condition':
-                return async (state) => withGraphSpan(state, { name: node.id, type: 'condition' }, async () => {
+                return async (state) => {
                     const conditionExpr = node.config?.['conditionExpr']
                         ?? node.config?.['conditionFn'];
-                    if (conditionExpr) {
-                        const branchValues = node.config?.['branchValues']
-                            ?? this.extractBranchValuesFromDsl(node.id);
-                        const result = await this.conditionEvaluator.evaluate(conditionExpr, state, branchValues, node.config?.['fallback'] ?? '__default__');
-                        return { currentNode: node.id, __conditionResult: result };
-                    }
-                    return { currentNode: node.id };
-                });
+                    const branchValues = node.config?.['branchValues']
+                        ?? this.extractBranchValuesFromDsl(node.id);
+                    const fallback = node.config?.['fallback'] ?? '__default__';
+                    return withGraphSpan(state, {
+                        name: node.id,
+                        type: 'condition',
+                        extra: {
+                            input: {
+                                conditionExpr: conditionExpr ?? null,
+                                branchValues,
+                                fallback,
+                            },
+                        },
+                    }, async () => {
+                        if (conditionExpr) {
+                            const result = await this.conditionEvaluator.evaluate(conditionExpr, state, branchValues, fallback);
+                            return { currentNode: node.id, __conditionResult: result };
+                        }
+                        return { currentNode: node.id };
+                    }, { outputFrom: (result) => result['__conditionResult'] });
+                };
             case 'subgraph':
                 return this.createSubGraphNodeFunction(node);
             case 'human':
@@ -1019,136 +1032,155 @@ export class LangGraphAdapter {
                 lastAssistantHasUnansweredToolCalls(rawMessages)) {
                 return { currentNode: node.id };
             }
-            return withGraphSpan(state, { name: node.id, type: 'llm' }, async () => {
-                const promptRoots = Array.isArray(state['promptRoots']) ? state['promptRoots'] : [];
-                const resolvedPrompt = resolveGraphPrompt(baseConfig.systemPrompt, promptRoots);
-                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) : [];
-                    console.log(`[LLM-DEBUG] node=${node.id} loadedTools=${toolNames.length}:`, toolNames);
-                }
-                const catalog = includeSkillCatalog ? this.buildSkillCatalog(skillDefs) : undefined;
-                const toolCatalog = disableTools ? undefined : buildToolCatalog(loadedTools);
-                const jail = resolveJailFromState({
-                    agentDir: state['agentDir'],
-                    userId,
-                    executionContext: execCtx,
-                    loadedTools,
-                    skillDefinitions: skillDefs,
-                });
-                if (this.overlayExtraRoots.length > 0) {
-                    jail.extraRoots = [...(jail.extraRoots ?? []), ...this.overlayExtraRoots];
-                }
-                const workingDirectory = jail.workdir;
-                const jailRoots = resolveJailRoots(jail);
-                const skillDirs = Object.values(skillDefs ?? {})
-                    .filter((skill) => Boolean(skill.bundlePath))
-                    .map((skill) => ({
-                    skillId: skill.skillId,
-                    bundlePath: skill.bundlePath,
-                    entryFile: skill.entryFile,
-                }));
-                const promptInputs = resolveLlmPromptInputs({
-                    silent,
-                    agentSystemPrompt: state['agentSystemPrompt'],
-                    nodePrompt: resolvedPrompt,
+            const promptRoots = Array.isArray(state['promptRoots']) ? state['promptRoots'] : [];
+            const resolvedPrompt = resolveGraphPrompt(baseConfig.systemPrompt, promptRoots);
+            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,
+                        });
+                    },
                 });
-                const assembled = this.systemPromptBuilder.build({
-                    agentPrompt: promptInputs.agentPrompt,
-                    nodePrompt: promptInputs.nodePrompt,
-                    skillCatalog: catalog,
-                    toolCatalog,
+            if (loadedTools && loadedTools !== loadedToolsBase) {
+                state['loadedTools'] = loadedTools;
+            }
+            // [DEBUG] 打印 loadedTools 实际状态
+            if (process.env.EAP_LLM_DEBUG === '1') {
+                const toolNames = loadedTools ? Object.keys(loadedTools) : [];
+                console.log(`[LLM-DEBUG] node=${node.id} loadedTools=${toolNames.length}:`, toolNames);
+            }
+            const catalog = includeSkillCatalog ? this.buildSkillCatalog(skillDefs) : undefined;
+            const toolCatalog = disableTools ? undefined : buildToolCatalog(loadedTools);
+            const jail = resolveJailFromState({
+                agentDir: state['agentDir'],
+                userId,
+                executionContext: execCtx,
+                loadedTools,
+                skillDefinitions: skillDefs,
+            });
+            if (this.overlayExtraRoots.length > 0) {
+                jail.extraRoots = [...(jail.extraRoots ?? []), ...this.overlayExtraRoots];
+            }
+            const workingDirectory = jail.workdir;
+            const jailRoots = resolveJailRoots(jail);
+            const skillDirs = Object.values(skillDefs ?? {})
+                .filter((skill) => Boolean(skill.bundlePath))
+                .map((skill) => ({
+                skillId: skill.skillId,
+                bundlePath: skill.bundlePath,
+                entryFile: skill.entryFile,
+            }));
+            const promptInputs = resolveLlmPromptInputs({
+                silent,
+                agentSystemPrompt: state['agentSystemPrompt'],
+                nodePrompt: resolvedPrompt,
+            });
+            const assembled = this.systemPromptBuilder.build({
+                agentPrompt: promptInputs.agentPrompt,
+                nodePrompt: promptInputs.nodePrompt,
+                skillCatalog: catalog,
+                toolCatalog,
+                agentCode,
+                userId,
+                workingDirectory,
+                os: { platform: os.platform(), release: os.release() },
+                jailRoots,
+                skillDirs,
+            });
+            const apiTools = disableTools ? [] : loadedToolsToApiTools(loadedTools);
+            const finalConfig = {
+                ...baseConfig,
+                systemPrompt: assembled.text,
+                systemSections: assembled.sections,
+                turn: {
+                    sessionId: typeof state['sessionId'] === 'string' ? state['sessionId'] : undefined,
+                    taskId: typeof state['taskId'] === 'string' ? state['taskId'] : undefined,
+                    nodeId: node.id,
                     agentCode,
-                    userId,
-                    workingDirectory,
-                    os: { platform: os.platform(), release: os.release() },
-                    jailRoots,
-                    skillDirs,
-                });
-                const apiTools = disableTools ? [] : loadedToolsToApiTools(loadedTools);
-                const finalConfig = {
-                    ...baseConfig,
-                    systemPrompt: assembled.text,
-                    systemSections: assembled.sections,
-                    turn: {
-                        sessionId: typeof state['sessionId'] === 'string' ? state['sessionId'] : undefined,
-                        taskId: typeof state['taskId'] === 'string' ? state['taskId'] : undefined,
-                        nodeId: node.id,
-                        agentCode,
-                        correlationId: typeof state['correlationId'] === 'string' ? state['correlationId'] : undefined,
-                    },
-                    tools: disableTools ? undefined : (apiTools.length > 0 ? apiTools : baseConfig.tools),
-                    toolChoice: disableTools ? 'none' : baseConfig.toolChoice,
-                };
-                // 流式旁路：有本次 stream 袋时启用 LLM token 推送；silent 节点不推给用户
-                const stream = getExecutionStream();
-                const enableStream = Boolean(stream) && !silent;
-                if (stream) {
-                    stream.reasoningStartedThisTurn = false;
-                    stream.streamedTextThisTurn = false;
-                }
-                const llmNode = new LLMNode(node.id, finalConfig, this.llmProvider, enableStream, enableStream
-                    ? (text) => {
-                        const live = getExecutionStream();
-                        if (!live || !text)
-                            return;
-                        const timestamp = new Date().toISOString();
-                        if (!live.reasoningStartedThisTurn) {
-                            live.reasoningStartedThisTurn = true;
-                            live.iteration += 1;
-                            live.sink({
-                                type: 'reasoning.started',
-                                taskId: undefined,
-                                correlationId: undefined,
-                                timestamp,
-                                payload: {
-                                    iterationCount: live.iteration,
-                                    model: finalConfig.model,
-                                },
-                            });
-                        }
-                        live.streamedTextThisTurn = true;
+                    correlationId: typeof state['correlationId'] === 'string' ? state['correlationId'] : undefined,
+                },
+                tools: disableTools ? undefined : (apiTools.length > 0 ? apiTools : baseConfig.tools),
+                toolChoice: disableTools ? 'none' : baseConfig.toolChoice,
+            };
+            // 流式旁路：有本次 stream 袋时启用 LLM token 推送；silent 节点不推给用户
+            const stream = getExecutionStream();
+            const enableStream = Boolean(stream) && !silent;
+            if (stream) {
+                stream.reasoningStartedThisTurn = false;
+                stream.streamedTextThisTurn = false;
+            }
+            const llmNode = new LLMNode(node.id, finalConfig, this.llmProvider, enableStream, enableStream
+                ? (text) => {
+                    const live = getExecutionStream();
+                    if (!live || !text)
+                        return;
+                    const timestamp = new Date().toISOString();
+                    if (!live.reasoningStartedThisTurn) {
+                        live.reasoningStartedThisTurn = true;
+                        live.iteration += 1;
                         live.sink({
-                            type: 'response.chunk',
+                            type: 'reasoning.started',
                             taskId: undefined,
                             correlationId: undefined,
                             timestamp,
                             payload: {
-                                content: text,
-                                index: live.chunkIndex++,
-                                node: node.id,
+                                iterationCount: live.iteration,
+                                model: finalConfig.model,
                             },
                         });
                     }
-                    : undefined, this.interceptors);
+                    live.streamedTextThisTurn = true;
+                    live.sink({
+                        type: 'response.chunk',
+                        taskId: undefined,
+                        correlationId: undefined,
+                        timestamp,
+                        payload: {
+                            content: text,
+                            index: live.chunkIndex++,
+                            node: node.id,
+                        },
+                    });
+                }
+                : undefined, this.interceptors);
+            const toolsForSpan = disableTools || !loadedTools
+                ? undefined
+                : Object.values(loadedTools).map((t) => ({
+                    name: t.name,
+                    ...(t.manifest.description?.trim()
+                        ? { description: t.manifest.description.trim() }
+                        : {}),
+                }));
+            // 组装后再 createNode：input 必须是发给模型的 system/tools/messages；completeNode 不能补 input。
+            return withGraphSpan(state, {
+                name: node.id,
+                type: 'llm',
+                extra: {
+                    input: llmSpanInput({
+                        system: assembled.text,
+                        tools: toolsForSpan,
+                        messages: state['messages'],
+                    }),
+                },
+            }, async () => {
                 const next = await llmNode.execute(state);
                 const hydratedUpdate = loadedTools && loadedTools !== loadedToolsBase ? { loadedTools } : {};
                 if (!silent)
@@ -1163,7 +1195,7 @@ export class LangGraphAdapter {
                     silentOutput: raw,
                     ...hydratedUpdate,
                 };
-            });
+            }, { outputFrom: llmSpanOutputFromResult });
         };
     }
     /**

package/dist/graph/hitl/hitl-handler.js

@@ -289,6 +289,12 @@ export class HitlHandler {
             name: extras.toolName ?? 'hitl',
             type: 'hitl',
             parentSpanId: extras.toolSpanId ?? skillSpanId,
+            extra: {
+                input: {
+                    question: config.question,
+                    options: config.options,
+                },
+            },
         });
         const persisted = {
             taskId,

package/dist/graph/trace-span.d.ts

@@ -12,4 +12,18 @@ export declare function completeGraphSpan(state: Record<string, unknown>, spanId
 export declare function withGraphSpan(state: Record<string, unknown>, spec: {
     name: string;
     type: ExecutionNodeEvent['type'];
-}, run: () => Promise<Record<string, unknown>>): Promise<Record<string, unknown>>;
+    extra?: Partial<Omit<ExecutionNodeEvent, 'traceId' | 'name' | 'type' | 'parentNodeId'>>;
+}, run: () => Promise<Record<string, unknown>>, complete?: {
+    outputFrom?: (result: Record<string, unknown>) => unknown;
+}): Promise<Record<string, unknown>>;
+/** llm Span create 时的 input：组装后的 system、工具短目录、本回合 messages。 */
+export declare function llmSpanInput(input: {
+    system?: string;
+    tools?: Array<{
+        name: string;
+        description?: string;
+    }>;
+    messages: unknown;
+}): Record<string, unknown>;
+/** llm Span complete 的 output：本回合新增 assistant（含 toolCalls）或 silentOutput。 */
+export declare function llmSpanOutputFromResult(result: Record<string, unknown>): unknown;

package/dist/graph/trace-span.js

@@ -43,15 +43,17 @@ export async function completeGraphSpan(state, spanId, params, collectorOverride
         warnTraceSpanFailure('completeNode', { spanId, traceId: resolveExecutionTrace(state).traceId }, err);
     }
 }
-export async function withGraphSpan(state, spec, run) {
+export async function withGraphSpan(state, spec, run, complete) {
     const spanId = await startGraphSpan(state, spec);
     try {
         const result = await run();
         const usage = Array.isArray(result['__llmTokenUsage'])
             ? result['__llmTokenUsage'].at(-1)
             : undefined;
+        const output = complete?.outputFrom?.(result);
         await completeGraphSpan(state, spanId, {
             status: 'completed',
+            ...(output !== undefined ? { output } : {}),
             inputTokens: usage?.inputTokens,
             outputTokens: usage?.outputTokens,
             totalTokens: usage?.inputTokens != null || usage?.outputTokens != null
@@ -69,3 +71,69 @@ export async function withGraphSpan(state, spec, run) {
         throw err;
     }
 }
+function spanGraphMessages(raw) {
+    if (!Array.isArray(raw))
+        return [];
+    return raw.map((msg) => {
+        if (typeof msg !== 'object' || msg === null) {
+            return { role: 'user', content: String(msg) };
+        }
+        const m = msg;
+        const out = {
+            role: typeof m['role'] === 'string' ? m['role'] : 'user',
+            content: typeof m['content'] === 'string' ? m['content'] : '',
+        };
+        const toolCalls = m['toolCalls'] ?? m['tool_calls'];
+        if (toolCalls !== undefined)
+            out.toolCalls = toolCalls;
+        const toolCallId = typeof m['toolCallId'] === 'string'
+            ? m['toolCallId']
+            : typeof m['tool_call_id'] === 'string'
+                ? m['tool_call_id']
+                : undefined;
+        if (toolCallId)
+            out.toolCallId = toolCallId;
+        if (typeof m['toolName'] === 'string')
+            out.toolName = m['toolName'];
+        if (typeof m['success'] === 'boolean')
+            out.success = m['success'];
+        const reasoning = typeof m['reasoningContent'] === 'string'
+            ? m['reasoningContent']
+            : typeof m['reasoning_content'] === 'string'
+                ? m['reasoning_content']
+                : undefined;
+        if (reasoning)
+            out.reasoningContent = reasoning;
+        return out;
+    });
+}
+/** llm Span create 时的 input：组装后的 system、工具短目录、本回合 messages。 */
+export function llmSpanInput(input) {
+    const tools = input.tools?.filter((t) => t.name);
+    return {
+        ...(input.system ? { system: input.system } : {}),
+        ...(tools && tools.length > 0 ? { tools } : {}),
+        messages: spanGraphMessages(input.messages),
+    };
+}
+/** llm Span complete 的 output：本回合新增 assistant（含 toolCalls）或 silentOutput。 */
+export function llmSpanOutputFromResult(result) {
+    if (typeof result['silentOutput'] === 'string') {
+        return { content: result['silentOutput'] };
+    }
+    const messages = Array.isArray(result['messages']) ? result['messages'] : [];
+    const added = messages[0];
+    if (!added || typeof added !== 'object')
+        return undefined;
+    const m = added;
+    const out = {
+        content: typeof m['content'] === 'string' ? m['content'] : '',
+    };
+    const toolCalls = m['toolCalls'] ?? m['tool_calls'];
+    if (Array.isArray(toolCalls) && toolCalls.length > 0)
+        out.toolCalls = toolCalls;
+    if (typeof m['reasoningContent'] === 'string' && m['reasoningContent']) {
+        out.reasoningContent = m['reasoningContent'];
+    }
+    return out;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gt-fe/eap-runtime",
-  "version": "0.0.29",
+  "version": "0.0.30",
   "description": "Enterprise Agent Platform — Runtime核心：Graph执行引擎、Task生命周期、Session管理、Checkpoint持久化",
   "type": "module",
   "main": "dist/index.js",