@zhin.js/agent 1.1.2 → 1.1.5

package/lib/tool/tool-runtime.js.map

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

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

@@ -19,9 +19,9 @@ export declare class ToolSystem {
     constructor(_config?: ToolSystemConfig);
     addSource(source: ToolSource): void;
     addFilter(filter: ToolFilter): void;
-    collectTools(context: CollectToolsContext, sources?: ToolSource[]): AgentTool[];
-    collectForTurn(input: CollectToolsForTurnInput): AgentTool[];
-    resolveForTurn(host: ZhinAgentPrivate, allTools: AgentTool[], sessionId: string): Promise<ResolvedToolsForTurn>;
+    collectTools(context: CollectToolsContext, sources?: ToolSource[]): Promise<AgentTool[]>;
+    collectForTurn(input: CollectToolsForTurnInput): Promise<AgentTool[]>;
+    resolveForTurn(host: ZhinAgentPrivate, allTools: AgentTool[], sessionId: string, platform?: string): Promise<ResolvedToolsForTurn>;
 }
 export interface ToolRunPlan {
     preExecTools: AgentTool[];
@@ -31,6 +31,10 @@ export interface ToolRunPlan {
 }
 export declare function planToolRun(tools: AgentTool[], timeoutMs: number): Promise<ToolRunPlan>;
 export declare function buildPreExecFastPathPrompt(persona: string, preData: string): string;
+/** Stamps the owning generation so ToolRuntime can reject retired-generation tools. */
+export declare function stampToolGeneration<T extends {
+    generation?: number;
+}>(tools: T[], generation: number): T[];
 /** 无 per-turn 可变 state；并发 collectForTurn 安全。 */
 export declare const defaultToolSystem: ToolSystem;
 //# sourceMappingURL=tool-system.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tool-system.d.ts","sourceRoot":"","sources":["../../src/tool/tool-system.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,KAAK,gBAAgB,EAAyB,MAAM,eAAe,CAAC;AAC7E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAIlE,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAC/E,OAAO,EAOL,KAAK,mBAAmB,EACzB,MAAM,cAAc,CAAC;AACtB,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,0BAA0B,CAAC;AAClC,YAAY,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxD,YAAY,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAErE,MAAM,WAAW,wBAAyB,SAAQ,mBAAmB;IACnE,IAAI,EAAE,gBAAgB,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,qDAAqD;AACrD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,mBAAmB,GAAG,UAAU,EAAE,CAQnF;AAED,wBAAgB,gBAAgB,CAAC,MAAM,GAAE,gBAAqB,GAAG,UAAU,CAE1E;AAED,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAoB;IAClD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;gBAEhC,OAAO,GAAE,gBAAqB;IAI1C,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAKnC,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAInC,YAAY,CAAC,OAAO,EAAE,mBAAmB,EAAE,OAAO,CAAC,EAAE,UAAU,EAAE,GAAG,SAAS,EAAE;IAe/E,cAAc,CAAC,KAAK,EAAE,wBAAwB,GAAG,SAAS,EAAE;IAetD,cAAc,CAClB,IAAI,EAAE,gBAAgB,EACtB,QAAQ,EAAE,SAAS,EAAE,EACrB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,oBAAoB,CAAC;CAGjC;AAED,MAAM,WAAW,WAAW;IAC1B,YAAY,EAAE,SAAS,EAAE,CAAC;IAC1B,YAAY,EAAE,gBAAgB,CAAC;IAC/B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,IAAI,EAAE,MAAM,GAAG,oBAAoB,GAAG,OAAO,CAAC;CAC/C;AAED,wBAAsB,WAAW,CAC/B,KAAK,EAAE,SAAS,EAAE,EAClB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,WAAW,CAAC,CAWtB;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAOnF;AAED,gDAAgD;AAChD,eAAO,MAAM,iBAAiB,YAAqB,CAAC"}
+{"version":3,"file":"tool-system.d.ts","sourceRoot":"","sources":["../../src/tool/tool-system.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,KAAK,gBAAgB,EAAyB,MAAM,eAAe,CAAC;AAC7E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAIlE,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAC/E,OAAO,EAOL,KAAK,mBAAmB,EACzB,MAAM,cAAc,CAAC;AACtB,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,0BAA0B,CAAC;AAClC,YAAY,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxD,YAAY,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAErE,MAAM,WAAW,wBAAyB,SAAQ,mBAAmB;IACnE,IAAI,EAAE,gBAAgB,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,qDAAqD;AACrD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,mBAAmB,GAAG,UAAU,EAAE,CAQnF;AAED,wBAAgB,gBAAgB,CAAC,MAAM,GAAE,gBAAqB,GAAG,UAAU,CAE1E;AAED,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAoB;IAClD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;gBAEhC,OAAO,GAAE,gBAAqB;IAI1C,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAKnC,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAI7B,YAAY,CAAC,OAAO,EAAE,mBAAmB,EAAE,OAAO,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAexF,cAAc,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAerE,cAAc,CAClB,IAAI,EAAE,gBAAgB,EACtB,QAAQ,EAAE,SAAS,EAAE,EACrB,SAAS,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,oBAAoB,CAAC;CAGjC;AAED,MAAM,WAAW,WAAW;IAC1B,YAAY,EAAE,SAAS,EAAE,CAAC;IAC1B,YAAY,EAAE,gBAAgB,CAAC;IAC/B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,IAAI,EAAE,MAAM,GAAG,oBAAoB,GAAG,OAAO,CAAC;CAC/C;AAED,wBAAsB,WAAW,CAC/B,KAAK,EAAE,SAAS,EAAE,EAClB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,WAAW,CAAC,CAWtB;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAOnF;AAED,uFAAuF;AACvF,wBAAgB,mBAAmB,CAAC,CAAC,SAAS;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,EACnE,KAAK,EAAE,CAAC,EAAE,EACV,UAAU,EAAE,MAAM,GACjB,CAAC,EAAE,CAGL;AAED,gDAAgD;AAChD,eAAO,MAAM,iBAAiB,YAAqB,CAAC"}

package/lib/tool/tool-system.js

@@ -29,23 +29,23 @@ export class ToolSystem {
     addFilter(filter) {
         this.filters.push(filter);
     }
-    collectTools(context, sources) {
+    async collectTools(context, sources) {
         const activeSources = sources ?? [
             ...createDefaultToolSources(context),
             ...this.customSources,
         ];
         let tools = [];
         for (const source of activeSources) {
-            tools.push(...source.collectTools(context));
+            tools.push(...(await source.collectTools(context)));
         }
         for (const filter of this.filters) {
             tools = filter.filter(tools, { message: context.message });
         }
         return tools;
     }
-    collectForTurn(input) {
+    async collectForTurn(input) {
         const { host, spawnableAgentNames, ...ctx } = input;
-        const tools = this.collectTools(ctx, createDefaultToolSources(ctx));
+        const tools = await this.collectTools(ctx, createDefaultToolSources(ctx));
         if (host.subagentSystem && spawnableAgentNames) {
             const permissionTask = host.activeBinding?.permission?.task;
             tools.push(createSpawnTaskTool(ctx.message, host.subagentSystem, {
@@ -55,8 +55,8 @@ export class ToolSystem {
         }
         return tools;
     }
-    async resolveForTurn(host, allTools, sessionId) {
-        return resolveAgentToolsForTurn(host, allTools, sessionId);
+    async resolveForTurn(host, allTools, sessionId, platform) {
+        return resolveAgentToolsForTurn(host, allTools, sessionId, platform);
     }
 }
 export async function planToolRun(tools, timeoutMs) {
@@ -79,6 +79,12 @@ ${preData}
 
 Answer the user's question based on the data above. Be clear and concise; use emoji when appropriate.`;
 }
+/** Stamps the owning generation so ToolRuntime can reject retired-generation tools. */
+export function stampToolGeneration(tools, generation) {
+    for (const tool of tools)
+        tool.generation = generation;
+    return tools;
+}
 /** 无 per-turn 可变 state；并发 collectForTurn 安全。 */
 export const defaultToolSystem = createToolSystem();
 //# sourceMappingURL=tool-system.js.map

package/lib/tool/tool-system.js.map

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

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

@@ -0,0 +1,29 @@
+import type { ToolCapability } from '../plugin-runtime/capability-ingress.js';
+import type { TurnIngress } from '../turn/turn-ingress.js';
+import type { ToolExecutionAuthority } from '../core/tool-execution-authority.js';
+export type TurnToolOutcome = Readonly<{
+    status: 'completed';
+    output: unknown;
+    durationMs: number;
+}> | Readonly<{
+    status: 'denied';
+    policy: string;
+    reason: string;
+}> | Readonly<{
+    status: 'cancelled';
+    reason: string;
+}> | Readonly<{
+    status: 'failed';
+    error: string;
+    retryable: boolean;
+}>;
+/** Sole execution authority for Tool capabilities within one fixed Turn lease. */
+export declare class TurnToolRuntime {
+    #private;
+    private readonly turn;
+    constructor(turn: TurnIngress, tools: readonly ToolCapability[]);
+    execute(name: string, input: Readonly<Record<string, unknown>>, toolUseId: string): Promise<TurnToolOutcome>;
+}
+/** Adapts canonical capability execution to the full AgentCore seam. */
+export declare function turnToolExecutionAuthority(runtime: TurnToolRuntime): ToolExecutionAuthority;
+//# sourceMappingURL=turn-tool-runtime.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"turn-tool-runtime.d.ts","sourceRoot":"","sources":["../../src/tool/turn-tool-runtime.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAE9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAIlF,MAAM,MAAM,eAAe,GACvB,QAAQ,CAAC;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,GACtE,QAAQ,CAAC;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAC9D,QAAQ,CAAC;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GACjD,QAAQ,CAAC;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAEtE,kFAAkF;AAClF,qBAAa,eAAe;;IAIxB,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,WAAW,EAClC,KAAK,EAAE,SAAS,cAAc,EAAE;IAK5B,OAAO,CACX,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACxC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,eAAe,CAAC;CA+D5B;AAED,wEAAwE;AACxE,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,eAAe,GAAG,sBAAsB,CAK3F"}

package/lib/tool/turn-tool-runtime.js

@@ -0,0 +1,89 @@
+import { runTurnToolPolicies } from '../security/policy-facade.js';
+import { toolInvocationFromTurn } from '../plugin-runtime/capability-tools.js';
+import { isApprovalPortAvailable } from '../session/approval-port.js';
+import { TurnJournalCommitError } from '../turn/journal-integrity.js';
+import { NetworkAccessDeniedError } from '../security/network-policy.js';
+/** Sole execution authority for Tool capabilities within one fixed Turn lease. */
+export class TurnToolRuntime {
+    turn;
+    #tools;
+    constructor(turn, tools) {
+        this.turn = turn;
+        this.#tools = new Map(tools.map((tool) => [tool.name, tool]));
+    }
+    async execute(name, input, toolUseId) {
+        const tool = this.#tools.get(name);
+        if (!tool)
+            return this.#deny(name, toolUseId, 'capability', `Unknown Tool capability: ${name}`);
+        await this.#append({ type: 'tool_call', toolName: name, args: { ...input }, toolUseId });
+        if (this.turn.signal.aborted)
+            return this.#cancel(name, toolUseId, 0);
+        const decision = await runTurnToolPolicies({ turn: this.turn, tool, input });
+        if (decision.status === 'denied') {
+            return this.#deny(name, toolUseId, decision.policy, decision.reason);
+        }
+        if (decision.status === 'approval_required') {
+            if (this.turn.policy.unattended || !isApprovalPortAvailable(this.turn.ports.approval)) {
+                return this.#deny(name, toolUseId, decision.policy, 'approval required but ApprovalPort unavailable');
+            }
+            const approved = await this.turn.ports.approval.requestApproval({
+                requestId: `${this.turn.identity.turnId}:${toolUseId}`,
+                toolName: name,
+                question: `工具「${name}」需要确认后执行。是否继续？`,
+                signal: this.turn.signal,
+            });
+            if (this.turn.signal.aborted)
+                return this.#cancel(name, toolUseId, 0);
+            if (!approved)
+                return this.#deny(name, toolUseId, decision.policy, 'tool execution denied by user');
+        }
+        const startedAt = Date.now();
+        try {
+            const output = await tool.execute(decision.input, toolInvocationFromTurn(this.turn));
+            const durationMs = Date.now() - startedAt;
+            if (this.turn.signal.aborted)
+                return this.#cancel(name, toolUseId, durationMs);
+            await this.#append({ type: 'tool_result', toolName: name, output, durationMs, toolUseId });
+            return Object.freeze({ status: 'completed', output, durationMs });
+        }
+        catch (error) {
+            if (error instanceof TurnJournalCommitError)
+                throw error;
+            const durationMs = Date.now() - startedAt;
+            if (this.turn.signal.aborted)
+                return this.#cancel(name, toolUseId, durationMs);
+            if (error instanceof NetworkAccessDeniedError) {
+                return this.#deny(name, toolUseId, error.policy, error.message);
+            }
+            const message = error instanceof Error ? error.message : String(error);
+            await this.#append({ type: 'tool_failed', toolName: name, toolUseId, error: message, durationMs });
+            return Object.freeze({ status: 'failed', error: message, retryable: false });
+        }
+    }
+    async #deny(toolName, toolUseId, policy, reason) {
+        await this.#append({ type: 'tool_denied', toolName, toolUseId, policy, reason });
+        return Object.freeze({ status: 'denied', policy, reason });
+    }
+    async #cancel(toolName, toolUseId, durationMs) {
+        const reason = this.turn.signal.reason instanceof Error
+            ? this.turn.signal.reason.message
+            : String(this.turn.signal.reason ?? 'turn cancelled');
+        await this.#append({ type: 'tool_cancelled', toolName, toolUseId, reason, durationMs });
+        return Object.freeze({ status: 'cancelled', reason });
+    }
+    async #append(event) {
+        try {
+            await this.turn.ports.journal.append(event);
+        }
+        catch (error) {
+            throw new TurnJournalCommitError(error);
+        }
+    }
+}
+/** Adapts canonical capability execution to the full AgentCore seam. */
+export function turnToolExecutionAuthority(runtime) {
+    return Object.freeze({
+        execute: (tool, input, toolUseId) => runtime.execute(tool.name, input, toolUseId),
+    });
+}
+//# sourceMappingURL=turn-tool-runtime.js.map

package/lib/tool/turn-tool-runtime.js.map

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

package/lib/tool-catalog/deferred-turn-controller.d.ts

@@ -0,0 +1,30 @@
+import { type AgentTool, type DeferredToolSessionSnapshot } from '@zhin.js/ai';
+import type { Tool, ToolResult } from '@zhin.js/core';
+import type { SkillRegistry } from '../orchestrator/skill-registry.js';
+import { type LoadSkillToolOptions } from '../builtin/load-skill-tool.js';
+import type { ToolCatalogItem } from './types.js';
+export declare const TOOLS_MUTATED_MARKER = "__zhin_tools_mutated__";
+export interface DeferredTurnControllerOptions {
+    readonly sessionId: string;
+    readonly platform?: string;
+    readonly catalog: readonly ToolCatalogItem[];
+    readonly skillRegistry: SkillRegistry | null;
+    readonly snapshot: DeferredToolSessionSnapshot;
+    readonly maxLoadedPerSession: number;
+    readonly discoverTopK: number;
+    readonly persistSnapshot: (snapshot: DeferredToolSessionSnapshot) => Promise<void>;
+    readonly onSkillLoaded?: (name: string, instructions: string, toolNames: string[]) => void;
+    readonly skillLoadOpts: LoadSkillToolOptions;
+}
+export interface DeferredTurnController {
+    readonly tools: readonly Tool[];
+    snapshot(): DeferredToolSessionSnapshot;
+    loadedToolNames(): string[];
+    tool(name: string): AgentTool | undefined;
+    fork(): DeferredTurnController;
+}
+export declare function runWithDeferredTurnController<TResult>(controller: DeferredTurnController, operation: () => Promise<TResult>): Promise<TResult>;
+export declare function getActiveDeferredTurnController(): DeferredTurnController | undefined;
+export declare function createDeferredTurnController(options: DeferredTurnControllerOptions): DeferredTurnController;
+export declare function isToolsMutatedResult(result: ToolResult): boolean;
+//# sourceMappingURL=deferred-turn-controller.d.ts.map

package/lib/tool-catalog/deferred-turn-controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deferred-turn-controller.d.ts","sourceRoot":"","sources":["../../src/tool-catalog/deferred-turn-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,SAAS,EACd,KAAK,2BAA2B,EACjC,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAyB,KAAK,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAEjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD,eAAO,MAAM,oBAAoB,2BAA2B,CAAC;AAE7D,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,SAAS,eAAe,EAAE,CAAC;IAC7C,QAAQ,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IAC7C,QAAQ,CAAC,QAAQ,EAAE,2BAA2B,CAAC;IAC/C,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,eAAe,EAAE,CAAC,QAAQ,EAAE,2BAA2B,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACnF,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC3F,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC;CAC9C;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,KAAK,EAAE,SAAS,IAAI,EAAE,CAAC;IAChC,QAAQ,IAAI,2BAA2B,CAAC;IACxC,eAAe,IAAI,MAAM,EAAE,CAAC;IAC5B,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC;IAC1C,IAAI,IAAI,sBAAsB,CAAC;CAChC;AAID,wBAAgB,6BAA6B,CAAC,OAAO,EACnD,UAAU,EAAE,sBAAsB,EAClC,SAAS,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,GAChC,OAAO,CAAC,OAAO,CAAC,CAElB;AAED,wBAAgB,+BAA+B,IAAI,sBAAsB,GAAG,SAAS,CAEpF;AAuBD,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,6BAA6B,GACrC,sBAAsB,CA2FxB;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAGhE"}

package/lib/tool-catalog/deferred-turn-controller.js

@@ -0,0 +1,126 @@
+import { addSkillToSnapshot, getLoadedToolNamesFromSnapshot, touchToolInSnapshot, touchToolsInSnapshot, } from '@zhin.js/ai';
+import { AsyncLocalStorage } from 'node:async_hooks';
+import { readSkillInstructions } from '../builtin/load-skill-tool.js';
+import { catalogToolByName, discoverInCatalog } from './tool-catalog.js';
+export const TOOLS_MUTATED_MARKER = '__zhin_tools_mutated__';
+const activeController = new AsyncLocalStorage();
+export function runWithDeferredTurnController(controller, operation) {
+    return activeController.run(controller, operation);
+}
+export function getActiveDeferredTurnController() {
+    return activeController.getStore();
+}
+const MEMORY_HINT_KEYWORDS = ['memory', 'remember', 'recall', 'store', '记忆', '记住', '记下', '回忆', '备忘'];
+const MEMORY_FALLBACK_HINT = 'No matches. 语义记忆工具未启用（需配置 ai.memory.semantic.enabled: true）。'
+    + '可使用 write_file 将信息写入 data/memory/sessions/…/MEMORY.md 作为文件记忆替代。';
+function formatDiscoverResults(items, query) {
+    if (items.length === 0) {
+        if (query && MEMORY_HINT_KEYWORDS.some(keyword => query.toLowerCase().includes(keyword))) {
+            return MEMORY_FALLBACK_HINT;
+        }
+        return 'No matches.';
+    }
+    return items.map(item => `- [${item.kind}] ${item.name}: ${item.brief}`).join('\n');
+}
+function schemaSummary(item) {
+    const params = item.fullTool.parameters;
+    if (!params)
+        return `Loaded tool "${item.name}".`;
+    return `Loaded tool "${item.name}".\nParameters schema:\n${JSON.stringify(params, null, 2)}`;
+}
+export function createDeferredTurnController(options) {
+    let currentSnapshot = structuredClone(options.snapshot);
+    const catalog = [...options.catalog];
+    const byName = catalogToolByName(catalog);
+    const persist = async (next) => {
+        currentSnapshot = next;
+        await options.persistSnapshot(currentSnapshot);
+    };
+    const tools = [
+        {
+            name: 'discover',
+            description: 'Search deferred tools and skills by query. kind: tool|skill|all (default all). Empty query returns platform-matched skills.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    query: { type: 'string', description: 'Search query (user intent keywords)' },
+                    kind: { type: 'string', enum: ['tool', 'skill', 'all'], description: 'What to search (default all)' },
+                    mcp_server: { type: 'string', description: 'Filter tools by MCP server name' },
+                },
+            },
+            source: 'builtin:agent',
+            execute: async (args) => {
+                const input = args;
+                const kind = (typeof input.kind === 'string' ? input.kind : 'all');
+                const query = typeof input.query === 'string' ? input.query : '';
+                const mcpServer = typeof input.mcp_server === 'string' ? input.mcp_server : undefined;
+                return formatDiscoverResults(discoverInCatalog({
+                    query,
+                    kind,
+                    topK: options.discoverTopK,
+                    platform: options.platform,
+                    mcpServer,
+                    skillRegistry: options.skillRegistry,
+                    catalog,
+                }), query);
+            },
+        },
+        {
+            name: 'load_tool',
+            description: 'Load a deferred tool schema into this turn so it can be called.',
+            parameters: {
+                type: 'object',
+                properties: { name: { type: 'string', description: 'Tool name from discover results' } },
+                required: ['name'],
+            },
+            source: 'builtin:agent',
+            execute: async (args) => {
+                const name = String(args.name);
+                const item = byName.get(name);
+                if (!item)
+                    return `Tool "${name}" not found in catalog.`;
+                await persist(touchToolInSnapshot(currentSnapshot, name, options.maxLoadedPerSession));
+                return `${schemaSummary(item)}\n${TOOLS_MUTATED_MARKER}`;
+            },
+        },
+        {
+            name: 'load_skill',
+            description: 'Load full skill instructions and unlock associated tools for this turn.',
+            parameters: {
+                type: 'object',
+                properties: { name: { type: 'string', description: 'Skill name from discover results' } },
+                required: ['name'],
+            },
+            source: 'builtin:agent',
+            execute: async (args) => {
+                const name = String(args.name);
+                const instructions = await readSkillInstructions(name, options.skillLoadOpts);
+                if (instructions.startsWith(`Skill '${name}' not found`))
+                    return instructions;
+                let next = addSkillToSnapshot(currentSnapshot, name);
+                const toolNames = options.skillRegistry?.getByName(name)?.tools?.map(tool => tool.name) ?? [];
+                next = touchToolsInSnapshot(next, toolNames, options.maxLoadedPerSession);
+                await persist(next);
+                options.onSkillLoaded?.(name, instructions, toolNames);
+                const unlock = toolNames.length > 0 ? `\nUnlocked tools: ${toolNames.join(', ')}` : '';
+                return `${instructions}${unlock}\n${TOOLS_MUTATED_MARKER}`;
+            },
+        },
+    ];
+    return Object.freeze({
+        tools: Object.freeze(tools),
+        snapshot: () => currentSnapshot,
+        loadedToolNames: () => getLoadedToolNamesFromSnapshot(currentSnapshot),
+        tool: (name) => byName.get(name)?.fullTool,
+        fork: () => createDeferredTurnController({
+            ...options,
+            snapshot: currentSnapshot,
+            persistSnapshot: async () => undefined,
+        }),
+    });
+}
+export function isToolsMutatedResult(result) {
+    const text = typeof result === 'string' ? result : JSON.stringify(result);
+    return text.includes(TOOLS_MUTATED_MARKER);
+}
+//# sourceMappingURL=deferred-turn-controller.js.map

package/lib/tool-catalog/deferred-turn-controller.js.map

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

package/lib/turn/auto-continue.d.ts

@@ -1,18 +1,9 @@
 import type { Message } from '../orchestrator/types.js';
-import type { SubagentCompletePayload, SubagentResultSender } from '../subagent/index.js';
+import type { SubagentCompletePayload } from '../subagent/index.js';
 import type { DeferredWorkerResult } from '../deferred-worker-runner.js';
-import type { ZhinAgentPrivate } from '../internal/agent-host.js';
-import type { PromptController } from './prompt-controller.js';
-import type { ZhinAgentConfig } from '../config/index.js';
-export interface AutoContinueHost {
-    config: Required<ZhinAgentConfig>;
-    promptController: PromptController;
-    getDeferredAutoContinueDepth(sessionKey: string): number;
-    setDeferredAutoContinueDepth(sessionKey: string, depth: number): void;
-    resetDeferredAutoContinueDepth(sessionKey: string): void;
-    getDeferredResultSender(): SubagentResultSender | null;
-    runInTurnContext<T>(turnId: string, fn: () => Promise<T>): Promise<T>;
-}
-export declare function continueAfterDeferredWorker(host: AutoContinueHost, agent: ZhinAgentPrivate, commMessage: Message, taskId: string, goal: string, result: DeferredWorkerResult): Promise<void>;
-export declare function continueAfterSubagent(host: AutoContinueHost, agent: ZhinAgentPrivate, payload: SubagentCompletePayload): Promise<void>;
+import type { AgentTurnLifecycleHost, ZhinAgentPrivate } from '../internal/agent-host.js';
+/** auto-continue 实际读取的窄面（turn 生命周期域 + config/deferred）。 */
+export type AutoContinueHost = AgentTurnLifecycleHost & Pick<ZhinAgentPrivate, 'config' | 'deferred'>;
+export declare function continueAfterDeferredWorker(agent: ZhinAgentPrivate, commMessage: Message, taskId: string, goal: string, result: DeferredWorkerResult): Promise<void>;
+export declare function continueAfterSubagent(agent: ZhinAgentPrivate, payload: SubagentCompletePayload): Promise<void>;
 //# sourceMappingURL=auto-continue.d.ts.map

package/lib/turn/auto-continue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auto-continue.d.ts","sourceRoot":"","sources":["../../src/turn/auto-continue.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC1F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAQzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAI1D,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;IAClC,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,4BAA4B,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC;IACzD,4BAA4B,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACtE,8BAA8B,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACzD,uBAAuB,IAAI,oBAAoB,GAAG,IAAI,CAAC;IACvD,gBAAgB,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CACvE;AA2CD,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,gBAAgB,EACvB,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,gBAAgB,EACvB,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,IAAI,CAAC,CAoCf"}
+{"version":3,"file":"auto-continue.d.ts","sourceRoot":"","sources":["../../src/turn/auto-continue.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAWzE,OAAO,KAAK,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAI1F,2DAA2D;AAC3D,MAAM,MAAM,gBAAgB,GAAG,sBAAsB,GACjD,IAAI,CAAC,gBAAgB,EAAE,QAAQ,GAAG,UAAU,CAAC,CAAC;AA2DlD,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,gBAAgB,EACvB,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAyBf;AAED,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,gBAAgB,EACvB,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,IAAI,CAAC,CAoCf"}

package/lib/turn/auto-continue.js

@@ -3,74 +3,86 @@ import { formatCompact, getLogger } from '@zhin.js/logger';
 import { resolveAgentTurnSessionKey } from '../collaboration/resolve-agent-session-key.js';
 import { deliverDeferredAutoContinueReply } from './deferred-delivery.js';
 import { buildDeferredAutoContinueUserMessage, shouldDeferredAutoContinue } from './deferred-auto-continue.js';
-import { buildSubagentAutoContinueUserMessage } from './subagent-auto-continue.js';
+import { buildSubagentAutoContinueUserMessage, buildSubagentAutoContinueRetryMessage, } from './subagent-auto-continue.js';
 import { persistSubagentResultToContext } from './persist-subagent-context.js';
 import { persistDeferredWorkerResultToContext } from './persist-deferred-context.js';
 import { processTextTurn } from './turn-pipeline.js';
 const logger = getLogger('ZhinAgent');
-async function executeAutoContinueTurn(host, agent, commMessage, sessionKey, taskId, depth, kind, buildMessage) {
-    await host.promptController.waitForIdle();
-    host.setDeferredAutoContinueDepth(sessionKey, depth + 1);
-    logger.info(formatCompact({
-        [kind]: 'auto_continue',
-        task_id: taskId,
-        depth: depth + 1,
-    }));
-    const elements = await host.runInTurnContext(randomUUID(), () => processTextTurn(agent, '', commMessage, [], undefined, {
+async function runAutoContinueProcess(agent, commMessage, buildMessage) {
+    return agent.runInTurnContext(randomUUID(), () => processTextTurn(agent, '', commMessage, [], undefined, {
         prebuiltMessages: [buildMessage()],
         deferredAutoContinue: true,
     }));
-    const sender = host.getDeferredResultSender();
+}
+async function executeAutoContinueTurn(agent, commMessage, sessionKey, taskId, depth, kind, buildMessage, 
+/** 仅 subagent：首轮空回复时再催一次主 Agent 汇总（仍不直接转发子 Agent 原文） */
+buildRetryMessage) {
+    const host = agent;
+    await host.promptController.waitForIdle();
+    host.deferred.setAutoContinueDepth(sessionKey, depth + 1);
+    logger.info(formatCompact({ op: `${kind}_auto_continue`, task: taskId, depth: depth + 1 }));
+    let elements = await runAutoContinueProcess(agent, commMessage, buildMessage);
+    if (elements.length === 0 && buildRetryMessage) {
+        logger.warn(formatCompact({
+            op: `${kind}_auto_continue_retry`,
+            task: taskId,
+            reason: 'empty_outbound',
+        }));
+        elements = await runAutoContinueProcess(agent, commMessage, buildRetryMessage);
+    }
+    const sender = host.deferred.resultSender;
     if (sender && elements.length > 0) {
         await deliverDeferredAutoContinueReply(sender, commMessage, elements);
     }
-    logger.info(formatCompact({
-        [kind]: 'auto_continue_done',
-        task_id: taskId,
-        depth: depth + 1,
-        outbound: elements.length,
-    }));
+    else if (elements.length === 0) {
+        logger.warn(formatCompact({
+            op: `${kind}_auto_continue_empty`,
+            task: taskId,
+            reason: 'main_agent_no_user_reply',
+        }));
+    }
+    logger.info(formatCompact({ op: `${kind}_auto_continue_done`, task: taskId, outbound: elements.length }));
 }
-export async function continueAfterDeferredWorker(host, agent, commMessage, taskId, goal, result) {
+export async function continueAfterDeferredWorker(agent, commMessage, taskId, goal, result) {
+    const host = agent;
     const sessionKey = resolveAgentTurnSessionKey(commMessage);
-    const depth = host.getDeferredAutoContinueDepth(sessionKey);
+    const depth = host.deferred.getAutoContinueDepth(sessionKey);
     const persisted = await persistDeferredWorkerResultToContext(agent, commMessage, taskId, goal, result);
     if (!shouldDeferredAutoContinue(host.config, result, depth, persisted)) {
         logger.warn(formatCompact({
-            deferred: 'auto_continue_skipped',
-            task_id: taskId,
+            op: 'deferred_auto_continue_skip',
+            task: taskId,
             depth,
-            persisted,
             status: result.status,
         }));
         return;
     }
-    await executeAutoContinueTurn(host, agent, commMessage, sessionKey, taskId, depth, 'deferred', () => buildDeferredAutoContinueUserMessage(taskId, goal, result.status));
+    await executeAutoContinueTurn(agent, commMessage, sessionKey, taskId, depth, 'deferred', () => buildDeferredAutoContinueUserMessage(taskId, goal, result.status));
 }
-export async function continueAfterSubagent(host, agent, payload) {
+export async function continueAfterSubagent(agent, payload) {
+    const host = agent;
     if (host.config.subagentAutoContinue === false)
         return;
     const commMessage = payload.origin.message;
     const sessionKey = resolveAgentTurnSessionKey(commMessage);
-    const depth = host.getDeferredAutoContinueDepth(sessionKey);
+    const depth = host.deferred.getAutoContinueDepth(sessionKey);
     if (depth >= host.config.deferredAutoContinueMaxDepth) {
         logger.warn(formatCompact({
-            subagent: 'auto_continue_skipped',
-            task_id: payload.taskId,
+            op: 'subagent_auto_continue_skip',
+            task: payload.taskId,
             reason: 'max_depth',
-            depth,
         }));
         return;
     }
     const persisted = await persistSubagentResultToContext(agent, commMessage, payload);
     if (!persisted) {
         logger.warn(formatCompact({
-            subagent: 'auto_continue_skipped',
-            task_id: payload.taskId,
+            op: 'subagent_auto_continue_skip',
+            task: payload.taskId,
             reason: 'persist_failed',
         }));
         return;
     }
-    await executeAutoContinueTurn(host, agent, commMessage, sessionKey, payload.taskId, depth, 'subagent', () => buildSubagentAutoContinueUserMessage(payload.taskId, payload.label, payload.status));
+    await executeAutoContinueTurn(agent, commMessage, sessionKey, payload.taskId, depth, 'subagent', () => buildSubagentAutoContinueUserMessage(payload.taskId, payload.label, payload.status), () => buildSubagentAutoContinueRetryMessage(payload.taskId, payload.label, payload.status));
 }
 //# sourceMappingURL=auto-continue.js.map

package/lib/turn/auto-continue.js.map

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