@downcity/agent 1.1.408 → 1.1.437

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

@@ -3,10 +3,10 @@
  *
  * 该模块只提取可见文本并写入统一 Logger，不参与协议转换或持久化。
  */
-import type { SessionAssistantMessagePart } from "../../types/session/SessionMessage.js";
+import type { SessionAgentMessagePart } from "@downcity/type";
 import type { Logger } from "../../utils/logger/Logger.js";
 /** 从 canonical Assistant Parts 提取可见文本。 */
-export declare function extract_assistant_text_for_log(parts: readonly SessionAssistantMessagePart[]): string;
+export declare function extract_assistant_text_for_log(parts: readonly SessionAgentMessagePart[]): string;
 /** 立即输出 Assistant 文本日志。 */
-export declare function log_assistant_message_now(logger: Logger, parts: readonly SessionAssistantMessagePart[]): Promise<void>;
+export declare function log_assistant_message_now(logger: Logger, parts: readonly SessionAgentMessagePart[]): Promise<void>;
 //# sourceMappingURL=SessionMessageLog.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"SessionMessageLog.d.ts","sourceRoot":"","sources":["../../../src/executor/messages/SessionMessageLog.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,mCAAmC,CAAC;AACrF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,0CAA0C;AAC1C,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,SAAS,2BAA2B,EAAE,GAC5C,MAAM,CAKR;AAED,2BAA2B;AAC3B,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,SAAS,2BAA2B,EAAE,GAC5C,OAAO,CAAC,IAAI,CAAC,CAIf"}
