pi-cc-extensions 0.8.20 → 0.8.22

package/extensions/ask-user-question/view/dialog-builder.ts

@@ -1,5 +1,4 @@
 import { DynamicBorder, type Theme } from "@earendil-works/pi-coding-agent";
-import { renderDialogHeader, renderDialogTopBorder } from "../../closable-dialog.ts";
 import { type Component, Container, type Input, Spacer } from "@earendil-works/pi-tui";
 import type { QuestionnaireState } from "../state/state.js";
 import type { QuestionData } from "../tool/types.js";
@@ -134,25 +133,10 @@ export class DialogView implements StatefulView<DialogProps> {
 		// Render only the active tab's natural content; blank height equalization would
 		// unnecessarily consume transcript rows above this full-width editor component.
 		const natural = this.buildContainerFromStrategy(strategy, headingRowCache).render(width);
-		if (natural.length > 0) {
-			natural[0] = renderDialogTopBorder(width, (text) => this.config.theme.fg("accent", text));
-			natural.splice(
-				1,
-				0,
-				renderDialogHeader(
-					" Questions",
-					width,
-					(text) => this.config.theme.fg("accent", text),
-					(text) => this.config.theme.fg("toolTitle", text),
-					(text) => this.config.theme.fg("muted", text),
-					false,
-				),
-			);
-		}
 
 		// Fixed region sizes (deterministic from structure).
 		// TabBar.render() returns [tabLine, ""] — always 2 rows.
-		const topFixed = 2 + (this.config.isMulti && this.config.tabBar ? 2 : 0) + 1;
+		const topFixed = 1 + (this.config.isMulti && this.config.tabBar ? 2 : 0) + 1;
 		const bottomFixed = 1 + strategy.footerRowCount;
 		const middleRows = natural.length - topFixed - bottomFixed;
 

package/extensions/claude-code-style.ts

@@ -29,12 +29,6 @@ import {
 	wrapTextWithAnsi,
 } from "@earendil-works/pi-tui";
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import {
-	bottomDialogBounds,
-	isDialogCloseClick,
-	renderDialogHeader,
-	renderDialogTopBorder,
-} from "./closable-dialog.ts";
 import { homedir } from "node:os";
 import { join } from "node:path";
 
@@ -794,7 +788,6 @@ type ToolRenderHit = {
 
 const TOOL_MOUSE_WIDGET_KEY = "ccstyle-tool-mouse";
 const TOOL_MOUSE_ENABLE = "\x1b[?1000h\x1b[?1003h\x1b[?1006h";
-const TOOL_MOUSE_HOVER_ENABLE = "\x1b[?1003h\x1b[?1006h";
 const TOOL_MOUSE_DISABLE = "\x1b[?1006l\x1b[?1003l\x1b[?1000l";
 const ZENTUI_PAGE_UP_INPUT = /^\x1b\[5;9(?::[12])?~$|^\x1b\[57421;9(?::[12])?u$|^\x1b\[1;6A$/;
 const ZENTUI_PAGE_DOWN_INPUT = /^\x1b\[6;9(?::[12])?~$|^\x1b\[57422;9(?::[12])?u$|^\x1b\[1;6B$/;
@@ -817,7 +810,6 @@ let pendingScrollMessages = 0;
 let assistantMessageActive = false;
 let scrollButtonSyncScheduled = false;
 let sessionRenderTimer: ReturnType<typeof setTimeout> | null = null;
-let hoveredToolSummaryRow: number | null = null;
 let hoveredToolCallId: string | null = null;
 
 function parseSgrMousePackets(data: string): SgrMousePacket[] | null {
@@ -1448,19 +1440,10 @@ function tryOpenToolIoShowMore(tui: any, packet: SgrMousePacket, hit: ToolRender
 
 function updateToolSummaryHover(tui: any, packet: SgrMousePacket): void {
 	if ((packet.code & 32) === 0 || packet.final !== "M") return;
-	const previousLines = Array.isArray(tui?.previousLines) ? tui.previousLines : [];
-	const lineIndex = useFixedEditorFeatures(tui)
-		? packet.row - 1
-		: (Number.isFinite(tui?.previousViewportTop) ? tui.previousViewportTop : 0) + packet.row - 1;
-	const line = stripTerminalSequences(String(previousLines[lineIndex] ?? ""));
-	const hit = COLLAPSED_TOOL_SUMMARY.test(line) ? findToolAtScreenRow(tui, packet.row) : null;
-	const nextRow = hit && !hit.component.expanded ? packet.row : null;
-	const nextToolCallId = nextRow ? (hit?.component?.toolCallId ?? null) : null;
-	if (nextRow === hoveredToolSummaryRow && nextToolCallId === hoveredToolCallId) return;
-	hoveredToolSummaryRow = nextRow;
+	const hit = findToolAtScreenRow(tui, packet.row);
+	const nextToolCallId = hit && !hit.component.expanded ? hit.component.toolCallId : null;
+	if (nextToolCallId === hoveredToolCallId) return;
 	hoveredToolCallId = nextToolCallId;
-	// Collapsed result components read hoveredToolCallId during render. Keeping
-	// hover in the render path avoids an async TUI repaint overwriting raw ANSI.
 	tui.requestRender?.();
 }
 
@@ -1612,7 +1595,6 @@ function teardownToolMouseInteraction(): void {
 	}
 	toolMouseInputUnsubscribe?.();
 	toolMouseInputUnsubscribe = null;
-	hoveredToolSummaryRow = null;
 	hoveredToolCallId = null;
 	try {
 		toolMouseTui?.terminal?.write?.(TOOL_MOUSE_DISABLE);
@@ -1653,7 +1635,7 @@ export function installToolMouseInteraction(
 		toolMouseTui = tui;
 		if (fixedEditorFeatures) patchToolMouseInputCapture(tui);
 		// Motion reporting is required for hover in both native and fixed-editor layouts.
-		tui?.terminal?.write?.(fixedEditorFeatures ? TOOL_MOUSE_ENABLE : TOOL_MOUSE_HOVER_ENABLE);
+		tui?.terminal?.write?.(fixedEditorFeatures ? TOOL_MOUSE_ENABLE : "\x1b[?1003h\x1b[?1006h");
 		const widget = {
 			render: (width: number) => renderScrollButton(width, theme),
 			invalidate() {},
@@ -2004,8 +1986,6 @@ async function showCcstylePanel(ctx: any, compactStyle: CompactStyleHooks): Prom
 		];
 
 		let activeSection = 0;
-		let lastWidth = 0;
-		let lastHeight = 0;
 		const settingsTheme = getSettingsListTheme();
 		const lists = sections.map(
 			(section) =>
@@ -2042,15 +2022,8 @@ async function showCcstylePanel(ctx: any, compactStyle: CompactStyleHooks): Prom
 				while (listBody.length > 0 && listBody[listBody.length - 1] === "") listBody.pop();
 
 				// Frame: top rule · tabs · mid rule · settings · mid rule · footer · bottom rule
-				const lines = [
-					renderDialogTopBorder(safeWidth, (text) => theme.fg("border", text)),
-					renderDialogHeader(
-						" CC Style",
-						safeWidth,
-						(text) => theme.fg("border", text),
-						(text) => theme.fg("toolTitle", text),
-						(text) => theme.fg("muted", text),
-					),
+				return [
+					rule,
 					renderSectionTabBar(theme, sections, activeSection, safeWidth),
 					rule,
 					...listBody,
@@ -2064,22 +2037,11 @@ async function showCcstylePanel(ctx: any, compactStyle: CompactStyleHooks): Prom
 					),
 					rule,
 				];
-				lastWidth = safeWidth;
-				lastHeight = lines.length;
-				return lines;
 			},
 			invalidate() {
 				for (const list of lists) list.invalidate();
 			},
 			handleInput(data: string) {
-				if (
-					!excludeSubmenuOpen &&
-					tui.terminal &&
-					isDialogCloseClick(data, bottomDialogBounds(tui.terminal, lastWidth, lastHeight))
-				) {
-					done();
-					return;
-				}
 				if (!excludeSubmenuOpen && isForwardTabKey(data)) {
 					switchSection(1);
 					tui.requestRender();
@@ -2130,15 +2092,22 @@ function toolCallArgument(args: any): { key: string; value: string } | undefined
 		: undefined;
 }
 
-function tailToWidth(text: string, width: number): string {
+export function middleTruncateToWidth(text: string, width: number): string {
 	if (visibleWidth(text) <= width) return text;
 	if (width <= 1) return "…";
-	let tail = "";
-	for (const char of Array.from(text).reverse()) {
-		if (visibleWidth(`…${char}${tail}`) > width) break;
-		tail = char + tail;
+	const chars = Array.from(text);
+	const leftWidth = Math.ceil((width - 1) / 2);
+	let left = "";
+	let right = "";
+	for (const char of chars) {
+		if (visibleWidth(left + char) > leftWidth) break;
+		left += char;
+	}
+	for (const char of chars.reverse()) {
+		if (visibleWidth(left + "…" + char + right) > width) break;
+		right = char + right;
 	}
-	return `…${tail}`;
+	return `${left}…${right}`;
 }
 
 export function shouldRenderRichDiff(
@@ -2182,11 +2151,7 @@ function createCcstyleTool(
 			return {
 				render(width: number) {
 					const argumentWidth = Math.max(1, width - visibleWidth(`${rawIcon} ${label}()`));
-					const shown = argument
-						? argument.key === "path"
-							? tailToWidth(argument.value, argumentWidth)
-							: truncateToWidth(argument.value, argumentWidth, "…")
-						: undefined;
+					const shown = argument ? middleTruncateToWidth(argument.value, argumentWidth) : undefined;
 					const call = shown === undefined ? label : `${label}(${shown})`;
 					// Leave one cell unused so the host shell never performs a second,
 					// unthemed truncation after this renderer has applied toolTitle.
@@ -2244,8 +2209,7 @@ function createCcstyleTool(
 				);
 			}
 			if (context?.state) context.state.ccstyleIoView = undefined;
-			const toolCallId =
-				context?.toolCallId ?? context?.id ?? context?.state?.toolCallId ?? context?.state?.id;
+			const toolCallId = context?.toolCallId;
 			const summary = theme.fg(
 				isError ? "error" : "muted",
 				renderCollapsedToolResult(rendered, hint),
@@ -2254,8 +2218,10 @@ function createCcstyleTool(
 				render(width: number) {
 					const line = truncateToWidth(summary, width, "…");
 					if (!toolCallId || hoveredToolCallId !== toolCallId) return [line];
-					const padding = " ".repeat(Math.max(0, width - visibleWidth(line)));
-					return [theme.bg("selectedBg", `${line}${padding}`)];
+					const highlighted = line.replace(/\x1b\[0m/g, "\x1b[0;7m");
+					return [
+						`\x1b[7m${highlighted}${" ".repeat(Math.max(0, width - visibleWidth(line)))}\x1b[0m`,
+					];
 				},
 				invalidate() {},
 			};

package/extensions/context.ts

@@ -10,12 +10,6 @@ import {
 	visibleWidth,
 	wrapTextWithAnsi,
 } from "@earendil-works/pi-tui";
-import {
-	centeredDialogBounds,
-	isDialogCloseClick,
-	renderDialogHeader,
-	renderDialogTopBorder,
-} from "./closable-dialog.ts";
 
 export type ContextPart = {
 	label: string;
@@ -71,8 +65,6 @@ export async function showTextPreview(
 			let scrollOffset = 0;
 			let pageSize = 1;
 			let totalLines = 1;
-			let lastWidth = 0;
-			let lastHeight = 0;
 			const wrappedContent = createWrappedTextCache(content);
 
 			const scrollTo = (nextOffset: number): void => {
@@ -85,10 +77,6 @@ export async function showTextPreview(
 					wrappedContent.invalidate();
 				},
 				handleInput(data: string) {
-					if (isDialogCloseClick(data, centeredDialogBounds(tui.terminal, lastWidth, lastHeight))) {
-						done(undefined);
-						return;
-					}
 					if (matchesKey(data, Key.escape) || matchesKey(data, Key.ctrl("c"))) {
 						done(undefined);
 						return;
@@ -150,24 +138,15 @@ export async function showTextPreview(
 					const end = Math.min(totalLines, scrollOffset + pageSize);
 					const status = `${start}-${end} / ${totalLines} lines · ↑↓ PgUp/PgDn Home/End · Esc close`;
 
-					const lines = [
-						renderDialogTopBorder(width, border),
-						renderDialogHeader(
-							` ${title}`,
-							width,
-							border,
-							(text) => theme.bold(theme.fg("accent", text)),
-							(text) => theme.fg("muted", text),
-						),
+					return [
+						border(`╭${"─".repeat(inner)}╮`),
+						`${border("│")}${padLine(` ${theme.bold(theme.fg("accent", title))}`)}${border("│")}`,
 						`${border("├")}${border("─".repeat(inner))}${border("┤")}`,
 						...bodyRows,
 						`${border("├")}${border("─".repeat(inner))}${border("┤")}`,
 						`${border("│")}${padLine(theme.fg("dim", ` ${status}`))}${border("│")}`,
 						border(`╰${"─".repeat(inner)}╯`),
 					];
-					lastWidth = width;
-					lastHeight = lines.length;
-					return lines;
 				},
 			};
 		},

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-cc-extensions",
-	"version": "0.8.20",
+	"version": "0.8.22",
 	"description": "A Pi productivity suite with Claude Code-style UI, structured questionnaires, context inspection, and agent/session references",
 	"type": "module",
 	"keywords": [

package/extensions/closable-dialog.ts

@@ -1,60 +0,0 @@
-import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-
-export type DialogBounds = { left: number; top: number; width: number };
-
-export function renderDialogTopBorder(width: number, color: (text: string) => string): string {
-	const safeWidth = Math.max(4, Math.floor(width));
-	return color(`╭${"─".repeat(safeWidth - 2)}╮`);
-}
-
-/** Render title and a larger [ × ] target on the row below the top border. */
-export function renderDialogHeader(
-	title: string,
-	width: number,
-	color: (text: string) => string,
-	titleColor: (text: string) => string,
-	closeColor: (text: string) => string,
-	showClose = true,
-): string {
-	const safeWidth = Math.max(8, Math.floor(width));
-	const innerWidth = safeWidth - 2;
-	const button = showClose ? "[ × ]" : "";
-	const titleWidth = Math.max(0, innerWidth - visibleWidth(button) - (showClose ? 2 : 0));
-	const shownTitle = truncateToWidth(title, titleWidth, "…");
-	const gap = " ".repeat(
-		Math.max(showClose ? 1 : 0, innerWidth - visibleWidth(shownTitle) - visibleWidth(button)),
-	);
-	return `${color("│")}${titleColor(shownTitle)}${gap}${showClose ? closeColor(button) : ""}${color("│")}`;
-}
-
-/** Match a left-button press anywhere on the [ × ] target. */
-export function isDialogCloseClick(data: string, bounds: DialogBounds): boolean {
-	const match = data.match(/^\x1b\[<(\d+);(\d+);(\d+)([Mm])$/);
-	if (!match || match[4] !== "M") return false;
-	const code = Number(match[1]);
-	if ((code & 3) !== 0 || (code & 32) !== 0) return false;
-	const col = Number(match[2]);
-	const firstButtonCol = bounds.left + bounds.width - 7;
-	const lastButtonCol = bounds.left + bounds.width - 3;
-	return col >= firstButtonCol && col <= lastButtonCol && Number(match[3]) === bounds.top + 1;
-}
-
-export function centeredDialogBounds(
-	terminal: { columns: number; rows: number },
-	width: number,
-	height: number,
-): DialogBounds {
-	return {
-		left: Math.floor((terminal.columns - width) / 2) + 1,
-		top: Math.floor((terminal.rows - height) / 2) + 1,
-		width,
-	};
-}
-
-export function bottomDialogBounds(
-	terminal: { rows: number },
-	width: number,
-	height: number,
-): DialogBounds {
-	return { left: 1, top: Math.max(1, terminal.rows - height + 1), width };
-}