@quandev104/pi-style 0.1.2 → 0.1.3

package/extension-src/pi-style/features/tools/boxed/write.ts

@@ -1,8 +1,26 @@
 // Boxed write tool renderer
 // (renderCall/renderResult only).
+//
+// The write call renders a compact preview box: the file path in the top
+// border, the written content as numbered lines in the body (cat -n style),
+// and the metrics footer in the bottom border. The footer lives in the shared
+// renderer state — the result renderer stores it (elapsed + words), the call
+// component reads it at paint time and closes the box. The preview is capped
+// at the collapsed line budget with a `Ctrl+O for more` hint on the bottom
+// border when truncated; expanded shows the expanded budget. Errors keep the
+// plain open call box so the boxed error result never duplicates a box.
 
+import type { Component } from "@earendil-works/pi-tui";
 import { stripAnsi } from "../../../shared/ansi.js";
-import { boxedToolWidthKey, getTextOutput, renderBoxedToolResult, stripTrailingNotice } from "../../../shared/box.js";
+import {
+	type BoxTheme,
+	boxedToolWidthKey,
+	getTextOutput,
+	renderBoxedToolResult,
+	renderCompactBoxedToolCall,
+	replaceTabs,
+} from "../../../shared/box.js";
+import { getToolsRenderConfig } from "./session-config.js";
 import {
 	type BoxedToolDefinition,
 	clearFooterState,
@@ -13,39 +31,86 @@ import {
 	resultFooterLines,
 } from "./shared.js";
 
-function parseWriteSummary(output: string): string | undefined {
-	const normalized = stripTrailingNotice(stripAnsi(output ?? "")).trim();
-	if (!normalized) return undefined;
+/** Right-side bottom-border hint shown when the compact preview is truncated. */
+const WRITE_EXPAND_HINT = "Ctrl+O for more";
 
-	const byteMatch = normalized.match(/\bwrote\s+(\d+)\s+bytes?\b/i);
-	if (byteMatch) {
-		const bytes = Number(byteMatch[1]);
-		if (Number.isFinite(bytes)) {
-			return `↳ Wrote ${bytes} ${bytes === 1 ? "byte" : "bytes"}.`;
-		}
-	}
+type NumberedLine = { number: string; content: string };
 
-	const lineMatch = normalized.match(/\bwrote\s+(\d+)\s+lines?\b/i);
-	if (lineMatch) {
-		const count = Number(lineMatch[1]);
-		if (Number.isFinite(count)) {
-			return `↳ Wrote ${count} ${count === 1 ? "line" : "lines"}.`;
-		}
-	}
+/**
+ * Numbered preview lines for the written content, `cat -n` style: every split
+ * line keeps its number (including a trailing empty line produced by a final
+ * newline), right-aligned to the widest line number.
+ */
+function numberedPreviewLines(content: string): NumberedLine[] {
+	const normalized = replaceTabs(String(content ?? "")).replace(/\r/g, "");
+	if (!normalized) return [];
+	const lines = normalized.split("\n");
+	const gutterWidth = Math.max(1, String(lines.length).length);
+	return lines.map((line, index) => ({
+		number: String(index + 1).padStart(gutterWidth),
+		content: line,
+	}));
+}
+
+/** One boxed preview row: dim gutter + toolOutput content. */
+function formatNumberedLine(theme: BoxTheme, line: NumberedLine): string {
+	return `${theme.fg("borderMuted", `${line.number} `)}${theme.fg("toolOutput", line.content)}`;
+}
 
-	return undefined;
+/** Compact write box: path header, numbered content preview, metrics footer. */
+function renderWritePreviewBox(
+	theme: BoxTheme,
+	detailLine: string,
+	content: string,
+	options: {
+		state?: Record<string, unknown>;
+		isError: boolean;
+		isPending: boolean;
+		expanded: boolean;
+	},
+): Component {
+	const preview = numberedPreviewLines(content);
+	const config = getToolsRenderConfig();
+	const budget = options.expanded ? config.maxExpandedLines : config.maxCollapsedLines;
+	const truncated = preview.length > budget;
+
+	return renderCompactBoxedToolCall(theme, "Write", detailLine, {
+		...(options.state ? { state: options.state } : {}),
+		isError: options.isError,
+		isPending: options.isPending,
+		bodyLines: () => {
+			if (preview.length === 0) return [];
+			const shown = preview.slice(0, budget).map((line) => formatNumberedLine(theme, line));
+			if (!truncated) return shown;
+			const omitted = preview.length - budget;
+			const note = options.expanded ? `… ${omitted} more lines omitted by render budget` : `… ${omitted} more lines`;
+			return [...shown, theme.fg("muted", note)];
+		},
+		...(options.expanded || options.isPending || !truncated ? {} : { bottomRightLabel: WRITE_EXPAND_HINT }),
+	});
 }
 
 export const writeTool: BoxedToolDefinition = {
 	call(args, theme, context) {
 		noteExecutionStart(context);
 		const detail = displayPath(String(args?.path ?? args?.file_path ?? ""), context);
-		return compactCall(theme, "Write", `${theme.fg("dim", "Path: ")}${detail}`, {
-			detailKey: detail,
-			context,
+		const detailLine = `${theme.fg("dim", "Path: ")}${detail}`;
+		// On error keep the plain open box: the result renderer continues it with
+		// the boxed error body, so call and result never duplicate a box.
+		if (context.isError) {
+			return compactCall(theme, "Write", detailLine, {
+				detailKey: detail,
+				context,
+			});
+		}
+		return renderWritePreviewBox(theme, detailLine, String(args?.content ?? ""), {
+			state: context.state,
+			isError: Boolean(context.isError),
+			isPending: Boolean(context.isPartial),
+			expanded: Boolean(context.expanded),
 		});
 	},
-	result(result, options, theme, context) {
+	result(result, _options, theme, context) {
 		clearFooterState(context);
 		const output = getTextOutput(result);
 		const detail = displayPath(String(context?.args?.path ?? context?.args?.file_path ?? ""), context);
@@ -59,31 +124,8 @@ export const writeTool: BoxedToolDefinition = {
 			});
 		}
 
-		if (!options.expanded) return compactFooterWithState(theme, result, context);
-
-		const content = String(context?.args?.content ?? "");
-		const lineCount = content ? content.split("\n").length : 0;
-		if (lineCount > 0) {
-			const summary = `↳ Wrote ${lineCount} ${lineCount === 1 ? "line" : "lines"}.`;
-			return renderBoxedToolResult(theme, () => [theme.fg("dim", summary)], {
-				widthKey,
-				footerLines: resultFooterLines(theme, result, context),
-			});
-		}
-
-		const summary = parseWriteSummary(output);
-		if (summary) {
-			return renderBoxedToolResult(theme, () => [theme.fg("dim", summary)], {
-				widthKey,
-				footerLines: resultFooterLines(theme, result, context),
-			});
-		}
-
-		const normalized = stripTrailingNotice(stripAnsi(output)).trim();
-		const fallback = normalized ? `↳ ${normalized}` : "↳ Wrote file.";
-		return renderBoxedToolResult(theme, () => [theme.fg("dim", fallback)], {
-			widthKey,
-			footerLines: resultFooterLines(theme, result, context),
-		});
+		// Success (compact and expanded): the preview box closes with the metrics
+		// footer stored into the shared renderer state; the result adds nothing.
+		return compactFooterWithState(theme, result, context);
 	},
 };

package/extension-src/pi-style/features/tools/index.ts

@@ -1,6 +1,19 @@
 import { visibleWidth } from "@earendil-works/pi-tui";
+import { EMPTY_BATCH_COMPONENT } from "./boxed/batch.js";
 import { renderBoxedToolCall, renderBoxedToolResult } from "./boxed/index.js";
 
+/**
+ * Batch members render zero lines. Pi's ToolExecutionComponent always adds a
+ * built-in Spacer child (one blank line) and only sets hideComponent when
+ * hasContent is false — but adding an empty renderer still marks hasContent
+ * true. Mark the instance hidden so members contribute zero lines (no stray
+ * blank margin after the batch panel). updateDisplay resets hideComponent on
+ * every pass; the wrapper re-applies it on each dispatch.
+ */
+function hideBatchMember(instance: object): void {
+	(instance as { hideComponent?: boolean }).hideComponent = true;
+}
+
 /**
  * Neutralize the native ToolExecutionComponent status background for boxed
  * rendering: Pi's updateDisplay sets contentBox/selfRenderContainer bgFn to
@@ -434,6 +447,7 @@ export function createToolDecorationOwner(snapshot: Partial<ToolDecorationSnapsh
 									);
 								})();
 					neutralizeToolContainerBackground(instance);
+					if (component === EMPTY_BATCH_COMPONENT) hideBatchMember(instance);
 					return component;
 				};
 			}

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

@@ -11,7 +11,6 @@ import {
 export interface CompatibilityCoordinator {
 	captureAuthorization(
 		coreFlag: boolean,
-		userFlag: boolean,
 		assistantFlag: boolean,
 		specialBlocksFlag: boolean,
 		toolsFlag: boolean,
@@ -33,7 +32,6 @@ export function createCompatibilityCoordinator(dispose = disposePiCompatibilityP
 	let authorization:
 		| {
 				core: boolean;
-				user: boolean;
 				assistant: boolean;
 				specialBlocks: boolean;
 				tools: boolean;
@@ -44,15 +42,13 @@ export function createCompatibilityCoordinator(dispose = disposePiCompatibilityP
 		get report() {
 			return report;
 		},
-		captureAuthorization(core, user, assistant, specialBlocks, tools, ascii) {
-			authorization = { core, user, assistant, specialBlocks, tools, ascii };
+		captureAuthorization(core, assistant, specialBlocks, tools, ascii) {
+			authorization = { core, assistant, specialBlocks, tools, ascii };
 		},
 		state(config) {
 			const version = detectPiVersion();
 			const messagesConfigured =
-				config.enabled &&
-				config.messages.enabled &&
-				(config.messages.userPrefix || config.messages.assistantPrefix || config.messages.specialBlocks);
+				config.enabled && config.messages.enabled && (config.messages.assistantPrefix || config.messages.specialBlocks);
 			const toolsConfigured = config.enabled && config.tools.enabled;
 			const surface = (
 				feature: "messages" | "tools",
@@ -91,12 +87,6 @@ export function createCompatibilityCoordinator(dispose = disposePiCompatibilityP
 				nativeFallbacks: report?.unsupported.filter((item) => item.reason.includes("fallback")).length ?? 0,
 				piVersion: version.version ?? report?.piVersion ?? "unknown",
 				versionRange: report?.versionRange ?? ">=0.83.0 <0.84.0",
-				userMessage: surface(
-					"messages",
-					config.enabled && config.messages.enabled && config.messages.userPrefix,
-					Boolean(authorization?.user),
-					"native-user-message",
-				),
 				assistantMessage: surface(
 					"messages",
 					config.enabled && config.messages.enabled && config.messages.assistantPrefix,
@@ -116,15 +106,6 @@ export function createCompatibilityCoordinator(dispose = disposePiCompatibilityP
 			if (cleanupPending && !report) cleanupPending = false;
 			if (cleanupPending || !tui || !config.enabled || !authorization?.core || productDenied) return undefined;
 			const certifiedHost = detectPiVersion().version === "0.83.0";
-			const userEnabled =
-				authorization.user &&
-				isTierCAuthorized({
-					certifiedHost,
-					coreFlag: authorization.core,
-					surfaceFlag: true,
-					surface: "userMessage",
-					config,
-				});
 			const assistantEnabled =
 				authorization.assistant &&
 				isTierCAuthorized({
@@ -143,7 +124,7 @@ export function createCompatibilityCoordinator(dispose = disposePiCompatibilityP
 					surface: "specialBlocks",
 					config,
 				});
-			const messagesEnabled = (userEnabled || assistantEnabled || specialBlocksEnabled) && config.messages.enabled;
+			const messagesEnabled = (assistantEnabled || specialBlocksEnabled) && config.messages.enabled;
 			const toolsEnabled =
 				authorization.tools &&
 				isTierCAuthorized({ certifiedHost, coreFlag: authorization.core, surfaceFlag: true, surface: "tools", config });
@@ -155,7 +136,6 @@ export function createCompatibilityCoordinator(dispose = disposePiCompatibilityP
 					messages: {
 						...config.messages,
 						enabled: messagesEnabled,
-						userPrefix: userEnabled,
 						assistantPrefix: assistantEnabled,
 						specialBlocks: messagesEnabled && config.messages.specialBlocks && specialBlocksEnabled,
 					},
@@ -165,9 +145,7 @@ export function createCompatibilityCoordinator(dispose = disposePiCompatibilityP
 					},
 				},
 				messageSnapshot: {
-					userPrefix: authorization.ascii ? "[user] " : "❯ ",
 					assistantPrefix: authorization.ascii ? "[assistant] " : "│ ",
-					userEnabled,
 					assistantEnabled,
 				},
 				toolSnapshot: {

package/extension-src/pi-style/pi/compatibility-probe.ts

@@ -8,7 +8,6 @@ import {
 	CustomMessageComponent,
 	SkillInvocationMessageComponent,
 	ToolExecutionComponent,
-	UserMessageComponent,
 } from "@earendil-works/pi-coding-agent";
 import { decorateMessageRender, type MessageDecorationSnapshot } from "../features/messages/index.js";
 import { renderSpecialMessageBlock, type SpecialBlockSubtype } from "../features/messages/special-blocks.js";
@@ -31,7 +30,6 @@ const reportStates = new WeakMap<
 // code loaded before this module could spoof the same function source. We therefore
 // fail closed on every unrecorded Pi build and never use module-load capture as trust.
 export const TRUSTED_NATIVE_FINGERPRINTS: Readonly<Record<string, string>> = Object.freeze({
-	"native-user-message:render": "b442a17c",
 	"native-assistant-message:render": "2a39243f",
 	"native-compaction-message:updateDisplay": "f8c44e78",
 	"native-branch-message:updateDisplay": "415d57b7",
@@ -43,19 +41,6 @@ export const TRUSTED_NATIVE_FINGERPRINTS: Readonly<Record<string, string>> = Obj
 
 export const CERTIFICATION_TABLE = Object.freeze({
 	"0.83.0": Object.freeze({
-		"native-user-message:render": Object.freeze({
-			feature: "messages",
-			subtype: "native-user-message",
-			target: UserMessageComponent.prototype,
-			method: "render",
-			writable: true,
-			configurable: true,
-			name: "render",
-			arity: 1,
-			fingerprint: TRUSTED_NATIVE_FINGERPRINTS["native-user-message:render"],
-			adapterId: "message-prefix-osc133-v1",
-			status: "certified" as const,
-		}),
 		"native-assistant-message:render": Object.freeze({
 			feature: "messages",
 			subtype: "native-assistant-message",
@@ -232,14 +217,6 @@ function trustedNativeIdentity(spec: TargetSpec, piVersion: string | undefined):
 }
 
 export const targetSpecs: readonly TargetSpec[] = [
-	{
-		feature: "messages",
-		subtype: "native-user-message",
-		target: UserMessageComponent.prototype,
-		method: "render",
-		adapterId: "message-prefix-osc133-v1",
-		status: "certified",
-	},
 	{
 		feature: "messages",
 		subtype: "native-assistant-message",
@@ -404,7 +381,7 @@ function shape(target: object, method: string): boolean {
 export interface CompatibilityProbeOptions {
 	markers?: Set<string>;
 	config?: Readonly<{
-		messages: { enabled: boolean; userPrefix: boolean; assistantPrefix: boolean; specialBlocks: boolean };
+		messages: { enabled: boolean; assistantPrefix: boolean; specialBlocks: boolean };
 		tools: { enabled: boolean; style: string; maxCollapsedLines: number; maxExpandedLines: number; dimOutput: boolean };
 		preset: string;
 	}>;
@@ -450,7 +427,6 @@ function surfaceDisabled(spec: TargetSpec, config: CompatibilityProbeOptions["co
 	if (!config) return false;
 	if (spec.feature === "tools") return !config.tools.enabled;
 	if (!config.messages.enabled) return true;
-	if (spec.subtype === "native-user-message") return !config.messages.userPrefix;
 	if (spec.subtype === "native-assistant-message") return !config.messages.assistantPrefix;
 	if (isSpecialBlock(spec)) return !config.messages.specialBlocks;
 	return true;
@@ -496,14 +472,8 @@ function probeSpec(options: {
 						args,
 					) ?? Reflect.apply(original as (...values: unknown[]) => unknown, target, args)
 				);
-			if (spec.subtype === "native-user-message" || spec.subtype === "native-assistant-message")
-				return decorateMessageRender(
-					spec.subtype as "native-user-message" | "native-assistant-message",
-					original,
-					target,
-					args,
-					messageSnapshot,
-				);
+			if (spec.subtype === "native-assistant-message")
+				return decorateMessageRender(original, target, args, messageSnapshot);
 			return renderSpecialMessageBlock(spec.subtype as SpecialBlockSubtype, original, target, args);
 		},
 	});

package/extension-src/pi-style/pi/compatibility-registry.ts

@@ -1,5 +1,4 @@
 export type CompatibilitySubtype =
-	| "native-user-message"
 	| "native-assistant-message"
 	| "native-compaction-message"
 	| "native-branch-message"

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

@@ -8,7 +8,6 @@ export interface SessionFlagReader {
 }
 export interface SessionAuthorization {
 	core: boolean;
-	user: boolean;
 	assistant: boolean;
 	specialBlocks: boolean;
 	tools: boolean;
@@ -59,7 +58,6 @@ export function resolveProductGate(
 export function readSessionAuthorization(pi: SessionFlagReader): SessionAuthorization {
 	return {
 		core: pi.getFlag("pi-style-core-patches") === true,
-		user: pi.getFlag("pi-style-message-user") === true,
 		assistant: pi.getFlag("pi-style-message-assistant") === true,
 		specialBlocks: pi.getFlag("pi-style-message-special-blocks") === true,
 		tools: pi.getFlag("pi-style-tools") === true,

package/extension-src/pi-style/pi/index.ts

@@ -1,5 +1,6 @@
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { StatusSnapshot } from "../domain/status.js";
+import { closeActiveBatch } from "../features/tools/boxed/batch.js";
 import { registerPiStyleCommand } from "./commands.js";
 import { type CompatibilityTestHooks, createPiStyleSessionCoordinator } from "./session-coordinator.js";
 import { usageFromSession } from "./session-usage.js";
@@ -10,6 +11,24 @@ function usagePatch(ctx: ExtensionContext): StatusSnapshot {
 	return usage ? { usage } : {};
 }
 
+/**
+ * Add Pi's read-only tools (grep/find/ls) to the active tool set if they are
+ * registered. Preserves any other active tools (e.g. extension tools).
+ * Only calls setActiveTools when something actually changed.
+ */
+function activateReadOnlyTools(pi: ExtensionAPI): void {
+	const available = new Set(pi.getAllTools().map((tool) => tool.name));
+	const active = new Set(pi.getActiveTools());
+	let changed = false;
+	for (const name of ["grep", "find", "ls"] as const) {
+		if (available.has(name) && !active.has(name)) {
+			active.add(name);
+			changed = true;
+		}
+	}
+	if (changed) pi.setActiveTools([...active]);
+}
+
 let compatibilityTestHooks: CompatibilityTestHooks = {};
 export function __setCompatibilityTestHooks(hooks: CompatibilityTestHooks): () => void {
 	const previous = compatibilityTestHooks;
@@ -26,10 +45,10 @@ export default function piStyleExtension(pi: ExtensionAPI): void {
 	// product gate `compatibility.allowCorePatches: false` (or `enabled: false`) in config.
 	for (const [name, description] of [
 		["pi-style-core-patches", "Enable pi-style message/tool core patches"],
-		["pi-style-message-user", "Enable pi-style user message prefix"],
 		["pi-style-message-assistant", "Enable pi-style assistant message prefix"],
 		["pi-style-message-special-blocks", "Enable pi-style boxed compaction/skill/branch/custom message blocks"],
 		["pi-style-tools", "Enable pi-style tool renderer decoration"],
+		["pi-style-readonly-tools", "Enable grep/find/ls read-only tools in the active tool set"],
 	] as const)
 		pi.registerFlag(name, { type: "boolean", description, default: true });
 	// ASCII markers stay opt-in; unicode markers are the default.
@@ -37,6 +56,13 @@ export default function piStyleExtension(pi: ExtensionAPI): void {
 	const coordinator = createPiStyleSessionCoordinator(pi, compatibilityTestHooks);
 	registerPiStyleCommand(pi, coordinator.app);
 	pi.on("session_start", async (event, ctx) => {
+		// Pi only activates read/bash/edit/write by default; grep/find/ls are
+		// registered but inactive (kept out of the model's tool list to keep the
+		// core small). Activate them so the TUI shows them and the model can call
+		// them directly, mirroring Claude Code's glob/grep/read tool set.
+		if (pi.getFlag("pi-style-readonly-tools") === true) {
+			activateReadOnlyTools(pi);
+		}
 		await coordinator.start(event, ctx);
 	});
 	pi.on("agent_start", () => coordinator.app.runtime.current?.dismissStartup());
@@ -54,6 +80,14 @@ export default function piStyleExtension(pi: ExtensionAPI): void {
 	);
 	pi.on("thinking_level_select", (event) => coordinator.app.update({ thinkingLevel: event.level }, "immediate"));
 	pi.on("session_info_changed", (event) => coordinator.app.update({ sessionName: event.name }, "coalesced"));
+	pi.on("message_start", () => {
+		// A new message is a batch boundary: quiet-tool (read/ls/find) calls of the
+		// new message start a fresh batch instead of joining the previous one.
+		closeActiveBatch();
+		// grep/bash tree panels are NOT cleared here: historical panels must keep
+		// their state so Pi re-renders of previous messages (scroll/resume) stay
+		// intact. Only session boundaries reset them (session-coordinator).
+	});
 	pi.on("message_update", () => coordinator.app.update({}, "coalesced"));
 	// Usage (tokens + cost) is aggregated from finalized session entries at
 	// message/turn boundaries, mirroring Pi's native footer; per-chunk updates

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

@@ -2,8 +2,12 @@ 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, type ToolsRenderConfig } from "../features/tools/boxed/session-config.js";
 import { createCompatibilityCoordinator } from "./compatibility-coordinator.js";
 import {
 	type CompatibilityCleanupResult,
@@ -45,6 +49,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 +74,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 +101,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 +126,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 +145,11 @@ 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();
 			active = false;
 			await app.reload();
 			productGate = app.productPolicy.corePatchGate;
@@ -127,7 +157,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 +213,9 @@ export function createPiStyleSessionCoordinator(pi: ExtensionAPI, hooks: Compati
 			tuiSession = false;
 			terminalInputUnsubscribe?.();
 			terminalInputUnsubscribe = undefined;
+			resetBatchRegistry();
+			resetGrepRegistry();
+			resetBashTreeRegistry();
 			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

@@ -47,6 +47,14 @@ export interface BoxedRenderOptions {
 	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 +141,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,14 +331,21 @@ function formatBoxedStatusIcon(theme: BoxTheme, isError?: boolean): string {
 	return theme.fg(isError ? "error" : "success", icon);
 }
 
+/**
+ * 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 function formatBoxedToolTitle(theme: BoxTheme, name: string, isError?: boolean): string {
-	const rawTitle = `➔ ${name}`;
 	// 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} ✗`)
+		: `${formatToolTitlePrefix(theme, name)} ${formatBoxedStatusIcon(theme, false)}`;
 	return typeof theme?.bold === "function" ? theme.bold(coloredTitle) : coloredTitle;
 }
 
@@ -423,6 +438,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);
@@ -599,9 +630,12 @@ export function renderCompactBoxedToolCall(
 				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,7 +644,7 @@ export function renderCompactBoxedToolCall(
 						BOX_ROUND_BOTTOM_LEFT,
 						BOX_ROUND_BOTTOM_RIGHT,
 						compactFooter,
-						undefined,
+						options.bottomRightLabel,
 						renderedWidth,
 					),
 				);
@@ -622,7 +656,7 @@ export function renderCompactBoxedToolCall(
 						BOX_ROUND_BOTTOM_LEFT,
 						BOX_ROUND_BOTTOM_RIGHT,
 						theme.fg("dim", `… ${pendingText}`),
-						undefined,
+						options.bottomRightLabel,
 						renderedWidth,
 					),
 				);