@downcity/agent 1.1.430 → 1.1.437

package/src/executor/messages/SessionModelMessages.ts

@@ -13,35 +13,15 @@ import type {
   ModelJsonValue,
   ModelMessage,
 } from "@downcity/type";
-import { parse_chat_message_markup } from "@executor/messages/ChatMessageMarkup.js";
 import { render_session_user_context } from "@/session/messages/SessionUserContext.js";
 import type {
-  SessionAssistantMessage,
-  SessionAssistantToolPart,
+  SessionAgentMessage,
+  SessionAgentToolPart,
   SessionMessage,
   SessionUserFilePart,
   SessionUserMessage,
+  SessionUserMessagePart,
 } from "@downcity/type";
-import type { SessionContextSnapshot } from "@/types/session/SessionSegment.js";
-
-/** 把完整 Session 上下文快照转换为模型消息。 */
-export async function session_context_to_model_messages(
-  snapshot: Readonly<SessionContextSnapshot>,
-  project_root?: string,
-): Promise<ModelMessage[]> {
-  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(
@@ -50,9 +30,9 @@ export async function session_messages_to_model_messages(
 ): Promise<ModelMessage[]> {
   const output: ModelMessage[] = [];
   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));
     }
   }
@@ -64,56 +44,94 @@ async function convert_user_message(
   message: SessionUserMessage,
   project_root?: string,
 ): Promise<ModelMessage[]> {
+  const converted = await convert_user_parts(message.parts, project_root);
+  return converted ? [converted] : [];
+}
+
+/** 将 canonical User Parts 投影为单条模型消息。 */
+async function convert_user_parts(
+  parts: readonly SessionUserMessagePart[],
+  project_root?: string,
+): Promise<ModelMessage | null> {
   const content: ModelContent[] = [];
-  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),
-      });
-    } 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 消息。 */
-function convert_assistant_message(message: SessionAssistantMessage): ModelMessage[] {
+/** 把单条 canonical Agent Message 转换为模型 assistant 与 tool 消息。 */
+function convert_assistant_message(message: SessionAgentMessage): ModelMessage[] {
+  const output: ModelMessage[] = [];
+  let current_step_id: string | null = null;
   const content: ModelContent[] = [];
   const tool_results: ModelContent[] = [];
-  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 = (): void => {
+    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 } as ModelMessage] : []),
-    ...(tool_results.length > 0
-      ? [{ role: "tool", content: tool_results } as ModelMessage]
-      : []),
-  ];
+  flush_step();
+  return output;
 }
 
 /** 把 canonical Tool Part 投影为模型工具调用和可选工具结果。 */
 function append_tool_content(
-  part: SessionAssistantToolPart,
+  part: SessionAgentToolPart,
   content: ModelContent[],
   tool_results: ModelContent[],
 ): void {
@@ -169,36 +187,6 @@ function build_model_file(
   };
 }
 
-/** 解析兼容聊天入口写入文本中的附件标记。 */
-async function read_markup_files(
-  message: SessionUserMessage,
-  project_root?: string,
-): Promise<ModelFileContent[]> {
-  const text = message.parts
-    .filter((part) => part.type === "text")
-    .map((part) => part.text)
-    .join("\n");
-  const output: ModelFileContent[] = [];
-  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: string, project_root?: string): string {
   if (path.isAbsolute(raw_path)) return path.resolve(raw_path);
@@ -211,19 +199,13 @@ function resolve_local_file_path(raw_path: string, project_root?: string): strin
   return file_path;
 }
 
-/** 根据文件扩展名解析模型可用的 MIME type。 */
-function guess_media_type(file_path: string): string | undefined {
-  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: unknown): ModelJsonValue {
   if (value === undefined) return null;
   return JSON.parse(JSON.stringify(value)) as ModelJsonValue;
 }
+
+/** 联合类型增加成员时，强制模型投影显式选择支持或忽略。 */
+function assert_never(value: never): never {
+  throw new Error(`Unsupported Session model part: ${String((value as { type?: unknown }).type)}`);
+}

package/src/executor/model/ModelStepRunner.ts

