@quandev104/pi-style 0.1.4 → 0.1.6

package/extension-src/pi-style/app/command-service.ts

@@ -56,6 +56,7 @@ const allowedPaths = new Set([
 	"tools.showElapsed",
 	"theme.nerdFonts",
 	"theme.terminalBackgroundSync",
+	"theme.autoApply",
 	"theme.colors",
 	"theme.glyphs",
 	"compatibility.allowSafePatches",
@@ -93,6 +94,7 @@ function validatePathValue(path: string, value: unknown): boolean {
 	if (path === "startup.mode") return typeof value === "string" && startupModes.includes(value);
 	if (path === "editor.style") return typeof value === "string" && styles.includes(value);
 	if (path === "editor.frame") return typeof value === "string" && frames.includes(value);
+	if (path === "theme.autoApply") return typeof value === "string" && value !== "";
 	if (["theme.nerdFonts", "theme.terminalBackgroundSync", "statusLine.separator", "tools.style"].includes(path))
 		return typeof value === "string";
 	if (path === "tools.maxCollapsedLines" || path === "tools.maxExpandedLines")

package/extension-src/pi-style/domain/config-authorization.ts

@@ -1,16 +1,19 @@
 import type { NormalizedPiStyleConfig } from "./config-types.js";
 
 export interface TierCAuthorizationInput {
-	readonly certifiedHost: boolean;
 	readonly coreFlag: boolean;
 	readonly surfaceFlag: boolean;
 	readonly surface: "messages" | "tools" | "assistantMessage" | "specialBlocks";
 	readonly config: NormalizedPiStyleConfig;
 }
 
-/** Persisted and ordinary command state is intentionally not an input: authorization is session-bound. */
+/**
+ * Tier C surface authorization is session-bound to the core/surface flags and
+ * normalized config; runtime compatibility is decided per-surface by the probe's
+ * identity (fingerprint) check, never by a hard-pinned Pi version.
+ */
 export function isTierCAuthorized(input: TierCAuthorizationInput): boolean {
-	if (!input.certifiedHost || !input.coreFlag || !input.surfaceFlag || !input.config.enabled) return false;
+	if (!input.coreFlag || !input.surfaceFlag || !input.config.enabled) return false;
 	if (input.surface === "tools") return input.config.tools.enabled;
 	if (input.surface === "assistantMessage")
 		return input.config.messages.enabled && input.config.messages.assistantPrefix;

package/extension-src/pi-style/domain/config-normalization.ts

@@ -27,7 +27,7 @@ export const DEFAULT_CONFIG: NormalizedPiStyleConfig = Object.freeze({
 		bottomMargin: 1,
 		contextBarWidth: 10,
 	}),
-	editor: Object.freeze({ enabled: true, style: "compact", frame: "auto", showMetadata: false }),
+	editor: Object.freeze({ enabled: true, style: "dock", frame: "rounded", showMetadata: false, hint: "" }),
 	messages: Object.freeze({ enabled: true, assistantPrefix: true, specialBlocks: true, hideThinkingLabel: true }),
 	tools: Object.freeze({
 		enabled: true,
@@ -37,7 +37,13 @@ export const DEFAULT_CONFIG: NormalizedPiStyleConfig = Object.freeze({
 		dimOutput: false,
 		showElapsed: true,
 	}),
-	theme: Object.freeze({ nerdFonts: "auto", terminalBackgroundSync: "auto", colors: {}, glyphs: {} }),
+	theme: Object.freeze({
+		nerdFonts: "auto",
+		terminalBackgroundSync: "auto",
+		autoApply: "titanium",
+		colors: {},
+		glyphs: {},
+	}),
 	compatibility: Object.freeze({
 		allowSafePatches: true,
 		allowCorePatches: false,
@@ -152,10 +158,11 @@ export function normalizeConfig(
 			style: stringEnum(editor.style, ["compact", "boxed", "dock", "native"], defaults.editor.style),
 			frame: stringEnum(
 				editor.frame,
-				["auto", "halfblock", "line", "solid", "outline", "native"],
+				["auto", "halfblock", "line", "solid", "outline", "rounded", "native"],
 				defaults.editor.frame,
 			),
 			showMetadata: bool(editor.showMetadata, defaults.editor.showMetadata),
+			hint: typeof editor.hint === "string" ? editor.hint : defaults.editor.hint,
 		}),
 		messages: Object.freeze({
 			enabled: bool(messages.enabled, defaults.messages.enabled),
@@ -178,6 +185,10 @@ export function normalizeConfig(
 				["auto", "on", "off"],
 				defaults.theme.terminalBackgroundSync,
 			),
+			autoApply:
+				typeof theme.autoApply === "string" && theme.autoApply.trim() !== ""
+					? theme.autoApply
+					: defaults.theme.autoApply,
 			colors: stringMap(theme.colors),
 			glyphs: stringMap(theme.glyphs),
 		}),
@@ -201,7 +212,7 @@ const ENUMS: Readonly<Record<string, readonly string[]>> = {
 	placement: ["above", "below"],
 	"startup.mode": ["off", "compact", "overlay"],
 	"editor.style": ["compact", "boxed", "dock", "native"],
-	"editor.frame": ["auto", "halfblock", "line", "solid", "outline", "native"],
+	"editor.frame": ["auto", "halfblock", "line", "solid", "outline", "rounded", "native"],
 	"theme.nerdFonts": ["auto", "on", "off"],
 	"theme.terminalBackgroundSync": ["auto", "on", "off"],
 };
@@ -259,7 +270,9 @@ function validCustomItem(item: unknown): boolean {
 function validLeaf(path: string, value: unknown): boolean {
 	if (BOOL_PATHS.has(path)) return typeof value === "boolean";
 	if (ENUMS[path]) return typeof value === "string" && ENUMS[path].includes(value);
-	if (path === "statusLine.separator" || path === "tools.style") return typeof value === "string";
+	if (path === "theme.autoApply") return typeof value === "string" && value !== "";
+	if (path === "statusLine.separator" || path === "tools.style" || path === "editor.hint")
+		return typeof value === "string";
 	if (path === "tools.maxCollapsedLines" || path === "tools.maxExpandedLines")
 		return typeof value === "number" && Number.isFinite(value) && value >= 0;
 	if (path === "statusLine.bottomMargin" || path === "statusLine.contextBarWidth")
@@ -482,6 +495,8 @@ export function resolveConfigDetailed(sources: ConfigSources): {
 		envPatch.theme = { nerdFonts: env.PI_STYLE_NERD_FONTS === "1" ? "on" : "off" };
 	if (env.PI_STYLE_EDITOR && ["native", "compact", "boxed", "dock"].includes(env.PI_STYLE_EDITOR))
 		envPatch.editor = { style: env.PI_STYLE_EDITOR };
+	if (env.PI_STYLE_THEME !== undefined && env.PI_STYLE_THEME !== "")
+		envPatch.theme = { ...(envPatch.theme ?? {}), autoApply: env.PI_STYLE_THEME };
 	if (env.PI_STYLE_OSC11 === "1" || env.PI_STYLE_OSC11 === "0")
 		envPatch.theme = { ...(envPatch.theme ?? {}), terminalBackgroundSync: env.PI_STYLE_OSC11 === "1" ? "on" : "off" };
 	if (env.PI_STYLE_DEBUG === "1") envPatch.debug = true;
@@ -526,6 +541,7 @@ export function resolveConfigDetailed(sources: ConfigSources): {
 				"PI_STYLE_OSC11",
 				"PI_STYLE_DEBUG",
 				"PI_STYLE_STATUS",
+				"PI_STYLE_THEME",
 			].includes(key)
 		)
 			diagnostics.push({

package/extension-src/pi-style/domain/config-presets.ts

@@ -42,7 +42,7 @@ export const CONFIG_PRESETS: Readonly<Record<PresetName, Readonly<PiStyleConfig>
 		startup: { mode: "off" },
 		messages: { enabled: false },
 		tools: { enabled: false },
-		theme: { terminalBackgroundSync: "off" },
+		theme: { terminalBackgroundSync: "off", autoApply: "off" },
 	}),
 });
 

package/extension-src/pi-style/domain/config-types.ts

@@ -5,7 +5,7 @@ export type NerdFontsMode = "auto" | "on" | "off";
 export type ToggleMode = "auto" | "on" | "off";
 export type PresetName = "default" | "minimal" | "compact" | "full" | "ascii" | "native";
 export type EditorStyle = "compact" | "boxed" | "dock" | "native";
-export type EditorFrame = "auto" | "halfblock" | "line" | "solid" | "outline" | "native";
+export type EditorFrame = "auto" | "halfblock" | "line" | "solid" | "outline" | "rounded" | "native";
 
 export interface StatusCustomItemConfig {
 	id: string;
@@ -31,7 +31,7 @@ export interface PiStyleConfig {
 		/** Context progress-bar cell count (default 10). */
 		contextBarWidth?: number;
 	};
-	editor?: { enabled?: boolean; style?: string; frame?: string; showMetadata?: boolean };
+	editor?: { enabled?: boolean; style?: string; frame?: string; showMetadata?: boolean; hint?: string };
 	messages?: { enabled?: boolean; assistantPrefix?: boolean; specialBlocks?: boolean; hideThinkingLabel?: boolean };
 	tools?: {
 		enabled?: boolean;
@@ -44,6 +44,8 @@ export interface PiStyleConfig {
 	theme?: {
 		nerdFonts?: string;
 		terminalBackgroundSync?: string;
+		/** Pi theme name auto-applied at TUI session start ("off" disables; default "titanium"). */
+		autoApply?: string;
 		colors?: Record<string, unknown>;
 		glyphs?: Record<string, unknown>;
 	};
@@ -78,7 +80,7 @@ export interface NormalizedPiStyleConfig {
 		/** Context progress-bar cell count. */
 		contextBarWidth: number;
 	};
-	readonly editor: { enabled: boolean; style: EditorStyle; frame: EditorFrame; showMetadata: boolean };
+	readonly editor: { enabled: boolean; style: EditorStyle; frame: EditorFrame; showMetadata: boolean; hint: string };
 	readonly messages: { enabled: boolean; assistantPrefix: boolean; specialBlocks: boolean; hideThinkingLabel: boolean };
 	readonly tools: {
 		enabled: boolean;
@@ -91,6 +93,8 @@ export interface NormalizedPiStyleConfig {
 	readonly theme: {
 		nerdFonts: NerdFontsMode;
 		terminalBackgroundSync: ToggleMode;
+		/** Pi theme name auto-applied at TUI session start; "off" disables the surface. */
+		autoApply: string;
 		colors: Readonly<Record<string, string>>;
 		glyphs: Readonly<Record<string, string>>;
 	};

package/extension-src/pi-style/domain/theme.ts

@@ -35,7 +35,8 @@ export type SemanticToken =
 	| "cache"
 	| "cost"
 	| "time"
-	| "separator";
+	| "separator"
+	| "hint";
 
 /** Structural view of Pi's theme. fg/bg follow Pi's `(color, text) => string` shape. */
 export interface ActiveTheme {
@@ -94,6 +95,7 @@ const SEMANTIC_COLORS: Record<SemanticToken, string> = {
 	cost: "text",
 	time: "muted",
 	separator: "dim",
+	hint: "#8a8a8a",
 };
 
 const GLYPHS = {
@@ -108,6 +110,7 @@ const GLYPHS = {
 		powerlineThinLeft: "\uE0B1",
 		powerlineThinRight: "\uE0B3",
 		batchOpen: "\u{F111}",
+		bashPrompt: "\u{F12A}",
 	},
 	unicode: {
 		pi: "π",
@@ -120,6 +123,7 @@ const GLYPHS = {
 		powerlineThinLeft: "│",
 		powerlineThinRight: "│",
 		batchOpen: "●",
+		bashPrompt: "$",
 	},
 	ascii: {
 		pi: "pi",
@@ -132,6 +136,7 @@ const GLYPHS = {
 		powerlineThinLeft: "|",
 		powerlineThinRight: "|",
 		batchOpen: "v",
+		bashPrompt: "$",
 	},
 } as const;
 

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

@@ -53,6 +53,58 @@ function isNativeBorderLine(line: string): boolean {
 	return /^─{2,}$/.test(stripped) || /^─── [↑↓] \d+ more /.test(stripped);
 }
 
+/**
+ * Remove `count` leading visible characters from an ANSI-rendered editor line,
+ * preserving escape sequences (CSI/OSC/APC/DCS) verbatim. Used to hide the
+ * bash-mode `!` prefix; the CURSOR_MARKER and cursor-block sequences pass
+ * through unchanged so hardware-cursor placement stays aligned.
+ */
+function stripLeadingVisibleChars(line: string, count: number): string {
+	if (count <= 0 || line.length === 0) return line;
+	let output = "";
+	let stripped = 0;
+	let index = 0;
+	while (index < line.length) {
+		const char = line[index] ?? "";
+		if (char === "\x1b") {
+			const start = index;
+			index++;
+			const intro = line[index];
+			if (intro === "[") {
+				index++;
+				while (index < line.length) {
+					const byte = line[index] ?? "";
+					index++;
+					if (byte >= "@" && byte <= "~") break;
+				}
+			} else if (intro === "]" || intro === "_" || intro === "^" || intro === "P") {
+				index++;
+				while (index < line.length) {
+					const byte = line[index] ?? "";
+					if (byte === "\x1b" && line[index + 1] === "\\") {
+						index += 2;
+						break;
+					}
+					index++;
+					if (byte === "\x07") break;
+				}
+			} else if (intro !== undefined) {
+				index++;
+			}
+			output += line.slice(start, index);
+			continue;
+		}
+		if (stripped < count) {
+			stripped++;
+			index++;
+			continue;
+		}
+		output += char;
+		index++;
+	}
+	return output;
+}
+
 function semanticTheme(theme: PiEditorTheme, config: NormalizedPiStyleConfig): ResolvedTheme {
 	const editorTheme = theme;
 	return resolveTheme(
@@ -118,6 +170,7 @@ export class StyledEditor extends CustomEditor implements EditorComponent {
 	override render(width: number): string[] {
 		if (width <= 0) return [];
 		const nativeLines = super.render(width);
+		const style = this.styleFor(width);
 		// Autocomplete (slash menu / @-mentions) restructure: Pi draws the
 		// suggestions after its own bottom border, which pushes the below-editor
 		// widgets (status line) down. Re-frame the native output so the dropdown
@@ -125,7 +178,7 @@ export class StyledEditor extends CustomEditor implements EditorComponent {
 		// Native layout: [top border, text lines, bottom border, dropdown lines...].
 		if ((this as unknown as { autocompleteState?: unknown }).autocompleteState) {
 			const prompt = this.prompt();
-			const padding = this.paddingFor(width, this.styleFor(width));
+			const padding = this.paddingFor(width, style);
 			const promptWidth = widthOf(prompt) + 1;
 			const prefix = `${" ".repeat(padding)}${prompt} `;
 			const continuation = " ".repeat(padding + promptWidth);
@@ -133,31 +186,63 @@ export class StyledEditor extends CustomEditor implements EditorComponent {
 			const split = borderIndex >= 0 ? borderIndex + 1 : nativeLines.length;
 			const body = nativeLines.slice(1, split);
 			const dropdown = nativeLines.slice(split);
-			const border = this.borderFor(width);
-			const renderedBody = body.map((line, index) => widthSafe(`${index === 0 ? prefix : continuation}${line}`, width));
-			return [
-				border("─".repeat(width)),
-				...renderedBody,
-				...dropdown.map((line) => widthSafe(line, width)),
-				border("─".repeat(width)),
-			];
+			const border = this.borderFor();
+			const kind = this.frameKind(style);
+			const renderWidth = width - (kind === "rounded" ? 2 : 0);
+			const sideColor = kind === "rounded" ? this.borderColorFor() : undefined;
+			const wrap = (line: string) =>
+				kind === "rounded" && sideColor ? `${sideColor("│")}${line}${sideColor("│")}` : line;
+			const bashHidden = this.bashHiddenCount();
+			const renderedBody = body.map((line, index) => {
+				const source = index === 0 && bashHidden > 0 ? stripLeadingVisibleChars(line, bashHidden) : line;
+				return wrap(widthSafe(`${index === 0 ? prefix : continuation}${source}`, renderWidth));
+			});
+			const dropdownLines = dropdown.map((line) => wrap(widthSafe(line, renderWidth)));
+			if (kind === "rounded") {
+				return [
+					border(`╭${"─".repeat(Math.max(0, width - 2))}╮`),
+					...renderedBody,
+					...dropdownLines,
+					border(`╰${"─".repeat(Math.max(0, width - 2))}╯`),
+				];
+			}
+			return [border("─".repeat(width)), ...renderedBody, ...dropdownLines, border("─".repeat(width))];
 		}
-		const style = this.styleFor(width);
 		if (style === "native") return nativeLines.map((line) => widthSafe(line, width));
 
 		const prompt = this.prompt();
 		const promptWidth = widthOf(prompt) + 1;
 		const padding = this.paddingFor(width, style);
-		const innerWidth = Math.max(1, width - promptWidth - padding * 2);
+		const kind = this.frameKind(style);
+		const sideReserve = kind === "rounded" ? 2 : 0;
+		const renderWidth = Math.max(1, width - sideReserve);
+		const innerWidth = Math.max(1, renderWidth - promptWidth - padding * 2);
 		const innerLines = super.render(innerWidth);
 		if (innerLines.length === 0) return [];
 
 		const body = innerLines.slice(1, -1);
 		const prefix = `${" ".repeat(padding)}${prompt} `;
 		const continuation = " ".repeat(padding + promptWidth);
+		const hint = this.config.editor.hint;
+		const showHint = hint !== "" && this.getText() === "";
+		const bashHidden = this.bashHiddenCount();
 		const renderedBody = body.map((line, index) => {
 			const lead = index === 0 ? prefix : continuation;
-			return widthSafe(`${lead}${line}`, width);
+			const source = index === 0 && bashHidden > 0 ? stripLeadingVisibleChars(line, bashHidden) : line;
+			let content = `${lead}${source}`;
+			// Empty-input hint: the cursor block (first cell of the native empty
+			// line) stays at the input position, the dim hint trails it. The native
+			// line is pre-padded to renderWidth with literal spaces; drop them from
+			// the raw end (safe: no ANSI follows the padding) before appending the
+			// hint, or the hint is truncated away by widthSafe. Typing any character
+			// makes the text non-empty and the hint disappears.
+			if (showHint && index === 0 && line) {
+				let end = content.length;
+				while (end > 0 && content[end - 1] === " ") end--;
+				if (end < content.length) content = content.slice(0, end);
+				content += this.semantic.apply("hint", hint);
+			}
+			return widthSafe(content, renderWidth);
 		});
 		const metadata = this.metadata(width, style);
 		const framed = this.frame(width, style, renderedBody, metadata);
@@ -171,11 +256,41 @@ export class StyledEditor extends CustomEditor implements EditorComponent {
 	}
 
 	private prompt(): string {
+		if (this.isBashMode()) {
+			// Bash mode (`!` prefix): the prompt glyph becomes the bash icon and the
+			// leading `!` is hidden from the input text. The glyph takes the live
+			// border color (pi sets editor.borderColor to the bashMode color).
+			const glyph = this.semantic.glyph("bashPrompt");
+			return this.borderColor(glyph);
+		}
 		const configured = this.config.theme.glyphs.prompt;
 		if (configured) return configured;
 		return this.semantic.mode === "ascii" ? ">" : "❯";
 	}
 
+	/** Pi's bash mode: the input starts with `!` after optional whitespace. */
+	private isBashMode(): boolean {
+		return this.getText().trimStart().startsWith("!");
+	}
+
+	/**
+	 * Number of leading `!` characters to hide from the displayed input while
+	 * bash mode is active. Characters under the cursor are never hidden, so the
+	 * native cursor block stays visible when the cursor sits on a `!`.
+	 */
+	private bashHiddenCount(): number {
+		const text = this.getText();
+		let index = 0;
+		while (index < text.length && (text[index] === " " || text[index] === "\t")) index++;
+		const runStart = index;
+		while (index < text.length && text[index] === "!") index++;
+		const run = index - runStart;
+		if (run === 0) return 0;
+		const cursor = this.getCursor();
+		const position = cursor.line === 0 ? cursor.col : Number.POSITIVE_INFINITY;
+		return Math.min(run, Math.max(0, position - runStart));
+	}
+
 	private styleFor(width: number): "compact" | "boxed" | "dock" | "native" {
 		if (width < 20) return "native";
 		if (["compact", "boxed", "dock", "native"].includes(this.config.editor.style)) {
@@ -186,17 +301,40 @@ export class StyledEditor extends CustomEditor implements EditorComponent {
 		return "compact";
 	}
 
+	/**
+	 * Resolve the frame treatment for a style: horizontal bars for compact,
+	 * full-width bars for boxed, an outlined box for dock, and a rounded box
+	 * with side borders (`╭─╮ │ │ ╰─╯`) for `frame: "rounded"`.
+	 */
+	private frameKind(
+		style: "compact" | "boxed" | "dock" | "native",
+	): "compact" | "boxed" | "outline" | "rounded" | "native" {
+		const frame = this.config.editor.frame;
+		if (style === "compact" || frame === "line" || frame === "solid") return "compact";
+		if (style === "boxed") return "boxed";
+		if (frame === "native") return "native";
+		if (frame === "rounded") return "rounded";
+		return "outline";
+	}
+
 	private paddingFor(width: number, style: "compact" | "boxed" | "dock" | "native"): number {
 		if (width < 50) return 0;
 		return style === "boxed" ? 2 : style === "dock" ? 1 : 1;
 	}
 
-	private borderFor(width: number): (line: string) => string {
-		// Sync the frame color with the active thinking level, matching Pi's native editor.
+	private borderFor(): (line: string) => string {
+		return (line: string) => this.borderColorFor()(line);
+	}
+
+	/** Raw border color function (thinking-synced) WITHOUT full-width padding, for single glyphs. */
+	private borderColorFor(): (line: string) => string {
+		// While bash mode is active pi keeps editor.borderColor set to the
+		// bashMode color (its native updateEditorBorderColor path); prefer it over
+		// the thinking-level color so the whole frame switches to the bash color.
+		if (this.isBashMode()) return this.borderColor;
 		const level = this.snapshot.thinkingLevel;
 		const thinking = this.fullTheme?.getThinkingBorderColor?.(level ?? "off");
-		const border = thinking ?? this.piTheme.borderColor;
-		return (line: string) => border(widthSafe(line, width));
+		return thinking ?? this.piTheme.borderColor;
 	}
 
 	private frame(
@@ -205,23 +343,27 @@ export class StyledEditor extends CustomEditor implements EditorComponent {
 		body: string[],
 		metadata: string[],
 	): string[] {
-		const border = this.borderFor(width);
-		const lineMode = this.config.editor.frame === "line" || this.config.editor.frame === "solid";
-		if (style === "compact" || lineMode) {
+		const border = this.borderFor();
+		const kind = this.frameKind(style);
+		if (kind === "compact") {
 			// Match Pi's native editor: a horizontal border above and below the input.
 			return [border("─".repeat(width)), ...body, border("─".repeat(width)), ...metadata];
 		}
-		if (style === "boxed") {
+		if (kind === "boxed") {
 			const glyph = this.config.editor.frame === "halfblock" ? "▀" : "━";
 			return [border(glyph.repeat(width)), ...body, border(glyph.repeat(width)), ...metadata];
 		}
-		if (this.config.editor.frame === "native") return body;
-		return [
-			border(`┌${"─".repeat(Math.max(0, width - 2))}┐`),
-			...body,
-			border(`└${"─".repeat(Math.max(0, width - 2))}┘`),
-			...metadata,
-		];
+		if (kind === "native") return body;
+		const inner = Math.max(0, width - 2);
+		if (kind === "rounded") {
+			// Rounded box with vertical side borders: `╭─╮ / │ text │ / ╰─╯`.
+			// Body lines were rendered at width - 2; re-fit defensively, then wrap.
+			// Side glyphs use the raw border color (no full-width padding, unlike border()).
+			const sideColor = this.borderColorFor();
+			const side = (line: string) => `${sideColor("│")}${widthSafe(line, inner)}${sideColor("│")}`;
+			return [border(`╭${"─".repeat(inner)}╮`), ...body.map(side), border(`╰${"─".repeat(inner)}╯`), ...metadata];
+		}
+		return [border(`┌${"─".repeat(inner)}┐`), ...body, border(`└${"─".repeat(inner)}┘`), ...metadata];
 	}
 
 	private metadata(width: number, style: "compact" | "boxed" | "dock" | "native"): string[] {

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

@@ -176,6 +176,8 @@ function prefixNative(lines: unknown, width: number, prefix: string): string[] |
 export type MessageDecorationSnapshot = Readonly<{
 	assistantPrefix: string;
 	assistantEnabled: boolean;
+	/** Drop the hidden-thinking label row and its trailing spacer (zero-trace collapse). */
+	collapseHiddenThinking: boolean;
 }>;
 
 export function decorateMessageRender(
@@ -185,6 +187,7 @@ export function decorateMessageRender(
 	snapshot: MessageDecorationSnapshot = {
 		assistantPrefix: "│ ",
 		assistantEnabled: true,
+		collapseHiddenThinking: false,
 	},
 ): unknown {
 	if (typeof original !== "function") return undefined;
@@ -199,4 +202,67 @@ export function decorateMessageRender(
 	return prefixNative(native, width, prefix) ?? native;
 }
 
+/** Spacer-like: renders empty lines and exposes only setLines among these surfaces. */
+function isSpacerChild(child: unknown): boolean {
+	return typeof (child as { setLines?: unknown } | undefined)?.setLines === "function";
+}
+
+/**
+ * The hidden-thinking placeholder: a Text (setCustomBgFn) whose ANSI-stripped
+ * rendered content is empty. Duck-typed on the public shape because
+ * pi-coding-agent may resolve its own nested pi-tui copy, so `instanceof`
+ * across that module boundary is unreliable.
+ */
+function isBlankTextChild(child: unknown): boolean {
+	const candidate = child as { setCustomBgFn?: unknown; render?: (width: number) => string[] } | undefined;
+	if (typeof candidate?.setCustomBgFn !== "function" || typeof candidate.render !== "function") return false;
+	return contentText(candidate.render(0).join("\n")).trim() === "";
+}
+
+/**
+ * Collapse Pi's hidden-thinking placeholder row to zero trace.
+ *
+ * Native `AssistantMessageComponent.updateContent` renders the thinking block as
+ * `Text(theme.italic(theme.fg("thinkingText", label)), outputPad, 0)` plus a
+ * trailing `Spacer(1)`. An empty label is still wrapped in ANSI SGR codes, so
+ * `Text.render` cannot treat it as empty (its check is `text.trim() === ""`,
+ * and trim does not strip escape sequences) and emits one full-width invisible
+ * line. That invisible row plus the surrounding spacers is the "gap" left when
+ * the label is hidden. This wrapper runs the native layout, then drops the
+ * invisible label row and the spacer the native layout appends after the
+ * thinking run, leaving the same single top padding as a text-only message.
+ */
+export function decorateMessageUpdate(
+	original: unknown,
+	instance: object,
+	args: unknown[],
+	snapshot: MessageDecorationSnapshot = {
+		assistantPrefix: "│ ",
+		assistantEnabled: true,
+		collapseHiddenThinking: false,
+	},
+): unknown {
+	if (typeof original !== "function") return undefined;
+	const result = Reflect.apply(original, instance, args);
+	if (!snapshot.collapseHiddenThinking) return result;
+	const target = instance as {
+		hideThinkingBlock?: boolean;
+		hiddenThinkingLabel?: string;
+		contentContainer?: { children?: unknown[] };
+	};
+	// Only meaningful when Pi renders the hidden-block label (hideThinkingBlock)
+	// and the extension has blanked that label out ("" — the zero-trace mode).
+	if (target.hideThinkingBlock !== true || target.hiddenThinkingLabel !== "") return result;
+	const children = target.contentContainer?.children;
+	if (!children) return result;
+	for (let index = children.length - 1; index >= 0; index--) {
+		if (!isBlankTextChild(children[index])) continue;
+		children.splice(index, 1);
+		// Drop the Spacer(1) the native layout appends after the thinking run when
+		// another visible block follows; the message keeps only its shared top padding.
+		if (isSpacerChild(children[index])) children.splice(index, 1);
+	}
+	return result;
+}
+
 // Special private layouts are intentionally not installed; their prototypes remain native.