@downcity/agent 1.1.74 → 1.1.81

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":"AAAA;;;;;;;GAOG;AAMH,SAAS,QAAQ,CAAC,KAAc;IAC9B,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAC7E,OAAO,KAAsB,CAAC;AAChC,CAAC;AAED,SAAS,eAAe,CAAC,KAAc;IACrC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/B,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IACvB,MAAM,QAAQ,GACZ,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ;QACjC,CAAC,CAAC,MAAM,CAAC,QAAQ;QACjB,CAAC,CAAC,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ;YAC/B,CAAC,CAAC,MAAM,CAAC,IAAI;YACb,CAAC,CAAC,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ;gBAC/B,CAAC,CAAC,MAAM,CAAC,IAAI;gBACb,CAAC,CAAC,EAAE,CAAC;IACb,OAAO,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AACvC,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAc;IACvC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/B,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IACvB,MAAM,UAAU,GACd,OAAO,MAAM,CAAC,UAAU,KAAK,QAAQ;QACnC,CAAC,CAAC,MAAM,CAAC,UAAU;QACnB,CAAC,CAAC,OAAO,MAAM,CAAC,EAAE,KAAK,QAAQ;YAC7B,CAAC,CAAC,MAAM,CAAC,EAAE;YACX,CAAC,CAAC,EAAE,CAAC;IACX,OAAO,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AACzC,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAc;IAC1C,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/B,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAC9B,IAAI,OAAO,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC,KAAK,CAAC;IAC3C,IAAI,UAAU,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC,QAAQ,CAAC;IACjD,IAAI,WAAW,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC,SAAS,CAAC;IACnD,IAAI,MAAM,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC,IAAI,CAAC;IACzC,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAc;IAC9C,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/B,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAC9B,IAAI,QAAQ,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC,MAAM,CAAC;IAC7C,IAAI,QAAQ,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC,MAAM,CAAC;IAC7C,IAAI,WAAW,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC,SAAS,CAAC;IACnD,IAAI,OAAO,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC,KAAK,CAAC;IAC3C,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,0BAA0B,CAAC,KAAc;IAChD,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/B,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAC9B,IAAI,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;QACpE,OAAO,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;IACjC,CAAC;IACD,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;QAC5D,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,CAAC;IACD,IAAI,MAAM,CAAC,KAAK,YAAY,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;QACjE,OAAO,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IACrC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,sBAAsB,CAAC,WAAsB;IACpD,MAAM,GAAG,GAAG,IAAI,GAAG,EAAmB,CAAC;IACvC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,MAAM,UAAU,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACjD,IAAI,CAAC,UAAU;YAAE,SAAS;QAC1B,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAClC,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAc;IACzC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/B,MAAM,IAAI,GAAG,OAAO,MAAM,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;AACrB,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAc;IACzC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/B,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAC1B,IAAI,MAAM,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC,IAAI,CAAC;IACzC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,cAAc,CAAC,IAAY;IAClC,OAAO,YAAY,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;AAC/C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,qBAAqB,CAAC,MAKrC;IACC,MAAM,GAAG,GAA8B,EAAE,CAAC;IAC1C,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IACrD,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;IAClF,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC;QACvD,CAAC,CAAC,UAAU,CAAC,WAAW;QACxB,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,WAAW,CAAC,CAAC;IAChE,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC;QACnD,CAAC,CAAC,UAAU,CAAC,SAAS;QACtB,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC9C,MAAM,qBAAqB,GACzB,OAAO,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;IAChE,IAAI,CAAC,qBAAqB;QAAE,OAAO,EAAE,CAAC;IAEtC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;IAEjC,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,KAAK,UAAU,CAAC;QACpD,GAAG,CAAC,IAAI,CACN,UAAU;YACR,CAAC,CAAC;gBACE,IAAI,EAAE,WAAW;gBACjB,IAAI;gBACJ,KAAK,EAAE,MAAM;aACd;YACH,CAAC,CAAC;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI;gBACJ,KAAK,EAAE,MAAM;aACd,CACN,CAAC;IACJ,CAAC;IAED,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACzD,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QAClC,MAAM,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC,IAAI,cAAc,CAAC;QAC7D,MAAM,UAAU,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAChF,IAAI,CAAC,UAAU;YAAE,SAAS;QAC1B,MAAM,MAAM,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAC;QACpD,MAAM,SAAS,GAAG,0BAA0B,CAAC,UAAU,CAAC,CAAC;QACzD,GAAG,CAAC,IAAI,CACN;YACE,IAAI,EAAE,QAAQ,QAAQ,EAAE;YACxB,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACrC,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACzC,GAAG,CAAC,SAAS;gBACX,CAAC,CAAC;oBACE,KAAK,EAAE,cAAc;oBACrB,SAAS;iBACV;gBACH,CAAC,CAAC;oBACE,KAAK,EAAE,kBAAkB;oBACzB,MAAM;iBACP,CAAC;SAC8B,CACvC,CAAC;IACJ,CAAC;IAED,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACzD,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,CAAC,IAAI;YAAE,SAAS;QACpB,GAAG,CAAC,IAAI,CACN;YACE,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC;YAC1B,IAAI,EAAE,mBAAmB,CAAC,QAAQ,CAAC;SACC,CACvC,CAAC;IACJ,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}

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

