@downcity/agent 1.1.74 → 1.1.81

package/bin/executor/core-engine/CoreEngineRunner.js

@@ -0,0 +1,309 @@
+/**
+ * CoreEngineRunner：模型与 tool-loop 主循环执行器。
+ *
+ * 关键点（中文）
+ * - 只负责单次已装配输入的执行，不负责 run scope、外层重试与历史准备。
+ * - 把 step 循环、续写恢复、最终 assistant 汇总等细节从 Executor 中剥离。
+ * - 保持失败返回结构稳定，避免对外 Session 行为变化。
+ */
+import { streamText } from "ai";
+import { buildOpenAIResponsesProviderOptions } from "../messages/SessionMessageCodec.js";
+import { logAssistantMessageNow } from "../messages/SessionMessageLog.js";
+import { MAX_INCOMPLETE_RESPONSE_RECOVERIES, MAX_TEXT_ONLY_CONTINUATIONS, MAX_TOOL_LOOP_STEPS, buildIncompleteResponseRecoveryNudge, buildTextOnlyContinuationNudge, detectIncompleteResponse, detectTextOnlyContinuationReason, mergeAssistantUiMessages, summarizeStepForDebug, summarizeUiMessageForDebug, toInlinePreview, } from "../core-engine/CoreEngineSignals.js";
+import { evaluateCoreEngineLoopDecision, shouldContinueForTailMergedUserMessages, } from "../core-engine/CoreEngineLoopDecision.js";
+import { resolveEffectiveCoreEngineError, summarizeStreamError, } from "../core-engine/CoreEngineError.js";
+import { collectFinalAssistantMessageFromUiStream } from "../core-engine/CoreEngineUiStreamCollector.js";
+import { CoreEngineMessageState } from "../core-engine/CoreEngineMessageState.js";
+/**
+ * 生成 file part 去重 key。
+ */
+function build_file_part_key(part) {
+    return [
+        String(part.type || ""),
+        String(part.mediaType || ""),
+        String(part.filename || ""),
+        String(part.url || ""),
+    ].join("\n");
+}
+/**
+ * 把 tool/plugin 运行期产生的 file parts 并入最终 assistant UIMessage。
+ */
+function mergePendingAssistantFileParts(message, parts) {
+    if (!Array.isArray(parts) || parts.length === 0)
+        return message;
+    const current_parts = Array.isArray(message.parts) ? message.parts : [];
+    const seen = new Set();
+    for (const part of current_parts) {
+        const candidate = part;
+        if (candidate?.type !== "file")
+            continue;
+        seen.add(build_file_part_key(candidate));
+    }
+    const next_file_parts = parts.filter((part) => {
+        const key = build_file_part_key(part);
+        if (seen.has(key))
+            return false;
+        seen.add(key);
+        return true;
+    });
+    if (next_file_parts.length === 0)
+        return message;
+    return {
+        ...message,
+        parts: [...current_parts, ...next_file_parts],
+    };
+}
+/**
+ * 模型与 tool-loop 主循环执行器。
+ */
+export class CoreEngineRunner {
+    history_store;
+    context_composer;
+    logger;
+    should_compact_on_error;
+    constructor(options) {
+        this.history_store = options.history_store;
+        this.context_composer = options.context_composer;
+        this.logger = options.logger;
+        this.should_compact_on_error = options.should_compact_on_error;
+    }
+    /**
+     * 执行一次已装配完成的模型/tool-loop 运行。
+     */
+    async run(input) {
+        const start_time = Date.now();
+        const session_id = String(this.history_store.sessionId || "").trim();
+        const system = Array.isArray(input.execute_input.system)
+            ? input.execute_input.system
+            : [];
+        const tools = input.execute_input.tools;
+        let last_observed_stream_error = undefined;
+        try {
+            const message_state = await CoreEngineMessageState.create({
+                messages: input.execute_input.messages,
+                tools,
+            });
+            const append_merged_user_messages = (messages) => message_state.appendMergedUserMessages(messages);
+            const context_composer_on_step_finish = this.context_composer.createOnStepFinishHandler(input.run_context);
+            let step_count = 0;
+            let total_tool_call_count = 0;
+            let total_tool_result_count = 0;
+            const on_step_finish = async (step_result) => {
+                step_count += 1;
+                const summary = summarizeStepForDebug(step_result);
+                total_tool_call_count +=
+                    typeof summary.toolCallCount === "number" ? summary.toolCallCount : 0;
+                total_tool_result_count +=
+                    typeof summary.toolResultCount === "number"
+                        ? summary.toolResultCount
+                        : 0;
+                await this.logger.log("info", "[agent] step.finish", {
+                    sessionId: session_id,
+                    stepIndex: step_count,
+                    ...summary,
+                });
+                await context_composer_on_step_finish(step_result);
+            };
+            const prepare_step = this.context_composer.createPrepareStepHandler({
+                system,
+                appendMergedUserMessages: append_merged_user_messages,
+                runContext: input.run_context,
+            });
+            let final_assistant_ui_message = null;
+            let text_only_continuation_count = 0;
+            let incomplete_response_recovery_count = 0;
+            while (step_count < MAX_TOOL_LOOP_STEPS) {
+                const result = streamText({
+                    model: input.model,
+                    system,
+                    onStepFinish: on_step_finish,
+                    prepareStep: prepare_step,
+                    messages: message_state.modelMessages,
+                    tools,
+                    providerOptions: buildOpenAIResponsesProviderOptions(),
+                    onError: async ({ error }) => {
+                        last_observed_stream_error = error;
+                        await this.logger.log("error", "[agent] stream.error", {
+                            sessionId: session_id,
+                            ...summarizeStreamError(error),
+                        });
+                    },
+                });
+                const step_assistant_ui_message = await collectFinalAssistantMessageFromUiStream({
+                    result,
+                    sessionId: session_id,
+                    logger: this.logger,
+                    buildFallbackAssistantMessage: (text) => this.context_composer.buildFallbackAssistantMessage(text, input.run_context),
+                    onUiMessageChunkCallback: input.run_context.onUiMessageChunkCallback,
+                });
+                const executed_steps = await result.steps;
+                const last_step = executed_steps[executed_steps.length - 1];
+                if (!last_step)
+                    break;
+                const incomplete_response = detectIncompleteResponse({
+                    stepResult: last_step,
+                    assistantMessage: step_assistant_ui_message,
+                });
+                const text_only_continuation_reason = detectTextOnlyContinuationReason(last_step);
+                const loop_decision = evaluateCoreEngineLoopDecision({
+                    hasIncompleteResponse: incomplete_response !== null,
+                    incompleteRecoveryCount: incomplete_response_recovery_count,
+                    maxIncompleteRecoveries: MAX_INCOMPLETE_RESPONSE_RECOVERIES,
+                    textOnlyContinuationReason: text_only_continuation_reason,
+                    textOnlyContinuationCount: text_only_continuation_count,
+                    maxTextOnlyContinuations: MAX_TEXT_ONLY_CONTINUATIONS,
+                    hasTools: Object.keys(tools).length > 0,
+                    toolCallCount: last_step.toolCalls.length,
+                });
+                await this.logger.log("info", "[agent] loop.decision", {
+                    sessionId: session_id,
+                    stepIndex: step_count,
+                    continueForToolCalls: loop_decision.continueForToolCalls,
+                    continueForTextOnly: loop_decision.continueForTextOnly,
+                    continueForIncompleteRecovery: loop_decision.continueForIncompleteRecovery,
+                    decisionKind: loop_decision.kind,
+                    textOnlyContinuationReason: text_only_continuation_reason,
+                    textOnlyContinuationCount: text_only_continuation_count,
+                    incompleteResponseReason: incomplete_response?.reason ?? null,
+                    incompleteResponseRecoveryCount: incomplete_response_recovery_count,
+                    toolCallCount: last_step.toolCalls.length,
+                    toolResultCount: last_step.toolResults.length,
+                    finishReason: last_step.finishReason,
+                    textPreview: toInlinePreview(last_step.text),
+                });
+                if (loop_decision.continueForIncompleteRecovery &&
+                    incomplete_response) {
+                    incomplete_response_recovery_count += 1;
+                    await this.logger.log("warn", "[agent] incomplete_response.recover", {
+                        sessionId: session_id,
+                        stepIndex: step_count,
+                        recoveryCount: incomplete_response_recovery_count,
+                        reason: incomplete_response.reason,
+                        ...incomplete_response.details,
+                    });
+                    const recovery_message = this.history_store.userText({
+                        text: buildIncompleteResponseRecoveryNudge(incomplete_response_recovery_count),
+                        metadata: {
+                            sessionId: session_id,
+                            extra: {
+                                internal: "agent_incomplete_response_recover",
+                                reason: incomplete_response.reason,
+                                stepIndex: step_count,
+                            },
+                        },
+                    });
+                    await message_state.appendUserTextMessage(recovery_message);
+                    continue;
+                }
+                if (incomplete_response) {
+                    await this.logger.log("error", "[agent] incomplete_response", {
+                        sessionId: session_id,
+                        stepIndex: step_count,
+                        reason: incomplete_response.reason,
+                        recoveryCount: incomplete_response_recovery_count,
+                        ...incomplete_response.details,
+                    });
+                    throw new Error(`Agent received incomplete response (${incomplete_response.reason})`);
+                }
+                const response_messages = Array.isArray(last_step.response?.messages)
+                    ? last_step.response.messages
+                    : [];
+                message_state.appendModelMessages(response_messages);
+                final_assistant_ui_message = mergeAssistantUiMessages(final_assistant_ui_message, step_assistant_ui_message);
+                // 关键点（中文）：把本 step 的 assistant UI 消息并入运行时上下文，保证后续全量重算不丢历史。
+                message_state.appendRuntimeSessionMessage(step_assistant_ui_message);
+                if (loop_decision.continueForToolCalls) {
+                    text_only_continuation_count = 0;
+                    incomplete_response_recovery_count = 0;
+                    continue;
+                }
+                if (loop_decision.continueForTextOnly) {
+                    text_only_continuation_count += 1;
+                    incomplete_response_recovery_count = 0;
+                    const continuation_message = this.history_store.userText({
+                        text: buildTextOnlyContinuationNudge(text_only_continuation_count),
+                        metadata: {
+                            sessionId: session_id,
+                            extra: {
+                                internal: "agent_loop_auto_continue",
+                                reason: text_only_continuation_reason,
+                                stepIndex: step_count,
+                            },
+                        },
+                    });
+                    await message_state.appendUserTextMessage(continuation_message);
+                    continue;
+                }
+                // 关键点（中文）：stop 前做 tail merge，覆盖最后一个 step 后才入队的新 user 消息。
+                const tail_prepared = await prepare_step({ messages: [] });
+                const tail_merged_message_count = Array.isArray(tail_prepared.messages)
+                    ? tail_prepared.messages.length
+                    : 0;
+                if (shouldContinueForTailMergedUserMessages({
+                    mergedUserMessageCount: tail_merged_message_count,
+                })) {
+                    text_only_continuation_count = 0;
+                    incomplete_response_recovery_count = 0;
+                    await this.logger.log("info", "[agent] loop.tail_merge_continue", {
+                        sessionId: session_id,
+                        stepIndex: step_count,
+                        mergedUserMessageCount: tail_merged_message_count,
+                    });
+                    continue;
+                }
+                break;
+            }
+            if (step_count >= MAX_TOOL_LOOP_STEPS) {
+                await this.logger.log("warn", "[agent] loop.max_steps_reached", {
+                    sessionId: session_id,
+                    stepCount: step_count,
+                    totalToolCallCount: total_tool_call_count,
+                    totalToolResultCount: total_tool_result_count,
+                });
+            }
+            const final_message = mergePendingAssistantFileParts(final_assistant_ui_message ||
+                this.context_composer.buildFallbackAssistantMessage("Execution completed", input.run_context), input.run_context.pendingAssistantFileParts);
+            await this.logger.log("info", "[agent] final.message", {
+                sessionId: session_id,
+                ...summarizeUiMessageForDebug(final_message),
+            });
+            await logAssistantMessageNow(this.logger, final_message);
+            const duration = Date.now() - start_time;
+            await this.logger.log("info", "[agent] finish", {
+                sessionId: session_id,
+                duration,
+                stepCount: step_count,
+                totalToolCallCount: total_tool_call_count,
+                totalToolResultCount: total_tool_result_count,
+            });
+            return {
+                success: true,
+                assistantMessage: final_message,
+                deferredPersistedUserMessages: [
+                    ...input.run_context.deferredPersistedUserMessages,
+                ],
+            };
+        }
+        catch (error) {
+            if (this.should_compact_on_error(error)) {
+                throw error;
+            }
+            const error_text = resolveEffectiveCoreEngineError({
+                error,
+                streamError: last_observed_stream_error,
+            });
+            await this.logger.log("error", "CoreEngine execution failed", {
+                error: error_text,
+            });
+            return {
+                success: false,
+                error: error_text,
+                assistantMessage: this.context_composer.buildFallbackAssistantMessage(`Execution failed: ${error_text}`, input.run_context),
+                deferredPersistedUserMessages: [
+                    ...input.run_context.deferredPersistedUserMessages,
+                ],
+            };
+        }
+    }
+}
+//# sourceMappingURL=CoreEngineRunner.js.map

