@zhin.js/agent 1.1.2 → 1.1.5

package/lib/core/agent-core-run.d.ts

@@ -6,8 +6,13 @@ import type { AgentRunJournal } from '@zhin.js/ai/agent-stream';
 import { type ToolCallRecord } from './tool-calls-user-format.js';
 import type { HostPromptTurnHooks } from '../internal/host-types.js';
 import type { AgentCore } from './agent-core.js';
-import type { ZhinAgentPrivate, OnChunkCallback, Message } from '../internal/agent-host.js';
+import type { ZhinAgentPrivate, OnChunkCallback } from '../internal/agent-host.js';
+import type { ToolCatalogItem } from '../tool-catalog/types.js';
 import type { TurnEvent } from '../event/turn-event.js';
+import type { AgentPromptProfile } from '../prompt/turn-prompt-profile.js';
+import type { TurnContextView } from '../context/turn-envelope.js';
+import type { ToolExecutionAuthority } from './tool-execution-authority.js';
+import type { PluginAILoopHookRegistry } from '../plugin-loop-hooks.js';
 export interface AgentLoopTurnInput {
     host: ZhinAgentPrivate;
     core?: AgentCore;
@@ -15,10 +20,21 @@ export interface AgentLoopTurnInput {
     /** 本轮 user 消息 extra（入库 agent_messages.extra） */
     userMessageExtra?: import('@zhin.js/ai').AgentMessageExtra;
     rawContent: string;
-    commMessage: Message;
-    contextForTools: Message;
+    promptProfile: AgentPromptProfile;
+    turnContext: TurnContextView;
     allTools: AgentTool[];
     resolvedTools: AgentTool[];
+    toolExecution: ToolExecutionAuthority;
+    /** Canonical capability authority journals tool facts itself; classic loops map them. */
+    toolEventSource?: 'loop' | 'authority';
+    loopHooks?: PluginAILoopHookRegistry;
+    promptRuntime?: Readonly<{
+        bootstrapContext?: string;
+        activeSkillsContext?: string;
+        agentNickname?: string;
+        modelId?: string;
+        providerAlias?: string;
+    }>;
     personaEnhanced: string;
     modelId: string;
     modelCandidates: string[];
@@ -27,22 +43,29 @@ export interface AgentLoopTurnInput {
     promptHooks?: HostPromptTurnHooks;
     signal?: AbortSignal;
     deferredStats?: string;
+    /** Turn-owned deferred selection authority. Required for deferred loading. */
+    deferredController?: Readonly<{
+        loadedToolNames(): string[];
+    }>;
+    /** Catalog paired with deferredController for this exact Turn. */
+    toolCatalog?: readonly ToolCatalogItem[];
+    /** Direct tool sets bypass deferred catalog/snapshot/meta-tool machinery. */
+    toolLoading?: 'deferred' | 'direct';
+    /** Isolated executions neither load nor append conversational history. */
+    conversationPersistence?: 'session' | 'none';
     /** Tool name aliases: LLM-facing name → actual tool name */
     toolAliases?: Record<string, string>;
     /** Optional TurnEvent tap (processStream / diagnostics) */
     onTurnEvent?: (event: TurnEvent) => void;
     /** Ordered public event journal for this stream turn. */
     journal?: AgentRunJournal;
+    /**
+     * Snapshot generation for ToolRuntime validation.
+     * Plugin Runtime hosts pass SnapshotStore / AgentCapabilities.generation;
+     * legacy paths keep the `0` placeholder.
+     */
+    generation?: number;
 }
-/** Optional second argument for tools that support cooperative cancellation. */
-export interface AgentToolExecutionContext {
-    readonly signal?: AbortSignal;
-    readonly sessionId: string;
-    readonly toolCallId: string;
-    readonly toolName: string;
-}
-type CancellableToolExecute<TResult = unknown> = (args: Record<string, unknown>, legacyContext?: Message, executionContext?: AgentToolExecutionContext) => TResult | Promise<TResult>;
-export declare function executeCancellableTool<TResult>(execute: CancellableToolExecute<TResult>, args: Record<string, unknown>, legacyContext: Message, context: AgentToolExecutionContext): Promise<TResult>;
 export interface AgentLoopTurnResult {
     reply: string;
     usage: Usage;
@@ -51,12 +74,13 @@ export interface AgentLoopTurnResult {
     model: string;
     toolCalls: ToolCallRecord[];
     thinking?: string;
+    /** Conversation projection applied only after the durable terminal commits. */
+    projectConversation?: () => Promise<void>;
 }
 export interface AgentLoopVisionTurnInput {
     host: ZhinAgentPrivate;
     core?: AgentCore;
     sessionId: string;
-    commMessage: Message;
     visionSystemPrompt: string;
     userMessages: AgentMessage[];
     modelCandidates: string[];
@@ -71,5 +95,4 @@ export type AgentLoopVisionTurnResult = AgentLoopTurnResult & {
 export declare function runAgentLoopVisionTurnRun(input: AgentLoopVisionTurnInput): AsyncGenerator<TurnEvent, AgentLoopVisionTurnResult>;
 export declare function collectAgentLoopTurnRun<R>(gen: AsyncGenerator<TurnEvent, R>, onTurnEvent?: (event: TurnEvent) => void): Promise<R>;
 export declare function runAgentLoopTextTurnRun(input: AgentLoopTurnInput): AsyncGenerator<TurnEvent, AgentLoopTurnResult>;
-export {};
 //# sourceMappingURL=agent-core-run.d.ts.map

package/lib/core/agent-core-run.d.ts.map

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

package/lib/core/agent-core-run.js

@@ -3,28 +3,25 @@
  */
 import { aiOutboundJsonSchema, buildAiOutboundPromptHint } from '@zhin.js/core';
 import { formatCompact, truncatePreview, getLogger } from '@zhin.js/logger';
-import { agentLoop, agentContextFrom, assistantText, createUserMessage, getLlmTransportModel, getLoadedToolNamesFromSnapshot } from '@zhin.js/ai';
-import { runWithCommMessage } from '../security/comm-message-context.js';
+import { agentLoop, agentContextFrom, assistantText, createUserMessage, getLlmTransportModel, agentToolsToLlmTools } from '@zhin.js/ai';
+import { tokenUsageToLegacy } from './agent-run-shared.js';
 import { applyExecPolicyToTools } from '../security/exec-policy.js';
-import { createOwnerOrchestratedToolResultTransform } from '../orchestrator/owner-confirm-orchestration.js';
 import { resolveModelHarness } from '../config/model-harness-runtime.js';
 import { buildAgentPathSystemPrompt, buildChatPathSystemPrompt, describeAgentPathPromptSections } from '../prompt/assembly.js';
 import { logPromptComposition } from '../internal/prompt-trace.js';
 import { planToolRun } from '../tool/runtime.js';
 import { sanitizeAssistantReply, unwrapJsonStringLayers } from './text-sanitize.js';
 import { formatToolCallsForUser } from './tool-calls-user-format.js';
+import { shouldSuppressReplyForSpawnDelegation } from './spawn-delegation.js';
 import { transformContextWithCompaction } from '../memory/compaction-runtime.js';
 import { logPhase, tokenUsageLogFields, logAgentLoopIterationEnd } from '../internal/phase-trace.js';
 import { buildAgentPromptCacheStreamOptions } from '../config/index.js';
-import { bindDeferredToolRuntime } from '../builtin/deferred-tool-meta.js';
-import { persistDeferredToolSnapshot, buildLlmToolsForProvider } from '../tool/deferred-resolution.js';
-import { runToolApprovalGate } from '../tool/tool-approval-gate.js';
+import { buildLlmToolsForProvider } from '../tool/deferred-resolution.js';
 import { applyToolToModelOutput } from '../tool/tool-model-output.js';
-import { resolveSessionInteractionPort, readHttpSessionId } from '../session/resolve-session-interaction-port.js';
-import { resolveDeferredToolsConfig, resolveAlwaysLoadedSet } from '../tool-catalog/resolve-config.js';
+import { resolveAlwaysLoadedSet } from '../tool-catalog/resolve-config.js';
 import { resolveDeferredApiTools } from '../tool-catalog/tool-catalog.js';
-import { buildSkillLoadOptsForAgent } from '../skill/skill-load-opts.js';
 import { createTurnEventMapperState, mapAgentEventToTurnEvents, } from './turn-event-mapper.js';
+import { TurnJournalCommitError } from '../turn/journal-integrity.js';
 const logger = getLogger('ZhinAgent:AgentLoopTurn');
 /** 入库前解开模型误包的 JSON 字符串，避免下一轮历史继续叠转义。 */
 function normalizeAssistantMessageText(assistant) {
@@ -54,16 +51,6 @@ function logAssistantIterationFailure(assistant, modelId, sessionId) {
         error: truncatePreview(assistant.errorMessage, 500),
     }));
 }
-function resolveAIService(plugin) {
-    if (!plugin)
-        return undefined;
-    try {
-        return plugin.inject?.('ai');
-    }
-    catch {
-        return undefined;
-    }
-}
 /** ai.agent.outputSchema 配置 → 传给 LLM 的 JSON Schema（true/'segments' 用 zhin 出站契约）。 */
 function resolveAgentOutputSchema(value) {
     if (!value)
@@ -72,13 +59,6 @@ function resolveAgentOutputSchema(value) {
         return aiOutboundJsonSchema;
     return value;
 }
-function tokenUsageToLegacy(usage) {
-    return {
-        prompt_tokens: usage.input,
-        completion_tokens: usage.output,
-        total_tokens: usage.totalTokens,
-    };
-}
 function toolResultToAgentMessage(toolCall, result, isError) {
     const text = typeof result === 'string'
         ? result
@@ -94,34 +74,6 @@ function toolResultToAgentMessage(toolCall, result, isError) {
         timestamp: Date.now(),
     };
 }
-export async function executeCancellableTool(execute, args, legacyContext, context) {
-    throwIfToolExecutionAborted(context.signal);
-    const execution = Promise.resolve().then(() => execute(args, legacyContext, context));
-    const result = await raceToolExecutionAbort(execution, context.signal);
-    throwIfToolExecutionAborted(context.signal);
-    return result;
-}
-function throwIfToolExecutionAborted(signal) {
-    if (!signal?.aborted)
-        return;
-    throw signal.reason instanceof Error ? signal.reason : new Error('Tool execution cancelled');
-}
-function raceToolExecutionAbort(execution, signal) {
-    if (!signal)
-        return execution;
-    throwIfToolExecutionAborted(signal);
-    return new Promise((resolve, reject) => {
-        const onAbort = () => reject(signal.reason instanceof Error ? signal.reason : new Error('Tool execution cancelled'));
-        signal.addEventListener('abort', onAbort, { once: true });
-        void execution.then((result) => {
-            signal.removeEventListener('abort', onAbort);
-            resolve(result);
-        }, (error) => {
-            signal.removeEventListener('abort', onAbort);
-            reject(error);
-        });
-    });
-}
 function turnEndFromLegacyUsage(reply, usage) {
     return {
         type: 'turn_end',
@@ -134,7 +86,7 @@ function turnEndFromLegacyUsage(reply, usage) {
     };
 }
 async function* runAgentLoopVisionTurnOnceRun(input) {
-    const { host, sessionId, commMessage, visionSystemPrompt, modelId, onChunk, promptHooks, signal } = input;
+    const { host, sessionId, visionSystemPrompt, modelId, onChunk, promptHooks, signal } = input;
     const repo = host.contextRepository;
     const providerAlias = host.getTurnProvider().name;
     const llmModel = getLlmTransportModel(providerAlias, modelId);
@@ -272,31 +224,37 @@ export async function collectAgentLoopTurnRun(gen, onTurnEvent) {
     }
 }
 export async function* runAgentLoopTextTurnRun(input) {
-    const { host, sessionId, userMessageExtra, commMessage, contextForTools, allTools, resolvedTools, personaEnhanced, modelId, onChunk, promptHooks, signal, } = input;
+    const { host, sessionId, userMessageExtra, allTools, resolvedTools, personaEnhanced, modelId, onChunk, promptHooks, signal, } = input;
     const repo = host.contextRepository;
     const providerAlias = host.getTurnProvider().name;
     const llmModel = getLlmTransportModel(providerAlias, modelId);
-    const loaded = await repo.loadContext(sessionId);
+    const persistentConversation = input.conversationPersistence !== 'none';
+    const loaded = persistentConversation
+        ? await repo.loadContext(sessionId)
+        : { messages: [] };
     const promptMessages = input.initialMessages?.length
         ? input.initialMessages
         : [createUserMessage(input.rawContent)];
-    const toolRun = allTools.length > 0
+    const directTools = input.toolLoading === 'direct';
+    const hasTools = directTools ? resolvedTools.length > 0 : allTools.length > 0;
+    const toolRun = hasTools && !directTools
         ? await planToolRun(resolvedTools, host.config.preExecTimeout)
         : { mode: 'agent', preExecution: { tools: [], data: '' } };
     const preData = toolRun.preExecution.data;
-    const hasTools = allTools.length > 0;
     const outputSchema = resolveAgentOutputSchema(host.config.outputSchema);
     let systemPrompt = hasTools
         ? await buildAgentPathSystemPrompt(host, {
+            profile: input.promptProfile,
+            turn: input.turnContext,
             content: input.rawContent,
-            commMessage: contextForTools,
             sessionId,
             personaEnhanced,
             preData,
             deferredStats: input.deferredStats,
             modelSdk: llmModel.sdk,
+            runtime: input.promptRuntime,
         })
-        : buildChatPathSystemPrompt(host, personaEnhanced, contextForTools);
+        : buildChatPathSystemPrompt(host, personaEnhanced, input.promptProfile);
     if (outputSchema) {
         systemPrompt = `${systemPrompt}\n\n${buildAiOutboundPromptHint({})}`;
     }
@@ -305,42 +263,29 @@ export async function* runAgentLoopTextTurnRun(input) {
             approvalMode: host.config.execApprovalMode,
         })
         : [];
-    let sessionSnapshot = host.lastDeferredSessionSnapshot ?? { loadedTools: {}, loadedSkills: [] };
-    const catalog = host.lastDeferredCatalog ?? [];
-    const deferredCfg = resolveDeferredToolsConfig(host.config);
-    if (hasTools && catalog.length > 0) {
-        const skillLoadOpts = buildSkillLoadOptsForAgent(host);
-        bindDeferredToolRuntime(contextForTools, {
-            sessionId,
-            catalog,
-            skillRegistry: host.skillRegistry,
-            snapshot: sessionSnapshot,
-            maxLoadedPerSession: deferredCfg.maxLoadedPerSession,
-            discoverTopK: deferredCfg.discoverTopK,
-            persistSnapshot: async (snap) => {
-                sessionSnapshot = snap;
-                host.lastDeferredSessionSnapshot = snap;
-                await persistDeferredToolSnapshot(host, sessionId, snap);
-            },
-            onSkillLoaded: (_name, instructions) => {
-                host.appendActiveSkillsContext(instructions);
-            },
-            skillLoadOpts,
-        });
+    const deferredController = directTools ? undefined : input.deferredController;
+    const catalog = directTools ? [] : [...(input.toolCatalog ?? [])];
+    if (!directTools && hasTools && (!deferredController || catalog.length === 0)) {
+        throw new Error('Deferred tool loading requires a turn-owned controller and catalog');
     }
     const refreshResolvedTools = () => {
+        if (directTools)
+            return resolvedTools;
         const alwaysLoaded = resolveAlwaysLoadedSet(host.config);
-        const loaded = getLoadedToolNamesFromSnapshot(sessionSnapshot);
+        const loaded = deferredController.loadedToolNames();
         return resolveDeferredApiTools(catalog, alwaysLoaded, loaded);
     };
     if (hasTools) {
-        const sections = await describeAgentPathPromptSections(host, {
-            commMessage: contextForTools,
-            content: input.rawContent,
-            sessionId,
-            deferredStats: input.deferredStats,
-            modelSdk: llmModel.sdk,
-        });
+        const sections = input.promptProfile.kind === 'interactive'
+            ? await describeAgentPathPromptSections(host, {
+                turn: input.turnContext,
+                content: input.rawContent,
+                sessionId,
+                deferredStats: input.deferredStats,
+                modelSdk: llmModel.sdk,
+                runtime: input.promptRuntime,
+            })
+            : [];
         logPromptComposition({
             config: host.promptTraceConfig,
             sessionId,
@@ -367,37 +312,20 @@ export async function* runAgentLoopTextTurnRun(input) {
     const maxIterations = hasTools
         ? (harness.maxIterations ?? host.config.maxIterations)
         : 1;
-    // Plugin Runtime Agent Host has no Feature root Plugin — skip owner hard-orch.
-    const orchestrationPlugin = host.emitter.getHostPlugin() ?? undefined;
-    const disableHardOrchestration = !orchestrationPlugin;
-    if (disableHardOrchestration) {
-        logger.debug(formatCompact({
-            note: 'no_host_plugin',
-            hint: 'runtime_agent_host; owner hard-orchestration disabled',
-        }));
-    }
-    const transformToolResult = createOwnerOrchestratedToolResultTransform({
-        commMessage: contextForTools,
-        disableHardOrchestration,
-        plugin: orchestrationPlugin,
-    });
     const legacyByName = new Map(agentTools.map((t) => [t.name, t]));
-    let llmTools = buildLlmToolsForProvider(llmModel.sdk, catalog, agentTools, resolveAlwaysLoadedSet(host.config), getLoadedToolNamesFromSnapshot(sessionSnapshot));
+    let llmTools = directTools
+        ? agentToolsToLlmTools(agentTools)
+        : buildLlmToolsForProvider(llmModel.sdk, catalog, agentTools, resolveAlwaysLoadedSet(host.config), deferredController?.loadedToolNames() ?? []);
     const toolCalls = [];
     let iterations = 0;
     let lastAssistantText = '';
     let lastUsage;
+    const conversationBatches = [];
     logPhase(host.phaseConfig, 'agent_loop.turn.start', sessionId, {
         model: modelId,
         maxIterations,
         toolCount: agentTools.length,
     });
-    if (hasTools) {
-        await host.emitter.dispatch('ai.agent.start', host.emitter.createPayload(sessionId, contextForTools, 'text', {
-            path: 'agent',
-            model: modelId,
-        }));
-    }
     const loopContext = agentContextFrom({
         systemPrompt,
         messages: loaded.messages,
@@ -410,12 +338,13 @@ export async function* runAgentLoopTextTurnRun(input) {
         legacyByName.clear();
         for (const t of nextAgentTools)
             legacyByName.set(t.name, t);
-        llmTools = buildLlmToolsForProvider(llmModel.sdk, catalog, nextAgentTools, resolveAlwaysLoadedSet(host.config), getLoadedToolNamesFromSnapshot(sessionSnapshot));
+        llmTools = directTools
+            ? agentToolsToLlmTools(nextAgentTools)
+            : buildLlmToolsForProvider(llmModel.sdk, catalog, nextAgentTools, resolveAlwaysLoadedSet(host.config), deferredController?.loadedToolNames() ?? []);
         return llmTools;
     };
     const contextWindow = llmModel.contextWindow ?? host.config.contextTokens;
-    const aiService = resolveAIService(orchestrationPlugin);
-    const loopHooks = aiService?.loopHooks;
+    const loopHooks = input.loopHooks;
     const loopConfig = {
         model: llmModel,
         maxIterations,
@@ -430,27 +359,25 @@ export async function* runAgentLoopTextTurnRun(input) {
             ...(outputSchema ? { outputSchema } : {}),
         },
         convertToLlm: (messages) => messages,
-        transformContext: async (messages, ctxSignal) => transformContextWithCompaction(messages, ctxSignal, {
+        transformContext: async (messages, ctxSignal) => persistentConversation ? transformContextWithCompaction(messages, ctxSignal, {
             host,
             sessionId,
-            commMessage: contextForTools,
             model: llmModel,
             compactionConfig: host.config.compaction,
             contextWindow,
             mode: 'text',
             loopHooks,
-        }),
-        onContextOverflow: async (messages, ctxSignal) => transformContextWithCompaction(messages, ctxSignal, {
+        }) : messages,
+        onContextOverflow: async (messages, ctxSignal) => persistentConversation ? transformContextWithCompaction(messages, ctxSignal, {
             host,
             sessionId,
-            commMessage: contextForTools,
             model: llmModel,
             compactionConfig: host.config.compaction,
             contextWindow,
             mode: 'text',
             force: true,
             loopHooks,
-        }),
+        }) : messages,
         getSteeringMessages: promptHooks?.getSteeringMessages,
         getFollowUpMessages: promptHooks?.getFollowUpMessages,
         executeTool: async (toolCall, _tools, toolSignal) => {
@@ -466,7 +393,7 @@ export async function* runAgentLoopTextTurnRun(input) {
                     toolInput: effectiveArgs,
                     toolSource: legacyByName.get(resolvedName)?.source,
                     sessionId,
-                    commMessage: contextForTools,
+                    turn: input.turnContext,
                 });
                 if (preDecision.decision === 'deny') {
                     const reason = preDecision.reason;
@@ -481,35 +408,14 @@ export async function* runAgentLoopTextTurnRun(input) {
             if (!legacy) {
                 return toolResultToAgentMessage(toolCall, `工具「${resolvedName}」执行失败：工具不存在或所属插件未启用。`, true);
             }
-            const httpSessionId = readHttpSessionId(contextForTools);
-            const approvalDenied = await runToolApprovalGate({
-                toolName: resolvedName,
-                args: effectiveArgs,
-                sessionId,
-                commMessage: contextForTools,
-                policy: legacy.approval,
-                plugin: orchestrationPlugin,
-                bus: host.orchestrator?.agentStreamBus,
-                port: resolveSessionInteractionPort(contextForTools, orchestrationPlugin, host.httpApprovalAdapter, host.approvalPort),
-                publishCtx: { sessionId, httpSessionId },
-                onceStore: host.orchestrator?.approvalOnce,
-                journal: input.journal,
-            });
-            if (approvalDenied) {
-                toolCalls.push({ tool: resolvedName, args: effectiveArgs, result: approvalDenied });
-                return toolResultToAgentMessage(toolCall, approvalDenied, true);
-            }
-            const t0 = performance.now();
-            const executionSignal = toolSignal ?? signal;
             try {
-                const raw = await runWithCommMessage(contextForTools, () => executeCancellableTool(legacy.execute, effectiveArgs, contextForTools, {
-                    signal: executionSignal,
-                    sessionId,
-                    toolCallId: toolCall.id,
-                    toolName: resolvedName,
-                }));
-                const durationMs = performance.now() - t0;
-                const rawText = await applyToolToModelOutput(legacy, raw, effectiveArgs);
+                const outcome = await input.toolExecution.execute(legacy, effectiveArgs, toolCall.id);
+                if (outcome.status !== 'completed') {
+                    const reason = outcome.status === 'failed' ? outcome.error : outcome.reason;
+                    toolCalls.push({ tool: resolvedName, args: effectiveArgs, result: reason });
+                    return toolResultToAgentMessage(toolCall, reason, true);
+                }
+                const rawText = await applyToolToModelOutput(legacy, outcome.output, effectiveArgs);
                 // PostToolUse interception
                 let resultText = rawText;
                 if (hookRegistry) {
@@ -518,9 +424,9 @@ export async function* runAgentLoopTextTurnRun(input) {
                         toolName: resolvedName,
                         toolInput: effectiveArgs,
                         toolOutput: rawText,
-                        durationMs,
+                        durationMs: outcome.durationMs,
                         sessionId,
-                        commMessage: contextForTools,
+                        turn: input.turnContext,
                     });
                     if (postDecision.decision === 'reject') {
                         toolCalls.push({ tool: resolvedName, args: effectiveArgs, result: postDecision.reason });
@@ -532,37 +438,23 @@ export async function* runAgentLoopTextTurnRun(input) {
                             : JSON.stringify(postDecision.modifiedOutput);
                     }
                 }
-                const transformed = await transformToolResult({
-                    toolName: resolvedName,
-                    toolCallId: toolCall.id,
-                    args: effectiveArgs,
-                    result: resultText,
-                });
-                const finalText = typeof transformed === 'string' ? transformed : String(transformed);
+                const finalText = resultText;
                 toolCalls.push({ tool: resolvedName, args: effectiveArgs, result: finalText });
-                host.emitter.emit('ai.tool.result', host.emitter.createPayload(sessionId, contextForTools, 'text', {
-                    path: 'agent',
-                    toolName: resolvedName,
-                    result: finalText,
-                }));
                 return toolResultToAgentMessage(toolCall, finalText, false);
             }
             catch (err) {
-                throwIfToolExecutionAborted(executionSignal);
+                if (err instanceof TurnJournalCommitError)
+                    throw err;
+                if (signal?.aborted) {
+                    throw signal.reason instanceof Error ? signal.reason : new Error('Tool execution cancelled');
+                }
                 const message = err instanceof Error ? err.message : String(err);
                 const failure = `工具「${resolvedName}」执行失败：${message}`;
                 toolCalls.push({ tool: resolvedName, args: effectiveArgs, result: failure });
                 return toolResultToAgentMessage(toolCall, failure, true);
             }
         },
-        beforeToolCall: async ({ toolCall }) => {
-            host.emitter.emit('ai.tool.call', host.emitter.createPayload(sessionId, contextForTools, 'text', {
-                path: 'agent',
-                toolName: toolCall.name,
-                args: toolCall.arguments,
-            }));
-            return loopHooks?.runBeforeToolCall({ toolCall, sessionId });
-        },
+        beforeToolCall: async ({ toolCall }) => loopHooks?.runBeforeToolCall({ toolCall, sessionId }),
         afterToolCall: async ({ toolCall, result }) => {
             await loopHooks?.runAfterToolCall({ toolCall, result, sessionId });
         },
@@ -583,6 +475,9 @@ export async function* runAgentLoopTextTurnRun(input) {
     };
     for await (const event of agentLoop(promptMessages, loopContext, loopConfig, signal)) {
         for (const te of mapAgentEventToTurnEvents(event, mapperState)) {
+            if (input.toolEventSource === 'authority'
+                && (te.type === 'tool_call' || te.type === 'tool_result'))
+                continue;
             emitTurnEvent(te);
             yield te;
         }
@@ -617,7 +512,9 @@ export async function* runAgentLoopTextTurnRun(input) {
             const userBatch = event.userMessages ?? promptMessages;
             const batch = [...userBatch, ...event.messages];
             const messageExtras = batch.map((msg, i) => (msg.role === 'user' && i < userBatch.length ? userMessageExtra : undefined));
-            await repo.appendMessages(sessionId, batch, { messageExtras });
+            if (persistentConversation) {
+                conversationBatches.push({ messages: batch, messageExtras });
+            }
         }
     }
     if (signal?.aborted) {
@@ -634,6 +531,7 @@ export async function* runAgentLoopTextTurnRun(input) {
             model: modelId,
             toolCalls,
             thinking,
+            projectConversation: () => appendConversationBatches(repo, sessionId, conversationBatches),
         };
     }
     const reply = sanitizeAssistantReply(lastAssistantText, {
@@ -643,20 +541,13 @@ export async function* runAgentLoopTextTurnRun(input) {
     if (spawnedSubagent) {
         await host.getActiveTurnTracker()?.waitForPendingSubagents();
     }
-    const delegatedOnly = spawnedSubagent
+    const delegatedOnly = shouldSuppressReplyForSpawnDelegation(toolCalls)
         && !toolCalls.some(tc => tc.tool === 'run_deferred_task')
         && !toolCalls.some(tc => tc.tool === 'generate_image'
             && tc.result
             && typeof tc.result === 'object'
             && typeof tc.result.image === 'string');
     const finalReply = delegatedOnly ? '' : reply;
-    if (hasTools) {
-        await host.emitter.dispatch('ai.agent.finish', host.emitter.createPayload(sessionId, contextForTools, 'text', {
-            path: 'agent',
-            model: modelId,
-            iterations,
-        }));
-    }
     logPhase(host.phaseConfig, 'agent_loop.turn.end', sessionId, {
         iterations,
         ...tokenUsageLogFields(lastUsage),
@@ -674,6 +565,12 @@ export async function* runAgentLoopTextTurnRun(input) {
         model: modelId,
         toolCalls,
         thinking,
+        projectConversation: () => appendConversationBatches(repo, sessionId, conversationBatches),
     };
 }
+async function appendConversationBatches(repo, sessionId, batches) {
+    for (const batch of batches) {
+        await repo.appendMessages(sessionId, batch.messages, { messageExtras: batch.messageExtras });
+    }
+}
 //# sourceMappingURL=agent-core-run.js.map