@downcity/agent 1.1.200 → 1.1.203

package/src/executor/composer/compaction/jsonl/JsonlSessionCompactionFileOperations.ts

@@ -0,0 +1,197 @@
+/**
+ * JsonlSessionCompactionFileOperations：上下文压缩文件操作记录模块。
+ *
+ * 关键点（中文）
+ * - 从被压缩的 session 消息中 best-effort 提取文件读写痕迹。
+ * - 输出结构化 XML 片段，追加到 LLM 生成的 compact summary 末尾。
+ * - 解析失败或没有文件操作时不影响 compact 主流程。
+ */
+
+import { isTextUIPart } from "ai";
+import type { SessionMessageRecordV1 } from "@/executor/types/SessionRecords.js";
+
+/**
+ * 压缩范围内的文件操作汇总。
+ */
+export type SessionCompactionFileOperations = {
+  /** 本次压缩范围内被读取或查看过的文件路径。 */
+  read_files: string[];
+  /** 本次压缩范围内被新增、修改或删除过的文件路径。 */
+  modified_files: string[];
+};
+
+type UnknownRecord = Record<string, unknown>;
+
+const PATH_CANDIDATE_RE =
+  /(?:\.{1,2}\/|\/|[A-Za-z0-9_.@-]+\/)[A-Za-z0-9_.@~:+/=-]+/g;
+const PATCH_FILE_RE = /^\*\*\* (?:Add|Update|Delete) File: (.+)$/gm;
+const GIT_STATUS_FILE_RE = /^\s*(?:[MADRCU?!]{1,2}|[ MADRCU?!][ MADRCU?!])\s+(.+)$/gm;
+const READ_COMMAND_RE =
+  /\b(?:cat|less|more|sed|nl|head|tail|rg|grep|find|ls|wc|stat|open|git\s+(?:show|diff|status|grep|ls-files))\b/;
+
+/**
+ * 把压缩范围内的文件操作格式化为 XML。
+ */
+export function format_session_compaction_file_operations(
+  messages: SessionMessageRecordV1[],
+): string {
+  const operations = collect_session_compaction_file_operations(messages);
+  if (operations.read_files.length === 0 && operations.modified_files.length === 0) {
+    return "";
+  }
+  return [
+    "<read-files>",
+    ...operations.read_files.map((file_path) => xml_escape(file_path)),
+    "</read-files>",
+    "",
+    "<modified-files>",
+    ...operations.modified_files.map((file_path) => xml_escape(file_path)),
+    "</modified-files>",
+  ].join("\n");
+}
+
+/**
+ * 收集压缩范围内的文件操作。
+ */
+export function collect_session_compaction_file_operations(
+  messages: SessionMessageRecordV1[],
+): SessionCompactionFileOperations {
+  const read_files = new Set<string>();
+  const modified_files = new Set<string>();
+
+  for (const message of Array.isArray(messages) ? messages : []) {
+    const text_blocks = extract_message_operation_texts(message);
+    for (const text of text_blocks) {
+      for (const file_path of extract_modified_files(text)) {
+        modified_files.add(file_path);
+      }
+      for (const file_path of extract_read_files(text)) {
+        read_files.add(file_path);
+      }
+    }
+  }
+
+  for (const file_path of modified_files) {
+    read_files.delete(file_path);
+  }
+
+  return {
+    read_files: [...read_files].sort(),
+    modified_files: [...modified_files].sort(),
+  };
+}
+
+/**
+ * 提取单条消息中可能包含文件操作的文本块。
+ */
+function extract_message_operation_texts(message: SessionMessageRecordV1): string[] {
+  const out: string[] = [];
+  const parts = Array.isArray(message.parts) ? message.parts : [];
+  for (const part of parts) {
+    if (isTextUIPart(part)) {
+      const text = String(part.text ?? "").trim();
+      if (text) out.push(text);
+      continue;
+    }
+    const part_record = to_record(part);
+    if (!part_record) continue;
+    const input_text = stringify_compact(part_record.input);
+    const output_text = stringify_compact(part_record.output);
+    const error_text = stringify_compact(part_record.errorText);
+    if (input_text) out.push(input_text);
+    if (output_text) out.push(output_text);
+    if (error_text) out.push(error_text);
+  }
+  return out;
+}
+
+/**
+ * 提取 patch / git status 中的修改文件。
+ */
+function extract_modified_files(text: string): string[] {
+  const out = new Set<string>();
+  for (const file_path of match_group_values(text, PATCH_FILE_RE)) {
+    const normalized = normalize_file_path(file_path);
+    if (normalized) out.add(normalized);
+  }
+  for (const file_path of match_group_values(text, GIT_STATUS_FILE_RE)) {
+    const normalized = normalize_file_path(file_path);
+    if (normalized) out.add(normalized);
+  }
+  return [...out];
+}
+
+/**
+ * 从读命令文本中提取读取路径。
+ */
+function extract_read_files(text: string): string[] {
+  const out = new Set<string>();
+  const lines = String(text || "").split(/\r?\n/);
+  for (const line of lines) {
+    if (!READ_COMMAND_RE.test(line)) continue;
+    for (const candidate of line.match(PATH_CANDIDATE_RE) || []) {
+      const normalized = normalize_file_path(candidate);
+      if (normalized) out.add(normalized);
+    }
+  }
+  return [...out];
+}
+
+/**
+ * 获取正则第一个捕获组的所有结果。
+ */
+function match_group_values(text: string, pattern: RegExp): string[] {
+  const out: string[] = [];
+  pattern.lastIndex = 0;
+  let match = pattern.exec(text);
+  while (match) {
+    const value = String(match[1] || "").trim();
+    if (value) out.push(value);
+    match = pattern.exec(text);
+  }
+  return out;
+}
+
+/**
+ * 归一化候选路径。
+ */
+function normalize_file_path(value: string): string {
+  let file_path = String(value || "").trim();
+  if (!file_path || file_path.includes("://")) return "";
+  file_path = file_path.replace(/^["'`]+|["'`]+$/g, "");
+  file_path = file_path.replace(/[),.;:]+$/g, "");
+  if (!file_path || file_path === "." || file_path === "..") return "";
+  if (file_path.startsWith("-")) return "";
+  return file_path;
+}
+
+/**
+ * 转成对象记录。
+ */
+function to_record(value: unknown): UnknownRecord | null {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+  return value as UnknownRecord;
+}
+
+/**
+ * 将未知结构紧凑地转为文本。
+ */
+function stringify_compact(value: unknown): string {
+  if (value === undefined || value === null) return "";
+  if (typeof value === "string") return value;
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return String(value);
+  }
+}
+
+/**
+ * XML 文本转义。
+ */
+function xml_escape(value: string): string {
+  return String(value || "")
+    .replace(/&/g, "&amp;")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;");
+}

