pi-cc-extensions 1.0.4 → 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,6 +1198,8 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		foldTimer?: ReturnType<typeof setTimeout>;
 		/** 回合挂钟起点，保证 Running 时长连续递增。 */
 		startedAt: number;
+		/** 本进程看见回合的挂钟起点。消息 timestamp 不随工具执行前进。 */
+		wallStartedAt: number;
 		endedAt?: number;
 		/** 回合尾行（摘要 + live 槽位），挂在 transcript 容器的回合末尾。 */
 		tail?: MountedRoundTail;
@@ -1268,8 +1273,8 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		value >= 1_600_000_000_000 &&
 		value <= Date.now() + 60_000;
 
-	/** 结束回合活动态；不做任何重绘。endTimestamp 用后一段内容的真实时刻收边（回放里
-	 * 同一毫秒完成的 create/finalize 差不出真实耗时）；缺省取回合内消息的最大 timestamp。 */
+	/** 结束回合活动态；不做任何重绘。更晚的消息 timestamp 用来保住回放时长；
+	 * 同一条消息的 timestamp 不动，活回合改用本进程挂钟，避免把历史 timestamp 收到「现在」。 */
 	const finalizeRound = (round: CompactRound, endTimestamp?: number): void => {
 		clearFoldTimer(round);
 		round.active = false;
@@ -1280,10 +1285,11 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 					fallback = message.timestamp;
 				}
 			}
-			round.endedAt = Math.max(
-				round.startedAt,
-				isUsableTimestamp(endTimestamp) ? endTimestamp : fallback || Date.now(),
-			);
+			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;
@@ -1658,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;
@@ -1683,6 +1690,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 			suppressedToolIds: new Set(),
 			liveSlotToolIds: new Set(),
 			startedAt: isUsableTimestamp(message?.timestamp) ? message.timestamp : Date.now(),
+			wallStartedAt: Date.now(),
 		};
 		liveRounds.add(round);
 		activateRound(round);
