@xp266/dshtui 0.1.8 → 0.1.9

package/lib/dialog.mjs

@@ -1,3 +1,3 @@
 import "./prod-react-Dzof4qJx.mjs";
-import { L as panelAnchorRow, c as asTextItem, i as Dialog, l as registerWidget, n as panelLegend, o as rowHeight, r as CloseGuardContext, s as wrapStatusLines, t as PanelSurface } from "./surface-bsX86Swt.mjs";
+import { I as panelAnchorRow, c as asTextItem, i as Dialog, l as registerWidget, n as panelLegend, o as rowHeight, r as CloseGuardContext, s as wrapStatusLines, t as PanelSurface } from "./surface-CfzU6eCq.mjs";
 export { CloseGuardContext, Dialog, PanelSurface, asTextItem, panelAnchorRow, panelLegend, registerWidget, rowHeight, wrapStatusLines };

package/lib/index.mjs

@@ -1,5 +1,5 @@
 import "./prod-react-Dzof4qJx.mjs";
-import { $ as colToCharIndex, A as Region, At as colorLevel, B as hintBlockTop, C as caretNonceText, Ct as permissionModeInfo, D as markKeymapConsumed, Dt as subscribePalettes, E as isKeyConsumed, Et as setThemeMode, F as inputContentContains, Ft as installCrashHandlers, G as segmentsKey, H as inputStatusRow, I as messageBackgroundWidth, It as warn, J as sliceByColumns, K as wrapSegments, L as panelAnchorRow, M as isMouseResidue, Mt as env, N as writeStdoutRaw, Nt as configureLogs, O as SelectableText, Ot as themeMode, P as hintSpan, Pt as error, Q as charWidth, R as panelContains, S as caretNonceColor, St as paletteColor, T as beginKeyEvent, Tt as replacePalettes, U as glyphs, V as inputFrameTop, W as mergeRuns, X as selectedRange, Y as clampFocusRow, Z as toScreenSelection, _ as editDeleteWordRight, _t as registerFieldKind, a as DIALOG_MAX_HEIGHT, at as truncate, b as writeCursorShape, bt as specialFieldFactory, ct as charactersChipLabel, d as editCursorLeft, dt as fieldStyleOf, et as errorText, f as editCursorRight, ft as hasFieldChar, g as editDeleteWordLeft, gt as linesChipLabel, h as editDelete, ht as isFieldChar, i as Dialog, it as textWidth, j as createMouseController, jt as setColorLevel, k as SelectionContext, kt as keyedRegistry, l as registerWidget, lt as fieldExpandOf, m as editCursorWordRight, mt as imageChipLabel, n as panelLegend, nt as locToPoint, ot as wrapLines, p as editCursorWordLeft, pt as hasFieldSlots, q as chromeSelectionText, r as CloseGuardContext, rt as segmentGraphemes, st as allocateField, t as PanelSurface, tt as lineBreaks, u as editBackspace, ut as fieldSlotOf, v as editInsert, vt as releaseFields, w as useCaret, wt as registerPalette, x as caretNonceBold, xt as COLORS, y as CapText, yt as releaseUnreferenced, z as scrollbarColumn } from "./surface-bsX86Swt.mjs";
+import { $ as errorText, A as SelectableText, At as setColorLevel, B as inputFrameTop, C as caretNonceText, Ct as registerPalette, D as markKeymapConsumed, Dt as themeMode, E as isKeyConsumed, Et as subscribePalettes, F as messageBackgroundWidth, Ft as warn, G as wrapSegments, H as glyphs, I as panelAnchorRow, It as enterMode, J as clampFocusRow, K as chromeSelectionText, L as panelContains, Lt as restoreAllModes, M as Region, Mt as configureLogs, N as hintSpan, Nt as error, O as createMouseController, Ot as keyedRegistry, P as inputContentContains, Pt as installCrashHandlers, Q as colToCharIndex, R as scrollbarColumn, S as caretNonceColor, St as permissionModeInfo, T as beginKeyEvent, Tt as setThemeMode, U as mergeRuns, V as inputStatusRow, W as segmentsKey, X as toScreenSelection, Y as selectedRange, Z as charWidth, _ as editDeleteWordRight, _t as releaseFields, a as DIALOG_MAX_HEIGHT, at as wrapLines, b as writeCursorShape, bt as COLORS, ct as fieldExpandOf, d as editCursorLeft, dt as hasFieldChar, et as lineBreaks, f as editCursorRight, ft as hasFieldSlots, g as editDeleteWordLeft, gt as registerFieldKind, h as editDelete, ht as linesChipLabel, i as Dialog, it as truncate, j as SelectionContext, jt as env, k as isMouseResidue, kt as colorLevel, l as registerWidget, lt as fieldSlotOf, m as editCursorWordRight, mt as isFieldChar, n as panelLegend, nt as segmentGraphemes, ot as allocateField, p as editCursorWordLeft, pt as imageChipLabel, q as sliceByColumns, r as CloseGuardContext, rt as textWidth, st as charactersChipLabel, t as PanelSurface, tt as locToPoint, u as editBackspace, ut as fieldStyleOf, v as editInsert, vt as releaseUnreferenced, w as useCaret, wt as replacePalettes, x as caretNonceBold, xt as paletteColor, y as CapText, yt as specialFieldFactory, z as hintBlockTop } from "./surface-CfzU6eCq.mjs";
 import { createRequire } from "node:module";
 import { readFileSync, statSync } from "node:fs";
 import { join, resolve } from "node:path";
