@oh-my-pi/pi-tui 18.2.8 → 18.2.10

package/src/tmux.ts

@@ -1,3 +1,6 @@
+import { $which } from "@oh-my-pi/pi-utils";
+import { isBunTestRuntime } from "@oh-my-pi/pi-utils/env";
+
 /** Whether the process is running inside a tmux session. */
 export function isInsideTmux(env: NodeJS.ProcessEnv = Bun.env): boolean {
 	return Boolean(env.TMUX);
@@ -12,3 +15,38 @@ export function wrapTmuxPassthrough(payload: string): string {
 export function wrapTmuxPassthroughIfNeeded(payload: string, env: NodeJS.ProcessEnv = Bun.env): string {
 	return isInsideTmux(env) ? wrapTmuxPassthrough(payload) : payload;
 }
+
+const CLIENT_TERMTYPE_NAME = /^([A-Za-z][A-Za-z0-9._+-]*)(?=\s|\(|$)/u;
+const CLIENT_TERMTYPE_TIMEOUT_MS = 500;
+let cachedClientTerminalName: string | null | undefined;
+
+function queryTmuxClientTerminalName(env: NodeJS.ProcessEnv): string | null {
+	const tmux = $which("tmux", { PATH: env.PATH });
+	if (!tmux) return null;
+	try {
+		const result = Bun.spawnSync([tmux, "display-message", "-p", "#{client_termtype}"], {
+			env,
+			stdout: "pipe",
+			stderr: "ignore",
+			timeout: CLIENT_TERMTYPE_TIMEOUT_MS,
+			killSignal: "SIGKILL",
+		});
+		if (result.exitCode !== 0) return null;
+		return CLIENT_TERMTYPE_NAME.exec(result.stdout.toString().trim())?.[1] ?? null;
+	} catch {
+		return null;
+	}
+}
+
+/**
+ * Resolve the terminal emulator name recorded for this tmux client.
+ *
+ * tmux overwrites pane identity variables with its own values, but retains the
+ * attached client's terminal-type reply in `#{client_termtype}`. The local IPC
+ * query runs once per process and degrades to `null` when unavailable.
+ */
+export function resolveTmuxClientTerminalName(env: NodeJS.ProcessEnv = Bun.env): string | null {
+	if (!isInsideTmux(env) || isBunTestRuntime()) return null;
+	if (cachedClientTerminalName === undefined) cachedClientTerminalName = queryTmuxClientTerminalName(env);
+	return cachedClientTerminalName;
+}

package/src/tools/eval-format/index.ts

@@ -7,6 +7,7 @@ export * from "./python";
 
 /** Formats an arbitrary eval-code prefix for display without changing the executed source. */
 export function formatEvalCodeForDisplay(source: string, language: EvalLanguage): string {
+	if (/^\s*%/.test(source)) return source;
 	switch (language) {
 		case "js":
 			return formatJavaScriptForDisplay(source);

package/src/tools/eval.ts

@@ -93,10 +93,7 @@ interface EvalRenderCellArg {
 	title?: string;
 }
 
-interface EvalRenderArgs {
-	language?: string;
-	code?: string;
-	title?: string;
+interface EvalRenderArgs extends EvalRenderCellArg {
 	cells?: EvalRenderCellArg[];
 	__partialJson?: string;
 }
@@ -126,10 +123,9 @@ function getRenderCells(args: EvalRenderArgs | undefined): EvalRenderCell[] {
 	for (const cell of raw) {
 		if (!cell || typeof cell !== "object") continue;
 		const language = normalizeRenderLanguage(typeof cell.language === "string" ? cell.language : undefined);
-		const code = typeof cell.code === "string" ? cell.code : "";
 		out.push({
 			language,
-			code: formatEvalCodeForDisplay(code, language),
+			code: formatEvalCodeForDisplay(cell.code ?? "", language),
 			title: typeof cell.title === "string" ? cell.title : undefined,
 		});
 	}
@@ -139,16 +135,28 @@ function getRenderCells(args: EvalRenderArgs | undefined): EvalRenderCell[] {
 type AgentEventStatus = "pending" | "running" | "completed" | "failed" | "aborted";
 
 /**
- * Append or replace a status event. `agent` and `judge_batch` events are
- * progress snapshots keyed by `id`, so they coalesce in place (preserving
- * first-seen order); every other op is a discrete action and simply appends.
- * Keeps the persisted event list bounded even when a subagent or batch emits
- * hundreds of throttled progress ticks.
+ * Coalescing key of a progress-snapshot event: `agent` and `judge_batch`
+ * events keyed by `id`, where only the newest snapshot matters. Discrete
+ * actions (everything else) have no key. Shared by {@link upsertStatusEvent}
+ * and the executors' display collectors so both coalesce identically.
  */
-export function upsertStatusEvent(events: EvalStatusEvent[], event: EvalStatusEvent): void {
+export function statusEventKey(event: { op: string; [key: string]: unknown }): string | undefined {
 	if ((event.op === "agent" || event.op === "judge_batch") && typeof event.id === "string") {
-		const { op, id } = event;
-		const idx = events.findIndex(e => e.op === op && e.id === id);
+		return `${event.op}\0${event.id}`;
+	}
+	return undefined;
+}
+
+/**
+ * Append or replace a status event. Progress snapshots (see
+ * {@link statusEventKey}) coalesce in place, preserving first-seen order; every
+ * other op is a discrete action and simply appends. Keeps the persisted event
+ * list bounded even when a subagent or batch emits hundreds of progress ticks.
+ */
+export function upsertStatusEvent(events: EvalStatusEvent[], event: EvalStatusEvent): void {
+	const key = statusEventKey(event);
+	if (key !== undefined) {
+		const idx = events.findIndex(e => statusEventKey(e) === key);
 		if (idx >= 0) {
 			events[idx] = event;
 			return;

package/src/tools/find.ts

@@ -7,7 +7,15 @@ import * as path from "node:path";
 import { formatDuration, formatNumber } from "@oh-my-pi/pi-utils";
 import { renderProgressBar } from "../components/progress-bar";
 import { Text } from "../components/text";
-import { Ellipsis, fileHyperlink, getTreeBranch, renderStatusLine, renderTreeList, truncateToWidth } from "../render";
+import {
+	Ellipsis,
+	fileHyperlink,
+	getTreeBranch,
+	renderStatusLine,
+	renderTreeList,
+	truncateToWidth,
+	uriHyperlink,
+} from "../render";
 import {
 	createCachedComponent,
 	formatCount,
@@ -31,7 +39,7 @@ export interface FindRange {
 
 /** A file whose verified passages cleared the threshold; `ranges` are merged positive spans, strongest first. */
 export interface FindHit {
-	/** Display path relative to {@link FindToolDetails.cwd}. */
+	/** Display path relative to {@link FindToolDetails.cwd}, or an `omp://` doc URL for docs scopes. */
 	rel: string;
 	/** Filename judgment, when the name batch answered. */
 	nameScore?: number;
@@ -116,9 +124,14 @@ function gauge(p: number, theme: Theme): string {
 }
 
 function renderHit(hit: FindHit, rangeLimit: number, cwd: string | undefined, theme: Theme): string[] {
-	const absPath = cwd === undefined ? undefined : path.join(cwd, hit.rel);
-	const link = (text: string, line?: number) =>
-		absPath === undefined ? text : fileHyperlink(absPath, text, { line });
+	// `omp://` hits are virtual docs, not files under `cwd`: link the URL
+	// itself instead of joining it onto a filesystem base.
+	const isOmpHit = /^omp:\/\//i.test(hit.rel);
+	const link = (text: string, line?: number): string => {
+		if (isOmpHit) return uriHyperlink(line === undefined ? hit.rel : `${hit.rel}:${line}`, text);
+		const absPath = cwd === undefined ? undefined : path.join(cwd, hit.rel);
+		return absPath === undefined ? text : fileHyperlink(absPath, text, { line });
+	};
 	const coverage = hit.truncated ? `${hit.linesSeen} lines judged, partial` : `${hit.linesSeen} lines judged`;
 	const lines = [
 		`${gauge(hit.contentScore, theme)} ${theme.fg(scoreColor(hit.contentScore), hit.contentScore.toFixed(2))} ${link(theme.fg("accent", hit.rel))} ${theme.fg("dim", coverage)}`,

package/src/tools/hub.ts

@@ -100,6 +100,8 @@ export interface JobSnapshot {
 	status: "running" | "completed" | "failed" | "cancelled";
 	label: string;
 	durationMs: number;
+	/** Process exit status when the job reports one. */
+	exitCode?: number;
 	/** Effective task model selector, including an explicit reasoning suffix when configured. */
 	resolvedModel?: string;
 	/** Provider/id including routing, with no added thinking suffix. */
@@ -570,11 +572,11 @@ export function jobsRenderResult(
 					renderItem: (job, context) => {
 						const rowWidth = Math.max(0, width - (context.prefixWidth ?? 0));
 						const lines: string[] = [];
-						const icon = formatStatusIcon(
+						const icon = `${formatStatusIcon(
 							statusToIcon(job.status),
 							uiTheme,
 							job.status === "running" ? options.spinnerFrame : undefined,
-						);
+						)}${job.exitCode === undefined ? "" : `${uiTheme.sep.dot}${uiTheme.fg(job.exitCode === 0 ? "muted" : "error", `exit ${job.exitCode}`)}`}`;
 						const typeBadge = formatBadge(job.type, statusToColor(job.status), uiTheme);
 						const durationSuffix = `${uiTheme.sep.dot}${uiTheme.fg("dim", formatDuration(job.durationMs))}`;
 						const displayId = truncateToWidth(

package/src/tui.ts

@@ -137,9 +137,12 @@ export interface TuiPaint {
 	readonly rows: number;
 }
 
+/** Observer of completed terminal paints; see {@link TUI.addPaintListener}. */
+export type PaintListener = (paint: TuiPaint) => void;
+
 export interface TUIOptions {
 	renderScheduler?: RenderScheduler;
-	onPaint?: (paint: TuiPaint) => void;
+	onPaint?: PaintListener;
 }
 /** Physical terminal dimensions supplied to a frame provider. */
 export interface ViewportSize {
@@ -789,7 +792,7 @@ export class TUI extends Container {
 	#debugNextWindowTop = 0;
 	#inputListeners = new Set<InputListener>();
 	#startListeners = new Set<StartListener>();
-	#paintListener: ((paint: TuiPaint) => void) | null;
+	#paintListeners = new Set<PaintListener>();
 
 	/** Global callback for debug key (Shift+Ctrl+D). Called before input is forwarded to focused component. */
 	onDebug?: () => void;
@@ -922,7 +925,7 @@ export class TUI extends Container {
 		super();
 		this.terminal = terminal;
 		this.#renderScheduler = options?.renderScheduler ?? DEFAULT_RENDER_SCHEDULER;
-		this.#paintListener = options?.onPaint ?? null;
+		if (options?.onPaint) this.#paintListeners.add(options.onPaint);
 		this.#showHardwareCursor = showHardwareCursor === undefined ? this.#showHardwareCursor : showHardwareCursor;
 		this.#watchdog = new LoopWatchdog();
 	}
@@ -931,9 +934,15 @@ export class TUI extends Container {
 		return mode === "append" || mode === "rebuild" || mode === "preserve" ? mode : "preserve";
 	}
 
-	/** Install a listener for completed terminal paints. */
-	setPaintListener(listener: ((paint: TuiPaint) => void) | null): void {
-		this.#paintListener = listener;
+	/**
+	 * Observe completed terminal paints; returns the unsubscribe. Independent
+	 * observers (live stream publisher, session recorder) coexist.
+	 */
+	addPaintListener(listener: PaintListener): () => void {
+		this.#paintListeners.add(listener);
+		return () => {
+			this.#paintListeners.delete(listener);
+		};
 	}
 
 	/** Install the product-owned bounded frame provider. */
@@ -2636,10 +2645,12 @@ export class TUI extends Container {
 	}
 
 	#notifyPaint(paint: TuiPaint): void {
-		try {
-			this.#paintListener?.(paint);
-		} catch (err) {
-			logger.error("TUI paint listener failed", { err });
+		for (const listener of this.#paintListeners) {
+			try {
+				listener(paint);
+			} catch (err) {
+				logger.error("TUI paint listener failed", { err });
+			}
 		}
 	}
 

package/src/utils.ts

@@ -384,6 +384,70 @@ export function visibleWidth(str: string): number {
 	return width;
 }
 
+/** Remove ANSI, OSC, and APC control sequences while preserving visible text. */
+export function stripTerminalSequences(str: string): string {
+	if (!str.includes("\x1b")) return str;
+	let result = "";
+	let i = 0;
+	while (i < str.length) {
+		const ansi = extractAnsiCode(str, i);
+		if (ansi) {
+			i += ansi.length;
+			continue;
+		}
+		result += str[i];
+		i++;
+	}
+	return result;
+}
+
+/**
+ * Extract ANSI escape sequences from a string at the given position.
+ * Copied verbatim from pi-mono `packages/tui/src/utils.ts` alongside
+ * `stripTerminalSequences` so both behave identically to upstream pi. Kept
+ * module-private: it was removed from the public API in 9.6.2 and this port
+ * does not reintroduce that export.
+ */
+function extractAnsiCode(str: string, pos: number): { code: string; length: number } | null {
+	if (pos >= str.length || str[pos] !== "\x1b") return null;
+
+	const next = str[pos + 1];
+
+	// CSI sequence: ESC [ ... m/G/K/H/J
+	if (next === "[") {
+		let j = pos + 2;
+		while (j < str.length && !/[mGKHJ]/.test(str[j]!)) j++;
+		if (j < str.length) return { code: str.substring(pos, j + 1), length: j + 1 - pos };
+		return null;
+	}
+
+	// OSC sequence: ESC ] ... BEL or ESC ] ... ST (ESC \)
+	// Used for hyperlinks (OSC 8), window titles, etc.
+	if (next === "]") {
+		let j = pos + 2;
+		while (j < str.length) {
+			if (str[j] === "\x07") return { code: str.substring(pos, j + 1), length: j + 1 - pos };
+			if (str[j] === "\x1b" && str[j + 1] === "\\") return { code: str.substring(pos, j + 2), length: j + 2 - pos };
+			j++;
+		}
+		return null;
+	}
+
+	// APC sequence: ESC _ ... BEL or ESC _ ... ST (ESC \)
+	// Used for cursor marker and application-specific commands
+	if (next === "_") {
+		let j = pos + 2;
+		while (j < str.length) {
+			if (str[j] === "\x07") return { code: str.substring(pos, j + 1), length: j + 1 - pos };
+			if (str[j] === "\x1b" && str[j + 1] === "\\") return { code: str.substring(pos, j + 2), length: j + 2 - pos };
+			j++;
+		}
+		return null;
+	}
+
+	return null;
+}
+
 /**
  * Scaled spans must bypass wrapping/padding and, when scaled up, reserve the
  * terminal rows their multicell glyphs flow into.