pi-cc-extensions 0.8.48 → 0.8.49

package/extensions/renderer/show-more-hint.ts

@@ -0,0 +1,40 @@
+/**
+ * show-more 提示文本：fullscreen 下鼠标 hover/click 可用，提示 "click to show more"；
+ * 其他模式（regular 保留终端原生 scrollback、不启用鼠标上报）提示默认展开快捷键。
+ *
+ * tui 模式由 mouse-interaction 在 renderer 回调中维护；未安装时按 fullscreen 处理，
+ * 保证纯渲染测试与既有行为不变。
+ */
+import { getKeybindings } from "@earendil-works/pi-tui";
+
+let toolTuiFullscreen: boolean | undefined;
+
+export function setToolTuiFullscreen(value: boolean): void {
+	toolTuiFullscreen = value;
+}
+
+export function isToolTuiFullscreen(): boolean {
+	return toolTuiFullscreen !== false;
+}
+
+function formatKeyPart(part: string): string {
+	// 与 pi 内置 keybinding-hints 一致：macOS 上 alt 显示为 option
+	return process.platform === "darwin" && part.toLowerCase() === "alt" ? "option" : part;
+}
+
+/** 默认展开快捷键（app.tools.expand）显示文本；未配置时回退 ctrl+o。 */
+export function expandShortcutText(): string {
+	const keys = getKeybindings().getKeys("app.tools.expand");
+	if (keys.length === 0) return "ctrl+o";
+	return keys
+		.join("/")
+		.split("/")
+		.map((part) => part.split("+").map(formatKeyPart).join("+"))
+		.join("/");
+}
+
+export function showMoreHintText(): string {
+	return isToolTuiFullscreen()
+		? "click to show more"
+		: `${expandShortcutText()} to show more`;
+}

package/extensions/{tool-diff → renderer/tool-diff}/diff-renderer.ts

@@ -30,10 +30,11 @@ import {
 	resolveDiffPresentationMode,
 	type DiffPresentationMode,
 } from "./diff-presentation.ts";
-import { sanitizeToolResultText } from "../tool-result-sanitize.ts";
+import { sanitizeToolResultText } from "../../utils/tool-result-sanitize.ts";
 import { pluralize, sanitizeAnsiForThemedOutput } from "./render-utils.ts";
 import { splitWriteContentLines } from "./write-display-utils.ts";
 import { MAX_HL_CHARS, shikiHighlightCache } from "./shiki-highlight.ts";