@@ -2945,26 +2945,6 @@ function selectionText(messages, width, selection) {
 	return lines.join("\n").replace(/[ \t]+$/gm, "").replace(/\n+$/, "");
 }
 //#endregion
-//#region src/terminal/restore.ts
-/**
-* Synchronously restore every terminal mode this TUI enables: cursor
-* visibility and shape, mouse tracking, bracketed paste, the kitty keyboard
-* protocol, and the alternate screen. Windows TTY writes through
-* process.stdout are asynchronous, so the restores ink queues at unmount
-* can be dropped when the process exits right after — every exit path must
-* call this synchronously before the process leaves.
-*/
-function restoreTerminal() {
-	writeStdoutRaw([
-		"\x1B[?25h",
-		"\x1B[0 q",
-		"\x1B[?1003l\x1B[?1000l\x1B[?1002l\x1B[?1006l",
-		"\x1B[?2004l",
-		"\x1B[<u",
-		"\x1B[?1049l"
-	].join(""));
-}
-//#endregion
 //#region src/ui/hooks/use-terminal-size.ts
 function useTerminalSize() {
 	const { stdout } = useStdout();
@@ -9162,7 +9142,7 @@ function App({ bridge, screen, themeTick = 0 }) {
 			}
 			if (!exiting.current) {
 				exiting.current = true;
-				restoreTerminal();
+				restoreAllModes();
 				process.kill(process.pid, "SIGINT");
 				setTimeout(() => process.exit(0), FORCE_EXIT_DELAY_MS).unref();
 			}
@@ -11293,6 +11273,10 @@ function apply(ctx, config = Config(DEFAULT_CONFIG)) {
 			});
 			lastColumns = capture.stream.columns;
 			lastRows = capture.stream.rows;
+			if (config.alternateScreen) enterMode("alt-screen", "", "\x1B[?1049l");
+			enterMode("kitty-keyboard", "", "\x1B[<u");
+			enterMode("bracketed-paste", "", "\x1B[?2004l");
+			enterMode("cursor", "", "\x1B[?25h\x1B[0 q");
 			const onResize = () => {
 				lastColumns = capture.stream.columns;
 				lastRows = capture.stream.rows;
@@ -11350,10 +11334,9 @@ function apply(ctx, config = Config(DEFAULT_CONFIG)) {
 			disposeExtensionPoint();
 			stopSizePoll?.();
 			hotTheme?.stop();
-			writeCursorShape("reset");
 			bridge?.dispose();
 			app?.unmount();
-			restoreTerminal();
+			restoreAllModes();
 			disposeCrashHandlers();
 		};
 	});

package/lib/{surface-bsX86Swt.mjs → surface-CfzU6eCq.mjs}

@@ -25,6 +25,40 @@ function resolveDshHome(env = process.env) {
 	return resolve(expandHomePath(selected));
 }
 //#endregion
