pi-cc-extensions 1.0.3 → 1.0.4

package/extensions/feature/context.ts

@@ -9,13 +9,14 @@ import {
 	getMarkdownTheme,
 } from "@earendil-works/pi-coding-agent";
 import { Key, Markdown, matchesKey, visibleWidth } from "@earendil-works/pi-tui";
-import { mouseBaseButton, parseSgrMousePacket } from "../utils/sgr-mouse.ts";
+import { type Color, rgbColor } from "@earendil-works/pi-tui";
 import { padLine } from "../utils/format.ts";
 
 export type ContextPart = {
 	label: string;
 	tokens: number;
-	color: "accent" | "success" | "warning" | "customMessageLabel" | "muted" | "dim" | "error";
+	/** 固定 RGB 色值，不走主题 token——避免不同主题撞色。渲染用 theme.style({fg: color})。 */
+	color: Color;
 };
 
 type PreviewKey =
@@ -107,6 +108,7 @@ export async function showTextPreview(
 				let totalLines = 1;
 				let escHovered = false;
 				let copyHovered = false;
+				let scrollbarHovered = false;
 				let escHitbox: { row: number; startCol: number; endCol: number } | undefined;
 				let copyHitbox: { row: number; startCol: number; endCol: number } | undefined;
 				let scrollbarHitbox:
@@ -141,6 +143,12 @@ export async function showTextPreview(
 					tui.requestRender();
 				};
 
+				const setScrollbarHovered = (hovered: boolean): void => {
+					if (hovered === scrollbarHovered) return;
+					scrollbarHovered = hovered;
+					tui.requestRender();
+				};
+
 				const copyPreview = (): void => {
 					void copyTextImpl(content)
 						.then(() => {
@@ -168,6 +176,92 @@ export async function showTextPreview(
 					scrollTo(nextOffset);
 				};
 
+				/**
+				 * 预览鼠标共用处：1-based 屏幕 col/row + 已解码的按键/动作。
+				 * handleInput（regular 主屏 raw SGR）与 handleMouse（overlay 事件对象）
+				 * 都收在这里，两条链同一套 esc/copy/滚动条/滚轮行为。
+				 * 返回 true 表示这次输入被预览消费。
+				 */
+				const handlePreviewMouse = (args: {
+					col: number;
+					row: number;
+					release: boolean;
+					motion: boolean;
+					/** 基础按键码：0 左键、64/65 滚轮上/下。 */
+					baseButton: number;
+				}): boolean => {
+					const { col, row, release, motion, baseButton } = args;
+					if (release) {
+						scrollbarDragOffset = null;
+						setScrollbarHovered(false);
+						return true;
+					}
+					const overEsc = Boolean(
+						escHitbox &&
+							row === escHitbox.row &&
+							col >= escHitbox.startCol &&
+							col <= escHitbox.endCol,
+					);
+					const overCopy = Boolean(
+						copyHitbox &&
+							row === copyHitbox.row &&
+							col >= copyHitbox.startCol &&
+							col <= copyHitbox.endCol,
+					);
+					setEscHovered(overEsc);
+					setCopyHovered(overCopy);
+					// 拖动中保持 hover：thumb 一直亮，官方 scrollbarDrag 同理。
+					setScrollbarHovered(
+						Boolean(
+							scrollbarHitbox &&
+								col === scrollbarHitbox.col &&
+								row >= scrollbarHitbox.startRow &&
+								row <= scrollbarHitbox.endRow,
+						) || scrollbarDragOffset !== null,
+					);
+					if (baseButton === 0 && !motion) {
+						if (overEsc) {
+							done(undefined);
+							return true;
+						}
+						if (overCopy) {
+							copyPreview();
+							return true;
+						}
+						if (
+							scrollbarHitbox &&
+							col === scrollbarHitbox.col &&
+							row >= scrollbarHitbox.startRow &&
+							row <= scrollbarHitbox.endRow
+						) {
+							const trackRow = row - scrollbarHitbox.startRow;
+							const inThumb =
+								trackRow >= scrollbarHitbox.thumbStart &&
+								trackRow < scrollbarHitbox.thumbStart + scrollbarHitbox.thumbSize;
+							scrollbarDragOffset = inThumb
+								? trackRow - scrollbarHitbox.thumbStart
+								: Math.floor(scrollbarHitbox.thumbSize / 2);
+							dragScrollbarTo(row);
+							return true;
+						}
+					}
+					if (motion && scrollbarDragOffset !== null) {
+						dragScrollbarTo(row);
+						return true;
+					}
+					if (baseButton === 64) {
+						scrollTo(scrollOffset - 3);
+						return true;
+					}
+					if (baseButton === 65) {
+						scrollTo(scrollOffset + 3);
+						return true;
+					}
+					// 预览矩形内但未命中任何控件的包也算预览的：返回 true 让 overlay
+					// 命中它（hit 成立），官方不再往底下的 transcript 分发。
+					return true;
+				};
+
 				return {
 					invalidate() {
 						markdownView.invalidate();
@@ -183,62 +277,24 @@ export async function showTextPreview(
 						else if (matchesKey(data, "pageDown")) scrollTo(scrollOffset + pageSize);
 						else if (matchesKey(data, Key.home)) scrollTo(0);
 						else if (matchesKey(data, Key.end)) scrollTo(totalLines - pageSize);
-						else {
-							const mouse = parseSgrMousePacket(data);
-							if (!mouse) return;
-							if (mouse.final === "m") {
-								scrollbarDragOffset = null;
-								return;
-							}
-							const overEsc = Boolean(
-								escHitbox &&
-									mouse.row === escHitbox.row &&
-									mouse.col >= escHitbox.startCol &&
-									mouse.col <= escHitbox.endCol,
-							);
-							const overCopy = Boolean(
-								copyHitbox &&
-									mouse.row === copyHitbox.row &&
-									mouse.col >= copyHitbox.startCol &&
-									mouse.col <= copyHitbox.endCol,
-							);
-							setEscHovered(overEsc);
-							setCopyHovered(overCopy);
-							const button = mouseBaseButton(mouse.code);
-							const motion = (mouse.code & 32) !== 0;
-							if (button === 0 && !motion) {
-								if (overEsc) {
-									done(undefined);
-									return;
-								}
-								if (overCopy) {
-									copyPreview();
-									return;
-								}
-								if (
-									scrollbarHitbox &&
-									mouse.col === scrollbarHitbox.col &&
-									mouse.row >= scrollbarHitbox.startRow &&
-									mouse.row <= scrollbarHitbox.endRow
-								) {
-									const trackRow = mouse.row - scrollbarHitbox.startRow;
-									const inThumb =
-										trackRow >= scrollbarHitbox.thumbStart &&
-										trackRow < scrollbarHitbox.thumbStart + scrollbarHitbox.thumbSize;
-									scrollbarDragOffset = inThumb
-										? trackRow - scrollbarHitbox.thumbStart
-										: Math.floor(scrollbarHitbox.thumbSize / 2);
-									dragScrollbarTo(mouse.row);
-									return;
-								}
-							}
-							if (motion && scrollbarDragOffset !== null) {
-								dragScrollbarTo(mouse.row);
-								return;
-							}
-							if (button === 64) scrollTo(scrollOffset - 3);
-							else if (button === 65) scrollTo(scrollOffset + 3);
-						}
+					},
+					// overlay 事件对象路径：官方 dispatchMouseToOverlay 把鼠标派到
+					// handleMouse，event.x/y 是相对弹框左上角的 0-based 局部坐标，
+					// 与 hitbox 同基准，天然对齐官方放置位置。
+					handleMouse(event: any) {
+						// 一次单击 = press + release + 合成 click。动作已在 press 执行，
+						// click 只消费不重复触发（否则 copy/esc 会跑两次）。
+						if (event.type === "click") return { handled: true };
+						const wheelUp = event.type === "wheel" && Number(event.wheelDelta) < 0;
+						const wheelDown = event.type === "wheel" && Number(event.wheelDelta) > 0;
+						handlePreviewMouse({
+							col: Number(event.x),
+							row: Number(event.y),
+							release: event.type === "release",
+							motion: event.type === "move" || event.type === "drag",
+							baseButton: wheelUp ? 64 : wheelDown ? 65 : event.button === "left" ? 0 : -1,
+						});
+						return { handled: true };
 					},
 
 					render(width: number) {
@@ -257,16 +313,24 @@ export async function showTextPreview(
 						const wrapped = markdownView.render(bodyWidth);
 						totalLines = wrapped.length;
 						scrollOffset = Math.min(scrollOffset, Math.max(0, totalLines - pageSize));
-						// Centered overlay with margin 2: mirror TUI resolveOverlayLayout for anchor "center".
-						const overlayTop = 2 + Math.floor((availableHeight - viewportHeight) / 2);
-						const overlayLeft = Math.floor((Math.max(1, tui.terminal.columns) - width) / 2);
-						escHitbox = escCloseHitbox({ left: overlayLeft, top: overlayTop, width });
-						copyHitbox = copyButtonHitbox({ left: overlayLeft, top: overlayTop, width });
+						// hitbox 用弹框局部坐标（0-based）：title 固定第 1 行，esc/copy
+						// 在行尾，滚动条字符在 body 行右 border 内侧（width-2 列）。
+						escHitbox = { row: 1, startCol: width - 6, endCol: width - 2 };
+						copyHitbox = {
+							row: 1,
+							startCol: width - 6 - 1 - visibleWidth(COPY_LABEL),
+							endCol: width - 8,
+						};
 						const visible = wrapped.slice(scrollOffset, scrollOffset + pageSize);
 						const border = (text: string) => theme.fg("border", text);
 						const scrollable = totalLines > pageSize;
+						// thumb 几何对齐官方 getScrollbarGeometry：trackHeight=pageSize、
+						// contentHeight=totalLines，minThumb=min(2,track)，thumb=round(track²/content)。
 						const thumbSize = scrollable
-							? Math.max(1, Math.floor((pageSize * pageSize) / totalLines))
+							? Math.max(
+									Math.min(2, pageSize),
+									Math.min(pageSize, Math.round((pageSize * pageSize) / totalLines)),
+								)
 							: 0;
 						const maxScrollOffset = Math.max(0, totalLines - pageSize);
 						const thumbStart =
@@ -275,9 +339,9 @@ export async function showTextPreview(
 								: 0;
 						scrollbarHitbox = scrollable
 							? {
-									col: overlayLeft + width - 1,
-									startRow: overlayTop + 4,
-									endRow: overlayTop + 3 + pageSize,
+									col: width - 2,
+									startRow: 3,
+									endRow: 2 + pageSize,
 									thumbStart,
 									thumbSize,
 									maxOffset: maxScrollOffset,
@@ -286,7 +350,10 @@ export async function showTextPreview(
 						const scrollbar = (row: number): string => {
 							if (!scrollable) return " ";
 							const inThumb = row >= thumbStart && row < thumbStart + thumbSize;
-							return theme.fg(inThumb ? "accent" : "borderMuted", inThumb ? "█" : "│");
+							// 对齐官方：thumb 常态 ┃、hover/拖动中 █；track 始终 │。
+							const thumbActive = scrollbarHovered || scrollbarDragOffset !== null;
+							if (inThumb) return theme.fg("accent", thumbActive ? "█" : "┃");
+							return theme.fg("borderMuted", "│");
 						};
 						const bodyRows = Array.from({ length: pageSize }, (_, row) => {
 							const line = visible[row] ?? "";
@@ -294,7 +361,7 @@ export async function showTextPreview(
 						});
 						const start = totalLines === 0 ? 0 : scrollOffset + 1;
 						const end = Math.min(totalLines, scrollOffset + pageSize);
-						const status = `${start}-${end} / ${totalLines} lines · ↑↓ PgUp/PgDn Home/End · [copy] · [esc] close`;
+						const status = `${start}-${end} / ${totalLines} lines · ↑↓ PgUp/PgDn Home/End`;
 
 						return [
 							border(`╭${"─".repeat(inner)}╮`),
@@ -312,7 +379,7 @@ export async function showTextPreview(
 				overlay: true,
 				overlayOptions: {
 					anchor: "center",
-					width: "85%",
+					width: "80%",
 					minWidth: 50,
 					maxHeight: "80%",
 					margin: 2,
@@ -330,19 +397,15 @@ const tokenEstimate = (value: unknown): number => {
 	return Math.max(0, Math.ceil(text.length / 4));
 };
 
-/** system 消息对请求的贡献：正文 + 各 section 文本 + 声明的工具 schema，与 pi 的 estimateTokens 同口径。 */
+/** 只算会进请求正文的 content 和 sections。工具 schema 走 tools 参数，由 Tools definition 单独计一次。 */
 function systemMessageTokens(message: {
 	content?: unknown;
 	sections?: Record<string, string | null> | null;
-	toolsAdded?: unknown;
-	toolsRemoved?: unknown;
 }): number {
 	let chars = typeof message.content === "string" ? message.content.length : 0;
 	for (const section of Object.values(message.sections ?? {})) {
 		if (typeof section === "string") chars += section.length;
 	}
-	if (message.toolsAdded) chars += JSON.stringify(message.toolsAdded).length;
-	if (message.toolsRemoved) chars += JSON.stringify(message.toolsRemoved).length;
 	return Math.ceil(chars / 4);
 }
 
@@ -527,12 +590,16 @@ export function collectContextBreakdown(
 	systemTokens = Math.max(0, systemTokens);
 	return {
 		parts: [
-			{ label: "System prompt", tokens: systemTokens, color: "accent" },
-			{ label: "Memory", tokens: memoryTokens, color: "error" },
-			{ label: "Skills", tokens: skillsTokens, color: "warning" },
-			{ label: "Tools definition", tokens: toolDefinitionTokens, color: "success" },
-			{ label: "Tool results", tokens: toolResultTokens, color: "customMessageLabel" },
-			{ label: "Context", tokens: contextTokens, color: "warning" },
+			{ label: "System prompt", tokens: systemTokens, color: rgbColor(0x79, 0xc0, 0xff) },
+			{ label: "Memory", tokens: memoryTokens, color: rgbColor(0xff, 0x7b, 0x72) },
+			{ label: "Skills", tokens: skillsTokens, color: rgbColor(0xcb, 0x92, 0x14) },
+			{
+				label: "Tools definition",
+				tokens: toolDefinitionTokens,
+				color: rgbColor(0x37, 0xb3, 0x4a),
+			},
+			{ label: "Tool results", tokens: toolResultTokens, color: rgbColor(0xf7, 0x78, 0xba) },
+			{ label: "Context", tokens: contextTokens, color: rgbColor(0xf0, 0x88, 0x3e) },
 		] satisfies ContextPart[],
 		previews: {
 			systemPrompt:
@@ -566,8 +633,8 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 			const free = Math.max(0, contextWindow - used);
 			const allParts = [
 				...parts,
-				{ label: "Other", tokens: other, color: "muted" as const },
-				{ label: "Free space", tokens: free, color: "dim" as const },
+				{ label: "Other", tokens: other, color: rgbColor(0x92, 0x9e, 0xab) },
+				{ label: "Free space", tokens: free, color: rgbColor(0x76, 0x84, 0x94) },
 			];
 
 			if (ctx.mode !== "tui") {
@@ -642,6 +709,59 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 							let escHovered = false;
 							let hoveredKey: PreviewKey | undefined;
 
+							/** context 主弹框鼠标共用处：handleInput（raw SGR）与 handleMouse（overlay
+							 * 事件对象）同一套 hover/选中/关闭行为。返回 true 表示被预览消费。 */
+							const handleDialogMouse = (args: {
+								col: number;
+								row: number;
+								release: boolean;
+								motion: boolean;
+								baseButton: number;
+							}): boolean => {
+								const { col, row, release, motion, baseButton } = args;
+								if (release) return true;
+								if (motion) {
+									const overEsc = Boolean(
+										escHitbox &&
+											row === escHitbox.row &&
+											col >= escHitbox.startCol &&
+											col <= escHitbox.endCol,
+									);
+									const hovered = previewHitboxes.find(
+										(candidate) =>
+											row === candidate.row && col >= candidate.startCol && col <= candidate.endCol,
+									);
+									if (overEsc !== escHovered || hovered?.key !== hoveredKey) {
+										escHovered = overEsc;
+										hoveredKey = hovered?.key;
+										tui.requestRender();
+									}
+									return true;
+								}
+								if (baseButton !== 0) return true;
+								if (
+									escHitbox &&
+									row === escHitbox.row &&
+									col >= escHitbox.startCol &&
+									col <= escHitbox.endCol
+								) {
+									done(undefined);
+									return true;
+								}
+								const hitbox = previewHitboxes.find(
+									(candidate) =>
+										row === candidate.row && col >= candidate.startCol && col <= candidate.endCol,
+								);
+								if (hitbox) {
+									selectedPreviewIndex = Math.max(
+										0,
+										visiblePreviews.findIndex((preview) => preview.key === hitbox.key),
+									);
+									done(hitbox.key);
+								}
+								return true;
+							};
+
 							return {
 								invalidate() {},
 								handleInput(data: string) {
@@ -664,53 +784,20 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 										done(visiblePreviews[selectedPreviewIndex]?.key);
 										return;
 									}
-
-									const mouse = parseSgrMousePacket(data);
-									if (!mouse || mouse.final !== "M") return;
-									if ((mouse.code & 32) !== 0) {
-										// SGR 1003 的无按键 hover code 为 35，不能按左键事件过滤。
-										const overEsc = Boolean(
-											escHitbox &&
-												mouse.row === escHitbox.row &&
-												mouse.col >= escHitbox.startCol &&
-												mouse.col <= escHitbox.endCol,
-										);
-										const hovered = previewHitboxes.find(
-											(candidate) =>
-												mouse.row === candidate.row &&
-												mouse.col >= candidate.startCol &&
-												mouse.col <= candidate.endCol,
-										);
-										if (overEsc !== escHovered || hovered?.key !== hoveredKey) {
-											escHovered = overEsc;
-											hoveredKey = hovered?.key;
-											tui.requestRender();
-										}
-										return;
-									}
-									if (mouseBaseButton(mouse.code) !== 0) return;
-									if (
-										escHitbox &&
-										mouse.row === escHitbox.row &&
-										mouse.col >= escHitbox.startCol &&
-										mouse.col <= escHitbox.endCol
-									) {
-										done(undefined);
-										return;
-									}
-									const hitbox = previewHitboxes.find(
-										(candidate) =>
-											mouse.row === candidate.row &&
-											mouse.col >= candidate.startCol &&
-											mouse.col <= candidate.endCol,
-									);
-									if (hitbox) {
-										selectedPreviewIndex = Math.max(
-											0,
-											visiblePreviews.findIndex((preview) => preview.key === hitbox.key),
-										);
-										done(hitbox.key);
-									}
+								},
+								// overlay 事件对象路径：event.x/y 是弹框局部 0-based 坐标，
+								// 与 hitbox 同基准。click 是 press+release 的合成，动作已在
+								// press 做过，只消费。
+								handleMouse(event: any) {
+									if (event.type === "click") return { handled: true };
+									handleDialogMouse({
+										col: Number(event.x),
+										row: Number(event.y),
+										release: event.type === "release",
+										motion: event.type === "move" || event.type === "drag",
+										baseButton: event.button === "left" ? 0 : -1,
+									});
+									return { handled: true };
 								},
 								render(width: number) {
 									const inner = Math.max(1, width - 2);
@@ -730,7 +817,7 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 															Math.round((part.tokens / Math.max(1, contextWindow)) * barWidth),
 														);
 											remaining -= cells;
-											return theme.fg(part.color, "█".repeat(Math.max(0, cells)));
+											return theme.style("█".repeat(Math.max(0, cells)), { fg: part.color });
 										})
 										.join("");
 									const labelWidth = Math.min(
@@ -740,7 +827,7 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 									const selectedLabel = visiblePreviews[selectedPreviewIndex]?.label;
 									const partRows = allParts.map((part) => {
 										const pct = contextWindow > 0 ? (part.tokens / contextWindow) * 100 : 0;
-										const swatch = theme.fg(part.color, "■");
+										const swatch = theme.style("■", { fg: part.color });
 										const label = part.label.padEnd(labelWidth);
 										const amount = `${formatTokens(part.tokens).padStart(7)}  ${pct.toFixed(1).padStart(5)}%`;
 										const selected = part.label === selectedLabel;
@@ -769,10 +856,10 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 										Math.max(1, terminalHeight - 2),
 									);
 									const visibleHeight = Math.min(lines.length, maxHeight);
-									const overlayTop =
-										1 + Math.floor((Math.max(1, terminalHeight - 2) - visibleHeight) / 2);
-									const overlayLeft = Math.floor((Math.max(1, tui.terminal.columns) - width) / 2);
-									escHitbox = escCloseHitbox({ left: overlayLeft, top: overlayTop, width });
+									// hitbox 用弹框局部坐标（0-based）：esc 在 title 行（第 1 行）
+									// 尾部 │ 前 5 列，preview 行对应 partRows（顶 border=0、title=1、
+									// ├=2、segments=3、空行=4，part 从 5 起）。不依赖官方放置行列。
+									escHitbox = { row: 1, startCol: width - 6, endCol: width - 2 };
 									previewHitboxes = visiblePreviews.flatMap((preview) => {
 										const partIndex = allParts.findIndex((part) => part.label === preview.label);
 										const line = 5 + partIndex;
@@ -780,9 +867,9 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 											? [
 													{
 														key: preview.key,
-														row: overlayTop + line + 1,
-														startCol: overlayLeft + 1,
-														endCol: overlayLeft + width,
+														row: line,
+														startCol: 0,
+														endCol: width - 1,
 													},
 												]
 											: [];

package/extensions/renderer/compact-mode.ts

@@ -1201,6 +1201,8 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 	};
 	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 +1261,30 @@ 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;
+
+	/** 结束回合活动态；不做任何重绘。endTimestamp 用后一段内容的真实时刻收边（回放里
+	 * 同一毫秒完成的 create/finalize 差不出真实耗时）；缺省取回合内消息的最大 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;
+				}
+			}
+			round.endedAt = Math.max(
+				round.startedAt,
+				isUsableTimestamp(endTimestamp) ? endTimestamp : fallback || Date.now(),
+			);
+		}
 		if (activeRound === round) {
 			activeRound = undefined;
 			deps.query?.setCompactSummaryActive?.(false);
@@ -1275,13 +1296,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 +1483,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 +1552,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 +1570,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 +1598,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);
@@ -1640,7 +1673,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		}
 	};
 
-	/** 新建活回合：literal + 激活 + refresh 重建时的旧回合收编。 */
+	/** 新建活回合：起点用消息真实时刻（回放里 Date.now 会把整轮挤在同一毫秒）。 */
 	const createRound = (anchor: any, message: any): CompactRound => {
 		const round: CompactRound = {
 			anchor,
@@ -1649,8 +1682,9 @@ 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(),
 		};
+		liveRounds.add(round);
 		activateRound(round);
 		adoptPriorRound(round, message);
 		return round;
@@ -2014,11 +2048,32 @@ 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;
+			if (round && liveRounds.has(round)) 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();
@@ -2088,7 +2143,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 					round.messages.delete(this);
 					clearRoundAnchor(this);
 				}
-				if (activeRound) finishRound(activeRound);
+				if (activeRound) finishRound(activeRound, message.timestamp);
 				round = createRound(this, message);
 				roundByComponent.set(this, round);
 			} else if (!round) {
@@ -2097,6 +2152,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;
 		}
@@ -2111,17 +2169,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 +2191,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 +2201,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 +2326,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 +2334,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/mouse/interaction.ts

@@ -191,7 +191,7 @@ const FULLSCREEN_FOCUS_OUT = "\x1b[O";
 
 let pendingCollapsePress: {
 	card: any;
-	/** 命中的最内层组件：官方工具卡由 MouseRegion 的 click 收起。 */
+	/** 命中的最内层组件：卡内工具行命中时用于触发官方 click 抑制窗口。 */
 	component: any;
 	col: number;
 	row: number;
@@ -240,22 +240,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 +260,7 @@ function resolveCollapsePress(
 		suppressOfficialCardClickUntil = Date.now() + SUPPRESS_OFFICIAL_CARD_CLICK_MS;
 	}
 	collapseExpandedCard(tui, card);
-	// 返回收起的卡：调用方只对 compact 面板清官方选区。
+	// 返回收起的卡：fullscreen 调用方据此吞掉这次 release 并清官方按下/选区状态。
 	return card;
 }
 
@@ -398,7 +393,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 +469,8 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 				});
 			}
 		}
-		// 其余放行官方：选区、OSC8 链接与 click 合成都交给 renderer。
-		// 完整单击的收起：官方卡由 guard 处理，自有卡在松手时结算。
+		// 其余放行官方：选区、OSC8 链接与官方按下登记都交给 renderer。
+		// 完整单击的收起统一在松手结算（release 被 consume，官方不会再合成 click）。
 		rememberCollapsePress(card, pressComponent, packet);
 		return false;
 	}
@@ -584,6 +579,27 @@ function handleFullscreenToolHover(tui: any, packet: SgrMousePacket): void {
 	applyFullscreenHover(tui, target);
 }
 
+/**
+ * 鼠标包（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 +618,32 @@ 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) {
+				// overlay 可见时：落在 overlay 矩形内的包全部放行官方（文本预览的
+				// [esc] 点击/滚轮、官方搜索框等），扩展不展开/收起/hover。
+				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 +989,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)) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-cc-extensions",
-	"version": "1.0.3",
+	"version": "1.0.4",
 	"license": "MIT",
 	"description": "Claude Code-style TUI output with some personal touches and handy utilities.",
 	"type": "module",