@zhin.js/agent 1.1.3 → 1.1.5

package/lib/task-executor.js

@@ -1,156 +1,125 @@
+/** Delivery boundary for the independent schedule execution domain. */
 import { createSyntheticMessage, resolveIMSessionIdFromMessage, getLogger } from '@zhin.js/core';
-import { createNotificationRouter, } from './assistant/notification-router.js';
-import { senderFromScheduleCreator } from './assistant/job-creator.js';
-import { buildScheduleTurnMessage } from './assistant/schedule-message.js';
-import { buildScheduleTurnPrompt } from './assistant/schedule-execution.js';
+import { createNotificationRouter } from './assistant/notification-router.js';
+import { scheduleJobCreatorFromPrincipal, senderFromScheduleCreator } from './assistant/job-creator.js';
 import { deliverScheduleToAdapter } from './assistant/deliver-schedule-to-adapter.js';
+import { KeyedMutex } from './utils/keyed-mutex.js';
+import { ScheduleExecutionDomainImpl, } from './schedule-domain/execution-domain.js';
+import { demoteScheduleCreator } from './schedule-domain/security-harness.js';
+import { JsonlScheduleAuditLogger } from './schedule-domain/audit-logger.js';
 const logger = getLogger('task-executor');
-const locks = new Map();
-async function withLock(sceneId, fn) {
-    const prev = locks.get(sceneId) ?? Promise.resolve();
-    let resolve;
-    const gate = new Promise((r) => { resolve = r; });
-    const next = prev.then(() => gate, () => gate);
-    locks.set(sceneId, next.finally(() => {
-        if (locks.get(sceneId) === next)
-            locks.delete(sceneId);
-    }));
-    await prev.catch(() => { });
-    try {
-        return await fn();
-    }
-    finally {
-        resolve();
-    }
+const sceneLocks = new KeyedMutex();
+function buildExecutionMessage(job, notify) {
+    const im = notify.channel === 'im' ? notify : undefined;
+    const scene = im?.target.scene;
+    const sceneId = scene?.sceneId || 'cron';
+    const scope = scene?.kind || 'private';
+    const creator = job.createdBy ? demoteScheduleCreator(job.createdBy) : undefined;
+    const sender = creator
+        ? senderFromScheduleCreator(creator)
+        : { id: 'schedule', name: 'schedule', isMaster: false, isTrusted: false };
+    return createSyntheticMessage({
+        adapter: scene?.platform || 'cron',
+        endpoint: scene?.endpointKey || 'default',
+        sender,
+        channel: { type: scope, id: sceneId },
+    });
 }
-function elementsToText(elements) {
-    return elements.map(el => {
-        if (el.type === 'text')
-            return el.content || '';
-        if (el.type === 'image')
-            return `<image url="${el.url}"/>`;
-        return '';
-    }).join('\n').trim();
+function buildPreviewMessage(job, source) {
+    const creator = demoteScheduleCreator(job.createdBy ?? scheduleJobCreatorFromPrincipal(source.principal));
+    const im = source.origin.kind === 'im' ? source.origin : undefined;
+    return createSyntheticMessage({
+        adapter: im?.platform ?? source.origin.kind,
+        endpoint: im?.endpoint ?? 'preview',
+        sender: senderFromScheduleCreator(creator),
+        channel: { type: im?.scope ?? 'private', id: im?.sceneId ?? creator.userId },
+        id: im?.messageId,
+    });
 }
 export function createTaskExecutor(deps) {
-    const router = deps.router ?? createNotificationRouter({
-        resolveAdapter: deps.resolveAdapter,
-        sendIm: deps.deliverIm
-            ? async (notify, content) => deps.deliverIm(notify, content)
-            : undefined,
+    const router = deps.router ?? createNotificationRouter({ resolveAdapter: deps.resolveAdapter });
+    const domain = deps.domain ?? new ScheduleExecutionDomainImpl({
+        agent: deps.agent,
+        auditLogger: new JsonlScheduleAuditLogger(deps.dataDir),
     });
-    async function executeTask(options) {
-        const { prompt, notify, timeContext, createdBy, preview, previewCommMessage, executionPlan, activityFeedback, scheduleJobId, } = options;
-        const t0 = Date.now();
-        const effectiveNotify = router.resolveEffectiveNotify(notify, deps.defaultNotify);
-        const basePrompt = executionPlan?.prompt?.trim() || prompt;
-        const finalPrompt = preview
-            ? buildScheduleTurnPrompt({ basePrompt, mode: 'preview' })
-            : timeContext
-                ? buildScheduleTurnPrompt({ basePrompt, mode: 'scheduled' })
-                : basePrompt;
-        deps.agent.initScheduleTurnContext({
-            executionPlan,
-            createdBy,
-            preview: preview || undefined,
-            activityFeedback: activityFeedback || undefined,
-            jobId: scheduleJobId,
-        });
-        const emitter = deps.agent.getEventEmitter?.() ?? {
-            emit: () => { },
-            createPayload: (_sessionId, comm) => ({
-                sessionId: resolveIMSessionIdFromMessage(comm),
-                source: 'zhin-agent',
-            }),
-        };
-        let commMessage;
-        if (preview && previewCommMessage) {
-            commMessage = buildScheduleTurnMessage({ sourceMessage: previewCommMessage });
-        }
-        else {
-            const im = effectiveNotify.channel === 'im' ? effectiveNotify : undefined;
-            const scene = im?.target.scene;
-            const sceneId = scene?.sceneId || 'cron';
-            const scope = scene?.kind || 'private';
-            const sender = createdBy
-                ? senderFromScheduleCreator(createdBy)
-                : { id: 'system', name: 'system', isMaster: true, isTrusted: false };
-            commMessage = createSyntheticMessage({
-                adapter: scene?.platform || 'cron',
-                endpoint: scene?.endpointId || 'default',
-                sender,
-                channel: { type: scope, id: sceneId },
-            });
-        }
-        const dispatchSchedule = (name) => {
-            if (!activityFeedback)
+    async function execute(job, options = {}) {
+        const previewSource = options.previewSource;
+        const effectiveNotify = router.resolveEffectiveNotify(job.notify, deps.defaultNotify);
+        const commMessage = previewSource
+            ? buildPreviewMessage(job, previewSource)
+            : buildExecutionMessage(job, effectiveNotify);
+        const emitter = deps.agent.getEventEmitter();
+        const event = (name) => {
+            if (!job.activityFeedback)
                 return;
             const sessionId = resolveIMSessionIdFromMessage(commMessage);
-            emitter.emit(name, emitter.createPayload(sessionId, commMessage, 'text'));
+            emitter.emit(name, emitter.createPayload(sessionId, commMessage, 'text', {
+                hookContext: {
+                    scheduleJobId: job.id,
+                    ...(job.createdBy ? { scheduleCreatedBy: job.createdBy } : {}),
+                    ...(previewSource ? { schedulePreview: true } : {}),
+                    scheduleActivityFeedback: true,
+                    ...(job.executionPlan ? { scheduleExecutionPlan: job.executionPlan } : {}),
+                },
+            }));
         };
-        const lockKey = preview
-            ? `preview:${resolveIMSessionIdFromMessage(previewCommMessage ?? commMessage)}`
+        const lockKey = previewSource
+            ? `preview:${previewSource.sessionKey}`
             : (commMessage.$channel?.id ?? 'cron');
-        try {
-            dispatchSchedule('schedule.start');
-            const elements = await withLock(lockKey, () => deps.agent.process(finalPrompt, commMessage));
-            const text = elementsToText(elements);
-            const captured = preview && typeof deps.agent.getLastTurnToolSnapshot === 'function'
-                ? deps.agent.getLastTurnToolSnapshot()
-                : { tools: [], skills: [] };
-            const resultPlan = preview
-                ? {
-                    prompt: basePrompt,
-                    tools: captured.tools.length ? captured.tools : executionPlan?.tools,
-                    skills: captured.skills.length ? captured.skills : executionPlan?.skills,
-                    previewSample: text || undefined,
-                    previewedAt: Date.now(),
-                    confirmed: false,
-                }
-                : executionPlan;
-            if (preview) {
-                if (text && previewCommMessage && typeof previewCommMessage.$reply === 'function') {
-                    await previewCommMessage.$reply(text);
-                }
-                return {
-                    success: true,
-                    responseText: text,
-                    durationMs: Date.now() - t0,
-                    executionPlan: resultPlan,
-                };
+        event('schedule.start');
+        const result = await sceneLocks.run(lockKey, () => domain.execute(job, commMessage, {
+            preview: Boolean(previewSource),
+        }));
+        const executionPlan = previewSource
+            ? {
+                prompt: job.action.prompt,
+                tools: result.toolsUsed.length ? result.toolsUsed : undefined,
+                skills: result.audit.skillsResolved?.length ? result.audit.skillsResolved : undefined,
+                previewSample: result.output || undefined,
+                previewedAt: Date.now(),
+                confirmed: false,
             }
-            if (!text) {
-                // spawn_task 委派时主回合 finalReply 为空；投递由 auto-continue + proactive 出站完成。
-                if (timeContext && typeof deps.agent.waitForIdle === 'function') {
-                    await deps.agent.waitForIdle();
-                }
-                dispatchSchedule('schedule.finish');
-                return { success: true, responseText: '', durationMs: Date.now() - t0, executionPlan: resultPlan };
-            }
-            await deliverScheduleToAdapter({
-                notify: effectiveNotify,
-                content: text,
-                proactiveOutbound: deps.proactiveOutbound,
-                router,
-                resolveAdapter: deps.resolveAdapter,
-            });
-            dispatchSchedule('schedule.finish');
-            return { success: true, responseText: text, durationMs: Date.now() - t0, executionPlan: resultPlan };
+            : job.executionPlan;
+        if (!result.success) {
+            event('schedule.error');
+            logger.error(`[TaskExecutor] 执行失败: ${result.error ?? 'unknown error'}`);
+        }
+        else if (previewSource) {
+            event('schedule.finish');
         }
-        catch (e) {
-            dispatchSchedule('schedule.error');
-            const error = e.message || String(e);
-            logger.error(`[TaskExecutor] 执行失败: ${error}`);
-            return { success: false, responseText: '', durationMs: Date.now() - t0, error };
+        else {
+            if (result.output) {
+                await deliverScheduleToAdapter({
+                    notify: effectiveNotify,
+                    content: result.output,
+                    router,
+                    source: 'scheduled',
+                });
+            }
+            event('schedule.finish');
         }
+        return { ...result, responseText: result.output, executionPlan };
     }
-    return { executeTask, resolveAdapter: deps.resolveAdapter };
+    async function preview(prompt, source, options = {}) {
+        const now = Date.now();
+        const job = {
+            id: `preview-${now}`,
+            enabled: true,
+            schedule: { kind: 'at', atMs: now },
+            action: { kind: 'agent', prompt },
+            notify: { channel: 'silent' },
+            createdAt: now,
+            updatedAt: now,
+            state: {},
+            source: 'manual',
+            createdBy: scheduleJobCreatorFromPrincipal(source.principal),
+            activityFeedback: options.activityFeedback,
+        };
+        return execute(job, { previewSource: source });
+    }
+    return { execute, preview, resolveAdapter: deps.resolveAdapter };
 }
 export async function drainTaskExecutorLocks(timeoutMs) {
-    const deadline = Date.now() + timeoutMs;
-    while (locks.size > 0 && Date.now() < deadline) {
-        await Promise.allSettled([...locks.values()]);
-    }
-    locks.clear();
+    await sceneLocks.drain(timeoutMs);
 }
 //# sourceMappingURL=task-executor.js.map

package/lib/task-executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"task-executor.js","sourceRoot":"","sources":["../src/task-executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"task-executor.js","sourceRoot":"","sources":["../src/task-executor.ts"],"names":[],"mappings":"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"}

package/lib/tool/builtin-policy-extractors.d.ts

@@ -0,0 +1,2 @@
+export declare function registerBuiltinPolicyExtractors(): void;
+//# sourceMappingURL=builtin-policy-extractors.d.ts.map

package/lib/tool/builtin-policy-extractors.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"builtin-policy-extractors.d.ts","sourceRoot":"","sources":["../../src/tool/builtin-policy-extractors.ts"],"names":[],"mappings":"AA6DA,wBAAgB,+BAA+B,IAAI,IAAI,CAWtD"}

package/lib/tool/builtin-policy-extractors.js

@@ -0,0 +1,65 @@
+/**
+ * Builtin 工具的策略输入提取器注册。
+ *
+ * 每个 builtin 声明如何从工具参数派生 ToolPolicyInput，
+ * 供 ToolRuntime 在执行前统一调用 runToolPolicies。
+ *
+ * 注意：web_fetch 和 web_search 有 per-URL 的二次策略检查，
+ * 这些通过 ToolRuntime.checkPolicy() 在工具内部调用。
+ */
+import { expandHome } from '../discovery/utils.js';
+import { registerPolicyExtractor } from './tool-runtime.js';
+const fileReadExtractor = (toolName, args, commMessage) => {
+    const filePathArg = String(args.file_path || args.path || '');
+    const fp = filePathArg ? expandHome(filePathArg) : undefined;
+    return {
+        toolName,
+        filePath: fp,
+        rawFilePath: filePathArg || undefined,
+        fileOperation: 'read',
+        devicePathGuard: true,
+        commMessage,
+    };
+};
+const fileWriteExtractor = (op) => (toolName, args, commMessage) => {
+    const filePathArg = String(args.file_path || args.path || '');
+    const fp = filePathArg ? expandHome(filePathArg) : undefined;
+    return {
+        toolName,
+        filePath: fp,
+        rawFilePath: filePathArg || undefined,
+        fileOperation: op,
+        commMessage,
+    };
+};
+const dirExtractor = (toolName, args, commMessage) => {
+    const dirPath = String(args.path || args.directory || args.cwd || process.cwd());
+    return { toolName, filePath: dirPath, commMessage };
+};
+const bashExtractor = (toolName, args, commMessage, hostPlugin) => ({
+    toolName: 'bash',
+    command: String(args.command || ''),
+    commMessage,
+    hostPlugin,
+});
+const webFetchExtractor = (toolName, _args, commMessage) => ({
+    toolName: 'web_fetch',
+    commMessage,
+});
+const webSearchExtractor = (toolName, _args, commMessage) => ({
+    toolName: 'web_search',
+    commMessage,
+});
+export function registerBuiltinPolicyExtractors() {
+    registerPolicyExtractor('read_file', fileReadExtractor);
+    registerPolicyExtractor('analyze_media', fileReadExtractor);
+    registerPolicyExtractor('write_file', fileWriteExtractor('create'));
+    registerPolicyExtractor('edit_file', fileWriteExtractor('update'));
+    registerPolicyExtractor('glob', dirExtractor);
+    registerPolicyExtractor('grep', dirExtractor);
+    registerPolicyExtractor('list_dir', dirExtractor);
+    registerPolicyExtractor('bash', bashExtractor);
+    registerPolicyExtractor('web_fetch', webFetchExtractor);
+    registerPolicyExtractor('web_search', webSearchExtractor);
+}
+//# sourceMappingURL=builtin-policy-extractors.js.map

package/lib/tool/builtin-policy-extractors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"builtin-policy-extractors.js","sourceRoot":"","sources":["../../src/tool/builtin-policy-extractors.ts"],"names":[],"mappings":"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"}

package/lib/tool/classic-tool-execution-authority.d.ts

@@ -0,0 +1,22 @@
+import type { AgentRunJournal } from '@zhin.js/ai/agent-stream';
+import type { Message, Plugin } from '@zhin.js/core';
+import type { ToolExecutionAuthority } from '../core/tool-execution-authority.js';
+import type { ZhinAgentPrivate } from '../internal/agent-host.js';
+import { type DeferredTurnController } from '../tool-catalog/deferred-turn-controller.js';
+export interface ClassicToolExecutionAuthorityOptions {
+    readonly host: ZhinAgentPrivate;
+    readonly sessionId: string;
+    readonly message: Message;
+    readonly signal: AbortSignal;
+    readonly generation: number;
+    readonly rejectApproval: boolean;
+    readonly plugin?: Plugin;
+    readonly deferredController?: DeferredTurnController;
+    readonly journal?: AgentRunJournal;
+}
+/**
+ * Adapter for the remaining classic Tool definitions. AgentCore itself never
+ * reads Message, policy configuration, or approval transports through this seam.
+ */
+export declare function createClassicToolExecutionAuthority(options: ClassicToolExecutionAuthorityOptions): ToolExecutionAuthority;
+//# sourceMappingURL=classic-tool-execution-authority.d.ts.map

package/lib/tool/classic-tool-execution-authority.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"classic-tool-execution-authority.d.ts","sourceRoot":"","sources":["../../src/tool/classic-tool-execution-authority.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAEV,sBAAsB,EACvB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAGlE,OAAO,EAAiC,KAAK,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AAKzH,MAAM,WAAW,oCAAoC;IACnD,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,kBAAkB,CAAC,EAAE,sBAAsB,CAAC;IACrD,QAAQ,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC;CACpC;AAED;;;GAGG;AACH,wBAAgB,mCAAmC,CACjD,OAAO,EAAE,oCAAoC,GAC5C,sBAAsB,CA4ExB"}

package/lib/tool/classic-tool-execution-authority.js

@@ -0,0 +1,79 @@
+import { runWithCommMessage } from '../security/comm-message-context.js';
+import { readHttpSessionId, resolveApprovalPort } from '../session/resolve-approval-port.js';
+import { runWithDeferredTurnController } from '../tool-catalog/deferred-turn-controller.js';
+import { registerBuiltinPolicyExtractors } from './builtin-policy-extractors.js';
+import { runToolApprovalGate } from './tool-approval-gate.js';
+import { createToolRuntime } from './tool-runtime.js';
+/**
+ * Adapter for the remaining classic Tool definitions. AgentCore itself never
+ * reads Message, policy configuration, or approval transports through this seam.
+ */
+export function createClassicToolExecutionAuthority(options) {
+    registerBuiltinPolicyExtractors();
+    const runtime = createToolRuntime({
+        generation: options.generation,
+        signal: options.signal,
+        sessionId: options.sessionId,
+        commMessage: options.message,
+        journal: options.journal
+            ? { append: (event) => { options.journal.append(event); } }
+            : undefined,
+        config: options.host.config,
+        hostPlugin: options.plugin,
+    });
+    return Object.freeze({
+        async execute(tool, input, toolUseId) {
+            const approvalDenied = options.rejectApproval && tool.approval && tool.approval !== 'never'
+                ? 'Error: unattended execution rejects tools that require approval'
+                : await runToolApprovalGate({
+                    toolName: tool.name,
+                    args: { ...input },
+                    sessionId: options.sessionId,
+                    commMessage: options.message,
+                    policy: tool.approval,
+                    plugin: options.plugin,
+                    bus: options.host.orchestrator?.agentStreamBus,
+                    port: resolveApprovalPort(options.message, options.host.httpApprovalAdapter, options.host.approvalPort),
+                    publishCtx: {
+                        sessionId: options.sessionId,
+                        httpSessionId: readHttpSessionId(options.message),
+                    },
+                    onceStore: options.host.orchestrator?.approvalOnce,
+                    journal: options.journal,
+                    signal: options.signal,
+                });
+            if (approvalDenied)
+                return Object.freeze({ status: 'denied', reason: approvalDenied });
+            try {
+                const execute = () => runWithCommMessage(options.message, () => runtime.execute(tool, { ...input }, { toolCallId: toolUseId }));
+                const outcome = options.deferredController
+                    ? await runWithDeferredTurnController(options.deferredController, execute)
+                    : await execute();
+                if (outcome.denied) {
+                    return Object.freeze({ status: 'denied', reason: String(outcome.output) });
+                }
+                return Object.freeze({
+                    status: 'completed',
+                    output: outcome.output,
+                    durationMs: outcome.durationMs,
+                });
+            }
+            catch (error) {
+                if (options.signal.aborted) {
+                    return Object.freeze({
+                        status: 'cancelled',
+                        reason: options.signal.reason instanceof Error
+                            ? options.signal.reason.message
+                            : String(options.signal.reason ?? 'Tool execution cancelled'),
+                    });
+                }
+                return Object.freeze({
+                    status: 'failed',
+                    error: error instanceof Error ? error.message : String(error),
+                    retryable: false,
+                });
+            }
+        },
+    });
+}
+//# sourceMappingURL=classic-tool-execution-authority.js.map

package/lib/tool/classic-tool-execution-authority.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"classic-tool-execution-authority.js","sourceRoot":"","sources":["../../src/tool/classic-tool-execution-authority.ts"],"names":[],"mappings":"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"}

package/lib/tool/contracts.d.ts

@@ -1,7 +1,7 @@
 /**
  * Tool System — 模块契约（与实现同步）。
  *
- * 实现：`ToolSystem.collectForTurn` 同步收集 `AgentTool[]`（`ToolSource.collectTools` 亦为同步）；
+ * 实现：`ToolSystem.collectForTurn` 异步收集 `AgentTool[]`（`ToolSource.collectTools` 返回 `Promise<AgentTool[]>` 或同步 `AgentTool[]`）；
  * 每 turn 通过 `createDefaultToolSources` 独立 Source 列表，避免并发 mutate。
  */
 import type { AgentTool } from '@zhin.js/ai';
@@ -29,7 +29,7 @@ export interface FilterContext {
 export interface ToolSource {
     name: string;
     priority: number;
-    collectTools(context: TurnContext): AgentTool[];
+    collectTools(context: TurnContext): AgentTool[] | Promise<AgentTool[]>;
 }
 export interface ToolFilter {
     name: string;

package/lib/tool/contracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/tool/contracts.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE1D;;;;;;;GAOG;AACH,MAAM,WAAW,mBAAoB,SAAQ,SAAS;IACpD,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,EAAE,CAAC;CACjD;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,aAAa,GAAG,SAAS,EAAE,CAAC;CACjE;AAED,MAAM,WAAW,gBAAgB;CAEhC"}
+{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/tool/contracts.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE1D;;;;;;;GAOG;AACH,MAAM,WAAW,mBAAoB,SAAQ,SAAS;IACpD,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,EAAE,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;CACxE;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,aAAa,GAAG,SAAS,EAAE,CAAC;CACjE;AAED,MAAM,WAAW,gBAAgB;CAEhC"}

package/lib/tool/contracts.js

@@ -1,7 +1,7 @@
 /**
  * Tool System — 模块契约（与实现同步）。
  *
- * 实现：`ToolSystem.collectForTurn` 同步收集 `AgentTool[]`（`ToolSource.collectTools` 亦为同步）；
+ * 实现：`ToolSystem.collectForTurn` 异步收集 `AgentTool[]`（`ToolSource.collectTools` 返回 `Promise<AgentTool[]>` 或同步 `AgentTool[]`）；
  * 每 turn 通过 `createDefaultToolSources` 独立 Source 列表，避免并发 mutate。
  */
 export {};

package/lib/tool/deferred-resolution.d.ts

@@ -1,14 +1,16 @@
 import { type AgentTool, type LlmTool, type DeferredToolSessionSnapshot } from '@zhin.js/ai';
-import type { ToolCatalogItem } from '../tool-catalog/types.js';
+import { type ToolCatalogItem } from '../tool-catalog/types.js';
 import type { ZhinAgentPrivate } from '../internal/agent-host.js';
+import { type DeferredTurnController } from '../tool-catalog/deferred-turn-controller.js';
 export interface ResolvedToolsForTurn {
     tools: AgentTool[];
     catalog: ToolCatalogItem[];
-    deferred: true;
+    deferred: boolean;
     deferredStats?: string;
     sessionSnapshot: DeferredToolSessionSnapshot;
+    controller?: DeferredTurnController;
 }
-export declare function resolveAgentToolsForTurn(agent: ZhinAgentPrivate, allTools: AgentTool[], sessionId: string): Promise<ResolvedToolsForTurn>;
+export declare function resolveAgentToolsForTurn(agent: ZhinAgentPrivate, allTools: AgentTool[], sessionId: string, platform?: string): Promise<ResolvedToolsForTurn>;
 export declare function persistDeferredToolSnapshot(agent: ZhinAgentPrivate, sessionId: string, snapshot: DeferredToolSessionSnapshot): Promise<void>;
 export declare function buildLlmToolsForProvider(sdk: string | undefined, catalog: ToolCatalogItem[], apiTools: AgentTool[], alwaysLoaded: Set<string>, sessionLoadedNames: string[]): LlmTool[];
 //# sourceMappingURL=deferred-resolution.d.ts.map

package/lib/tool/deferred-resolution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deferred-resolution.d.ts","sourceRoot":"","sources":["../../src/tool/deferred-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,OAAO,EAA4E,KAAK,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAQvK,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAEhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,QAAQ,EAAE,IAAI,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,2BAA2B,CAAC;CAC9C;AAWD,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,gBAAgB,EACvB,QAAQ,EAAE,SAAS,EAAE,EACrB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,oBAAoB,CAAC,CA2C/B;AAED,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,gBAAgB,EACvB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,2BAA2B,GACpC,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,OAAO,EAAE,eAAe,EAAE,EAC1B,QAAQ,EAAE,SAAS,EAAE,EACrB,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,EACzB,kBAAkB,EAAE,MAAM,EAAE,GAC3B,OAAO,EAAE,CAWX"}
+{"version":3,"file":"deferred-resolution.d.ts","sourceRoot":"","sources":["../../src/tool/deferred-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,OAAO,EAA4E,KAAK,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAQvK,OAAO,EAA4B,KAAK,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE1F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAgC,KAAK,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AAExH,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,QAAQ,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,2BAA2B,CAAC;IAC7C,UAAU,CAAC,EAAE,sBAAsB,CAAC;CACrC;AAWD,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,gBAAgB,EACvB,QAAQ,EAAE,SAAS,EAAE,EACrB,SAAS,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,oBAAoB,CAAC,CAkE/B;AAED,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,gBAAgB,EACvB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,2BAA2B,GACpC,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,OAAO,EAAE,eAAe,EAAE,EAC1B,QAAQ,EAAE,SAAS,EAAE,EACrB,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,EACzB,kBAAkB,EAAE,MAAM,EAAE,GAC3B,OAAO,EAAE,CAWX"}