+//#region src/terminal/modes.ts
+/**
+* Single choke point for terminal mode changes: every enter/exit of a
+* terminal mode registers its restore sequence here, so one
+* restoreAllModes() call on any exit path inverts everything that was
+* applied — including the modes ink enables on our behalf (seeded with an
+* empty enter sequence). Windows TTY writes through process.stdout are
+* asynchronous, so mode sequences must be written synchronously through
+* fd 1 or they are silently dropped at exit.
+*/
+const applied = /* @__PURE__ */ new Map();
+function writeStdoutRaw(text) {
+	try {
+		writeSync(1, text);
+	} catch {
+		process.stdout.write(text);
+	}
+}
+function enterMode(name, sequence, restore) {
+	applied.set(name, restore);
+	if (sequence !== "") writeStdoutRaw(sequence);
+}
+function exitMode(name) {
+	const restore = applied.get(name);
+	if (restore === void 0) return;
+	applied.delete(name);
+	writeStdoutRaw(restore);
+}
+/** Restore every still-applied mode, newest first. */
+function restoreAllModes() {
+	for (const restore of [...applied.values()].reverse()) writeStdoutRaw(restore);
+	applied.clear();
+}
+//#endregion
 //#region src/log.ts
 const LOG_LEVELS = [
 	"debug",
@@ -175,7 +209,10 @@ function installCrashHandlers(options = {}) {
 			message: stringifyError(cause),
 			stack: cause instanceof Error ? cause.stack : void 0
 		});
