@quandev104/pi-style 0.2.9 → 0.2.10

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

@@ -8,6 +8,13 @@
 // global tool-output toggle (Ctrl+O) expands everything again
 // (`options.expanded` is read, never written).
 //
+// The summary also reports the turn's aggregate diff stats (`· Edit +6 -2`,
+// diff colors) computed purely from tool-result data — `details.diff` for
+// edit, the parsed `── diff ──` output section for the quick-edit family
+// (the same sources the box renderers read) — so live, scroll-back, and
+// resume render identically. `write` carries no diff and is skipped; error
+// members keep their visible blocks and never contribute stats.
+//
 // Mutating tools (edit/write/quick_edit/substitute_edit/target_edit) are
 // exempt from the summary by default (`tools.collapseMutatingTools: off`):
 // their blocks are the record of what was done to the user's files, so they
@@ -34,8 +41,11 @@
 import type { Component } from "@earendil-works/pi-tui";
 import type { BoxTheme } from "../../../shared/box.js";
 import { safeTruncateToWidth } from "../../../shared/render-budget.js";
+import { countDiffStats, firstText } from "../../../shared/split-diff.js";
 import { pluralForm } from "./output-tree.js";
+import { extractQuickEditDiff, getQuickEditToolConfig } from "./quick-edit.js";
 import { getToolsRenderConfig } from "./session-config.js";
