@blade-hq/agent-client 2610.0.0-beta.8 → 2610.0.0-beta.80

package/dist/index.js

@@ -167,6 +167,10 @@ function decorateAuthError(error) {
   }
   return error;
 }
+function buildBackendUrl(baseUrl, path) {
+  const base = baseUrl.endsWith("/") ? baseUrl : `${baseUrl}/`;
+  return new URL(path.startsWith("/") ? path.slice(1) : path, base);
+}
 
 // src/resources/auth.ts
 var AuthResource = class {
@@ -214,6 +218,11 @@ var AuthResource = class {
   }
 };
 
+// src/shared/type-guards.ts
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
 // src/resources/headless.ts
 var HeadlessError = class extends Error {
   constructor(message, detail) {
@@ -352,8 +361,7 @@ var HeadlessResource = class {
       socket.on("system:error", onSystemError);
       socket.emit("session:subscribe", {
         session_id,
-        event_format: "raw",
-        stream_tokens: this.client.options.streamTokens !== false
+        event_format: "raw"
       });
       socket.emit(
         "chat:send",
@@ -395,9 +403,6 @@ function errorMessageFromResult(result) {
   }
   return null;
 }
-function isRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 function ensureSocketConnected(socket, timeoutMs, detail) {
   if (socket.connected) {
     return Promise.resolve();
@@ -425,6 +430,81 @@ function ensureSocketConnected(socket, timeoutMs, detail) {
   });
 }
 
+// src/resources/computers.ts
+function computerState(computer) {
+  if (computer.is_primary) return "primary";
+  if (computer.enabled) return "enabled";
+  return computer.online ? "idle" : "offline";
+}
+function computerOS(computer) {
+  const os = (computer.os ?? "").toLowerCase();
+  if (os.startsWith("darwin") || os.startsWith("mac")) return "macos";
+  if (os.startsWith("windows")) return "windows";
+  if (os.startsWith("linux")) return "linux";
+  return "unknown";
+}
+function computerPlatformLabel(computer) {
+  const os = (computer.os ?? "").trim();
+  const arch = (computer.arch ?? "").trim();
+  if (os && arch) return `${os}/${arch}`;
+  return os || arch || "";
+}
+function computerDaemonVersion(computer) {
+  return (computer.daemon_version ?? "").trim();
+}
+function canToggleComputer(computer) {
+  return !computer.is_primary;
+}
+function sortComputers(computers) {
+  return [...computers].sort((a, b) => {
+    const byCreated = (a.created_at ?? "").localeCompare(b.created_at ?? "");
+    if (byCreated !== 0) return byCreated;
+    return a.label.localeCompare(b.label);
+  });
+}
+var ComputersResource = class {
+  constructor(client) {
+    this.client = client;
+  }
+  client;
+  /**
+   * 列出当前账号登记过的全部电脑及其在线状态。
+   *
+   * 首页还没有会话，也要能看到同一份清单——判定各写一份必然分叉，一边的兜底会把
+   * 另一边的错误盖住（#1597）。所以账号事实只从这一个接口读。
+   */
+  async listAccount() {
+    const data = await this.client.json("GET", "/api/daemon/instances");
+    return {
+      computers: (data.instances ?? []).map((instance) => ({
+        ...instance,
+        online: Boolean(instance.online)
+      }))
+    };
+  }
+  /**
+   * 列出当前用户的全部电脑，带上"在不在线"和"这次会话能不能用"。
+   * 服务端只查库，电脑离线时同样返回，所以拿得到"它离线了"这个结论。
+   */
+  list(sessionId) {
+    return this.client.json(
+      "GET",
+      `/api/sessions/${encodeURIComponent(sessionId)}/computers`
+    );
+  }
+  /**
+   * 启动或停止一台电脑。只改这次会话的可用范围，不会碰远程机器，
+   * 电脑离线时同样能登记，等它上线就直接可用。
+   */
+  setEnabled(sessionId, computer, enabled) {
+    return this.client.json(
+      "PUT",
+      `/api/sessions/${encodeURIComponent(sessionId)}/computers/${encodeURIComponent(computer)}/enabled`,
+      { enabled }
+    );
+  }
+};
+
 // src/resources/models.ts
 var ModelsResource = class {
   constructor(client) {
@@ -451,6 +531,7 @@ var SessionInfo = type({
   "shared?": "boolean",
   "memory_enabled?": "boolean",
   "is_persistent?": "boolean",
+  "initiator?": "'ui' | 'sdk' | 'unknown' | null",
   "is_headless?": "boolean",
   "viewer_role?": "'owner' | 'viewer'",
   "template_id?": "string | null",
@@ -473,7 +554,11 @@ var SessionInfo = type({
   "disable_tools?": "string[]",
   "runtime_type?": "string | null",
   "daemon_id?": "string | null",
+  "agent_runtime_id?": "string | null",
   "workspace_path?": "string | null",
+  "ba_version?": "string | null",
+  "sandbox_version?": "string | null",
+  "chat_group_id?": "string | null",
   "match?": "unknown"
 });
 
@@ -539,7 +624,7 @@ function upsertToolCall(state, toolCallId, toolName, displayName, args) {
     });
   }
 }
-function applyToolResult(state, toolCallId, result, status, durationMs, sourceLoop) {
+function applyToolResult(state, toolCallId, result, status, durationMs, ranInParallel, sourceLoop, startedAt = null) {
   let toolName = "";
   let displayName = "";
   let finalResult = result;
@@ -551,6 +636,8 @@ function applyToolResult(state, toolCallId, result, status, durationMs, sourceLo
     }
     const update = { status, result: finalResult };
     if (durationMs != null) update.duration_ms = durationMs;
+    if (ranInParallel != null) update.ran_in_parallel = ranInParallel;
+    if (startedAt != null) update.started_at = startedAt;
     state.toolCalls[i] = { ...tc, ...update };
     toolName = tc.tool_name;
     displayName = tc.display_name;
@@ -732,11 +819,17 @@ function buildCompactionTurn(sequence, compactionId, loopId, status, data) {
     summary_preview: summaryPreview,
     summary_full: summaryFull,
     archived_count: archivedCount,
+    archived_files: Array.isArray(data.archived_files) ? data.archived_files.filter(
+      (item) => typeof item === "object" && item !== null && !Array.isArray(item)
+    ) : null,
+    archived_tool_calls: Array.isArray(data.archived_tool_calls) ? data.archived_tool_calls.filter(
+      (item) => typeof item === "object" && item !== null && !Array.isArray(item)
+    ) : null,
     tokens_before: tokensBefore,
     tokens_after: tokensAfter,
     saved_ratio: savedRatio,
     trigger: asTrigger(data.trigger),
-    failure_reason: typeof data.reason === "string" && data.reason ? data.reason : null,
+    failure_reason: [data.failure_reason, data.fallback_reason, data.reason].find((value) => typeof value === "string" && value.length > 0) ?? null,
     fallback_applied: typeof data.fallback_applied === "boolean" ? data.fallback_applied : null
   };
 }
@@ -991,6 +1084,12 @@ function createTurnState(turnId, loopId, opts = {}) {
     toolCalls: [],
     usage: null,
     responseDone: false,
+    firstTokenMs: null,
+    streamDurationMs: null,
+    firstTokenDeliveryMs: null,
+    modelStartedAt: null,
+    modelDurationMs: null,
+    modelStartedAtReported: false,
     memoryRefs: opts.memoryRefs ?? null,
     parentForkToolCallId: null
   };
@@ -1008,8 +1107,13 @@ function snapshot(state, sequence, status) {
     tool_calls: [...state.toolCalls],
     model: state.model,
     usage: state.usage ? { ...state.usage } : null,
-    duration_ms: Math.max(0, Date.now() - state.startedAt),
-    started_at: new Date(state.startedAt).toISOString(),
+    duration_ms: state.modelDurationMs,
+    first_token_ms: state.firstTokenMs,
+    stream_duration_ms: state.streamDurationMs,
+    first_token_delivery_ms: state.firstTokenDeliveryMs,
+    started_at: state.modelStartedAt ?? new Date(state.startedAt).toISOString(),
+    // 没有 payload 上报时用的是 loop:turn 的浏览器事件时间，标记出来供瀑布区分。
+    has_reported_timing: state.modelStartedAtReported,
     context_window: state.contextWindow,
     memory_refs: state.memoryRefs,
     parent_fork_tool_call_id: state.parentForkToolCallId
@@ -1023,10 +1127,134 @@ function toolStatusFromResult(result) {
   return inferToolStatus(text);
 }
 
+// src/schemas/context.ts
+var BUILTIN_CONTEXT_TITLES = {
+  "agent-instructions": "\u9879\u76EE\u8BF4\u660E",
+  "skill-catalog": "\u53EF\u7528\u80FD\u529B",
+  "runtime-context": "\u5F53\u524D\u5DE5\u4F5C\u73AF\u5883",
+  "workspace-context": "\u5F53\u524D\u5DE5\u4F5C\u533A\u73AF\u5883"
+};
+var BUILTIN_CONTEXT_DETAILS = {
+  "agent-instructions": "\u8FD9\u4E9B\u8BF4\u660E\u4F1A\u5E2E\u52A9\u667A\u80FD\u4F53\u7406\u89E3\u5F53\u524D\u9879\u76EE\u548C\u5DE5\u4F5C\u8981\u6C42\u3002",
+  "skill-catalog": "\u8FD9\u4E9B\u80FD\u529B\u4F1A\u5E2E\u52A9\u667A\u80FD\u4F53\u9009\u62E9\u5408\u9002\u7684\u65B9\u5F0F\u5B8C\u6210\u4EFB\u52A1\u3002",
+  "runtime-context": "\u8FD9\u4E9B\u4FE1\u606F\u4F1A\u5E2E\u52A9\u667A\u80FD\u4F53\u4E86\u89E3\u5F53\u524D\u6587\u4EF6\u5939\u548C\u8FD0\u884C\u6761\u4EF6\u3002",
+  "workspace-context": "\u8FD9\u4E9B\u4FE1\u606F\u4F1A\u5E2E\u52A9\u667A\u80FD\u4F53\u4E86\u89E3\u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55\u3001\u6587\u4EF6\u548C\u8FD0\u884C\u73AF\u5883\u3002"
+};
+function nonEmptyString(value) {
+  return typeof value === "string" && value.trim() ? value.trim() : null;
+}
+function contextProjectionData(fields) {
+  const contextKind = nonEmptyString(fields.context_kind);
+  const contextKey = nonEmptyString(fields.context_key);
+  const contextName = nonEmptyString(fields.context_name);
+  const contextRevision = nonEmptyString(fields.context_revision);
+  if (!contextKind || !contextKey || !contextName || !contextRevision || typeof fields.context_order !== "number" || !Number.isFinite(fields.context_order) || !fields.context_action) {
+    return null;
+  }
+  return {
+    context_kind: contextKind,
+    context_key: contextKey,
+    context_name: contextName,
+    context_order: fields.context_order,
+    context_action: fields.context_action,
+    context_revision: contextRevision,
+    display_title: nonEmptyString(fields.display_title),
+    display_summary: nonEmptyString(fields.display_summary),
+    sources: Array.isArray(fields.sources) ? fields.sources : []
+  };
+}
+function getContextDisplayState(context) {
+  const title = nonEmptyString(context.display_title) ?? BUILTIN_CONTEXT_TITLES[context.context_kind] ?? "\u5BF9\u8BDD\u80CC\u666F";
+  const isRemoved = context.context_action === "removed";
+  const summary = nonEmptyString(context.display_summary) ?? (isRemoved ? "\u5DF2\u505C\u6B62\u7528\u4E8E\u540E\u7EED\u5BF9\u8BDD" : context.context_action === "retained" ? "\u7EE7\u7EED\u7528\u4E8E\u540E\u7EED\u5BF9\u8BDD" : context.context_kind === "agent-instructions" ? "\u5DF2\u66F4\u65B0\u672C\u6B21\u5BF9\u8BDD\u4F7F\u7528\u7684\u9879\u76EE\u8BF4\u660E" : context.context_kind === "skill-catalog" ? "\u5DF2\u66F4\u65B0\u672C\u6B21\u53EF\u7528\u80FD\u529B" : context.context_kind === "runtime-context" ? "\u5DF2\u66F4\u65B0\u672C\u6B21\u5DE5\u4F5C\u73AF\u5883" : context.context_kind === "workspace-context" ? "\u5DF2\u66F4\u65B0\u672C\u6B21\u5DE5\u4F5C\u533A\u73AF\u5883" : "\u5DF2\u66F4\u65B0\u672C\u6B21\u5BF9\u8BDD\u80CC\u666F");
+  const detail = isRemoved ? `${title}\u5DF2\u4E0D\u518D\u7528\u4E8E\u540E\u7EED\u5BF9\u8BDD\u3002` : BUILTIN_CONTEXT_DETAILS[context.context_kind] ?? "\u8FD9\u4E9B\u4FE1\u606F\u4F1A\u5E2E\u52A9\u667A\u80FD\u4F53\u7406\u89E3\u5F53\u524D\u4EFB\u52A1\u3002";
+  return { title, summary, detail, isRemoved };
+}
+function groupAdjacentContextRuns(kinds) {
+  const runs = [];
+  let current = null;
+  kinds.forEach((kind, index) => {
+    if (kind === null) {
+      current = null;
+      return;
+    }
+    if (current === null) {
+      current = [];
+      runs.push(current);
+    }
+    current.push(index);
+  });
+  return runs;
+}
+function getContextGroupDisplayState(contexts) {
+  const count = contexts.length;
+  if (count === 1) {
+    const single = getContextDisplayState(contexts[0]);
+    return { title: single.title, summary: single.summary, count };
+  }
+  const removed = contexts.filter(
+    (context) => context.context_action === "removed"
+  ).length;
+  const updated = count - removed;
+  const parts = [];
+  if (updated > 0) parts.push(`${updated} \u9879\u5DF2\u66F4\u65B0`);
+  if (removed > 0) parts.push(`${removed} \u9879\u5DF2\u505C\u7528`);
+  return {
+    title: "\u5BF9\u8BDD\u80CC\u666F",
+    summary: parts.join(" \xB7 ") || `${count} \u9879`,
+    count
+  };
+}
+
+// src/shared/projection/context.ts
+function buildContextTurn(entry, sequence) {
+  if (entry.kind !== "context" || !isRecord(entry.source) || !isRecord(entry.data)) {
+    return null;
+  }
+  const display = isRecord(entry.data.display) ? entry.data.display : {};
+  const message = isRecord(entry.message) ? entry.message : {};
+  const context = contextProjectionData({
+    context_kind: typeof entry.source.kind === "string" ? entry.source.kind : null,
+    context_key: typeof entry.source.key === "string" ? entry.source.key : null,
+    context_name: typeof entry.data.contribution_name === "string" ? entry.data.contribution_name : null,
+    context_order: typeof entry.data.order === "number" ? entry.data.order : null,
+    context_action: entry.data.action === "published" || entry.data.action === "retained" || entry.data.action === "removed" ? entry.data.action : null,
+    context_revision: typeof entry.data.revision === "string" ? entry.data.revision : null,
+    display_title: typeof display.title === "string" ? display.title : null,
+    display_summary: typeof display.summary === "string" ? display.summary : null,
+    sources: Array.isArray(display.sources) ? display.sources.filter(isRecord) : []
+  });
+  if (!context) return null;
+  const turnId = typeof entry.id === "string" && entry.id ? entry.id : `context-${sequence}`;
+  return {
+    id: turnId,
+    sequence,
+    turn_id: turnId,
+    loop_id: typeof entry.loop_name === "string" && entry.loop_name ? entry.loop_name : "root",
+    kind: "context",
+    role: "system",
+    status: "completed",
+    blocks: [],
+    tool_calls: [],
+    model: null,
+    usage: null,
+    duration_ms: 0,
+    context_content: Object.hasOwn(message, "content") ? message.content : null,
+    ...context
+  };
+}
+
 // src/shared/projection/builder.ts
+function backgroundTaskStatus(payload) {
+  const tasks = Array.isArray(payload.tasks) ? payload.tasks : [];
+  return tasks.some((task) => isRecord(task) && (["failed", "cancelled", "lost"].includes(String(task.status)) || typeof task.exit_code === "number" && task.exit_code !== 0)) ? "error" : "done";
+}
+function acknowledgeTurnEvents(acknowledge) {
+  acknowledge?.();
+}
 function hasChatRunEvent(events) {
   return events.some(
-    (event) => event.type !== "session:post_chat_followup" && !event.type.startsWith("compaction:")
+    (event) => event.type !== "llm:first_token:delivered" && event.type !== "session:post_chat_followup" && !event.type.startsWith("compaction:")
   );
 }
 function acceptedPostChatFollowupCompletesLatestRun(events, updates) {
@@ -1058,7 +1286,8 @@ function completedResponseText(content) {
   ).filter((part) => part.type === "text").map((part) => String(part.text ?? "")).join("");
 }
 function replaceTextContent(state, content) {
-  if (state.blocks.some((block) => block.type === "text")) return;
+  const currentContent = state.blocks.filter((block) => block.type === "text").map((block) => String(block.content ?? "")).join("");
+  if (currentContent === content) return;
   const replacement = { type: "text", content };
   const blocks = [];
   let inserted = false;
@@ -1078,11 +1307,39 @@ function replaceTextContent(state, content) {
   }
   state.blocks = blocks;
 }
+function applyResponseBlockOrder(state, value) {
+  if (!Array.isArray(value)) return false;
+  const ordered = [];
+  for (const item of value) {
+    if (typeof item !== "object" || item === null || Array.isArray(item)) continue;
+    const block = item;
+    if (block.type === "text" || block.type === "thinking") {
+      const content = String(block[block.type] ?? "");
+      if (content) ordered.push({ type: block.type, content });
+      continue;
+    }
+    if (block.type !== "tool_call") continue;
+    const toolCallId = String(block.id ?? "");
+    const toolBlock = state.blocks.find(
+      (candidate) => candidate.type === "tool_use" && candidate.tool_call_id === toolCallId
+    );
+    if (toolBlock) ordered.push(toolBlock);
+  }
+  if (ordered.length === 0 && value.length > 0) return false;
+  const unrelatedBlocks = state.blocks.filter(
+    (block) => block.type !== "text" && block.type !== "thinking" && block.type !== "tool_use"
+  );
+  state.blocks = [...ordered, ...unrelatedBlocks];
+  return true;
+}
 var ClientProjectionBuilder = class {
   activeTurns = /* @__PURE__ */ new Map();
   lastTurnIds = /* @__PURE__ */ new Map();
   latestTurns = /* @__PURE__ */ new Map();
+  turnsById = /* @__PURE__ */ new Map();
   loopDescriptions = /* @__PURE__ */ new Map();
+  /** loop_name → 正在运行的子智能体起点，agent:end 结算并挂到父工具调用上。 */
+  activeSubagentRuns = /* @__PURE__ */ new Map();
   pendingChildPauses = /* @__PURE__ */ new Map();
   pendingMemoryRefs = /* @__PURE__ */ new Map();
   activeCompactions = /* @__PURE__ */ new Map();
@@ -1117,6 +1374,8 @@ var ClientProjectionBuilder = class {
         return this.onMemoryInject(loopId, payload);
       case "memory:inject:none":
         return null;
+      case "context:entry":
+        return this.onContextEntry(payload);
       case "loop:turn":
         return this.onLoopTurn(loopId, payload);
       case "mode:change":
@@ -1140,6 +1399,25 @@ var ClientProjectionBuilder = class {
     }
     if (event.type.startsWith("compaction:"))
       return this.onCompaction(event.type, loopId, payload);
+    if (event.type === "llm:first_token:delivered") {
+      const targetTurnId = String(payload.turn_id ?? "");
+      const active = this.activeTurns.get(loopId);
+      if (active && (!targetTurnId || active.turnId === targetTurnId)) {
+        this.applyFirstTokenDelivery(active, payload);
+        return this.syncPatch(active);
+      }
+      const latest = targetTurnId ? this.turnsById.get(targetTurnId) : this.latestTurns.get(loopId);
+      const duration = payload.first_token_delivery_ms;
+      if (!latest || latest.role !== "assistant" || typeof duration !== "number" || duration < 0) {
+        return null;
+      }
+      const turn = { ...latest, first_token_delivery_ms: duration };
+      this.turnsById.set(turn.turn_id, turn);
+      if (this.latestTurns.get(loopId)?.turn_id === turn.turn_id) {
+        this.latestTurns.set(loopId, turn);
+      }
+      return [{ kind: "upsert", turn }];
+    }
     const state = this.activeTurns.get(loopId);
     if (!state) {
       if (event.type === "chat:end") {
@@ -1155,16 +1433,28 @@ var ClientProjectionBuilder = class {
         state.toolCalls = [];
         state.usage = null;
         state.responseDone = false;
+        state.firstTokenMs = null;
+        state.streamDurationMs = null;
+        state.firstTokenDeliveryMs = null;
         return this.syncPatch(state);
       case "llm:thinking:delta":
+        this.applyFirstTokenDelivery(state, payload);
         return this.onDelta(state, "thinking", "", String(payload.content ?? ""));
       case "llm:content:delta":
+        this.applyFirstTokenDelivery(state, payload);
         return this.onDelta(state, "text", "", String(payload.content ?? ""));
       case "llm:content:complete":
         replaceTextContent(state, String(payload.content ?? ""));
         return this.syncPatch(state);
+      case "llm:content:done":
+        this.applyStreamTiming(state, payload);
+        return this.syncPatch(state);
       case "llm:tool_call:created":
+        this.applyFirstTokenDelivery(state, payload);
         return this.onToolCallCreated(state, payload);
+      case "llm:tool_call:arguments:delta":
+        this.applyFirstTokenDelivery(state, payload);
+        return this.onToolCallArgumentsDelta(state, payload);
       case "llm:response:done":
         return this.onResponseDone(state, loopId, payload);
       case "tool:result:delta":
@@ -1191,7 +1481,9 @@ var ClientProjectionBuilder = class {
     this.activeTurns.clear();
     this.lastTurnIds.clear();
     this.latestTurns.clear();
+    this.turnsById.clear();
     this.loopDescriptions.clear();
+    this.activeSubagentRuns.clear();
     this.pendingChildPauses.clear();
     this.pendingMemoryRefs.clear();
     this.activeCompactions.clear();
@@ -1206,15 +1498,18 @@ var ClientProjectionBuilder = class {
   }
   _seedTurns(turns) {
     const latestTurns = /* @__PURE__ */ new Map();
+    const turnsById = /* @__PURE__ */ new Map();
     for (const turn of turns) {
       this.seedSequence(turn.sequence);
       if (!isConversationTurn(turn)) continue;
+      turnsById.set(turn.turn_id, turn);
       const current = latestTurns.get(turn.loop_id);
       if (!current || turn.sequence >= current.sequence) {
         latestTurns.set(turn.loop_id, turn);
       }
     }
     this.latestTurns = latestTurns;
+    this.turnsById = turnsById;
   }
   // --- Event handlers ---
   onMemoryInject(loopId, payload) {
@@ -1232,11 +1527,16 @@ var ClientProjectionBuilder = class {
     }
     return null;
   }
+  onContextEntry(payload) {
+    if (!isRecord(payload.entry)) return null;
+    const turn = buildContextTurn(payload.entry, this.nextSeq());
+    return turn ? [{ kind: "upsert", turn }] : null;
+  }
   onLoopTurn(loopId, payload) {
     let turnId = String(payload.turn_id ?? this.nextTurnId(`turn:${loopId}`));
     let memoryRefs = null;
     const pending = this.pendingMemoryRefs.get(loopId);
-    if (pending) {
+    if (pending && (!pending.turnId || pending.turnId === turnId)) {
       this.pendingMemoryRefs.delete(loopId);
       if (pending.turnId) turnId = pending.turnId;
       memoryRefs = pending.refs;
@@ -1252,6 +1552,7 @@ var ClientProjectionBuilder = class {
     this.lastTurnIds.set(loopId, turnId);
     const turn = snapshot(state, this.nextSeq(), "streaming");
     this.latestTurns.set(loopId, turn);
+    this.turnsById.set(turn.turn_id, turn);
     return [{ kind: "upsert", turn }];
   }
   onModeChange(loopId, payload) {
@@ -1288,11 +1589,11 @@ var ClientProjectionBuilder = class {
         loopId,
         toolCallId: optStr(payload.tool_call_id) ?? void 0,
         toolName: toolNameFromPayload(payload) ?? void 0,
-        workspacePath: isRecord2(payload.workspace_change) ? optStr(payload.workspace_change.to) ?? void 0 : void 0
+        workspacePath: isRecord(payload.workspace_change) ? optStr(payload.workspace_change.to) ?? void 0 : void 0
       }
     ];
     const change = payload.workspace_change;
-    if (isRecord2(change)) {
+    if (isRecord(change)) {
       const source = optStr(change.source) ?? "";
       const projectName = optStr(change.project_name) ?? "";
       const fromPath = optStr(change.from) ?? "";
@@ -1324,6 +1625,13 @@ var ClientProjectionBuilder = class {
   onAgentStart(loopId, payload) {
     const description = optStr(payload.description);
     if (description) this.loopDescriptions.set(loopId, description);
+    const subagentStartedAt = optStr(payload.started_at);
+    if (subagentStartedAt) {
+      this.activeSubagentRuns.set(loopId, {
+        runId: optStr(payload.run_id) ?? loopId,
+        startedAt: subagentStartedAt
+      });
+    }
     const turn = buildSystemNotificationTurn(
       this.nextSeq(),
       this.nextTurnId("agent:start"),
@@ -1365,7 +1673,7 @@ var ClientProjectionBuilder = class {
       this.nextTurnId("bg:tasks_completed"),
       loopId,
       "bg:tasks_completed",
-      "done",
+      backgroundTaskStatus(payload),
       `Background tasks completed (${count})`,
       detail || null,
       { task_ids: taskIds, count }
@@ -1385,7 +1693,32 @@ var ClientProjectionBuilder = class {
     }
     const directTurn = this.activeTurns.get(loopId) ?? this.latestTurns.get(loopId);
     setToolCallStatus(directTurn, toolCallId, "done", null, null);
-    return this.collectLoopUpdates(loopId, parentLoopId);
+    const updates = this.collectLoopUpdates(loopId, parentLoopId);
+    const entryId = typeof payload.entry_id === "string" ? payload.entry_id : "";
+    if (!entryId) return updates;
+    const answerData = isRecord(payload.answer_data) ? payload.answer_data : {};
+    const answerTurn = {
+      id: entryId,
+      sequence: this.nextSeq(),
+      turn_id: entryId,
+      loop_id: loopId,
+      kind: "message",
+      role: "assistant",
+      status: "completed",
+      blocks: [
+        {
+          type: "ask_user_answer",
+          content: answerData,
+          tool_call_id: toolCallId || null
+        }
+      ],
+      tool_calls: [],
+      model: null,
+      usage: null,
+      duration_ms: 0,
+      client_request_id: typeof payload.client_request_id === "string" ? payload.client_request_id : null
+    };
+    return [...updates, { kind: "upsert", turn: answerTurn }];
   }
   onUserMessage(_loopId, payload) {
     const entryId = String(payload.entry_id ?? this.nextTurnId("user"));
@@ -1402,7 +1735,8 @@ var ClientProjectionBuilder = class {
       tool_calls: [],
       model: null,
       usage: null,
-      duration_ms: 0
+      duration_ms: 0,
+      client_request_id: typeof payload.client_request_id === "string" ? payload.client_request_id : null
     };
     this.latestTurns.set("root", turn);
     return [{ kind: "upsert", turn }];
@@ -1430,13 +1764,7 @@ var ClientProjectionBuilder = class {
   }
   onToolCallCreated(state, payload) {
     if ("arguments_delta" in payload) {
-      const delta = String(payload.arguments_delta ?? "");
-      const toolCallId2 = String(payload.id ?? "");
-      if (delta && toolCallId2) {
-        appendToolCallArguments(state, toolCallId2, delta);
-        return this.syncPatch(state);
-      }
-      return null;
+      return this.onToolCallArgumentsDelta(state, payload);
     }
     const toolCallId = String(payload.id ?? "");
     const toolName = toolNameFromPayload(payload);
@@ -1445,16 +1773,21 @@ var ClientProjectionBuilder = class {
     upsertToolCall(state, toolCallId, toolName, displayName, args);
     return this.syncPatch(state);
   }
+  onToolCallArgumentsDelta(state, payload) {
+    const delta = String(payload.arguments_delta ?? "");
+    const toolCallId = String(payload.id ?? "");
+    if (!delta || !toolCallId) return null;
+    appendToolCallArguments(state, toolCallId, delta);
+    return this.syncPatch(state);
+  }
   onResponseDone(state, loopId, payload) {
     state.responseDone = true;
+    this.applyStreamTiming(state, payload);
     const model = optStr(payload.model);
     if (model) state.model = model;
     if (typeof payload.usage === "object" && payload.usage !== null) {
       state.usage = { ...payload.usage };
     }
-    if ("content" in payload) {
-      replaceTextContent(state, completedResponseText(payload.content));
-    }
     const toolCalls = payload.tool_calls;
     if (Array.isArray(toolCalls)) {
       for (const raw of toolCalls) {
@@ -1472,11 +1805,42 @@ var ClientProjectionBuilder = class {
         );
       }
     }
-    if (state.toolCalls.length === 0) {
+    if (!applyResponseBlockOrder(state, payload.response_blocks) && "content" in payload) {
+      replaceTextContent(state, completedResponseText(payload.content));
+    }
+    const isNativeProviderResponse = typeof payload.provider === "string" && payload.provider !== "";
+    if (state.toolCalls.length === 0 || isNativeProviderResponse && state.toolCalls.every(
+      (toolCall) => toolCall.status !== "pending" && toolCall.status !== "awaiting_answer"
+    )) {
       return this.finalize(loopId, "completed");
     }
     return this.syncPatch(state);
   }
+  applyFirstTokenDelivery(state, payload) {
+    const firstTokenMs = payload.first_token_ms;
+    if (state.firstTokenMs === null && typeof firstTokenMs === "number" && firstTokenMs >= 0) {
+      state.firstTokenMs = Math.round(firstTokenMs);
+    }
+    const duration = payload.first_token_delivery_ms;
+    if (state.firstTokenDeliveryMs === null && typeof duration === "number" && duration >= 0) {
+      state.firstTokenDeliveryMs = duration;
+    }
+  }
+  applyStreamTiming(state, payload) {
+    if (typeof payload.first_token_ms === "number" && payload.first_token_ms >= 0) {
+      state.firstTokenMs = Math.round(payload.first_token_ms);
+    }
+    if (typeof payload.stream_duration_ms === "number" && payload.stream_duration_ms >= 0) {
+      state.streamDurationMs = Math.round(payload.stream_duration_ms);
+    }
+    if (typeof payload.started_at === "string" && payload.started_at) {
+      state.modelStartedAt = payload.started_at;
+      state.modelStartedAtReported = true;
+    }
+    if (typeof payload.duration_ms === "number" && payload.duration_ms >= 0) {
+      state.modelDurationMs = Math.round(payload.duration_ms);
+    }
+  }
   onToolResultDone(state, loopId, payload) {
     const toolCallId = String(payload.tool_call_id ?? "");
     const streamedResult = state.toolCalls.find((toolCall) => toolCall.id === toolCallId)?.result;
@@ -1484,9 +1848,12 @@ var ClientProjectionBuilder = class {
     const status = toolStatusFromResult(content);
     const rawDuration = payload.duration_ms;
     const durationMs = typeof rawDuration === "number" && rawDuration >= 0 ? Math.round(rawDuration) : null;
+    const ranInParallel = typeof payload.ran_in_parallel === "boolean" ? payload.ran_in_parallel : null;
     const sl = sourceLoopFor(state.loopId, this.loopDescriptions);
-    applyToolResult(state, toolCallId, content, status, durationMs, sl);
-    if (this.shouldFinalizeAfterToolResults(state)) {
+    const startedAt = typeof payload.started_at === "string" && payload.started_at ? payload.started_at : null;
+    applyToolResult(state, toolCallId, content, status, durationMs, ranInParallel, sl, startedAt);
+    const isNativeProviderResult = typeof payload.provider === "string" && payload.provider !== "";
+    if (!isNativeProviderResult && this.shouldFinalizeAfterToolResults(state)) {
       return this.finalize(loopId, "completed");
     }
     return this.syncPatch(state);
@@ -1515,10 +1882,13 @@ var ClientProjectionBuilder = class {
   onToolBridge(state, payload) {
     const bridge = payload.bridge;
     if (typeof bridge !== "object" || bridge === null) return null;
+    const toolCallId = String(payload.tool_call_id ?? "");
+    if (!toolCallId || !state.toolCalls.some((toolCall) => toolCall.id === toolCallId)) return null;
     state.blocks.push({
       type: "tool_bridge",
       content: bridge,
-      tool_call_id: String(payload.tool_call_id ?? "") || null
+      delivery_id: String(payload.delivery_id ?? "") || null,
+      tool_call_id: toolCallId
     });
     return this.syncPatch(state);
   }
@@ -1527,6 +1897,11 @@ var ClientProjectionBuilder = class {
     const toolName = String(payload.tool_name ?? "");
     const displayName = this.displayNameResolver(toolName);
     upsertToolCall(state, toolCallId, toolName, displayName, "");
+    const relatedToolCallId = String(payload.related_tool_call_id ?? "");
+    if (relatedToolCallId && relatedToolCallId !== toolCallId) {
+      const related = state.toolCalls.find((toolCall) => toolCall.id === relatedToolCallId);
+      if (related) related.status = "awaiting_answer";
+    }
     return this.syncPatch(state);
   }
   onChildPause(state, loopId, payload) {
@@ -1632,6 +2007,7 @@ var ClientProjectionBuilder = class {
   }
   onAgentEnd(state, loopId, payload) {
     const ok = payload.ok !== false;
+    this.settleSubagentRun(loopId, payload);
     const status = ok ? "done" : "error";
     const title = `Agent: ${payload.description ?? payload.skill_id ?? "agent"}`;
     const detail = optStr(payload.error);
@@ -1639,6 +2015,7 @@ var ClientProjectionBuilder = class {
       skill_id: optStr(payload.skill_id),
       description: optStr(payload.description),
       parent_fork_tool_call_id: optStr(payload.parent_fork_tool_call_id),
+      ...typeof payload.run_status === "string" ? { run_status: payload.run_status } : {},
       ok
     };
     if (state) {
@@ -1658,6 +2035,32 @@ var ClientProjectionBuilder = class {
     );
     return [{ kind: "upsert", turn }];
   }
+  settleSubagentRun(loopId, payload) {
+    const active = this.activeSubagentRuns.get(loopId);
+    this.activeSubagentRuns.delete(loopId);
+    const parentToolCallId = optStr(payload.parent_fork_tool_call_id);
+    if (!parentToolCallId) return;
+    const rawDuration = payload.run_duration_ms;
+    const durationMs = typeof rawDuration === "number" && rawDuration >= 0 ? Math.round(rawDuration) : null;
+    const rawStatus = optStr(payload.run_status);
+    const status = rawStatus === "failed" || rawStatus === "cancelled" || rawStatus === "paused" || rawStatus === "incomplete" ? rawStatus : payload.ok === false ? "failed" : "completed";
+    const run = {
+      run_id: active?.runId ?? optStr(payload.run_id) ?? loopId,
+      scope: "subagent",
+      loop_id: loopId,
+      started_at: active?.startedAt ?? optStr(payload.run_started_at),
+      duration_ms: durationMs,
+      status
+    };
+    const seen = /* @__PURE__ */ new Set();
+    for (const turn of [...this.latestTurns.values(), ...this.turnsById.values()]) {
+      if (seen.has(turn)) continue;
+      seen.add(turn);
+      const toolCall = turn.tool_calls.find((item) => item.id === parentToolCallId);
+      if (!toolCall) continue;
+      toolCall.subagent_runs = [...toolCall.subagent_runs ?? [], run];
+    }
+  }
   dropIncompleteToolCalls(state) {
     if (state.responseDone) return;
     state.toolCalls = [];
@@ -1707,6 +2110,7 @@ var ClientProjectionBuilder = class {
   syncPatch(state) {
     const turn = snapshot(state, this.nextSeq(), "streaming");
     this.latestTurns.set(state.loopId, turn);
+    this.turnsById.set(turn.turn_id, turn);
     this.lastTurnIds.set(state.loopId, turn.turn_id);
     return [{ kind: "upsert", turn }];
   }
@@ -1717,6 +2121,7 @@ var ClientProjectionBuilder = class {
     const turn = snapshot(state, this.nextSeq(), status);
     this.lastTurnIds.set(loopId, turn.turn_id);
     this.latestTurns.set(loopId, turn);
+    this.turnsById.set(turn.turn_id, turn);
     return [{ kind: "upsert", turn }];
   }
   shouldFinalizeAfterToolResults(state) {
@@ -1754,9 +2159,6 @@ var ClientProjectionBuilder = class {
     return `${prefix}:${this.syntheticCounter}:${hex}`;
   }
 };
-function isRecord2(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 function optStr(value) {
   if (value == null || value === "") return null;
   return String(value);
@@ -1783,6 +2185,8 @@ function projectHistory(entries) {
   const latestAssistantByLoop = /* @__PURE__ */ new Map();
   const pendingChildPauses = /* @__PURE__ */ new Map();
   const answeredToolCallIds = /* @__PURE__ */ new Set();
+  const nativeToolTurns = /* @__PURE__ */ new Set();
+  const turnEntryAliases = /* @__PURE__ */ new Map();
   let latestRootMessage = null;
   let latestRootAssistant = null;
   let sequence = 0;
@@ -1790,7 +2194,40 @@ function projectHistory(entries) {
     const kind = String(entry.kind ?? "");
     const loopId = String(entry.loop_name ?? "root");
     const id = String(entry.id ?? `history-${sequence + 1}`);
-    if (kind === "post_chat_followup" && isRecord3(entry.data)) {
+    if (kind === "turn_timing" && isRecord(entry.data)) {
+      const turnId = typeof entry.data.turn_id === "string" ? entry.data.turn_id : "";
+      const duration = numberOrNull(entry.data.first_token_delivery_ms);
+      const target = turnEntryAliases.get(turnId);
+      if (target && duration !== null) target.first_token_delivery_ms = duration;
+      continue;
+    }
+    if (kind === "run_timing" && isRecord(entry.data)) {
+      const data = entry.data;
+      if (data.scope === "subagent") {
+        const parentToolCallId = String(data.parent_fork_tool_call_id ?? "");
+        const duration = numberOrNull(data.duration_ms);
+        const rawStatus = String(data.status ?? "completed");
+        const status = rawStatus === "failed" || rawStatus === "cancelled" || rawStatus === "paused" || rawStatus === "incomplete" ? rawStatus : "completed";
+        for (const turn of turns) {
+          const toolCall = turn.tool_calls.find((item) => item.id === parentToolCallId);
+          if (!toolCall) continue;
+          toolCall.subagent_runs = [
+            ...toolCall.subagent_runs ?? [],
+            {
+              run_id: String(data.run_id ?? ""),
+              scope: "subagent",
+              loop_id: loopId,
+              started_at: typeof data.started_at === "string" ? data.started_at : null,
+              duration_ms: duration,
+              status
+            }
+          ];
+          break;
+        }
+      }
+      continue;
+    }
+    if (kind === "post_chat_followup" && isRecord(entry.data)) {
       const assistantEntryId = String(entry.data.assistant_entry_id ?? "");
       if (latestRootMessage?.role === "assistant" && latestRootMessage.turn_id === assistantEntryId) {
         const followup = normalizePostChatFollowup(entry.data, assistantEntryId);
@@ -1798,7 +2235,15 @@ function projectHistory(entries) {
       }
       continue;
     }
-    if (kind === "message" && isRecord3(entry.message)) {
+    if (kind === "context") {
+      const turn = buildContextTurn(entry, sequence + 1);
+      if (turn) {
+        sequence += 1;
+        turns.push(turn);
+      }
+      continue;
+    }
+    if (kind === "message" && isRecord(entry.message)) {
       const message = entry.message;
       const role = String(message.role ?? "");
       if (role === "tool") {
@@ -1808,6 +2253,12 @@ function projectHistory(entries) {
         if (owner && toolCall) {
           toolCall.status = message._error ? "error" : inferToolStatus(String(message.content ?? ""));
           toolCall.result = message.content ?? "";
+          const duration = numberOrNull(message._duration_ms);
+          if (duration !== null) toolCall.duration_ms = duration;
+          if (typeof message._started_at === "string") {
+            toolCall.started_at = message._started_at;
+          }
+          if (message._ran_in_parallel === true) toolCall.ran_in_parallel = true;
           owner.blocks.push({
             type: "tool_result",
             content: message.content ?? "",
@@ -1817,7 +2268,7 @@ function projectHistory(entries) {
         continue;
       }
       if (role !== "user" && role !== "assistant" && role !== "system") continue;
-      const toolCalls = role === "assistant" ? buildToolCalls(message.tool_calls) : [];
+      const toolCalls = role === "assistant" && !message._error ? buildToolCalls(message.tool_calls) : [];
       const blocks = buildBlocks(message, toolCalls);
       const turn = {
         id,
@@ -1830,14 +2281,52 @@ function projectHistory(entries) {
         blocks,
         tool_calls: toolCalls,
         model: stringOrNull(message.model),
-        usage: isRecord3(message._usage) ? { ...message._usage } : null,
-        duration_ms: numberOrZero(message._duration_ms),
-        started_at: typeof entry.timestamp === "string" ? entry.timestamp : void 0
+        usage: isRecord(message._usage) ? { ...message._usage } : null,
+        // 模型请求区间来自持久化字段；旧会话缺失时为 null，不用落盘时刻冒充（#2581 A1）。
+        duration_ms: numberOrNull(message._duration_ms),
+        first_token_ms: numberOrNull(message._first_token_ms),
+        stream_duration_ms: numberOrNull(message._stream_duration_ms),
+        started_at: typeof message._started_at === "string" ? message._started_at : typeof entry.timestamp === "string" ? entry.timestamp : void 0,
+        has_reported_timing: typeof message._started_at === "string",
+        // fork 子会话的父锚点:历史里落在消息级 _parent_fork_tool_call_id。丢掉它,
+        // 刷新后工作流步骤 fork 就配不回 workflow:run 工具调用(普通 Agent fork 有
+        // root Agent 工具调用兜底配对,工作流 fork 没有,子智能体卡会整体消失)。
+        parent_fork_tool_call_id: stringOrNull(message._parent_fork_tool_call_id)
       };
+      const isNativeToolEntry = role === "assistant" && Array.isArray(message.tool_calls) && message.tool_calls.some(
+        (toolCall) => isRecord(toolCall) && typeof toolCall.provider === "string"
+      );
+      const previousTurn = turns[turns.length - 1];
+      if (role === "assistant" && previousTurn?.role === "assistant" && previousTurn.loop_id === loopId && nativeToolTurns.has(previousTurn)) {
+        nativeToolTurns.delete(previousTurn);
+        previousTurn.blocks.push(...turn.blocks);
+        previousTurn.tool_calls.push(...turn.tool_calls);
+        previousTurn.status = turn.status;
+        previousTurn.model = turn.model ?? previousTurn.model;
+        previousTurn.usage = turn.usage ?? previousTurn.usage;
+        if (turn.duration_ms) previousTurn.duration_ms = turn.duration_ms;
+        previousTurn.first_token_ms = turn.first_token_ms ?? previousTurn.first_token_ms;
+        previousTurn.stream_duration_ms = turn.stream_duration_ms ?? previousTurn.stream_duration_ms;
+        if (turn.has_reported_timing) {
+          previousTurn.started_at = turn.started_at;
+          previousTurn.has_reported_timing = true;
+        } else if (!previousTurn.has_reported_timing) {
+          previousTurn.started_at = previousTurn.started_at ?? turn.started_at;
+        }
+        previousTurn.id = turn.id;
+        previousTurn.turn_id = turn.turn_id;
+        if (isNativeToolEntry) nativeToolTurns.add(previousTurn);
+        turnEntryAliases.set(id, previousTurn);
+        if (loopId === "root") latestRootMessage = previousTurn;
+        latestAssistantByLoop.set(loopId, previousTurn);
+        continue;
+      }
       if (loopId === "root" && (role === "user" || role === "assistant")) {
         latestRootMessage = turn;
       }
       turns.push(turn);
+      turnEntryAliases.set(id, turn);
+      if (isNativeToolEntry) nativeToolTurns.add(turn);
       if (role === "assistant") latestAssistantByLoop.set(loopId, turn);
       if (loopId === "root") {
         if (role === "assistant") latestRootAssistant = turn;
@@ -1846,10 +2335,25 @@ function projectHistory(entries) {
       for (const toolCall of toolCalls) toolOwners.set(toolCall.id, turn);
       continue;
     }
+    if (kind === "tool_result") {
+      const data = entry.data ?? {};
+      const toolCallId = String(data.tool_call_id ?? "");
+      const owner = toolOwners.get(toolCallId) ?? findLatestAssistant(turns, loopId);
+      if (owner && toolCallId) {
+        const rawContent = data.content;
+        const content = typeof rawContent === "string" ? rawContent : Array.isArray(rawContent) ? rawContent : String(rawContent ?? "");
+        const status = data.is_error === true ? "error" : inferToolStatus(typeof content === "string" ? content : JSON.stringify(content));
+        setToolCallStatus(owner, toolCallId, status, content, null);
+        if (!owner.blocks.some((block) => block.type === "tool_result" && block.tool_call_id === toolCallId)) {
+          owner.blocks.push({ type: "tool_result", content, tool_call_id: toolCallId });
+        }
+      }
+      continue;
+    }
     if (kind === "mode_change") {
       turns.push(markerTurn(id, ++sequence, loopId, "mode_change", entry.data ?? {}));
     } else if (kind === "workspace_change") {
-      const change = isRecord3(entry.data) ? entry.data : {};
+      const change = isRecord(entry.data) ? entry.data : {};
       const source = stringOrNull(change.source) ?? "";
       const projectName = stringOrNull(change.project_name) ?? "";
       const fromPath = stringOrNull(change.from) ?? "";
@@ -1878,19 +2382,21 @@ function projectHistory(entries) {
     } else if (kind === "tool_ui" || kind === "tool_bridge") {
       const data = entry.data ?? {};
       const toolCallId = String(data.tool_call_id ?? "");
-      const owner = toolOwners.get(toolCallId) ?? findLatestAssistant(turns, loopId);
-      const content = kind === "tool_ui" ? data.ui : data.bridge;
+      const owner = kind === "tool_bridge" ? toolCallId ? toolOwners.get(toolCallId) : void 0 : toolOwners.get(toolCallId) ?? findLatestAssistant(turns, loopId);
+      const rawContent = kind === "tool_ui" ? data.ui : data.bridge;
+      const content = kind === "tool_ui" && isRecord(rawContent) ? { ...rawContent, archived: true } : rawContent;
       if (owner && content !== void 0) {
         owner.blocks.push({
           type: kind,
           content,
+          ...kind === "tool_bridge" ? { delivery_id: id } : {},
           tool_call_id: toolCallId || null
         });
       }
     } else if (kind === "compaction" || kind === "tool_result_archive") {
       const data = entry.data ?? {};
       const compactionId = String(data.compaction_id ?? entry.id ?? `history-${sequence + 1}`);
-      let content = isRecord3(entry.message) ? entry.message.content : void 0;
+      let content = isRecord(entry.message) ? entry.message.content : void 0;
       if (kind === "tool_result_archive") {
         const archivedCount = Array.isArray(data.archived_files) ? data.archived_files.length : 0;
         content = `<compaction-summary>
@@ -1898,18 +2404,24 @@ function projectHistory(entries) {
 </compaction-summary>`;
       }
       turns.push(
-        buildCompactionTurn(++sequence, compactionId, loopId, "completed", {
-          ...data,
-          content
-        })
+        buildCompactionTurn(
+          ++sequence,
+          compactionId,
+          loopId,
+          data.status === "failed" ? "failed" : "completed",
+          {
+            ...data,
+            content
+          }
+        )
       );
     } else if (kind === "child_pause") {
       const data = entry.data ?? {};
-      const sourceLoop = isRecord3(data.source_loop) ? data.source_loop : {};
+      const sourceLoop = isRecord(data.source_loop) ? data.source_loop : {};
       const childLoopId = String(data.child_loop_name ?? sourceLoop.name ?? "");
       const childToolCallId = String(data.child_pause_tool_call_id ?? "");
       const parentToolCallId = String(data.parent_fork_tool_call_id ?? "");
-      const pauseToolData = isRecord3(data.pause_tool_data) ? data.pause_tool_data : {};
+      const pauseToolData = isRecord(data.pause_tool_data) ? data.pause_tool_data : {};
       const description = String(sourceLoop.description ?? "");
       applyAskUserPauseToTurn(
         latestAssistantByLoop.get(childLoopId),
@@ -1997,15 +2509,15 @@ function parseToolArguments(value) {
   if (!value) return {};
   try {
     const parsed = JSON.parse(value);
-    return isRecord3(parsed) ? parsed : {};
+    return isRecord(parsed) ? parsed : {};
   } catch {
     return {};
   }
 }
 function buildToolCalls(value) {
   if (!Array.isArray(value)) return [];
-  return value.filter(isRecord3).map((raw) => {
-    const fn = isRecord3(raw.function) ? raw.function : {};
+  return value.filter(isRecord).map((raw) => {
+    const fn = isRecord(raw.function) ? raw.function : {};
     const name = String(fn.name ?? "");
     return {
       id: String(raw.id ?? ""),
@@ -2021,23 +2533,40 @@ function buildBlocks(message, toolCalls) {
   const displayContent = message.role === "user" ? message._display_content : void 0;
   const stored = message._blocks;
   const blocks = [];
+  const storedToolCallIds = /* @__PURE__ */ new Set();
   if (displayContent !== void 0) {
     blocks.push({ type: "text", content: displayContent });
   } else if (Array.isArray(stored)) {
     for (const raw of stored) {
-      if (!isRecord3(raw)) continue;
+      if (!isRecord(raw)) continue;
       const type3 = String(raw.type ?? "");
       if (type3 === "thinking") blocks.push({ type: type3, content: raw.thinking ?? raw.content ?? "" });
       if (type3 === "text") blocks.push({ type: type3, content: raw.text ?? raw.content ?? "" });
+      if (type3 === "tool_call") {
+        const toolCallId = String(raw.id ?? "");
+        const toolCall = toolCalls.find((candidate) => candidate.id === toolCallId);
+        if (!toolCall) continue;
+        storedToolCallIds.add(toolCallId);
+        blocks.push({
+          type: "tool_use",
+          content: toolCall.arguments,
+          tool_call_id: toolCall.id,
+          tool_name: toolCall.tool_name,
+          display_name: toolCall.display_name
+        });
+      }
     }
   } else if (message.content !== void 0 && message.content !== "") {
     blocks.push({ type: "text", content: message.content });
   }
   for (const toolCall of toolCalls) {
+    if (storedToolCallIds.has(toolCall.id)) continue;
     blocks.push({
       type: "tool_use",
-      content: { name: toolCall.tool_name, arguments: toolCall.arguments },
-      tool_call_id: toolCall.id
+      content: toolCall.arguments,
+      tool_call_id: toolCall.id,
+      tool_name: toolCall.tool_name,
+      display_name: toolCall.display_name
     });
   }
   return blocks;
@@ -2058,14 +2587,11 @@ function markerTurn(id, sequence, loopId, type3, content, toolCallId = null) {
     duration_ms: 0
   };
 }
-function isRecord3(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 function stringOrNull(value) {
   return typeof value === "string" ? value : null;
 }
-function numberOrZero(value) {
-  return typeof value === "number" ? value : 0;
+function numberOrNull(value) {
+  return typeof value === "number" && value >= 0 ? value : null;
 }
 function findLatestAssistant(turns, loopId) {
   for (let index = turns.length - 1; index >= 0; index -= 1) {
@@ -2076,6 +2602,10 @@ function findLatestAssistant(turns, loopId) {
 }
 
 // src/resources/sessions.ts
+function isEntryGoneError(error) {
+  const status = error?.status;
+  return status === 404 || status === 409;
+}
 function toCreateSessionPayload(request) {
   const solutionRef = request.solution_ref ?? externalSolutionRef(request.solution_id);
   return {
@@ -2094,13 +2624,14 @@ function toCreateSessionPayload(request) {
     solution_snapshot_session_id: request.solution_snapshot_session_id ?? null,
     compaction_ratio: request.compaction_ratio ?? null,
     ...request.runtime_type ? { runtime_type: request.runtime_type } : {},
-    ...request.daemon_id ? { daemon_id: request.daemon_id } : {}
+    ...request.daemon_id ? { daemon_id: request.daemon_id } : {},
+    ...request.agent_runtime_id ? { agent_runtime_id: request.agent_runtime_id } : {},
+    ...request.chat_group_id ? { chat_group_id: request.chat_group_id } : {}
   };
 }
 var builtinSolutionIds = /* @__PURE__ */ new Set([
   "app-dev",
   "general_chat",
-  "multica",
   "night_build",
   "skill_editor",
   "smart_bid",
@@ -2123,6 +2654,36 @@ var SessionsResource = class {
     this.client = client;
   }
   client;
+  getMcpApp(sessionId, sourceId, init) {
+    return this.client.jsonFromInit(`/api/sessions/${encodeURIComponent(sessionId)}/mcp-apps/${encodeURIComponent(sourceId)}`, init);
+  }
+  onMcpAppChanged(sessionId, sourceId, listener) {
+    let socket = this.client.socket();
+    const changed = (payload) => {
+      if (payload.session_id === sessionId && payload.source_id === sourceId) listener();
+    };
+    socket.on("mcp-app:changed", changed);
+    socket.on("connect", listener);
+    const off = this.client.onSocketReplaced(() => {
+      socket.off("mcp-app:changed", changed);
+      socket.off("connect", listener);
+      socket = this.client.socket();
+      socket.on("mcp-app:changed", changed);
+      socket.on("connect", listener);
+    });
+    return () => {
+      off();
+      socket.off("mcp-app:changed", changed);
+      socket.off("connect", listener);
+    };
+  }
+  callMcpApp(sessionId, sourceId, request, init) {
+    return this.client.jsonFromInit(`/api/sessions/${encodeURIComponent(sessionId)}/mcp-apps/${encodeURIComponent(sourceId)}/calls`, {
+      ...init,
+      method: "POST",
+      body: JSON.stringify(request)
+    });
+  }
   /**
    * 连接一个已存在的会话，返回实时会话对象 AgentSession
    * （自动完成历史加载、Socket.IO 订阅、断线重连补数）。
@@ -2130,6 +2691,56 @@ var SessionsResource = class {
   connect(sessionId) {
     return this.client.hub.connect(sessionId);
   }
+  listSessionPlugins(sessionId, init) {
+    return this.client.jsonFromInit(`/api/sessions/${encodeURIComponent(sessionId)}/plugins`, init);
+  }
+  setSessionPluginActivation(sessionId, name, active, init) {
+    return this.client.jsonFromInit(`/api/sessions/${encodeURIComponent(sessionId)}/plugins/${encodeURIComponent(name)}:activation`, { method: "POST", body: JSON.stringify({ active }), ...init });
+  }
+  /**
+   * Fetch a plugin's package-local icon as bytes.
+   *
+   * The request carries the client's own bearer credentials, so callers turn
+   * the blob into an object URL instead of pointing `<img>` at an API path and
+   * hoping the request is authenticated.
+   */
+  fetchSessionPluginIcon(sessionId, name) {
+    return this.client.blob("GET", `/api/sessions/${encodeURIComponent(sessionId)}/plugins/${encodeURIComponent(name)}/icon`);
+  }
+  /** Authenticated URL for the icon; useful where a blob URL cannot be used. */
+  sessionPluginIconUrl(sessionId, name) {
+    return this.client.buildAuthedUrl(`/api/sessions/${encodeURIComponent(sessionId)}/plugins/${encodeURIComponent(name)}/icon`);
+  }
+  /**
+   * 准备一个插件的配置：把包准备好并读出用户的配置契约，**不启用**它。
+   *
+   * 开启插件前必须先走这一步：缺配置时用户只会看到配置表单，服务端不会先把
+   * active 持久化成 true 再靠补偿关掉。它不修改会话的插件选择、不连接 MCP。
+   */
+  prepareSessionPluginConfig(sessionId, name, init) {
+    return this.client.jsonFromInit(
+      `/api/sessions/${encodeURIComponent(sessionId)}/plugins/${encodeURIComponent(name)}:prepare-config`,
+      { method: "POST", ...init }
+    );
+  }
+  /**
+   * Read a plugin's configuration contract and the user's stored values.
+   *
+   * Secrets are never returned: `write_only` lists the pointers that hold one.
+   */
+  getSessionPluginConfig(sessionId, name, init) {
+    return this.client.jsonFromInit(`/api/sessions/${encodeURIComponent(sessionId)}/plugins/${encodeURIComponent(name)}/config`, init);
+  }
+  /**
+   * Publish explicit set/remove operations to the user's keychain file.
+   *
+   * Fields absent from both lists keep their stored value, so a form never has
+   * to round-trip a secret. Rejections leave the previous file untouched; the
+   * call never restarts MCP servers.
+   */
+  updateSessionPluginConfig(sessionId, name, update, init) {
+    return this.client.jsonFromInit(`/api/sessions/${encodeURIComponent(sessionId)}/plugins/${encodeURIComponent(name)}/config`, { method: "PUT", body: JSON.stringify(update), ...init });
+  }
   /** 创建新会话并直接连接，返回可收发消息的 AgentSession。 */
   async create(request = {}) {
     if (isSessionDefinition(request)) {
@@ -2226,7 +2837,8 @@ var SessionsResource = class {
     template_id_prefix,
     solution_id,
     solution_registry_id,
-    q
+    q,
+    chat_group_id
   }) {
     const searchParams = new URLSearchParams();
     searchParams.set("limit", String(limit));
@@ -2239,6 +2851,7 @@ var SessionsResource = class {
     }
     const trimmedQuery = q?.trim();
     if (trimmedQuery) searchParams.set("q", trimmedQuery);
+    if (chat_group_id) searchParams.set("chat_group_id", chat_group_id);
     return this.client.json("GET", `/api/sessions?${searchParams.toString()}`);
   }
   async listSessions(template_id_prefix, solution_id) {
@@ -2329,6 +2942,55 @@ var SessionsResource = class {
     );
     return projectHistory(entries);
   }
+  async getSessionTurnsPage(sessionId, options = {}, init = {}) {
+    const query = new URLSearchParams();
+    if (options.limit !== void 0) query.set("limit", String(options.limit));
+    if (options.before !== void 0) query.set("before", options.before);
+    if (options.fromEntryId !== void 0) query.set("from_entry_id", options.fromEntryId);
+    const suffix = query.size ? `?${query}` : "";
+    const page = await this.client.jsonFromInit(`/api/sessions/${encodeURIComponent(sessionId)}/turns${suffix}`, init);
+    return {
+      turns: page.turns,
+      nextBefore: page.next_before,
+      currentMode: page.current_mode
+    };
+  }
+  /**
+   * 当前分支上可导航的用户发言目录（消息导航侧栏）。
+   *
+   * 只回 id、标题和时间：侧栏要列的是**整条会话**的发言，而窗口外的发言 id 只能
+   * 从服务端拿；消息体仍然走 `/turns`。
+   */
+  async getSessionTurnIndex(sessionId) {
+    const index = await this.client.json("GET", `/api/sessions/${encodeURIComponent(sessionId)}/turn-index`);
+    return {
+      sessionId: index.session_id,
+      items: index.items.map((item) => ({
+        entryId: item.entry_id,
+        preview: item.preview,
+        createdAt: item.created_at
+      }))
+    };
+  }
+  getMcpAppContext(sessionId, sourceId, init) {
+    return this.client.jsonFromInit(`/api/sessions/${encodeURIComponent(sessionId)}/mcp-apps/${encodeURIComponent(sourceId)}/context`, init);
+  }
+  updateMcpAppContext(sessionId, sourceId, body, init) {
+    return this.client.jsonFromInit(`/api/sessions/${encodeURIComponent(sessionId)}/mcp-apps/${encodeURIComponent(sourceId)}/context`, {
+      ...init,
+      method: "POST",
+      body: JSON.stringify(body)
+    });
+  }
+  async getSessionTurnCommands(sessionId) {
+    const commands = await this.client.json("GET", `/api/sessions/${encodeURIComponent(sessionId)}/turn-commands`);
+    return commands.map((command) => ({
+      deliveryId: command.delivery_id,
+      toolCallId: command.tool_call_id ?? void 0,
+      action: command.action,
+      payload: command.payload
+    }));
+  }
   listResultFeedback(sessionId) {
     return this.client.json("GET", `/api/sessions/${encodeURIComponent(sessionId)}/feedback`);
   }
@@ -2396,8 +3058,9 @@ var SessionsResource = class {
       `/api/sessions/${sessionId}/probe-url?url=${encodeURIComponent(url)}`
     );
   }
-  listDir(sessionId, dirPath) {
-    return this.client.json("GET", `/api/sessions/${sessionId}/ls/${encodeURIComponent(dirPath)}`);
+  listDir(sessionId, dirPath, showHidden = false) {
+    const query = showHidden ? "?show_hidden=true" : "";
+    return this.client.json("GET", `/api/sessions/${sessionId}/ls/${encodeURIComponent(dirPath)}${query}`);
   }
   async countFiles(sessionId, dirPath = "") {
     const entries = await this.listDir(sessionId, dirPath);
@@ -2592,6 +3255,130 @@ function profileToCreateSessionRequest(profile) {
   };
 }
 
+// src/resources/plugins.ts
+var PluginsResource = class {
+  constructor(client) {
+    this.client = client;
+  }
+  client;
+  /**
+   * 列出当前用户安装的插件及其展示信息。
+   *
+   * 服务端可能为了补齐名称/图标惰性获取包内容，但绝不激活插件、不连 MCP；
+   * 单个插件的展示信息读不出来只会降级成占位，不会让整份目录失败。
+   */
+  catalog(init) {
+    return this.client.jsonFromInit("/api/plugins/catalog", init);
+  }
+  /** 取一个插件的包内图标字节（用户级，不需要会话）。 */
+  fetchIcon(name) {
+    return this.client.blob("GET", `/api/plugins/${encodeURIComponent(name)}/icon`);
+  }
+  /** 带凭据的图标地址；能直接用 blob URL 的地方优先用 `fetchIcon`。 */
+  iconUrl(name) {
+    return this.client.buildAuthedUrl(`/api/plugins/${encodeURIComponent(name)}/icon`);
+  }
+};
+
+// src/resources/chat-groups.ts
+var ChatGroupsResource = class {
+  constructor(client) {
+    this.client = client;
+  }
+  client;
+  list() {
+    return this.client.json("GET", "/api/chat-groups");
+  }
+  create(payload) {
+    return this.client.json("POST", "/api/chat-groups", payload);
+  }
+  update(groupId, payload) {
+    return this.client.json("PATCH", `/api/chat-groups/${encodeURIComponent(groupId)}`, payload);
+  }
+  delete(groupId, options) {
+    const query = options?.deleteWorkspace ? "?delete_workspace=true" : "";
+    return this.client.json("DELETE", `/api/chat-groups/${encodeURIComponent(groupId)}${query}`);
+  }
+};
+
+// src/resources/site-visits.ts
+var SITE_VISITS_PATH = "/api/site-visits";
+var REQUEST_TIMEOUT_MS = 5e3;
+var SiteVisitsResource = class {
+  constructor(client) {
+    this.client = client;
+  }
+  client;
+  /** 上报一次页面访问，返回当前快照；不承诺本次已计入或已落盘。 */
+  record() {
+    return this.request("POST");
+  }
+  /** 只读快照：不设置访客 Cookie，也不增加任何计数。 */
+  summary() {
+    return this.request("GET");
+  }
+  async request(method) {
+    const url = buildBackendUrl(this.client.options.baseUrl, SITE_VISITS_PATH);
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
+    try {
+      const response = await (this.client.options.fetchImpl ?? fetch)(url.toString(), {
+        method,
+        // 访客 Cookie 是唯一的去重依据，必须随请求往返。
+        credentials: "include",
+        signal: controller.signal
+      });
+      if (!response.ok) {
+        throw new BladeApiError(response, await extractErrorDetail(response));
+      }
+      return await response.json();
+    } finally {
+      clearTimeout(timeout);
+    }
+  }
+};
+
+// src/shared/auth-busy.ts
+var DEFAULT_RETRY_AFTER_SECONDS = 1;
+var MAX_TIMER_DELAY_MS = 2147483647;
+function errorData(error) {
+  if (typeof error !== "object" || error === null || !("data" in error)) return null;
+  const data = error.data;
+  return typeof data === "object" && data !== null ? data : null;
+}
+function authBusyRetryDelayMs(error) {
+  const data = errorData(error);
+  if (data?.code !== "auth_busy" || Number(data.status) !== 429) return null;
+  const rawRetryAfter = data.retry_after;
+  const seconds = rawRetryAfter == null || String(rawRetryAfter).trim() === "" ? Number.NaN : Number(rawRetryAfter);
+  const delaySeconds = Number.isFinite(seconds) && seconds >= 0 ? seconds : DEFAULT_RETRY_AFTER_SECONDS;
+  return Math.min(delaySeconds * 1e3, MAX_TIMER_DELAY_MS);
+}
+var AuthBusyReconnect = class {
+  timer = null;
+  get pending() {
+    return this.timer !== null;
+  }
+  schedule(error, reconnect) {
+    const delay = authBusyRetryDelayMs(error);
+    if (delay === null) {
+      this.cancel();
+      return false;
+    }
+    this.cancel();
+    this.timer = globalThis.setTimeout(() => {
+      this.timer = null;
+      reconnect();
+    }, delay);
+    return true;
+  }
+  cancel() {
+    if (this.timer === null) return;
+    globalThis.clearTimeout(this.timer);
+    this.timer = null;
+  }
+};
+
 // src/commands/registry.ts
 var BUFFER_LIMIT_PER_ACTION = 20;
 var CommandRegistry = class {
@@ -2700,14 +3487,282 @@ var Emitter = class {
   }
 };
 
-// src/schemas/message-utils.ts
-var SYSTEM_REMINDER_PATTERN = /^<system-reminder>\s*[\s\S]*?\s*<\/system-reminder>$/i;
-var SYSTEM_NOTIFICATION_PATTERN = /^<system-notification>\s*[\s\S]*?\s*<\/system-notification>$/i;
-var LEGACY_FORK_CONTEXT_MARKERS = [
-  "\u7236\u667A\u80FD\u4F53\u5728\u6D3E\u751F\u4F60\u4E4B\u524D\u5DF2\u7ECF\u5B8C\u6210\u4E86\u4E00\u4E9B\u64CD\u4F5C\u3002",
-  "\u53EF\u901A\u8FC7 `read_file` \u8BFB\u53D6\u3002",
-  "# \u4F60\u7684\u4EFB\u52A1"
-];
+// src/session/history-page.ts
+function sortedUnique(turns) {
+  const byId = /* @__PURE__ */ new Map();
+  for (const turn of turns) byId.set(turn.turn_id, turn);
+  return [...byId.values()].sort((left, right) => left.sequence - right.sequence);
+}
+function prependOlder(current, page) {
+  const currentById = new Map(current.map((turn) => [turn.turn_id, turn]));
+  return sortedUnique([
+    ...current,
+    ...page.map((turn) => {
+      const live = currentById.get(turn.turn_id);
+      return live ? { ...live, sequence: turn.sequence } : turn;
+    })
+  ]);
+}
+function replaceWindow(current, page, liveRevisionAtStart, liveRevisions) {
+  const pageById = new Map(page.map((turn) => [turn.turn_id, turn]));
+  const newerLive = current.filter(
+    (turn) => turn.turn_id.startsWith("local-user-") || (liveRevisions.byTurnId.get(turn.turn_id) ?? 0) > liveRevisionAtStart
+  );
+  return sortedUnique([
+    ...page,
+    ...newerLive.map((turn) => {
+      const snapshot2 = pageById.get(turn.turn_id);
+      return snapshot2 ? { ...turn, sequence: snapshot2.sequence } : turn;
+    })
+  ]);
+}
+
+// src/session/queue.ts
+var EMPTY_SESSION_QUEUE = {
+  session_id: "",
+  revision: 0,
+  paused: false,
+  pause_reason: null,
+  items: []
+};
+var QUEUE_FAILURE_MESSAGE = "\u961F\u5217\u64CD\u4F5C\u5931\u8D25";
+var QUEUED_MESSAGE_STATUSES = [
+  "pending",
+  "delivering",
+  "claimed",
+  "consumed",
+  "cancelled"
+];
+function toQueuedMessage(value) {
+  if (!isRecord(value)) return null;
+  const status = typeof value.status === "string" && QUEUED_MESSAGE_STATUSES.includes(value.status) ? value.status : null;
+  if (typeof value.id !== "string" || typeof value.content !== "string" || typeof value.position !== "number" || typeof value.version !== "number" || typeof value.created_at !== "string" || typeof value.updated_at !== "string" || status === null) {
+    return null;
+  }
+  const item = {
+    id: value.id,
+    content: value.content,
+    position: value.position,
+    version: value.version,
+    status,
+    created_at: value.created_at,
+    updated_at: value.updated_at
+  };
+  if (typeof value.target_run_id === "string") item.target_run_id = value.target_run_id;
+  if (typeof value.error === "string") item.error = value.error;
+  return item;
+}
+function toQueueSnapshot(value, fallbackSessionId) {
+  if (!isRecord(value)) return null;
+  if (typeof value.revision !== "number" || !Number.isInteger(value.revision) || value.revision < 0) {
+    return null;
+  }
+  if (typeof value.paused !== "boolean") return null;
+  if (!Array.isArray(value.items)) return null;
+  const pauseReason = value.pause_reason;
+  if (pauseReason !== null && pauseReason !== void 0 && typeof pauseReason !== "string") {
+    return null;
+  }
+  const items = [];
+  for (const raw of value.items) {
+    const item = toQueuedMessage(raw);
+    if (!item) return null;
+    items.push(item);
+  }
+  return {
+    session_id: typeof value.session_id === "string" && value.session_id ? value.session_id : fallbackSessionId,
+    revision: value.revision,
+    paused: value.paused,
+    pause_reason: typeof pauseReason === "string" ? pauseReason : null,
+    items
+  };
+}
+function isSessionQueueSnapshot(value) {
+  if (!isRecord(value) || typeof value.session_id !== "string") return false;
+  return toQueueSnapshot(value, value.session_id) !== null;
+}
+function shouldApplySnapshot(current, next) {
+  if (!isSessionQueueSnapshot(next)) return false;
+  if (current?.session_id && next.session_id !== current.session_id) return false;
+  return next.revision > (current?.revision ?? -1);
+}
+function parseQueueAck(response, fallbackSessionId) {
+  if (!isRecord(response)) {
+    return { ok: false, conflict: false, snapshot: null, message: QUEUE_FAILURE_MESSAGE };
+  }
+  const message = typeof response.message === "string" && response.message ? response.message : null;
+  const status = response.status;
+  if (status !== "ok" && status !== "conflict" && status !== "queued") {
+    return { ok: false, conflict: false, snapshot: null, message: message ?? QUEUE_FAILURE_MESSAGE };
+  }
+  const snapshot2 = toQueueSnapshot(response, fallbackSessionId);
+  if (status === "conflict") {
+    return { ok: false, conflict: true, snapshot: snapshot2, message: message ?? QUEUE_FAILURE_MESSAGE };
+  }
+  if (!snapshot2) {
+    return { ok: false, conflict: false, snapshot: null, message: message ?? QUEUE_FAILURE_MESSAGE };
+  }
+  return { ok: true, conflict: false, snapshot: snapshot2, message };
+}
+function canEditQueuedMessage(item) {
+  return item.status === "pending";
+}
+function canCancelQueuedMessage(item) {
+  return item.status === "pending";
+}
+function canDeliverQueuedMessage(item) {
+  return item.status === "pending";
+}
+var QUEUED_MESSAGE_STATUS_LABELS = {
+  pending: "\u5F85\u6267\u884C",
+  delivering: "\u7B49\u5F85\u63A5\u6536",
+  claimed: "",
+  consumed: "",
+  cancelled: ""
+};
+function queuedMessageStatusLabel(status) {
+  return QUEUED_MESSAGE_STATUS_LABELS[status] ?? "";
+}
+var QUEUE_PAUSE_REASON_LABELS = {
+  user_stop: "\u5DF2\u6682\u505C",
+  run_failed: "\u4EFB\u52A1\u5F02\u5E38\u5DF2\u6682\u505C",
+  run_unknown: "\u4EFB\u52A1\u7ED3\u675F\u72B6\u6001\u672A\u77E5\uFF0C\u5DF2\u6682\u505C",
+  server_restart: "\u670D\u52A1\u91CD\u542F\u5DF2\u6682\u505C"
+};
+function queuePauseReasonLabel(reason) {
+  if (!reason) return null;
+  return QUEUE_PAUSE_REASON_LABELS[reason] ?? reason;
+}
+
+// src/schemas/mcp-app.ts
+function isMcpAppData(value) {
+  return isRecord(value) && typeof value.sourceId === "string" && value.sourceId.length > 0 && typeof value.resourceUri === "string" && value.resourceUri.startsWith("ui://") && typeof value.mimeType === "string" && isRecord(value.resourceMeta) && isRecord(value.toolInput) && isRecord(value.toolResult);
+}
+
+// src/shared/tool-ui-card.ts
+function isNonEmptyString(value) {
+  return typeof value === "string" && value.trim().length > 0;
+}
+function isPositiveNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) && value > 0;
+}
+function isToolUiCard(value) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    return false;
+  }
+  const raw = value;
+  if (raw.target !== "inline" && raw.target !== "preview") {
+    return false;
+  }
+  if (!isPositiveNumber(raw.height)) {
+    return false;
+  }
+  if (raw.archived === true && !isNonEmptyString(raw.resourceHTML)) {
+    return false;
+  }
+  if (!isNonEmptyString(raw.resourceHTML) && !isNonEmptyString(raw.resourceUri) && !isNonEmptyString(raw.resourceURI)) {
+    return false;
+  }
+  if (raw.title != null && !isNonEmptyString(raw.title)) {
+    return false;
+  }
+  if (raw.mcpApp !== void 0 && !isMcpAppData(raw.mcpApp)) {
+    return false;
+  }
+  return true;
+}
+function resolveToolUiCardContent(card) {
+  if (isNonEmptyString(card.resourceHTML)) {
+    return { type: "resource-html", content: card.resourceHTML };
+  }
+  if (card.archived) return null;
+  const uri = isNonEmptyString(card.resourceUri) ? card.resourceUri : card.resourceURI;
+  return isNonEmptyString(uri) ? { type: "resource-uri", content: uri } : null;
+}
+function buildToolUiCardKey(toolCallId, type3, content) {
+  if (type3 === "resource-uri") {
+    return `tool-preview-uri:${content}`;
+  }
+  return `tool-preview:${toolCallId}`;
+}
+function isInternalStatusToolUiCard(card) {
+  return card?.title?.trim() === "\u9636\u6BB5\u8FDB\u5EA6";
+}
+function isAppDevToolUiCard(card, isAppDev) {
+  return isAppDev && card.target === "preview" && !card.resourceHTML && Boolean(card.resourceUri || card.resourceURI);
+}
+function collectInlineToolUiCards(messages) {
+  return messages.flatMap(
+    (message) => (message.blocks ?? []).flatMap(
+      (block, index) => block.type === "tool_ui" && block.tool_call_id && isToolUiCard(block.content) && block.content.target === "inline" ? [
+        {
+          key: `${message.entry_id ?? message.timestamp ?? "message"}-${block.tool_call_id}-${index}`,
+          toolCallId: block.tool_call_id,
+          card: block.content
+        }
+      ] : []
+    )
+  );
+}
+function collectPreviewToolUiCards(messages) {
+  return messages.flatMap(
+    (message) => (message.blocks ?? []).flatMap((block, index) => {
+      if (block.type !== "tool_ui" || !block.tool_call_id || !isToolUiCard(block.content) || block.content.target !== "preview") {
+        return [];
+      }
+      const toolCall = (message.tool_calls ?? []).find(
+        (candidate) => candidate.id === block.tool_call_id
+      );
+      return toolCall ? [
+        {
+          key: `${message.entry_id ?? message.timestamp ?? "message"}-${block.tool_call_id}-${index}`,
+          toolCall,
+          card: block.content,
+          blocks: message.blocks ?? []
+        }
+      ] : [];
+    })
+  );
+}
+
+// src/schemas/message-utils.ts
+var SYSTEM_REMINDER_PATTERN = /^<system-reminder>\s*[\s\S]*?\s*<\/system-reminder>$/i;
+var SYSTEM_NOTIFICATION_PATTERN = /^<system-notification>\s*[\s\S]*?\s*<\/system-notification>$/i;
+var LEGACY_FORK_CONTEXT_MARKERS = [
+  "\u7236\u667A\u80FD\u4F53\u5728\u6D3E\u751F\u4F60\u4E4B\u524D\u5DF2\u7ECF\u5B8C\u6210\u4E86\u4E00\u4E9B\u64CD\u4F5C\u3002",
+  "\u53EF\u901A\u8FC7 `read_file` \u8BFB\u53D6\u3002",
+  "# \u4F60\u7684\u4EFB\u52A1"
+];
+var INTERNAL_CHAT_ERROR_PATTERNS = [
+  /\b(?:ENOENT|EACCES|EPERM)\b/i,
+  /\[(?:Errno -?\d+|WinError \d+)\]/i,
+  /\b(?:ECONNRESET|ECONNREFUSED|ETIMEDOUT|EHOSTUNREACH|ENETUNREACH|ENOTFOUND|EAI_AGAIN)\b/i,
+  /\b(?:Connection refused|Connection reset by peer|All connection attempts failed|getaddrinfo failed)\b/i,
+  /(?:^|[\s("'`])\/(?:root|home|Users|tmp|var|opt|etc)\//,
+  /[A-Za-z]:\\(?:Users|Windows|Program Files|AppData)\\/i,
+  /(?:^|\n)Traceback \(most recent call last\):/,
+  /(?:^|\n)\s*at\s+\S+(?:\s+\(|:\d+:\d+)/,
+  /(?:^|\n)File "[^"]+", line \d+/
+];
+var SAFE_CHAT_ERROR_PREFIXES = [
+  "\u6C99\u76D2\u8FD0\u884C\u73AF\u5883\u6682\u65F6\u4E0D\u53EF\u7528\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002",
+  "\u6A21\u578B\u670D\u52A1\u6682\u65F6\u4E0D\u53EF\u7528\uFF0C\u8BF7\u68C0\u67E5\u6A21\u578B\u914D\u7F6E\u540E\u91CD\u8BD5\u3002"
+];
+var GENERIC_CHAT_ERROR = "\u6D88\u606F\u53D1\u9001\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5\u3002";
+function chatErrorForDisplay(message, developer = false) {
+  const normalized = message.trim();
+  if (!developer) {
+    const safePrefix = SAFE_CHAT_ERROR_PREFIXES.find((prefix) => normalized.startsWith(prefix));
+    if (safePrefix) return safePrefix;
+  }
+  if (!developer && /no source matches this model/i.test(normalized)) {
+    return "\u5F53\u524D\u6A21\u578B\u6682\u65F6\u4E0D\u53EF\u7528\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u6216\u91CD\u65B0\u9009\u62E9\u6A21\u578B\u3002";
+  }
+  if (!developer && INTERNAL_CHAT_ERROR_PATTERNS.some((pattern) => pattern.test(normalized))) {
+    return GENERIC_CHAT_ERROR;
+  }
+  return normalized || GENERIC_CHAT_ERROR;
+}
 function normalizeMessageContent(content) {
   if (typeof content === "string") return content;
   if (Array.isArray(content)) return content;
@@ -2727,10 +3782,10 @@ function isLegacyForkContextText(text) {
   const normalized = text.trim();
   return LEGACY_FORK_CONTEXT_MARKERS.every((marker) => normalized.includes(marker));
 }
-function isHiddenInternalMessage(message) {
+function isHiddenInternalMessage(message, options = {}) {
   if (message.role !== "user") return false;
   const text = getTextContent(normalizeMessageContent(message.content));
-  return isSystemReminderText(text) || isSystemNotificationText(text) || isLegacyForkContextText(text);
+  return isSystemReminderText(text) || isSystemNotificationText(text) || (options.includeLegacyForkContext ?? true) && isLegacyForkContextText(text);
 }
 function buildMessageContent(text, attachments) {
   if (attachments.length === 0) return text;
@@ -2877,7 +3932,10 @@ function createInitialSessionState(sessionId) {
     agentLoops: {},
     activeCompaction: null,
     replay: null,
-    viewerRole: null
+    queue: EMPTY_SESSION_QUEUE,
+    viewerRole: null,
+    nextBefore: null,
+    loadingOlder: false
   };
 }
 function parseAgentDescription(argumentsJson) {
@@ -2903,10 +3961,10 @@ function inferLoopStatusFromMessages(messages) {
 }
 function inferLoopStatusFromTurns(turns, messages) {
   const latestAgentNotification = [...turns].reverse().flatMap((turn) => turn.blocks).find((block) => {
-    if (block.type !== "system_notification" || !isRecord4(block.content)) return false;
+    if (block.type !== "system_notification" || !isRecord(block.content)) return false;
     return block.content.notification_type === "agent:start" || block.content.notification_type === "agent:end";
   });
-  if (latestAgentNotification?.type === "system_notification" && isRecord4(latestAgentNotification.content)) {
+  if (latestAgentNotification?.type === "system_notification" && isRecord(latestAgentNotification.content)) {
     const notificationType = latestAgentNotification.content.notification_type;
     const status = latestAgentNotification.content.status;
     if (notificationType === "agent:start" || status === "running") return "running";
@@ -2915,17 +3973,44 @@ function inferLoopStatusFromTurns(turns, messages) {
   }
   return inferLoopStatusFromMessages(messages);
 }
-function isRecord4(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
+function toSelectionMap(value) {
+  if (!isRecord(value)) return {};
+  const entries = Object.entries(value).map(([questionKey, optionIndexes]) => {
+    if (!Array.isArray(optionIndexes)) return null;
+    const parsedIndexes = optionIndexes.map((item) => typeof item === "number" ? item : Number(item)).filter((item) => Number.isInteger(item));
+    return [Number(questionKey), parsedIndexes];
+  }).filter((entry) => entry !== null);
+  return Object.fromEntries(entries);
+}
+function toCustomMap(value) {
+  if (!isRecord(value)) return {};
+  const entries = Object.entries(value).filter(([, text]) => typeof text === "string").map(([questionKey, text]) => [Number(questionKey), text]);
+  return Object.fromEntries(entries);
+}
+function extractAskAnswers(turns) {
+  const answers = {};
+  for (const turn of turns) {
+    for (const block of turn.blocks) {
+      if (block.type !== "ask_user_answer" || typeof block.tool_call_id !== "string") continue;
+      if (!isRecord(block.content)) continue;
+      const note = typeof block.content.note === "string" ? block.content.note.trim() : "";
+      answers[block.tool_call_id] = {
+        selections: toSelectionMap(block.content.selections),
+        custom: toCustomMap(block.content.custom),
+        ...note ? { note } : {}
+      };
+    }
+  }
+  return answers;
 }
 function parentForkToolCallIdFromTurn(turn) {
   if (typeof turn.parent_fork_tool_call_id === "string" && turn.parent_fork_tool_call_id.length > 0) {
     return turn.parent_fork_tool_call_id;
   }
   for (const block of turn.blocks) {
-    if (block.type !== "system_notification" || !isRecord4(block.content)) continue;
+    if (block.type !== "system_notification" || !isRecord(block.content)) continue;
     const metadata = block.content.metadata;
-    if (!isRecord4(metadata)) continue;
+    if (!isRecord(metadata)) continue;
     const parentId = metadata.parent_fork_tool_call_id;
     if (typeof parentId === "string" && parentId.length > 0) return parentId;
   }
@@ -2942,16 +4027,16 @@ function buildMessageContent2(turn) {
 }
 function workspaceNotificationContent(turn) {
   const block = turn.blocks.find(
-    (candidate) => candidate.type === "system_notification" && isRecord4(candidate.content) && candidate.content.notification_type === "workspace_change"
+    (candidate) => candidate.type === "system_notification" && isRecord(candidate.content) && candidate.content.notification_type === "workspace_change"
   );
-  if (!block || !isRecord4(block.content)) return "";
+  if (!block || !isRecord(block.content)) return "";
   const title = typeof block.content.title === "string" ? block.content.title.trim() : "";
   const detail = typeof block.content.detail === "string" ? block.content.detail.trim() : "";
   return [title ? `**${title}**` : "", detail].filter(Boolean).join("\n\n");
 }
 function askUserAnswerContent(turn) {
   const answerBlock = turn.blocks.find((block) => block.type === "ask_user_answer");
-  if (!answerBlock || !isRecord4(answerBlock.content)) return null;
+  if (!answerBlock || !isRecord(answerBlock.content)) return null;
   const answer = answerBlock.content.answer;
   return typeof answer === "string" && answer.trim().length > 0 ? answer : null;
 }
@@ -2971,6 +4056,19 @@ function extractModeFromBlocks(blocks) {
   return null;
 }
 function projectionToMessage(turn) {
+  if (turn.kind === "context") {
+    const context = contextProjectionData(turn);
+    if (!context) return null;
+    return {
+      role: "assistant",
+      content: "",
+      kind: "context",
+      context,
+      loop_name: turn.loop_id,
+      entry_id: turn.turn_id,
+      status: turn.status
+    };
+  }
   if (turn.kind === "compaction" && turn.compaction_id) {
     return {
       role: "assistant",
@@ -3141,21 +4239,58 @@ function orderTurns(turns) {
   return turns;
 }
 function reconcileOptimisticUserTurns(currentTurns, incomingTurns) {
-  const currentById = new Map(currentTurns.map((turn) => [turn.turn_id, turn]));
-  const optimisticUserTurn = currentTurns.find(
-    (turn) => turn.role === "user" && turn.turn_id.startsWith("local-user-")
+  return reconcileUserTurns(currentTurns, incomingTurns, true, false);
+}
+function reconcileHistoricalUserTurns(currentTurns, incomingTurns) {
+  return reconcileUserTurns(currentTurns, incomingTurns, false, true);
+}
+function reconcileUserTurns(currentTurns, incomingTurns, allowLiveFallback, keepUnclaimedOptimistic) {
+  const preservedTurns = preserveClientRenderIds(currentTurns, incomingTurns);
+  const optimisticUserTurns = currentTurns.filter(
+    (turn) => turn.role === "user" && (turn.kind ?? "message") === "message" && turn.turn_id.startsWith("local-user-")
   );
-  let optimisticUserMatched = false;
+  const optimisticByRequestId = new Map(
+    optimisticUserTurns.map((turn) => [
+      turn.turn_id.slice("local-user-".length),
+      turn
+    ])
+  );
+  const currentTurnIds = new Set(currentTurns.map((turn) => turn.turn_id));
+  const claimedOptimisticIds = /* @__PURE__ */ new Set();
+  const reconciled = preservedTurns.map((turn) => {
+    const exactOptimistic = typeof turn.client_request_id === "string" ? optimisticByRequestId.get(turn.client_request_id) : void 0;
+    if (exactOptimistic && !claimedOptimisticIds.has(exactOptimistic.turn_id) && isUserConfirmation(turn)) {
+      claimedOptimisticIds.add(exactOptimistic.turn_id);
+      return { ...turn, client_render_id: exactOptimistic.turn_id };
+    }
+    const fallbackOptimistic = optimisticUserTurns.find(
+      (candidate) => !claimedOptimisticIds.has(candidate.turn_id)
+    );
+    if (allowLiveFallback && typeof turn.client_request_id !== "string" && fallbackOptimistic && isUserConfirmation(turn) && !turn.turn_id.startsWith("local-user-") && !currentTurnIds.has(turn.turn_id)) {
+      claimedOptimisticIds.add(fallbackOptimistic.turn_id);
+      return { ...turn, client_render_id: fallbackOptimistic.turn_id };
+    }
+    return turn;
+  });
+  const result = claimedOptimisticIds.size === 0 ? reconciled : reconciled.filter((turn) => !claimedOptimisticIds.has(turn.turn_id));
+  if (!keepUnclaimedOptimistic) return result;
+  const resultIds = new Set(result.map((turn) => turn.turn_id));
+  const unclaimedOptimisticTurns = optimisticUserTurns.filter(
+    (turn) => !claimedOptimisticIds.has(turn.turn_id) && !resultIds.has(turn.turn_id)
+  );
+  return unclaimedOptimisticTurns.length === 0 ? result : orderTurns([...result, ...unclaimedOptimisticTurns]);
+}
+function isUserConfirmation(turn) {
+  return turn.role === "user" && (turn.kind ?? "message") === "message" || turn.blocks.some((block) => block.type === "ask_user_answer");
+}
+function preserveClientRenderIds(currentTurns, incomingTurns) {
+  const currentById = new Map(currentTurns.map((turn) => [turn.turn_id, turn]));
   return incomingTurns.map((turn) => {
     const current = currentById.get(turn.turn_id);
     if (current) {
       const currentRenderId = current.client_render_id;
       return turn.client_render_id || !currentRenderId ? turn : { ...turn, client_render_id: currentRenderId };
     }
-    if (!optimisticUserMatched && optimisticUserTurn && turn.role === "user" && !turn.turn_id.startsWith("local-user-")) {
-      optimisticUserMatched = true;
-      return { ...turn, client_render_id: optimisticUserTurn.turn_id };
-    }
     return turn;
   });
 }
@@ -3170,7 +4305,7 @@ function areAgentLoopsEqual(left, right) {
   });
 }
 function withTurns(state, turns) {
-  const orderedTurns = orderTurns(reconcileOptimisticUserTurns(state.turns, turns));
+  const orderedTurns = orderTurns(reconcileHistoricalUserTurns(state.turns, turns));
   const { messages, agentLoops, activeCompaction } = materialize(orderedTurns);
   const isWaitingForInput = orderedTurns.some(
     (turn) => turn.tool_calls.some((toolCall) => toolCall.status === "awaiting_answer")
@@ -3188,26 +4323,45 @@ function withTurns(state, turns) {
   });
   const mergedMessages = preservedErrors.length > 0 ? [...messagesWithRenderIds, ...preservedErrors] : messagesWithRenderIds;
   const latestMode = [...orderedTurns].reverse().map((turn) => extractModeFromBlocks(turn.blocks)).find((mode) => mode !== null);
+  const askAnswersFromHistory = extractAskAnswers(orderedTurns);
+  const presentToolCallIds = new Set(
+    orderedTurns.flatMap((turn) => turn.tool_calls.map((toolCall) => toolCall.id))
+  );
+  const askAnswers = { ...askAnswersFromHistory };
+  for (const [toolCallId, answer] of Object.entries(state.askAnswers)) {
+    if (!(toolCallId in askAnswers) && presentToolCallIds.has(toolCallId)) {
+      askAnswers[toolCallId] = answer;
+    }
+  }
   return {
     ...state,
     turns: orderedTurns,
     messages: mergedMessages,
     agentLoops: stableAgentLoops,
     activeCompaction,
+    askAnswers,
     mode: latestMode ?? state.mode,
     // 历史恢复时 chat:end(paused) 可能已不在 socket replay 缓存中；
     // awaiting_answer 是投影里的持久权威状态，必须据此恢复问答交互。
     status: isWaitingForInput ? "waiting_for_input" : state.status
   };
 }
+function withQueue(state, snapshot2) {
+  if (!shouldApplySnapshot(state.queue, snapshot2)) return state;
+  return { ...state, queue: snapshot2 };
+}
 var localTurnCounter = 0;
-function addUserMessage(state, content) {
+function addUserMessage(state, content, clientRequestId) {
   localTurnCounter += 1;
-  const turnId = `local-user-${Date.now()}-${localTurnCounter}`;
+  const turnId = `local-user-${clientRequestId ?? `${Date.now()}-${localTurnCounter}`}`;
   const optimisticTurn = {
     id: turnId,
     sequence: Math.max(0, ...state.turns.map((turn) => turn.sequence)) + 1,
     turn_id: turnId,
+    // 乐观态就自赋，跟服务端确认后 reconcileUserTurns 补上的
+    // client_render_id（= 乐观 turn 自己的 turn_id）保持同一个值，
+    // 消费方才能拿它当"确认前后不变"的稳定标识使用。
+    client_render_id: turnId,
     loop_id: "root",
     role: "user",
     status: "streaming",
@@ -3222,10 +4376,9 @@ function addUserMessage(state, content) {
 function upsertTurn(state, turn) {
   let existing = [...state.turns];
   const [nextTurn] = reconcileOptimisticUserTurns(existing, [turn]);
-  if (nextTurn.client_render_id && turn.role === "user") {
-    existing = existing.filter(
-      (item) => !(item.role === "user" && item.turn_id.startsWith("local-user-"))
-    );
+  const claimedOptimisticId = nextTurn.client_render_id;
+  if (claimedOptimisticId?.startsWith("local-user-")) {
+    existing = existing.filter((item) => item.turn_id !== claimedOptimisticId);
   }
   const index = existing.findIndex((item) => item.turn_id === nextTurn.turn_id);
   if (index >= 0) {
@@ -3233,7 +4386,7 @@ function upsertTurn(state, turn) {
   } else {
     existing.push(nextTurn);
   }
-  return withTurns(state, existing);
+  return withTurns({ ...state, turns: existing }, existing);
 }
 function applyTurnPatch(state, patch) {
   const turn = patch.data.turn;
@@ -3244,13 +4397,7 @@ function applyTurnPatch(state, patch) {
   if (lastSequence !== null && patch.sequence <= lastSequence) {
     return state;
   }
-  const nextTurn = { ...turn, sequence: patch.sequence };
-  if (index >= 0) {
-    existing[index] = nextTurn;
-  } else {
-    existing.push(nextTurn);
-  }
-  return withTurns(state, existing);
+  return upsertTurn(state, { ...turn, sequence: patch.sequence });
 }
 function addErrorMessage(state, content) {
   const anchorTurnId = state.turns[state.turns.length - 1]?.turn_id ?? null;
@@ -3282,19 +4429,27 @@ function markStreamingTurns(state, turnStatus, toolCallStatus) {
 
 // src/session/agent-session.ts
 var OOM_MESSAGE = "\u6C99\u76D2\u5185\u5B58\u4F7F\u7528\u8D85\u51FA\u9650\u5236\uFF0C\u5DF2\u81EA\u52A8\u91CD\u542F\u3002\u5982\u679C\u7ECF\u5E38\u89E6\u53D1\uFF0C\u53EF\u4EE5\u8054\u7CFB\u7BA1\u7406\u5458\u8C03\u6574\u989D\u5EA6\u3002";
-var OOM_KEYWORDS_RE = /(?:\b(?:exit_code|ExitedWith|exited with)|退出码)\D*(?<!\d)137(?!\d)/i;
-function isRecord5(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
+var COMMAND_RESTORE_RETRY_BASE_MS = 1e3;
+var COMMAND_RESTORE_RETRY_MAX_MS = 3e4;
+var QUEUE_ACK_TIMEOUT_MS = 1e4;
+var fallbackRequestCounter = 0;
+function createClientRequestId() {
+  if (typeof globalThis.crypto?.randomUUID === "function") {
+    return globalThis.crypto.randomUUID();
+  }
+  fallbackRequestCounter += 1;
+  return `${Date.now()}-${Math.random().toString(36).slice(2)}-${fallbackRequestCounter}`;
 }
+var OOM_KEYWORDS_RE = /(?:\b(?:exit_code|ExitedWith|exited with)|退出码)\D*(?<!\d)137(?!\d)/i;
 function isOomText(value) {
   return typeof value === "string" && OOM_KEYWORDS_RE.test(value);
 }
 function parseJsonRecord(value) {
-  if (isRecord5(value)) return value;
+  if (isRecord(value)) return value;
   if (typeof value !== "string") return null;
   try {
     const parsed = JSON.parse(value);
-    return isRecord5(parsed) ? parsed : null;
+    return isRecord(parsed) ? parsed : null;
   } catch {
     return null;
   }
@@ -3320,6 +4475,20 @@ function isOomResult(value) {
 function isToolBridgeContent(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value) && typeof value.action === "string";
 }
+function isCursorInvalidError(error) {
+  return typeof error === "object" && error !== null && "status" in error && error.status === 409;
+}
+function queueRequestFailure(error) {
+  return {
+    ok: false,
+    conflict: false,
+    snapshot: null,
+    message: error instanceof Error && error.message ? error.message : "\u961F\u5217\u64CD\u4F5C\u5931\u8D25"
+  };
+}
+function commandDeliveryKey(deliveryId) {
+  return `tool-command:${deliveryId}`;
+}
 function sessionStatusFromChatEnd(status) {
   if (status === "paused") return "waiting_for_input";
   if (status === "interrupted") return "interrupted";
@@ -3335,14 +4504,6 @@ function extractTerminalChatEndStatus(events) {
   }
   return null;
 }
-function hasChatRunEvent2(events) {
-  return events.some(
-    (event) => event.type !== "session:post_chat_followup" && !event.type.startsWith("compaction:")
-  );
-}
-function isUiMetaLike(value) {
-  return isRecord5(value) && ("resourceHTML" in value || "resourceUri" in value || "resourceURI" in value);
-}
 var AgentSession = class _AgentSession {
   sessionId;
   state;
@@ -3356,14 +4517,41 @@ var AgentSession = class _AgentSession {
   patchFlushCancel = null;
   joined = false;
   joinPending = null;
+  // bootstrap 与每次 reconnect 共用一条订阅生命周期队列。它们都会重置 join
+  // 状态并临时设置 replay source，禁止并发，否则较早操作的 finally 会清掉
+  // 较晚操作仍在使用的来源上下文。
+  subscriptionQueue = Promise.resolve();
+  replaceQueue = Promise.resolve();
+  timelineEpoch = 0;
+  /** 定位请求的流水号：被后一次选择取代的那次定位不再提交窗口（见 locateEntry）。 */
+  locateToken = 0;
+  /** 在途那次定位的请求句柄。**只**服务定位：权威刷新不共用它（见 cancelPendingLocate）。 */
+  locateAbort = null;
+  pagingGeneration = 0;
+  liveRevision = 0;
+  modeRevision = 0;
+  liveRevisions = /* @__PURE__ */ new Map();
+  pendingOptimisticTurnIds = /* @__PURE__ */ new Set();
+  olderPending = null;
+  replaceInFlight = 0;
   // 回放控制请求排成一条队列。连着点"5x"再点"退出回放"时，并发发出去的两个
   // 请求响应可能乱序回来，晚到的旧值会把已经退出的会话又显示成回放中；用
   // 序号丢弃过期响应又会在失败时留下中间态。串行执行就没有这些情况：每个
   // 响应都是当时最新的，失败也只影响自己。
   replayQueue = Promise.resolve();
+  // Historical snapshots and live commands share one delivery barrier. A
+  // repair closes the barrier before joining, snapshots the raw command log
+  // after the join, then releases buffered commands in socket arrival order.
+  commandRestoreQueue = Promise.resolve();
+  commandRecoveryGeneration = 0;
+  commandRestoreRetryAttempt = 0;
+  commandRestoreRetryHandle = null;
+  bufferedCommandDeliveries = null;
   pendingReplayMessage = null;
   pendingReplayMode;
+  pendingReplayKbIds;
   recentChatEndAt = 0;
+  subscriptionReplaySource = null;
   disposed = false;
   getAppContext = null;
   sendPending = false;
@@ -3374,11 +4562,19 @@ var AgentSession = class _AgentSession {
   seenToolCallIds = /* @__PURE__ */ new Set();
   finishedToolCallIds = /* @__PURE__ */ new Set();
   emittedMessageTurnIds = /* @__PURE__ */ new Set();
-  constructor(sessionId, runtime, connection) {
+  constructor(sessionId, runtime, connection, options = {}) {
     this.sessionId = sessionId;
     this.runtime = runtime;
     this.state = { ...createInitialSessionState(sessionId), connection };
+    this.isStatic = options.staticHistory === true;
   }
+  /**
+   * 静态历史（分享页 / `fromTurns`）：没有目录接口，也**没有**"目录还没到位"这个中间态。
+   *
+   * 宿主据此决定要不要拿已加载窗口当兜底条目——真实会话在 timeline 被重写后，窗口里还是
+   * 旧分支的发言，拿它兜底会把已经失效的 entry id 重新摆到轨道上，点了必然找不到。
+   */
+  isStatic;
   /** 从一份静态 turn 快照构造只展示历史的会话（例如公开分享页）。 */
   static fromTurns(sessionId, turns) {
     const readonlyError = () => {
@@ -3387,11 +4583,13 @@ var AgentSession = class _AgentSession {
     const session = new _AgentSession(
       sessionId,
       {
-        streamTokens: false,
         emitEvent: readonlyError,
         emitWithAck: async () => readonlyError(),
         ensureConnected: readonlyError,
-        fetchTurns: async () => turns,
+        fetchTurnsPage: async () => ({ turns, nextBefore: null, currentMode: "executing" }),
+        // 静态会话（分享页）没有会话目录接口，宿主用已加载的历史兜底条目。
+        fetchTurnIndex: async () => ({ sessionId, items: [] }),
+        fetchCommands: async () => [],
         // 静态历史没有回放身份可言，给个空详情即可，不要抛错——_bootstrap
         // 不会跑到这里，但保持只读语义一致。
         fetchSessionInfo: async () => ({ replay_state: null }),
@@ -3402,7 +4600,8 @@ var AgentSession = class _AgentSession {
         attachAppCli: async () => readonlyError(),
         onDispose: () => true
       },
-      "connected"
+      "connected",
+      { staticHistory: true }
     );
     session.state = {
       ...withTurns(session.state, turns),
@@ -3415,6 +4614,101 @@ var AgentSession = class _AgentSession {
   getState() {
     return this.state;
   }
+  get hasOlderHistory() {
+    return this.state.nextBefore !== null;
+  }
+  /** Load the page immediately preceding the current display window. */
+  loadOlderHistory(options = {}) {
+    if (this.disposed) return Promise.resolve();
+    if (this.olderPending) return this.olderPending;
+    if (this.replaceInFlight > 0) {
+      return this.replaceQueue.then(() => this.loadOlderHistory(options));
+    }
+    const before = this.state.nextBefore;
+    if (!before) return Promise.resolve();
+    const epoch = this.timelineEpoch;
+    const generation = this.pagingGeneration;
+    this.update((state) => ({ ...state, loadingOlder: true }));
+    const request = this.runtime.fetchTurnsPage(this.sessionId, { before }).then((page) => {
+      if (epoch !== this.timelineEpoch || generation !== this.pagingGeneration || this.state.nextBefore !== before) return;
+      options.beforeCommit?.();
+      this.update((state) => ({
+        ...withTurns(state, prependOlder(state.turns, page.turns)),
+        nextBefore: page.nextBefore,
+        loadingOlder: false
+      }));
+    }).catch(async (error) => {
+      if (isCursorInvalidError(error) && epoch === this.timelineEpoch && generation === this.pagingGeneration && this.state.nextBefore === before) {
+        this.invalidateTimeline();
+        await this.replaceFromHistory();
+        return;
+      }
+    }).finally(() => {
+      if (this.olderPending !== request) return;
+      this.olderPending = null;
+      this.update((state) => ({ ...state, loadingOlder: false }));
+    });
+    this.olderPending = request;
+    return request;
+  }
+  /**
+   * 定位到一条窗口外的历史发言：请服务端返回"从这条发言到最新"的窗口并整窗替换。
+   *
+   * 返回 false 表示这次定位没有落地（请求失败，或期间 timeline 被重写、会话已释放），
+   * 当前窗口保持不变，调用方可以原样重试。已加载的发言不要走这里——宿主直接滚动，
+   * 一次网络请求都不该发。
+   */
+  async locateEntry(entryId) {
+    const token = ++this.locateToken;
+    const controller = new AbortController();
+    this.locateAbort?.abort();
+    this.locateAbort = controller;
+    try {
+      return await this.replaceFromHistory({
+        suppressErrors: false,
+        fromEntryId: entryId,
+        signal: controller.signal,
+        isStale: () => this.locateToken !== token
+      });
+    } catch {
+      return false;
+    } finally {
+      if (this.locateAbort === controller) this.locateAbort = null;
+    }
+  }
+  /**
+   * 取消在途定位：用户改选了另一条发言（哪怕那条已经加载、不需要请求），
+   * 先前那次定位既不该再落地，也不该继续占着替换队列——排队中的下一次定位
+   * 不然要等它跑完（用户看到的是"点了新目标一直转圈"）。
+   *
+   * **只**中止定位自己的请求：权威刷新（运行结束 / 重连补数）不共用这个 controller，
+   * 否则"运行刚结束时点一下侧栏"就会把终态对账一起中止，流式与历史对不上。
+   */
+  cancelPendingLocate() {
+    this.locateToken += 1;
+    this.locateAbort?.abort();
+    this.locateAbort = null;
+  }
+  /**
+   * timeline 被整体改写（rewind / checkout / 释放）：推进纪元，并把在途定位请求一并中止
+   * ——它已经属于旧 timeline，却还占着替换队列，会让改写后的权威窗口排在后面等它跑完。
+   * 作废号仍然保留：中止只是让它更早结束。
+   */
+  invalidateTimeline() {
+    this.timelineEpoch += 1;
+    this.locateAbort?.abort();
+    this.locateAbort = null;
+  }
+  /**
+   * 拉取当前分支的用户发言目录（消息导航侧栏用）。
+   *
+   * 不在这里缓存：什么时候该刷新只有调用方知道（会话切换、历史被替换、新发言），
+   * 缓存只会让旧条目在 rewind 之后继续可点。
+   */
+  async loadTurnIndex() {
+    const index = await this.runtime.fetchTurnIndex(this.sessionId);
+    return index.items;
+  }
   /** 订阅状态变化。返回取消订阅函数。 */
   subscribe(listener) {
     this.listeners.add(listener);
@@ -3467,7 +4761,7 @@ var AgentSession = class _AgentSession {
   /** 发送一条消息。字符串或多模态内容均可。 */
   async send(content, options = {}) {
     this.runtime.ensureConnected();
-    if (this.state.isStreaming || this.state.activeCompaction || this.sendPending || this.manualCompactionPending) {
+    if (this.state.isStreaming && options.queueWhenRunning !== true || this.state.activeCompaction || this.sendPending || this.manualCompactionPending) {
       this.update(
         (s) => addErrorMessage(s, "\u5F53\u524D\u56DE\u590D\u5C1A\u672A\u7ED3\u675F\u6216\u5BF9\u8BDD\u6B63\u5728\u6574\u7406\uFF0C\u8BF7\u7A0D\u540E\u518D\u53D1\u9001\u3002")
       );
@@ -3480,9 +4774,125 @@ var AgentSession = class _AgentSession {
       this.sendPending = false;
     }
   }
+  /**
+   * 入队一条等待消息（运行中排队 / 暂停期间照常入队）。
+   *
+   * ack 超时或传输失败时结果未知：用**同一个** `client_request_id` 重试一次，
+   * 服务端按 `(session_id, client_request_id)` 幂等，不会制造第二条。
+   */
+  async queueMessage(content) {
+    const text = content.trim();
+    if (!text) {
+      return { ok: false, conflict: false, snapshot: null, message: "\u6D88\u606F\u4E0D\u80FD\u4E3A\u7A7A" };
+    }
+    const payload = {
+      session_id: this.sessionId,
+      message: text,
+      client_request_id: createClientRequestId()
+    };
+    try {
+      return await this.requestQueueAck("chat:append", payload);
+    } catch {
+      try {
+        return await this.requestQueueAck("chat:append", payload);
+      } catch (error) {
+        return queueRequestFailure(error);
+      }
+    }
+  }
+  /** 修改一条等待消息的正文；`expectedVersion` 是客户端看到的条目版本。 */
+  async updateQueuedMessage(itemId, expectedVersion, content) {
+    return this.runQueueCommand("chat:queue:update", {
+      session_id: this.sessionId,
+      item_id: itemId,
+      expected_version: expectedVersion,
+      message: content
+    });
+  }
+  /**
+   * 重排等待消息。`orderedIds` 必须是当前 pending 条目 id 的**完整集合**（顺序任意），
+   * 服务端按 `expectedRevision` 校验后整体替换顺序。
+   *
+   * 拖动排序就该像本地操作一样落地：版本冲突（运行中的任务刚领走一条 / 另一个端也在
+   * 动队列）不甩给用户「刷新后重试」，而是拿冲突响应里那份**最新快照**重算一次再提交
+   * ——掉队的条目（已经被领取执行的）从顺序里剔除，剩下的保持用户拖出来的相对次序。
+   * 最多补两次；仍旧冲突才把结果交回调用方。
+   */
+  async reorderQueuedMessages(expectedRevision, orderedIds) {
+    let revision = expectedRevision;
+    let ids = orderedIds;
+    let result = await this.runQueueCommand("chat:queue:reorder", {
+      session_id: this.sessionId,
+      expected_revision: revision,
+      ordered_ids: ids
+    });
+    for (let attempt = 0; attempt < 2 && !result.ok && result.conflict; attempt++) {
+      const snapshot2 = result.snapshot;
+      if (!snapshot2) break;
+      const pending = snapshot2.items.filter(canEditQueuedMessage);
+      const live = new Set(pending.map((item) => item.id));
+      const next = ids.filter((id) => live.has(id));
+      for (const item of pending) if (!next.includes(item.id)) next.push(item.id);
+      if (next.length === 0) {
+        return { ok: true, conflict: false, snapshot: snapshot2, message: null };
+      }
+      revision = snapshot2.revision;
+      ids = next;
+      result = await this.runQueueCommand("chat:queue:reorder", {
+        session_id: this.sessionId,
+        expected_revision: revision,
+        ordered_ids: ids
+      });
+    }
+    return result;
+  }
+  /** 删除一条等待消息；不传版本时由服务端自行判定。 */
+  async cancelQueuedMessage(itemId, expectedVersion) {
+    return this.runQueueCommand("chat:queue:cancel", {
+      session_id: this.sessionId,
+      item_id: itemId,
+      expected_version: expectedVersion
+    });
+  }
+  /** 立即补充：把等待消息交给当前运行，在下一个接收点消费，不停止也不另起一轮。 */
+  async deliverQueuedMessage(itemId, expectedVersion) {
+    return this.runQueueCommand("chat:queue:deliver", {
+      session_id: this.sessionId,
+      item_id: itemId,
+      expected_version: expectedVersion
+    });
+  }
+  /** 继续执行：清除暂停，并按当前顺序恢复逐条接续。 */
+  async resumeQueue() {
+    return this.runQueueCommand("chat:queue:resume", { session_id: this.sessionId });
+  }
+  /** 拉取一份权威队列快照。首次连接与每次重连后由实例自动调用，也可以手动刷新。 */
+  async refreshQueue() {
+    return this.runQueueCommand("chat:queue:list", { session_id: this.sessionId });
+  }
+  /**
+   * 发出一条队列命令并安装 ack 里的快照。
+   * 传输层失败（超时 / 断线）会 reject，由调用方决定是否重试。
+   */
+  async requestQueueAck(event, payload) {
+    this.runtime.ensureConnected();
+    const response = await this.runtime.emitWithAck(event, payload, QUEUE_ACK_TIMEOUT_MS);
+    const result = parseQueueAck(response, this.sessionId);
+    const snapshot2 = result.snapshot;
+    if (snapshot2) this.update((state) => withQueue(state, snapshot2));
+    return result;
+  }
+  /** 队列命令的对外入口：传输失败只体现为失败结果，不向调用方抛异常。 */
+  async runQueueCommand(event, payload) {
+    try {
+      return await this.requestQueueAck(event, payload);
+    } catch (error) {
+      return queueRequestFailure(error);
+    }
+  }
   async sendUnlocked(content, options) {
     await this.ensureIdleBeforeSend();
-    if (this.state.isStreaming || this.state.activeCompaction || this.manualCompactionPending) {
+    if (this.state.isStreaming && options.queueWhenRunning !== true || this.state.activeCompaction || this.manualCompactionPending) {
       this.update(
         (s) => addErrorMessage(s, "\u5F53\u524D\u56DE\u590D\u5C1A\u672A\u7ED3\u675F\u6216\u5BF9\u8BDD\u6B63\u5728\u6574\u7406\uFF0C\u8BF7\u7A0D\u540E\u518D\u53D1\u9001\u3002")
       );
@@ -3492,7 +4902,7 @@ var AgentSession = class _AgentSession {
     if (this.getAppContext) {
       try {
         const rawContext = await this.getAppContext();
-        if (!isRecord5(rawContext)) {
+        if (!isRecord(rawContext)) {
           throw new Error("getContext \u5FC5\u987B\u8FD4\u56DE JSON \u5BF9\u8C61");
         }
         const serialized = JSON.stringify(rawContext);
@@ -3500,7 +4910,7 @@ var AgentSession = class _AgentSession {
           throw new Error("getContext \u5FC5\u987B\u8FD4\u56DE\u53EF\u5E8F\u5217\u5316\u7684 JSON \u5BF9\u8C61");
         }
         const normalized = JSON.parse(serialized);
-        if (!isRecord5(normalized)) {
+        if (!isRecord(normalized)) {
           throw new Error("getContext \u5FC5\u987B\u8FD4\u56DE JSON \u5BF9\u8C61");
         }
         appContext = normalized;
@@ -3510,17 +4920,18 @@ var AgentSession = class _AgentSession {
         return false;
       }
     }
+    const wasStreaming = this.state.isStreaming;
     const askUserAnswer = options.askUserAnswer;
     let optimisticTurnId = null;
+    const clientRequestId = createClientRequestId();
     let optimisticAskAnswer;
     let previousAskAnswer;
-    if (!(askUserAnswer && typeof askUserAnswer.tool_call_id === "string")) {
-      this.update((state) => {
-        const next = addUserMessage(state, content);
-        optimisticTurnId = next.turns.at(-1)?.turn_id ?? null;
-        return next;
-      });
-    }
+    this.update((state) => {
+      const next = addUserMessage(state, content, clientRequestId);
+      optimisticTurnId = next.turns.at(-1)?.turn_id ?? null;
+      return next;
+    });
+    if (optimisticTurnId) this.markOptimisticTurnPending(optimisticTurnId);
     this.update((s) => ({ ...s, isStreaming: true }));
     if (askUserAnswer && typeof askUserAnswer.tool_call_id === "string") {
       const { tool_call_id, ...rest } = askUserAnswer;
@@ -3534,17 +4945,22 @@ var AgentSession = class _AgentSession {
     if (!options.replayDecision) {
       this.pendingReplayMessage = content;
       this.pendingReplayMode = options.mode;
+      this.pendingReplayKbIds = options.kbIds;
     }
     const payload = {
       session_id: this.sessionId,
       message: content,
+      client_request_id: clientRequestId,
       mode: options.mode,
       askuser_answer: askUserAnswer,
       model: options.model,
       thinking_override: options.thinkingOverride,
       whatif: options.whatif,
       replay_decision: options.replayDecision,
-      app_context: appContext
+      app_context: appContext,
+      kb_ids: options.kbIds,
+      // 运行中提交不必由客户端挑命令：服务端按会话运行状态决定直接执行还是入队。
+      queue_when_running: options.queueWhenRunning === true
     };
     try {
       await this.ensureJoined();
@@ -3554,12 +4970,28 @@ var AgentSession = class _AgentSession {
         askUserAnswer,
         optimisticAskAnswer,
         previousAskAnswer,
+        wasStreaming,
         error instanceof Error && error.message ? error.message : "\u4F1A\u8BDD\u8BA2\u9605\u5931\u8D25\uFF0C\u6D88\u606F\u672A\u53D1\u9001"
       );
       return false;
     }
     try {
       const response = await this.runtime.emitWithAck("chat:send", payload, 3e4);
+      if (response?.status === "queued") {
+        this.discardOptimisticSend(
+          optimisticTurnId,
+          askUserAnswer,
+          optimisticAskAnswer,
+          previousAskAnswer
+        );
+        const snapshot2 = parseQueueAck(response, this.sessionId).snapshot;
+        const running = response.running === true;
+        this.update((current) => {
+          const next = running ? current : { ...current, isStreaming: false };
+          return snapshot2 ? withQueue(next, snapshot2) : next;
+        });
+        return true;
+      }
       if (response?.status !== "accepted") {
         throw new Error(
           typeof response?.message === "string" ? response.message : "\u6D88\u606F\u672A\u88AB\u670D\u52A1\u7AEF\u63A5\u53D7"
@@ -3572,19 +5004,31 @@ var AgentSession = class _AgentSession {
         askUserAnswer,
         optimisticAskAnswer,
         previousAskAnswer,
+        wasStreaming,
         error instanceof Error && error.message ? error.message : "\u6D88\u606F\u53D1\u9001\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5"
       );
       return false;
     }
   }
-  rollbackOptimisticSend(optimisticTurnId, askUserAnswer, optimisticAskAnswer, previousAskAnswer, message) {
+  rollbackOptimisticSend(optimisticTurnId, askUserAnswer, optimisticAskAnswer, previousAskAnswer, wasStreaming, message) {
+    this.discardOptimisticSend(
+      optimisticTurnId,
+      askUserAnswer,
+      optimisticAskAnswer,
+      previousAskAnswer
+    );
+    this.update(
+      (current) => addErrorMessage(wasStreaming ? current : { ...current, isStreaming: false }, message)
+    );
+  }
+  /** 撤回一次乐观提交：移除乐观消息、恢复提问作答、清掉回放草稿。 */
+  discardOptimisticSend(optimisticTurnId, askUserAnswer, optimisticAskAnswer, previousAskAnswer) {
     this.pendingReplayMessage = null;
     this.pendingReplayMode = void 0;
+    this.pendingReplayKbIds = void 0;
     this.update((current) => {
-      let next = optimisticTurnId ? withTurns(
-        current,
-        current.turns.filter((turn) => turn.turn_id !== optimisticTurnId)
-      ) : current;
+      const filtered = optimisticTurnId ? current.turns.filter((turn) => turn.turn_id !== optimisticTurnId) : current.turns;
+      let next = optimisticTurnId ? withTurns({ ...current, turns: filtered }, filtered) : current;
       const toolCallId = askUserAnswer && typeof askUserAnswer.tool_call_id === "string" ? askUserAnswer.tool_call_id : null;
       if (toolCallId && next.askAnswers[toolCallId] === optimisticAskAnswer) {
         const askAnswers = { ...next.askAnswers };
@@ -3595,18 +5039,20 @@ var AgentSession = class _AgentSession {
         }
         next = { ...next, askAnswers };
       }
-      return addErrorMessage({ ...next, isStreaming: false }, message);
+      return next;
     });
-  }
-  /** 智能体运行期间追加补充说明（不打断当前回复）。 */
-  append(text) {
-    this.runtime.ensureConnected();
-    this.runtime.emitEvent("chat:append", { session_id: this.sessionId, message: text });
-    this.update((s) => addUserMessage(s, text));
+    if (optimisticTurnId) {
+      this.pendingOptimisticTurnIds.delete(optimisticTurnId);
+      this.liveRevisions.delete(optimisticTurnId);
+    }
   }
   /** 停止当前回复。 */
   stop() {
-    return this.runtime.emitWithAck("chat:stop", { session_id: this.sessionId }, 35e3).then((response) => response ?? {});
+    return this.runtime.emitWithAck("chat:stop", { session_id: this.sessionId }, 35e3).then((response) => {
+      const result = response ?? {};
+      if (result.status !== "accepted") this.manualCompactionPending = false;
+      return result;
+    });
   }
   /** 手动触发上下文压缩。 */
   compact() {
@@ -3626,8 +5072,10 @@ var AgentSession = class _AgentSession {
         trigger: "manual"
       }
     }));
-    return this.runtime.emitWithAck("chat:compact", { session_id: this.sessionId }, 3e4).then((response) => response ?? {}).finally(() => {
+    return this.runtime.emitWithAck("chat:compact", { session_id: this.sessionId }, 3e4).then((response) => response ?? {}).catch((error) => {
       this.manualCompactionPending = false;
+      throw error;
+    }).finally(() => {
       if (this.state.activeCompaction?.compaction_id === "pending-manual-compaction") {
         this.update((state) => ({ ...state, activeCompaction: null }));
       }
@@ -3666,10 +5114,20 @@ var AgentSession = class _AgentSession {
     if (this.disposed) return;
     if (!this.runtime.onDispose(this)) return;
     this.disposed = true;
+    this.invalidateTimeline();
+    this.invalidateOlderPaging();
+    this.state = { ...this.state, nextBefore: null, loadingOlder: false };
     this.cancelPatchFlush();
     this.listeners.clear();
     this.emitter.clear();
     this.commands.clear();
+    this.commandRecoveryGeneration += 1;
+    this.commandRestoreRetryAttempt = 0;
+    this.bufferedCommandDeliveries = null;
+    if (this.commandRestoreRetryHandle !== null) {
+      globalThis.clearTimeout(this.commandRestoreRetryHandle);
+      this.commandRestoreRetryHandle = null;
+    }
   }
   get isDisposed() {
     return this.disposed;
@@ -3680,28 +5138,64 @@ var AgentSession = class _AgentSession {
     if (this.state.connection === connection) return;
     this.update((s) => ({ ...s, connection }));
   }
+  /**
+   * @internal 服务端广播的权威队列快照。
+   * 结构不合法或 revision 不新的一律丢弃，绝不用旧快照覆盖新状态。
+   */
+  _handleQueueUpdated(payload) {
+    if (!isSessionQueueSnapshot(payload)) return;
+    const snapshot2 = payload;
+    this.update((state) => withQueue(state, snapshot2));
+  }
   /** @internal socket 重连后由 Hub 调用：重新加入房间并补数。 */
-  async _rejoinAfterReconnect() {
-    const turnsBeforeRejoin = this.state.turns;
-    this.joined = false;
-    this.joinPending = null;
-    try {
-      await this.ensureJoined();
-      await Promise.all([
-        this.syncTurnsFromHistory({
-          clearOnEmpty: true,
-          preserveChangesSince: turnsBeforeRejoin
-        }),
-        this.syncReplayFromSession()
-      ]);
-    } catch {
-    }
+  _rejoinAfterReconnect() {
+    this.invalidateOlderPaging();
+    this.update((state) => ({ ...state, nextBefore: null, loadingOlder: false }));
+    const reconnectLiveRevision = this.liveRevision;
+    const reconnectModeRevision = this.modeRevision;
+    const commandRecoveryGeneration = this.beginCommandRecovery();
+    return this.enqueueSubscription(async () => {
+      this.joined = false;
+      this.joinPending = null;
+      try {
+        this.subscriptionReplaySource = "reconnect_replay";
+        try {
+          await this.ensureJoined(reconnectLiveRevision);
+        } finally {
+          this.subscriptionReplaySource = null;
+          this.scheduleHistoricalCommandRestore(commandRecoveryGeneration);
+        }
+        await Promise.all([
+          this.refreshAuthoritativeHistory({
+            liveRevisionAtStart: reconnectLiveRevision,
+            modeRevisionAtStart: reconnectModeRevision
+          }),
+          this.syncReplayFromSession()
+        ]);
+      } catch {
+      }
+    });
   }
   /** @internal 首次连接：加载历史 + 加入房间。 */
-  async _bootstrap() {
-    await this.syncTurnsFromHistory({ suppressErrors: false });
-    await this.ensureJoined();
-    await this.syncReplayFromSession();
+  _bootstrap() {
+    const commandRecoveryGeneration = this.beginCommandRecovery();
+    return this.enqueueSubscription(async () => {
+      await this.replaceFromHistory({ suppressErrors: false });
+      this.subscriptionReplaySource = "bootstrap_replay";
+      try {
+        await this.ensureJoined();
+      } finally {
+        this.subscriptionReplaySource = null;
+      }
+      this.scheduleHistoricalCommandRestore(commandRecoveryGeneration);
+      await Promise.all([this.syncReplayFromSession(), this.refreshQueue()]);
+    });
+  }
+  /** 订阅生命周期串行执行；一次失败只由自己的调用方观察，不截断后续重连。 */
+  enqueueSubscription(operation) {
+    const run = this.subscriptionQueue.then(operation);
+    this.subscriptionQueue = run.catch(() => void 0);
+    return run;
   }
   /** 改回放是 owner 专属（服务端 PATCH 走 _get_owned_session）。 */
   get canControlReplay() {
@@ -3758,10 +5252,16 @@ var AgentSession = class _AgentSession {
     this.applyTurn(turn);
   }
   /** @internal 历史回放通道（event_format: raw）。 */
-  _handleTurnEvents(events) {
+  _handleTurnEvents(events, replayed = false) {
     if (!events.length) return;
+    if (events.some(
+      (event) => event.type === "compaction:end" || event.type === "compaction:error" || event.type === "compaction:abort"
+    )) {
+      this.manualCompactionPending = false;
+    }
+    this.dispatchRawCommands(events);
     const terminalChatEndStatus = extractTerminalChatEndStatus(events);
-    if (!terminalChatEndStatus && hasChatRunEvent2(events)) {
+    if (!terminalChatEndStatus && hasChatRunEvent(events) && this.state.status !== "waiting_for_input") {
       this.markRunningIfIdle();
     }
     if (this.state.turns.length) {
@@ -3770,7 +5270,10 @@ var AgentSession = class _AgentSession {
     const updates = this.projectionBuilder.processBatch(events);
     for (const update of updates) {
       if (update.kind === "upsert") {
-        this.applyTurn(update.turn);
+        this.applyTurn(
+          update.turn,
+          replayed ? this.subscriptionReplaySource ?? "bootstrap_replay" : "live"
+        );
       } else if (update.kind === "workspace_changed") {
         this.emitter.emit("workspaceChanged", {});
       }
@@ -3816,6 +5319,8 @@ var AgentSession = class _AgentSession {
       this.update((s) => ({ ...s, replay }));
     }
     this.emitter.emit("sessionUpdated", {
+      workspacePath: data.workspace_path,
+      chatGroupId: data.chat_group_id,
       intent: data.intent,
       status: data.status,
       model: data.model,
@@ -3825,16 +5330,26 @@ var AgentSession = class _AgentSession {
   }
   /** @internal */
   _handleRewind(checkpointId) {
-    this.update((s) => ({ ...s, mode: null, errorMessage: null }));
-    void this.syncTurnsFromHistory({ clearOnEmpty: true });
+    this.invalidateTimeline();
+    this.invalidateOlderPaging();
+    this.update((s) => ({
+      ...s,
+      mode: null,
+      errorMessage: null,
+      nextBefore: null,
+      loadingOlder: false
+    }));
+    void this.replaceFromHistory();
     this.emitter.emit("rewind", { checkpointId });
   }
   /** @internal */
   _handleReplayMismatch(data) {
     const message = this.pendingReplayMessage ?? data.actual_message ?? "";
     const mode = this.pendingReplayMode;
+    const kbIds = this.pendingReplayKbIds;
     this.pendingReplayMessage = null;
     this.pendingReplayMode = void 0;
+    this.pendingReplayKbIds = void 0;
     const respond = (decision) => {
       void this.runtime.emitWithAck(
         "chat:send",
@@ -3842,7 +5357,8 @@ var AgentSession = class _AgentSession {
           session_id: this.sessionId,
           message,
           mode,
-          replay_decision: decision
+          replay_decision: decision,
+          kb_ids: kbIds
         },
         3e4
       ).then((response) => {
@@ -3883,9 +5399,9 @@ var AgentSession = class _AgentSession {
       detail,
       status,
       loopId,
-      metadata: isRecord5(notification.metadata) ? notification.metadata : void 0
+      metadata: isRecord(notification.metadata) ? notification.metadata : void 0
     });
-    if (notificationType === "bg:started" && isRecord5(notification.metadata)) {
+    if (notificationType === "bg:started" && isRecord(notification.metadata)) {
       const taskId = typeof notification.metadata.task_id === "string" ? notification.metadata.task_id : "";
       if (taskId) {
         this.emitter.emit("backgroundTask", {
@@ -3907,12 +5423,12 @@ var AgentSession = class _AgentSession {
     this.emitter.emit("artifact", event);
   }
   /** @internal 加入房间的应答里带 is_running，据此校准流式状态。 */
-  _applyRunningState(isRunning) {
+  _applyRunningState(isRunning, liveRevisionAtJoin = this.liveRevision) {
     if (isRunning) {
       this.update((s) => ({ ...s, status: "running", isStreaming: true }));
     } else if (this.state.isStreaming) {
       this.update((s) => ({ ...s, isStreaming: false }));
-      void this.syncTurnsFromHistory();
+      void this.refreshAuthoritativeHistory({ liveRevisionAtStart: liveRevisionAtJoin });
     }
   }
   // ---------------------------------------------------------------- 内部实现
@@ -3933,14 +5449,36 @@ var AgentSession = class _AgentSession {
   completeChat(status) {
     this.finishStreaming(status);
     this.recentChatEndAt = Date.now();
-    void this.syncTurnsFromHistory();
+    void this.refreshAuthoritativeHistory();
     this.emitter.emit("chatEnd", { status });
   }
-  applyTurn(turn) {
+  markTurnFresh(turnId) {
+    this.liveRevision += 1;
+    this.liveRevisions.set(turnId, this.liveRevision);
+  }
+  markOptimisticTurnPending(turnId) {
+    this.pendingOptimisticTurnIds.add(turnId);
+    this.markTurnFresh(turnId);
+  }
+  pruneOptimisticLiveRevisions() {
+    const retained = new Set(
+      this.state.turns.map((turn) => turn.turn_id).filter((turnId) => turnId.startsWith("local-user-"))
+    );
+    for (const turnId of this.liveRevisions.keys()) {
+      if (turnId.startsWith("local-user-") && !retained.has(turnId)) {
+        this.pendingOptimisticTurnIds.delete(turnId);
+        this.liveRevisions.delete(turnId);
+      }
+    }
+  }
+  applyTurn(turn, source = "live") {
     this.flushPatches();
+    this.markTurnFresh(turn.turn_id);
+    if (extractModeFromBlocks(turn.blocks)) this.modeRevision += 1;
     const previous = this.state;
     this.update((s) => upsertTurn(s, turn));
-    this.emitTurnDerivedEvents(previous, turn);
+    this.pruneOptimisticLiveRevisions();
+    this.emitTurnDerivedEvents(previous, turn, source);
   }
   schedulePatchFlush() {
     if (this.patchFlushHandle != null) return;
@@ -3973,11 +5511,15 @@ var AgentSession = class _AgentSession {
     this.pendingTurnPatches.clear();
     for (const patch of patches) {
       const previous = this.state;
-      this.update((s) => applyTurnPatch(s, patch));
+      const next = applyTurnPatch(previous, patch);
+      if (next === previous) continue;
+      this.liveRevision += 1;
+      this.liveRevisions.set(patch.turn_id, this.liveRevision);
       const turn = patch.data.turn;
-      if (turn) {
-        this.emitTurnDerivedEvents(previous, turn);
-      }
+      if (turn && extractModeFromBlocks(turn.blocks)) this.modeRevision += 1;
+      this.setState(next);
+      this.pruneOptimisticLiveRevisions();
+      if (turn) this.emitTurnDerivedEvents(previous, turn);
     }
     if (this.patchFlushCancel) {
       this.patchFlushCancel();
@@ -3986,7 +5528,7 @@ var AgentSession = class _AgentSession {
     }
   }
   /** turn 数据落地后统一派生语义事件（指令 / 工具调用 / 消息 / 模式 / 预览 / OOM）。 */
-  emitTurnDerivedEvents(previous, turn) {
+  emitTurnDerivedEvents(previous, turn, source = "live") {
     const mode = extractModeFromBlocks(turn.blocks);
     if (mode && previous.mode !== mode) {
       this.emitter.emit("modeChange", { mode });
@@ -3999,23 +5541,24 @@ var AgentSession = class _AgentSession {
         this.dispatchCommand(turn, block);
         continue;
       }
-      if (block.type === "tool_ui" && block.tool_call_id && isUiMetaLike(block.content)) {
+      if (block.type === "tool_ui" && block.tool_call_id && isToolUiCard(block.content)) {
         const ui = block.content;
         if (ui.target !== "preview") continue;
-        const previewType = ui.resourceHTML ? "resource-html" : "resource-uri";
-        const previewContent = ui.resourceHTML ?? ui.resourceUri ?? ui.resourceURI;
-        if (!previewContent) continue;
-        const key = `${block.tool_call_id}:${previewType}`;
-        if (this.deliveredToolPreviews.get(key) === previewContent) continue;
-        this.deliveredToolPreviews.set(key, previewContent);
+        const resolved = resolveToolUiCardContent(ui);
+        if (!resolved) continue;
+        const key = buildToolUiCardKey(block.tool_call_id, resolved.type, resolved.content);
+        const fingerprint = JSON.stringify([resolved.content, ui.mcpApp?.sourceId]);
+        if (this.deliveredToolPreviews.get(key) === fingerprint) continue;
+        this.deliveredToolPreviews.set(key, fingerprint);
         this.emitter.emit("toolPreview", {
           toolCallId: block.tool_call_id,
-          type: previewType,
-          content: previewContent,
-          title: ui.title ?? "\u5DE5\u5177\u9884\u89C8"
+          type: resolved.type,
+          content: resolved.content,
+          title: ui.title ?? "\u5DE5\u5177\u9884\u89C8",
+          ...ui.mcpApp ? { mcpApp: ui.mcpApp } : {}
         });
       }
-      if (block.type === "system_notification" && isRecord5(block.content)) {
+      if (block.type === "system_notification" && isRecord(block.content)) {
         this._handleSystemNotification(turn.loop_id, block.content);
       }
     }
@@ -4035,7 +5578,7 @@ var AgentSession = class _AgentSession {
       const finished = toolCall.status === "done" || toolCall.status === "error" || toolCall.status === "cancelled";
       if (finished && !this.finishedToolCallIds.has(toolCall.id)) {
         this.finishedToolCallIds.add(toolCall.id);
-        this.emitter.emit("toolResult", { toolCall: info, turn });
+        this.emitter.emit("toolResult", { toolCall: info, turn, source });
         if (isOomResult(toolCall.result)) {
           this.notifySandboxOom(toolCall.id);
         }
@@ -4052,17 +5595,36 @@ var AgentSession = class _AgentSession {
   dispatchCommand(turn, block) {
     if (!isToolBridgeContent(block.content)) return;
     const { action, payload } = block.content;
-    let payloadKey = "";
-    try {
-      payloadKey = JSON.stringify(payload ?? null);
-    } catch {
-      payloadKey = String(payload ?? "");
+    const deliveryKey = block.delivery_id ? commandDeliveryKey(block.delivery_id) : `legacy-tool-command:${turn.turn_id}:${block.tool_call_id ?? ""}:${action}:${JSON.stringify(payload)}`;
+    this.deliverCommand(deliveryKey, action, payload, block.tool_call_id ?? void 0);
+  }
+  dispatchRawCommands(events) {
+    for (const event of events) {
+      if (event.type !== "loop:tool_bridge") continue;
+      const deliveryId = String(event.payload.delivery_id ?? "");
+      const bridge = event.payload.bridge;
+      if (!deliveryId || !isToolBridgeContent(bridge)) continue;
+      this.deliverCommand(
+        commandDeliveryKey(deliveryId),
+        bridge.action,
+        bridge.payload,
+        String(event.payload.tool_call_id ?? "") || void 0
+      );
     }
-    const deliveryKey = [block.tool_call_id ?? turn.id, action, payloadKey].join("\0");
+  }
+  deliverCommand(deliveryKey, action, payload, toolCallId) {
+    if (this.bufferedCommandDeliveries) {
+      this.bufferedCommandDeliveries.push({ deliveryKey, action, payload, toolCallId });
+      return;
+    }
+    this.deliverCommandNow({ deliveryKey, action, payload, toolCallId });
+  }
+  deliverCommandNow(command) {
+    const { deliveryKey, action, payload, toolCallId } = command;
     if (this.deliveredCommandKeys.has(deliveryKey)) return;
     this.deliveredCommandKeys.add(deliveryKey);
-    const meta = { toolCallId: block.tool_call_id ?? void 0 };
-    this.emitter.emit("command", { action, payload, toolCallId: meta.toolCallId });
+    const meta = { toolCallId };
+    this.emitter.emit("command", { action, payload, toolCallId });
     this.commands.dispatch(action, payload, meta);
   }
   notifySandboxOom(key) {
@@ -4071,49 +5633,195 @@ var AgentSession = class _AgentSession {
     this.update((s) => addErrorMessage(s, OOM_MESSAGE));
     this.emitter.emit("sandboxOom", { toolCallId: key });
   }
-  async syncTurnsFromHistory(options = {}) {
-    const { clearOnEmpty = false, suppressErrors = true, preserveChangesSince } = options;
-    const turnsAtRequestStart = this.state.turns;
-    try {
-      const turns = await this.runtime.fetchTurns(this.sessionId);
-      if (turns.length === 0 && !clearOnEmpty) return;
-      this.update((state) => {
-        const mergeBaseline = preserveChangesSince ?? turnsAtRequestStart;
-        if (state.turns === mergeBaseline) return withTurns(state, turns);
-        const historyById = new Map(turns.map((turn) => [turn.turn_id, turn]));
-        let merged = withTurns(state, turns);
-        for (const current of state.turns) {
-          const fromHistory = historyById.get(current.turn_id);
-          if (!fromHistory || current.sequence > fromHistory.sequence) {
-            merged = upsertTurn(merged, current);
-          }
-        }
-        return merged;
-      });
-      this.replayCommandsFromTurns(turns);
-    } catch (error) {
-      if (!suppressErrors) throw error;
-    }
-  }
   /**
-   * 把历史里的指令补投给宿主页面。
+   * 权威刷新（运行结束 / 重连补数）：**按当前窗口第一条发言取窗口**，不再另记"用户想看哪段"。
    *
-   * 重开会话、断线补数时，地图高亮这类"页面当前状态"必须能恢复——
-   * 否则刷新一次页面，之前智能体让页面做的事就全丢了。
-   * 只回放指令：toolCall / message 这些事件如果按历史全量重放，
-   * 监听器会在挂载瞬间收到几百条陈年事件。
-   * dispatch 内部按 deliveredCommandKeys 去重，重复调用安全。
+   * 窗口本身就是"用户在看哪段"：首屏就是最新一页，向上翻页 / 定位之后首条就是用户滚到的位置。
+   * 直接拿 `from_entry_id = 当前窗口第一条 turn_id` 去取，运行结束、重连补数、翻页之后的对账
+   * 是同一条规则，不需要意图、锚点、已落地锚点这些状态；窗口首条已经不在分支上（404 / 409）时
+   * 回落到最新一页。
    */
-  replayCommandsFromTurns(turns) {
+  refreshAuthoritativeHistory(options = {}) {
+    let entryGone = false;
+    const locateTokenAtStart = this.locateToken;
+    return this.replaceFromHistory({
+      ...options,
+      // 锚点在**这次操作真正开始**时采样：排队期间用户可能刚定位过，那时窗口首条才是他要的。
+      fromEntryId: () => this.state.turns[0]?.turn_id,
+      onError: (error) => {
+        entryGone = isEntryGoneError(error);
+      }
+    }).then((located) => {
+      if (located || !entryGone) return located;
+      if (this.locateToken !== locateTokenAtStart) return false;
+      return this.replaceFromHistory(options);
+    });
+  }
+  replaceFromHistory(options = {}) {
+    if (this.disposed) return Promise.resolve(false);
+    const operationEpoch = this.timelineEpoch;
+    const liveRevisionAtStart = options.liveRevisionAtStart ?? this.liveRevision;
+    const modeRevisionAtStart = options.modeRevisionAtStart ?? this.modeRevision;
+    this.invalidateOlderPaging();
+    this.replaceInFlight += 1;
+    const operation = async () => {
+      let previousNextBefore = null;
+      const restoreCursor = () => {
+        if (this.disposed || previousNextBefore === null) return;
+        this.update((state) => ({
+          ...state,
+          nextBefore: previousNextBefore,
+          loadingOlder: false
+        }));
+      };
+      try {
+        if (this.disposed || operationEpoch !== this.timelineEpoch) return false;
+        if (options.isStale?.()) return false;
+        this.invalidateOlderPaging();
+        previousNextBefore = this.state.nextBefore;
+        this.update((state) => ({ ...state, nextBefore: null, loadingOlder: false }));
+        const signal = options.signal;
+        const fromEntryId = typeof options.fromEntryId === "function" ? options.fromEntryId() : options.fromEntryId;
+        const page = await this.runtime.fetchTurnsPage(
+          this.sessionId,
+          fromEntryId ? { fromEntryId } : void 0,
+          signal ? { signal } : void 0
+        );
+        if (this.disposed || operationEpoch !== this.timelineEpoch) {
+          restoreCursor();
+          return false;
+        }
+        if (options.isStale?.()) {
+          restoreCursor();
+          return false;
+        }
+        if (!this.joined) this.seedToolCallDeliveryBaseline(page.turns);
+        this.update((state) => {
+          const next = withTurns(
+            state,
+            replaceWindow(state.turns, page.turns, liveRevisionAtStart, {
+              current: this.liveRevision,
+              byTurnId: this.liveRevisions
+            })
+          );
+          return {
+            ...next,
+            mode: this.modeRevision === modeRevisionAtStart ? page.currentMode : state.mode,
+            nextBefore: page.nextBefore,
+            loadingOlder: false
+          };
+        });
+        this.pruneOptimisticLiveRevisions();
+        this.projectionBuilder._seedTurns(this.state.turns);
+        return true;
+      } catch (error) {
+        options.onError?.(error);
+        if (!this.disposed && operationEpoch === this.timelineEpoch) {
+          this.update((state) => ({
+            ...state,
+            nextBefore: previousNextBefore,
+            loadingOlder: false
+          }));
+        }
+        if (options.suppressErrors === false) throw error;
+        return false;
+      } finally {
+        this.replaceInFlight -= 1;
+      }
+    };
+    const run = this.replaceQueue.then(operation);
+    this.replaceQueue = run.catch(() => void 0);
+    return run;
+  }
+  invalidateOlderPaging() {
+    this.pagingGeneration += 1;
+    this.olderPending = null;
+  }
+  beginCommandRecovery() {
+    this.commandRecoveryGeneration += 1;
+    this.commandRestoreRetryAttempt = 0;
+    this.bufferedCommandDeliveries ??= [];
+    if (this.commandRestoreRetryHandle !== null) {
+      globalThis.clearTimeout(this.commandRestoreRetryHandle);
+      this.commandRestoreRetryHandle = null;
+    }
+    return this.commandRecoveryGeneration;
+  }
+  scheduleHistoricalCommandRestore(generation) {
+    const restore = async () => {
+      if (this.disposed || generation !== this.commandRecoveryGeneration) return;
+      try {
+        const commands = await this.runtime.fetchCommands(this.sessionId);
+        if (this.disposed) return;
+        for (const command of commands) {
+          if (this.disposed) return;
+          this.deliverCommandNow({
+            deliveryKey: commandDeliveryKey(command.deliveryId),
+            action: command.action,
+            payload: command.payload,
+            toolCallId: command.toolCallId
+          });
+        }
+        if (generation !== this.commandRecoveryGeneration) return;
+        this.commandRestoreRetryAttempt = 0;
+        this.flushBufferedCommands(generation);
+      } catch {
+        if (!this.disposed && generation === this.commandRecoveryGeneration && this.commandRestoreRetryHandle === null) {
+          const retryDelay = Math.min(
+            COMMAND_RESTORE_RETRY_BASE_MS * 2 ** this.commandRestoreRetryAttempt,
+            COMMAND_RESTORE_RETRY_MAX_MS
+          );
+          this.commandRestoreRetryAttempt += 1;
+          this.commandRestoreRetryHandle = globalThis.setTimeout(() => {
+            this.commandRestoreRetryHandle = null;
+            if (!this.disposed && generation === this.commandRecoveryGeneration) {
+              this.scheduleHistoricalCommandRestore(generation);
+            }
+          }, retryDelay);
+        }
+      }
+    };
+    const run = this.commandRestoreQueue.then(restore);
+    this.commandRestoreQueue = run.catch(() => void 0);
+  }
+  flushBufferedCommands(generation) {
+    const pending = [...this.bufferedCommandDeliveries ?? []];
+    this.bufferedCommandDeliveries = [];
+    let index = 0;
+    while (index < pending.length) {
+      if (this.disposed) return;
+      if (generation !== this.commandRecoveryGeneration) {
+        const currentGenerationBuffer = this.bufferedCommandDeliveries ?? [];
+        this.bufferedCommandDeliveries = [
+          ...pending.slice(index),
+          ...currentGenerationBuffer
+        ];
+        return;
+      }
+      this.deliverCommandNow(pending[index]);
+      index += 1;
+      const reentrantBuffer = this.bufferedCommandDeliveries;
+      if (index === pending.length && reentrantBuffer && reentrantBuffer.length > 0) {
+        pending.push(...reentrantBuffer);
+        this.bufferedCommandDeliveries = [];
+      }
+    }
+    if (!this.disposed && generation === this.commandRecoveryGeneration) {
+      this.bufferedCommandDeliveries = null;
+    }
+  }
+  /** 首次订阅前的 REST 历史建立语义事件基线，随后同一工具的订阅回放不再投递。 */
+  seedToolCallDeliveryBaseline(turns) {
     for (const turn of turns) {
-      for (const block of turn.blocks) {
-        if (block.type === "tool_bridge" && isToolBridgeContent(block.content)) {
-          this.dispatchCommand(turn, block);
+      for (const toolCall of turn.tool_calls) {
+        this.seenToolCallIds.add(toolCall.id);
+        if (toolCall.status === "done" || toolCall.status === "error" || toolCall.status === "cancelled") {
+          this.finishedToolCallIds.add(toolCall.id);
         }
       }
     }
   }
-  ensureJoined() {
+  ensureJoined(liveRevisionBoundary = this.liveRevision) {
     if (this.joined) return Promise.resolve();
     if (this.joinPending) return this.joinPending;
     const join = this.runtime.emitWithAck(
@@ -4121,8 +5829,7 @@ var AgentSession = class _AgentSession {
       {
         session_id: this.sessionId,
         event_format: "raw",
-        resume: true,
-        stream_tokens: this.runtime.streamTokens
+        resume: true
       },
       5e3
     ).then((response) => {
@@ -4132,7 +5839,7 @@ var AgentSession = class _AgentSession {
         );
       }
       this.joined = true;
-      this._applyRunningState(Boolean(response?.is_running));
+      this._applyRunningState(Boolean(response?.is_running), liveRevisionBoundary);
     }).finally(() => {
       this.joinPending = null;
     });
@@ -4140,6 +5847,7 @@ var AgentSession = class _AgentSession {
     return join;
   }
   async ensureIdleBeforeSend() {
+    if (this.state.isStreaming) return;
     if (Date.now() - this.recentChatEndAt > 3e3) return;
     const deadline = Date.now() + 3e3;
     while (Date.now() < deadline) {
@@ -4174,6 +5882,7 @@ var SessionHub = class {
   connectionListeners = /* @__PURE__ */ new Set();
   bound = false;
   hasConnected = false;
+  authBusyReconnect = new AuthBusyReconnect();
   constructor(client) {
     this.client = client;
   }
@@ -4195,16 +5904,28 @@ var SessionHub = class {
    * 只有最后一份归还才退订房间——否则 StrictMode 双跑、路由抖动这类"连两次
    * 只释放一次"的场景会把仍在用的会话退订掉，之后所有 turn/chat 事件静默丢失。
    */
-  async connect(sessionId) {
+  async connect(sessionId, options = {}) {
     const existing = this.sessions.get(sessionId);
     if (existing && !existing.isDisposed) {
       this.hold(sessionId);
+      try {
+        options.setup?.(existing);
+      } catch (error) {
+        existing.dispose();
+        throw error;
+      }
       return this.bootstrapPending.get(sessionId) ?? existing;
     }
     this.ensureBound();
     const session = new AgentSession(sessionId, this.runtimeFor(), this.connection);
     this.sessions.set(sessionId, session);
     this.hold(sessionId);
+    try {
+      options.setup?.(session);
+    } catch (error) {
+      session.dispose();
+      throw error;
+    }
     this.ensureConnected();
     const bootstrap = session._bootstrap().then(() => session);
     this.bootstrapPending.set(sessionId, bootstrap);
@@ -4228,6 +5949,7 @@ var SessionHub = class {
   /** 手动重连（例如登录态变化后）。 */
   reconnect() {
     this.ensureBound();
+    this.authBusyReconnect.cancel();
     const socket = this.client.socket();
     socket.disconnect();
     this.setConnection("connecting");
@@ -4235,11 +5957,13 @@ var SessionHub = class {
   }
   /** 断开连接（不清理 session 实例）。 */
   disconnect() {
+    this.authBusyReconnect.cancel();
     this.client.socket().disconnect();
     this.setConnection("disconnected");
   }
   /** 清理当前身份下缓存的全部会话，避免切换登录身份后复用旧快照。 */
   disposeAll() {
+    this.authBusyReconnect.cancel();
     this.bootstrapPending.clear();
     for (const session of [...this.sessions.values()]) {
       this.forceRelease(session);
@@ -4251,6 +5975,7 @@ var SessionHub = class {
    * turn:* / chat:* 事件都会静默丢弃。
    */
   _handleSocketReplaced() {
+    this.authBusyReconnect.cancel();
     this.bound = false;
     this.setConnection("disconnected");
     if (this.sessions.size === 0) return;
@@ -4259,7 +5984,6 @@ var SessionHub = class {
   }
   runtimeFor() {
     return {
-      streamTokens: this.client.options?.streamTokens !== false,
       emitEvent: (event, data) => {
         ;
         this.client.socket().emit(event, data);
@@ -4275,7 +5999,9 @@ var SessionHub = class {
         });
       }),
       ensureConnected: () => this.ensureConnected(),
-      fetchTurns: (sessionId) => this.client.sessions.getSessionTurns(sessionId),
+      fetchTurnsPage: (sessionId, query, init) => this.client.sessions.getSessionTurnsPage(sessionId, query, init),
+      fetchTurnIndex: (sessionId) => this.client.sessions.getSessionTurnIndex(sessionId),
+      fetchCommands: (sessionId) => this.client.sessions.getSessionTurnCommands(sessionId),
       fetchSessionInfo: (sessionId) => this.client.sessions.getSession(sessionId),
       updateReplay: (sessionId, payload) => this.client.sessions.updateReplaySession(sessionId, payload).then((result) => result.replay_state ?? null),
       listDir: (sessionId, dirPath) => this.client.sessions.listDir(sessionId, dirPath),
@@ -4303,6 +6029,9 @@ var SessionHub = class {
     if (this.sessions.get(session.sessionId) === session) {
       this.sessions.delete(session.sessionId);
     }
+    if (this.sessions.size === 0) {
+      this.authBusyReconnect.cancel();
+    }
     ;
     this.client.socket().emit("session:unsubscribe", { session_id: session.sessionId });
     return true;
@@ -4311,10 +6040,13 @@ var SessionHub = class {
   forceRelease(session) {
     this.holdCounts.delete(session.sessionId);
     session.dispose();
+    if (this.sessions.size === 0) {
+      this.authBusyReconnect.cancel();
+    }
   }
   ensureConnected() {
     const socket = this.client.socket();
-    if (socket.connected || socket.active) return;
+    if (socket.connected || socket.active || this.authBusyReconnect.pending) return;
     this.setConnection("connecting");
     socket.connect();
   }
@@ -4346,17 +6078,35 @@ var SessionHub = class {
     this.bound = true;
     const socket = this.client.socket();
     socket.on("connect", () => {
+      this.authBusyReconnect.cancel();
       const isReconnect = this.hasConnected;
       this.hasConnected = true;
       this.setConnection("connected");
       if (isReconnect) {
         for (const session of this.sessions.values()) {
           void session._rejoinAfterReconnect();
+          void session.refreshQueue();
         }
       }
     });
-    socket.on("connect_error", () => this.setConnection("disconnected"));
-    socket.on("disconnect", () => this.setConnection("disconnected"));
+    socket.on("connect_error", (error) => {
+      this.setConnection("disconnected");
+      if (this.sessions.size === 0) {
+        this.authBusyReconnect.cancel();
+        return;
+      }
+      if (this.authBusyReconnect.schedule(error, () => {
+        const current = this.client.socket();
+        if (current !== socket || current.connected || current.active) return;
+        this.setConnection("connecting");
+        current.connect();
+      })) return;
+      this.authBusyReconnect.cancel();
+    });
+    socket.on("disconnect", () => {
+      this.authBusyReconnect.cancel();
+      this.setConnection("disconnected");
+    });
     socket.io.on("reconnect_attempt", () => this.setConnection("reconnecting"));
     socket.on("turn:start", (data) => {
       for (const session of this.route(data.session_id)) session._handleTurnStart(data);
@@ -4367,9 +6117,25 @@ var SessionHub = class {
     socket.on("turn:end", (data) => {
       for (const session of this.route(data.session_id)) session._handleTurnEnd(data);
     });
-    socket.on("turn:events", (data) => {
-      for (const session of this.route(data.session_id)) session._handleTurnEvents(data.events ?? []);
-    });
+    socket.on(
+      "turn:timing",
+      (data) => {
+        for (const session of this.route(data.session_id)) {
+          session._handleTurnEvents([
+            { type: "llm:first_token:delivered", payload: data }
+          ]);
+        }
+      }
+    );
+    socket.on(
+      "turn:events",
+      (data, acknowledge) => {
+        acknowledgeTurnEvents(acknowledge);
+        for (const session of this.route(data.session_id)) {
+          session._handleTurnEvents(data.events ?? [], data.replayed === true);
+        }
+      }
+    );
     socket.on("chat:start", (data) => {
       for (const session of this.route(data?.session_id)) session._handleChatStart();
     });
@@ -4381,6 +6147,9 @@ var SessionHub = class {
     socket.on("system:error", (data) => {
       for (const session of this.route(data.session_id)) session._handleSystemError(data.message);
     });
+    socket.on("chat:queue:updated", (data) => {
+      for (const session of this.route(data?.session_id)) session._handleQueueUpdated(data);
+    });
     socket.on(
       "system:notification",
       (data) => {
@@ -4497,21 +6266,14 @@ function resolveAuthToken(options) {
   return token ? token : null;
 }
 
-// src/version.ts
-var SDK_NAME = "agent-client";
-var SDK_VERSION = true ? "2610.0.0-beta.8" : "1.1.1";
-
 // src/socket.ts
-function withSdkIdentity(auth) {
-  return { ...auth ?? {}, sdk: SDK_NAME, sdk_version: SDK_VERSION };
-}
 function createSocket(options) {
   const token = resolveAuthToken(options);
   return io(options.baseUrl, {
     path: options.path ?? "/socket.io",
     withCredentials: true,
     query: token ? { token } : void 0,
-    auth: typeof options.token === "function" ? (cb) => cb(withSdkIdentity(buildSocketAuth(options))) : withSdkIdentity(buildSocketAuth(options)),
+    auth: typeof options.token === "function" ? (cb) => cb(buildSocketAuth(options) ?? {}) : buildSocketAuth(options) ?? {},
     autoConnect: false
   });
 }
@@ -4527,8 +6289,17 @@ var BladeClient = class {
   options;
   auth;
   headless;
+  computers;
   models;
   sessions;
+  /** 按用户读取的插件目录与图标；没有会话时也能用。 */
+  plugins;
+  chatGroups;
+  /**
+   * 全站访问统计：匿名读写，不带 bearer 也不触发登录刷新。
+   * 只有内置 Web 的同源页面使用，第三方宿主页面不会被自动统计。
+   */
+  siteVisits;
   /** 实时会话中枢：client.sessions.connect() 内部使用，一般不直接访问。 */
   hub;
   constructor(options) {
@@ -4538,8 +6309,12 @@ var BladeClient = class {
     };
     this.auth = new AuthResource(this);
     this.headless = new HeadlessResource(this);
+    this.computers = new ComputersResource(this);
     this.models = new ModelsResource(this);
     this.sessions = new SessionsResource(this);
+    this.plugins = new PluginsResource(this);
+    this.chatGroups = new ChatGroupsResource(this);
+    this.siteVisits = new SiteVisitsResource(this);
     this.hub = new SessionHub(this);
     if (this.options.token === void 0) {
       this.runtimeToken = readStoredToken(this.options.baseUrl);
@@ -4698,7 +6473,7 @@ var BladeClient = class {
       signal: init.signal
     });
     if (response.status === 401 && !isRetry && this.shouldRefreshFor401(url)) {
-      const refreshed = await this.tryRefresh();
+      const refreshed = await this.tryRefreshUnlessAborted(init.signal);
       if (refreshed) {
         return this.fetch(method, path, init, true);
       }
@@ -4710,7 +6485,7 @@ var BladeClient = class {
     return response;
   }
   buildAuthedUrl(path) {
-    const url = new URL(this.toBaseRelativePath(path), this.baseUrlWithTrailingSlash());
+    const url = buildBackendUrl(this.options.baseUrl, path);
     const token = this.resolveTokenForUrl(url);
     if (token) {
       url.searchParams.set("token", token);
@@ -4729,14 +6504,11 @@ var BladeClient = class {
     return result;
   }
   buildUrl(path) {
-    return new URL(this.toBaseRelativePath(path), this.baseUrlWithTrailingSlash());
+    return buildBackendUrl(this.options.baseUrl, path);
   }
   baseUrlWithTrailingSlash() {
     return this.options.baseUrl.endsWith("/") ? this.options.baseUrl : `${this.options.baseUrl}/`;
   }
-  toBaseRelativePath(path) {
-    return path.startsWith("/") ? path.slice(1) : path;
-  }
   isSameBackendUrl(url) {
     const base = new URL(this.baseUrlWithTrailingSlash());
     if (url.origin !== base.origin) {
@@ -4755,6 +6527,27 @@ var BladeClient = class {
   hasExplicitBearerToken() {
     return Boolean(this.resolveRestToken());
   }
+  /**
+   * 等一次令牌刷新，但调用方中止请求时不再等下去。
+   *
+   * 刷新本身是共享的（`refreshPromise`，别的请求也在等它），这里只是让这次已被取消的
+   * 请求尽早结束——否则它会一直挂在调用方（定位）的串行队列里，用户改选的新目标要等到
+   * 刷新结束才轮得到。
+   */
+  async tryRefreshUnlessAborted(signal) {
+    if (!signal) return this.tryRefresh();
+    if (signal.aborted) throw new DOMException("The operation was aborted.", "AbortError");
+    let onAbort;
+    const aborted = new Promise((_resolve, reject) => {
+      onAbort = () => reject(new DOMException("The operation was aborted.", "AbortError"));
+      signal.addEventListener("abort", onAbort, { once: true });
+    });
+    try {
+      return await Promise.race([this.tryRefresh(), aborted]);
+    } finally {
+      if (onAbort) signal.removeEventListener("abort", onAbort);
+    }
+  }
   async tryRefresh() {
     if (this.refreshPromise) {
       return this.refreshPromise;
@@ -4892,6 +6685,126 @@ function parseXhrHeaders(rawHeaders) {
   return headers;
 }
 
+// src/polling-backoff.ts
+var MAX_BACKOFF_MS = 6e4;
+var MAX_TIMER_MS = 2147483647;
+var PollingBackoff = class {
+  constructor(intervalMs) {
+    this.intervalMs = intervalMs;
+    if (!Number.isFinite(intervalMs) || intervalMs <= 0 || intervalMs > MAX_BACKOFF_MS) {
+      throw new RangeError("Polling interval must be between 0 and 60000 ms");
+    }
+  }
+  intervalMs;
+  failures = 0;
+  nextAt = 0;
+  reset() {
+    this.failures = 0;
+    this.nextAt = 0;
+  }
+  failed(error) {
+    if (error instanceof Error && error.name === "AbortError" || error instanceof BladeApiError && error.status < 500 && error.status !== 408 && error.status !== 429) {
+      this.nextAt = false;
+      return;
+    }
+    this.failures = Math.min(this.failures + 1, 10);
+    const ceiling = Math.min(MAX_BACKOFF_MS, this.intervalMs * 2 ** this.failures);
+    const backoff = Math.max(this.intervalMs, ceiling * (0.5 + Math.random() * 0.5));
+    const header = error instanceof BladeApiError ? error.response.headers.get("Retry-After")?.trim() : void 0;
+    const retryAfter = header ? /^\d+$/.test(header) ? Number(header) * 1e3 : Date.parse(header) - Date.now() : 0;
+    const delay = Math.max(backoff, Number.isNaN(retryAfter) ? 0 : retryAfter);
+    this.nextAt = delay > MAX_TIMER_MS ? false : Date.now() + delay;
+  }
+  /** Zero means ready, false means stop, otherwise wait at least this many ms. */
+  waitMs() {
+    return this.nextAt === false ? false : Math.max(0, this.nextAt - Date.now());
+  }
+};
+
+// src/platform-endpoints.ts
+var PLATFORM_SERVICE_NAMES = [
+  "os",
+  "hub",
+  "agent",
+  "oauth",
+  "llmGateway",
+  "gitea",
+  "tile"
+];
+var EMPTY_PLATFORM_ENDPOINTS = Object.freeze({
+  services: Object.freeze({})
+});
+function defaultDocumentBaseUrl() {
+  if (typeof document === "undefined") return void 0;
+  if (document.querySelector("base[href]")) return document.baseURI;
+  if (typeof location !== "undefined" && location.origin) return `${location.origin}/`;
+  return document.baseURI;
+}
+function normalizeServiceUrl(value) {
+  if (typeof value !== "string" || !value.trim()) return null;
+  if (value.includes("?") || value.includes("#")) return null;
+  try {
+    const url = new URL(value.trim());
+    if (url.protocol !== "http:" && url.protocol !== "https:") return null;
+    if (url.username || url.password || url.search || url.hash) return null;
+    return url.toString().replace(/\/$/, "");
+  } catch {
+    return null;
+  }
+}
+function parsePlatformEndpoints(value) {
+  if (!isRecord(value) || !isRecord(value.services)) return null;
+  const services = {};
+  for (const name of PLATFORM_SERVICE_NAMES) {
+    if (!(name in value.services)) continue;
+    const url = normalizeServiceUrl(value.services[name]);
+    if (!url) return null;
+    if (name === "agent" && new URL(url).pathname !== "/") return null;
+    services[name] = url;
+  }
+  return { services };
+}
+async function loadPlatformEndpoints(options = {}) {
+  const fetchImpl = options.fetchImpl ?? globalThis.fetch;
+  const baseUrl = options.baseUrl ?? defaultDocumentBaseUrl();
+  if (!fetchImpl || !baseUrl) return EMPTY_PLATFORM_ENDPOINTS;
+  const controller = new AbortController();
+  const timeout = globalThis.setTimeout(() => controller.abort(), options.timeoutMs ?? 3e3);
+  try {
+    const response = await fetchImpl(new URL("config.json", baseUrl), {
+      cache: "no-store",
+      credentials: "same-origin",
+      headers: { Accept: "application/json" },
+      signal: controller.signal
+    });
+    if (!response.ok) return EMPTY_PLATFORM_ENDPOINTS;
+    return parsePlatformEndpoints(await response.json()) ?? EMPTY_PLATFORM_ENDPOINTS;
+  } catch {
+    return EMPTY_PLATFORM_ENDPOINTS;
+  } finally {
+    globalThis.clearTimeout(timeout);
+  }
+}
+function resolveServiceUrl(endpoints, name, path = "") {
+  const baseUrl = endpoints.services[name];
+  if (!baseUrl) return null;
+  if (!path) return baseUrl;
+  const pathReference = path.trimStart();
+  if (path.includes("\\") || pathReference.startsWith("//") || /^[a-z][a-z0-9+.-]*:/i.test(pathReference)) {
+    return null;
+  }
+  const base = new URL(`${baseUrl}/`);
+  const target = new URL(path.replace(/^\/+/, ""), base);
+  if (target.origin !== base.origin || !target.pathname.startsWith(base.pathname)) {
+    return null;
+  }
+  return target.toString();
+}
+
+// src/version.ts
+var SDK_NAME = "agent-client";
+var SDK_VERSION = true ? "2610.0.0-beta.80" : "1.1.1";
+
 // src/commands/protocol.ts
 function isCommandEnvelope(value) {
   if (typeof value !== "object" || value === null) return false;
@@ -4992,12 +6905,19 @@ var Task = type2({
 });
 export {
   AgentSession,
+  AuthBusyReconnect,
   BladeApiError,
   BladeClient,
+  ChatGroupsResource,
   ClientProjectionBuilder,
+  ComputersResource,
   DEFAULT_REPLAY_SPEED,
+  EMPTY_PLATFORM_ENDPOINTS,
+  EMPTY_SESSION_QUEUE,
   LayoutType,
   ModelsResource,
+  PluginsResource,
+  PollingBackoff,
   SDK_NAME,
   SDK_VERSION,
   SessionHub,
@@ -5007,22 +6927,59 @@ export {
   Task,
   TaskStatus,
   acceptedPostChatFollowupCompletesLatestRun,
+  acknowledgeTurnEvents,
+  authBusyRetryDelayMs,
   buildMessageContent,
+  buildToolUiCardKey,
+  canCancelQueuedMessage,
+  canDeliverQueuedMessage,
+  canEditQueuedMessage,
+  canToggleComputer,
+  chatErrorForDisplay,
+  collectInlineToolUiCards,
+  collectPreviewToolUiCards,
+  computerDaemonVersion,
+  computerOS,
+  computerPlatformLabel,
+  computerState,
   connectEmbedded,
   contentPreview,
+  contextProjectionData,
   createInitialSessionState,
   createSocket,
   extractTextAttachments,
+  getContextDisplayState,
+  getContextGroupDisplayState,
   getFileParts,
   getImageParts,
   getTextContent,
+  groupAdjacentContextRuns,
   groupMessagesByLoop,
+  hasChatRunEvent,
+  inferToolStatus,
+  isAppDevToolUiCard,
   isCommandEnvelope,
+  isEntryGoneError,
   isHiddenInternalMessage,
   isInboundEnvelope,
+  isInternalStatusToolUiCard,
+  isMcpAppData,
+  isSessionQueueSnapshot,
+  isToolUiCard,
   latestPostChatFollowup,
+  loadPlatformEndpoints,
   normalizeMessageContent,
+  parseQueueAck,
+  prependOlder,
+  queuePauseReasonLabel,
+  queuedMessageStatusLabel,
+  reconcileHistoricalUserTurns,
   reconcileOptimisticUserTurns,
+  replaceWindow,
+  resolveServiceUrl,
+  resolveToolUiCardContent,
+  shouldApplySnapshot,
+  sortComputers,
   toReplaySnapshot,
   transformSlashCommand
 };