@oh-my-pi/pi-tui 18.1.22 → 18.2.1

package/src/terminal-multiplexer.ts

@@ -10,15 +10,36 @@ export function isInsideHerdr(env: NodeJS.ProcessEnv = Bun.env): boolean {
 	return false;
 }
 
-/** Detect whether a terminal multiplexer owns the current screen grid. */
-export function isInsideTerminalMultiplexer(env: NodeJS.ProcessEnv = Bun.env): boolean {
-	// TMUX/STY/ZELLIJ, Herdr, and CMUX workspace/surface/remote-transport
-	// markers are authoritative session signals. TERM can also survive when those are
-	// stripped (`sudo` without -E, `su`, env-sanitizing launchers/ssh). Do not
-	// use CMUX_SOCKET_PATH here: it is a CLI socket override and can be set
-	// outside a CMUX terminal.
-	if (env.TMUX || env.STY || env.ZELLIJ || isInsideHerdr(env)) return true;
-	if (env.CMUX_WORKSPACE_ID || env.CMUX_SURFACE_ID || env.CMUX_REMOTE_TRANSPORT) return true;
+/** Terminal multiplexers omp recognizes as owning the screen grid. */
+export type TerminalMultiplexer = "herdr" | "tmux" | "screen" | "zellij" | "cmux" | "wmux";
+
+/**
+ * Classify which terminal multiplexer owns the current screen grid, or `null`
+ * for a direct terminal. Single source of truth for both the render-path gate
+ * (`isInsideTerminalMultiplexer`) and the debug snapshot label.
+ *
+ * TMUX/STY/ZELLIJ, Herdr, and the CMUX/WMUX workspace/surface/remote-transport
+ * markers are authoritative session signals. TERM can also survive when those
+ * are stripped (`sudo` without -E, `su`, env-sanitizing launchers/ssh). Do not
+ * use CMUX_SOCKET_PATH / WMUX_CLI / WMUX_PIPE here: they are CLI socket/path
+ * overrides and can be set outside a CMUX/WMUX terminal. wmux is a Windows
+ * multiplexer (Electron + xterm.js) modeled on cmux/herdr that repaints its
+ * pane in place and exports WMUX=1 plus a native WMUX_SURFACE_ID.
+ */
+export function classifyTerminalMultiplexer(env: NodeJS.ProcessEnv = Bun.env): TerminalMultiplexer | null {
+	if (isInsideHerdr(env)) return "herdr";
+	if (env.TMUX) return "tmux";
+	if (env.STY) return "screen";
+	if (env.ZELLIJ) return "zellij";
+	if (env.CMUX_WORKSPACE_ID || env.CMUX_SURFACE_ID || env.CMUX_REMOTE_TRANSPORT) return "cmux";
+	if (env.WMUX === "1" || env.WMUX_SURFACE_ID) return "wmux";
 	const term = env.TERM?.toLowerCase() ?? "";
-	return term.startsWith("tmux") || term.startsWith("screen");
+	if (term.startsWith("tmux")) return "tmux";
+	if (term.startsWith("screen")) return "screen";
+	return null;
+}
+
+/** True when a terminal multiplexer owns the current screen grid. */
+export function isInsideTerminalMultiplexer(env: NodeJS.ProcessEnv = Bun.env): boolean {
+	return classifyTerminalMultiplexer(env) !== null;
 }

package/src/terminal.ts

@@ -1,16 +1,10 @@
 import { dlopen, FFIType, ptr } from "bun:ffi";
 import * as fs from "node:fs";
 import { TtyWriter } from "@oh-my-pi/pi-natives";
-import {
-	$env,
-	isBunTestRuntime,
-	isTerminalHeadless,
-	isWsl,
-	logger,
-	postmortem,
-	restoreTerminalStderr,
-	suppressTerminalStderr,
-} from "@oh-my-pi/pi-utils";
+import { $env, isBunTestRuntime, isTerminalHeadless, isWsl } from "@oh-my-pi/pi-utils/env";
+import * as logger from "@oh-my-pi/pi-utils/logger";
+import * as postmortem from "@oh-my-pi/pi-utils/postmortem";
+import { restoreTerminalStderr, suppressTerminalStderr } from "@oh-my-pi/pi-utils/stderr-guard";
 import { setKittyProtocolActive } from "./keys";
 import { StdinBuffer } from "./stdin-buffer";
 import {
@@ -520,6 +514,20 @@ export interface Terminal {
 	 */
 	readonly pendingOutputBytes?: number;
 
+	/**
+	 * Whether a pseudoconsole host owns the grid this terminal writes to, so
+	 * neither the cursor nor the painted rows survive a resize under the
+	 * application's own model. Measured on Windows conhost: resizing the
+	 * pseudoconsole makes it re-emit its whole viewport from `CSI H` with
+	 * absolute addressing while the application writes nothing, and it re-homes
+	 * the cursor, so a DSR reply after a resize reports column 1 instead of the
+	 * column the application parked. The renderer's resize anchor recovery needs
+	 * both properties, so it takes the rebuild path instead when this is set.
+	 * Optional so custom Terminals built against older pi-tui versions keep
+	 * working; absent means the terminal itself owns the grid.
+	 */
+	readonly hostOwnsGridOnResize?: boolean;
+
 	// Whether Kitty keyboard protocol is active
 	get kittyProtocolActive(): boolean;
 
@@ -662,8 +670,9 @@ function isPrivateModeSupported(status: string): boolean {
 export interface ProcessTerminalOptions {
 	/**
 	 * Force ConPTY-hosted behavior on or off. Defaults to live detection via
-	 * {@link isConPTYHosted}. Tests set this so the kitty-flag and write-chunking
-	 * paths stay hermetic regardless of the ambient WSL env (`WSL_DISTRO_NAME` /
+	 * {@link isConPTYHosted}. Tests set this so the kitty-flag, write-chunking
+	 * and resize-routing ({@link Terminal.hostOwnsGridOnResize}) paths stay
+	 * hermetic regardless of the ambient WSL env (`WSL_DISTRO_NAME` /
 	 * `WSL_INTEROP`) — the suite must behave identically on WSL and on CI.
 	 */
 	conpty?: boolean;
@@ -1995,6 +2004,14 @@ export class ProcessTerminal implements Terminal {
 		return process.stdout.writableLength ?? 0;
 	}
 
+	get hostOwnsGridOnResize(): boolean {
+		// #conpty, not a fresh isConPTYHosted() call: the construction override
+		// must gate every ConPTY-dependent path uniformly, or an injected
+		// `conpty` value models one host for writes and kitty flags and the
+		// opposite host for resize routing.
+		return this.#conpty;
+	}
+
 	/**
 	 * Reconcile the stdout backlog after a write or a poll. The watchdog runs an
 	 * episode from the moment the backlog crosses the arm cap until it drains to