pi-cc-extensions 1.0.3 → 1.0.5

package/extensions/renderer/compact-mode.ts

@@ -2,7 +2,7 @@
  * Compact mode：每条含 toolCall 的 assistant message 折叠为一条逐步累加的摘要行
  * （`Ran for 8s, bash×2, read×2`），edit/write 独立标题行（`✓ write <path> (+25 -0)`），
  * 普通工具折叠时不显示独立行；展开（Ctrl+O / fullscreen 点击）时助手文本按原生渲染，
- * thinking 与工具卡装进 userMessageBg 面板（卡内恢复 compact-thinking/Pi 原生或专用
+ * thinking 与工具卡装进按状态着色的面板（卡内恢复 compact-thinking/Pi 原生或专用
  * renderer）。edit/write 复用 mode=on 的 rich diff
  * 与 `editDiffCollapsedLines` / `writeDiffCollapsedLines` / `expandedPreviewMaxLines`。
  * Agent/Task 族：调用只进摘要计数，tool 卡始终折叠（避免 pending→完成高度闪动）。
@@ -37,6 +37,7 @@ import {
 } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth, visibleWidth, Box, Spacer } from "@earendil-works/pi-tui";
 import { config, getToolDisplayConfig } from "../config/config.ts";
+import { aggregateToolCardBgSlot, toolCardBgSlot } from "./tool/tool-state.ts";
 import { ASK_USER_QUESTION_TOOL_NAME } from "./tool/ask-user-question.ts";
 import { toolLoadingIcon } from "../utils/tool-loading-icon.ts";
 import { sanitizeToolResultText } from "../utils/tool-result-sanitize.ts";
@@ -53,7 +54,7 @@ import { displayConfigCacheKey } from "./tool/diff/diff-component.ts";
 import type { WriteExecutionMetadataStore } from "./tool/diff/write-execution.ts";
 import { isToolCallHovered } from "./mouse/hover.ts";
 import { getToolMouseTui } from "./mouse/scroll.ts";
-import { insetComponent } from "./tool/result.ts";
+import { expandedBodyComponent, insetComponent } from "./tool/result.ts";
 import { isLiveToolCall, scheduleAnimation } from "./tool/tool-state.ts";
 import { renderExpandedToolResult } from "./tool/tool-io.ts";
 import { paddedBackgroundRow } from "./tool/grouping.ts";
@@ -114,8 +115,7 @@ export function styleCompactThinkingText(
 	bold = false,
 ): string {
 	if (!theme) return text;
-	const color = config.dimThinkingText ? "dim" : "thinkingText";
-	const colored = typeof theme.fg === "function" ? theme.fg(color, text) : text;
+	const colored = typeof theme.fg === "function" ? theme.fg("dim", text) : text;
 	const weighted = bold && typeof theme.bold === "function" ? theme.bold(colored) : colored;
 	return typeof theme.italic === "function" ? theme.italic(weighted) : weighted;
 }
@@ -333,7 +333,7 @@ function darkenBgAnsi(theme: any, slot: string): string {
 	return `\x1b[48;2;${r};${g};${b}m`;
 }
 