package/bin/executor/core-engine/CoreEngineRunner.js.map

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

package/bin/executor/core-engine/CoreEngineUiStreamCollector.d.ts

@@ -9,6 +9,7 @@
 import type { streamText } from "ai";
 import type { Logger } from "../../utils/logger/Logger.js";
 import type { SessionMessageV1 } from "../../executor/types/SessionMessages.js";
+import type { SessionUiMessageChunkCallback } from "../../executor/types/SessionRun.js";
 /**
  * 收敛 UI stream 中的最终 assistant 消息。
  */
@@ -29,5 +30,9 @@ export declare function collectFinalAssistantMessageFromUiStream(params: {
      * 构造 fallback assistant 消息的工厂函数。
      */
     buildFallbackAssistantMessage: (text: string) => SessionMessageV1;
+    /**
+     * UI stream chunk 回调。
+     */
+    onUiMessageChunkCallback?: SessionUiMessageChunkCallback;
 }): Promise<SessionMessageV1>;
 //# sourceMappingURL=CoreEngineUiStreamCollector.d.ts.map

package/bin/executor/core-engine/CoreEngineUiStreamCollector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CoreEngineUiStreamCollector.d.ts","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineUiStreamCollector.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAO5E;;GAEG;AACH,wBAAsB,wCAAwC,CAAC,MAAM,EAAE;IACrE;;OAEG;IACH,MAAM,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IACtC;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,6BAA6B,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,gBAAgB,CAAC;CACnE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwD5B"}
+{"version":3,"file":"CoreEngineUiStreamCollector.d.ts","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineUiStreamCollector.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAC;AAMpF;;GAEG;AACH,wBAAsB,wCAAwC,CAAC,MAAM,EAAE;IACrE;;OAEG;IACH,MAAM,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IACtC;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,6BAA6B,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,gBAAgB,CAAC;IAClE;;OAEG;IACH,wBAAwB,CAAC,EAAE,6BAA6B,CAAC;CAC1D,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAsD5B"}

