@downcity/agent 1.1.199 → 1.1.200

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,17 +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" && role !== "operation") {
+    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) => {
@@ -240,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")
       : [];
@@ -357,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();
@@ -379,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();
@@ -438,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;
@@ -512,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 } : {}),
       },
     );
   }
@@ -521,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);
@@ -676,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: "operation",
+      ...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 }],
     };
   }
 }

package/src/executor/types/SessionMessages.ts

@@ -9,18 +9,21 @@
 
 import type { UIMessage } from "ai";
 import type { JsonObject } from "@/types/common/Json.js";
-import type { AgentSessionOperationRecord } from "@/types/sdk/AgentSessionOperation.js";
+import type {
+  AgentSessionActionRecord,
+  AgentSessionActionState,
+} from "@/types/sdk/AgentSessionAction.js";
 
 /**
  * Session 消息：以 UIMessage[] 作为唯一事实源。
  *
  * 关键点（中文）
  * - 持久化存储在 `.downcity/agents/<encodedAgentId>/sessions/<encodedSessionId>/messages/messages.jsonl`
- * - 默认只存 `role=user|assistant|operation`
+ * - 默认只存模型消息，或 `type=action` 的 UI 状态消息。
  * - compact 会把更早消息压缩为一条 `assistant` 摘要消息
- * - operation 只用于 UI timeline，不进入 LLM 输入
+ * - action 只用于 UI timeline，不进入 LLM 输入
  */
-export type SessionMessageKind = "normal" | "summary" | "operation";
+export type SessionMessageKind = "normal" | "summary";
 
 /**
  * Session 消息来源类型。
@@ -33,8 +36,7 @@ export type SessionMessageKind = "normal" | "summary" | "operation";
 export type SessionMessageSource =
   | "ingress"
   | "egress"
-  | "compact"
-  | "operation";
+  | "compact";
 
 /**
  * 入站消息细分类型。
@@ -74,14 +76,6 @@ export type SessionMetadataV1 = {
   archiveId?: string;
   /** compact 摘要所覆盖的原始消息范围。 */
   sourceRange?: SessionMessageSourceRangeV1;
-  /**
-   * operation message 对应的结构化操作记录。
-   *
-   * 说明（中文）
-   * - 仅当 `kind=operation` 或 `source=operation` 时存在。
-   * - 该字段供前端恢复时间线状态，不会进入 LLM 输入。
-   */
-  operation?: AgentSessionOperationRecord;
   /**
    * 扩展元信息。
    *
@@ -98,43 +92,87 @@ export type SessionMetadataV1 = {
 export type SessionModelMessageV1 = UIMessage<SessionMetadataV1>;
 
 /**
- * operation 角色的 Session 消息结构。
+ * action 消息元信息。
+ */
+export type SessionActionMetadataV1 = {
+  /** 元信息 schema 版本号。 */
+  v: 1;
+  /** 当前 action 写入时的毫秒时间戳。 */
+  ts: number;
+  /** 当前 action 所属的 session ID。 */
+  sessionId: string;
+  /** 当前 action 关联的 turn 标识。 */
+  turnId?: string;
+};
+
+/**
+ * action 类型的 Session 消息结构。
  *
  * 关键点（中文）
- * - `operation` 不是 AI SDK 原生模型 role。
+ * - `action` 不是 AI SDK 原生模型消息。
  * - 它只存在于 JSONL history 与前端 timeline，进入 LLM 前必须过滤。
  */
