@oh-my-pi/pi-tui 18.4.4 → 18.4.6

package/src/status-line/host.ts

@@ -45,6 +45,8 @@ export interface StatusLineSession {
 			orchestrationCacheRead: number;
 			premiumRequests: number;
 			cost: number;
+			/** Portion of `cost` carried by completed subagent task results. */
+			subagentCost?: number;
 		};
 	};
 	modelRegistry: {

package/src/status-line/metrics.ts

@@ -10,14 +10,26 @@ export interface BillingSummaryOptions {
 	readonly premiumRequests: number;
 	readonly fractionDigits: number;
 	readonly pricingPeriod?: "peak" | "off-peak";
+	/** Subagent-tree spend, rendered `(+…)` after the session's own spend; `cost` excludes it. */
+	readonly subagentCost?: number;
 	readonly advisor?: {
 		readonly cost: number;
 		readonly usingSubscription: boolean;
 	};
 }
 
-function formatSpend(amount: number, usingSubscription: boolean, fractionDigits: number, uiTheme: Theme): string {
+type BillingUnit = "metered" | "subscription";
+
+/** `showUnit: false` omits the `$`/subscription symbol when the summary already printed it. */
+function formatSpend(
+	amount: number,
+	usingSubscription: boolean,
+	fractionDigits: number,
+	uiTheme: Theme,
+	showUnit: boolean,
+): string {
 	const formatted = amount.toFixed(fractionDigits);
+	if (!showUnit) return formatted;
 	if (!usingSubscription) return `$${formatted}`;
 	if (uiTheme.getSymbolPreset() === "nerd") {
 		const icon = uiTheme.icon.subscription;
@@ -31,8 +43,9 @@ function formatAdvisorSpend(
 	usingSubscription: boolean,
 	fractionDigits: number,
 	uiTheme: Theme,
+	showUnit: boolean,
 ): string {
-	const spend = formatSpend(amount, usingSubscription, fractionDigits, uiTheme);
+	const spend = formatSpend(amount, usingSubscription, fractionDigits, uiTheme, showUnit);
 	const icon = uiTheme.icon.advisor;
 	return icon && icon !== "(adv)" ? `${icon} ${spend}` : `${spend} (adv)`;
 }
@@ -40,32 +53,50 @@ function formatAdvisorSpend(
 /**
  * Shared billing metric presentation. Callers select precision explicitly so
  * the legacy footer keeps three decimals while current status segments keep two.
+ * A unit symbol (`$` or the subscription mark) is printed at most once; later
+ * amounts billed the same way render bare.
  */
 export function formatBillingSummary(options: BillingSummaryOptions, uiTheme: Theme): string | undefined {
 	const premiumRequests = normalizePremiumRequests(options.premiumRequests);
 	const advisorCost = options.advisor?.cost ?? 0;
-	if (!options.cost && !advisorCost && !options.usingSubscription && !premiumRequests && !options.pricingPeriod) {
+	const subagentCost = options.subagentCost ?? 0;
+	if (
+		!options.cost &&
+		!subagentCost &&
+		!advisorCost &&
+		!options.usingSubscription &&
+		!premiumRequests &&
+		!options.pricingPeriod
+	) {
 		return undefined;
 	}
 
 	const parts: string[] = [];
-	if (options.cost || options.pricingPeriod) {
-		parts.push(formatSpend(options.cost, options.usingSubscription, options.fractionDigits, uiTheme));
+	let shownUnit: BillingUnit | undefined;
+	const primaryUnit: BillingUnit = options.usingSubscription ? "subscription" : "metered";
+	if (options.cost || options.pricingPeriod || subagentCost) {
+		parts.push(formatSpend(options.cost, options.usingSubscription, options.fractionDigits, uiTheme, true));
+		shownUnit = primaryUnit;
 	} else if (options.usingSubscription) {
 		parts.push(
 			uiTheme.getSymbolPreset() === "nerd" && uiTheme.icon.subscription ? uiTheme.icon.subscription : "(sub)",
 		);
+		shownUnit = primaryUnit;
 	}
+	// Always follows the primary spend, which already carries the unit.
+	if (subagentCost) parts.push(`(+${subagentCost.toFixed(options.fractionDigits)})`);
 	if (options.pricingPeriod) parts.push(options.pricingPeriod === "peak" ? "↑" : "↓");
 	if (premiumRequests) parts.push(`★ ${formatNumber(premiumRequests)}`);
 	if (advisorCost && options.advisor) {
 		const prefix = parts.length > 0 ? "+ " : "";
+		const advisorUnit: BillingUnit = options.advisor.usingSubscription ? "subscription" : "metered";
 		parts.push(
 			`${prefix}${formatAdvisorSpend(
 				advisorCost,
 				options.advisor.usingSubscription,
 				options.fractionDigits,
 				uiTheme,
+				shownUnit !== advisorUnit,
 			)}`,
 		);
 	}

package/src/status-line/segments.ts

@@ -782,6 +782,13 @@ const tokenRateSegment: StatusLineSegment = {
 /** Billing summary for the `cost` segment, or undefined when there is nothing to bill. */
 function costSummary(ctx: SegmentContext): string | undefined {
 	const { cost, premiumRequests } = ctx.usageStats;
+	// `cost` folds in completed task results; show the session's own spend and
+	// the subagent tree separately. The hub-projected tree total also covers
+	// grandchildren and running/async agents, but it lags persisted-roster
+	// hydration after resume, so the task-result sum is its floor.
+	const taskResultCost = ctx.usageStats.subagentCost ?? 0;
+	const ownCost = Math.max(0, cost - taskResultCost);
+	const subagentCost = Math.max(ctx.subagentTreeCost ?? 0, taskResultCost);
 	const advisorCost = ctx.session.getAdvisorCost?.() ?? 0;
 	const state = ctx.session.state;
 	const pricingPeriod = state.model?.cost
@@ -794,7 +801,8 @@ function costSummary(ctx: SegmentContext): string | undefined {
 	// working-spinner cadence, so an eager per-frame probe pinned CPU (#10129).
 	return formatBillingSummary(
 		{
-			cost,
+			cost: ownCost,
+			subagentCost,
 			usingSubscription,
 			premiumRequests,
 			fractionDigits: 2,

package/src/status-line/types.ts

@@ -138,6 +138,8 @@ export interface SegmentContext {
 		orchestrationCacheRead: number;
 		premiumRequests: number;
 		cost: number;
+		/** Portion of `cost` carried by completed subagent task results. */
+		subagentCost?: number;
 		tokensPerSecond: number | null;
 	};
 	/** Context usage percent, or null when unknown (e.g. right after compaction). */
@@ -150,6 +152,11 @@ export interface SegmentContext {
 	/** Blink phase for the running-speculation pulse; toggled by the component's timer. */
 	speculationBlinkOn: boolean;
 	subagentCount: number;
+	/**
+	 * Spend of every subagent under the main session (descendants included),
+	 * from the Agent Hub projection; 0 while a subagent is focused or unknown.
+	 */
+	subagentTreeCost?: number;
 	/**
 	 * Active processing time accumulated this session, in ms — the union of
 	 * every `agent_start`→`agent_end` window plus the currently-streaming
@@ -224,7 +231,11 @@ export interface SegmentView {
  * and branch, and the composer the rest.
  */
 export interface ComposerFacts {
-	/** `meter` (role `omp.composer.context`): context usage along the composer's top edge. */
+	/**
+	 * `meter` (role `omp.composer.context`): context usage along the composer's top edge,
+	 * the whole window wide, with the speculation and compaction points as icon marks,
+	 * the share as `label` and the window as `total`.
+	 */
 	readonly context: NativeNode;
 	/** The model chip's label: name plus the advisor, fast-mode and slow-mode marks. */
 	readonly model: SegmentView;
@@ -233,7 +244,7 @@ export interface ComposerFacts {
 	 * segments as `seg`s; the bar's flexible space, so present even when empty.
 	 */
 	readonly extras: NativeNode;
-	/** `text` (role `omp.composer.usage`): the context share of the window and the session cost. */
+	/** `text` (role `omp.composer.usage`): the session cost (empty when there is none). */
 	readonly usage: NativeNode;
 }
 

package/src/terminal.ts

@@ -33,6 +33,26 @@ const TERMINAL_PROGRESS_KEEPALIVE_MS = 1000;
 const TERMINAL_PROGRESS_ACTIVE_SEQUENCE = "\x1b]9;4;3\x07";
 const TERMINAL_PROGRESS_CLEAR_SEQUENCE = "\x1b]9;4;0;\x07";
 const WINDOWS_TERMINAL_OSC11_POLL_MS = 30_000;
+
+/**
+ * Terminal → program TSP messages through a Windows ConPTY: its input parser
+ * discards APC strings but passes OSC through, so Tern writes
+ * `ESC ] 877 ; tsp;… ESC \` there instead of `ESC _ tsp;… ESC \`.
+ */
+const TSP_OSC_PREFIX = `\x1b]877;${TSP_PREFIX.slice(2)}`;
+
+/**
+ * The TSP message a reassembled input string holds, in APC form, or
+ * `undefined` while its terminator has not arrived. An OSC 877 message may end
+ * with ST or BEL (a JSON body never contains BEL).
+ */
+function completeTspInput(buffered: string): string | undefined {
+	if (!buffered.startsWith(TSP_OSC_PREFIX)) return buffered.endsWith("\x1b\\") ? buffered : undefined;
+	const terminator = buffered.endsWith("\x1b\\") ? 2 : buffered.endsWith("\x07") ? 1 : 0;
+	if (terminator === 0) return undefined;
+	return `${TSP_PREFIX}${buffered.slice(TSP_OSC_PREFIX.length, -terminator)}\x1b\\`;
+}
+
 function shouldEnableModifyOtherKeysFallback(env: NodeJS.ProcessEnv = Bun.env): boolean {
 	if (!env.SSH_CONNECTION && !env.SSH_TTY && !env.SSH_CLIENT) return true;
 	return TERMINAL.id !== "base" && TERMINAL.id !== "trueColor";
@@ -1520,16 +1540,17 @@ export class ProcessTerminal implements Terminal {
 				}
 			}
 
-			// Tern Surface Protocol APC (`ESC _ tsp ; … ESC \`): the hello reply
-			// resolves the probe; events go to the input handler whole, where the
-			// TUI routes them to the native backend before key matching.
-			if (this.#tspReplyBuffer || sequence.startsWith(TSP_PREFIX)) {
+			// Tern Surface Protocol APC (`ESC _ tsp ; … ESC \`), or its OSC 877
+			// framing through a ConPTY: the hello reply resolves the probe; events
+			// go to the input handler whole, in APC form, where the TUI routes them
+			// to the native backend before key matching.
+			if (this.#tspReplyBuffer || sequence.startsWith(TSP_PREFIX) || sequence.startsWith(TSP_OSC_PREFIX)) {
 				if (this.#tspReplyBuffer && sequence.startsWith("\x1b") && sequence !== "\x1b\\") {
 					this.#tspReplyBuffer = "";
 				} else {
 					this.#tspReplyBuffer += sequence;
-					if (!this.#tspReplyBuffer.endsWith("\x1b\\")) return;
-					const message = this.#tspReplyBuffer;
+					const message = completeTspInput(this.#tspReplyBuffer);
+					if (message === undefined) return;
 					this.#tspReplyBuffer = "";
 					this.#handleTspMessage(message);
 					return;

package/src/tools/edit.ts

@@ -693,6 +693,29 @@ function getHashlineInputSections(input: string): HashlineInputEntry[] {
 	return entries;
 }
 
+/** Extract display targets using the existing parsers for supported freeform edit modes. */
+export function getEditInputPaths(input: string, resolvedMode?: EditMode): readonly string[] {
+	const mode =
+		resolvedMode ??
+		(/^\*\*\* (?:Add|Update|Delete) File:/m.test(input)
+			? "apply_patch"
+			: /^[ \t]*\*{3}[ \t]+Edit[ \t]+File:/im.test(input)
+				? "sloppy"
+				: undefined);
+	try {
+		const entries =
+			mode && mode !== "hashline" ? inspectInputEntries({}, mode, input) : getHashlineInputSections(input);
+		const paths: string[] = [];
+		for (const entry of entries) {
+			if (entry.path) paths.push(entry.path);
+			if (entry.rename && entry.rename !== entry.path) paths.push(entry.rename);
+		}
+		return paths;
+	} catch {
+		return [];
+	}
+}
+
 function getHashlineInputRenderSummary(
 	args: EditRenderArgs,
 	editMode: EditMode | undefined,

package/src/tools/eval.ts

@@ -689,9 +689,8 @@ interface EvalCellSection {
 }
 
 /**
- * One cell as a borderless section: its highlighted code (no line numbers),
- * then its output. Only multi-cell calls caption the section (`2/3 title ·
- * 1.2s`); a single cell's title is the tool head, never repeated.
+ * A notebook cell with separate input and output gutters. Only multi-cell
+ * calls repeat titles; prompts show execution state, never invented counts.
  */
 function evalCellSection(cell: EvalCellSection, index: number, total: number): NativeNode {
 	let head: TspSpan[] | undefined;
@@ -702,13 +701,36 @@ function evalCellSection(cell: EvalCellSection, index: number, total: number): N
 		if (cell.status === "error") head.push(span(" · failed", "error"));
 		if (cell.durationMs !== undefined) head.push(span(` · ${(cell.durationMs / 1000).toFixed(2)}s`, "muted"));
 	}
+	const prompt = cell.status === "running" ? "In [*]:" : !cell.status || cell.status === "pending" ? "In [ ]:" : "In:";
 	return node(
-		"section",
-		{ head, role: "omp.tool.eval.cell", tone: cell.status === "error" ? "error" : undefined },
-		[
-			keyed(codeNode(cell.code, { lang: languageForHighlighter(cell.language), numbers: false }), "code"),
-			...(cell.output ?? []),
-		],
+		"col",
+		{
+			role: "omp.tool.eval.cell",
+			tone: cell.status === "error" ? "error" : cell.status === "running" ? "pending" : undefined,
+		},
+		compact<NativeChild>([
+			head ? text(head, { role: "omp.tool.eval.caption" }) : undefined,
+			node(
+				"row",
+				{ role: "omp.tool.eval.input", align: "start" },
+				[
+					text(prompt, { role: "omp.tool.eval.prompt", wrap: "none" }),
+					keyed(codeNode(cell.code, { lang: languageForHighlighter(cell.language), numbers: false }), "code"),
+				],
+				"input",
+			),
+			cell.output?.length
+				? node(
+						"row",
+						{ role: "omp.tool.eval.result", align: "start" },
+						[
+							text("Out:", { role: "omp.tool.eval.prompt", wrap: "none" }),
+							node("col", { role: "omp.tool.eval.outputs" }, cell.output),
+						],
+						"output",
+					)
+				: undefined,
+		]),
 		`cell-${index}`,
 	);
 }
@@ -1061,6 +1083,7 @@ export const evalToolRenderer = {
 								cell.status === "error",
 							),
 							...(cell.statusEvents ?? []).map(describeStatusEvent),
+							...(i === cellResults.length - 1 ? jsonNodes : []),
 						],
 					},
 					i,
@@ -1086,17 +1109,26 @@ export const evalToolRenderer = {
 					result.isError === true,
 				),
 				...(details?.statusEvents ?? []).map(describeStatusEvent),
+				...jsonNodes,
 			];
 			cells =
 				argCells.length > 0
 					? argCells.map((cell, i) =>
-							evalCellSection(i === argCells.length - 1 ? { ...cell, output } : cell, i, argCells.length),
+							evalCellSection(
+								{
+									...cell,
+									status: isPartial ? "running" : result.isError ? "error" : "complete",
+									output: i === argCells.length - 1 ? output : undefined,
+								},
+								i,
+								argCells.length,
+							),
 						)
 					: output;
 		}
 		return {
 			tool: head,
-			body: compact<NativeChild>([...cells, ...jsonNodes, footer]),
+			body: compact<NativeChild>([...cells, footer]),
 			preview: { lines: previewLines },
 		};
 	},

package/src/tools/grouped-file-output.ts

@@ -300,6 +300,8 @@ export function* walkGroupedOutput(lines: readonly string[]): Generator<GroupedO
 
 /** `*12│text`, ` 12|text`, `*12:text`: optional match marker, line number, gutter, content. */
 const GROUPED_NUMBERED_LINE_RE = /^\s*(\*?)(\d+)(?:│|[:|])(.*)$/;
+/** `    │...`: grep's gap between non-adjacent context runs (drawn as {@link numberedCode}'s `…` row). */
+const GROUPED_GAP_LINE_RE = /^\s*│\.\.\.$/;
 
 /** One source line for {@link numberedCode}: its number (`null` for an elision marker), text and match mark. */
 export interface NumberedLine {
@@ -400,6 +402,10 @@ export function describeGroupedOutput(
 			if (event.kind === "file") current = { path: event.path, suffix: event.suffix, children: [], marks: 0 };
 			continue;
 		}
+		if (GROUPED_GAP_LINE_RE.test(event.text)) {
+			numbered.push({ n: null, text: "" });
+			continue;
+		}
 		const match = GROUPED_NUMBERED_LINE_RE.exec(event.text);
 		if (!match) {
 			if (numbered.length > 0) flushLines();

package/src/tools/task.ts

@@ -33,7 +33,9 @@ import {
 	previewLine,
 	previewWindowRows,
 	replaceTabs,
+	shortenEmbeddedPaths,
 	shortenPath,
+	shortenToolArgumentPaths,
 	type ToolUIStatus,
 	TRUNCATE_LENGTHS,
 	truncateToWidth,
@@ -663,6 +665,11 @@ function renderRouteLine(route: string | undefined, continuePrefix: string, maxW
 	];
 }
 
+/** A tool call's own intent, else its argument, with home paths shortened as the subagent HUD does. */
+function toolCallDetail(intent: string | undefined, args: string | undefined, argsKey: string | undefined): string {
+	return intent ? shortenEmbeddedPaths(intent) : shortenToolArgumentPaths(args ?? "", argsKey);
+}
+
 /**
  * Render streaming progress for a single agent.
  */
@@ -723,7 +730,11 @@ function renderAgentProgress(
 	if (progress.status === "running") {
 		if (progress.currentTool) {
 			let toolLine = `${continuePrefix}${theme.tree.hook} ${theme.fg("muted", sanitizeText(progress.currentTool))}`;
-			const toolDetail = progress.lastIntent ?? progress.currentToolArgs;
+			const toolDetail = toolCallDetail(
+				progress.currentToolIntent,
+				progress.currentToolArgs,
+				progress.currentToolArgsKey,
+			);
 			if (toolDetail) {
 				toolLine += `: ${theme.fg("dim", previewLine(sanitizeText(toolDetail), 40))}`;
 			}
@@ -738,7 +749,7 @@ function renderAgentProgress(
 			// Show most recent completed tool when idle between tools
 			const recent = progress.recentTools[0];
 			let toolLine = `${continuePrefix}${theme.tree.hook} ${theme.fg("dim", sanitizeText(recent.tool))}`;
-			const toolDetail = progress.lastIntent ?? recent.args;
+			const toolDetail = toolCallDetail(recent.intent, recent.args, recent.argsKey);
 			if (toolDetail) {
 				toolLine += `: ${theme.fg("dim", previewLine(sanitizeText(toolDetail), 40))}`;
 			}
@@ -1795,7 +1806,10 @@ function describeProgressAgent(progress: AgentProgress, state: AgentDescribeStat
 		running && progress.currentTool
 			? {
 					name: plainText(progress.currentTool),
-					intent: plainText(progress.lastIntent ?? progress.currentToolArgs ?? "") || undefined,
+					intent:
+						plainText(
+							toolCallDetail(progress.currentToolIntent, progress.currentToolArgs, progress.currentToolArgsKey),
+						) || undefined,
 					age: progress.currentToolStartMs ? Math.max(0, nowMs - progress.currentToolStartMs) : undefined,
 				}
 			: null;
@@ -2252,8 +2266,19 @@ export interface AgentProgress {
 	lastIntent?: string;
 	currentTool?: string;
 	currentToolArgs?: string;
+	/** Argument key selected for the display preview, when known. */
+	currentToolArgsKey?: string;
+	/** Intent the model attached to the current call; undefined when that call carried none. */
+	currentToolIntent?: string;
 	currentToolStartMs?: number;
-	recentTools: Array<{ tool: string; args: string; endMs: number }>;
+	recentTools: Array<{
+		tool: string;
+		args: string;
+		argsKey?: string;
+		intent?: string;
+		isError?: boolean;
+		endMs: number;
+	}>;
 	recentOutput: string[];
 	toolCount: number;
 	/** Count of assistant requests (assistant message_end events) across the run. Drives the soft request budget guard. */

package/src/tui.ts

@@ -27,7 +27,7 @@ import { LoopWatchdog } from "./loop-watchdog";
 import { assumedTspHello, NativeBackend, type NativeHost } from "./native/backend";
 import { col } from "./native/describe";
 import { TSP_PREFIX, type TspHello } from "./native/encode";
-import type { DescribeContext, NativeNode, NativeSurfaceProvider, NativeUiEvent } from "./native/node";
+import type { DescribeContext, NativeNode, NativeScreen, NativeSurfaceProvider, NativeUiEvent } from "./native/node";
 import { STDOUT_BACKLOG_CLEAR_BYTES, setAltScreenActive, type Terminal } from "./terminal";
 import {
 	encodeKittyDeleteAllImages,
@@ -274,6 +274,14 @@ export interface Component {
 	 */
 	nativeSheet?(cx: DescribeContext): boolean;
 
+	/**
+	 * A fullscreen overlay that is a page of its own rather than one block:
+	 * the regions (and role) of the screen surface it fills, instead of the
+	 * default lone `main` child. Put the component itself in `dock` to keep
+	 * its focus target and events.
+	 */
+	describeScreen?(cx: DescribeContext): NativeScreen;
+
 	/** User actions on nodes this component described (toggle, select, activate, custom). */
 	handleNativeEvent?(event: NativeUiEvent): void;