@quandev104/pi-style 0.1.1 → 0.1.3

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

@@ -45,9 +45,9 @@ const allowedPaths = new Set([
 	"editor.frame",
 	"editor.showMetadata",
 	"messages.enabled",
-	"messages.userPrefix",
 	"messages.assistantPrefix",
 	"messages.specialBlocks",
+	"messages.hideThinkingLabel",
 	"tools.enabled",
 	"tools.style",
 	"tools.maxCollapsedLines",
@@ -74,9 +74,9 @@ function validatePathValue(path: string, value: unknown): boolean {
 			"editor.enabled",
 			"editor.showMetadata",
 			"messages.enabled",
-			"messages.userPrefix",
 			"messages.assistantPrefix",
 			"messages.specialBlocks",
+			"messages.hideThinkingLabel",
 			"tools.enabled",
 			"tools.showElapsed",
 			"tools.dimOutput",

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

@@ -311,7 +311,6 @@ export function createPiStyleApp(
 					status: operational.installations?.status ?? "unknown",
 					editor: operational.installations?.editor ?? "unknown",
 					startup: operational.installations?.startup ?? "unknown",
-					userMessage: operational.compatibility?.userMessage ?? "unknown",
 					assistantMessage: operational.compatibility?.assistantMessage ?? "unknown",
 					specialBlocks: operational.compatibility?.specialBlocks ?? "unknown",
 					tools: operational.compatibility?.tools ?? "unknown",

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

@@ -4,7 +4,7 @@ export interface TierCAuthorizationInput {
 	readonly certifiedHost: boolean;
 	readonly coreFlag: boolean;
 	readonly surfaceFlag: boolean;
-	readonly surface: "messages" | "tools" | "userMessage" | "assistantMessage" | "specialBlocks";
+	readonly surface: "messages" | "tools" | "assistantMessage" | "specialBlocks";
 	readonly config: NormalizedPiStyleConfig;
 }
 
@@ -12,7 +12,6 @@ export interface TierCAuthorizationInput {
 export function isTierCAuthorized(input: TierCAuthorizationInput): boolean {
 	if (!input.certifiedHost || !input.coreFlag || !input.surfaceFlag || !input.config.enabled) return false;
 	if (input.surface === "tools") return input.config.tools.enabled;
-	if (input.surface === "userMessage") return input.config.messages.enabled && input.config.messages.userPrefix;
 	if (input.surface === "assistantMessage")
 		return input.config.messages.enabled && input.config.messages.assistantPrefix;
 	if (input.surface === "specialBlocks") return input.config.messages.enabled && input.config.messages.specialBlocks;

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

@@ -28,7 +28,7 @@ export const DEFAULT_CONFIG: NormalizedPiStyleConfig = Object.freeze({
 		contextBarWidth: 10,
 	}),
 	editor: Object.freeze({ enabled: true, style: "compact", frame: "auto", showMetadata: false }),
-	messages: Object.freeze({ enabled: true, userPrefix: true, assistantPrefix: true, specialBlocks: true }),
+	messages: Object.freeze({ enabled: true, assistantPrefix: true, specialBlocks: true, hideThinkingLabel: true }),
 	tools: Object.freeze({
 		enabled: true,
 		style: "compact-box",
@@ -159,9 +159,9 @@ export function normalizeConfig(
 		}),
 		messages: Object.freeze({
 			enabled: bool(messages.enabled, defaults.messages.enabled),
-			userPrefix: bool(messages.userPrefix, defaults.messages.userPrefix),
 			assistantPrefix: bool(messages.assistantPrefix, defaults.messages.assistantPrefix),
 			specialBlocks: bool(messages.specialBlocks, defaults.messages.specialBlocks),
+			hideThinkingLabel: bool(messages.hideThinkingLabel, defaults.messages.hideThinkingLabel),
 		}),
 		tools: Object.freeze({
 			enabled: bool(tools.enabled, defaults.tools.enabled),
@@ -213,9 +213,9 @@ const BOOL_PATHS = new Set([
 	"editor.enabled",
 	"editor.showMetadata",
 	"messages.enabled",
-	"messages.userPrefix",
 	"messages.assistantPrefix",
 	"messages.specialBlocks",
+	"messages.hideThinkingLabel",
 	"tools.enabled",
 	"tools.showElapsed",
 	"tools.dimOutput",

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

@@ -32,7 +32,7 @@ export interface PiStyleConfig {
 		contextBarWidth?: number;
 	};
 	editor?: { enabled?: boolean; style?: string; frame?: string; showMetadata?: boolean };
-	messages?: { enabled?: boolean; userPrefix?: boolean; assistantPrefix?: boolean; specialBlocks?: boolean };
+	messages?: { enabled?: boolean; assistantPrefix?: boolean; specialBlocks?: boolean; hideThinkingLabel?: boolean };
 	tools?: {
 		enabled?: boolean;
 		style?: string;
@@ -79,7 +79,7 @@ export interface NormalizedPiStyleConfig {
 		contextBarWidth: number;
 	};
 	readonly editor: { enabled: boolean; style: EditorStyle; frame: EditorFrame; showMetadata: boolean };
-	readonly messages: { enabled: boolean; userPrefix: boolean; assistantPrefix: boolean; specialBlocks: boolean };
+	readonly messages: { enabled: boolean; assistantPrefix: boolean; specialBlocks: boolean; hideThinkingLabel: boolean };
 	readonly tools: {
 		enabled: boolean;
 		style: string;

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

@@ -107,6 +107,7 @@ const GLYPHS = {
 		powerlineRight: "\uE0B2",
 		powerlineThinLeft: "\uE0B1",
 		powerlineThinRight: "\uE0B3",
+		batchOpen: "\u{F111}",
 	},
 	unicode: {
 		pi: "π",
@@ -118,6 +119,7 @@ const GLYPHS = {
 		powerlineRight: "‹",
 		powerlineThinLeft: "│",
 		powerlineThinRight: "│",
+		batchOpen: "●",
 	},
 	ascii: {
 		pi: "pi",
@@ -129,6 +131,7 @@ const GLYPHS = {
 		powerlineRight: "<",
 		powerlineThinLeft: "|",
 		powerlineThinRight: "|",
+		batchOpen: "v",
 	},
 } as const;
 

package/extension-src/pi-style/features/messages/boxed-block.ts

@@ -5,7 +5,7 @@
 
 import type { Component } from "@earendil-works/pi-tui";
 import type { BoxTheme } from "../../shared/box.js";
-import { boxBorder, boxInnerWidth, boxInsetDivider, boxLine, boxLineWithRight, boxWidth } from "../../shared/box.js";
+import { boxBlankLine, boxBorder, boxInnerWidth, boxLabeledBorder, boxLine, boxWidth } from "../../shared/box.js";
 
 export type MessageBlockOptions = {
 	kind: string;
@@ -18,7 +18,7 @@ export type MessageBlockOptions = {
 };
 
 function formatMessageBlockTitle(theme: BoxTheme, kind: string, title?: string, icon = "➔"): string {
-	const rawTitle = title ? `${icon} ${kind} | ${title}` : `${icon} ${kind}`;
+	const rawTitle = title ? `${icon} ${kind} · ${title}` : `${icon} ${kind}`;
 	const coloredTitle = theme.fg("accent", rawTitle);
 	return typeof theme?.bold === "function" ? theme.bold(coloredTitle) : coloredTitle;
 }
@@ -26,13 +26,17 @@ function formatMessageBlockTitle(theme: BoxTheme, kind: string, title?: string,
 /**
  * Render a boxed message block.
  *
+ * The title is embedded in the rounded top border, the body sits between
+ * blank padding rows, and the expand hint (when present) is embedded at the
+ * right end of the bottom border — no inset dividers.
+ *
  * Returns only border/content lines with foreground styling. Background is
  * applied by the parent Box (all patched components extend Box with a
  * customMessageBg bgFn), so this helper must NOT apply background itself —
  * that would create a double-background conflict.
  */
 export function renderBoxedMessageBlock(theme: BoxTheme, options: MessageBlockOptions): Component {
-	const { kind, title, right, body, icon = "➔", hasDivider = true, cache: shouldCache = true } = options;
+	const { kind, title, right, body, icon = "➔", cache: shouldCache = true } = options;
 	let cache: { width: number; lines: string[] } | null = null;
 
 	return {
@@ -45,27 +49,19 @@ export function renderBoxedMessageBlock(theme: BoxTheme, options: MessageBlockOp
 			const renderedWidth = boxWidth(width);
 			const contentWidth = boxInnerWidth(renderedWidth);
 			const titleLine = formatMessageBlockTitle(theme, kind, title, icon);
+			const bodyLines = body(contentWidth);
 
-			const lines: string[] = [];
-			lines.push(boxBorder(theme, "┌", "┐", renderedWidth));
-
+			const lines: string[] = [
+				boxLabeledBorder(theme, "╭", "╮", titleLine, undefined, renderedWidth),
+				boxBlankLine(theme, renderedWidth),
+				...bodyLines.map((line) => boxLine(theme, line, renderedWidth)),
+			];
+			if (bodyLines.length > 0) lines.push(boxBlankLine(theme, renderedWidth));
 			if (right) {
-				const rightStyled = theme.fg("dim", right);
-				lines.push(boxLineWithRight(theme, titleLine, rightStyled, renderedWidth));
+				lines.push(boxLabeledBorder(theme, "╰", "╯", "", theme.fg("dim", right), renderedWidth));
 			} else {
-				lines.push(boxLine(theme, titleLine, renderedWidth));
-			}
-
-			const bodyLines = body(contentWidth);
-			const showDivider = hasDivider === "auto" ? bodyLines.length > 0 : hasDivider;
-			if (showDivider) {
-				lines.push(boxInsetDivider(theme, renderedWidth));
+				lines.push(boxBorder(theme, "╰", "╯", renderedWidth));
 			}
-			for (const line of bodyLines) {
-				lines.push(boxLine(theme, line, renderedWidth));
-			}
-
-			lines.push(boxBorder(theme, "└", "┘", renderedWidth));
 
 			if (shouldCache) cache = { width, lines };
 			return lines;

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

@@ -12,22 +12,66 @@ function extractOscEnvelope(line: string): OscParts | undefined {
 	return { start: OSC133_ZONE_START, body: line.slice(OSC133_ZONE_START.length, bodyEnd), end: line.slice(bodyEnd) };
 }
 
-function prefixAtFirstContent(line: string, prefix: string): string {
+const BG_RESET = "\x1b[49m";
+
+/** Leading zero-width OSC sequences (e.g. OSC133 markers) of a line. */
+function splitLeadingMarkers(line: string): { head: string; rest: string } {
 	let index = 0;
+	while (line.startsWith("\x1b]", index)) {
+		const bel = line.indexOf("\x07", index + 2);
+		const st = line.indexOf("\x1b\\", index + 2);
+		const end = bel === -1 ? st : st === -1 ? bel : Math.min(bel, st);
+		if (end === -1) break;
+		index = end + 1;
+	}
+	return { head: line.slice(0, index), rest: line.slice(index) };
+}
+
+/** Leading SGR escape sequence of a line ("" when none). */
+function leadingSgr(line: string): string {
+	if (!line.startsWith("\x1b[")) return "";
+	let index = 2;
 	while (index < line.length) {
-		if (line[index] === "\x1b" && line[index + 1] === "[") {
-			index += 2;
-			while (index < line.length && (line.charCodeAt(index) < 64 || line.charCodeAt(index) > 126)) index++;
-			if (index < line.length) index++;
-			continue;
-		}
-		if (/\s/u.test(line[index] ?? "")) {
-			index++;
-			continue;
-		}
-		break;
+		const code = line.charCodeAt(index);
+		if (code >= 64 && code <= 126) return line.slice(0, index + 1);
+		index++;
 	}
-	return `${line.slice(0, index)}${prefix}${line.slice(index)}`;
+	return "";
+}
+
+/** Whether an SGR sequence sets/resets the terminal background color. */
+function isBackgroundSgr(sequence: string): boolean {
+	if (!sequence.startsWith("\x1b[") || !sequence.endsWith("m")) return false;
+	for (const code of sequence.slice(2, -1).split(";")) {
+		const value = Number(code);
+		if (value === 48 || value === 49) return true;
+		if (value >= 40 && value <= 47) return true;
+		if (value >= 100 && value <= 107) return true;
+	}
+	return false;
+}
+
+/**
+ * Rebuild a native line so `lead` (prompt prefix / continuation indent) and the
+ * full target width are covered by the line's background.
+ *
+ * Native Box lines (user messages) are `bgAnsi + body + \x1b[49m`; prepending the
+ * prefix outside that wrap shifted the input row's background right by the
+ * prefix width while keeping the full container width, producing a staircase
+ * box (indented left, overflowing right). Rebuilding inside the wrap keeps the
+ * background flush across every row; plain (unwrapped) lines are padded to the
+ * target width instead so left/right edges stay aligned.
+ */
+function rebuildAtWidth(line: string, width: number, lead: string): string {
+	const { head, rest } = splitLeadingMarkers(line);
+	const bgAnsi = leadingSgr(rest);
+	if (bgAnsi && isBackgroundSgr(bgAnsi) && rest.endsWith(BG_RESET)) {
+		const body = rest.slice(bgAnsi.length, rest.length - BG_RESET.length);
+		const pad = " ".repeat(Math.max(0, width - visibleWidth(lead) - visibleWidth(body)));
+		return `${head}${bgAnsi}${lead}${body}${pad}${BG_RESET}`;
+	}
+	const padded = `${lead}${line}`;
+	return `${padded}${" ".repeat(Math.max(0, width - visibleWidth(padded)))}`;
 }
 
 function decorateMessageLine(
@@ -35,6 +79,7 @@ function decorateMessageLine(
 	index: number,
 	lastIndex: number,
 	contentIndex: number,
+	width: number,
 	options: {
 		firstEnvelope: OscParts | undefined;
 		firstHasStart: boolean;
@@ -44,14 +89,29 @@ function decorateMessageLine(
 ): string {
 	const { firstEnvelope, firstHasStart, multilineEnvelope, prefix } = options;
 	const prefixWidth = visibleWidth(prefix);
+	const lead = index === contentIndex ? prefix : index > contentIndex ? " ".repeat(prefixWidth) : "";
 	if (index === contentIndex && firstEnvelope)
-		return `${firstEnvelope.start}${prefixAtFirstContent(firstEnvelope.body, prefix)}${firstEnvelope.end}`;
+		return `${firstEnvelope.start}${rebuildAtWidth(firstEnvelope.body, width, prefix)}${firstEnvelope.end}`;
 	if (index === contentIndex && firstHasStart)
-		return `${OSC133_ZONE_START}${prefix}${line.slice(OSC133_ZONE_START.length)}`;
+		return `${OSC133_ZONE_START}${rebuildAtWidth(line.slice(OSC133_ZONE_START.length), width, prefix)}`;
 	if (index === lastIndex && multilineEnvelope && index !== contentIndex)
-		return `${OSC133_ZONE_END}${OSC133_ZONE_FINAL}${line.slice((OSC133_ZONE_END + OSC133_ZONE_FINAL).length)}`;
-	if (index === contentIndex) return `${prefix}${line}`;
-	return index > contentIndex ? `${" ".repeat(prefixWidth)}${line}` : line;
+		return `${OSC133_ZONE_END}${OSC133_ZONE_FINAL}${rebuildAtWidth(
+			line.slice((OSC133_ZONE_END + OSC133_ZONE_FINAL).length),
+			width,
+			lead,
+		)}`;
+	if (
+		index === contentIndex &&
+		index === lastIndex &&
+		multilineEnvelope &&
+		line.startsWith(OSC133_ZONE_END + OSC133_ZONE_FINAL)
+	)
+		return `${OSC133_ZONE_END}${OSC133_ZONE_FINAL}${rebuildAtWidth(
+			line.slice((OSC133_ZONE_END + OSC133_ZONE_FINAL).length),
+			width,
+			prefix,
+		)}`;
+	return rebuildAtWidth(line, width, lead);
 }
 
 function contentText(line: string): string {
@@ -88,52 +148,49 @@ function prefixNative(lines: unknown, width: number, prefix: string): string[] |
 	const first = nativeLines[0] ?? "";
 	const last = nativeLines.at(-1) ?? "";
 	const multilineEnvelope = nativeLines.length > 1 && last.startsWith(OSC133_ZONE_END + OSC133_ZONE_FINAL);
-	const firstContentIndex = nativeLines.findIndex((line, index) =>
-		index !== nativeLines.length - 1 || !multilineEnvelope ? hasContent(line) : false,
-	);
+	// The last line is a content-start candidate only when the envelope is
+	// single-line, or when no earlier line carries content. Assistant messages
+	// with a single content line render as a multiline envelope whose only body
+	// sits on the final line ([OSC133_A, OSC133_END+FINAL+body]); excluding it
+	// would drop the prefix for every short assistant reply.
+	const firstContentIndex = nativeLines.findIndex((line, index) => {
+		if (index !== nativeLines.length - 1 || !multilineEnvelope) return hasContent(line);
+		return !nativeLines.slice(0, index).some((earlier) => hasContent(earlier)) && hasContent(line);
+	});
 	if (firstContentIndex < 0) return nativeLines;
 	const firstEnvelope = firstContentIndex === 0 ? extractOscEnvelope(first) : undefined;
 	const firstHasStart = firstContentIndex === 0 && first.startsWith(OSC133_ZONE_START);
-	const decorated = nativeLines.map((line, index) => {
-		if (index === firstContentIndex)
-			return decorateMessageLine(line, index, nativeLines.length - 1, firstContentIndex, {
-				firstEnvelope,
-				firstHasStart,
-				multilineEnvelope,
-				prefix,
-			});
-		if (index > firstContentIndex && hasContent(line)) return `${" ".repeat(prefixWidth)}${line}`;
-		return line;
-	});
+	const decorated = nativeLines.map((line, index) =>
+		decorateMessageLine(line, index, nativeLines.length - 1, firstContentIndex, width, {
+			firstEnvelope,
+			firstHasStart,
+			multilineEnvelope,
+			prefix,
+		}),
+	);
 	if (!decorated.every((line) => visibleWidth(line) <= width)) return undefined;
 	if (!nativeLines.every((line) => visibleWidth(line) <= bodyWidth)) return undefined;
 	return decorated;
 }
 
 export type MessageDecorationSnapshot = Readonly<{
-	userPrefix: string;
 	assistantPrefix: string;
-	userEnabled: boolean;
 	assistantEnabled: boolean;
 }>;
 
 export function decorateMessageRender(
-	subtype: "native-user-message" | "native-assistant-message",
 	original: unknown,
 	instance: object,
 	args: unknown[],
 	snapshot: MessageDecorationSnapshot = {
-		userPrefix: "❯ ",
 		assistantPrefix: "│ ",
-		userEnabled: true,
 		assistantEnabled: true,
 	},
 ): unknown {
 	if (typeof original !== "function") return undefined;
 	const width = typeof args[0] === "number" ? args[0] : 0;
-	const enabled = subtype === "native-user-message" ? snapshot.userEnabled : snapshot.assistantEnabled;
-	const prefix = subtype === "native-user-message" ? snapshot.userPrefix : snapshot.assistantPrefix;
-	if (!enabled) return Reflect.apply(original, instance, args);
+	const prefix = snapshot.assistantPrefix;
+	if (!snapshot.assistantEnabled) return Reflect.apply(original, instance, args);
 	if (width <= visibleWidth(prefix)) return Reflect.apply(original, instance, args);
 	// Exactly one native invocation. If the reduced render cannot be certified, the
 	// already-obtained result is the only safe fallback; retrying can mutate state.

package/extension-src/pi-style/features/messages/special-blocks.ts

@@ -106,7 +106,7 @@ function patchCompaction(instance: MessageBlockInstance, _original: () => void,
 	const block = renderBoxedMessageBlock(theme, {
 		kind: "Compaction",
 		title: `${tokenStr} tokens`,
-		...(expanded ? {} : { right: `(${expandHint()})` }),
+		...(expanded ? {} : { right: expandHint() }),
 		body,
 		icon: "⊟",
 		hasDivider: expanded,
@@ -132,7 +132,7 @@ function patchSkill(instance: MessageBlockInstance, _original: () => void, theme
 	const block = renderBoxedMessageBlock(theme, {
 		kind: "Skill",
 		title: skillName,
-		...(expanded ? {} : { right: `(${expandHint()})` }),
+		...(expanded ? {} : { right: expandHint() }),
 		body,
 		icon: "⊟",
 		hasDivider: expanded,
@@ -156,7 +156,7 @@ function patchBranch(instance: MessageBlockInstance, _original: () => void, them
 
 	const block = renderBoxedMessageBlock(theme, {
 		kind: "Branch",
-		...(expanded ? {} : { right: `(${expandHint()})` }),
+		...(expanded ? {} : { right: expandHint() }),
 		body,
 		icon: "⊟",
 		hasDivider: expanded,

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

@@ -193,7 +193,7 @@ function renderSystemContextPanel(
 		"─".repeat(pathWidth),
 	)}${divider}${resolved.apply("dim", "─".repeat(metricWidth))}`;
 	const lines = [
-		renderPanelBorder(resolved, "┌", "┐", panelWidth),
+		renderPanelBorder(resolved, "╭", "╮", panelWidth),
 		renderPanelLine(resolved, titleLine, panelWidth),
 		renderPanelLine(resolved, header, panelWidth),
 		renderPanelLine(resolved, separator, panelWidth),
@@ -215,7 +215,7 @@ function renderSystemContextPanel(
 			),
 		);
 	}
-	lines.push(renderPanelBorder(resolved, "└", "┘", panelWidth));
+	lines.push(renderPanelBorder(resolved, "╰", "╯", panelWidth));
 	return lines;
 }
 
@@ -269,7 +269,7 @@ function renderToolsPanel(resolved: ResolvedTheme, tools: readonly StartupToolIt
 		"─".repeat(countWidth),
 	)}${divider}${resolved.apply("dim", "─".repeat(toolsWidth))}`;
 	const lines = [
-		renderPanelBorder(resolved, "┌", "┐", panelWidth),
+		renderPanelBorder(resolved, "╭", "╮", panelWidth),
 		renderPanelLine(resolved, titleLine, panelWidth),
 		renderPanelLine(resolved, header, panelWidth),
 		renderPanelLine(resolved, separator, panelWidth),
@@ -291,7 +291,7 @@ function renderToolsPanel(resolved: ResolvedTheme, tools: readonly StartupToolIt
 			),
 		);
 	}
-	lines.push(renderPanelBorder(resolved, "└", "┘", panelWidth));
+	lines.push(renderPanelBorder(resolved, "╰", "╯", panelWidth));
 	return lines;
 }