pi-cc-extensions 1.0.9 → 1.0.11

package/README.en.md

@@ -91,7 +91,7 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
   "footerGitStatsMode": "working",         // working (default): uncommitted; branch: cumulative net changes
   "footerHiddenKeys": [],                  // hidden chip keys
   "footerLine1Keys": ["model", "context", "cache", "rate", "cost", "pi-usage"], // chip order per line; builtins and plugins share one layout
-  "footerLine2Keys": ["cwd", "git"],        // cwd: directory and session; git: branch and changes. Either can move to any line
+  "footerLine2Keys": ["cwd", "git"],       // cwd: directory and session; git: branch and changes. Either can move to any line
   "footerLine3Keys": [],                   // painted only when a chip is visible
 }
 ```

package/README.md

@@ -91,7 +91,7 @@ pi install git:github.com/minuque/pi-cc-extensions
   "footerGitStatsMode": "working",         // working（默认）：未提交改动；branch：分支累计净改动
   "footerHiddenKeys": [],                  // 隐藏的芯片 key
   "footerLine1Keys": ["model", "context", "cache", "rate", "cost", "pi-usage"], // 每行芯片顺序；内置项与插件同一套排布
-  "footerLine2Keys": ["cwd", "git"],        // cwd：目录和会话名；git：分支和改动。可换到任意行
+  "footerLine2Keys": ["cwd", "git"],       // cwd：目录和会话名；git：分支和改动。可换到任意行
   "footerLine3Keys": []                    // 有可见芯片才占行
 }
 ```

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"],
 	}));

package/extensions/feature/context.ts

@@ -887,27 +887,44 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 											return theme.style("█".repeat(Math.max(0, cells)), { fg: part.color });
 										})
 										.join("");
+									const amountCells = allParts.map((part) => {
+										const pct = contextWindow > 0 ? (part.tokens / contextWindow) * 100 : 0;
+										const tokens = formatTokens(part.tokens).padStart(7);
+										const percent = `${pct.toFixed(1).padStart(5)}%`;
+										return { tokens, percent, plain: `${tokens}  ${percent}` };
+									});
+									// 数字列整体贴右：label 最多占到「行宽 - 数字列宽 - 前缀 - 边距」为止。
+									const amountWidth = Math.max(
+										...amountCells.map((cell) => visibleWidth(cell.plain)),
+									);
 									const labelWidth = Math.min(
 										24,
 										Math.max(...allParts.map((part) => part.label.length)),
+										Math.max(1, inner - amountWidth - 5),
 									);
 									const selectedLabel = visiblePreviews[selectedPreviewIndex]?.label;
