pi-cc-extensions 0.9.10 → 0.9.11

package/README.en.md

@@ -63,7 +63,6 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
   "expandedCardBackground": "userMessageBg", // expanded card background slot: userMessageBg (same as user prompts) / toolPendingBg (neutral) etc.
   "inputClip": 0, // tool summary path/command clip length; 0 = fit width
   "showStartupHeader": true, // startup header (logo + tips) toggle
-  "scrollStepLines": 3, // fullscreen wheel scroll step
 
   // diff
   "diffViewMode": "auto", // layout: auto / split / unified
@@ -81,6 +80,8 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
 
   // footer
   "enableCustomFooter": true, // custom status bar
+  "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
   "footerHiddenKeys": [], // hidden plugin chip keys
   "footerLine1Keys": ["pi-usage"], // line1 plugin chip order; pi-usage is shown by default, data from @narumitw/pi-usage
@@ -98,11 +99,9 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
 ## Local development
 
 ```bash
-npm test
-npm run typecheck
-./test.sh # macOS/Linux: load the local checkout for one run, then restore
-test.bat  # Windows: same
-# one-off run without touching settings: pi -e .
+./test.sh            # macOS/Linux; needs node and pi
+./test.bat           # Windows; runs test.sh through Git Bash
+pi -e .              # one run, does not edit settings.json
 ```
 
 ## Compatibility

package/README.md

@@ -63,7 +63,6 @@ pi install git:github.com/minuque/pi-cc-extensions
   "expandedCardBackground": "userMessageBg", // 展开卡背景槽位；userMessageBg 与用户消息同色，toolPendingBg 为中性灰
   "inputClip": 0,                          // 工具摘要 path/command 折叠字符数；0 = 按可用宽度
   "showStartupHeader": true,               // 启动头（logo + tips）开关
-  "scrollStepLines": 3,                    // fullscreen 滚轮步进
 
   // diff
   "diffViewMode": "auto",                  // 布局：auto / split / unified
@@ -81,6 +80,8 @@ pi install git:github.com/minuque/pi-cc-extensions
 
   // footer
   "enableCustomFooter": true,              // 自定义状态栏
+  "footerCurrency": "USD",                 // 底栏费用的显示币种
+  "footerCurrencyRate": null,              // 1 单位费用换成多少显示币种；null 只换符号、不乘倍率
   "footerNerdIcons": true,                 // git/缓存用 Nerd Font 图标；false 为纯文本
   "footerHiddenKeys": [],                  // 隐藏的插件芯片 key
   "footerLine1Keys": ["pi-usage"],         // line1 插件芯片顺序；pi-usage 默认显示，数据来自 @narumitw/pi-usage
@@ -98,11 +99,9 @@ pi install git:github.com/minuque/pi-cc-extensions
 ## 本地开发
 
 ```bash
-npm test
-npm run typecheck
-./test.sh # macOS/Linux：临时加载本地检出，退出后还原
-test.bat  # Windows：同上
-# 只想跑一次、不改配置：pi -e .
+./test.sh            # macOS/Linux，需要 node 和 pi
+./test.bat           # Windows，经 Git Bash 运行 test.sh
+pi -e .              # 只跑一次，不改 settings.json
 ```
 
 ## 兼容性

package/extensions/config/config.ts

