@ia-ccun/code-agent-cli 0.0.52 → 0.0.53-beta.2

package/config/agent/extensions/aicode-btw.ts

@@ -5,12 +5,18 @@ import {
   SessionManager,
   type AgentSession,
   type AgentSessionEvent,
+  type CreateAgentSessionOptions,
   type ExtensionAPI,
   type ExtensionCommandContext,
   type ExtensionContext,
   type ResourceLoader,
 } from "@earendil-works/pi-coding-agent";
-import { type AssistantMessage, type Message, type ThinkingLevel as AiThinkingLevel, type UserMessage } from "@earendil-works/pi-ai";
+import {
+  type AssistantMessage,
+  type Message,
+  type ThinkingLevel as AiThinkingLevel,
+  type UserMessage,
+} from "@earendil-works/pi-ai";
 import {
   Box,
   Container,
@@ -28,7 +34,6 @@ import {
 } from "@earendil-works/pi-tui";
 
 // ============== 常量 ==============
-const STATUS_KEY = "aicode-btw";
 const BTW_MESSAGE_TYPE = "aicode-btw-message";
 const BTW_ENTRY_TYPE = "aicode-btw-entry";
 const BTW_RESET_TYPE = "aicode-btw-reset";
@@ -40,6 +45,26 @@ function matchesBtwFocusShortcut(data: string): boolean {
   return BTW_FOCUS_SHORTCUTS.some((shortcut) => matchesKey(data, shortcut));
 }
 
+/**
+ * 类型守卫：检查 entry 是否是有效的 Message 对象
+ * ✅ 用于安全转换，避免使用危险的 as unknown as
+ */
+function isMessageLike(entry: unknown): entry is Partial<Message> & {
+  role?: string;
+  customType?: string;
+  content?: unknown;
+} {
+  if (!entry || typeof entry !== "object") {
+    return false;
+  }
+  const candidate = entry as {
+    role?: unknown;
+    customType?: string;
+    content?: unknown;
+  };
+  return typeof candidate.role === "string" && Array.isArray(candidate.content);
+}
+
 const BTW_SYSTEM_PROMPT = [
   "You are having an aside conversation with the user, separate from their main working session.",
   "If main session messages are provided, they are for context only — that work is being handled by another agent.",
@@ -51,8 +76,10 @@ const BTW_SYSTEM_PROMPT = [
 const BTW_SUMMARIZE_SYSTEM_PROMPT =
   "Summarize the side conversation concisely. Preserve key decisions, plans, insights, risks, and action items. Output only the summary.";
 
-const BTW_CONTINUE_THREAD_USER_TEXT = "[The following is a separate side conversation. Continue this thread.]";
-const BTW_CONTINUE_THREAD_ASSISTANT_TEXT = "Understood, continuing our side conversation.";
+const BTW_CONTINUE_THREAD_USER_TEXT =
+  "[The following is a separate side conversation. Continue this thread.]";
+const BTW_CONTINUE_THREAD_ASSISTANT_TEXT =
+  "Understood, continuing our side conversation.";
 
 type SessionThinkingLevel = "off" | AiThinkingLevel;
 type BtwThreadMode = "contextual" | "tangent";
@@ -88,7 +115,10 @@ type BtwResetDetails = {
 };
 
 type BtwModelOverrideDetails =
-  | ({ timestamp: number; action: "set" } & Pick<SessionModel, "provider" | "id" | "api">)
+  | ({ timestamp: number; action: "set" } & Pick<
+      SessionModel,
+      "provider" | "id" | "api"
+    >)
   | { timestamp: number; action: "clear" };
 
 type BtwThinkingOverrideDetails =
@@ -112,11 +142,35 @@ type ResolvedBtwSettings = {
 };
 
 type BtwTranscriptEntry =
-  | { id: number; turnId: number; type: "turn-boundary"; phase: "start" | "end" }
+  | {
+      id: number;
+      turnId: number;
+      type: "turn-boundary";
+      phase: "start" | "end";
+    }
   | { id: number; turnId: number; type: "user-message"; text: string }
-  | { id: number; turnId: number; type: "thinking"; text: string; streaming: boolean }
-  | { id: number; turnId: number; type: "assistant-text"; text: string; streaming: boolean }
-  | { id: number; turnId: number; type: "tool-call"; toolCallId: string; toolName: string; args: string }
+  | {
+      id: number;
+      turnId: number;
+      type: "thinking";
+      text: string;
+      streaming: boolean;
+    }
+  | {
+      id: number;
+      turnId: number;
+      type: "assistant-text";
+      text: string;
+      streaming: boolean;
+    }
+  | {
+      id: number;
+      turnId: number;
+      type: "tool-call";
+      toolCallId: string;
+      toolName: string;
+      args: string;
+    }
   | {
       id: number;
       turnId: number;
@@ -137,7 +191,10 @@ type BtwTranscriptState = {
   nextTurnId: number;
   currentTurnId: number | null;
   lastTurnId: number | null;
-  toolCalls: Map<string, { turnId: number; callEntryId: number; resultEntryId?: number }>;
+  toolCalls: Map<
+    string,
+    { turnId: number; callEntryId: number; resultEntryId?: number }
+  >;
 };
 
 type BtwSessionRuntime = {
@@ -156,17 +213,31 @@ type OverlayRuntime = {
   closed?: boolean;
 };
 
-function isVisibleBtwMessage(message: { role: string; customType?: string }): boolean {
+function isVisibleBtwMessage(message: {
+  role: string;
+  customType?: string;
+}): boolean {
   return message.role === "custom" && message.customType === BTW_MESSAGE_TYPE;
 }
 
-function isCustomEntry(entry: unknown, customType: string): entry is { type: "custom"; customType: string; data?: unknown } {
-  return !!entry && typeof entry === "object" && (entry as { type?: string }).type === "custom" && (entry as { customType?: string }).customType === customType;
+function isCustomEntry(
+  entry: unknown,
+  customType: string,
+): entry is { type: "custom"; customType: string; data?: unknown } {
+  return (
+    !!entry &&
+    typeof entry === "object" &&
+    (entry as { type?: string }).type === "custom" &&
+    (entry as { customType?: string }).customType === customType
+  );
 }
 
 function stripDynamicSystemPromptFooter(systemPrompt: string): string {
   return systemPrompt
-    .replace(/\nCurrent date and time:[^\n]*(?:\nCurrent working directory:[^\n]*)?$/u, "")
+    .replace(
+      /\nCurrent date and time:[^\n]*(?:\nCurrent working directory:[^\n]*)?$/u,
+      "",
+    )
     .replace(/\nCurrent working directory:[^\n]*$/u, "")
     .trim();
 }
@@ -175,7 +246,11 @@ function createBtwResourceLoader(
   ctx: ExtensionCommandContext,
   appendSystemPrompt: string[] = [BTW_SYSTEM_PROMPT],
 ): ResourceLoader {
-  const extensionsResult = { extensions: [], errors: [], runtime: createExtensionRuntime() };
+  const extensionsResult = {
+    extensions: [],
+    errors: [],
+    runtime: createExtensionRuntime(),
+  };
   const systemPrompt = stripDynamicSystemPromptFooter(ctx.getSystemPrompt());
 
   return {
@@ -185,13 +260,18 @@ function createBtwResourceLoader(
     getThemes: () => ({ themes: [], diagnostics: [] }),
     getAgentsFiles: () => ({ agentsFiles: [] }),
     getSystemPrompt: () => systemPrompt,
+    getSystemPromptSource: () => undefined,
     getAppendSystemPrompt: () => appendSystemPrompt,
+    getAppendSystemPromptSources: () => [],
     extendResources: () => {},
     reload: async () => {},
   };
 }
 
-function extractText(parts: AssistantMessage["content"], type: "text" | "thinking"): string {
+function extractText(
+  parts: AssistantMessage["content"],
+  type: "text" | "thinking",
+): string {
   const chunks: string[] = [];
 
   for (const part of parts) {
@@ -219,7 +299,9 @@ function parseBtwArgs(args: string): ParsedBtwArgs {
   return { question, save };
 }
 
-function parseBtwModelArgs(args: string):
+function parseBtwModelArgs(
+  args: string,
+):
   | { action: "show" }
   | { action: "clear" }
   | { action: "set"; model: BtwModelRef }
@@ -235,14 +317,19 @@ function parseBtwModelArgs(args: string):
 
   const parts = trimmed.split(/\s+/);
   if (parts.length !== 3) {
-    return { action: "invalid", message: "Usage: /btw:model <provider> <model> <api> | clear" };
+    return {
+      action: "invalid",
+      message: "Usage: /btw:model <provider> <model> <api> | clear",
+    };
   }
 
   const [provider, id, api] = parts;
   return { action: "set", model: { provider, id, api } as BtwModelRef };
 }
 
-function parseBtwThinkingArgs(args: string):
+function parseBtwThinkingArgs(
+  args: string,
+):
   | { action: "show" }
   | { action: "clear" }
   | { action: "set"; thinkingLevel: SessionThinkingLevel } {
@@ -258,7 +345,9 @@ function parseBtwThinkingArgs(args: string):
   return { action: "set", thinkingLevel: trimmed as SessionThinkingLevel };
 }
 
-function formatModelRef(model: Pick<SessionModel, "provider" | "id" | "api">): string {
+function formatModelRef(
+  model: Pick<SessionModel, "provider" | "id" | "api">,
+): string {
   return `${model.provider}/${model.id} (${model.api})`;
 }
 
@@ -273,23 +362,33 @@ function buildBtwSeedState(
   if (mode === "contextual") {
     try {
       messages.push(
-        ...(buildSessionContext(ctx.sessionManager.getEntries(), ctx.sessionManager.getLeafId()).messages as Message[]).filter(
-          (message) => !isVisibleBtwMessage(message),
-        ),
+        ...(
+          buildSessionContext(
+            ctx.sessionManager.getEntries(),
+            ctx.sessionManager.getLeafId(),
+          ).messages as Message[]
+        ).filter((message) => !isVisibleBtwMessage(message)),
       );
-    } catch {
+    } catch (error) {
+      // ✅ 改进错误处理：记录错误而不忽略
+      console.warn("[btw] buildSessionContext failed, using fallback:", error);
       messages.push(
         ...ctx.sessionManager.getEntries().flatMap((entry) => {
-          if (!entry || typeof entry !== "object") {
+          // ✅ 使用类型守卫进行安全转换，避免 as unknown as
+          if (!isMessageLike(entry)) {
             return [];
           }
 
-          const message = entry as unknown as Partial<Message> & { role?: string; customType?: string; content?: unknown };
-          if (typeof message.role !== "string" || !Array.isArray(message.content)) {
-            return [];
+          const message = entry; // ✅ 类型安全
+          if (
+            !isVisibleBtwMessage({
+              role: message.role ?? "",
+              customType: message.customType,
+            })
+          ) {
+            return [message as Message];
           }
-
-          return isVisibleBtwMessage({ role: message.role, customType: message.customType }) ? [] : [message as Message];
+          return [];
         }),
       );
     }
@@ -335,16 +434,25 @@ function buildBtwSeedState(
           content: [{ type: "text", text: entry.answer }],
           provider: entry.provider,
           model: entry.model,
-          api: entry.api || sessionModel?.api || ctx.model?.api || "openai-responses",
-          usage:
-            entry.usage ?? {
+          api:
+            entry.api ||
+            sessionModel?.api ||
+            ctx.model?.api ||
+            "openai-responses",
+          usage: entry.usage ?? {
+            input: 0,
+            output: 0,
+            cacheRead: 0,
+            cacheWrite: 0,
+            totalTokens: 0,
+            cost: {
               input: 0,
               output: 0,
               cacheRead: 0,
               cacheWrite: 0,
-              totalTokens: 0,
-              cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
+              total: 0,
             },
+          },
           stopReason: "stop",
           timestamp: entry.timestamp,
         },
@@ -380,7 +488,9 @@ function formatToolPreview(value: unknown): string {
       return "";
     }
     return preview.length > 120 ? `${preview.slice(0, 117)}...` : preview;
-  } catch {
+  } catch (error) {
+    // ✅ 改进错误处理：记录错误而不忽略
+    console.warn("[btw] JSON.stringify failed in formatToolPreview:", error);
     return "";
   }
 }
@@ -396,6 +506,26 @@ function createEmptyTranscriptState(): BtwTranscriptState {
   };
 }
 
+/**
+ * clearTranscriptState - 清理 transcriptState 的所有资源
+ * ✅ 清理 entries 数组
+ * ✅ 清理 toolCalls Map（防止内存泄漏）
+ * ✅ 重置所有状态
+ */
+function clearTranscriptState(state: BtwTranscriptState): void {
+  // ✅ 清理 toolCalls Map（防止内存泄漏）
+  state.toolCalls.clear();
+
+  // 清理 entries 数组
+  state.entries = [];
+
+  // 重置状态
+  state.nextEntryId = 1;
+  state.nextTurnId = 1;
+  state.currentTurnId = null;
+  state.lastTurnId = null;
+}
+
 function appendTranscriptEntry<T extends BtwTranscriptEntry>(
   state: BtwTranscriptState,
   entry: Omit<T, "id">,
@@ -413,21 +543,35 @@ function ensureTranscriptTurn(state: BtwTranscriptState): number {
   const turnId = state.nextTurnId++;
   state.currentTurnId = turnId;
   state.lastTurnId = turnId;
-  appendTranscriptEntry(state, { type: "turn-boundary", turnId, phase: "start" } as Omit<Extract<BtwTranscriptEntry, { type: "turn-boundary" }>, "id">);
+  appendTranscriptEntry(state, {
+    type: "turn-boundary",
+    turnId,
+    phase: "start",
+  } as Omit<Extract<BtwTranscriptEntry, { type: "turn-boundary" }>, "id">);
   return turnId;
 }
 
-function finishTranscriptTurn(state: BtwTranscriptState, turnId?: number | null): void {
+function finishTranscriptTurn(
+  state: BtwTranscriptState,
+  turnId?: number | null,
+): void {
   const resolvedTurnId = turnId ?? state.currentTurnId;
   if (resolvedTurnId === null || resolvedTurnId === undefined) {
     return;
   }
 
   const hasEndBoundary = state.entries.some(
-    (entry) => entry.turnId === resolvedTurnId && entry.type === "turn-boundary" && entry.phase === "end",
+    (entry) =>
+      entry.turnId === resolvedTurnId &&
+      entry.type === "turn-boundary" &&
+      entry.phase === "end",
   );
   if (!hasEndBoundary) {
-    appendTranscriptEntry(state, { type: "turn-boundary", turnId: resolvedTurnId, phase: "end" } as Omit<Extract<BtwTranscriptEntry, { type: "turn-boundary" }>, "id">);
+    appendTranscriptEntry(state, {
+      type: "turn-boundary",
+      turnId: resolvedTurnId,
+      phase: "end",
+    } as Omit<Extract<BtwTranscriptEntry, { type: "turn-boundary" }>, "id">);
   }
 
   for (const entry of state.entries) {
@@ -435,7 +579,11 @@ function finishTranscriptTurn(state: BtwTranscriptState, turnId?: number | null)
       continue;
     }
 
-    if (entry.type === "thinking" || entry.type === "assistant-text" || entry.type === "tool-result") {
+    if (
+      entry.type === "thinking" ||
+      entry.type === "assistant-text" ||
+      entry.type === "tool-result"
+    ) {
       entry.streaming = false;
     }
   }
@@ -444,9 +592,19 @@ function finishTranscriptTurn(state: BtwTranscriptState, turnId?: number | null)
   if (state.currentTurnId === resolvedTurnId) {
     state.currentTurnId = null;
   }
+
+  // ✅ 清理当前 turn 的 toolCalls（防止内存泄漏）
+  for (const [toolCallId, toolCall] of state.toolCalls.entries()) {
+    if (toolCall.turnId === resolvedTurnId) {
+      state.toolCalls.delete(toolCallId);
+    }
+  }
 }
 
-function removeTranscriptTurn(state: BtwTranscriptState, turnId: number | null): void {
+function removeTranscriptTurn(
+  state: BtwTranscriptState,
+  turnId: number | null,
+): void {
   if (turnId === null) {
     return;
   }
@@ -483,7 +641,11 @@ function findLatestTranscriptEntry<TType extends BtwTranscriptEntry["type"]>(
 
 function ensureTranscriptTurnForUserMessage(state: BtwTranscriptState): number {
   if (state.currentTurnId !== null) {
-    const currentAssistant = findLatestTranscriptEntry(state, state.currentTurnId, "assistant-text");
+    const currentAssistant = findLatestTranscriptEntry(
+      state,
+      state.currentTurnId,
+      "assistant-text",
+    );
     if (currentAssistant && !currentAssistant.streaming) {
       finishTranscriptTurn(state, state.currentTurnId);
     }
@@ -492,7 +654,9 @@ function ensureTranscriptTurnForUserMessage(state: BtwTranscriptState): number {
   return ensureTranscriptTurn(state);
 }
 
-function extractMessageText(message: { content?: string | AssistantMessage["content"] | UserMessage["content"] }): string {
+function extractMessageText(message: {
+  content?: string | AssistantMessage["content"] | UserMessage["content"];
+}): string {
   if (typeof message.content === "string") {
     return message.content;
   }
@@ -500,13 +664,20 @@ function extractMessageText(message: { content?: string | AssistantMessage["cont
     return "";
   }
   return message.content
-    .filter((part): part is { type: "text"; text: string } => part.type === "text" && typeof part.text === "string")
+    .filter(
+      (part): part is { type: "text"; text: string } =>
+        part.type === "text" && typeof part.text === "string",
+    )
     .map((part) => part.text)
     .join("\n")
     .trim();
 }
 
-function upsertUserMessageEntry(state: BtwTranscriptState, turnId: number, text: string): void {
+function upsertUserMessageEntry(
+  state: BtwTranscriptState,
+  turnId: number,
+  text: string,
+): void {
   if (!text) {
     return;
   }
@@ -517,7 +688,10 @@ function upsertUserMessageEntry(state: BtwTranscriptState, turnId: number, text:
     return;
   }
 
-  appendTranscriptEntry(state, { type: "user-message", turnId, text } as Omit<Extract<BtwTranscriptEntry, { type: "user-message" }>, "id">);
+  appendTranscriptEntry(state, { type: "user-message", turnId, text } as Omit<
+    Extract<BtwTranscriptEntry, { type: "user-message" }>,
+    "id"
+  >);
 }
 
 function upsertTranscriptTextEntry(
@@ -538,10 +712,16 @@ function upsertTranscriptTextEntry(
     return;
   }
 
-  appendTranscriptEntry(state, { type, turnId, text, streaming } as Omit<Extract<BtwTranscriptEntry, { type: "thinking" | "assistant-text" }>, "id">);
+  appendTranscriptEntry(state, { type, turnId, text, streaming } as Omit<
+    Extract<BtwTranscriptEntry, { type: "thinking" | "assistant-text" }>,
+    "id"
+  >);
 }
 
-function summarizeToolResult(value: unknown, maxLength = 400): { content: string; truncated: boolean } {
+function summarizeToolResult(
+  value: unknown,
+  maxLength = 400,
+): { content: string; truncated: boolean } {
   let content = "";
 
   if (value && typeof value === "object") {
@@ -574,7 +754,12 @@ function summarizeToolResult(value: unknown, maxLength = 400): { content: string
     } else if (value !== undefined) {
       try {
         content = JSON.stringify(value, null, 2);
-      } catch {
+      } catch (error) {
+        // ✅ 改进错误处理：记录错误而不忽略
+        console.warn(
+          "[btw] JSON.stringify failed in summarizeToolResult:",
+          error,
+        );
         content = String(value);
       }
     }
@@ -628,7 +813,10 @@ function upsertToolResultEntry(
   const toolCall = ensureToolCallEntry(state, turnId, toolCallId, toolName, "");
   const existing =
     toolCall.resultEntryId !== undefined
-      ? state.entries.find((entry) => entry.id === toolCall.resultEntryId && entry.type === "tool-result")
+      ? state.entries.find(
+          (entry) =>
+            entry.id === toolCall.resultEntryId && entry.type === "tool-result",
+        )
       : undefined;
 
   if (existing && existing.type === "tool-result") {
@@ -667,11 +855,20 @@ function applyAssistantMessageToTranscript(
   }
 
   if (answer) {
-    upsertTranscriptTextEntry(state, turnId, "assistant-text", answer, streaming);
+    upsertTranscriptTextEntry(
+      state,
+      turnId,
+      "assistant-text",
+      answer,
+      streaming,
+    );
   }
 }
 
-function applyTranscriptEvent(state: BtwTranscriptState, event: AgentSessionEvent): void {
+function applyTranscriptEvent(
+  state: BtwTranscriptState,
+  event: AgentSessionEvent,
+): void {
   switch (event.type) {
     case "turn_start": {
       ensureTranscriptTurn(state);
@@ -680,7 +877,11 @@ function applyTranscriptEvent(state: BtwTranscriptState, event: AgentSessionEven
     case "message_start": {
       if (event.message.role === "user") {
         const turnId = ensureTranscriptTurnForUserMessage(state);
-        upsertUserMessageEntry(state, turnId, extractMessageText(event.message));
+        upsertUserMessageEntry(
+          state,
+          turnId,
+          extractMessageText(event.message),
+        );
         return;
       }
 
@@ -702,7 +903,11 @@ function applyTranscriptEvent(state: BtwTranscriptState, event: AgentSessionEven
     case "message_end": {
       if (event.message.role === "user") {
         const turnId = ensureTranscriptTurnForUserMessage(state);
-        upsertUserMessageEntry(state, turnId, extractMessageText(event.message));
+        upsertUserMessageEntry(
+          state,
+          turnId,
+          extractMessageText(event.message),
+        );
         return;
       }
 
@@ -714,11 +919,19 @@ function applyTranscriptEvent(state: BtwTranscriptState, event: AgentSessionEven
     }
     case "tool_execution_start": {
       const turnId = ensureTranscriptTurn(state);
-      ensureToolCallEntry(state, turnId, event.toolCallId, event.toolName, formatToolPreview(event.args));
+      ensureToolCallEntry(
+        state,
+        turnId,
+        event.toolCallId,
+        event.toolName,
+        formatToolPreview(event.args),
+      );
       return;
     }
     case "tool_execution_update": {
-      const turnId = state.toolCalls.get(event.toolCallId)?.turnId ?? ensureTranscriptTurn(state);
+      const turnId =
+        state.toolCalls.get(event.toolCallId)?.turnId ??
+        ensureTranscriptTurn(state);
       const result = summarizeToolResult(event.partialResult);
       upsertToolResultEntry(
         state,
@@ -733,7 +946,9 @@ function applyTranscriptEvent(state: BtwTranscriptState, event: AgentSessionEven
       return;
     }
     case "tool_execution_end": {
-      const turnId = state.toolCalls.get(event.toolCallId)?.turnId ?? ensureTranscriptTurn(state);
+      const turnId =
+        state.toolCalls.get(event.toolCallId)?.turnId ??
+        ensureTranscriptTurn(state);
       const result = summarizeToolResult(event.result);
       upsertToolResultEntry(
         state,
@@ -756,45 +971,100 @@ function applyTranscriptEvent(state: BtwTranscriptState, event: AgentSessionEven
   }
 }
 
-function appendPersistedTranscriptTurn(state: BtwTranscriptState, details: BtwDetails): void {
+function appendPersistedTranscriptTurn(
+  state: BtwTranscriptState,
+  details: BtwDetails,
+): void {
   const turnId = ensureTranscriptTurn(state);
   upsertUserMessageEntry(state, turnId, details.question);
   if (details.thinking) {
-    upsertTranscriptTextEntry(state, turnId, "thinking", details.thinking, false);
+    upsertTranscriptTextEntry(
+      state,
+      turnId,
+      "thinking",
+      details.thinking,
+      false,
+    );
   }
-  upsertTranscriptTextEntry(state, turnId, "assistant-text", details.answer, false);
+  upsertTranscriptTextEntry(
+    state,
+    turnId,
+    "assistant-text",
+    details.answer,
+    false,
+  );
   finishTranscriptTurn(state, turnId);
 }
 
-function setTranscriptFailure(state: BtwTranscriptState, message: string): void {
-  const turnId = state.currentTurnId ?? state.lastTurnId ?? ensureTranscriptTurn(state);
-  upsertTranscriptTextEntry(state, turnId, "assistant-text", `❌ ${message}`, false);
+function setTranscriptFailure(
+  state: BtwTranscriptState,
+  message: string,
+): void {
+  const turnId =
+    state.currentTurnId ?? state.lastTurnId ?? ensureTranscriptTurn(state);
+  upsertTranscriptTextEntry(
+    state,
+    turnId,
+    "assistant-text",
+    `❌ ${message}`,
+    false,
+  );
   finishTranscriptTurn(state, turnId);
 }
 
 function hasStreamingTranscriptEntry(entries: BtwTranscript): boolean {
   return entries.some(
     (entry) =>
-      (entry.type === "thinking" || entry.type === "assistant-text" || entry.type === "tool-result") &&
+      (entry.type === "thinking" ||
+        entry.type === "assistant-text" ||
+        entry.type === "tool-result") &&
       entry.streaming,
   );
 }
 
 function getCompletedExchangeCount(entries: BtwTranscript): number {
-  return entries.filter((entry) => entry.type === "assistant-text" && !entry.streaming).length;
+  return entries.filter(
+    (entry) => entry.type === "assistant-text" && !entry.streaming,
+  ).length;
 }
 
-function buildOverlayTranscript(entries: BtwTranscript, theme: ExtensionContext["ui"]["theme"]): string[] {
+function buildOverlayTranscript(
+  entries: BtwTranscript,
+  theme: ExtensionContext["ui"]["theme"],
+): string[] {
   if (entries.length === 0) {
     return [theme.fg("dim", "暂无 BTW 对话。输入侧边问题开始。")];
   }
 
   const lines: string[] = [];
-  const userBadge = buildTranscriptBadge(theme, "You", "userMessageBg", "accent");
-  const thinkingBadge = buildTranscriptBadge(theme, "Thinking", "toolPendingBg", "warning");
-  const toolBadge = buildTranscriptBadge(theme, "Tool", "toolPendingBg", "warning");
-  const assistantBadge = buildTranscriptBadge(theme, "Assistant", "customMessageBg", "success");
-  const separator = theme.fg("borderMuted", "────────────────────────────────────────");
+  const userBadge = buildTranscriptBadge(
+    theme,
+    "You",
+    "userMessageBg",
+    "accent",
+  );
+  const thinkingBadge = buildTranscriptBadge(
+    theme,
+    "Thinking",
+    "toolPendingBg",
+    "warning",
+  );
+  const toolBadge = buildTranscriptBadge(
+    theme,
+    "Tool",
+    "toolPendingBg",
+    "warning",
+  );
+  const assistantBadge = buildTranscriptBadge(
+    theme,
+    "Assistant",
+    "customMessageBg",
+    "success",
+  );
+  const separator = theme.fg(
+    "borderMuted",
+    "────────────────────────────────────────",
+  );
   const blockIndent = "    ";
   const resultIndent = blockIndent;
 
@@ -825,7 +1095,11 @@ function buildOverlayTranscript(entries: BtwTranscript, theme: ExtensionContext[
   const pushStackedBlock = (
     header: string,
     text: string,
-    options: { blankBefore?: boolean; indent?: string; style?: (value: string) => string } = {},
+    options: {
+      blankBefore?: boolean;
+      indent?: string;
+      style?: (value: string) => string;
+    } = {},
   ) => {
     const bodyLines = text.split("\n");
     const indent = options.indent ?? blockIndent;
@@ -855,7 +1129,9 @@ function buildOverlayTranscript(entries: BtwTranscript, theme: ExtensionContext[
     }
 
     if (entry.type === "thinking") {
-      const thinkingHeader = entry.streaming ? `${thinkingBadge} ${theme.fg("warning", "▍")}` : thinkingBadge;
+      const thinkingHeader = entry.streaming
+        ? `${thinkingBadge} ${theme.fg("warning", "▍")}`
+        : thinkingBadge;
       pushStackedBlock(thinkingHeader, entry.text, {
         style: (line) => theme.fg("warning", theme.italic(line)),
       });
@@ -875,17 +1151,26 @@ function buildOverlayTranscript(entries: BtwTranscript, theme: ExtensionContext[
         : entry.streaming
           ? theme.fg("warning", "↳ 流式输出中")
           : theme.fg("dim", "↳ result");
-      const truncationLabel = entry.truncated ? theme.fg("dim", " (truncated)") : "";
-      pushStackedBlock(`${resultHeaderLabel}${truncationLabel}`, entry.content, {
-        blankBefore: false,
-        indent: resultIndent,
-        style: (line) => (entry.isError ? theme.fg("error", line) : theme.fg("dim", line)),
-      });
+      const truncationLabel = entry.truncated
+        ? theme.fg("dim", " (truncated)")
+        : "";
+      pushStackedBlock(
+        `${resultHeaderLabel}${truncationLabel}`,
+        entry.content,
+        {
+          blankBefore: false,
+          indent: resultIndent,
+          style: (line) =>
+            entry.isError ? theme.fg("error", line) : theme.fg("dim", line),
+        },
+      );
       continue;
     }
 
     if (entry.type === "assistant-text") {
-      const assistantHeader = entry.streaming ? `${assistantBadge} ${theme.fg("warning", "▍")}` : assistantBadge;
+      const assistantHeader = entry.streaming
+        ? `${assistantBadge} ${theme.fg("warning", "▍")}`
+        : assistantBadge;
       pushStackedBlock(assistantHeader, entry.text);
     }
   }
@@ -893,7 +1178,9 @@ function buildOverlayTranscript(entries: BtwTranscript, theme: ExtensionContext[
   return lines;
 }
 
-function getLastAssistantMessage(session: AgentSession): AssistantMessage | null {
+function getLastAssistantMessage(
+  session: AgentSession,
+): AssistantMessage | null {
   for (let i = session.state.messages.length - 1; i >= 0; i--) {
     const message = session.state.messages[i];
     if (message.role === "assistant") {
@@ -914,10 +1201,18 @@ function buildBtwMessageContent(question: string, answer: string): string {
 }
 
 function formatThread(thread: BtwHandoffExchange[]): string {
-  return thread.map((entry) => `User: ${entry.user.trim()}\nAssistant: ${entry.assistant.trim()}`).join("\n\n---\n\n");
+  return thread
+    .map(
+      (entry) =>
+        `User: ${entry.user.trim()}\nAssistant: ${entry.assistant.trim()}`,
+    )
+    .join("\n\n---\n\n");
 }
 
-function isThreadContinuationMarker(messages: Message[], index: number): boolean {
+function isThreadContinuationMarker(
+  messages: Message[],
+  index: number,
+): boolean {
   const userMessage = messages[index];
   const assistantMessage = messages[index + 1];
   return (
@@ -928,9 +1223,18 @@ function isThreadContinuationMarker(messages: Message[], index: number): boolean
   );
 }
 
-function extractBtwHandoffThread(sessionRuntime: BtwSessionRuntime): BtwHandoffExchange[] {
-  const handoffMessages = sessionRuntime.session.state.messages.slice(sessionRuntime.sideThreadStartIndex);
-  const threadMessages = isThreadContinuationMarker(handoffMessages as Message[], 0) ? handoffMessages.slice(2) : handoffMessages;
+function extractBtwHandoffThread(
+  sessionRuntime: BtwSessionRuntime,
+): BtwHandoffExchange[] {
+  const handoffMessages = sessionRuntime.session.state.messages.slice(
+    sessionRuntime.sideThreadStartIndex,
+  );
+  const threadMessages = isThreadContinuationMarker(
+    handoffMessages as Message[],
+    0,
+  )
+    ? handoffMessages.slice(2)
+    : handoffMessages;
   const exchanges: BtwHandoffExchange[] = [];
   let currentUser = "";
   let currentAssistant = "";
@@ -964,7 +1268,9 @@ function extractBtwHandoffThread(sessionRuntime: BtwSessionRuntime): BtwHandoffE
       continue;
     }
 
-    currentAssistant = currentAssistant ? `${currentAssistant}\n\n${text}` : text;
+    currentAssistant = currentAssistant
+      ? `${currentAssistant}\n\n${text}`
+      : text;
   }
 
   pushCurrent();
@@ -997,7 +1303,11 @@ function saveVisibleBtwNote(
   return "saved";
 }
 
-function notify(ctx: ExtensionContext | ExtensionCommandContext, message: string, level: "info" | "warning" | "error"): void {
+function notify(
+  ctx: ExtensionContext | ExtensionCommandContext,
+  message: string,
+  level: "info" | "warning" | "error",
+): void {
   if (ctx.hasUI) {
     ctx.ui.notify(message, level);
   }
@@ -1123,7 +1433,10 @@ class BtwOverlayComponent extends Container implements Focusable {
   private borderLine(innerWidth: number, edge: "top" | "bottom"): string {
     const left = edge === "top" ? "┌" : "└";
     const right = edge === "top" ? "┐" : "┘";
-    return this.theme.fg("borderMuted", `${left}${"─".repeat(innerWidth)}${right}`);
+    return this.theme.fg(
+      "borderMuted",
+      `${left}${"─".repeat(innerWidth)}${right}`,
+    );
   }
 
   private wrapTranscript(innerWidth: number): string[] {
@@ -1151,13 +1464,20 @@ class BtwOverlayComponent extends Container implements Focusable {
 
     if (matchesKey(data, Key.pageUp)) {
       this.followTranscript = false;
-      this.transcriptScrollOffset = Math.max(0, this.transcriptScrollOffset - Math.max(1, this.transcriptViewportHeight - 1));
+      this.transcriptScrollOffset = Math.max(
+        0,
+        this.transcriptScrollOffset -
+          Math.max(1, this.transcriptViewportHeight - 1),
+      );
       this.tui.requestRender();
       return;
     }
 
     if (matchesKey(data, Key.pageDown)) {
-      this.transcriptScrollOffset += Math.max(1, this.transcriptViewportHeight - 1);
+      this.transcriptScrollOffset += Math.max(
+        1,
+        this.transcriptViewportHeight - 1,
+      );
       this.tui.requestRender();
       return;
     }
@@ -1194,7 +1514,10 @@ class BtwOverlayComponent extends Container implements Focusable {
     if (this.followTranscript) {
       this.transcriptScrollOffset = maxScroll;
     } else {
-      this.transcriptScrollOffset = Math.max(0, Math.min(this.transcriptScrollOffset, maxScroll));
+      this.transcriptScrollOffset = Math.max(
+        0,
+        Math.min(this.transcriptScrollOffset, maxScroll),
+      );
       if (this.transcriptScrollOffset >= maxScroll) {
         this.followTranscript = true;
       }
@@ -1204,7 +1527,10 @@ class BtwOverlayComponent extends Container implements Focusable {
       this.transcriptScrollOffset,
       this.transcriptScrollOffset + transcriptHeight,
     );
-    const transcriptPadCount = Math.max(0, transcriptHeight - visibleTranscript.length);
+    const transcriptPadCount = Math.max(
+      0,
+      transcriptHeight - visibleTranscript.length,
+    );
     const hiddenAbove = this.transcriptScrollOffset;
     const hiddenBelow = Math.max(0, maxScroll - this.transcriptScrollOffset);
     const summary =
@@ -1214,7 +1540,12 @@ class BtwOverlayComponent extends Container implements Focusable {
 
     const lines = [this.borderLine(innerWidth, "top")];
 
-    lines.push(this.frameLine(this.theme.fg("accent", this.theme.bold(this.modeTextValue.trim())), innerWidth));
+    lines.push(
+      this.frameLine(
+        this.theme.fg("accent", this.theme.bold(this.modeTextValue.trim())),
+        innerWidth,
+      ),
+    );
     lines.push(this.frameLine(this.theme.fg("dim", summary), innerWidth));
     lines.push(this.ruleLine(innerWidth));
 
@@ -1226,9 +1557,19 @@ class BtwOverlayComponent extends Container implements Focusable {
     }
 
     lines.push(this.ruleLine(innerWidth));
-    lines.push(this.frameLine(this.theme.fg("warning", this.statusTextValue.trim()), innerWidth));
+    lines.push(
+      this.frameLine(
+        this.theme.fg("warning", this.statusTextValue.trim()),
+        innerWidth,
+      ),
+    );
     lines.push(this.inputFrameLine(dialogWidth));
-    lines.push(this.frameLine(this.theme.fg("dim", this.hintsTextValue.trim()), innerWidth));
+    lines.push(
+      this.frameLine(
+        this.theme.fg("dim", this.hintsTextValue.trim()),
+        innerWidth,
+      ),
+    );
     lines.push(this.borderLine(innerWidth, "bottom"));
 
     return lines;
@@ -1252,7 +1593,9 @@ class BtwOverlayComponent extends Container implements Focusable {
     this.modeText.setText(this.modeTextValue);
     const entries = this.readTranscriptEntries();
     const exchanges = getCompletedExchangeCount(entries);
-    const active = hasStreamingTranscriptEntry(entries) ? " · 流式输出中" : " · 空闲";
+    const active = hasStreamingTranscriptEntry(entries)
+      ? " · 流式输出中"
+      : " · 空闲";
     this.summaryTextValue = `${exchanges} 轮对话${active}`;
     this.summaryText.setText(this.summaryTextValue);
 
@@ -1265,7 +1608,8 @@ class BtwOverlayComponent extends Container implements Focusable {
     const status = this.getStatus() ?? "就绪。Enter 提交，Escape 取消。";
     this.statusTextValue = status;
     this.statusText.setText(this.statusTextValue);
-    this.hintsTextValue = "Enter 提交 · Alt+/ 切换焦点 · Escape 取消 · PgUp/PgDn 滚动";
+    this.hintsTextValue =
+      "Enter 提交 · Alt+/ 切换焦点 · Escape 取消 · PgUp/PgDn 滚动";
     this.hintsText.setText(this.hintsTextValue);
     this.tui.requestRender();
   }
@@ -1292,7 +1636,10 @@ export default function (pi: ExtensionAPI) {
     }
   }
 
-  function setOverlayStatus(status: string | null, ctx?: ExtensionContext | ExtensionCommandContext): void {
+  function setOverlayStatus(
+    status: string | null,
+    ctx?: ExtensionContext | ExtensionCommandContext,
+  ): void {
     overlayStatus = status;
     syncUi(ctx);
   }
@@ -1333,19 +1680,25 @@ export default function (pi: ExtensionAPI) {
     overlayRuntime?.refresh?.();
   }
 
-  function removeBtwSessionSubscription(sessionRuntime: BtwSessionRuntime, unsubscribe: () => void): void {
+  function removeBtwSessionSubscription(
+    sessionRuntime: BtwSessionRuntime,
+    unsubscribe: () => void,
+  ): void {
     if (!sessionRuntime.subscriptions.delete(unsubscribe)) {
       return;
     }
 
     try {
       unsubscribe();
-    } catch {
-      // Ignore unsubscribe errors during BTW session replacement/shutdown.
+    } catch (error) {
+      // ✅ 改进错误处理：记录错误而不忽略
+      console.warn("[btw] Unsubscribe failed during session removal:", error);
     }
   }
 
-  function clearBtwSessionSubscriptions(sessionRuntime: BtwSessionRuntime): void {
+  function clearBtwSessionSubscriptions(
+    sessionRuntime: BtwSessionRuntime,
+  ): void {
     for (const unsubscribe of [...sessionRuntime.subscriptions]) {
       removeBtwSessionSubscription(sessionRuntime, unsubscribe);
     }
@@ -1356,7 +1709,10 @@ export default function (pi: ExtensionAPI) {
     event: AgentSessionEvent,
     ctx?: ExtensionContext | ExtensionCommandContext,
   ): void {
-    if (activeBtwSession?.session !== sessionRuntime.session || !overlayRuntime) {
+    if (
+      activeBtwSession?.session !== sessionRuntime.session ||
+      !overlayRuntime
+    ) {
       return;
     }
 
@@ -1368,7 +1724,12 @@ export default function (pi: ExtensionAPI) {
     }
 
     if (event.type === "tool_execution_end") {
-      setOverlayStatus(sessionRuntime.session.isStreaming ? `⏳ 运行工具: ${event.toolName}` : "⏳ 流式输出中...", ctx);
+      setOverlayStatus(
+        sessionRuntime.session.isStreaming
+          ? `⏳ 运行工具: ${event.toolName}`
+          : "⏳ 流式输出中...",
+        ctx,
+      );
       return;
     }
 
@@ -1387,21 +1748,31 @@ export default function (pi: ExtensionAPI) {
     }
   }
 
-  function subscribeOverlayToActiveBtwSession(ctx?: ExtensionContext | ExtensionCommandContext): void {
+  function subscribeOverlayToActiveBtwSession(
+    ctx?: ExtensionContext | ExtensionCommandContext,
+  ): void {
     const sessionRuntime = activeBtwSession;
     if (!sessionRuntime || sessionRuntime.subscriptions.size > 0) {
       return;
     }
 
-    const unsubscribe = sessionRuntime.session.subscribe((event: AgentSessionEvent) => {
-      handleBtwSessionEvent(sessionRuntime, event, ctx);
-    });
+    const unsubscribe = sessionRuntime.session.subscribe(
+      (event: AgentSessionEvent) => {
+        handleBtwSessionEvent(sessionRuntime, event, ctx);
+      },
+    );
     sessionRuntime.subscriptions.add(unsubscribe);
   }
 
   async function disposeBtwSession(): Promise<void> {
     const current = activeBtwSession;
     activeBtwSession = null;
+
+    // ✅ 清理 transcriptState（防止内存泄漏）
+    if (transcriptState) {
+      clearTranscriptState(transcriptState);
+    }
+
     if (!current) {
       return;
     }
@@ -1410,8 +1781,9 @@ export default function (pi: ExtensionAPI) {
 
     try {
       await current.session.abort();
-    } catch {
-      // Ignore abort errors during BTW session replacement/shutdown.
+    } catch (error) {
+      // ✅ 改进错误处理：记录错误而不忽略
+      console.warn("[btw] Session abort failed during disposal:", error);
     }
 
     current.session.dispose();
@@ -1427,7 +1799,8 @@ export default function (pi: ExtensionAPI) {
     notifyOnFallback = false,
   ): Promise<ResolvedBtwModel> {
     if (btwModelOverride) {
-      const auth = await ctx.modelRegistry.getApiKeyAndHeaders(btwModelOverride);
+      const auth =
+        await ctx.modelRegistry.getApiKeyAndHeaders(btwModelOverride);
       if (auth.ok && auth.apiKey) {
         return {
           model: btwModelOverride,
@@ -1482,7 +1855,8 @@ export default function (pi: ExtensionAPI) {
     notifyOnFallback = false,
   ): Promise<ResolvedBtwSettings> {
     const resolvedModel = await resolveBtwModel(ctx, notifyOnFallback);
-    const thinkingLevel = btwThinkingOverride ?? (pi.getThinkingLevel() as SessionThinkingLevel);
+    const thinkingLevel =
+      btwThinkingOverride ?? (pi.getThinkingLevel() as SessionThinkingLevel);
 
     return {
       model: resolvedModel.model,
@@ -1514,14 +1888,26 @@ export default function (pi: ExtensionAPI) {
   }
 
   function describeResolvedThinking(settings: ResolvedBtwSettings): string {
-    const source = settings.thinkingSource === "override" ? "override" : "inherits main thread";
+    const source =
+      settings.thinkingSource === "override"
+        ? "override"
+        : "inherits main thread";
     return `BTW thinking: ${settings.thinkingLevel} (${source}).`;
   }
 
-  async function setBtwModelOverride(ctx: ExtensionCommandContext, nextModel: SessionModel | null): Promise<void> {
+  async function setBtwModelOverride(
+    ctx: ExtensionCommandContext,
+    nextModel: SessionModel | null,
+  ): Promise<void> {
     btwModelOverride = nextModel;
     const details: BtwModelOverrideDetails = nextModel
-      ? { action: "set", timestamp: Date.now(), provider: nextModel.provider, id: nextModel.id, api: nextModel.api }
+      ? {
+          action: "set",
+          timestamp: Date.now(),
+          provider: nextModel.provider,
+          id: nextModel.id,
+          api: nextModel.api,
+        }
       : { action: "clear", timestamp: Date.now() };
     pi.appendEntry(BTW_MODEL_OVERRIDE_TYPE, details);
     await disposeBtwSession();
@@ -1539,7 +1925,11 @@ export default function (pi: ExtensionAPI) {
   ): Promise<void> {
     btwThinkingOverride = nextThinkingLevel;
     const details: BtwThinkingOverrideDetails = nextThinkingLevel
-      ? { action: "set", timestamp: Date.now(), thinkingLevel: nextThinkingLevel }
+      ? {
+          action: "set",
+          timestamp: Date.now(),
+          thinkingLevel: nextThinkingLevel,
+        }
       : { action: "clear", timestamp: Date.now() };
     pi.appendEntry(BTW_THINKING_OVERRIDE_TYPE, details);
     await disposeBtwSession();
@@ -1551,7 +1941,10 @@ export default function (pi: ExtensionAPI) {
     notify(ctx, `${message} ${describeResolvedThinking(settings)}`, "info");
   }
 
-  async function createBtwSubSession(ctx: ExtensionCommandContext, mode: BtwThreadMode): Promise<BtwSessionRuntime> {
+  async function createBtwSubSession(
+    ctx: ExtensionCommandContext,
+    mode: BtwThreadMode,
+  ): Promise<BtwSessionRuntime> {
     const settings = await resolveBtwSettings(ctx, true);
     if (!settings.model) {
       throw new Error(settings.fallbackReason || "No active model selected.");
@@ -1560,22 +1953,32 @@ export default function (pi: ExtensionAPI) {
     const { session } = await createAgentSession({
       sessionManager: SessionManager.inMemory(),
       model: settings.model,
-      modelRegistry: ctx.modelRegistry as AgentSession["modelRegistry"],
-      thinkingLevel: settings.thinkingLevel,
+      // pi 1.1.0: AgentSession 改用 ModelRuntime, 但 ModelRegistry 实现了 Models 接口
+      modelRuntime:
+        ctx.modelRegistry as unknown as CreateAgentSessionOptions["modelRuntime"],
       // Match pi's default coding-agent toolset (read/bash/edit/write).
       tools: ["read", "bash", "edit", "write"],
       resourceLoader: createBtwResourceLoader(ctx),
     });
 
-    const { messages: seedMessages, sideThreadStartIndex } = buildBtwSeedState(ctx, pendingThread, mode, settings.model);
+    const { messages: seedMessages, sideThreadStartIndex } = buildBtwSeedState(
+      ctx,
+      pendingThread,
+      mode,
+      settings.model,
+    );
     if (seedMessages.length > 0) {
-      session.agent.state.messages = seedMessages as typeof session.state.messages;
+      session.agent.state.messages =
+        seedMessages as typeof session.state.messages;
     }
 
     return { session, mode, subscriptions: new Set(), sideThreadStartIndex };
   }
 
-  async function ensureBtwSession(ctx: ExtensionCommandContext, mode: BtwThreadMode): Promise<BtwSessionRuntime | null> {
+  async function ensureBtwSession(
+    ctx: ExtensionCommandContext,
+    mode: BtwThreadMode,
+  ): Promise<BtwSessionRuntime | null> {
     const settings = await resolveBtwSettings(ctx);
     if (!settings.model) {
       return null;
@@ -1590,7 +1993,9 @@ export default function (pi: ExtensionAPI) {
     return activeBtwSession;
   }
 
-  async function ensureOverlay(ctx: ExtensionCommandContext | ExtensionContext): Promise<void> {
+  async function ensureOverlay(
+    ctx: ExtensionCommandContext | ExtensionContext,
+  ): Promise<void> {
     if (!ctx.hasUI) {
       return;
     }
@@ -1692,11 +2097,19 @@ export default function (pi: ExtensionAPI) {
         if (overlayRuntime === runtime) {
           overlayRuntime = null;
         }
-        notify(ctx, error instanceof Error ? error.message : String(error), "error");
+        notify(
+          ctx,
+          error instanceof Error ? error.message : String(error),
+          "error",
+        );
       });
   }
 
-  async function dispatchBtwCommand(name: string, args: string, ctx: ExtensionCommandContext): Promise<boolean> {
+  async function dispatchBtwCommand(
+    name: string,
+    args: string,
+    ctx: ExtensionCommandContext,
+  ): Promise<boolean> {
     const trimmedArgs = args.trim();
 
     if (name === "btw") {
@@ -1794,7 +2207,10 @@ export default function (pi: ExtensionAPI) {
         return true;
       }
 
-      await setBtwThinkingOverride(ctx, parsed.action === "clear" ? null : parsed.thinkingLevel);
+      await setBtwThinkingOverride(
+        ctx,
+        parsed.action === "clear" ? null : parsed.thinkingLevel,
+      );
       return true;
     }
 
@@ -1821,7 +2237,11 @@ export default function (pi: ExtensionAPI) {
         notify(ctx, `已注入 BTW 线程（${count} 轮对话）。`, "info");
       } catch (error) {
         setOverlayStatus("注入失败。线程已保留，可重试或总结。", ctx);
-        notify(ctx, error instanceof Error ? error.message : String(error), "error");
+        notify(
+          ctx,
+          error instanceof Error ? error.message : String(error),
+          "error",
+        );
       }
       return true;
     }
@@ -1850,7 +2270,11 @@ export default function (pi: ExtensionAPI) {
         notify(ctx, `已注入 BTW 总结（${count} 轮对话）。`, "info");
       } catch (error) {
         setOverlayStatus("总结失败。线程已保留，可重试或注入。", ctx);
-        notify(ctx, error instanceof Error ? error.message : String(error), "error");
+        notify(
+          ctx,
+          error instanceof Error ? error.message : String(error),
+          "error",
+        );
       }
       return true;
     }
@@ -1858,9 +2282,13 @@ export default function (pi: ExtensionAPI) {
     return false;
   }
 
-  function parseOverlayBtwCommand(value: string): { name: string; args: string } | null {
+  function parseOverlayBtwCommand(
+    value: string,
+  ): { name: string; args: string } | null {
     const trimmed = value.trim();
-    const match = trimmed.match(/^\/(btw:(?:new|tangent|clear|inject|summarize|model|thinking))(?:\s+(.*))?$/);
+    const match = trimmed.match(
+      /^\/(btw:(?:new|tangent|clear|inject|summarize|model|thinking))(?:\s+(.*))?$/,
+    );
     if (!match) {
       return null;
     }
@@ -1871,7 +2299,10 @@ export default function (pi: ExtensionAPI) {
     };
   }
 
-  async function submitFromOverlay(ctx: ExtensionCommandContext | ExtensionContext, value: string): Promise<void> {
+  async function submitFromOverlay(
+    ctx: ExtensionCommandContext | ExtensionContext,
+    value: string,
+  ): Promise<void> {
     const question = value.trim();
     if (!question) {
       setOverlayStatus("Enter a BTW prompt before submitting.", ctx);
@@ -1879,7 +2310,10 @@ export default function (pi: ExtensionAPI) {
     }
 
     if (!("getSystemPrompt" in ctx)) {
-      setOverlayStatus("BTW overlay submit requires a command context. Reopen BTW from a command.", ctx);
+      setOverlayStatus(
+        "BTW overlay submit requires a command context. Reopen BTW from a command.",
+        ctx,
+      );
       return;
     }
 
@@ -1933,7 +2367,9 @@ export default function (pi: ExtensionAPI) {
 
     for (let i = 0; i < branch.length; i++) {
       if (isCustomEntry(branch[i], BTW_MODEL_OVERRIDE_TYPE)) {
-        const details = (branch[i] as unknown as { data?: BtwModelOverrideDetails }).data;
+        const details = (
+          branch[i] as unknown as { data?: BtwModelOverrideDetails }
+        ).data;
         if (details?.action === "set") {
           const resolved = ctx.modelRegistry.find(details.provider, details.id);
           if (resolved) {
@@ -1948,7 +2384,9 @@ export default function (pi: ExtensionAPI) {
       }
 
       if (isCustomEntry(branch[i], BTW_THINKING_OVERRIDE_TYPE)) {
-        const details = (branch[i] as unknown as { data?: BtwThinkingOverrideDetails }).data;
+        const details = (
+          branch[i] as unknown as { data?: BtwThinkingOverrideDetails }
+        ).data;
         btwThinkingOverride =
           details?.action === "set"
             ? details.thinkingLevel
@@ -1959,7 +2397,8 @@ export default function (pi: ExtensionAPI) {
 
       if (isCustomEntry(branch[i], BTW_RESET_TYPE)) {
         lastResetIndex = i;
-        const details = (branch[i] as unknown as { data?: BtwResetDetails }).data;
+        const details = (branch[i] as unknown as { data?: BtwResetDetails })
+          .data;
         pendingMode = details?.mode ?? "contextual";
       }
     }
@@ -2004,7 +2443,9 @@ export default function (pi: ExtensionAPI) {
 
     const auth = await ctx.modelRegistry.getApiKeyAndHeaders(model);
     if (!auth.ok || !auth.apiKey) {
-      const message = auth.ok ? `No credentials available for ${model.provider}/${model.id}.` : auth.error;
+      const message = auth.ok
+        ? `No credentials available for ${model.provider}/${model.id}.`
+        : auth.error;
       setOverlayStatus(message, ctx);
       notify(ctx, message, "error");
       await ensureOverlay(ctx);
@@ -2037,7 +2478,10 @@ export default function (pi: ExtensionAPI) {
         throw new Error("BTW request finished without a response.");
       }
       if (response.stopReason === "aborted") {
-        removeTranscriptTurn(transcriptState, transcriptState.lastTurnId ?? transcriptState.currentTurnId);
+        removeTranscriptTurn(
+          transcriptState,
+          transcriptState.lastTurnId ?? transcriptState.currentTurnId,
+        );
         setOverlayStatus("Request aborted.", ctx);
         return;
       }
@@ -2045,9 +2489,16 @@ export default function (pi: ExtensionAPI) {
         throw new Error(response.errorMessage || "BTW request failed.");
       }
 
-      const completedTurnId = transcriptState.lastTurnId ?? transcriptState.currentTurnId;
+      const completedTurnId =
+        transcriptState.lastTurnId ?? transcriptState.currentTurnId;
       const streamedThinking =
-        completedTurnId !== null ? findLatestTranscriptEntry(transcriptState, completedTurnId, "thinking")?.text : "";
+        completedTurnId !== null
+          ? findLatestTranscriptEntry(
+              transcriptState,
+              completedTurnId,
+              "thinking",
+            )?.text
+          : "";
       const answer = extractAnswer(response);
       const thinking = extractThinking(response) || streamedThinking || "";
 
@@ -2074,12 +2525,19 @@ export default function (pi: ExtensionAPI) {
         notify(ctx, "已排队，将在当前轮次结束后保存到主对话。", "info");
         setOverlayStatus("已排队，将在当前轮次结束后保存到主对话。", ctx);
       } else {
-        setOverlayStatus("Ready for a follow-up. Hidden BTW thread updated.", ctx);
+        setOverlayStatus(
+          "Ready for a follow-up. Hidden BTW thread updated.",
+          ctx,
+        );
       }
     } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
+      const errorMessage =
+        error instanceof Error ? error.message : String(error);
       setTranscriptFailure(transcriptState, errorMessage);
-      setOverlayStatus("Request failed. Thread preserved for retry or follow-up.", ctx);
+      setOverlayStatus(
+        "Request failed. Thread preserved for retry or follow-up.",
+        ctx,
+      );
       notify(ctx, errorMessage, "error");
       await disposeBtwSession();
     } finally {
@@ -2088,15 +2546,23 @@ export default function (pi: ExtensionAPI) {
   }
 
   function getPendingThreadForHandoff(): BtwHandoffExchange[] {
-    return pendingThread.map((entry) => ({ user: entry.question, assistant: entry.answer }));
-  }
-
-  async function getBtwHandoffThread(
-    ctx: ExtensionCommandContext,
-  ): Promise<{ sessionRuntime: BtwSessionRuntime | null; thread: BtwHandoffExchange[] }> {
-    const sessionRuntime = activeBtwSession ?? (await ensureBtwSession(ctx, pendingMode));
-    const thread = sessionRuntime ? extractBtwHandoffThread(sessionRuntime) : [];
-    const resolvedThread = thread.length > 0 ? thread : getPendingThreadForHandoff();
+    return pendingThread.map((entry) => ({
+      user: entry.question,
+      assistant: entry.answer,
+    }));
+  }
+
+  async function getBtwHandoffThread(ctx: ExtensionCommandContext): Promise<{
+    sessionRuntime: BtwSessionRuntime | null;
+    thread: BtwHandoffExchange[];
+  }> {
+    const sessionRuntime =
+      activeBtwSession ?? (await ensureBtwSession(ctx, pendingMode));
+    const thread = sessionRuntime
+      ? extractBtwHandoffThread(sessionRuntime)
+      : [];
+    const resolvedThread =
+      thread.length > 0 ? thread : getPendingThreadForHandoff();
 
     if (resolvedThread.length === 0) {
       throw new Error("无可用 BTW 对话用于交接。");
@@ -2105,7 +2571,10 @@ export default function (pi: ExtensionAPI) {
     return { sessionRuntime, thread: resolvedThread };
   }
 
-  async function summarizeThread(ctx: ExtensionCommandContext, thread: BtwHandoffExchange[]): Promise<string> {
+  async function summarizeThread(
+    ctx: ExtensionCommandContext,
+    thread: BtwHandoffExchange[],
+  ): Promise<string> {
     const settings = await resolveBtwSettings(ctx, true);
     const model = settings.model;
     if (!model) {
@@ -2114,16 +2583,23 @@ export default function (pi: ExtensionAPI) {
 
     const auth = await ctx.modelRegistry.getApiKeyAndHeaders(model);
     if (!auth.ok || !auth.apiKey) {
-      throw new Error(auth.ok ? `No credentials available for ${model.provider}/${model.id}.` : auth.error);
+      throw new Error(
+        auth.ok
+          ? `No credentials available for ${model.provider}/${model.id}.`
+          : auth.error,
+      );
     }
 
     const { session } = await createAgentSession({
       sessionManager: SessionManager.inMemory(),
       model,
-      modelRegistry: ctx.modelRegistry as AgentSession["modelRegistry"],
-      thinkingLevel: "off",
+      // pi 1.1.0: AgentSession 改用 ModelRuntime, 但 ModelRegistry 实现了 Models 接口
+      modelRuntime:
+        ctx.modelRegistry as unknown as CreateAgentSessionOptions["modelRuntime"],
       tools: [],
-      resourceLoader: createBtwResourceLoader(ctx, [BTW_SUMMARIZE_SYSTEM_PROMPT]),
+      resourceLoader: createBtwResourceLoader(ctx, [
+        BTW_SUMMARIZE_SYSTEM_PROMPT,
+      ]),
     });
 
     try {
@@ -2134,7 +2610,9 @@ export default function (pi: ExtensionAPI) {
         throw new Error("BTW summarize finished without a response.");
       }
       if (response.stopReason === "error") {
-        throw new Error(response.errorMessage || "Failed to summarize BTW thread.");
+        throw new Error(
+          response.errorMessage || "Failed to summarize BTW thread.",
+        );
       }
       if (response.stopReason === "aborted") {
         throw new Error("BTW summarize aborted.");
@@ -2144,14 +2622,21 @@ export default function (pi: ExtensionAPI) {
     } finally {
       try {
         await session.abort();
-      } catch {
-        // Ignore abort errors during summarize session shutdown.
+      } catch (error) {
+        // ✅ 改进错误处理：记录错误而不忽略
+        console.warn(
+          "[btw] Session abort failed during summarize shutdown:",
+          error,
+        );
       }
       session.dispose();
     }
   }
 
-  function sendThreadToMain(ctx: ExtensionCommandContext, content: string): void {
+  function sendThreadToMain(
+    ctx: ExtensionCommandContext,
+    content: string,
+  ): void {
     if (ctx.isIdle()) {
       pi.sendUserMessage(content);
     } else {
@@ -2159,37 +2644,45 @@ export default function (pi: ExtensionAPI) {
     }
   }
 
-  pi.registerMessageRenderer(BTW_MESSAGE_TYPE, (message, { expanded }, theme) => {
-    const details = message.details as BtwDetails | undefined;
-    const content = typeof message.content === "string" ? message.content : "[non-text btw message]";
-    const lines = [theme.fg("accent", theme.bold("[BTW]")), content];
-
-    if (expanded && details) {
-      lines.push(
-        theme.fg(
-          "dim",
-          `model: ${details.provider}/${details.model} (${details.api ?? "openai-responses"}) · thinking: ${details.thinkingLevel}`,
-        ),
-      );
+  pi.registerMessageRenderer(
+    BTW_MESSAGE_TYPE,
+    (message, { expanded }, theme) => {
+      const details = message.details as BtwDetails | undefined;
+      const content =
+        typeof message.content === "string"
+          ? message.content
+          : "[non-text btw message]";
+      const lines = [theme.fg("accent", theme.bold("[BTW]")), content];
 
-      if (details.usage) {
+      if (expanded && details) {
         lines.push(
           theme.fg(
             "dim",
-            `tokens: in ${details.usage.input} · out ${details.usage.output} · total ${details.usage.totalTokens}`,
+            `model: ${details.provider}/${details.model} (${details.api ?? "openai-responses"}) · thinking: ${details.thinkingLevel}`,
           ),
         );
+
+        if (details.usage) {
+          lines.push(
+            theme.fg(
+              "dim",
+              `tokens: in ${details.usage.input} · out ${details.usage.output} · total ${details.usage.totalTokens}`,
+            ),
+          );
+        }
       }
-    }
 
-    const box = new Box(1, 1, (text) => theme.bg("customMessageBg", text));
-    box.addChild(new Text(lines.join("\n"), 0, 0));
-    return box;
-  });
+      const box = new Box(1, 1, (text) => theme.bg("customMessageBg", text));
+      box.addChild(new Text(lines.join("\n"), 0, 0));
+      return box;
+    },
+  );
 
   pi.on("context", async (event) => {
     return {
-      messages: event.messages.filter((message) => !isVisibleBtwMessage(message)),
+      messages: event.messages.filter(
+        (message) => !isVisibleBtwMessage(message),
+      ),
     };
   });
 
@@ -2216,7 +2709,8 @@ export default function (pi: ExtensionAPI) {
   }
 
   pi.registerCommand("btw", {
-    description: "侧边对话。默认带主会话上下文；用 /btw:tangent 开启无上下文模式。加 --save 保存到主对话。",
+    description:
+      "侧边对话。默认带主会话上下文；用 /btw:tangent 开启无上下文模式。加 --save 保存到主对话。",
     handler: async (args, ctx) => {
       await dispatchBtwCommand("btw", args, ctx);
     },