pi-cc-extensions 0.8.50 → 0.8.52

package/extensions/renderer/index.ts

@@ -3,6 +3,11 @@ import { ToolExecutionComponent } from "@earendil-works/pi-coding-agent";
 import { Text, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import type { CompactThinkingController } from "../feature/compact-thinking.ts";
 import { installToolGrouping, type ToolGroupingHooks } from "./tool-grouping.ts";
+import {
+	installCompactMode,
+	refreshCompactModeComponents,
+	type CompactModeHooks,
+} from "./compact-mode.ts";
 import { isLazyProxyTui } from "../utils/fullscreen-detect.ts";
 import { showCcstylePanel } from "../config/panel.ts";
 import {
@@ -33,6 +38,7 @@ import {
 	countLines,
 	hasExpandableDetail,
 	headTruncateToWidth,
+	insetComponent,
 	isToolExpanded,
 	middleTruncateToWidth,
 	oneLine,
@@ -49,6 +55,7 @@ import {
 	toolViewportWidth,
 } from "./tool-result.ts";
 import { showMoreHintText } from "./show-more-hint.ts";
+import type { CompactThinkingQuery } from "./compact-mode.ts";
 import {
 	installWriteOverride,
 	renderRichToolResult,
@@ -74,10 +81,19 @@ const ANSI_FG_RESET = "\x1b[39m";
 function refreshCurrentTranscript(ctx?: any, toolGrouping?: ToolGroupingHooks): void {
 	toolGrouping?.refresh(toolMouseTui);
 	refreshMessageDisplays(toolMouseTui);
+	refreshCompactModeComponents(toolMouseTui);
+	compactModeHooks?.refresh();
 	toolMouseTui?.requestRender?.(true);
 	ctx?.ui?.requestRender?.(true);
 }
 
+let compactModeHooks: CompactModeHooks | undefined;
+
+function syncCompactMode(ctx: any): void {
+	refreshCompactModeComponents(toolMouseTui);
+	compactModeHooks?.sync(ctx);
+}
+
 function applyStyleMode(mode: CompactStyleMode, ctx: any, toolGrouping?: ToolGroupingHooks): void {
 	config.mode = mode;
 	saveConfig();
@@ -92,6 +108,9 @@ function applyStyleMode(mode: CompactStyleMode, ctx: any, toolGrouping?: ToolGro
 		if (toolMouseTui && !isLazyProxyTui(toolMouseTui)) {
 			toolMouseTui.terminal?.write?.(TOOL_MOUSE_DISABLE);
 		}
+	} else if (mode === "compact") {
+		// 切入 compact：先收集当前 transcript，再同步全局展开状态和补丁所有权。
+		syncCompactMode(ctx);
 	}
 	refreshCurrentTranscript(ctx, toolGrouping);
 	ctx.ui.notify(`Claude Code style: ${mode}`, "info");
@@ -113,17 +132,6 @@ function singleLine(text: string) {
 	};
 }
 
-function insetComponent(component: any): any {
-	return {
-		render: (width: number) =>
-			component.render(Math.max(1, width - 1)).map((line: string) => {
-				const nestedMarker = line.replace(/^((?:\x1b\[[0-?]*[ -/]*[@-~])*)↳/, "$1  ↳");
-				return ` ${nestedMarker}`;
-			}),
-		invalidate: () => component.invalidate?.(),
-	};
-}
-
 function humanizeToolLabel(label: string): string {
 	return label
 		.replace(/([a-z0-9])([A-Z])/g, "$1 $2")
@@ -763,7 +771,7 @@ function installToolExpandedBackground(): () => void {
 	const host = globalThis as any;
 	const previous = host[TOOL_EXPANDED_BACKGROUND_PATCH] as ToolExpandedBackgroundPatch | undefined;
 	if (previous) previous.dispose();
-	const prototype = ToolExecutionComponent.prototype;
+	const prototype = ToolExecutionComponent.prototype as unknown as { updateDisplay: () => void };
 	const original = prototype.updateDisplay;
 	const patch: ToolExpandedBackgroundPatch = {
 		active: true,
@@ -817,6 +825,7 @@ export default function (
 		| {
 				globalToolRendering: GlobalToolRenderPatch;
 				toolGrouping: ToolGroupingHooks;
+				compactMode: CompactModeHooks;
 				disposeMessageDisplay: () => void;
 				disposeToolExpandedBackground: () => void;
 		  }
@@ -828,12 +837,18 @@ export default function (
 		if (installation) return installation;
 		const globalToolRendering = installGlobalToolRendering(writeExecutionMetadata);
 		const toolGrouping = installToolGrouping(() => config.mode === "on");
+		const compactMode = installCompactMode({
+			query: compactThinking as CompactThinkingQuery | undefined,
+			writeMetadata: writeExecutionMetadata,
+		});
+		compactModeHooks = compactMode;
 		const disposeMessageDisplay = installMessageDisplayRendering();
 		const disposeToolExpandedBackground = installToolExpandedBackground();
 		deactivateLegacyCompactionRendering();
 		installation = {
 			globalToolRendering,
 			toolGrouping,
+			compactMode,
 			disposeMessageDisplay,
 			disposeToolExpandedBackground,
 		};
@@ -845,6 +860,11 @@ export default function (
 		getArgumentCompletions: (prefix) => {
 			const topLevel = [
 				{ value: "on", label: "on", description: "Enable Claude Code style" },
+				{
+					value: "compact",
+					label: "compact",
+					description: "One summary line per assistant message",
+				},
 				{ value: "off", label: "off", description: "Use Pi's native renderer" },
 				{ value: "status", label: "status", description: "Show full configuration" },
 				{ value: "panel", label: "panel", description: "Open interactive settings panel" },
@@ -853,7 +873,7 @@ export default function (
 		},
 		handler: async (args, ctx) => {
 			const arg = args.trim().toLowerCase();
-			if (!arg || arg === "panel" || arg === "on" || arg === "off") {
+			if (!arg || arg === "panel" || arg === "on" || arg === "compact" || arg === "off") {
 				if (ctx?.mode !== "tui" || !ctx?.hasUI) {
 					ctx.ui?.notify?.("/ccstyle requires TUI mode", "warning");
 					return;
@@ -868,7 +888,7 @@ export default function (
 						compactThinking,
 					);
 				} else {
-					applyStyleMode(arg, ctx, hooks.toolGrouping);
+					applyStyleMode(arg as CompactStyleMode, ctx, hooks.toolGrouping);
 				}
 				return;
 			}
@@ -876,10 +896,28 @@ export default function (
 				ctx.ui.notify(`Claude Code style: ${formatConfigStatus(config)}`, "info");
 				return;
 			}
-			ctx.ui.notify("Usage: /ccstyle [on|off|status|panel]", "warning");
+			ctx.ui.notify("Usage: /ccstyle [on|compact|off|status|panel]", "warning");
 		},
 	});
 
+	pi.on("message_update", async (event) => {
+		// compact-thinking 在 session_start 时于 compact 补丁之上再装一层；
+		// 扩展事件先于 interactive-mode 的 updateContent 派发，此处先重新认领。
+		if (config.mode === "compact" && event.message?.role === "assistant") {
+			compactModeHooks?.assertOwnership();
+		}
+	});
+
+	pi.on("tool_execution_end", async (event) => {
+		if (config.mode !== "compact") return;
+		// Agent 工具在 tool_execution_end 收尾思考：延迟到所有监听器之后刷新，
+		// 让 compact-thinking 先写入最终时长，再重绘摘要行。
+		const toolCallId: string | undefined = event?.toolCallId;
+		setTimeout(() => {
+			compactModeHooks?.refreshToolCallMessage(toolCallId);
+		}, 0);
+	});
+
 	pi.on("session_start", async (event, ctx) => {
 		// 延迟到 session_start 注册 write override：加载阶段 getAllTools 不可用且其他扩展
 		// 尚未注册工具，无法检测外部 write 所有者（如 pi-spark），直接注册会与对方撞名。
@@ -893,6 +931,11 @@ export default function (
 		hooks.toolGrouping.setTheme(ctx.ui.theme);
 		setMessageDisplayTheme(ctx.ui.theme);
 		ctx.ui.setStatus("ccstyle", undefined);
+		// 先收集 resume transcript，再同步 compact 补丁与全局展开状态。
+		syncCompactMode(ctx);
+		// compact-thinking 的 session_start 处理在本 handler 之后执行（在其之上再装
+		// 一层 updateContent）；延迟再同步一次，保证 compact 补丁最终位于外层。
+		setTimeout(() => syncCompactMode(ctx), 0);
 		scheduleSessionRender(() => hooks.toolGrouping.refresh(toolMouseTui));
 	});
 
@@ -904,7 +947,18 @@ export default function (
 		if (!hooks) return;
 		hooks.toolGrouping.setTheme(ctx.ui.theme);
 		setMessageDisplayTheme(ctx.ui.theme);
-		scheduleSessionRender(() => hooks.toolGrouping.refresh(toolMouseTui));
+		syncCompactMode(ctx);
+		scheduleSessionRender(() => {
+			syncCompactMode(ctx);
+			hooks.toolGrouping.refresh(toolMouseTui);
+		});
+	});
+
+	pi.on("session_tree", async (event, ctx) => {
+		// 会话树重建后在当前帧和下一帧各同步一次，替换旧组件引用。
+		if (ctx?.mode !== "tui" || !ctx?.hasUI) return;
+		syncCompactMode(ctx);
+		scheduleSessionRender(() => syncCompactMode(ctx));
 	});
 
 	pi.on("tool_execution_start", async (event, ctx) => {
@@ -925,8 +979,10 @@ export default function (
 			return;
 		deactivateGlobalToolRendering(current.globalToolRendering);
 		current.toolGrouping.shutdown();
-		current.disposeMessageDisplay();
 		current.disposeToolExpandedBackground();
+		current.compactMode.shutdown();
+		compactModeHooks = undefined;
+		current.disposeMessageDisplay();
 		deactivateLegacyCompactionRendering();
 		clearAllAnimations();
 		installation = undefined;

package/extensions/renderer/message-display.ts

@@ -45,7 +45,8 @@ const SKILL_KIND: DisplayKind = {
 };
 
 const COMPACTION_KIND: DisplayKind = {
-	title: (component) => `Compacted from ${Number(component.message?.tokensBefore ?? 0).toLocaleString()} tokens`,
+	title: (component) =>
+		`Compacted from ${Number(component.message?.tokensBefore ?? 0).toLocaleString()} tokens`,
 	body: (component) => String(component.message?.summary ?? ""),
 };
 
@@ -58,6 +59,10 @@ function renderCcstyle(component: any, kind: DisplayKind): void {
 	const theme = displayTheme;
 	if (!theme) return; // 主题未就绪时保留原生渲染
 	if (component.bgFn) component.setBgFn?.(undefined); // 与工具调用一致，去掉灰底
+	if (component.paddingY !== 0) {
+		component._ccstyleOriginalPaddingY = component.paddingY;
+		component.paddingY = 0; // 工具组件 paddingY=0；原生 Box 默认 1，会上下各留一个空行
+	}
 	component.clear();
 	const icon = `${BRIGHT_GREEN}✓${ANSI_FG_RESET}`; // 已完成消息，等同工具成功态
 	const title = theme.fg("toolTitle", kind.title(component));
@@ -75,7 +80,11 @@ function renderCcstyle(component: any, kind: DisplayKind): void {
 	);
 }
 
-type PatchEntry = { prototype: any; installed: (...args: any[]) => void; original: (...args: any[]) => void };
+type PatchEntry = {
+	prototype: any;
+	installed: (...args: any[]) => void;
+	original: (...args: any[]) => void;
+};
 
 /** patch 三个消息组件的 updateDisplay，返回统一 dispose（/reload 链安全）。 */
 export function installMessageDisplayRendering(): () => void {
@@ -91,7 +100,7 @@ export function installMessageDisplayRendering(): () => void {
 		const prototype = ComponentClass.prototype;
 		const original = prototype.updateDisplay;
 		const installed = function (this: any) {
-			if (patch.active && config.mode === "on") {
+			if (patch.active && config.mode !== "off") {
 				try {
 					renderCcstyle(this, kind);
 					return;
@@ -99,6 +108,11 @@ export function installMessageDisplayRendering(): () => void {
 					// 渲染失败回退原生
 				}
 			}
+			// 回退原生前恢复 paddingY，避免原生渲染丢失上下内边距
+			if (this._ccstyleOriginalPaddingY !== undefined) {
+				this.paddingY = this._ccstyleOriginalPaddingY;
+				delete this._ccstyleOriginalPaddingY;
+			}
 			original.call(this);
 		};
 		prototype.updateDisplay = installed;

package/extensions/renderer/mouse-hover.ts

@@ -0,0 +1,130 @@
+import { setHoveredCompactAssistant } from "./compact-mode.ts";
+import {
+	isExpandedToolIoView,
+	invalidateIoView,
+	type ExpandedToolIoView,
+	type ToolIoSection,
+} from "./tool-result.ts";
+import type { ToolGroupComponent } from "./tool-grouping.ts";
+import { componentAtLocalRow, type ComponentRowHit } from "./mouse-layout.ts";
+import { setScrollButtonHovered } from "./mouse-scroll.ts";
+
+const TOOL_HOVER_STATE_KEY = Symbol.for("pi.ccstyle.tool-hover-state");
+
+type SharedToolHoverState = { toolCallId: string | null };
+
+/**
+ * hover 状态宿主（Symbol.for + globalThis）：模块 reload 后新旧实例共享，
+ * 测试依赖该跨实例语义。
+ */
+export function sharedToolHoverState(): SharedToolHoverState {
+	const host = globalThis as any;
+	return (host[TOOL_HOVER_STATE_KEY] ??= { toolCallId: null });
+}
+
+export let hoveredToolCallId: string | null = sharedToolHoverState().toolCallId;
+
+export function setHoveredToolCallId(toolCallId: string | null): void {
+	hoveredToolCallId = toolCallId;
+	sharedToolHoverState().toolCallId = toolCallId;
+}
+
+export function isToolCallHovered(toolCallId: string | null | undefined): boolean {
+	return Boolean(toolCallId && sharedToolHoverState().toolCallId === toolCallId);
+}
+
+let hoveredToolGroup: ToolGroupComponent | null = null;
+
+export function setHoveredToolGroup(group: ToolGroupComponent | null): boolean {
+	if (group === hoveredToolGroup) return false;
+	hoveredToolGroup?.setHintHovered(false);
+	hoveredToolGroup = group;
+	group?.setHintHovered(true);
+	return true;
+}
+
+let hoveredToolIoView: ExpandedToolIoView | null = null;
+let hoveredToolIoSection: ToolIoSection | null = null;
+
+export function setHoveredToolIo(
+	view: ExpandedToolIoView | null,
+	section: ToolIoSection | null,
+): boolean {
+	// resultRendererComponent 可能是 Text/第三方 renderer；reload 后也可能残留旧实例。
+	const nextView = isExpandedToolIoView(view) ? view : null;
+	const nextSection = nextView ? section : null;
+	if (nextView === hoveredToolIoView && nextSection === hoveredToolIoSection) return false;
+	if (isExpandedToolIoView(hoveredToolIoView)) {
+		hoveredToolIoView.setHoveredSection(null);
+		invalidateIoView(hoveredToolIoView);
+	}
+	hoveredToolIoView = nextView;
+	hoveredToolIoSection = nextSection;
+	if (nextView) {
+		nextView.setHoveredSection(nextSection);
+		invalidateIoView(nextView);
+	}
+	return true;
+}
+
+/** hover 与点击共用组件定位；同一布局下按容器/宽度/行缓存，避免 motion 重复渲染。 */
+let fullscreenHoverCacheLayout: unknown = null;
+let fullscreenHoverComponentCache = new WeakMap<object, Map<string, ComponentRowHit | null>>();
+
+export function cachedFullscreenComponentAtRow(
+	layout: any,
+	container: any,
+	row: number,
+	width: number,
+): ComponentRowHit | null {
+	if (!container || typeof container !== "object") return null;
+	if (fullscreenHoverCacheLayout !== layout) {
+		fullscreenHoverCacheLayout = layout;
+		fullscreenHoverComponentCache = new WeakMap();
+	}
+	let rows = fullscreenHoverComponentCache.get(container);
+	if (!rows) {
+		rows = new Map();
+		fullscreenHoverComponentCache.set(container, rows);
+	}
+	const key = `${width}:${row}`;
+	if (rows.has(key)) return rows.get(key) ?? null;
+	const hit = componentAtLocalRow(container, row, width);
+	rows.set(key, hit);
+	return hit;
+}
+
+/** fullscreen 鼠标悬停目标。 */
+export type FullscreenHoverTarget =
+	| { kind: "button" }
+	| { kind: "group"; component: ToolGroupComponent }
+	| { kind: "assistant"; component: any }
+	| {
+			kind: "tool";
+			component: any;
+			view: ExpandedToolIoView | null;
+			section: ToolIoSection | null;
+	  };
+
+/** 悬停状态变化才触发渲染（motion 事件密集，状态不变跳过）。 */
+export function applyFullscreenHover(tui: any, target: FullscreenHoverTarget | null): void {
+	let changed = false;
+	const nextCallId =
+		target?.kind === "tool" && !target.component.expanded
+			? (target.component.toolCallId ?? null)
+			: null;
+	if (nextCallId !== sharedToolHoverState().toolCallId) {
+		setHoveredToolCallId(nextCallId);
+		changed = true;
+	}
+	const nextGroup = target?.kind === "group" ? target.component : null;
+	if (setHoveredToolGroup(nextGroup)) changed = true;
+	const nextAssistant = target?.kind === "assistant" ? target.component : null;
+	if (setHoveredCompactAssistant(nextAssistant)) changed = true;
+	const nextView = target?.kind === "tool" ? target.view : null;
+	const nextSection = target?.kind === "tool" ? target.section : null;
+	if (setHoveredToolIo(nextView, nextSection)) changed = true;
+	const nextButton = target?.kind === "button";
+	if (setScrollButtonHovered(nextButton)) changed = true;
+	if (changed) tui.requestRender?.();
+}