package/bin/executor/services/ExecutorInflightService.d.ts

@@ -0,0 +1,39 @@
+/**
+ * ExecutorInflightService：运行中 assistant 快照写入服务。
+ *
+ * 关键点（中文）
+ * - 只负责把 step/tool 增量写入当前 inflight assistant 快照。
+ * - 不负责长期 history 组装，不负责主执行循环。
+ * - 保持与 SessionHistoryStore 的交互边界清晰，避免 Executor 自身同时承担编排与写入细节。
+ */
+import type { SessionHistoryStore } from "../../executor/store/history/SessionHistoryStore.js";
+import type { SessionMessageV1 } from "../../executor/types/SessionMessages.js";
+interface ExecutorInflightServiceOptions {
+    /**
+     * 当前 session 标识。
+     */
+    session_id: string;
+    /**
+     * 当前 session 对应的 history 事实源。
+     */
+    history_store: SessionHistoryStore;
+    /**
+     * inflight 更新完成后的异步通知。
+     */
+    run_after_session_updated_async?: () => Promise<void>;
+}
+/**
+ * 运行中 assistant 快照写入服务。
+ */
+export declare class ExecutorInflightService {
+    private readonly session_id;
+    private readonly history_store;
+    private readonly run_after_session_updated_async?;
+    constructor(options: ExecutorInflightServiceOptions);
+    /**
+     * 把 step/tool 过程增量写入当前运行中的 assistant 快照。
+     */
+    append_assistant_step_parts(parts: SessionMessageV1["parts"]): Promise<void>;
+}
+export {};
+//# sourceMappingURL=ExecutorInflightService.d.ts.map

package/bin/executor/services/ExecutorInflightService.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExecutorInflightService.d.ts","sourceRoot":"","sources":["../../../src/executor/services/ExecutorInflightService.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAC3F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAE5E,UAAU,8BAA8B;IACtC;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,aAAa,EAAE,mBAAmB,CAAC;IAEnC;;OAEG;IACH,+BAA+B,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACvD;AAED;;GAEG;AACH,qBAAa,uBAAuB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IACpD,OAAO,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAoE;gBAEzG,OAAO,EAAE,8BAA8B;IAWnD;;OAEG;IACG,2BAA2B,CAC/B,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,GAC/B,OAAO,CAAC,IAAI,CAAC;CA8CjB"}

package/bin/executor/services/ExecutorInflightService.js