package/src/executor/composer/compaction/jsonl/JsonlSessionCompactionPrompts.ts

@@ -0,0 +1,162 @@
+/**
+ * JsonlSessionCompactionPrompts：上下文压缩提示词模块。
+ *
+ * 关键点（中文）
+ * - 统一维护 session compact 使用的 system prompt 与 user prompt。
+ * - 支持初始压缩、迭代更新压缩、turn prefix 压缩三类场景。
+ * - prompt 文本保持结构化格式稳定，便于后续 LLM 继续接力。
+ */
+
+/**
+ * 上下文压缩 system prompt。
+ */
+export const SESSION_COMPACTION_SYSTEM_PROMPT = [
+  "You are a context summarization assistant. Your task is to read a conversation between a user and an AI assistant, then produce a structured summary following the exact format specified.",
+  "",
+  "Do NOT continue the conversation. Do NOT respond to any questions in the conversation. ONLY output the structured summary.",
+].join("\n");
+
+/**
+ * 构建初始上下文压缩 prompt。
+ */
+export function build_initial_session_compaction_prompt(params: {
+  /** 待压缩的历史对话文本。 */
+  conversation_text: string;
+}): string {
+  return [
+    String(params.conversation_text || "").trim(),
+    "",
+    "The messages above are a conversation to summarize. Create a structured context checkpoint summary that another LLM will use to continue the work.",
+    "",
+    "Use this EXACT format:",
+    "",
+    "## Goal",
+    "[What is the user trying to accomplish? Can be multiple items if the session covers different tasks.]",
+    "",
+    "## Constraints & Preferences",
+    "- [Any constraints, preferences, or requirements mentioned by user]",
+    '- [Or "(none)" if none were mentioned]',
+    "",
+    "## Progress",
+    "### Done",
+    "- [x] [Completed tasks/changes]",
+    "",
+    "### In Progress",
+    "- [ ] [Current work]",
+    "",
+    "### Blocked",
+    "[Issues preventing progress, if any]",
+    "",
+    "## Key Decisions",
+    "- **[Decision]**: [Brief rationale]",
+    "",
+    "## Next Steps",
+    "1. [Ordered list of what should happen next]",
+    "",
+    "## Critical Context",
+    "- [Any data, examples, or references needed to continue]",
+    '- [Or "(none)" if not applicable]',
+    "",
+    "Keep each section concise. Preserve exact file paths, function names, and error messages.",
+  ].join("\n");
+}
+
+/**
+ * 构建迭代更新上下文压缩 prompt。
+ */
+export function build_update_session_compaction_prompt(params: {
+  /** 已存在的旧摘要。 */
+  previous_summary: string;
+  /** 本次需要合入旧摘要的新对话文本。 */
+  new_conversation_text: string;
+}): string {
+  return [
+    "<previous-summary>",
+    String(params.previous_summary || "").trim(),
+    "</previous-summary>",
+    "",
+    String(params.new_conversation_text || "").trim(),
+    "",
+    "The messages above are NEW conversation messages to incorporate into the existing summary provided in <previous-summary> tags.",
+    "",
+    "Update the existing structured summary with new information. RULES:",
+    "- PRESERVE all existing information from the previous summary",
+    "- ADD new progress, decisions, and context from the new messages",
+    '- UPDATE the Progress section: move items from "In Progress" to "Done" when completed',
+    '- UPDATE "Next Steps" based on what was accomplished',
+    "- PRESERVE exact file paths, function names, and error messages",
+    "- If something is no longer relevant, you may remove it",
+    "",
+    "Use this EXACT format:",
+    "",
+    "## Goal",
+    "[Preserve existing goals, add new ones if the task expanded]",
+    "",
+    "## Constraints & Preferences",
+    "- [Preserve existing, add new ones discovered]",
+    "",
+    "## Progress",
+    "### Done",
+    "- [x] [Include previously done items AND newly completed items]",
+    "",
+    "### In Progress",
+    "- [ ] [Current work - update based on progress]",
+    "",
+    "### Blocked",
+    "[Current blockers - remove if resolved]",
+    "",
+    "## Key Decisions",
+    "- **[Decision]**: [Brief rationale] (preserve all previous, add new)",
+    "",
+    "## Next Steps",
+    "1. [Update based on current state]",
+    "",
+    "## Critical Context",
+    "- [Preserve important context, add new if needed]",
+    "",
+    "Keep each section concise. Preserve exact file paths, function names, and error messages.",
+  ].join("\n");
+}
+
+/**
+ * 构建 turn prefix 压缩 prompt。
+ */
+export function build_turn_prefix_session_compaction_prompt(params: {
+  /** 被切下来的 turn prefix 文本。 */
+  prefix_text: string;
+}): string {
+  return [
+    String(params.prefix_text || "").trim(),
+    "",
+    "This is the PREFIX of a turn that was too large to keep. The SUFFIX (recent work) is retained.",
+    "",
+    "Summarize the prefix to provide context for the retained suffix:",
+    "",
+    "## Original Request",
+    "[What did the user ask for in this turn?]",
+    "",
+    "## Early Progress",
+    "- [Key decisions and work done in the prefix]",
+    "",
+    "## Context for Suffix",
+    "- [Information needed to understand the retained recent work]",
+    "",
+    "Be concise. Focus on what's needed to understand the kept suffix.",
+  ].join("\n");
+}
+
+/**
+ * 给摘要追加文件操作 XML。
+ */
+export function append_session_compaction_file_operations(params: {
+  /** LLM 生成的结构化摘要。 */
+  summary: string;
+  /** 文件操作 XML，空字符串时不追加。 */
+  file_operations_xml?: string;
+}): string {
+  const summary = String(params.summary || "").trim();
+  const file_operations_xml = String(params.file_operations_xml || "").trim();
+  if (!file_operations_xml) return summary;
+  if (!summary) return file_operations_xml;
+  return `${summary}\n\n${file_operations_xml}`;
+}

