@zhin.js/agent 1.1.3 → 1.1.6

package/lib/tool/deferred-resolution.js

@@ -2,7 +2,10 @@ import { getLoadedToolNamesFromSnapshot, addSkillToSnapshot, touchToolsInSnapsho
 import { resolveMcpConnectionFromToolName } from '@zhin.js/ai/mcp-qualified-name';
 import { agentToolToLlmTool } from '../tool-bridge.js';
 import { buildDeferredStats, buildToolCatalog, resolveDeferredApiTools, } from '../tool-catalog/tool-catalog.js';
+import { DEFERRED_META_TOOL_NAMES } from '../tool-catalog/types.js';
 import { resolveDeferredToolsConfig } from '../tool-catalog/resolve-config.js';
+import { createDeferredTurnController } from '../tool-catalog/deferred-turn-controller.js';
+import { buildSkillLoadOptsForAgent } from '../skill/skill-load-opts.js';
 function buildMcpServerMap(tools) {
     const map = new Map();
     for (const tool of tools) {
@@ -12,12 +15,13 @@ function buildMcpServerMap(tools) {
     }
     return map;
 }
-export async function resolveAgentToolsForTurn(agent, allTools, sessionId) {
+export async function resolveAgentToolsForTurn(agent, allTools, sessionId, platform) {
     const deferredCfg = resolveDeferredToolsConfig(agent.config);
     const alwaysLoaded = new Set(deferredCfg.alwaysLoadedTools);
-    const mcpServerByTool = buildMcpServerMap(allTools);
-    const catalog = buildToolCatalog({
-        tools: allTools,
+    const baseTools = allTools.filter(tool => !DEFERRED_META_TOOL_NAMES.has(tool.name));
+    const mcpServerByTool = buildMcpServerMap(baseTools);
+    const baseCatalog = buildToolCatalog({
+        tools: baseTools,
         mcpServerByTool,
         alwaysLoaded,
     });
@@ -36,16 +40,38 @@ export async function resolveAgentToolsForTurn(agent, allTools, sessionId) {
     if (touched) {
         await persistDeferredToolSnapshot(agent, sessionId, sessionSnapshot);
     }
+    const controller = createDeferredTurnController({
+        sessionId,
+        platform,
+        catalog: baseCatalog,
+        skillRegistry: agent.skillRegistry,
+        snapshot: sessionSnapshot,
+        maxLoadedPerSession: deferredCfg.maxLoadedPerSession,
+        discoverTopK: deferredCfg.discoverTopK,
+        persistSnapshot: async (snapshot) => {
+            agent.deferred.lastSessionSnapshot = snapshot;
+            await persistDeferredToolSnapshot(agent, sessionId, snapshot);
+        },
+        onSkillLoaded: (_name, instructions) => agent.appendActiveSkillsContext(instructions),
+        skillLoadOpts: buildSkillLoadOptsForAgent(agent),
+    });
+    const turnTools = [...baseTools, ...controller.tools];
+    const catalog = buildToolCatalog({
+        tools: turnTools,
+        mcpServerByTool,
+        alwaysLoaded,
+    });
     const sessionLoaded = getLoadedToolNamesFromSnapshot(sessionSnapshot);
     const apiTools = resolveDeferredApiTools(catalog, alwaysLoaded, sessionLoaded);
     const deferredStats = buildDeferredStats(catalog, apiTools);
-    agent.deferredCatalog = catalog.map(c => c.fullTool);
+    agent.deferred.catalog = catalog.map(c => c.fullTool);
     return {
         tools: apiTools,
         catalog,
         deferred: true,
         deferredStats,
         sessionSnapshot,
+        controller,
     };
 }
 export async function persistDeferredToolSnapshot(agent, sessionId, snapshot) {

package/lib/tool/deferred-resolution.js.map

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

package/lib/tool/index.d.ts

@@ -11,4 +11,6 @@ export { resolveAgentToolsForTurn, persistDeferredToolSnapshot, buildLlmToolsFor
 export { collectRuntimeTools } from './runtime.js';
 export { prepareTurnTools } from './prepare-turn-tools.js';
 export type { TurnToolsPrep } from './prepare-turn-tools.js';
+export { TurnToolRuntime, turnToolExecutionAuthority } from './turn-tool-runtime.js';
+export type { TurnToolOutcome } from './turn-tool-runtime.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tool/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,YAAY,EACV,UAAU,EACV,UAAU,EACV,gBAAgB,EAChB,WAAW,EACX,aAAa,EACb,mBAAmB,GACpB,MAAM,gBAAgB,CAAC;AAExB,YAAY,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACrE,YAAY,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AACtF,YAAY,EAAE,0BAA0B,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE5E,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EAChB,wBAAwB,EACxB,WAAW,EACX,0BAA0B,GAC3B,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,oBAAoB,EACpB,iBAAiB,EACjB,aAAa,EACb,gBAAgB,GACjB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,wBAAwB,EACxB,2BAA2B,EAC3B,wBAAwB,GACzB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,YAAY,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tool/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,YAAY,EACV,UAAU,EACV,UAAU,EACV,gBAAgB,EAChB,WAAW,EACX,aAAa,EACb,mBAAmB,GACpB,MAAM,gBAAgB,CAAC;AAExB,YAAY,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACrE,YAAY,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AACtF,YAAY,EAAE,0BAA0B,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE5E,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EAChB,wBAAwB,EACxB,WAAW,EACX,0BAA0B,GAC3B,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,oBAAoB,EACpB,iBAAiB,EACjB,aAAa,EACb,gBAAgB,GACjB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,wBAAwB,EACxB,2BAA2B,EAC3B,wBAAwB,GACzB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,YAAY,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACrF,YAAY,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC"}

package/lib/tool/index.js

@@ -6,4 +6,5 @@ export { ExternalToolSource, SkillToolSource, RegisteredToolSource, BuiltinToolS
 export { resolveAgentToolsForTurn, persistDeferredToolSnapshot, buildLlmToolsForProvider, } from './deferred-resolution.js';
 export { collectRuntimeTools } from './runtime.js';
 export { prepareTurnTools } from './prepare-turn-tools.js';
+export { TurnToolRuntime, turnToolExecutionAuthority } from './turn-tool-runtime.js';
 //# sourceMappingURL=index.js.map

package/lib/tool/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tool/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAeH,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EAChB,wBAAwB,EACxB,WAAW,EACX,0BAA0B,GAC3B,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,oBAAoB,EACpB,iBAAiB,EACjB,aAAa,EACb,gBAAgB,GACjB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,wBAAwB,EACxB,2BAA2B,EAC3B,wBAAwB,GACzB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tool/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAeH,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EAChB,wBAAwB,EACxB,WAAW,EACX,0BAA0B,GAC3B,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,oBAAoB,EACpB,iBAAiB,EACjB,aAAa,EACb,gBAAgB,GACjB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,wBAAwB,EACxB,2BAA2B,EAC3B,wBAAwB,GACzB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC"}

package/lib/tool/prepare-turn-tools.d.ts

@@ -2,6 +2,7 @@ import type { AgentTool } from '@zhin.js/ai';
 import type { Message } from '@zhin.js/core';
 import type { ZhinAgentPrivate, Tool } from '../internal/agent-host.js';
 import type { ResolvedToolsForTurn } from './deferred-resolution.js';
+import type { HostScheduleTurnContext } from '../internal/host-types.js';
 export interface TurnToolsPrep {
     contextForTools: Message;
     allTools: AgentTool[];
@@ -18,5 +19,6 @@ export declare function prepareTurnTools(host: ZhinAgentPrivate, opts: {
     sessionId: string;
     userId: string;
     mcpServerNames: string[];
+    scheduleContext?: HostScheduleTurnContext;
 }): Promise<TurnToolsPrep>;
 //# sourceMappingURL=prepare-turn-tools.d.ts.map

package/lib/tool/prepare-turn-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepare-turn-tools.d.ts","sourceRoot":"","sources":["../../src/tool/prepare-turn-tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAS7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAGxE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAOrE,MAAM,WAAW,aAAa;IAC5B,eAAe,EAAE,OAAO,CAAC;IACzB,QAAQ,EAAE,SAAS,EAAE,CAAC;IACtB,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,aAAa,EAAE,SAAS,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACzC,eAAe,EAAE,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;CAC1D;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,gBAAgB,EACtB,IAAI,EAAE;IACJ,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,IAAI,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,GACA,OAAO,CAAC,aAAa,CAAC,CA+ExB"}
+{"version":3,"file":"prepare-turn-tools.d.ts","sourceRoot":"","sources":["../../src/tool/prepare-turn-tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAQ7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAGxE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAKrE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AASzE,MAAM,WAAW,aAAa;IAC5B,eAAe,EAAE,OAAO,CAAC;IACzB,QAAQ,EAAE,SAAS,EAAE,CAAC;IACtB,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,aAAa,EAAE,SAAS,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACzC,eAAe,EAAE,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;CAC1D;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,gBAAgB,EACtB,IAAI,EAAE;IACJ,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,IAAI,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,eAAe,CAAC,EAAE,uBAAuB,CAAC;CAC3C,GACA,OAAO,CAAC,aAAa,CAAC,CAqIxB"}

package/lib/tool/prepare-turn-tools.js

@@ -1,10 +1,14 @@
 import { ensureMcpConnectionsForBinding, getMcpToolsForBinding, } from '../orchestrator/mcp-lifecycle.js';
-import { preloadScheduleToolsFromContext } from '../assistant/schedule-tool-runtime.js';
 import { rehydrateTurnActiveSkills } from '../assistant/schedule-skills.js';
-import { captureDeferredSnapshotBefore, cloneDeferredSnapshot } from '../internal/turn-context.js';
+import { captureDeferredSnapshotBefore, cloneDeferredSnapshot, setTurnActiveSkills } from '../internal/turn-context.js';
 import { attachWebSearchLocale } from './web-search-locale-attach.js';
 import { defaultToolSystem } from '../tool/tool-system.js';
 import { applyDynamicTurnOverrides } from '../dynamic/dynamic-registry.js';
+import { resolveScheduleTools } from '../schedule-domain/tool-resolver.js';
+import { secureScheduleTools } from '../schedule-domain/security-harness.js';
+import { loadScheduleSkillContext } from '../schedule-domain/prompt-assembler.js';
+import { getLogger } from '@zhin.js/logger';
+const scheduleLogger = getLogger('schedule-execution-domain');
 function listSpawnableAgentNames(host) {
     const presets = host.orchestrator?.subagents.getAllPresets().map((p) => p.name) ?? [];
     return [...new Set(presets.filter(Boolean))].sort();
@@ -37,7 +41,7 @@ export async function prepareTurnTools(host, opts) {
         ? getMcpToolsForBinding(host.orchestrator.mcps, opts.mcpServerNames)
         : [];
     const toolSystem = host.toolSystem ?? defaultToolSystem;
-    let allTools = toolSystem.collectForTurn({
+    let allTools = await toolSystem.collectForTurn({
         host,
         message: contextForTools,
         content: opts.content,
@@ -64,16 +68,64 @@ export async function prepareTurnTools(host, opts) {
     });
     allTools = dynamicApplied.tools;
     host.turnDynamicInstructions = dynamicApplied.additionalInstructions;
-    const resolved = await toolSystem.resolveForTurn(host, allTools, opts.sessionId);
+    const scheduleContext = opts.scheduleContext;
+    if (scheduleContext) {
+        const resolution = resolveScheduleTools({
+            prompt: opts.content,
+            executionPlan: scheduleContext.executionPlan,
+            tools: allTools,
+            skillRegistry: host.skillRegistry,
+        });
+        const resolvedTools = secureScheduleTools({
+            tools: resolution.tools,
+            message: contextForTools,
+            config: host.config,
+            context: scheduleContext.security,
+            onDenial: denial => scheduleContext.securityDenials.push(denial),
+        });
+        const catalog = [];
+        const sessionSnapshot = {
+            loadedTools: {},
+            loadedSkills: [],
+        };
+        scheduleContext.toolResolution = {
+            tools: resolvedTools.map(tool => tool.name),
+            skills: resolution.skills,
+            resolvedBy: resolution.resolvedBy,
+            missingTools: resolution.missingTools,
+            missingSkills: resolution.missingSkills,
+        };
+        for (const name of resolution.missingTools) {
+            scheduleLogger.warn(`Schedule execution plan tool not found: ${name}`);
+        }
+        for (const name of resolution.missingSkills) {
+            scheduleLogger.warn(`Schedule execution plan skill not found: ${name}`);
+        }
+        setTurnActiveSkills(await loadScheduleSkillContext(host, resolution.skills));
+        const resolved = {
+            tools: resolvedTools,
+            catalog,
+            deferred: false,
+            sessionSnapshot,
+        };
+        return {
+            contextForTools,
+            allTools,
+            resolved,
+            resolvedTools,
+            catalog,
+            sessionSnapshot,
+        };
+    }
+    const resolved = await toolSystem.resolveForTurn(host, allTools, opts.sessionId, String(contextForTools.$adapter));
     const { tools: resolvedTools, deferredStats, catalog, sessionSnapshot: initialSnapshot } = resolved;
-    let sessionSnapshot = initialSnapshot;
-    sessionSnapshot = await preloadScheduleToolsFromContext(host, opts.sessionId, catalog, sessionSnapshot);
+    const sessionSnapshot = initialSnapshot;
     captureDeferredSnapshotBefore(sessionSnapshot);
-    host.lastDeferredSnapshotBefore = cloneDeferredSnapshot(sessionSnapshot);
+    host.deferred.lastSnapshotBefore = cloneDeferredSnapshot(sessionSnapshot);
     await rehydrateTurnActiveSkills(host, opts.sessionId, host.getAlwaysSkillsBaseline());
-    host.lastDeferredSessionSnapshot = sessionSnapshot;
-    host.lastDeferredCatalog = catalog;
-    host.lastToolSearchDeferredStats = deferredStats;
+    host.deferred.lastSessionSnapshot = sessionSnapshot;
+    host.deferred.lastCatalog = catalog;
+    host.deferred.lastToolSearchStats = deferredStats;
     return {
         contextForTools,
         allTools,

package/lib/tool/prepare-turn-tools.js.map

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

package/lib/tool/runtime.d.ts

@@ -19,7 +19,7 @@ export interface CollectRuntimeToolsOptions {
     mcpTools?: AgentTool[];
     toolSystem?: ToolSystem;
 }
-export declare function collectRuntimeTools(options: CollectRuntimeToolsOptions): AgentTool[];
+export declare function collectRuntimeTools(options: CollectRuntimeToolsOptions): Promise<AgentTool[]>;
 export type { ToolRunPlan };
 export { planToolRun, buildPreExecFastPathPrompt } from './tool-system.js';
 //# sourceMappingURL=runtime.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/tool/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACzF,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAIL,KAAK,WAAW,EAChB,KAAK,UAAU,EAChB,MAAM,kBAAkB,CAAC;AAC1B,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,IAAI,EAAE,CAAC;IACtB,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;IAClC,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACrD,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,EAAE,iBAAiB,GAAG,uBAAuB,CAAC;IAC/D,YAAY,EAAE,gBAAgB,CAAC;IAC/B,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,SAAS,EAAE,CAgBpF;AAED,YAAY,EAAE,WAAW,EAAE,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/tool/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACzF,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAIL,KAAK,WAAW,EAChB,KAAK,UAAU,EAChB,MAAM,kBAAkB,CAAC;AAC1B,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,IAAI,EAAE,CAAC;IACtB,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;IAClC,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACrD,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,EAAE,iBAAiB,GAAG,uBAAuB,CAAC;IAC/D,YAAY,EAAE,gBAAgB,CAAC;IAC/B,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAgBnG;AAED,YAAY,EAAE,WAAW,EAAE,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC"}

package/lib/tool/runtime.js

@@ -1,5 +1,5 @@
 import { createDefaultToolSources, defaultToolSystem, } from './tool-system.js';
-export function collectRuntimeTools(options) {
+export async function collectRuntimeTools(options) {
     const toolSystem = options.toolSystem ?? defaultToolSystem;
     const ctx = {
         message: options.commMessage,

package/lib/tool/runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../src/tool/runtime.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,wBAAwB,EACxB,iBAAiB,GAIlB,MAAM,kBAAkB,CAAC;AAgB1B,MAAM,UAAU,mBAAmB,CAAC,OAAmC;IACrE,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,iBAAiB,CAAC;IAC3D,MAAM,GAAG,GAAwB;QAC/B,OAAO,EAAE,OAAO,CAAC,WAAW;QAC5B,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;QAC9C,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC3B,CAAC;IACF,OAAO,UAAU,CAAC,YAAY,CAAC,GAAG,EAAE,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;AACrE,CAAC;AAGD,OAAO,EAAE,WAAW,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../src/tool/runtime.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,wBAAwB,EACxB,iBAAiB,GAIlB,MAAM,kBAAkB,CAAC;AAgB1B,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAAmC;IAC3E,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,iBAAiB,CAAC;IAC3D,MAAM,GAAG,GAAwB;QAC/B,OAAO,EAAE,OAAO,CAAC,WAAW;QAC5B,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;QAC9C,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC3B,CAAC;IACF,OAAO,UAAU,CAAC,YAAY,CAAC,GAAG,EAAE,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;AACrE,CAAC;AAGD,OAAO,EAAE,WAAW,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC"}

package/lib/tool/sources.d.ts

@@ -1,4 +1,5 @@
 import { type AgentTool, type ImTranscriptStore, type MemoryImTranscriptStore } from '@zhin.js/ai';
+import type { PermissionHost } from '@zhin.js/permission';
 import type { Tool, Message } from '../orchestrator/types.js';
 import type { SkillRegistry } from '../orchestrator/skill-registry.js';
 import type { ZhinAgentConfig } from '../config/zhin-agent-config.js';
@@ -16,13 +17,15 @@ export interface CollectToolsContext {
     imTranscriptStore: ImTranscriptStore | MemoryImTranscriptStore;
     userProfiles: UserProfileStore;
     mcpTools?: AgentTool[];
+    /** PermissionHost（permit 声明的工具经其判定；缺省 fail-closed）。 */
+    permissionHost?: PermissionHost | null;
 }
 export declare class ExternalToolSource implements ToolSource {
     private readonly externalTools;
     name: string;
     priority: number;
     constructor(externalTools: Tool[]);
-    collectTools(context: CollectToolsContext): AgentTool[];
+    collectTools(context: CollectToolsContext): Promise<AgentTool[]>;
 }
 export declare class SkillToolSource implements ToolSource {
     private readonly skillRegistry;
@@ -41,7 +44,7 @@ export declare class RegisteredToolSource implements ToolSource {
      * `canAccessTool` for both registration paths; `hidden` tools stay
      * executable by name but are never offered to the model.
      */
-    collectTools(context: CollectToolsContext): AgentTool[];
+    collectTools(context: CollectToolsContext): Promise<AgentTool[]>;
 }
 export declare class BuiltinToolSource implements ToolSource {
     name: string;

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

@@ -1 +1 @@
-{"version":3,"file":"sources.d.ts","sourceRoot":"","sources":["../../src/tool/sources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,SAAS,EAAE,KAAK,iBAAiB,EAAE,KAAK,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEvH,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAMtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAI3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGlF,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;IAClC,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,aAAa,EAAE,IAAI,EAAE,CAAC;IACtB,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACrD,iBAAiB,EAAE,iBAAiB,GAAG,uBAAuB,CAAC;IAC/D,YAAY,EAAE,gBAAgB,CAAC;IAC/B,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC;CACxB;AAED,qBAAa,kBAAmB,YAAW,UAAU;IAIvC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAH1C,IAAI,SAAc;IAClB,QAAQ,SAAO;gBAEc,aAAa,EAAE,IAAI,EAAE;IAElD,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,SAAS,EAAE;CAQxD;AAED,qBAAa,eAAgB,YAAW,UAAU;IAIpC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAH1C,IAAI,SAAY;IAChB,QAAQ,SAAO;gBAEc,aAAa,EAAE,aAAa,GAAG,IAAI;IAEhE,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,SAAS,EAAE;CAMxD;AAED,qBAAa,oBAAqB,YAAW,UAAU;IAIzC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IAH/C,IAAI,SAAgB;IACpB,QAAQ,SAAO;gBAEc,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC;IAEjF;;;;OAIG;IACH,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,SAAS,EAAE;CASxD;AAED,qBAAa,iBAAkB,YAAW,UAAU;IAClD,IAAI,SAAa;IACjB,QAAQ,SAAQ;IAEhB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,SAAS,EAAE;CAexD;AAED,qBAAa,aAAc,YAAW,UAAU;IAC9C,IAAI,SAAS;IACb,QAAQ,SAAM;IAEd,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,SAAS,EAAE;CAcxD;AAED,qBAAa,oBAAqB,YAAW,UAAU;IACrD,IAAI,SAAgB;IAEpB,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE;CAGxC;AAED,qBAAa,gBAAiB,YAAW,UAAU;IACjD,IAAI,SAAY;IAEhB,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE;CAUxC"}
+{"version":3,"file":"sources.d.ts","sourceRoot":"","sources":["../../src/tool/sources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,SAAS,EAAE,KAAK,iBAAiB,EAAE,KAAK,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEvH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAMtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAI3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGlF,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;IAClC,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,aAAa,EAAE,IAAI,EAAE,CAAC;IACtB,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACrD,iBAAiB,EAAE,iBAAiB,GAAG,uBAAuB,CAAC;IAC/D,YAAY,EAAE,gBAAgB,CAAC;IAC/B,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC;IACvB,uDAAuD;IACvD,cAAc,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;CACxC;AAED,qBAAa,kBAAmB,YAAW,UAAU;IAIvC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAH1C,IAAI,SAAc;IAClB,QAAQ,SAAO;gBAEc,aAAa,EAAE,IAAI,EAAE;IAE5C,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;CAQvE;AAED,qBAAa,eAAgB,YAAW,UAAU;IAIpC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAH1C,IAAI,SAAY;IAChB,QAAQ,SAAO;gBAEc,aAAa,EAAE,aAAa,GAAG,IAAI;IAEhE,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,SAAS,EAAE;CAMxD;AAED,qBAAa,oBAAqB,YAAW,UAAU;IAIzC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IAH/C,IAAI,SAAgB;IACpB,QAAQ,SAAO;gBAEc,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC;IAEjF;;;;OAIG;IACG,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;CASvE;AAED,qBAAa,iBAAkB,YAAW,UAAU;IAClD,IAAI,SAAa;IACjB,QAAQ,SAAQ;IAEhB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,SAAS,EAAE;CAexD;AAED,qBAAa,aAAc,YAAW,UAAU;IAC9C,IAAI,SAAS;IACb,QAAQ,SAAM;IAEd,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,SAAS,EAAE;CAcxD;AAED,qBAAa,oBAAqB,YAAW,UAAU;IACrD,IAAI,SAAgB;IAEpB,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE;CAGxC;AAED,qBAAa,gBAAiB,YAAW,UAAU;IACjD,IAAI,SAAY;IAEhB,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE;CAUxC"}

package/lib/tool/sources.js

@@ -13,10 +13,10 @@ export class ExternalToolSource {
     constructor(externalTools) {
         this.externalTools = externalTools;
     }
-    collectTools(context) {
+    async collectTools(context) {
         const tools = [];
         for (const tool of this.externalTools) {
-            if (!canAccessTool(tool, context.message))
+            if (!(await canAccessTool(tool, context.message, context.permissionHost)))
                 continue;
             tools.push(sharedToolSelection.normalize(tool, context.message));
         }
@@ -48,12 +48,12 @@ export class RegisteredToolSource {
      * `canAccessTool` for both registration paths; `hidden` tools stay
      * executable by name but are never offered to the model.
      */
-    collectTools(context) {
+    async collectTools(context) {
         const tools = [];
         for (const tool of this.externalRegistered.values()) {
             if (tool.hidden)
                 continue;
-            if (!canAccessTool(tool, context.message))
+            if (!(await canAccessTool(tool, context.message, context.permissionHost)))
                 continue;
             tools.push(tool);
         }

package/lib/tool/sources.js.map

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

package/lib/tool/tool-approval-gate.d.ts

@@ -5,10 +5,9 @@ import type { Message, Plugin } from '@zhin.js/core';
 import { AgentRunJournal } from '@zhin.js/ai/agent-stream';
 import type { ToolApprovalPolicy } from '@zhin.js/ai/tool-policy';
 import type { AgentStreamBus, AgentStreamPublishContext } from '../event/agent-stream-bus.js';
-import { type ApprovalPort } from '../session/session-interaction-port.js';
+import { type ApprovalPort } from '../session/approval-port.js';
 import type { ToolApprovalOnceStore } from './tool-approval-once-store.js';
-/** Plugin Runtime's `on-risk` policy is conservatively approval-required in P2. */
-export type ToolApprovalGatePolicy = ToolApprovalPolicy | 'on-risk';
+export type ToolApprovalGatePolicy = ToolApprovalPolicy;
 export declare function resolveToolApprovalRequired(policy: ToolApprovalGatePolicy | undefined, input: {
     toolName: string;
     args: Record<string, unknown>;
@@ -27,6 +26,7 @@ export interface ToolApprovalGateOptions {
     publishCtx?: AgentStreamPublishContext;
     /** Stream-turn journal; request/result become ordered run events when present. */
     journal?: AgentRunJournal;
+    signal: AbortSignal;
 }
 /**
  * Returns denial message when approval is required but not granted; otherwise null.

package/lib/tool/tool-approval-gate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-approval-gate.d.ts","sourceRoot":"","sources":["../../src/tool/tool-approval-gate.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,eAAe,EAAiD,MAAM,0BAA0B,CAAC;AAC1G,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AAC9F,OAAO,EAA2B,KAAK,YAAY,EAAE,MAAM,wCAAwC,CAAC;AACpG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAE3E,mFAAmF;AACnF,MAAM,MAAM,sBAAsB,GAAG,kBAAkB,GAAG,SAAS,CAAC;AAEpE,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,sBAAsB,GAAG,SAAS,EAC1C,KAAK,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EAC7E,SAAS,CAAC,EAAE,qBAAqB,GAChC,OAAO,CAAC,OAAO,CAAC,CAQlB;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,sBAAsB,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAClC,UAAU,CAAC,EAAE,yBAAyB,CAAC;IACvC,kFAAkF;IAClF,OAAO,CAAC,EAAE,eAAe,CAAC;CAC3B;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAgExB"}
+{"version":3,"file":"tool-approval-gate.d.ts","sourceRoot":"","sources":["../../src/tool/tool-approval-gate.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,eAAe,EAAiD,MAAM,0BAA0B,CAAC;AAC1G,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AAC9F,OAAO,EAA2B,KAAK,YAAY,EAAE,MAAM,6BAA6B,CAAC;AACzF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAE3E,MAAM,MAAM,sBAAsB,GAAG,kBAAkB,CAAC;AAExD,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,sBAAsB,GAAG,SAAS,EAC1C,KAAK,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EAC7E,SAAS,CAAC,EAAE,qBAAqB,GAChC,OAAO,CAAC,OAAO,CAAC,CAQlB;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,sBAAsB,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAClC,UAAU,CAAC,EAAE,yBAAyB,CAAC;IACvC,kFAAkF;IAClF,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,MAAM,EAAE,WAAW,CAAC;CACrB;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAiExB"}

package/lib/tool/tool-approval-gate.js

@@ -1,5 +1,5 @@
 import { AgentStreamEventType } from '@zhin.js/ai/agent-stream';
-import { isApprovalPortAvailable } from '../session/session-interaction-port.js';
+import { isApprovalPortAvailable } from '../session/approval-port.js';
 export async function resolveToolApprovalRequired(policy, input, onceStore) {
     if (!policy || policy === 'never')
         return false;
@@ -49,6 +49,7 @@ export async function runToolApprovalGate(options) {
             requestId,
             toolName: options.toolName,
             question,
+            signal: options.signal,
         });
     }
     catch (err) {

package/lib/tool/tool-approval-gate.js.map

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

package/lib/tool/tool-runtime.d.ts

@@ -0,0 +1,52 @@
+/**
+ * ToolRuntime — 统一工具执行网关。
+ *
+ * 所有工具类型（builtin、Host、MCP、Skill、Agent）都必须通过 ToolRuntime 执行：
+ * 1. Generation 验证 — 工具的 generation 戳是否仍有效
+ * 2. 安全策略 — runToolPolicies() 统一执行（builtin 不再自行调用）
+ * 3. 取消感知 — 对齐 turn AbortSignal
+ * 4. Journal 事件 — 发射 tool_call / tool_result
+ * 5. 审计 — policyAudit 链路记录
+ *
+ * ToolRuntime 按 turn 创建（createToolRuntime），绑定 turn 级上下文。
+ */
+import type { AgentTool } from '@zhin.js/ai';
+import type { Message, Plugin } from '@zhin.js/core';
+import type { ZhinAgentConfig } from '../config/index.js';
+import { type ToolPolicyInput, type ToolPolicyResult, type ToolPolicyLayerRecord } from '../security/policy-facade.js';
+import type { ToolCallEvent, ToolResultEvent } from '../event/turn-event.js';
+export interface ToolRuntimeJournalPort {
+    append(event: ToolCallEvent | ToolResultEvent): void | Promise<void>;
+}
+export interface ToolRuntimeTurnContext {
+    readonly generation: number;
+    readonly signal: AbortSignal;
+    readonly sessionId: string;
+    readonly commMessage: Message;
+    readonly journal?: ToolRuntimeJournalPort;
+    readonly config?: Required<ZhinAgentConfig>;
+    readonly hostPlugin?: Plugin;
+    readonly isGenerationValid?: (gen: number) => boolean;
+}
+export interface ToolCallContext {
+    readonly toolCallId: string;
+}
+export interface ToolExecutionOutcome {
+    readonly output: unknown;
+    readonly durationMs: number;
+    readonly denied?: string;
+    readonly policyAudit: readonly ToolPolicyLayerRecord[];
+}
+/**
+ * 工具策略输入提取器 — 从工具名和参数派生 ToolPolicyInput。
+ * builtin 工具注册自己的提取器；非 builtin 使用默认提取器（仅 toolName）。
+ */
+export type ToolPolicyInputExtractor = (toolName: string, args: Record<string, unknown>, commMessage?: Message, hostPlugin?: Plugin) => ToolPolicyInput;
+export declare function registerPolicyExtractor(toolName: string, extractor: ToolPolicyInputExtractor): void;
+export interface ToolRuntime {
+    execute(tool: AgentTool, args: Record<string, unknown>, call: ToolCallContext): Promise<ToolExecutionOutcome>;
+    checkPolicy(input: ToolPolicyInput): ToolPolicyResult;
+    readonly generation: number;
+}
+export declare function createToolRuntime(ctx: ToolRuntimeTurnContext): ToolRuntime;
+//# sourceMappingURL=tool-runtime.d.ts.map

package/lib/tool/tool-runtime.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-runtime.d.ts","sourceRoot":"","sources":["../../src/tool/tool-runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAGL,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC3B,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE7E,MAAM,WAAW,sBAAsB;IACrC,MAAM,CAAC,KAAK,EAAE,aAAa,GAAG,eAAe,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtE;AAID,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,sBAAsB,CAAC;IAC1C,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;IAC5C,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;CACvD;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,SAAS,qBAAqB,EAAE,CAAC;CACxD;AAED;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG,CACrC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,WAAW,CAAC,EAAE,OAAO,EACrB,UAAU,CAAC,EAAE,MAAM,KAChB,eAAe,CAAC;AAMrB,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,wBAAwB,GAAG,IAAI,CAEnG;AAYD,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC9G,WAAW,CAAC,KAAK,EAAE,eAAe,GAAG,gBAAgB,CAAC;IACtD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,sBAAsB,GAAG,WAAW,CA2F1E"}

package/lib/tool/tool-runtime.js

@@ -0,0 +1,101 @@
+import { runToolPolicies, toolPolicyResultToMessage, } from '../security/policy-facade.js';
+// ── 默认策略提取器注册表 ─────────────────────────────────────────
+const extractorRegistry = new Map();
+export function registerPolicyExtractor(toolName, extractor) {
+    extractorRegistry.set(toolName, extractor);
+}
+function defaultExtractor(toolName, _args, commMessage) {
+    return { toolName, commMessage };
+}
+function resolveExtractor(toolName) {
+    return extractorRegistry.get(toolName) ?? defaultExtractor;
+}
+export function createToolRuntime(ctx) {
+    return {
+        generation: ctx.generation,
+        checkPolicy(input) {
+            return runToolPolicies(input);
+        },
+        async execute(tool, args, call) {
+            const t0 = performance.now();
+            const toolName = tool.name;
+            // 1. Generation 验证 — context-level and tool-level
+            if (ctx.isGenerationValid && !ctx.isGenerationValid(ctx.generation)) {
+                return {
+                    output: `Error: tool「${toolName}」rejected — generation ${ctx.generation} is no longer valid`,
+                    durationMs: performance.now() - t0,
+                    denied: 'generation_invalid',
+                    policyAudit: [],
+                };
+            }
+            if (tool.generation !== undefined && tool.generation !== ctx.generation) {
+                return {
+                    output: `Error: tool「${toolName}」rejected — tool generation ${tool.generation} does not match turn generation ${ctx.generation}`,
+                    durationMs: performance.now() - t0,
+                    denied: 'generation_mismatch',
+                    policyAudit: [],
+                };
+            }
+            // 2. 取消检查
+            if (ctx.signal.aborted) {
+                throw ctx.signal.reason instanceof Error
+                    ? ctx.signal.reason
+                    : new Error('Tool execution cancelled');
+            }
+            // 3. 安全策略
+            const extractor = resolveExtractor(toolName);
+            const policyInput = extractor(toolName, args, ctx.commMessage, ctx.hostPlugin);
+            if (ctx.config)
+                policyInput.config = ctx.config;
+            const policyResult = runToolPolicies(policyInput);
+            const policyAudit = policyResult.decisions;
+            const denied = toolPolicyResultToMessage(policyResult, toolName);
+            if (denied) {
+                await emitToolEvents(ctx, toolName, args, call.toolCallId, denied, performance.now() - t0);
+                return { output: denied, durationMs: performance.now() - t0, denied, policyAudit };
+            }
+            // 4. Journal: tool_call
+            await emitToolCall(ctx, toolName, args, call.toolCallId);
+            // 5. 执行（取消感知）
+            let output;
+            try {
+                output = await Promise.resolve().then(() => tool.execute(args, ctx.commMessage, {
+                    signal: ctx.signal,
+                    sessionId: ctx.sessionId,
+                    toolCallId: call.toolCallId,
+                    toolName,
+                }));
+            }
+            catch (err) {
+                if (ctx.signal.aborted) {
+                    throw ctx.signal.reason instanceof Error
+                        ? ctx.signal.reason
+                        : new Error('Tool execution cancelled');
+                }
+                throw err;
+            }
+            // 6. 取消后检查
+            if (ctx.signal.aborted) {
+                throw ctx.signal.reason instanceof Error
+                    ? ctx.signal.reason
+                    : new Error('Tool execution cancelled');
+            }
+            const durationMs = performance.now() - t0;
+            // 7. Journal: tool_result
+            await emitToolResult(ctx, toolName, output, call.toolCallId, durationMs);
+            return { output, durationMs, policyAudit };
+        },
+    };
+}
+// ── Journal 事件辅助 ─────────────────────────────────────────────────
+async function emitToolCall(ctx, toolName, args, toolUseId) {
+    await ctx.journal?.append({ type: 'tool_call', toolName, args, toolUseId });
+}
+async function emitToolResult(ctx, toolName, output, toolUseId, durationMs) {
+    await ctx.journal?.append({ type: 'tool_result', toolName, output, toolUseId, durationMs });
+}
+async function emitToolEvents(ctx, toolName, args, toolUseId, output, durationMs) {
+    await emitToolCall(ctx, toolName, args, toolUseId);
+    await emitToolResult(ctx, toolName, output, toolUseId, durationMs);
+}
+//# sourceMappingURL=tool-runtime.js.map