+{"version":3,"file":"SessionMessageLog.d.ts","sourceRoot":"","sources":["../../../src/executor/messages/SessionMessageLog.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,0CAA0C;AAC1C,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,SAAS,uBAAuB,EAAE,GACxC,MAAM,CAKR;AAED,2BAA2B;AAC3B,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,SAAS,uBAAuB,EAAE,GACxC,OAAO,CAAC,IAAI,CAAC,CAIf"}

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

@@ -1 +1 @@
-{"version":3,"file":"SessionMessageLog.js","sourceRoot":"","sources":["../../../src/executor/messages/SessionMessageLog.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,0CAA0C;AAC1C,MAAM,UAAU,8BAA8B,CAC5C,KAA6C;IAE7C,OAAO,KAAK;SACT,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1D,IAAI,CAAC,IAAI,CAAC;SACV,IAAI,EAAE,CAAC;AACZ,CAAC;AAED,2BAA2B;AAC3B,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,MAAc,EACd,KAA6C;IAE7C,MAAM,IAAI,GAAG,8BAA8B,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC;IAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACvD,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,eAAe,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAC7F,CAAC"}
+{"version":3,"file":"SessionMessageLog.js","sourceRoot":"","sources":["../../../src/executor/messages/SessionMessageLog.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,0CAA0C;AAC1C,MAAM,UAAU,8BAA8B,CAC5C,KAAyC;IAEzC,OAAO,KAAK;SACT,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1D,IAAI,CAAC,IAAI,CAAC;SACV,IAAI,EAAE,CAAC;AACZ,CAAC;AAED,2BAA2B;AAC3B,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,MAAc,EACd,KAAyC;IAEzC,MAAM,IAAI,GAAG,8BAA8B,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC;IAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACvD,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,eAAe,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAC7F,CAAC"}

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

@@ -5,10 +5,7 @@
  * 不经过 UI Message、Executor Record 或 Provider 私有格式。
  */
 import type { ModelMessage } from "@downcity/type";
-import type { SessionMessage } from "../../types/session/SessionMessage.js";
-import type { SessionContextSnapshot } from "../../types/session/SessionSegment.js";
-/** 把完整 Session 上下文快照转换为模型消息。 */
-export declare function session_context_to_model_messages(snapshot: Readonly<SessionContextSnapshot>, project_root?: string): Promise<ModelMessage[]>;
+import type { SessionMessage } from "@downcity/type";
 /** 把一组 canonical Session Message 转换为模型消息。 */
 export declare function session_messages_to_model_messages(messages: readonly SessionMessage[], project_root?: string): Promise<ModelMessage[]>;
 //# sourceMappingURL=SessionModelMessages.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"SessionModelMessages.d.ts","sourceRoot":"","sources":["../../../src/executor/messages/SessionModelMessages.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAIV,YAAY,EACb,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAGV,cAAc,EAGf,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAEhF,gCAAgC;AAChC,wBAAsB,iCAAiC,CACrD,QAAQ,EAAE,QAAQ,CAAC,sBAAsB,CAAC,EAC1C,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,YAAY,EAAE,CAAC,CAazB;AAED,6CAA6C;AAC7C,wBAAsB,kCAAkC,CACtD,QAAQ,EAAE,SAAS,cAAc,EAAE,EACnC,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,YAAY,EAAE,CAAC,CAUzB"}
+{"version":3,"file":"SessionModelMessages.d.ts","sourceRoot":"","sources":["../../../src/executor/messages/SessionModelMessages.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAIV,YAAY,EACb,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAGV,cAAc,EAIf,MAAM,gBAAgB,CAAC;AAExB,6CAA6C;AAC7C,wBAAsB,kCAAkC,CACtD,QAAQ,EAAE,SAAS,cAAc,EAAE,EACnC,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,YAAY,EAAE,CAAC,CAUzB"}

package/bin/executor/messages/SessionModelMessages.js

@@ -6,28 +6,15 @@
  */
 import fs from "fs-extra";
 import path from "node:path";
-import { parse_chat_message_markup } from "./ChatMessageMarkup.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,
-    ];
-}
+import { render_session_user_context } from "../../session/messages/SessionUserContext.js";
 /** 把一组 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));
         }
     }
@@ -35,48 +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 === "file") {
-            content.push(await convert_file_part(part, project_root));
+    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);
         }
     }
-    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) {
@@ -124,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))
@@ -163,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/ModelGenerate.d.ts

@@ -3,7 +3,8 @@
  *
  * 标题、压缩和调度等旁路复用同一标准协议，不建立第二套模型运行时。
  */
-import type { ModelCall, ModelClient, ModelFinishReason, ModelMessage, ModelToolCallContent, ModelUsage } from "@downcity/type";
+import type { ModelCall, ModelClient, ModelFinishReason, ModelMessage, ModelRequestKind, ModelToolCallContent, ModelUsage } from "@downcity/type";
+import type { ModelRequestFailureReporter } from "../../types/executor/ModelRequest.js";
 /** 单次非交互模型生成结果。 */
 export interface ModelGenerateResult {
     /** 聚合后的普通文本。 */
@@ -15,8 +16,17 @@ export interface ModelGenerateResult {
     /** Provider 返回的可选 usage。 */
     usage?: ModelUsage;
 }
+/** 非交互模型生成执行选项。 */
+export interface ModelGenerateOptions {
+    /** 当前模型请求用途。 */
+    request_kind: Exclude<ModelRequestKind, "turn">;
+    /** 可选取消信号。 */
+    signal?: AbortSignal;
+    /** 可选逐次失败通知入口。 */
+    on_failure?: ModelRequestFailureReporter;
+}
 /** 执行一次不包含 Agent 工具循环的模型调用。 */
-export declare function generate_model(model: ModelClient, call: ModelCall, signal?: AbortSignal): Promise<ModelGenerateResult>;
+export declare function generate_model(model: ModelClient, call: ModelCall, options: ModelGenerateOptions): Promise<ModelGenerateResult>;
 /** 构造单轮 system + user 文本消息。 */
 export declare function build_text_model_messages(system: string, prompt: string): ModelMessage[];
 //# sourceMappingURL=ModelGenerate.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ModelGenerate.d.ts","sourceRoot":"","sources":["../../../src/executor/model/ModelGenerate.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,SAAS,EACT,WAAW,EACX,iBAAiB,EACjB,YAAY,EACZ,oBAAoB,EACpB,UAAU,EACX,MAAM,gBAAgB,CAAC;AAGxB,mBAAmB;AACnB,MAAM,WAAW,mBAAmB;IAClC,gBAAgB;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB;IAChB,UAAU,EAAE,oBAAoB,EAAE,CAAC;IACnC,cAAc;IACd,aAAa,EAAE,iBAAiB,CAAC;IACjC,4BAA4B;IAC5B,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,+BAA+B;AAC/B,wBAAsB,cAAc,CAClC,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,mBAAmB,CAAC,CA6B9B;AAED,+BAA+B;AAC/B,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY,EAAE,CAOxF"}
+{"version":3,"file":"ModelGenerate.d.ts","sourceRoot":"","sources":["../../../src/executor/model/ModelGenerate.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,SAAS,EACT,WAAW,EACX,iBAAiB,EACjB,YAAY,EACZ,gBAAgB,EAChB,oBAAoB,EACpB,UAAU,EACX,MAAM,gBAAgB,CAAC;AAGxB,OAAO,KAAK,EACV,2BAA2B,EAC5B,MAAM,kCAAkC,CAAC;AAE1C,mBAAmB;AACnB,MAAM,WAAW,mBAAmB;IAClC,gBAAgB;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB;IAChB,UAAU,EAAE,oBAAoB,EAAE,CAAC;IACnC,cAAc;IACd,aAAa,EAAE,iBAAiB,CAAC;IACjC,4BAA4B;IAC5B,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,mBAAmB;AACnB,MAAM,WAAW,oBAAoB;IACnC,gBAAgB;IAChB,YAAY,EAAE,OAAO,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;IAChD,cAAc;IACd,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,kBAAkB;IAClB,UAAU,CAAC,EAAE,2BAA2B,CAAC;CAC1C;AAED,+BAA+B;AAC/B,wBAAsB,cAAc,CAClC,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,mBAAmB,CAAC,CAQ9B;AA8CD,+BAA+B;AAC/B,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY,EAAE,CAOxF"}

package/bin/executor/model/ModelGenerate.js

@@ -3,25 +3,34 @@
  *
  * 标题、压缩和调度等旁路复用同一标准协议，不建立第二套模型运行时。
  */
-import { ModelStreamValidator } from "@downcity/type";
+import { execute_model_request } from "../model/ModelRequestRunner.js";
+import { consume_model_stream } from "../model/ModelStreamConsumer.js";
 /** 执行一次不包含 Agent 工具循环的模型调用。 */
-export async function generate_model(model, call, signal) {
-    const stream = await model.stream(call, signal);
-    const text_by_id = new Map();
+export async function generate_model(model, call, options) {
+    return await execute_model_request({
+        request_kind: options.request_kind,
+        abort_signal: options.signal,
+        on_failure: options.on_failure,
+        execute_attempt: async () => await generate_model_once(model, call, options.signal),
+    });
+}
+/** 执行一次非交互模型调用并聚合完整结果。 */
+async function generate_model_once(model, call, signal) {
     const tools = new Map();
     const tool_calls = [];
     let text = "";
+    let has_partial_output = false;
     let finish_reason;
     let usage;
-    const validator = new ModelStreamValidator();
-    for await (const event of stream) {
-        validator.accept(event);
-        if (event.type === "model_error")
-            throw new Error(event.error.message);
-        if (event.type === "text_start")
-            text_by_id.set(event.content_id, "");
-        else if (event.type === "text_delta") {
-            text_by_id.set(event.content_id, (text_by_id.get(event.content_id) ?? "") + event.delta);
+    await consume_model_stream(model, call, signal, () => has_partial_output, (event) => {
+        if (event.type === "text_delta" ||
+            event.type === "reasoning_start" ||
+            event.type === "reasoning_delta" ||
+            event.type === "tool_call_start" ||
+            event.type === "tool_call_delta") {
+            has_partial_output = true;
+        }
+        if (event.type === "text_delta") {
             text += event.delta;
         }
         else if (event.type === "tool_call_start") {
@@ -37,8 +46,7 @@ export async function generate_model(model, call, signal) {
             usage = event.usage;
         else if (event.type === "model_finish")
             finish_reason = event.finish_reason;
-    }
-    validator.finish();
+    });
     if (!finish_reason)
         throw new Error("Model stream ended without model_finish");
     return { text, tool_calls, finish_reason, ...(usage ? { usage } : {}) };

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

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

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

@@ -0,0 +1,29 @@
+/**
+ * Agent 模型请求统一执行器。
+ *
+ * 本模块唯一拥有请求重试次数、退避和逐次失败通知；具体模型流解析由调用方提供。
+ */
+import type { ModelRequestKind } from "@downcity/type";
+import type { ModelRequestFailureReporter } from "../../types/executor/ModelRequest.js";
+import { ModelStreamFailure } from "../model/ModelStreamFailure.js";
+/** 首次模型调用失败后的最大自动重试次数。 */
+export declare const MAX_MODEL_REQUEST_RETRIES = 5;
+/** 包含首次调用与自动重试在内的最大模型调用次数。 */
+export declare const MAX_MODEL_REQUEST_ATTEMPTS: number;
+/** 统一模型请求执行参数。 */
+interface ExecuteModelRequestInput<TResult> {
+    /** 当前模型请求用途。 */
+    request_kind: ModelRequestKind;
+    /** 执行一次模型调用及其流消费。 */
+    execute_attempt: () => Promise<TResult>;
+    /** 可选取消信号。 */
+    abort_signal?: AbortSignal;
+    /** 可选逐次失败通知入口。 */
+    on_failure?: ModelRequestFailureReporter;
+    /** 判断错误是否交给当前执行器自动重试。 */
+    should_retry?: (error: ModelStreamFailure) => boolean;
+}
+/** 执行一次带统一恢复策略的模型请求。 */
+export declare function execute_model_request<TResult>(input: ExecuteModelRequestInput<TResult>): Promise<TResult>;
+export {};
+//# sourceMappingURL=ModelRequestRunner.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ModelRequestRunner.d.ts","sourceRoot":"","sources":["../../../src/executor/model/ModelRequestRunner.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AACpF,OAAO,EACL,kBAAkB,EAEnB,MAAM,uCAAuC,CAAC;AAE/C,0BAA0B;AAC1B,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAE3C,8BAA8B;AAC9B,eAAO,MAAM,0BAA0B,QAAgC,CAAC;AAKxE,kBAAkB;AAClB,UAAU,wBAAwB,CAAC,OAAO;IACxC,gBAAgB;IAChB,YAAY,EAAE,gBAAgB,CAAC;IAC/B,qBAAqB;IACrB,eAAe,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACxC,cAAc;IACd,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,kBAAkB;IAClB,UAAU,CAAC,EAAE,2BAA2B,CAAC;IACzC,yBAAyB;IACzB,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,OAAO,CAAC;CACvD;AAED,wBAAwB;AACxB,wBAAsB,qBAAqB,CAAC,OAAO,EACjD,KAAK,EAAE,wBAAwB,CAAC,OAAO,CAAC,GACvC,OAAO,CAAC,OAAO,CAAC,CAyClB"}

package/bin/executor/model/ModelRequestRunner.js

@@ -0,0 +1,77 @@
+/**
+ * Agent 模型请求统一执行器。
+ *
+ * 本模块唯一拥有请求重试次数、退避和逐次失败通知；具体模型流解析由调用方提供。
+ */
+import { ModelStreamFailure, is_retryable_empty_model_stream_failure, } from "../model/ModelStreamFailure.js";
+/** 首次模型调用失败后的最大自动重试次数。 */
+export const MAX_MODEL_REQUEST_RETRIES = 5;
+/** 包含首次调用与自动重试在内的最大模型调用次数。 */
+export const MAX_MODEL_REQUEST_ATTEMPTS = MAX_MODEL_REQUEST_RETRIES + 1;
+/** 模型请求重试退避，避免连续冲击同一 Provider。 */
+const MODEL_REQUEST_RETRY_DELAYS_MS = [300, 1_000, 2_000, 4_000, 8_000];
+/** 执行一次带统一恢复策略的模型请求。 */
+export async function execute_model_request(input) {
+    for (let attempt = 1; attempt <= MAX_MODEL_REQUEST_ATTEMPTS; attempt += 1) {
+        try {
+            return await input.execute_attempt();
+        }
+        catch (error) {
+            if (!(error instanceof ModelStreamFailure))
+                throw error;
+            const eligible_for_retry = error.code !== "cancelled" &&
+                input.abort_signal?.aborted !== true &&
+                is_retryable_empty_model_stream_failure(error) &&
+                (input.should_retry?.(error) ?? true);
+            const can_retry = eligible_for_retry && attempt < MAX_MODEL_REQUEST_ATTEMPTS;
+            if (error.code !== "cancelled" && input.abort_signal?.aborted !== true) {
+                try {
+                    await input.on_failure?.({
+                        request_kind: input.request_kind,
+                        code: error.code,
+                        message: error.message,
+                        retryable: error.retryable,
+                        attempt,
+                        max_attempts: eligible_for_retry
+                            ? MAX_MODEL_REQUEST_ATTEMPTS
+                            : attempt,
+                        will_retry: can_retry,
+                        ...(error.provider_request_id
+                            ? { provider_request_id: error.provider_request_id }
+                            : {}),
+                    }, error);
+                }
+                catch {
+                    // 关键点（中文）：诊断通知失败不能改变模型请求恢复结果。
+                }
+            }
+            if (!can_retry)
+                throw error;
+            await wait_for_model_request_retry(resolve_model_request_retry_delay(attempt), input.abort_signal);
+        }
+    }
+    throw new Error("Model request retry state is invalid");
+}
+/** 读取指定重试序号对应的退避时间。 */
+function resolve_model_request_retry_delay(retry_count) {
+    return MODEL_REQUEST_RETRY_DELAYS_MS[retry_count - 1] ??
+        MODEL_REQUEST_RETRY_DELAYS_MS.at(-1) ??
+        8_000;
+}
+/** 等待下一次模型请求，并在调用方取消时立即结束。 */
+async function wait_for_model_request_retry(delay_ms, abort_signal) {
+    if (abort_signal?.aborted)
+        throw abort_signal.reason;
+    await new Promise((resolve, reject) => {
+        const timer = setTimeout(() => {
+            abort_signal?.removeEventListener("abort", on_abort);
+            resolve();
+        }, delay_ms);
+        const on_abort = () => {
+            clearTimeout(timer);
+            reject(abort_signal?.reason);
+        };
+        abort_signal?.addEventListener("abort", on_abort, { once: true });
+    });
+}
+//# sourceMappingURL=ModelRequestRunner.js.map

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

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

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

@@ -5,9 +5,9 @@
  * 标准事件会原样交给 Session 输出端口，不产生 UI-shaped 中间事件。
  */
 import { type ModelClient, type ModelFinishReason, type ModelJsonValue, type ModelMessage, type ModelUsage, type RuntimeTool as Tool } from "@downcity/type";
-import type { SessionSystemMessage } from "../types/SessionPrompts.js";
+import type { SessionSystemMessage } from "../../executor/types/SessionPrompts.js";
 import type { SessionAssistantOutput } from "../../types/executor/SessionAssistantOutput.js";
-import type { SessionAssistantMessagePart } from "../../types/session/SessionMessage.js";
+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,EAGL,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,mCAAmC,CAAC;AAG3C,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,CA4DD"}
+{"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"}