@@ -63,7 +63,6 @@ export type Config = {
 	animationIntervalMs: number;
 	dimThinkingText: boolean;
 	showStartupHeader: boolean;
-	scrollStepLines: number;
 	enableSessionReference: boolean;
 	enableSubagentAutocomplete: boolean;
 	enableContextCommand: boolean;
@@ -71,6 +70,10 @@ export type Config = {
 	enableWorkingMessage: boolean;
 	enableAliases: boolean;
 	enableCustomFooter: boolean;
+	/** ISO 4217 显示币种。USD 时不换算。 */
+	footerCurrency: string;
+	/** 1 单位费用对应的显示币种数量。null 只换符号、不乘倍率。 */
+	footerCurrencyRate: number | null;
 	footerNerdIcons: boolean;
 	footerHiddenKeys: string[];
 	footerLine1Keys: string[];
@@ -112,8 +115,6 @@ export const EXPANDED_OUTPUT_MAX_LINES_VALUES = ["10", "20", "40", "80", "120"];
 export const INPUT_CLIP_VALUES = ["0", "40", "60", "80", "100", "120", "160"];
 export const THINKING_PREVIEW_LINES_VALUES = ["0", "1", "3", "5", "10"];
 export const THINKING_ANIMATION_INTERVAL_VALUES = ["40", "60", "90", "120", "180"];
-/** fullscreen 滚轮步进行数预设。 */
-export const SCROLL_STEP_LINES_VALUES = ["1", "2", "3", "5", "10"];
 /** Tools commonly toggled in excludeRenderers via the settings panel. */
 export const EXCLUDE_RENDERER_CANDIDATES = [
 	"bash",
@@ -148,7 +149,6 @@ export const DEFAULT_CONFIG: Config = {
 	animationIntervalMs: 90,
 	dimThinkingText: false,
 	showStartupHeader: true,
-	scrollStepLines: 3,
 	enableSessionReference: true,
 	enableSubagentAutocomplete: true,
 	enableContextCommand: true,
@@ -156,6 +156,8 @@ export const DEFAULT_CONFIG: Config = {
 	enableWorkingMessage: true,
 	enableAliases: true,
 	enableCustomFooter: true,
+	footerCurrency: "USD",
+	footerCurrencyRate: null,
 	footerNerdIcons: true,
 	...DEFAULT_FOOTER_CHIP_LAYOUT,
 };
@@ -183,6 +185,19 @@ export function pickPositiveNumber(value: unknown, fallback: number, min = 1): n
 	return Number.isFinite(n) ? Math.max(min, n) : fallback;
 }
 
+function normalizeCurrency(value: unknown): string {
+	return typeof value === "string" && /^[A-Za-z]{3}$/.test(value.trim())
+		? value.trim().toUpperCase()
+		: "USD";
+}
+
+/** 缺失、空串、非正数都视为不换算。 */
+function normalizeFooterCurrencyRate(value: unknown): number | null {
+	if (value === undefined || value === null || value === "") return null;
+	const n = typeof value === "number" ? value : typeof value === "string" ? Number(value) : NaN;
+	return Number.isFinite(n) && n > 0 ? n : null;
+}
+
 export function normalizeConfig(input: unknown): Config {
 	const source = (input && typeof input === "object" ? input : {}) as Record<string, unknown>;
 	const mode = pickEnum(source.mode, ["on", "compact", "off"], DEFAULT_CONFIG.mode);
@@ -260,7 +275,6 @@ export function normalizeConfig(input: unknown): Config {
 		),
 		dimThinkingText: source.dimThinkingText === true,
 		showStartupHeader: source.showStartupHeader !== false,
-		scrollStepLines: pickPositiveInt(source.scrollStepLines, DEFAULT_CONFIG.scrollStepLines, 1, 50),
 		enableSessionReference: source.enableSessionReference !== false,
 		enableSubagentAutocomplete: source.enableSubagentAutocomplete !== false,
 		enableContextCommand: source.enableContextCommand !== false,
@@ -268,6 +282,8 @@ export function normalizeConfig(input: unknown): Config {
 		enableWorkingMessage: source.enableWorkingMessage !== false,
 		enableAliases: source.enableAliases !== false,
 		enableCustomFooter: source.enableCustomFooter !== false,
+		footerCurrency: normalizeCurrency(source.footerCurrency),
+		footerCurrencyRate: normalizeFooterCurrencyRate(source.footerCurrencyRate),
 		footerNerdIcons: source.footerNerdIcons !== false,
 		...normalizeFooterChipLayout(source),
 	};
@@ -316,7 +332,6 @@ export function formatConfigStatus(source: Config = config): string {
 		`thinkingAnimation=${source.animationIntervalMs}ms`,
 		`thinkingDim=${source.dimThinkingText ? "on" : "off"}`,
 		`startupHeader=${source.showStartupHeader ? "on" : "off"}`,
-		`scrollStep=${source.scrollStepLines}`,
 		`sessionRef=${source.enableSessionReference ? "on" : "off"}`,
 		`subagentAuto=${source.enableSubagentAutocomplete ? "on" : "off"}`,
 		`context=${source.enableContextCommand ? "on" : "off"}`,
@@ -324,6 +339,8 @@ export function formatConfigStatus(source: Config = config): string {
 		`workingMsg=${source.enableWorkingMessage ? "on" : "off"}`,
 		`aliases=${source.enableAliases ? "on" : "off"}`,
 		`footer=${source.enableCustomFooter ? "on" : "off"}`,
+		`footerCurrency=${source.footerCurrency}`,
+		`footerRate=${source.footerCurrencyRate ?? "-"}`,
 		`footerIcons=${source.footerNerdIcons ? "nerd" : "plain"}`,
 		formatFooterChipSummary(source),
 	].join(" · ");

package/extensions/config/panel.ts

@@ -12,6 +12,10 @@ import {
 	clearCustomFooter,
 	getFooterStatusSnapshot,
 } from "../feature/shell/footer.ts";
+import {
+	FOOTER_CURRENCY_PRESETS,
+	presetFooterCurrencyRate,
+} from "../feature/shell/footer-currency.ts";
 import {
 	footerChipDescription,
 	footerLineOfKey,
@@ -42,7 +46,6 @@ import {
 	pickInputClip,
 	pickPositiveInt,
 	pickPositiveNumber,
-	SCROLL_STEP_LINES_VALUES,
 	THINKING_ANIMATION_INTERVAL_VALUES,
 	THINKING_PREVIEW_LINES_VALUES,
 	INPUT_CLIP_VALUES,
@@ -281,10 +284,22 @@ function buildExcludeRenderersSubmenu(
 	};
 }
 
-/** 数值项手动输入子面板：预填当前值，Space 循环预设，输入数字自定义，Enter 应用，Esc 取消。 */
-function buildNumberInputSubmenu(
+function footerCurrencyRateLabel(rate: number | null): string {
+	return rate === null ? "-" : String(rate);
+}
+
+/**
+ * 手动输入子面板。accept 返回字符串则提交，undefined 取消，null 用 invalid 提示。
+ */
+function buildValueInputSubmenu(
 	theme: any,
-	setting: { label: string; values: readonly string[]; currentValue: string },
+	options: {
+		prompt: string;
+		initial: string;
+		hint: string;
+		accept: (raw: string) => string | null | undefined;
+		invalid?: (raw: string) => string;
+	},
 	closeSubmenu: (selected?: string) => void,
 ): {
 	render: (width: number) => string[];
@@ -293,27 +308,28 @@ function buildNumberInputSubmenu(
 } {
 	const input = new Input();
 	let error = "";
-	input.setValue(setting.currentValue);
+	input.setValue(options.initial);
 	input.onSubmit = (value: string) => {
 		const raw = value.trim();
-		if (raw === "") {
-			closeSubmenu(); // 空输入 = 取消
+		const next = options.accept(raw);
+		if (next === undefined) {
+			closeSubmenu();
 			return;
 		}
-		if (!Number.isFinite(Number(raw))) {
-			error = `Invalid number: "${raw}"`;
+		if (next === null) {
+			error = options.invalid?.(raw) ?? "Invalid value";
 			return;
 		}
-		closeSubmenu(raw);
+		closeSubmenu(next);
 	};
 	input.onEscape = () => closeSubmenu();
 	return {
 		render: (width: number) => {
 			const safe = Math.max(0, Math.floor(width));
 			const lines = [
-				theme.fg("dim", `  ${setting.label} — custom value:`),
+				theme.fg("dim", options.prompt),
 				...input.render(safe),
-				truncateToWidth(theme.fg("dim", "  Enter to apply · Esc to go back"), safe),
+				truncateToWidth(theme.fg("dim", options.hint), safe),
 			];
 			if (error !== "") lines.push(theme.fg("dim", `  ${error}`));
 			return lines;
@@ -323,6 +339,25 @@ function buildNumberInputSubmenu(
 	};
 }
 
+/** 数值项：预填当前值，空输入取消，非数字留下错误。 */
+function buildNumberInputSubmenu(
+	theme: any,
+	setting: { label: string; currentValue: string },
+	closeSubmenu: (selected?: string) => void,
+) {
+	return buildValueInputSubmenu(
+		theme,
+		{
+			prompt: `  ${setting.label} — custom value:`,
+			initial: setting.currentValue,
+			hint: "  Enter to apply · Esc to go back",
+			accept: (raw) => (raw === "" ? undefined : Number.isFinite(Number(raw)) ? raw : null),
+			invalid: (raw) => `Invalid number: "${raw}"`,
+		},
+		closeSubmenu,
+	);
+}
+
 /** Section tabs for /ccstyle — matches Zentui-style "A / B / C" headers. */
 type CcstyleSection = {
 	id: "style" | "diff" | "thinking" | "ui" | "feature" | "footer";
@@ -551,15 +586,6 @@ export async function showCcstylePanel(
 			currentValue: config.showStartupHeader ? "on" : "off",
 			values: ["on", "off"],
 		};
-		const scrollStepSetting = {
-			id: "scrollStepLines",
-			label: "Scroll step",
-			description: "Mouse wheel scroll lines in fullscreen mode.",
-			currentValue: String(config.scrollStepLines),
-			values: [...SCROLL_STEP_LINES_VALUES],
-			submenu: (_current: string, closeSubmenu: (selected?: string) => void) =>
-				buildNumberInputSubmenu(theme, scrollStepSetting, closeSubmenu),
-		};
 
 		// 额外功能开关：注册于扩展加载期，切换后需重启（/reload）生效。
 		const sessionReferenceToggle = featureToggleSetting(
@@ -604,6 +630,65 @@ export async function showCcstylePanel(
 			"Aliases disabled.",
 			config.enableAliases,
 		);
+		const footerCurrencySetting = {
+			id: "footerCurrency",
+			label: "Cost currency",
+			description:
+				"ISO code for the status-bar cost. Switching currency fills its preset rate. USD clears the rate.",
+			currentValue: config.footerCurrency,
+			values: [...FOOTER_CURRENCY_PRESETS],
+			submenu: (_current: string, closeSubmenu: (selected?: string) => void) => {
+				nestedSubmenuOpen = true;
+				nestedHint = "  Enter to apply · Esc back to Footer";
+				return buildValueInputSubmenu(
+					theme,
+					{
+						prompt: "  Cost currency — ISO code:",
+						initial: footerCurrencySetting.currentValue,
+						hint: "  Enter to apply · Esc to go back",
+						accept: (raw) => (raw === "" ? undefined : raw),
+					},
+					(selected) => {
+						nestedSubmenuOpen = false;
+						nestedHint = "";
+						closeSubmenu(selected);
+					},
+				);
+			},
+		};
+		const footerCurrencyRateSetting = {
+			id: "footerCurrencyRate",
+			label: "Cost rate",
+			description:
+				"Display units per 1 USD of cost. Switching currency replaces this. Empty keeps the number and only changes the symbol.",
+			currentValue: footerCurrencyRateLabel(config.footerCurrencyRate),
+			submenu: (_current: string, closeSubmenu: (selected?: string) => void) => {
+				nestedSubmenuOpen = true;
+				nestedHint = "  Enter to apply · empty clears · Esc back to Footer";
+				return buildValueInputSubmenu(
+					theme,
+					{
+						prompt: "  Cost rate — display units per 1 cost unit:",
+						initial:
+							footerCurrencyRateSetting.currentValue === "-"
+								? ""
+								: footerCurrencyRateSetting.currentValue,
+						hint: "  Enter to apply · empty clears conversion · Esc to go back",
+						accept: (raw) => {
+							if (raw === "" || raw === "-") return "-";
+							const n = Number(raw);
+							return Number.isFinite(n) && n > 0 ? raw : null;
+						},
+						invalid: () => "Rate must be a positive number",
+					},
+					(selected) => {
+						nestedSubmenuOpen = false;
+						nestedHint = "";
+						closeSubmenu(selected);
+					},
+				);
+			},
+		};
 		const footerNerdIconsSetting = {
 			id: "footerNerdIcons",
 			label: "Nerd Font icons",
@@ -663,6 +748,27 @@ export async function showCcstylePanel(
 				ctx.ui.notify(`Updated ${id}: ${value}`, "info");
 				return;
 			}
+			if (id === "footerCurrency") {
+				updateConfig({
+					footerCurrency: value,
+					footerCurrencyRate: presetFooterCurrencyRate(value),
+				});
+				footerCurrencySetting.currentValue = config.footerCurrency;
+				footerCurrencyRateSetting.currentValue = footerCurrencyRateLabel(config.footerCurrencyRate);
+				if (config.enableCustomFooter) applyCustomFooter(ctx);
+				ctx.ui.notify(
+					`Updated ${id}: ${config.footerCurrency} · ${footerCurrencyRateSetting.currentValue}`,
+					"info",
+				);
+				return;
+			}
+			if (id === "footerCurrencyRate") {
+				updateConfig({ footerCurrencyRate: value === "-" ? null : Number(value) });
+				footerCurrencyRateSetting.currentValue = footerCurrencyRateLabel(config.footerCurrencyRate);
+				if (config.enableCustomFooter) applyCustomFooter(ctx);
+				ctx.ui.notify(`Updated ${id}: ${footerCurrencyRateSetting.currentValue}`, "info");
+				return;
+			}
 			if (id === "footerNerdIcons") {
 				const enabled = value === "on";
 				updateConfig({ footerNerdIcons: enabled });
@@ -810,12 +916,6 @@ export async function showCcstylePanel(
 					else clearStartupHeader(ctx);
 					break;
 				}
-				case "scrollStepLines":
-					updateConfig({
-						scrollStepLines: pickPositiveInt(value, DEFAULT_CONFIG.scrollStepLines, 1, 50),
-					});
-					scrollStepSetting.currentValue = String(config.scrollStepLines);
-					break;
 				default:
 					return;
 			}
@@ -852,7 +952,6 @@ export async function showCcstylePanel(
 					expandedCardBgSetting,
 					inputClipSetting,
 					startupHeaderSetting,
-					scrollStepSetting,
 				],
 			},
 			{
@@ -880,7 +979,13 @@ export async function showCcstylePanel(
 			{
 				id: "footer",
 				label: "Footer",
-				items: [customFooterSetting, footerNerdIconsSetting, pluginChipsSetting],
+				items: [
+					customFooterSetting,
+					footerCurrencySetting,
+					footerCurrencyRateSetting,
+					footerNerdIconsSetting,
+					pluginChipsSetting,
+				],
 			},
 		];
 

package/extensions/feature/compact-thinking.ts

@@ -324,7 +324,7 @@ function hiddenPreviewHint(
 	return undefined;
 }
 
-const expandedThinking = new Set<number>();
+const expandedThinking = new Set<string>();
 
 /** 折叠预览 + 展开全文。fullscreen 点击 hint 展开、展开卡单击整块收起（拖动选择文本时不收起）。 */
 export class ThinkingPreviewBlock implements Component {
@@ -335,7 +335,6 @@ export class ThinkingPreviewBlock implements Component {
 	readonly runStartIndex: number;
 	private style: (text: string) => string;
 	private theme: Theme | undefined;
-	private _expanded: boolean;
 	private hintHovered = false;
 	private collapsedMemo:
 		| {
@@ -363,7 +362,6 @@ export class ThinkingPreviewBlock implements Component {
 		this.runStartIndex = runStartIndex;
 		this.style = style;
 		this.theme = theme;
-		this._expanded = expandedThinking.has(messageTimestamp);
 	}
 
 	private paint(color: string, text: string): string {
@@ -372,18 +370,20 @@ export class ThinkingPreviewBlock implements Component {
 			: text;
 	}
 
+	/** 展开态按消息时间戳 + run 序号共享：面板重排/内容重建换掉实例后，
+	 *  布局里的旧实例与 render 的新实例同键，点谁都能展开。 */
 	get expanded(): boolean {
-		return this._expanded;
+		return expandedThinking.has(`${this.messageTimestamp}:${this.runStartIndex}`);
 	}
 
 	setExpanded(expanded: boolean): void {
-		if (this._expanded !== expanded) this.collapsedMemo = undefined;
-		this._expanded = expanded;
-		if (expanded) expandedThinking.add(this.messageTimestamp);
+		const key = `${this.messageTimestamp}:${this.runStartIndex}`;
+		if (expanded) expandedThinking.add(key);
 		else {
-			expandedThinking.delete(this.messageTimestamp);
+			expandedThinking.delete(key);
 			evictExpandedWraps(this.messageTimestamp, this.runStartIndex);
 		}
+		this.collapsedMemo = undefined;
 	}
 
 	setHintHovered(hovered: boolean): void {
@@ -392,7 +392,7 @@ export class ThinkingPreviewBlock implements Component {
 	}
 
 	private headingLines(width: number, hiddenLines: number, padding: number): string[] {
-		const hint = this._expanded
+		const hint = this.expanded
 			? undefined
 			: hiddenPreviewHint(hiddenLines, Boolean(this.text) && config.previewLines <= 0);
 		if (!hint) return new Text(this.heading, padding, 0).render(width);
@@ -412,10 +412,10 @@ export class ThinkingPreviewBlock implements Component {
 	}
 
 	private bodyLines(width: number, padding: number): { lines: string[]; hiddenLines: number } {
-		if (!this.text || (config.previewLines <= 0 && !this._expanded)) {
+		if (!this.text || (config.previewLines <= 0 && !this.expanded)) {
 			return { lines: [], hiddenLines: 0 };
 		}
-		if (this._expanded) {
+		if (this.expanded) {
 			return {
 				lines: wrapExpandedThinking(this.messageTimestamp, this.runStartIndex, this.text, width),
 				hiddenLines: 0,
@@ -426,7 +426,7 @@ export class ThinkingPreviewBlock implements Component {
 	}
 
 	render(width: number) {
-		if (this._expanded) {
+		if (this.expanded) {
 			const innerWidth = Math.max(1, width - 2);
 			const body = this.bodyLines(innerWidth, 0);
 			const heading = this.headingLines(innerWidth, 0, 0);

package/extensions/feature/shell/footer-currency.ts

@@ -0,0 +1,29 @@
+const KNOWN_CURRENCIES = new Set(Intl.supportedValuesOf("currency"));
+
+/** 1 美元费用对应的显示币种数量。面板切换币种时写入。 */
+export const FOOTER_CURRENCY_RATES = {
+	CNY: 7.12,
+	EUR: 0.92,
+	JPY: 150,
+	GBP: 0.76,
+	INR: 96.25,
+	HKD: 7.78,
+} as const;
+
+export const FOOTER_CURRENCY_PRESETS = ["USD", ...Object.keys(FOOTER_CURRENCY_RATES)] as const;
+
+/** 不在表里的币种，包括 USD，返回 null。 */
+export function presetFooterCurrencyRate(currency: string): number | null {
+	const code = currency.trim().toUpperCase();
+	return FOOTER_CURRENCY_RATES[code as keyof typeof FOOTER_CURRENCY_RATES] ?? null;
+}
+
+/** 底栏费用文本。USD 或不支持的币种保持美元写法。没有倍率时只换符号。 */
+export function formatFooterCost(cost: number, currency: string, rate: number | null): string {
+	const usd = `$${cost.toFixed(2)}`;
+	if (currency === "USD" || !KNOWN_CURRENCIES.has(currency)) return usd;
+	const formatted = new Intl.NumberFormat("en", { style: "currency", currency }).format(
+		rate === null ? cost : cost * rate,
+	);
+	return rate === null ? formatted : `≈${formatted}`;
+}

package/extensions/feature/shell/footer.ts

@@ -21,6 +21,7 @@ import { join } from "node:path";
 import { pathToFileURL } from "node:url";
 import { config } from "../../config/config.ts";
 import { stripAnsi } from "../../utils/ansi-text.ts";
+import { formatFooterCost } from "./footer-currency.ts";
 import {
 	PI_USAGE_KEY,
 	isSkippedFooterStatusKey,
@@ -419,8 +420,10 @@ const createCustomFooterFactory =
 				cachePct > 0 ? `${glyphs.cache ? `${glyphs.cache} ` : ""}${Math.floor(cachePct)}%` : "";
 			const costChip =
 				cost || usingSubscription
-					? theme.fg("dim", `$${cost.toFixed(2)}`) +
-						(usingSubscription ? theme.fg("warning", " sub") : "")
+					? theme.fg(
+							"dim",
+							formatFooterCost(cost, config.footerCurrency, config.footerCurrencyRate),
+						) + (usingSubscription ? theme.fg("warning", " sub") : "")
 					: "";
 			const line1 = joinChips([
 				theme.fg("accent", modelLabel),

package/extensions/renderer/compact-mode.ts

@@ -535,6 +535,12 @@ function isToolComponent(value: any): boolean {
 	return value instanceof ToolExecutionComponent;
 }
 
+/** 成员离开回合后不再算外层面板，避免点别的卡时被跳过收起。 */
+function clearRoundAnchor(component: any): void {
+	if (!component || Object.getOwnPropertyDescriptor(component, "roundAnchor")?.get) return;
+	delete component.roundAnchor;
+}
+
 function detachAssistantExpansion(component: any): void {
 	if (
 		typeof component?.[ASSISTANT_SET_EXPANDED_KEY] !== "function" ||
@@ -546,6 +552,7 @@ function detachAssistantExpansion(component: any): void {
 	delete component[ASSISTANT_SET_EXPANDED_KEY];
 	delete component[ASSISTANT_TOGGLE_ROUND_KEY];
 	delete component[ASSISTANT_REENTRY_KEY];
+	clearRoundAnchor(component);
 }
 
 /** 供 mouse-interaction 识别可点击的 compact assistant 行（仅 compact 模式下生效）。 */
@@ -949,8 +956,11 @@ function compactAssistantLineComponent(
 					text = `${styleCompactThinkingText(heading, theme)}${plain(tools)}`;
 				}
 			}
-			const hintColor = hover ? "text" : "dim";
-			const line = `${text}${hintText ? theme.fg(hintColor, hintText) : ""}`;
+			// 圆点保持 dim；hover 只高亮可点击文字。
+			const hintPart = hint
+				? `${theme.fg("dim", " · ")}${theme.fg(hover ? "text" : "dim", showMoreHintText())}`
+				: "";
+			const line = `${text}${hintPart}`;
 			const rendered = `${" ".repeat(pad)}${truncateToWidth(line, available, "")}`;
 			const lines = leadingBlank ? ["", rendered] : [rendered];
 			paint = {
@@ -1695,6 +1705,10 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		for (const [component, message] of round.messages) {
 			component.lastMessage = message;
 			ensureAssistantSetExpanded(component);
+			// 尾行用 getter 指向 anchor；成员用同名属性，点内部工具时能认出同一回合。
+			if (!Object.getOwnPropertyDescriptor(component, "roundAnchor")?.get) {
+				component.roundAnchor = round.anchor;
+			}
 			component[ASSISTANT_TOGGLE_ROUND_KEY] = (expanded: boolean) => {
 				const wasExpanded = round.anchor.expanded === true;
 				if (expanded && !wasExpanded) capturePanelViewport(round.anchor);
@@ -1946,7 +1960,10 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 		if (hasToolCalls) {
 			let round = roundByComponent.get(this);
 			if (hasText && (!round || round.anchor !== this)) {
-				if (round) round.messages.delete(this);
+				if (round) {
+					round.messages.delete(this);
+					clearRoundAnchor(this);
+				}
 				if (activeRound) finishRound(activeRound);
 				round = createRound(this, message);
 				roundByComponent.set(this, round);
@@ -1966,6 +1983,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 				// 最终回答开始后，当前组件恢复原生文本；它已完成的 thinking
 				// 留在上一轮摘要中，避免再次生成独立 Thought 行。
 				round.messages.delete(this);
+				clearRoundAnchor(this);
 				round.detachedMessages.push(previousMessage);
 				roundByComponent.delete(this);
 				finishRound(round);
@@ -1975,6 +1993,7 @@ export function installCompactMode(deps: CompactModeInstallDeps): CompactModeHoo
 				// 围观态下 anchor 还挂着槽位卡，必须重绘才能收回。
 				endRound(round, true);
 				roundByComponent.delete(this);
+				clearRoundAnchor(this);
 				return passThroughAssistant(this, message);
 			}
 			if (activeRound) finishRound(activeRound);

package/extensions/renderer/default-mode.ts

@@ -85,8 +85,8 @@ type GlobalToolRenderPatch = {
 	prototype: any;
 	active: boolean;
 	mode: () => CompactStyleMode;
-	wrap: (tool: any) => any;
-	byDefinition: WeakMap<object, any>;
+	wrap: (tool: any, toolName: string) => any;
+	byDefinition: WeakMap<object, Map<string, any>>;
 	byName: Map<string, any>;
 	downstream: ToolRenderMethods;
 	installed: ToolRenderMethods;
@@ -217,8 +217,8 @@ function renderExpandedTaskResult(
 function createCcstyleTool(
 	originalTool: any,
 	writeExecutionMetadata: WriteExecutionMetadataStore,
+	toolName: string,
 ): any {
-	const toolName = originalTool.name;
 	const label = originalTool.label || toolName;
 	const defaultTitle = label === toolName ? humanizeToolLabel(label) : label;
 	// MCP 工具直接用 adapter 暴露的真实工具名，不做人性化
@@ -459,19 +459,24 @@ function shouldGloballyStyleTool(component: any, patch: GlobalToolRenderPatch):
 
 function getGloballyStyledTool(component: any, patch: GlobalToolRenderPatch): any {
 	const definition = component.toolDefinition ?? component.builtInToolDefinition;
+	const name = String(component.toolName || definition?.name || "tool");
 	if (definition && typeof definition === "object") {
-		let wrapped = patch.byDefinition.get(definition);
+		let byName = patch.byDefinition.get(definition);
+		if (!byName) {
+			byName = new Map();
+			patch.byDefinition.set(definition, byName);
+		}
+		let wrapped = byName.get(name);
 		if (!wrapped) {
-			wrapped = patch.wrap(definition);
-			patch.byDefinition.set(definition, wrapped);
+			wrapped = patch.wrap(definition, name);
+			byName.set(name, wrapped);
 		}
 		return wrapped;
 	}
 
-	const name = String(component.toolName || "tool");
 	let wrapped = patch.byName.get(name);
 	if (!wrapped) {
-		wrapped = patch.wrap({ name, label: name });
+		wrapped = patch.wrap({ name, label: name }, name);
 		patch.byName.set(name, wrapped);
 	}
 	return wrapped;
@@ -568,7 +573,8 @@ function installGlobalToolRendering(
 		prototype,
 		active: true,
 		mode: () => config.mode,
-		wrap: (tool: any) => createCcstyleTool(tool, writeExecutionMetadata),
+		wrap: (tool: any, toolName: string) =>
+			createCcstyleTool(tool, writeExecutionMetadata, toolName),
 		byDefinition: new WeakMap(),
 		byName: new Map(),
 		downstream,

package/extensions/renderer/mouse/interaction.ts

@@ -13,7 +13,6 @@ import {
 	setHoveredCompactAssistant,
 } from "../compact-mode.ts";
 import { isMessageDisplayComponent } from "../tool/message-display.ts";
-import { config } from "../../config/config.ts";
 import { isLazyProxyTui } from "../../utils/fullscreen-detect.ts";
 import { setToolTuiFullscreen, isCollapseHintLine } from "../tool/show-more-hint.ts";
 import {
@@ -308,10 +307,6 @@ function ensureFullscreenToolMouseMotion(tui: any): void {
 		releaseFullscreenToolMouseMotion(tui);
 		return;
 	}
-	// 面板改 scrollStepLines 后，下一帧渲染即同步（restore 仍按 original 恢复）。
-	if (typeof tui.wheelScrollLines === "number" && tui.wheelScrollLines !== config.scrollStepLines) {
-		tui.wheelScrollLines = config.scrollStepLines;
-	}
 	if (
 		!toolMouseInteractionActive() ||
 		tui.mouseEnabled === false ||
@@ -348,7 +343,6 @@ function releaseFullscreenToolMouseMotion(tui?: any): void {
 }
 
 const FULLSCREEN_VIEWPORT_PATCH = Symbol("ccstyle.fullscreen-viewport-patch");
-const FULLSCREEN_WHEEL_SCROLL_ORIGINAL = Symbol("ccstyle.fullscreen-wheel-scroll-original");
 
 /**
  * diff 结果组件自带 remainder 行：声明存在时只有那一行是展开入口（正文里的同名字样不算）；
@@ -418,11 +412,11 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 	if (!isTool && !isGroup && !isAssistant && !isThinking && !isMessage) return false;
 	if (!component.expanded) {
 		// collapsed 仅按钮文本可展开，不能把同一行正文/留白变成点击区。
+		// thinking 例外：标题行（标题、隐藏行数与提示同一行）整行都是展开入口。
 		const hint = collapsedHintHitbox(line);
 		const onHint = Boolean(
 			hint &&
-				packet.col >= hint.startCol &&
-				packet.col <= hint.endCol &&
+				(isThinking || (packet.col >= hint.startCol && packet.col <= hint.endCol)) &&
 				isCollapsedHintRow(component, line),
 		);
 		if (!onHint) {
@@ -437,18 +431,16 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 			if (other !== component && other.expanded) {
 				// 展开 round 卡内 thinking/工具时，外层 compact 卡是它的容器，不能收起。
 				// 面板挂在摘要行时，anchor 与摘要行是同一张外层卡，点内部工具不能收起它。
-				if (
-					(isThinking || isTool) &&
-					isCompactAssistantComponent(other) &&
-					(other === target.owner || other === target.owner?.roundAnchor)
-				)
-					continue;
+				// 同一回合的摘要行、anchor 和其他消息都是外层面板，收起任一个都会关掉整块。
+				if ((isThinking || isTool) && isSameExpandedRound(other, target.owner)) continue;
 				other.setExpanded(false);
 				other.invalidate?.();
 			}
 		}
 		// 展开 round 卡内工具时，让 compact 的强制折叠放行它（非 round 内工具为空操作）。
 		if (isTool) markCompactRoundToolExpanded(component);
+		// compact 摘要行自己记展开前的视口（收起时还原跟随），这里不动它。
+		if (!isAssistant) keepViewportOnExpand(tui);
 		component.setExpanded(true);
 		clearPendingCollapsePress();
 	} else {
@@ -489,6 +481,25 @@ function handleFullscreenToolClick(tui: any, packet: SgrMousePacket): boolean {
 	return true;
 }
 
+/** 点到的组件和外层卡是否属于同一张 compact 回合面板。 */
+function isSameExpandedRound(other: any, owner: any): boolean {
+	if (!owner || !isCompactAssistantComponent(other)) return false;
+	const anchor = owner.roundAnchor ?? owner;
+	return other === owner || other === anchor || other.roundAnchor === anchor;
+}
+
+/**
+ * 原地展开时停在当前滚动位置：transcript 跟随底部时，内容变高会把视口拖到底，
+ * 点击的行和它上方的外层面板被顶出屏幕。展开前关掉跟随，点击行留在原位。
+ */
+function keepViewportOnExpand(tui: any): void {
+	const view = tui.getPrimaryScrollView?.();
+	if (typeof view?.scrollTo !== "function" || typeof view.scrollTop !== "number") return;
+	view.scrollTo(view.scrollTop, { disableFollow: true });
+	// 已脱离底部跟随：亮出回到底部按钮，新输出到来时仍有入口。
+	if (view.isFollowingEnd === false) setScrollButtonVisible(true);
+}
+
 /**
  * fullscreen 鼠标悬停：collapsed 卡 [click to show more] hint、
  * expanded 卡截断头 show-more、回到底部按钮。motion 不 consume，官方链照常。
@@ -528,7 +539,8 @@ function handleFullscreenToolHover(tui: any, packet: SgrMousePacket): void {
 			if (component instanceof ToolGroupComponent) {
 				if (overHint) target = { kind: "group", component };
 			} else if (component instanceof ThinkingPreviewBlock) {
-				if (component.expanded || overHint) target = { kind: "thinking", component };
+				// thinking 折叠标题行整行可点：整块 hover 都高亮动作词，不只高亮按钮文本。
+				if (component.expanded || Boolean(hintBox)) target = { kind: "thinking", component };
 			} else if (isToolExecutionComponent(component)) {
 				let view: ExpandedToolIoView | null = null;
 				let section: ToolIoSection | null = null;
@@ -571,11 +583,6 @@ function patchFullscreenViewportInput(tui: any): void {
 	const proto = Object.getPrototypeOf(tui);
 	const original = proto?.handleViewportInput;
 	if (typeof original !== "function") return;
-	// 官方原生 routeWheel 已完整处理嵌套 ScrollView；只调整默认步进（config.scrollStepLines）。
-	if (typeof tui.wheelScrollLines === "number") {
-		tui[FULLSCREEN_WHEEL_SCROLL_ORIGINAL] = tui.wheelScrollLines;
-		tui.wheelScrollLines = config.scrollStepLines;
-	}
 	tui[FULLSCREEN_VIEWPORT_PATCH] = true;
 	tui.handleViewportInput = function (this: any, data: string) {
 		if (toolMouseInteractionActive() && tui.mode === "fullscreen") {
@@ -624,11 +631,6 @@ function restoreFullscreenViewportInput(tui: any): void {
 	if (typeof proto?.handleViewportInput === "function") {
 		tui.handleViewportInput = proto.handleViewportInput;
 	}
-	const originalWheelScrollLines = tui[FULLSCREEN_WHEEL_SCROLL_ORIGINAL];
-	if (typeof originalWheelScrollLines === "number") {
-		tui.wheelScrollLines = originalWheelScrollLines;
-		tui[FULLSCREEN_WHEEL_SCROLL_ORIGINAL] = undefined;
-	}
 	tui[FULLSCREEN_VIEWPORT_PATCH] = false;
 }
 

package/extensions/renderer/tool/codemode.ts

@@ -235,7 +235,10 @@ export function codemodeCollapsedLines(options: {
 	const summary = codemodeSummaryParts(calls, codemodeOutputLineCount(result), running);
 	// 没有子调用时不画衔接符，避免孤零零一个 └
 	const prefix = shown.length > 0 ? `${INDENT}${fg("dim", "└")} ` : INDENT;
-	const hint = running ? "" : ` ${fg(options.hovered ? "text" : "dim", `· ${showMoreHintText()}`)}`;
+	// 圆点保持 dim；hover 只高亮可点击文字。
+	const hint = running
+		? ""
+		: ` ${fg("dim", "·")} ${fg(options.hovered ? "text" : "dim", showMoreHintText())}`;
 	const bodyWidth = Math.max(1, rowWidth - visibleWidth(prefix) - visibleWidth(hint));
 	const body = fg(isError ? "error" : "muted", fitSummaryParts(summary, bodyWidth));
 	lines.push(truncateToWidth(`${prefix}${body}${hint}`, rowWidth, ""));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-cc-extensions",
-	"version": "0.9.10",
+	"version": "0.9.11",
 	"license": "MIT",
 	"description": "Claude Code-style TUI output with some personal touches and handy utilities.",
 	"type": "module",