@downcity/agent 1.1.74 → 1.1.79

package/bin/executor/Executor.js

@@ -9,7 +9,7 @@
 import { streamText } from "ai";
 import { SessionHistoryWriter } from "./composer/history/SessionHistoryWriter.js";
 import { withSessionRunScope } from "./SessionRunScope.js";
-import { buildSessionStepEventMessages } from "./messages/SessionStepEventMapper.js";
+import { buildSessionStepParts } from "./messages/SessionStepEventMapper.js";
 import { JsonlSessionCompactionComposer } from "./composer/compaction/jsonl/JsonlSessionCompactionComposer.js";
 import { LocalSessionContextComposer } from "./composer/context/LocalSessionContextComposer.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";
@@ -19,6 +19,7 @@ import { collectFinalAssistantMessageFromUiStream } from "./core-engine/CoreEngi
 import { CoreEngineMessageState } from "./core-engine/CoreEngineMessageState.js";
 import { buildOpenAIResponsesProviderOptions, } from "./messages/SessionMessageCodec.js";
 import { logAssistantMessageNow } from "./messages/SessionMessageLog.js";
+import { generateId } from "../utils/Id.js";
 /**
  * 可压缩错误的最大重试次数。
  */
@@ -113,6 +114,52 @@ export class Executor {
     async appendAssistantMessage(params) {
         await this.historyWriter.appendAssistantMessage(params);
     }
+    /**
+     * 把 step/tool 过程增量写入当前运行中的 assistant 快照。
+     */
+    async appendAssistantStepPartsToInflight(parts) {
+        const normalized_parts = Array.isArray(parts)
+            ? parts.filter((part) => part && typeof part === "object")
+            : [];
+        if (normalized_parts.length === 0)
+            return;
+        const current_inflight = await this.historyStore.readInflight();
+        const next_message = current_inflight
+            ? {
+                ...current_inflight,
+                metadata: {
+                    ...(current_inflight.metadata || {
+                        v: 1,
+                        ts: Date.now(),
+                        sessionId: this.sessionId,
+                    }),
+                    ts: Date.now(),
+                    sessionId: this.sessionId,
+                    source: "egress",
+                    kind: "normal",
+                },
+                parts: [
+                    ...(Array.isArray(current_inflight.parts)
+                        ? current_inflight.parts
+                        : []),
+                    ...normalized_parts,
+                ],
+            }
+            : {
+                id: `a:${this.sessionId}:${generateId()}`,
+                role: "assistant",
+                metadata: {
+                    v: 1,
+                    ts: Date.now(),
+                    sessionId: this.sessionId,
+                    source: "egress",
+                    kind: "normal",
+                },
+                parts: normalized_parts,
+            };
+        await this.historyStore.writeInflight(next_message);
+        await this.afterSessionUpdatedAsync();
+    }
     /**
      * 运行当前 session 的一次请求。
      *
@@ -138,23 +185,16 @@ export class Executor {
                 ? { onUiMessageChunkCallback: params.onUiMessageChunkCallback }
                 : {}),
         };
-        let persistedAssistantStepCount = 0;
         const providedOnAssistantStepCallback = sessionRunScope.onAssistantStepCallback;
         const wrappedOnAssistantStepCallback = async (step) => {
-            const stepMessages = buildSessionStepEventMessages({
-                sessionId: this.sessionId,
+            const step_parts = buildSessionStepParts({
                 stepIndex: step.stepIndex,
                 stepResult: step.stepResult,
                 text: step.text,
                 visibility: step.visibility,
             });
-            if (stepMessages.length > 0) {
-                for (const stepMessage of stepMessages) {
-                    await this.appendAssistantMessage({
-                        message: stepMessage,
-                    });
-                    persistedAssistantStepCount += 1;
-                }
+            if (step_parts.length > 0) {
+                await this.appendAssistantStepPartsToInflight(step_parts);
             }
             if (typeof providedOnAssistantStepCallback === "function") {
                 await providedOnAssistantStepCallback(step);
@@ -168,30 +208,7 @@ export class Executor {
                 ...sessionRunScope,
                 onAssistantStepCallback: wrappedOnAssistantStepCallback,
             }, () => this.runWithRetry({ query }));
-            if (persistedAssistantStepCount <= 0)
-                return result;
-            return {
-                ...result,
-                assistantMessage: {
-                    ...result.assistantMessage,
-                    metadata: {
-                        ...(result.assistantMessage.metadata || {
-                            v: 1,
-                            ts: Date.now(),
-                            sessionId: this.sessionId,
-                        }),
-                        extra: {
-                            ...(result.assistantMessage.metadata?.extra &&
-                                typeof result.assistantMessage.metadata.extra === "object" &&
-                                !Array.isArray(result.assistantMessage.metadata.extra)
-                                ? result.assistantMessage.metadata.extra
-                                : {}),
-                            assistantStepMessagesPersisted: true,
-                            assistantStepCount: persistedAssistantStepCount,
-                        },
-                    },
-                },
-            };
+            return result;
         }
         finally {
             this.resetRunState();

package/bin/executor/Executor.js.map

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

package/bin/executor/composer/history/SessionHistoryWriter.js

@@ -69,14 +69,14 @@ export class SessionHistoryWriter {
         try {
             const historyStore = this.getHistoryStore();
             if (params.message && typeof params.message === "object") {
-                await historyStore.append(params.message);
+                await historyStore.finalizeInflight(params.message);
                 void this.afterSessionUpdatedAsync();
                 return;
             }
             const fallbackText = String(params.fallbackText || "").trim();
             if (!fallbackText)
                 return;
-            await historyStore.append(historyStore.assistantText({
+            await historyStore.finalizeInflight(historyStore.assistantText({
                 text: fallbackText,
                 metadata: {
                     sessionId: this.sessionId,

package/bin/executor/composer/history/SessionHistoryWriter.js.map

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

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"}

package/bin/executor/messages/SessionStepEventMapper.js

@@ -1,12 +1,11 @@
 /**
- * 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 { generateId } from "../../utils/Id.js";
 function toRecord(value) {
     if (!value || typeof value !== "object" || Array.isArray(value))
         return null;
@@ -64,6 +63,21 @@ function resolveToolResultPayload(value) {
         return record.error;
     return undefined;
 }
+function resolveToolResultErrorText(value) {
+    const record = toRecord(value);
+    if (!record)
+        return undefined;
+    if (typeof record.errorText === "string" && record.errorText.trim()) {
+        return record.errorText.trim();
+    }
+    if (typeof record.error === "string" && record.error.trim()) {
+        return record.error.trim();
+    }
+    if (record.error instanceof Error && record.error.message.trim()) {
+        return record.error.message.trim();
+    }
+    return undefined;
+}
 function mapToolResultsByCallId(toolResults) {
     const out = new Map();
     for (const toolResult of toolResults) {
@@ -90,35 +104,10 @@ function resolveAcpEventData(value) {
 function toDataPartType(type) {
     return `data-acp-${type.replace(/_/g, "-")}`;
 }
-function buildMetadata(params) {
-    return {
-        v: 1,
-        ts: params.ts,
-        sessionId: params.sessionId,
-        source: "egress",
-        kind: "normal",
-        ...(params.extra ? { extra: params.extra } : {}),
-    };
-}
-function buildAssistantStepMessage(params) {
-    return {
-        id: `a:${params.sessionId}:${generateId()}`,
-        role: "assistant",
-        metadata: buildMetadata({
-            sessionId: params.sessionId,
-            ts: params.ts,
-            extra: params.extra,
-        }),
-        parts: [params.part],
-    };
-}
 /**
- * 从 stepResult 提取按顺序落盘的 session assistant 消息。
+ * 从 stepResult 提取按顺序写入同一条 assistant message 的 parts。
  */
-export function buildSessionStepEventMessages(params) {
-    const sessionId = String(params.sessionId || "").trim();
-    if (!sessionId)
-        return [];
+export function buildSessionStepParts(params) {
     const out = [];
     const stepRecord = toRecord(params.stepResult) || {};
     const toolCalls = Array.isArray(stepRecord.toolCalls) ? stepRecord.toolCalls : [];
@@ -129,31 +118,24 @@ export function buildSessionStepEventMessages(params) {
     const acpEvents = Array.isArray(stepRecord.acpEvents)
         ? stepRecord.acpEvents
         : [];
-    const baseTs = Date.now();
-    let sequence = 0;
     const text = String(params.text || "").trim();
+    const has_structured_output = Boolean(text) || toolCalls.length > 0 || acpEvents.length > 0;
+    if (!has_structured_output)
+        return [];
+    out.push({ type: "step-start" });
     if (text) {
         const isInternal = params.visibility === "internal";
-        out.push(buildAssistantStepMessage({
-            sessionId,
-            ts: baseTs + sequence,
-            part: isInternal
-                ? {
-                    type: "reasoning",
-                    text,
-                    state: "done",
-                }
-                : {
-                    type: "text",
-                    text,
-                },
-            extra: {
-                internal: isInternal ? "assistant_step_reasoning" : "assistant_step_text",
-                stepIndex: params.stepIndex,
-                persistedBy: "session_store_run",
-            },
-        }));
-        sequence += 1;
+        out.push(isInternal
+            ? {
+                type: "reasoning",
+                text,
+                state: "done",
+            }
+            : {
+                type: "text",
+                text,
+                state: "done",
+            });
     }
     for (let index = 0; index < toolCalls.length; index += 1) {
         const toolCall = toolCalls[index];
@@ -164,44 +146,31 @@ export function buildSessionStepEventMessages(params) {
         if (!toolResult)
             continue;
         const output = resolveToolResultPayload(toolResult);
-        out.push(buildAssistantStepMessage({
-            sessionId,
-            ts: baseTs + sequence,
-            part: {
-                type: `tool-${toolName}`,
-                ...(toolCallId ? { toolCallId } : {}),
-                ...(input !== undefined ? { input } : {}),
-                state: "output-available",
-                output,
-            },
-            extra: {
-                internal: "assistant_step_tool_result",
-                stepIndex: params.stepIndex,
-                toolIndex: index + 1,
-            },
-        }));
-        sequence += 1;
+        const errorText = resolveToolResultErrorText(toolResult);
+        out.push({
+            type: `tool-${toolName}`,
+            ...(toolCallId ? { toolCallId } : {}),
+            ...(input !== undefined ? { input } : {}),
+            ...(errorText
+                ? {
+                    state: "output-error",
+                    errorText,
+                }
+                : {
+                    state: "output-available",
+                    output,
+                }),
+        });
     }
     for (let index = 0; index < acpEvents.length; index += 1) {
         const acpEvent = acpEvents[index];
         const type = resolveAcpEventType(acpEvent);
         if (!type)
             continue;
-        out.push(buildAssistantStepMessage({
-            sessionId,
-            ts: baseTs + sequence,
-            part: {
-                type: toDataPartType(type),
-                data: resolveAcpEventData(acpEvent),
-            },
-            extra: {
-                internal: "assistant_step_acp_event",
-                stepIndex: params.stepIndex,
-                acpEventType: type,
-                eventIndex: index + 1,
-            },
-        }));
-        sequence += 1;
+        out.push({
+            type: toDataPartType(type),
+            data: resolveAcpEventData(acpEvent),
+        });
     }
     return out;
 }

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

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

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

@@ -11,18 +11,10 @@ import type { SessionMessageV1 } from "../../executor/types/SessionMessages.js";
  * 生成真正应该落盘到 session 的 assistant message。
  *
  * 关键点（中文）
- * - 没有 step 持久化时，直接保留完整 assistant message。
- * - 一旦 step 已单独落盘，最终 merged assistant 不再重复写入。
+ * - session 正式历史应尽量保留 AI SDK 最终 assistant UIMessage。
+ * - 运行中 step/tool 的中断恢复由 inflight 快照承担，不再通过跳过最终 message 收口。
  */
 export declare function resolveAssistantMessageForPersistence(message: SessionMessageV1 | null | undefined): SessionMessageV1 | null;
-/**
- * 判断 assistant message 是否声明“本轮 step 消息已单独持久化”。
- *
- * 关键点（中文）
- * - 该标记只用于避免在 run 结束时把最终 merged assistant 再重复写入 context。
- * - 不影响 channel 发送；只影响 context messages 的最终 append 策略。
- */
-export declare function hasPersistedAssistantSteps(message: SessionMessageV1 | null | undefined): boolean;
 /**
  * 提取策略（中文）
  * - 倒序扫描：优先使用最后一次 `chat_send`，与最终用户感知一致。

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

@@ -1 +1 @@
-{"version":3,"file":"UserVisibleText.d.ts","sourceRoot":"","sources":["../../../src/executor/messages/UserVisibleText.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAM5E;;;;;;GAMG;AACH,wBAAgB,qCAAqC,CACnD,OAAO,EAAE,gBAAgB,GAAG,IAAI,GAAG,SAAS,GAC3C,gBAAgB,GAAG,IAAI,CAGzB;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,gBAAgB,GAAG,IAAI,GAAG,SAAS,GAC3C,OAAO,CAIT;AAED;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,gBAAgB,GAAG,IAAI,GAAG,SAAS,GAC3C,MAAM,CA8BR"}
+{"version":3,"file":"UserVisibleText.d.ts","sourceRoot":"","sources":["../../../src/executor/messages/UserVisibleText.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAM5E;;;;;;GAMG;AACH,wBAAgB,qCAAqC,CACnD,OAAO,EAAE,gBAAgB,GAAG,IAAI,GAAG,SAAS,GAC3C,gBAAgB,GAAG,IAAI,CAGzB;AAED;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,gBAAgB,GAAG,IAAI,GAAG,SAAS,GAC3C,MAAM,CA8BR"}

package/bin/executor/messages/UserVisibleText.js

@@ -11,26 +11,13 @@ import { extractTextFromUiMessage, extractToolCallsFromUiMessage, } from "./UIMe
  * 生成真正应该落盘到 session 的 assistant message。
  *
  * 关键点（中文）
- * - 没有 step 持久化时，直接保留完整 assistant message。
- * - 一旦 step 已单独落盘，最终 merged assistant 不再重复写入。
+ * - session 正式历史应尽量保留 AI SDK 最终 assistant UIMessage。
+ * - 运行中 step/tool 的中断恢复由 inflight 快照承担，不再通过跳过最终 message 收口。
  */
 export function resolveAssistantMessageForPersistence(message) {
     if (!message || typeof message !== "object")
         return null;
-    return hasPersistedAssistantSteps(message) ? null : message;
-}
-/**
- * 判断 assistant message 是否声明“本轮 step 消息已单独持久化”。
- *
- * 关键点（中文）
- * - 该标记只用于避免在 run 结束时把最终 merged assistant 再重复写入 context。
- * - 不影响 channel 发送；只影响 context messages 的最终 append 策略。
- */
-export function hasPersistedAssistantSteps(message) {
-    const extra = message?.metadata?.extra;
-    if (!extra || typeof extra !== "object" || Array.isArray(extra))
-        return false;
-    return extra.assistantStepMessagesPersisted === true;
+    return message;
 }
 /**
  * 提取策略（中文）

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

@@ -1 +1 @@
-{"version":3,"file":"UserVisibleText.js","sourceRoot":"","sources":["../../../src/executor/messages/UserVisibleText.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EACL,wBAAwB,EACxB,6BAA6B,GAC9B,MAAM,2BAA2B,CAAC;AAEnC;;;;;;GAMG;AACH,MAAM,UAAU,qCAAqC,CACnD,OAA4C;IAE5C,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IACzD,OAAO,0BAA0B,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;AAC9D,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,0BAA0B,CACxC,OAA4C;IAE5C,MAAM,KAAK,GAAG,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC;IACvC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9E,OAAO,KAAK,CAAC,8BAA8B,KAAK,IAAI,CAAC;AACvD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,8BAA8B,CAC5C,OAA4C;IAE5C,MAAM,SAAS,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC;IACzD,iDAAiD;IACjD,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAClD,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,CAAC,EAAE;YAAE,SAAS;QAClB,IAAI,MAAM,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,KAAK,WAAW;YAAE,SAAS;QAEpD,MAAM,SAAS,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QACvD,MAAM,IAAI,GAAG,CAAC,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACrE,IAAI,CAAC,IAAI;YAAE,SAAS;QAEpB,MAAM,GAAG,GAAG,MAAM,CAAC,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3C,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAC,CAAC,wBAAwB;QAE/C,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/B,IACE,MAAM;gBACN,OAAO,MAAM,KAAK,QAAQ;gBACzB,MAAgC,CAAC,OAAO,KAAK,IAAI,EAClD,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,qCAAqC;YACrC,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,wBAAwB,CAAC,OAAO,CAAC,CAAC;AAC3C,CAAC"}
+{"version":3,"file":"UserVisibleText.js","sourceRoot":"","sources":["../../../src/executor/messages/UserVisibleText.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EACL,wBAAwB,EACxB,6BAA6B,GAC9B,MAAM,2BAA2B,CAAC;AAEnC;;;;;;GAMG;AACH,MAAM,UAAU,qCAAqC,CACnD,OAA4C;IAE5C,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IACzD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,8BAA8B,CAC5C,OAA4C;IAE5C,MAAM,SAAS,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC;IACzD,iDAAiD;IACjD,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAClD,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,CAAC,EAAE;YAAE,SAAS;QAClB,IAAI,MAAM,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,KAAK,WAAW;YAAE,SAAS;QAEpD,MAAM,SAAS,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QACvD,MAAM,IAAI,GAAG,CAAC,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACrE,IAAI,CAAC,IAAI;YAAE,SAAS;QAEpB,MAAM,GAAG,GAAG,MAAM,CAAC,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3C,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAC,CAAC,wBAAwB;QAE/C,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/B,IACE,MAAM;gBACN,OAAO,MAAM,KAAK,QAAQ;gBACzB,MAAgC,CAAC,OAAO,KAAK,IAAI,EAClD,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,qCAAqC;YACrC,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,wBAAwB,CAAC,OAAO,CAAC,CAAC;AAC3C,CAAC"}