-export type SessionOperationMessageV1 = Omit<SessionModelMessageV1, "role"> & {
-  /** 消息角色固定为 `operation`。 */
-  role: "operation";
+export type SessionActionMessageV1 = {
+  /** item 类型固定为 `action`。 */
+  type: "action";
+  /** 同一个 action 生命周期内稳定复用的 ID。 */
+  id: string;
+  /** 当前 action 标题。 */
+  title: string;
+  /** 当前 action 描述。 */
+  description?: string;
+  /** 当前 action 状态。 */
+  state: AgentSessionActionState;
+  /** action 元信息。 */
+  metadata: SessionActionMetadataV1;
 };
 
 /**
  * Session 持久化消息结构。
  */
-export type SessionMessageV1 = SessionModelMessageV1 | SessionOperationMessageV1;
+export type SessionMessageV1 = SessionModelMessageV1 | SessionActionMessageV1;
 
 /**
  * user 角色的 Session 消息结构。
  */
-export type SessionUserMessageV1 = SessionMessageV1 & {
+export type SessionUserMessageV1 = SessionModelMessageV1 & {
   /** 消息角色固定为 `user`。 */
   role: "user";
 };
 
 /**
- * 判断一条消息是否为 operation message。
+ * 判断一条消息是否为 action message。
  */
-export function isSessionOperationMessage(
+export function isSessionActionMessage(
   message: SessionMessageV1 | null | undefined,
-): boolean {
+): message is SessionActionMessageV1 {
   if (!message || typeof message !== "object") return false;
-  const metadata = (message.metadata || null) as SessionMetadataV1 | null;
-  return (
-    message.role === "operation" ||
-    metadata?.kind === "operation" ||
-    metadata?.source === "operation"
-  );
+  return (message as { type?: unknown }).type === "action";
+}
+
+/**
+ * 从订阅事件构造 action message。
+ */
+export function toSessionActionMessage(
+  action: AgentSessionActionRecord,
+  session_id: string,
+): SessionActionMessageV1 {
+  const title = String(action.title || "").trim() || "Action";
+  const description = String(action.description || "").trim();
+  const id = String(action.id || "").trim() || `action:${session_id}:${Date.now()}`;
+  return {
+    type: "action",
+    id,
+    title,
+    ...(description ? { description } : {}),
+    state: action.state,
+    metadata: {
+      v: 1,
+      ts: Date.now(),
+      sessionId: session_id,
+      ...(action.turnId ? { turnId: action.turnId } : {}),
+    },
+  };
 }
 
 /**
@@ -144,5 +182,5 @@ export function isSessionModelMessage(
   message: SessionMessageV1 | null | undefined,
 ): message is SessionModelMessageV1 {
   if (!message || typeof message !== "object") return false;
-  return message.role !== "operation" && !isSessionOperationMessage(message);
+  return !isSessionActionMessage(message);
 }

package/src/index.ts

@@ -56,12 +56,11 @@ export type {
   AgentSessionUnsubscribe,
 } from "./types/sdk/AgentSessionEvent.js";
 export type {
-  AgentSessionOperationCallback,
-  AgentSessionOperationEvent,
-  AgentSessionOperationName,
-  AgentSessionOperationRecord,
-  AgentSessionOperationStatus,
-} from "./types/sdk/AgentSessionOperation.js";
+  AgentSessionActionCallback,
+  AgentSessionActionEvent,
+  AgentSessionActionRecord,
+  AgentSessionActionState,
+} from "./types/sdk/AgentSessionAction.js";
 export type { AgentSessionPromptInput, SessionUserMessagePart } from "./types/sdk/AgentSessionPrompt.js";
 export type { AgentSessionStopResult } from "./types/sdk/AgentSessionStop.js";
 export type {

package/src/session/SessionTitle.ts

@@ -10,6 +10,7 @@
 import { generateText, type LanguageModel } from "ai";
 import type { SessionHistoryMetaV1 } from "@/executor/types/SessionHistoryMeta.js";
 import type { SessionMessageV1 } from "@/executor/types/SessionMessages.js";
+import { isSessionModelMessage } from "@/executor/types/SessionMessages.js";
 import {
   normalizeSessionTitle,
   readSessionMetadata,
@@ -61,6 +62,7 @@ function truncateTitle(input: string, maxChars: number): string {
 }
 
 function extractTextFromMessage(message: SessionMessageV1): string {
+  if (!isSessionModelMessage(message)) return "";
   if (!Array.isArray(message.parts)) return "";
   const texts: string[] = [];
   for (const part of message.parts) {
@@ -76,6 +78,7 @@ function extractTextFromMessage(message: SessionMessageV1): string {
 
 function resolveFirstUserText(messages: SessionMessageV1[]): string {
   for (const message of messages) {
+    if (!isSessionModelMessage(message)) continue;
     if (message.role !== "user") continue;
     const text = extractTextFromMessage(message);
     if (text) return text;

package/src/session/browse/Browse.ts

@@ -26,10 +26,15 @@ import type {
   AgentSessionTimelineEvent,
 } from "@/types/agent/AgentTypes.js";
 import type {
+  SessionActionMessageV1,
   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 { pickLastSuccessfulChatSendText } from "@/executor/messages/UserVisibleText.js";
 import { getSdkAgentSessionMessagesPath } from "@/session/storage/Paths.js";
@@ -172,7 +177,7 @@ function extractMessageText(parts: unknown): string {
   return texts.join("\n").trim();
 }
 
-function extractAssistantToolSummary(message: SessionMessageV1): string {
+function extractAssistantToolSummary(message: SessionModelMessageV1): string {
   if (!Array.isArray(message.parts)) return "";
   const toolNames = new Set<string>();
   for (const part of message.parts as AnyUiPart[]) {
@@ -189,6 +194,12 @@ function extractAssistantToolSummary(message: SessionMessageV1): string {
  * 解析单条 session 消息的用户可见预览文本。
  */
 export function resolveSessionMessagePreview(message: SessionMessageV1): string {
+  if (isSessionActionMessage(message)) {
+    return message.description
+      ? `${message.title}\n${message.description}`
+      : message.title;
+  }
+  if (!isSessionModelMessage(message)) return "";
   const plainText = extractMessageText(message.parts);
   if (plainText) return plainText;
   if (message.role !== "assistant") return "";
@@ -226,7 +237,7 @@ function extractToolResultOutput(part: ToolPartCompatShape): unknown {
 }
 
 function toTimelineEvent(params: {
-  message: SessionMessageV1;
+  message: SessionModelMessageV1;
   role: AgentSessionTimelineEvent["role"];
   text: string;
   sequence: number;
@@ -241,15 +252,21 @@ function toTimelineEvent(params: {
     ...(typeof metadata?.source === "string" ? { source: metadata.source } : {}),
     text: params.text,
     ...(params.toolName ? { toolName: params.toolName } : {}),
-    ...(params.role === "operation" && metadata?.operation?.operationId
-      ? { operationId: metadata.operation.operationId }
-      : {}),
-    ...(params.role === "operation" && metadata?.operation?.name
-      ? { operationName: metadata.operation.name }
-      : {}),
-    ...(params.role === "operation" && metadata?.operation?.status
-      ? { operationStatus: metadata.operation.status }
-      : {}),
+  };
+}
+
+function toActionTimelineEvent(
+  message: SessionActionMessageV1,
+): AgentSessionTimelineEvent {
+  const metadata = message.metadata || null;
+  return {
+    id: `${String(message.id || "")}:0`,
+    role: "action",
+    ...(typeof metadata?.ts === "number" ? { ts: metadata.ts } : {}),
+    text: resolveSessionMessagePreview(message),
+    actionTitle: message.title,
+    ...(message.description ? { actionDescription: message.description } : {}),
+    actionState: message.state,
   };
 }
 
@@ -259,21 +276,11 @@ function toTimelineEvent(params: {
 export function toSessionTimelineEvents(
   message: SessionMessageV1,
 ): AgentSessionTimelineEvent[] {
-  if (isSessionOperationMessage(message)) {
-    const metadata = (message.metadata || null) as SessionMetadataV1 | null;
-    if (metadata?.operation?.status !== "finished") return [];
-    return [
-      toTimelineEvent({
-        message,
-        role: "operation",
-        text:
-          String(metadata?.operation?.label || "").trim() ||
-          resolveSessionMessagePreview(message),
-        sequence: 0,
-      }),
-    ];
+  if (isSessionActionMessage(message)) {
+    return [toActionTimelineEvent(message)];
   }
 
+  if (!isSessionModelMessage(message)) return [];
   if (message.role !== "assistant") {
     return [
       toTimelineEvent({
@@ -368,10 +375,11 @@ export async function loadSessionMessagesFromPath(
       try {
         const parsed = JSON.parse(line) as SessionMessageV1;
         if (!parsed || typeof parsed !== "object") continue;
+        const candidate = parsed as { type?: unknown; role?: unknown };
         if (
-          parsed.role !== "user" &&
-          parsed.role !== "assistant" &&
-          parsed.role !== "operation"
+          candidate.type !== "action" &&
+          candidate.role !== "user" &&
+          candidate.role !== "assistant"
         ) {
           continue;
         }
@@ -387,8 +395,7 @@ export async function loadSessionMessagesFromPath(
     try {
       const parsed = (await fs.readJson(inflight_path)) as SessionMessageV1;
       if (
-        parsed &&
-        typeof parsed === "object" &&
+        isSessionModelMessage(parsed) &&
         parsed.role === "assistant" &&
         Array.isArray(parsed.parts)
       ) {
@@ -417,14 +424,14 @@ export async function loadSessionArchiveMessagesFromPath(
     const items = Array.isArray(raw?.messages) ? raw.messages : [];
     return items.filter((item): item is SessionMessageV1 => {
       if (!item || typeof item !== "object") return false;
-      const candidate = item as Partial<SessionMessageV1>;
+      const candidate = item as { type?: unknown; role?: unknown; parts?: unknown };
       return (
         (
+          candidate.type === "action" ||
           candidate.role === "user" ||
-          candidate.role === "assistant" ||
-          candidate.role === "operation"
+          candidate.role === "assistant"
         ) &&
-        Array.isArray(candidate.parts)
+        (candidate.type === "action" || Array.isArray(candidate.parts))
       );
     });
   } catch {
@@ -433,6 +440,7 @@ export async function loadSessionArchiveMessagesFromPath(
 }
 
 function isCompactSummaryMessage(message: SessionMessageV1): boolean {
+  if (!isSessionModelMessage(message)) return false;
   const metadata = (message.metadata || null) as SessionMetadataV1 | null;
   return metadata?.source === "compact" || metadata?.kind === "summary";
 }