+import { formatDiffStatsPair } from "./shared.js";
 
 export interface TurnMemberInfo {
 	readonly toolCallId: string;
@@ -45,6 +55,8 @@ export interface TurnMemberInfo {
 	isError: boolean;
 	/** Frozen wall-clock elapsed (ms), recorded from the renderer context state. */
 	elapsedMs?: number;
+	/** Frozen diff line stats recorded from the tool result (edit family). */
+	diffStats?: { additions: number; removals: number } | undefined;
 }
 
 export interface TurnState {
@@ -114,22 +126,72 @@ function toolCallsOf(message: unknown): ToolCallLike[] {
 	return calls;
 }
 
-function registerTurn(
+/** Tool-result fields the registry consumes (ToolResultMessage subset). */
+export interface TurnResultLike {
+	readonly toolCallId: string;
+	readonly isError?: boolean;
+	readonly content?: readonly unknown[] | undefined;
+	readonly details?: unknown;
+}
+
+/** Result facts per tool call id: presence, error flag, and raw payload. */
+interface RawMemberResult {
+	readonly isError: boolean;
+	readonly content?: readonly unknown[] | undefined;
+	readonly details?: unknown;
+}
+
+/**
+ * Extract a mutating member's diff line stats from its tool result — the
+ * same sources the box renderers read: `details.diff` for `edit`, the
+ * parsed `── diff ──` output section for the quick-edit family. `write`
+ * carries no diff and yields undefined. Pure: no render-time work.
+ */
+function diffStatsFromResult(
+	toolName: string,
+	result: RawMemberResult | undefined,
+): { additions: number; removals: number } | undefined {
+	if (!result) return undefined;
+	if (isMutatingTool(toolName) && toolName !== "write") {
+		const diff = (result.details as { diff?: unknown } | undefined)?.diff;
+		if (typeof diff === "string" && diff.length > 0) return countDiffStats(diff);
+	}
+	if (getQuickEditToolConfig(toolName)) {
+		const text = Array.isArray(result.content)
+			? firstText(result.content as Array<{ type: string; text?: string }>)
+			: "";
+		const diff = text ? extractQuickEditDiff(text) : undefined;
+		if (diff) return countDiffStats(diff);
+	}
+	return undefined;
+}
+
+function buildMembers(
 	calls: readonly ToolCallLike[],
-	isErrorById: ReadonlyMap<string, boolean>,
-	ended: boolean,
-): TurnState | undefined {
-	if (calls.length === 0) return undefined;
-	const complete = calls.every((call) => typeof call.id === "string" && isErrorById.has(call.id));
-	const members: TurnMemberInfo[] = calls.map((call) => {
+	resultsById: ReadonlyMap<string, RawMemberResult>,
+): TurnMemberInfo[] {
+	return calls.map((call) => {
 		const toolCallId = String(call.id ?? "");
+		const toolName = typeof call.name === "string" ? call.name : "tool";
+		const result = resultsById.get(toolCallId);
 		return {
 			toolCallId,
-			toolName: typeof call.name === "string" ? call.name : "tool",
-			hasResult: isErrorById.has(toolCallId),
-			isError: isErrorById.get(toolCallId) === true,
+			toolName,
+			hasResult: result !== undefined,
+			isError: result?.isError === true,
+			diffStats: diffStatsFromResult(toolName, result),
 		};
 	});
+}
+
+function registerTurn(
+	calls: readonly ToolCallLike[],
+	resultsById: ReadonlyMap<string, RawMemberResult>,
+	ended: boolean,
+): TurnState | undefined {
+	if (calls.length === 0) return undefined;
+	const complete = calls.every((call) => typeof call.id === "string" && resultsById.has(String(call.id ?? "")));
+	const members: TurnMemberInfo[] = buildMembers(calls, resultsById);
 	const leader = members.find((member) => !member.isError && (!isMutatingTool(member.toolName) || mutatingCollapses()));
 	const turn: TurnState = {
 		leaderId: leader?.toolCallId ?? "",
@@ -140,11 +202,6 @@ function registerTurn(
 	return turn;
 }
 
-export interface TurnResultLike {
-	readonly toolCallId: string;
-	readonly isError?: boolean;
-}
-
 /**
  * One summary group = one agent run (user request → `agent_end`). Pi emits
  * `turn_end` per assistant message, so tool batches of the same request are
@@ -165,20 +222,16 @@ export function beginAgentRun(): void {
 export function registerTurnFromMessage(message: unknown, toolResults: readonly TurnResultLike[]): void {
 	const calls = toolCallsOf(message);
 	if (calls.length === 0) return;
-	const isErrorById = new Map<string, boolean>();
+	const resultsById = new Map<string, RawMemberResult>();
 	for (const result of toolResults) {
 		if (typeof result?.toolCallId !== "string") continue;
-		isErrorById.set(result.toolCallId, result.isError === true);
+		resultsById.set(result.toolCallId, {
+			isError: result.isError === true,
+			content: result.content,
+			details: result.details,
+		});
 	}
-	const newMembers: TurnMemberInfo[] = calls.map((call) => {
-		const toolCallId = String(call.id ?? "");
-		return {
-			toolCallId,
-			toolName: typeof call.name === "string" ? call.name : "tool",
-			hasResult: isErrorById.has(toolCallId),
-			isError: isErrorById.get(toolCallId) === true,
-		};
-	});
+	const newMembers: TurnMemberInfo[] = buildMembers(calls, resultsById);
 	const leader = newMembers.find(
 		(member) => !member.isError && (!isMutatingTool(member.toolName) || mutatingCollapses()),
 	);
@@ -215,6 +268,7 @@ interface TurnEntryLike {
 	readonly message?: {
 		readonly role?: unknown;
 		readonly content?: unknown;
+		readonly details?: unknown;
 		readonly stopReason?: unknown;
 		readonly toolCallId?: unknown;
 		readonly isError?: unknown;
@@ -231,8 +285,7 @@ interface TurnEntryLike {
 export function rebuildTurnRegistryFromEntries(entries: readonly TurnEntryLike[] | undefined): void {
 	memberByCallId.clear();
 	if (!Array.isArray(entries)) return;
-	const isErrorById = new Map<string, boolean>();
-	const resultById = new Set<string>();
+	const resultsById = new Map<string, RawMemberResult>();
 	const runs: Array<{
 		calls: ToolCallLike[];
 		lastStopReason: string | undefined;
@@ -247,8 +300,11 @@ export function rebuildTurnRegistryFromEntries(entries: readonly TurnEntryLike[]
 		if (entry?.type !== "message") return;
 		const message = entry.message;
 		if (message?.role === "toolResult" && typeof message.toolCallId === "string") {
-			resultById.add(message.toolCallId);
-			isErrorById.set(message.toolCallId, message.isError === true);
+			resultsById.set(message.toolCallId, {
+				isError: message.isError === true,
+				content: Array.isArray(message.content) ? (message.content as readonly unknown[]) : undefined,
+				details: message.details,
+			});
 		} else if (message?.role === "assistant") {
 			if (!current) current = { calls: [], lastStopReason: undefined, followedByUser: false };
 			const calls = toolCallsOf(message);
@@ -267,9 +323,9 @@ export function rebuildTurnRegistryFromEntries(entries: readonly TurnEntryLike[]
 	});
 	closeRun();
 	for (const run of runs) {
-		const complete = run.calls.every((call) => typeof call.id === "string" && resultById.has(call.id));
+		const complete = run.calls.every((call) => typeof call.id === "string" && resultsById.has(String(call.id ?? "")));
 		const ended = complete && (run.followedByUser || run.lastStopReason !== undefined);
-		registerTurn(run.calls, isErrorById, ended);
+		registerTurn(run.calls, resultsById, ended);
 	}
 }
 
@@ -349,25 +405,37 @@ export interface TurnSummaryParts {
 	readonly failedCount: number;
 	/** Sum of members' frozen elapsed; undefined when nothing was recorded. */
 	readonly elapsedMs: number | undefined;
+	/** Aggregate diff line stats over non-error edit-family members; undefined
+	 * when none carried a diff. Collected regardless of the mutating exemption:
+	 * visible edit blocks are exactly what these stats describe. */
+	readonly diffStats: { additions: number; removals: number } | undefined;
 }
 
 /**
  * Aggregate a turn's collapsed members into summary parts (pure). Mutating
- * members are excluded unless `tools.collapseMutatingTools` is on — by default
- * their visible blocks are the record; the summary describes only what it
- * hides.
+ * members are excluded from counts/elapsed unless `tools.collapseMutatingTools`
+ * is on — by default their visible blocks are the record; the summary counts
+ * only what it hides. Their diff stats aggregate either way.
  */
 export function turnSummaryParts(turn: TurnState): TurnSummaryParts {
 	const counts = new Map<string, number>();
 	const order: string[] = [];
 	let failedCount = 0;
 	let elapsedMs: number | undefined;
+	let diffAdditions = 0;
+	let diffRemovals = 0;
+	let diffMembers = 0;
 	const collapseMutating = mutatingCollapses();
 	for (const member of turn.members) {
 		if (member.isError) {
 			failedCount++;
 			continue;
 		}
+		if (member.diffStats !== undefined) {
+			diffAdditions += member.diffStats.additions;
+			diffRemovals += member.diffStats.removals;
+			diffMembers++;
+		}
 		if (!collapseMutating && isMutatingTool(member.toolName)) continue;
 		if (member.elapsedMs !== undefined) elapsedMs = (elapsedMs ?? 0) + member.elapsedMs;
 		const existing = counts.get(member.toolName);
@@ -383,16 +451,24 @@ export function turnSummaryParts(turn: TurnState): TurnSummaryParts {
 		// neutral phrasing with the invariant tool name: `used 5 TaskCreate`.
 		return style ? `${style.verb} ${count} ${pluralForm(style.unit, count)}` : `used ${count} ${toolName}`;
 	});
-	return { parts, failedCount, elapsedMs };
+	return {
+		parts,
+		failedCount,
+		elapsedMs,
+		diffStats: diffMembers > 0 ? { additions: diffAdditions, removals: diffRemovals } : undefined,
+	};
 }
 
 function formatTurnSummaryLine(theme: BoxTheme, turn: TurnState): string {
 	const summary = turnSummaryParts(turn);
 	// The summary is deliberately quiet: the whole line renders dim so completed
-	// tool work recedes behind the assistant's answer. Only the failed marker
-	// stays error-colored (errors must remain visible).
+	// tool work recedes behind the assistant's answer. Only the diff stats
+	// (`+N` added / `-M` removed) and the failed marker stay color-coded —
+	// changes and errors must remain visible at a glance.
 	const parts = summary.parts.join(", ");
 	let line = `${theme.fg("dim", `➔ ${parts}`)}`;
+	if (summary.diffStats !== undefined)
+		line += `${theme.fg("dim", " · Edit ")}${formatDiffStatsPair(theme, summary.diffStats.additions, summary.diffStats.removals)}`;
 	if (summary.failedCount > 0)
 		line += theme.fg("error", ` · ${summary.failedCount} ${pluralForm("failure", summary.failedCount)}`);
 	if (summary.elapsedMs !== undefined) line += theme.fg("dim", ` · ${(summary.elapsedMs / 1000).toFixed(2)}s`);

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

@@ -89,6 +89,7 @@ function renderWritePreviewBox(
 		isError: options.isError,
 		isPending: options.isPending,
 		running: Boolean(options.running),
+		tint: true, // the write preview is a framed box — it owns its status tint
 		bodyLines: () => {
 			if (preview.length === 0) return [];
 			const shown = preview.slice(0, budget).map((line) => formatNumberedLine(theme, line));

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

@@ -15,13 +15,16 @@ function hideBatchMember(instance: object): void {
 }
 
 /**
- * Neutralize the native ToolExecutionComponent status background for boxed
+ * Neutralize the native ToolExecutionComponent container fill for boxed
  * rendering: Pi's updateDisplay sets contentBox/selfRenderContainer bgFn to
  * toolPendingBg/toolErrorBg/toolSuccessBg before invoking the renderers. The
- * boxed renderers own their visual boundary (borders + ✓/✗ state marks), so the
- * container fill is removed (no background slab).
- * Runs on every boxed dispatch; updateDisplay re-applies the bgFn on the next
- * pass and this wrapper re-neutralizes it.
+ * rendered boxes own their tint (box ⇒ background): boxed components wrap
+ * their own lines in the status fill while boxless surfaces (quiet-tool rows,
+ * tree panels, git/gh semantic cards, turn summaries) stay transparent — so
+ * the container fill is always removed. The native Box padding (1,1) is
+ * zeroed as well, or the frame would gain stray blank rows and an indent.
+ * Runs on every boxed dispatch; updateDisplay re-applies both on the next
+ * pass and this wrapper re-neutralizes them.
  */
 function neutralizeToolContainerBackground(instance: object): void {
 	const host = instance as {
@@ -421,7 +424,6 @@ export function createToolDecorationOwner(snapshot: Partial<ToolDecorationSnapsh
 				// fallback renderer, mirroring the generic boxed fallback used for
 				// unknown tool names.
 				if (typeof renderer !== "function") {
-					neutralizeToolContainerBackground(instance);
 					if (subtype === "tool-call-renderer")
 						return (callArgs: unknown, theme: unknown, context: unknown) => {
 							const component = renderBoxedToolCall(
@@ -430,6 +432,7 @@ export function createToolDecorationOwner(snapshot: Partial<ToolDecorationSnapsh
 								theme as never,
 								context as never,
 							);
+							neutralizeToolContainerBackground(instance);
 							// Same batch-member contract as the native-renderer path: a
 							// collapsed turn member (or quiet batch member) returns the
 							// singleton and must be hidden, or Pi leaves a stray native
@@ -445,6 +448,7 @@ export function createToolDecorationOwner(snapshot: Partial<ToolDecorationSnapsh
 							theme as never,
 							context as never,
 						);
+						neutralizeToolContainerBackground(instance);
 						if (component === EMPTY_BATCH_COMPONENT) hideBatchMember(instance);
 						return component;
 					};

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

@@ -168,6 +168,8 @@ export function createCompatibilityCoordinator(dispose = disposePiCompatibilityP
 					assistantPrefix: authorization.ascii ? "[assistant] " : "│ ",
 					assistantEnabled,
 					collapseHiddenThinking: thinkingCollapseEnabled,
+					thoughtSummary: thinkingCollapseEnabled && config.messages.thoughtSummary,
+					thoughtGlyph: authorization.ascii ? ">" : "◈",
 				},
 				toolSnapshot: {
 					callMarker: authorization.ascii ? "[tool] " : "[tool] ",

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

@@ -44,6 +44,7 @@ export const SUPPORTED_PI_VERSIONS: readonly string[] = Object.freeze([
 	"0.84.3",
 	"0.84.4",
 	"0.85.0",
+	"0.85.1",
 ]);
 
 /** A recorded native identity for one certified surface. */
@@ -97,7 +98,7 @@ export const KNOWN_NATIVE_IDENTITIES: Readonly<Record<string, readonly KnownNati
 			name: "render",
 			arity: 1,
 			fingerprint: "a9be09a3",
-			versions: Object.freeze(["0.84.3", "0.84.4", "0.85.0"]),
+			versions: Object.freeze(["0.84.3", "0.84.4", "0.85.0", "0.85.1"]),
 		}),
 	]),
 	"native-assistant-message:updateContent": Object.freeze([
@@ -132,7 +133,7 @@ export const KNOWN_NATIVE_IDENTITIES: Readonly<Record<string, readonly KnownNati
 			name: "updateContent",
 			arity: 1,
 			fingerprint: "80e338d2",
-			versions: Object.freeze(["0.85.0"]),
+			versions: Object.freeze(["0.85.0", "0.85.1"]),
 		}),
 		// 0.85.0 bundled: same drift, minified.
 		Object.freeze({
@@ -141,6 +142,16 @@ export const KNOWN_NATIVE_IDENTITIES: Readonly<Record<string, readonly KnownNati
 			fingerprint: "c3d72f2b",
 			versions: Object.freeze(["0.85.0"]),
 		}),
+		// 0.85.1 bundled: the rebundled runtime renames the minified `message2`
+		// parameter to `message` — the modular dist is unchanged from 0.85.0 (only
+		// the GPT-6 Astra model catalog and fullscreen-scroll fixes landed), so the
+		// minified method text drifts while behavior stays identical.
+		Object.freeze({
+			name: "updateContent",
+			arity: 1,
+			fingerprint: "31632e19",
+			versions: Object.freeze(["0.85.1"]),
+		}),
 	]),
 	"native-compaction-message:updateDisplay": Object.freeze([
 		Object.freeze({
@@ -153,7 +164,7 @@ export const KNOWN_NATIVE_IDENTITIES: Readonly<Record<string, readonly KnownNati
 			name: "updateDisplay",
 			arity: 0,
 			fingerprint: "5118a51d",
-			versions: Object.freeze(["0.84.3", "0.84.4", "0.85.0"]),
+			versions: Object.freeze(["0.84.3", "0.84.4", "0.85.0", "0.85.1"]),
 		}),
 	]),
 	"native-branch-message:updateDisplay": Object.freeze([
@@ -167,7 +178,7 @@ export const KNOWN_NATIVE_IDENTITIES: Readonly<Record<string, readonly KnownNati
 			name: "updateDisplay",
 			arity: 0,
 			fingerprint: "2185274e",
-			versions: Object.freeze(["0.84.3", "0.84.4", "0.85.0"]),
+			versions: Object.freeze(["0.84.3", "0.84.4", "0.85.0", "0.85.1"]),
 		}),
 	]),
 	"native-skill-message:updateDisplay": Object.freeze([
@@ -181,7 +192,7 @@ export const KNOWN_NATIVE_IDENTITIES: Readonly<Record<string, readonly KnownNati
 			name: "updateDisplay",
 			arity: 0,
 			fingerprint: "4051fd65",
-			versions: Object.freeze(["0.84.3", "0.84.4", "0.85.0"]),
+			versions: Object.freeze(["0.84.3", "0.84.4", "0.85.0", "0.85.1"]),
 		}),
 	]),
 	"native-custom-message:rebuild": Object.freeze([
@@ -195,7 +206,7 @@ export const KNOWN_NATIVE_IDENTITIES: Readonly<Record<string, readonly KnownNati
 			name: "rebuild",
 			arity: 0,
 			fingerprint: "b89987cc",
-			versions: Object.freeze(["0.84.3", "0.84.4", "0.85.0"]),
+			versions: Object.freeze(["0.84.3", "0.84.4", "0.85.0", "0.85.1"]),
 		}),
 	]),
 	"tool-call-renderer:getCallRenderer": Object.freeze([
@@ -224,7 +235,7 @@ export const KNOWN_NATIVE_IDENTITIES: Readonly<Record<string, readonly KnownNati
 			name: "getCallRenderer",
 			arity: 0,
 			fingerprint: "73116365",
-			versions: Object.freeze(["0.85.0"]),
+			versions: Object.freeze(["0.85.0", "0.85.1"]),
 		}),
 	]),
 	"tool-result-renderer:getResultRenderer": Object.freeze([
@@ -253,7 +264,7 @@ export const KNOWN_NATIVE_IDENTITIES: Readonly<Record<string, readonly KnownNati
 			name: "getResultRenderer",
 			arity: 0,
 			fingerprint: "d613a2a3",
-			versions: Object.freeze(["0.85.0"]),
+			versions: Object.freeze(["0.85.0", "0.85.1"]),
 		}),
 	]),
 	"native-bash-execution:render": Object.freeze([
@@ -271,7 +282,7 @@ export const KNOWN_NATIVE_IDENTITIES: Readonly<Record<string, readonly KnownNati
 			name: "BashExecutionComponent",
 			arity: 2,
 			fingerprint: "98d22d96",
-			versions: Object.freeze(["0.84.3", "0.84.4", "0.85.0"]),
+			versions: Object.freeze(["0.84.3", "0.84.4", "0.85.0", "0.85.1"]),
 		}),
 	]),
 });

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

