ptywright 0.4.0 → 0.5.0

package/dist/{terminal_session-DopC7Xg6.mjs → terminal_session-DJKr-O3X.mjs}

@@ -143,6 +143,43 @@ function functionKeySpec(key) {
 	};
 }
 //#endregion
+//#region src/terminal/mouse.ts
+const ESC$2 = "\x1B";
+function encodeSgrMouse(event) {
+	const x = clampInt(event.x, 1, 500);
+	const y = clampInt(event.y, 1, 300);
+	if (event.action === "click") return `${encodeSingleSgrMouse({
+		...event,
+		action: "down"
+	}, x, y)}${encodeSingleSgrMouse({
+		...event,
+		action: "up"
+	}, x, y)}`;
+	return encodeSingleSgrMouse(event, x, y);
+}
+function encodeSingleSgrMouse(event, x, y) {
+	const modifiers = event.modifiers;
+	const modifierBits = (modifiers?.shift ? 4 : 0) + (modifiers?.alt ? 8 : 0) + (modifiers?.ctrl ? 16 : 0);
+	const buttonCode = buttonToCode(event.button ?? "left");
+	if (event.action === "down") return `${ESC$2}[<${buttonCode + modifierBits};${x};${y}M`;
+	if (event.action === "up") return `${ESC$2}[<${buttonCode + modifierBits};${x};${y}m`;
+	if (event.action === "scroll_up") return `${ESC$2}[<${64 + modifierBits};${x};${y}M`;
+	if (event.action === "scroll_down") return `${ESC$2}[<${65 + modifierBits};${x};${y}M`;
+	return `${ESC$2}[<${32 + (event.button ? buttonCode : 3) + modifierBits};${x};${y}M`;
+}
+function buttonToCode(button) {
+	if (button === "left") return 0;
+	if (button === "middle") return 1;
+	return 2;
+}
+function clampInt(value, min, max) {
+	if (!Number.isFinite(value)) return min;
+	const int = Math.trunc(value);
+	if (int < min) return min;
+	if (int > max) return max;
+	return int;
+}
+//#endregion
 //#region src/terminal/style.ts
 const DEFAULT_STYLE = {
 	fg: { mode: "default" },
@@ -207,128 +244,64 @@ function extractColor(isDefault, isPalette, isRgb, value) {
 	return { mode: "default" };
 }
 //#endregion
-//#region src/terminal/ansi.ts
-const ESC$2 = "\x1B";
-const SGR_RESET = `${ESC$2}[0m`;
-function renderAnsiLines(terminal, options) {
-	const scope = options?.scope ?? "visible";
-	const trimRight = options?.trimRight ?? false;
-	const buffer = terminal.buffer.active;
-	const nullCell = buffer.getNullCell();
-	let startY = 0;
-	let count = buffer.length;
-	if (scope === "visible") {
-		startY = buffer.viewportY;
-		count = terminal.rows;
-	}
-	const out = [];
-	for (let i = 0; i < count; i += 1) {
-		const y = startY + i;
-		const line = buffer.getLine(y);
-		out.push(renderLine(line, terminal.cols, nullCell, trimRight));
+//#region src/terminal/snapshot_rows.ts
+function snapshotPlainLine(line, cols, nullCell, trimRight) {
+	let endCol = cols;
+	if (trimRight) endCol = findMeaningfulEndCol(line, cols, nullCell);
+	let out = "";
+	for (let x = 0; x < endCol; x += 1) {
+		const cell = line?.getCell(x, nullCell);
+		if (!cell) {
+			out += " ";
+			continue;
+		}
+		if (cell.getWidth() === 0) continue;
+		out += cell.getChars() || " ";
 	}
 	return out;
 }
-function renderLine(line, cols, nullCell, trimRight) {
+function snapshotStyleRuns(line, cols, nullCell, trimRight) {
 	let endCol = cols;
 	if (trimRight) endCol = findMeaningfulEndCol(line, cols, nullCell);
-	let ansi = "";
-	let plain = "";
-	let hasStyle = false;
-	let usedSgr = false;
-	const defaultKey = styleKey(DEFAULT_STYLE);
-	let currentKey = defaultKey;
+	const out = [];
+	let currentKey = null;
+	let currentRun = null;
 	for (let x = 0; x < endCol; x += 1) {
 		const cell = line?.getCell(x, nullCell);
 		if (!cell) {
-			plain += " ";
-			ansi += " ";
+			if (currentRun) {
+				out.push(currentRun);
+				currentRun = null;
+				currentKey = null;
+			}
 			continue;
 		}
-		if (cell.getWidth() === 0) continue;
-		const chars = cell.getChars() || " ";
+		const width = cell.getWidth();
+		if (width === 0) continue;
 		const style = extractStyle(cell);
-		const isDefault = isDefaultStyle(style);
-		if (!isDefault) hasStyle = true;
+		if (isDefaultStyle(style)) {
+			if (currentRun) {
+				out.push(currentRun);
+				currentRun = null;
+				currentKey = null;
+			}
+			continue;
+		}
 		const key = styleKey(style);
-		if (key !== currentKey) {
-			ansi += isDefault ? SGR_RESET : toSgr(style);
-			usedSgr = true;
-			currentKey = key;
+		if (currentRun && key === currentKey) {
+			currentRun.endCol = x + width;
+			continue;
 		}
-		ansi += chars;
-		plain += chars;
-	}
-	if (usedSgr && currentKey !== defaultKey) ansi += SGR_RESET;
-	return {
-		ansi,
-		plain,
-		hasStyle
-	};
-}
-function toSgr(style) {
-	const codes = ["0"];
-	if (style.bold) codes.push("1");
-	if (style.dim) codes.push("2");
-	if (style.italic) codes.push("3");
-	if (style.underline) codes.push("4");
-	if (style.inverse) codes.push("7");
-	if (style.strikethrough) codes.push("9");
-	if (style.fg.mode === "palette") codes.push(`38;5;${style.fg.value}`);
-	else if (style.fg.mode === "rgb") {
-		const [r, g, b] = rgb(style.fg.value);
-		codes.push(`38;2;${r};${g};${b}`);
-	}
-	if (style.bg.mode === "palette") codes.push(`48;5;${style.bg.value}`);
-	else if (style.bg.mode === "rgb") {
-		const [r, g, b] = rgb(style.bg.value);
-		codes.push(`48;2;${r};${g};${b}`);
+		if (currentRun) out.push(currentRun);
+		currentKey = key;
+		currentRun = {
+			startCol: x,
+			endCol: x + width,
+			style
+		};
 	}
-	return `${ESC$2}[${codes.join(";")}m`;
-}
-function rgb(value) {
-	return [
-		value >> 16 & 255,
-		value >> 8 & 255,
-		value & 255
-	];
-}
-//#endregion
-//#region src/terminal/mouse.ts
-const ESC$1 = "\x1B";
-function encodeSgrMouse(event) {
-	const x = clampInt(event.x, 1, 500);
-	const y = clampInt(event.y, 1, 300);
-	if (event.action === "click") return `${encodeSingleSgrMouse({
-		...event,
-		action: "down"
-	}, x, y)}${encodeSingleSgrMouse({
-		...event,
-		action: "up"
-	}, x, y)}`;
-	return encodeSingleSgrMouse(event, x, y);
-}
-function encodeSingleSgrMouse(event, x, y) {
-	const modifiers = event.modifiers;
-	const modifierBits = (modifiers?.shift ? 4 : 0) + (modifiers?.alt ? 8 : 0) + (modifiers?.ctrl ? 16 : 0);
-	const buttonCode = buttonToCode(event.button ?? "left");
-	if (event.action === "down") return `${ESC$1}[<${buttonCode + modifierBits};${x};${y}M`;
-	if (event.action === "up") return `${ESC$1}[<${buttonCode + modifierBits};${x};${y}m`;
-	if (event.action === "scroll_up") return `${ESC$1}[<${64 + modifierBits};${x};${y}M`;
-	if (event.action === "scroll_down") return `${ESC$1}[<${65 + modifierBits};${x};${y}M`;
-	return `${ESC$1}[<${32 + (event.button ? buttonCode : 3) + modifierBits};${x};${y}M`;
-}
-function buttonToCode(button) {
-	if (button === "left") return 0;
-	if (button === "middle") return 1;
-	return 2;
-}
-function clampInt(value, min, max) {
-	if (!Number.isFinite(value)) return min;
-	const int = Math.trunc(value);
-	if (int < min) return min;
-	if (int > max) return max;
-	return int;
+	if (currentRun) out.push(currentRun);
+	return out;
 }
 //#endregion
 //#region src/terminal/snapshot.ts
@@ -383,108 +356,6 @@ function snapshotGrid(terminal, options) {
 		styleRuns: includeStyles ? snapshotVisibleStyleRuns(terminal, trimRight) : void 0
 	};
 }
-function snapshotPlainLine(line, cols, nullCell, trimRight) {
-	let endCol = cols;
-	if (trimRight) endCol = findMeaningfulEndCol(line, cols, nullCell);
-	let out = "";
-	for (let x = 0; x < endCol; x += 1) {
-		const cell = line?.getCell(x, nullCell);
-		if (!cell) {
-			out += " ";
-			continue;
-		}
-		if (cell.getWidth() === 0) continue;
-		out += cell.getChars() || " ";
-	}
-	return out;
-}
-function snapshotStyleRuns(line, cols, nullCell, trimRight) {
-	let endCol = cols;
-	if (trimRight) endCol = findMeaningfulEndCol(line, cols, nullCell);
-	const out = [];
-	let currentKey = null;
-	let currentRun = null;
-	for (let x = 0; x < endCol; x += 1) {
-		const cell = line?.getCell(x, nullCell);
-		if (!cell) {
-			if (currentRun) {
-				out.push(currentRun);
-				currentRun = null;
-				currentKey = null;
-			}
-			continue;
-		}
-		const width = cell.getWidth();
-		if (width === 0) continue;
-		const style = extractStyle(cell);
-		if (isDefaultStyle(style)) {
-			if (currentRun) {
-				out.push(currentRun);
-				currentRun = null;
-				currentKey = null;
-			}
-			continue;
-		}
-		const key = styleKey(style);
-		if (currentRun && key === currentKey) {
-			currentRun.endCol = x + width;
-			continue;
-		}
-		if (currentRun) out.push(currentRun);
-		currentKey = key;
-		currentRun = {
-			startCol: x,
-			endCol: x + width,
-			style
-		};
-	}
-	if (currentRun) out.push(currentRun);
-	return out;
-}
-//#endregion
-//#region src/terminal/mask.ts
-function applyTextMaskRules(lines, rules) {
-	if (!rules || rules.length === 0) return lines;
-	const compiled = compileMaskRules(rules);
-	if (compiled.length === 0) return lines;
-	return lines.map((line) => applyCompiledMaskRules(line, compiled));
-}
-function compileMaskRules(rules) {
-	const compiled = [];
-	for (const rule of rules) {
-		if (!rule.regex.trim()) continue;
-		const preserveLength = rule.preserveLength ?? false;
-		const replacement = preserveLength ? firstChar(rule.replacement) : rule.replacement ?? "<masked>";
-		const flags = normalizeFlags(rule.flags);
-		let regex;
-		try {
-			regex = new RegExp(rule.regex, flags);
-		} catch (error) {
-			throw new Error(`invalid mask rule regex=${JSON.stringify(rule.regex)} flags=${JSON.stringify(rule.flags ?? "")}: ${error.message}`);
-		}
-		compiled.push({
-			regex,
-			replacement,
-			preserveLength
-		});
-	}
-	return compiled;
-}
-function normalizeFlags(flags) {
-	const value = flags?.trim() ? flags.trim() : "g";
-	const set = new Set(value.split(""));
-	set.add("g");
-	return [...set].join("");
-}
-function firstChar(value) {
-	const trimmed = value?.trim();
-	return trimmed && trimmed.length > 0 ? trimmed[0] : "█";
-}
-function applyCompiledMaskRules(line, rules) {
-	let out = line;
-	for (const rule of rules) out = out.replace(rule.regex, (match) => rule.preserveLength ? rule.replacement.repeat(match.length) : rule.replacement);
-	return out;
-}
 //#endregion
 //#region src/util/hash.ts
 function fnv1a32(text) {
@@ -496,13 +367,6 @@ function fnv1a32(text) {
 	return (hash >>> 0).toString(16).padStart(8, "0");
 }
 //#endregion
-//#region src/util/sleep.ts
-async function sleep(ms) {
-	await new Promise((resolve) => {
-		setTimeout(resolve, ms);
-	});
-}
-//#endregion
 //#region src/trace/asciicast.ts
 function encodeAsciicast(header, events) {
 	const lines = [JSON.stringify(header)];
@@ -589,6 +453,269 @@ var TraceRecorder = class {
 	}
 };
 //#endregion
+//#region src/terminal/ansi.ts
+const ESC$1 = "\x1B";
+const SGR_RESET = `${ESC$1}[0m`;
+function renderAnsiLines(terminal, options) {
+	const scope = options?.scope ?? "visible";
+	const trimRight = options?.trimRight ?? false;
+	const buffer = terminal.buffer.active;
+	const nullCell = buffer.getNullCell();
+	let startY = 0;
+	let count = buffer.length;
+	if (scope === "visible") {
+		startY = buffer.viewportY;
+		count = terminal.rows;
+	}
+	const out = [];
+	for (let i = 0; i < count; i += 1) {
+		const y = startY + i;
+		const line = buffer.getLine(y);
+		out.push(renderLine(line, terminal.cols, nullCell, trimRight));
+	}
+	return out;
+}
+function renderLine(line, cols, nullCell, trimRight) {
+	let endCol = cols;
+	if (trimRight) endCol = findMeaningfulEndCol(line, cols, nullCell);
+	let ansi = "";
+	let plain = "";
+	let hasStyle = false;
+	let usedSgr = false;
+	const defaultKey = styleKey(DEFAULT_STYLE);
+	let currentKey = defaultKey;
+	for (let x = 0; x < endCol; x += 1) {
+		const cell = line?.getCell(x, nullCell);
+		if (!cell) {
+			plain += " ";
+			ansi += " ";
+			continue;
+		}
+		if (cell.getWidth() === 0) continue;
+		const chars = cell.getChars() || " ";
+		const style = extractStyle(cell);
+		const isDefault = isDefaultStyle(style);
+		if (!isDefault) hasStyle = true;
+		const key = styleKey(style);
+		if (key !== currentKey) {
+			ansi += isDefault ? SGR_RESET : toSgr(style);
+			usedSgr = true;
+			currentKey = key;
+		}
+		ansi += chars;
+		plain += chars;
+	}
+	if (usedSgr && currentKey !== defaultKey) ansi += SGR_RESET;
+	return {
+		ansi,
+		plain,
+		hasStyle
+	};
+}
+function toSgr(style) {
+	const codes = ["0"];
+	if (style.bold) codes.push("1");
+	if (style.dim) codes.push("2");
+	if (style.italic) codes.push("3");
+	if (style.underline) codes.push("4");
+	if (style.inverse) codes.push("7");
+	if (style.strikethrough) codes.push("9");
+	if (style.fg.mode === "palette") codes.push(`38;5;${style.fg.value}`);
+	else if (style.fg.mode === "rgb") {
+		const [r, g, b] = rgb(style.fg.value);
+		codes.push(`38;2;${r};${g};${b}`);
+	}
+	if (style.bg.mode === "palette") codes.push(`48;5;${style.bg.value}`);
+	else if (style.bg.mode === "rgb") {
+		const [r, g, b] = rgb(style.bg.value);
+		codes.push(`48;2;${r};${g};${b}`);
+	}
+	return `${ESC$1}[${codes.join(";")}m`;
+}
+function rgb(value) {
+	return [
+		value >> 16 & 255,
+		value >> 8 & 255,
+		value & 255
+	];
+}
+//#endregion
+//#region src/terminal/mask.ts
+function applyTextMaskRules(lines, rules) {
+	if (!rules || rules.length === 0) return lines;
+	const compiled = compileMaskRules(rules);
+	if (compiled.length === 0) return lines;
+	return lines.map((line) => applyCompiledMaskRules(line, compiled));
+}
+function compileMaskRules(rules) {
+	const compiled = [];
+	for (const rule of rules) {
+		if (!rule.regex.trim()) continue;
+		const preserveLength = rule.preserveLength ?? false;
+		const replacement = preserveLength ? firstChar(rule.replacement) : rule.replacement ?? "<masked>";
+		const flags = normalizeFlags(rule.flags);
+		let regex;
+		try {
+			regex = new RegExp(rule.regex, flags);
+		} catch (error) {
+			throw new Error(`invalid mask rule regex=${JSON.stringify(rule.regex)} flags=${JSON.stringify(rule.flags ?? "")}: ${error.message}`);
+		}
+		compiled.push({
+			regex,
+			replacement,
+			preserveLength
+		});
+	}
+	return compiled;
+}
+function normalizeFlags(flags) {
+	const value = flags?.trim() ? flags.trim() : "g";
+	const set = new Set(value.split(""));
+	set.add("g");
+	return [...set].join("");
+}
+function firstChar(value) {
+	const trimmed = value?.trim();
+	return trimmed && trimmed.length > 0 ? trimmed[0] : "█";
+}
+function applyCompiledMaskRules(line, rules) {
+	let out = line;
+	for (const rule of rules) out = out.replace(rule.regex, (match) => rule.preserveLength ? rule.replacement.repeat(match.length) : rule.replacement);
+	return out;
+}
+//#endregion
+//#region src/session/terminal_session_snapshot.ts
+function snapshotSessionText(terminal, options) {
+	if (options?.maxLines !== void 0 && options.tailLines !== void 0) throw new Error("snapshotText: maxLines and tailLines are mutually exclusive");
+	let lines = snapshotLines(terminal, {
+		scope: options?.scope,
+		trimRight: options?.trimRight
+	});
+	if (options?.trimBottom ?? true) lines = trimBottomEmptyLines(lines);
+	if (options?.maxLines !== void 0) {
+		const max = Math.max(0, Math.trunc(options.maxLines));
+		lines = lines.slice(0, max);
+	}
+	if (options?.tailLines !== void 0) {
+		const tail = Math.max(0, Math.trunc(options.tailLines));
+		lines = lines.slice(Math.max(0, lines.length - tail));
+	}
+	lines = applyTextMaskRules(lines, options?.mask);
+	const text = lines.join("\n");
+	return {
+		text,
+		hash: fnv1a32(text)
+	};
+}
+function snapshotSessionAnsi(terminal, options) {
+	if (options?.maxLines !== void 0 && options.tailLines !== void 0) throw new Error("snapshotAnsi: maxLines and tailLines are mutually exclusive");
+	let lines = renderAnsiLines(terminal, {
+		scope: options?.scope,
+		trimRight: options?.trimRight
+	});
+	if (options?.trimBottom ?? true) lines = trimBottomEmptyAnsiLines(lines);
+	if (options?.maxLines !== void 0) {
+		const max = Math.max(0, Math.trunc(options.maxLines));
+		lines = lines.slice(0, max);
+	}
+	if (options?.tailLines !== void 0) {
+		const tail = Math.max(0, Math.trunc(options.tailLines));
+		lines = lines.slice(Math.max(0, lines.length - tail));
+	}
+	if (options?.mask && options.mask.length > 0) {
+		const maskedPlain = applyTextMaskRules(lines.map((line) => line.plain), options.mask);
+		const maskedAnsi = applyTextMaskRules(lines.map((line) => line.ansi), options.mask);
+		lines = lines.map((line, idx) => ({
+			...line,
+			plain: maskedPlain[idx] ?? "",
+			ansi: maskedAnsi[idx] ?? ""
+		}));
+	}
+	const ansi = lines.map((l) => l.ansi).join("\n");
+	return {
+		ansi,
+		plain: lines.map((l) => l.plain).join("\n"),
+		hash: fnv1a32(ansi),
+		lines
+	};
+}
+function trimBottomEmptyLines(lines) {
+	let end = lines.length;
+	while (end > 0 && lines[end - 1] === "") end -= 1;
+	return end === lines.length ? lines : lines.slice(0, end);
+}
+function trimBottomEmptyAnsiLines(lines) {
+	let end = lines.length;
+	while (end > 0) {
+		const line = lines[end - 1];
+		if (!(!line?.hasStyle && (line?.plain ?? "").trim() === "")) break;
+		end -= 1;
+	}
+	return end === lines.length ? lines : lines.slice(0, end);
+}
+//#endregion
+//#region src/util/sleep.ts
+async function sleep(ms) {
+	await new Promise((resolve) => {
+		setTimeout(resolve, ms);
+	});
+}
+//#endregion
+//#region src/session/terminal_session_wait.ts
+async function waitForSessionText(host, args) {
+	const startedAt = Date.now();
+	let closedSince = null;
+	while (Date.now() - startedAt <= args.timeoutMs) {
+		const snapshot = await host.snapshotText({
+			captureFrame: true,
+			scope: args.scope
+		});
+		if (args.text && snapshot.text.includes(args.text)) return {
+			found: true,
+			...snapshot
+		};
+		if (args.regex && args.regex.test(snapshot.text)) return {
+			found: true,
+			...snapshot
+		};
+		if (host.isClosed()) {
+			closedSince ??= Date.now();
+			const drainMs = Math.max(500, args.intervalMs * 4);
+			if (Date.now() - closedSince >= drainMs) break;
+		}
+		await sleep(args.intervalMs);
+	}
+	return {
+		found: false,
+		...await host.snapshotText({
+			captureFrame: true,
+			scope: args.scope
+		})
+	};
+}
+async function waitForStableSessionScreen(host, args) {
+	const startedAt = Date.now();
+	let stableSince = null;
+	let lastHash = null;
+	while (Date.now() - startedAt <= args.timeoutMs) {
+		const snapshot = await host.snapshotText({ captureFrame: true });
+		if (snapshot.hash === lastHash) stableSince ??= Date.now();
+		else {
+			stableSince = null;
+			lastHash = snapshot.hash;
+		}
+		if (stableSince !== null && Date.now() - stableSince >= args.quietMs) return {
+			stable: true,
+			...snapshot
+		};
+		await sleep(args.intervalMs);
+	}
+	return {
+		stable: false,
+		...await host.snapshotText({ captureFrame: true })
+	};
+}
+//#endregion
 //#region src/session/terminal_session.ts
 const ESC = "\x1B";
 var TerminalSession = class {
@@ -688,23 +815,7 @@ var TerminalSession = class {
 	}
 	async snapshotText(options) {
 		await this.flush();
-		if (options?.maxLines !== void 0 && options.tailLines !== void 0) throw new Error("snapshotText: maxLines and tailLines are mutually exclusive");
-		let lines = snapshotLines(this.terminal, {
-			scope: options?.scope,
-			trimRight: options?.trimRight
-		});
-		if (options?.trimBottom ?? true) lines = trimBottomEmptyLines(lines);
-		if (options?.maxLines !== void 0) {
-			const max = Math.max(0, Math.trunc(options.maxLines));
-			lines = lines.slice(0, max);
-		}
-		if (options?.tailLines !== void 0) {
-			const tail = Math.max(0, Math.trunc(options.tailLines));
-			lines = lines.slice(Math.max(0, lines.length - tail));
-		}
-		lines = applyTextMaskRules(lines, options?.mask);
-		const text = lines.join("\n");
-		const hash = fnv1a32(text);
+		const { text, hash } = snapshotSessionText(this.terminal, options);
 		if (options?.captureFrame ?? true) this.captureFrame(text, hash);
 		return {
 			text,
@@ -713,36 +824,7 @@ var TerminalSession = class {
 	}
 	async snapshotAnsi(options) {
 		await this.flush();
-		if (options?.maxLines !== void 0 && options.tailLines !== void 0) throw new Error("snapshotAnsi: maxLines and tailLines are mutually exclusive");
-		let lines = renderAnsiLines(this.terminal, {
-			scope: options?.scope,
-			trimRight: options?.trimRight
-		});
-		if (options?.trimBottom ?? true) lines = trimBottomEmptyAnsiLines(lines);
-		if (options?.maxLines !== void 0) {
-			const max = Math.max(0, Math.trunc(options.maxLines));
-			lines = lines.slice(0, max);
-		}
-		if (options?.tailLines !== void 0) {
-			const tail = Math.max(0, Math.trunc(options.tailLines));
-			lines = lines.slice(Math.max(0, lines.length - tail));
-		}
-		if (options?.mask && options.mask.length > 0) {
-			const maskedPlain = applyTextMaskRules(lines.map((line) => line.plain), options.mask);
-			const maskedAnsi = applyTextMaskRules(lines.map((line) => line.ansi), options.mask);
-			lines = lines.map((line, idx) => ({
-				...line,
-				plain: maskedPlain[idx] ?? "",
-				ansi: maskedAnsi[idx] ?? ""
-			}));
-		}
-		const ansi = lines.map((l) => l.ansi).join("\n");
-		return {
-			ansi,
-			plain: lines.map((l) => l.plain).join("\n"),
-			hash: fnv1a32(ansi),
-			lines
-		};
+		return snapshotSessionAnsi(this.terminal, options);
 	}
 	async snapshotGrid(options) {
 		await this.flush();
@@ -771,57 +853,10 @@ var TerminalSession = class {
 		return [...this.rawOutputRing];
 	}
 	async waitForText(args) {
-		const startedAt = Date.now();
-		let closedSince = null;
-		while (Date.now() - startedAt <= args.timeoutMs) {
-			const snapshot = await this.snapshotText({
-				captureFrame: true,
-				scope: args.scope
-			});
-			if (args.text && snapshot.text.includes(args.text)) return {
-				found: true,
-				...snapshot
-			};
-			if (args.regex && args.regex.test(snapshot.text)) return {
-				found: true,
-				...snapshot
-			};
-			if (this.isClosed()) {
-				closedSince ??= Date.now();
-				const drainMs = Math.max(500, args.intervalMs * 4);
-				if (Date.now() - closedSince >= drainMs) break;
-			}
-			await sleep(args.intervalMs);
-		}
-		return {
-			found: false,
-			...await this.snapshotText({
-				captureFrame: true,
-				scope: args.scope
-			})
-		};
+		return waitForSessionText(this, args);
 	}
 	async waitForStableScreen(args) {
-		const startedAt = Date.now();
-		let stableSince = null;
-		let lastHash = null;
-		while (Date.now() - startedAt <= args.timeoutMs) {
-			const snapshot = await this.snapshotText({ captureFrame: true });
-			if (snapshot.hash === lastHash) stableSince ??= Date.now();
-			else {
-				stableSince = null;
-				lastHash = snapshot.hash;
-			}
-			if (stableSince !== null && Date.now() - stableSince >= args.quietMs) return {
-				stable: true,
-				...snapshot
-			};
-			await sleep(args.intervalMs);
-		}
-		return {
-			stable: false,
-			...await this.snapshotText({ captureFrame: true })
-		};
+		return waitForStableSessionScreen(this, args);
 	}
 	close() {
 		if (this.closed === null) this.closed = { type: "closed_by_user" };
@@ -875,19 +910,5 @@ var TerminalSession = class {
 		return true;
 	}
 };
-function trimBottomEmptyLines(lines) {
-	let end = lines.length;
-	while (end > 0 && lines[end - 1] === "") end -= 1;
-	return end === lines.length ? lines : lines.slice(0, end);
-}
-function trimBottomEmptyAnsiLines(lines) {
-	let end = lines.length;
-	while (end > 0) {
-		const line = lines[end - 1];
-		if (!(!line?.hasStyle && (line?.plain ?? "").trim() === "")) break;
-		end -= 1;
-	}
-	return end === lines.length ? lines : lines.slice(0, end);
-}
 //#endregion
-export { applyTextMaskRules as a, encodeSgrMouse as c, isDefaultStyle as d, styleKey as f, fnv1a32 as i, extractStyle as l, TraceRecorder as n, snapshotGrid as o, encodeKey as p, sleep as r, snapshotLines as s, TerminalSession as t, findMeaningfulEndCol as u };
+export { fnv1a32 as a, extractStyle as c, styleKey as d, encodeSgrMouse as f, TraceRecorder as i, findMeaningfulEndCol as l, sleep as n, snapshotGrid as o, encodeKey as p, applyTextMaskRules as r, snapshotLines as s, TerminalSession as t, isDefaultStyle as u };