@herbertgao/pi-extensions 2026.10.4 → 2026.10.6

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/default-mode.ts

@@ -1,12 +1,12 @@
 /**
  * default mode（config.mode === "on"）：Claude Code 风格工具卡渲染。
  *
- * 经 ToolExecutionComponent 原型补丁接管 call/result；edit/write 走 rich diff。
+ * 经 ToolExecutionComponent 原型补丁接管 call/result。
+ * 卡片怎么画在 tool/ccstyle-tool.ts，本文件只负责安装与所有权。
  * 生命周期对齐 compact-mode：installDefaultMode → hooks.shutdown。
  */
 import { ToolExecutionComponent } from "@earendil-works/pi-coding-agent";
-import { Text, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import { config, getToolDisplayConfig, type CompactStyleMode } from "../config/config.ts";
+import { config, type CompactStyleMode } from "../config/config.ts";
 import {
 	COMPONENT_TOOL_RENDER_MODE,
 	GLOBAL_TOOL_RENDER_PATCH,
@@ -14,48 +14,31 @@ import {
 	TOOL_EXPANDED_BACKGROUND_PATCH,
 } from "../utils/patch-keys.ts";
 import { isToolCallHovered } from "./mouse/hover.ts";
-import {
-	countLines,
-	hasExpandableDetail,
-	insetComponent,
-	isToolExpanded,
-	outputLineCount,
-	pendingIcon,
-	renderCollapsedToolResultToWidth,
-	renderExpandedToolResult,
-	resolveToolVisualState,
-	scheduleAnimation,
-	settledIcon,
-	setToolVisualState,
-	textFromResult,
-	toolIconColor,
-	toolViewportWidth,
-} from "./tool/result.ts";
-import { oneLine } from "../utils/format.ts";
-import { showMoreHintText } from "./tool/show-more-hint.ts";
-import {
-	CODEMODE_TOOL_NAME,
-	codemodeExpandedBody,
-	createCodemodeResultComponent,
-} from "./tool/codemode.ts";
-import { countWriteDiffStats } from "./tool/diff/diff-renderer.ts";
-import { renderRichToolResult, type WriteExecutionMetadataStore } from "./tool/diff/index.ts";
+import { isLiveToolCall } from "./tool/tool-state.ts";
 import { getMessageDisplayTheme } from "./tool/message-display.ts";
-import { mcpToolTitle } from "./tool/mcp-title.ts";
-import {
-	fitToolCallSummary,
-	humanizeToolLabel,
-	renderToolSummary,
-	toolCallSummary,
-} from "./tool/names.ts";
-
-// 成功勾：亮绿 truecolor（与 message-display 一致）
-const BRIGHT_GREEN = "\x1b[38;2;80;220;100m";
-const ANSI_FG_RESET = "\x1b[39m";
+import { createCcstyleTool } from "./tool/ccstyle-tool.ts";
+import type { WriteExecutionMetadataStore } from "./tool/diff/index.ts";
+export { shouldRenderRichDiff } from "./tool/ccstyle-tool.ts";
 
 // pi-subagents 等扩展为 Agent 提供专用渲染器，ccstyle 必须保留。
 const DEDICATED_RENDERER_TOOLS = new Set(["Agent"]);
 
+/** 排除名单内且自带 renderer 的工具保留原渲染。 */
+export function preservesOriginalRenderer(
+	extensionDefinition: any,
+	toolName: string,
+	builtInToolDefinition?: any,
+	excludeRenderers: readonly string[] = config.excludeRenderers,
+): boolean {
+	if (!excludeRenderers.includes(toolName)) return false;
+	return [extensionDefinition, builtInToolDefinition].some(
+		(definition) =>
+			definition?.renderShell === "self" ||
+			typeof definition?.renderCall === "function" ||
+			typeof definition?.renderResult === "function",
+	);
+}
+
 export type DefaultModeHooks = {
 	/** 本安装是否仍持有全局工具渲染补丁。 */
 	isOwner(): boolean;
@@ -95,6 +78,9 @@ type GlobalToolRenderPatch = {
 	renderPaint?: (width: number) => string[];
 	invalidatePaint?: () => void;
 	paintCache?: WeakMap<object, ToolPaintHit>;
+	/** 给渲染上下文补 result；卸下时还原。 */
+	originalGetRenderContext?: (...args: any[]) => any;
+	getRenderContext?: (this: any, ...args: any[]) => any;
 };
 
 type ToolExpandedBackgroundPatch = {
@@ -105,326 +91,6 @@ type ToolExpandedBackgroundPatch = {
 	dispose: () => void;
 };
 
-/** rich diff 的两个入口（本处与 compact 的 paintCompactEditWrite）都靠 renderRichToolResult
- * 返回 undefined 让位，这里只判断模式与工具名，避免多一个可能与让位不一致的 gate。 */
-export function shouldRenderRichDiff(
-	mode: CompactStyleMode,
-	toolName: string,
-	isError: boolean,
-): boolean {
-	return mode === "on" && !isError && (toolName === "edit" || toolName === "write");
-}
-
-/** 排除名单内且自带 renderer 的工具保留原渲染。 */
-export function preservesOriginalRenderer(
-	extensionDefinition: any,
-	toolName: string,
-	builtInToolDefinition?: any,
-	excludeRenderers: readonly string[] = config.excludeRenderers,
-): boolean {
-	if (!excludeRenderers.includes(toolName)) return false;
-	return [extensionDefinition, builtInToolDefinition].some(
-		(definition) =>
-			definition?.renderShell === "self" ||
-			typeof definition?.renderCall === "function" ||
-			typeof definition?.renderResult === "function",
-	);
-}
-
-function renderDefault(tool: any, slot: "renderCall" | "renderResult", args: any[], fallback = "") {
-	try {
-		if (typeof tool?.[slot] === "function") return tool[slot](...args);
-	} catch {
-		// Fall through to raw fallback.
-	}
-	return new Text(fallback, 0, 0);
-}
-
-type ParsedTask = { id: string; status: string; subject: string };
-
-function parseTaskList(text: string): ParsedTask[] {
-	return text
-		.split("\n")
-		.map((line) => line.match(/^#(\d+) \[([^\]]+)] (.+)$/))
-		.filter((match): match is RegExpMatchArray => Boolean(match))
-		.map((match) => ({ id: match[1]!, status: match[2]!, subject: match[3]! }));
-}
-
-function taskListSummary(tasks: ParsedTask[]): string {
-	const counts = { pending: 0, in_progress: 0, completed: 0 };
-	for (const task of tasks) {
-		if (task.status in counts) counts[task.status as keyof typeof counts]++;
-	}
-	return [
-		`${tasks.length} tasks`,
-		counts.in_progress ? `${counts.in_progress} in progress` : "",
-		counts.pending ? `${counts.pending} pending` : "",
-		counts.completed ? `${counts.completed} completed` : "",
-	]
-		.filter(Boolean)
-		.join(" · ");
-}
-
-function renderExpandedTaskResult(
-	toolName: string,
-	text: string,
-	theme: any,
-	isError: boolean,
-): any | undefined {
-	if (isError) return undefined;
-	if (toolName === "TaskList") {
-		const tasks = parseTaskList(text);
-		if (!tasks.length) return undefined;
-		const limit = Math.max(1, config.expandedPreviewMaxLines);
-		const rows = tasks.slice(0, limit).map((task) => {
-			const color =
-				task.status === "completed"
-					? "success"
-					: task.status === "in_progress"
-						? "warning"
-						: "muted";
-			return `${theme.fg("accent", `#${task.id}`)} ${theme.fg(color, task.status)} ${theme.fg("dim", task.subject)}`;
-		});
-		if (tasks.length > rows.length)
-			rows.push(theme.fg("muted", `… ${tasks.length - rows.length} more tasks`));
-		// 贴左：外层展开卡片 Box(1,1) 提供 1 格 padding
-		return new Text(
-			`↳ ${theme.fg("muted", taskListSummary(tasks))}\n${rows.map((r) => `  ${r}`).join("\n")}`,
-			0,
-			0,
-		);
-	}
-	const line = text.trim();
-	if (!line || line.includes("\n")) return undefined;
-	let formatted: string | undefined;
-	let match: RegExpMatchArray | null;
-	if (
-		toolName === "TaskCreate" &&
-		(match = line.match(/^Task #(\d+) created successfully: (.+)$/))
-	) {
-		formatted = `${theme.fg("success", "Created task")} ${theme.fg("accent", `#${match[1]}`)} ${theme.fg("muted", match[2])}`;
-	} else if (toolName === "TaskUpdate" && (match = line.match(/^Updated task #(\d+) (.+)$/))) {
-		formatted = `${theme.fg("success", "Updated task")} ${theme.fg("accent", `#${match[1]}`)} ${theme.fg("muted", match[2])}`;
-	} else if (toolName === "TaskExecute") {
-		formatted = `${theme.fg("success", "Started")} ${theme.fg("muted", line)}`;
-	} else if (toolName === "TaskStop") {
-		formatted = `${theme.fg("success", "Stopped")} ${theme.fg("muted", line)}`;
-	}
-	return formatted ? new Text(`↳ ${formatted}`, 0, 0) : undefined;
-}
-
-/** 用 ccstyle call/result 包装任意工具定义。 */
-function createCcstyleTool(
-	originalTool: any,
-	writeExecutionMetadata: WriteExecutionMetadataStore,
-	toolName: string,
-): any {
-	const label = originalTool.label || toolName;
-	const defaultTitle = label === toolName ? humanizeToolLabel(label) : label;
-	// MCP 工具直接用 adapter 暴露的真实工具名，不做人性化
-	const title = mcpToolTitle({ toolName, definition: originalTool }) ?? defaultTitle;
-
-	return {
-		...originalTool,
-		renderShell: "self",
-		renderCall(args: any, theme: any, context: any) {
-			if (config.mode === "off") {
-				return renderDefault(originalTool, "renderCall", [args, theme, context], String(toolName));
-			}
-
-			const visualState = resolveToolVisualState(context);
-			const isPending =
-				visualState === "pending" ||
-				(!visualState && (context?.isPartial || context?.executionStarted));
-			const animating = isPending && Boolean(context?.executionStarted);
-			if (animating) scheduleAnimation(context, { light: true });
-			const settledRawIcon = isPending ? "" : settledIcon(toolName, visualState);
-			const settledIconStyled =
-				visualState === "success"
-					? `${BRIGHT_GREEN}${settledRawIcon}${ANSI_FG_RESET}`
-					: theme.fg(toolIconColor(context), settledRawIcon);
-			// 逐帧 spinner：帧在 render() 内取，动画定时器只需 requestRender，
-			// 不再每次 tick 走 updateDisplay 把整张卡重建一遍。
-			const pendingIconStyled = () => theme.fg(toolIconColor(context), pendingIcon(toolName));
-			const summary = toolCallSummary(toolName, args, {
-				title,
-				variant: "default",
-				cwd: context?.cwd,
-			});
-			let writeStatsText = "";
-			let writeStatsStyled = "";
-			if (toolName === "write" && visualState === "success") {
-				const meta = writeExecutionMetadata.get(context?.toolCallId);
-				const stats = countWriteDiffStats(
-					typeof args?.content === "string" ? args.content : undefined,
-					meta?.previousContent,
-					meta?.fileExistedBeforeWrite,
-				);
-				if (stats) {
-					writeStatsText = ` (+${stats.added} -${stats.removed})`;
-					writeStatsStyled = ` ${theme.fg("dim", "(")}${theme.fg("success", `+${stats.added}`)} ${theme.fg("error", `-${stats.removed}`)}${theme.fg("dim", ")")}`;
-				}
-			}
-			const extraText = writeStatsText || summary.detail;
-			const extraStyled = writeStatsStyled || theme.fg("dim", summary.detail);
-			let cachedWidth: number | undefined;
-			let cachedLine: string | undefined;
-			let cachedIcon: string | undefined;
-			const expanded = Boolean(context?.expanded);
-			return {
-				render(width: number) {
-					// 轻量 tick 只会 requestRender，靠这里续期，动画才能自维持。
-					if (animating) scheduleAnimation(context, { light: true });
-					const icon = isPending ? pendingIconStyled() : settledIconStyled;
-					if (cachedLine !== undefined && cachedWidth === width && cachedIcon === icon) {
-						return [cachedLine];
-					}
-					const viewportWidth = toolViewportWidth(width);
-					// 展开态贴左（外层 Box 已 pad 1）；折叠 self-shell 保留 1 格前导空格
-					const lead = expanded ? "" : " ";
-					const callWidth = Math.max(
-						0,
-						viewportWidth - visibleWidth(icon) - 1 - (expanded ? 0 : 1),
-					);
-					const mainWidth = Math.max(0, callWidth - visibleWidth(extraText));
-					cachedWidth = width;
-					cachedIcon = icon;
-					// 路径按最终可用宽度中间截断，避免整行二次截断隐藏文件名。
-					cachedLine = `${lead}${icon} ${renderToolSummary(summary, mainWidth, theme.fg.bind(theme))}${extraStyled}`;
-					return [truncateToWidth(cachedLine, viewportWidth, "")];
-				},
-				invalidate() {
-					cachedLine = undefined;
-					cachedIcon = undefined;
-				},
-			};
-		},
-		renderResult(result: any, options: any, theme: any, context: any) {
-			if (config.mode === "off") {
-				return renderDefault(
-					originalTool,
-					"renderResult",
-					[result, options, theme, context],
-					textFromResult(result),
-				);
-			}
-
-			const expanded = isToolExpanded(options, context);
-			const isError = Boolean(options?.isError || context?.isError);
-			// codemode：折叠态自己画子调用树，展开态给全部子调用与去掉脚本头的输出
-			if (toolName === CODEMODE_TOOL_NAME) {
-				if (!options?.isPartial) setToolVisualState(context, isError ? "error" : "success");
-				if (expanded) {
-					return renderExpandedToolResult(
-						codemodeExpandedBody(result),
-						theme,
-						isError,
-						context?.lastComponent,
-						context?.args,
-						context,
-						true,
-					);
-				}
-				// 折叠态不再复用展开视图，免得 hover/鼠标命中指向已隐藏的组件
-				if (context?.state) context.state.ccstyleIoView = undefined;
-				const toolCallId = context?.toolCallId;
-				return createCodemodeResultComponent({
-					result,
-					theme,
-					running: Boolean(options?.isPartial),
-					isError,
-					isHovered: () => isToolCallHovered(toolCallId),
-				});
-			}
-			if (options?.isPartial) {
-				// 展开态贴左（Box 提供 1 格 pad）；折叠态保持 3 格对齐标题
-				const pending = expanded ? "↳ Pending…" : "   ↳ Pending…";
-				return new Text(theme.fg("muted", pending), 0, 0);
-			}
-
-			setToolVisualState(context, isError ? "error" : "success");
-			const toolCallId = context?.toolCallId;
-			if (shouldRenderRichDiff(config.mode, toolName, Boolean(isError))) {
-				// getter 保证 Diff indicator / wrap / limits 下次绘制即更新
-				const richResult = renderRichToolResult(
-					toolName,
-					result,
-					{
-						...options,
-						expanded,
-						// 全局共享状态避免 /reload 后旧 result renderer 闭包失联
-						isHovered: () => isToolCallHovered(toolCallId),
-					},
-					theme,
-					context,
-					writeExecutionMetadata,
-					getToolDisplayConfig,
-				);
-				// 展开态由 Box(1,1) 提供内边距；折叠态 inset 一级缩进
-				if (richResult) return expanded ? richResult : insetComponent(richResult);
-			}
-
-			const text = textFromResult(result, expanded);
-			const args = context?.args;
-			if (expanded) {
-				const taskResult = renderExpandedTaskResult(toolName, text, theme, Boolean(isError));
-				if (taskResult) return taskResult;
-			}
-			const tasks = !isError && toolName === "TaskList" ? parseTaskList(text) : [];
-			const outputLines = outputLineCount(result) || countLines(text);
-			const lineWord = outputLines === 1 ? "line" : "lines";
-			const action = toolName === "read" ? "loaded" : "returned";
-			const rendered = tasks.length
-				? taskListSummary(tasks)
-				: isError
-					? text
-						? // 72 与原 result.ts 默认一致，保持错误摘要截断宽度。
-							oneLine(text, 72)
-						: "Failed"
-					: outputLines
-						? `${outputLines} ${lineWord} ${action}`
-						: "Done";
-			const expandable = !expanded && (tasks.length > 0 || hasExpandableDetail(text, args));
-			const hintText = showMoreHintText();
-			const hintPrefix = expandable ? theme.fg("dim", " · ") : "";
-			const hint = expandable ? hintPrefix + theme.fg("dim", hintText) : "";
-			const hoveredHint = expandable ? hintPrefix + theme.fg("text", hintText) : "";
-			if (expanded) {
-				return renderExpandedToolResult(
-					text || "",
-					theme,
-					Boolean(isError),
-					context?.lastComponent,
-					args,
-					context,
-					true, // mode=on：贴左，由外层 Box(1,1) 提供 1 格 padding
-				);
-			}
-			if (context?.state) context.state.ccstyleIoView = undefined;
-			let cachedWidth: number | undefined;
-			let cachedLine: string | undefined;
-			let cachedHoveredLine: string | undefined;
-			return {
-				render(width: number) {
-					if (cachedLine === undefined || cachedWidth !== width) {
-						cachedWidth = width;
-						cachedLine = theme.fg(
-							isError ? "error" : "muted",
-							renderCollapsedToolResultToWidth(rendered, hint, width),
-						);
-						cachedHoveredLine = theme.fg(
-							isError ? "error" : "muted",
-							renderCollapsedToolResultToWidth(rendered, hoveredHint, width),
-						);
-					}
-					return [isToolCallHovered(toolCallId) ? cachedHoveredLine! : cachedLine];
-				},
-				invalidate() {},
-			};
-		},
-	};
-}
-
 function syncToolShell(component: any, shell: "default" | "self"): void {
 	const target = shell === "self" ? component.selfRenderContainer : component.contentBox;
 	if (!target || !Array.isArray(component.children)) return;
@@ -566,6 +232,10 @@ function installGlobalToolRendering(
 		previous?.originalInvalidate && prototype.invalidate === previous.invalidatePaint
 			? previous.originalInvalidate
 			: prototype.invalidate;
+	const originalGetRenderContext =
+		previous?.originalGetRenderContext && prototype.getRenderContext === previous.getRenderContext
+			? previous.originalGetRenderContext
+			: prototype.getRenderContext;
 	if (isOwnershipAwarePatch(previous)) disconnectGlobalToolRenderPatch(previous);
 
 	const patch: GlobalToolRenderPatch = {
@@ -581,6 +251,7 @@ function installGlobalToolRendering(
 		installed: undefined as any,
 		originalRender,
 		originalInvalidate,
+		originalGetRenderContext,
 		paintCache: new WeakMap(),
 	};
 
@@ -618,6 +289,13 @@ function installGlobalToolRendering(
 	prototype.getRenderShell = patch.installed.getRenderShell;
 	prototype.getCallRenderer = patch.installed.getCallRenderer;
 	prototype.getResultRenderer = patch.installed.getResultRenderer;
+	// 渲染上下文没有 result。ask_user_question 的标题要报问题数，只能从这里补。
+	patch.getRenderContext = function (this: any, ...args: any[]) {
+		const context = originalGetRenderContext.apply(this, args);
+		if (context && typeof context === "object") context.result = this.result;
+		return context;
+	};
+	prototype.getRenderContext = patch.getRenderContext;
 	// fullscreen 滚动/选区每帧整树 render；内容未变时复用上一帧行，避免重做 diff/Box。
 	patch.renderPaint = function (this: any, width: number): string[] {
 		if (!patch.active || patch.mode() === "off") {
@@ -626,8 +304,11 @@ function installGlobalToolRendering(
 		const cache = patch.paintCache;
 		// A running partial tool owns a time-varying spinner. Light animation ticks
 		// request a repaint without invalidating the component, so settled-content
-		// caching must not intercept those paints.
-		const cacheable = !(this.executionStarted && this.isPartial);
+		// caching must not intercept those paints. The waiting window before the
+		// tool is dispatched animates too, so it must bypass the cache as well.
+		const animatingRow =
+			this.isPartial && (this.executionStarted || isLiveToolCall(this.toolCallId));
+		const cacheable = !animatingRow;
 		const hit = cacheable ? cache?.get(this) : undefined;
 		if (hit && toolPaintMatches(hit, this, width)) return hit.lines;
 		const lines = originalRender.call(this, width);
@@ -683,6 +364,13 @@ function deactivateGlobalToolRendering(patch: GlobalToolRenderPatch): void {
 	) {
 		prototype.invalidate = patch.originalInvalidate;
 	}
+	if (
+		patch.getRenderContext &&
+		prototype.getRenderContext === patch.getRenderContext &&
+		patch.originalGetRenderContext
+	) {
+		prototype.getRenderContext = patch.originalGetRenderContext;
+	}
 }
 
 /** 展开面板背景统一为 user message 背景色；折叠行保持原生状态色。

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/index.ts

@@ -31,8 +31,18 @@ import {
 	TOOL_MOUSE_DISABLE,
 } from "./mouse/interaction.ts";
 import { getToolMouseTui, noteNewTranscriptItem } from "./mouse/scroll.ts";
+import {
+	disposeStickyPromptPatches,
+	installStickyPromptPatches,
+	setStickyPromptTheme,
+} from "./mouse/sticky-prompt.ts";
 import { setHoveredToolGroup, setHoveredToolIo } from "./mouse/hover.ts";
-import { clearAllAnimations } from "./tool/result.ts";
+import {
+	clearAllAnimations,
+	clearLiveToolCalls,
+	noteStreamingToolCalls,
+	retireLiveToolCall,
+} from "./tool/tool-state.ts";
 import { installWriteOverride, WriteExecutionMetadataStore } from "./tool/diff/index.ts";
 import {
 	installMessageDisplayRendering,
@@ -123,6 +133,8 @@ export default function (
 		if (staleGlobalPatch) staleGlobalPatch.mode = () => "off";
 		// regular 主屏的差分渲染补丁：视口上方变化不再触发清回滚的 fullRender。
 		installMainScreenDoRenderPatch();
+		// 粘性用户消息头：标记注入 + fullscreen 帧合成。
+		installStickyPromptPatches();
 		const defaultMode = installDefaultMode(writeExecutionMetadata);
 		const toolGrouping = installToolGrouping(() => config.mode === "on");
 		const compactMode = installCompactMode({
@@ -189,6 +201,9 @@ export default function (
 	});
 
 	pi.on("message_update", async (event) => {
+		// 声明期（assistant 消息结束前）就记住工具 id：这段工具行已在等启动，
+		// spinner 该转，但 Pi 还没跑 markExecutionStarted。
+		if (event.message?.role === "assistant") noteStreamingToolCalls(event.message);
 		// compact-thinking 在 session_start 时于 compact 补丁之上再装一层；
 		// 扩展事件先于 interactive-mode 的 updateContent 派发，此处先重新认领。
 		if (config.mode === "compact" && event.message?.role === "assistant") {
@@ -204,6 +219,7 @@ export default function (
 	});
 
 	pi.on("tool_execution_end", async (event) => {
+		retireLiveToolCall(event?.toolCallId);
 		if (config.mode !== "compact") return;
 		// Agent 等工具收尾后延迟刷新，让 compact-thinking 先落最终态。
 		const toolCallId: string | undefined = event?.toolCallId;
@@ -232,12 +248,16 @@ export default function (
 		if (!hooks) return;
 		hooks.toolGrouping.setTheme(ctx.ui.theme);
 		setMessageDisplayTheme(ctx.ui.theme);
+		setStickyPromptTheme(ctx.ui.theme);
 		ctx.ui.setStatus("ccstyle", undefined);
 		// 先收集 resume transcript，再同步 compact 补丁与全局展开状态。
 		syncCompactMode(ctx);
 		// compact-thinking 的 session_start 处理在本 handler 之后执行（在其之上再装
 		// 一层 updateContent）；延迟再同步一次，保证 compact 补丁最终位于外层。
 		setTimeout(() => syncCompactMode(ctx), 0);
+		// 历史回放发生在 session_start 之后，延迟到回放结束再收尾最后一个回合，
+		// 否则它没有后续消息，摘要行会停在 Running。
+		setTimeout(() => compactModeHooks?.settleReplayedRound(), 0);
 		scheduleSessionRender(() => hooks.toolGrouping.refresh(getToolMouseTui()));
 	});
 
@@ -249,6 +269,7 @@ export default function (
 		if (!hooks) return;
 		hooks.toolGrouping.setTheme(ctx.ui.theme);
 		setMessageDisplayTheme(ctx.ui.theme);
+		setStickyPromptTheme(ctx.ui.theme);
 		syncCompactMode(ctx);
 		scheduleSessionRender(() => {
 			syncCompactMode(ctx);
@@ -268,8 +289,18 @@ export default function (
 		noteNewTranscriptItem();
 	});
 
+	pi.on("turn_end", async () => {
+		clearLiveToolCalls();
+	});
+
+	pi.on("agent_end", async () => {
+		clearLiveToolCalls();
+	});
+
 	pi.on("session_shutdown", async () => {
 		writeExecutionMetadata.clear();
+		// 会话结束就清空，不能等 installation 早退判断；残留的 id 会让下一会话误转。
+		clearLiveToolCalls();
 		// 鼠标交互独立于渲染层：fullscreen 下 installation 为 undefined，
 		// 但 onTerminalInput 监听与 handleViewportInput 包装仍需释放。
 		teardownToolMouseInteraction(mouseOwner);
@@ -281,6 +312,7 @@ export default function (
 		current.compactMode.shutdown();
 		compactModeHooks = undefined;
 		current.disposeMessageDisplay();
+		disposeStickyPromptPatches();
 		clearAllAnimations();
 		installation = undefined;
 	});
@@ -300,6 +332,6 @@ export {
 	ExpandedToolIoView,
 	ExpandedToolResultText,
 	formatToolInputArgs,
-	SHOW_MORE_LABEL,
-} from "./tool/result.ts";
+} from "./tool/tool-io.ts";
+export { SHOW_MORE_LABEL } from "./tool/result.ts";
 export { installToolMouseInteraction } from "./mouse/interaction.ts";