-									const partRows = allParts.map((part) => {
-										const pct = contextWindow > 0 ? (part.tokens / contextWindow) * 100 : 0;
+									const partRows = allParts.map((part, index) => {
 										const swatch = theme.style("■", { fg: part.color });
 										const label = part.label.padEnd(labelWidth);
-										const amount = `${formatTokens(part.tokens).padStart(7)}  ${pct.toFixed(1).padStart(5)}%`;
+										const amount = amountCells[index];
 										const selected = part.label === selectedLabel;
 										const hoverLabel = visiblePreviews.find((p) => p.key === hoveredKey)?.label;
 										const prefix = selected ? "› " : "  ";
-										const row = padLine(`${prefix}${swatch} ${label} ${amount}`, inner);
+										const left = `${prefix}${swatch} ${label}`;
+										const gap = Math.max(
+											1,
+											inner - 1 - visibleWidth(left) - visibleWidth(amount?.plain ?? ""),
+										);
+										// token 数字用次级色，百分比保持正文色以保留可读的主指标。
+										const right = `${theme.fg("dim", amount?.tokens ?? "")}  ${amount?.percent ?? ""}`;
+										const row = padLine(`${left}${" ".repeat(gap)}${right}`, inner);
 										if (selected) return theme.bg("selectedBg", row);
 										return part.label === hoverLabel ? theme.bg("customMessageBg", row) : row;
 									});
 									const border = (text: string) => theme.fg("border", text);
 									const lines = [
 										border(`╭${"─".repeat(inner)}╮`),
-										`${border("│")}${padLine(` ${title}  ${theme.fg("muted", subtitle)}`, inner - escWidth)}${theme.fg(escHovered ? "text" : "muted", "[esc]")}${border("│")}`,
+										`${border("│")}${padLine(` ${title}  ${theme.fg("dim", subtitle)}`, inner - escWidth)}${theme.fg(escHovered ? "text" : "muted", "[esc]")}${border("│")}`,
 										`${border("├")}${border("─".repeat(inner))}${border("┤")}`,
 										`${border("│")}${padLine(` ${segments}`, inner)}${border("│")}`,
 										`${border("│")}${" ".repeat(inner)}${border("│")}`,

package/extensions/renderer/compact-mode.ts

@@ -64,6 +64,7 @@ import { paddedBackgroundRow } from "./tool/grouping.ts";
 import { styleChangeCounts } from "./tool/ccstyle-tool.ts";
 import { formatDisplayPath } from "./tool/names.ts";
 import {
+	contentRowRange,
 	hasVisibleText,
 	removeStyledRange,
 	stripBackgroundAnsi,
@@ -372,7 +373,7 @@ function editWriteExpandedCard(theme: any, component: any): any {
 /** compact 展开面板：外卡片保持展开卡背景；展开的 thinking 另包一层更深的
  *  内卡（自身 Box 背景与外卡同色，不区分会糊在一起），工具卡直接铺在外卡背景上。
  *  每个子卡前面补 1 行分隔（上一条已经是空行时不再补），子卡自带的首尾空行会被裁掉，
- *  避免与外卡/内卡 padding 叠出双空行。
+ *  避免与外卡/内卡 padding 叠出双空行（内联图片的占位行不裁，见 contentRowRange）。
  *  hits：子卡的行区间与命中目标（thinking 命中自身，工具命中 tool 组件），
  *  供展开后点击 hint。未开启 toolHits 时不映射工具，点击仍归外层面板。
  *  live=true：live 槽位用，不铺底色也不留上下空行，首行紧跟 `↳`、其余行缩进对齐
@@ -434,14 +435,8 @@ function layoutExpandedToolCard(
 		const painted = paints?.[childIndex];
 		const childLines = Array.isArray(painted) ? painted : child.render(innerWidth);
 		const innerCard = !live && isThinkingPreview(child) && child.expanded === true;
-		let first = -1;
-		let last = -1;
-		for (let i = 0; i < childLines.length; i++) {
-			if (hasVisibleText(childLines[i])) {
-				if (first < 0) first = i;
-				last = i;
-			}
-		}
+		// 内联图片按 placement 把范围撑开：锚点前后的空行是图片占的位置，不能当首尾空行裁。
+		const { first, last } = contentRowRange(childLines);
 		if (first < 0) {
 			if (live) continue;
 			for (const line of childLines) {
@@ -603,16 +598,20 @@ export type CompactModeHooks = {
 	/** 重新渲染包含指定 toolCallId 的 assistant 消息（思考收尾时刷新）。 */
 	refreshToolCallMessage(toolCallId: string | undefined): void;
 	/**
-	 * 收尾 resume 重放留下的活动回合。重放是同步的，回合之间靠下一条消息收口，
-	 * 只有最后一条没有后续消息，会停在 Running。
+	 * 会话已空闲时收尾末尾回合。回放/切换样式/重载重建之后，末尾那条消息
+	 * 后面没有消息来收口；活性只问会话，不从消息形状推断。
 	 */
-	settleReplayedRound(): void;
+	settleIdleRound(): void;
+	/** agent 这轮跑完：收尾仍在 live 的末尾回合，别让它一直挂着 Running。 */
+	settleFinishedRound(): void;
 	shutdown(): void;
 };
 
 type CompactModeInstallDeps = {
 	query?: CompactThinkingQuery;
 	writeMetadata: WriteExecutionMetadataStore;
+	/** 会话是否空闲；测试注入用，正式路径取 ctx.isIdle。 */
+	isIdle?: () => boolean;
 };
 
 type CompactModePatch = {
@@ -1233,8 +1232,18 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 	const liveSlotToolIds = new Set<string>();
 	const pendingFoldRounds = new Set<CompactRound>();
 	let uiRef: { requestRender?: (force?: boolean) => void } | undefined;
+	let idleRef: (() => boolean) | undefined = deps.isIdle;
 	let roundTickTimer: ReturnType<typeof setInterval> | undefined;
 
+	/** 会话是否空闲：回合活性的事实来源，取不到就当没空闲（宁可保留 Running）。 */
+	const sessionIdle = (): boolean => {
+		try {
+			return idleRef?.() === true;
+		} catch {
+			return false;
+		}
+	};
+
 	const roundWallMs = (round: CompactRound): number => {
 		const end = round.active ? Date.now() : (round.endedAt ?? Date.now());
 		return Math.max(1, end - round.startedAt);
@@ -2172,6 +2181,19 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		}
 	};
 
+	/**
+	 * 会话已空闲时收尾末尾回合。重建 pass 内仍按顺序并回合（同一 turn 的多条
+	 * 消息要合成一条摘要），只在 pass 结束时对账：会话没在跑，末尾那条就不会
+	 * 再长出内容，停在 Running 是假的。
+	 */
+	const settleTrailingRound = (): void => {
+		if (!sessionIdle()) return;
+		const round = activeRound;
+		if (!round) return;
+		finalizeRound(round);
+		renderRound(round);
+	};
+
 	patch.assistantInstalled = function (this: any, message: any, isStreaming?: boolean) {
 		const self = this as any;
 		// 同 compact-thinking：isStreaming 丢失 → mermaid 流式误渲染来回闪。
@@ -2423,6 +2445,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		sync(ctx: any) {
 			if (!patch.active) return;
 			uiRef = ctx?.ui;
+			if (typeof ctx?.isIdle === "function") idleRef = () => ctx.isIdle() === true;
 			resetRounds();
 			// 始终保持补丁在链上：mode=on/off 走 passThrough，仍写入 lastMessage
 			// 与 tracked 集合，这样 /ccstyle 切回 compact 时不必 /reload。
@@ -2431,6 +2454,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 			else hoveredAssistantComponent = undefined;
 			refreshTrackedComponents();
 			sweepOrphanTails();
+			settleTrailingRound();
 		},
 		refresh() {
 			if (!patch.active) return;
@@ -2439,6 +2463,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 			if (config.mode !== "compact") hoveredAssistantComponent = undefined;
 			refreshTrackedComponents();
 			sweepOrphanTails();
+			settleTrailingRound();
 		},
 		assertOwnership() {
 			if (!patch.active) return;
@@ -2459,11 +2484,16 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 				}
 			}
 		},
-		settleReplayedRound() {
+		settleIdleRound() {
+			if (!patch.active || config.mode !== "compact") return;
+			settleTrailingRound();
+		},
+		settleFinishedRound() {
 			if (!patch.active || config.mode !== "compact") return;
 			const round = activeRound;
 			if (!round) return;
-			finalizeRound(round); // clears activeRound — capture it first
+			// 走静默期：摘要行当场翻成 Ran for，槽位卡多留一拍再收拢。
+			endRound(round, true);
 			renderRound(round);
 		},
 		shutdown() {

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;
@@ -249,11 +258,14 @@ export default function (
 		syncCompactMode(ctx);
 		// compact-thinking 的 session_start 处理在本 handler 之后执行（在其之上再装
 		// 一层 updateContent）；延迟再同步一次，保证 compact 补丁最终位于外层。
+		// 历史回放也在这之后跑完：sync 末尾按 ctx.isIdle() 收尾末尾回合，
+		// 它没有后续消息，不收就会停在 Running。
 		setTimeout(() => syncCompactMode(ctx), 0);
-		// 历史回放发生在 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) => {
@@ -290,6 +302,8 @@ export default function (
 
 	pi.on("agent_end", async () => {
 		clearLiveToolCalls();
+		// 这轮跑完：末尾回合没有正文收口（纯工具回合）就一直挂着 Running。
+		compactModeHooks?.settleFinishedRound();
 	});
 
 	pi.on("session_shutdown", async () => {
@@ -307,6 +321,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;

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

@@ -30,6 +30,7 @@ import {
 	expandedBodyComponent,
 	formatToolDuration,
 	insetComponent,
+	renderCollapsedToolResult,
 	renderCollapsedToolResultToWidth,
 	textFromResult,
 	toolViewportWidth,
@@ -46,6 +47,12 @@ import {
 	toolIconColor,
 } from "./tool-state.ts";
 import { showMoreHintText } from "./names.ts";
+import { oneLine } from "../../utils/format.ts";
+import {
+	isFailedSubagentStatus,
+	measuredStats,
+	agentStatusLabel,
+} from "./subagent-notification.ts";
 
 /** 成功勾：亮绿 truecolor（与 message-display 一致）。 */
 const BRIGHT_GREEN = "";
@@ -82,6 +89,8 @@ function renderDefault(tool: any, slot: "renderCall" | "renderResult", args: any
 	return new Text(fallback, 0, 0);
 }
 
+export const AGENT_TOOL_NAME = "Agent";
+
 type ParsedTask = { id: string; status: string; subject: string };
 
 function parseTaskList(text: string): ParsedTask[] {
@@ -185,6 +194,92 @@ function shellDurationText(toolName: string, context: any, isPartial: boolean):
 	return elapsed === undefined ? "" : formatToolDuration(elapsed);
 }
 
+/**
+ * Agent 的 renderResult：与 pi-subagents 保持同样的分支，但收敛成 ccstyle 的 ↳ 行。
+ * running/partial 转交原渲染器（只有它有 spinner frame 和 activity 文案）；
+ * background/completed/stopped/error 画单行摘要，展开态结果正文交给通用展开视图。
+ */
+function renderAgentResult(
+	originalTool: any,
+	result: any,
+	options: any,
+	theme: any,
+	context: any,
+	expanded: boolean,
+	isError: boolean,
+): any | undefined {
+	const details = result?.details;
+	const text = textFromResult(result);
+	// 没拿到子代理状态（pi-subagents 原始路径的兜底）就沿用通用渲染。
+	if (!details?.status) return undefined;
+
+	const isPartial = Boolean(options?.isPartial);
+	const status = String(details.status);
+
+	// running：pi-subagents 的 spinner/activity 组件才能实时动，原样转交。
+	if (isPartial || status === "running") {
+		return renderDefault(originalTool, "renderResult", [result, options, theme, context], text);
+	}
+
+	const stats = measuredStats(details).join(" · ");
+
+	const agentId = details.agentId ? `ID: ${details.agentId}` : "";
+	const tail = (body: string) => (stats ? `${body} · ${stats}` : body);
+
+	if (status === "background") {
+		if (!expanded) {
+			const body = tail(`Running in background${agentId ? ` · ${agentId}` : ""}`);
+			return new Text(theme.fg("muted", renderCollapsedToolResult(body, "")), 0, 0);
+		}
+		const view = renderExpandedToolResult(
+			`Running in background${agentId ? ` · ${agentId}` : ""}`,
+			theme,
+			false,
+			context?.lastComponent,
+			context?.args,
+			context,
+			true,
+		);
+		return view;
+	}
+
+	if (status === "completed" || status === "steered") {
+		if (!expanded) {
+			const label = status === "steered" ? "Wrapped up (turn limit)" : "Done";
+			const body = [label, stats].filter(Boolean).join(" · ");
+			return new Text(theme.fg("muted", renderCollapsedToolResult(body, "")), 0, 0);
+		}
+		const view = renderExpandedToolResult(
+			text || "Done",
+			theme,
+			Boolean(isError),
+			context?.lastComponent,
+			context?.args,
+			context,
+			true,
+		);
+		return view;
+	}
+
+	if (status === "stopped") {
+		const body = tail("Stopped");
+		return new Text(theme.fg("muted", renderCollapsedToolResult(body, "")), 0, 0);
+	}
+
+	// error / aborted：首行错误文案 + 统计，与通用失败行口径一致。
+	const label = agentStatusLabel(status);
+	const firstLine = text.split("\n").find((line) => line.trim()) ?? label;
+	const body = tail(oneLine(firstLine, 72));
+	return new Text(
+		theme.fg(
+			isFailedSubagentStatus(status) ? "error" : "muted",
+			renderCollapsedToolResult(body, ""),
+		),
+		0,
+		0,
+	);
+}
+
 /** 用 ccstyle call/result 包装任意工具定义。 */
 export function createCcstyleTool(
 	originalTool: any,
@@ -315,6 +410,20 @@ export function createCcstyleTool(
 
 			const expanded = isToolExpanded(options, context);
 			const isError = Boolean(options?.isError || context?.isError);
+			// Agent：running 转交原渲染器（spinner/activity 只有它有）；其余画 ↳ 摘要行。
+			// toolName 大小写宽松匹配：上游改名也不静默失效。
+			if (toolName.toLowerCase() === AGENT_TOOL_NAME.toLowerCase()) {
+				const agentResult = renderAgentResult(
+					originalTool,
+					result,
+					options,
+					theme,
+					context,
+					expanded,
+					isError,
+				);
+				if (agentResult) return agentResult;
+			}
 			// codemode：折叠态自己画子调用树，展开态给全部子调用与去掉脚本头的输出
 			if (toolName === CODEMODE_TOOL_NAME) {
 				if (!options?.isPartial) setToolVisualState(context, isError ? "error" : "success");