-		if (options.exit === true) process.exit(1);
+		if (options.exit === true) {
+			restoreAllModes();
+			process.exit(1);
+		}
 	};
 	const onRejected = (cause) => {
 		writeCrashReport({
@@ -183,7 +220,10 @@ function installCrashHandlers(options = {}) {
 			message: stringifyError(cause),
 			stack: cause instanceof Error ? cause.stack : void 0
 		});
-		if (options.exit === true) process.exit(1);
+		if (options.exit === true) {
+			restoreAllModes();
+			process.exit(1);
+		}
 	};
 	process.on("uncaughtException", onUncaught);
 	process.on("unhandledRejection", onRejected);
@@ -1298,142 +1338,6 @@ function scrollbarColumn(columns) {
 function messageBackgroundWidth(width) {
 	return width - 2 - 3 - 1;
 }
-//#endregion
-//#region src/terminal/mouse.ts
-const MOUSE_ENABLE_SEQUENCES = "\x1B[?1003l\x1B[?1000h\x1B[?1002h\x1B[?1006h";
-const MOUSE_DISABLE_SEQUENCES = "\x1B[?1003l\x1B[?1000l\x1B[?1002l\x1B[?1006l";
-/**
-* Terminal-mode sequences must reach the device even when the process exits
-* right after: on Windows, TTY writes through process.stdout are
-* asynchronous and a trailing restore sequence is silently dropped, leaving
-* the terminal in mouse-tracking mode. fd 1 writes are synchronous.
-*/
-function writeStdoutRaw(text) {
-	try {
-		writeSync(1, text);
-	} catch {
-		process.stdout.write(text);
-	}
-}
-function writeMouseEnable() {
-	writeStdoutRaw(MOUSE_ENABLE_SEQUENCES);
-}
-function writeMouseDisable() {
-	writeStdoutRaw(MOUSE_DISABLE_SEQUENCES);
-}
-const MAX_BUFFER = 64;
-const SGR_PREFIX = "\x1B[<";
-function partialPrefixLength(buffer) {
-	for (let keep = Math.min(2, buffer.length); keep > 0; keep--) if (SGR_PREFIX.startsWith(buffer.slice(-keep))) return keep;
-	return 0;
-}
-function createMouseParser(onEvent) {
-	let buffer = "";
-	const pressedButtons = /* @__PURE__ */ new Set();
-	function parseSequenceAt(str, offset) {
-		if (!str.startsWith("\x1B[<", offset)) return null;
-		let index = offset + 3;
-		const values = [];
-		let current = 0;
-		let hasDigit = false;
-		let terminator = "";
-		for (; index < str.length; index++) {
-			const ch = str[index];
-			if (ch >= "0" && ch <= "9") {
-				current = current * 10 + (ch.charCodeAt(0) - 48);
-				hasDigit = true;
-			} else if (ch === ";" && hasDigit) {
-				values.push(current);
-				current = 0;
-				hasDigit = false;
-			} else if (ch === "M" || ch === "m") {
-				if (!hasDigit) return null;
-				values.push(current);
-				terminator = ch;
-				break;
-			} else return null;
-		}
-		if (terminator === "") return null;
-		if (values.length !== 3) return null;
-		return {
-			event: decodeSgrEvent(values[0], values[1], values[2], terminator, pressedButtons),
-			consumed: index - offset + 1
-		};
-	}
-	return { feed(chunk) {
-		buffer += chunk;
-		while (true) {
-			const start = buffer.indexOf("\x1B[<");
-			if (start === -1) {
-				const keep = partialPrefixLength(buffer);
-				buffer = keep === 0 ? "" : buffer.slice(-keep);
-				return;
-			}
-			if (start > 0) {
-				buffer = buffer.slice(start);
-				continue;
-			}
-			if (buffer.length > MAX_BUFFER) {
-				buffer = "";
-				return;
-			}
-			const parsed = parseSequenceAt(buffer, 0);
-			if (parsed === null) return;
-			const { event, consumed } = parsed;
-			buffer = buffer.slice(consumed);
-			onEvent(event);
-		}
-	} };
-}
-function decodeSgrEvent(rawButtonCode, wireX, wireY, pressRelease, pressed) {
-	const button = rawButtonCode & 3;
-	const isScroll = (rawButtonCode & 64) !== 0;
-	const isMotion = (rawButtonCode & 32) !== 0;
-	const modifiers = {
-		shift: (rawButtonCode & 4) !== 0,
-		alt: (rawButtonCode & 8) !== 0,
-		ctrl: (rawButtonCode & 16) !== 0
-	};
-	let type;
-	let scrollDirection;
-	if (isScroll) {
-		type = "scroll";
-		scrollDirection = button === 0 ? "up" : "down";
-	} else if (isMotion) type = pressed.size > 0 ? "drag" : "move";
-	else if (pressRelease === "M") {
-		type = "down";
-		if (button !== 3) pressed.add(button);
-	} else {
-		type = "up";
-		if (button === 3) pressed.clear();
-		else pressed.delete(button);
-	}
-	return {
-		type,
-		button: button === 3 ? 0 : button,
-		x: wireX - 1,
-		y: wireY - 1,
-		modifiers,
-		...scrollDirection === void 0 ? {} : { scrollDirection }
-	};
-}
-function isMouseResidue(input) {
-	return input.includes("\x1B") || /^\[<\d+(;\d+)*[Mm]$/.test(input);
-}
-function createMouseController(onEvent) {
-	const parser = createMouseParser(onEvent);
-	const onData = (chunk) => parser.feed(chunk.toString("latin1"));
-	return {
-		enable() {
-			writeMouseEnable();
-			process.stdin.on("data", onData);
-		},
-		disable() {
-			writeMouseDisable();
-			process.stdin.off("data", onData);
-		}
-	};
-}
 const RegionContext = createContext({
 	x: 0,
 	y: 0
@@ -1571,6 +1475,123 @@ function renderSegments(segments, start, end, baseColor) {
 	return out;
 }
 //#endregion
+//#region src/terminal/mouse.ts
+const MOUSE_ENABLE_SEQUENCES = "\x1B[?1003l\x1B[?1000h\x1B[?1002h\x1B[?1006h";
+const MOUSE_DISABLE_SEQUENCES = "\x1B[?1003l\x1B[?1000l\x1B[?1002l\x1B[?1006l";
+const MAX_BUFFER = 64;
+const SGR_PREFIX = "\x1B[<";
+function partialPrefixLength(buffer) {
+	for (let keep = Math.min(2, buffer.length); keep > 0; keep--) if (SGR_PREFIX.startsWith(buffer.slice(-keep))) return keep;
+	return 0;
+}
+function createMouseParser(onEvent) {
+	let buffer = "";
+	const pressedButtons = /* @__PURE__ */ new Set();
+	function parseSequenceAt(str, offset) {
+		if (!str.startsWith("\x1B[<", offset)) return null;
+		let index = offset + 3;
+		const values = [];
+		let current = 0;
+		let hasDigit = false;
+		let terminator = "";
+		for (; index < str.length; index++) {
+			const ch = str[index];
+			if (ch >= "0" && ch <= "9") {
+				current = current * 10 + (ch.charCodeAt(0) - 48);
+				hasDigit = true;
+			} else if (ch === ";" && hasDigit) {
+				values.push(current);
+				current = 0;
+				hasDigit = false;
+			} else if (ch === "M" || ch === "m") {
+				if (!hasDigit) return null;
+				values.push(current);
+				terminator = ch;
+				break;
+			} else return null;
+		}
+		if (terminator === "") return null;
+		if (values.length !== 3) return null;
+		return {
+			event: decodeSgrEvent(values[0], values[1], values[2], terminator, pressedButtons),
+			consumed: index - offset + 1
+		};
+	}
+	return { feed(chunk) {
+		buffer += chunk;
+		while (true) {
+			const start = buffer.indexOf("\x1B[<");
+			if (start === -1) {
+				const keep = partialPrefixLength(buffer);
+				buffer = keep === 0 ? "" : buffer.slice(-keep);
+				return;
+			}
+			if (start > 0) {
+				buffer = buffer.slice(start);
+				continue;
+			}
+			if (buffer.length > MAX_BUFFER) {
+				buffer = "";
+				return;
+			}
+			const parsed = parseSequenceAt(buffer, 0);
+			if (parsed === null) return;
+			const { event, consumed } = parsed;
+			buffer = buffer.slice(consumed);
+			onEvent(event);
+		}
+	} };
+}
+function decodeSgrEvent(rawButtonCode, wireX, wireY, pressRelease, pressed) {
+	const button = rawButtonCode & 3;
+	const isScroll = (rawButtonCode & 64) !== 0;
+	const isMotion = (rawButtonCode & 32) !== 0;
+	const modifiers = {
+		shift: (rawButtonCode & 4) !== 0,
+		alt: (rawButtonCode & 8) !== 0,
+		ctrl: (rawButtonCode & 16) !== 0
+	};
+	let type;
+	let scrollDirection;
+	if (isScroll) {
+		type = "scroll";
+		scrollDirection = button === 0 ? "up" : "down";
+	} else if (isMotion) type = pressed.size > 0 ? "drag" : "move";
+	else if (pressRelease === "M") {
+		type = "down";
+		if (button !== 3) pressed.add(button);
+	} else {
+		type = "up";
+		if (button === 3) pressed.clear();
+		else pressed.delete(button);
+	}
+	return {
+		type,
+		button: button === 3 ? 0 : button,
+		x: wireX - 1,
+		y: wireY - 1,
+		modifiers,
+		...scrollDirection === void 0 ? {} : { scrollDirection }
+	};
+}
+function isMouseResidue(input) {
+	return input.includes("\x1B") || /^\[<\d+(;\d+)*[Mm]$/.test(input);
+}
+function createMouseController(onEvent) {
+	const parser = createMouseParser(onEvent);
+	const onData = (chunk) => parser.feed(chunk.toString("latin1"));
+	return {
+		enable() {
+			enterMode("mouse", MOUSE_ENABLE_SEQUENCES, MOUSE_DISABLE_SEQUENCES);
+			process.stdin.on("data", onData);
+		},
+		disable() {
+			exitMode("mouse");
+			process.stdin.off("data", onData);
+		}
+	};
+}
+//#endregion
 //#region src/ui/key-arbiter.ts
 /**
 * Key-event suppression for ink's broadcast-based useInput.
@@ -1648,7 +1669,7 @@ const SEQUENCES = {
 	show: "\x1B[?25h"
 };
 function writeCursorShape(shape) {
-	writeStdoutRaw(SEQUENCES[shape]);
+	enterMode("cursor", SEQUENCES[shape], "\x1B[?25h\x1B[0 q");
 }
 //#endregion
 //#region src/ui/chrome/caps.tsx
@@ -3136,4 +3157,4 @@ function PanelSurface({ columns, rows, body, bodyStart, background, blockWidth }
 	}) });
 }
 //#endregion
-export { colToCharIndex as $, Region as A, colorLevel as At, hintBlockTop as B, caretNonceText as C, permissionModeInfo as Ct, markKeymapConsumed as D, subscribePalettes as Dt, isKeyConsumed as E, setThemeMode as Et, inputContentContains as F, installCrashHandlers as Ft, segmentsKey as G, inputStatusRow as H, messageBackgroundWidth as I, warn as It, sliceByColumns as J, wrapSegments as K, panelAnchorRow as L, isMouseResidue as M, env as Mt, writeStdoutRaw as N, configureLogs as Nt, SelectableText as O, themeMode as Ot, hintSpan as P, error as Pt, charWidth as Q, panelContains as R, caretNonceColor as S, paletteColor as St, beginKeyEvent as T, replacePalettes as Tt, glyphs as U, inputFrameTop as V, mergeRuns as W, selectedRange as X, clampFocusRow as Y, toScreenSelection as Z, editDeleteWordRight as _, registerFieldKind as _t, DIALOG_MAX_HEIGHT as a, truncate as at, writeCursorShape as b, specialFieldFactory as bt, asTextItem as c, charactersChipLabel as ct, editCursorLeft as d, fieldStyleOf as dt, errorText as et, editCursorRight as f, hasFieldChar as ft, editDeleteWordLeft as g, linesChipLabel as gt, editDelete as h, isFieldChar as ht, Dialog as i, textWidth as it, createMouseController as j, setColorLevel as jt, SelectionContext as k, keyedRegistry as kt, registerWidget as l, fieldExpandOf as lt, editCursorWordRight as m, imageChipLabel as mt, panelLegend as n, locToPoint as nt, rowHeight as o, wrapLines as ot, editCursorWordLeft as p, hasFieldSlots as pt, chromeSelectionText as q, CloseGuardContext as r, segmentGraphemes as rt, wrapStatusLines as s, allocateField as st, PanelSurface as t, lineBreaks as tt, editBackspace as u, fieldSlotOf as ut, editInsert as v, releaseFields as vt, useCaret as w, registerPalette as wt, caretNonceBold as x, COLORS as xt, CapText as y, releaseUnreferenced as yt, scrollbarColumn as z };
+export { errorText as $, SelectableText as A, setColorLevel as At, inputFrameTop as B, caretNonceText as C, registerPalette as Ct, markKeymapConsumed as D, themeMode as Dt, isKeyConsumed as E, subscribePalettes as Et, messageBackgroundWidth as F, warn as Ft, wrapSegments as G, glyphs as H, panelAnchorRow as I, enterMode as It, clampFocusRow as J, chromeSelectionText as K, panelContains as L, restoreAllModes as Lt, Region as M, configureLogs as Mt, hintSpan as N, error as Nt, createMouseController as O, keyedRegistry as Ot, inputContentContains as P, installCrashHandlers as Pt, colToCharIndex as Q, scrollbarColumn as R, caretNonceColor as S, permissionModeInfo as St, beginKeyEvent as T, setThemeMode as Tt, mergeRuns as U, inputStatusRow as V, segmentsKey as W, toScreenSelection as X, selectedRange as Y, charWidth as Z, editDeleteWordRight as _, releaseFields as _t, DIALOG_MAX_HEIGHT as a, wrapLines as at, writeCursorShape as b, COLORS as bt, asTextItem as c, fieldExpandOf as ct, editCursorLeft as d, hasFieldChar as dt, lineBreaks as et, editCursorRight as f, hasFieldSlots as ft, editDeleteWordLeft as g, registerFieldKind as gt, editDelete as h, linesChipLabel as ht, Dialog as i, truncate as it, SelectionContext as j, env as jt, isMouseResidue as k, colorLevel as kt, registerWidget as l, fieldSlotOf as lt, editCursorWordRight as m, isFieldChar as mt, panelLegend as n, segmentGraphemes as nt, rowHeight as o, allocateField as ot, editCursorWordLeft as p, imageChipLabel as pt, sliceByColumns as q, CloseGuardContext as r, textWidth as rt, wrapStatusLines as s, charactersChipLabel as st, PanelSurface as t, locToPoint as tt, editBackspace as u, fieldStyleOf as ut, editInsert as v, releaseUnreferenced as vt, useCaret as w, replacePalettes as wt, caretNonceBold as x, paletteColor as xt, CapText as y, specialFieldFactory as yt, hintBlockTop as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xp266/dshtui",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "type": "module",
   "description": "ink-based terminal UI plugin for DeepSeek Harness",
   "engines": {

package/src/index.tsx

@@ -10,7 +10,7 @@ import { createChatBridge } from './chat/bridge.ts'
 import type { ChatBridge } from './chat/bridge.ts'
 import { createScreenCapture } from './terminal/screen.ts'
 import { writeCursorShape } from './terminal/cursor-shape.ts'
-import { restoreTerminal } from './terminal/restore.ts'
+import { enterMode, restoreAllModes } from './terminal/modes.ts'
 import { startHotTheme } from './hot-theme.ts'
 import { applyTheme } from './apply-theme.ts'
 import { registerPalette } from './theme.ts'
@@ -114,6 +114,12 @@ export function apply(ctx: Context, config: Config = Config(DEFAULT_CONFIG)) {
       })
       lastColumns = capture.stream.columns
       lastRows = capture.stream.rows
+      // Seed the modes ink enables on our behalf (its own enter writes are
+      // internal); a config-off alternate screen is never registered.
+      if (config.alternateScreen) enterMode('alt-screen', '', '\x1b[?1049l')
+      enterMode('kitty-keyboard', '', '\x1b[<u')
+      enterMode('bracketed-paste', '', '\x1b[?2004l')
+      enterMode('cursor', '', '\x1b[?25h\x1b[0 q')
       const onResize = () => {
         lastColumns = capture.stream.columns
         lastRows = capture.stream.rows
@@ -178,10 +184,9 @@ export function apply(ctx: Context, config: Config = Config(DEFAULT_CONFIG)) {
       disposeExtensionPoint()
       stopSizePoll?.()
       hotTheme?.stop()
-      writeCursorShape('reset')
       bridge?.dispose()
       app?.unmount()
-      restoreTerminal()
+      restoreAllModes()
       disposeCrashHandlers()
     }
   })

package/src/log.ts

@@ -1,6 +1,7 @@
 import { appendFileSync, chmodSync, mkdirSync, renameSync, statSync, unlinkSync } from 'node:fs'
 import { dirname, join } from 'node:path'
 import { resolveDshHome } from './harness-home.ts'
+import { restoreAllModes } from './terminal/modes.ts'
 
 const LOG_LEVELS = ['debug', 'info', 'warn', 'error'] as const
 export type LogLevel = (typeof LOG_LEVELS)[number]
@@ -228,7 +229,10 @@ export function installCrashHandlers(options: { exit?: boolean } = {}): () => vo
       message: stringifyError(cause),
       stack: cause instanceof Error ? cause.stack : undefined,
     })
-    if (options.exit === true) process.exit(1)
+    if (options.exit === true) {
+      restoreAllModes()
+      process.exit(1)
+    }
   }
   const onRejected = (cause: unknown): void => {
     writeCrashReport({
@@ -236,7 +240,10 @@ export function installCrashHandlers(options: { exit?: boolean } = {}): () => vo
       message: stringifyError(cause),
       stack: cause instanceof Error ? cause.stack : undefined,
     })
-    if (options.exit === true) process.exit(1)
+    if (options.exit === true) {
+      restoreAllModes()
+      process.exit(1)
+    }
   }
   process.on('uncaughtException', onUncaught)
   process.on('unhandledRejection', onRejected)

package/src/terminal/cursor-shape.ts

@@ -1,5 +1,5 @@
 
-import { writeStdoutRaw } from './mouse.ts'
+import { enterMode } from './modes.ts'
 
 const SEQUENCES = {
   beam: '\x1b[1 q',
@@ -12,5 +12,7 @@ const SEQUENCES = {
 export type CursorShape = keyof typeof SEQUENCES
 
 export function writeCursorShape(shape: CursorShape): void {
-  writeStdoutRaw(SEQUENCES[shape])
+  // The restore covers visibility and shape together: panels toggle hide /
+  // show freely, and the last writer's state is what an exit must undo.
+  enterMode('cursor', SEQUENCES[shape], '\x1b[?25h\x1b[0 q')
 }

package/src/terminal/modes.ts

@@ -0,0 +1,39 @@
+import { writeSync } from 'node:fs'
+
+/**
+ * Single choke point for terminal mode changes: every enter/exit of a
+ * terminal mode registers its restore sequence here, so one
+ * restoreAllModes() call on any exit path inverts everything that was
+ * applied — including the modes ink enables on our behalf (seeded with an
+ * empty enter sequence). Windows TTY writes through process.stdout are
+ * asynchronous, so mode sequences must be written synchronously through
+ * fd 1 or they are silently dropped at exit.
+ */
+const applied = new Map<string, string>()
+
+export function writeStdoutRaw(text: string): void {
+  try {
+    writeSync(1, text)
+  } catch {
+    // A full stdout buffer (EAGAIN) can only be retried asynchronously.
+    process.stdout.write(text)
+  }
+}
+
+export function enterMode(name: string, sequence: string, restore: string): void {
+  applied.set(name, restore)
+  if (sequence !== '') writeStdoutRaw(sequence)
+}
+
+export function exitMode(name: string): void {
+  const restore = applied.get(name)
+  if (restore === undefined) return
+  applied.delete(name)
+  writeStdoutRaw(restore)
+}
+
+/** Restore every still-applied mode, newest first. */
+export function restoreAllModes(): void {
+  for (const restore of [...applied.values()].reverse()) writeStdoutRaw(restore)
+  applied.clear()
+}

package/src/terminal/mouse.ts

@@ -1,5 +1,3 @@
-import { writeSync } from 'node:fs'
-
 export type MouseEventType = 'down' | 'up' | 'drag' | 'move' | 'scroll'
 
 export interface MouseEventData {
@@ -11,6 +9,8 @@ export interface MouseEventData {
   scrollDirection?: 'up' | 'down'
 }
 
+import { enterMode, exitMode } from './modes.ts'
+
 const MOUSE_ENABLE_SEQUENCES = '\x1b[?1003l\x1b[?1000h\x1b[?1002h\x1b[?1006h'
 const MOUSE_DISABLE_SEQUENCES = '\x1b[?1003l\x1b[?1000l\x1b[?1002l\x1b[?1006l'
 
@@ -20,22 +20,7 @@ const MOUSE_DISABLE_SEQUENCES = '\x1b[?1003l\x1b[?1000l\x1b[?1002l\x1b[?1006l'
  * asynchronous and a trailing restore sequence is silently dropped, leaving
  * the terminal in mouse-tracking mode. fd 1 writes are synchronous.
  */
-export function writeStdoutRaw(text: string): void {
-  try {
-    writeSync(1, text)
-  } catch {
-    // A full stdout buffer (EAGAIN) can only be retried asynchronously.
-    process.stdout.write(text)
-  }
-}
 
-export function writeMouseEnable(): void {
-  writeStdoutRaw(MOUSE_ENABLE_SEQUENCES)
-}
-
-export function writeMouseDisable(): void {
-  writeStdoutRaw(MOUSE_DISABLE_SEQUENCES)
-}
 
 interface ParsedSequence {
   event: MouseEventData
@@ -160,11 +145,11 @@ export function createMouseController(onEvent: (event: MouseEventData) => void):
   const onData = (chunk: Buffer) => parser.feed(chunk.toString('latin1'))
   return {
     enable() {
-      writeMouseEnable()
+      enterMode('mouse', MOUSE_ENABLE_SEQUENCES, MOUSE_DISABLE_SEQUENCES)
       process.stdin.on('data', onData)
     },
     disable() {
-      writeMouseDisable()
+      exitMode('mouse')
       process.stdin.off('data', onData)
     },
   }

package/src/ui/app.tsx

@@ -9,7 +9,7 @@ import type { ChatBridge } from '../chat/bridge.ts'
 import type { AgentActivity } from '../chat/store.ts'
 import { rowIndexFor, selectionText } from './message/layout.ts'
 import { glyphs } from '../terminal/glyphs.ts'
-import { restoreTerminal } from '../terminal/restore.ts'
+import { restoreAllModes } from '../terminal/modes.ts'
 import { chromeSelectionText } from './selection-registry.ts'
 import type { ScreenCapture } from '../terminal/screen.ts'
 import type { LineSelection } from '../model/selection.ts'
@@ -333,9 +333,10 @@ export function App({ bridge, screen, themeTick = 0 }: AppProps) {
       }
       if (!exiting.current) {
         exiting.current = true
-        // Restore terminal modes synchronously before signaling: on Windows
-        // the queued async writes of the dispose path can be lost at exit.
-        restoreTerminal()
+        // Restore every terminal mode synchronously before signaling: on
+        // Windows the queued async writes of the dispose path can be lost
+        // at exit.
+        restoreAllModes()
         process.kill(process.pid, 'SIGINT')
         setTimeout(() => process.exit(0), FORCE_EXIT_DELAY_MS).unref()
       }

package/src/terminal/restore.ts

@@ -1,20 +0,0 @@
-import { writeStdoutRaw } from './mouse.ts'
-
-/**
- * Synchronously restore every terminal mode this TUI enables: cursor
- * visibility and shape, mouse tracking, bracketed paste, the kitty keyboard
- * protocol, and the alternate screen. Windows TTY writes through
- * process.stdout are asynchronous, so the restores ink queues at unmount
- * can be dropped when the process exits right after — every exit path must
- * call this synchronously before the process leaves.
- */
-export function restoreTerminal(): void {
-  writeStdoutRaw([
-    '\x1b[?25h',
-    '\x1b[0 q',
-    '\x1b[?1003l\x1b[?1000l\x1b[?1002l\x1b[?1006l',
-    '\x1b[?2004l',
-    '\x1b[<u',
-    '\x1b[?1049l',
-  ].join(''))
-}