@gt-fe/eap-runtime 0.0.33 → 0.0.35

package/dist/task/task-timeout.js

@@ -10,6 +10,7 @@
  * @see requirements.md Requirement 7 AC4
  */
 import { DEFAULT_GRAPH_TIMEOUT_MS } from '../common/types.js';
+import { TaskAbortError } from './task-abort.js';
 // ─────────────────────────────────────────────
 // Default Constants
 // ─────────────────────────────────────────────
@@ -31,6 +32,11 @@ const MAX_TIMEOUT_MS = 3_600_000;
  */
 export class TaskTimeoutManager {
     entries = new Map();
+    /**
+     * startTimer 之前到达的停止。startTimer 消费后返回已 abort 的 signal，且不调用 onTimeout。
+     * clearTimer 只在计时器已经启动时清掉残留，避免把还没被 startTimer 看到的停止丢掉。
+     */
+    pendingAborts = new Map();
     defaultTimeoutMs;
     constructor(options) {
         this.defaultTimeoutMs = options?.defaultTimeoutMs ?? DEFAULT_TIMEOUT_MS;
@@ -49,12 +55,22 @@ export class TaskTimeoutManager {
             throw new Error(`Timeout timer already exists for task '${taskId}'. Call clearTimer() first.`);
         }
         const effectiveTimeout = Math.min(Math.max(timeoutMs ?? this.defaultTimeoutMs, 0), MAX_TIMEOUT_MS);
+        const pendingKind = this.pendingAborts.get(taskId);
+        if (pendingKind) {
+            this.pendingAborts.delete(taskId);
+            const already = new AbortController();
+            already.abort(new TaskAbortError(taskId, pendingKind, effectiveTimeout));
+            return already.signal;
+        }
         const abortController = new AbortController();
         const timer = setTimeout(() => {
-            // 超时触发：abort signal + 执行回调
-            abortController.abort(new Error(`Task '${taskId}' timed out after ${effectiveTimeout}ms`));
+            // abort() 已取走条目时不再标 timeout
+            if (!this.entries.has(taskId))
+                return;
             this.entries.delete(taskId);
-            // 触发外部回调（fire-and-forget，错误不应阻塞清理）
+            if (!abortController.signal.aborted) {
+                abortController.abort(new TaskAbortError(taskId, 'timeout', effectiveTimeout));
+            }
             void onTimeout().catch(() => {
                 // onTimeout 回调的错误由调用方处理，这里静默忽略
             });
@@ -63,9 +79,27 @@ export class TaskTimeoutManager {
         if (timer.unref) {
             timer.unref();
         }
-        this.entries.set(taskId, { timer, abortController });
+        this.entries.set(taskId, { timer, abortController, timeoutMs: effectiveTimeout });
         return abortController.signal;
     }
+    /**
+     * 停止这一轮。清掉计时器，不调用 onTimeout。
+     * 计时器还没启动时记下 kind，等 startTimer 返回已 abort 的 signal。
+     */
+    abort(taskId, kind = 'cancelled') {
+        this.pendingAborts.delete(taskId);
+        const entry = this.entries.get(taskId);
+        if (!entry) {
+            this.pendingAborts.set(taskId, kind);
+            return true;
+        }
+        clearTimeout(entry.timer);
+        this.entries.delete(taskId);
+        if (!entry.abortController.signal.aborted) {
+            entry.abortController.abort(new TaskAbortError(taskId, kind, entry.timeoutMs));
+        }
+        return true;
+    }
     /**
      * 取消超时计时器（Task 正常完成时调用）
      *
@@ -79,6 +113,7 @@ export class TaskTimeoutManager {
         }
         clearTimeout(entry.timer);
         this.entries.delete(taskId);
+        this.pendingAborts.delete(taskId);
         return true;
     }
     /**
@@ -113,5 +148,6 @@ export class TaskTimeoutManager {
             entry.abortController.abort(new Error(`TaskTimeoutManager disposed, task '${taskId}' aborted`));
         }
         this.entries.clear();
+        this.pendingAborts.clear();
     }
 }

package/dist/task/task.service.js

@@ -16,16 +16,17 @@ import { TaskProgressTracker } from './task-progress-tracker.js';
  * 合法状态流转映射
  *
  * pending → running
- * running → success | failed | timeout | token_exhausted
+ * running → success | failed | timeout | token_exhausted | cancelled | waiting_hitl
  */
 const VALID_TRANSITIONS = {
-    pending: ['running'],
-    running: ['success', 'failed', 'timeout', 'token_exhausted', 'waiting_hitl'],
-    waiting_hitl: ['running', 'timeout', 'failed'],
+    pending: ['running', 'cancelled'],
+    running: ['success', 'failed', 'timeout', 'token_exhausted', 'cancelled', 'waiting_hitl'],
+    waiting_hitl: ['running', 'timeout', 'failed', 'cancelled'],
     success: [],
     failed: [],
     timeout: [],
     token_exhausted: [],
+    cancelled: [],
 };
 // ─────────────────────────────────────────────
 // In-Memory Repository (Default)
@@ -128,7 +129,11 @@ export class TaskService {
         if (status === 'waiting_hitl' && output !== undefined) {
             task.output = output;
         }
-        if (status === 'success' || status === 'failed' || status === 'timeout' || status === 'token_exhausted') {
+        if (status === 'success' ||
+            status === 'failed' ||
+            status === 'timeout' ||
+            status === 'token_exhausted' ||
+            status === 'cancelled') {
             task.completedAt = now;
             if (output !== undefined) {
                 task.output = output;
@@ -215,6 +220,7 @@ export class TaskService {
             case 'failed':
             case 'timeout':
             case 'token_exhausted':
+            case 'cancelled':
                 return 100;
             default:
                 return 0;

package/dist/tool/index.d.ts

@@ -22,4 +22,5 @@ export { expandSkillScriptRefs, isSkillEntryFile, EAP_SKILL_DIR_ENV, } from './s
 export { ToolResultInjector, type ToolMessage, } from './tool-result-injector.js';
 export { ToolEventEmitter } from './tool-event-emitter.js';
 export { ToolConfirmationInterceptor } from './tool-confirmation.js';
-export { SystemPromptBuilder, naturalTimeWindows, buildSkillCatalog, buildToolCatalog, catalogEntryTitle, spokenName, loadedToolsToApiTools, toLoadedSkillMap, filterLoadedToolsForSkill, type PromptBuildContext, type PromptSection, type AssembledSystemPrompt, type ApiToolDefinition, type LoadedSkillInfo, type LoadedSkillMap, } from './system-prompt-builder.js';
+export { TOOL_SEARCH_NAME, buildMcpToolIndex, deferMcpToolsEnabled, resolveModelToolSurface, runToolSearch, } from './mcp-tool-exposure.js';
+export { SystemPromptBuilder, naturalTimeWindows, buildSkillCatalog, catalogEntryTitle, spokenName, loadedToolsToApiTools, toLoadedSkillMap, filterLoadedToolsForSkill, type PromptBuildContext, type PromptSection, type AssembledSystemPrompt, type ApiToolDefinition, type LoadedSkillInfo, type LoadedSkillMap, } from './system-prompt-builder.js';

package/dist/tool/index.js

@@ -21,4 +21,5 @@ export { expandSkillScriptRefs, isSkillEntryFile, EAP_SKILL_DIR_ENV, } from './s
 export { ToolResultInjector, } from './tool-result-injector.js';
 export { ToolEventEmitter } from './tool-event-emitter.js';
 export { ToolConfirmationInterceptor } from './tool-confirmation.js';
-export { SystemPromptBuilder, naturalTimeWindows, buildSkillCatalog, buildToolCatalog, catalogEntryTitle, spokenName, loadedToolsToApiTools, toLoadedSkillMap, filterLoadedToolsForSkill, } from './system-prompt-builder.js';
+export { TOOL_SEARCH_NAME, buildMcpToolIndex, deferMcpToolsEnabled, resolveModelToolSurface, runToolSearch, } from './mcp-tool-exposure.js';
+export { SystemPromptBuilder, naturalTimeWindows, buildSkillCatalog, catalogEntryTitle, spokenName, loadedToolsToApiTools, toLoadedSkillMap, filterLoadedToolsForSkill, } from './system-prompt-builder.js';

package/dist/tool/mcp-tool-exposure.d.ts

@@ -0,0 +1,113 @@
+/**
+ * 每轮发给模型的 function schema 按工具来源决定。
+ *
+ * builtin（execution.source=builtin）以及 type 为 code / http 的工具，始终带完整参数。
+ * type=mcp 且不是 builtin 的，默认不带参数；名称和一行用途写入 system 段 mcp-tools。
+ * 点名，或没点名就调用，都不执行；名字记入本会话，下一次请求带上当前参数后再打外部系统。
+ * 没点名的那句只给模型。员工看模型正文和真正的工具结果（含飞书报错、用户拒绝），不另写未执行。
+ * 新会话不沿用。没有 sessionId 时按 taskId。EAP_DEFER_MCP_TOOLS=0 关闭，恢复为全部 schema 都下发。
+ */
+import type { GraphMessage } from '../graph/contracts/executable-graph.js';
+import type { LLMNodeConfig } from '../graph/nodes/llm-node.js';
+import type { LoadedToolDefinition, LoadedToolMap } from './loaded-tool-definition.js';
+import { type ApiToolDefinition } from './system-prompt-builder.js';
+export declare const TOOL_SEARCH_NAME = "tool_search";
+export declare function deferMcpToolsEnabled(env?: Record<string, string | undefined>): boolean;
+export declare function isDeferredMcpTool(tool: LoadedToolDefinition): boolean;
+export declare function hasDeferredMcp(loadedTools: LoadedToolMap | undefined): boolean;
+/** 具名 toolChoice 指向的函数。auto / none / required 没有名字。 */
+export declare function forcedToolName(toolChoice: LLMNodeConfig['toolChoice'] | unknown): string | undefined;
+/** 有 sessionId 用会话，否则用 taskId。空字符串表示无处可记。 */
+export declare function exposureScopeId(input: {
+    sessionId?: unknown;
+    taskId?: unknown;
+}): string;
+export declare function exposedNamesForScope(names: unknown, storedScopeId: unknown, scopeId: string): string[];
+export declare function mergeExposed(current: readonly string[], additions: readonly string[]): string[];
+export interface ModelToolSurface {
+    apiTools: ApiToolDefinition[];
+    /** 段 mcp-tools 的正文。没有要推迟的 MCP、或本轮 disableTools、或开关关闭时缺省。 */
+    mcpToolIndex?: string;
+    /** 本轮是否按来源推迟了 MCP 参数。 */
+    deferred: boolean;
+}
+export declare function resolveModelToolSurface(input: {
+    loadedTools: LoadedToolMap | undefined;
+    disableTools: boolean;
+    exposedNames: readonly string[];
+    forcedName?: string;
+    env?: Record<string, string | undefined>;
+}): ModelToolSurface;
+/** 全部推迟中的 MCP：名称 + 现有 description，不截断，不含参数 schema。 */
+export declare function buildMcpToolIndex(loadedTools: LoadedToolMap | undefined): string | undefined;
+export declare function toolSearchApiTool(): ApiToolDefinition;
+export interface ToolSearchOutcome {
+    content: string;
+    /** 这些 MCP 名字的完整参数从下一次模型调用开始带上。 */
+    expose: string[];
+}
+export declare function unloadedCallToolContent(name: string): string;
+export declare function isUnloadedDeferredCall(tool: LoadedToolDefinition | undefined, sentToolNames: readonly string[] | undefined): boolean;
+export declare function runToolSearch(args: Record<string, unknown> | undefined, loadedTools: LoadedToolMap | undefined, alreadyInTools?: readonly string[]): ToolSearchOutcome;
+export declare function partitionToolSearchCalls<T extends {
+    name: string;
+}>(calls: T[], loadedTools: LoadedToolMap | undefined, env?: Record<string, string | undefined>): {
+    deferActive: boolean;
+    intercept: boolean;
+    search: T[];
+    business: T[];
+};
+/** tool_search 点名，以及本轮调用过的 MCP，记入本会话。直接调用这一次不执行。 */
+export declare function mcpNamesToExpose(loadedTools: LoadedToolMap | undefined, searchExpose: readonly string[], businessNames: readonly string[]): string[];
+export interface VisibleToolFact {
+    name?: string;
+    toolName?: string;
+    content?: unknown;
+    success?: boolean;
+}
+/** 发给模型的历史。不改会话存档。只处理这次 tools 里没有的名字。 */
+export declare function projectHistoryForModelTools(messages: GraphMessage[], toolNames: ReadonlySet<string>): GraphMessage[];
+/**
+ * 员工可见正文。未点名、只报了名，都不改模型的话。
+ * 用户拒绝仍补一行。飞书自己的成功或错误不改。
+ */
+export declare function correctEmployeeVisibleReply(visible: string, tools: readonly VisibleToolFact[]): string;
+/**
+ * 还有未点名的 MCP 时，这段模型正文先攒着，等这条消息落定再决定发不发给员工。
+ * 全部已经在本次 tools 里，或本次没有 tools，仍逐 token 推。
+ */
+export declare function holdEmployeeTextForUnnamedMcp(loadedTools: LoadedToolMap | undefined, sentToolNames: readonly string[]): boolean;
+/**
+ * 这条模型消息还不能当员工结论：带着没点名的调用，或这一次只点了名。
+ * 没有工具调用时不丢，交给回合结束时的闸门。
+ */
+export declare function shouldDropUnsettledEmployeeText(calls: readonly {
+    name: string;
+}[] | undefined, loadedTools: LoadedToolMap | undefined, sentToolNames: readonly string[] | undefined): boolean;
+export interface EmployeeHeldEvent {
+    type: string;
+    payload: Record<string, unknown>;
+}
+/**
+ * 没点名的工具事件和 tool_search 不进员工 SSE。
+ * 判定：`modelOnly`，或工具名是 `tool_search`，或正文以 `未调用 ` 开头。
+ */
+export declare function takeEmployeeVisibleEvents(eventType: string, payload: unknown): EmployeeHeldEvent[];
+export interface EmployeeTurnClose {
+    visible: string;
+    /** 用户拒绝时补在最后的那几行。带开头换行。没有则为空。 */
+    tailChunk: string;
+}
+export declare function employeeTurnClose(raw: string, tools: readonly VisibleToolFact[]): EmployeeTurnClose;
+/** 回合结束时要补发的 response.chunk。final 仍是 injected。 */
+export declare function employeeStreamClose(input: {
+    raw: string;
+    tools: readonly VisibleToolFact[];
+    suffix?: string;
+}): {
+    chunks: string[];
+    persistCorrected: boolean;
+};
+export declare function toolFactsSinceLastUser(messages: readonly unknown[]): VisibleToolFact[];
+/** 本轮最后一条助手正文。图若停在 tool 节点，不用工具正文当员工结论。 */
+export declare function lastAssistantTextSinceLastUser(messages: readonly unknown[]): string;