@downcity/agent 1.1.199 → 1.1.200

package/scripts/{session-operation-message.test.mjs → session-action-message.test.mjs}

@@ -1,10 +1,10 @@
 /**
- * @file 验证 operation message 的持久化、模型输入过滤与 timeline 投影。
+ * @file 验证 action message 的持久化、模型输入过滤与 timeline 投影。
  *
  * 关键点（中文）
- * - operation message 会作为 operation role 消息写入 JSONL。
- * - history composer 组装 LLM 输入时必须过滤 operation message。
- * - timeline view 可以把 operation message 投影成前端可识别的 operation 事件。
+ * - action message 会作为 `type=action` item 写入 JSONL。
+ * - 同一个 action id 会被更新为一条历史记录，不拆成 running/completed 多条。
+ * - history composer 组装 LLM 输入时必须过滤 action message。
  */
 
 import test from "node:test";
@@ -18,14 +18,14 @@ import { JsonlSessionHistoryComposer } from "../bin/executor/composer/history/js
 import { toSessionTimelineEvents } from "../bin/session/browse/Browse.js";
 import { Agent } from "../bin/index.js";
 
-test("operation message is persisted but filtered from LLM history", async () => {
+test("action message is upserted but filtered from LLM history", async () => {
   const root_path = await fs.mkdtemp(
-    path.join(os.tmpdir(), "downcity-agent-operation-message-"),
+    path.join(os.tmpdir(), "downcity-agent-action-message-"),
   );
-  const session_id = "operation_session";
+  const session_id = "action_session";
   const store = new JsonlSessionHistoryStore({
     rootPath: root_path,
-    agentId: "operation_agent",
+    agentId: "action_agent",
     sessionId: session_id,
   });
   const composer = new JsonlSessionHistoryComposer({ store });
@@ -38,16 +38,26 @@ test("operation message is persisted but filtered from LLM history", async () =>
     }),
   );
   await store.append(
-    store.operation({
-      operation: {
-        operationId: "op-1",
-        name: "compacting",
-        status: "finished",
-        label: "Session history compacted",
+    store.action({
+      action: {
+        id: "action:1",
+        title: "Compacting session history",
+        state: "running",
+        turnId: "turn-1",
+      },
+      metadata: { sessionId: session_id },
+    }),
+  );
+  await store.append(
+    store.action({
+      action: {
+        id: "action:1",
+        title: "Session history compacted",
+        description: "Compacted earlier messages.",
+        state: "completed",
         turnId: "turn-1",
       },
       metadata: { sessionId: session_id },
-      id: "op:1",
     }),
   );
   await store.append(
@@ -60,9 +70,10 @@ test("operation message is persisted but filtered from LLM history", async () =>
 
   const persisted_messages = await store.list();
   assert.equal(persisted_messages.length, 3);
-  assert.equal(persisted_messages[1].role, "operation");
-  assert.equal(persisted_messages[1].metadata.kind, "operation");
-  assert.equal(persisted_messages[1].metadata.operation.operationId, "op-1");
+  assert.equal(persisted_messages[1].type, "action");
+  assert.equal(persisted_messages[1].title, "Session history compacted");
+  assert.equal(persisted_messages[1].description, "Compacted earlier messages.");
+  assert.equal(persisted_messages[1].state, "completed");
 
   const model_messages = await composer.prepare({
     query: "",
@@ -78,28 +89,17 @@ test("operation message is persisted but filtered from LLM history", async () =>
 
   const timeline_events = toSessionTimelineEvents(persisted_messages[1]);
   assert.equal(timeline_events.length, 1);
-  assert.equal(timeline_events[0].role, "operation");
-  assert.equal(timeline_events[0].operationId, "op-1");
-  assert.equal(timeline_events[0].operationName, "compacting");
-  assert.equal(timeline_events[0].operationStatus, "finished");
-  assert.equal(timeline_events[0].text, "Session history compacted");
-
-  const hidden_started_events = toSessionTimelineEvents(
-    store.operation({
-      operation: {
-        operationId: "op-started",
-        name: "compacting",
-        status: "started",
-        label: "Compacting session history",
-      },
-      metadata: { sessionId: session_id },
-      id: "op:started",
-    }),
+  assert.equal(timeline_events[0].role, "action");
+  assert.equal(timeline_events[0].actionTitle, "Session history compacted");
+  assert.equal(timeline_events[0].actionDescription, "Compacted earlier messages.");
+  assert.equal(timeline_events[0].actionState, "completed");
+  assert.equal(
+    timeline_events[0].text,
+    "Session history compacted\nCompacted earlier messages.",
   );
-  assert.deepEqual(hidden_started_events, []);
 });
 
-test("session.set persists and publishes model-switching operations", async () => {
+test("session.set persists and publishes model-switching actions", async () => {
   const agent_path = await fs.mkdtemp(
     path.join(os.tmpdir(), "downcity-agent-model-switching-"),
   );
@@ -113,7 +113,7 @@ test("session.set persists and publishes model-switching operations", async () =
     });
     const events = [];
     const unsubscribe = session.subscribe((event) => {
-      if (event.type === "operation") events.push(event);
+      if (event.type === "action") events.push(event);
     });
 
     await session.set({
@@ -125,24 +125,25 @@ test("session.set persists and publishes model-switching operations", async () =
     unsubscribe();
 
     assert.deepEqual(
-      events.map((event) => `${event.name}:${event.status}`),
-      ["model-switching:started", "model-switching:finished"],
+      events.map((event) => `${event.title}:${event.state}`),
+      ["Switching session model:running", "Session model switched:completed"],
     );
+    assert.equal(new Set(events.map((event) => event.id)).size, 1);
 
     const history = await session.history({ view: "timeline" });
-    const operation_events = history.items.filter(
-      (item) => item.role === "operation",
+    const action_events = history.items.filter(
+      (item) => item.role === "action",
     );
     assert.deepEqual(
-      operation_events.map((event) => `${event.operationName}:${event.operationStatus}`),
-      ["model-switching:finished"],
+      action_events.map((event) => `${event.actionTitle}:${event.actionState}`),
+      ["Session model switched:completed"],
     );
   } finally {
     await agent.dispose();
   }
 });
 
-test("session.fork persists and publishes history-forking operations on source session", async () => {
+test("session.fork persists and publishes history-forking actions on source session", async () => {
   const agent_path = await fs.mkdtemp(
     path.join(os.tmpdir(), "downcity-agent-history-forking-"),
   );
@@ -164,7 +165,7 @@ test("session.fork persists and publishes history-forking operations on source s
 
     const events = [];
     const unsubscribe = session.subscribe((event) => {
-      if (event.type === "operation" && event.name === "history-forking") {
+      if (event.type === "action") {
         events.push(event);
       }
     });
@@ -172,25 +173,26 @@ test("session.fork persists and publishes history-forking operations on source s
     unsubscribe();
 
     assert.deepEqual(
-      events.map((event) => `${event.name}:${event.status}`),
-      ["history-forking:started", "history-forking:finished"],
+      events.map((event) => `${event.title}:${event.state}`),
+      ["Forking session history:running", "Session history forked:completed"],
     );
+    assert.equal(new Set(events.map((event) => event.id)).size, 1);
     assert.notEqual(forked.id, session.id);
 
     const source_history = await session.history({ view: "timeline" });
-    const source_fork_operations = source_history.items.filter(
-      (item) => item.operationName === "history-forking",
+    const source_fork_actions = source_history.items.filter(
+      (item) => item.role === "action" && item.actionTitle === "Session history forked",
     );
     assert.deepEqual(
-      source_fork_operations.map((event) => event.operationStatus),
-      ["finished"],
+      source_fork_actions.map((event) => event.actionState),
+      ["completed"],
     );
 
     const forked_history = await forked.history({ view: "timeline" });
-    const forked_model_operations = forked_history.items.filter(
-      (item) => item.operationName === "model-switching",
+    const forked_model_actions = forked_history.items.filter(
+      (item) => item.role === "action" && item.actionTitle === "Session model switched",
     );
-    assert.equal(forked_model_operations.length, 1);
+    assert.equal(forked_model_actions.length, 1);
   } finally {
     await agent.dispose();
   }

package/src/executor/Executor.ts

@@ -28,7 +28,7 @@ import type { JsonObject } from "@/types/common/Json.js";
 import type { SessionMessageV1 } from "@/executor/types/SessionMessages.js";
 import type { SessionExecutor } from "@/executor/types/SessionExecutor.js";
 import type { SessionRunContext } from "@/types/executor/SessionRunContext.js";
-import type { AgentSessionOperationRecord } from "@/types/sdk/AgentSessionOperation.js";
+import type { AgentSessionActionRecord } from "@/types/sdk/AgentSessionAction.js";
 import type {
   SessionExecuteInput,
   SessionRunResult,
@@ -362,7 +362,7 @@ export class Executor implements SessionExecutor {
     const composed_context = await this.contextComposer.compose(run_context);
     const tools = this.bind_run_scope_to_tools(composed_context.tools, run_context);
     const system = await this.systemComposer.resolve(run_context);
-    let compaction_operation_id = "";
+    let compaction_action_id = "";
 
     try {
       if (retry_count > 0) {
@@ -371,13 +371,13 @@ export class Executor implements SessionExecutor {
         });
       }
 
-      const emit_compaction_operation = async (
-        operation: AgentSessionOperationRecord,
+      const emit_compaction_action = async (
+        action: AgentSessionActionRecord,
       ): Promise<void> => {
-        if (operation.status === "started") {
-          compaction_operation_id = operation.operationId;
+        if (action.state === "running") {
+          compaction_action_id = action.id;
         }
-        await this.emitOperation(run_context, operation);
+        await this.emitAction(run_context, action);
       };
 
       await this.compactionComposer.run({
@@ -385,17 +385,16 @@ export class Executor implements SessionExecutor {
         model,
         system,
         retryCount: retry_count,
-        onOperation: emit_compaction_operation,
+        onAction: emit_compaction_action,
       });
     } catch (error) {
-      await this.emitOperation(run_context, {
-        operationId:
-          compaction_operation_id ||
+      await this.emitAction(run_context, {
+        id:
+          compaction_action_id ||
           `compacting:${this.sessionId}:failed:${Date.now()}:${generateId()}`,
-        name: "compacting",
-        status: "failed",
-        label: "Session history compact failed",
-        error: error instanceof Error ? error.message : String(error),
+        title: "Session history compact failed",
+        description: error instanceof Error ? error.message : String(error),
+        state: "failed",
         visible: false,
       });
       // 压缩失败不阻断主流程，继续使用当前历史消息执行。
@@ -492,8 +491,8 @@ export class Executor implements SessionExecutor {
       ...(typeof input?.onUiMessageChunkCallback === "function"
         ? { onUiMessageChunkCallback: input.onUiMessageChunkCallback }
         : {}),
-      ...(typeof input?.onOperationCallback === "function"
-        ? { onOperationCallback: input.onOperationCallback }
+      ...(typeof input?.onActionCallback === "function"
+        ? { onActionCallback: input.onActionCallback }
         : {}),
       ...(input?.abortSignal ? { abortSignal: input.abortSignal } : {}),
       injectedUserMessages: Array.isArray(input?.injectedUserMessages)
@@ -511,22 +510,22 @@ export class Executor implements SessionExecutor {
   }
 
   /**
-   * 发布一次 session operation。
+   * 发布一次 session action。
    */
-  private async emitOperation(
+  private async emitAction(
     run_context: SessionRunContext,
-    operation: AgentSessionOperationRecord,
+    action: AgentSessionActionRecord,
   ): Promise<void> {
-    if (typeof run_context.onOperationCallback !== "function") return;
-    const operation_id =
-      String(operation.operationId || "").trim() ||
-      `operation:${this.sessionId}:${Date.now()}:${generateId()}`;
-    await run_context.onOperationCallback({
-      type: "operation",
+    if (typeof run_context.onActionCallback !== "function") return;
+    const action_id =
+      String(action.id || "").trim() ||
+      `action:${this.sessionId}:${Date.now()}:${generateId()}`;
+    await run_context.onActionCallback({
+      type: "action",
       sessionId: run_context.sessionId || this.sessionId,
-      ...operation,
-      operationId: operation_id,
-      ...(run_context.turnId && !operation.turnId
+      ...action,
+      id: action_id,
+      ...(run_context.turnId && !action.turnId
         ? { turnId: run_context.turnId }
         : {}),
     });

package/src/executor/composer/compaction/SessionCompactionComposer.ts

@@ -8,7 +8,7 @@
 
 import type { LanguageModel, SystemModelMessage } from "ai";
 import type { SessionHistoryStore } from "@/executor/store/history/SessionHistoryStore.js";
-import type { AgentSessionOperationRecord } from "@/types/sdk/AgentSessionOperation.js";
+import type { AgentSessionActionRecord } from "@/types/sdk/AgentSessionAction.js";
 
 /**
  * compaction Composer 执行输入。
@@ -35,13 +35,13 @@ export type SessionCompactionInput = {
   retryCount: number;
 
   /**
-   * 可选 operation 发布回调。
+   * 可选 action 发布回调。
    *
    * 说明（中文）
-   * - 默认 compaction Composer 可在真正开始压缩时发布 `compacting`。
-   * - 回调由上层 Session 负责转成订阅事件与 operation message。
+   * - 默认 compaction Composer 可在真正开始压缩时发布 action。
+   * - 回调由上层 Session 负责转成订阅事件与 action message。
    */
-  onOperation?: (operation: AgentSessionOperationRecord) => Promise<void>;
+  onAction?: (action: AgentSessionActionRecord) => Promise<void>;
 };
 
 /**

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

@@ -79,7 +79,7 @@ export class JsonlSessionCompactionComposer implements SessionCompactionComposer
       maxInputTokensApprox: policy.maxInputTokensApprox,
       archiveOnCompact: policy.archiveOnCompact,
       compactRatio: policy.compactRatio,
-      ...(input.onOperation ? { onOperation: input.onOperation } : {}),
+      ...(input.onAction ? { onAction: input.onAction } : {}),
     });
   }
 

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

@@ -20,10 +20,14 @@ import { getLogger } from "@/utils/logger/Logger.js";
 import type {
   SessionMessageV1,
   SessionMetadataV1,
+  SessionModelMessageV1,
+} from "@/executor/types/SessionMessages.js";
+import {
+  isSessionActionMessage,
+  isSessionModelMessage,
 } from "@/executor/types/SessionMessages.js";
-import { isSessionOperationMessage } from "@/executor/types/SessionMessages.js";
 import type { SessionHistoryMetaV1 } from "@/executor/types/SessionHistoryMeta.js";
-import type { AgentSessionOperationRecord } from "@/types/sdk/AgentSessionOperation.js";
+import type { AgentSessionActionRecord } from "@/types/sdk/AgentSessionAction.js";
 
 export type SessionCompactParams = {
   model: LanguageModel;
@@ -32,7 +36,7 @@ export type SessionCompactParams = {
   maxInputTokensApprox: number;
   archiveOnCompact: boolean;
   compactRatio: number;
-  onOperation?: (operation: AgentSessionOperationRecord) => Promise<void>;
+  onAction?: (action: AgentSessionActionRecord) => Promise<void>;
 };
 
 type SessionCompactDeps = {
@@ -63,17 +67,16 @@ export async function compactSessionMessagesIfNeeded(
   params: SessionCompactParams,
 ): Promise<{ compacted: boolean; reason?: string }> {
   const logger = getLogger(deps.rootPath, "info");
-  const operation_id = `compacting:${deps.sessionId}:${Date.now()}:${generateId()}`;
-  let operation_started = false;
+  const action_id = `compacting:${deps.sessionId}:${Date.now()}:${generateId()}`;
+  let action_started = false;
 
-  const publish_operation = async (
-    operation: Omit<AgentSessionOperationRecord, "operationId" | "name">,
+  const publish_action = async (
+    action: Omit<AgentSessionActionRecord, "id">,
   ): Promise<void> => {
-    if (typeof params.onOperation !== "function") return;
-    await params.onOperation({
-      operationId: operation_id,
-      name: "compacting",
-      ...operation,
+    if (typeof params.onAction !== "function") return;
+    await params.onAction({
+      id: action_id,
+      ...action,
     });
   };
 
@@ -81,12 +84,10 @@ export async function compactSessionMessagesIfNeeded(
   // phase 1：snapshot（短锁）
   // - 仅负责拿一致性快照，不做耗时的模型调用。
   // - 目的是把锁持有时间降到最低。
-  let snapshot: SessionMessageV1[] = [];
+  let snapshot: SessionModelMessageV1[] = [];
   let snapshotTailId = "";
   await deps.withWriteLock(async () => {
-    snapshot = (await deps.loadAll()).filter(
-      (message) => !isSessionOperationMessage(message),
-    );
+    snapshot = (await deps.loadAll()).filter(isSessionModelMessage);
     snapshotTailId =
       snapshot.length > 0
         ? String(snapshot[snapshot.length - 1].id || "")
@@ -118,11 +119,10 @@ export async function compactSessionMessagesIfNeeded(
   const older = snapshot.slice(0, compactCount);
   if (older.length === 0) return { compacted: false, reason: "nothing_to_compact" };
 
-  operation_started = true;
-  await publish_operation({
-    status: "started",
-    label: "Compacting session history",
-    progress: 0,
+  action_started = true;
+  await publish_action({
+    title: "Compacting session history",
+    state: "running",
   });
 
   const olderTextAll = extractPlainTextFromMessages(older);
@@ -163,11 +163,10 @@ export async function compactSessionMessagesIfNeeded(
       },
     );
     summary = "（系统自动压缩：摘要生成失败，已丢弃更早历史，仅保留最近对话。）";
-    await publish_operation({
-      status: "progress",
-      label: "Compacting session history",
-      reason: "summary_fallback",
-      progress: 0.5,
+    await publish_action({
+      title: "Compacting session history",
+      description: "Summary generation failed; using a fallback summary.",
+      state: "running",
     });
   }
 
@@ -191,7 +190,7 @@ export async function compactSessionMessagesIfNeeded(
     void snapshotTailId;
 
     const current_model_messages = current.filter(
-      (message) => !isSessionOperationMessage(message),
+      isSessionModelMessage,
     );
     const currentCompactCount = resolveCompactCount(
       current_model_messages.length,
@@ -242,15 +241,11 @@ export async function compactSessionMessagesIfNeeded(
     });
   });
 
-  if (operation_started) {
-    await publish_operation({
-      status: "finished",
-      label: "Session history compacted",
-      progress: 1,
-      result: {
-        archiveId,
-        compactedCount: older.length,
-      },
+  if (action_started) {
+    await publish_action({
+      title: "Session history compacted",
+      description: `Compacted ${String(older.length)} earlier messages into ${archiveId}.`,
+      state: "completed",
     });
   }
 
@@ -302,7 +297,7 @@ function estimateTokensApproxFromText(text: string): number {
  * - 统一把 user / assistant 内容线性化，作为 compact 摘要输入。
  * - tool 原始结构不会原样输出，避免把噪声日志喂给摘要模型。
  */
-function extractPlainTextFromMessages(messages: SessionMessageV1[]): string {
+function extractPlainTextFromMessages(messages: SessionModelMessageV1[]): string {
   const lines: string[] = [];
   for (const m of messages) {
     if (!m || typeof m !== "object") continue;

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

@@ -9,8 +9,10 @@
 
 import type { Tool } from "ai";
 import {
-  isSessionOperationMessage,
+  isSessionActionMessage,
+  isSessionModelMessage,
   type SessionMessageV1,
+  type SessionModelMessageV1,
 } from "@/executor/types/SessionMessages.js";
 import type { SessionHistoryStore } from "@/executor/store/history/SessionHistoryStore.js";
 import type {
@@ -49,7 +51,7 @@ export class JsonlSessionHistoryComposer implements SessionHistoryComposer {
     return tools && typeof tools === "object" ? { ...tools } : {};
   }
 
-  private readUserSessionMessageText(message: SessionMessageV1): string {
+  private readUserSessionMessageText(message: SessionModelMessageV1): string {
     if (!message || typeof message !== "object" || message.role !== "user") {
       return "";
     }
@@ -76,7 +78,7 @@ 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 (item.role !== "user") continue;
+      if (!isSessionModelMessage(item) || item.role !== "user") continue;
       return this.readUserSessionMessageText(item) === target;
     }
     return false;
@@ -85,6 +87,8 @@ export class JsonlSessionHistoryComposer implements SessionHistoryComposer {
   private sanitizeMessages(messages: SessionMessageV1[]): SessionMessageV1[] {
     if (!Array.isArray(messages)) return [];
     return messages
+      .filter((message) => !isSessionActionMessage(message))
+      .filter(isSessionModelMessage)
       .map((message) => {
         const parts = Array.isArray(message.parts)
           ? message.parts.filter((part) => part && typeof part === "object")
@@ -94,7 +98,6 @@ export class JsonlSessionHistoryComposer implements SessionHistoryComposer {
           parts,
         };
       })
-      .filter((message) => !isSessionOperationMessage(message))
       .filter((message) => Array.isArray(message.parts) && message.parts.length > 0);
   }
 

package/src/executor/messages/SessionAttachmentMapper.ts

@@ -187,7 +187,7 @@ export async function hydrateFileUrlPartsForModel(
       continue;
     }
 
-    const nextParts: SessionMessageV1["parts"] = [];
+    const nextParts: SessionModelMessageV1["parts"] = [];
     let changed = false;
     for (const part of parts) {
       if (!isFileUIPart(part as FileUIPart)) {
@@ -196,7 +196,7 @@ export async function hydrateFileUrlPartsForModel(
       }
       const nextPart = await hydrateFileUrlPart(part as FileUIPart, projectRoot);
       if (nextPart !== part) changed = true;
-      nextParts.push(nextPart as SessionMessageV1["parts"][number]);
+      nextParts.push(nextPart as SessionModelMessageV1["parts"][number]);
     }
 
     out.push(changed ? { ...message, parts: nextParts } : message);

package/src/executor/messages/SessionMessageCodec.ts

@@ -28,7 +28,7 @@ import {
  *
  * 关键点（中文）
  * - 用途：从 onStepCallback 返回的消息里挑出可并入推理上下文的 user 文本。
- * - 输入：任意 SessionMessageV1[]（可能混有 assistant/tool/空消息）。
+ * - 输入：任意 SessionMessageV1[]（可能混有 assistant/tool/action/空消息）。
  * - 输出：只包含“非空 user 文本”的消息数组。
  */
 export function pickMergedUserMessages(
@@ -40,7 +40,7 @@ export function pickMergedUserMessages(
   // 逐条过滤消息。
   return messages.filter((message) => {
     // 防御 1：消息必须是对象。
-    if (!message || typeof message !== "object") return false;
+    if (!isSessionModelMessage(message)) return false;
 
     // 防御 2：只接受 user 角色。
     if (message.role !== "user") return false;
@@ -80,7 +80,7 @@ export async function toModelMessages(
   // 空输入快速返回，避免调用转换器的额外开销。
   if (!Array.isArray(messages) || messages.length === 0) return [];
 
-  // operation message 只服务前端时间线，不能传入模型。
+  // action message 只服务前端时间线，不能传入模型。
   const model_messages = messages.filter(isSessionModelMessage);
   if (model_messages.length === 0) return [];
 

package/src/executor/messages/SessionStepEventMapper.ts

@@ -7,7 +7,7 @@
  * - 每个 step 前插入 `step-start`，便于在 UI 中保留多 step 边界。
  */
 
-import type { SessionMessageV1 } from "@/executor/types/SessionMessages.js";
+import type { SessionModelMessageV1 } from "@/executor/types/SessionMessages.js";
 
 type UnknownRecord = Record<string, unknown>;
 
@@ -112,8 +112,8 @@ export function buildSessionStepParts(params: {
   stepResult?: unknown;
   text: string;
   visibility?: "visible" | "internal";
-}): SessionMessageV1["parts"] {
-  const out: SessionMessageV1["parts"] = [];
+}): SessionModelMessageV1["parts"] {
+  const out: SessionModelMessageV1["parts"] = [];
   const stepRecord = toRecord(params.stepResult) || {};
   const toolCalls = Array.isArray(stepRecord.toolCalls) ? stepRecord.toolCalls : [];
   const toolResults = Array.isArray(stepRecord.toolResults)
@@ -171,7 +171,7 @@ export function buildSessionStepParts(params: {
               state: "output-available",
               output,
             }),
-      } as SessionMessageV1["parts"][number],
+      } as SessionModelMessageV1["parts"][number],
     );
   }
 
@@ -183,7 +183,7 @@ export function buildSessionStepParts(params: {
       {
         type: toDataPartType(type),
         data: resolveAcpEventData(acpEvent),
-      } as SessionMessageV1["parts"][number],
+      } as SessionModelMessageV1["parts"][number],
     );
   }
 

package/src/executor/services/ExecutorInflightService.ts

@@ -9,7 +9,8 @@
 
 import { generateId } from "@/utils/Id.js";
 import type { SessionHistoryStore } from "@/executor/store/history/SessionHistoryStore.js";
-import type { SessionMessageV1 } from "@/executor/types/SessionMessages.js";
+import type { SessionModelMessageV1 } from "@/executor/types/SessionMessages.js";
+import { isSessionModelMessage } from "@/executor/types/SessionMessages.js";
 
 interface ExecutorInflightServiceOptions {
   /**
@@ -51,7 +52,7 @@ export class ExecutorInflightService {
    * 把 step/tool 过程增量写入当前运行中的 assistant 快照。
    */
   async append_assistant_step_parts(
-    parts: SessionMessageV1["parts"],
+    parts: SessionModelMessageV1["parts"],
   ): Promise<void> {
     const normalized_parts = Array.isArray(parts)
       ? parts.filter((part) => part && typeof part === "object")
@@ -59,11 +60,14 @@ export class ExecutorInflightService {
     if (normalized_parts.length === 0) return;
 
     const current_inflight = await this.history_store.readInflight();
-    const next_message: SessionMessageV1 = current_inflight
+    const normalized_inflight = isSessionModelMessage(current_inflight)
+      ? current_inflight
+      : null;
+    const next_message: SessionModelMessageV1 = normalized_inflight
       ? {
-          ...current_inflight,
+          ...normalized_inflight,
           metadata: {
-            ...(current_inflight.metadata || {
+            ...(normalized_inflight.metadata || {
               v: 1 as const,
               ts: Date.now(),
               sessionId: this.session_id,
@@ -74,8 +78,8 @@ export class ExecutorInflightService {
             kind: "normal",
           },
           parts: [
-            ...(Array.isArray(current_inflight.parts)
-              ? current_inflight.parts
+            ...(Array.isArray(normalized_inflight.parts)
+              ? normalized_inflight.parts
               : []),
             ...normalized_parts,
           ],