pi-open-tui 0.4.2 → 0.4.3

package/extensions/open-tui/config.ts

@@ -22,6 +22,7 @@ export interface FooterSegments {
 	tokens: boolean;
 	cost: boolean;
 	liveTps: boolean;
+	extensionSegments: boolean;
 	extensionStatuses: boolean;
 	capitalizeProviderName: boolean;
 	nerdIconSpacing: boolean;
@@ -41,6 +42,14 @@ export interface ThinkingPeekConfig {
 	lines: ThinkingPeekLines;
 }
 
+export interface ToolViewConfig {
+	mode: ToolViewMode;
+	/** In compact mode, also collapse tools that are not Pi's own built-ins. */
+	extensionTools: boolean;
+	/** Tool names that always keep their native rendering. */
+	exclude: string[];
+}
+
 export interface OpenTuiConfig {
 	enabled: boolean;
 	/** Override Pi's header with the open-tui header. When false, the header slot is left to Pi or another extension. */
@@ -56,9 +65,7 @@ export interface OpenTuiConfig {
 	footerSegments: FooterSegments;
 	telemetry: TelemetryConfig;
 	thinkingPeek: ThinkingPeekConfig;
-	toolView: {
-		mode: ToolViewMode;
-	};
+	toolView: ToolViewConfig;
 }
 
 export const DEFAULT_CONFIG: OpenTuiConfig = {
@@ -83,6 +90,7 @@ export const DEFAULT_CONFIG: OpenTuiConfig = {
 		tokens: true,
 		cost: true,
 		liveTps: true,
+		extensionSegments: true,
 		extensionStatuses: true,
 		capitalizeProviderName: true,
 		nerdIconSpacing: false,
@@ -101,6 +109,8 @@ export const DEFAULT_CONFIG: OpenTuiConfig = {
 	},
 	toolView: {
 		mode: "native",
+		extensionTools: false,
+		exclude: [],
 	},
 };
 
@@ -113,6 +123,17 @@ function normalizeThinkingPeekLines(value: unknown): ThinkingPeekLines {
 	return value === 0 || value === 1 || value === 2 ? value : DEFAULT_CONFIG.thinkingPeek.lines;
 }
 
+function normalizeToolView(value: unknown): ToolViewConfig {
+	const source = typeof value === "object" && value !== null && !Array.isArray(value)
+		? (value as Partial<Record<keyof ToolViewConfig, unknown>>)
+		: {};
+	return {
+		mode: source.mode === "compact" ? "compact" : DEFAULT_CONFIG.toolView.mode,
+		extensionTools: source.extensionTools === true,
+		exclude: Array.isArray(source.exclude) ? source.exclude.filter((name): name is string => typeof name === "string") : [],
+	};
+}
+
 const ICON_MODES: IconMode[] = ["auto", "nerd", "unicode", "ascii"];
 
 // Non-boolean flags (e.g. "false" strings) fall back to defaults instead of reading as truthy.
@@ -198,10 +219,7 @@ export function loadConfig(notify?: (msg: string, level: "warning" | "info") =>
 		} else {
 			config.thinkingPeek.lines = normalizeThinkingPeekLines(config.thinkingPeek.lines);
 		}
-		if (typeof config.toolView !== "object" || config.toolView === null
-			|| (config.toolView.mode !== "native" && config.toolView.mode !== "compact")) {
-			config.toolView = structuredClone(DEFAULT_CONFIG.toolView);
-		}
+		config.toolView = normalizeToolView(config.toolView);
 		return config;
 	} catch (err) {
 		notify?.(`open-tui config parse error: ${err instanceof Error ? err.message : String(err)}`, "warning");

package/extensions/open-tui/copy-buttons.ts

@@ -1,3 +1,4 @@
+import { randomUUID } from "node:crypto";
 import { copyToClipboard, UserMessageComponent, type MarkdownTransformContext, type Theme } from "@earendil-works/pi-coding-agent";
 import {
 	compositeTuiLine,
@@ -13,15 +14,14 @@ import {
 	type TuiMouseEvent,
 	type TuiMouseEventResult,
 } from "@earendil-works/pi-tui";
+import { stripAnsi } from "./utils.ts";
 
 const LABEL = "[Copy]";
 // Below this width a frame plus label would crowd the code, so Pi's plain fences are kept.
 const MIN_FRAME_WIDTH = 8;
 // Zero-width APC sequence: survives wrapping and padding, and marks the label column before we strip it.
-const MARKER = "\x1b_open-tui:cb\x07";
+const MARKER_PREFIX = "\x1b_open-tui:cb:";
 const PATCH_KEY = Symbol.for("pi-open-tui.copy-buttons");
-// pi-pretty-tui draws its own code-block [Copy]; patching the same methods twice would fight.
-const PRETTY_TUI_KEY = Symbol.for("pretty-tui.code-blocks");
 // Pi only synthesizes `click` for a zero-movement release, so allow a little jitter.
 const RELEASE_TOLERANCE = 2;
 
@@ -58,6 +58,7 @@ interface AltScreenInternals {
 interface MarkdownInternals {
 	text?: unknown;
 	theme: MarkdownTheme;
+	invalidate(): void;
 	render(width: number): string[];
 	renderToken(token: Token, width: number, nextTokenType?: string, styleContext?: unknown): string[];
 	handleMouse?(event: TuiMouseEvent): TuiMouseEventResult | undefined;
@@ -69,26 +70,39 @@ interface UserMessageInternals {
 	handleMouse?(event: TuiMouseEvent): TuiMouseEventResult | undefined;
 }
 
+interface MarkdownState {
+	active: boolean;
+	policy?: { frame: boolean; label: boolean };
+	lines?: readonly string[];
+	regions: CopyRegion[];
+	descriptors: Map<number, { text: string; label: boolean }>;
+	nextId: number;
+}
+
 /** Set by our Markdown transformer while a transcript Markdown renders. */
-let renderScope: { frame: boolean; label: boolean; ordinal: number; blocks: { text: string; ordinal: number }[] } | undefined;
+let renderScope: { owner: MarkdownInternals; state: MarkdownState; active: boolean; frame: boolean; label: boolean } | undefined;
 let press: Press | undefined;
-const markdownRegions = new WeakMap<object, { lines: readonly string[]; regions: CopyRegion[] }>();
-const userRegions = new WeakMap<object, { region: CopyRegion; source: string; label: string; width: number; line: string }>();
+const regionTargets = new WeakMap<CopyRegion, string>();
 
 /**
- * Markdown transformer that only records the message kind; Pi calls it during Markdown.render.
+ * Pi calls the transform before consulting its native block cache, so policy changes can invalidate it in this pass.
  * Thinking blocks keep Pi's fences. Streaming replies get the frame but no label: it would copy unfinished code.
  */
 export function markCopyScope(markdown: string, context: MarkdownTransformContext): string {
 	if (renderScope) {
-		renderScope.frame = context.messageType !== "assistant-thinking";
+		renderScope.frame = renderScope.active && context.messageType !== "assistant-thinking";
 		renderScope.label = renderScope.frame && !context.isStreaming;
+		const previous = renderScope.state.policy;
+		if (previous && (previous.frame !== renderScope.frame || previous.label !== renderScope.label)) {
+			renderScope.owner.invalidate();
+		}
+		renderScope.state.policy = { frame: renderScope.frame, label: renderScope.label };
 	}
 	return markdown;
 }
 
 /**
- * Rounded frame with the language and the label in the top border, like pi-pretty-tui:
+ * Rounded frame with the language and the label in the top border:
  * `╭─ ts ───── [Copy] ╮`. It replaces the two fence rows, so the block keeps its height.
  */
 export function renderFramedCode(
@@ -98,6 +112,7 @@ export function renderFramedCode(
 	width: number,
 	label: string | undefined,
 	border: (text: string) => string = theme.codeBlockBorder,
+	marker = "",
 ): string[] {
 	const inner = width - 4;
 	const highlighted = theme.highlightCode?.(code, lang) ?? code.split("\n").map((line) => theme.codeBlock(line));
@@ -111,8 +126,8 @@ export function renderFramedCode(
 	const widest = Math.max(0, ...rows.map((row) => visibleWidth(row)));
 	const frameWidth = Math.min(width, Math.max(widest + 4, visibleWidth(prefix) + 3 + visibleWidth(suffix) + 1));
 	const fill = Math.max(0, frameWidth - visibleWidth(prefix) - visibleWidth(suffix) - 1);
-	const top = border("╭─ ") + theme.codeBlockBorder(`${name} `) + border("─".repeat(fill))
-		+ (label === undefined ? "" : ` ${MARKER}${label} `) + border("╮");
+	const top = (label === undefined ? marker : "") + border("╭─ ") + theme.codeBlockBorder(`${name} `) + border("─".repeat(fill))
+		+ (label === undefined ? "" : ` ${marker}${label} `) + border("╮");
 	const body = rows.map((row) => border("│ ") + row + " ".repeat(Math.max(0, frameWidth - 4 - visibleWidth(row))) + border(" │"));
 	return [top, ...body, border(`╰${"─".repeat(frameWidth - 2)}╯`)];
 }
@@ -150,7 +165,8 @@ function cancelStalePress(owner: object, regions: readonly CopyRegion[]): void {
 	if (press?.owner !== owner) return;
 	const previous = press.region;
 	if (!regions.some((region) => region.row === previous.row && region.col === previous.col
-		&& region.width === previous.width && region.text === previous.text)) {
+		&& region.width === previous.width && region.text === previous.text
+		&& regionTargets.get(region) === regionTargets.get(previous))) {
 		press = undefined;
 	}
 }
@@ -228,21 +244,28 @@ export function installCopyButtons(options: {
 	const altScreenProto = TuiAltScreen.prototype as unknown as AltScreenInternals;
 
 	const refresh = () => {
+		press = undefined;
 		const tui = options.getTui();
 		tui?.invalidate();
 		tui?.requestRender();
 	};
-	if (markdownProto[PATCH_KEY] || markdownProto[PRETTY_TUI_KEY]) return { cleanup: () => {}, refresh };
+	if (markdownProto[PATCH_KEY]) return { cleanup: () => {}, refresh };
 
-	if (typeof altScreenProto.handleMouseEvent !== "function" || typeof altScreenProto.createMouseEvent !== "function") {
+	if (typeof markdownProto.render !== "function" || typeof markdownProto.renderToken !== "function"
+		|| typeof markdownProto.invalidate !== "function" || typeof altScreenProto.handleMouseEvent !== "function"
+		|| typeof altScreenProto.createMouseEvent !== "function") {
 		return { cleanup: () => {}, refresh };
 	}
 	let installed = true;
 	const active = () => installed && options.isEnabled() && options.getTui()?.mode === "fullscreen";
+	let markdownRegions = new WeakMap<object, MarkdownState>();
+	let userRegions = new WeakMap<object, { region: CopyRegion; source: string; label: string; width: number; line: string }>();
+	const markerPrefix = `${MARKER_PREFIX}${randomUUID()}:`;
+	const markerPattern = new RegExp(`${markerPrefix}(\\d+):([01])\x07`, "g");
 	const copy = (text: string) => {
 		const tui = options.getTui();
 		const flash = (message: string) => {
-			if (tui instanceof TuiAltScreen) tui.flash(message);
+			if (installed && tui === options.getTui() && tui instanceof TuiAltScreen) tui.flash(message);
 		};
 		copyToClipboard(text).then(() => flash("Copied!"), () => flash("Copy failed"));
 	};
@@ -257,7 +280,10 @@ export function installCopyButtons(options: {
 
 	const restores = [
 		patch(altScreenProto, "handleMouseEvent", function (this: AltScreenInternals, raw) {
-			if (!active() || this !== (options.getTui() as unknown)) return originalAltScreenMouse.call(this, raw);
+			if (!active() || this !== (options.getTui() as unknown)) {
+				press = undefined;
+				return originalAltScreenMouse.call(this, raw);
+			}
 			const motion = (raw.button & 32) !== 0;
 			if (!raw.release && !motion) press = undefined;
 			// Leave press/drag to Pi's selection; intercept only a qualifying release before copy-on-select runs.
@@ -273,63 +299,110 @@ export function installCopyButtons(options: {
 		}),
 		patch(markdownProto, "renderToken", function (this: MarkdownInternals, token, width, nextTokenType, styleContext) {
 			const scope = renderScope;
-			if (!installed || !scope || token.type !== "code") return originalRenderToken.call(this, token, width, nextTokenType, styleContext);
-			const ordinal = scope.ordinal++;
-			if (!scope.frame || !active() || width < MIN_FRAME_WIDTH) {
+			if (!installed || !scope?.active || scope.owner !== this || token.type !== "code") {
 				return originalRenderToken.call(this, token, width, nextTokenType, styleContext);
 			}
-			const theme = options.getTheme();
 			const showLabel = scope.label && width >= MIN_FRAME_WIDTH + LABEL.length + 2;
-			const lines = renderFramedCode(
-				this.theme,
-				token.text,
-				token.lang,
-				width,
-				showLabel ? label() : undefined,
-				(text) => theme.fg("borderMuted", text),
-			);
-			if (showLabel) scope.blocks.push({ text: token.text, ordinal });
-			// Same spacing rule as Pi's own code-block rendering.
-			if (nextTokenType && nextTokenType !== "space") lines.push("");
+			const id = scope.state.nextId++;
+			const marker = `${markerPrefix}${id}:${showLabel ? 1 : 0}\x07`;
+			let lines: string[];
+			if (scope.frame && width >= MIN_FRAME_WIDTH) {
+				const theme = options.getTheme();
+				lines = renderFramedCode(this.theme, token.text, token.lang, width, showLabel ? label() : undefined,
+					(text) => theme.fg("borderMuted", text), marker);
+				// Same spacing rule as Pi's own code-block rendering.
+				if (nextTokenType && nextTokenType !== "space") lines.push("");
+			} else {
+				lines = originalRenderToken.call(this, token, width, nextTokenType, styleContext);
+				// Unlabeled occurrences still count toward the current source ordinal.
+				lines[0] = marker + (lines[0] ?? "");
+			}
+			scope.state.descriptors.set(id, { text: token.text, label: showLabel });
 			return lines;
 		}),
 		patch(markdownProto, "render", function (this: MarkdownInternals, width) {
 			if (!installed) return originalRender.call(this, width);
-			const outer = renderScope;
-			const scope = { frame: false, label: false, ordinal: 0, blocks: [] as { text: string; ordinal: number }[] };
-			renderScope = scope;
-			let lines: string[];
-			try {
-				lines = originalRender.call(this, width);
-			} finally {
-				renderScope = outer;
+			const enabled = active();
+			const previous = markdownRegions.get(this);
+			const state: MarkdownState = previous ?? { active: enabled, regions: [], descriptors: new Map(), nextId: 0 };
+			if (!previous) {
+				markdownRegions.set(this, state);
+				// A component may already have cached native fences before this installation.
+				this.invalidate();
+			} else if (state.active !== enabled) {
+				this.invalidate();
+				cancelStalePress(this, []);
+				state.active = enabled;
+				state.policy = undefined;
 			}
-			// A cache hit returns the array we already processed and skips renderToken.
-			if (markdownRegions.get(this)?.lines === lines) return lines;
-			const source = typeof this.text === "string" ? this.text : "";
-			const regions: CopyRegion[] = [];
-			let next = 0;
-			for (let row = 0; row < lines.length; row++) {
-				const line = lines[row]!;
-				const at = line.indexOf(MARKER);
-				if (at < 0) continue;
-				// The renderer caches this array, so stripping in place keeps the marker out of later frames.
-				lines[row] = line.split(MARKER).join("");
-				const block = scope.blocks[next++];
-				if (!block) continue;
-				regions.push({
-					row,
-					col: visibleWidth(line.slice(0, at)),
-					width: LABEL.length,
-					text: restoreTabs(source, block.ordinal, block.text),
-				});
+			const run = () => {
+				const outer = renderScope;
+				renderScope = { owner: this, state, active: enabled, frame: false, label: false };
+				try { return originalRender.call(this, width); }
+				finally { renderScope = outer; }
+			};
+			try {
+				let lines = run();
+				if (state.lines === lines) return lines;
+				// A retained native block can outlive its description after a renderer change.
+				const missing = lines.some((line) => [...line.matchAll(markerPattern)].some((match) => !state.descriptors.has(Number(match[1]))));
+				if (missing) {
+					this.invalidate();
+					lines = run();
+				}
+				const source = typeof this.text === "string" ? this.text : "";
+				const regions: CopyRegion[] = [];
+				const live = new Set<number>();
+				let ordinal = 0;
+				for (let row = 0; row < lines.length; row++) {
+					const line = lines[row]!;
+					let clean = "";
+					let from = 0;
+					for (const match of line.matchAll(markerPattern)) {
+						clean += line.slice(from, match.index);
+						from = match.index + match[0].length;
+						const id = Number(match[1]);
+						const block = state.descriptors.get(id);
+						const currentOrdinal = ordinal++;
+						if (block) live.add(id);
+						if (match[2] !== "1") continue;
+						const suffix = line.slice(from);
+						const labelAt = suffix.indexOf(LABEL);
+						if (labelAt < 0 || stripAnsi(suffix.slice(0, labelAt)) !== "") continue;
+						if (!block?.label || !enabled) {
+							// Preserve styles and width while removing an unresolved extension label.
+							clean += suffix.slice(0, labelAt) + " ".repeat(LABEL.length);
+							from += labelAt + LABEL.length;
+							continue;
+						}
+						const region = { row, col: visibleWidth(clean), width: LABEL.length,
+							text: restoreTabs(source, currentOrdinal, block.text) };
+						regionTargets.set(region, `${currentOrdinal}\0${source}`);
+						regions.push(region);
+					}
+					// Only sanitize the final array; native block lines retain their descriptor IDs.
+					lines[row] = clean + line.slice(from);
+				}
+				for (const id of state.descriptors.keys()) if (!live.has(id)) state.descriptors.delete(id);
+				cancelStalePress(this, regions);
+				state.lines = lines;
+				state.regions = regions;
+				return lines;
+			} catch (error) {
+				cancelStalePress(this, []);
+				state.lines = undefined;
+				state.regions = [];
+				state.descriptors.clear();
+				state.policy = undefined;
+				this.invalidate();
+				throw error;
 			}
-			cancelStalePress(this, regions);
-			markdownRegions.set(this, { lines, regions });
-			return lines;
 		}),
 		patch(markdownProto, "handleMouse", function (this: MarkdownInternals, event) {
-			if (!active()) return originalMarkdownMouse?.call(this, event);
+			if (!active()) {
+				cancelStalePress(this, []);
+				return originalMarkdownMouse?.call(this, event);
+			}
 			const regions = markdownRegions.get(this)?.regions ?? [];
 			return handleCopyMouse(this, regions, event, copy) ?? originalMarkdownMouse?.call(this, event);
 		}),
@@ -365,7 +438,10 @@ export function installCopyButtons(options: {
 			return lines;
 		}),
 		patch(userProto, "handleMouse", function (this: UserMessageInternals, event) {
-			if (!active()) return originalUserMouse?.call(this, event);
+			if (!active()) {
+				cancelStalePress(this, []);
+				return originalUserMouse?.call(this, event);
+			}
 			const region = userRegions.get(this)?.region;
 			return handleCopyMouse(this, region ? [region] : [], event, copy) ?? originalUserMouse?.call(this, event);
 		}),
@@ -380,6 +456,8 @@ export function installCopyButtons(options: {
 			for (const restore of restores) restore();
 			delete markdownProto[PATCH_KEY];
 			press = undefined;
+			markdownRegions = new WeakMap();
+			userRegions = new WeakMap();
 			try {
 				refresh();
 			} catch {

package/extensions/open-tui/footer-segments.ts

@@ -0,0 +1,119 @@
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { randomUUID } from "node:crypto";
+import { sanitizeStatusPreservingStyles } from "./utils.ts";
+
+const BUILTIN_SEGMENTS = [
+	"cwd", "hostname", "sessionName", "git", "runtime", "timer", "context", "model", "tokens", "cost",
+] as const;
+
+export type FooterBuiltinSegment = typeof BUILTIN_SEGMENTS[number];
+
+export type FooterPosition =
+	| { row: 1 | 2; side: "left" | "right"; edge?: "start" | "end" }
+	| { before: FooterBuiltinSegment }
+	| { after: FooterBuiltinSegment };
+
+export interface FooterSegment {
+	key: string;
+	position: FooterPosition;
+	text: string;
+	compactText?: string;
+	order?: number;
+	priority?: number;
+}
+
+export interface RegisteredFooterSegment extends FooterSegment {
+	order: number;
+	priority: number;
+}
+
+export type FooterSetMessage = FooterSegment & { lifecycle: string };
+export type FooterRemoveMessage = { key: string; lifecycle: string };
+export type FooterStateMessage = { available: true; lifecycle: string } | { available: false };
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function isAnchor(value: unknown): value is FooterBuiltinSegment {
+	return typeof value === "string" && BUILTIN_SEGMENTS.some((anchor) => anchor === value);
+}
+
+function readPosition(value: unknown): FooterPosition | undefined {
+	if (!isRecord(value)) return undefined;
+	if ("before" in value) {
+		if ("after" in value || "row" in value || "side" in value || "edge" in value) return undefined;
+		return isAnchor(value.before) ? { before: value.before } : undefined;
+	}
+	if ("after" in value) {
+		if ("row" in value || "side" in value || "edge" in value) return undefined;
+		return isAnchor(value.after) ? { after: value.after } : undefined;
+	}
+	if (value.row !== 1 && value.row !== 2) return undefined;
+	if (value.side !== "left" && value.side !== "right") return undefined;
+	if (value.edge !== undefined && value.edge !== "start" && value.edge !== "end") return undefined;
+	return { row: value.row, side: value.side, edge: value.edge ?? "end" };
+}
+
+function readSegment(value: Record<string, unknown>): RegisteredFooterSegment | undefined {
+	if (typeof value.key !== "string" || value.key.trim().length === 0 || typeof value.text !== "string") return undefined;
+	if (value.compactText !== undefined && typeof value.compactText !== "string") return undefined;
+	if (value.order !== undefined && (typeof value.order !== "number" || !Number.isFinite(value.order))) return undefined;
+	if (value.priority !== undefined && (typeof value.priority !== "number" || !Number.isFinite(value.priority))) return undefined;
+	const position = readPosition(value.position);
+	if (!position) return undefined;
+	return {
+		key: value.key,
+		position,
+		text: sanitizeStatusPreservingStyles(value.text),
+		compactText: value.compactText === undefined ? undefined : sanitizeStatusPreservingStyles(value.compactText),
+		order: value.order ?? 0,
+		priority: value.priority ?? -1,
+	};
+}
+
+/** Session-local storage for the public footer protocol. Pi owns subscription cleanup. */
+export function createFooterSegments(events: ExtensionAPI["events"], requestRender: () => void) {
+	let lifecycle: string | undefined;
+	const segments = new Map<string, RegisteredFooterSegment>();
+	let ordered: readonly RegisteredFooterSegment[] = [];
+	const announce = () => {
+		const state: FooterStateMessage = lifecycle === undefined
+			? { available: false }
+			: { available: true, lifecycle };
+		events.emit("open-tui:footer:state", state);
+	};
+	const changed = () => {
+		ordered = [...segments.values()].sort((a, b) => a.order - b.order || (a.key < b.key ? -1 : a.key > b.key ? 1 : 0));
+		requestRender();
+	};
+
+	events.on("open-tui:footer:query", announce);
+	events.on("open-tui:footer:set", (data) => {
+		if (!lifecycle || !isRecord(data) || data.lifecycle !== lifecycle) return;
+		const segment = readSegment(data);
+		if (!segment) return;
+		segments.set(segment.key, segment);
+		changed();
+	});
+	events.on("open-tui:footer:remove", (data) => {
+		if (!lifecycle || !isRecord(data) || data.lifecycle !== lifecycle || typeof data.key !== "string") return;
+		if (segments.delete(data.key)) changed();
+	});
+
+	return {
+		getSegments: (): readonly RegisteredFooterSegment[] => ordered,
+		activate(): void {
+			if (lifecycle !== undefined) return;
+			lifecycle = randomUUID();
+			announce();
+		},
+		deactivate(): void {
+			if (lifecycle === undefined) return;
+			lifecycle = undefined;
+			segments.clear();
+			ordered = [];
+			announce();
+		},
+	};
+}