pi-pretty-tui 0.1.7 → 0.2.0

package/extensions/index.ts

@@ -1,6 +1,7 @@
 import {
   AssistantMessageComponent,
   CustomEditor,
+  CustomMessageComponent,
   InteractiveMode,
   ToolExecutionComponent,
   UserMessageComponent,
@@ -13,6 +14,7 @@ import {
   createWriteTool,
   copyToClipboard,
   getAgentDir,
+  getMarkdownTheme,
   type ExtensionAPI,
 } from "@earendil-works/pi-coding-agent";
 import {
@@ -27,10 +29,40 @@ import {
 } from "@earendil-works/pi-tui";
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
+import {
+  ActivityTimeline,
+  assistantMessageKey,
+  assistantSystemBoundary,
+  thinkingText,
+  visibleAssistantText,
+  type ActivityGroup,
+  type ActivityMember,
+} from "./activity-timeline.js";
 
 type PrettyTuiMode = "full" | "compact" | "clean";
 const CLEAN_TOOL_ACTIVITY_MIN_MS = 1000;
+const SPECIALIZED_TOOL_NAMES = new Set(["read", "bash", "edit", "write", "grep", "find", "ls"]);
+
+const stripAnsiBackgrounds = (value: string): string =>
+  value.replace(/\x1b\[([0-9:;]*)m/g, (sequence, raw: string) => {
+    const fields = raw === "" ? [0] : raw.split(";").map((field) => Number(field));
+    const kept: number[] = [];
+    for (let index = 0; index < fields.length; index++) {
+      const field = fields[index];
+      if ((field >= 40 && field <= 49) || (field >= 100 && field <= 107)) continue;
+      if (field === 48) {
+        const mode = fields[index + 1];
+        if (mode === 5) index += 2;
+        else if (mode === 2) index += 4;
+        continue;
+      }
+      kept.push(field);
+    }
+    if (raw.includes(":") && /(?:^|;)48:/u.test(raw)) return "";
+    return kept.length > 0 ? `\x1b[${kept.join(";")}m` : "";
+  });
 type PrettyTuiConfig = {
+  enabled?: boolean;
   mode?: PrettyTuiMode;
   /** Legacy location used by the first mode implementation. */
   bash?: {
@@ -52,6 +84,7 @@ export default function prettyTui(pi: ExtensionAPI) {
   const cwd = process.cwd();
   const configPath = join(getAgentDir(), "pretty-tui.json");
   let config = loadConfig(configPath);
+  const activeForSession = config.enabled !== false;
   const configuredMode = config.mode ?? config.bash?.mode;
   let renderMode: PrettyTuiMode = configuredMode === "full" || configuredMode === "compact" || configuredMode === "clean"
     ? configuredMode
@@ -62,6 +95,16 @@ export default function prettyTui(pi: ExtensionAPI) {
   let currentTui: any;
   let currentExtensionUi: any;
   let changingAllToolsExpansion = false;
+  const activityTimeline = new ActivityTimeline();
+  const revealedActivityGroups = new Set<string>();
+  const expandedThinkingMembers = new Set<string>();
+  const thinkingComponents = new Map<string, any>();
+  const activityFallbackThemes = new Map<string, any>();
+  const activityUpdateComponents = new Map<string, Component>();
+  const customUpdateToolHints = new Map<string, string>();
+  const customUpdateBeforeToolHints = new Set<string>();
+  let activityUpdateSequence = 0;
+  const assistantBoundaryKeys = new Set<string>();
   const cleanCompactToolCallIds = new Set<string>();
   const cleanGroupToolCallIds = new Map<string, string[]>();
   const cleanToolCallGroupOwners = new Map<string, string>();
@@ -77,31 +120,213 @@ export default function prettyTui(pi: ExtensionAPI) {
 
   const isCleanGroupRevealed = (toolCallId: string): boolean => {
     if (cleanCompactToolCallIds.has(toolCallId)) return true;
-    const groupOwner = cleanToolCallGroupOwners.get(toolCallId);
-    const groupToolCallIds = groupOwner ? cleanGroupToolCallIds.get(groupOwner) : undefined;
-    return groupToolCallIds?.some((id) => cleanCompactToolCallIds.has(id)) ?? false;
+    const activityGroup = activityTimeline.groupForTool(toolCallId);
+    if (activityGroup && activityGroupRevealed(activityGroup)) return true;
+    const legacyOwner = cleanToolCallGroupOwners.get(toolCallId);
+    const legacyIds = legacyOwner ? cleanGroupToolCallIds.get(legacyOwner) : undefined;
+    return legacyIds?.some((id) => cleanCompactToolCallIds.has(id)) ?? false;
   };
 
   const cleanThemeForToolCall = (toolCallId: string): any => {
     const directTheme = cleanToolThemes.get(toolCallId);
     if (directTheme) return directTheme;
-    const groupOwner = cleanToolCallGroupOwners.get(toolCallId);
-    const groupToolCallIds = groupOwner ? cleanGroupToolCallIds.get(groupOwner) : undefined;
-    return groupToolCallIds
-      ?.map((id) => cleanToolThemes.get(id))
-      .find(Boolean);
+    const activityGroup = activityTimeline.groupForTool(toolCallId);
+    // Prefer a real tool renderer theme over the Markdown-derived fallback.
+    // A group that starts with Thought installs the fallback first; returning
+    // it here made later third-party success dots use the heading color.
+    if (activityGroup) {
+      for (const id of activityGroup.toolCallIds) {
+        const activityTheme = cleanToolThemes.get(id);
+        if (activityTheme) {
+          activityFallbackThemes.set(activityGroup.id, activityTheme);
+          return activityTheme;
+        }
+      }
+    }
+    const cachedActivityTheme = activityGroup
+      ? activityFallbackThemes.get(activityGroup.id)
+      : undefined;
+    if (cachedActivityTheme) return cachedActivityTheme;
+    const legacyOwner = cleanToolCallGroupOwners.get(toolCallId);
+    const legacyIds = legacyOwner ? cleanGroupToolCallIds.get(legacyOwner) : undefined;
+    return legacyIds?.map((id) => cleanToolThemes.get(id)).find(Boolean);
+  };
+
+  const activityGroupOwner = (group: ActivityGroup): string | undefined => {
+    for (let index = group.toolCallIds.length - 1; index >= 0; index--) {
+      const toolCallId = group.toolCallIds[index];
+      if (settledSummaries.has(toolCallId)) return toolCallId;
+    }
+    if (cleanRun.activeToolCallId && group.toolCallIds.includes(cleanRun.activeToolCallId)) {
+      return cleanRun.activeToolCallId;
+    }
+    if (cleanRun.lastCompletedToolCallId && group.toolCallIds.includes(cleanRun.lastCompletedToolCallId)) {
+      return cleanRun.lastCompletedToolCallId;
+    }
+    return group.toolCallIds[group.toolCallIds.length - 1];
+  };
+
+  const defaultActivityTheme = () => {
+    const markdownTheme = getMarkdownTheme();
+    return {
+      fg: (color: string, text: string) => {
+        if (color === "accent") return markdownTheme.listBullet(text);
+        if (color === "success" || color === "syntaxComment") return markdownTheme.codeBlock(text);
+        if (color === "thinkingLow") return markdownTheme.link(text);
+        if (color === "dim" || color === "muted" || color === "thinkingText") {
+          return markdownTheme.quote(text);
+        }
+        return text;
+      },
+      bold: markdownTheme.bold,
+      italic: markdownTheme.italic,
+    };
   };
 
-  const saveRenderMode = (mode: PrettyTuiMode) => {
-    config = { ...config, mode };
+  const activityGroupTheme = (group: ActivityGroup): any => {
+    // A Thought can render before its tools are constructed and install a
+    // Markdown fallback. Always promote a real tool theme once available so
+    // light mode receives explicit, high-contrast text colors.
+    for (const toolCallId of group.toolCallIds) {
+      const toolTheme = cleanToolThemes.get(toolCallId);
+      if (toolTheme) {
+        activityFallbackThemes.set(group.id, toolTheme);
+        return toolTheme;
+      }
+    }
+    const cached = activityFallbackThemes.get(group.id);
+    if (cached) return cached;
+    const fallback = defaultActivityTheme();
+    activityFallbackThemes.set(group.id, fallback);
+    return fallback;
+  };
+
+  const activityGroupRevealed = (group: ActivityGroup): boolean =>
+    cleanToolsExpanded || revealedActivityGroups.has(group.id);
+
+  const activityMemberPosition = (group: ActivityGroup, member: ActivityMember) => ({
+    first: group.members[0]?.id === member.id,
+    last: group.members[group.members.length - 1]?.id === member.id,
+  });
+
+  const activityTreeStyle = (
+    group: ActivityGroup,
+    member: ActivityMember,
+    width: number,
+    memberTheme?: any,
+  ) => {
+    const { last } = activityMemberPosition(group, member);
+    const rawPrefix = last ? "  └─ " : "  ├─ ";
+    const rawContinuation = last ? "     " : "  │  ";
+    const prefixWidth = visibleWidth(rawPrefix);
+    if (width <= prefixWidth) {
+      return { prefix: "", continuation: "", childWidth: Math.max(1, width), prefixWidth: 0 };
+    }
+    const resolvedTheme = memberTheme ?? activityGroupTheme(group);
+    return {
+      prefix: resolvedTheme ? resolvedTheme.fg("dim", rawPrefix) : rawPrefix,
+      continuation: resolvedTheme ? resolvedTheme.fg("dim", rawContinuation) : rawContinuation,
+      childWidth: Math.max(1, width - prefixWidth),
+      prefixWidth,
+    };
+  };
+
+  const humanizeCustomType = (value: string): string =>
+    value
+      .split(/[-_\s]+/u)
+      .filter(Boolean)
+      .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+      .join(" ") || "Update";
+
+  const renderActivityUpdate = (
+    group: ActivityGroup,
+    member: ActivityMember,
+    width: number,
+    theme = activityGroupTheme(group),
+  ): string[] => {
+    if (renderMode !== "clean" || !activityGroupRevealed(group)) return [];
+    const { prefix, continuation, childWidth } = activityTreeStyle(group, member, width, theme);
+    const title = truncateToWidth(member.updateTitle ?? "Update", Math.max(1, childWidth - 2), "…");
+    const lines = [theme.fg("accent", "◇ ") + theme.fg("toolTitle", theme.bold(title))];
+    if (member.updateContent) {
+      const detailWidth = Math.max(1, childWidth - visibleWidth("  │ "));
+      const detailLines = wrapTextWithAnsi(theme.fg("muted", member.updateContent), detailWidth);
+      lines.push(...detailLines.map((line, index) =>
+        theme.fg("dim", index === detailLines.length - 1 ? "  └ " : "  │ ") + line
+      ));
+    }
+    const decorated = lines.map((line, index) =>
+      truncateToWidth((index === 0 ? prefix : continuation) + line, Math.max(1, width), "")
+    );
+    const position = activityMemberPosition(group, member);
+    return position.first
+      ? ["", ...renderActivityGroupSummary(group, width), ...decorated]
+      : decorated;
+  };
+
+  const renderPendingActivityUpdate = (member: ActivityMember, width: number): string[] => {
+    const theme = defaultActivityTheme();
+    const title = truncateToWidth(member.updateTitle ?? "Update", Math.max(1, width - 2), "…");
+    const lines = [theme.fg("accent", "◇ ") + theme.fg("toolTitle", theme.bold(title))];
+    if (member.updateContent) {
+      const detailWidth = Math.max(1, width - visibleWidth("  │ "));
+      const details = wrapTextWithAnsi(theme.fg("muted", member.updateContent), detailWidth);
+      lines.push(...details.map((line, index) =>
+        theme.fg("dim", index === details.length - 1 ? "  └ " : "  │ ") + line
+      ));
+    }
+    return ["", ...lines.map((line) => truncateToWidth(line, Math.max(1, width), ""))];
+  };
+
+  const handleActivityUpdateMouse = (
+    group: ActivityGroup,
+    member: ActivityMember,
+    event: any,
+  ) => {
+    const isLeftClick = event.type === "click" && event.button === "left";
+    if (!isLeftClick || group.toolCallIds.length === 0) return undefined;
+    const position = activityMemberPosition(group, member);
+    if (!activityGroupRevealed(group)) {
+      if (!position.first) return undefined;
+      revealedActivityGroups.add(group.id);
+      for (const toolCallId of group.toolCallIds) cleanCompactToolCallIds.add(toolCallId);
+    } else {
+      const summaryHeight = position.first ? renderActivityGroupSummary(group, event.width).length : 0;
+      if (!position.first || event.y <= 0 || event.y > summaryHeight) return undefined;
+      revealedActivityGroups.delete(group.id);
+      for (const toolCallId of group.toolCallIds) {
+        cleanCompactToolCallIds.delete(toolCallId);
+        const component = cleanToolComponents.get(toolCallId);
+        if (component?.expanded) component.setExpanded(false);
+      }
+      for (const child of group.members) expandedThinkingMembers.delete(child.id);
+    }
+    for (const child of group.members) {
+      if (child.kind === "tool" && child.toolCallId) {
+        cleanToolComponents.get(child.toolCallId)?.updateDisplay?.();
+      } else if (child.kind === "thinking" && child.messageKey) {
+        thinkingComponents.get(child.messageKey)?.invalidate?.();
+      }
+    }
+    currentTui?.requestRender?.();
+    return { handled: true };
+  };
+
+  const saveConfig = (nextConfig: Record<string, any>) => {
+    config = nextConfig;
     mkdirSync(getAgentDir(), { recursive: true });
     writeFileSync(configPath, `${JSON.stringify(config, null, 2)}\n`, { encoding: "utf8", mode: 0o600 });
   };
 
+  const saveRenderMode = (mode: PrettyTuiMode) => saveConfig({ ...config, mode });
+  const saveEnabled = (enabled: boolean) => saveConfig({ ...config, enabled });
+
   pi.registerCommand("pretty-tui", {
-    description: "Configure pi-pretty-tui rendering mode",
+    description: "Configure pi-pretty-tui",
     getArgumentCompletions: (prefix: string) => {
       const items = [
+        { value: "enable", label: "enable", description: "Enable the extension and reload automatically" },
+        { value: "disable", label: "disable", description: "Disable the extension and reload automatically" },
         { value: "full", label: "full", description: "Full tool details and output" },
         { value: "compact", label: "compact", description: "Concise summaries for all built-in tools" },
         { value: "clean", label: "clean", description: "Group supported tools into Running/Done status" },
@@ -115,29 +340,67 @@ export default function prettyTui(pi: ExtensionAPI) {
 
       if (!requested) {
         if (!ctx.hasUI) {
-          ctx.ui.notify(`pi-pretty-tui mode: ${renderMode}`, "info");
+          ctx.ui.notify(
+            `pi-pretty-tui: ${config.enabled !== false ? "enabled" : "disabled"} · mode: ${renderMode}`,
+            "info",
+          );
           return;
         }
+        const enabled = `Enabled — ${config.enabled !== false ? "on" : "off"}`;
         const full = `Full — full tool details and output${renderMode === "full" ? " (current)" : ""}`;
         const compact = `Compact — concise summaries for all built-in tools${renderMode === "compact" ? " (current)" : ""}`;
         const clean = `Clean — group supported tools into Running/Done status${renderMode === "clean" ? " (current)" : ""}`;
-        const selected = await ctx.ui.select("pi-pretty-tui rendering mode", [full, compact, clean]);
+        const selected = await ctx.ui.select("pi-pretty-tui settings", [enabled, full, compact, clean]);
         if (!selected) return;
-        requested = selected === full ? "full" : selected === compact ? "compact" : "clean";
+        requested = selected === enabled
+          ? config.enabled !== false ? "disable" : "enable"
+          : selected === full
+            ? "full"
+            : selected === compact
+              ? "compact"
+              : "clean";
       }
 
       if (requested === "status") {
-        ctx.ui.notify(`pi-pretty-tui mode: ${renderMode}`, "info");
+        ctx.ui.notify(
+          `pi-pretty-tui: ${config.enabled !== false ? "enabled" : "disabled"} · mode: ${renderMode}`,
+          "info",
+        );
         return;
       }
+      if (requested === "enable" || requested === "disable") {
+        const enabled = requested === "enable";
+        try {
+          saveEnabled(enabled);
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          ctx.ui.notify(`Could not save pi-pretty-tui setting: ${message}`, "error");
+          return;
+        }
+        ctx.ui.notify(
+          `pi-pretty-tui ${enabled ? "enabled" : "disabled"}; reloading…`,
+          "info",
+        );
+        try {
+          await ctx.reload();
+          return;
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          ctx.ui.notify(`Setting saved, but automatic reload failed: ${message}`, "warning");
+          return;
+        }
+      }
       if (requested !== "full" && requested !== "compact" && requested !== "clean") {
-        ctx.ui.notify("Usage: /pretty-tui [full|compact|clean|status]", "error");
+        ctx.ui.notify("Usage: /pretty-tui [enable|disable|full|compact|clean|status]", "error");
         return;
       }
 
       cleanCompactToolCallIds.clear();
+      revealedActivityGroups.clear();
+      expandedThinkingMembers.clear();
       renderMode = requested;
       for (const component of cleanToolComponents.values()) component.updateDisplay?.();
+      for (const component of thinkingComponents.values()) component.invalidate?.();
       try {
         saveRenderMode(renderMode);
         ctx.ui.notify(`pi-pretty-tui mode set to: ${renderMode}`, "info");
@@ -148,6 +411,24 @@ export default function prettyTui(pi: ExtensionAPI) {
     },
   });
 
+  // Keep the settings command available while disabled, but do not install
+  // render patches or override built-in tools until the next enabled reload.
+  if (!activeForSession) return;
+
+  // Markdown enhancements are active only while pi-pretty-tui renders the main
+  // conversation transcript. Plugin overlays also use Pi's Markdown class, so
+  // a global always-on prototype patch would leak transcript styling into them.
+  let transcriptMarkdownDepth = 0;
+  const withTranscriptMarkdown = <T>(callback: () => T): T => {
+    transcriptMarkdownDepth++;
+    try {
+      return callback();
+    } finally {
+      transcriptMarkdownDepth--;
+    }
+  };
+  const transcriptMarkdownActive = () => transcriptMarkdownDepth > 0;
+
   // Give Pi's main prompt editor a complete rounded frame. Render the native
   // editor at a two-column narrower width so cursor layout, wrapping, IME, and
   // autocomplete remain native, then add one themed border column per side.
@@ -258,12 +539,35 @@ export default function prettyTui(pi: ExtensionAPI) {
           const top = border(topStart + markdownTheme.bold(title) + topTail + "╮");
           const bottom = border("╰" + "─".repeat(Math.max(0, frameWidth - 2)) + "╯");
           const contentWidth = Math.max(1, frameWidth - 4);
-          const body = content.render(contentWidth).map((line: string) => {
+          const body = withTranscriptMarkdown(() => content.render(contentWidth)).map((line: string) => {
             const padding = " ".repeat(Math.max(0, contentWidth - visibleWidth(line)));
             return border("│ ") + line + padding + border(" │");
           });
           return [top, ...body, bottom].map((line: string) => outer + paintBackground(line));
         },
+        handleMouse(event: any) {
+          if (!content.handleMouse) return undefined;
+          const sidePad = Math.min(outputPad, Math.max(0, Math.floor((event.width - 1) / 2)));
+          const frameWidth = Math.max(1, event.width - sidePad * 2);
+          if (frameWidth < 4) {
+            return withTranscriptMarkdown(() => content.handleMouse({
+              ...event,
+              x: event.x - sidePad,
+              width: frameWidth,
+            }));
+          }
+          const contentWidth = Math.max(1, frameWidth - 4);
+          if (event.y <= 0 || event.x < sidePad + 2 || event.x >= sidePad + 2 + contentWidth) {
+            return undefined;
+          }
+          return withTranscriptMarkdown(() => content.handleMouse({
+            ...event,
+            x: event.x - sidePad - 2,
+            y: event.y - 1,
+            width: contentWidth,
+            height: Math.max(0, event.height - 2),
+          }));
+        },
         invalidate() {
           content.invalidate?.();
         },
@@ -291,63 +595,376 @@ export default function prettyTui(pi: ExtensionAPI) {
     });
   }
 
-  // Pi's built-in assistant component turns hidden thinking into a static
-  // "Thinking..." label. In collapsed clean mode, omit that label entirely;
-  // the clean-mode Running(...) row owns activity, while Ctrl+O still reveals
-  // the thinking content. The component is exported by Pi specifically for
-  // extension-level rendering customizations, so patch its public methods
-  // rather than Pi's source.
+  const customMessageKey = (message: any): string => {
+    if (message?.timestamp !== undefined) {
+      const parsed = typeof message.timestamp === "string"
+        ? Date.parse(message.timestamp)
+        : Number(message.timestamp);
+      return Number.isFinite(parsed) ? String(parsed) : String(message.timestamp);
+    }
+    return `${message?.customType ?? "custom"}:${JSON.stringify(message?.content ?? "")}`;
+  };
+
+  const customMessageText = (message: any): string =>
+    typeof message?.content === "string"
+      ? message.content
+      : Array.isArray(message?.content)
+        ? message.content
+          .filter((item: any) => item?.type === "text" && typeof item.text === "string")
+          .map((item: any) => item.text)
+          .join("\n")
+        : "";
+
+  const addPersistentActivityUpdate = (message: any): ActivityMember => {
+    const key = customMessageKey(message);
+    const title = humanizeCustomType(message?.customType ?? "update");
+    const content = customMessageText(message);
+    return activityTimeline.addUpdate(key, title, content, true) ??
+      activityTimeline.addPendingUpdate(key, title, content, true);
+  };
+
+  const customMessagePrototype = CustomMessageComponent.prototype as any;
+  const customMessagePatchKey = Symbol.for("pretty-tui.clean-custom-message");
+  if (!customMessagePrototype[customMessagePatchKey]) {
+    const originalCustomRender = customMessagePrototype.render;
+    const originalCustomHandleMouse = customMessagePrototype.handleMouse;
+    const releaseSemanticCustomMessage = (component: any): boolean => {
+      if (!component.customRenderer) return false;
+      const key = customMessageKey(component.message);
+      const member = activityTimeline.memberForUpdate(key);
+      if (member) activityUpdateComponents.delete(member.id);
+      activityTimeline.removeUpdate(key);
+      return true;
+    };
+    const patchedCustomRender = function (this: any, width: number): string[] {
+      if (releaseSemanticCustomMessage(this)) {
+        return originalCustomRender.call(this, width);
+      }
+      const message = this.message;
+      const key = customMessageKey(message);
+      let member = activityTimeline.memberForUpdate(key);
+      if (!member) {
+        const hintedToolCallId = customUpdateToolHints.get(key);
+        const hintedGroup = hintedToolCallId
+          ? activityTimeline.groupForTool(hintedToolCallId)
+          : undefined;
+        if (hintedGroup) {
+          const attach = customUpdateBeforeToolHints.has(key)
+            ? activityTimeline.addUpdateToGroupStart.bind(activityTimeline)
+            : activityTimeline.addUpdateToGroup.bind(activityTimeline);
+          member = attach(
+            hintedGroup.id,
+            key,
+            humanizeCustomType(message?.customType ?? "update"),
+            customMessageText(message),
+            true,
+          );
+        }
+      }
+      const group = member ? activityTimeline.groupForMember(member.id) : undefined;
+      if (renderMode !== "clean" || !member || !group) {
+        return originalCustomRender.call(this, width);
+      }
+      activityUpdateComponents.set(member.id, this);
+      if (group.toolCallIds.length === 0) return renderPendingActivityUpdate(member, width);
+      const position = activityMemberPosition(group, member);
+      if (!activityGroupRevealed(group)) {
+        return position.first
+          ? ["", ...renderActivityGroupSummary(group, width, true)]
+          : [];
+      }
+      return renderActivityUpdate(group, member, width);
+    };
+    const patchedCustomHandleMouse = function (this: any, event: any) {
+      if (releaseSemanticCustomMessage(this)) {
+        return originalCustomHandleMouse?.call(this, event);
+      }
+      const member = activityTimeline.memberForUpdate(customMessageKey(this.message));
+      const group = member ? activityTimeline.groupForMember(member.id) : undefined;
+      if (renderMode !== "clean" || !member || !group) {
+        return originalCustomHandleMouse?.call(this, event);
+      }
+      if (group.toolCallIds.length === 0) return undefined;
+      return handleActivityUpdateMouse(group, member, event);
+    };
+    customMessagePrototype[customMessagePatchKey] = {
+      originalRender: originalCustomRender,
+      patchedRender: patchedCustomRender,
+      originalHandleMouse: originalCustomHandleMouse,
+      patchedHandleMouse: patchedCustomHandleMouse,
+    };
+    customMessagePrototype.render = patchedCustomRender;
+    customMessagePrototype.handleMouse = patchedCustomHandleMouse;
+    pi.on("session_shutdown", () => {
+      const patch = customMessagePrototype[customMessagePatchKey];
+      if (!patch) return;
+      if (patch.patchedRender === customMessagePrototype.render) {
+        customMessagePrototype.render = patch.originalRender;
+      }
+      if (patch.patchedHandleMouse === customMessagePrototype.handleMouse) {
+        customMessagePrototype.handleMouse = patch.originalHandleMouse;
+      }
+      if (
+        customMessagePrototype.render === patch.originalRender &&
+        customMessagePrototype.handleMouse === patch.originalHandleMouse
+      ) {
+        delete customMessagePrototype[customMessagePatchKey];
+      }
+    });
+  }
+
+  // Thinking and tools are peers in the transcript-first activity timeline.
+  // Assistant components keep Pi's native Markdown renderer, while clean mode
+  // projects each thinking run as a compact, independently expandable child.
   const assistantPrototype = AssistantMessageComponent.prototype as any;
   const thinkingPatchKey = Symbol.for("pretty-tui.clean-thinking");
   if (!assistantPrototype[thinkingPatchKey]) {
     const originalUpdateContent = assistantPrototype.updateContent;
     const originalRender = assistantPrototype.render;
+    const originalHandleMouse = assistantPrototype.handleMouse;
     const originalMessageKey = Symbol("pretty-tui.original-assistant-message");
     const renderedModeKey = Symbol("pretty-tui.rendered-assistant-mode");
-    const renderedExpansionKey = Symbol("pretty-tui.rendered-thinking-expansion");
+    const renderedExpansionKey = Symbol("pretty-tui.rendered-assistant-expansion");
+    const cleanThinkingRenderCacheKey = Symbol("pretty-tui.clean-thinking-render-cache");
+    const cleanThinkingDetailKey = Symbol("pretty-tui.clean-thinking-detail");
+
+    const eligibleThinking = (message: any) =>
+      Array.isArray(message?.content) &&
+      message.content.some(
+        (item: any) => item?.type === "thinking" &&
+          typeof item.thinking === "string" &&
+          item.thinking.length > 0,
+      ) &&
+      !assistantSystemBoundary(message);
+
+    const refreshGroup = (group: ActivityGroup) => {
+      for (const member of group.members) {
+        if (member.kind === "tool" && member.toolCallId) {
+          cleanToolComponents.get(member.toolCallId)?.updateDisplay?.();
+        } else if (member.kind === "thinking" && member.messageKey) {
+          thinkingComponents.get(member.messageKey)?.invalidate?.();
+        }
+      }
+      currentTui?.requestRender?.();
+    };
 
     const patchedUpdateContent = function (this: any, message: any, isStreaming = this.isStreaming) {
+      this[originalMessageKey] = message;
+      this[renderedModeKey] = renderMode;
+      this[renderedExpansionKey] = cleanToolsExpanded;
+      this.lastMessage = message;
       if (renderMode !== "clean") {
         originalUpdateContent.call(this, message, isStreaming);
-        this[originalMessageKey] = message;
-        this[renderedModeKey] = renderMode;
-        this[renderedExpansionKey] = undefined;
+        this.lastMessage = message;
         return;
       }
+      const groupedThinking = eligibleThinking(message);
+      if (groupedThinking) {
+        const key = assistantMessageKey(message);
+        activityTimeline.addThinking(key, thinkingText(message));
+        thinkingComponents.set(key, this);
+      }
 
-      const showThinking = cleanToolsExpanded;
-      const content = Array.isArray(message?.content) ? message.content : [];
-      // In collapsed clean mode, omit Pi's built-in Thinking... placeholder
-      // entirely. The clean-mode Running(...) row owns the activity label;
-      // expanded mode still reveals the actual thinking content.
-      const displayMessage = showThinking
-        ? message
-        : { ...message, content: content.filter((item: any) => item.type !== "thinking") };
       const previousHideThinkingBlock = this.hideThinkingBlock;
       this.hideThinkingBlock = false;
+      // Clean mode owns grouped thinking completely. Removing it from Pi's
+      // native content tree also removes the native MouseRegion that would
+      // otherwise toggle a second, unrelated `Thinking...` block.
+      const displayMessage =
+        groupedThinking && Array.isArray(message?.content)
+          ? { ...message, content: message.content.filter((item: any) => item.type !== "thinking") }
+          : message;
       try {
         originalUpdateContent.call(this, displayMessage, isStreaming);
       } finally {
         this.hideThinkingBlock = previousHideThinkingBlock;
       }
-
-      // Pi's invalidate()/setHideThinkingBlock() call updateContent with
-      // lastMessage, so retain the unfiltered message for later mode changes.
-      this[originalMessageKey] = message;
-      this[renderedModeKey] = renderMode;
-      this[renderedExpansionKey] = showThinking;
       this.lastMessage = message;
     };
 
-    const patchedRender = function (this: any, width: number): string[] {
-      const needsRefresh = this[originalMessageKey] && (
-        this[renderedModeKey] !== renderMode ||
-        (renderMode === "clean" && this[renderedExpansionKey] !== cleanToolsExpanded)
+    const renderAssistantTranscript = function (this: any, width: number): string[] {
+      const message = this[originalMessageKey] ?? this.lastMessage;
+      if (
+        message &&
+        (this[renderedModeKey] !== renderMode || this[renderedExpansionKey] !== cleanToolsExpanded)
+      ) {
+        patchedUpdateContent.call(this, message, this.isStreaming);
+      }
+      if (renderMode !== "clean" || !eligibleThinking(message)) {
+        return originalRender.call(this, width);
+      }
+
+      const key = assistantMessageKey(message);
+      const member = activityTimeline.memberForThinking(key);
+      const group = member ? activityTimeline.groupForMember(member.id) : undefined;
+      if (!member || !group) {
+        // Timeline ownership can be briefly unavailable during transcript
+        // rebuilds. Fail open to Pi's filtered native renderer so visible
+        // assistant text is never lost.
+        return originalRender.call(this, width);
+      }
+      if (group.toolCallIds.length === 0) {
+        // Activity groups are tool-oriented. A model may finish with Thinking
+        // and visible text without calling a tool; only the Thinking portion
+        // is filtered from Pi's native component, so always preserve the
+        // visible response here instead of returning an empty projection.
+        return visibleAssistantText(message) ? originalRender.call(this, width) : [];
+      }
+      thinkingComponents.set(key, this);
+      if (!activityFallbackThemes.has(group.id)) {
+        activityFallbackThemes.set(group.id, defaultActivityTheme());
+      }
+      const position = activityMemberPosition(group, member);
+      const visibleLines = visibleAssistantText(message) ? originalRender.call(this, width) : [];
+      const revealed = activityGroupRevealed(group);
+      if (!revealed) {
+        const activityLines = position.first
+          ? ["", ...renderActivityGroupSummary(group, width, true)]
+          : [];
+        return [...activityLines, ...visibleLines];
+      }
+
+      const groupTheme = activityGroupTheme(group);
+      const { prefix, continuation, childWidth } = activityTreeStyle(
+        group,
+        member,
+        width,
+        groupTheme,
+      );
+      const expanded = cleanToolsExpanded || expandedThinkingMembers.has(member.id);
+      const settledOwner = position.first ? activityGroupOwner(group) : undefined;
+      const stableSummary = !position.first || Boolean(
+        settledOwner && settledSummaries.has(settledOwner) && !toolActivityHolds.has(settledOwner),
       );
-      if (needsRefresh) {
-        patchedUpdateContent.call(this, this[originalMessageKey], this.isStreaming);
+      const cacheable = !expanded && !this.isStreaming && stableSummary;
+      const cached = cacheable ? this[cleanThinkingRenderCacheKey] : undefined;
+      if (
+        cached?.width === width &&
+        cached?.message === message &&
+        cached?.theme === groupTheme &&
+        cached?.memberCount === group.members.length &&
+        cached?.last === position.last
+      ) {
+        // Only the stable activity projection is cached. Visible assistant
+        // text belongs outside the collapsible group and must be appended on
+        // every render, including cache hits.
+        return [...cached.lines, ...visibleLines];
+      }
+      const stateLabel = this.isStreaming ? "thinking" : "thought";
+      const label = truncateToWidth(stateLabel, Math.max(1, childWidth - 2), "…");
+      const header = groupTheme.fg("thinkingLow", "● ") +
+        groupTheme.fg("toolTitle", groupTheme.bold(label));
+      let contentLines: string[] = [header];
+      if (expanded) {
+        const detailWidth = Math.max(1, childWidth - visibleWidth("  │ "));
+        const detailText = member.thinking ?? thinkingText(message);
+        let detail = this[cleanThinkingDetailKey];
+        if (!detail || detail.text !== detailText) {
+          detail = {
+            text: detailText,
+            component: new Markdown(
+              detailText,
+              0,
+              0,
+              this.markdownTheme,
+              {
+                color: (text: string) => groupTheme.fg("thinkingText", text),
+                italic: true,
+              },
+            ),
+          };
+          this[cleanThinkingDetailKey] = detail;
+        }
+        const detailLines = detail.component.render(detailWidth);
+        contentLines.push(...detailLines.map((line: string, index: number) =>
+          groupTheme.fg("dim", index === detailLines.length - 1 ? "  └ " : "  │ ") + line
+        ));
+      }
+      const decorated = contentLines.map((line, index) =>
+        truncateToWidth((index === 0 ? prefix : continuation) + line, Math.max(1, width), "")
+      );
+      const output = position.first
+        ? ["", ...renderActivityGroupSummary(group, width), ...decorated]
+        : decorated;
+      if (cacheable) {
+        this[cleanThinkingRenderCacheKey] = {
+          width,
+          message,
+          theme: groupTheme,
+          memberCount: group.members.length,
+          last: position.last,
+          lines: output,
+        };
+      }
+      return [...output, ...visibleLines];
+    };
+
+    const patchedRender = function (this: any, width: number): string[] {
+      return withTranscriptMarkdown(() => renderAssistantTranscript.call(this, width));
+    };
+
+    const handleAssistantTranscriptMouse = function (this: any, event: any) {
+      const message = this[originalMessageKey] ?? this.lastMessage;
+      if (renderMode !== "clean" || !eligibleThinking(message)) {
+        return originalHandleMouse.call(this, event);
+      }
+      const key = assistantMessageKey(message);
+      const member = activityTimeline.memberForThinking(key);
+      const group = member ? activityTimeline.groupForMember(member.id) : undefined;
+      if (!member || !group) return originalHandleMouse.call(this, event);
+      if (group.toolCallIds.length === 0) return originalHandleMouse.call(this, event);
+      const position = activityMemberPosition(group, member);
+      const isLeftClick = event.type === "click" && event.button === "left";
+
+      // A completed assistant message can contain both the final Thought and
+      // visible Markdown. The Markdown is rendered after the activity rows;
+      // route clicks in that suffix back to Pi's native component so links,
+      // text selection, and code-block Copy controls keep working.
+      if (visibleAssistantText(message)) {
+        const visibleLines = originalRender.call(this, event.width);
+        const renderedLines = patchedRender.call(this, event.width);
+        const activityHeight = Math.max(0, renderedLines.length - visibleLines.length);
+        if (event.y >= activityHeight) {
+          return originalHandleMouse.call(this, {
+            ...event,
+            y: event.y - activityHeight,
+            height: visibleLines.length,
+          });
+        }
+      }
+
+      if (!activityGroupRevealed(group)) {
+        if (!isLeftClick) return undefined;
+        if (position.first) {
+          revealedActivityGroups.add(group.id);
+          for (const toolCallId of group.toolCallIds) cleanCompactToolCallIds.add(toolCallId);
+          refreshGroup(group);
+        }
+        return { handled: true };
       }
-      return originalRender.call(this, width);
+      const summaryHeight = position.first ? renderActivityGroupSummary(group, event.width).length : 0;
+      if (position.first && event.y > 0 && event.y <= summaryHeight && isLeftClick) {
+        revealedActivityGroups.delete(group.id);
+        for (const toolCallId of group.toolCallIds) {
+          cleanCompactToolCallIds.delete(toolCallId);
+          const component = cleanToolComponents.get(toolCallId);
+          if (component?.expanded) component.setExpanded(false);
+        }
+        for (const child of group.members) expandedThinkingMembers.delete(child.id);
+        refreshGroup(group);
+        return { handled: true };
+      }
+      if (isLeftClick) {
+        if (expandedThinkingMembers.has(member.id)) expandedThinkingMembers.delete(member.id);
+        else expandedThinkingMembers.add(member.id);
+        refreshGroup(group);
+        return { handled: true };
+      }
+      return undefined;
+    };
+
+    const patchedHandleMouse = function (this: any, event: any) {
+      return withTranscriptMarkdown(() => handleAssistantTranscriptMouse.call(this, event));
     };
 
     assistantPrototype[thinkingPatchKey] = {
@@ -355,9 +972,12 @@ export default function prettyTui(pi: ExtensionAPI) {
       patchedUpdateContent,
       originalRender,
       patchedRender,
+      originalHandleMouse,
+      patchedHandleMouse,
     };
     assistantPrototype.updateContent = patchedUpdateContent;
     assistantPrototype.render = patchedRender;
+    assistantPrototype.handleMouse = patchedHandleMouse;
 
     pi.on("session_shutdown", () => {
       const patch = assistantPrototype[thinkingPatchKey];
@@ -368,9 +988,13 @@ export default function prettyTui(pi: ExtensionAPI) {
       if (patch.patchedRender === assistantPrototype.render) {
         assistantPrototype.render = patch.originalRender;
       }
+      if (patch.patchedHandleMouse === assistantPrototype.handleMouse) {
+        assistantPrototype.handleMouse = patch.originalHandleMouse;
+      }
       if (
         assistantPrototype.updateContent === patch.originalUpdateContent &&
-        assistantPrototype.render === patch.originalRender
+        assistantPrototype.render === patch.originalRender &&
+        assistantPrototype.handleMouse === patch.originalHandleMouse
       ) {
         delete assistantPrototype[thinkingPatchKey];
       }
@@ -403,20 +1027,76 @@ export default function prettyTui(pi: ExtensionAPI) {
     ];
   };
 
+  const indexDisplayedCustomUpdateHints = (entries: any[]) => {
+    customUpdateToolHints.clear();
+    customUpdateBeforeToolHints.clear();
+    let lastToolCallId: string | undefined;
+    let pendingCustomKeys: string[] = [];
+    for (const entry of entries) {
+      if (entry?.type === "compaction") {
+        lastToolCallId = undefined;
+        pendingCustomKeys = [];
+        continue;
+      }
+      if (entry?.type === "custom_message") {
+        if (entry.display !== false) {
+          const key = customMessageKey(entry);
+          if (lastToolCallId) customUpdateToolHints.set(key, lastToolCallId);
+          else pendingCustomKeys.push(key);
+        }
+        continue;
+      }
+      if (entry?.type !== "message") continue;
+      const message = entry.message;
+      if (message?.role === "user") {
+        lastToolCallId = undefined;
+        pendingCustomKeys = [];
+        continue;
+      }
+      if (message?.role === "assistant") {
+        const toolCalls = (Array.isArray(message.content) ? message.content : [])
+          .filter((item: any) => item?.type === "toolCall" && item.id);
+        if (toolCalls.length > 0 && pendingCustomKeys.length > 0) {
+          for (const key of pendingCustomKeys) {
+            customUpdateToolHints.set(key, toolCalls[0].id);
+            customUpdateBeforeToolHints.add(key);
+          }
+          pendingCustomKeys = [];
+        }
+        if (visibleAssistantText(message) || assistantSystemBoundary(message)) {
+          lastToolCallId = undefined;
+          pendingCustomKeys = [];
+        }
+        for (const item of toolCalls) lastToolCallId = item.id;
+        continue;
+      }
+      if (message?.role === "toolResult" && message.toolCallId) {
+        lastToolCallId = message.toolCallId;
+      }
+    }
+  };
+
   const interactiveModePrototype = InteractiveMode.prototype as any;
   const toolsExpansionPatchKey = Symbol.for("pretty-tui.clean-tool-expansion");
   if (!interactiveModePrototype[toolsExpansionPatchKey]) {
     const originalSetToolsExpanded = interactiveModePrototype.setToolsExpanded;
     const originalRenderSessionEntries = interactiveModePrototype.renderSessionEntries;
     const originalSwitchTuiMode = interactiveModePrototype.switchTuiMode;
+    const originalShowExtensionNotify = interactiveModePrototype.showExtensionNotify;
     const patchedSetToolsExpanded = function (this: any, expanded: boolean) {
       cleanToolsExpanded = expanded;
       changingAllToolsExpansion = true;
-      if (!expanded) cleanCompactToolCallIds.clear();
+      if (!expanded) {
+        cleanCompactToolCallIds.clear();
+        revealedActivityGroups.clear();
+        expandedThinkingMembers.clear();
+      }
       try {
         return originalSetToolsExpanded.call(this, expanded);
       } finally {
         changingAllToolsExpansion = false;
+        for (const component of thinkingComponents.values()) component.invalidate?.();
+        this.ui?.requestRender?.();
       }
     };
 
@@ -426,11 +1106,9 @@ export default function prettyTui(pi: ExtensionAPI) {
       // buildContextEntries() prepends the latest compaction for model context,
       // while Pi's live compaction UI appends it chronologically. Keep reloads
       // and transcript rebuilds consistent with that live presentation.
-      return originalRenderSessionEntries.call(
-        this,
-        orderContextEntriesForTranscript(entries),
-        options,
-      );
+      const orderedEntries = orderContextEntriesForTranscript(entries);
+      indexDisplayedCustomUpdateHints(orderedEntries);
+      return originalRenderSessionEntries.call(this, orderedEntries, options);
     };
 
     const patchedSwitchTuiMode = function (this: any, ...args: any[]) {
@@ -440,6 +1118,43 @@ export default function prettyTui(pi: ExtensionAPI) {
       return result;
     };
 
+    const patchedShowExtensionNotify = function (
+      this: any,
+      message: string,
+      type?: "info" | "warning" | "error",
+    ) {
+      if (renderMode !== "clean" || (type !== undefined && type !== "info")) {
+        return originalShowExtensionNotify.call(this, message, type);
+      }
+      const [firstLine, ...remainingLines] = String(message).split("\n");
+      const updateKey = `info:${++activityUpdateSequence}`;
+      const title = firstLine || "Info";
+      const content = remainingLines.join("\n");
+      const member = activityTimeline.addUpdate(updateKey, title, content, false) ??
+        activityTimeline.addPendingUpdate(updateKey, title, content, false);
+      const group = activityTimeline.groupForMember(member.id);
+      if (!group || !this.chatContainer?.addChild) {
+        return originalShowExtensionNotify.call(this, message, type);
+      }
+      const component: Component = {
+        render: (width: number) => {
+          if (group.toolCallIds.length === 0) return renderPendingActivityUpdate(member, width);
+          const position = activityMemberPosition(group, member);
+          if (!activityGroupRevealed(group)) {
+            return position.first
+              ? ["", ...renderActivityGroupSummary(group, width, true)]
+              : [];
+          }
+          return renderActivityUpdate(group, member, width);
+        },
+        invalidate() {},
+        handleMouse: (event: any) => handleActivityUpdateMouse(group, member, event),
+      } as Component;
+      activityUpdateComponents.set(member.id, component);
+      this.chatContainer.addChild(component);
+      this.ui?.requestRender?.();
+    };
+
     interactiveModePrototype[toolsExpansionPatchKey] = {
       originalSetToolsExpanded,
       patchedSetToolsExpanded,
@@ -447,10 +1162,13 @@ export default function prettyTui(pi: ExtensionAPI) {
       patchedRenderSessionEntries,
       originalSwitchTuiMode,
       patchedSwitchTuiMode,
+      originalShowExtensionNotify,
+      patchedShowExtensionNotify,
     };
     interactiveModePrototype.setToolsExpanded = patchedSetToolsExpanded;
     interactiveModePrototype.renderSessionEntries = patchedRenderSessionEntries;
     interactiveModePrototype.switchTuiMode = patchedSwitchTuiMode;
+    interactiveModePrototype.showExtensionNotify = patchedShowExtensionNotify;
 
     pi.on("session_shutdown", () => {
       fullscreenTui = false;
@@ -467,10 +1185,14 @@ export default function prettyTui(pi: ExtensionAPI) {
       if (patch.patchedSwitchTuiMode === interactiveModePrototype.switchTuiMode) {
         interactiveModePrototype.switchTuiMode = patch.originalSwitchTuiMode;
       }
+      if (patch.patchedShowExtensionNotify === interactiveModePrototype.showExtensionNotify) {
+        interactiveModePrototype.showExtensionNotify = patch.originalShowExtensionNotify;
+      }
       if (
         interactiveModePrototype.setToolsExpanded === patch.originalSetToolsExpanded &&
         interactiveModePrototype.renderSessionEntries === patch.originalRenderSessionEntries &&
-        interactiveModePrototype.switchTuiMode === patch.originalSwitchTuiMode
+        interactiveModePrototype.switchTuiMode === patch.originalSwitchTuiMode &&
+        interactiveModePrototype.showExtensionNotify === patch.originalShowExtensionNotify
       ) {
         delete interactiveModePrototype[toolsExpansionPatchKey];
       }
@@ -546,6 +1268,7 @@ export default function prettyTui(pi: ExtensionAPI) {
   const codeBlockPatchKey = Symbol.for("pretty-tui.code-blocks");
   const codeBlockCollectionKey = Symbol("pretty-tui.code-block-collection");
   const codeBlockRegionsKey = Symbol("pretty-tui.code-block-regions");
+  const transcriptMarkdownStateKey = Symbol("pretty-tui.transcript-markdown-state");
   if (!markdownPrototype[codeBlockPatchKey]) {
     const originalInvalidate = markdownPrototype.invalidate;
     const originalRender = markdownPrototype.render;
@@ -561,6 +1284,15 @@ export default function prettyTui(pi: ExtensionAPI) {
     };
 
     const patchedRender = function (this: any, width: number): string[] {
+      const scoped = transcriptMarkdownActive();
+      if (this[transcriptMarkdownStateKey] !== scoped) {
+        delete this[codeBlockCollectionKey];
+        delete this[codeBlockRegionsKey];
+        originalInvalidate.call(this);
+        this[transcriptMarkdownStateKey] = scoped;
+      }
+      if (!scoped) return originalRender.call(this, width);
+
       const needsRender =
         !this.cachedLines || this.cachedText !== this.text || this.cachedWidth !== width;
       if (needsRender) this[codeBlockCollectionKey] = [];
@@ -604,6 +1336,100 @@ export default function prettyTui(pi: ExtensionAPI) {
       nextTokenType?: string,
       styleContext?: any,
     ): string[] {
+      if (!transcriptMarkdownActive()) {
+        return originalRenderToken.call(this, token, width, nextTokenType, styleContext);
+      }
+
+      if (token?.type === "heading") {
+        const level = Math.max(1, Math.min(6, Number(token.depth) || 1));
+        const maxWidth = Math.max(1, width);
+        const addHeadingSpacing = (lines: string[]) => {
+          if (nextTokenType && nextTokenType !== "space") lines.push("");
+          return lines;
+        };
+        const headingStyle = (text: string) => this.theme.heading(text);
+        const foregroundLuminance = (styled: string): number | undefined => {
+          const trueColor = /\x1b\[38;2;(\d+);(\d+);(\d+)m/.exec(styled);
+          if (!trueColor) return undefined;
+          const [, red, green, blue] = trueColor.map(Number);
+          return red * 0.2126 + green * 0.7152 + blue * 0.0722;
+        };
+        const defaultLuminance = foregroundLuminance(this.applyDefaultStyle("M"));
+        const headingLuminance = foregroundLuminance(headingStyle("M"));
+        const darkTheme =
+          defaultLuminance !== undefined
+            ? defaultLuminance >= 128
+            : (headingLuminance ?? 255) >= 160;
+        const whiteStyle = (text: string) => `\x1b[97m${text}\x1b[39m`;
+        const titleStyle =
+          level === 1 || level === 3
+            ? (text: string) => headingStyle(this.theme.bold(this.theme.underline(text)))
+            : level === 2
+              ? (text: string) =>
+                  (darkTheme ? whiteStyle : headingStyle)(
+                    this.theme.bold(this.theme.underline(text)),
+                  )
+              : level === 4
+                ? (text: string) => headingStyle(this.theme.bold(text))
+                : level === 5
+                  ? headingStyle
+                  : (text: string) => this.theme.quote(this.theme.italic(text));
+        const titleContext = {
+          applyText: titleStyle,
+          stylePrefix: this.getStylePrefix(titleStyle),
+        };
+        const title = this.renderInlineTokens(token.tokens || [], titleContext);
+
+        if (level === 1 && maxWidth >= 6) {
+          const maximumInnerWidth = maxWidth - 4;
+          const titleLines = wrapTextWithAnsi(title, Math.max(1, maximumInnerWidth));
+          const innerWidth = Math.max(
+            1,
+            ...titleLines.map((line: string) => visibleWidth(line)),
+          );
+          const frameWidth = Math.min(maxWidth, innerWidth + 4);
+          const frameStyle = (text: string) => headingStyle(this.theme.bold(text));
+          const lines = [
+            frameStyle(`╔${"═".repeat(frameWidth - 2)}╗`),
+            ...titleLines.map((line: string) => {
+              const padding = " ".repeat(Math.max(0, innerWidth - visibleWidth(line)));
+              return frameStyle("║ ") + line + frameStyle(`${padding} ║`);
+            }),
+            frameStyle(`╚${"═".repeat(frameWidth - 2)}╝`),
+          ];
+          return addHeadingSpacing(lines);
+        }
+
+        if (level === 2) {
+          // Reverse only the rendered title cells: the theme's heading color
+          // becomes a compact, content-width background label with no frame.
+          const lines = wrapTextWithAnsi(title, maxWidth).map((line: string) =>
+            darkTheme
+              ? `\x1b[48;5;94m${line}\x1b[49m`
+              : `\x1b[107m\x1b[7m${line}\x1b[27m\x1b[49m`
+          );
+          return addHeadingSpacing(lines);
+        }
+
+        if (level === 5 && maxWidth >= 8) {
+          const prefix = "┄┄ ";
+          const suffix = " ┄┄";
+          const contentWidth = Math.max(
+            1,
+            maxWidth - visibleWidth(prefix) - visibleWidth(suffix),
+          );
+          const wrapped = wrapTextWithAnsi(title, contentWidth);
+          const lines = wrapped.map((line: string, index: number) => {
+            const left = index === 0 ? this.theme.heading(prefix) : " ".repeat(visibleWidth(prefix));
+            const right = index === wrapped.length - 1 ? this.theme.heading(suffix) : "";
+            return left + line + right;
+          });
+          return addHeadingSpacing(lines);
+        }
+
+        return addHeadingSpacing(wrapTextWithAnsi(title, maxWidth));
+      }
+
       if (token?.type !== "code") {
         return originalRenderToken.call(this, token, width, nextTokenType, styleContext);
       }
@@ -676,6 +1502,15 @@ export default function prettyTui(pi: ExtensionAPI) {
     };
 
     const patchedHandleMouse = function (this: any, event: TuiMouseEvent) {
+      // Fullscreen layout hit-testing may dispatch directly to this Markdown
+      // leaf instead of traversing AssistantMessageComponent.handleMouse. The
+      // most recent render therefore records whether this instance belongs to
+      // the main transcript; dynamic render scope alone is not sufficient.
+      const transcriptOwned = transcriptMarkdownActive() || this[transcriptMarkdownStateKey] === true;
+      if (!transcriptOwned) {
+        delete this[codeBlockRegionsKey];
+        return originalHandleMouse?.call(this, event);
+      }
       if (event.button === "left" && (event.type === "press" || event.type === "click")) {
         const region = (this[codeBlockRegionsKey] ?? []).find(
           (candidate: any) =>
@@ -823,10 +1658,24 @@ export default function prettyTui(pi: ExtensionAPI) {
     context.state.compactToolStatus = status;
   };
 
+  const foregroundLuminance = (styled: string): number | undefined => {
+    const trueColor = /\x1b\[38;2;(\d+);(\d+);(\d+)m/.exec(styled);
+    if (!trueColor) return undefined;
+    const [, red, green, blue] = trueColor.map(Number);
+    return red * 0.2126 + green * 0.7152 + blue * 0.0722;
+  };
+
+  const successMarkerColor = (theme: any): string => {
+    const textLuminance = foregroundLuminance(theme.fg("text", "M"));
+    return textLuminance !== undefined && textLuminance < 128
+      ? "success"
+      : "syntaxComment";
+  };
+
   const callRow = (theme: any, name: string, detail: string, state: any): DisplayRow => ({
     prefix: () => {
       const status = (state.compactToolStatus ?? "running") as ToolStatus;
-      const color = status === "success" ? "success" : status === "error" ? "error" : "dim";
+      const color = status === "success" ? successMarkerColor(theme) : status === "error" ? "error" : "dim";
       return theme.fg(color, "● ");
     },
     continuation: "  ",
@@ -840,7 +1689,7 @@ export default function prettyTui(pi: ExtensionAPI) {
   const call = (theme: any, name: string, detail: string, state: any) =>
     block([callRow(theme, name, detail, state)]);
 
-  const writeCall = (theme: any, path: string, content: string, expanded: boolean, state: any) => {
+  const writeCall = (theme: any, name: string, path: string, content: string, expanded: boolean, state: any) => {
     const lines = content.replace(/\t/g, "    ").split("\n");
     while (lines.length > 0 && lines[lines.length - 1] === "") lines.pop();
 
@@ -848,14 +1697,14 @@ export default function prettyTui(pi: ExtensionAPI) {
     const shown = lines.slice(0, expanded ? total : 10);
     const remaining = total - shown.length;
     const rows: DisplayRow[] = [
-      callRow(theme, "Write", `${path} · ${total} ${total === 1 ? "line" : "lines"}`, state),
+      callRow(theme, name, `${path} · ${total} ${total === 1 ? "line" : "lines"}`, state),
     ];
 
     for (let index = 0; index < shown.length; index++) {
       const isLast = index === shown.length - 1 && remaining === 0;
       rows.push({
         prefix: theme.fg("dim", isLast ? "   └ " : "   │ "),
-        continuation: theme.fg("dim", "   │ "),
+        continuation: isLast ? "     " : theme.fg("dim", "   │ "),
         content: theme.fg("toolOutput", shown[index] || " "),
       });
     }
@@ -888,19 +1737,22 @@ export default function prettyTui(pi: ExtensionAPI) {
 
     if (expanded && output) {
       const lines = output.split("\n");
+      while (lines.length > 1 && lines[lines.length - 1] === "") lines.pop();
       const shown = lines.slice(0, 40);
-      for (const line of shown) {
+      const omitted = lines.length - shown.length;
+      for (let index = 0; index < shown.length; index++) {
+        const isLast = index === shown.length - 1 && omitted === 0;
         rows.push({
-          prefix: theme.fg("dim", "   │ "),
-          continuation: theme.fg("dim", "   │ "),
-          content: outputStyle(line || " "),
+          prefix: theme.fg("dim", isLast ? "   └ " : "   │ "),
+          continuation: isLast ? "     " : theme.fg("dim", "   │ "),
+          content: outputStyle(shown[index] || " "),
         });
       }
-      if (lines.length > shown.length) {
+      if (omitted > 0) {
         rows.push({
           prefix: theme.fg("muted", "   └ "),
           continuation: "     ",
-          content: theme.fg("muted", `… ${lines.length - shown.length} more lines`),
+          content: theme.fg("muted", `… ${omitted} more lines`),
         });
       }
     }
@@ -974,7 +1826,7 @@ export default function prettyTui(pi: ExtensionAPI) {
       const isLast = index === shown.length - 1;
       rows.push({
         prefix: theme.fg("dim", isLast ? "   └ " : "   │ "),
-        continuation: theme.fg("dim", "   │ "),
+        continuation: isLast ? "     " : theme.fg("dim", "   │ "),
         content: theme.fg("toolOutput", shown[index] || " "),
       });
     }
@@ -991,6 +1843,7 @@ export default function prettyTui(pi: ExtensionAPI) {
   type ToolSummaryGroup = {
     count: number;
     failed: number;
+    thoughtCount?: number;
     lastToolCallId: string;
     toolCallIds?: string[];
     activity?: string;
@@ -998,12 +1851,12 @@ export default function prettyTui(pi: ExtensionAPI) {
   type ToolSummaryData = {
     count?: number;
     failed?: number;
+    thoughtCount?: number;
     /** Identifies the last tool component for older single-group entries. */
     lastToolCallId?: string;
     /** All groups from a run, used to restore summaries after reload. */
     groups?: ToolSummaryGroup[];
   };
-  const supportedTools = new Set(["read", "bash", "edit", "write", "grep", "find", "ls"]);
   type ToolActivityHold = {
     toolCallId: string;
     name: string;
@@ -1012,7 +1865,12 @@ export default function prettyTui(pi: ExtensionAPI) {
     started: boolean;
     timer?: ReturnType<typeof setTimeout>;
   };
-  const settledSummaries = new Map<string, { count: number; failed: number; activity: DisplayValue }>();
+  const settledSummaries = new Map<string, {
+    count: number;
+    failed: number;
+    thoughtCount: number;
+    activity: DisplayValue;
+  }>();
   const toolActivityHolds = new Map<string, ToolActivityHold>();
   const legacySummaryLastToolCallIds = new Map<string, string>();
   const knownToolCallIds = new Set<string>();
@@ -1040,8 +1898,64 @@ export default function prettyTui(pi: ExtensionAPI) {
     settled: false,
   };
 
-  const toolDisplayName = (name: string): string =>
-    name === "ls" ? "List" : name.charAt(0).toUpperCase() + name.slice(1);
+  const toolLabel = (toolName: string, label?: string): string => label || toolName;
+
+  const conciseThirdPartyArgs = (args: any): string => {
+    if (!args || typeof args !== "object" || Array.isArray(args)) return "";
+    const sensitive = /(?:token|secret|password|authorization|credential|api[_-]?key)/iu;
+    const preferred = ["path", "query", "url", "offset", "id"];
+    const entries = Object.entries(args)
+      .filter(([key, value]) => !sensitive.test(key) && ["string", "number", "boolean"].includes(typeof value))
+      .sort(([left], [right]) => {
+        const leftRank = preferred.indexOf(left);
+        const rightRank = preferred.indexOf(right);
+        return (leftRank < 0 ? preferred.length : leftRank) -
+          (rightRank < 0 ? preferred.length : rightRank);
+      })
+      .slice(0, 2)
+      .map(([key, value]) => {
+        const safeValue = String(value)
+          .replace(/(https?:\/\/)[^\s/@:]+:[^\s/@]+@/giu, "$1…:…@")
+          .replace(/([?&](?:token|secret|password|api[_-]?key)=)[^&\s]+/giu, "$1…");
+        const rendered = truncateToWidth(safeValue, 36, "…");
+        return `${key}=${rendered}`;
+      });
+    return entries.join(" · ");
+  };
+
+  const thirdPartyResultSummary = (component: any): string => {
+    const detailsError = component.result?.details?.error;
+    const firstText = component.result?.content?.find(
+      (item: any) => item?.type === "text" && typeof item.text === "string" && item.text.length > 0,
+    )?.text;
+    const text = String(typeof detailsError === "string" ? detailsError : firstText ?? "");
+    const boundedText = text.slice(0, 512);
+    const newline = boundedText.indexOf("\n");
+    const boundedFirstLine = boundedText.slice(0, newline < 0 ? boundedText.length : newline);
+    const firstLine = stripTerminalSequences(boundedFirstLine).trim();
+    if (firstLine) return truncateToWidth(firstLine, 72, "…");
+    if (component.result) return component.result.isError ? "Failed" : "Done";
+    return component.executionStarted ? "Running…" : "Pending";
+  };
+
+  const renderThirdPartyCompact = (component: any, width: number, theme: any): string[] => {
+    const label = toolLabel(component.toolName, component.toolDefinition?.label);
+    const args = conciseThirdPartyArgs(component.args);
+    const dotColor = component.result?.isError
+      ? "error"
+      : component.result && !component.isPartial
+        ? successMarkerColor(theme)
+        : "accent";
+    const title = theme.fg(dotColor, "● ") +
+      theme.fg("accent", theme.bold(label)) +
+      (args ? theme.fg("muted", `(${args})`) : "");
+    const result = thirdPartyResultSummary(component);
+    const resultColor = component.result?.isError ? "error" : "muted";
+    return [
+      truncateToWidth(title, Math.max(1, width), "…"),
+      theme.fg(resultColor, truncateToWidth(`  └ ${result}`, Math.max(1, width), "…")),
+    ];
+  };
 
   const clearToolActivityHolds = () => {
     for (const hold of toolActivityHolds.values()) {
@@ -1088,7 +2002,7 @@ export default function prettyTui(pi: ExtensionAPI) {
       toolCallId,
       name,
       until: startedAt + CLEAN_TOOL_ACTIVITY_MIN_MS,
-      after: "thinking...",
+      after: "thinking",
       started,
     });
     cleanRun.activeToolName = name;
@@ -1103,14 +2017,14 @@ export default function prettyTui(pi: ExtensionAPI) {
         toolCallId,
         name,
         until: now + CLEAN_TOOL_ACTIVITY_MIN_MS,
-        after: "thinking...",
+        after: "thinking",
         started: true,
       };
       toolActivityHolds.set(toolCallId, hold);
     }
     hold.name = name;
     hold.started = true;
-    hold.after = "thinking...";
+    hold.after = "thinking";
     scheduleToolActivityRelease(hold);
   };
 
@@ -1124,15 +2038,18 @@ export default function prettyTui(pi: ExtensionAPI) {
   const liveCleanToolCount = (): number =>
     Math.max(cleanRun.count, cleanRun.currentToolCallIds.length);
 
+  const thoughtCountForTool = (toolCallId: string | undefined): number =>
+    toolCallId ? activityTimeline.groupForTool(toolCallId)?.thoughtCount ?? 0 : 0;
+
   const currentCleanActivity = (): string => {
     if (cleanRun.activeToolCallId) {
-      return cleanRun.activeToolName ?? cleanRun.activity ?? "thinking...";
+      return cleanRun.activeToolName ?? cleanRun.activity ?? "thinking";
     }
     if (cleanRun.lastCompletedToolCallId) {
       const hold = toolActivityHolds.get(cleanRun.lastCompletedToolCallId);
       if (hold) return heldActivity(hold);
     }
-    return cleanRun.activeToolName ?? cleanRun.activity ?? (cleanRun.active ? "thinking..." : "done");
+    return cleanRun.activeToolName ?? cleanRun.activity ?? (cleanRun.active ? "thinking" : "done");
   };
 
   pi.on("session_shutdown", clearToolActivityHolds);
@@ -1148,116 +2065,198 @@ export default function prettyTui(pi: ExtensionAPI) {
     const originalToolRender = toolExecutionPrototype.render;
     const originalToolHandleMouse = toolExecutionPrototype.handleMouse;
     const renderedModeKey = Symbol("pretty-tui.tool-rendered-mode");
-    const revealCleanGroup = (groupToolCallIds: string[], ui?: any) => {
-      for (const toolCallId of groupToolCallIds) cleanCompactToolCallIds.add(toolCallId);
-      for (const toolCallId of groupToolCallIds) cleanToolComponents.get(toolCallId)?.updateDisplay();
+    const cleanChildRenderCacheKey = Symbol("pretty-tui.clean-child-render-cache");
+    const refreshActivityGroup = (group: ActivityGroup) => {
+      for (const member of group.members) {
+        if (member.kind === "tool" && member.toolCallId) {
+          cleanToolComponents.get(member.toolCallId)?.updateDisplay();
+        } else if (member.kind === "thinking" && member.messageKey) {
+          thinkingComponents.get(member.messageKey)?.invalidate?.();
+        }
+      }
+    };
+    const revealCleanGroup = (group: ActivityGroup, ui?: any) => {
+      revealedActivityGroups.add(group.id);
+      for (const toolCallId of group.toolCallIds) cleanCompactToolCallIds.add(toolCallId);
+      refreshActivityGroup(group);
+      ui?.requestRender?.();
+    };
+    const collapseCleanGroup = (group: ActivityGroup, ui?: any) => {
+      revealedActivityGroups.delete(group.id);
+      for (const toolCallId of group.toolCallIds) {
+        const component = cleanToolComponents.get(toolCallId);
+        if (component?.expanded) originalSetExpanded.call(component, false);
+        cleanCompactToolCallIds.delete(toolCallId);
+      }
+      for (const member of group.members) expandedThinkingMembers.delete(member.id);
+      refreshActivityGroup(group);
       ui?.requestRender?.();
     };
     const patchedMarkExecutionStarted = function (this: any) {
-      if (supportedTools.has(this.toolName)) {
-        if (!cleanRun.currentToolCallIds.includes(this.toolCallId)) {
-          cleanRun.currentToolCallIds.push(this.toolCallId);
-        }
-        cleanRun.activeToolCallIds.add(this.toolCallId);
-        cleanToolNames.set(this.toolCallId, toolDisplayName(this.toolName));
-        setCleanGroupMembers(this.toolCallId, cleanRun.currentToolCallIds.slice());
-        if (typeof this.ui?.requestRender === "function") {
-          cleanRun.requestRender = () => this.ui.requestRender();
-        }
-        cleanRun.active = true;
-        cleanRun.activeToolCallId = this.toolCallId;
-        beginToolActivity(this.toolCallId, toolDisplayName(this.toolName), true);
-      }
+      activityTimeline.addTool(this.toolCallId, this.toolName);
+      if (!cleanRun.currentToolCallIds.includes(this.toolCallId)) {
+        cleanRun.currentToolCallIds.push(this.toolCallId);
+      }
+      cleanRun.activeToolCallIds.add(this.toolCallId);
+      const displayName = toolLabel(this.toolName, this.toolDefinition?.label);
+      cleanToolNames.set(this.toolCallId, displayName);
+      setCleanGroupMembers(this.toolCallId, cleanRun.currentToolCallIds.slice());
+      if (typeof this.ui?.requestRender === "function") {
+        cleanRun.requestRender = () => this.ui.requestRender();
+      }
+      cleanRun.active = true;
+      cleanRun.activeToolCallId = this.toolCallId;
+      beginToolActivity(this.toolCallId, displayName, true);
       return originalMarkExecutionStarted.call(this);
     };
     const patchedSetExpanded = function (this: any, expanded: boolean) {
-      const groupToolCallIds = cleanGroupToolCallIds.get(this.toolCallId);
+      const group = activityTimeline.groupForTool(this.toolCallId);
       if (
         renderMode === "clean" &&
         !changingAllToolsExpansion &&
         expanded &&
         !this.expanded &&
-        !isCleanGroupRevealed(this.toolCallId) &&
-        groupToolCallIds?.length
+        group &&
+        !activityGroupRevealed(group)
       ) {
-        revealCleanGroup(groupToolCallIds, this.ui);
+        revealCleanGroup(group, this.ui);
         return;
       }
       return originalSetExpanded.call(this, expanded);
     };
     const patchedToolRender = function (this: any, width: number): string[] {
-      if (supportedTools.has(this.toolName)) {
-        cleanToolComponents.set(this.toolCallId, this);
-        knownToolCallIds.add(this.toolCallId);
-      }
+      cleanToolComponents.set(this.toolCallId, this);
+      knownToolCallIds.add(this.toolCallId);
+      const member = activityTimeline.addTool(this.toolCallId, this.toolName);
+      cleanToolNames.set(
+        this.toolCallId,
+        toolLabel(this.toolName, this.toolDefinition?.label),
+      );
       if (this[renderedModeKey] !== renderMode) {
         this[renderedModeKey] = renderMode;
         this.updateDisplay();
       }
 
-      const groupOwner = cleanToolCallGroupOwners.get(this.toolCallId);
-      const groupToolCallIds = groupOwner ? cleanGroupToolCallIds.get(groupOwner) : undefined;
-      const childIndex = groupToolCallIds?.indexOf(this.toolCallId) ?? -1;
-      const showAsChild = renderMode === "clean" && childIndex >= 0 && isCleanGroupRevealed(this.toolCallId);
-      if (!showAsChild || !groupOwner || !groupToolCallIds) {
-        return originalToolRender.call(this, width);
+      const group = activityTimeline.groupForMember(member.id);
+      if (renderMode !== "clean" || !group) return originalToolRender.call(this, width);
+      const position = activityMemberPosition(group, member);
+      if (!activityGroupRevealed(group)) {
+        return position.first
+          ? ["", ...renderActivityGroupSummary(group, width, true)]
+          : [];
+      }
+
+      const childTheme = cleanThemeForToolCall(this.toolCallId) ?? activityGroupTheme(group);
+      const {
+        prefix: childPrefix,
+        continuation,
+        childWidth,
+      } = activityTreeStyle(group, member, width, childTheme);
+      const thirdParty = !SPECIALIZED_TOOL_NAMES.has(this.toolName);
+      const cacheable = !this.expanded && Boolean(this.result) && !this.isPartial;
+      const cached = cacheable ? this[cleanChildRenderCacheKey] : undefined;
+      let decoratedContent: string[];
+      if (
+        cached?.width === width &&
+        cached?.childWidth === childWidth &&
+        cached?.result === this.result &&
+        cached?.args === this.args &&
+        cached?.callRenderer === this.callRendererComponent &&
+        cached?.resultRenderer === this.resultRendererComponent &&
+        cached?.theme === childTheme &&
+        cached?.last === position.last &&
+        cached?.memberCount === group.members.length
+      ) {
+        decoratedContent = cached.lines;
+      } else {
+        let contentLines: string[];
+        if (thirdParty) {
+          const summaryLines = renderThirdPartyCompact(this, childWidth, childTheme);
+          if (this.expanded) {
+            const detailPrefix = "  │ ";
+            const nativeLines = originalToolRender.call(
+              this,
+              Math.max(1, childWidth - visibleWidth(detailPrefix)),
+            );
+            const nativeContentLines = nativeLines[0] === "" ? nativeLines.slice(1) : nativeLines;
+            contentLines = [
+              summaryLines[0],
+              ...nativeContentLines.map((line: string, index: number) =>
+                childTheme.fg(
+                  "dim",
+                  index === nativeContentLines.length - 1 ? "  └ " : detailPrefix,
+                ) + stripAnsiBackgrounds(line)
+              ),
+            ];
+          } else {
+            contentLines = summaryLines;
+          }
+        } else {
+          const lines = originalToolRender.call(this, childWidth);
+          if (lines.length === 0) return lines;
+          contentLines = lines[0] === "" ? lines.slice(1) : lines;
+        }
+        decoratedContent = contentLines.map((line: string, index: number) =>
+          truncateToWidth(
+            (index === 0 ? childPrefix : continuation) + line,
+            Math.max(1, width),
+            "",
+          )
+        );
+        if (cacheable) {
+          this[cleanChildRenderCacheKey] = {
+            width,
+            childWidth,
+            result: this.result,
+            args: this.args,
+            callRenderer: this.callRendererComponent,
+            resultRenderer: this.resultRendererComponent,
+            theme: childTheme,
+            last: position.last,
+            memberCount: group.members.length,
+            lines: decoratedContent,
+          };
+        }
       }
-
-      const rawChildPrefix = childIndex === groupToolCallIds.length - 1 ? "  └─ " : "  ├─ ";
-      const rawContinuation = childIndex === groupToolCallIds.length - 1 ? "     " : "  │  ";
-      const childTheme = cleanThemeForToolCall(this.toolCallId);
-      const childPrefix = childTheme ? childTheme.fg("dim", rawChildPrefix) : rawChildPrefix;
-      const continuation = childTheme ? childTheme.fg("dim", rawContinuation) : rawContinuation;
-      const childWidth = Math.max(1, width - visibleWidth(rawChildPrefix));
-      const lines = originalToolRender.call(this, childWidth);
-      if (lines.length === 0) return lines;
-
-      const decoratedContent = lines.slice(1).map((line: string, index: number) =>
-        (index === 0 ? childPrefix : continuation) + line
-      );
-      if (childIndex !== 0) return decoratedContent;
-      return [lines[0], ...renderCleanGroupSummary(groupOwner, width), ...decoratedContent];
+      if (!position.first) return decoratedContent;
+      return ["", ...renderActivityGroupSummary(group, width), ...decoratedContent];
     };
     const patchedToolHandleMouse = function (this: any, event: any) {
-      const groupOwner = cleanToolCallGroupOwners.get(this.toolCallId);
-      const groupToolCallIds = groupOwner ? cleanGroupToolCallIds.get(groupOwner) : undefined;
-      const childIndex = groupToolCallIds?.indexOf(this.toolCallId) ?? -1;
-      const showAsChild = renderMode === "clean" && childIndex >= 0 && isCleanGroupRevealed(this.toolCallId);
+      const member = activityTimeline.memberForTool(this.toolCallId);
+      const group = member ? activityTimeline.groupForMember(member.id) : undefined;
       const isLeftClick = event.type === "click" && event.button === "left";
+      if (renderMode !== "clean" || !member || !group) {
+        return originalToolHandleMouse.call(this, event);
+      }
+      const position = activityMemberPosition(group, member);
+      const revealed = activityGroupRevealed(group);
 
-      // Pi normally ignores tool clicks until a result exists. Clean mode can
-      // still reveal the active call safely because this changes presentation
-      // only; it does not affect or delay execution.
-      if (
-        renderMode === "clean" &&
-        !showAsChild &&
-        isLeftClick &&
-        this.toolCallId === groupOwner &&
-        groupToolCallIds?.length
-      ) {
-        revealCleanGroup(groupToolCallIds, this.ui);
+      if (!revealed && position.first && isLeftClick) {
+        revealCleanGroup(group, this.ui);
         return { handled: true };
       }
-      if (!showAsChild || !groupToolCallIds) return originalToolHandleMouse.call(this, event);
+      if (!revealed) return isLeftClick ? { handled: true } : undefined;
 
-      const summaryHeight = childIndex === 0 ? renderCleanGroupSummary(groupOwner!, event.width).length : 0;
-      if (
-        childIndex === 0 &&
-        event.y > 0 &&
-        event.y <= summaryHeight &&
-        isLeftClick
-      ) {
+      const summaryHeight = position.first ? renderActivityGroupSummary(group, event.width).length : 0;
+      if (position.first && event.y > 0 && event.y <= summaryHeight && isLeftClick) {
         changingAllToolsExpansion = true;
         try {
-          for (const toolCallId of groupToolCallIds) {
-            const component = cleanToolComponents.get(toolCallId);
-            if (component?.expanded) originalSetExpanded.call(component, false);
-            cleanCompactToolCallIds.delete(toolCallId);
-          }
-          for (const toolCallId of groupToolCallIds) cleanToolComponents.get(toolCallId)?.updateDisplay();
+          collapseCleanGroup(group, this.ui);
         } finally {
           changingAllToolsExpansion = false;
         }
+        return { handled: true };
+      }
+
+      // Self-rendering tools reserve y=0 for Pi's leading spacer. Clean mode
+      // replaces that spacer with the compact header for non-first members.
+      const thirdPartyHeaderY = position.first ? summaryHeight + 1 : 0;
+      if (
+        !SPECIALIZED_TOOL_NAMES.has(this.toolName) &&
+        isLeftClick &&
+        event.y === thirdPartyHeaderY
+      ) {
+        originalSetExpanded.call(this, !this.expanded);
         this.ui?.requestRender?.();
         return { handled: true };
       }
@@ -1268,12 +2267,17 @@ export default function prettyTui(pi: ExtensionAPI) {
         return { handled: true };
       }
 
-      const childPrefixWidth = visibleWidth("  ├─ ");
+      const { prefixWidth } = activityTreeStyle(
+        group,
+        member,
+        event.width,
+        cleanThemeForToolCall(this.toolCallId),
+      );
       return originalToolHandleMouse.call(this, {
         ...event,
-        x: Math.max(0, event.x - childPrefixWidth),
-        y: event.y - summaryHeight + (childIndex === 0 ? 0 : 1),
-        width: Math.max(1, event.width - childPrefixWidth),
+        x: Math.max(0, event.x - prefixWidth),
+        y: event.y - summaryHeight + (position.first ? 0 : 1),
+        width: Math.max(1, event.width - prefixWidth),
       });
     };
 
@@ -1323,6 +2327,7 @@ export default function prettyTui(pi: ExtensionAPI) {
       const group: ToolSummaryGroup = {
         count: cleanRun.count,
         failed: cleanRun.failed,
+        thoughtCount: thoughtCountForTool(cleanRun.lastCompletedToolCallId),
         lastToolCallId: cleanRun.lastCompletedToolCallId,
         toolCallIds: cleanRun.currentToolCallIds.slice(),
         activity,
@@ -1331,6 +2336,7 @@ export default function prettyTui(pi: ExtensionAPI) {
       settledSummaries.set(group.lastToolCallId, {
         count: group.count,
         failed: group.failed,
+        thoughtCount: group.thoughtCount ?? 0,
         activity: activityValueForHold(group.lastToolCallId, activity),
       });
       setCleanGroupMembers(group.lastToolCallId, group.toolCallIds ?? []);
@@ -1342,6 +2348,7 @@ export default function prettyTui(pi: ExtensionAPI) {
     cleanRun.lastCompletedToolCallId = undefined;
     cleanRun.activeToolCallId = undefined;
     cleanRun.activeToolName = undefined;
+    activityTimeline.boundary();
   };
 
   const settleLastCleanGroup = () => {
@@ -1351,30 +2358,44 @@ export default function prettyTui(pi: ExtensionAPI) {
     settledSummaries.set(group.lastToolCallId, {
       count: group.count,
       failed: group.failed,
+      thoughtCount: group.thoughtCount ?? 0,
       activity: activityValueForHold(group.lastToolCallId, "done"),
     });
   };
 
-  const summaryText = (count: number, _failed: number, activity = "done"): string => {
-    const activityText = typeof activity === "string" ? activity : "done";
+  const summaryText = (
+    count: number,
+    _failed: number,
+    thoughtCount: number,
+    activity = "done",
+  ): string => {
+    const rawActivityText = typeof activity === "string" ? activity : "done";
+    const normalizedActivityText = rawActivityText.trim();
+    const activityText = /^thinking(?:\.\.\.)?$/iu.test(normalizedActivityText)
+      ? "thinking"
+      : rawActivityText;
     const countLabel = `${count} tool ${count === 1 ? "call" : "calls"}`;
+    const thoughtLabel = thoughtCount > 0
+      ? ` · ${thoughtCount} ${thoughtCount === 1 ? "thought" : "thoughts"}`
+      : "";
     const activityLabel = activityText !== "done" && activityText.trim()
       ? ` · ${activityText}`
       : "";
-    return `${countLabel}${activityLabel}`;
+    return `${countLabel}${thoughtLabel}${activityLabel}`;
   };
 
   const summaryRow = (
     theme: any,
     count: number,
     failed: number,
+    thoughtCount: number,
     activity: DisplayValue = "done",
     collapsedDone = false,
   ): DisplayRow => ({
     prefix: () => {
       const currentActivity = typeof activity === "function" ? activity() : activity;
       const color = currentActivity === "done"
-        ? collapsedDone ? "thinkingText" : "success"
+        ? collapsedDone ? "thinkingText" : successMarkerColor(theme)
         : "accent";
       return theme.fg(color, "● ");
     },
@@ -1383,12 +2404,13 @@ export default function prettyTui(pi: ExtensionAPI) {
       const currentActivity = typeof activity === "function" ? activity() : activity;
       const label = currentActivity === "done" ? "Done" : "Running";
       const color = label === "Done"
-        ? collapsedDone ? "thinkingText" : "success"
+        ? collapsedDone ? "thinkingText" : successMarkerColor(theme)
         : "accent";
       const detailColor = label === "Done" && collapsedDone ? "thinkingText" : "text";
       return theme.fg(color, theme.bold(label)) +
         theme.fg("dim", "(") +
-        theme.fg(detailColor, summaryText(count, failed, currentActivity)) + theme.fg("dim", ")");
+        theme.fg(detailColor, summaryText(count, failed, thoughtCount, currentActivity)) +
+        theme.fg("dim", ")");
     },
   });
 
@@ -1397,18 +2419,70 @@ export default function prettyTui(pi: ExtensionAPI) {
     if (!summaryTheme) return [];
     const settled = settledSummaries.get(lastToolCallId);
     if (settled) {
-      return block([summaryRow(summaryTheme, settled.count, settled.failed, settled.activity)]).render(width);
+      return block([summaryRow(
+        summaryTheme,
+        settled.count,
+        settled.failed,
+        settled.thoughtCount,
+        settled.activity,
+      )]).render(width);
     }
     if (cleanRun.activeToolCallId === lastToolCallId) {
       return block([summaryRow(
         summaryTheme,
         liveCleanToolCount(),
         cleanRun.failed,
+        thoughtCountForTool(lastToolCallId),
         () => cleanRun.activeToolName ?? currentCleanActivity(),
       )]).render(width);
     }
     if (cleanRun.lastCompletedToolCallId === lastToolCallId && cleanRun.count > 0) {
-      return block([summaryRow(summaryTheme, cleanRun.count, cleanRun.failed, currentCleanActivity)]).render(width);
+      return block([summaryRow(
+        summaryTheme,
+        cleanRun.count,
+        cleanRun.failed,
+        thoughtCountForTool(lastToolCallId),
+        currentCleanActivity,
+      )]).render(width);
+    }
+    return [];
+  };
+
+  const renderActivityGroupSummary = (
+    group: ActivityGroup,
+    width: number,
+    collapsedDone = false,
+  ): string[] => {
+    const fit = (lines: string[]) => lines.map((line) => truncateToWidth(line, Math.max(1, width), ""));
+    const summaryTheme = activityGroupTheme(group);
+    const owner = activityGroupOwner(group);
+    if (!summaryTheme || !owner || group.toolCallIds.length === 0) return [];
+    const settled = settledSummaries.get(owner);
+    if (settled) {
+      return fit(block([summaryRow(
+        summaryTheme,
+        Math.max(settled.count, group.toolCallIds.length),
+        settled.failed,
+        Math.max(settled.thoughtCount, group.thoughtCount),
+        settled.activity,
+        collapsedDone,
+      )]).render(width));
+    }
+    const currentBelongs = cleanRun.activeToolCallId
+      ? group.toolCallIds.includes(cleanRun.activeToolCallId)
+      : false;
+    const lastBelongs = cleanRun.lastCompletedToolCallId
+      ? group.toolCallIds.includes(cleanRun.lastCompletedToolCallId)
+      : false;
+    if (currentBelongs || lastBelongs || !cleanRun.settled) {
+      return fit(block([summaryRow(
+        summaryTheme,
+        Math.max(group.toolCallIds.length, liveCleanToolCount()),
+        cleanRun.failed,
+        group.thoughtCount,
+        () => cleanRun.activeToolName ?? currentCleanActivity(),
+        collapsedDone,
+      )]).render(width));
     }
     return [];
   };
@@ -1421,6 +2495,8 @@ export default function prettyTui(pi: ExtensionAPI) {
   const cleanToolCall = (theme: any, name: string, toolCallId: string): Component => {
     knownToolCallIds.add(toolCallId);
     cleanToolThemes.set(toolCallId, theme);
+    const activityGroup = activityTimeline.groupForTool(toolCallId);
+    if (activityGroup) activityFallbackThemes.set(activityGroup.id, theme);
     return {
       render(width: number): string[] {
         if (renderMode !== "clean") return [];
@@ -1431,6 +2507,7 @@ export default function prettyTui(pi: ExtensionAPI) {
             theme,
             settledSummary.count,
             settledSummary.failed,
+            settledSummary.thoughtCount,
             settledSummary.activity,
             true,
           )]).render(width);
@@ -1442,6 +2519,7 @@ export default function prettyTui(pi: ExtensionAPI) {
             theme,
             liveCleanToolCount(),
             cleanRun.failed,
+            thoughtCountForTool(toolCallId),
             () => cleanRun.activeToolName ?? name,
           )]).render(width);
         }
@@ -1453,7 +2531,13 @@ export default function prettyTui(pi: ExtensionAPI) {
           cleanRun.count > 0 &&
           !cleanRun.activeToolCallId
         ) {
-          return block([summaryRow(theme, cleanRun.count, cleanRun.failed, currentCleanActivity)]).render(width);
+          return block([summaryRow(
+            theme,
+            cleanRun.count,
+            cleanRun.failed,
+            thoughtCountForTool(toolCallId),
+            currentCleanActivity,
+          )]).render(width);
         }
 
         // Do not fall back to the per-component pending state here: Pi may
@@ -1472,8 +2556,8 @@ export default function prettyTui(pi: ExtensionAPI) {
     return block([]);
   };
 
-  // In collapsed clean mode, every supported tool call is represented by its
-  // Running row. Ctrl+O bypasses this and restores the normal full renderer.
+  // Built-ins use specialized compact renderers, while the activity timeline
+  // controls grouping for every tool, including third-party definitions.
   const hideCleanTool = (
     toolCallId: string,
     expanded: boolean,
@@ -1496,6 +2580,7 @@ export default function prettyTui(pi: ExtensionAPI) {
           ? [{
               count: data.count ?? 0,
               failed: data.failed ?? 0,
+              thoughtCount: data.thoughtCount ?? 0,
               lastToolCallId: data.lastToolCallId,
             }]
           : (() => {
@@ -1504,6 +2589,7 @@ export default function prettyTui(pi: ExtensionAPI) {
                 ? [{
                     count: data?.count ?? 0,
                     failed: data?.failed ?? 0,
+                    thoughtCount: data?.thoughtCount ?? 0,
                     lastToolCallId: summaryCallId,
                   }]
                 : [];
@@ -1513,11 +2599,10 @@ export default function prettyTui(pi: ExtensionAPI) {
       // absent from an uncompacted branch.
       const missingGroups = groups.filter((group) => !knownToolCallIds.has(group.lastToolCallId));
       if (missingGroups.length === 0) return [];
-      // Persisted entries represent settled groups. Older versions could
-      // accidentally store the transient responding... activity, so always
-      // normalize their display to Done.
+      // Persisted entries represent settled groups, so always normalize their
+      // display to Done even when an older entry stored a transient activity.
       return block(missingGroups.map((group) =>
-        summaryRow(theme, group.count, group.failed, "done", true)
+        summaryRow(theme, group.count, group.failed, group.thoughtCount ?? 0, "done", true)
       )).render(width);
     },
     invalidate() {},
@@ -1538,6 +2623,16 @@ export default function prettyTui(pi: ExtensionAPI) {
     cleanToolsExpanded = ctx.ui.getToolsExpanded();
     settledSummaries.clear();
     legacySummaryLastToolCallIds.clear();
+    activityTimeline.clear();
+    revealedActivityGroups.clear();
+    expandedThinkingMembers.clear();
+    thinkingComponents.clear();
+    activityFallbackThemes.clear();
+    activityUpdateComponents.clear();
+    customUpdateToolHints.clear();
+    customUpdateBeforeToolHints.clear();
+    activityUpdateSequence = 0;
+    assistantBoundaryKeys.clear();
     knownToolCallIds.clear();
     cleanCompactToolCallIds.clear();
     cleanGroupToolCallIds.clear();
@@ -1569,9 +2664,15 @@ export default function prettyTui(pi: ExtensionAPI) {
     const explicitSummaryIds = new Set<string>();
 
     const rememberGroup = (group: ToolSummaryGroup, entryId?: string) => {
+      const thoughtCount = Math.max(
+        group.thoughtCount ?? 0,
+        thoughtCountForTool(group.lastToolCallId),
+      );
+      group.thoughtCount = thoughtCount;
       settledSummaries.set(group.lastToolCallId, {
         count: group.count,
         failed: group.failed,
+        thoughtCount,
         activity: "done",
       });
       if (group.toolCallIds?.length) {
@@ -1583,11 +2684,22 @@ export default function prettyTui(pi: ExtensionAPI) {
 
     const finishGroup = () => {
       if (lastToolCallId && count > 0) {
-        lastFinishedGroup = { count, failed, lastToolCallId, toolCallIds: [...toolCalls] };
+        lastFinishedGroup = {
+          count,
+          failed,
+          thoughtCount: thoughtCountForTool(lastToolCallId),
+          lastToolCallId,
+          toolCallIds: [...toolCalls],
+        };
         inferredGroups.push(lastFinishedGroup);
         setCleanGroupMembers(lastToolCallId, [...toolCalls]);
         if (!explicitSummaryIds.has(lastToolCallId)) {
-          settledSummaries.set(lastToolCallId, { count, failed, activity: "done" });
+          settledSummaries.set(lastToolCallId, {
+            count,
+            failed,
+            thoughtCount: lastFinishedGroup.thoughtCount ?? 0,
+            activity: "done",
+          });
         }
       }
       count = 0;
@@ -1595,13 +2707,20 @@ export default function prettyTui(pi: ExtensionAPI) {
       lastToolCallId = undefined;
       toolCalls.clear();
       completedToolCalls.clear();
+      activityTimeline.boundary();
     };
 
     const inferredGroupsOverlapping = (group: ToolSummaryGroup): ToolSummaryGroup[] => {
       if (!group.toolCallIds?.length) return [];
       const persistedIds = new Set(group.toolCallIds);
       const currentGroup = lastToolCallId && count > 0
-        ? [{ count, failed, lastToolCallId, toolCallIds: [...toolCalls] }]
+        ? [{
+            count,
+            failed,
+            thoughtCount: thoughtCountForTool(lastToolCallId),
+            lastToolCallId,
+            toolCallIds: [...toolCalls],
+          }]
         : [];
       return [...inferredGroups, ...currentGroup].filter((inferred) =>
         inferred.toolCallIds?.some((toolCallId) => persistedIds.has(toolCallId)),
@@ -1680,6 +2799,7 @@ export default function prettyTui(pi: ExtensionAPI) {
           const group = {
             count: data.count ?? 0,
             failed: data.failed ?? 0,
+            thoughtCount: data.thoughtCount ?? 0,
             lastToolCallId: data.lastToolCallId,
           };
           rememberGroup(group);
@@ -1691,6 +2811,7 @@ export default function prettyTui(pi: ExtensionAPI) {
           rememberGroup({
             count: data?.count ?? lastFinishedGroup.count,
             failed: data?.failed ?? lastFinishedGroup.failed,
+            thoughtCount: data?.thoughtCount ?? lastFinishedGroup.thoughtCount ?? 0,
             lastToolCallId: lastFinishedGroup.lastToolCallId,
           }, entry.id);
         } else if (lastToolCallId && count > 0) {
@@ -1698,9 +2819,16 @@ export default function prettyTui(pi: ExtensionAPI) {
           rememberGroup({
             count: data?.count ?? count,
             failed: data?.failed ?? failed,
+            thoughtCount: data?.thoughtCount ?? thoughtCountForTool(lastToolCallId),
             lastToolCallId,
           }, entry.id);
         }
+        activityTimeline.boundary();
+        continue;
+      }
+
+      if (entry.type === "custom_message") {
+        if (entry.display !== false) addPersistentActivityUpdate(entry);
         continue;
       }
 
@@ -1713,12 +2841,23 @@ export default function prettyTui(pi: ExtensionAPI) {
         continue;
       }
 
+      if (message.role === "custom") {
+        if (message.display !== false) addPersistentActivityUpdate(message);
+        continue;
+      }
+
       if (message.role === "assistant") {
+        const thinking = thinkingText(message);
+        if (thinking && !assistantSystemBoundary(message)) {
+          activityTimeline.addThinking(assistantMessageKey(message), thinking);
+        }
         if (messageHasVisibleText(message)) finishGroup();
         for (const item of messageContentItems(message)) {
-          if (item.type !== "toolCall" || !supportedTools.has(item.name)) continue;
+          if (item.type !== "toolCall" || !item.id) continue;
           toolCalls.add(item.id);
+          activityTimeline.addTool(item.id, item.name ?? "tool");
         }
+        if (assistantSystemBoundary(message)) finishGroup();
         continue;
       }
 
@@ -1739,6 +2878,17 @@ export default function prettyTui(pi: ExtensionAPI) {
 
   pi.on("session_start", (_event, ctx) => restoreCleanSession(ctx));
   pi.on("session_tree", (_event, ctx) => restoreCleanSession(ctx));
+  pi.on("session_before_compact", () => {
+    // Pi emits this for manual, threshold, and overflow-recovery compaction.
+    // Seal the activity group before the compaction indicator is rendered so
+    // completed work never remains labelled Running(... · thinking). A
+    // lifecycle boundary overrides the minimum per-tool activity hold.
+    clearToolActivityHolds();
+    finishCleanGroup("done");
+    settleLastCleanGroup();
+    cleanRun.activity = "done";
+    cleanRun.requestRender?.();
+  });
   pi.on("session_compact", () => {
     // Compaction is a hard chronological boundary. Keep tools completed before
     // it in their own group so expanded hierarchy lines never cross the summary.
@@ -1747,31 +2897,55 @@ export default function prettyTui(pi: ExtensionAPI) {
     // Pre-compaction tools have been summarized intentionally. Their durable
     // fallback rows should not be replayed beside the compacted transcript.
     cleanContextCompacted = true;
+    cleanRun.requestRender?.();
+  });
+  pi.on("session_compact_failed", () => {
+    // The pre-compaction work is still complete even when compaction is
+    // cancelled or fails. Keep it settled and let a retry start a new group.
+    settleLastCleanGroup();
+    cleanRun.activity = "done";
+    cleanRun.requestRender?.();
   });
 
   const hasVisibleAssistantText = (message: any): boolean =>
     message?.role === "assistant" && messageHasVisibleText(message);
 
+  const closeAtAssistantBoundary = (message: any, activity: string): boolean => {
+    const key = assistantMessageKey(message);
+    if (assistantBoundaryKeys.has(key)) return false;
+    assistantBoundaryKeys.add(key);
+    cleanRun.activity = activity;
+    finishCleanGroup(activity);
+    return true;
+  };
+
   const pendingToolCalls = (message: any): any[] =>
     messageContentItems(message).filter(
-      (item: any) => item.type === "toolCall" && supportedTools.has(item.name) && item.id,
+      (item: any) => item.type === "toolCall" && item.id,
     );
 
+  const trackThinkingActivity = (message: any): void => {
+    if (message?.role !== "assistant" || assistantSystemBoundary(message)) return;
+    const thinking = thinkingText(message);
+    if (thinking) activityTimeline.addThinking(assistantMessageKey(message), thinking);
+  };
+
   const trackPendingToolActivity = (message: any): boolean => {
     const toolCalls = pendingToolCalls(message);
     if (toolCalls.length === 0) return false;
     for (const toolCall of toolCalls) {
+      activityTimeline.addTool(toolCall.id, toolCall.name ?? "tool");
       if (!cleanRun.currentToolCallIds.includes(toolCall.id)) {
         cleanRun.currentToolCallIds.push(toolCall.id);
       }
-      cleanToolNames.set(toolCall.id, toolDisplayName(toolCall.name));
+      cleanToolNames.set(toolCall.id, cleanToolNames.get(toolCall.id) ?? toolCall.name);
     }
     const toolCall = toolCalls[toolCalls.length - 1];
     if (cleanRun.lastCompletedToolCallId === toolCall.id) return false;
     setCleanGroupMembers(toolCall.id, cleanRun.currentToolCallIds.slice());
     cleanRun.active = true;
     cleanRun.activeToolCallId = toolCall.id;
-    beginToolActivity(toolCall.id, toolDisplayName(toolCall.name));
+    beginToolActivity(toolCall.id, cleanToolNames.get(toolCall.id) ?? toolCall.name);
     return true;
   };
 
@@ -1791,29 +2965,42 @@ export default function prettyTui(pi: ExtensionAPI) {
   // message_start runs before Pi adds the user component to the transcript,
   // so settling here keeps the previous parent row above that message.
   pi.on("message_start", (event) => {
+    if (event.message.role === "custom" && event.message.display !== false) {
+      addPersistentActivityUpdate(event.message);
+      return;
+    }
     if (event.message.role !== "user") return;
     finishCleanGroup("done");
     settleLastCleanGroup();
   });
 
-  // A visible assistant response is the boundary between tool groups. Do
-  // this during streaming so a following tool call cannot inherit the prior
-  // summary, while message_end keeps the rule correct for non-streaming paths.
+  // A visible assistant response is the boundary between tool groups. Seal
+  // the prior group directly as Done; the response text already communicates
+  // current activity and does not need a duplicate response status.
   pi.on("message_update", (event) => {
     if (hasVisibleAssistantText(event.message)) {
-      cleanRun.activity = "responding...";
-      finishCleanGroup("responding...");
+      trackThinkingActivity(event.message);
+      clearToolActivityHolds();
+      closeAtAssistantBoundary(event.message, "done");
       return;
     }
+    if (assistantSystemBoundary(event.message)) {
+      closeAtAssistantBoundary(event.message, "done");
+      settleLastCleanGroup();
+      return;
+    }
+    trackThinkingActivity(event.message);
     trackPendingToolActivity(event.message);
   });
   pi.on("message_end", (event) => {
-    if (hasVisibleAssistantText(event.message)) {
+    if (hasVisibleAssistantText(event.message) || assistantSystemBoundary(event.message)) {
+      trackThinkingActivity(event.message);
+      closeAtAssistantBoundary(event.message, "done");
       cleanRun.activity = "done";
-      finishCleanGroup("done");
       settleLastCleanGroup();
       return;
     }
+    trackThinkingActivity(event.message);
     trackPendingToolActivity(event.message);
   });
 
@@ -1834,25 +3021,25 @@ export default function prettyTui(pi: ExtensionAPI) {
     cleanRun.activeToolCallIds.clear();
     cleanRun.activeToolCallId = undefined;
     cleanRun.activeToolName = undefined;
-    cleanRun.activity = "thinking...";
+    cleanRun.activity = "thinking";
   });
   pi.on("tool_execution_start", (event) => {
-    if (!supportedTools.has(event.toolName)) return;
+    activityTimeline.addTool(event.toolCallId, event.toolName);
     if (!cleanRun.currentToolCallIds.includes(event.toolCallId)) {
       cleanRun.currentToolCallIds.push(event.toolCallId);
     }
     cleanRun.activeToolCallIds.add(event.toolCallId);
-    cleanToolNames.set(event.toolCallId, toolDisplayName(event.toolName));
+    const displayName = cleanToolNames.get(event.toolCallId) ?? event.toolName;
+    cleanToolNames.set(event.toolCallId, displayName);
     setCleanGroupMembers(event.toolCallId, cleanRun.currentToolCallIds.slice());
     cleanRun.active = true;
     cleanRun.activeToolCallId = event.toolCallId;
-    beginToolActivity(event.toolCallId, toolDisplayName(event.toolName), true);
+    beginToolActivity(event.toolCallId, displayName, true);
   });
   pi.on("tool_execution_end", (event) => {
-    if (!supportedTools.has(event.toolName)) return;
     const activityName = cleanRun.activeToolCallId === event.toolCallId
-      ? cleanRun.activeToolName ?? toolDisplayName(event.toolName)
-      : toolDisplayName(event.toolName);
+      ? cleanRun.activeToolName ?? cleanToolNames.get(event.toolCallId) ?? event.toolName
+      : cleanToolNames.get(event.toolCallId) ?? event.toolName;
     // Keep the tool activity visible until at least one second after start;
     // this only delays the status transition, never the tool result itself.
     holdToolActivity(event.toolCallId, activityName);
@@ -1867,7 +3054,7 @@ export default function prettyTui(pi: ExtensionAPI) {
       cleanRun.activeToolName = cleanRun.activeToolCallId
         ? cleanToolNames.get(cleanRun.activeToolCallId)
         : undefined;
-      cleanRun.activity = cleanRun.activeToolName ?? "thinking...";
+      cleanRun.activity = cleanRun.activeToolName ?? "thinking";
     }
     const visibleSummaryToolCallId = cleanRun.activeToolCallId ?? cleanRun.lastCompletedToolCallId;
     setCleanGroupMembers(visibleSummaryToolCallId, cleanRun.currentToolCallIds.slice());
@@ -1879,7 +3066,7 @@ export default function prettyTui(pi: ExtensionAPI) {
     cleanRun.activeToolCallIds.clear();
     cleanRun.activeToolCallId = undefined;
     cleanRun.activeToolName = undefined;
-    cleanRun.activity = "thinking...";
+    cleanRun.activity = "thinking";
   });
   pi.on("agent_settled", () => {
     if (cleanRun.settled) return;
@@ -1892,6 +3079,7 @@ export default function prettyTui(pi: ExtensionAPI) {
       settledSummaries.set(group.lastToolCallId, {
         count: group.count,
         failed: group.failed,
+        thoughtCount: group.thoughtCount ?? 0,
         activity: activityValueForHold(group.lastToolCallId, "done"),
       });
     }
@@ -1907,14 +3095,17 @@ export default function prettyTui(pi: ExtensionAPI) {
 
     const count = groups.reduce((total, group) => total + group.count, 0);
     const failed = groups.reduce((total, group) => total + group.failed, 0);
+    const thoughtCount = groups.reduce((total, group) => total + (group.thoughtCount ?? 0), 0);
     const lastToolCallId = groups[groups.length - 1]?.lastToolCallId;
     pi.appendEntry<ToolSummaryData>("pretty-tui-tool-summary", {
       count,
       failed,
+      thoughtCount,
       lastToolCallId,
-      groups: groups.map(({ count, failed, lastToolCallId, toolCallIds }) => ({
+      groups: groups.map(({ count, failed, thoughtCount, lastToolCallId, toolCallIds }) => ({
         count,
         failed,
+        thoughtCount,
         lastToolCallId,
         toolCallIds,
       })),
@@ -1922,15 +3113,16 @@ export default function prettyTui(pi: ExtensionAPI) {
   });
 
   const read = createReadTool(cwd);
+  const readLabel = read.label || read.name;
   pi.registerTool({
     ...read,
     renderShell: "self",
     renderCall(args: any, theme: any, context: any) {
-      if (hideCleanTool(context.toolCallId, context.expanded, context.executionStarted)) return cleanToolCall(theme, "Read", context.toolCallId);
+      if (hideCleanTool(context.toolCallId, context.expanded, context.executionStarted)) return cleanToolCall(theme, readLabel, context.toolCallId);
       const range = args.offset || args.limit
         ? ` · lines ${args.offset ?? 1}${args.limit ? `–${(args.offset ?? 1) + args.limit - 1}` : "+"}`
         : "";
-      return call(theme, "Read", `${args.path}${range}`, context.state);
+      return call(theme, readLabel, `${args.path}${range}`, context.state);
     },
     renderResult(toolResult: any, options: any, theme: any, context: any) {
       const output = textContent(toolResult);
@@ -1952,11 +3144,12 @@ export default function prettyTui(pi: ExtensionAPI) {
   } as any);
 
   const bash = createBashTool(cwd);
+  const bashLabel = bash.label || bash.name;
   pi.registerTool({
     ...bash,
     renderShell: "self",
     renderCall(args: any, theme: any, context: any) {
-      if (hideCleanTool(context.toolCallId, context.expanded, context.executionStarted)) return cleanToolCall(theme, "Bash", context.toolCallId);
+      if (hideCleanTool(context.toolCallId, context.expanded, context.executionStarted)) return cleanToolCall(theme, bashLabel, context.toolCallId);
       const command = typeof args.command === "string" ? args.command : "";
       if (useCompactToolView(context.toolCallId, context.expanded)) {
         const commandLines = command.split(/\r\n|\r|\n/);
@@ -1965,9 +3158,9 @@ export default function prettyTui(pi: ExtensionAPI) {
         const detail = omitted > 0
           ? `${firstLine} … (${omitted} more ${omitted === 1 ? "line" : "lines"})`
           : firstLine;
-        return call(theme, "Bash", detail, context.state);
+        return call(theme, bashLabel, detail, context.state);
       }
-      return call(theme, "Bash", command, context.state);
+      return call(theme, bashLabel, command, context.state);
     },
     renderResult(toolResult: any, options: any, theme: any, context: any) {
       const output = textContent(toolResult);
@@ -2002,13 +3195,14 @@ export default function prettyTui(pi: ExtensionAPI) {
   } as any);
 
   const edit = createEditTool(cwd);
+  const editLabel = edit.label || edit.name;
   pi.registerTool({
     ...edit,
     renderShell: "self",
     renderCall(args: any, theme: any, context: any) {
-      if (hideCleanTool(context.toolCallId, context.expanded, context.executionStarted)) return cleanToolCall(theme, "Edit", context.toolCallId);
+      if (hideCleanTool(context.toolCallId, context.expanded, context.executionStarted)) return cleanToolCall(theme, editLabel, context.toolCallId);
       const count = Array.isArray(args.edits) ? ` · ${args.edits.length} changes` : "";
-      return call(theme, "Edit", `${args.path}${count}`, context.state);
+      return call(theme, editLabel, `${args.path}${count}`, context.state);
     },
     renderResult(toolResult: any, options: any, theme: any, context: any) {
       const output = textContent(toolResult);
@@ -2043,20 +3237,21 @@ export default function prettyTui(pi: ExtensionAPI) {
   } as any);
 
   const write = createWriteTool(cwd);
+  const writeLabel = write.label || write.name;
   pi.registerTool({
     ...write,
     renderShell: "self",
     renderCall(args: any, theme: any, context: any) {
-      if (hideCleanTool(context.toolCallId, context.expanded, context.executionStarted)) return cleanToolCall(theme, "Write", context.toolCallId);
+      if (hideCleanTool(context.toolCallId, context.expanded, context.executionStarted)) return cleanToolCall(theme, writeLabel, context.toolCallId);
       const content = typeof args.content === "string" ? args.content : "";
       const path = String(args.path ?? "");
       if (useCompactToolView(context.toolCallId, context.expanded)) {
         const lines = content.replace(/\t/g, "    ").split("\n");
         while (lines.length > 0 && lines[lines.length - 1] === "") lines.pop();
         const total = lines.length;
-        return call(theme, "Write", `${path} · ${total} ${total === 1 ? "line" : "lines"}`, context.state);
+        return call(theme, writeLabel, `${path} · ${total} ${total === 1 ? "line" : "lines"}`, context.state);
       }
-      return writeCall(theme, path, content, context.expanded, context.state);
+      return writeCall(theme, writeLabel, path, content, context.expanded, context.state);
     },
     renderResult(toolResult: any, options: any, theme: any, context: any) {
       const output = textContent(toolResult);
@@ -2074,14 +3269,15 @@ export default function prettyTui(pi: ExtensionAPI) {
   } as any);
 
   const grep = createGrepTool(cwd);
+  const grepLabel = grep.label || grep.name;
   pi.registerTool({
     ...grep,
     renderShell: "self",
     renderCall(args: any, theme: any, context: any) {
-      if (hideCleanTool(context.toolCallId, context.expanded, context.executionStarted)) return cleanToolCall(theme, "Grep", context.toolCallId);
+      if (hideCleanTool(context.toolCallId, context.expanded, context.executionStarted)) return cleanToolCall(theme, grepLabel, context.toolCallId);
       const where = args.path ? ` · ${args.path}` : "";
       const glob = args.glob ? ` · ${args.glob}` : "";
-      return call(theme, "Grep", `${args.pattern}${where}${glob}`, context.state);
+      return call(theme, grepLabel, `${args.pattern}${where}${glob}`, context.state);
     },
     renderResult(toolResult: any, options: any, theme: any, context: any) {
       const output = textContent(toolResult);
@@ -2094,12 +3290,13 @@ export default function prettyTui(pi: ExtensionAPI) {
   } as any);
 
   const find = createFindTool(cwd);
+  const findLabel = find.label || find.name;
   pi.registerTool({
     ...find,
     renderShell: "self",
     renderCall(args: any, theme: any, context: any) {
-      if (hideCleanTool(context.toolCallId, context.expanded, context.executionStarted)) return cleanToolCall(theme, "Find", context.toolCallId);
-      return call(theme, "Find", `${args.pattern}${args.path ? ` · ${args.path}` : ""}`, context.state);
+      if (hideCleanTool(context.toolCallId, context.expanded, context.executionStarted)) return cleanToolCall(theme, findLabel, context.toolCallId);
+      return call(theme, findLabel, `${args.pattern}${args.path ? ` · ${args.path}` : ""}`, context.state);
     },
     renderResult(toolResult: any, options: any, theme: any, context: any) {
       const output = textContent(toolResult);
@@ -2112,12 +3309,13 @@ export default function prettyTui(pi: ExtensionAPI) {
   } as any);
 
   const ls = createLsTool(cwd);
+  const lsLabel = ls.label || ls.name;
   pi.registerTool({
     ...ls,
     renderShell: "self",
     renderCall(args: any, theme: any, context: any) {
-      if (hideCleanTool(context.toolCallId, context.expanded, context.executionStarted)) return cleanToolCall(theme, "List", context.toolCallId);
-      return call(theme, "List", args.path ?? ".", context.state);
+      if (hideCleanTool(context.toolCallId, context.expanded, context.executionStarted)) return cleanToolCall(theme, lsLabel, context.toolCallId);
+      return call(theme, lsLabel, args.path ?? ".", context.state);
     },
     renderResult(toolResult: any, options: any, theme: any, context: any) {
       const output = textContent(toolResult);