pi-cc-extensions 0.9.10 → 0.9.12

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/extensions/renderer/tool/diff/diff-edit-render.ts

@@ -1,6 +1,7 @@
-import { Text, type Component } from "@earendil-works/pi-tui";
+import { Text, visibleWidth, type Component } from "@earendil-works/pi-tui";
 import type { EditToolDetails } from "@earendil-works/pi-coding-agent";
 import { sanitizeToolResultText } from "../../../utils/tool-result-sanitize.ts";
+import { showMoreHintText } from "../show-more-hint.ts";
 import {
 	getLineNumberWidth,
 	parseDiff,
@@ -20,6 +21,7 @@ import {
 import { renderDiffFrameLine, renderHeaderRows, renderSingleDiffRow } from "./diff-header.ts";
 import {
 	applyLineLimit,
+	clampDiffLineToWidth,
 	clampDiffLinesToWidth,
 	resolveDiffDisplayLimit,
 	resolveDiffProcessBudget,
@@ -81,6 +83,33 @@ export function countEditDiffStats(
 	}
 }
 
+/** Keep counts in the result row: the default-mode edit title does not include them. */
+function renderEditCollapsedSummaryLine(
+	stats: ParsedDiff["stats"],
+	width: number,
+	theme: DiffTheme,
+	hovered: boolean,
+): string {
+	const counts = `+${stats.added} -${stats.removed}`;
+	const hint = showMoreHintText();
+	const candidates = [
+		`↳ diff ${counts} · ${hint}`,
+		`↳ ${counts} · ${hint}`,
+		`${counts} · ${hint}`,
+		`↳ diff ${counts}`,
+		counts,
+		"diff",
+		"…",
+	];
+	const text = candidates.find((candidate) => visibleWidth(candidate) <= width) ?? "";
+	const hintIndex = text.lastIndexOf(hint);
+	const styled =
+		hovered && hintIndex >= 0
+			? theme.fg("muted", text.slice(0, hintIndex)) + theme.fg("text", hint)
+			: theme.fg("muted", text);
+	return clampDiffLineToWidth(styled, width);
+}
+
 export function renderEditDiffResult(
 	details: unknown,
 	options: DiffRenderOptions,
@@ -110,25 +139,33 @@ export function renderEditDiffResult(
 		return new Text(theme.fg("muted", "↳ no diff data"), 0, 0);
 	}
 
-	const splitRows = buildSplitRows(renderEntries);
-	const showHashlineAnchors =
-		options.expanded === true &&
-		renderEntries.some((entry) => entry.kind === "line" && !!entry.hashlineAnchorContent);
-	const lineNumberWidth = getLineNumberWidth(renderEntries, showHashlineAnchors);
 	const palette = resolveDiffPalette(theme);
 	// Rich diffs use ccstyle's self shell. Keep the panel transparent so the
 	// separator cannot leak toolSuccessBg across the entire new column.
 	const containerBgAnsi = undefined;
 	const language = resolveLanguageFromPath(options.filePath);
 	const cache = createDiffRenderCache();
-	const highlightLine = createCodeLineHighlighter(language, theme, renderEntries, () => {
-		cache.invalidate();
-		options.invalidate?.();
-	});
+	// Summary-only previews need parsed counts, not split rows or syntax highlighting.
+	// Keep detailed data lazy so a live setting change can still reveal the same diff.
+	function buildDetailedData() {
+		const showHashlineAnchors =
+			options.expanded === true &&
+			renderEntries.some((entry) => entry.kind === "line" && !!entry.hashlineAnchorContent);
+		return {
+			splitRows: buildSplitRows(renderEntries),
+			showHashlineAnchors,
+			lineNumberWidth: getLineNumberWidth(renderEntries, showHashlineAnchors),
+			highlightLine: createCodeLineHighlighter(language, theme, renderEntries, () => {
+				cache.invalidate();
+				options.invalidate?.();
+			}),
+		};
+	}
+	let detailedData: ReturnType<typeof buildDetailedData> | undefined;
 
 	return {
 		[RICH_DIFF_COMPONENT]: true,
-		/** 鼠标层只在真正的 remainder 行上提供展开入口。 */
+		/** Only the current summary/remainder row is an expand target, never diff body text. */
 		isCollapsedHintLine(plainLine: string): boolean {
 			const hint = cache.getHintLine();
 			return hint !== undefined && normalizeCollapsedHintLine(plainLine) === hint;
@@ -147,6 +184,20 @@ export function renderEditDiffResult(
 				return cached;
 			}
 
+			// Like write's zero-line preview, handle this before the normal body limiter.
+			if (!options.expanded && live.editDiffCollapsedLines === 0) {
+				const summary = renderEditCollapsedSummaryLine(parsed.stats, safeWidth, theme, hovered);
+				return cache.set(
+					safeWidth,
+					options.expanded,
+					mode,
+					configKey,
+					hovered,
+					[summary],
+					normalizeCollapsedHintLine(summary),
+				);
+			}
+
 			if (mode === "summary") {
 				return cache.set(
 					safeWidth,
@@ -166,6 +217,8 @@ export function renderEditDiffResult(
 				);
 			}
 
+			const { splitRows, showHashlineAnchors, lineNumberWidth, highlightLine } = (detailedData ??=
+				buildDetailedData());
 			const headerRows = renderHeaderRows(parsed.stats, mode, safeWidth, theme);
 			const displayLimit = resolveDiffDisplayLimit(options.expanded, live.editDiffCollapsedLines);
 			const processBudget = resolveDiffProcessBudget(displayLimit, wordWrap);

package/extensions/renderer/tool/names.ts

@@ -5,9 +5,9 @@ import { config } from "../../config/config.ts";
 import { oneLine } from "../../utils/format.ts";
 import { headTruncateToWidth } from "./result.ts";
 
-/** inputClip=0 时不设字符上限，交给渲染时的实际宽度截断。 */
+/** toolLabelClip=0 时不设字符上限，交给渲染时的实际宽度截断。 */
 function clipLimit(): number {
-	return config.inputClip > 0 ? config.inputClip : Number.POSITIVE_INFINITY;
+	return config.toolLabelClip > 0 ? config.toolLabelClip : Number.POSITIVE_INFINITY;
 }
 
 function clip(value: unknown): string {

package/package.json

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