@@ -0,0 +1,75 @@
+/**
+ * ExecutorInflightService：运行中 assistant 快照写入服务。
+ *
+ * 关键点（中文）
+ * - 只负责把 step/tool 增量写入当前 inflight assistant 快照。
+ * - 不负责长期 history 组装，不负责主执行循环。
+ * - 保持与 SessionHistoryStore 的交互边界清晰，避免 Executor 自身同时承担编排与写入细节。
+ */
+import { generateId } from "../../utils/Id.js";
+/**
+ * 运行中 assistant 快照写入服务。
+ */
+export class ExecutorInflightService {
+    session_id;
+    history_store;
+    run_after_session_updated_async;
+    constructor(options) {
+        this.session_id = String(options.session_id || "").trim();
+        this.history_store = options.history_store;
+        this.run_after_session_updated_async =
+            options.run_after_session_updated_async;
+        if (!this.session_id) {
+            throw new Error("ExecutorInflightService requires a non-empty session_id");
+        }
+    }
+    /**
+     * 把 step/tool 过程增量写入当前运行中的 assistant 快照。
+     */
+    async append_assistant_step_parts(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.history_store.readInflight();
+        const next_message = current_inflight
+            ? {
+                ...current_inflight,
+                metadata: {
+                    ...(current_inflight.metadata || {
+                        v: 1,
+                        ts: Date.now(),
+                        sessionId: this.session_id,
+                    }),
+                    ts: Date.now(),
+                    sessionId: this.session_id,
+                    source: "egress",
+                    kind: "normal",
+                },
+                parts: [
+                    ...(Array.isArray(current_inflight.parts)
+                        ? current_inflight.parts
+                        : []),
+                    ...normalized_parts,
+                ],
+            }
+            : {
+                id: `a:${this.session_id}:${generateId()}`,
+                role: "assistant",
+                metadata: {
+                    v: 1,
+                    ts: Date.now(),
+                    sessionId: this.session_id,
+                    source: "egress",
+                    kind: "normal",
+                },
+                parts: normalized_parts,
+            };
+        await this.history_store.writeInflight(next_message);
+        if (this.run_after_session_updated_async) {
+            await this.run_after_session_updated_async();
+        }
+    }
+}
+//# sourceMappingURL=ExecutorInflightService.js.map

package/bin/executor/services/ExecutorInflightService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExecutorInflightService.js","sourceRoot":"","sources":["../../../src/executor/services/ExecutorInflightService.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAqB3C;;GAEG;AACH,MAAM,OAAO,uBAAuB;IACjB,UAAU,CAAS;IACnB,aAAa,CAAsB;IACnC,+BAA+B,CAAqE;IAErH,YAAY,OAAuC;QACjD,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC1D,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAC3C,IAAI,CAAC,+BAA+B;YAClC,OAAO,CAAC,+BAA+B,CAAC;QAE1C,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;QAC7E,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,2BAA2B,CAC/B,KAAgC;QAEhC,MAAM,gBAAgB,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;YAC3C,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,CAAC;YAC1D,CAAC,CAAC,EAAE,CAAC;QACP,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAE1C,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC;QACjE,MAAM,YAAY,GAAqB,gBAAgB;YACrD,CAAC,CAAC;gBACE,GAAG,gBAAgB;gBACnB,QAAQ,EAAE;oBACR,GAAG,CAAC,gBAAgB,CAAC,QAAQ,IAAI;wBAC/B,CAAC,EAAE,CAAU;wBACb,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE;wBACd,SAAS,EAAE,IAAI,CAAC,UAAU;qBAC3B,CAAC;oBACF,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE;oBACd,SAAS,EAAE,IAAI,CAAC,UAAU;oBAC1B,MAAM,EAAE,QAAQ;oBAChB,IAAI,EAAE,QAAQ;iBACf;gBACD,KAAK,EAAE;oBACL,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC;wBACvC,CAAC,CAAC,gBAAgB,CAAC,KAAK;wBACxB,CAAC,CAAC,EAAE,CAAC;oBACP,GAAG,gBAAgB;iBACpB;aACF;YACH,CAAC,CAAC;gBACE,EAAE,EAAE,KAAK,IAAI,CAAC,UAAU,IAAI,UAAU,EAAE,EAAE;gBAC1C,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE;oBACR,CAAC,EAAE,CAAC;oBACJ,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE;oBACd,SAAS,EAAE,IAAI,CAAC,UAAU;oBAC1B,MAAM,EAAE,QAAQ;oBAChB,IAAI,EAAE,QAAQ;iBACf;gBACD,KAAK,EAAE,gBAAgB;aACxB,CAAC;QAEN,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;QACrD,IAAI,IAAI,CAAC,+BAA+B,EAAE,CAAC;YACzC,MAAM,IAAI,CAAC,+BAA+B,EAAE,CAAC;QAC/C,CAAC;IACH,CAAC;CACF"}

