pi-cc-extensions 1.0.8 → 1.0.10

package/README.en.md

@@ -4,7 +4,7 @@
 
 # pi-cc-extensions
 
-> Claude Code-style TUI output with some personal touches and handy utilities.
+> Claude Code-style TUI output with some personal touches and handy utilities (no extra built-in tools).
 
 ## Preview
 
@@ -34,7 +34,7 @@ Run `/reload` after installation.
 | Context inspection          | Usage breakdown and previews for the system prompt, memory, skills, tools definition, and messages                                           | `/context`                                      |
 | Session/Subagent references | Search and inject effective context from previous Sessions or existing SubAgents                                                             | `@`                                             |
 | Status bar                  | Shows model, context, cache, cost, and git; also works with `@narumitw/pi-usage` for live quota. Git/cache Nerd Font icons can be turned off | `/ccstyle`                                      |
-| Theme                       | Bundled CC Dark and CC Light themes                                                                                                          | `/theme`                                        |
+| Theme                       | Bundled CC Dark and CC Light themes                                                                                                          | `/settings` → Theme                             |
 
 Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-examples-default.md) · [compact](./docs/tool-render-examples-compact.md)
 
@@ -55,7 +55,7 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
   "enableAgentSummary": true,              // per-turn tool summary
   "enableWorkingMessage": true,            // Working... bottom token/elapsed
   "enableAliases": true,                   // /clear, /exit aliases
-  "enableMarkdownEnhance": true,             // markdown pass: Mermaid dialects and circled-number conversion; false hands it to other extensions
+  "enableMarkdownEnhance": true,           // markdown pass: Mermaid dialects and circled-number conversion; false hands it to other extensions
   "enableEditorPrefix": true,              // editor ❯ prefix
 
   // ui
@@ -97,12 +97,10 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
 ```
 
 > [!TIP]
-> **Fullscreen**: click `click to show more` to expand tool cards, thinking, Skill, and compact summaries. An expanded diff always shows every line; when expanded Input/Output exceeds the line cap, the footer `… +N more lines · click to show more` opens a full preview. Click to collapse.
->
-> Both `scrollButtonMode` values show the same `Back to bottom` / `N new message(s)` text: `dock` draws it in a dedicated row, `native` in Pi’s floating overlay.
+> **Fullscreen**: expanded diffs always show every line. When expanded Input/Output exceeds the line cap, the footer shows `… +N more lines`; click for the full preview, click again to collapse.
 
 > [!NOTE]
-> **Mermaid rendering**: set `markdown.mermaid` to `final` via `~/.pi/agent/settings.json` or the Mermaid diagrams option in `/settings`. Default `streaming` redraws per frame; `final` renders once at completion.
+> **Mermaid rendering**: set `markdown.mermaid` to `final` via `~/.pi/agent/settings.json` or `/settings`. Default `streaming` redraws every frame; `final` renders once.
 
 ## Local development
 

package/README.md

@@ -4,7 +4,7 @@
 
 # pi-cc-extensions
 
-> 类 Claude Code TUI 输出风格，并融入了一些个人喜好，和一些实用小功能。
+> 类 Claude Code TUI 输出风格，并融入了一些个人喜好，和一些实用小功能（无额外内置工具）。
 
 ## 界面预览
 
@@ -34,7 +34,7 @@ pi install git:github.com/minuque/pi-cc-extensions
 | 上下文检查            | 查看上下文占用，并预览 System prompt、Memory、Skills、Tools definition 和消息内容 | `/context`                                      |
 | Session/Subagent 引用 | 搜索并注入历史 Session 或现有 SubAgent 的有效上下文                             | `@`                                             |
 | 状态栏                | 显示：模型、上下文、缓存、费用、git并适配 @narumitw/pi-usage 实时显示额度；git/缓存图标可关 Nerd Font | `/ccstyle`                              |
-| 主题                  | 随包提供内置 CC Dark、CC Light 主题                                             | `/theme`                                        |
+| 主题                  | 随包提供内置 CC Dark、CC Light 主题                                             | `/settings` → Theme                             |
 
 `on` / `compact` 两种模式的渲染样例：[默认模式](./docs/tool-render-examples-default.md) · [紧凑模式](./docs/tool-render-examples-compact.md)
 
@@ -55,7 +55,7 @@ pi install git:github.com/minuque/pi-cc-extensions
   "enableAgentSummary": true,              // 每回合工具摘要
   "enableWorkingMessage": true,            // Working... 底部 token/耗时
   "enableAliases": true,                   // /clear、/exit 别名
-  "enableMarkdownEnhance": true,             // markdown 转换：Mermaid 方言渲染、圈数字转半角括号；false 让位给其他扩展
+  "enableMarkdownEnhance": true,           // markdown 转换：Mermaid 方言渲染、圈数字转半角括号；false 让位给其他扩展
   "enableEditorPrefix": true,              // 输入框 ❯ 前缀
 
   // ui
@@ -97,12 +97,10 @@ pi install git:github.com/minuque/pi-cc-extensions
 ```
 
 > [!TIP]
