@oh-my-pi/pi-coding-agent 16.0.10 → 16.1.0

package/src/tools/gh.ts

@@ -2179,7 +2179,7 @@ function formatPrFiles(files: GhPrFile[] | undefined): string[] {
 	}
 
 	if (files.length > FILE_PREVIEW_LIMIT) {
-		lines.push(`- ... ${files.length - FILE_PREVIEW_LIMIT} more files`);
+		lines.push(`[…${files.length - FILE_PREVIEW_LIMIT} files elided…]`);
 	}
 
 	return lines;

package/src/tools/index.ts

@@ -312,6 +312,10 @@ export interface ToolSession {
 	steer?(message: { customType: string; content: string; details?: unknown }): void;
 	/** Peek the currently in-flight tool-choice queue directive's invocation handler. Used by the `resolve` tool to dispatch to the pending action. */
 	peekQueueInvoker?(): ((input: unknown) => Promise<unknown> | unknown) | undefined;
+	/** Peek the most-recently registered non-forcing pending preview invoker. The `resolve`
+	 *  tool dispatches to it so a staged preview resolves WITHOUT forcing tool_choice — the
+	 *  agent-loop's SoftToolRequirement lifecycle owns reminder injection and escalation. */
+	peekPendingInvoker?(): ((input: unknown) => Promise<unknown> | unknown) | undefined;
 	/** Peek the long-lived "standing" resolve handler registered by a mode (e.g. plan mode).
 	 *  Consulted by the `resolve` tool as a fallback when no queue invoker is in flight,
 	 *  letting modes accept `resolve` invocations without forcing the tool choice every turn. */

package/src/tools/irc.ts

@@ -182,7 +182,7 @@ export class IrcTool implements AgentTool<typeof ircSchema, IrcDetails> {
 		const bus = IrcBus.global();
 		const peers = registry
 			.list()
-			.filter(ref => ref.id !== senderId && ref.status !== "aborted")
+			.filter(ref => ref.id !== senderId && ref.status !== "aborted" && ref.kind !== "advisor")
 			.map(ref => ({
 				id: ref.id,
 				displayName: ref.displayName,

package/src/tools/json-tree.ts

@@ -1,7 +1,7 @@
 /**
  * JSON tree rendering utilities shared across tool renderers.
  */
-import { INTENT_FIELD } from "@oh-my-pi/pi-agent-core";
+import { INTENT_FIELD } from "@oh-my-pi/pi-wire";
 import type { Theme } from "../modes/theme/theme";
 import { truncateToWidth } from "./render-utils";
 
@@ -19,6 +19,8 @@ const ARGS_INLINE_PAIR_SEP = ", ";
 const ARGS_INLINE_PAIR_SEP_WIDTH = Bun.stringWidth(ARGS_INLINE_PAIR_SEP);
 const ARGS_INLINE_MORE = "…";
 const ARGS_INLINE_MORE_WIDTH = Bun.stringWidth(ARGS_INLINE_MORE);
+/** Minimal value footprint (quotes + a couple chars) reserved for each not-yet-rendered key. */
+const ARGS_INLINE_TAIL_VALUE_RESERVE = 4;
 
 function isRecord(value: unknown): value is Record<string, unknown> {
 	return !!value && typeof value === "object" && !Array.isArray(value);
@@ -49,10 +51,15 @@ export function formatScalar(value: unknown, maxLen: number): string {
  * Format args inline for collapsed view.
  */
 export function formatArgsInline(args: Record<string, unknown>, maxWidth: number): string {
-	let result = "";
-	let width = 0;
+	const keys: string[] = [];
 	for (const key in args) {
 		if (key in HIDDEN_ARG_KEYS) continue;
+		keys.push(key);
+	}
+	let result = "";
+	let width = 0;
+	for (let i = 0; i < keys.length; i++) {
+		const key = keys[i];
 		const value = args[key];
 		const sep = width > 0 ? ARGS_INLINE_PAIR_SEP : "";
 		const sepW = width > 0 ? ARGS_INLINE_PAIR_SEP_WIDTH : 0;
@@ -61,11 +68,21 @@ export function formatArgsInline(args: Record<string, unknown>, maxWidth: number
 		if (cap <= 0) {
 			return `${result}${ARGS_INLINE_MORE}`;
 		}
-		const valueMaxLen = Math.min(maxWidth - current, 24);
+		// Reserve each still-pending key's minimal footprint (sep + name + `=` +
+		// a short value) so a long value can't starve the keys that follow it.
+		let tailReserve = 0;
+		for (let j = i + 1; j < keys.length; j++) {
+			tailReserve += ARGS_INLINE_PAIR_SEP_WIDTH + Bun.stringWidth(keys[j]) + 1 + ARGS_INLINE_TAIL_VALUE_RESERVE;
+		}
+		// Budget the whole `key=value` piece against the width left after the
+		// tail reserve, then back out the value's share. The last key reserves
+		// nothing and fills the line.
+		const pieceBudget = Math.min(cap, maxWidth - current - tailReserve);
+		const valueMaxLen = Math.max(1, pieceBudget - Bun.stringWidth(key) - 3);
 		const valueStr = formatScalar(value, valueMaxLen);
 		const piece = `${key}=${valueStr}`;
 		const pieceW = Bun.stringWidth(piece);
-		if (pieceW > cap) {
+		if (pieceW > pieceBudget) {
 			return `${result}${sep}${truncateToWidth(piece, cap)}`;
 		}
 		result += sep + piece;

package/src/tools/read.ts

@@ -275,7 +275,7 @@ function formatMergedBraceLine(
 	shouldAddHashLines: boolean,
 	shouldAddLineNumbers: boolean,
 ): { model: string; display: string } {
-	const merged = `${headText.trimEnd()} .. ${tailText.trim()}`;
+	const merged = `${headText.trimEnd()} … ${tailText.trim()}`;
 	if (shouldAddHashLines) {
 		return { model: `${startLine}-${endLine}:${merged}`, display: merged };
 	}
@@ -315,7 +315,7 @@ const FOOTER_RANGE_SAMPLES = 2;
 
 /**
  * Footer appended to summarized reads telling the model how to recover the
- * elided body. Without this hint, agents either ignore the `...`/`{ .. }`
+ * elided body. Without this hint, agents either ignore the `…`/`{ … }`
  * markers or burn a turn guessing the right selector (see issue #1046). The
  * footer demonstrates the multi-range selector syntax with concrete sample
  * ranges drawn from the actual elision so the model re-reads only what it
@@ -327,7 +327,6 @@ function formatSummaryElisionFooter(
 	elidedLines: number,
 ): string {
 	if (elidedRanges.length === 0) return "";
-	const lineWord = elidedLines === 1 ? "line" : "lines";
 	const sampleCount = Math.min(elidedRanges.length, FOOTER_RANGE_SAMPLES);
 	const selector = elidedRanges
 		.slice(0, sampleCount)
@@ -335,7 +334,7 @@ function formatSummaryElisionFooter(
 		.join(",");
 	const example = `${readPath}:${selector}`;
 	const tail = elidedRanges.length > sampleCount ? `, e.g. ${example}` : ` with ${example}`;
-	return `[${elidedLines} ${lineWord} elided; re-read needed ranges${tail}]`;
+	return `[…${elidedLines}ln elided; re-read needed ranges${tail}]`;
 }
 const READ_CHUNK_SIZE = 8 * 1024;
 
@@ -1904,8 +1903,8 @@ export class ReadTool implements AgentTool<typeof readSchema, ReadToolDetails> {
 		let elidedLines = 0;
 		for (const unit of units) {
 			if (unit.kind === "elided") {
-				modelParts.push("...");
-				displayParts.push("...");
+				modelParts.push("…");
+				displayParts.push("…");
 				elidedRanges.push({ start: unit.startLine, end: unit.endLine });
 				elidedLines += unit.endLine - unit.startLine + 1;
 				continue;

package/src/tools/resolve.ts

@@ -1,4 +1,10 @@
-import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
+import type {
+	AgentTool,
+	AgentToolContext,
+	AgentToolResult,
+	AgentToolUpdateCallback,
+	CustomMessage,
+} from "@oh-my-pi/pi-agent-core";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { prompt, untilAborted } from "@oh-my-pi/pi-utils";
@@ -28,11 +34,18 @@ export interface ResolveToolDetails {
 	sourceResultDetails?: unknown;
 }
 
+/** Monotonic suffix making each staged preview's pending-invoker id UNIQUE, so
+ *  stacked previews never clobber one another by label. */
+let pendingPreviewSeq = 0;
+
 /**
- * Queue a resolve-protocol handler on the tool-choice queue. Forces the next
- * LLM call to invoke the hidden `resolve` tool, wraps the caller's apply/reject
- * callbacks into an onInvoked closure that matches the resolve schema, and
- * steers a preview reminder so the model understands why.
+ * Register a non-forcing resolve-protocol handler for a staged preview. Wraps the
+ * caller's apply/reject into an onInvoked closure (matching the resolve schema) and
+ * stores it on the tool-choice queue's pending-invoker registry under a UNIQUE id.
+ * The `resolve` tool dispatches to it; the agent-loop's SoftToolRequirement
+ * lifecycle injects the preview reminder and escalates to a forced `resolve` only
+ * if the model declines — so a compliant turn pays ZERO tool_choice change (no
+ * prompt-cache messages-cache invalidation).
  *
  * This is the canonical entry point for any tool that wants preview/apply
  * semantics. No session-level abstraction is needed: callers pass their
@@ -48,46 +61,55 @@ export function queueResolveHandler(
 	},
 ): void {
 	const queue = session.getToolChoiceQueue?.();
-	const forced = session.buildToolChoice?.("resolve");
-	if (!queue || !forced || typeof forced === "string") return;
+	if (!queue) return;
 
-	const steerReminder = (): void => {
-		session.steer?.({
-			customType: "resolve-reminder",
-			content: [
-				"<system-reminder>",
-				"This is a preview. Call the `resolve` tool to apply or discard these changes.",
-				"</system-reminder>",
-			].join("\n"),
-			details: { toolName: options.sourceToolName },
-		});
-	};
+	// Unique per preview: stacked/sequential previews each get their own entry.
+	const id = `pending-action:${options.sourceToolName}:${pendingPreviewSeq++}`;
 
-	const pushDirective = (): void => {
-		queue.pushOnce(forced, {
-			label: `pending-action:${options.sourceToolName}`,
-			now: true,
-			onRejected: () => "requeue",
-			onInvoked: async (input: unknown) =>
-				runResolveInvocation(input as ResolveParams, {
-					sourceToolName: options.sourceToolName,
-					label: options.label,
-					apply: options.apply,
-					reject: options.reject,
-					onApplyError: () => {
-						// Apply threw (e.g. ast_edit overlapping replacements). Re-push the
-						// same directive so the preview remains pending and the model can
-						// `discard` or fix-and-retry on the next turn instead of being
-						// stranded with no pending action to address.
-						pushDirective();
-						steerReminder();
-					},
-				}),
+	const onInvoked = async (input: unknown): Promise<AgentToolResult<unknown>> => {
+		const result = await runResolveInvocation(input as ResolveParams, {
+			sourceToolName: options.sourceToolName,
+			label: options.label,
+			apply: options.apply,
+			reject: options.reject,
+			onApplyError: () => {
+				// Apply threw (e.g. ast_edit overlapping replacements). Keep the preview
+				// pending under the SAME id so the model can `discard` or fix-and-retry;
+				// runResolveInvocation rethrows, so the success-path removal below is skipped.
+				queue.registerPendingInvoker(id, options.sourceToolName, onInvoked);
+			},
 		});
+		// Resolved (apply succeeded, or discard): consume the staged action exactly once.
+		queue.removePendingInvoker(id);
+		return result;
 	};
 
-	pushDirective();
-	steerReminder();
+	// NON-FORCING: register so `resolve` can dispatch here WITHOUT changing
+	// tool_choice. The agent-loop injects the reminder (from the SoftToolRequirement
+	// the session builds) and forces a resolve turn only on non-compliance.
+	queue.registerPendingInvoker(id, options.sourceToolName, onInvoked);
+}
+
+/**
+ * The canonical preview reminder. The resolve mechanism owns the wording; the
+ * agent-loop delivers it via the session's `SoftToolRequirement.reminder` (injected
+ * once per pending-preview head) instead of a host-side steer, so it lands as a
+ * stable mid-history append and never churns the cached prefix.
+ */
+export function buildResolveReminderMessage(sourceToolName: string): CustomMessage {
+	return {
+		role: "custom",
+		customType: "resolve-reminder",
+		content: [
+			"<system-reminder>",
+			"This is a preview. Call the `resolve` tool to apply or discard these changes.",
+			"</system-reminder>",
+		].join("\n"),
+		display: false,
+		details: { toolName: sourceToolName },
+		attribution: "agent",
+		timestamp: Date.now(),
+	};
 }
 
 /**
@@ -185,7 +207,10 @@ export class ResolveTool implements AgentTool<typeof resolveSchema, ResolveToolD
 		_context?: AgentToolContext,
 	): Promise<AgentToolResult<ResolveToolDetails>> {
 		return untilAborted(signal, async () => {
-			const invoker = this.session.peekQueueInvoker?.() ?? this.session.peekStandingResolveHandler?.();
+			const invoker =
+				this.session.peekQueueInvoker?.() ??
+				this.session.peekPendingInvoker?.() ??
+				this.session.peekStandingResolveHandler?.();
 			if (!invoker) {
 				// `discard` is a request to cancel/abort a staged action. When nothing is
 				// pending, the desired end-state (no staged change) already holds, so honor

package/src/tui/output-block.ts

@@ -48,8 +48,8 @@ function normalizeContentPaddingLeft(value: number | undefined): number {
 
 export function renderOutputBlock(options: OutputBlockOptions, theme: Theme): string[] {
 	const { header, headerMeta, state, sections = [], width, applyBg = true } = options;
-	const h = theme.boxSharp.horizontal;
-	const v = theme.boxSharp.vertical;
+	const h = theme.boxRound.horizontal;
+	const v = theme.boxRound.vertical;
 	const cap = h.repeat(3);
 	const lineWidth = Math.max(0, width);
 	// Border colors: running/pending use accent, success uses dim (gray), error/warning keep their colors
@@ -84,8 +84,8 @@ export function renderOutputBlock(options: OutputBlockOptions, theme: Theme): st
 	const rows: BlockRow[] = [];
 	rows.push({
 		kind: "bar",
-		leftChar: theme.boxSharp.topLeft,
-		rightChar: theme.boxSharp.topRight,
+		leftChar: theme.boxRound.topLeft,
+		rightChar: theme.boxRound.topRight,
 		label: header,
 		meta: headerMeta,
 	});
@@ -99,15 +99,15 @@ export function renderOutputBlock(options: OutputBlockOptions, theme: Theme): st
 		if (section.label) {
 			rows.push({
 				kind: "bar",
-				leftChar: theme.boxSharp.teeRight,
-				rightChar: theme.boxSharp.teeLeft,
+				leftChar: theme.boxRound.teeRight,
+				rightChar: theme.boxRound.teeLeft,
 				label: section.label,
 			});
 		} else if (section.separator && sectionIndex > 0) {
 			rows.push({
 				kind: "bar",
-				leftChar: theme.boxSharp.teeRight,
-				rightChar: theme.boxSharp.teeLeft,
+				leftChar: theme.boxRound.teeRight,
+				rightChar: theme.boxRound.teeLeft,
 			});
 		}
 		const allLines = section.lines.flatMap(l => l.split("\n"));
@@ -126,7 +126,7 @@ export function renderOutputBlock(options: OutputBlockOptions, theme: Theme): st
 		}
 	}
 
-	rows.push({ kind: "bottom", leftChar: theme.boxSharp.bottomLeft, rightChar: theme.boxSharp.bottomRight });
+	rows.push({ kind: "bottom", leftChar: theme.boxRound.bottomLeft, rightChar: theme.boxRound.bottomRight });
 
 	const H = rows.length;
 

package/src/web/scrapers/firefox-addons.ts

@@ -173,7 +173,7 @@ export const handleFirefoxAddons: SpecialHandler = async (
 				md += `- ${permission}\n`;
 			}
 			if (permissions.length > preview.length) {
-				md += `\n*...and ${permissions.length - preview.length} more*\n`;
+				md += `\n[…${permissions.length - preview.length} permissions elided…]\n`;
 			}
 		}
 

package/src/web/scrapers/github.ts

@@ -468,7 +468,7 @@ async function renderGitHubRepo(
 			md += `${prefix}${item.path}\n`;
 		}
 		if (tree.length > 100) {
-			md += `... and ${tree.length - 100} more files\n`;
+			md += `[…${tree.length - 100} files elided…]\n`;
 		}
 		md += "```\n\n";
 	}

package/src/web/scrapers/go-pkg.ts

@@ -211,7 +211,7 @@ export const handleGoPkg: SpecialHandler = async (
 					sections.push(exported.slice(0, 50).join("\n"));
 					if (exported.length > 50) {
 						notes.push(`showing 50 of ${exported.length} exports`);
-						sections.push(`\n... and ${exported.length - 50} more`);
+						sections.push(`\n[…${exported.length - 50} exports elided…]`);
 					}
 					sections.push("");
 				}
@@ -240,7 +240,7 @@ export const handleGoPkg: SpecialHandler = async (
 					sections.push(imports.slice(0, 20).join("\n"));
 					if (imports.length > 20) {
 						notes.push(`showing 20 of ${imports.length} imports`);
-						sections.push(`\n... and ${imports.length - 20} more`);
+						sections.push(`\n[…${imports.length - 20} imports elided…]`);
 					}
 					sections.push("");
 				}

package/src/web/scrapers/metacpan.ts

@@ -162,7 +162,7 @@ function formatModuleMarkdown(module: ModuleResponse, release: ReleaseResponse |
 				md += "\n";
 			}
 			if (runtimeDeps.length > 20) {
-				md += `\n*...and ${runtimeDeps.length - 20} more*\n`;
+				md += `\n[…${runtimeDeps.length - 20} dependencies elided…]\n`;
 			}
 		}
 	}
@@ -212,7 +212,7 @@ function formatReleaseMarkdown(release: ReleaseResponse): string {
 			md += "\n";
 		}
 		if (runtimeDeps.length > 20) {
-			md += `\n*...and ${runtimeDeps.length - 20} more*\n`;
+			md += `\n[…${runtimeDeps.length - 20} dependencies elided…]\n`;
 		}
 	}
 

package/src/web/scrapers/nvd.ts

@@ -182,7 +182,7 @@ export const handleNvd: SpecialHandler = async (
 				md += `- \`${cpe}\`\n`;
 			}
 			if (cpes.length > 20) {
-				md += `\n*...and ${cpes.length - 20} more*\n`;
+				md += `\n[…${cpes.length - 20} CPEs elided…]\n`;
 			}
 			md += "\n";
 		}
@@ -195,7 +195,7 @@ export const handleNvd: SpecialHandler = async (
 				md += `- ${ref.url}${tags}\n`;
 			}
 			if (vuln.references.length > 15) {
-				md += `\n*...and ${vuln.references.length - 15} more references*\n`;
+				md += `\n[…${vuln.references.length - 15} references elided…]\n`;
 			}
 		}
 

package/src/web/scrapers/ollama.ts

@@ -139,7 +139,7 @@ function formatTagList(tags: string[], maxItems: number): string {
 	const limited = tags.slice(0, maxItems);
 	const formatted = limited.map(tag => `\`${tag}\``).join(", ");
 	if (tags.length > maxItems) {
-		return `${formatted} (and ${tags.length - maxItems} more)`;
+		return `${formatted} […${tags.length - maxItems} tags elided…]`;
 	}
 	return formatted;
 }

package/src/web/scrapers/opencorporates.ts

@@ -216,7 +216,7 @@ export const handleOpenCorporates: SpecialHandler = async (
 					md += "\n";
 				}
 				if (inactiveOfficers.length > 10) {
-					md += `\n*...and ${inactiveOfficers.length - 10} more former officers*\n`;
+					md += `\n[…${inactiveOfficers.length - 10} former officers elided…]\n`;
 				}
 				md += "\n";
 			}

package/src/web/scrapers/pub-dev.ts

@@ -109,7 +109,7 @@ export const handlePubDev: SpecialHandler = async (url: string, timeout: number,
 					md += "\n";
 				}
 				if (deps.length > 20) {
-					md += `\n*...and ${deps.length - 20} more*\n`;
+					md += `\n[…${deps.length - 20} dependencies elided…]\n`;
 				}
 				md += "\n";
 			}

package/src/web/scrapers/repology.ts

@@ -239,7 +239,7 @@ export const handleRepology: SpecialHandler = async (
 		}
 
 		if (packages.length > 15) {
-			md += `\n*...and ${packages.length - 15} more repositories*\n`;
+			md += `\n[…${packages.length - 15} repositories elided…]\n`;
 		}
 
 		md += `\n---\n\n[View on Repology](${url})\n`;

package/src/web/scrapers/sourcegraph.ts

@@ -294,7 +294,7 @@ async function renderSearch(
 	}
 
 	if (results.length > maxResults) {
-		md += `... and ${results.length - maxResults} more results\n`;
+		md += `[…${results.length - maxResults} results elided…]\n`;
 	}
 
 	return { content: md, ok: true };

package/src/web/scrapers/terraform.ts

@@ -150,7 +150,7 @@ async function handleModuleUrl(
 			md += `| ${input.name} | \`${type}\` | ${required} | ${desc} |\n`;
 		}
 		if (inputs.length > 30) {
-			md += `\n*... and ${inputs.length - 30} more inputs*\n`;
+			md += `\n[…${inputs.length - 30} inputs elided…]\n`;
 		}
 		md += "\n";
 	}
@@ -165,7 +165,7 @@ async function handleModuleUrl(
 			md += "\n";
 		}
 		if (outputs.length > 20) {
-			md += `\n*... and ${outputs.length - 20} more outputs*\n`;
+			md += `\n[…${outputs.length - 20} outputs elided…]\n`;
 		}
 		md += "\n";
 	}
@@ -180,7 +180,7 @@ async function handleModuleUrl(
 			md += "\n";
 		}
 		if (deps.length > 15) {
-			md += `\n*... and ${deps.length - 15} more dependencies*\n`;
+			md += `\n[…${deps.length - 15} dependencies elided…]\n`;
 		}
 		md += "\n";
 	}
@@ -193,7 +193,7 @@ async function handleModuleUrl(
 			md += `- \`${res.type}\` (${res.name})\n`;
 		}
 		if (resources.length > 20) {
-			md += `\n*... and ${resources.length - 20} more resources*\n`;
+			md += `\n[…${resources.length - 20} resources elided…]\n`;
 		}
 		md += "\n";
 	}
@@ -205,7 +205,7 @@ async function handleModuleUrl(
 			md += `- **${sub.name}**: \`${sub.path}\`\n`;
 		}
 		if (mod.submodules.length > 10) {
-			md += `\n*... and ${mod.submodules.length - 10} more submodules*\n`;
+			md += `\n[…${mod.submodules.length - 10} submodules elided…]\n`;
 		}
 	}
 
@@ -267,7 +267,7 @@ async function handleProviderUrl(
 				md += `- [${doc.title}](https://registry.terraform.io/providers/${namespace}/${type}/latest/docs/${doc.category}/${doc.slug})\n`;
 			}
 			if (docs.length > 15) {
-				md += `\n*... and ${docs.length - 15} more*\n`;
+				md += `\n[…${docs.length - 15} documents elided…]\n`;
 			}
 			md += "\n";
 		}

package/src/web/scrapers/wikidata.ts

@@ -169,7 +169,7 @@ export const handleWikidata: SpecialHandler = async (
 				if (values.length > 0) {
 					// Limit values shown per property
 					const displayValues = values.slice(0, 10);
-					const overflow = values.length > 10 ? ` (+${values.length - 10} more)` : "";
+					const overflow = values.length > 10 ? ` […${values.length - 10} values elided…]` : "";
 					processedProperties.push(`- **${propLabel}:** ${displayValues.join(", ")}${overflow}`);
 				}
 			}
@@ -187,7 +187,7 @@ export const handleWikidata: SpecialHandler = async (
 			const maxProps = 50;
 			md += processedProperties.slice(0, maxProps).join("\n");
 			if (processedProperties.length > maxProps) {
-				md += `\n\n*...and ${processedProperties.length - maxProps} more properties*`;
+				md += `\n\n[…${processedProperties.length - maxProps} properties elided…]`;
 			}
 			md += "\n";
 		}

package/src/workspace-tree.ts

@@ -298,7 +298,7 @@ function applyLineCap(
 	const removed = new Set(removable.map(item => item.index));
 	const kept = lines.filter((_, index) => !removed.has(index));
 	kept.push({
-		label: `… (${removable.length} lines elided beyond depth/cap)`,
+		label: `[…${removable.length}ln elided…]`,
 		depth: 0,
 		isRoot: false,
 	});

package/dist/types/modes/components/branch-summary-message.d.ts

@@ -1,13 +0,0 @@
-import { Box } from "@oh-my-pi/pi-tui";
-import type { BranchSummaryMessage } from "../../session/messages";
-/**
- * Component that renders a branch summary message with collapsed/expanded state.
- * Uses same background color as hook messages for visual consistency.
- */
-export declare class BranchSummaryMessageComponent extends Box {
-    #private;
-    private readonly message;
-    constructor(message: BranchSummaryMessage);
-    setExpanded(expanded: boolean): void;
-    invalidate(): void;
-}

package/src/modes/components/branch-summary-message.ts

@@ -1,46 +0,0 @@
-import { Box, Markdown, Spacer, Text } from "@oh-my-pi/pi-tui";
-import { getMarkdownTheme, theme } from "../../modes/theme/theme";
-import type { BranchSummaryMessage } from "../../session/messages";
-
-/**
- * Component that renders a branch summary message with collapsed/expanded state.
- * Uses same background color as hook messages for visual consistency.
- */
-export class BranchSummaryMessageComponent extends Box {
-	#expanded = false;
-
-	constructor(private readonly message: BranchSummaryMessage) {
-		super(1, 1, t => theme.bg("customMessageBg", t));
-		this.setIgnoreTight(true);
-		this.#updateDisplay();
-	}
-
-	setExpanded(expanded: boolean): void {
-		this.#expanded = expanded;
-		this.#updateDisplay();
-	}
-
-	override invalidate(): void {
-		super.invalidate();
-		this.#updateDisplay();
-	}
-
-	#updateDisplay(): void {
-		this.clear();
-
-		const label = theme.fg("customMessageLabel", theme.bold("[branch]"));
-		this.addChild(new Text(label, 0, 0));
-		this.addChild(new Spacer(1));
-
-		if (this.#expanded) {
-			const header = "**Branch Summary**\n\n";
-			this.addChild(
-				new Markdown(header + this.message.summary, 0, 0, getMarkdownTheme(), {
-					color: (text: string) => theme.fg("customMessageText", text),
-				}),
-			);
-		} else {
-			this.addChild(new Text(theme.fg("customMessageText", "Branch summary (ctrl+o to expand)"), 0, 0));
-		}
-	}
-}