package/bin/executor/services/ExecutorRecoveryPolicy.d.ts

@@ -0,0 +1,103 @@
+/**
+ * ExecutorRecoveryPolicy：执行恢复与重试策略。
+ *
+ * 关键点（中文）
+ * - 统一封装“压缩后重试”和“普通失败兜底”逻辑。
+ * - Executor 只负责准备输入与调用策略，不再直接承载重试状态机。
+ * - 不改变外部行为，只把异常分流规则集中到一个地方。
+ */
+import type { LanguageModel } from "ai";
+import type { Logger } from "../../utils/logger/Logger.js";
+import type { SessionCompactionComposer } from "../composer/compaction/SessionCompactionComposer.js";
+import type { SessionContextComposer } from "../composer/context/SessionContextComposer.js";
+import type { SessionRunContext } from "../../types/executor/SessionRunContext.js";
+import type { SessionExecuteInput, SessionRunResult } from "../../executor/types/SessionRun.js";
+interface ExecutorRecoveryPolicyOptions {
+    /**
+     * 当前 session 对应的 compaction Composer。
+     */
+    compaction_composer: SessionCompactionComposer;
+    /**
+     * 当前 session 对应的 context Composer。
+     */
+    context_composer: SessionContextComposer;
+    /**
+     * 当前 session 统一日志器。
+     */
+    logger: Logger;
+}
+interface ExecutorPrepareRunInput {
+    /**
+     * 当前轮用户 query。
+     */
+    query: string;
+    /**
+     * 当前轮模型实例。
+     */
+    model: LanguageModel;
+    /**
+     * 当前显式运行上下文。
+     */
+    run_context: SessionRunContext;
+    /**
+     * 当前压缩重试次数。
+     */
+    retry_count: number;
+}
+interface ExecutorExecutePreparedRunInput {
+    /**
+     * 已装配好的执行输入。
+     */
+    execute_input: SessionExecuteInput;
+    /**
+     * 当前轮模型实例。
+     */
+    model: LanguageModel;
+    /**
+     * 当前显式运行上下文。
+     */
+    run_context: SessionRunContext;
+}
+interface ExecutorRecoveryRunInput {
+    /**
+     * 当前轮用户 query。
+     */
+    query: string;
+    /**
+     * 当前轮模型实例。
+     */
+    model: LanguageModel;
+    /**
+     * 当前显式运行上下文。
+     */
+    run_context: SessionRunContext;
+    /**
+     * 运行前装配执行输入。
+     */
+    prepare_execute_input: (input: ExecutorPrepareRunInput) => Promise<SessionExecuteInput>;
+    /**
+     * 执行已装配好的运行输入。
+     */
+    execute_prepared_run: (input: ExecutorExecutePreparedRunInput) => Promise<SessionRunResult>;
+}
+/**
+ * 执行恢复与重试策略服务。
+ */
+export declare class ExecutorRecoveryPolicy {
+    private readonly compaction_composer;
+    private readonly context_composer;
+    private readonly logger;
+    private retry_count;
+    constructor(options: ExecutorRecoveryPolicyOptions);
+    /**
+     * 重置当前 run 级状态。
+     */
+    reset_run_state(): void;
+    /**
+     * 执行一次带恢复策略的 session run。
+     */
+    run_with_retry(input: ExecutorRecoveryRunInput): Promise<SessionRunResult>;
+    private build_failure_result;
+}
+export {};
+//# sourceMappingURL=ExecutorRecoveryPolicy.d.ts.map