@@ -8,7 +8,6 @@
 import {
   type ModelCall,
   type ModelClient,
-  type ModelContent,
   type ModelFinishReason,
   type ModelJsonValue,
   type ModelMessage,
@@ -22,8 +21,8 @@ import { z } from "zod";
 import type { SessionSystemMessage } from "@/executor/types/SessionPrompts.js";
 import type { SessionAssistantOutput } from "@/types/executor/SessionAssistantOutput.js";
 import type {
-  SessionAssistantMessagePart,
-  SessionAssistantToolPart,
+  SessionAgentMessagePart,
+  SessionAgentToolPart,
 } from "@downcity/type";
 import { consume_model_stream } from "@/executor/model/ModelStreamConsumer.js";
 
@@ -59,8 +58,6 @@ export interface ModelStepResult {
   tool_calls: ModelStepToolCall[];
   /** 当前 Step 的工具结果。 */
   tool_results: ModelStepToolResult[];
-  /** 用于后续模型 Step 的消息。 */
-  response: { messages: ModelMessage[] };
   /** 供诊断代码读取的内容事实。 */
   content: Array<Record<string, unknown>>;
 }
@@ -86,7 +83,7 @@ export interface RunModelStepInput {
 /** 执行一个 Downcity 模型 Step 并收敛工具结果。 */
 export async function run_model_step(input: RunModelStepInput): Promise<{
   /** 当前 Step 的 canonical Assistant Parts。 */
-  assistant_parts: SessionAssistantMessagePart[];
+  assistant_parts: SessionAgentMessagePart[];
   /** 当前 Step 的运行结果。 */
   step_result: ModelStepResult;
 }> {
@@ -123,19 +120,6 @@ export async function run_model_step(input: RunModelStepInput): Promise<{
     collected.assistant_parts,
     tool_results,
   );
-  const response_messages: ModelMessage[] = [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: {
@@ -144,7 +128,6 @@ export async function run_model_step(input: RunModelStepInput): Promise<{
       ...(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,
@@ -155,8 +138,7 @@ export async function run_model_step(input: RunModelStepInput): Promise<{
 
 /** 模型事件聚合器。 */
 class StepEventCollector {
-  private readonly model_content: ModelContent[] = [];
-  private readonly assistant_parts: SessionAssistantMessagePart[] = [];
+  private readonly assistant_parts: SessionAgentMessagePart[] = [];
   private readonly text_by_id = new Map<string, string>();
   private readonly reasoning_by_id = new Map<string, string>();
   private readonly tool_by_content_id = new Map<string, ModelStepToolCall>();
@@ -183,7 +165,6 @@ class StepEventCollector {
       this.text += event.delta;
     } 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,
@@ -200,11 +181,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,
@@ -224,12 +200,6 @@ class StepEventCollector {
       if (tool) {
         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,
@@ -249,8 +219,7 @@ class StepEventCollector {
 
   /** 返回完整 Step 聚合结果。 */
   finish(): {
-    assistant_parts: SessionAssistantMessagePart[];
-    assistant_model_message: ModelMessage;
+    assistant_parts: SessionAgentMessagePart[];
     finish_reason: ModelFinishReason;
     usage?: ModelUsage;
     text: string;
@@ -259,7 +228,6 @@ class StepEventCollector {
     if (!this.finish_reason) 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,
@@ -377,9 +345,9 @@ function to_model_json_value(value: unknown): ModelJsonValue {
 
 /** 把工具结果合并到 canonical Tool Parts。 */
 function append_tool_results(
-  parts: SessionAssistantMessagePart[],
+  parts: SessionAgentMessagePart[],
   results: ModelStepToolResult[],
-): SessionAssistantMessagePart[] {
+): SessionAgentMessagePart[] {
   if (results.length === 0) return parts;
   const result_by_id = new Map(results.map((result) => [result.tool_call_id, result]));
   return parts.map((part) => {
@@ -391,12 +359,12 @@ function append_tool_results(
           ...part,
           state: "completed",
           output: to_model_json_value(result.output),
-        } satisfies SessionAssistantToolPart
+        } satisfies SessionAgentToolPart
       : {
           ...part,
           state: "failed",
           error: read_tool_error(result.output),
-        } satisfies SessionAssistantToolPart;
+        } satisfies SessionAgentToolPart;
   });
 }
 

package/src/executor/services/ExecutorRecoveryPolicy.ts

@@ -3,17 +3,12 @@
  *
  * 关键点（中文）
  * - 统一封装“压缩后重试”和“普通失败兜底”逻辑。
- * - 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";
 
 /**
  * 可压缩错误的最大重试次数。
@@ -24,8 +19,8 @@ interface ExecutorRecoveryPolicyOptions {
   /** 当前 Session 稳定标识。 */
   session_id: string;
 
-  /** 判断错误是否需要持久化压缩后重试。 */
-  should_compact: (error: unknown) => boolean;
+  /** 请求 Composer 尝试推进上下文派生状态。 */
+  recover_context: (error: unknown) => Promise<boolean>;
 
   /**
    * 当前 session 统一日志器。
@@ -33,145 +28,64 @@ interface ExecutorRecoveryPolicyOptions {
   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 class ExecutorRecoveryPolicy {
-  private readonly should_compact: ExecutorRecoveryPolicyOptions["should_compact"];
+  private readonly recover_context: ExecutorRecoveryPolicyOptions["recover_context"];
   private readonly logger: Logger;
-  private retry_count = 0;
 
   constructor(options: ExecutorRecoveryPolicyOptions) {
     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(): void {
-    this.retry_count = 0;
-  }
-
   /**
    * 执行一次带恢复策略的 Session Turn。
    */
   async execute_with_retry(
     input: ExecutorRecoveryInput,
   ): Promise<SessionTurnExecutionResult> {
-    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,
-      });
     }
   }
 
@@ -181,18 +95,11 @@ export class ExecutorRecoveryPolicy {
      */
     error_text: string;
 
-    /**
-     * 当前显式运行上下文。
-     */
-    turn_context: SessionTurnContext;
   }): SessionTurnExecutionResult {
     return {
       success: false,
       text: "",
       error: input.error_text,
-      deferred_persisted_user_messages: [
-        ...input.turn_context.input.deferred_user_messages(),
-      ],
     };
   }
 }

package/src/executor/types/SessionHistoryMeta.ts

@@ -2,7 +2,7 @@
  * SessionHistoryMeta：随 session_id 持久化的元信息。
  *
  * 关键点（中文）
- * - 存储位置：Agent Storage `sessions/<encodedSessionId>/meta.json`
+ * - 存储位置：Session SQLite 的 `session_state` 表
  * - 用于保存 session 列表、详情和索引所需的轻量元信息
  */
 
@@ -35,6 +35,4 @@ export type SessionHistoryMeta = {
   message_count?: number;
   /** 当前 session 最后一条记录的用户可见摘要，用于列表预览。 */
   preview_text?: string;
-  /** 生成当前摘要时 messages.jsonl 的字节长度，用于校验摘要是否仍然有效。 */
-  historyBytes?: number;
 };