@@ -2060,7 +2068,11 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 	const sweepOrphanTails = (): void => {
 		for (const tail of [...mountedTails]) {
 			const round = tail.round as CompactRound | undefined;
-			if (round && liveRounds.has(round)) continue;
+			// 回合还在本 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) {
@@ -2138,16 +2150,11 @@ 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, message.timestamp);
-				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);
 			}

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,
@@ -503,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);
 }
 
 /**
@@ -579,6 +580,18 @@ 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。
@@ -623,8 +636,9 @@ function patchFullscreenViewportInput(tui: any): void {
 			// dispatchMouseToOverlay → overlay.handleMouse；overlay 外的包仍
 			// 走扩展收起/展开/hover。两条路径各管各的。
 			if (packets) {
-				// overlay 可见时：落在 overlay 矩形内的包全部放行官方（文本预览的
-				// [esc] 点击/滚轮、官方搜索框等），扩展不展开/收起/hover。
+				// 布局还没出来或仍是上一帧：不要把点击收成工具展开。返回 undefined
+				// 让焦点 overlay 的 handleInput 拿到原始 SGR；官方链也靠这份布局，调它会消费且打到 transcript。
+				if (tui.hasOverlay?.() && !overlayLayoutsCurrent(tui)) return undefined;
 				const overlayPackets = tui.hasOverlay?.()
 					? packets.filter((packet) => packetInsideOverlay(tui, packet))
 					: undefined;

package/extensions/renderer/mouse/scroll.ts

@@ -68,7 +68,7 @@ export function setScrollButtonVisible(visible: boolean): void {
 export function noteNewTranscriptItem(): void {
 	const state = scrollButtonState();
 	const tui = getToolMouseTui();
-	if (!state.visible || !tui) return;
+	if (!dockScrollButtonActive() || !state.visible || !tui) return;
 	// 提交新消息时官方可能直接跳回底部（不经过滚动输入）：先按实时跟随状态校正，
 	// 否则跟随期间的内容会被当成“离开底部时的新消息”计入。
 	if (isAtTranscriptBottom(tui)) {
@@ -107,6 +107,11 @@ export function toolMouseInteractionActive(): boolean {
 	return config.mode !== "off";
 }
 
+/** dock 模式才用扩展的独占行；native 或 ccstyle off 时交还 Pi 原生浮层。 */
+export function dockScrollButtonActive(): boolean {
+	return toolMouseInteractionActive() && config.scrollButtonMode === "dock";
+}
+
 /** 惰性 Proxy 官方 fullscreen（TuiAltScreen）判定。 */
 export function fullscreenLazyTui(tui: any): boolean {
 	return isLazyProxyTui(tui) && tui.mode === "fullscreen";
@@ -132,10 +137,15 @@ export function restoreOfficialScrollToEnd(tui: any): void {
 	tui[OFFICIAL_SCROLL_TO_END_KEY] = undefined;
 }
 
-/** on/compact 用 dock 按钮；off 还回 pi 原生 Jump to latest。 */
+/** dock 模式替换官方浮层；native 或 ccstyle off 时保留 Pi 原生 Jump to latest。 */
 export function syncOfficialScrollToEnd(tui: any): void {
-	if (toolMouseInteractionActive()) disableOfficialScrollToEnd(tui);
-	else restoreOfficialScrollToEnd(tui);
+	if (dockScrollButtonActive()) {
+		disableOfficialScrollToEnd(tui);
+		return;
+	}
+	restoreOfficialScrollToEnd(tui);
+	setScrollButtonVisible(false);
+	setScrollButtonHovered(false);
 }
 
 /** 官方 fullscreen：是否已跟随 transcript 底部（按钮隐藏条件）。 */
@@ -202,7 +212,7 @@ export function hideScrollButton(tui: any): void {
 export function scheduleScrollButtonSync(tui: any, data: string): void {
 	if (
 		!fullscreenLazyTui(tui) ||
-		!toolMouseInteractionActive() ||
+		!dockScrollButtonActive() ||
 		!isScrollNavigationInput(data) ||
 		scrollButtonSyncScheduled
 	)
@@ -211,7 +221,7 @@ export function scheduleScrollButtonSync(tui: any, data: string): void {
 	const previousLines = tui.previousLines;
 	const check = (attempt: number) => {
 		scrollButtonSyncScheduled = false;
-		if (getToolMouseTui() !== tui) return;
+		if (getToolMouseTui() !== tui || !dockScrollButtonActive()) return;
 		// Pi renders on its own frame timer. Inspect the resulting viewport before
 		// showing the button so empty or non-scrollable transcripts never flash it.
 		const rendered = tui.previousLines !== previousLines;
@@ -234,7 +244,7 @@ export function scheduleScrollButtonSync(tui: any, data: string): void {
 }
 
 export function updateScrollButtonFromInput(tui: any, data: string): void {
-	if (!fullscreenLazyTui(tui) || !toolMouseInteractionActive()) return;
+	if (!fullscreenLazyTui(tui) || !dockScrollButtonActive()) return;
 	if (matchesKey(data, "enter") || matchesKey(data, "return")) hideScrollButton(tui);
 }
 
@@ -247,7 +257,12 @@ function scrollButtonText(): string {
 }
 
 export function renderScrollButton(width: number, theme: any): string[] {
-	if (!getScrollButtonVisible() || !fullscreenLazyTui(getToolMouseTui())) return [];
+	if (
+		!dockScrollButtonActive() ||
+		!getScrollButtonVisible() ||
+		!fullscreenLazyTui(getToolMouseTui())
+	)
+		return [];
 	const label = theme.fg(
 		getScrollButtonHovered() ? "text" : "accent",
 		`[ ↓ ${scrollButtonText()} ]`,

package/extensions/renderer/mouse/sticky-prompt.ts

@@ -27,7 +27,7 @@ import {
 } from "../../utils/patch-keys.ts";
 import { isToolTuiFullscreen } from "../tool/names.ts";
 import type { SgrMousePacket } from "./packets.ts";
-import { setScrollButtonVisible } from "./scroll.ts";
+import { dockScrollButtonActive, setScrollButtonVisible } from "./scroll.ts";
 
 /** 消息正文首行/末行的零宽 APC 标记；终端忽略，合成前剥离。 */
 const MESSAGE_START = "\x1b_cc:p\x07";
@@ -338,7 +338,7 @@ export function handleStickyPromptClick(tui: any, packet: SgrMousePacket): boole
 	const view = tui.getPrimaryScrollView?.();
 	if (typeof view?.scrollTo === "function") {
 		view.scrollTo(state.jumpRow, { disableFollow: true });
-		if (view.isFollowingEnd === false) setScrollButtonVisible(true);
+		if (view.isFollowingEnd === false && dockScrollButtonActive()) setScrollButtonVisible(true);
 	}
 	// 落点已到消息头，这一帧的粘性行立即失效；等下一帧按新位置重算。
 	state.visible = false;

package/extensions/renderer/tool/ccstyle-tool.ts

@@ -27,6 +27,7 @@ import {
 } from "./names.ts";
 import {
 	collapsedResultSummary,
+	expandedBodyComponent,
 	formatToolDuration,
 	insetComponent,
 	renderCollapsedToolResultToWidth,
@@ -154,6 +155,23 @@ function renderExpandedTaskResult(
 	return formatted ? new Text(`↳ ${formatted}`, 0, 0) : undefined;
 }
 
+/**
+ * 工具耗时（毫秒）。结束时优先用 pi 记在结果上的 durationMs（单调，restore 出来的行也带得到）；
+ * 运行中 pi 不给（partial 期间渲染上下文里恒为 undefined），退回 renderCall 记下的时钟。
+ * 拿不到返回 undefined。时钟回拨时钳到 0。
+ */
+function toolElapsedMs(context: any, isPartial: boolean): number | undefined {
+	const recorded = context?.durationMs;
+	if (!isPartial && typeof recorded === "number" && Number.isFinite(recorded) && recorded >= 0) {
+		return recorded;
+	}
+	const startedAt = context?.state?.ccstyleShellStartedAt;
+	if (typeof startedAt !== "number") return undefined;
+	const endedAt = context?.state?.ccstyleShellEndedAt;
+	const end = typeof endedAt === "number" ? endedAt : Date.now();
+	return Math.max(0, end - startedAt);
+}
+
 /**
  * shell 的耗时文本。Pi 原生 shell 渲染器会在结果底部报一行，ccstyle 的通用折叠行把它盖掉了。
  *
@@ -163,16 +181,8 @@ function renderExpandedTaskResult(
  */
 function shellDurationText(toolName: string, context: any, isPartial: boolean): string {
 	if (!SHELL_TOOL_NAMES.has(toolName)) return "";
-	const recorded = context?.durationMs;
-	if (!isPartial && typeof recorded === "number" && Number.isFinite(recorded) && recorded >= 0) {
-		return formatToolDuration(recorded);
-	}
-	const startedAt = context?.state?.ccstyleShellStartedAt;
-	if (typeof startedAt !== "number") return "";
-	const endedAt = context?.state?.ccstyleShellEndedAt;
-	const end = typeof endedAt === "number" ? endedAt : Date.now();
-	// 时钟回拨时别吐负数；快照固定时钟也会走到这。
-	return formatToolDuration(Math.max(0, end - startedAt));
+	const elapsed = toolElapsedMs(context, isPartial);
+	return elapsed === undefined ? "" : formatToolDuration(elapsed);
 }
 
 /** 用 ccstyle call/result 包装任意工具定义。 */
@@ -328,6 +338,7 @@ export function createCcstyleTool(
 					running: Boolean(options?.isPartial),
 					isError,
 					isHovered: () => isToolCallHovered(toolCallId),
+					code: context?.args?.code,
 				});
 			}
 			// ask_user_question：折叠态摊成问答树，展开态按问题逐条列出选择。
@@ -405,8 +416,9 @@ export function createCcstyleTool(
 					writeExecutionMetadata,
 					getToolDisplayConfig,
 				);
-				// 展开态由 Box(1,1) 提供内边距；折叠态 inset 一级缩进
-				if (richResult) return expanded ? richResult : insetComponent(richResult);
+				// 展开态由 Box(1,1) 提供内边距，首行再缩 2 格与标题文字列对齐；折叠态 inset 一级缩进
+				if (richResult)
+					return expanded ? expandedBodyComponent(richResult) : insetComponent(richResult);
 			}
 
 			const text = textFromResult(result, expanded);