-> **全屏模式**：单击 `click to show more` 展开工具卡、思考、Skill 和 compact 摘要；工具卡展开态 diff 全量显示，Input/Output 超行时末行 `… +N more lines · click to show more` 打开全量预览，单击收起。
->
-> `scrollButtonMode` 两种模式文案相同（`Back to bottom` / `N new message(s)`）：`dock` 画在独占行，`native` 画在 Pi 原生浮层。
+> **全屏模式**：展开态 diff 全量显示。Input/Output 超行时末行给 `… +N more lines`，单击看全量，再击收起。
 
 > [!NOTE]
-> **Mermaid 渲染**：建议把 `markdown.mermaid` 设为 `final`（`~/.pi/agent/settings.json` 或 `/settings` 面板的 Mermaid diagrams 选项）。默认 `streaming` 逐帧重绘，`final` 渲染最终版更稳定。
+> **Mermaid 渲染**：`markdown.mermaid` 建议设为 `final`（`~/.pi/agent/settings.json` 或 `/settings`）。默认 `streaming` 逐帧重绘，`final` 只渲染最终版。
 
 ## 本地开发
 

package/extensions/config/config.ts

@@ -122,6 +122,7 @@ export const THINKING_PREVIEW_LINES_VALUES = ["0", "1", "3", "5", "10"];
 export const THINKING_ANIMATION_INTERVAL_VALUES = ["40", "60", "90", "120", "180"];
 /** Tools commonly toggled in excludeRenderers via the settings panel. */
 export const EXCLUDE_RENDERER_CANDIDATES = [
+	"agent",
 	"bash",
 	"powershell",
 	"read",

package/extensions/config/panel.ts

@@ -82,8 +82,8 @@ function modeSettingDescription(mode: CompactStyleMode): string {
 
 function excludeRenderersDescription(names: readonly string[]): string {
 	return names.length === 0
-		? "No tools excluded. Agent always keeps its dedicated renderer. Enter to toggle common tools."
-		: `Native renderer for: ${names.join(", ")}. Agent is always native. Enter to toggle.`;
+		? "No tools excluded. Enter to toggle common tools."
+		: `Native renderer for: ${names.join(", ")}. Enter to toggle.`;
 }
 
 function customFooterDescription(enabled: boolean): string {
@@ -274,10 +274,7 @@ function buildExcludeRenderersSubmenu(
 	const items = candidates.map((name) => ({
 		id: name,
 		label: name,
-		description:
-			name === "Agent"
-				? "Agent always uses its dedicated renderer and cannot be forced through ccstyle."
-				: `Use Pi native renderer for ${name} instead of Claude Code styling.`,
+		description: `Use Pi native renderer for ${name} instead of Claude Code styling.`,
 		currentValue: config.excludeRenderers.includes(name) ? "exclude" : "style",
 		values: ["style", "exclude"],
 	}));
@@ -431,6 +428,11 @@ export async function showCcstylePanel(
 		return;
 	}
 
+	// 编辑器插槽只能在面板关闭后替换：面板自己就挂在 editorContainer 上，面板开着时调
+	// setEditorComponent 会把面板踢出渲染树、done() 再也走不到，`ctx.ui.custom()` 永不落定，
+	// 整个输入管线随之卡死。
+	let editorPrefixChanged = false;
+
 	await ctx.ui.custom((tui: any, theme: any, _keybindings: any, done: () => void) => {
 		const modeSetting = {
 			id: "mode",
@@ -880,8 +882,7 @@ export async function showCcstylePanel(
 				editorPrefixSetting.description = enabled
 					? "Show ❯ before the input line; color follows thinking level / bash mode."
 					: "Plain input line, no ❯ glyph.";
-				if (enabled) applyPromptEditor(ctx);
-				else clearPromptEditor(ctx);
+				editorPrefixChanged = true;
 				ctx.ui.notify(`Updated ${id}: ${value}`, "info");
 				return;
 			}
@@ -1208,6 +1209,11 @@ export async function showCcstylePanel(
 			},
 		};
 	});
+	// 面板已经卸下，插槽此时替换才不会踢掉对话框。
+	if (editorPrefixChanged) {
+		if (config.enableEditorPrefix) applyPromptEditor(ctx);
+		else clearPromptEditor(ctx);
+	}
 	// 面板卸下后主 transcript 重新挂载；再刷一次，吃掉打开期间扫树失败的切换。
 	hooks.refreshCurrentTranscript(ctx, toolGrouping);
 }

package/extensions/feature/shell/footer.ts

@@ -385,12 +385,24 @@ const createCustomFooterFactory =
 			return 0;
 		};
 
-		const render = (width: number): string[] => {
+		// 三个会话统计每帧重算会全量遍历 session，长会话把 pi 钉在 100% CPU（issue #80）。
+		// leaf/model/thinking 任一变化立即重算；不变时 1s TTL，流式期间每秒刷新一次。
+		const SESSION_STATS_TTL_MS = 1_000;
+		let statsMemoKey = "";
+		let statsMemoAt = 0;
+		let statsMemo:
+			| { contextUsage: ReturnType<typeof ctx.getContextUsage>; cost: number; cachePct: number }
+			| undefined;
+		const sessionStats = () => {
 			const model = ctx.model;
-			const contextUsage = ctx.getContextUsage();
-			const contextWindow = contextUsage?.contextWindow ?? model?.contextWindow ?? 0;
-			const percent = contextUsage?.percent;
-
+			const key = `${ctx.sessionManager.getLeafId() ?? ""}|${model?.provider}/${model?.id}|${ctx.thinkingLevel ?? ""}`;
+			if (
+				statsMemo &&
+				key === statsMemoKey &&
+				performance.now() - statsMemoAt < SESSION_STATS_TTL_MS
+			) {
+				return statsMemo;
+			}
 			let cost = 0;
 			for (const entry of ctx.sessionManager.getEntries()) {
 				if (entry.type === "message") {
@@ -404,6 +416,17 @@ const createCustomFooterFactory =
 					cost += entry.usage.cost?.total || 0;
 				}
 			}
+			statsMemo = { contextUsage: ctx.getContextUsage(), cost, cachePct: getCachePct() };
+			statsMemoKey = key;
+			statsMemoAt = performance.now();
+			return statsMemo;
+		};
+
+		const render = (width: number): string[] => {
+			const model = ctx.model;
+			const { contextUsage, cost, cachePct } = sessionStats();
+			const contextWindow = contextUsage?.contextWindow ?? model?.contextWindow ?? 0;
+			const percent = contextUsage?.percent;
 
 			// cwd 默认只显示最底层路径（根目录时回退完整路径）
 			const cwdLabel = ctx.cwd.split(/[\\/]/).filter(Boolean).pop() || ctx.cwd;
@@ -430,7 +453,6 @@ const createCustomFooterFactory =
 			const dimPlugin = (text: string) => colorUsageChip(theme, text);
 
 			const pctLabel = percent === null || percent === undefined ? "?" : `${Math.floor(percent)}%`;
-			const cachePct = getCachePct();
 			const glyphs = footerGlyphs(config.footerNerdIcons);
 			const cacheLabel =
 				cachePct > 0 ? `${glyphs.cache ? `${glyphs.cache} ` : ""}${Math.floor(cachePct)}%` : "";

package/extensions/feature/shell/prompt-editor.ts

@@ -59,27 +59,48 @@ const promptEditorFactory: EditorFactory = (tui, theme, keybindings) =>
 let active = false;
 let previousEditorFactory: EditorFactory | undefined;
 
-/** 撤销本扩展占据的插槽；从未占用就不碰插槽。 */
+/**
+ * 撤销本扩展占据的插槽；从未占用就不碰插槽。
+ *
+ * 插槽可能已经被其他扩展包在外层（pi-inline-skills 会把当前工厂再包一层），
+ * 那种结构里无法只拆内层，直接还回占据前的工厂；外层扩展会在下次终端输入时
+ * 自己重新包装，前缀不会因此复活。
+ *
+ * 例外：插槽被 pi 重置回占据前的工厂时（/new、/reload 走 resetExtensionUI），
+ * 我们已经不在槽里，再写一次会把 pi 刚重置的结果又覆盖掉；此时只清状态。
+ */
 function releasePromptEditor(ctx: ExtensionContext): void {
 	if (!active) return;
-	ctx.ui.setEditorComponent(previousEditorFactory);
+	const previous = previousEditorFactory;
 	active = false;
 	previousEditorFactory = undefined;
+	if (ctx.ui.getEditorComponent?.() === previous) return;
+	ctx.ui.setEditorComponent(previous);
 }
 
-/** 应用输入框前缀；enableEditorPrefix=false 时只撤自己装的那层。 */
+/**
+ * 应用输入框前缀；enableEditorPrefix=false 时只撤自己装的那层。
+ *
+ * 只在没有扩展对话框开着时调用：pi 的 setEditorComponent 会清空 editorContainer 并
+ * 抢走焦点，把正在设置面板里的对话框踢出渲染树，对话框的 done() 再也走不到，
+ * `ctx.ui.custom()` 的 Promise 永不落定，后续输入全部卡死。设置面板自己不做替换，
+ * 等 `ctx.ui.custom()` 返回后再调本函数。
+ *
+ * 插槽已经装着本扩展的编辑器时直接返回：重复安装只会重建实例，丢掉撤销栈、
+ * 历史等编辑器状态，还会打断其他扩展包在外层的编辑器。
+ */
 export function applyPromptEditor(ctx: ExtensionContext): void {
 	if (!ctx?.hasUI || typeof ctx.ui?.setEditorComponent !== "function") return;
+	if (!config.enableEditorPrefix) {
+		releasePromptEditor(ctx);
+		return;
+	}
+	const current = ctx.ui.getEditorComponent?.();
+	if (current === promptEditorFactory) return;
 	try {
-		if (!config.enableEditorPrefix) {
-			releasePromptEditor(ctx);
-			return;
-		}
-		if (!active) {
-			// pi 的插槽是硬替换、没有栈，先记住是谁占着，撤销时还回去。
-			previousEditorFactory = ctx.ui.getEditorComponent?.();
-			active = true;
-		}
+		// pi 的插槽是硬替换、没有栈，先记住是谁占着，撤销时还回去。
+		previousEditorFactory = current;
+		active = true;
 		ctx.ui.setEditorComponent(promptEditorFactory);
 	} catch (err) {
 		ctx.ui.notify(

package/extensions/renderer/compact-mode.ts

@@ -1057,6 +1057,14 @@ function compactStopStatusLine(status: string, pad = 0): any {
 /** 展开入口的动作词：我们的 `click to show more`、pi 的 `<key> to expand`（键名可能取不到）。 */
 const EXPAND_ACTION = String.raw`(?:click to show more|(?:[\w/+]+\s+)?to (?:show more|expand))`;
 
+/**
+ * 展开入口只挂在行尾：正则只看行尾这一段，单行代价与行长无关。
+ * 图片负载（kitty 图形数据的 Base64）一行可达数百 KB，整行过正则会拖住渲染帧。
+ */
+const SLOT_HINT_WINDOW = 200;
+/** 窗口里出现这些词才可能有展开入口，其余行（负载、代码）直接放过正则。 */
+const SLOT_HINT_MARKERS = ["to expand", "to show more"];
+
 const SLOT_HINT_PATTERNS: RegExp[] = [
 	// 卡在括号里：`(9 more lines, click to show more)` / `(195 earlier lines, ctrl+o to expand)`，
 	// 只去掉动作词，收尾括号与计数保留。
@@ -1066,13 +1074,18 @@ const SLOT_HINT_PATTERNS: RegExp[] = [
 	new RegExp(String.raw`\s*(?:[•·]\s*)?${EXPAND_ACTION}\s*$`),
 ];
 
-function stripSlotHint(line: string): string {
-	const plain = stripTerminalSequencesPreservingLayout(line);
+/** 导出供单测：窗口边界与键名长度是性能与裁剪行为的关键，需要逐条钉住。 */
+export function stripSlotHint(line: string): string {
+	// 切点可能落在转义序列中间，残片只当作窗口头部文本；两个模式都锚在行尾，不受影响。
+	const head = line.slice(0, Math.max(0, line.length - SLOT_HINT_WINDOW));
+	const tail = line.slice(head.length);
+	const plain = stripTerminalSequencesPreservingLayout(tail);
+	if (!SLOT_HINT_MARKERS.some((marker) => plain.includes(marker))) return line;
 	for (const re of SLOT_HINT_PATTERNS) {
 		const match = re.exec(plain);
 		if (!match) continue;
 		// 删除区间而非截断后拼纯文本：收尾括号留在原样式里（dim），不会掉回默认前景色。
-		return removeStyledRange(line, match.index, match.index + match[0].length);
+		return head + removeStyledRange(tail, match.index, match.index + match[0].length);
 	}
 	return line;
 }

package/extensions/renderer/default-mode.ts

@@ -20,10 +20,7 @@ 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 的工具保留原渲染。 */
+/** 排除名单内且自带 renderer 的工具保留原渲染；excludeRenderers 里的工具也交给原生渲染器。 */
 export function preservesOriginalRenderer(
 	extensionDefinition: any,
 	toolName: string,
@@ -117,7 +114,6 @@ function shouldGloballyStyleTool(component: any, patch: GlobalToolRenderPatch):
 	// compact 也复用同一套 ccstyle call/result，避免折叠态工具卡回落到 Pi 原生样式。
 	const useCcstyle =
 		patch.mode() !== "off" &&
-		!DEDICATED_RENDERER_TOOLS.has(toolName) &&
 		!preservesOriginalRenderer(extensionDefinition, toolName, builtInDefinition);
 	component[COMPONENT_TOOL_RENDER_MODE] = useCcstyle;
 	return useCcstyle;

package/extensions/renderer/index.ts

@@ -49,13 +49,17 @@ import {
 	refreshMessageDisplays,
 	setMessageDisplayTheme,
 } from "./tool/message-display.ts";
+import {
+	installSubagentNotificationRenderer,
+	refreshSubagentNotifications,
+} from "./tool/subagent-notification.ts";
 
 /**
  * Claude Code Style for pi — 装配入口。
  *
  * mode=on      → default-mode（工具卡样式 + 展开背景）
  * mode=compact → compact-mode（消息折叠摘要）
- * 共用        → tool-grouping / message-display / mouse / write override
+ * 共用        → tool-grouping / message-display / subagent-notification / mouse / write override
  */
 
 let compactModeHooks: CompactModeHooks | undefined;
@@ -64,6 +68,7 @@ function refreshCurrentTranscript(ctx?: any, toolGrouping?: ToolGroupingHooks):
 	const tui = getToolMouseTui();
 	toolGrouping?.refresh(tui);
 	refreshMessageDisplays(tui);
+	refreshSubagentNotifications(tui);
 	refreshCompactModeComponents(tui);
 	compactModeHooks?.refresh();
 	tui?.requestRender?.(true);
@@ -117,6 +122,7 @@ export default function (
 				toolGrouping: ToolGroupingHooks;
 				compactMode: CompactModeHooks;
 				disposeMessageDisplay: () => void;
+				disposeSubagentNotificationRenderer: () => void;
 				disposeToolExpandedBackground: () => void;
 		  }
 		| undefined;
@@ -138,6 +144,8 @@ export default function (
 		});
 		compactModeHooks = compactMode;
 		const disposeMessageDisplay = installMessageDisplayRendering();
+		// pi-subagents 的结束通知：换查找结果而不注册，加载先后都归本插件，off 还给原生。
+		const disposeSubagentNotificationRenderer = installSubagentNotificationRenderer();
 		// 展开背景必须在 compact-mode 之后装，shutdown 时先于 compact 释放。
 		const disposeToolExpandedBackground = installToolExpandedBackground();
 		installation = {
@@ -145,6 +153,7 @@ export default function (
 			toolGrouping,
 			compactMode,
 			disposeMessageDisplay,
+			disposeSubagentNotificationRenderer,
 			disposeToolExpandedBackground,
 		};
 		return installation;
@@ -253,7 +262,11 @@ export default function (
 		// 历史回放发生在 session_start 之后，延迟到回放结束再收尾最后一个回合，
 		// 否则它没有后续消息，摘要行会停在 Running。
 		setTimeout(() => compactModeHooks?.settleReplayedRound(), 0);
-		scheduleSessionRender(() => hooks.toolGrouping.refresh(getToolMouseTui()));
+		scheduleSessionRender(() => {
+			hooks.toolGrouping.refresh(getToolMouseTui());
+			// /reload、/resume 在 session_start 之前就重建了 transcript：已挂载的通知卡换上本插件的渲染器。
+			refreshSubagentNotifications(getToolMouseTui());
+		});
 	});
 
 	pi.on("session_compact", async (event, ctx) => {
@@ -307,6 +320,7 @@ export default function (
 		current.compactMode.shutdown();
 		compactModeHooks = undefined;
 		current.disposeMessageDisplay();
+		current.disposeSubagentNotificationRenderer();
 		disposeStickyPromptPatches();
 		clearAllAnimations();
 		installation = undefined;

package/extensions/renderer/markdown-enhance.ts

@@ -102,7 +102,10 @@ function deCircled(markdown: string): string {
 // 跨行链接规整
 // ============================================================================
 
-const MULTILINE_LINK_RE = /\[([^\]\n]*(?:\n[^\]\n]*)+)\](?=\()/g;
+// \x1b 排除：Pi 的带颜色 Mermaid 输出把每行包成含 ANSI SGR（\x1b[...m）的 code span，
+// 转义序列里的 `[` 不能当成链接起点，否则匹配会从第一个转义跨行直到后面真正的 `](`，
+// 把图和之后的段落全压成一行（#84）。
+const MULTILINE_LINK_RE = /(?<!\x1b)\[([^\]\n\x1b]*(?:\n[^\]\n\x1b]*)+)\](?=\()/g;
 
 /** 防止 Markdown 跨行链接把行尾填充空格纳入 OSC 8 点击区。 */
 function normalizeMultilineLinks(markdown: string): string {

package/extensions/renderer/mouse/interaction.ts

@@ -12,7 +12,6 @@ import {
 	markCompactRoundToolExpanded,
 	setHoveredCompactAssistant,
 } from "../compact-mode.ts";
-import { isMessageDisplayComponent } from "../tool/message-display.ts";
 import { isLazyProxyTui } from "../../utils/fullscreen-detect.ts";
 import { setToolTuiFullscreen, isCollapseHintLine } from "../tool/names.ts";
 import {
@@ -43,6 +42,7 @@ import {
 	collapsedHintHitbox,
 	fullscreenContentWidth,
 	fullscreenLeafAt,
+	isMessageCard,
 	isScrollbarColumnAt,
 } from "./layout.ts";
 import {
@@ -122,7 +122,7 @@ let sessionRenderTimer: ReturnType<typeof setTimeout> | null = null;
 let latestInteractionFrame: InteractionFrame = { regions: [] };
 
 /** Summary markers used by Pi and ccstyle; unlike the trailing hint, these survive truncation. */
-const COLLAPSED_TOOL_SUMMARY = /^\s*(?:↳|└|⎿|●|✓|✗|…)/;
+const COLLAPSED_TOOL_SUMMARY = /^\s*(?:↳|└|⎿|●|✓|✗|…|\.\.\.)/;
 
 function interactionRegionAt(packet: SgrMousePacket): InteractionRegion | null {
 	const matches = latestInteractionFrame.regions.filter(
@@ -347,28 +347,40 @@ function releaseFullscreenToolMouseMotion(tui?: any): void {
 const FULLSCREEN_VIEWPORT_PATCH = Symbol("ccstyle.fullscreen-viewport-patch");
 
 /**
- * diff 结果组件自带 remainder 行：声明存在时只有那一行是展开入口（正文里的同名字样不算）；
- * 未声明的组件继续用文本规则。
+ * 折叠卡上哪些行声明为展开入口。resultRendererComponent 自带 isCollapsedHintLine
+ * 的（diff/ask/codemode）按它声明的判，行号原样转发；不带的原生卡（grep/find/ls/
+ * read/bash/fallback）按原生展开提示的收尾特征判——pi 给结果区套整卡 MouseRegion，
+ * 正文行（含路径文本）也会被官方 click 展开，这里把入口收到提示那几行。
+ * localRow 是组件 render 内的行号（frame marker / 布局 localRow），供声明按行判。
  */
-function isCollapsedHintRow(component: any, finalLine: string): boolean {
+function isCollapsedHintRow(component: any, finalLine: string, localRow?: number): boolean {
 	const result = component?.resultRendererComponent;
-	return typeof result?.isCollapsedHintLine === "function"
-		? result.isCollapsedHintLine(finalLine)
-		: true;
+	if (typeof result?.isCollapsedHintLine === "function") {
+		return result.isCollapsedHintLine(finalLine, localRow);
+	}
+	return isNativeExpandHintLine(finalLine);
+}
+
+/** 原生折叠卡展开提示的收尾特征：`(... N more lines, ctrl+o to expand)` 或行尾的 `to show more`。 */
+function isNativeExpandHintLine(line: string): boolean {
+	return /(\([^()]*\/(?: click| to expand)\)|(?:[\w/+]+\s+)?to (?:expand|show more)\)?)\s*$/.test(
+		stripTerminalSequencesPreservingLayout(line),
+	);
 }
 
 /**
  * pi 0.87 给工具结果区套了 MouseRegion：整卡左键 click 都会 setExpanded。
- * 命中该区域时官方会跳过文本选区，所以可以安全吞掉；单行摘要卡没有声明
- * remainder 行，继续走官方整行行为。
+ * 声明了展开入口的组件（diff remainder 等）与原生卡（提示在预览末行）只放行入口
+ * 行，其余位置直接吞掉 click，避免官方把正文当展开入口；无提示的单行摘要卡保持
+ * 官方整行行为。
  */
 function blocksOfficialCardToggle(component: any, event: any): boolean {
 	if (event?.type !== "click" || event.button !== "left" || component?.expanded) return false;
-	const result = component?.resultRendererComponent;
-	if (typeof result?.isCollapsedHintLine !== "function") return false;
 	const lines = component.render?.(Math.max(1, Math.floor(Number(event.width) || 0)));
-	const line = Array.isArray(lines) ? lines[event.y] : undefined;
-	return typeof line === "string" && !result.isCollapsedHintLine(line);
+	const row = event.y;
+	const line = Array.isArray(lines) ? lines[row] : undefined;
+	if (typeof line !== "string") return false;
+	return !isCollapsedHintRow(component, line, row);
 }
 
 /**
@@ -410,7 +422,7 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 	const isGroup = component instanceof ToolGroupComponent;
 	const isAssistant = isCompactAssistantComponent(component);
 	const isThinking = component instanceof ThinkingPreviewBlock;
-	const isMessage = isMessageDisplayComponent(component);
+	const isMessage = isMessageCard(component);
 	if (!isTool && !isGroup && !isAssistant && !isThinking && !isMessage) return false;
 	if (!component.expanded) {
 		// collapsed 仅按钮文本可展开，不能把同一行正文/留白变成点击区。
@@ -419,7 +431,7 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 		const onHint = Boolean(
 			hint &&
 				(isThinking || (packet.col >= hint.startCol && packet.col <= hint.endCol)) &&
-				isCollapsedHintRow(component, line),
+				isCollapsedHintRow(component, line, hit.localRow),
 		);
 		if (!onHint) {
 			// 面板内非提示区（工具卡标题/摘要行、thinking 预览正文）：单击收起整块面板。
@@ -573,7 +585,7 @@ function handleFullscreenToolHover(tui: any, packet: SgrMousePacket): void {
 			} else if (isCompactAssistantComponent(component)) {
 				// compact 摘要行：折叠时仅提示文字高亮，展开卡整体高亮。
 				if (component.expanded || overHint) target = { kind: "assistant", component };
-			} else if (isMessageDisplayComponent(component)) {
+			} else if (isMessageCard(component)) {
 				if (overHint) target = { kind: "message", component };
 			}
 		}
@@ -758,7 +770,7 @@ function buildInteractionFrame(
 				if (
 					box &&
 					COLLAPSED_TOOL_SUMMARY.test(stripTerminalSequences(line)) &&
-					isCollapsedHintRow(component, line)
+					isCollapsedHintRow(component, line, placement.componentRow)
 				) {
 					regions.push({ kind: "collapsed-hint", row: finalRow, ...box, component });
 				}

package/extensions/renderer/mouse/layout.ts

@@ -3,6 +3,7 @@ import { ThinkingPreviewBlock } from "../../feature/compact-thinking.ts";
 import { isCompactAssistantComponent } from "../compact-mode.ts";
 import { ToolGroupComponent } from "../tool/grouping.ts";
 import { isMessageDisplayComponent } from "../tool/message-display.ts";
+import { isSubagentNotificationView } from "../tool/subagent-notification.ts";
 import { isToolExecutionComponent, stripTerminalSequencesPreservingLayout } from "./packets.ts";
 import { getScrollButtonWidget } from "./scroll.ts";
 
@@ -15,11 +16,19 @@ export type ComponentRowHit = {
 	owner?: any;
 };
 
+/**
+ * 消息类卡片：skill/压缩/分支摘要三种消息组件，以及单独出现的 subagent 通知行。
+ * 点击、悬停与 single-expand 规则相同。
+ */
+export function isMessageCard(component: any): boolean {
+	return isMessageDisplayComponent(component) || isSubagentNotificationView(component);
+}
+
 /** 行内 [click to show more] / [↑ Collapse] 提示的命中列区间（1-based，含两端）。 */
 export function collapsedHintHitbox(line: string): { startCol: number; endCol: number } | null {
 	const plain = stripTerminalSequencesPreservingLayout(line);
 	const match =
-		/(\([^()\n]* \/ click\)|click to show more|to show more|↑ Collapse|to collapse)(?=\)?\s*$)/.exec(
+		/(\([^()\n]*(?: \/ click|, (?:[\w/+]+\s+)?to (?:expand|show more))\)|click to show more|to show more|↑ Collapse|to collapse)(?=\)?\s*$)/.exec(
 			plain,
 		);
 	if (!match?.[1]) return null;
@@ -140,7 +149,7 @@ export function componentAtLocalRow(
 	if (component instanceof ThinkingPreviewBlock) {
 		return { component, row: localRow };
 	}
-	if (isMessageDisplayComponent(component)) {
+	if (isMessageCard(component)) {
 		return { component, row: localRow };
 	}
 	if (component === getScrollButtonWidget()) {
@@ -182,7 +191,7 @@ export function collectFullscreenToolCards(
 		component instanceof ToolGroupComponent ||
 		isCompactAssistantComponent(component) ||
 		component instanceof ThinkingPreviewBlock ||
-		isMessageDisplayComponent(component)
+		isMessageCard(component)
 	) {
 		out.push(component);
 		return;