pi-cc-extensions 1.0.14 → 1.0.16

package/README.en.md

@@ -32,9 +32,10 @@ Run `/reload` after installation.
 | Fullscreen mode             | Tool card/group expand and collapse on click, previews, hover highlight, and a back-to-bottom button                                         | `TUIMODE=fullscreen` or `--tui-mode fullscreen` |
 | Settings panel              | `Style / Features / UI / Diff / Thinking / Footer` tabs                                                                                      | `/ccstyle`                                      |
 | Context inspection          | Usage breakdown and previews for the system prompt, memory, skills, tools definition, and messages                                           | `/context`                                      |
+| Transcript browsing         | Full-screen transcript browsing with every tool output expanded                                                                              | `Ctrl+O`                                        |
 | Session/Subagent references | Search and inject effective context from previous Sessions or existing SubAgents                                                             | `@`                                             |
-| Status bar                  | Shows model, context, cache, cost, the conversation token total, 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                                                                                                          | `/settings` → Theme                             |
+| Status bar                  | Shows model, context, cache, cost, the conversation token total, and git; also works with `@narumitw/pi-usage` for live quota. Git/cache/token Nerd Font icons can be turned off | `/ccstyle`                                      |
+| Theme                       | Bundled themes: CC Dark, CC Light, CC Dark HC, CC Light HC                                                                                   | `/settings` → Theme                             |
 
 Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-examples-default.md) · [compact](./docs/tool-render-examples-compact.md)
 
@@ -86,10 +87,10 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
   "footerTokenRate": true,                 // output rate chip; false hides it
   "footerTokenRateMode": "average",        // average: whole-prompt avg; live: trailing 1s rate
   "footerTokenRateTtft": true,             // append TTFT to the rate chip; false shows tok/s only
-  "footerSessionTokens": false,            // conversation token total chip (∑); sums usage.totalTokens from session entries. Off by default
+  "footerSessionTokens": false,            // conversation token total chip (Nerd Font glyph, Σ in plain text); sums usage.totalTokens from session entries. Off by default
   "footerCurrency": "USD",                 // display currency for the footer cost
   "footerCurrencyRate": null,              // display units per 1 cost unit; null changes the symbol only
-  "footerNerdIcons": true,                 // Nerd Font glyphs for git/cache; false = plain text
+  "footerNerdIcons": true,                 // Nerd Font glyphs for git/cache/tokens; false = plain text
   "footerGitStatsMode": "working",         // working (default): uncommitted; branch: cumulative net changes
   "footerHiddenKeys": [],                  // hidden chip keys
   "footerLine1Keys": ["model", "context", "cache", "rate", "cost", "tokens", "pi-usage"], // chip order per line; builtins and plugins share one layout

package/README.md

@@ -32,9 +32,10 @@ pi install git:github.com/minuque/pi-cc-extensions
 | Fullscreen mode       | 工具卡/group 单击展开与收起、预览、hover 高亮、回到底部按钮                 | `TUIMODE=fullscreen` 或 `--tui-mode fullscreen` |
 | 配置面板              | `Style / Features / UI / Diff / Thinking / Footer` 六页签                       | `/ccstyle`                                      |
 | 上下文检查            | 查看上下文占用，并预览 System prompt、Memory、Skills、Tools definition 和消息内容 | `/context`                                      |
+| 会话记录浏览          | 全屏浏览完整会话记录，工具输出全展开                                             | `Ctrl+O`                                        |
 | Session/Subagent 引用 | 搜索并注入历史 Session 或现有 SubAgent 的有效上下文                             | `@`                                             |
-| 状态栏                | 显示：模型、上下文、缓存、费用、本次对话累计 token、git并适配 @narumitw/pi-usage 实时显示额度；git/缓存图标可关 Nerd Font | `/ccstyle`                              |
-| 主题                  | 随包提供内置 CC Dark、CC Light 主题                                             | `/settings` → Theme                             |
+| 状态栏                | 显示：模型、上下文、缓存、费用、本次对话累计 token、git并适配 @narumitw/pi-usage 实时显示额度；git/缓存/token 图标可关 Nerd Font | `/ccstyle`                              |
+| 主题                  | 随包提供 4 个主题：CC Dark、CC Light、CC Dark HC、CC Light HC                   | `/settings` → Theme                             |
 
 `on` / `compact` 两种模式的渲染样例：[默认模式](./docs/tool-render-examples-default.md) · [紧凑模式](./docs/tool-render-examples-compact.md)
 