package/bin/executor/core-engine/CoreEngineUiStreamCollector.js

@@ -6,7 +6,6 @@
  * - 优先使用结构化 `responseMessage`；缺失时才回退到纯文本。
  * - UI chunk 回调是展示层副作用，失败不应阻断 session 执行。
  */
-import { getSessionRunScope } from "../SessionRunScope.js";
 import { summarizeUiMessageForDebug, toInlinePreview, } from "../core-engine/CoreEngineSignals.js";
 /**
  * 收敛 UI stream 中的最终 assistant 消息。
@@ -28,12 +27,11 @@ export async function collectFinalAssistantMessageFromUiStream(params) {
             };
         },
     });
-    const onUiMessageChunkCallback = getSessionRunScope()?.onUiMessageChunkCallback;
     for await (const chunk of uiStream) {
-        if (typeof onUiMessageChunkCallback !== "function")
+        if (typeof params.onUiMessageChunkCallback !== "function")
             continue;
         try {
-            await onUiMessageChunkCallback(chunk);
+            await params.onUiMessageChunkCallback(chunk);
         }
         catch {
             // ignore UI stream callback failures

package/bin/executor/core-engine/CoreEngineUiStreamCollector.js.map

@@ -1 +1 @@
-{"version":3,"file":"CoreEngineUiStreamCollector.js","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineUiStreamCollector.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EACL,0BAA0B,EAC1B,eAAe,GAChB,MAAM,4CAA4C,CAAC;AAEpD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,wCAAwC,CAAC,MAiB9D;IACC,IAAI,wBAAwB,GAA4B,IAAI,CAAC;IAC7D,IAAI,eAAe,GAAsB,IAAI,CAAC;IAE9C,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAmB;QACjE,wEAAwE;QACxE,aAAa,EAAE,IAAI;QACnB,WAAW,EAAE,KAAK;QAClB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;YAClB,wBAAwB,GAAG,KAAK,CAAC,eAAe,IAAI,IAAI,CAAC;YACzD,eAAe,GAAG;gBAChB,cAAc,EAAE,KAAK,CAAC,cAAc;gBACpC,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,YAAY,EACV,OAAO,KAAK,CAAC,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI;gBACpE,GAAG,0BAA0B,CAAC,KAAK,CAAC,eAAe,CAAC;aACrD,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,wBAAwB,GAC5B,kBAAkB,EAAE,EAAE,wBAAwB,CAAC;IACjD,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QACnC,IAAI,OAAO,wBAAwB,KAAK,UAAU;YAAE,SAAS;QAC7D,IAAI,CAAC;YACH,MAAM,wBAAwB,CAAC,KAAK,CAAC,CAAC;QACxC,CAAC;QAAC,MAAM,CAAC;YACP,qCAAqC;QACvC,CAAC;IACH,CAAC;IAED,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,EAAE;QACnD,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,GAAG,CAAC,eAAe,IAAI;YACrB,sBAAsB,EAAE,IAAI;SAC7B,CAAC;KACH,CAAC,CAAC;IAEH,IAAI,wBAAwB;QAAE,OAAO,wBAAwB,CAAC;IAE9D,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,IAAI,CAAC;QACH,aAAa,GAAG,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAClE,CAAC;IAAC,MAAM,CAAC;QACP,aAAa,GAAG,EAAE,CAAC;IACrB,CAAC;IAED,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gCAAgC,EAAE;QAChE,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,mBAAmB,EAAE,aAAa,CAAC,MAAM;QACzC,oBAAoB,EAAE,eAAe,CAAC,aAAa,CAAC;KACrD,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,6BAA6B,CACzC,aAAa,IAAI,qBAAqB,CACvC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"CoreEngineUiStreamCollector.js","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineUiStreamCollector.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAOH,OAAO,EACL,0BAA0B,EAC1B,eAAe,GAChB,MAAM,4CAA4C,CAAC;AAEpD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,wCAAwC,CAAC,MAqB9D;IACC,IAAI,wBAAwB,GAA4B,IAAI,CAAC;IAC7D,IAAI,eAAe,GAAsB,IAAI,CAAC;IAE9C,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAmB;QACjE,wEAAwE;QACxE,aAAa,EAAE,IAAI;QACnB,WAAW,EAAE,KAAK;QAClB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;YAClB,wBAAwB,GAAG,KAAK,CAAC,eAAe,IAAI,IAAI,CAAC;YACzD,eAAe,GAAG;gBAChB,cAAc,EAAE,KAAK,CAAC,cAAc;gBACpC,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,YAAY,EACV,OAAO,KAAK,CAAC,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI;gBACpE,GAAG,0BAA0B,CAAC,KAAK,CAAC,eAAe,CAAC;aACrD,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;IAEH,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QACnC,IAAI,OAAO,MAAM,CAAC,wBAAwB,KAAK,UAAU;YAAE,SAAS;QACpE,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC;QAC/C,CAAC;QAAC,MAAM,CAAC;YACP,qCAAqC;QACvC,CAAC;IACH,CAAC;IAED,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,EAAE;QACnD,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,GAAG,CAAC,eAAe,IAAI;YACrB,sBAAsB,EAAE,IAAI;SAC7B,CAAC;KACH,CAAC,CAAC;IAEH,IAAI,wBAAwB;QAAE,OAAO,wBAAwB,CAAC;IAE9D,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,IAAI,CAAC;QACH,aAAa,GAAG,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAClE,CAAC;IAAC,MAAM,CAAC;QACP,aAAa,GAAG,EAAE,CAAC;IACrB,CAAC;IAED,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gCAAgC,EAAE;QAChE,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,mBAAmB,EAAE,aAAa,CAAC,MAAM;QACzC,oBAAoB,EAAE,eAAe,CAAC,aAAa,CAAC;KACrD,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,6BAA6B,CACzC,aAAa,IAAI,qBAAqB,CACvC,CAAC;AACJ,CAAC"}

package/bin/executor/messages/AssistantResultPersistence.d.ts

@@ -4,7 +4,7 @@
  * 关键点（中文）
  * - 负责收敛“写完整 assistant message / 写 fallback 文本 / 完全跳过”三种分支。
  * - 避免 SDK、HTTP execute、control execute、chat queue 各自复制一套判断。
- * - 一旦 step 消息已经单独持久化，最终 merged assistant 必须跳过，不能再补一条 fallback。
+ * - 运行中 step/tool 的持久化由 inflight 快照承担；run 结束时只关心最终 assistant 如何收口。
  */
 import type { SessionMessageV1 } from "../../executor/types/SessionMessages.js";
 /**
@@ -41,8 +41,8 @@ export interface PersistAssistantResultParams {
      * 可选兜底文本。
      *
      * 关键点（中文）
-     * - 仅在没有完整 assistant message 且未发生 step 持久化时才允许写入。
-     * - 若 step 已单独落盘，这里必须被忽略，避免重复 assistant。
+     * - 仅在没有完整 assistant message 时才允许写入。
+     * - inflight 快照的正式收口由 history store 负责，这里不再处理旧的 step 独立落盘分支。
      */
     fallbackText?: string;
 }

