@downcity/agent 1.1.198 → 1.1.200

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

@@ -12,7 +12,7 @@ import {
   isTextUIPart,
   isToolUIPart,
 } from "ai";
-import type { SessionMessageV1 } from "@/executor/types/SessionMessages.js";
+import type { SessionModelMessageV1 } from "@/executor/types/SessionMessages.js";
 import type { JsonObject } from "@/types/common/Json.js";
 
 /**
@@ -192,7 +192,7 @@ export function summarizeStepForDebug(stepResult: unknown): JsonObject {
  * 汇总最终 assistant UI 消息的调试摘要。
  */
 export function summarizeUiMessageForDebug(
-  message: SessionMessageV1 | null | undefined,
+  message: SessionModelMessageV1 | null | undefined,
 ): JsonObject {
   const parts = Array.isArray(message?.parts) ? message.parts : [];
   const text = parts
@@ -230,9 +230,9 @@ export function summarizeUiMessageForDebug(
  * - 多 step 场景下，最终 assistant message 需要把各 step 的 UI part 串起来。
  */
 export function mergeAssistantUiMessages(
-  base: SessionMessageV1 | null,
-  incoming: SessionMessageV1,
-): SessionMessageV1 {
+  base: SessionModelMessageV1 | null,
+  incoming: SessionModelMessageV1,
+): SessionModelMessageV1 {
   if (!base) return incoming;
   const baseMetadata = base.metadata;
   const incomingMetadata = incoming.metadata;
@@ -254,7 +254,7 @@ export function mergeAssistantUiMessages(
 }
 
 function pickIncompleteToolParts(
-  message: SessionMessageV1 | null | undefined,
+  message: SessionModelMessageV1 | null | undefined,
 ): Array<{
   toolName: string;
   state: string;
@@ -304,7 +304,7 @@ export function buildIncompleteResponseRecoveryNudge(
  */
 export function detectIncompleteResponse(params: {
   stepResult: unknown;
-  assistantMessage: SessionMessageV1 | null | undefined;
+  assistantMessage: SessionModelMessageV1 | null | undefined;
 }): {
   reason: string;
   details: JsonObject;

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

@@ -10,7 +10,7 @@
 import type { streamText } from "ai";
 import type { Logger } from "@/utils/logger/Logger.js";
 import type { JsonObject } from "@/types/common/Json.js";
-import type { SessionMessageV1 } from "@/executor/types/SessionMessages.js";
+import type { SessionModelMessageV1 } from "@/executor/types/SessionMessages.js";
 import type { SessionUiMessageChunkCallback } from "@/executor/types/SessionRun.js";
 import { generateId } from "@/utils/Id.js";
 import {
@@ -37,7 +37,7 @@ export async function collectFinalAssistantMessageFromUiStream(params: {
   /**
    * 构造 fallback assistant 消息的工厂函数。
    */
-  buildFallbackAssistantMessage: (text: string) => SessionMessageV1;
+  buildFallbackAssistantMessage: (text: string) => SessionModelMessageV1;
   /**
    * UI stream chunk 回调。
    */
@@ -50,12 +50,12 @@ export async function collectFinalAssistantMessageFromUiStream(params: {
    * - 此时仍应尽量用已经收到的 text delta 构造可持久化 assistant 消息。
    */
   abortSignal?: AbortSignal;
-}): Promise<SessionMessageV1> {
-  let streamedAssistantMessage: SessionMessageV1 | null = null;
+}): Promise<SessionModelMessageV1> {
+  let streamedAssistantMessage: SessionModelMessageV1 | null = null;
   let uiFinishSummary: JsonObject | null = null;
   let streamed_text = "";
 
-  const uiStream = params.result.toUIMessageStream<SessionMessageV1>({
+  const uiStream = params.result.toUIMessageStream<SessionModelMessageV1>({
     // 关键点（中文）：SDK stream 需要 reasoning 旁路事件时可直接消费；最终落盘仍由 responseMessage 收敛。
     originalMessages: [],
     generateMessageId: () => `a:${params.sessionId}:${generateId()}`,

package/src/executor/messages/AssistantResultPersistence.ts

@@ -7,7 +7,10 @@
  * - 运行中 step/tool 的持久化由 inflight 快照承担；run 结束时只关心最终 assistant 如何收口。
  */
 
-import type { SessionMessageV1 } from "@/executor/types/SessionMessages.js";
+import type {
+  SessionMessageV1,
+  SessionModelMessageV1,
+} from "@/executor/types/SessionMessages.js";
 import { resolveAssistantMessageForPersistence } from "@/executor/messages/UserVisibleText.js";
 
 /**
@@ -40,7 +43,7 @@ export interface PersistAssistantResultParams {
   /**
    * 本轮执行得到的 assistant message。
    */
-  assistantMessage: SessionMessageV1 | null | undefined;
+  assistantMessage: SessionModelMessageV1 | null | undefined;
   /**
    * 可选兜底文本。
    *
@@ -65,7 +68,7 @@ export function buildAssistantResultPersistencePayload(
   /**
    * 已构造好的完整 assistant message。
    */
-  message?: SessionMessageV1 | null;
+  message?: SessionModelMessageV1 | null;
   /**
    * 允许写入的兜底文本。
    */

package/src/executor/messages/SessionAttachmentMapper.ts

@@ -17,7 +17,10 @@ import {
   type FileUIPart,
 } from "ai";
 import type { SessionUserMessagePart } from "@/types/sdk/AgentSessionPrompt.js";
-import type { SessionMessageV1 } from "@/executor/types/SessionMessages.js";
+import type {
+  SessionMessageV1,
+  SessionModelMessageV1,
+} from "@/executor/types/SessionMessages.js";
 import { parseChatMessageMarkup } from "@/executor/messages/ChatMessageMarkup.js";
 
 /**
@@ -171,12 +174,12 @@ export async function hydrateUserPromptFileParts(
  * - 新历史保留 Agent 根目录相对路径，旧历史的 `file://` 仍继续兼容。
  */
 export async function hydrateFileUrlPartsForModel(
-  messages: SessionMessageV1[],
+  messages: SessionModelMessageV1[],
   projectRoot?: string,
-): Promise<SessionMessageV1[]> {
+): Promise<SessionModelMessageV1[]> {
   if (!Array.isArray(messages) || messages.length === 0) return messages;
 
-  const out: SessionMessageV1[] = [];
+  const out: SessionModelMessageV1[] = [];
   for (const message of messages) {
     const parts = Array.isArray(message?.parts) ? message.parts : [];
     if (!parts.some((part) => isFileUIPart(part as FileUIPart))) {
@@ -184,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)) {
@@ -193,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);
@@ -206,13 +209,13 @@ export async function hydrateFileUrlPartsForModel(
  * 在 user 消息上注入 FileUIPart，以便多模态模型直接消费本地附件。
  */
 export async function injectFilePartsFromAttachments(
-  messages: SessionMessageV1[],
+  messages: SessionModelMessageV1[],
   projectRoot?: string,
-): Promise<SessionMessageV1[]> {
+): Promise<SessionModelMessageV1[]> {
   if (!Array.isArray(messages) || messages.length === 0) return messages;
 
   const root = path.resolve(String(projectRoot || "").trim() || process.cwd());
-  const out: SessionMessageV1[] = [];
+  const out: SessionModelMessageV1[] = [];
 
   for (const message of messages) {
     if (!message || typeof message !== "object" || message.role !== "user") {

package/src/executor/messages/SessionMessageCodec.ts

@@ -15,7 +15,7 @@ import {
   type ToolSet,
 } from "ai";
 import {
-  isSessionOperationMessage,
+  isSessionModelMessage,
   type SessionMessageV1,
 } from "@/executor/types/SessionMessages.js";
 import {
@@ -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,10 +80,8 @@ export async function toModelMessages(
   // 空输入快速返回，避免调用转换器的额外开销。
   if (!Array.isArray(messages) || messages.length === 0) return [];
 
-  // operation message 只服务前端时间线，不能传入模型。
-  const model_messages = messages.filter(
-    (message) => !isSessionOperationMessage(message),
-  );
+  // action message 只服务前端时间线，不能传入模型。
+  const model_messages = messages.filter(isSessionModelMessage);
   if (model_messages.length === 0) return [];
 
   // 第一步（中文）：在 user 消息上注入 file parts（多模态附件）。

package/src/executor/messages/SessionMessageLog.ts

@@ -9,12 +9,14 @@
 
 import { isTextUIPart } from "ai";
 import type { Logger } from "@/utils/logger/Logger.js";
-import type { SessionMessageV1 } from "@/executor/types/SessionMessages.js";
+import type { SessionModelMessageV1 } from "@/executor/types/SessionMessages.js";
 
 /**
  * 从 UI message 中提取 assistant 文本部分。
  */
-export function extractAssistantTextForLog(message: SessionMessageV1): string {
+export function extractAssistantTextForLog(
+  message: SessionModelMessageV1,
+): string {
   if (!Array.isArray(message.parts)) return "";
   return message.parts
     .filter(isTextUIPart)
@@ -28,7 +30,7 @@ export function extractAssistantTextForLog(message: SessionMessageV1): string {
  */
 export async function logAssistantMessageNow(
   logger: Logger,
-  message: SessionMessageV1,
+  message: SessionModelMessageV1,
 ): Promise<void> {
   const text = extractAssistantTextForLog(message) || "-";
   const normalized = text.replace(/\r\n/g, "\n");

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/messages/UserVisibleText.ts

@@ -7,7 +7,11 @@
  * - 因此需要一个稳定的、与 Agent 解耦的提取逻辑（属于 chat/egress 语义）
  */
 
-import type { SessionMessageV1 } from "@/executor/types/SessionMessages.js";
+import {
+  isSessionModelMessage,
+  type SessionMessageV1,
+  type SessionModelMessageV1,
+} from "@/executor/types/SessionMessages.js";
 import {
   extractTextFromUiMessage,
   extractToolCallsFromUiMessage,
@@ -22,8 +26,9 @@ import {
  */
 export function resolveAssistantMessageForPersistence(
   message: SessionMessageV1 | null | undefined,
-): SessionMessageV1 | null {
+): SessionModelMessageV1 | null {
   if (!message || typeof message !== "object") return null;
+  if (!isSessionModelMessage(message)) return null;
   return message;
 }
 
@@ -37,6 +42,7 @@ export function resolveAssistantMessageForPersistence(
 export function pickLastSuccessfulChatSendText(
   message: SessionMessageV1 | null | undefined,
 ): string {
+  if (!isSessionModelMessage(message)) return "";
   const toolCalls = extractToolCallsFromUiMessage(message);
   // 关键点（中文）：优先从 chat_send 的 input.text 还原"用户可见回复"。
   for (let i = toolCalls.length - 1; i >= 0; i -= 1) {

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,
           ],

package/src/executor/store/history/SessionHistoryStore.ts

@@ -9,11 +9,12 @@
 
 import type { LanguageModel } from "ai";
 import type {
+  SessionActionMessageV1,
   SessionMessageV1,
   SessionMetadataV1,
 } from "@/executor/types/SessionMessages.js";
 import type { SessionSystemMessage } from "@/executor/types/SessionPrompts.js";
-import type { AgentSessionOperationRecord } from "@/types/sdk/AgentSessionOperation.js";
+import type { AgentSessionActionRecord } from "@/types/sdk/AgentSessionAction.js";
 
 /**
  * compact 输入参数。
@@ -50,9 +51,9 @@ export type SessionHistoryCompactInput = {
   compactRatio: number;
 
   /**
-   * 可选 operation 发布回调。
+   * 可选 action 发布回调。
    */
-  onOperation?: (operation: AgentSessionOperationRecord) => Promise<void>;
+  onAction?: (action: AgentSessionActionRecord) => Promise<void>;
 };
 
 /**
@@ -165,23 +166,23 @@ export interface SessionHistoryStore {
   }): SessionMessageV1;
 
   /**
-   * 构造 operation 消息。
+   * 构造 action 消息。
    */
-  operation(input: {
+  action(input: {
     /**
-     * 当前 operation 结构化记录。
+     * 当前 action 结构化记录。
      */
-    operation: AgentSessionOperationRecord;
+    action: AgentSessionActionRecord;
 
     /**
-     * 消息元信息（除 schema 字段、kind、source 与 operation 字段）。
+     * 消息元信息（除 schema 字段）。
      */
-    metadata: Omit<SessionMetadataV1, "v" | "ts" | "kind" | "source" | "operation"> &
+    metadata: Pick<SessionMetadataV1, "sessionId"> &
       Partial<Pick<SessionMetadataV1, "ts">>;
 
     /**
      * 可选消息 ID（默认自动生成）。
      */
     id?: string;
-  }): SessionMessageV1;
+  }): SessionActionMessageV1;
 }

package/src/executor/store/history/jsonl/JsonlSessionHistoryStore.ts

@@ -18,10 +18,16 @@ import { generateId } from "@/utils/Id.js";
 import { getLogger } from "@/utils/logger/Logger.js";
 import { compactSessionMessagesIfNeeded } from "@executor/composer/compaction/jsonl/JsonlSessionCompactionExecutor.js";
 import type {
+  SessionActionMessageV1,
   SessionMessageV1,
   SessionMetadataV1,
 } from "@/executor/types/SessionMessages.js";
-import type { AgentSessionOperationRecord } from "@/types/sdk/AgentSessionOperation.js";
+import {
+  isSessionActionMessage,
+  isSessionModelMessage,
+  toSessionActionMessage,
+} from "@/executor/types/SessionMessages.js";
+import type { AgentSessionActionRecord } from "@/types/sdk/AgentSessionAction.js";
 import type { SessionSystemMessage } from "@/executor/types/SessionPrompts.js";
 import type { SessionHistoryMetaV1 } from "@/executor/types/SessionHistoryMeta.js";
 import type { SessionHistoryPathOverrides } from "@/executor/types/SessionHistoryPaths.js";
@@ -216,15 +222,60 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
     input: unknown,
   ): SessionMessageV1 | null {
     if (!input || typeof input !== "object") return null;
-    const candidate = input as Partial<SessionMessageV1>;
+    if ((input as { type?: unknown }).type === "action") {
+      return this.normalizeActionMessage(input);
+    }
+    const candidate = input as { role?: unknown; parts?: unknown };
     const role = String(candidate.role || "");
-    if (role !== "user" && role !== "assistant") return null;
+    if (role !== "user" && role !== "assistant") {
+      return null;
+    }
     if (!Array.isArray(candidate.parts)) return null;
-    return candidate as SessionMessageV1;
+    return input as SessionMessageV1;
+  }
+
+  private normalizeActionMessage(input: unknown): SessionActionMessageV1 | null {
+    if (!input || typeof input !== "object") return null;
+    const candidate = input as Partial<SessionActionMessageV1>;
+    const id = String(candidate.id || "").trim();
+    const title = String(candidate.title || "").trim();
+    const state = String(candidate.state || "").trim();
+    if (!id || !title) return null;
+    if (state !== "running" && state !== "completed" && state !== "failed") {
+      return null;
+    }
+    const metadata_input =
+      candidate.metadata && typeof candidate.metadata === "object"
+        ? candidate.metadata
+        : {};
+    const metadata_candidate = metadata_input as Partial<SessionActionMessageV1["metadata"]>;
+    const session_id =
+      String(metadata_candidate.sessionId || "").trim() || this.sessionId;
+    const description = String(candidate.description || "").trim();
+    return {
+      type: "action",
+      id,
+      title,
+      ...(description ? { description } : {}),
+      state,
+      metadata: {
+        v: 1,
+        ts:
+          typeof metadata_candidate.ts === "number"
+            ? metadata_candidate.ts
+            : Date.now(),
+        sessionId: session_id,
+        ...(metadata_candidate.turnId ? { turnId: metadata_candidate.turnId } : {}),
+      },
+    };
   }
 
   private hasStructuredAssistantParts(message: SessionMessageV1 | null): boolean {
-    if (!message || message.role !== "assistant" || !Array.isArray(message.parts)) {
+    if (
+      !isSessionModelMessage(message) ||
+      message.role !== "assistant" ||
+      !Array.isArray(message.parts)
+    ) {
       return false;
     }
     return message.parts.some((part) => {
@@ -238,6 +289,8 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
     inflight: SessionMessageV1,
     finalMessage: SessionMessageV1,
   ): SessionMessageV1 {
+    if (!isSessionModelMessage(finalMessage)) return inflight;
+    if (!isSessionModelMessage(inflight)) return finalMessage;
     const final_parts = Array.isArray(finalMessage.parts)
       ? finalMessage.parts.filter((part) => part && typeof part === "object")
       : [];
@@ -355,7 +408,10 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
 
   private async writeInflightUnsafe(message: SessionMessageV1): Promise<void> {
     const normalized = this.normalizePersistedMessage(message);
-    if (!normalized || normalized.role !== "assistant") {
+    if (
+      !isSessionModelMessage(normalized) ||
+      normalized.role !== "assistant"
+    ) {
       throw new Error("inflight assistant must be an assistant UIMessage");
     }
     const file = this.getInflightFilePath();
@@ -377,6 +433,44 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
     );
   }
 
+  private async rewriteMessagesUnsafe(messages: SessionMessageV1[]): Promise<void> {
+    const file = this.getMessagesFilePath();
+    const temp = `${file}.${process.pid}.${Date.now()}.tmp`;
+    const payload =
+      messages.length > 0
+        ? messages.map((message) => JSON.stringify(message)).join("\n") + "\n"
+        : "";
+    await fs.writeFile(temp, payload, "utf8");
+    await fs.move(temp, file, { overwrite: true });
+  }
+
+  private async upsertActionMessageUnsafe(
+    message: SessionActionMessageV1,
+  ): Promise<void> {
+    const file = this.getMessagesFilePath();
+    const raw = await fs.readFile(file, "utf8").catch(() => "");
+    const messages: SessionMessageV1[] = [];
+    let replaced = false;
+
+    for (const line of raw.split("\n").filter(Boolean)) {
+      try {
+        const current = this.normalizePersistedMessage(JSON.parse(line));
+        if (!current) continue;
+        if (isSessionActionMessage(current) && current.id === message.id) {
+          messages.push(message);
+          replaced = true;
+          continue;
+        }
+        messages.push(current);
+      } catch {
+        // 关键点（中文）：重写 action 时顺手跳过损坏行，避免坏 JSON 阻断状态更新。
+      }
+    }
+
+    if (!replaced) messages.push(message);
+    await this.rewriteMessagesUnsafe(messages);
+  }
+
   private async withWriteLock<T>(fn: () => Promise<T>): Promise<T> {
     await this.ensureLayout();
     const lockPath = this.getLockFilePath();
@@ -436,44 +530,6 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
     return system.filter((item) => item && typeof item === "object");
   }
 
-  private normalizeOperation(
-    operation: AgentSessionOperationRecord,
-  ): AgentSessionOperationRecord {
-    const operation_id = String(operation.operationId || "").trim() || generateId();
-    const name = String(operation.name || "").trim() || "operation";
-    const status = String(operation.status || "").trim();
-    const normalized_status: AgentSessionOperationRecord["status"] =
-      status === "started" ||
-      status === "progress" ||
-      status === "finished" ||
-      status === "skipped" ||
-      status === "failed"
-        ? status
-        : "progress";
-    return {
-      operationId: operation_id,
-      name,
-      status: normalized_status,
-      ...(typeof operation.turnId === "string" && operation.turnId.trim()
-        ? { turnId: operation.turnId.trim() }
-        : {}),
-      ...(typeof operation.label === "string" && operation.label.trim()
-        ? { label: operation.label.trim() }
-        : {}),
-      ...(typeof operation.reason === "string" && operation.reason.trim()
-        ? { reason: operation.reason.trim() }
-        : {}),
-      ...(typeof operation.progress === "number" && Number.isFinite(operation.progress)
-        ? { progress: Math.max(0, Math.min(1, operation.progress)) }
-        : {}),
-      ...(operation.result !== undefined ? { result: operation.result } : {}),
-      ...(typeof operation.error === "string" && operation.error.trim()
-        ? { error: operation.error.trim() }
-        : {}),
-      ...(operation.visible === false ? { visible: false } : {}),
-    };
-  }
-
   async compact(input: SessionHistoryCompactInput): Promise<{
     compacted: boolean;
     reason?: string;
@@ -510,7 +566,7 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
         maxInputTokensApprox: input.maxInputTokensApprox,
         archiveOnCompact: input.archiveOnCompact,
         compactRatio: input.compactRatio,
-        ...(input.onOperation ? { onOperation: input.onOperation } : {}),
+        ...(input.onAction ? { onAction: input.onAction } : {}),
       },
     );
   }
@@ -519,10 +575,14 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
     await this.withWriteLock(async () => {
       const normalized = this.normalizePersistedMessage(message);
       if (!normalized) return;
+      if (isSessionActionMessage(normalized)) {
+        await this.upsertActionMessageUnsafe(normalized);
+        return;
+      }
 
       // 关键点（中文）：若上一次 assistant 在运行中中断，新的 user 到来前先把残留快照收口到正式历史，
       // 避免 `list()` 时旧 inflight 跑到新 user 后面，打乱时序。
-      if (normalized.role === "user") {
+      if (isSessionModelMessage(normalized) && normalized.role === "user") {
         const current_inflight = await this.readInflightUnsafe();
         if (current_inflight) {
           await this.appendMessageUnsafe(current_inflight);
@@ -674,29 +734,26 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
     };
   }
 
-  operation(input: {
-    operation: AgentSessionOperationRecord;
-    metadata: Omit<SessionMetadataV1, "v" | "ts" | "kind" | "source" | "operation"> &
+  action(input: {
+    action: AgentSessionActionRecord;
+    metadata: Pick<SessionMetadataV1, "sessionId"> &
       Partial<Pick<SessionMetadataV1, "ts">>;
     id?: string;
-  }): SessionMessageV1 {
-    const operation = this.normalizeOperation(input.operation);
-    const label = String(
-      operation.label || `${operation.name}: ${operation.status}`,
-    ).trim();
+  }): SessionActionMessageV1 {
     const { ts, ...metadata } = input.metadata;
+    const message = toSessionActionMessage(
+      {
+        ...input.action,
+        ...(input.id ? { id: input.id } : {}),
+      },
+      metadata.sessionId || this.sessionId,
+    );
     return {
-      id: input.id || `op:${this.sessionId}:${operation.operationId}:${generateId()}`,
-      role: "assistant",
+      ...message,
       metadata: {
-        v: 1,
-        ts: typeof ts === "number" ? ts : Date.now(),
-        ...metadata,
-        source: "operation",
-        kind: "operation",
-        operation,
+        ...message.metadata,
+        ts: typeof ts === "number" ? ts : message.metadata.ts,
       },
-      parts: [{ type: "text", text: label }],
     };
   }
 }