@@ -86,10 +87,10 @@ pi install git:github.com/minuque/pi-cc-extensions
   "footerTokenRate": true,                 // 输出速率芯片；false 隐藏
   "footerTokenRateMode": "average",        // average：整段指令平均（avg）；live：最近 1 秒瞬时（live）
   "footerTokenRateTtft": true,             // 速率芯片是否带 TTFT；false 只显示 tok/s
-  "footerSessionTokens": false,            // 本次对话累计 token 芯片（∑）；累加会话条目的 usage.totalTokens，默认关
+  "footerSessionTokens": false,            // 本次对话累计 token 芯片（Nerd Font 图标，纯文本为 Σ）；累加会话条目的 usage.totalTokens，默认关
   "footerCurrency": "USD",                 // 底栏费用的显示币种
   "footerCurrencyRate": null,              // 1 单位费用换成多少显示币种；null 只换符号、不乘倍率
-  "footerNerdIcons": true,                 // git/缓存用 Nerd Font 图标；false 为纯文本
+  "footerNerdIcons": true,                 // git/缓存/token 用 Nerd Font 图标；false 为纯文本
   "footerGitStatsMode": "working",         // working（默认）：未提交改动；branch：分支累计净改动
   "footerHiddenKeys": [],                  // 隐藏的芯片 key
   "footerLine1Keys": ["model", "context", "cache", "rate", "cost", "tokens", "pi-usage"], // 每行芯片顺序；内置项与插件同一套排布

package/extensions/config/panel.ts

@@ -759,8 +759,8 @@ export async function showCcstylePanel(
 			id: "footerNerdIcons",
 			label: "Nerd Font icons",
 			description: config.footerNerdIcons
-				? "Git and cache chips use Nerd Font glyphs. Turn off for plain text."
-				: "Git and cache chips use plain text. No Nerd Font required.",
+				? "Git, cache and token chips use Nerd Font glyphs. Turn off for plain text."
+				: "Git, cache and token chips use plain text. No Nerd Font required.",
 			currentValue: config.footerNerdIcons ? "on" : "off",
 			values: ["on", "off"],
 		};
@@ -937,8 +937,8 @@ export async function showCcstylePanel(
 				updateConfig({ footerNerdIcons: enabled });
 				footerNerdIconsSetting.currentValue = enabled ? "on" : "off";
 				footerNerdIconsSetting.description = enabled
-					? "Git and cache chips use Nerd Font glyphs. Turn off for plain text."
-					: "Git and cache chips use plain text. No Nerd Font required.";
+					? "Git, cache and token chips use Nerd Font glyphs. Turn off for plain text."
+					: "Git, cache and token chips use plain text. No Nerd Font required.";
 				ctx.ui.notify(`Updated ${id}: ${value}`, "info");
 				return;
 			}

package/extensions/feature/compact-thinking.ts

@@ -26,6 +26,7 @@ import {
 	styleCompactThinkingText,
 } from "../renderer/compact-mode.ts";
 import { refreshMountedTranscript } from "../renderer/transcript-refresh.ts";