@@ -4,6 +4,7 @@ import type { ConfigFilePort } from "../app/config-storage.js";
 import { createPiStyleApp, type PiStyleApp } from "../app/index.js";
 import { resolveTheme } from "../domain/theme.js";
 import { resetPendingImageRegistry } from "../features/messages/image-input.js";
+import { setThoughtLabelTheme } from "../features/messages/index.js";
 import { setMessagesRenderConfig } from "../features/messages/render-config.js";
 import { setSpecialBlockTheme } from "../features/messages/special-blocks.js";
 import { setBashExecutionTheme } from "../features/tools/bash-execution.js";
@@ -94,9 +95,26 @@ export function createPiStyleSessionCoordinator(pi: ExtensionAPI, hooks: Compati
 	 * 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.
+	 *
+	 * Gated on the certified `updateContent` surface actually being installed:
+	 * blanking without the patch leaves Pi's native invisible-row gap (worse
+	 * than the label it replaces), so an unsupported runtime identity keeps the
+	 * native `Thinking...` label instead.
 	 */
+	const thinkingCollapseInstalled = (): boolean => {
+		const records = compatibility.report?.recordSnapshots ?? [];
+		return records.some(
+			(record) =>
+				record.subtype === "native-assistant-message" &&
+				record.method === "updateContent" &&
+				record.shape === "installed" &&
+				!record.disposed,
+		);
+	};
 	const applyMessagesConfig = (config: import("../domain/config-types.js").NormalizedPiStyleConfig) => {
-		sessionUi?.setHiddenThinkingLabel?.(config.messages.hideThinkingLabel ? "" : undefined);
+		sessionUi?.setHiddenThinkingLabel?.(
+			config.messages.hideThinkingLabel && thinkingCollapseInstalled() ? "" : undefined,
+		);
 		// User-prompt image previews (ADR 0008) + clipboard image input (ADR
 		// 0009): the leaves gate their respective sides (preview: stage+render;
 		// clipboard: input transform) and size the preview images.
@@ -211,6 +229,7 @@ export function createPiStyleSessionCoordinator(pi: ExtensionAPI, hooks: Compati
 			applyMessagesConfig(app.config);
 			if (ctx.ui?.theme) setSpecialBlockTheme(ctx.ui.theme as never);
 			if (ctx.ui?.theme) setBashExecutionTheme(ctx.ui.theme as never);
+			if (ctx.ui?.theme) setThoughtLabelTheme(ctx.ui.theme as never);
 			const toolDetails = collectToolDetails(pi.getActiveTools?.(), pi.getAllTools?.());
 			app.sessionStart(
 				{