@quandev104/pi-style 0.1.2 → 0.1.4

package/extension-src/pi-style/pi/session-coordinator.ts

@@ -2,8 +2,16 @@ import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-a
 import { type KeyId, matchesKey } from "@earendil-works/pi-tui";
 import type { ConfigFilePort } from "../app/config-storage.js";
 import { createPiStyleApp, type PiStyleApp } from "../app/index.js";
+import { resolveTheme } from "../domain/theme.js";
 import { setSpecialBlockTheme } from "../features/messages/special-blocks.js";
-import { setToolsRenderConfig } from "../features/tools/boxed/session-config.js";
+import { resetBashTreeRegistry } from "../features/tools/boxed/bash.js";
+import { resetBatchRegistry } from "../features/tools/boxed/batch.js";
+import { resetGrepRegistry } from "../features/tools/boxed/grep.js";
+import {
+	setToolsRenderConfig,
+	stopAllElapsedTickers,
+	type ToolsRenderConfig,
+} from "../features/tools/boxed/session-config.js";
 import { createCompatibilityCoordinator } from "./compatibility-coordinator.js";
 import {
 	type CompatibilityCleanupResult,
@@ -45,6 +53,8 @@ export function createPiStyleSessionCoordinator(pi: ExtensionAPI, hooks: Compati
 	let active = false;
 	let tuiSession = false;
 	let terminalInputUnsubscribe: (() => void) | undefined;
+	let sessionTheme: unknown;
+	let sessionUi: import("@earendil-works/pi-coding-agent").ExtensionUIContext | undefined;
 	const source = createConfigSourceAdapter(
 		pi,
 		filePort,
@@ -68,6 +78,22 @@ export function createPiStyleSessionCoordinator(pi: ExtensionAPI, hooks: Compati
 			),
 		);
 	};
+	/** Render-scoped tool config: line budgets + the resolved open-tree glyph. */
+	const applyToolsRenderConfig = (config: import("../domain/config-types.js").NormalizedPiStyleConfig) => {
+		setToolsRenderConfig({
+			...config.tools,
+			batchOpenGlyph: resolveTheme(sessionTheme as never, config, process.env).glyph("batchOpen"),
+			nerdFonts: resolveTheme(sessionTheme as never, config, process.env).mode === "nerd",
+		} satisfies ToolsRenderConfig);
+	};
+	/**
+	 * Hide Pi's "Thinking..." placeholder label: an empty label renders zero
+	 * lines, so the thinking block leaves no trace while content stays hidden.
+	 * Passing undefined restores the default label.
+	 */
+	const applyMessagesConfig = (config: import("../domain/config-types.js").NormalizedPiStyleConfig) => {
+		sessionUi?.setHiddenThinkingLabel?.(config.messages.hideThinkingLabel ? "" : undefined);
+	};
 	const app: PiStyleApp = createPiStyleApp(
 		undefined,
 		{
@@ -79,6 +105,10 @@ export function createPiStyleSessionCoordinator(pi: ExtensionAPI, hooks: Compati
 		(config) => {
 			productGate = app.productPolicy.corePatchGate;
 			if (!active) return;
+			// Apply render-scoped tool config live so `/pi-style set tools.*` takes
+			// effect immediately (line budgets, dimOutput, open-tree glyph, …).
+			applyToolsRenderConfig(config);
+			applyMessagesConfig(config);
 			if (compatibility.report) {
 				const cleanup = compatibility.dispose();
 				if (!cleanup.complete) {
@@ -100,7 +130,6 @@ export function createPiStyleSessionCoordinator(pi: ExtensionAPI, hooks: Compati
 			authorization = readSessionAuthorization(pi);
 			compatibility.captureAuthorization(
 				authorization.core,
-				authorization.user,
 				authorization.assistant,
 				authorization.specialBlocks,
 				authorization.tools,
@@ -120,6 +149,14 @@ export function createPiStyleSessionCoordinator(pi: ExtensionAPI, hooks: Compati
 			tuiSession = ctx.mode === "tui";
 			app.setProjectTrusted(ctx.isProjectTrusted());
 			source.setSession(cwd, ctx.isProjectTrusted());
+			// Drop any batch state carried over from the previous session (Pi renders
+			// the restored chat between session_shutdown and the next session_start).
+			resetBatchRegistry();
+			resetGrepRegistry();
+			resetBashTreeRegistry();
+			// Stop any 1s elapsed re-render ticker left by a tool that was still
+			// running when the session ended.
+			stopAllElapsedTickers();
 			active = false;
 			await app.reload();
 			productGate = app.productPolicy.corePatchGate;
@@ -127,7 +164,10 @@ export function createPiStyleSessionCoordinator(pi: ExtensionAPI, hooks: Compati
 			compatibility.install(app.config, ctx.mode === "tui", productGate);
 			// Session-scoped render configuration for the boxed tool/message surfaces.
 			// Populated once per session (never inside render).
-			setToolsRenderConfig(app.config.tools);
+			sessionTheme = ctx.ui?.theme as never;
+			sessionUi = ctx.ui as import("@earendil-works/pi-coding-agent").ExtensionUIContext | undefined;
+			applyToolsRenderConfig(app.config);
+			applyMessagesConfig(app.config);
 			if (ctx.ui?.theme) setSpecialBlockTheme(ctx.ui.theme as never);
 			const toolDetails = collectToolDetails(pi.getActiveTools?.(), pi.getAllTools?.());
 			app.sessionStart(
@@ -180,6 +220,10 @@ export function createPiStyleSessionCoordinator(pi: ExtensionAPI, hooks: Compati
 			tuiSession = false;
 			terminalInputUnsubscribe?.();
 			terminalInputUnsubscribe = undefined;
+			resetBatchRegistry();
+			resetGrepRegistry();
+			resetBashTreeRegistry();
+			stopAllElapsedTickers();
 			app.sessionShutdown();
 			// Tier C prototype patches stay installed across session switches. Pi renders
 			// the restored chat (renderBeforeBind) AFTER session_shutdown but BEFORE the

package/extension-src/pi-style/shared/box.ts

@@ -43,10 +43,26 @@ export interface BoxedRenderOptions {
 	isError?: boolean;
 	isPartial?: boolean;
 	isPending?: boolean;
+	/** Execution has started but the tool is still running (title `◌` instead of `✓`). */
+	running?: boolean;
+	/** A result renderer already produced a continuation for this call, so the call
+	 *  leaves the box open instead of closing it with a pending label. */
+	resultSeen?: boolean;
 	pendingText?: string;
+	/** Verbatim bottom-border label for the pending/running card (overrides the
+	 *  `… ${pendingText}` default, e.g. a live `◌ Running · 12.4s` status). */
+	pendingLabel?: string;
 	state?: Record<string, unknown>;
 	/** Wall-clock elapsed override (used when metrics are not in result.details). */
 	elapsedMs?: number;
+	/** Width-dependent content lines rendered between the top border and the
+	 *  footer border of a compact box (replaces the blank breathing line).
+	 *  Each returned line is truncated to the box inner width by the renderer.
+	 *  Returns an empty array for no body (blank line preserved). */
+	bodyLines?: (contentWidth: number) => string[];
+	/** Right-side label embedded in the compact box bottom border before the
+	 *  corner (e.g. an expand hint such as `Ctrl+O for more`). */
+	bottomRightLabel?: string;
 }
 
 export function isExpanded(options: { expanded?: boolean } | undefined): boolean {
@@ -133,7 +149,7 @@ export function countWords(text: string): number {
 	return count;
 }
 
-function formatCompactCount(value: number): string {
+export function formatCompactCount(value: number): string {
 	if (value < 1000) return `${Math.round(value)}`;
 	if (value < 10000) return `${(value / 1000).toFixed(1)}k`;
 	if (value < 1000000) return `${Math.round(value / 1000)}k`;
@@ -323,17 +339,47 @@ function formatBoxedStatusIcon(theme: BoxTheme, isError?: boolean): string {
 	return theme.fg(isError ? "error" : "success", icon);
 }
 
-export function formatBoxedToolTitle(theme: BoxTheme, name: string, isError?: boolean): string {
-	const rawTitle = `➔ ${name}`;
+/**
+ * Colored `➔ Name` prefix for tool titles (identity color). The status glyph
+ * (✓/◌/✗) is appended separately by formatBoxedToolTitle.
+ */
+export function formatToolTitlePrefix(theme: BoxTheme, name: string): string {
+	return colorFromExtra(theme, "bashPromptColor", "bashMode", `➔ ${name}`);
+}
+
+export type BoxedTitleStatus = "running" | "pending";
+
+/**
+ * Boxed tool title: `➔ Name ✓` when settled, `➔ Name ◌` while running, plain
+ * `➔ Name` while pending, and a fully error-colored `➔ Name ✗` on failure.
+ * The ✓/◌ glyphs are never shown before the tool settles, so a card that is
+ * still executing never reads as finished.
+ */
+export function formatBoxedToolTitle(
+	theme: BoxTheme,
+	name: string,
+	isError?: boolean,
+	status?: BoxedTitleStatus,
+): string {
 	// On failure the whole title turns error-colored (not just the ✗) so a failed
 	// tool reads instantly; on success the tool keeps its identity color and only
 	// the ✓ carries the success color.
 	const coloredTitle = isError
-		? theme.fg("error", `${rawTitle} ✗`)
-		: `${colorFromExtra(theme, "bashPromptColor", "bashMode", rawTitle)} ${formatBoxedStatusIcon(theme, false)}`;
+		? theme.fg("error", `➔ ${name} ✗`)
+		: status === "running"
+			? `${formatToolTitlePrefix(theme, name)} ${theme.fg("text", "◌")}`
+			: status === "pending"
+				? formatToolTitlePrefix(theme, name)
+				: `${formatToolTitlePrefix(theme, name)} ${formatBoxedStatusIcon(theme, false)}`;
 	return typeof theme?.bold === "function" ? theme.bold(coloredTitle) : coloredTitle;
 }
 
+/** Live running status label for pending/running cards and streaming footers. */
+export function formatBoxedRunningStatus(theme: BoxTheme, elapsedMs: number | undefined): string {
+	const elapsed = elapsedMs === undefined ? "" : `${theme.fg("text", ` · ${(elapsedMs / 1000).toFixed(1)}s`)}`;
+	return `${theme.fg("dim", "◌ Running")}${elapsed}`;
+}
+
 function boxText(theme: BoxTheme, text: string): string {
 	return `${RESET_INTENSITY}${theme.fg("borderMuted", text)}`;
 }
@@ -423,6 +469,22 @@ export function boxBlankLine(theme: BoxTheme, width: number): string {
 	return `${boxFrameText(theme, BOX_VERTICAL)}${sidePad}${" ".repeat(contentWidth)}${sidePad}${boxFrameText(theme, BOX_VERTICAL)}`;
 }
 
+export function boxLineAligned(theme: BoxTheme, left: string, right: string, width: number): string {
+	const renderedWidth = boxWidth(width);
+	const contentWidth = boxInnerWidth(renderedWidth);
+	const rightWidth = safeVisibleWidth(right);
+	const sidePad = " ".repeat(BOX_SIDE_PADDING);
+
+	if (!right || rightWidth >= contentWidth) {
+		return boxLine(theme, right || left, renderedWidth);
+	}
+
+	const maxLeftWidth = Math.max(1, contentWidth - rightWidth - 1);
+	const truncatedLeft = safeTruncateToWidth(left, maxLeftWidth, "…");
+	const gap = " ".repeat(Math.max(1, contentWidth - safeVisibleWidth(truncatedLeft) - rightWidth));
+	return `${boxFrameText(theme, BOX_VERTICAL)}${sidePad}${truncatedLeft}${gap}${right}${sidePad}${boxFrameText(theme, BOX_VERTICAL)}`;
+}
+
 export function boxLineWithRight(theme: BoxTheme, left: string, right: string, width: number): string {
 	const renderedWidth = boxWidth(width);
 	const contentWidth = boxInnerWidth(renderedWidth);
@@ -540,7 +602,12 @@ export function renderBoxedToolCall(
 		},
 		render(width: number): string[] {
 			if (cache?.width === width) return cache.lines;
-			const title = formatBoxedToolTitle(theme, toolName, options.isError);
+			const title = formatBoxedToolTitle(
+				theme,
+				toolName,
+				options.isError,
+				options.isPending ? (options.running ? "running" : "pending") : undefined,
+			);
 			const headerLabel = options.headerDetail ? `${title} · ${options.headerDetail}` : title;
 			const renderedWidth = boxWidth(width);
 			const lines = [
@@ -548,22 +615,26 @@ export function renderBoxedToolCall(
 				boxBlankLine(theme, renderedWidth),
 				...detailLines.flatMap((line) => boxedWrappedLines(theme, line, renderedWidth)),
 			];
-			if (options.isPending) {
-				const pendingText = options.pendingText ?? "Waiting for output…";
+			if (options.isPending && !options.resultSeen) {
+				// Pending/running card: close the box with the status label. Once a
+				// result renderer has produced a continuation, the box stays open and
+				// that continuation closes it.
+				const pendingLabel =
+					options.pendingLabel ?? theme.fg("dim", `… ${options.pendingText ?? "Waiting for output…"}`);
 				lines.push(
 					boxBlankLine(theme, renderedWidth),
 					boxLabeledBorder(
 						theme,
 						BOX_ROUND_BOTTOM_LEFT,
 						BOX_ROUND_BOTTOM_RIGHT,
-						theme.fg("dim", `… ${pendingText}`),
+						pendingLabel,
 						undefined,
 						renderedWidth,
 					),
 				);
 			} else {
 				// Leave the box open with trailing breathing room; the result renderer
-				// continues it with the Response divider.
+				// continues it with the result divider.
 				lines.push(boxBlankLine(theme, renderedWidth));
 			}
 			cache = { width, lines };
@@ -593,15 +664,23 @@ export function renderCompactBoxedToolCall(
 		invalidate() {},
 		render(width: number): string[] {
 			const renderedWidth = boxWidth(width);
-			const title = formatBoxedToolTitle(theme, toolName, options.isError);
+			const title = formatBoxedToolTitle(
+				theme,
+				toolName,
+				options.isError,
+				options.isPending ? (options.running ? "running" : "pending") : undefined,
+			);
 			const headerLabel = detailLine ? `${title} · ${detailLine}` : title;
 			const compactFooter =
 				typeof options.state?.[COMPACT_FOOTER_KEY] === "string" ? options.state[COMPACT_FOOTER_KEY] : "";
 			const _footerIsError = Boolean(options.state?.[COMPACT_FOOTER_ERROR_KEY]);
 			const _footerIsPartial = Boolean(options.state?.[COMPACT_FOOTER_PARTIAL_KEY]);
+			const bodyLines = options.bodyLines ? options.bodyLines(boxInnerWidth(renderedWidth)) : [];
 			const lines = [
 				boxLabeledBorder(theme, BOX_ROUND_TOP_LEFT, BOX_ROUND_TOP_RIGHT, headerLabel, undefined, renderedWidth),
-				boxBlankLine(theme, renderedWidth),
+				...(bodyLines.length > 0
+					? bodyLines.map((line) => boxLine(theme, line, renderedWidth))
+					: [boxBlankLine(theme, renderedWidth)]),
 			];
 			if (compactFooter) {
 				lines.push(
@@ -610,24 +689,28 @@ export function renderCompactBoxedToolCall(
 						BOX_ROUND_BOTTOM_LEFT,
 						BOX_ROUND_BOTTOM_RIGHT,
 						compactFooter,
-						undefined,
+						options.bottomRightLabel,
 						renderedWidth,
 					),
 				);
 			} else if (options.isPending) {
-				const pendingText = options.pendingText ?? "Waiting for output…";
+				const pendingLabel =
+					options.pendingLabel ??
+					(options.running
+						? formatBoxedRunningStatus(theme, undefined)
+						: theme.fg("dim", `… ${options.pendingText ?? "Waiting for output…"}`));
 				lines.push(
 					boxLabeledBorder(
 						theme,
 						BOX_ROUND_BOTTOM_LEFT,
 						BOX_ROUND_BOTTOM_RIGHT,
-						theme.fg("dim", `… ${pendingText}`),
-						undefined,
+						pendingLabel,
+						options.bottomRightLabel,
 						renderedWidth,
 					),
 				);
 			} else {
-				// No footer yet (transient, or the result opens the Response divider):
+				// No footer yet (transient, or the result opens the result divider):
 				// leave the box open so the result renderer continues the same box.
 			}
 			return lines;
@@ -655,6 +738,10 @@ export function renderBoxedToolResult(
 		expandHint?: string;
 		isError?: boolean;
 		isPartial?: boolean;
+		/** Skip the result divider entirely (streaming continuation into an open call box). */
+		showDivider?: boolean;
+		/** Error state marker prepended to the body (default `✗ Error`). */
+		errorLabel?: string;
 	} = {},
 ): Component {
 	let cache: RenderLinesCache | null = null;
@@ -668,7 +755,7 @@ export function renderBoxedToolResult(
 			const renderedWidth = boxWidth(width);
 			const maxContentWidth = boxInnerWidth(renderedWidth);
 			const bodyLines = typeof body === "function" ? body(maxContentWidth) : body.render(maxContentWidth);
-			const errorPrefix = options.isError ? [theme.fg("error", "✗ Error")] : [];
+			const errorPrefix = options.isError ? [theme.fg("error", options.errorLabel ?? "✗ Error")] : [];
 			const outputLines =
 				bodyLines.length > 0
 					? [...errorPrefix, ...bodyLines]
@@ -679,14 +766,18 @@ export function renderBoxedToolResult(
 					? options.dividerLabel(renderedWidth)
 					: (options.dividerLabel ?? "Response");
 			const rendered = [
-				boxLabeledBorder(
-					theme,
-					BOX_DIVIDER_LEFT,
-					BOX_DIVIDER_RIGHT,
-					theme.fg("dim", dividerText),
-					options.dividerRightLabel ? theme.fg("dim", options.dividerRightLabel) : undefined,
-					renderedWidth,
-				),
+				...(options.showDivider === false
+					? []
+					: [
+							boxLabeledBorder(
+								theme,
+								BOX_DIVIDER_LEFT,
+								BOX_DIVIDER_RIGHT,
+								theme.fg("dim", dividerText),
+								options.dividerRightLabel ? theme.fg("dim", options.dividerRightLabel) : undefined,
+								renderedWidth,
+							),
+						]),
 				boxBlankLine(theme, renderedWidth),
 				...renderBoxedOutputLines(theme, outputLines, renderedWidth, options.renderLineBudget ?? outputLines.length),
 				boxBlankLine(theme, renderedWidth),

package/extension-src/pi-style/shared/theme-extras.ts

@@ -20,8 +20,6 @@ const extensionDir = dirname(fileURLToPath(import.meta.url));
 export const THEME_EXTRA_DEFAULTS: Readonly<Record<string, string>> = Object.freeze({
 	assistantPrefix: "•",
 	assistantPrefixColor: "",
-	userPrefix: "❯",
-	userPrefixColor: "accent",
 	dividerChar: "─",
 	dividerColor: "",
 	showDivider: "true",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quandev104/pi-style",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "A native-layout, cohesive visual style package for Pi.",
   "license": "MIT",
   "type": "module",