+import { isTranscriptComponent } from "../renderer/transcript-scope.ts";
 import {
 	COMPACT_THINKING_OWNER,
 	COMPACT_THINKING_PATCH_KEY,
@@ -645,6 +646,11 @@ function compactThinking(pi: ExtensionAPI) {
 		message: AssistantMessage,
 		isStreaming?: boolean,
 	) {
+		// 浏览层副本：不改写思考块，也不当作最新消息跟踪。
+		if (isTranscriptComponent(this)) {
+			originalUpdateContent.call(this, message, isStreaming);
+			return;
+		}
 		const component = this as AssistantMessageComponentLike;
 		const self = this as unknown as AssistantInternals;
 		// isStreaming 丢失 → mermaid 流式误渲染来回闪。

package/extensions/feature/shell/footer.ts

@@ -59,10 +59,26 @@ export const FOOTER_NERD_ICON_CACHE = "󰆼";
 // md power-plug：MCP 服务器连接数
 export const FOOTER_NERD_ICON_MCP = "\u{f06a5}";
 
-export function footerGlyphs(nerdIcons: boolean): { git: string; cache: string; mcp: string } {
+// md sigma：会话累计 token。与缓存、MCP 同属 md 图标，字高一致。
+export const FOOTER_NERD_ICON_TOKENS = "\u{f04a0}";
+// 纯文本用希腊字母 Σ：数学求和号 ∑ 在多数字体里比数字高，排在芯片里突兀。
+// 不留空：只剩数字时看不出是 token 总数。
+export const FOOTER_PLAIN_ICON_TOKENS = "Σ";
+
+export function footerGlyphs(nerdIcons: boolean): {
+	git: string;
+	cache: string;
+	mcp: string;
+	tokens: string;
+} {
 	return nerdIcons
-		? { git: FOOTER_NERD_ICON_GIT, cache: FOOTER_NERD_ICON_CACHE, mcp: FOOTER_NERD_ICON_MCP }
-		: { git: "", cache: "", mcp: "" };
+		? {
+				git: FOOTER_NERD_ICON_GIT,
+				cache: FOOTER_NERD_ICON_CACHE,
+				mcp: FOOTER_NERD_ICON_MCP,
+				tokens: FOOTER_NERD_ICON_TOKENS,
+			}
+		: { git: "", cache: "", mcp: "", tokens: FOOTER_PLAIN_ICON_TOKENS };
 }
 
 /**
@@ -487,7 +503,9 @@ const createCustomFooterFactory =
 			const costChip = costLabel
 				? theme.fg("dim", costLabel) + (usingSubscription ? theme.fg("warning", " sub") : "")
 				: "";
-			const tokensLabel = config.footerSessionTokens ? formatSessionTokenTotal(tokens) : "";
+			const tokensLabel = config.footerSessionTokens
+				? formatSessionTokenTotal(tokens, footerGlyphs(config.footerNerdIcons).tokens)
+				: "";
 
 			const gitColor = theme.getThinkingBorderColor("medium");
 			let place = theme.fg("accent", cwdLabel);

package/extensions/feature/shell/session-tokens.ts

@@ -45,8 +45,8 @@ export function sessionEntryTokens(entry: unknown): number {
 	return 0;
 }
 
-/** 芯片文案：`∑ 402k`；没有数据返回空串（不占位置）。 */
-export function formatSessionTokenTotal(total: number): string {
+/** 芯片文案：`<glyph> 402k`；没有数据返回空串（不占位置）。 */
+export function formatSessionTokenTotal(total: number, glyph: string): string {
 	if (!Number.isFinite(total) || total <= 0) return "";
-	return `∑ ${formatTokenCount(Math.round(total))}`;
+	return `${glyph} ${formatTokenCount(Math.round(total))}`;
 }

package/extensions/renderer/compact-mode.ts

@@ -60,6 +60,14 @@ import { isToolCallHovered } from "./mouse/hover.ts";
 import { getToolMouseTui } from "./mouse/scroll.ts";
 import { expandedBodyComponent, insetComponent } from "./tool/result.ts";
 import { isLiveToolCall, scheduleAnimation } from "./tool/tool-state.ts";
+import { isTranscriptComponent } from "./transcript-scope.ts";
+
+const COMPACT_ROUND_TAIL_KEY = Symbol.for("ccstyle.compactRoundTail");
+
+/** compact 挂进对话区的回合尾行（摘要行与槽位卡），浏览层跳过它。 */
+export function isCompactRoundTail(value: unknown): boolean {
+	return Boolean(value && typeof value === "object" && (value as any)[COMPACT_ROUND_TAIL_KEY]);
+}
 import { renderExpandedToolResult } from "./tool/tool-io.ts";
 import { paddedBackgroundRow } from "./tool/grouping.ts";
 import { styleChangeCounts } from "./tool/ccstyle-tool.ts";
@@ -1479,15 +1487,22 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 	/**
 	 * 回合还有活干：成员消息仍在流式，或本回合的工具还没拿到最终结果。
 	 * 收尾要么按事实等活干完，要么摘要行就会把仍在跑的工具报成 Ran for。
+	 * pendingLiveTool 是「toolCall 已写进消息、组件还没挂上」的空窗：流停了也要等它合上。
+	 * 只在 renderRoundLive 里按缺组件重算；空闲回放不会再补组件，不因此停在 Running。
 	 */
 	const roundHasLiveWork = (round: CompactRound): boolean => {
+		if (round.pendingLiveTool && !sessionIdle()) return true;
 		for (const component of round.messages.keys()) {
 			if (component?.isStreaming === true) return true;
 		}
 		const ids = roundToolCallIds(round);
 		if (ids.size === 0) return false;
 		for (const tool of trackedToolComponents) {
-			if (typeof tool?.toolCallId === "string" && ids.has(tool.toolCallId) && isRunningTool(tool)) {
+			const id = tool?.toolCallId;
+			if (typeof id !== "string" || !ids.has(id)) continue;
+			if (isRunningTool(tool)) return true;
+			// 组件已挂上、还没 markExecutionStarted：声明期 id 仍在等派发。
+			if (!sessionIdle() && isLiveToolCall(id) && (!tool.result || tool.isPartial === true)) {
 				return true;
 			}
 		}
@@ -1625,6 +1640,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		}
 		const tail: MountedRoundTail = { host: undefined, container: undefined, parts: [], round };
 		const host: any = {
+			[COMPACT_ROUND_TAIL_KEY]: true,
 			outputPad: Number(round.anchor?.outputPad) || 0,
 			children: [],
 			render: (width: number) => tail.parts.flatMap((part: any) => part?.render?.(width) ?? []),
@@ -2287,6 +2303,8 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 			return patch.assistantNative.call(this, message, isStreaming);
 		}
 		self.lastMessage = message;
+		// 浏览层副本：不进回合跟踪，按原生方式渲染完整消息。
+		if (isTranscriptComponent(this)) return passThroughAssistant(this, message, isStreaming);
 		trackedAssistantComponents.add(this);
 		if (!patch.active || config.mode !== "compact") {
 			return passThroughAssistant(this, message, isStreaming);
@@ -2431,7 +2449,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 	};
 
 	patch.toolInstalledRender = function (this: any, width: number) {
-		if (!patch.active || config.mode !== "compact") {
+		if (!patch.active || config.mode !== "compact" || isTranscriptComponent(this)) {
 			return patch.toolOriginalRender.call(this, width);
 		}
 		const name = String(this.toolName ?? "");
@@ -2460,6 +2478,8 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 	};
 
 	patch.toolInstalledUpdateDisplay = function (this: any) {
+		// 浏览层副本：不受回合展开规则约束，也不进组件跟踪。
+		if (isTranscriptComponent(this)) return patch.toolOriginalUpdateDisplay.call(this);
 		const id = String(this.toolCallId ?? "");
 		if (
 			patch.active &&

package/extensions/renderer/index.ts

@@ -31,6 +31,7 @@ import {
 	TOOL_MOUSE_DISABLE,
 } from "./mouse/interaction.ts";
 import { getToolMouseTui, noteNewTranscriptItem } from "./mouse/scroll.ts";
+import { installTranscriptMode, teardownTranscriptMode } from "./transcript-mode.ts";
 import {
 	disposeStickyPromptPatches,
 	installStickyPromptPatches,
@@ -249,6 +250,8 @@ export default function (
 		// 鼠标交互独立于渲染层：fullscreen 渲染层让位（hooks undefined）但
 		// 工具点击/回到底部适配仍需安装；保持在渲染层安装之后以维持原顺序。
 		if (ctx?.mode === "tui" && ctx?.hasUI) installToolMouseInteraction(ctx, mouseOwner);
+		// 浏览模式与鼠标交互同为输入监听，跟着一起装。
+		installTranscriptMode(ctx);
 		if (!hooks) return;
 		hooks.toolGrouping.setTheme(ctx.ui.theme);
 		setMessageDisplayTheme(ctx.ui.theme);
@@ -273,6 +276,7 @@ export default function (
 		// Compaction rebuilds the transcript without session_start. Rebind after
 		// other TUI extensions may have replaced the root input dispatcher.
 		if (ctx?.mode === "tui" && ctx?.hasUI) installToolMouseInteraction(ctx, mouseOwner);
+		installTranscriptMode(ctx);
 		if (!hooks) return;
 		hooks.toolGrouping.setTheme(ctx.ui.theme);
 		setMessageDisplayTheme(ctx.ui.theme);
@@ -313,6 +317,7 @@ export default function (
 		// 鼠标交互独立于渲染层：fullscreen 下 installation 为 undefined，
 		// 但 onTerminalInput 监听与 handleViewportInput 包装仍需释放。
 		teardownToolMouseInteraction(mouseOwner);
+		teardownTranscriptMode();
 		const current = installation;
 		if (!current || !current.defaultMode.isOwner()) return;
 		current.defaultMode.shutdown();

package/extensions/renderer/mouse/interaction.ts

@@ -49,6 +49,7 @@ import {
 	fullscreenLazyTui,
 	hideScrollButton,
 	dockScrollButtonActive,
+	isFullscreenAtBottom,
 	restoreOfficialScrollToEnd,
 	restoreNativeScrollIndicatorText,
 	syncOfficialScrollToEnd,
@@ -457,9 +458,9 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 			// compact 摘要行自己记展开前的视口（收起时还原跟随），所以它先展开再停跟随：
 			// 顺序反了快照会记下「未跟随」，收起时就交不回官方 follow。
 			component.setExpanded(true);
-			keepViewportOnExpand(tui);
+			keepViewportOnExpand(tui, hit);
 		} else {
-			keepViewportOnExpand(tui);
+			keepViewportOnExpand(tui, hit);
 			component.setExpanded(true);
 		}
 		clearPendingCollapsePress();
@@ -509,13 +510,40 @@ function isSameExpandedRound(other: any, owner: any): boolean {
 }
 
 /**
- * 原地展开时停在当前滚动位置：transcript 跟随底部时，内容变高会把视口拖到底，
- * 点击的行和它上方的外层面板被顶出屏幕。展开前关掉跟随，点击行留在原位。
+ * 点击行在滚动视口里的位置：视口内行号与视口高度。布局树读不到时返回 null。
+ * leaf 不带 scrollView，视口是最近的带 scrollView 的祖先 box。
+ */
+function clickedRowInViewport(
+	hit: { box: any; localRow: number } | null | undefined,
+): { y: number; height: number } | null {
+	if (!hit?.box) return null;
+	let scrollBox: any = null;
+	for (let current = hit.box; current; current = current.parent) {
+		if (current.scrollView) {
+			scrollBox = current;
+			break;
+		}
+	}
+	const rect = scrollBox?.rect;
+	const height = Number(rect?.height);
+	const rowY = Number(hit.box.rect?.y);
+	if (!rect || !(height > 0) || !Number.isFinite(rowY)) return null;
+	return { y: rowY + hit.localRow - Number(rect.y), height };
+}
+
+/**
+ * 原地展开时视口怎么走。transcript 跟随底部时，内容变高会把视口拖到底，
+ * 点击的行和它上方的外层面板被顶出屏幕：展开前关掉跟随，点击行留在原位。
  * compact 摘要行同样适用：它的展开入口在 setExpanded 之后调用本函数（见调用点）。
+ *
+ * 例外是点击行已经落在视口下半屏：它下面没有足够空间，冻结只会把展开出来的
+ * 内容全推到屏幕外（贴着底部输入框时最常见）。这种位置保持跟随，让新内容顶上来。
  */
-function keepViewportOnExpand(tui: any): void {
+function keepViewportOnExpand(tui: any, hit?: { box: any; localRow: number } | null): void {
 	const view = tui.getPrimaryScrollView?.();
 	if (typeof view?.scrollTo !== "function" || typeof view.scrollTop !== "number") return;
+	const spot = clickedRowInViewport(hit);
+	if (spot && isFullscreenAtBottom(tui) && spot.y >= spot.height / 2) return;
 	view.scrollTo(view.scrollTop, { disableFollow: true });
 	// 已脱离底部跟随：dock 模式亮出回到底部按钮，新输出到来时仍有入口。
 	if (view.isFollowingEnd === false && dockScrollButtonActive()) setScrollButtonVisible(true);

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

@@ -4,6 +4,7 @@
  */
 import { Text, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { config, getToolDisplayConfig, type CompactStyleMode } from "../../config/config.ts";
+import { expandedLineLimit } from "../transcript-scope.ts";
 import { isToolCallHovered } from "../mouse/hover.ts";
 import {
 	ASK_USER_QUESTION_TOOL_NAME,
@@ -126,7 +127,7 @@ function renderExpandedTaskResult(
 	if (toolName === "TaskList") {
 		const tasks = parseTaskList(text);
 		if (!tasks.length) return undefined;
-		const limit = Math.max(1, config.expandedPreviewMaxLines);
+		const limit = Math.max(1, expandedLineLimit(config.expandedPreviewMaxLines));
 		const rows = tasks.slice(0, limit).map((task) => {
 			const color =
 				task.status === "completed"
@@ -194,6 +195,69 @@ function shellDurationText(toolName: string, context: any, isPartial: boolean):
 	return elapsed === undefined ? "" : formatToolDuration(elapsed);
 }
 
+/**
+ * 运行中的展开视图：与结束后同一份 Input / Output。
+ * 还没输出时用 Pending… 占位：空正文会被视图画成 Done，像已经跑完了。
+ * 纯空白（空格、换行、tab）同样算还没输出；非空正文保留原始缩进，不整体 trim。
+ * shell 的已用时间挂到视图尾部；取值函数每帧重算，秒数才跟着动画 tick 走。
+ */
+function renderRunningExpandedResult(toolName: string, result: any, context: any, theme: any): any {
+	const text = textFromResult(result);
+	const view = renderExpandedToolResult(
+		text.trim() ? text : "Pending…",
+		theme,
+		false,
+		context?.lastComponent,
+		context?.args,
+		context,
+		true,
+	);
+	if (isExpandedToolIoView(view) && SHELL_TOOL_NAMES.has(toolName)) {
+		view.setFooter(() => shellDurationText(toolName, context, true) || undefined);
+	}
+	return view;
+}
+
+/**
+ * 运行中的折叠行：`   ↳ Pending… · 12.4s · click to show more`。
+ * 提示必须留在行尾：collapsedHintHitbox 只认行尾，没有它这行既点不动也看不出能点。
+ * 已用时间在 render() 内取，动画 tick 才能带上新值。
+ */
+function renderRunningCollapsedResult(options: {
+	toolName: string;
+	context: any;
+	theme: any;
+	/** ask_user_question 的结果树用 1 格缩进，与它的 ├/└ 对齐。 */
+	prefix?: string;
+}): any {
+	const { toolName, context, theme, prefix } = options;
+	const toolCallId = context?.toolCallId;
+	const hintPrefix = theme.fg("dim", " · ");
+	const hint = hintPrefix + theme.fg("dim", showMoreHintText());
+	const hoveredHint = hintPrefix + theme.fg("text", showMoreHintText());
+	let cachedWidth: number | undefined;
+	let cachedBody: string | undefined;
+	let cachedLine: string | undefined;
+	let cachedHoveredLine: string | undefined;
+	return {
+		render(width: number) {
+			const elapsed = shellDurationText(toolName, context, true);
+			const body = elapsed ? `Pending… · ${elapsed}` : "Pending…";
+			if (cachedLine === undefined || cachedWidth !== width || cachedBody !== body) {
+				cachedWidth = width;
+				cachedBody = body;
+				cachedLine = theme.fg("muted", renderCollapsedToolResultToWidth(body, hint, width, prefix));
+				cachedHoveredLine = theme.fg(
+					"muted",
+					renderCollapsedToolResultToWidth(body, hoveredHint, width, prefix),
+				);
+			}
+			return [isToolCallHovered(toolCallId) ? cachedHoveredLine! : cachedLine];
+		},
+		invalidate(): void {},
+	};
+}
+
 /**
  * Agent 的 renderResult：与 pi-subagents 保持同样的分支，但收敛成 ccstyle 的 ↳ 行。
  * running/partial 转交原渲染器（只有它有 spinner frame 和 activity 文案）；
@@ -389,8 +453,12 @@ export function createCcstyleTool(
 					cachedWidth = width;
 					cachedIcon = icon;
 					// 路径按最终可用宽度中间截断，避免整行二次截断隐藏文件名。
-					cachedLine = `${lead}${icon} ${renderToolSummary(summary, mainWidth, theme.fg.bind(theme))}${extraStyled}`;
-					return [truncateToWidth(cachedLine, viewportWidth, "")];
+					cachedLine = truncateToWidth(
+						`${lead}${icon} ${renderToolSummary(summary, mainWidth, theme.fg.bind(theme))}${extraStyled}`,
+						viewportWidth,
+						"",
+					);
+					return [cachedLine];
 				},
 				invalidate() {
 					cachedLine = undefined;
@@ -454,9 +522,11 @@ export function createCcstyleTool(
 			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);
+					// 等待回答时也能展开看问题原文（Input 即 args.questions）；折叠态 1 格缩进。
+					if (expanded) return renderRunningExpandedResult(toolName, result, context, theme);
+					// 折叠后清掉展开视图，与通用 partial 折叠一致。
+					if (context?.state) context.state.ccstyleIoView = undefined;
+					return renderRunningCollapsedResult({ toolName, context, theme, prefix: " ↳ " });
 				}
 				if (expanded) {
 					return renderExpandedToolResult(
@@ -479,21 +549,11 @@ export function createCcstyleTool(
 				});
 			}
 			if (options?.isPartial) {
+				// 运行中也给和结束后同一份 Input / Output：命令全文与已产生的输出。
+				if (expanded) return renderRunningExpandedResult(toolName, result, context, theme);
 				// 折叠态保持 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 {},
-				};
+				if (context?.state) context.state.ccstyleIoView = undefined;
+				return renderRunningCollapsedResult({ toolName, context, theme });
 			}
 
 			// shell：结果定型时定一次结束时间，这一行之后不再变。

package/extensions/renderer/tool/codemode.ts

@@ -11,6 +11,7 @@
 import { highlightCode } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { config } from "../../config/config.ts";
+import { expandedLineLimit } from "../transcript-scope.ts";
 import { stripAnsi } from "../../utils/ansi-text.ts";
 import { oneLine } from "../../utils/format.ts";
 import { toolLoadingIcon } from "../../utils/tool-loading-icon.ts";
@@ -164,7 +165,7 @@ export function codemodeCodeLines(
 		if (text) statements.push(text);
 	}
 	if (statements.length === 0) return [];
-	const limit = Math.max(1, config.expandedInputMaxLines);
+	const limit = Math.max(1, expandedLineLimit(config.expandedInputMaxLines));
 	const visible = statements.slice(0, limit);
 	const rail = `${INDENT}${fg("dim", "│")} `;
 	const lines = visible.map((statement) =>

package/extensions/renderer/tool/diff/diff-header.ts

@@ -53,8 +53,8 @@ function renderDiffStatBar(stats: DiffStats, width: number, theme: DiffTheme): s
 	}
 	const removedSlots = Math.max(0, barSlots - addedSlots);
 
-	const addedBar = addedSlots > 0 ? theme.fg("toolDiffAdded", "━".repeat(addedSlots)) : "";
-	const removedBar = removedSlots > 0 ? theme.fg("toolDiffRemoved", "━".repeat(removedSlots)) : "";
+	const addedBar = addedSlots > 0 ? theme.fg("success", "━".repeat(addedSlots)) : "";
+	const removedBar = removedSlots > 0 ? theme.fg("error", "━".repeat(removedSlots)) : "";
 	return stabilizeBackgroundResets(
 		`${theme.fg("dim", "[")}${addedBar}${removedBar}${theme.fg("dim", "]")}`,
 	);
@@ -63,8 +63,8 @@ function renderDiffStatBar(stats: DiffStats, width: number, theme: DiffTheme): s
 function buildDiffSummaryBasePieces(stats: DiffStats, theme: DiffTheme): string[] {
 	return [
 		theme.fg("toolOutput", `↳ ${emphasis(theme, "diff")}`),
-		theme.fg("toolDiffAdded", `+${stats.added}`),
-		theme.fg("toolDiffRemoved", `-${stats.removed}`),
+		theme.fg("success", `+${stats.added}`),
+		theme.fg("error", `-${stats.removed}`),
 	];
 }
 

package/extensions/renderer/tool/diff/diff-layout.ts

@@ -92,10 +92,10 @@ function renderChangeMarker(
 		return rowBg ? `${rowBg} ${rowBg}` : " ";
 	}
 	if (kind === "add") {
-		return colorizeSegment(theme, "toolDiffAdded", glyph, rowBg);
+		return colorizeSegment(theme, "success", glyph, rowBg);
 	}
 	if (kind === "remove") {
-		return colorizeSegment(theme, "toolDiffRemoved", glyph, rowBg);
+		return colorizeSegment(theme, "error", glyph, rowBg);
 	}
 	return colorizeSegment(theme, "dim", glyph, rowBg);
 }
@@ -132,12 +132,12 @@ function renderCodeDivider(
 	);
 }
 
-function getLineNumberColor(kind: DiffLineKind): "dim" | "toolDiffAdded" | "toolDiffRemoved" {
+function getLineNumberColor(kind: DiffLineKind): "dim" | "success" | "error" {
 	if (kind === "add") {
-		return "toolDiffAdded";
+		return "success";
 	}
 	if (kind === "remove") {
-		return "toolDiffRemoved";
+		return "error";
 	}
 	return "dim";
 }
@@ -179,7 +179,7 @@ function renderClassicContentPrefix(
 	}
 
 	const glyph = kind === "add" ? "+" : "-";
-	const glyphColor = kind === "add" ? "toolDiffAdded" : "toolDiffRemoved";
+	const glyphColor = kind === "add" ? "success" : "error";
 	const spacer = rowBg ? `${rowBg} ` : " ";
 	return `${colorizeSegment(theme, glyphColor, glyph, rowBg)}${spacer}`;
 }

package/extensions/renderer/tool/diff/diff-palette.ts

@@ -115,7 +115,7 @@ export function keepBackgroundAcrossResets(text: string, rowBg: string): string
 
 export function colorizeSegment(
 	theme: DiffTheme,
-	color: "dim" | "toolDiffAdded" | "toolDiffRemoved",
+	color: "dim" | "success" | "error",
 	text: string,
 	rowBg: string | undefined,
 ): string {
@@ -276,15 +276,15 @@ export function readThemeAnsi(
 export function resolveDiffPalette(theme: DiffTheme): DiffPalette {
 	const fallbackBg = parseAnsiColorCode(readThemeAnsi(theme, "bg", "toolPendingBg")) ??
 		parseAnsiColorCode(readThemeAnsi(theme, "bg", "userMessageBg")) ?? { r: 32, g: 35, b: 42 };
-	// 删除行用 toolErrorBg 做基底（主题里是 diffDelBg 暗红）；不定义时退回通用基底混 tint。
+	// 新增行/删除行的文字和底色统一取 success、error，与工具标题、footer 计数同源。
 	const addBaseBg = parseAnsiColorCode(readThemeAnsi(theme, "bg", "toolSuccessBg")) ?? fallbackBg;
 	const removeBaseBg = parseAnsiColorCode(readThemeAnsi(theme, "bg", "toolErrorBg")) ?? addBaseBg;
-	const addFg = parseAnsiColorCode(readThemeAnsi(theme, "fg", "toolDiffAdded")) ?? {
+	const addFg = parseAnsiColorCode(readThemeAnsi(theme, "fg", "success")) ?? {
 		r: 88,
 		g: 173,
 		b: 88,
 	};
-	const removeFg = parseAnsiColorCode(readThemeAnsi(theme, "fg", "toolDiffRemoved")) ?? {
+	const removeFg = parseAnsiColorCode(readThemeAnsi(theme, "fg", "error")) ?? {
 		r: 196,
 		g: 98,
 		b: 98,

package/extensions/renderer/tool/diff/diff-presentation.ts

@@ -96,9 +96,9 @@ export function styleDiffSummaryLine(
 	};
 	if (countsIndex >= 0 && stats) {
 		pushMuted(countsIndex);
-		pieces.push(theme.fg("toolDiffAdded", `+${stats.added}`));
+		pieces.push(theme.fg("success", `+${stats.added}`));
 		pieces.push(theme.fg("muted", " "));
-		pieces.push(theme.fg("toolDiffRemoved", `-${stats.removed}`));
+		pieces.push(theme.fg("error", `-${stats.removed}`));
 		cursor = countsIndex + counts.length;
 	}
 	if (hintIndex >= cursor) {

package/extensions/renderer/tool/grouping.ts

@@ -26,6 +26,7 @@ import { mcpToolTitle } from "./mcp-title.ts";
 import { collapseHintText, isToolTuiFullscreen, showMoreHintText } from "./names.ts";
 import {
 	contentRowRange,
+	hasVisibleText,
 	imagePlacement,
 	stripAnsi,
 	stripBackgroundAnsi,
@@ -364,10 +365,17 @@ function expandedToolRows(tool: any, width: number): string[] {
 	const cached = expandedToolRowsCache.get(paint);
 	if (cached) return cached;
 	const rendered = visibleLines(paint);
-	if (rendered.length) {
-		rendered[0] = stripLeadingStatusIcon(rendered[0])
+	// 首行的状态图标由组前缀给，子行里要剥掉。
+	const stripIcon = (line: string) =>
+		stripLeadingStatusIcon(line)
 			.replace(/^ +/, "")
 			.replace(/^((?:\x1b\[[0-?]*[ -/]*[@-~])*) +/, "$1");
+	// 剥完什么都没剩下（子卡首行只剩一个图标）就丢掉这一行，再对新的首行剥一次：
+	// 留着会多出一行只有 `├ ✓` 的空行，标题行也会带着图标和前缀叠成两个。
+	while (rendered.length) {
+		rendered[0] = stripIcon(rendered[0]);
+		if (hasVisibleText(rendered[0])) break;
+		rendered.shift();
 	}
 	const rows = rendered.length
 		? // 续行只剥外层 Box 的 1 格 left pad，保留 Input/Output 相对缩进