package/src/executor/composer/context/LocalSessionContextComposer.ts

@@ -13,9 +13,9 @@ import type {
   SessionContextComposeResult,
 } from "@executor/composer/context/SessionContextComposer.js";
 import type {
-  SessionMessageV1,
-  SessionModelMessageV1,
-} from "@/executor/types/SessionMessages.js";
+  SessionRecordV1,
+  SessionMessageRecordV1,
+} from "@/executor/types/SessionRecords.js";
 import type { SessionSystemMessage } from "@/executor/types/SessionPrompts.js";
 import type { Tool } from "ai";
 import type { SessionRunContext } from "@/types/executor/SessionRunContext.js";
@@ -66,7 +66,7 @@ export class LocalSessionContextComposer implements SessionContextComposer {
     input: {
       system: SessionSystemMessage[];
       appendMergedUserMessages: (
-        messages: SessionMessageV1[],
+        messages: SessionRecordV1[],
       ) => Promise<ModelMessage[]>;
       runContext: SessionRunContext;
     },
@@ -150,7 +150,7 @@ export class LocalSessionContextComposer implements SessionContextComposer {
   buildFallbackAssistantMessage(
     text: string,
     run_context: SessionRunContext,
-  ): SessionModelMessageV1 {
+  ): SessionMessageRecordV1 {
     const sessionId = String(
       run_context.sessionId || this.sessionId || "",
     ).trim();

package/src/executor/composer/context/SessionContextComposer.ts

@@ -8,9 +8,9 @@
 
 import type { ModelMessage, Tool } from "ai";
 import type {
-  SessionMessageV1,
-  SessionModelMessageV1,
-} from "@/executor/types/SessionMessages.js";
+  SessionRecordV1,
+  SessionMessageRecordV1,
+} from "@/executor/types/SessionRecords.js";
 import type { SessionSystemMessage } from "@/executor/types/SessionPrompts.js";
 import type { SessionRunContext } from "@/types/executor/SessionRunContext.js";
 
@@ -51,7 +51,7 @@ export interface SessionContextComposer {
        * 将新增 user 消息转换为可追加的模型消息。
        */
       appendMergedUserMessages: (
-        messages: SessionMessageV1[],
+        messages: SessionRecordV1[],
       ) => Promise<ModelMessage[]>;
       /**
        * 当前显式运行上下文。
@@ -79,5 +79,5 @@ export interface SessionContextComposer {
   buildFallbackAssistantMessage(
     text: string,
     run_context: SessionRunContext,
-  ): SessionModelMessageV1;
+  ): SessionMessageRecordV1;
 }

package/src/executor/composer/history/SessionHistoryComposer.ts

@@ -8,7 +8,7 @@
  */
 
 import type { LanguageModel, Tool } from "ai";
-import type { SessionMessageV1 } from "@/executor/types/SessionMessages.js";
+import type { SessionRecordV1 } from "@/executor/types/SessionRecords.js";
 import type { SessionSystemMessage } from "@/executor/types/SessionPrompts.js";
 
 /**
@@ -58,5 +58,5 @@ export interface SessionHistoryComposer {
   /**
    * 为本轮 Session 执行准备模型输入消息。
    */
-  prepare(input: SessionHistoryPrepareInput): Promise<SessionMessageV1[]>;
+  prepare(input: SessionHistoryPrepareInput): Promise<SessionRecordV1[]>;
 }

package/src/executor/composer/history/SessionHistoryWriter.ts

@@ -9,9 +9,9 @@
 
 import type { JsonObject } from "@/types/common/Json.js";
 import type {
-  SessionMessageV1,
+  SessionRecordV1,
   SessionMetadataV1,
-} from "@/executor/types/SessionMessages.js";
+} from "@/executor/types/SessionRecords.js";
 import type { SessionHistoryStore } from "@/executor/store/history/SessionHistoryStore.js";
 
 type SessionHistoryWriterOptions = {
@@ -63,15 +63,15 @@ export class SessionHistoryWriter {
   /**
    * 追加一条 user 消息。
    */
-  async appendUserMessage(params: {
-    message?: SessionMessageV1 | null;
+  async append_user_message(params: {
+    message?: SessionRecordV1 | null;
     text?: string;
     extra?: JsonObject;
   }): Promise<void> {
     try {
       const historyStore = this.getHistoryStore();
       if (params.message && typeof params.message === "object") {
-        await historyStore.append(params.message);
+        await historyStore.write_record(params.message);
         void this.afterSessionUpdatedAsync();
         return;
       }
@@ -86,7 +86,7 @@ export class SessionHistoryWriter {
           extra: params.extra,
         } as Omit<SessionMetadataV1, "v" | "ts">,
       });
-      await historyStore.append(message);
+      await historyStore.write_record(message);
       void this.afterSessionUpdatedAsync();
     } catch {
       // ignore
@@ -96,15 +96,15 @@ export class SessionHistoryWriter {
   /**
    * 追加一条 assistant 消息。
    */
-  async appendAssistantMessage(params: {
-    message?: SessionMessageV1 | null;
+  async append_assistant_message(params: {
+    message?: SessionRecordV1 | null;
     fallbackText?: string;
     extra?: JsonObject;
   }): Promise<void> {
     try {
       const historyStore = this.getHistoryStore();
       if (params.message && typeof params.message === "object") {
-        await historyStore.finalizeInflight(params.message);
+        await historyStore.finalize_inflight(params.message);
         void this.afterSessionUpdatedAsync();
         return;
       }
@@ -112,7 +112,7 @@ export class SessionHistoryWriter {
       const fallbackText = String(params.fallbackText || "").trim();
       if (!fallbackText) return;
 
-      await historyStore.finalizeInflight(
+      await historyStore.finalize_inflight(
         historyStore.assistantText({
           text: fallbackText,
           metadata: {

package/src/executor/composer/history/jsonl/JsonlSessionHistoryComposer.ts

@@ -9,11 +9,11 @@
 
 import type { Tool } from "ai";
 import {
-  isSessionActionMessage,
-  isSessionModelMessage,
-  type SessionMessageV1,
-  type SessionModelMessageV1,
-} from "@/executor/types/SessionMessages.js";
+  is_session_action_record,
+  is_session_message_record,
+  type SessionRecordV1,
+  type SessionMessageRecordV1,
+} from "@/executor/types/SessionRecords.js";
 import type { SessionHistoryStore } from "@/executor/store/history/SessionHistoryStore.js";
 import type {
   SessionHistoryComposer,
@@ -51,7 +51,7 @@ export class JsonlSessionHistoryComposer implements SessionHistoryComposer {
     return tools && typeof tools === "object" ? { ...tools } : {};
   }
 
-  private readUserSessionMessageText(message: SessionModelMessageV1): string {
+  private readUserSessionMessageText(message: SessionMessageRecordV1): string {
     if (!message || typeof message !== "object" || message.role !== "user") {
       return "";
     }
@@ -70,7 +70,7 @@ export class JsonlSessionHistoryComposer implements SessionHistoryComposer {
   }
 
   private hasTrailingUserQuery(
-    messages: SessionMessageV1[],
+    messages: SessionRecordV1[],
     query: string,
   ): boolean {
     const target = String(query || "").trim();
@@ -78,17 +78,17 @@ export class JsonlSessionHistoryComposer implements SessionHistoryComposer {
     for (let index = messages.length - 1; index >= 0; index -= 1) {
       const item = messages[index];
       if (!item || typeof item !== "object") continue;
-      if (!isSessionModelMessage(item) || item.role !== "user") continue;
+      if (!is_session_message_record(item) || item.role !== "user") continue;
       return this.readUserSessionMessageText(item) === target;
     }
     return false;
   }
 
-  private sanitizeMessages(messages: SessionMessageV1[]): SessionMessageV1[] {
+  private sanitizeMessages(messages: SessionRecordV1[]): SessionRecordV1[] {
     if (!Array.isArray(messages)) return [];
     return messages
-      .filter((message) => !isSessionActionMessage(message))
-      .filter(isSessionModelMessage)
+      .filter((message) => !is_session_action_record(message))
+      .filter(is_session_message_record)
       .map((message) => {
         const parts = Array.isArray(message.parts)
           ? message.parts.filter((part) => part && typeof part === "object")
@@ -101,12 +101,12 @@ export class JsonlSessionHistoryComposer implements SessionHistoryComposer {
       .filter((message) => Array.isArray(message.parts) && message.parts.length > 0);
   }
 
-  async prepare(input: SessionHistoryPrepareInput): Promise<SessionMessageV1[]> {
+  async prepare(input: SessionHistoryPrepareInput): Promise<SessionRecordV1[]> {
     const query = String(input.query || "").trim();
     const tools = this.normalizeTools(input.tools);
     void tools;
 
-    let baseMessages = this.sanitizeMessages(await this.store.list());
+    let baseMessages = this.sanitizeMessages(await this.store.list_records());
     if ((!Array.isArray(baseMessages) || baseMessages.length === 0) && query) {
       baseMessages = [
         this.store.userText({

package/src/executor/core-engine/CoreEngineMessageState.ts

@@ -8,7 +8,7 @@
  */
 
 import type { ModelMessage, Tool } from "ai";
-import type { SessionMessageV1 } from "@/executor/types/SessionMessages.js";
+import type { SessionRecordV1 } from "@/executor/types/SessionRecords.js";
 import {
   pickMergedUserMessages,
   toModelMessages,
@@ -21,7 +21,7 @@ export class CoreEngineMessageState {
   /**
    * 当前运行时 session 语义消息。
    */
-  private sessionMessages: SessionMessageV1[];
+  private sessionMessages: SessionRecordV1[];
 
   /**
    * 当前模型侧消息基线。
@@ -42,7 +42,7 @@ export class CoreEngineMessageState {
     /**
      * 当前运行时 session 语义消息。
      */
-    sessionMessages: SessionMessageV1[];
+    sessionMessages: SessionRecordV1[];
     /**
      * 当前模型侧消息基线。
      */
@@ -69,7 +69,7 @@ export class CoreEngineMessageState {
     /**
      * 初始 session 语义消息。
      */
-    messages: SessionMessageV1[];
+    messages: SessionRecordV1[];
     /**
      * 当前轮可用工具集合。
      */
@@ -105,7 +105,7 @@ export class CoreEngineMessageState {
    * 把 step 间新增的 user 消息并入两份基线。
    */
   async appendMergedUserMessages(
-    messages: SessionMessageV1[],
+    messages: SessionRecordV1[],
   ): Promise<ModelMessage[]> {
     const mergedMessages = pickMergedUserMessages(messages);
     if (mergedMessages.length === 0) return [];
@@ -115,14 +115,14 @@ export class CoreEngineMessageState {
   /**
    * 追加内部生成的 user nudge 消息。
    */
-  async appendUserTextMessage(message: SessionMessageV1): Promise<void> {
+  async appendUserTextMessage(message: SessionRecordV1): Promise<void> {
     await this.appendSessionMessagesAsModelMessages([message]);
   }
 
   /**
    * 追加 assistant UI 消息到 session 语义基线。
    */
-  appendRuntimeSessionMessage(message: SessionMessageV1): void {
+  appendRuntimeSessionMessage(message: SessionRecordV1): void {
     this.sessionMessages = [...this.sessionMessages, message];
   }
 
@@ -135,7 +135,7 @@ export class CoreEngineMessageState {
   }
 
   private async appendSessionMessagesAsModelMessages(
-    messages: SessionMessageV1[],
+    messages: SessionRecordV1[],
   ): Promise<ModelMessage[]> {
     this.sessionMessages = [...this.sessionMessages, ...messages];
     const modelMessages = await toModelMessages(

package/src/executor/core-engine/CoreEngineRunner.ts

@@ -42,9 +42,9 @@ import type {
   SessionRunResult,
 } from "@/executor/types/SessionRun.js";
 import type {
-  SessionMessageV1,
-  SessionModelMessageV1,
-} from "@/executor/types/SessionMessages.js";
+  SessionRecordV1,
+  SessionMessageRecordV1,
+} from "@/executor/types/SessionRecords.js";
 
 const TURN_STOPPED_MESSAGE = "Turn stopped";
 
@@ -64,9 +64,9 @@ function build_file_part_key(part: FileUIPart): string {
  * 把 tool/plugin 运行期产生的 file parts 并入最终 assistant UIMessage。
  */
 function mergePendingAssistantFileParts(
-  message: SessionModelMessageV1,
+  message: SessionMessageRecordV1,
   parts: FileUIPart[],
-): SessionModelMessageV1 {
+): SessionMessageRecordV1 {
   if (!Array.isArray(parts) || parts.length === 0) return message;
   const current_parts = Array.isArray(message.parts) ? message.parts : [];
   const seen = new Set<string>();
@@ -154,7 +154,7 @@ export class CoreEngineRunner {
       : [];
     const tools = input.execute_input.tools;
     let last_observed_stream_error: unknown = undefined;
-    let final_assistant_ui_message: SessionModelMessageV1 | null = null;
+    let final_assistant_ui_message: SessionMessageRecordV1 | null = null;
 
     try {
       const message_state = await CoreEngineMessageState.create({
@@ -163,7 +163,7 @@ export class CoreEngineRunner {
         projectRoot: input.run_context.projectRoot,
       });
 
-      const append_merged_user_messages = (messages: SessionMessageV1[]) =>
+      const append_merged_user_messages = (messages: SessionRecordV1[]) =>
         message_state.appendMergedUserMessages(messages);
 
       const context_composer_on_step_finish =