pi-cc-extensions 1.0.1 → 1.0.2

package/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,56 +14,31 @@ import {
 	TOOL_EXPANDED_BACKGROUND_PATCH,
 } from "../utils/patch-keys.ts";
 import { isToolCallHovered } from "./mouse/hover.ts";
-import {
-	collapsedResultSummary,
-	formatToolDuration,
-	hasExpandableDetail,
-	insetComponent,
-	isExpandedToolIoView,
-	isLiveToolCall,
-	isToolExpanded,
-	pendingIcon,
-	renderCollapsedToolResultToWidth,
-	renderExpandedToolResult,
-	resolveToolVisualState,
-	scheduleAnimation,
-	settledIcon,
-	setToolVisualState,
-	textFromResult,
-	toolIconColor,
-	toolViewportWidth,
-} from "./tool/result.ts";
-import { showMoreHintText } from "./tool/show-more-hint.ts";
-import {
-	ASK_USER_QUESTION_TOOL_NAME,
-	askUserExpandedBody,
-	askUserQuestionCount,
-	createAskUserResultComponent,
-} from "./tool/ask-user-question.ts";
-import {
-	CODEMODE_TOOL_NAME,
-	codemodeExpandedBody,
-	createCodemodeResultComponent,
-} from "./tool/codemode.ts";
-import { countWriteDiffStats, writeStatsInCollapsedBody } 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,
-	SHELL_TOOL_NAMES,
-	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;
@@ -116,421 +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;
-}
-
-/**
- * shell 的耗时文本。Pi 原生 shell 渲染器会在结果底部报一行，ccstyle 的通用折叠行把它盖掉了。
- *
- * 两条路都要：新 Pi 在渲染上下文里给 `durationMs`（单调，restore 出来的行也带得到），优先用它；
- * 拿不到（旧 Pi、无耗时的结果）再退回自己的时钟——开始时间在 renderCall 记，结束时间在结果定型时定一次。
- * 运行中的实时计时也只能走时钟。
- */
-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));
-}
-
-/** 用 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));
-			}
-
-			// shell 的耗时从执行开始算；restore 出来的行没有 executionStarted，不参与。
-			if (
-				SHELL_TOOL_NAMES.has(toolName) &&
-				context?.executionStarted &&
-				context.state &&
-				context.state.ccstyleShellStartedAt === undefined
-			) {
-				context.state.ccstyleShellStartedAt = Date.now();
-			}
-
-			const visualState = resolveToolVisualState(context);
-			const isPending =
-				visualState === "pending" ||
-				(!visualState && (context?.isPartial || context?.executionStarted));
-			// 等待窗口（声明流式中或等待派发）也要转：Pi 要到 assistant 消息结束
-			// 才派发执行，这段只靠 executionStarted 会一直冻在第一帧。
-			const animating =
-				isPending && (Boolean(context?.executionStarted) || isLiveToolCall(context?.toolCallId));
-			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,
-			});
-			// ask_user_question：问题原文在折叠结果树里逐条列出，标题只留工具名和问题数，
-			// 否则第一个问题会在标题和树里各出现一次。
-			if (toolName === ASK_USER_QUESTION_TOOL_NAME) {
-				// Pi 的渲染上下文不带 result，问题数从这里取。
-				const questionCount = askUserQuestionCount(context?.result, args);
-				summary.main = title;
-				summary.detail = questionCount === undefined ? "" : ` (+${questionCount})`;
-				summary.payload = undefined;
-			}
-			let writeStatsText = "";
-			let writeStatsStyled = "";
-			// 折叠 0 行预览时计数由正文那行（↳ diff +A -D · created …）显示，标题不重复。
-			const statsInBody = writeStatsInCollapsedBody(
-				Boolean(context?.expanded),
-				getToolDisplayConfig(),
-			);
-			if (toolName === "write" && visualState === "success" && !statsInBody) {
-				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),
-				});
-			}
-			// ask_user_question：折叠态摊成问答树，展开态按问题逐条列出选择。
-			if (toolName === ASK_USER_QUESTION_TOOL_NAME) {
-				if (!options?.isPartial) setToolVisualState(context, isError ? "error" : "success");
-				if (options?.isPartial) {
-					// 折叠态 1 格缩进：与完成后的 ├/└ 对齐标题行的勾。
-					const pending = expanded ? "↳ Pending…" : " ↳ Pending…";
-					return new Text(theme.fg("muted", pending), 0, 0);
-				}
-				if (expanded) {
-					return renderExpandedToolResult(
-						askUserExpandedBody(result),
-						theme,
-						isError,
-						context?.lastComponent,
-						context?.args,
-						context,
-						true,
-					);
-				}
-				if (context?.state) context.state.ccstyleIoView = undefined;
-				const toolCallId = context?.toolCallId;
-				return createAskUserResultComponent({
-					result,
-					theme,
-					isError,
-					isHovered: () => isToolCallHovered(toolCallId),
-				});
-			}
-			if (options?.isPartial) {
-				// 折叠态保持 3 格：与完成后的 `   ↳ …` 同列，工具跑完那行不横跳。
-				// 展开态贴左（Box 提供 1 格 pad）。
-				const pending = expanded ? "↳ Pending…" : "   ↳ Pending…";
-				if (!SHELL_TOOL_NAMES.has(toolName)) {
-					return new Text(theme.fg("muted", pending), 0, 0);
-				}
-				// shell 运行中报已用时间：数字在 render() 内取，动画 tick 才能带上新值。
-				return {
-					render(width: number) {
-						const elapsed = shellDurationText(toolName, context, true);
-						const suffix = elapsed ? theme.fg("dim", ` · ${elapsed}`) : "";
-						return [truncateToWidth(theme.fg("muted", pending) + suffix, width, "")];
-					},
-					invalidate(): void {},
-				};
-			}
-
-			// shell：结果定型时定一次结束时间，这一行之后不再变。
-			if (
-				SHELL_TOOL_NAMES.has(toolName) &&
-				context?.state &&
-				context.state.ccstyleShellEndedAt === undefined
-			) {
-				context.state.ccstyleShellEndedAt = Date.now();
-			}
-			// 折叠行接在摘要后，展开态接在 Output 正文后（原生也是在结果底部报一行）。
-			const duration = shellDurationText(toolName, context, false);
-
-			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 rendered = tasks.length
-				? taskListSummary(tasks)
-				: collapsedResultSummary({ result, toolName, text, isError });
-			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) {
-				const view = renderExpandedToolResult(
-					text || "",
-					theme,
-					Boolean(isError),
-					context?.lastComponent,
-					args,
-					context,
-					true, // mode=on：贴左，由外层 Box(1,1) 提供 1 格 padding
-				);
-				// 尾部附注只能挂在 IoView 上：鼠标层按对象识别它，包一层会断掉命中。
-				// 与折叠态保持同一写法：裸值，不写 Took。
-				if (isExpandedToolIoView(view)) view.setFooter(duration || undefined);
-				return view;
-			}
-			if (context?.state) context.state.ccstyleIoView = undefined;
-			// 折叠态的耗时接在摘要后、展开提示前（提示必须留在行尾供鼠标层识别）。
-			const body = duration ? `${rendered}${theme.fg("dim", ` · ${duration}`)}` : rendered;
-			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(body, hint, width),
-						);
-						cachedHoveredLine = theme.fg(
-							isError ? "error" : "muted",
-							renderCollapsedToolResultToWidth(body, 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;

package/extensions/renderer/index.ts

@@ -42,7 +42,7 @@ import {
 	clearLiveToolCalls,
 	noteStreamingToolCalls,
 	retireLiveToolCall,
-} from "./tool/result.ts";
+} from "./tool/tool-state.ts";
 import { installWriteOverride, WriteExecutionMetadataStore } from "./tool/diff/index.ts";
 import {
 	installMessageDisplayRendering,
@@ -324,6 +324,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";

package/extensions/renderer/markdown-enhance.ts

@@ -110,14 +110,11 @@ function trimUrl(url: string): string {
 function linkifyUrls(markdown: string): string {
 	const lines = markdown.split("\n");
 	const out: string[] = [];
-	let inFence = false;
+	let fence: MarkdownFence | undefined;
 	for (const line of lines) {
-		if (/^```/.test(line)) {
-			inFence = !inFence;
-			out.push(line);
-			continue;
-		}
-		if (inFence) {
+		const scanned = scanMarkdownFence(line, fence);
+		fence = scanned.fence;
+		if (scanned.protected) {
 			out.push(line);
 			continue;
 		}
@@ -145,8 +142,53 @@ function linkifyUrls(markdown: string): string {
 // 转成 ASCII "(n)" 后任何字体下宽度一致。U+2460-U+2473 连续，差值即序号。
 const CIRCLED_RE = /[①-⑳]/g;
 
+const BLOCKQUOTE_PREFIX = /^ {0,3}>[ \t]?/;
+const CODE_FENCE_OPEN = /^ {0,3}(`{3,}|~{3,})/;
+const CODE_FENCE_CLOSE = /^ {0,3}(`+|~+)[ \t]*$/;
+
+type MarkdownFence = { marker: string; blockquoteDepth: number };
+
+function parseFenceLine(line: string): { blockquoteDepth: number; content: string } {
+	let content = line;
+	let blockquoteDepth = 0;
+	while (BLOCKQUOTE_PREFIX.test(content)) {
+		content = content.replace(BLOCKQUOTE_PREFIX, "");
+		blockquoteDepth++;
+	}
+	return { blockquoteDepth, content };
+}
+
+function scanMarkdownFence(
+	line: string,
+	fence: MarkdownFence | undefined,
+): { protected: boolean; fence: MarkdownFence | undefined } {
+	const parsed = parseFenceLine(line);
+	if (fence && parsed.blockquoteDepth >= fence.blockquoteDepth) {
+		const close = parsed.content.match(CODE_FENCE_CLOSE)?.[1];
+		const closed =
+			parsed.blockquoteDepth === fence.blockquoteDepth &&
+			close?.[0] === fence.marker[0] &&
+			close.length >= fence.marker.length;
+		return { protected: true, fence: closed ? undefined : fence };
+	}
+	const marker = parsed.content.match(CODE_FENCE_OPEN)?.[1];
+	return {
+		protected: Boolean(marker),
+		fence: marker ? { marker, blockquoteDepth: parsed.blockquoteDepth } : undefined,
+	};
+}
+
 function deCircled(markdown: string): string {
-	return markdown.replace(CIRCLED_RE, (ch) => `(${ch.codePointAt(0)! - 0x2460 + 1})`);
+	let fence: MarkdownFence | undefined;
+	return markdown
+		.split("\n")
+		.map((line) => {
+			const scanned = scanMarkdownFence(line, fence);
+			fence = scanned.fence;
+			if (scanned.protected) return line;
+			return line.replace(CIRCLED_RE, (ch) => `(${ch.codePointAt(0)! - 0x2460 + 1})`);
+		})
+		.join("\n");
 }
 
 // ============================================================================
@@ -159,7 +201,7 @@ const MULTILINE_LINK_RE = /\[([^\]\n]*(?:\n[^\]\n]*)+)\](?=\()/g;
 function normalizeMultilineLinks(markdown: string): string {
 	const out: string[] = [];
 	let prose: string[] = [];
-	let inFence = false;
+	let fence: MarkdownFence | undefined;
 	const flush = () => {
 		if (prose.length === 0) return;
 		out.push(
@@ -171,15 +213,13 @@ function normalizeMultilineLinks(markdown: string): string {
 		prose = [];
 	};
 	for (const line of markdown.split("\n")) {
-		if (/^```/.test(line)) {
-			flush();
-			inFence = !inFence;
-			out.push(line);
-		} else if (inFence) {
-			out.push(line);
-		} else {
-			prose.push(line);
-		}
+		const scanned = scanMarkdownFence(line, fence);
+		const opening = !fence && scanned.fence;
+		const closing = fence && !scanned.fence;
+		fence = scanned.fence;
+		if (opening || closing) flush();
+		if (scanned.protected) out.push(line);
+		else prose.push(line);
 	}
 	flush();
 	return out.join("\n");
@@ -272,17 +312,18 @@ function renderDiagrams(
 function renderAdmonitions(markdown: string): string {
 	const lines = markdown.split("\n");
 	const out: string[] = [];
-	let inFence = false;
+	let fence: MarkdownFence | undefined;
 	let i = 0;
 	while (i < lines.length) {
 		const line = lines[i];
-		if (/^```/.test(line)) {
-			inFence = !inFence;
+		const scanned = scanMarkdownFence(line, fence);
+		fence = scanned.fence;
+		if (scanned.protected) {
 			out.push(line);
 			i++;
 			continue;
 		}
-		if (!inFence && /^>\s*\[\s*!/i.test(line)) {
+		if (/^>\s*\[\s*!/i.test(line)) {
 			const result = renderAdmonition(lines, i);
 			if (result) {
 				out.push(...result.output);

package/extensions/renderer/mouse/hover.ts

@@ -6,7 +6,7 @@ import {
 	invalidateIoView,
 	type ExpandedToolIoView,
 	type ToolIoSection,
-} from "../tool/result.ts";
+} from "../tool/tool-io.ts";
 import type { ToolGroupComponent } from "../tool/grouping.ts";
 import { componentAtLocalRow, type ComponentRowHit } from "./layout.ts";
 import { setScrollButtonHovered } from "./scroll.ts";

package/extensions/renderer/mouse/interaction.ts

@@ -14,7 +14,7 @@ import {
 } from "../compact-mode.ts";
 import { isMessageDisplayComponent } from "../tool/message-display.ts";
 import { isLazyProxyTui } from "../../utils/fullscreen-detect.ts";
-import { setToolTuiFullscreen, isCollapseHintLine } from "../tool/show-more-hint.ts";
+import { setToolTuiFullscreen, isCollapseHintLine } from "../tool/names.ts";
 import {
 	type ExpandedToolIoView,
 	getActiveIoViewFrame,
@@ -22,7 +22,7 @@ import {
 	type IoViewFrameState,
 	setActiveIoViewFrame,
 	type ToolIoSection,
-} from "../tool/result.ts";
+} from "../tool/tool-io.ts";
 import {
 	collectToolComponents,
 	extractToolFramePlacements,