package/bin/executor/messages/AssistantResultPersistence.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AssistantResultPersistence.d.ts","sourceRoot":"","sources":["../../../src/executor/messages/AssistantResultPersistence.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAM5E;;GAEG;AACH,MAAM,WAAW,gCAAgC;IAC/C;;OAEG;IACH,sBAAsB,CAAC,MAAM,EAAE;QAC7B;;WAEG;QACH,OAAO,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;QAClC;;WAEG;QACH,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,4BAA4B;IAC3C;;OAEG;IACH,MAAM,EAAE,gCAAgC,CAAC;IACzC;;OAEG;IACH,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,GAAG,SAAS,CAAC;IACtD;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAOD;;GAEG;AACH,wBAAgB,sCAAsC,CACpD,MAAM,EAAE,IAAI,CAAC,4BAA4B,EAAE,QAAQ,CAAC,GACnD;IACD;;OAEG;IACH,OAAO,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAClC;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,IAAI,CAoBP;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,OAAO,CAAC,CAQlB"}
+{"version":3,"file":"AssistantResultPersistence.d.ts","sourceRoot":"","sources":["../../../src/executor/messages/AssistantResultPersistence.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAG5E;;GAEG;AACH,MAAM,WAAW,gCAAgC;IAC/C;;OAEG;IACH,sBAAsB,CAAC,MAAM,EAAE;QAC7B;;WAEG;QACH,OAAO,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;QAClC;;WAEG;QACH,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,4BAA4B;IAC3C;;OAEG;IACH,MAAM,EAAE,gCAAgC,CAAC;IACzC;;OAEG;IACH,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,GAAG,SAAS,CAAC;IACtD;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAOD;;GAEG;AACH,wBAAgB,sCAAsC,CACpD,MAAM,EAAE,IAAI,CAAC,4BAA4B,EAAE,QAAQ,CAAC,GACnD;IACD;;OAEG;IACH,OAAO,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAClC;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,IAAI,CAeP;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,OAAO,CAAC,CAQlB"}

package/bin/executor/messages/AssistantResultPersistence.js

@@ -4,9 +4,9 @@
  * 关键点（中文）
  * - 负责收敛“写完整 assistant message / 写 fallback 文本 / 完全跳过”三种分支。
  * - 避免 SDK、HTTP execute、control execute、chat queue 各自复制一套判断。
- * - 一旦 step 消息已经单独持久化，最终 merged assistant 必须跳过，不能再补一条 fallback。
+ * - 运行中 step/tool 的持久化由 inflight 快照承担；run 结束时只关心最终 assistant 如何收口。
  */
-import { hasPersistedAssistantSteps, resolveAssistantMessageForPersistence, } from "../../executor/messages/UserVisibleText.js";
+import { resolveAssistantMessageForPersistence } from "../../executor/messages/UserVisibleText.js";
 function normalizeFallbackText(input) {
     const text = String(input || "").trim();
     return text || undefined;
@@ -21,10 +21,6 @@ export function buildAssistantResultPersistencePayload(params) {
             message: persistedMessage,
         };
     }
-    // 关键点（中文）：step 已经单独落盘时，最终 merged assistant 必须完全跳过。
-    if (hasPersistedAssistantSteps(params.assistantMessage)) {
-        return null;
-    }
     const fallbackText = normalizeFallbackText(params.fallbackText);
     if (!fallbackText)
         return null;

package/bin/executor/messages/AssistantResultPersistence.js.map

@@ -1 +1 @@
-{"version":3,"file":"AssistantResultPersistence.js","sourceRoot":"","sources":["../../../src/executor/messages/AssistantResultPersistence.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EACL,0BAA0B,EAC1B,qCAAqC,GACtC,MAAM,wCAAwC,CAAC;AA2ChD,SAAS,qBAAqB,CAAC,KAAyB;IACtD,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACxC,OAAO,IAAI,IAAI,SAAS,CAAC;AAC3B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,sCAAsC,CACpD,MAAoD;IAWpD,MAAM,gBAAgB,GAAG,qCAAqC,CAC5D,MAAM,CAAC,gBAAgB,CACxB,CAAC;IACF,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO;YACL,OAAO,EAAE,gBAAgB;SAC1B,CAAC;IACJ,CAAC;IAED,mDAAmD;IACnD,IAAI,0BAA0B,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,YAAY,GAAG,qBAAqB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAChE,IAAI,CAAC,YAAY;QAAE,OAAO,IAAI,CAAC;IAC/B,OAAO;QACL,YAAY;KACb,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,MAAoC;IAEpC,MAAM,OAAO,GAAG,sCAAsC,CAAC;QACrD,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;KAClC,CAAC,CAAC;IACH,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAC3B,MAAM,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;IACpD,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"AssistantResultPersistence.js","sourceRoot":"","sources":["../../../src/executor/messages/AssistantResultPersistence.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,qCAAqC,EAAE,MAAM,wCAAwC,CAAC;AA2C/F,SAAS,qBAAqB,CAAC,KAAyB;IACtD,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACxC,OAAO,IAAI,IAAI,SAAS,CAAC;AAC3B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,sCAAsC,CACpD,MAAoD;IAWpD,MAAM,gBAAgB,GAAG,qCAAqC,CAC5D,MAAM,CAAC,gBAAgB,CACxB,CAAC;IACF,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO;YACL,OAAO,EAAE,gBAAgB;SAC1B,CAAC;IACJ,CAAC;IAED,MAAM,YAAY,GAAG,qBAAqB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAChE,IAAI,CAAC,YAAY;QAAE,OAAO,IAAI,CAAC;IAC/B,OAAO;QACL,YAAY;KACb,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,MAAoC;IAEpC,MAAM,OAAO,GAAG,sCAAsC,CAAC;QACrD,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;KAClC,CAAC,CAAC;IACH,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAC3B,MAAM,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;IACpD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/bin/executor/messages/SessionStepEventMapper.d.ts

@@ -1,20 +1,19 @@
 /**
- * SessionStepEventMapper：把单个 step 结果转成按顺序可持久化的 session 消息。
+ * SessionStepEventMapper：把单个 step 结果转成 assistant parts。
  *
  * 关键点（中文）
- * - 工具结果使用 AI SDK v6 UI tool part 格式，避免历史重放时丢失 tool result。
- * - 只做 best-effort 提取，不依赖 provider 私有结构。
- * - 输出仍然是标准 SessionMessageV1，供 SessionHistoryWriter 直接落盘。
+ * - 运行过程仍然要持久化，但收口到同一条 assistant UIMessage。
+ * - 工具结果使用 AI SDK v6 UI tool part 格式，和官方 UIMessage 语义保持一致。
+ * - 每个 step 前插入 `step-start`，便于在 UI 中保留多 step 边界。
  */
 import type { SessionMessageV1 } from "../../executor/types/SessionMessages.js";
 /**
- * 从 stepResult 提取按顺序落盘的 session assistant 消息。
+ * 从 stepResult 提取按顺序写入同一条 assistant message 的 parts。
  */
-export declare function buildSessionStepEventMessages(params: {
-    sessionId: string;
+export declare function buildSessionStepParts(params: {
     stepIndex: number;
     stepResult?: unknown;
     text: string;
     visibility?: "visible" | "internal";
-}): SessionMessageV1[];
+}): SessionMessageV1["parts"];
 //# sourceMappingURL=SessionStepEventMapper.d.ts.map

package/bin/executor/messages/SessionStepEventMapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionStepEventMapper.d.ts","sourceRoot":"","sources":["../../../src/executor/messages/SessionStepEventMapper.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAmH5E;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE;IACpD,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC;CACrC,GAAG,gBAAgB,EAAE,CAiGrB"}
+{"version":3,"file":"SessionStepEventMapper.d.ts","sourceRoot":"","sources":["../../../src/executor/messages/SessionStepEventMapper.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAiG5E;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE;IAC5C,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC;CACrC,GAAG,gBAAgB,CAAC,OAAO,CAAC,CA4E5B"}