package/bin/executor/services/ExecutorRecoveryPolicy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExecutorRecoveryPolicy.d.ts","sourceRoot":"","sources":["../../../src/executor/services/ExecutorRecoveryPolicy.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4DAA4D,CAAC;AAC5G,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sDAAsD,CAAC;AACnG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,gCAAgC,CAAC;AAOxC,UAAU,6BAA6B;IACrC;;OAEG;IACH,mBAAmB,EAAE,yBAAyB,CAAC;IAE/C;;OAEG;IACH,gBAAgB,EAAE,sBAAsB,CAAC;IAEzC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,uBAAuB;IAC/B;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,KAAK,EAAE,aAAa,CAAC;IAErB;;OAEG;IACH,WAAW,EAAE,iBAAiB,CAAC;IAE/B;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,+BAA+B;IACvC;;OAEG;IACH,aAAa,EAAE,mBAAmB,CAAC;IAEnC;;OAEG;IACH,KAAK,EAAE,aAAa,CAAC;IAErB;;OAEG;IACH,WAAW,EAAE,iBAAiB,CAAC;CAChC;AAED,UAAU,wBAAwB;IAChC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,KAAK,EAAE,aAAa,CAAC;IAErB;;OAEG;IACH,WAAW,EAAE,iBAAiB,CAAC;IAE/B;;OAEG;IACH,qBAAqB,EAAE,CACrB,KAAK,EAAE,uBAAuB,KAC3B,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAElC;;OAEG;IACH,oBAAoB,EAAE,CACpB,KAAK,EAAE,+BAA+B,KACnC,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAChC;AAED;;GAEG;AACH,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA4B;IAChE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAyB;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,WAAW,CAAK;gBAEZ,OAAO,EAAE,6BAA6B;IAMlD;;OAEG;IACH,eAAe,IAAI,IAAI;IAIvB;;OAEG;IACG,cAAc,CAClB,KAAK,EAAE,wBAAwB,GAC9B,OAAO,CAAC,gBAAgB,CAAC;IA8C5B,OAAO,CAAC,oBAAoB;CA4B7B"}

package/bin/executor/services/ExecutorRecoveryPolicy.js

@@ -0,0 +1,87 @@
+/**
+ * ExecutorRecoveryPolicy：执行恢复与重试策略。
+ *
+ * 关键点（中文）
+ * - 统一封装“压缩后重试”和“普通失败兜底”逻辑。
+ * - Executor 只负责准备输入与调用策略，不再直接承载重试状态机。
+ * - 不改变外部行为，只把异常分流规则集中到一个地方。
+ */
+/**
+ * 可压缩错误的最大重试次数。
+ */
+const MAX_COMPACTION_RETRY_ATTEMPTS = 3;
+/**
+ * 执行恢复与重试策略服务。
+ */
+export class ExecutorRecoveryPolicy {
+    compaction_composer;
+    context_composer;
+    logger;
+    retry_count = 0;
+    constructor(options) {
+        this.compaction_composer = options.compaction_composer;
+        this.context_composer = options.context_composer;
+        this.logger = options.logger;
+    }
+    /**
+     * 重置当前 run 级状态。
+     */
+    reset_run_state() {
+        this.retry_count = 0;
+    }
+    /**
+     * 执行一次带恢复策略的 session run。
+     */
+    async run_with_retry(input) {
+        try {
+            const execute_input = await input.prepare_execute_input({
+                query: input.query,
+                model: input.model,
+                run_context: input.run_context,
+                retry_count: this.retry_count,
+            });
+            return await input.execute_prepared_run({
+                execute_input,
+                model: input.model,
+                run_context: input.run_context,
+            });
+        }
+        catch (error) {
+            if (this.compaction_composer.shouldCompactOnError(error)) {
+                await this.logger.log("info", "[agent] compacting", {
+                    retryCount: this.retry_count,
+                    error: String(error),
+                });
+                if (this.retry_count < MAX_COMPACTION_RETRY_ATTEMPTS) {
+                    this.retry_count += 1;
+                    return await this.run_with_retry(input);
+                }
+                return this.build_failure_result({
+                    error_text: "Context length exceeded and retries failed. Please resend your question.",
+                    fallback_text: "Context length exceeded and retries failed. Please resend your question.",
+                    run_context: input.run_context,
+                });
+            }
+            const error_text = String(error);
+            await this.logger.log("error", "Executor execution failed", {
+                error: error_text,
+            });
+            return this.build_failure_result({
+                error_text,
+                fallback_text: `Execution failed: ${error_text}`,
+                run_context: input.run_context,
+            });
+        }
+    }
+    build_failure_result(input) {
+        return {
+            success: false,
+            error: input.error_text,
+            assistantMessage: this.context_composer.buildFallbackAssistantMessage(input.fallback_text, input.run_context),
+            deferredPersistedUserMessages: [
+                ...input.run_context.deferredPersistedUserMessages,
+            ],
+        };
+    }
+}
+//# sourceMappingURL=ExecutorRecoveryPolicy.js.map