-/** 工具卡深色行：左右内缩（左 2 右 3 格，含工具卡自身 padding），背景只到内容区，
+/** 工具卡深色行：左右各缩 1 格（含工具卡自身 padding），背景只到内容区，
  *  修复行尾 reset 截断。 */
 function toolCardBgRow(
 	theme: any,
@@ -342,8 +342,8 @@ function toolCardBgRow(
 	line: string,
 	width: number,
 ): string {
-	const leftInset = 2;
-	const rightInset = 3;
+	const leftInset = 1;
+	const rightInset = 1;
 	const contentWidth = Math.max(0, width - leftInset - rightInset);
 	// 深色块内左右各 1 格内部 padding；去掉行首原有空格后重新对齐
 	const text = stripBackgroundAnsi(line).replace(/^ +/, "");
@@ -356,14 +356,13 @@ 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 展开卡：保持原样式（展开卡背景 Box），不应用工具卡深色/间距改动。 */
-function editWriteExpandedCard(theme: any): any {
+/** edit/write 展开卡：按这张工具卡自己的状态取底色，不应用工具卡深色/间距改动。 */
+function editWriteExpandedCard(theme: any, component: any): any {
+	const slot = toolCardBgSlot(component);
 	return new Box(
 		1,
 		1,
-		typeof theme.bg === "function"
-			? (text: string) => theme.bg(config.expandedCardBackground, text)
-			: undefined,
+		typeof theme.bg === "function" ? (text: string) => theme.bg(slot, text) : undefined,
 	);
 }
 
@@ -384,7 +383,7 @@ function layoutExpandedToolCard(
 	toolHits = false,
 	live = false,
 ): { lines: string[]; hits: Array<{ child: any; start: number; end: number }> } {
-	const slot = config.expandedCardBackground;
+	const slot = aggregateToolCardBgSlot(children.map((child) => child?.__ccTool).filter(Boolean));
 	const toolBgAnsi = darkenBgAnsi(theme, slot);
 	/** live 每行前面的标记宽度（首行 `↳ `，其余对齐空格）。 */
 	const markerWidth = live ? 2 : 0;
@@ -397,7 +396,10 @@ function layoutExpandedToolCard(
 	let liveLead = 0;
 	const pushRow = (raw: string) => {
 		if (!live) {
-			lines.push(paddedBackgroundRow(theme, slot, raw, width));
+			// 面板 pad 1 是唯一左边距：剥掉子行 collapsed 态自带的 1 格 lead，
+			// 否则标题行偏到 2、↳ 行偏到 4，左右不再对称。
+			const line = raw.replace(/^((?:\x1b\[[0-?]*[ -/]*[@-~])*) /, "$1");
+			lines.push(paddedBackgroundRow(theme, slot, line, width));
 			return;
 		}
 		// 槽位里不重复展开入口（见 SLOT_HINT_PATTERNS）。
@@ -500,7 +502,9 @@ function compactRoundCard(
 		| undefined;
 	const layout = (width: number) => {
 		const theme = themeOf();
-		const bgSlot = config.expandedCardBackground;
+		const bgSlot = aggregateToolCardBgSlot(
+			children.map((child) => child?.__ccTool).filter(Boolean),
+		);
 		const innerWidth = contentWidth(width);
 		const paints = children.map((child) => {
 			const lines = child.render?.(innerWidth);
@@ -706,7 +710,7 @@ function compactEditWriteLine(
 	const isError = component.result?.isError === true;
 	const isPending = !component.result || component.isPartial === true;
 	const icon = isError ? "✗" : isPending ? toolLoadingIcon() : "✓";
-	const iconColor = isError ? "error" : isPending ? "accent" : "success";
+	const iconColor = isError ? "error" : isPending ? "dim" : "success";
 	let statsText = "";
 	let statsStyled = "";
 	// 统计只显示一处：正文自带 +A -D 时标题不再重复（showStats=false）。
@@ -749,7 +753,7 @@ function compactEditWriteLine(
 	const hintPart = clickable
 		? `${theme.fg("dim", " · ")}${theme.fg(isToolCallHovered(component.toolCallId) ? "text" : "dim", clickText)}`
 		: "";
-	const line = `${iconPart}${namePart}${theme.fg("toolTitle", pathPart)}${statsStyled}${hintPart}`;
+	const line = `${iconPart}${namePart}${theme.fg("muted", pathPart)}${statsStyled}${hintPart}`;
 	return ["", truncateToWidth(line, width, "")];
 }
 
@@ -809,7 +813,7 @@ function compactEditWriteLines(
 			hit &&
 			hit.width === width &&
 			hit.theme === theme &&
-			hit.bgSlot === config.expandedCardBackground &&
+			hit.bgSlot === toolCardBgSlot(component) &&
 			hit.diffConfigKey === diffConfigKey &&
 			hit.expanded === expanded &&
 			hit.result === component.result &&
@@ -826,7 +830,7 @@ function compactEditWriteLines(
 		compactEditPaintCache.set(component, {
 			width,
 			theme,
-			bgSlot: config.expandedCardBackground,
+			bgSlot: toolCardBgSlot(component),
 			diffConfigKey,
 			expanded,
 			result: component.result,
@@ -894,7 +898,7 @@ function paintCompactEditWrite(
 
 	let detail: any;
 	if (hasRich) {
-		detail = expanded ? candidate : insetComponent(candidate as any);
+		detail = expanded ? expandedBodyComponent(candidate) : insetComponent(candidate as any);
 	} else {
 		const outputText = sanitizeToolResultText(
 			Array.isArray(result?.content)
@@ -921,7 +925,7 @@ function paintCompactEditWrite(
 		return [...title, ...detail.render(width)];
 	}
 
-	const box = editWriteExpandedCard(theme);
+	const box = editWriteExpandedCard(theme, component);
 	box.addChild({
 		render(innerWidth: number): string[] {
 			return compactEditWriteLine(component, innerWidth, writeMetadata, {
@@ -985,8 +989,7 @@ function compactAssistantLineComponent(
 				return paint.lines;
 			}
 			const plainText = truncateToWidth(resolved, summaryWidth, "…");
-			// Dim thinking text 开启时整行统一 dim，否则工具计数保持 muted。
-			const plain = (value: string) => theme.fg(config.dimThinkingText ? "dim" : "muted", value);
+			const plain = (value: string) => theme.fg("dim", value);
 			let text = plain(plainText);
 			if (runningActive || plainText.startsWith("Ran for ")) {
 				const separator = plainText.indexOf(", ");
@@ -1195,12 +1198,16 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		foldTimer?: ReturnType<typeof setTimeout>;
 		/** 回合挂钟起点，保证 Running 时长连续递增。 */
 		startedAt: number;
+		/** 本进程看见回合的挂钟起点。消息 timestamp 不随工具执行前进。 */
+		wallStartedAt: number;
 		endedAt?: number;
 		/** 回合尾行（摘要 + live 槽位），挂在 transcript 容器的回合末尾。 */
 		tail?: MountedRoundTail;
 	};
 	let activeRound: CompactRound | undefined;
 	let roundByComponent = new WeakMap<object, CompactRound>();
+	/** 本 pass 建起的回合（含被收编的）：清扫孤儿尾行的在册名单。 */
+	const liveRounds = new Set<CompactRound>();
 	const expandedRoundToolIds = new Set<string>();
 	/** 用户显式点开的 round 内工具；强制折叠不压回这些 id。 */
 	const explicitRoundToolIds = new Set<string>();
@@ -1259,11 +1266,31 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		pendingFoldRounds.delete(round);
 	};
 
-	/** 结束回合活动态；不做任何重绘。 */
-	const finalizeRound = (round: CompactRound): void => {
+	/** 供采纳为回合边界的 timestamp：必须是看起来像 epoch 毫秒的数（桩数据/秒级会被拒）。 */
+	const isUsableTimestamp = (value: unknown): value is number =>
+		typeof value === "number" &&
+		Number.isFinite(value) &&
+		value >= 1_600_000_000_000 &&
+		value <= Date.now() + 60_000;
+
+	/** 结束回合活动态；不做任何重绘。更晚的消息 timestamp 用来保住回放时长；
+	 * 同一条消息的 timestamp 不动，活回合改用本进程挂钟，避免把历史 timestamp 收到「现在」。 */
+	const finalizeRound = (round: CompactRound, endTimestamp?: number): void => {
 		clearFoldTimer(round);
 		round.active = false;
-		if (round.endedAt === undefined) round.endedAt = Date.now();
+		if (round.endedAt === undefined) {
+			let fallback = 0;
+			for (const message of roundMessages(round)) {
+				if (isUsableTimestamp(message?.timestamp) && message.timestamp > fallback) {
+					fallback = message.timestamp;
+				}
+			}
+			const stamped = isUsableTimestamp(endTimestamp) ? endTimestamp : fallback;
+			if (stamped > round.startedAt) round.endedAt = stamped;
+			else if (typeof round.wallStartedAt === "number") {
+				round.endedAt = round.startedAt + Math.max(0, Date.now() - round.wallStartedAt);
+			} else round.endedAt = Math.max(round.startedAt, Date.now());
+		}
 		if (activeRound === round) {
 			activeRound = undefined;
 			deps.query?.setCompactSummaryActive?.(false);
@@ -1275,13 +1302,13 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 	 * 结束回合活动态；render=true 时走静默期，延迟 FOLD_SETTLE_MS 再收拢。
 	 * 分组语义不受影响：activeRound 立即让位，新消息不会被并进已收尾的回合。
 	 */
-	const endRound = (round: CompactRound, render = false): void => {
+	const endRound = (round: CompactRound, render = false, endTimestamp?: number): void => {
 		if (!render || !round.active) {
-			finalizeRound(round);
+			finalizeRound(round, endTimestamp);
 			if (render) renderRound(round);
 			return;
 		}
-		finalizeRound(round);
+		finalizeRound(round, endTimestamp);
 		if (round.foldTimer !== undefined) return;
 		round.settleUntil = Date.now() + FOLD_SETTLE_MS;
 		pendingFoldRounds.add(round);
@@ -1462,7 +1489,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 	/** 取并入目标；旧回合被用户消息隔开时先收尾（静默期一转场，新回合立即接手）。 */
 	const joinOrCreateRound = (component: any, message: any): CompactRound => {
 		const joinable = joinableActiveRound(component);
-		if (!joinable && activeRound) finishRound(activeRound);
+		if (!joinable && activeRound) finishRound(activeRound, message?.timestamp);
 		return joinable ?? createRound(component, message);
 	};
 
@@ -1531,10 +1558,13 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 	};
 
 	/**
-	 * 尾行归位。运行中（含收尾静默期）尾行恒为容器最末一行：计数行钉在
-	 * transcript 底缘，运行中到达的提示行/custom 条目只能落在它上方，计数
-	 * 不会被顶离底部截成两行。回合收尾后摘要行回落到回合最后一个成员之后，
-	 * 外来行统一换到摘要行之下，通知行永远落在回合边界外。
+	 * 尾行归位。目标位：活回合（运行中/收尾静默期）且未展开 → 容器最末，
+	 * 计数行钉在 transcript 可写底缘，运行中到达的提示行/custom 条目只能落在
+	 * 它上方，不会被顶离底部截成两行；其余（收尾回合、展开的回合）→ 回合最后
+	 * 一个成员之后，外来行统一换到摘要行之下。展开的回合不按 live 推到底：
+	 * 展开卡属于回合原位，推进容器末尾会把它挪到别的消息之间。
+	 * 尾行已在目标位就不动容器：展开/收起只换 tail.parts，无谓的重摘重插
+	 * 本身就是摘要行挪位的来源。
 	 */
 	const syncTailPosition = (round: CompactRound): void => {
 		const tail = round.tail;
@@ -1546,11 +1576,20 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		if (!container || !Array.isArray(container.children)) return;
 		tail.container = container;
 		const children = container.children as any[];
+		const isMember = roundMemberMatcher(round);
 		const current = children.indexOf(tail.host);
+		// 摘尾行前先定目标位，已在位就整段跳过。
+		let last = -1;
+		for (let i = 0; i < children.length; i++) {
+			if (children[i] === tail.host || !isMember(children[i])) continue;
+			last = i;
+		}
+		const pinToEnd = roundLive(round) && round.anchor?.expanded !== true;
+		const desired = pinToEnd || last < 0 ? children.length - 1 : last + 1;
+		if (current === desired) return;
 		if (current >= 0) children.splice(current, 1);
-		const isMember = roundMemberMatcher(round);
 		let first = -1;
-		let last = -1;
+		last = -1;
 		for (let i = 0; i < children.length; i++) {
 			if (!isMember(children[i])) continue;
 			if (first < 0) first = i;
@@ -1565,7 +1604,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		}
 		if (lastMember) last = children.indexOf(lastMember);
 		const insertAt = last < 0 ? children.length : last + 1;
-		if (roundLive(round)) {
+		if (pinToEnd) {
 			// 活回合：外来行压到最后成员之后，尾行占容器最末。
 			children.splice(insertAt, 0, ...intruders);
 			children.push(tail.host);
@@ -1625,6 +1664,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		}
 		if (!prior) return;
 		round.startedAt = prior.startedAt;
+		if (typeof prior.wallStartedAt === "number") round.wallStartedAt = prior.wallStartedAt;
 		if (prior.detachedMessages.length) round.detachedMessages.push(...prior.detachedMessages);
 		if (!prior.active) {
 			round.active = false;
@@ -1640,7 +1680,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		}
 	};
 
-	/** 新建活回合：literal + 激活 + refresh 重建时的旧回合收编。 */
+	/** 新建活回合：起点用消息真实时刻（回放里 Date.now 会把整轮挤在同一毫秒）。 */
 	const createRound = (anchor: any, message: any): CompactRound => {
 		const round: CompactRound = {
 			anchor,
@@ -1649,8 +1689,10 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 			active: true,
 			suppressedToolIds: new Set(),
 			liveSlotToolIds: new Set(),
-			startedAt: Date.now(),
+			startedAt: isUsableTimestamp(message?.timestamp) ? message.timestamp : Date.now(),
+			wallStartedAt: Date.now(),
 		};
+		liveRounds.add(round);
 		activateRound(round);
 		adoptPriorRound(round, message);
 		return round;
@@ -2014,11 +2056,36 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		ensureRoundTick();
 	};
 
-	const finishRound = (round: CompactRound): void => endRound(round, true);
+	/** 结束回合活动态；render=true 时走静默期，延迟 FOLD_SETTLE_MS 再收拢。 */
+	const finishRound = (round: CompactRound, endTimestamp?: number): void =>
+		endRound(round, true, endTimestamp);
+
+	/**
+	 * 重放/重建结束后的对账：mountedTails 里凡 tail.round 不在本 pass 回合名单的
+	 * 都是没被收编的孤儿（anchor 组件没了、消息换成了新对象、回放顺序错位），
+	 * 就地摘除。收编过的尾行 round 已过户到新 round，不在此列。
+	 */
+	const sweepOrphanTails = (): void => {
+		for (const tail of [...mountedTails]) {
+			const round = tail.round as CompactRound | undefined;
+			// 回合还在本 pass 名单里、且没有同 anchor 的更新 tail 顶位时保留。
+			if (round && liveRounds.has(round)) {
+				const anchor = round.anchor;
+				if (!anchor || tailByAnchor.get(anchor) === tail) continue;
+			}
+			removeTailHost(tail);
+			mountedTails.delete(tail);
+			if (round?.anchor && tailByAnchor.get(round.anchor) === tail) {
+				tailByAnchor.delete(round.anchor);
+			}
+			if (round?.tail === tail) round.tail = undefined;
+		}
+	};
 
 	const resetRounds = (): void => {
 		for (const round of [...pendingFoldRounds]) clearFoldTimer(round);
 		activeRound = undefined;
+		liveRounds.clear();
 		roundByComponent = new WeakMap();
 		expandedRoundToolIds.clear();
 		explicitRoundToolIds.clear();
@@ -2083,20 +2150,18 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 
 		if (hasToolCalls) {
 			let round = roundByComponent.get(this);
-			if (hasText && (!round || round.anchor !== this)) {
-				if (round) {
-					round.messages.delete(this);
-					clearRoundAnchor(this);
-				}
-				if (activeRound) finishRound(activeRound);
-				round = createRound(this, message);
-				roundByComponent.set(this, round);
-			} else if (!round) {
-				// 中间隔着用户消息就另起一回合，不并进上一个回合。
+			if (!round) {
+				// 本条消息是否带 text 不是回合边界：pi 流式协议里同一条
+				// assistant 消息会以 text+toolCall、toolCall-only 反复到达。
+				// 只在「组件未挂进任何回合」时并入 activeRound；被用户消息
+				// 隔开（steer/上回合没正文）时由 joinOrCreateRound 收尾另起。
 				round = joinOrCreateRound(this, message);
 				roundByComponent.set(this, round);
 			}
 			round.messages.set(this, message);
+			if (isUsableTimestamp(message.timestamp) && message.timestamp < round.startedAt) {
+				round.startedAt = message.timestamp;
+			}
 			renderRound(round);
 			return undefined;
 		}
@@ -2111,17 +2176,17 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 				clearRoundAnchor(this);
 				round.detachedMessages.push(previousMessage);
 				roundByComponent.delete(this);
-				finishRound(round);
+				finishRound(round, message.timestamp);
 				return renderAssistantWithoutThinking(this, message);
 			}
 			if (round) {
 				// 围观态下 anchor 还挂着槽位卡，必须重绘才能收回。
-				endRound(round, true);
+				endRound(round, true, message.timestamp);
 				roundByComponent.delete(this);
 				clearRoundAnchor(this);
 				return passThroughAssistant(this, message);
 			}
-			if (activeRound) finishRound(activeRound);
+			if (activeRound) finishRound(activeRound, message.timestamp);
 			return renderAssistantWithoutThinking(this, message);
 		}
 
@@ -2133,6 +2198,9 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 				roundByComponent.set(this, round);
 			}
 			round.messages.set(this, message);
+			if (isUsableTimestamp(message.timestamp) && message.timestamp < round.startedAt) {
+				round.startedAt = message.timestamp;
+			}
 			renderRound(round);
 			return undefined;
 		}
@@ -2140,7 +2208,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		// 无可见内容的 abort/error/length：直接外层状态行，并结束进行中的回合。
 		const loneStatus = messageStopStatus(message);
 		if (loneStatus) {
-			if (activeRound) finishRound(activeRound);
+			if (activeRound) finishRound(activeRound, message.timestamp);
 			self.contentContainer.clear();
 			appendStopStatus(this, loneStatus);
 			return undefined;
@@ -2265,6 +2333,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 			if (config.mode === "compact") syncGlobalExpanded(ctx);
 			else hoveredAssistantComponent = undefined;
 			refreshTrackedComponents();
+			sweepOrphanTails();
 		},
 		refresh() {
 			if (!patch.active) return;
@@ -2272,6 +2341,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 			patch.assertAssistantOwnership();
 			if (config.mode !== "compact") hoveredAssistantComponent = undefined;
 			refreshTrackedComponents();
+			sweepOrphanTails();
 		},
 		assertOwnership() {
 			if (!patch.active) return;

package/extensions/renderer/default-mode.ts

@@ -14,7 +14,7 @@ import {
 	TOOL_EXPANDED_BACKGROUND_PATCH,
 } from "../utils/patch-keys.ts";
 import { isToolCallHovered } from "./mouse/hover.ts";
-import { isLiveToolCall } from "./tool/tool-state.ts";
+import { isLiveToolCall, toolCardBgSlot } from "./tool/tool-state.ts";
 import { getMessageDisplayTheme } from "./tool/message-display.ts";
 import { createCcstyleTool } from "./tool/ccstyle-tool.ts";
 import type { WriteExecutionMetadataStore } from "./tool/diff/index.ts";
@@ -373,7 +373,9 @@ function deactivateGlobalToolRendering(patch: GlobalToolRenderPatch): void {
 	}
 }
 
-/** 展开面板背景统一为 user message 背景色；折叠行保持原生状态色。
+/** 展开面板背景按工具状态取槽位；折叠行保持原生状态色。
+ *  compact 下 ask_user_question 等普通工具的展开也走原生 contentBox，
+ *  这里按同一套状态覆盖它的底色。
  *  必须在 compact-mode 之后安装，shutdown 时先于 compact-mode 释放。 */
 export function installToolExpandedBackground(): () => void {
 	const previous = patchRegistry.get<ToolExpandedBackgroundPatch>(TOOL_EXPANDED_BACKGROUND_PATCH);
@@ -385,7 +387,7 @@ export function installToolExpandedBackground(): () => void {
 		prototype,
 		installed: function (this: any) {
 			original.call(this);
-			if (!patch.active || config.mode !== "on" || !this.expanded) return;
+			if (!patch.active || config.mode === "off" || !this.expanded) return;
 			const theme = getMessageDisplayTheme();
 			if (!theme?.bg) return;
 			const box = this.contentBox;
@@ -394,7 +396,8 @@ export function installToolExpandedBackground(): () => void {
 				box.paddingX = 1;
 				box.paddingY = 1;
 				if (box.setBgFn) {
-					box.setBgFn((text: string) => theme.bg(config.expandedCardBackground, text));
+					const slot = toolCardBgSlot(this);
+					box.setBgFn((text: string) => theme.bg(slot, text));
 				}
 			}
 		},

package/extensions/renderer/mouse/interaction.ts

@@ -48,6 +48,7 @@ import {
 import {
 	fullscreenLazyTui,
 	hideScrollButton,
+	dockScrollButtonActive,
 	restoreOfficialScrollToEnd,
 	syncOfficialScrollToEnd,
 	isScrollBottomInput,
@@ -191,7 +192,7 @@ const FULLSCREEN_FOCUS_OUT = "\x1b[O";
 
 let pendingCollapsePress: {
 	card: any;
-	/** 命中的最内层组件：官方工具卡由 MouseRegion 的 click 收起。 */
+	/** 命中的最内层组件：卡内工具行命中时用于触发官方 click 抑制窗口。 */
 	component: any;
 	col: number;
 	row: number;
@@ -240,22 +241,17 @@ function rememberCollapsePress(card: any, component: any, packet: SgrMousePacket
 
 /**
  * 松手结算：只有"按下与松开在同一格"的完整单击才收起，拖动选择文本时保持展开。
- * 官方工具卡（result 区的 MouseRegion）由 guard 在官方 click 里收起，这里必须跳过，
- * 否则先收起会被官方 click 的 setExpanded(!expanded) 翻回来。
+ * 官方卡与自有卡统一在这里结算：fullscreen 下结算成功的 release 被 consume，
+ * 官方不会再合成 click（合成 click 要求按下/松开坐标完全一致，手抖一格就不发，
+ * 还会把刚收起的卡 toggle 回去、或误触卡内其他 MouseRegion）。
  */
-function resolveCollapsePress(
-	tui: any,
-	packet: SgrMousePacket,
-	options: { skipOfficialCards: boolean },
-): any {
+function resolveCollapsePress(tui: any, packet: SgrMousePacket): any {
 	const press = pendingCollapsePress;
 	pendingCollapsePress = null;
 	if (!press || packet.final !== "m") return undefined;
 	if (Math.abs(packet.col - press.col) > COLLAPSE_CLICK_MOVE_TOLERANCE) return undefined;
 	if (Math.abs(packet.row - press.row) > COLLAPSE_CLICK_MOVE_TOLERANCE) return undefined;
 	if (Date.now() - press.at > COLLAPSE_CLICK_MAX_MS) return undefined;
-	if (options.skipOfficialCards && press.component instanceof ToolExecutionComponent)
-		return undefined;
 	const card = press.card;
 	if (
 		(card instanceof ToolGroupComponent || isCompactAssistantComponent(card)) &&
@@ -265,7 +261,7 @@ function resolveCollapsePress(
 		suppressOfficialCardClickUntil = Date.now() + SUPPRESS_OFFICIAL_CARD_CLICK_MS;
 	}
 	collapseExpandedCard(tui, card);
-	// 返回收起的卡：调用方只对 compact 面板清官方选区。
+	// 返回收起的卡：fullscreen 调用方据此吞掉这次 release 并清官方按下/选区状态。
 	return card;
 }
 
@@ -398,7 +394,7 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 	if (!target) return false;
 	const component = target.component;
 	// compact 展开面板内命中时 owner 是面板：收起对象与记账对象都归面板，
-	// 否则 skipOfficialCards 会把内部工具当成官方卡跳过。
+	// 面板内工具行命中时 release 统一由扩展结算。
 	const card = target.group ?? target.owner ?? component;
 	const pressComponent = target.owner ?? component;
 	// 回到底部按钮：按组件引用命中，不依赖渲染行缓存。
@@ -474,8 +470,8 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 				});
 			}
 		}
-		// 其余放行官方：选区、OSC8 链接与 click 合成都交给 renderer。
-		// 完整单击的收起：官方卡由 guard 处理，自有卡在松手时结算。
+		// 其余放行官方：选区、OSC8 链接与官方按下登记都交给 renderer。
+		// 完整单击的收起统一在松手结算（release 被 consume，官方不会再合成 click）。
 		rememberCollapsePress(card, pressComponent, packet);
 		return false;
 	}
@@ -508,8 +504,8 @@ function keepViewportOnExpand(tui: any): void {
 	const view = tui.getPrimaryScrollView?.();
 	if (typeof view?.scrollTo !== "function" || typeof view.scrollTop !== "number") return;
 	view.scrollTo(view.scrollTop, { disableFollow: true });
-	// 已脱离底部跟随：亮出回到底部按钮，新输出到来时仍有入口。
-	if (view.isFollowingEnd === false) setScrollButtonVisible(true);
+	// 已脱离底部跟随：dock 模式亮出回到底部按钮，新输出到来时仍有入口。
+	if (view.isFollowingEnd === false && dockScrollButtonActive()) setScrollButtonVisible(true);
 }
 
 /**
@@ -584,6 +580,39 @@ function handleFullscreenToolHover(tui: any, packet: SgrMousePacket): void {
 	applyFullscreenHover(tui, target);
 }
 
+/** 布局缺失，或焦点 overlay 还不在上一帧列表里：这份矩形不能拿来判点击。 */
+function overlayLayoutsCurrent(tui: any): boolean {
+	const layouts = tui?.renderedOverlayLayouts;
+	if (!Array.isArray(layouts) || layouts.length === 0) return false;
+	if (typeof tui.isOverlayFocused === "function" && tui.isOverlayFocused()) {
+		const focused = tui.focusedComponent;
+		if (focused && !layouts.some((layout: any) => layout?.entry?.component === focused))
+			return false;
+	}
+	return true;
+}
+
+/**
+ * 鼠标包（1-based 屏幕坐标）是否落在某个已渲染 overlay 的矩形内。
+ * renderedOverlayLayouts 与官方 dispatchMouseToOverlay 同源：只含上一帧画出的可见 overlay。
+ */
+function packetInsideOverlay(tui: any, packet: SgrMousePacket): boolean {
+	const layouts = tui?.renderedOverlayLayouts;
+	if (!Array.isArray(layouts)) return false;
+	const x = packet.col - 1;
+	const y = packet.row - 1;
+	for (const layout of layouts) {
+		if (
+			x >= layout.col &&
+			x < layout.col + layout.width &&
+			y >= layout.row &&
+			y < layout.row + layout.height
+		)
+			return true;
+	}
+	return false;
+}
+
 /**
  * 实例级包装 TuiAltScreen.handleViewportInput（惰性 Proxy 安全）：
  * 原型方法取 original（绕开 proxy 函数包装），实例 own property 装 wrapper
@@ -602,24 +631,33 @@ function patchFullscreenViewportInput(tui: any): void {
 			// 官方 viewport 会消费键盘，扩展监听器无法补偿，必须在这里调度。
 			scheduleScrollButtonSync(tui, data);
 			const packets = parseSgrMousePackets(data);
-			// 官方 fullscreen 会消费全部鼠标；文本预览 overlay 活动时放行给 focused
-			// custom component，使 [esc] 点击和滚轮可用。
-			if (packets && tui.hasOverlay?.() && hasActiveTextPreview()) return undefined;
-			if (packets && !tui.hasOverlay?.()) {
+			// overlay（文本预览/context 弹框，都是真 overlay）可见时：落在
+			// overlay 矩形内的包经 packetInsideOverlay 放行官方
+			// dispatchMouseToOverlay → overlay.handleMouse；overlay 外的包仍
+			// 走扩展收起/展开/hover。两条路径各管各的。
+			if (packets) {
+				// 布局还没出来或仍是上一帧：不要把点击收成工具展开。返回 undefined
+				// 让焦点 overlay 的 handleInput 拿到原始 SGR；官方链也靠这份布局，调它会消费且打到 transcript。
+				if (tui.hasOverlay?.() && !overlayLayoutsCurrent(tui)) return undefined;
+				const overlayPackets = tui.hasOverlay?.()
+					? packets.filter((packet) => packetInsideOverlay(tui, packet))
+					: undefined;
+				const insideOverlay = (packet: SgrMousePacket) => overlayPackets?.includes(packet) === true;
 				for (const packet of packets) {
+					if (insideOverlay(packet)) continue;
 					if (isSgrLeftRelease(packet)) {
-						// 只给 compact 面板清选区：自有面板收起会重排布局，官方选区锚点
-						// 还停在旧布局上，同一次 release 会结算出多行高亮。
-						if (
-							isCompactAssistantComponent(
-								resolveCollapsePress(tui, packet, { skipOfficialCards: true }),
-							)
-						) {
+						// 结算单击收起：成功时吞掉 release，官方不会再对同一次点击合成
+						// click（官方 click 要求按下/松开坐标严格一致，还会把刚收起的卡
+						// toggle 回去，或误触卡内其他 MouseRegion 区）。
+						if (resolveCollapsePress(tui, packet) !== undefined) {
+							// 收起会重排布局：官方还留着按下时登记的 press 目标与选区锚点，
+							// 发 FOCUS_OUT 一次清干净，避免旧坐标结算出误选/误发 click。
 							try {
 								Reflect.apply(original, this, [FULLSCREEN_FOCUS_OUT]);
 							} catch {
 								/* 老版本没有选区状态 */
 							}
+							return { consume: true };
 						}
 					} else if (!isSgrLeftPress(packet) && !isSgrIdleMotion(packet))
 						clearPendingCollapsePressOnMove(packet);
@@ -965,12 +1003,15 @@ function handleToolMouseInput(data: string): { consume: true } | undefined {
 		scheduleScrollButtonSync(getToolMouseTui(), data);
 		return undefined;
 	}
+	// 文本预览活动时，点击交给预览自己的 handleInput（esc/copy/滚动条），
+	// 不被残留的工具 region 吞掉；预览关闭后恢复。
+	if (hasActiveTextPreview()) return undefined;
 
 	let consumed = false;
 	for (const packet of packets) {
 		updateToolSummaryHover(getToolMouseTui(), packet);
 		if (isSgrLeftRelease(packet)) {
-			resolveCollapsePress(getToolMouseTui(), packet, { skipOfficialCards: false });
+			resolveCollapsePress(getToolMouseTui(), packet);
 			continue;
 		}
 		if (!isSgrLeftPress(packet)) {