@quandev104/pi-style 0.1.6 → 0.1.7

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

@@ -48,12 +48,14 @@ const allowedPaths = new Set([
 	"messages.assistantPrefix",
 	"messages.specialBlocks",
 	"messages.hideThinkingLabel",
+	"messages.hideInterimText",
 	"tools.enabled",
 	"tools.style",
 	"tools.maxCollapsedLines",
 	"tools.maxExpandedLines",
 	"tools.dimOutput",
 	"tools.showElapsed",
+	"tools.collapseAfterTurn",
 	"theme.nerdFonts",
 	"theme.terminalBackgroundSync",
 	"theme.autoApply",
@@ -78,9 +80,11 @@ function validatePathValue(path: string, value: unknown): boolean {
 			"messages.assistantPrefix",
 			"messages.specialBlocks",
 			"messages.hideThinkingLabel",
+			"messages.hideInterimText",
 			"tools.enabled",
 			"tools.showElapsed",
 			"tools.dimOutput",
+			"tools.collapseAfterTurn",
 			"compatibility.allowSafePatches",
 			"compatibility.allowCorePatches",
 			"compatibility.preferExistingEditor",

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

@@ -28,7 +28,13 @@ export const DEFAULT_CONFIG: NormalizedPiStyleConfig = Object.freeze({
 		contextBarWidth: 10,
 	}),
 	editor: Object.freeze({ enabled: true, style: "dock", frame: "rounded", showMetadata: false, hint: "" }),
-	messages: Object.freeze({ enabled: true, assistantPrefix: true, specialBlocks: true, hideThinkingLabel: true }),
+	messages: Object.freeze({
+		enabled: true,
+		assistantPrefix: true,
+		specialBlocks: true,
+		hideThinkingLabel: true,
+		hideInterimText: true,
+	}),
 	tools: Object.freeze({
 		enabled: true,
 		style: "compact-box",
@@ -36,6 +42,7 @@ export const DEFAULT_CONFIG: NormalizedPiStyleConfig = Object.freeze({
 		maxExpandedLines: 50,
 		dimOutput: false,
 		showElapsed: true,
+		collapseAfterTurn: true,
 	}),
 	theme: Object.freeze({
 		nerdFonts: "auto",
@@ -169,6 +176,7 @@ export function normalizeConfig(
 			assistantPrefix: bool(messages.assistantPrefix, defaults.messages.assistantPrefix),
 			specialBlocks: bool(messages.specialBlocks, defaults.messages.specialBlocks),
 			hideThinkingLabel: bool(messages.hideThinkingLabel, defaults.messages.hideThinkingLabel),
+			hideInterimText: bool(messages.hideInterimText, defaults.messages.hideInterimText),
 		}),
 		tools: Object.freeze({
 			enabled: bool(tools.enabled, defaults.tools.enabled),
@@ -177,6 +185,7 @@ export function normalizeConfig(
 			maxExpandedLines: maxExpanded,
 			dimOutput: bool(tools.dimOutput, defaults.tools.dimOutput),
 			showElapsed: bool(tools.showElapsed, defaults.tools.showElapsed),
+			collapseAfterTurn: bool(tools.collapseAfterTurn, defaults.tools.collapseAfterTurn),
 		}),
 		theme: Object.freeze({
 			nerdFonts: stringEnum(theme.nerdFonts, ["auto", "on", "off"], defaults.theme.nerdFonts),
@@ -227,9 +236,11 @@ const BOOL_PATHS = new Set([
 	"messages.assistantPrefix",
 	"messages.specialBlocks",
 	"messages.hideThinkingLabel",
+	"messages.hideInterimText",
 	"tools.enabled",
 	"tools.showElapsed",
 	"tools.dimOutput",
+	"tools.collapseAfterTurn",
 	"compatibility.allowSafePatches",
 	"compatibility.allowCorePatches",
 	"compatibility.preferExistingEditor",

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

@@ -10,7 +10,7 @@ export const CONFIG_PRESETS: Readonly<Record<PresetName, Readonly<PiStyleConfig>
 		editor: { style: "native", frame: "native", showMetadata: false },
 		startup: { mode: "off" },
 		messages: { enabled: false },
-		tools: { enabled: false },
+		tools: { enabled: false, collapseAfterTurn: false },
 		theme: { terminalBackgroundSync: "off" },
 	}),
 	compact: Object.freeze({
@@ -41,7 +41,7 @@ export const CONFIG_PRESETS: Readonly<Record<PresetName, Readonly<PiStyleConfig>
 		editor: { style: "native", frame: "native", showMetadata: false },
 		startup: { mode: "off" },
 		messages: { enabled: false },
-		tools: { enabled: false },
+		tools: { enabled: false, collapseAfterTurn: false },
 		theme: { terminalBackgroundSync: "off", autoApply: "off" },
 	}),
 });

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

@@ -32,7 +32,13 @@ export interface PiStyleConfig {
 		contextBarWidth?: number;
 	};
 	editor?: { enabled?: boolean; style?: string; frame?: string; showMetadata?: boolean; hint?: string };
-	messages?: { enabled?: boolean; assistantPrefix?: boolean; specialBlocks?: boolean; hideThinkingLabel?: boolean };
+	messages?: {
+		enabled?: boolean;
+		assistantPrefix?: boolean;
+		specialBlocks?: boolean;
+		hideThinkingLabel?: boolean;
+		hideInterimText?: boolean;
+	};
 	tools?: {
 		enabled?: boolean;
 		style?: string;
@@ -40,6 +46,8 @@ export interface PiStyleConfig {
 		maxExpandedLines?: number;
 		dimOutput?: boolean;
 		showElapsed?: boolean;
+		/** Collapse a completed turn's tool blocks into one summary line (ADR 0007). */
+		collapseAfterTurn?: boolean;
 	};
 	theme?: {
 		nerdFonts?: string;
@@ -81,7 +89,13 @@ export interface NormalizedPiStyleConfig {
 		contextBarWidth: number;
 	};
 	readonly editor: { enabled: boolean; style: EditorStyle; frame: EditorFrame; showMetadata: boolean; hint: string };
-	readonly messages: { enabled: boolean; assistantPrefix: boolean; specialBlocks: boolean; hideThinkingLabel: boolean };
+	readonly messages: {
+		enabled: boolean;
+		assistantPrefix: boolean;
+		specialBlocks: boolean;
+		hideThinkingLabel: boolean;
+		hideInterimText: boolean;
+	};
 	readonly tools: {
 		enabled: boolean;
 		style: string;
@@ -89,6 +103,8 @@ export interface NormalizedPiStyleConfig {
 		maxExpandedLines: number;
 		dimOutput: boolean;
 		showElapsed: boolean;
+		/** Collapse a completed turn's tool blocks into one summary line (ADR 0007). */
+		collapseAfterTurn: boolean;
 	};
 	readonly theme: {
 		nerdFonts: NerdFontsMode;

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

@@ -178,6 +178,8 @@ export type MessageDecorationSnapshot = Readonly<{
 	assistantEnabled: boolean;
 	/** Drop the hidden-thinking label row and its trailing spacer (zero-trace collapse). */
 	collapseHiddenThinking: boolean;
+	/** Hide the text of assistant messages that also carry tool calls (interim narration). */
+	hideInterimText: boolean;
 }>;
 
 export function decorateMessageRender(
@@ -188,6 +190,7 @@ export function decorateMessageRender(
 		assistantPrefix: "│ ",
 		assistantEnabled: true,
 		collapseHiddenThinking: false,
+		hideInterimText: false,
 	},
 ): unknown {
 	if (typeof original !== "function") return undefined;
@@ -207,6 +210,34 @@ function isSpacerChild(child: unknown): boolean {
 	return typeof (child as { setLines?: unknown } | undefined)?.setLines === "function";
 }
 
+/**
+ * The assistant TEXT Markdown block: `Markdown(text, pad, 0, theme, undefined,
+ * { transform })` — duck-typed by setText + options object + no defaultTextStyle.
+ * Thinking Markdown passes a `{ color, italic }` defaultTextStyle and is
+ * therefore excluded; plain Text components carry no `options`.
+ */
+function isInterimTextChild(child: unknown): boolean {
+	const candidate = child as { setText?: unknown; options?: unknown; defaultTextStyle?: unknown } | undefined;
+	return (
+		typeof candidate?.setText === "function" &&
+		candidate.options !== undefined &&
+		typeof candidate.options === "object" &&
+		candidate.defaultTextStyle === undefined
+	);
+}
+
+/** Whether the message content includes a toolCall item (interim narration marker). */
+function hasToolCallItems(message: unknown): boolean {
+	if (!message || typeof message !== "object") return false;
+	const content = (message as { content?: unknown }).content;
+	return (
+		Array.isArray(content) &&
+		content.some(
+			(item) => item !== null && typeof item === "object" && (item as { type?: unknown }).type === "toolCall",
+		)
+	);
+}
+
 /**
  * The hidden-thinking placeholder: a Text (setCustomBgFn) whose ANSI-stripped
  * rendered content is empty. Duck-typed on the public shape because
@@ -240,11 +271,11 @@ export function decorateMessageUpdate(
 		assistantPrefix: "│ ",
 		assistantEnabled: true,
 		collapseHiddenThinking: false,
+		hideInterimText: 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;
@@ -252,15 +283,32 @@ export function decorateMessageUpdate(
 	};
 	// 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);
+	if (snapshot.collapseHiddenThinking && target.hideThinkingBlock === true && target.hiddenThinkingLabel === "") {
+		const children = target.contentContainer?.children;
+		if (children) {
+			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);
+			}
+		}
+	}
+	// Interim narration: assistant messages that carry tool calls use their text
+	// only to narrate while working; the tool blocks tell the story. Hide the text
+	// so the feed shows the run's summary and the final answer. Deterministic per
+	// content — streaming, scroll-back, and resume behave identically. Errors and
+	// truncation notices are Text children and stay; if only spacers remain the
+	// message becomes zero-trace.
+	if (snapshot.hideInterimText && hasToolCallItems(args[0])) {
+		const children = target.contentContainer?.children;
+		if (children) {
+			for (let index = children.length - 1; index >= 0; index--) {
+				if (isInterimTextChild(children[index])) children.splice(index, 1);
+			}
+			if (children.every((child) => isSpacerChild(child))) children.length = 0;
+		}
 	}
 	return result;
 }

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

@@ -7,7 +7,7 @@
 import type { Component } from "@earendil-works/pi-tui";
 import type { BoxTheme } from "../../../shared/box.js";
 import { bashTool } from "./bash.js";
-import { closeActiveBatch, isBatchableTool } from "./batch.js";
+import { closeActiveBatch, EMPTY_BATCH_COMPONENT, isBatchableTool } from "./batch.js";
 import { editTool } from "./edit.js";
 import { renderFallbackCall, renderFallbackResult } from "./fallback.js";
 import { findTool } from "./find.js";
@@ -15,7 +15,16 @@ import { grepTool } from "./grep.js";
 import { lsTool } from "./ls.js";
 import { getQuickEditToolConfig, quickEditTool } from "./quick-edit.js";
 import { readTool } from "./read.js";
+import { getStateElapsedMs, getToolsRenderConfig } from "./session-config.js";
 import type { BoxedToolContext, BoxedToolDefinition } from "./shared.js";
+import {
+	emptyTurnResult,
+	getTurnEntry,
+	noteTurnMemberElapsed,
+	noteTurnMemberRender,
+	renderTurnSummaryCall,
+	type TurnState,
+} from "./turn-summary.js";
 import { writeTool } from "./write.js";
 
 function quickEditToolFor(toolName: string): BoxedToolDefinition {
@@ -41,6 +50,18 @@ export function hasBoxedRenderer(toolName: unknown): boolean {
 	return typeof toolName === "string" && Object.hasOwn(REGISTRY, toolName);
 }
 
+/**
+ * Turn-summary gate (ADR 0007): the member belongs to an ended turn, Pi's
+ * global tool-output state is collapsed, the surface is enabled, and the block
+ * itself is not an error (errors always stay visible).
+ */
+function collapsedTurnFor(toolCallId: string, expanded: boolean): TurnState | undefined {
+	if (expanded || !getToolsRenderConfig().collapseAfterTurn) return undefined;
+	const entry = getTurnEntry(toolCallId);
+	if (!entry?.turn.ended || entry.member.isError) return undefined;
+	return entry.turn;
+}
+
 export function renderBoxedToolCall(
 	toolName: unknown,
 	args: Record<string, unknown>,
@@ -50,6 +71,16 @@ export function renderBoxedToolCall(
 	// Any non-batchable tool call is a batch boundary: the next quiet call starts
 	// a fresh batch instead of joining the previous one.
 	if (!isBatchableTool(toolName)) closeActiveBatch();
+	const turn = collapsedTurnFor(context.toolCallId, context.expanded);
+	if (turn) {
+		if (turn.leaderId === context.toolCallId) return renderTurnSummaryCall(theme, turn);
+		// Same singleton the batch machinery uses: the decoration's hideBatchMember
+		// (identity-compared) removes the instance so members consume zero lines.
+		return EMPTY_BATCH_COMPONENT;
+	}
+	// Capture the component invalidate so the turn_end path can force this block
+	// to re-run the renderer selectors (pi only re-invokes them from updateDisplay).
+	noteTurnMemberRender(context.toolCallId, context.invalidate);
 	const tool = typeof toolName === "string" ? REGISTRY[toolName] : undefined;
 	if (tool) return tool.call(args, theme, context);
 	return renderFallbackCall(toolName, args, theme, context);
@@ -62,6 +93,15 @@ export function renderBoxedToolResult(
 	theme: BoxTheme,
 	context: BoxedToolContext,
 ): Component {
+	const turn = collapsedTurnFor(context.toolCallId, options.expanded);
+	if (turn) {
+		// Freeze the member's wall-clock elapsed into the registry once the turn
+		// collapsed (the value is already frozen by the renderer context state).
+		if (!options.isPartial) noteTurnMemberElapsed(context.toolCallId, getStateElapsedMs(context.state));
+		if (turn.leaderId === context.toolCallId) return emptyTurnResult();
+		return EMPTY_BATCH_COMPONENT;
+	}
+	noteTurnMemberRender(context.toolCallId, context.invalidate);
 	const tool = typeof toolName === "string" ? REGISTRY[toolName] : undefined;
 	if (tool) return tool.result(result, options, theme, context);
 	return renderFallbackResult(toolName, result, options, theme, context);

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

@@ -12,6 +12,8 @@ export interface ToolsRenderConfig {
 	batchOpenGlyph: string;
 	/** Nerd Font mode is active: file-type icons render in output trees. */
 	nerdFonts: boolean;
+	/** Collapse a completed turn's tool blocks into one summary line (ADR 0007). */
+	collapseAfterTurn: boolean;
 }
 
 let sessionToolsConfig: ToolsRenderConfig = {
@@ -21,6 +23,7 @@ let sessionToolsConfig: ToolsRenderConfig = {
 	showElapsed: true,
 	batchOpenGlyph: "●",
 	nerdFonts: false,
+	collapseAfterTurn: true,
 };
 
 export function setToolsRenderConfig(config: Partial<ToolsRenderConfig>): void {