@downcity/agent 1.1.430 → 1.1.438

package/bin/executor/messages/SessionModelMessages.js

@@ -6,29 +6,15 @@
  */
 import fs from "fs-extra";
 import path from "node:path";
-import { parse_chat_message_markup } from "../messages/ChatMessageMarkup.js";
 import { render_session_user_context } from "../../session/messages/SessionUserContext.js";
-/** 把完整 Session 上下文快照转换为模型消息。 */
-export async function session_context_to_model_messages(snapshot, project_root) {
-    const messages = await session_messages_to_model_messages(snapshot.messages, project_root);
-    if (!snapshot.summary?.text.trim())
-        return messages;
-    return [
-        {
-            role: "assistant",
-            content: [{ type: "text", text: snapshot.summary.text }],
-        },
-        ...messages,
-    ];
-}
 /** 把一组 canonical Session Message 转换为模型消息。 */
 export async function session_messages_to_model_messages(messages, project_root) {
     const output = [];
     for (const message of messages) {
-        if (message.type === "user") {
+        if (message.role === "user") {
             output.push(...await convert_user_message(message, project_root));
         }
-        else if (message.type === "assistant") {
+        else if (message.role === "agent") {
             output.push(...convert_assistant_message(message));
         }
     }
@@ -36,54 +22,89 @@ export async function session_messages_to_model_messages(messages, project_root)
 }
 /** 把单条 canonical User Message 转换为模型消息。 */
 async function convert_user_message(message, project_root) {
+    const converted = await convert_user_parts(message.parts, project_root);
+    return converted ? [converted] : [];
+}
+/** 将 canonical User Parts 投影为单条模型消息。 */
+async function convert_user_parts(parts, project_root) {
     const content = [];
-    const has_explicit_file = message.parts.some((part) => part.type === "file");
-    for (const part of message.parts) {
-        if (part.type === "text" && part.text.trim()) {
-            content.push({ type: "text", text: part.text });
-        }
-        else if (part.type === "context") {
-            content.push({
-                type: "text",
-                text: render_session_user_context(part.tag, part.context),
-            });
+    for (const part of parts) {
+        switch (part.type) {
+            case "text":
+                if (part.text.trim())
+                    content.push({ type: "text", text: part.text });
+                break;
+            case "context":
+                content.push({
+                    type: "text",
+                    text: render_session_user_context(part.tag, part.context),
+                });
+                break;
+            case "file":
+                content.push(await convert_file_part(part, project_root));
+                break;
+            case "data":
+                // Data Part 是持久化 UI 数据，不属于模型输入协议。
+                break;
+            default:
+                assert_never(part);
         }
-        else if (part.type === "file") {
-            content.push(await convert_file_part(part, project_root));
-        }
-    }
-    if (!has_explicit_file) {
-        content.push(...await read_markup_files(message, project_root));
     }
-    return content.length > 0 ? [{ role: "user", content }] : [];
+    return content.length > 0 ? { role: "user", content } : null;
 }
-/** 把单条 canonical Assistant Message 转换为 assistant 与 tool 消息。 */
+/** 把单条 canonical Agent Message 转换为模型 assistant 与 tool 消息。 */
 function convert_assistant_message(message) {
+    const output = [];
+    let current_step_id = null;
     const content = [];
     const tool_results = [];
-    for (const part of message.parts) {
-        if (part.type === "text" && part.text.trim()) {
-            content.push({ type: "text", text: part.text });
-        }
-        else if (part.type === "reasoning" && part.text.trim()) {
-            content.push({
-                type: "reasoning",
-                text: part.text,
-                ...(part.reasoning_signature
-                    ? { signature: part.reasoning_signature }
-                    : {}),
-            });
-        }
-        else if (part.type === "tool" && part.input !== undefined) {
-            append_tool_content(part, content, tool_results);
+    const flush_step = () => {
+        if (content.length > 0)
+            output.push({ role: "assistant", content: [...content] });
+        if (tool_results.length > 0)
+            output.push({ role: "tool", content: [...tool_results] });
+        content.length = 0;
+        tool_results.length = 0;
+    };
+    for (const part of [...message.parts].sort((left, right) => left.sequence - right.sequence)) {
+        const part_step_id = part.step_id ?? "__unscoped__";
+        if (current_step_id !== null && part_step_id !== current_step_id)
+            flush_step();
+        current_step_id = part_step_id;
+        switch (part.type) {
+            case "text":
+                if (part.text.trim())
+                    content.push({ type: "text", text: part.text });
+                break;
+            case "reasoning":
+                if (part.text.trim()) {
+                    content.push({
+                        type: "reasoning",
+                        text: part.text,
+                        ...(part.reasoning_signature
+                            ? { signature: part.reasoning_signature }
+                            : {}),
+                    });
+                }
+                break;
+            case "tool":
+                if (part.input !== undefined) {
+                    append_tool_content(part, content, tool_results);
+                }
+                break;
+            case "interaction":
+            case "file":
+            case "data":
+            case "action":
+            case "error":
+                // 这些 Part 只属于运行状态或宿主展示，不进入模型历史。
+                break;
+            default:
+                assert_never(part);
         }
     }
-    return [
-        ...(content.length > 0 ? [{ role: "assistant", content }] : []),
-        ...(tool_results.length > 0
-            ? [{ role: "tool", content: tool_results }]
-            : []),
-    ];
+    flush_step();
+    return output;
 }
 /** 把 canonical Tool Part 投影为模型工具调用和可选工具结果。 */
 function append_tool_content(part, content, tool_results) {
@@ -131,33 +152,6 @@ function build_model_file(part, source) {
         ...(part.filename ? { filename: part.filename } : {}),
     };
 }
-/** 解析兼容聊天入口写入文本中的附件标记。 */
-async function read_markup_files(message, project_root) {
-    const text = message.parts
-        .filter((part) => part.type === "text")
-        .map((part) => part.text)
-        .join("\n");
-    const output = [];
-    for (const file of parse_chat_message_markup(text).files) {
-        const media_type = guess_media_type(file.path);
-        if (!media_type || (!media_type.startsWith("image/") && media_type !== "application/pdf")) {
-            continue;
-        }
-        const file_path = resolve_local_file_path(file.path, project_root);
-        if (!await fs.pathExists(file_path))
-            continue;
-        output.push({
-            type: "file",
-            media_type,
-            source: {
-                type: "base64",
-                data: (await fs.readFile(file_path)).toString("base64"),
-            },
-            filename: path.basename(file_path),
-        });
-    }
-    return output;
-}
 /** 把本地文件引用限制在项目根目录内，绝对附件路径保持可读。 */
 function resolve_local_file_path(raw_path, project_root) {
     if (path.isAbsolute(raw_path))
@@ -170,25 +164,14 @@ function resolve_local_file_path(raw_path, project_root) {
     }
     return file_path;
 }
-/** 根据文件扩展名解析模型可用的 MIME type。 */
-function guess_media_type(file_path) {
-    const extension = path.extname(file_path).toLowerCase();
-    if (extension === ".png")
-        return "image/png";
-    if (extension === ".jpg" || extension === ".jpeg")
-        return "image/jpeg";
-    if (extension === ".webp")
-        return "image/webp";
-    if (extension === ".gif")
-        return "image/gif";
-    if (extension === ".pdf")
-        return "application/pdf";
-    return undefined;
-}
 /** 将未知值限制为可传输 JSON。 */
 function to_model_json_value(value) {
     if (value === undefined)
         return null;
     return JSON.parse(JSON.stringify(value));
 }
+/** 联合类型增加成员时，强制模型投影显式选择支持或忽略。 */
+function assert_never(value) {
+    throw new Error(`Unsupported Session model part: ${String(value.type)}`);
+}
 //# sourceMappingURL=SessionModelMessages.js.map

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

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

package/bin/executor/model/ModelStepRunner.d.ts

@@ -7,7 +7,7 @@
 import { type ModelClient, type ModelFinishReason, type ModelJsonValue, type ModelMessage, type ModelUsage, type RuntimeTool as Tool } from "@downcity/type";
 import type { SessionSystemMessage } from "../../executor/types/SessionPrompts.js";
 import type { SessionAssistantOutput } from "../../types/executor/SessionAssistantOutput.js";
-import type { SessionAssistantMessagePart } from "@downcity/type";
+import type { SessionAgentMessagePart } from "@downcity/type";
 /** 单个工具调用的执行事实。 */
 export interface ModelStepToolCall {
     /** 工具调用 ID。 */
@@ -38,10 +38,6 @@ export interface ModelStepResult {
     tool_calls: ModelStepToolCall[];
     /** 当前 Step 的工具结果。 */
     tool_results: ModelStepToolResult[];
-    /** 用于后续模型 Step 的消息。 */
-    response: {
-        messages: ModelMessage[];
-    };
     /** 供诊断代码读取的内容事实。 */
     content: Array<Record<string, unknown>>;
 }
@@ -65,7 +61,7 @@ export interface RunModelStepInput {
 /** 执行一个 Downcity 模型 Step 并收敛工具结果。 */
 export declare function run_model_step(input: RunModelStepInput): Promise<{
     /** 当前 Step 的 canonical Assistant Parts。 */
-    assistant_parts: SessionAssistantMessagePart[];
+    assistant_parts: SessionAgentMessagePart[];
     /** 当前 Step 的运行结果。 */
     step_result: ModelStepResult;
 }>;

package/bin/executor/model/ModelStepRunner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModelStepRunner.d.ts","sourceRoot":"","sources":["../../../src/executor/model/ModelStepRunner.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAEL,KAAK,WAAW,EAEhB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,YAAY,EAGjB,KAAK,UAAU,EACf,KAAK,WAAW,IAAI,IAAI,EAEzB,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC/E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AACzF,OAAO,KAAK,EACV,2BAA2B,EAE5B,MAAM,gBAAgB,CAAC;AAGxB,mBAAmB;AACnB,MAAM,WAAW,iBAAiB;IAChC,eAAe;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe;IACf,KAAK,EAAE,cAAc,CAAC;IACtB,2BAA2B;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,mBAAmB;AACnB,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;IAC5D,gBAAgB;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB;IACjB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,+BAA+B;AAC/B,MAAM,WAAW,eAAe;IAC9B,gBAAgB;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc;IACd,aAAa,EAAE,iBAAiB,CAAC;IACjC,4BAA4B;IAC5B,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,qBAAqB;IACrB,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,qBAAqB;IACrB,YAAY,EAAE,mBAAmB,EAAE,CAAC;IACpC,uBAAuB;IACvB,QAAQ,EAAE;QAAE,QAAQ,EAAE,YAAY,EAAE,CAAA;KAAE,CAAC;IACvC,oBAAoB;IACpB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CACzC;AAED,uBAAuB;AACvB,MAAM,WAAW,iBAAiB;IAChC,sBAAsB;IACtB,KAAK,EAAE,WAAW,CAAC;IACnB,oBAAoB;IACpB,MAAM,EAAE,oBAAoB,EAAE,CAAC;IAC/B,eAAe;IACf,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,iBAAiB;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,cAAc;IACd,YAAY,EAAE,WAAW,CAAC;IAC1B,gCAAgC;IAChC,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;IAC1C,kBAAkB;IAClB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1E;AAED,qCAAqC;AACrC,wBAAsB,cAAc,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC;IACtE,2CAA2C;IAC3C,eAAe,EAAE,2BAA2B,EAAE,CAAC;IAC/C,qBAAqB;IACrB,WAAW,EAAE,eAAe,CAAC;CAC9B,CAAC,CA8DD"}
+{"version":3,"file":"ModelStepRunner.d.ts","sourceRoot":"","sources":["../../../src/executor/model/ModelStepRunner.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,YAAY,EAGjB,KAAK,UAAU,EACf,KAAK,WAAW,IAAI,IAAI,EAEzB,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC/E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AACzF,OAAO,KAAK,EACV,uBAAuB,EAExB,MAAM,gBAAgB,CAAC;AAGxB,mBAAmB;AACnB,MAAM,WAAW,iBAAiB;IAChC,eAAe;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe;IACf,KAAK,EAAE,cAAc,CAAC;IACtB,2BAA2B;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,mBAAmB;AACnB,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;IAC5D,gBAAgB;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB;IACjB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,+BAA+B;AAC/B,MAAM,WAAW,eAAe;IAC9B,gBAAgB;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc;IACd,aAAa,EAAE,iBAAiB,CAAC;IACjC,4BAA4B;IAC5B,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,qBAAqB;IACrB,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,qBAAqB;IACrB,YAAY,EAAE,mBAAmB,EAAE,CAAC;IACpC,oBAAoB;IACpB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CACzC;AAED,uBAAuB;AACvB,MAAM,WAAW,iBAAiB;IAChC,sBAAsB;IACtB,KAAK,EAAE,WAAW,CAAC;IACnB,oBAAoB;IACpB,MAAM,EAAE,oBAAoB,EAAE,CAAC;IAC/B,eAAe;IACf,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,iBAAiB;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,cAAc;IACd,YAAY,EAAE,WAAW,CAAC;IAC1B,gCAAgC;IAChC,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;IAC1C,kBAAkB;IAClB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1E;AAED,qCAAqC;AACrC,wBAAsB,cAAc,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC;IACtE,2CAA2C;IAC3C,eAAe,EAAE,uBAAuB,EAAE,CAAC;IAC3C,qBAAqB;IACrB,WAAW,EAAE,eAAe,CAAC;CAC9B,CAAC,CAgDD"}

package/bin/executor/model/ModelStepRunner.js

@@ -28,19 +28,6 @@ export async function run_model_step(input) {
         });
     }
     const assistant_parts = append_tool_results(collected.assistant_parts, tool_results);
-    const response_messages = [collected.assistant_model_message];
-    if (tool_results.length > 0) {
-        response_messages.push({
-            role: "tool",
-            content: tool_results.map((result) => ({
-                type: "tool_result",
-                tool_call_id: result.tool_call_id,
-                tool_name: result.tool_name,
-                outcome: result.success ? "succeeded" : "failed",
-                content: [{ type: "json", value: to_model_json_value(result.output) }],
-            })),
-        });
-    }
     return {
         assistant_parts,
         step_result: {
@@ -49,7 +36,6 @@ export async function run_model_step(input) {
             ...(collected.usage ? { usage: collected.usage } : {}),
             tool_calls: collected.tool_calls,
             tool_results,
-            response: { messages: response_messages },
             content: collected.tool_calls.map((tool_call) => ({
                 type: "tool-call",
                 ...tool_call,
@@ -59,7 +45,6 @@ export async function run_model_step(input) {
 }
 /** 模型事件聚合器。 */
 class StepEventCollector {
-    model_content = [];
     assistant_parts = [];
     text_by_id = new Map();
     reasoning_by_id = new Map();
@@ -84,7 +69,6 @@ class StepEventCollector {
         }
         else if (event.type === "text_finish") {
             const text = this.text_by_id.get(event.content_id) ?? "";
-            this.model_content.push({ type: "text", text });
             this.assistant_parts.push({
                 part_id: `text:${event.content_id}`,
                 sequence: this.assistant_parts.length + 1,
@@ -101,11 +85,6 @@ class StepEventCollector {
         }
         else if (event.type === "reasoning_finish") {
             const text = this.reasoning_by_id.get(event.content_id) ?? "";
-            this.model_content.push({
-                type: "reasoning",
-                text,
-                ...(event.signature ? { signature: event.signature } : {}),
-            });
             this.assistant_parts.push({
                 part_id: `reasoning:${event.content_id}`,
                 sequence: this.assistant_parts.length + 1,
@@ -128,12 +107,6 @@ class StepEventCollector {
                 tool.input = event.input;
                 if (event.input_error)
                     tool.input_error = event.input_error;
-                this.model_content.push({
-                    type: "tool_call",
-                    tool_call_id: tool.tool_call_id,
-                    tool_name: tool.tool_name,
-                    input: tool.input,
-                });
                 this.assistant_parts.push({
                     part_id: `tool:${tool.tool_call_id}`,
                     sequence: this.assistant_parts.length + 1,
@@ -158,7 +131,6 @@ class StepEventCollector {
             throw new Error("Model stream ended without model_finish");
         return {
             assistant_parts: this.assistant_parts,
-            assistant_model_message: { role: "assistant", content: this.model_content },
             finish_reason: this.finish_reason,
             ...(this.usage ? { usage: this.usage } : {}),
             text: this.text,

package/bin/executor/model/ModelStepRunner.js.map

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

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

@@ -3,89 +3,32 @@
  *
  * 关键点（中文）
  * - 统一封装“压缩后重试”和“普通失败兜底”逻辑。
- * - Executor 只负责准备输入与调用策略，不再直接承载重试状态机。
+ * - Executor 提供单次 Turn 行为，本模块只决定是否恢复并重试。
  * - 不改变外部行为，只把异常分流规则集中到一个地方。
  */
-import type { ModelClient } from "@downcity/type";
 import type { Logger } from "../../utils/logger/Logger.js";
-import type { SessionTurnContext } from "../../types/executor/SessionTurnContext.js";
-import type { SessionStepExecutionInput, SessionTurnExecutionResult } from "../../types/session/SessionExecution.js";
+import type { SessionTurnExecutionResult } from "../../types/session/SessionExecution.js";
 interface ExecutorRecoveryPolicyOptions {
     /** 当前 Session 稳定标识。 */
     session_id: string;
-    /** 判断错误是否需要持久化压缩后重试。 */
-    should_compact: (error: unknown) => boolean;
+    /** 请求 Composer 尝试推进上下文派生状态。 */
+    recover_context: (error: unknown) => Promise<boolean>;
     /**
      * 当前 session 统一日志器。
      */
     logger: Logger;
 }
-interface ExecutorPrepareExecutionInput {
-    /**
-     * 当前轮用户 query。
-     */
-    query: string;
-    /**
-     * 当前轮模型实例。
-     */
-    model: ModelClient;
-    /**
-     * 当前显式运行上下文。
-     */
-    turn_context: SessionTurnContext;
-    /**
-     * 当前压缩重试次数。
-     */
-    retry_count: number;
-}
-interface ExecutorExecutePreparedInput {
-    /**
-     * 已装配好的执行输入。
-     */
-    execute_input: SessionStepExecutionInput;
-    /**
-     * 当前轮模型实例。
-     */
-    model: ModelClient;
-    /**
-     * 当前显式运行上下文。
-     */
-    turn_context: SessionTurnContext;
-}
 interface ExecutorRecoveryInput {
-    /**
-     * 当前轮用户 query。
-     */
-    query: string;
-    /**
-     * 当前轮模型实例。
-     */
-    model: ModelClient;
-    /**
-     * 当前显式运行上下文。
-     */
-    turn_context: SessionTurnContext;
-    /**
-     * 运行前装配执行输入。
-     */
-    prepare_execute_input: (input: ExecutorPrepareExecutionInput) => Promise<SessionStepExecutionInput>;
-    /**
-     * 执行已装配好的运行输入。
-     */
-    execute_prepared_input: (input: ExecutorExecutePreparedInput) => Promise<SessionTurnExecutionResult>;
+    /** 按当前恢复次数执行完整 Turn。 */
+    execute_turn: (retry_count: number) => Promise<SessionTurnExecutionResult>;
 }
 /**
  * 执行恢复与重试策略服务。
  */
 export declare class ExecutorRecoveryPolicy {
-    private readonly should_compact;
+    private readonly recover_context;
     private readonly logger;
-    private retry_count;
     constructor(options: ExecutorRecoveryPolicyOptions);
-    /**
-     * 重置当前 Turn 执行状态。
-     */
-    reset_execution_state(): void;
     /**
      * 执行一次带恢复策略的 Session Turn。
      */

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

@@ -1 +1 @@
-{"version":3,"file":"ExecutorRecoveryPolicy.d.ts","sourceRoot":"","sources":["../../../src/executor/services/ExecutorRecoveryPolicy.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC3B,MAAM,qCAAqC,CAAC;AAO7C,UAAU,6BAA6B;IACrC,uBAAuB;IACvB,UAAU,EAAE,MAAM,CAAC;IAEnB,wBAAwB;IACxB,cAAc,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;IAE5C;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,6BAA6B;IACrC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,KAAK,EAAE,WAAW,CAAC;IAEnB;;OAEG;IACH,YAAY,EAAE,kBAAkB,CAAC;IAEjC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,4BAA4B;IACpC;;OAEG;IACH,aAAa,EAAE,yBAAyB,CAAC;IAEzC;;OAEG;IACH,KAAK,EAAE,WAAW,CAAC;IAEnB;;OAEG;IACH,YAAY,EAAE,kBAAkB,CAAC;CAClC;AAED,UAAU,qBAAqB;IAC7B;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,KAAK,EAAE,WAAW,CAAC;IAEnB;;OAEG;IACH,YAAY,EAAE,kBAAkB,CAAC;IAEjC;;OAEG;IACH,qBAAqB,EAAE,CACrB,KAAK,EAAE,6BAA6B,KACjC,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAExC;;OAEG;IACH,sBAAsB,EAAE,CACtB,KAAK,EAAE,4BAA4B,KAChC,OAAO,CAAC,0BAA0B,CAAC,CAAC;CAC1C;AAED;;GAEG;AACH,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkD;IACjF,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,WAAW,CAAK;gBAEZ,OAAO,EAAE,6BAA6B;IASlD;;OAEG;IACH,qBAAqB,IAAI,IAAI;IAI7B;;OAEG;IACG,kBAAkB,CACtB,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,0BAA0B,CAAC;IA2CtC,OAAO,CAAC,oBAAoB;CAoB7B"}
+{"version":3,"file":"ExecutorRecoveryPolicy.d.ts","sourceRoot":"","sources":["../../../src/executor/services/ExecutorRecoveryPolicy.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAOtF,UAAU,6BAA6B;IACrC,uBAAuB;IACvB,UAAU,EAAE,MAAM,CAAC;IAEnB,+BAA+B;IAC/B,eAAe,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAEtD;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,qBAAqB;IAC7B,wBAAwB;IACxB,YAAY,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,0BAA0B,CAAC,CAAC;CAC5E;AAED;;GAEG;AACH,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAmD;IACnF,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;gBAEpB,OAAO,EAAE,6BAA6B;IASlD;;OAEG;IACG,kBAAkB,CACtB,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,0BAA0B,CAAC;IAmCtC,OAAO,CAAC,oBAAoB;CAa7B"}

package/bin/executor/services/ExecutorRecoveryPolicy.js

@@ -3,7 +3,7 @@
  *
  * 关键点（中文）
  * - 统一封装“压缩后重试”和“普通失败兜底”逻辑。
- * - Executor 只负责准备输入与调用策略，不再直接承载重试状态机。
+ * - Executor 提供单次 Turn 行为，本模块只决定是否恢复并重试。
  * - 不改变外部行为，只把异常分流规则集中到一个地方。
  */
 /**
@@ -14,63 +14,50 @@ const MAX_COMPACTION_RETRY_ATTEMPTS = 3;
  * 执行恢复与重试策略服务。
  */
 export class ExecutorRecoveryPolicy {
-    should_compact;
+    recover_context;
     logger;
-    retry_count = 0;
     constructor(options) {
         const session_id = String(options.session_id || "").trim();
-        this.should_compact = options.should_compact;
+        this.recover_context = options.recover_context;
         this.logger = options.logger;
         if (!session_id) {
             throw new Error("ExecutorRecoveryPolicy requires a non-empty session_id");
         }
     }
-    /**
-     * 重置当前 Turn 执行状态。
-     */
-    reset_execution_state() {
-        this.retry_count = 0;
-    }
     /**
      * 执行一次带恢复策略的 Session Turn。
      */
     async execute_with_retry(input) {
-        try {
-            const execute_input = await input.prepare_execute_input({
-                query: input.query,
-                model: input.model,
-                turn_context: input.turn_context,
-                retry_count: this.retry_count,
-            });
-            return await input.execute_prepared_input({
-                execute_input,
-                model: input.model,
-                turn_context: input.turn_context,
-            });
-        }
-        catch (error) {
-            if (this.should_compact(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.execute_with_retry(input);
+        let retry_count = 0;
+        while (true) {
+            try {
+                return await input.execute_turn(retry_count);
+            }
+            catch (error) {
+                if (retry_count < MAX_COMPACTION_RETRY_ATTEMPTS) {
+                    const recovered = await this.recover_context(error);
+                    if (recovered) {
+                        await this.logger.log("info", "[agent] compacting", {
+                            retryCount: retry_count,
+                            error: String(error),
+                        });
+                        retry_count += 1;
+                        continue;
+                    }
                 }
+                if (retry_count > 0) {
+                    return this.build_failure_result({
+                        error_text: "Context length exceeded and retries failed. Please resend your question.",
+                    });
+                }
+                const error_text = String(error);
+                await this.logger.log("error", "Executor execution failed", {
+                    error: error_text,
+                });
                 return this.build_failure_result({
-                    error_text: "Context length exceeded and retries failed. Please resend your question.",
-                    turn_context: input.turn_context,
+                    error_text,
                 });
             }
-            const error_text = String(error);
-            await this.logger.log("error", "Executor execution failed", {
-                error: error_text,
-            });
-            return this.build_failure_result({
-                error_text,
-                turn_context: input.turn_context,
-            });
         }
     }
     build_failure_result(input) {
@@ -78,9 +65,6 @@ export class ExecutorRecoveryPolicy {
             success: false,
             text: "",
             error: input.error_text,
-            deferred_persisted_user_messages: [
-                ...input.turn_context.input.deferred_user_messages(),
-            ],
         };
     }
 }