package/bin/executor/services/ExecutorRecoveryPolicy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExecutorRecoveryPolicy.js","sourceRoot":"","sources":["../../../src/executor/services/ExecutorRecoveryPolicy.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAYH;;GAEG;AACH,MAAM,6BAA6B,GAAG,CAAC,CAAC;AAyFxC;;GAEG;AACH,MAAM,OAAO,sBAAsB;IAChB,mBAAmB,CAA4B;IAC/C,gBAAgB,CAAyB;IACzC,MAAM,CAAS;IACxB,WAAW,GAAG,CAAC,CAAC;IAExB,YAAY,OAAsC;QAChD,IAAI,CAAC,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC;QACvD,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;QACjD,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,eAAe;QACb,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;IACvB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,cAAc,CAClB,KAA+B;QAE/B,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,qBAAqB,CAAC;gBACtD,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,WAAW,EAAE,KAAK,CAAC,WAAW;gBAC9B,WAAW,EAAE,IAAI,CAAC,WAAW;aAC9B,CAAC,CAAC;YACH,OAAO,MAAM,KAAK,CAAC,oBAAoB,CAAC;gBACtC,aAAa;gBACb,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,WAAW,EAAE,KAAK,CAAC,WAAW;aAC/B,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzD,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oBAAoB,EAAE;oBAClD,UAAU,EAAE,IAAI,CAAC,WAAW;oBAC5B,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;iBACrB,CAAC,CAAC;gBAEH,IAAI,IAAI,CAAC,WAAW,GAAG,6BAA6B,EAAE,CAAC;oBACrD,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC;oBACtB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;gBAC1C,CAAC;gBAED,OAAO,IAAI,CAAC,oBAAoB,CAAC;oBAC/B,UAAU,EACR,0EAA0E;oBAC5E,aAAa,EACX,0EAA0E;oBAC5E,WAAW,EAAE,KAAK,CAAC,WAAW;iBAC/B,CAAC,CAAC;YACL,CAAC;YAED,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YACjC,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,2BAA2B,EAAE;gBAC1D,KAAK,EAAE,UAAU;aAClB,CAAC,CAAC;YACH,OAAO,IAAI,CAAC,oBAAoB,CAAC;gBAC/B,UAAU;gBACV,aAAa,EAAE,qBAAqB,UAAU,EAAE;gBAChD,WAAW,EAAE,KAAK,CAAC,WAAW;aAC/B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEO,oBAAoB,CAAC,KAe5B;QACC,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,KAAK,CAAC,UAAU;YACvB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,CAAC,6BAA6B,CACnE,KAAK,CAAC,aAAa,EACnB,KAAK,CAAC,WAAW,CAClB;YACD,6BAA6B,EAAE;gBAC7B,GAAG,KAAK,CAAC,WAAW,CAAC,6BAA6B;aACnD;SACF,CAAC;IACJ,CAAC;CACF"}

package/bin/executor/store/history/SessionHistoryStore.d.ts

@@ -50,6 +50,18 @@ export interface SessionHistoryStore {
      * 追加一条消息到历史。
      */
     append(message: SessionMessageV1): Promise<void>;
+    /**
+     * 读取当前运行中的 assistant 快照。
+     */
+    readInflight(): Promise<SessionMessageV1 | null>;
+    /**
+     * 写入当前运行中的 assistant 快照。
+     */
+    writeInflight(message: SessionMessageV1): Promise<void>;
+    /**
+     * 用最终 assistant 收口 inflight 快照。
+     */
+    finalizeInflight(message?: SessionMessageV1 | null): Promise<void>;
     /**
      * 读取完整消息历史。
      */