pi-cc-extensions 0.9.8 → 0.9.10

package/extensions/feature/shell/mcp-chip.ts

@@ -0,0 +1,136 @@
+/**
+ * 内置 MCP 的状态栏芯片。
+ *
+ * pi 的内置 MCP 不写 setStatus：连接状态只在 `/mcp` 菜单里，扩展读不到。这里用公开数据推算
+ * 「已连接/已配置」，并在别的扩展接管 `/mcp` 时让位（pi-mcp-adapter 这类扩展自己会写 "mcp" 状态）。
+ *
+ * - 已连接：`pi.getAllTools()` 里来源是 builtin:mcp、曝光非 hidden 的工具，按 namespace 去重。
+ *   断线后工具仍在、0 个工具的服务器连上也看不见，needs-auth / failed 与 connecting 也分不开，
+ *   所以这只是近似值。
+ * - 已配置：mcp.json 里 enabled !== false 的条目（项目级要已 trust）。
+ */
+
+import { readFileSync, statSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+
+/** 与 pi-mcp-adapter 共用同一个 status key；它写了 key 时本扩展不画。 */
+export const MCP_STATUS_KEY = "mcp";
+/** 内置 MCP 扩展的资源路径。 */
+export const BUILTIN_MCP_SOURCE = "builtin:mcp";
+const MCP_NAMESPACE_PREFIX = "mcp__";
+
+type McpConfigCacheEntry = { mtimeMs: number; names: string[] };
+
+const configCache = new Map<string, McpConfigCacheEntry>();
+
+export function mcpAgentDir(): string {
+	return process.env.PI_CODING_AGENT_DIR ?? join(homedir(), ".pi", "agent");
+}
+
+/** pi 把 `-` 与 `_` 视作同一个服务器名（`mcpNamespace` 只把 `-` 换成 `_`）。 */
+export function normalizeMcpServerName(name: string): string {
+	return name.trim().replace(/-/g, "_");
+}
+
+/** `mcp__<server>` → `<server>`；不是 MCP 命名空间返回 undefined。 */
+export function mcpNamespaceServer(namespace: string): string | undefined {
+	if (!namespace.startsWith(MCP_NAMESPACE_PREFIX)) return undefined;
+	const server = namespace.slice(MCP_NAMESPACE_PREFIX.length);
+	return server || undefined;
+}
+
+/** 已连接的服务器名（按 namespace 去重，返回规范化名字）。 */
+export function connectedMcpServers(tools: readonly any[]): string[] {
+	const fromBuiltin = new Set<string>();
+	const fromNamespace = new Set<string>();
+	for (const tool of tools ?? []) {
+		if (tool?.exposure === "hidden") continue;
+		const server = mcpNamespaceServer(String(tool?.namespace?.name ?? ""));
+		if (!server) continue;
+		const name = normalizeMcpServerName(server);
+		if (tool?.sourceInfo?.path === BUILTIN_MCP_SOURCE) fromBuiltin.add(name);
+		else fromNamespace.add(name);
+	}
+	// 版本漂移兜底：来源路径对不上时按 namespace 认（接管 /mcp 的扩展已在此之前排除）
+	return [...(fromBuiltin.size > 0 ? fromBuiltin : fromNamespace)];
+}
+
+/** `MCP 2/3`：已连接/（已连接 ∪ 已配置）。两边都空时不显示。 */
+export function formatMcpChip(
+	connected: readonly string[],
+	configured: readonly string[],
+): string | undefined {
+	const connectedNames = new Set(connected.map(normalizeMcpServerName).filter(Boolean));
+	const configuredNames = new Set(configured.map(normalizeMcpServerName).filter(Boolean));
+	const total = new Set([...connectedNames, ...configuredNames]).size;
+	if (total === 0) return undefined;
+	return `MCP ${connectedNames.size}/${total}`;
+}
+
+/** 读一个 mcp.json 里启用中的服务器名；文件缺失或损坏返回 undefined。 */
+function readMcpConfigNames(path: string): string[] | undefined {
+	try {
+		const { mtimeMs } = statSync(path);
+		const cached = configCache.get(path);
+		if (cached && cached.mtimeMs === mtimeMs) return cached.names;
+		const parsed = JSON.parse(readFileSync(path, "utf8")) as { mcpServers?: unknown };
+		const servers = parsed?.mcpServers;
+		const names: string[] = [];
+		if (servers && typeof servers === "object" && !Array.isArray(servers)) {
+			for (const [name, entry] of Object.entries(servers as Record<string, unknown>)) {
+				if (!entry || typeof entry !== "object" || Array.isArray(entry)) continue;
+				if ((entry as { enabled?: unknown }).enabled === false) continue;
+				names.push(name);
+			}
+		}
+		configCache.set(path, { mtimeMs, names });
+		return names;
+	} catch {
+		configCache.delete(path);
+		return undefined;
+	}
+}
+
+/** mcp.json 里启用中的服务器名：用户级，加上已信任时的项目级（同名以项目为准，计数时去重）。 */
+export function configuredMcpServers(options: {
+	agentDir: string;
+	cwd: string;
+	projectTrusted: boolean;
+}): string[] {
+	const names = [...(readMcpConfigNames(join(options.agentDir, "mcp.json")) ?? [])];
+	if (options.projectTrusted) {
+		names.push(...(readMcpConfigNames(join(options.cwd, ".pi", "mcp.json")) ?? []));
+	}
+	return names;
+}
+
+/** 注册了 `/mcp` 的都是内置 MCP；别的扩展接管时它自己会写状态芯片。 */
+export function builtinMcpOwnsCommand(commands: readonly any[]): boolean {
+	const mcpCommands = (commands ?? []).filter((command) => command?.name === MCP_STATUS_KEY);
+	return (
+		mcpCommands.length > 0 &&
+		mcpCommands.every((command) => command?.sourceInfo?.path === BUILTIN_MCP_SOURCE)
+	);
+}
+
+/** footer 渲染用：当前芯片文案（不含 nerd 图标），不适用时返回 undefined。 */
+export function buildMcpChip(ctx: any, api: any): string | undefined {
+	try {
+		// 工具与命令列表在 pi API 上，ctx 只提供 cwd / trust
+		if (!builtinMcpOwnsCommand(api?.getCommands?.() ?? [])) return undefined;
+		const tools = api?.getAllTools?.();
+		if (!Array.isArray(tools)) return undefined;
+		return formatMcpChip(
+			connectedMcpServers(tools),
+			configuredMcpServers({
+				agentDir: mcpAgentDir(),
+				cwd: String(ctx?.cwd ?? process.cwd()),
+				projectTrusted: ctx?.isProjectTrusted?.() === true,
+			}),
+		);
+	} catch {
+		// footer 不能因为读配置或读工具列表失败而中断渲染
+		return undefined;
+	}
+}

package/extensions/feature/shell/startup-header.ts

@@ -1,9 +1,14 @@
-import { VERSION, type AppKeybinding } from "@earendil-works/pi-coding-agent";
+import { InteractiveMode, VERSION, type AppKeybinding } from "@earendil-works/pi-coding-agent";
 import { getKeybindings } from "@earendil-works/pi-tui";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { config } from "../../config/config.ts";
 import { ansi16ToRgb, ansi256ToRgb } from "../../utils/ansi-color.ts";
 import { stripAnsi } from "../../utils/ansi-text.ts";
+import {
+	EARLY_STARTUP_HEADER_PATCH,
+	EARLY_STARTUP_HEADER_SWAP_KEY,
+	patchRegistry,
+} from "../../utils/patch-keys.ts";
 type Rgb = [number, number, number];
 type StyledPart = {
 	raw: string;
@@ -279,17 +284,88 @@ export function renderHeaderLines(
 	);
 }
 
+/** 官方 setHeader 的组件工厂：theme 由宿主注入。 */
+function headerFactory(): (
+	tui: unknown,
+	theme: any,
+) => {
+	render(width: number): string[];
+	invalidate(): void;
+} {
+	return (_tui: unknown, theme: any) => ({
+		render(width: number): string[] {
+			return renderHeaderLines(width, theme);
+		},
+		invalidate() {},
+	});
+}
+
 /** 按配置安装启动头。禁用时不碰槽位，避免清掉其他扩展的 header。 */
 export function applyStartupHeader(ctx: any): void {
 	if (!ctx?.hasUI || typeof ctx.ui?.setHeader !== "function" || !config.showStartupHeader) {
 		return;
 	}
-	ctx.ui.setHeader((_tui: unknown, theme: any) => ({
-		render(width: number): string[] {
-			return renderHeaderLines(width, theme);
+	ctx.ui.setHeader(headerFactory());
+}
+
+type EarlyHeaderPatch = {
+	active: boolean;
+	original: (...args: any[]) => unknown;
+	installed: (...args: any[]) => unknown;
+};
+
+type HeaderContainerSwap = {
+	original: (child: any) => unknown;
+	installed: (child: any) => unknown;
+};
+
+/**
+ * Pi 在 session_start 之前就把原生启动头画上去了：init() 先建 header 再 requestRender，
+ * 之后才 await 工具检查、加载扩展，所以扩展最早只能到 session_start 换头，启动时会闪一下原生头。
+ * 这里补 init，在原生 header 刚进容器的瞬间换成 ccstyle 的，首次绘制就已经是我们的。
+ * 判定用 child === mode.builtInHeader，不依赖类名；配置关掉时不碰槽位，保留原生头。
+ */
+export function installEarlyStartupHeader(): void {
+	const prototype = (InteractiveMode as any)?.prototype;
+	if (!prototype || typeof prototype.init !== "function") return;
+	const previous = patchRegistry.get<EarlyHeaderPatch>(EARLY_STARTUP_HEADER_PATCH);
+	if (previous) previous.active = false;
+	const original =
+		previous && prototype.init === previous.installed ? previous.original : prototype.init;
+	const patch: EarlyHeaderPatch = {
+		active: true,
+		original,
+		installed: async function (this: any, ...args: any[]) {
+			installHeaderContainerSwap(this, patch);
+			return original.apply(this, args);
 		},
-		invalidate() {},
-	}));
+	};
+	prototype.init = patch.installed;
+	patchRegistry.install(EARLY_STARTUP_HEADER_PATCH, patch);
+}
+
+/** 只包一次 headerContainer.addChild；/reload 后按所有权接管旧包装。 */
+function installHeaderContainerSwap(mode: any, patch: EarlyHeaderPatch): void {
+	const container = mode?.headerContainer;
+	if (!container || typeof container.addChild !== "function") return;
+	const previous = container[EARLY_STARTUP_HEADER_SWAP_KEY] as HeaderContainerSwap | undefined;
+	const original =
+		previous && container.addChild === previous.installed
+			? previous.original
+			: container.addChild.bind(container);
+	const installed = function (child: any) {
+		const result = original(child);
+		if (!patch.active || !config.showStartupHeader || child !== mode.builtInHeader) return result;
+		if (typeof mode.setExtensionHeader !== "function") return result;
+		try {
+			mode.setExtensionHeader(headerFactory());
+		} catch {
+			// 换头失败就退回原生 header，不影响启动
+		}
+		return result;
+	};
+	container.addChild = installed;
+	container[EARLY_STARTUP_HEADER_SWAP_KEY] = { original, installed };
 }
 
 /** 用户从 /ccstyle 关掉本扩展启动头时，恢复官方 header。 */

package/extensions/feature/shell/working-message.ts

@@ -115,18 +115,30 @@ export default function (pi: ExtensionAPI): void {
 		return parts.length ? `Working... (${parts.join(" · ")})` : "";
 	}
 
+	function workingUiAvailable(): boolean {
+		try {
+			return activeCtx?.hasUI === true;
+		} catch {
+			// 会话替换/reload 后捕获的 ctx 失效，getter 抛错；停止驱动 footer。
+			turnActive = false;
+			activeCtx = null;
+			stopRefreshLoop();
+			return false;
+		}
+	}
+
 	function restoreDefaultWorkingMessage(): void {
 		lastMessage = null;
-		if (!activeCtx?.hasUI) return;
+		if (!workingUiAvailable()) return;
 		try {
-			activeCtx.ui?.setWorkingMessage();
+			activeCtx?.ui?.setWorkingMessage();
 		} catch {
 			// Noop when the TUI is unavailable.
 		}
 	}
 
 	function syncWorkingMessage(force = false): void {
-		if (!activeCtx?.hasUI) return;
+		if (!workingUiAvailable()) return;
 		const next = buildWorkingMessage();
 		if (!next) {
 			if (force) restoreDefaultWorkingMessage();
@@ -135,7 +147,7 @@ export default function (pi: ExtensionAPI): void {
 		if (!force && next === lastMessage) return;
 		lastMessage = next;
 		try {
-			activeCtx.ui?.setWorkingMessage(next);
+			activeCtx?.ui?.setWorkingMessage(next);
 		} catch {
 			// Noop when the TUI is unavailable.
 		}
@@ -147,9 +159,12 @@ export default function (pi: ExtensionAPI): void {
 			refreshTimer = null;
 			try {
 				syncWorkingMessage();
-			} finally {
-				scheduleRefreshTick();
+			} catch {
+				// 定时器内的异常会成为 uncaughtException 终止 Pi；装饰性刷新直接停止。
+				turnActive = false;
+				return;
 			}
+			scheduleRefreshTick();
 		}, REFRESH_INTERVAL_MS);
 		refreshTimer.unref?.();
 	}

package/extensions/index.ts

@@ -5,7 +5,7 @@ import { config } from "./config/config.ts";
 import piAliases from "./feature/shell/aliases.ts";
 import { installFlushDockedBash } from "./feature/shell/flush-docked-bash.ts";
 import customFooter from "./feature/shell/footer.ts";
-import piStartupHeader from "./feature/shell/startup-header.ts";
+import piStartupHeader, { installEarlyStartupHeader } from "./feature/shell/startup-header.ts";
 import workingMessage from "./feature/shell/working-message.ts";
 
 // feature
@@ -23,6 +23,7 @@ export default function (pi: ExtensionAPI): void {
 	// shell chrome
 	if (config.enableAliases) piAliases(pi);
 	installFlushDockedBash();
+	installEarlyStartupHeader();
 	piStartupHeader(pi);
 	if (config.enableWorkingMessage) workingMessage(pi);
 	customFooter(pi);

package/extensions/renderer/compact-mode.ts

@@ -338,16 +338,18 @@ function toolCardBgRow(
 	const inset = (n: number) => (outerBg ? `${outerBg}${" ".repeat(n)}\x1b[49m` : " ".repeat(n));
 	return `${inset(leftInset)}${bgAnsi}${stable}\x1b[49m${inset(rightInset)}`;
 }
-/** edit/write 展开卡：保持原样式（userMessageBg Box），不应用工具卡深色/间距改动。 */
+/** edit/write 展开卡：保持原样式（展开卡背景 Box），不应用工具卡深色/间距改动。 */
 function editWriteExpandedCard(theme: any): any {
 	return new Box(
 		1,
 		1,
-		typeof theme.bg === "function" ? (text: string) => theme.bg("userMessageBg", text) : undefined,
+		typeof theme.bg === "function"
+			? (text: string) => theme.bg(config.expandedCardBackground, text)
+			: undefined,
 	);
 }
 
-/** compact 展开面板：外卡片保持 userMessageBg；展开的 thinking 另包一层更深的
+/** compact 展开面板：外卡片保持展开卡背景；展开的 thinking 另包一层更深的
  *  内卡（自身 Box 背景与外卡同色，不区分会糊在一起），工具卡直接铺在外卡背景上。
  *  每个子卡前面补 1 行分隔（上一条已经是空行时不再补），子卡自带的首尾空行会被裁掉，
  *  避免与外卡/内卡 padding 叠出双空行。
@@ -364,7 +366,7 @@ function layoutExpandedToolCard(
 	toolHits = false,
 	live = false,
 ): { lines: string[]; hits: Array<{ child: any; start: number; end: number }> } {
-	const slot = "userMessageBg";
+	const slot = config.expandedCardBackground;
 	const toolBgAnsi = darkenBgAnsi(theme, slot);
 	/** live 每行前面的标记宽度（首行 `↳ `，其余对齐空格）。 */
 	const markerWidth = live ? 2 : 0;
@@ -471,6 +473,8 @@ function compactRoundCard(
 		| {
 				width: number;
 				theme: unknown;
+				/** 背景槽位也是面板行的输入：改配置后不能复用旧底色的整卡。 */
+				bgSlot: string;
 				paints: unknown[];
 				lines: string[];
 				hits: Array<{ child: any; start: number; end: number }>;
@@ -478,6 +482,7 @@ function compactRoundCard(
 		| undefined;
 	const layout = (width: number) => {
 		const theme = themeOf();
+		const bgSlot = config.expandedCardBackground;
 		const innerWidth = contentWidth(width);
 		const paints = children.map((child) => {
 			const lines = child.render?.(innerWidth);
@@ -487,6 +492,7 @@ function compactRoundCard(
 			paint &&
 			paint.width === width &&
 			paint.theme === theme &&
+			paint.bgSlot === bgSlot &&
 			paint.paints.length === paints.length &&
 			paint.paints.every((item, index) => item === paints[index])
 		) {
@@ -496,6 +502,7 @@ function compactRoundCard(
 		paint = {
 			width,
 			theme,
+			bgSlot,
 			paints,
 			lines: laid.lines,
 			hits: laid.hits,
@@ -697,7 +704,7 @@ function compactEditWriteLine(
 	const iconPart = `${options.flushLeft ? "" : " "}${theme.fg(iconColor, icon)} `;
 	const namePart = theme.fg("toolTitle", name);
 	const hintText =
-		options.hint !== false && component.expanded !== true ? ` • ${showMoreHintText()}` : "";
+		options.hint !== false && component.expanded !== true ? ` · ${showMoreHintText()}` : "";
 	const fixedWidth =
 		visibleWidth(iconPart) +
 		visibleWidth(namePart) +
@@ -719,6 +726,8 @@ const compactRichDiffCache = new WeakMap<
 type CompactEditPaintHit = {
 	width: number;
 	theme: unknown;
+	/** 展开卡的背景槽位同样参与命中判断。 */
+	bgSlot: string;
 	expanded: boolean;
 	result: unknown;
 	isPartial: boolean;
@@ -756,6 +765,7 @@ function compactEditWriteLines(
 			hit &&
 			hit.width === width &&
 			hit.theme === theme &&
+			hit.bgSlot === config.expandedCardBackground &&
 			hit.expanded === expanded &&
 			hit.result === component.result &&
 			hit.isPartial === isPartial &&
@@ -771,6 +781,7 @@ function compactEditWriteLines(
 		compactEditPaintCache.set(component, {
 			width,
 			theme,
+			bgSlot: config.expandedCardBackground,
 			expanded,
 			result: component.result,
 			isPartial,
@@ -901,7 +912,7 @@ function compactAssistantLineComponent(
 			const pad = Math.max(0, options.pad ?? (Number(self.outputPad) || 0));
 			const available = Math.max(0, width - pad);
 			const hint = options.hint !== false;
-			const hintText = hint ? ` • ${showMoreHintText()}` : "";
+			const hintText = hint ? ` · ${showMoreHintText()}` : "";
 			const summaryWidth = Math.max(0, available - visibleWidth(hintText));
 			const resolved = typeof summary === "function" ? summary() : summary;
 			const runningActive = resolved.startsWith("Running...");
@@ -975,7 +986,7 @@ function compactStopStatusLine(status: string, pad = 0): any {
 
 /**
  * 槽位卡内的展开入口：卡里是只读围观，展开走摘要行自己的 hint，卡内不再重复提示。
- * 提示有两处来源——我们的 showMoreHintText（`… +N more lines • click to show more`）与
+ * 提示有两处来源——我们的 showMoreHintText（`… +N more lines · click to show more`）与
  * pi 原生工具卡（`… (N earlier lines, ctrl+o to expand)`），所以按渲染结果收尾裁剪。
  * 只去掉动作词，`(N more lines)` 这类计数保留。
  */
@@ -987,7 +998,8 @@ const SLOT_HINT_PATTERNS: RegExp[] = [
 	// 只去掉动作词，收尾括号与计数保留。
 	new RegExp(String.raw`,\s*[^()]*?${EXPAND_ACTION}(?=\))`),
 	// 直接挂在行尾：整段去掉。
-	new RegExp(String.raw`\s*(?:•\s*)?${EXPAND_ACTION}\s*$`),
+	// 尾部分隔点：ccstyle 统一 `·`，同时兼容旧帧与 pi 原生的 `•`
+	new RegExp(String.raw`\s*(?:[•·]\s*)?${EXPAND_ACTION}\s*$`),
 ];
 
 function stripSlotHint(line: string): string {
@@ -1167,6 +1179,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 				stopRoundTick();
 				return;
 			}
+			settleStrandedRounds();
 			try {
 				// 非 force：保留 fullscreen 布局缓存和差分绘制。
 				uiRef?.requestRender?.();
@@ -1320,19 +1333,56 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		return found;
 	};
 
+	/** 组件在树里的直属父容器。TUI 切换/reparent 后缓存的 container 会过期。 */
+	const containerOfHost = (host: any): any => {
+		let found: any;
+		walkComponentTree(getToolMouseTui(), (value: any) => {
+			if (found) return false;
+			if (Array.isArray(value?.children) && value.children.includes(host)) {
+				found = value;
+				return false;
+			}
+			return undefined;
+		});
+		return found;
+	};
+
+	/** 尾行实际所在容器；缓存的 container 过期时按树找回来。 */
+	const tailHostContainer = (tail: MountedRoundTail): any =>
+		containerOfHost(tail.host) ??
+		(tail.container?.children?.includes?.(tail.host) === true ? tail.container : undefined);
+
+	/** 摘尾行：按实际所在容器摘，避免缓存过期时摘了个空、行留在树上。 */
+	const removeTailHost = (tail: MountedRoundTail): void => {
+		tailHostContainer(tail)?.removeChild?.(tail.host);
+	};
+
 	const ensureTailHost = (round: CompactRound): MountedRoundTail => {
 		if (round.tail) return round.tail;
 		// 同一 anchor 上残留的旧回合尾行（reset/重组后建新回合）先摘除，避免双摘要。
 		const stale = tailByAnchor.get(round.anchor);
 		if (stale) {
-			stale.container?.removeChild?.(stale.host);
+			removeTailHost(stale);
 			mountedTails.delete(stale);
 			tailByAnchor.delete(round.anchor);
 		}
 		const tail: MountedRoundTail = { host: undefined, container: undefined, parts: [], round };
 		const host: any = {
 			outputPad: Number(round.anchor?.outputPad) || 0,
+			children: [],
 			render: (width: number) => tail.parts.flatMap((part: any) => part?.render?.(width) ?? []),
+			childAtRow(localRow: number, width: number) {
+				let offset = 0;
+				for (const part of tail.parts) {
+					const lines = part?.render?.(width);
+					const count = Array.isArray(lines) ? lines.length : 0;
+					if (localRow < offset + count) {
+						return part?.childAtRow?.(localRow - offset, width) ?? null;
+					}
+					offset += count;
+				}
+				return null;
+			},
 			invalidate: () => {
 				for (const part of tail.parts) part?.invalidate?.();
 			},
@@ -1348,6 +1398,10 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		// 点击/悬停归属与 anchor 同一展开入口；toggle 每次 renderRound 重建，按值转发。
 		// 经 tail.round 动态解引用：重建过户时 anchor 可能换成别的组件。
 		ensureAssistantSetExpanded(host);
+		Object.defineProperty(host, "roundAnchor", {
+			configurable: true,
+			get: () => tail.round?.anchor,
+		});
 		host[ASSISTANT_TOGGLE_ROUND_KEY] = (expanded: boolean) =>
 			tail.round?.anchor?.[ASSISTANT_TOGGLE_ROUND_KEY]?.(expanded);
 		tail.host = host;
@@ -1410,7 +1464,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		const tail = round.tail;
 		if (!tail) return;
 		round.tail = undefined;
-		tail.container?.removeChild?.(tail.host);
+		removeTailHost(tail);
 		mountedTails.delete(tail);
 		if (tailByAnchor.get(round.anchor) === tail) tailByAnchor.delete(round.anchor);
 	};
@@ -1442,7 +1496,11 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 			const stale = tail.round as CompactRound | undefined;
 			if (
 				stale &&
-				(stale.messages.get(round.anchor) === message || stale.detachedMessages.includes(message))
+				// 先认组件：重放时消息对象未必是同一个（会话重读/重建），
+				// 只认消息身份会漏掉本该接回的回合，摘要行就此掉队。
+				(stale.anchor === round.anchor ||
+					stale.messages.has(round.anchor) ||
+					stale.detachedMessages.includes(message))
 			) {
 				prior = stale;
 				break;
@@ -1498,6 +1556,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		}
 		const tail = ensureTailHost(round);
 		tail.parts = makeParts(tail.host);
+		tail.host.children = tail.parts;
 		syncTailPosition(round);
 	};
 
@@ -1650,8 +1709,10 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		}
 
 		if (round.anchor.expanded === true) {
-			// 展开卡自带全部内容，尾行摘下（收起时在折叠分支重新挂载）。
-			unmountRoundTail(round);
+			// 展开内容留在摘要行那个位置：回合最后一个成员（含 write/edit）之后。
+			// 放进 anchor 内部会跳到回合起点，盖到中间的 write/edit 上面。
+			// anchor 未挂进 transcript 时没有这个位置，退回 anchor 内部。
+			const mounted = Boolean(tailContainerOf(round.anchor));
 			const toolsById = new Map<string, any>();
 			for (const tool of trackedToolComponents) {
 				if (typeof tool?.toolCallId === "string") toolsById.set(tool.toolCallId, tool);
@@ -1761,7 +1822,20 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 					!explicitRoundToolIds.has(String(tool.toolCallId ?? "")),
 			);
 			flushPanel();
-			for (const child of anchorChildren) round.anchor.contentContainer.addChild(child);
+			if (mounted) {
+				// 正文留在各自的 assistant 消息上，面板挂回摘要行原位。
+				const outside: any[] = [];
+				const panel: any[] = [];
+				for (const child of anchorChildren) {
+					(typeof child?.childAtRow === "function" ? panel : outside).push(child);
+				}
+				for (const child of outside) round.anchor.contentContainer.addChild(child);
+				if (panel.length > 0) mountRoundTail(round, () => panel);
+				else unmountRoundTail(round);
+			} else {
+				unmountRoundTail(round);
+				for (const child of anchorChildren) round.anchor.contentContainer.addChild(child);
+			}
 			// 展开卡内工具会显示 error，外层仍挂 abort/length，避免只藏在折叠工具里。
 			appendStopStatus(round.anchor, stopStatus);
 			return;
@@ -1815,12 +1889,14 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		// 一致；同 anchor 重建回合时 ensureTailHost 去重摘除），非 compact 摘掉，
 		// 别把紧凑摘要带进 default 渲染。
 		for (const tail of [...mountedTails]) {
-			if (tail.container?.children?.includes?.(tail.host) !== true) {
+			const container = tailHostContainer(tail);
+			if (!container) {
 				mountedTails.delete(tail);
 				continue;
 			}
+			tail.container = container;
 			if (config.mode === "compact") continue;
-			tail.container.removeChild(tail.host);
+			container.removeChild(tail.host);
 			mountedTails.delete(tail);
 			if (tail.round?.tail === tail) tail.round.tail = undefined;
 			if (tail.round?.anchor && tailByAnchor.get(tail.round.anchor) === tail) {
@@ -1831,6 +1907,19 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		stopRoundTick();
 	};
 
+	/**
+	 * 兜底：resetRounds 会丢掉回合索引但保留已挂的尾行，重放没能接回的回合会一直
+	 * active——尾行永远显示 Running...（时长还在涨）却不再计入新工具。既不是活动
+	 * 回合也不在收尾静默期的活回合就地收尾，不让它永远挂在屏幕上。
+	 */
+	const settleStrandedRounds = (): void => {
+		for (const tail of [...mountedTails]) {
+			const round = tail.round as CompactRound | undefined;
+			if (!round?.active || round === activeRound || pendingFoldRounds.has(round)) continue;
+			endRound(round, true);
+		}
+	};
+
 	patch.assistantInstalled = function (this: any, message: any, isStreaming?: boolean) {
 		const self = this as any;
 		// 同 compact-thinking：isStreaming 丢失 → mermaid 流式误渲染来回闪。