+import { showMoreHintText } from "../show-more-hint.ts";
 import {
 	DEFAULT_TOOL_DISPLAY_CONFIG,
 	type DiffIndicatorMode,
@@ -2319,7 +2320,7 @@ function applyLineLimit(
 		DIFF_WIDTH_OPS,
 	);
 
-	const clickLabel = "click to show more";
+	const clickLabel = showMoreHintText();
 	const clickIndex = hintText.lastIndexOf(clickLabel);
 	const styledHint =
 		hovered && !expanded && clickIndex >= 0

package/extensions/{tool-diff → renderer/tool-diff}/line-width-safety.ts

@@ -1,5 +1,6 @@
 import { normalizeDiffRenderWidth } from "./diff-presentation.ts";
 import { pluralize } from "./render-utils.ts";
+import { showMoreHintText } from "../show-more-hint.ts";
 
 export interface WidthMeasurementOps {
 	measure(text: string): number;
@@ -71,7 +72,7 @@ export function buildCollapsedDiffHintText(
 				: undefined;
 
 		const candidates = [
-			`… (${[remainingText, hiddenHunksText, "click to show more"].filter(Boolean).join(" • ")})`,
+			`… (${[remainingText, hiddenHunksText, showMoreHintText()].filter(Boolean).join(" • ")})`,
 			`… (${[remainingText, hiddenHunksText].filter(Boolean).join(" • ")})`,
 			`… (${[shortRemainingText, shortHiddenHunksText].filter(Boolean).join(" • ")})`,
 			options.hiddenHunks > 0

package/extensions/{tool-grouping.ts → renderer/tool-grouping.ts}

@@ -1,7 +1,8 @@
 import { AssistantMessageComponent, ToolExecutionComponent } from "@earendil-works/pi-coding-agent";
 import { Container, Spacer, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "./tool-loading-icon.ts";
-import { sanitizeToolResultText } from "./tool-result-sanitize.ts";
+import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "../utils/tool-loading-icon.ts";
+import { sanitizeToolResultText } from "../utils/tool-result-sanitize.ts";
+import { showMoreHintText } from "./show-more-hint.ts";
 
 const PATCH_KEY = Symbol.for("pi.ccstyle.tool-grouping-patch");
 const PARENT_KEY = Symbol.for("pi.ccstyle.tool-grouping-parent");
@@ -250,7 +251,11 @@ let nextGroupId = 1;
 export class ToolGroupComponent extends Container {
 	readonly toolCallId = `ccstyle-tool-group-${nextGroupId++}`;
 	readonly toolName = "Tool group";
-	private expanded = false;
+	private _expanded = false;
+	/** 分组是否展开（只读；测试与外部读状态用）。 */
+	get expanded(): boolean {
+		return this._expanded;
+	}
 	private hintHovered = false;
 	private readonly patch: Patch;
 
@@ -279,7 +284,7 @@ export class ToolGroupComponent extends Container {
 	}
 
 	setExpanded(expanded: boolean): void {
-		this.expanded = expanded;
+		this._expanded = expanded;
 		for (const tool of this.children) tool.setExpanded?.(expanded);
 	}
 
@@ -287,6 +292,30 @@ export class ToolGroupComponent extends Container {
 		this.hintHovered = hovered;
 	}
 
+	/**
+	 * 展开时按局部行定位内部组件（null = 行属于 group 自身：空行/头行/尾行）。
+	 * 行数计算与 render 保持一致：宽度 width-2 + 空行过滤。
+	 */
+	childAtRow(localRow: number, width: number): { component: any; row: number } | null {
+		if (!this._expanded || localRow < 2) return null;
+		let offset = 2;
+		for (const tool of this.children) {
+			let lines: string[] = [];
+			try {
+				const rendered = tool.render?.(Math.max(1, width - 2));
+				if (Array.isArray(rendered)) lines = visibleLines(rendered.map((line) => String(line)));
+			} catch {
+				lines = [];
+			}
+			const lineCount = Math.max(1, lines.length);
+			if (localRow < offset + lineCount) {
+				return { component: tool, row: localRow - offset };
+			}
+			offset += lineCount;
+		}
+		return null;
+	}
+
 	invalidate(): void {
 		for (const tool of this.children) tool.invalidate?.();
 	}
@@ -312,7 +341,7 @@ export class ToolGroupComponent extends Container {
 		const overallColor = overall === "pending" ? "accent" : overall;
 		const nameList = names.size > 1 ? ` ${fg("dim", `• ${toolNameList(this.children)}`)}` : "";
 		// 圆点保持 dim；hover 只高亮可点击文字。
-		const hint = `${fg("dim", "•")} ${fg(this.hintHovered ? "text" : "dim", "click to show more")}`;
+		const hint = `${fg("dim", "•")} ${fg(this.hintHovered ? "text" : "dim", showMoreHintText())}`;
 		const lines = [
 			"",
 			truncateToWidth(
@@ -329,7 +358,7 @@ export class ToolGroupComponent extends Container {
 			const color = toolStatus === "pending" ? "accent" : toolStatus;
 			const branch = index === total - 1 ? "└" : "├";
 			const continuation = index === total - 1 ? "  " : "│ ";
-			if (!this.expanded) {
+			if (!this._expanded) {
 				const summary = toolSummary(tool);
 				lines.push(
 					truncateToWidth(
@@ -357,7 +386,7 @@ export class ToolGroupComponent extends Container {
 				expandedLines.push(prefix + content);
 			}
 		}
-		if (this.expanded) {
+		if (this._expanded) {
 			const backgroundSlot =
 				overall === "error"
 					? "toolErrorBg"
@@ -438,9 +467,40 @@ function maybeGroup(patch: Patch, parent: any, component: any): void {
 	children.splice(index, 1);
 }
 
+/** /reload 不会重新 addChild；扫描当前 mounted roots，把已有工具重新送入同一分组规则。 */
+function regroup(patch: Patch, root: any): void {
+	if (!patch.active || !patch.enabled() || !root) return;
+	const seen = new Set<any>();
+	const visit = (value: any): void => {
+		if (!value || typeof value !== "object" || seen.has(value)) return;
+		seen.add(value);
+		if (Array.isArray(value)) {
+			for (const child of value) visit(child);
+			return;
+		}
+		const children = value.children;
+		if (Array.isArray(children)) {
+			for (const child of [...children]) {
+				if (child && typeof child === "object") child[PARENT_KEY] = value;
+				maybeGroup(patch, value, child);
+			}
+			for (const child of [...children]) {
+				if (!(child instanceof ToolGroupComponent) && !isGroupable(child)) visit(child);
+			}
+		}
+		try {
+			const mounted = value.getMountedRoots?.();
+			if (Array.isArray(mounted)) visit(mounted);
+		} catch {
+			// renderer 切换中的惰性 Proxy 可能暂时没有 mounted roots。
+		}
+	};
+	visit(root);
+}
+
 export type ToolGroupingHooks = {
 	setTheme(theme: any): void;
-	refresh(): void;
+	refresh(root?: any): void;
 	shutdown(): void;
 };
 
@@ -522,13 +582,14 @@ export function installToolGrouping(getEnabled: () => boolean): ToolGroupingHook
 		setTheme(theme: any) {
 			patch.theme = theme;
 		},
-		refresh() {
+		refresh(root?: any) {
 			const enabled = patch.enabled();
 			if (enabled !== patch.lastEnabled) {
 				patch.lastEnabled = enabled;
 				if (enabled) patch.generation++;
 			}
-			if (!enabled) ungroup(patch);
+			if (enabled) regroup(patch, root);
+			else ungroup(patch);
 		},
 		shutdown() {
 			if (!patch.active) return;