@quandev104/pi-style 0.1.1 → 0.1.3

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

@@ -1,204 +1,47 @@
 // Boxed read tool renderer
 // (renderCall/renderResult only; no tool re-registration).
+//
+// Read calls render as a boxless tree panel — a lone read is a batch of one,
+// consecutive reads group into one panel (see batch.ts). There is no boxed
+// single-call special case.
 
-import { getLanguageFromPath, highlightCode } from "@earendil-works/pi-coding-agent";
 import { stripAnsi } from "../../../shared/ansi.js";
-import type { BoxTheme } from "../../../shared/box.js";
+import { getTextOutput } from "../../../shared/box.js";
 import {
-	boxedToolWidthKey,
-	countLines,
-	extractTrailingNotice,
-	getTextOutput,
-	renderBoxedToolResult,
-	stripTrailingNotice,
-} from "../../../shared/box.js";
-import { safeTruncateToWidth } from "../../../shared/render-budget.js";
-import { getToolsRenderConfig } from "./session-config.js";
-import {
-	type BoxedToolDefinition,
-	clearFooterState,
-	compactCall,
-	compactFooterWithState,
-	noteExecutionStart,
-	pathRangeDetail,
-	resultFooterLines,
-	truncationOutputLines,
-} from "./shared.js";
-
-const MAX_HIGHLIGHT_OUTPUT_CHARS = 12000;
-const MAX_HIGHLIGHT_OUTPUT_LINES = 300;
-
-type NumberedReadLine = {
-	lineNumber: string;
-	content: string;
-};
-
-type ParsedReadOutput = {
-	fileHash: string | undefined;
-	numberedLines?: NumberedReadLine[];
-	body: string;
-};
-
-function parseReadOutput(text: string): ParsedReadOutput {
-	const fileHashMatch = text.match(/^fileHash: ([^\n]+)\n\n/);
-	const body = fileHashMatch ? text.slice(fileHashMatch[0].length) : text;
-	const rawLines = body ? body.split("\n") : [];
-	const numberedLines = rawLines.map((line) => line.match(/^\s*(\d+)\| ?(.*)$/));
-
-	if (numberedLines.length > 0 && numberedLines.every(Boolean)) {
-		return {
-			fileHash: fileHashMatch?.[1],
-			body: numberedLines.map((match) => match?.[2] ?? "").join("\n"),
-			numberedLines: numberedLines.map((match) => ({
-				lineNumber: match?.[1] ?? "",
-				content: match?.[2] ?? "",
-			})),
-		};
-	}
-
-	return { fileHash: fileHashMatch?.[1], body };
-}
-
-function renderReadBody(
-	theme: BoxTheme,
-	options: { expanded: boolean },
-	parsed: ParsedReadOutput,
-	output: string,
-	truncationNotice: string | null,
-): { render(width: number): string[]; invalidate(): void } {
-	let cacheKey = "";
-	let cacheLines: string[] | null = null;
-	return {
-		invalidate() {
-			cacheKey = "";
-			cacheLines = null;
-		},
-		render(width: number): string[] {
-			const renderWidth = Math.max(1, width);
-			const cfg = getToolsRenderConfig();
-			const maxLines = cfg.maxExpandedLines;
-			const expanded = Boolean(options.expanded);
-			const cacheId = `${renderWidth}|${expanded ? 1 : 0}|${maxLines}|${cfg.dimOutput ? 1 : 0}`;
-			if (cacheLines && cacheKey === cacheId) return cacheLines;
-
-			const linesRead = parsed.numberedLines?.length ?? countLines(parsed.body);
-			const summary = theme.fg("dim", `↳ Read ${linesRead} ${linesRead === 1 ? "line" : "lines"}.`);
-			const footer: string[] = [];
-			if (truncationNotice) footer.push(theme.fg("warning", truncationNotice));
-			footer.push("", summary);
-			const budget = maxLines > 0 ? maxLines - footer.length : 0;
-			const renderPlain = (text: string): string[] => {
-				const out: string[] = [];
-				for (const line of text.split("\n")) {
-					out.push(safeTruncateToWidth(theme.fg("toolOutput", line), renderWidth, "…"));
-				}
-				return out;
-			};
-			const lineCount = parsed.numberedLines?.length ?? countLines(parsed.body);
-			const shouldHighlight =
-				expanded &&
-				Boolean(getLanguageFromPath(output)) &&
-				parsed.body.length <= MAX_HIGHLIGHT_OUTPUT_CHARS &&
-				lineCount <= MAX_HIGHLIGHT_OUTPUT_LINES;
-
-			const renderBody = (): string[] => {
-				if (!parsed.numberedLines)
-					return renderPlain(parsed.fileHash ? `fileHash: ${parsed.fileHash}\n\n${parsed.body}` : parsed.body);
-
-				let bodyLines = parsed.body.split("\n").map((line) => theme.fg("toolOutput", line));
-				const lang = getLanguageFromPath(output);
-				if (shouldHighlight && lang) {
-					try {
-						bodyLines = highlightCode(parsed.body, lang);
-					} catch {
-						bodyLines = parsed.body.split("\n").map((line) => theme.fg("toolOutput", line));
-					}
-				}
-
-				const out: string[] = [];
-				if (parsed.fileHash) out.push(theme.fg("muted", `fileHash: ${parsed.fileHash}`), "");
-
-				const numberWidth = Math.max(...parsed.numberedLines.map((line) => line.lineNumber.length));
-				const gutterWidth = numberWidth + 3;
-				const contentWidth = Math.max(1, renderWidth - gutterWidth);
-				for (let i = 0; i < parsed.numberedLines.length; i++) {
-					const numberedLine = parsed.numberedLines[i] ?? { lineNumber: "", content: "" };
-					const bodyLine = safeTruncateToWidth(bodyLines[i] ?? "", contentWidth, "…");
-					const gutter = theme.fg("dim", `${numberedLine.lineNumber.padStart(numberWidth)} │ `);
-					out.push(`${gutter}${bodyLine}`);
-				}
-				return out;
-			};
-
-			const highlighted = renderBody();
-			if (maxLines > 0 && highlighted.length > budget) {
-				const truncated = highlighted.slice(0, budget);
-				const remaining = highlighted.length - budget;
-				truncated.push(theme.fg("dim", `… ${remaining} more lines`));
-				truncated.push(...footer);
-				cacheKey = cacheId;
-				cacheLines = truncated;
-				return cacheLines;
-			}
-			highlighted.push(...footer);
-			cacheKey = cacheId;
-			cacheLines = highlighted;
-			return cacheLines;
-		},
-	};
-}
+	type BatchToolMeta,
+	EMPTY_BATCH_COMPONENT,
+	emptyBatchResult,
+	registerBatchCall,
+	registerBatchResult,
+	renderBatchAwareCall,
+} from "./batch.js";
+import { type BoxedToolDefinition, noteExecutionStart, pathRangeDetail } from "./shared.js";
+
+const READ_META: BatchToolMeta = Object.freeze({
+	toolName: "read",
+	label: "Read",
+});
 
 export const readTool: BoxedToolDefinition = {
 	call(args, theme, context) {
 		noteExecutionStart(context);
 		const rawPath = String(args?.path ?? args?.file_path ?? "");
 		const detail = pathRangeDetail(rawPath, args?.offset, args?.limit, context);
-		return compactCall(theme, "Read", `${theme.fg("dim", "Path: ")}${detail}`, {
-			detailKey: detail,
-			context,
-		});
+		const { isLeader, batch } = registerBatchCall(READ_META, detail, context);
+		if (!isLeader) return EMPTY_BATCH_COMPONENT;
+		return renderBatchAwareCall(theme, batch);
 	},
-	result(result, options, theme, context) {
-		clearFooterState(context);
+	result(result, options, _theme, context) {
 		const output = stripAnsi(getTextOutput(result)).trimEnd();
-		const rawPath = String(context?.args?.path ?? context?.args?.file_path ?? "");
-		const detail = pathRangeDetail(rawPath, context?.args?.offset, context?.args?.limit, context);
-		const widthKey = boxedToolWidthKey("Read", detail);
-
-		if (context.isError) {
-			return renderBoxedToolResult(theme, () => [theme.fg("error", output || "Error")], {
-				widthKey,
-				footerLines: resultFooterLines(theme, result, context),
-				isError: true,
-			});
-		}
-
-		const imageCount = Array.isArray(result.content)
-			? result.content.filter((contentBlock) => {
-					if (!contentBlock || typeof contentBlock !== "object") return false;
-					return (contentBlock as { type?: unknown }).type === "image";
-				}).length
-			: 0;
-		if (imageCount > 0) {
-			if (!options.expanded) return compactFooterWithState(theme, result, context);
-			const summary = `↳ Read ${imageCount} ${imageCount === 1 ? "image" : "images"}.`;
-			return renderBoxedToolResult(theme, () => [theme.fg("dim", summary)], {
-				widthKey,
-				footerLines: resultFooterLines(theme, result, context),
-			});
-		}
-
-		const stripped = stripTrailingNotice(output);
-		const parsed = parseReadOutput(stripped);
-		const truncationNotice = extractTrailingNotice(output);
-		const _linesRead = truncationOutputLines(result) ?? parsed.numberedLines?.length ?? countLines(parsed.body);
-
-		if (!options.expanded) return compactFooterWithState(theme, result, context);
-
-		const body = renderReadBody(theme, options, parsed, output, truncationNotice);
-		return renderBoxedToolResult(theme, body, {
-			widthKey,
-			footerLines: resultFooterLines(theme, result, context),
-		});
+		registerBatchResult(
+			READ_META,
+			{
+				isPartial: Boolean(options.isPartial),
+				isError: Boolean(context.isError),
+				errorText: context.isError ? output || undefined : undefined,
+			},
+			context,
+		);
+		return emptyBatchResult();
 	},
 };

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

@@ -8,6 +8,10 @@ export interface ToolsRenderConfig {
 	maxExpandedLines: number;
 	dimOutput: boolean;
 	showElapsed: boolean;
+	/** Open-tree glyph for the done batch header (nerd `\u{F111}` / unicode `●`). */
+	batchOpenGlyph: string;
+	/** Nerd Font mode is active: file-type icons render in output trees. */
+	nerdFonts: boolean;
 }
 
 let sessionToolsConfig: ToolsRenderConfig = {
@@ -15,6 +19,8 @@ let sessionToolsConfig: ToolsRenderConfig = {
 	maxExpandedLines: 50,
 	dimOutput: false,
 	showElapsed: true,
+	batchOpenGlyph: "●",
+	nerdFonts: false,
 };
 
 export function setToolsRenderConfig(config: Partial<ToolsRenderConfig>): void {

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,