vterm.js 0.6.1 → 0.7.1

package/dist/index.mjs

@@ -1,6 +1,6 @@
 //#region src/screen.ts
 /** Default retained payload bound for one APC/DCS sequence (16 MiB of ASCII/base64). */
-const DEFAULT_MAX_STRING_SEQUENCE_LENGTH = 16 * 1024 * 1024;
+const DEFAULT_MAX_STRING_SEQUENCE_LENGTH = 16777216;
 /** Frozen sentinel for unwritten cells — never mutate, copy-on-write in writeChar(). */
 const EMPTY_CELL = Object.freeze({
 	char: "",
@@ -17,6 +17,7 @@ const EMPTY_CELL = Object.freeze({
 	hidden: false,
 	blink: false,
 	wide: false,
+	protected: false,
 	url: null
 });
 function emptyCell() {
@@ -31,7 +32,7 @@ function emptyCell() {
 * case), so the read path allocates nothing there.
 */
 function stripColorIndex(c) {
-	if (c === null || c.index === void 0) return c;
+	if (c?.index === void 0) return c;
 	return {
 		r: c.r,
 		g: c.g,
@@ -57,11 +58,12 @@ const F_HIDDEN$1 = 64;
 const F_BLINK$1 = 128;
 const F_WIDE$1 = 256;
 const UL_SHIFT$1 = 9;
-const UL_MASK$1 = 7 << UL_SHIFT$1;
+const UL_MASK$1 = 3584;
 const F_HAS_FG = 4096;
 const F_HAS_BG = 8192;
 const F_HAS_UL = 16384;
 const F_HAS_URL = 32768;
+const F_PROTECTED$1 = 65536;
 const UL_STYLES = [
 	"none",
 	"single",
@@ -77,6 +79,17 @@ function underlineToBits(u) {
 function bitsToUnderline(meta) {
 	return UL_STYLES[(meta & UL_MASK$1) >> UL_SHIFT$1] ?? "none";
 }
+/** Require an invariant-owned value and fail where the impossible state is first observed. */
+function required(value, subject) {
+	if (value === null || value === void 0) throw new Error(`Missing ${subject}`);
+	return value;
+}
+/** Read a dense indexed value and fail at the violated invariant instead of propagating `undefined`. */
+function itemAt(items, index, subject) {
+	const value = items[index];
+	if (value === void 0) throw new RangeError(`${subject}[${index}] is outside its ${items.length}-item range`);
+	return value;
+}
 /** Pack a color's 8-bit channels into a 24-bit `0xRRGGBB` word. */
 function packRgb(c) {
 	return ((c.r & 255) << 16 | (c.g & 255) << 8 | c.b & 255) >>> 0;
@@ -108,7 +121,7 @@ function makePackedRow(width) {
 	let ulIdx = null;
 	let urlMap = null;
 	function setFg(col, c) {
-		if (fgRgb === null) {
+		if (fgRgb === null || fgIdx === null) {
 			fgRgb = new Uint32Array(width);
 			fgIdx = new Int16Array(width);
 		}
@@ -116,7 +129,7 @@ function makePackedRow(width) {
 		fgIdx[col] = c.index ?? -1;
 	}
 	function setBg(col, c) {
-		if (bgRgb === null) {
+		if (bgRgb === null || bgIdx === null) {
 			bgRgb = new Uint32Array(width);
 			bgIdx = new Int16Array(width);
 		}
@@ -124,7 +137,7 @@ function makePackedRow(width) {
 		bgIdx[col] = c.index ?? -1;
 	}
 	function setUl(col, c) {
-		if (ulRgb === null) {
+		if (ulRgb === null || ulIdx === null) {
 			ulRgb = new Uint32Array(width);
 			ulIdx = new Int16Array(width);
 		}
@@ -147,6 +160,7 @@ function makePackedRow(width) {
 		if (a.inverse) m |= F_INVERSE$1;
 		if (a.hidden) m |= F_HIDDEN$1;
 		if (a.blink) m |= F_BLINK$1;
+		if (a.protected) m |= F_PROTECTED$1;
 		if (wide) m |= F_WIDE$1;
 		return m | underlineToBits(a.underline);
 	}
@@ -208,34 +222,35 @@ function makePackedRow(width) {
 			} else meta[col] = 0;
 		},
 		widen(col) {
-			meta[col] = (meta[col] | F_WIDE$1) >>> 0;
+			meta[col] = (itemAt(meta, col, "packed row metadata") | F_WIDE$1) >>> 0;
 			if (col + 1 < width) row.setEmpty(col + 1);
 		},
 		appendChar(col, ch) {
-			chars[col] = chars[col] + ch;
+			chars[col] = itemAt(chars, col, "packed row characters") + ch;
 		},
 		copyCellFrom(col, src, srcCol) {
 			row.setCellRaw(col, src.getCellRaw(srcCol));
 		},
 		getCellRaw(col) {
-			const m = meta[col];
+			const m = itemAt(meta, col, "packed row metadata");
 			if (m === 0 && chars[col] === "") return emptyCell();
 			return {
-				char: chars[col],
-				fg: m & F_HAS_FG ? unpackColor(fgRgb[col], fgIdx[col]) : null,
-				bg: m & F_HAS_BG ? unpackColor(bgRgb[col], bgIdx[col]) : null,
+				char: itemAt(chars, col, "packed row characters"),
+				fg: m & F_HAS_FG ? unpackColor(itemAt(required(fgRgb, "foreground color plane"), col, "foreground color plane"), itemAt(required(fgIdx, "foreground color index plane"), col, "foreground color index plane")) : null,
+				bg: m & F_HAS_BG ? unpackColor(itemAt(required(bgRgb, "background color plane"), col, "background color plane"), itemAt(required(bgIdx, "background color index plane"), col, "background color index plane")) : null,
 				bold: (m & F_BOLD$1) !== 0,
 				faint: (m & F_FAINT$1) !== 0,
 				italic: (m & F_ITALIC$1) !== 0,
 				underline: bitsToUnderline(m),
-				underlineColor: m & F_HAS_UL ? unpackColor(ulRgb[col], ulIdx[col]) : null,
+				underlineColor: m & F_HAS_UL ? unpackColor(itemAt(required(ulRgb, "underline color plane"), col, "underline color plane"), itemAt(required(ulIdx, "underline color index plane"), col, "underline color index plane")) : null,
 				overline: (m & F_OVERLINE$1) !== 0,
 				strikethrough: (m & F_STRIKE$1) !== 0,
 				inverse: (m & F_INVERSE$1) !== 0,
 				hidden: (m & F_HIDDEN$1) !== 0,
 				blink: (m & F_BLINK$1) !== 0,
+				protected: (m & F_PROTECTED$1) !== 0,
 				wide: (m & F_WIDE$1) !== 0,
-				url: m & F_HAS_URL ? urlMap.get(col) ?? null : null
+				url: m & F_HAS_URL ? required(urlMap, "packed row URL map").get(col) ?? null : null
 			};
 		},
 		toCells() {
@@ -250,10 +265,10 @@ function makePackedRow(width) {
 			return meta[col] === 0 && chars[col] === "";
 		},
 		getChar(col) {
-			return chars[col];
+			return itemAt(chars, col, "packed row characters");
 		},
 		isWide(col) {
-			return (meta[col] & F_WIDE$1) !== 0;
+			return (itemAt(meta, col, "packed row metadata") & F_WIDE$1) !== 0;
 		}
 	};
 	return row;
@@ -357,9 +372,9 @@ function buildPalette256() {
 		255
 	];
 	for (let r = 0; r < 6; r++) for (let g = 0; g < 6; g++) for (let b = 0; b < 6; b++) palette.push({
-		r: levels[r],
-		g: levels[g],
-		b: levels[b]
+		r: itemAt(levels, r, "ANSI cube red levels"),
+		g: itemAt(levels, g, "ANSI cube green levels"),
+		b: itemAt(levels, b, "ANSI cube blue levels")
 	});
 	for (let i = 0; i < 24; i++) {
 		const v = 8 + i * 10;
@@ -385,14 +400,14 @@ function parseColorSpec(spec) {
 			return Math.round(v * 255 / max);
 		};
 		return {
-			r: scale(rgbMatch[1]),
-			g: scale(rgbMatch[2]),
-			b: scale(rgbMatch[3])
+			r: scale(itemAt(rgbMatch, 1, "X11 red capture")),
+			g: scale(itemAt(rgbMatch, 2, "X11 green capture")),
+			b: scale(itemAt(rgbMatch, 3, "X11 blue capture"))
 		};
 	}
 	const hex6 = /^#([0-9a-fA-F]{6})$/.exec(s);
 	if (hex6) {
-		const v = hex6[1];
+		const v = itemAt(hex6, 1, "six-digit hex capture");
 		return {
 			r: parseInt(v.substring(0, 2), 16),
 			g: parseInt(v.substring(2, 4), 16),
@@ -401,12 +416,12 @@ function parseColorSpec(spec) {
 	}
 	const hex3 = /^#([0-9a-fA-F]{3})$/.exec(s);
 	if (hex3) {
-		const v = hex3[1];
+		const v = itemAt(hex3, 1, "three-digit hex capture");
 		const expand = (ch) => parseInt(ch + ch, 16);
 		return {
-			r: expand(v[0]),
-			g: expand(v[1]),
-			b: expand(v[2])
+			r: expand(itemAt(v, 0, "short hex red channel")),
+			g: expand(itemAt(v, 1, "short hex green channel")),
+			b: expand(itemAt(v, 2, "short hex blue channel"))
 		};
 	}
 	return null;
@@ -480,7 +495,9 @@ function createScreen(options = {}) {
 		attrs: resetAttrs(),
 		originMode: false,
 		autoWrap: true,
-		charsetG0: false
+		charsetG0: false,
+		charsetG1: false,
+		activeG1: false
 	};
 	let savedCurX = 0;
 	let savedCurY = 0;
@@ -497,6 +514,7 @@ function createScreen(options = {}) {
 	let focusTracking = false;
 	let originMode = false;
 	let insertMode = false;
+	let newLineMode = false;
 	let reverseVideo = false;
 	let syncOutput = false;
 	let kittyKeyboardFlags = 0;
@@ -658,6 +676,8 @@ function createScreen(options = {}) {
 		assertBoolean("savedState.originMode", saved.originMode);
 		assertBoolean("savedState.autoWrap", saved.autoWrap);
 		assertBoolean("savedState.charsetG0", saved.charsetG0);
+		if (Object.hasOwn(saved, "charsetG1")) assertBoolean("savedState.charsetG1", saved.charsetG1);
+		if (Object.hasOwn(saved, "activeG1")) assertBoolean("savedState.activeG1", saved.activeG1);
 		assertRecord("attrs", value.attrs);
 		const modes = value.modes;
 		assertRecord("modes", modes);
@@ -740,6 +760,8 @@ function createScreen(options = {}) {
 		const unicode = value.unicode;
 		assertRecord("unicode", unicode);
 		assertBoolean("unicode.charsetG0", unicode.charsetG0);
+		if (Object.hasOwn(unicode, "charsetG1")) assertBoolean("unicode.charsetG1", unicode.charsetG1);
+		if (Object.hasOwn(unicode, "activeG1")) assertBoolean("unicode.activeG1", unicode.activeG1);
 		assertString("unicode.lastChar", unicode.lastChar);
 		if (unicode.pendingRegionalIndicator !== null) assertString("unicode.pendingRegionalIndicator", unicode.pendingRegionalIndicator);
 		assertBoolean("unicode.afterZWJ", unicode.afterZWJ);
@@ -769,6 +791,8 @@ function createScreen(options = {}) {
 	let advancedClipboard = "";
 	let viewportOffset = 0;
 	let charsetG0 = false;
+	let charsetG1 = false;
+	let activeG1 = false;
 	let clipboard = "";
 	let cwd = "";
 	let notifications = [];
@@ -778,7 +802,68 @@ function createScreen(options = {}) {
 	let mainSoftWrapped = new Array(rows).fill(false);
 	let altSoftWrapped = new Array(rows).fill(false);
 	let softWrapped = mainSoftWrapped;
+	let mainLineAttrs = new Array(rows).fill(0);
+	let altLineAttrs = new Array(rows).fill(0);
+	let lineAttrs = mainLineAttrs;
 	let scrollbackSoftWrapped = [];
+	let scrollbackLineAttrs = [];
+	/**
+	* Drop every banked scrollback row AND its soft-wrap flag.
+	*
+	* These two arrays are one data structure wearing two names, and nothing in
+	* the type system says so. `ESC [ 3 J` (erase display + scrollback) once
+	* emptied the rows and left the flags, which diverged the pair permanently
+	* by however many rows were banked at that instant. Every later push
+	* extended both and preserved the gap, so the snapshot codec refused to
+	* write a frame — `soft-wrap length 3580 != rowCount 2103` — and the seat
+	* kept running with its recording silently ended
+	* (@i/5-agent-loop/vterm-codec-ends-recording).
+	*
+	* `ESC [ 3 J` is not exotic: `clear` emits it on a modern terminal. Every
+	* clear goes through here so the pairing is structural rather than
+	* remembered at each call site.
+	*/
+	/** Dense per-row attributes -> sparse `[row, attr]` pairs, skipping normal rows. */
+	function toSparseAttrs(dense) {
+		const out = [];
+		for (let r = 0; r < dense.length; r++) {
+			const a = dense[r] ?? 0;
+			if (a !== 0) out.push([r, a]);
+		}
+		return out;
+	}
+	/** Sparse pairs -> a dense array of `length`; out-of-range rows are dropped. */
+	function fromSparseAttrs(sparse, length) {
+		const dense = new Array(length).fill(0);
+		for (const pair of sparse ?? []) {
+			const [r, a] = pair;
+			if (Number.isInteger(r) && r >= 0 && r < length) dense[r] = a;
+		}
+		return dense;
+	}
+	function clearScrollback() {
+		scrollback.length = 0;
+		scrollbackSoftWrapped.length = 0;
+		scrollbackLineAttrs.length = 0;
+	}
+	/**
+	* Bank one row into scrollback, trimming to the limit. Returns how many rows
+	* were trimmed off the front so a caller tracking absolute rows can rebase.
+	*
+	* Every scrollback mutation goes through a helper that moves BOTH arrays —
+	* see `clearScrollback` for what one unpaired mutation cost.
+	*/
+	function bankScrollbackRow(row, wrapped, lineAttr) {
+		scrollback.push(row);
+		scrollbackSoftWrapped.push(wrapped);
+		scrollbackLineAttrs.push(lineAttr);
+		if (scrollback.length <= scrollbackLimit * 2) return 0;
+		const over = scrollback.length - scrollbackLimit;
+		scrollback.splice(0, over);
+		scrollbackSoftWrapped.splice(0, over);
+		scrollbackLineAttrs.splice(0, over);
+		return over;
+	}
 	let lastChar = "";
 	let pendingRegionalIndicator = null;
 	let afterZWJ = false;
@@ -873,13 +958,12 @@ function createScreen(options = {}) {
 		if (bytes.length === 0) return 0;
 		let continuationCount = 0;
 		let leadIndex = bytes.length - 1;
-		while (leadIndex >= 0 && (bytes[leadIndex] & 192) === 128 && continuationCount < 3) {
+		while (leadIndex >= 0 && (itemAt(bytes, leadIndex, "UTF-8 pending bytes") & 192) === 128 && continuationCount < 3) {
 			continuationCount++;
 			leadIndex--;
 		}
 		if (leadIndex < 0) return bytes.length;
-		const lead = bytes[leadIndex];
-		const expectedLength = utf8SequenceLength(lead);
+		const expectedLength = utf8SequenceLength(itemAt(bytes, leadIndex, "UTF-8 lead byte"));
 		if (expectedLength === 0) return bytes.length;
 		return expectedLength > bytes.length - leadIndex ? leadIndex : bytes.length;
 	}
@@ -912,6 +996,16 @@ function createScreen(options = {}) {
 		fn(cells);
 		row.replaceAllFromCells(cells);
 	}
+	/**
+	* SGR 0 resets the pen but NOT DECSCA: character protection is independent
+	* of SGR, and is cleared only by DECSTR/RIS. Using the full `resetAttrs()`
+	* here would let any `ESC [ 0 m` silently unprotect subsequent writes.
+	*/
+	function resetSgrAttrs() {
+		const next = resetAttrs();
+		next.protected = attrs.protected;
+		return next;
+	}
 	function resetAttrs() {
 		return {
 			fg: null,
@@ -926,37 +1020,69 @@ function createScreen(options = {}) {
 			inverse: false,
 			hidden: false,
 			blink: false,
-			url: null
+			url: null,
+			protected: false
 		};
 	}
+	/**
+	* Usable columns on a row. A DEC double-width line (DECDWL/DECDHL) renders
+	* each cell twice as wide, so the row addresses and wraps at half the
+	* terminal's columns — an 80-column screen wraps a double-width line at 40.
+	*/
+	function rowCols(row) {
+		return (lineAttrs[row] ?? 0) === 0 ? cols : cols >> 1;
+	}
 	function clampCursor() {
 		if (curX < 0) curX = 0;
-		if (curX >= cols) curX = cols - 1;
 		if (curY < 0) curY = 0;
 		if (curY >= rows) curY = rows - 1;
+		const usable = rowCols(curY);
+		if (curX >= usable) curX = usable - 1;
+		if (originMode) {
+			if (curY < scrollTop) curY = scrollTop;
+			if (curY > scrollBottom) curY = scrollBottom;
+		}
+	}
+	/**
+	* Move the cursor down one line, scrolling ONLY at the region's bottom edge.
+	*
+	* `curY++; if (curY > scrollBottom) { curY = scrollBottom; scrollUp() }`
+	* looks equivalent and is not. From a row BELOW the scrolling region it
+	* clamps the cursor BACKWARDS into the region and scrolls a region the
+	* cursor was never in — with DECSTBM at 1;10, a linefeed from row 19 landed
+	* on row 9 instead of row 20.
+	*
+	* DECSTBM confines SCROLLING, not movement: a cursor outside the region
+	* simply walks the screen.
+	*/
+	function lineFeedDown() {
+		if (curY === scrollBottom) scrollUp(scrollTop, scrollBottom);
+		else if (curY < rows - 1) curY++;
+	}
+	/** RI's mirror: scroll only at the region's top edge, else walk up. */
+	function reverseIndexUp() {
+		if (curY === scrollTop) scrollDown(scrollTop, scrollBottom);
+		else if (curY > 0) curY--;
 	}
 	function scrollUp(top, bottom) {
 		if (leftRightMarginMode && (leftMargin > 0 || rightMargin < cols - 1)) {
 			const lm = leftMargin;
 			const rm = rightMargin;
 			for (let r = top; r < bottom; r++) {
-				const srcRow = grid[r + 1];
-				const dstRow = grid[r];
+				const srcRow = itemAt(grid, r + 1, "scroll source rows");
+				const dstRow = itemAt(grid, r, "scroll destination rows");
 				for (let c = lm; c <= rm && c < cols; c++) dstRow.copyCellFrom(c, srcRow, c);
 			}
-			const bottomRow = grid[bottom];
+			const bottomRow = itemAt(grid, bottom, "scroll bottom row");
 			for (let c = lm; c <= rm && c < cols; c++) bottomRow.setEmpty(c);
 			markScreenRowsDirty(top, bottom);
 		} else {
 			const enteredScrollback = grid === mainGrid && top === 0;
 			if (enteredScrollback) {
-				scrollback.push(grid[0]);
-				scrollbackSoftWrapped.push(softWrapped[0] ?? false);
-				markAbsoluteRowDirty(scrollback.length - 1);
-				if (scrollback.length > scrollbackLimit * 2) {
-					const over = scrollback.length - scrollbackLimit;
-					scrollback.splice(0, over);
-					scrollbackSoftWrapped.splice(0, over);
+				const banked = grid[0];
+				const over = banked === void 0 ? 0 : bankScrollbackRow(banked, softWrapped[0] ?? false, lineAttrs[0] ?? 0);
+				markAbsoluteRowDirty(scrollback.length - 1 + over);
+				if (over > 0) {
 					if (!dirtyAll && dirtyRows.size > 0) {
 						const shifted = /* @__PURE__ */ new Set();
 						for (const r of dirtyRows) if (r >= over) shifted.add(r - over);
@@ -990,16 +1116,16 @@ function createScreen(options = {}) {
 			const lm = leftMargin;
 			const rm = rightMargin;
 			for (let r = bottom; r > top; r--) {
-				const srcRow = grid[r - 1];
-				const dstRow = grid[r];
+				const srcRow = itemAt(grid, r - 1, "reverse-scroll source rows");
+				const dstRow = itemAt(grid, r, "reverse-scroll destination rows");
 				for (let c = lm; c <= rm && c < cols; c++) dstRow.copyCellFrom(c, srcRow, c);
 			}
-			const topRow = grid[top];
+			const topRow = itemAt(grid, top, "reverse-scroll top row");
 			for (let c = lm; c <= rm && c < cols; c++) topRow.setEmpty(c);
 		} else {
 			for (let i = bottom; i > top; i--) {
-				grid[i] = grid[i - 1];
-				softWrapped[i] = softWrapped[i - 1];
+				grid[i] = itemAt(grid, i - 1, "reverse-scroll source rows");
+				softWrapped[i] = itemAt(softWrapped, i - 1, "reverse-scroll source wrap flags");
 			}
 			grid[top] = makeRow(cols);
 			softWrapped[top] = false;
@@ -1024,7 +1150,7 @@ function createScreen(options = {}) {
 			if (prevRow < 0) return null;
 			prevCol = cols - 1;
 		}
-		const row = grid[prevRow];
+		const row = itemAt(grid, prevRow, "previous-cell rows");
 		if (prevCol > 0 && row.getChar(prevCol) === "" && row.isWide(prevCol - 1)) prevCol--;
 		if (row.isEmpty(prevCol)) return null;
 		return {
@@ -1038,7 +1164,7 @@ function createScreen(options = {}) {
 		row.widen(col);
 	}
 	function writeChar(ch) {
-		if (charsetG0 && ch.length === 1) {
+		if ((activeG1 ? charsetG1 : charsetG0) && ch.length === 1) {
 			const mapped = DEC_SPECIAL_GRAPHICS[ch];
 			if (mapped) ch = mapped;
 		}
@@ -1088,14 +1214,16 @@ function createScreen(options = {}) {
 				return;
 			}
 		}
-		if (isRegionalIndicator(codePoint)) if (pendingRegionalIndicator !== null) {
-			const flag = pendingRegionalIndicator + ch;
-			pendingRegionalIndicator = null;
-			writeCharCore(flag, true);
-			return;
-		} else {
-			pendingRegionalIndicator = ch;
-			return;
+		if (isRegionalIndicator(codePoint)) {
+			if (pendingRegionalIndicator !== null) {
+				const flag = pendingRegionalIndicator + ch;
+				pendingRegionalIndicator = null;
+				writeCharCore(flag, true);
+				return;
+			} else {
+				pendingRegionalIndicator = ch;
+				return;
+			}
 		}
 		if (pendingRegionalIndicator !== null) {
 			const ri = pendingRegionalIndicator;
@@ -1108,20 +1236,22 @@ function createScreen(options = {}) {
 	function writeCharCore(ch, wide) {
 		if (cols <= 0 || rows <= 0) return;
 		const charWidth = wide ? 2 : 1;
-		const wrapBoundary = leftRightMarginMode ? rightMargin + 1 : cols;
+		const wrapBoundary = leftRightMarginMode ? rightMargin + 1 : rowCols(curY);
 		const wrapReturn = leftRightMarginMode ? leftMargin : 0;
-		if (curX + charWidth > wrapBoundary) if (autoWrap) {
-			softWrapped[curY] = true;
-			curX = wrapReturn;
-			curY++;
-			if (curY > scrollBottom) {
-				curY = scrollBottom;
-				scrollUp(scrollTop, scrollBottom);
-			}
-		} else curX = wrapBoundary - charWidth;
+		if (curX + charWidth > wrapBoundary) {
+			if (autoWrap) {
+				softWrapped[curY] = true;
+				curX = wrapReturn;
+				curY++;
+				if (curY > scrollBottom) {
+					curY = scrollBottom;
+					scrollUp(scrollTop, scrollBottom);
+				}
+			} else curX = wrapBoundary - charWidth;
+		}
 		if (insertMode) {
 			const insertEnd = leftRightMarginMode ? rightMargin + 1 : cols;
-			mutateRowAsCells(grid[curY], (cells) => {
+			mutateRowAsCells(itemAt(grid, curY, "cursor row"), (cells) => {
 				for (let i = 0; i < charWidth; i++) {
 					cells.splice(insertEnd - 1, 1);
 					cells.splice(curX, 0, emptyCell());
@@ -1133,6 +1263,7 @@ function createScreen(options = {}) {
 		if (wide) widenCell(row, curX);
 		markScreenRowDirty(curY);
 		curX += charWidth;
+		if (!autoWrap && curX >= wrapBoundary) curX = wrapBoundary - 1;
 		lastChar = ch;
 	}
 	function handleCSI(params, intermediates, finalByte) {
@@ -1163,12 +1294,15 @@ function createScreen(options = {}) {
 				case 6:
 					cursorShape = "bar";
 					cursorBlinking = false;
-					break;
 			}
 			else if (finalByte === "@") handleShiftLeft(Math.max(parts[0] ?? 1, 1));
 			else if (finalByte === "A") handleShiftRight(Math.max(parts[0] ?? 1, 1));
 			return;
 		}
+		if (intermediates === "\"" && finalByte === "q") {
+			attrs.protected = (parts[0] ?? 0) === 1;
+			return;
+		}
 		if (intermediates === "!") {
 			if (finalByte === "p") softReset();
 			return;
@@ -1188,7 +1322,7 @@ function createScreen(options = {}) {
 				const { t, l, b, r } = normalizeRect(parts[1] ?? 1, parts[2] ?? 1, parts[3] ?? rows, parts[4] ?? cols);
 				const fillChar = String.fromCharCode(charCode);
 				for (let row = t; row <= b && row < rows; row++) {
-					const gr = grid[row];
+					const gr = itemAt(grid, row, "rectangular erase rows");
 					for (let col = l; col <= r && col < cols; col++) {
 						const cell = emptyCell();
 						cell.char = fillChar;
@@ -1199,7 +1333,7 @@ function createScreen(options = {}) {
 			} else if (finalByte === "z" || finalByte === "{") {
 				const { t, l, b, r } = normalizeRect(parts[0] ?? 1, parts[1] ?? 1, parts[2] ?? rows, parts[3] ?? cols);
 				for (let row = t; row <= b && row < rows; row++) {
-					const gr = grid[row];
+					const gr = itemAt(grid, row, "rectangular fill rows");
 					for (let col = l; col <= r && col < cols; col++) gr.setEmpty(col);
 				}
 				markScreenRowsDirty(t, Math.min(b, rows - 1));
@@ -1219,11 +1353,11 @@ function createScreen(options = {}) {
 				for (let row = 0; row < h; row++) {
 					const dr = dstTop + row;
 					if (dr < 0 || dr >= rows) continue;
-					const dstRow = grid[dr];
+					const dstRow = itemAt(grid, dr, "rectangular copy destination rows");
 					for (let col = 0; col < w; col++) {
 						const dc = dstLeft + col;
 						if (dc < 0 || dc >= cols) continue;
-						dstRow.setCellRaw(dc, snapshot[row][col]);
+						dstRow.setCellRaw(dc, itemAt(itemAt(snapshot, row, "rectangular copy rows"), col, "rectangular copy cells"));
 					}
 				}
 				markScreenRowsDirty(Math.max(0, dstTop), Math.min(dstTop + h - 1, rows - 1));
@@ -1232,7 +1366,7 @@ function createScreen(options = {}) {
 				const sgrParts = parts.slice(4);
 				const reverse = finalByte === "t";
 				for (let row = t; row <= b && row < rows; row++) {
-					const gr = grid[row];
+					const gr = itemAt(grid, row, "rectangular attribute rows");
 					for (let col = l; col <= r && col < cols; col++) {
 						const cell = gr.getCellRaw(col);
 						applyRectAttrs(cell, sgrParts, reverse);
@@ -1278,18 +1412,22 @@ function createScreen(options = {}) {
 		}
 		switch (finalByte) {
 			case "A":
+			case "k":
 				curY -= Math.max(parts[0] ?? 1, 1);
 				clampCursor();
 				break;
 			case "B":
+			case "e":
 				curY += Math.max(parts[0] ?? 1, 1);
 				clampCursor();
 				break;
 			case "C":
+			case "a":
 				curX += Math.max(parts[0] ?? 1, 1);
 				clampCursor();
 				break;
 			case "D":
+			case "j":
 				curX -= Math.max(parts[0] ?? 1, 1);
 				clampCursor();
 				break;
@@ -1342,21 +1480,21 @@ function createScreen(options = {}) {
 					case 20:
 						onResponse(`\x1b]L${title}\x1b\\`);
 						break;
-					case 21:
-						onResponse(`\x1b]l${title}\x1b\\`);
-						break;
+					case 21: onResponse(`\x1b]l${title}\x1b\\`);
 				}
 				break;
 			}
 			case "H":
 			case "f":
 				if (originMode) {
+					const originX = leftRightMarginMode ? leftMargin : 0;
+					const limitX = leftRightMarginMode ? rightMargin : cols - 1;
 					curY = scrollTop + (parts[0] ?? 1) - 1;
-					curX = (parts[1] ?? 1) - 1;
+					curX = originX + (parts[1] ?? 1) - 1;
 					if (curY < scrollTop) curY = scrollTop;
 					if (curY > scrollBottom) curY = scrollBottom;
-					if (curX < 0) curX = 0;
-					if (curX >= cols) curX = cols - 1;
+					if (curX < originX) curX = originX;
+					if (curX > limitX) curX = limitX;
 				} else {
 					curY = (parts[0] ?? 1) - 1;
 					curX = (parts[1] ?? 1) - 1;
@@ -1427,10 +1565,16 @@ function createScreen(options = {}) {
 				}
 				break;
 			case "h":
-				for (const code of parts) if (code === 4) insertMode = true;
+				for (const code of parts) {
+					if (code === 4) insertMode = true;
+					if (code === 20) newLineMode = true;
+				}
 				break;
 			case "l":
-				for (const code of parts) if (code === 4) insertMode = false;
+				for (const code of parts) {
+					if (code === 4) insertMode = false;
+					if (code === 20) newLineMode = false;
+				}
 				break;
 			case "s":
 				if (leftRightMarginMode && intermediates === "") {
@@ -1455,8 +1599,6 @@ function createScreen(options = {}) {
 				curX = savedCurX;
 				curY = savedCurY;
 				clampCursor();
-				break;
-			default: break;
 		}
 	}
 	function handleCSIGt(params, _intermediates, finalByte) {
@@ -1551,6 +1693,9 @@ function createScreen(options = {}) {
 					case 4:
 						value = insertMode ? 1 : 2;
 						break;
+					case 20:
+						value = newLineMode ? 1 : 2;
+						break;
 					case 3:
 						value = decColumnMode ? 1 : 2;
 						break;
@@ -1560,9 +1705,7 @@ function createScreen(options = {}) {
 					case 1007:
 						value = altScrollMode ? 1 : 2;
 						break;
-					case 1048:
-						value = 2;
-						break;
+					case 1048: value = 2;
 				}
 				onResponse(`\x1b[?${mode};${value}$y`);
 			}
@@ -1577,11 +1720,11 @@ function createScreen(options = {}) {
 			return;
 		}
 		if (finalByte === "J") {
-			handleEraseDisplay(parts[0] ?? 0);
+			handleEraseDisplay(parts[0] ?? 0, true);
 			return;
 		}
 		if (finalByte === "K") {
-			handleEraseLine(parts[0] ?? 0);
+			handleEraseLine(parts[0] ?? 0, true);
 			return;
 		}
 		const set = finalByte === "h";
@@ -1610,11 +1753,13 @@ function createScreen(options = {}) {
 					useAltScreen = true;
 					grid = altGrid;
 					softWrapped = altSoftWrapped;
+					lineAttrs = altLineAttrs;
 					markAllDirty();
 				} else if (!set && useAltScreen) {
 					useAltScreen = false;
 					grid = mainGrid;
 					softWrapped = mainSoftWrapped;
+					lineAttrs = mainLineAttrs;
 					markAllDirty();
 				}
 				break;
@@ -1643,8 +1788,10 @@ function createScreen(options = {}) {
 					useAltScreen = true;
 					altGrid = makeGrid(cols, rows);
 					altSoftWrapped = new Array(rows).fill(false);
+					altLineAttrs = new Array(rows).fill(0);
 					grid = altGrid;
 					softWrapped = altSoftWrapped;
+					lineAttrs = altLineAttrs;
 					curX = 0;
 					curY = 0;
 					markAllDirty();
@@ -1652,6 +1799,7 @@ function createScreen(options = {}) {
 					useAltScreen = false;
 					grid = mainGrid;
 					softWrapped = mainSoftWrapped;
+					lineAttrs = mainLineAttrs;
 					curX = savedCurX;
 					curY = savedCurY;
 					clampCursor();
@@ -1686,55 +1834,53 @@ function createScreen(options = {}) {
 			case 1007:
 				altScrollMode = set;
 				break;
-			case 1048:
-				if (set) {
-					savedCurX = curX;
-					savedCurY = curY;
-				} else {
-					curX = savedCurX;
-					curY = savedCurY;
-					clampCursor();
-				}
-				break;
+			case 1048: if (set) {
+				savedCurX = curX;
+				savedCurY = curY;
+			} else {
+				curX = savedCurX;
+				curY = savedCurY;
+				clampCursor();
+			}
 		}
 	}
-	function handleEraseDisplay(mode) {
+	function handleEraseDisplay(mode, selective = false) {
 		switch (mode) {
 			case 0:
-				eraseCells(curY, curX, curY, cols - 1);
-				for (let row = curY + 1; row < rows; row++) eraseCells(row, 0, row, cols - 1);
+				eraseCells(curY, curX, curY, cols - 1, selective);
+				for (let row = curY + 1; row < rows; row++) eraseCells(row, 0, row, cols - 1, selective);
 				break;
 			case 1:
-				for (let row = 0; row < curY; row++) eraseCells(row, 0, row, cols - 1);
-				eraseCells(curY, 0, curY, curX);
+				for (let row = 0; row < curY; row++) eraseCells(row, 0, row, cols - 1, selective);
+				eraseCells(curY, 0, curY, curX, selective);
 				break;
 			case 2:
 			case 3:
-				for (let row = 0; row < rows; row++) eraseCells(row, 0, row, cols - 1);
-				if (mode === 3) scrollback.length = 0;
+				for (let row = 0; row < rows; row++) eraseCells(row, 0, row, cols - 1, selective);
+				if (mode === 3) clearScrollback();
 				markAllDirty();
-				break;
 		}
 	}
-	function handleEraseLine(mode) {
+	function handleEraseLine(mode, selective = false) {
 		const eraseRight = leftRightMarginMode ? rightMargin : cols - 1;
 		const eraseLeft = leftRightMarginMode ? leftMargin : 0;
 		switch (mode) {
 			case 0:
-				eraseCells(curY, curX, curY, eraseRight);
+				eraseCells(curY, curX, curY, eraseRight, selective);
 				break;
 			case 1:
-				eraseCells(curY, eraseLeft, curY, curX);
-				break;
-			case 2:
-				eraseCells(curY, eraseLeft, curY, eraseRight);
+				eraseCells(curY, eraseLeft, curY, curX, selective);
 				break;
+			case 2: eraseCells(curY, eraseLeft, curY, eraseRight, selective);
 		}
 	}
-	function eraseCells(row, startCol, _endRow, endCol) {
+	function eraseCells(row, startCol, _endRow, endCol, selective = false) {
 		const r = grid[row];
 		if (!r) return;
-		for (let col = startCol; col <= endCol && col < cols; col++) r.eraseWithBg(col, attrs.bg);
+		for (let col = startCol; col <= endCol && col < cols; col++) {
+			if (selective && r.getCellRaw(col).protected) continue;
+			r.eraseWithBg(col, attrs.bg);
+		}
 		markScreenRowDirty(row);
 	}
 	function handleInsertLines(count) {
@@ -1878,9 +2024,7 @@ function createScreen(options = {}) {
 			case 25:
 				cell.blink = false;
 				break;
-			case 27:
-				cell.inverse = false;
-				break;
+			case 27: cell.inverse = false;
 		}
 	}
 	function handleSGR(rawParams) {
@@ -1890,18 +2034,18 @@ function createScreen(options = {}) {
 		for (const seg of segments) if (seg.includes(":")) {
 			const subs = seg.split(":").map((s) => s === "" ? 0 : parseInt(s, 10));
 			subParams.set(params.length, subs);
-			params.push(subs[0]);
+			params.push(itemAt(subs, 0, "SGR sub-parameters"));
 		} else params.push(seg === "" ? 0 : parseInt(seg, 10));
 		if (params.length === 0 || params.length === 1 && params[0] === 0) {
-			attrs = resetAttrs();
+			attrs = resetSgrAttrs();
 			return;
 		}
 		let i = 0;
 		while (i < params.length) {
-			const code = params[i];
+			const code = itemAt(params, i, "SGR parameters");
 			switch (code) {
 				case 0:
-					attrs = resetAttrs();
+					attrs = resetSgrAttrs();
 					break;
 				case 1:
 					attrs.bold = true;
@@ -1914,7 +2058,7 @@ function createScreen(options = {}) {
 					break;
 				case 4: {
 					const subs = subParams.get(i);
-					if (subs && subs.length > 1) switch (subs[1]) {
+					if (subs && subs.length > 1) switch (itemAt(subs, 1, "underline style sub-parameters")) {
 						case 0:
 							attrs.underline = "none";
 							break;
@@ -1933,9 +2077,7 @@ function createScreen(options = {}) {
 						case 5:
 							attrs.underline = "dashed";
 							break;
-						default:
-							attrs.underline = "single";
-							break;
+						default: attrs.underline = "single";
 					}
 					else attrs.underline = "single";
 					break;
@@ -1989,7 +2131,7 @@ function createScreen(options = {}) {
 				case 36:
 				case 37:
 					attrs.fg = {
-						...palette256[code - 30],
+						...itemAt(palette256, code - 30, "basic foreground palette"),
 						index: code - 30
 					};
 					break;
@@ -2019,7 +2161,7 @@ function createScreen(options = {}) {
 				case 46:
 				case 47:
 					attrs.bg = {
-						...palette256[code - 40],
+						...itemAt(palette256, code - 40, "basic background palette"),
 						index: code - 40
 					};
 					break;
@@ -2072,7 +2214,7 @@ function createScreen(options = {}) {
 				case 96:
 				case 97:
 					attrs.fg = {
-						...palette256[code - 90 + 8],
+						...itemAt(palette256, code - 90 + 8, "bright foreground palette"),
 						index: code - 90 + 8
 					};
 					break;
@@ -2083,12 +2225,10 @@ function createScreen(options = {}) {
 				case 104:
 				case 105:
 				case 106:
-				case 107:
-					attrs.bg = {
-						...palette256[code - 100 + 8],
-						index: code - 100 + 8
-					};
-					break;
+				case 107: attrs.bg = {
+					...itemAt(palette256, code - 100 + 8, "bright background palette"),
+					index: code - 100 + 8
+				};
 			}
 			i++;
 		}
@@ -2097,7 +2237,7 @@ function createScreen(options = {}) {
 		if (startIndex + 1 >= params.length) return null;
 		const type = params[startIndex + 1];
 		if (type === 5 && startIndex + 2 < params.length) {
-			const idx = params[startIndex + 2];
+			const idx = itemAt(params, startIndex + 2, "indexed color parameters");
 			const entry = palette256[idx];
 			return {
 				color: entry ? {
@@ -2112,9 +2252,9 @@ function createScreen(options = {}) {
 			};
 		} else if (type === 2 && startIndex + 4 < params.length) return {
 			color: {
-				r: params[startIndex + 2],
-				g: params[startIndex + 3],
-				b: params[startIndex + 4]
+				r: itemAt(params, startIndex + 2, "truecolor red parameter"),
+				g: itemAt(params, startIndex + 3, "truecolor green parameter"),
+				b: itemAt(params, startIndex + 4, "truecolor blue parameter")
 			},
 			nextIndex: startIndex + 5
 		};
@@ -2125,7 +2265,7 @@ function createScreen(options = {}) {
 		if (subs.length < 3) return null;
 		const type = subs[1];
 		if (type === 5 && subs.length >= 3) {
-			const idx = subs[2];
+			const idx = itemAt(subs, 2, "indexed color sub-parameters");
 			const entry = palette256[idx];
 			return entry ? {
 				...entry,
@@ -2138,18 +2278,18 @@ function createScreen(options = {}) {
 		} else if (type === 2) {
 			if (subs.length >= 5) {
 				if (subs.length >= 6) return {
-					r: subs[3],
-					g: subs[4],
-					b: subs[5]
+					r: itemAt(subs, 3, "colorspace red sub-parameter"),
+					g: itemAt(subs, 4, "colorspace green sub-parameter"),
+					b: itemAt(subs, 5, "colorspace blue sub-parameter")
 				};
 				return {
-					r: subs[2],
-					g: subs[3],
-					b: subs[4]
+					r: itemAt(subs, 2, "truecolor red sub-parameter"),
+					g: itemAt(subs, 3, "truecolor green sub-parameter"),
+					b: itemAt(subs, 4, "truecolor blue sub-parameter")
 				};
 			} else if (subs.length >= 4) return {
-				r: subs[2],
-				g: subs[3],
+				r: itemAt(subs, 2, "partial truecolor red sub-parameter"),
+				g: itemAt(subs, 3, "partial truecolor green sub-parameter"),
 				b: 0
 			};
 		}
@@ -2181,14 +2321,11 @@ function createScreen(options = {}) {
 							startCol: curX
 						});
 						break;
-					case "C":
-						semanticZones.push({
-							type: "output",
-							startRow: curY,
-							startCol: curX
-						});
-						break;
-					case "D": break;
+					case "C": semanticZones.push({
+						type: "output",
+						startRow: curY,
+						startCol: curX
+					});
 				}
 				break;
 			case 1: break;
@@ -2206,8 +2343,8 @@ function createScreen(options = {}) {
 			case 4: {
 				const fields = value.split(";");
 				for (let fi = 0; fi + 1 < fields.length; fi += 2) {
-					const idx = parseInt(fields[fi], 10);
-					const spec = fields[fi + 1];
+					const idx = parseInt(itemAt(fields, fi, "OSC 4 palette fields"), 10);
+					const spec = itemAt(fields, fi + 1, "OSC 4 palette fields");
 					if (isNaN(idx) || idx < 0 || idx > 255) continue;
 					if (spec === "?") {
 						const c = palette256[idx];
@@ -2222,8 +2359,8 @@ function createScreen(options = {}) {
 			case 5: {
 				const fields = value.split(";");
 				for (let fi = 0; fi + 1 < fields.length; fi += 2) {
-					const idx = parseInt(fields[fi], 10);
-					const spec = fields[fi + 1];
+					const idx = parseInt(itemAt(fields, fi, "OSC 5 special-color fields"), 10);
+					const spec = itemAt(fields, fi + 1, "OSC 5 special-color fields");
 					if (isNaN(idx) || idx < 0 || idx > 4) continue;
 					if (spec === "?") {
 						const c = specialColors.get(idx);
@@ -2333,70 +2470,76 @@ function createScreen(options = {}) {
 					const isQuery = val === "?";
 					const paletteMatch = /^color(\d+)$/.exec(key);
 					if (paletteMatch) {
-						const idx = parseInt(paletteMatch[1], 10);
+						const idx = parseInt(itemAt(paletteMatch, 1, "OSC 104 palette capture"), 10);
 						if (idx < 0 || idx > 255) continue;
 						if (isQuery) {
 							const c = palette256[idx];
 							if (c) response.push(`${key}=${formatColorResponse(c)}`);
 						} else if (val === "") {
 							const fresh = buildPalette256();
-							palette256[idx] = fresh[idx];
+							palette256[idx] = itemAt(fresh, idx, "fresh ANSI palette");
 						} else {
 							const c = parseColorSpec(val);
 							if (c) palette256[idx] = c;
 						}
-					} else if (key === "foreground") if (isQuery) {
-						const c = defaultFgColor ?? {
-							r: 255,
-							g: 255,
-							b: 255
-						};
-						response.push(`${key}=${formatColorResponse(c)}`);
-					} else if (val === "") defaultFgColor = null;
-					else {
-						const c = parseColorSpec(val);
-						if (c) defaultFgColor = c;
-					}
-					else if (key === "background") if (isQuery) {
-						const c = defaultBgColor ?? {
-							r: 0,
-							g: 0,
-							b: 0
-						};
-						response.push(`${key}=${formatColorResponse(c)}`);
-					} else if (val === "") defaultBgColor = null;
-					else {
-						const c = parseColorSpec(val);
-						if (c) defaultBgColor = c;
-					}
-					else if (key === "cursor") if (isQuery) {
-						const c = cursorColor ?? defaultFgColor ?? {
-							r: 255,
-							g: 255,
-							b: 255
-						};
-						response.push(`${key}=${formatColorResponse(c)}`);
-					} else if (val === "") cursorColor = null;
-					else {
-						const c = parseColorSpec(val);
-						if (c) cursorColor = c;
+					} else if (key === "foreground") {
+						if (isQuery) {
+							const c = defaultFgColor ?? {
+								r: 255,
+								g: 255,
+								b: 255
+							};
+							response.push(`${key}=${formatColorResponse(c)}`);
+						} else if (val === "") defaultFgColor = null;
+						else {
+							const c = parseColorSpec(val);
+							if (c) defaultFgColor = c;
+						}
+					} else if (key === "background") {
+						if (isQuery) {
+							const c = defaultBgColor ?? {
+								r: 0,
+								g: 0,
+								b: 0
+							};
+							response.push(`${key}=${formatColorResponse(c)}`);
+						} else if (val === "") defaultBgColor = null;
+						else {
+							const c = parseColorSpec(val);
+							if (c) defaultBgColor = c;
+						}
+					} else if (key === "cursor") {
+						if (isQuery) {
+							const c = cursorColor ?? defaultFgColor ?? {
+								r: 255,
+								g: 255,
+								b: 255
+							};
+							response.push(`${key}=${formatColorResponse(c)}`);
+						} else if (val === "") cursorColor = null;
+						else {
+							const c = parseColorSpec(val);
+							if (c) cursorColor = c;
+						}
+					} else if (key === "selection_background") {
+						if (isQuery) {
+							const c = highlightBgColor ?? defaultFgColor ?? {
+								r: 255,
+								g: 255,
+								b: 255
+							};
+							response.push(`${key}=${formatColorResponse(c)}`);
+						} else highlightBgColor = val === "" ? null : parseColorSpec(val);
+					} else if (key === "selection_foreground") {
+						if (isQuery) {
+							const c = highlightFgColor ?? defaultBgColor ?? {
+								r: 0,
+								g: 0,
+								b: 0
+							};
+							response.push(`${key}=${formatColorResponse(c)}`);
+						} else highlightFgColor = val === "" ? null : parseColorSpec(val);
 					}
-					else if (key === "selection_background") if (isQuery) {
-						const c = highlightBgColor ?? defaultFgColor ?? {
-							r: 255,
-							g: 255,
-							b: 255
-						};
-						response.push(`${key}=${formatColorResponse(c)}`);
-					} else highlightBgColor = val === "" ? null : parseColorSpec(val);
-					else if (key === "selection_foreground") if (isQuery) {
-						const c = highlightFgColor ?? defaultBgColor ?? {
-							r: 0,
-							g: 0,
-							b: 0
-						};
-						response.push(`${key}=${formatColorResponse(c)}`);
-					} else highlightFgColor = val === "" ? null : parseColorSpec(val);
 				}
 				if (response.length > 0 && onResponse) onResponse(`\x1b]21;${response.join(";")}\x1b\\`);
 				break;
@@ -2407,7 +2550,7 @@ function createScreen(options = {}) {
 					const fresh = buildPalette256();
 					for (const tok of value.split(";")) {
 						const idx = parseInt(tok, 10);
-						if (!isNaN(idx) && idx >= 0 && idx < 256) palette256[idx] = fresh[idx];
+						if (!isNaN(idx) && idx >= 0 && idx < 256) palette256[idx] = itemAt(fresh, idx, "fresh ANSI palette");
 					}
 				}
 				break;
@@ -2478,14 +2621,11 @@ function createScreen(options = {}) {
 							startCol: curX
 						});
 						break;
-					case "C":
-						semanticZones.push({
-							type: "output",
-							startRow: curY,
-							startCol: curX
-						});
-						break;
-					case "D": break;
+					case "C": semanticZones.push({
+						type: "output",
+						startRow: curY,
+						startCol: curX
+					});
 				}
 				break;
 			case 66:
@@ -2558,10 +2698,8 @@ function createScreen(options = {}) {
 					advancedClipboard = "";
 				}
 				break;
-			case 1337:
-				if (value === "ReportCellSize" && onResponse) onResponse("\x1B]1337;ReportCellSize=16;8\x1B\\");
-				else if (value === "RequestCapabilities" && onResponse) onResponse("\x1B]1337;Capabilities=\x1B\\");
-				break;
+			case 1337: if (value === "ReportCellSize" && onResponse) onResponse("\x1B]1337;ReportCellSize=16;8\x1B\\");
+			else if (value === "RequestCapabilities" && onResponse) onResponse("\x1B]1337;Capabilities=\x1B\\");
 		}
 	}
 	function handleDCS(data) {
@@ -2569,7 +2707,7 @@ function createScreen(options = {}) {
 		if (match) {
 			hasSixel = true;
 			sixelImages.push({
-				data: match[2],
+				data: itemAt(match, 2, "sixel payload capture"),
 				row: dcsStartRow,
 				col: dcsStartCol
 			});
@@ -2602,6 +2740,7 @@ function createScreen(options = {}) {
 	}
 	function softReset() {
 		insertMode = false;
+		newLineMode = false;
 		originMode = false;
 		autoWrap = true;
 		curVisible = true;
@@ -2622,6 +2761,8 @@ function createScreen(options = {}) {
 		rightMargin = cols - 1;
 		attrs = resetAttrs();
 		charsetG0 = false;
+		charsetG1 = false;
+		activeG1 = false;
 		curX = 0;
 		curY = 0;
 	}
@@ -2644,7 +2785,9 @@ function createScreen(options = {}) {
 			attrs: resetAttrs(),
 			originMode: false,
 			autoWrap: true,
-			charsetG0: false
+			charsetG0: false,
+			charsetG1: false,
+			activeG1: false
 		};
 		attrs = resetAttrs();
 		title = "";
@@ -2659,6 +2802,7 @@ function createScreen(options = {}) {
 		focusTracking = false;
 		originMode = false;
 		insertMode = false;
+		newLineMode = false;
 		reverseVideo = false;
 		syncOutput = false;
 		kittyKeyboardFlags = 0;
@@ -2682,6 +2826,8 @@ function createScreen(options = {}) {
 		advancedClipboard = "";
 		viewportOffset = 0;
 		charsetG0 = false;
+		charsetG1 = false;
+		activeG1 = false;
 		clipboard = "";
 		cwd = "";
 		notifications = [];
@@ -2717,6 +2863,9 @@ function createScreen(options = {}) {
 		mainSoftWrapped = new Array(rows).fill(false);
 		altSoftWrapped = new Array(rows).fill(false);
 		softWrapped = mainSoftWrapped;
+		mainLineAttrs = new Array(rows).fill(0);
+		altLineAttrs = new Array(rows).fill(0);
+		lineAttrs = mainLineAttrs;
 		markAllDirty();
 		dirtyScrolled = 0;
 		if (sigDamageActive) sigDirtyScrolled = 0;
@@ -2868,15 +3017,18 @@ function createScreen(options = {}) {
 						emitExecute(9);
 					} else if (code === 10 || code === 11 || code === 12) {
 						softWrapped[curY] = false;
-						curY++;
-						if (curY > scrollBottom) {
-							curY = scrollBottom;
-							scrollUp(scrollTop, scrollBottom);
-						}
+						lineFeedDown();
+						if (newLineMode) curX = 0;
 						emitExecute(code);
 					} else if (code === 13) {
 						curX = 0;
 						emitExecute(13);
+					} else if (code === 14) {
+						activeG1 = true;
+						emitExecute(14);
+					} else if (code === 15) {
+						activeG1 = false;
+						emitExecute(15);
 					} else if (code >= 32) {
 						let char = ch;
 						if (code >= 55296 && code <= 56319 && i + 1 < text.length) {
@@ -2910,19 +3062,11 @@ function createScreen(options = {}) {
 						parserState = "ground";
 						emitEsc("c", "");
 					} else if (ch === "D") {
-						curY++;
-						if (curY > scrollBottom) {
-							curY = scrollBottom;
-							scrollUp(scrollTop, scrollBottom);
-						}
+						lineFeedDown();
 						parserState = "ground";
 						emitEsc("D", "");
 					} else if (ch === "M") {
-						curY--;
-						if (curY < scrollTop) {
-							curY = scrollTop;
-							scrollDown(scrollTop, scrollBottom);
-						}
+						reverseIndexUp();
 						parserState = "ground";
 						emitEsc("M", "");
 					} else if (ch === "7") {
@@ -2937,7 +3081,9 @@ function createScreen(options = {}) {
 							},
 							originMode,
 							autoWrap,
-							charsetG0
+							charsetG0,
+							charsetG1,
+							activeG1
 						};
 						parserState = "ground";
 						emitEsc("7", "");
@@ -2953,6 +3099,8 @@ function createScreen(options = {}) {
 						originMode = savedState.originMode;
 						autoWrap = savedState.autoWrap;
 						charsetG0 = savedState.charsetG0;
+						charsetG1 = savedState.charsetG1;
+						activeG1 = savedState.activeG1;
 						clampCursor();
 						parserState = "ground";
 						emitEsc("8", "");
@@ -2974,9 +3122,11 @@ function createScreen(options = {}) {
 						parserState = "escape_hash";
 					} else if (ch === "(") {
 						escIntermediate = "(";
+						escBuf = "(";
 						parserState = "escape_charset";
 					} else if (ch === ")") {
 						escIntermediate = ")";
+						escBuf = ")";
 						parserState = "escape_charset";
 					} else if (ch === "=") {
 						applicationKeypad = true;
@@ -2996,23 +3146,28 @@ function createScreen(options = {}) {
 					} else parserState = "ground";
 					break;
 				case "escape_charset":
-					if (ch === "0") charsetG0 = true;
-					else charsetG0 = false;
+					const designator = escBuf === ")" ? ")" : "(";
+					if (designator === ")") charsetG1 = ch === "0";
+					else charsetG0 = ch === "0";
+					escBuf = "";
 					parserState = "ground";
-					emitEsc(ch, escIntermediate);
+					emitEsc(ch, designator);
 					break;
 				case "escape_hash":
 					if (ch === "8") {
 						const alignCell = emptyCell();
 						alignCell.char = "E";
 						for (let r = 0; r < rows; r++) {
-							const row = grid[r];
+							const row = itemAt(grid, r, "selective erase rows");
 							for (let c = 0; c < cols; c++) row.setCellRaw(c, alignCell);
 							softWrapped[r] = false;
 						}
 						curX = 0;
 						curY = 0;
-					}
+					} else if (ch === "3") lineAttrs[curY] = 2;
+					else if (ch === "4") lineAttrs[curY] = 3;
+					else if (ch === "5") lineAttrs[curY] = 0;
+					else if (ch === "6") lineAttrs[curY] = 1;
 					parserState = "ground";
 					emitEsc(ch, escIntermediate);
 					break;
@@ -3090,7 +3245,6 @@ function createScreen(options = {}) {
 						apcOverflow = false;
 					}
 					parserState = "ground";
-					break;
 			}
 		}
 		flushPrintRun();
@@ -3129,22 +3283,39 @@ function createScreen(options = {}) {
 	* trailing blanks or one past the last cell) lands after the last emitted
 	* cell, advanced by the leftover distance, clamped to the row.
 	*/
+	/**
+	* One line attribute per LOGICAL line, taken from the line's FIRST physical
+	* row — the grouping `getLogicalLines` uses, so the two arrays line up.
+	* A rewrap then re-applies the attribute to every row the line becomes.
+	*/
+	function logicalLineAttrs(srcGrid, srcSoftWrapped, srcLineAttrs, srcRows) {
+		const out = [];
+		let starting = true;
+		for (let r = 0; r < srcRows; r++) {
+			if (!srcGrid[r]) continue;
+			if (starting) out.push(srcLineAttrs[r] ?? 0);
+			starting = !srcSoftWrapped[r];
+		}
+		return out;
+	}
 	function rewrapLines(logicalLines, newCols, track) {
 		const outRows = [];
 		const outWrapped = [];
+		const outLine = [];
 		let tracked = null;
 		for (let li = 0; li < logicalLines.length; li++) {
-			const line = logicalLines[li];
+			const line = itemAt(logicalLines, li, "reflow logical lines");
 			let lineLen = line.length;
 			while (lineLen > 0) {
-				const cell = line[lineLen - 1];
+				const cell = itemAt(line, lineLen - 1, "reflow logical-line cells");
 				if (cell.char === "" && !cell.wide) lineLen--;
 				else break;
 			}
 			if (lineLen === 0) {
 				outRows.push(makeRow(newCols));
 				outWrapped.push(false);
-				if (track !== void 0 && track.line === li) tracked = {
+				outLine.push(li);
+				if (track?.line === li) tracked = {
 					row: outRows.length - 1,
 					col: Math.min(track.offset, newCols - 1)
 				};
@@ -3155,9 +3326,9 @@ function createScreen(options = {}) {
 				const row = makeRow(newCols);
 				let col = 0;
 				while (col < newCols && pos < lineLen) {
-					const cell = line[pos];
+					const cell = itemAt(line, pos, "reflow logical-line cells");
 					if (cell.wide && col + 2 > newCols) break;
-					if (track !== void 0 && track.line === li && pos === track.offset) tracked = {
+					if (track?.line === li && pos === track.offset) tracked = {
 						row: outRows.length,
 						col
 					};
@@ -3168,7 +3339,8 @@ function createScreen(options = {}) {
 				const moreContent = pos < lineLen;
 				outRows.push(row);
 				outWrapped.push(moreContent);
-				if (!moreContent && track !== void 0 && track.line === li && tracked === null) {
+				outLine.push(li);
+				if (!moreContent && track?.line === li && tracked === null) {
 					const extra = track.offset - lineLen;
 					tracked = {
 						row: outRows.length - 1,
@@ -3180,6 +3352,7 @@ function createScreen(options = {}) {
 		return {
 			rows: outRows,
 			wrapped: outWrapped,
+			lineIndex: outLine,
 			tracked
 		};
 	}
@@ -3191,15 +3364,19 @@ function createScreen(options = {}) {
 	/**
 	* Trim trailing empty rows from reflowed result, so they don't push content off the top
 	* when we take the last newRows rows.
+	*
+	* Never trims the row the CURSOR is on. A shell that has just emitted its
+	* final newline sits on a blank last row, and dropping it makes the content
+	* measure one row shorter than it is — so a shrink banks one row too few and
+	* every surviving line lands one row low, taking the cursor with it.
 	*/
 	function trimTrailingEmptyRows(result) {
-		while (result.rows.length > 1) {
-			const lastRow = result.rows[result.rows.length - 1];
-			if (packedRowIsBlank(lastRow) && !result.wrapped[result.rows.length - 2]) {
-				result.rows.pop();
-				result.wrapped.pop();
-			} else break;
-		}
+		const floor = result.tracked == null ? 1 : Math.max(1, result.tracked.row + 1);
+		while (result.rows.length > floor) if (packedRowIsBlank(itemAt(result.rows, result.rows.length - 1, "reflow result rows")) && !result.wrapped[result.rows.length - 2]) {
+			result.rows.pop();
+			result.wrapped.pop();
+			result.lineIndex?.pop();
+		} else break;
 	}
 	function resize(newCols, newRows) {
 		if (newCols === cols && newRows === rows) return;
@@ -3213,23 +3390,56 @@ function createScreen(options = {}) {
 			line: cursorLineIdx,
 			offset: (cursorRowPre - cursorLineStart) * cols + curX
 		};
-		const mainResult = rewrapLines(getLogicalLines(mainGrid, mainSoftWrapped, rows), newCols, useAltScreen ? void 0 : cursorTrack);
+		let restoredRows = [];
+		let restoredWrapped = [];
+		let restoredAttrs = [];
+		if (!useAltScreen && newRows > rows && scrollback.length > 0) {
+			const probe = rewrapLines(getLogicalLines(mainGrid, mainSoftWrapped, rows), newCols, void 0);
+			trimTrailingEmptyRows(probe);
+			const take = Math.min(Math.max(0, newRows - probe.rows.length), scrollback.length);
+			if (take > 0) {
+				restoredRows = scrollback.splice(scrollback.length - take, take);
+				restoredWrapped = scrollbackSoftWrapped.splice(scrollbackSoftWrapped.length - take, take);
+				restoredAttrs = scrollbackLineAttrs.splice(scrollbackLineAttrs.length - take, take);
+			}
+		}
+		if (restoredRows.length > 0) {
+			let completed = 0;
+			for (const wrapped of restoredWrapped) if (!wrapped) completed++;
+			if (cursorTrack.line === 0 && restoredWrapped[restoredWrapped.length - 1] === true) for (let i = restoredWrapped.length - 1; i >= 0 && restoredWrapped[i]; i--) cursorTrack.offset += itemAt(restoredRows, i, "restored rows").length;
+			cursorTrack.line += completed;
+		}
+		const mainSrc = restoredRows.length > 0 ? [...restoredRows, ...mainGrid] : mainGrid;
+		const mainSrcWrapped = restoredRows.length > 0 ? [...restoredWrapped, ...mainSoftWrapped] : mainSoftWrapped;
+		const mainSrcAttrs = restoredRows.length > 0 ? [...restoredAttrs, ...mainLineAttrs] : mainLineAttrs;
+		const mainSrcRows = restoredRows.length + rows;
+		const mainLogicalAttrs = logicalLineAttrs(mainSrc, mainSrcWrapped, mainSrcAttrs, mainSrcRows);
+		const mainResult = rewrapLines(getLogicalLines(mainSrc, mainSrcWrapped, mainSrcRows), newCols, useAltScreen ? void 0 : cursorTrack);
 		trimTrailingEmptyRows(mainResult);
+		const altLogicalAttrs = logicalLineAttrs(altGrid, altSoftWrapped, altLineAttrs, rows);
 		const altResult = rewrapLines(getLogicalLines(altGrid, altSoftWrapped, rows), newCols, useAltScreen ? cursorTrack : void 0);
 		trimTrailingEmptyRows(altResult);
 		const newMain = makeGrid(newCols, newRows);
 		const newMainWrapped = new Array(newRows).fill(false);
+		const newMainAttrs = new Array(newRows).fill(0);
 		const mainStartRow = Math.max(0, mainResult.rows.length - newRows);
+		for (let r = 0; r < mainStartRow; r++) {
+			const overflow = mainResult.rows[r];
+			if (overflow !== void 0) bankScrollbackRow(overflow, mainResult.wrapped[r] ?? false, mainLogicalAttrs[mainResult.lineIndex[r] ?? 0] ?? 0);
+		}
 		for (let r = 0; r < newRows && mainStartRow + r < mainResult.rows.length; r++) {
-			newMain[r] = mainResult.rows[mainStartRow + r];
-			newMainWrapped[r] = mainResult.wrapped[mainStartRow + r];
+			newMain[r] = itemAt(mainResult.rows, mainStartRow + r, "resized main rows");
+			newMainWrapped[r] = itemAt(mainResult.wrapped, mainStartRow + r, "resized main wrap flags");
+			newMainAttrs[r] = mainLogicalAttrs[mainResult.lineIndex[mainStartRow + r] ?? 0] ?? 0;
 		}
 		const newAlt = makeGrid(newCols, newRows);
 		const newAltWrapped = new Array(newRows).fill(false);
+		const newAltAttrs = new Array(newRows).fill(0);
 		const altStartRow = Math.max(0, altResult.rows.length - newRows);
 		for (let r = 0; r < newRows && altStartRow + r < altResult.rows.length; r++) {
-			newAlt[r] = altResult.rows[altStartRow + r];
-			newAltWrapped[r] = altResult.wrapped[altStartRow + r];
+			newAlt[r] = itemAt(altResult.rows, altStartRow + r, "resized alternate rows");
+			newAltWrapped[r] = itemAt(altResult.wrapped, altStartRow + r, "resized alternate wrap flags");
+			newAltAttrs[r] = altLogicalAttrs[altResult.lineIndex[altStartRow + r] ?? 0] ?? 0;
 		}
 		const activeResult = useAltScreen ? altResult : mainResult;
 		const activeStartRow = useAltScreen ? altStartRow : mainStartRow;
@@ -3241,8 +3451,11 @@ function createScreen(options = {}) {
 		altGrid = newAlt;
 		mainSoftWrapped = newMainWrapped;
 		altSoftWrapped = newAltWrapped;
+		mainLineAttrs = newMainAttrs;
+		altLineAttrs = newAltAttrs;
 		grid = useAltScreen ? altGrid : mainGrid;
 		softWrapped = useAltScreen ? altSoftWrapped : mainSoftWrapped;
+		lineAttrs = useAltScreen ? altLineAttrs : mainLineAttrs;
 		const oldCols = cols;
 		cols = newCols;
 		rows = newRows;
@@ -3277,6 +3490,11 @@ function createScreen(options = {}) {
 			},
 			scrollback: cloneGridSnapshot(scrollback),
 			scrollbackSoftWrapped: [...scrollbackSoftWrapped],
+			lineAttrs: {
+				main: toSparseAttrs(mainLineAttrs),
+				alt: toSparseAttrs(altLineAttrs),
+				scrollback: toSparseAttrs(scrollbackLineAttrs)
+			},
 			cursor: {
 				x: curX,
 				y: curY,
@@ -3292,7 +3510,9 @@ function createScreen(options = {}) {
 				attrs: cloneAttrsSnapshot(savedState.attrs),
 				originMode: savedState.originMode,
 				autoWrap: savedState.autoWrap,
-				charsetG0: savedState.charsetG0
+				charsetG0: savedState.charsetG0,
+				charsetG1: savedState.charsetG1,
+				activeG1: savedState.activeG1
 			},
 			attrs: cloneAttrsSnapshot(attrs),
 			modes: {
@@ -3306,6 +3526,7 @@ function createScreen(options = {}) {
 				focusTracking,
 				origin: originMode,
 				insert: insertMode,
+				newLine: newLineMode,
 				reverseVideo,
 				syncOutput,
 				kittyKeyboardFlags,
@@ -3355,6 +3576,8 @@ function createScreen(options = {}) {
 			},
 			unicode: {
 				charsetG0,
+				charsetG1,
+				activeG1,
 				lastChar,
 				pendingRegionalIndicator,
 				afterZWJ
@@ -3372,9 +3595,13 @@ function createScreen(options = {}) {
 		scrollbackSoftWrapped = snapshotValue.scrollbackSoftWrapped ? [...snapshotValue.scrollbackSoftWrapped] : new Array(scrollback.length).fill(false);
 		mainSoftWrapped = [...snapshotValue.main.softWrapped];
 		altSoftWrapped = [...snapshotValue.alt.softWrapped];
+		mainLineAttrs = fromSparseAttrs(snapshotValue.lineAttrs?.main, mainSoftWrapped.length);
+		altLineAttrs = fromSparseAttrs(snapshotValue.lineAttrs?.alt, altSoftWrapped.length);
+		scrollbackLineAttrs = fromSparseAttrs(snapshotValue.lineAttrs?.scrollback, scrollback.length);
 		useAltScreen = snapshotValue.activeBuffer === "alt";
 		grid = useAltScreen ? altGrid : mainGrid;
 		softWrapped = useAltScreen ? altSoftWrapped : mainSoftWrapped;
+		lineAttrs = useAltScreen ? altLineAttrs : mainLineAttrs;
 		curX = snapshotValue.cursor.x;
 		curY = snapshotValue.cursor.y;
 		curVisible = snapshotValue.cursor.visible;
@@ -3388,7 +3615,9 @@ function createScreen(options = {}) {
 			attrs: cloneAttrsSnapshot(snapshotValue.savedState.attrs),
 			originMode: snapshotValue.savedState.originMode,
 			autoWrap: snapshotValue.savedState.autoWrap,
-			charsetG0: snapshotValue.savedState.charsetG0
+			charsetG0: snapshotValue.savedState.charsetG0,
+			charsetG1: snapshotValue.savedState.charsetG1 ?? false,
+			activeG1: snapshotValue.savedState.activeG1 ?? false
 		};
 		attrs = cloneAttrsSnapshot(snapshotValue.attrs);
 		bracketedPaste = snapshotValue.modes.bracketedPaste;
@@ -3401,6 +3630,7 @@ function createScreen(options = {}) {
 		focusTracking = snapshotValue.modes.focusTracking;
 		originMode = snapshotValue.modes.origin;
 		insertMode = snapshotValue.modes.insert;
+		newLineMode = snapshotValue.modes.newLine ?? false;
 		reverseVideo = snapshotValue.modes.reverseVideo;
 		syncOutput = snapshotValue.modes.syncOutput;
 		kittyKeyboardFlags = snapshotValue.modes.kittyKeyboardFlags;
@@ -3439,6 +3669,8 @@ function createScreen(options = {}) {
 		apcOverflow = snapshotValue.parser.apcOverflow ?? false;
 		utf8PendingBytes = [...snapshotValue.parser.utf8PendingBytes];
 		charsetG0 = snapshotValue.unicode.charsetG0;
+		charsetG1 = snapshotValue.unicode.charsetG1 ?? false;
+		activeG1 = snapshotValue.unicode.activeG1 ?? false;
 		lastChar = snapshotValue.unicode.lastChar;
 		pendingRegionalIndicator = snapshotValue.unicode.pendingRegionalIndicator;
 		afterZWJ = snapshotValue.unicode.afterZWJ;
@@ -3472,7 +3704,7 @@ function createScreen(options = {}) {
 	}
 	function getText() {
 		const lines = [];
-		for (let r = 0; r < rows; r++) lines.push(rowToString(grid[r]));
+		for (let r = 0; r < rows; r++) lines.push(rowToString(itemAt(grid, r, "screen text rows")));
 		return lines.join("\n");
 	}
 	function getScrollbackText() {
@@ -3491,7 +3723,7 @@ function createScreen(options = {}) {
 	}
 	function getRowAbsolute(row) {
 		if (row < 0 || row >= scrollback.length + rows) return makeRow(cols).toCells();
-		return (row < scrollback.length ? scrollback[row] : grid[row - scrollback.length]).toCells().map(stripCellColorIndex);
+		return (row < scrollback.length ? itemAt(scrollback, row, "scrollback rows") : itemAt(grid, row - scrollback.length, "screen rows")).toCells().map(stripCellColorIndex);
 	}
 	function firstRetainedRow() {
 		return trimmedRowCount;
@@ -3558,6 +3790,7 @@ function createScreen(options = {}) {
 			case "focusTracking": return focusTracking;
 			case "originMode": return originMode;
 			case "insertMode": return insertMode;
+			case "newLineMode": return newLineMode;
 			case "reverseVideo": return reverseVideo;
 			case "syncOutput": return syncOutput;
 			case "sgrMouse": return sgrMouse;
@@ -3637,6 +3870,7 @@ function createScreen(options = {}) {
 			focusTracking,
 			originMode,
 			insertMode,
+			newLineMode,
 			reverseVideo,
 			syncOutput,
 			leftRightMargin: leftRightMarginMode,
@@ -3647,7 +3881,7 @@ function createScreen(options = {}) {
 		};
 	}
 	function modesEq(a, b) {
-		return a.altScreen === b.altScreen && a.cursorVisible === b.cursorVisible && a.bracketedPaste === b.bracketedPaste && a.applicationCursor === b.applicationCursor && a.applicationKeypad === b.applicationKeypad && a.autoWrap === b.autoWrap && a.mouseTracking === b.mouseTracking && a.mouseTrackingMode === b.mouseTrackingMode && a.sgrMouse === b.sgrMouse && a.utf8Mouse === b.utf8Mouse && a.focusTracking === b.focusTracking && a.originMode === b.originMode && a.insertMode === b.insertMode && a.reverseVideo === b.reverseVideo && a.syncOutput === b.syncOutput && a.leftRightMargin === b.leftRightMargin && a.colorSchemeReporting === b.colorSchemeReporting && a.kittyKeyboard === b.kittyKeyboard && a.kittyGraphics === b.kittyGraphics && a.sixel === b.sixel;
+		return a.altScreen === b.altScreen && a.cursorVisible === b.cursorVisible && a.bracketedPaste === b.bracketedPaste && a.applicationCursor === b.applicationCursor && a.applicationKeypad === b.applicationKeypad && a.autoWrap === b.autoWrap && a.mouseTracking === b.mouseTracking && a.mouseTrackingMode === b.mouseTrackingMode && a.sgrMouse === b.sgrMouse && a.utf8Mouse === b.utf8Mouse && a.focusTracking === b.focusTracking && a.originMode === b.originMode && a.insertMode === b.insertMode && a.newLineMode === b.newLineMode && a.reverseVideo === b.reverseVideo && a.syncOutput === b.syncOutput && a.leftRightMargin === b.leftRightMargin && a.colorSchemeReporting === b.colorSchemeReporting && a.kittyKeyboard === b.kittyKeyboard && a.kittyGraphics === b.kittyGraphics && a.sixel === b.sixel;
 	}
 	const damageListeners = /* @__PURE__ */ new Set();
 	let damageLast = {
@@ -4059,7 +4293,7 @@ function serializeSnapshot(snapshot, options = {}) {
 		const wraps = snapshot.scrollbackSoftWrapped;
 		const last = snapshot.scrollback.length - 1;
 		for (let i = 0; i < snapshot.scrollback.length; i++) {
-			const row = snapshot.scrollback[i];
+			const row = itemAt(snapshot.scrollback, i, "snapshot scrollback rows");
 			if (wraps?.[i] === true && i < last) out.push(serializeEncodeRow(row, hyperlinks, snapshot.cols), "\x1B[0m");
 			else out.push(serializeEncodeRow(row, hyperlinks), "\x1B[0m\r\n");
 		}
@@ -4098,6 +4332,8 @@ function serializeSnapshot(snapshot, options = {}) {
 	out.push(m.autoWrap ? "\x1B[?7h" : "\x1B[?7l");
 	if (snapshot.cursor.shape !== "block" || !snapshot.cursor.blinking) out.push(`\x1b[${String(serializeCursorStyleCode(snapshot.cursor.shape, snapshot.cursor.blinking))} q`);
 	if (snapshot.unicode.charsetG0) out.push("\x1B(0");
+	if (snapshot.unicode.charsetG1) out.push("\x1B)0");
+	if (snapshot.unicode.activeG1) out.push("");
 	if (m.insert && !excluded.has("insert")) out.push("\x1B[4h");
 	if (!serializeTabStopsAreDefault(snapshot.tabStops, snapshot.cols)) {
 		out.push("\x1B[3g");
@@ -4112,10 +4348,12 @@ function serializeSnapshot(snapshot, options = {}) {
 	if (hyperlinks && snapshot.attrs.url !== null) out.push(`\x1b]8;;${snapshot.attrs.url}\x1b\\`);
 	out.push(snapshot.cursor.visible ? "\x1B[?25h" : "\x1B[?25l");
 	const origin = m.origin && !excluded.has("origin");
-	const inRegion = snapshot.cursor.y >= snapshot.margins.scrollTop && snapshot.cursor.y <= snapshot.margins.scrollBottom;
+	const originX = snapshot.margins.leftRight ? snapshot.margins.left : 0;
+	const limitX = snapshot.margins.leftRight ? snapshot.margins.right : snapshot.cols - 1;
+	const inRegion = snapshot.cursor.y >= snapshot.margins.scrollTop && snapshot.cursor.y <= snapshot.margins.scrollBottom && snapshot.cursor.x >= originX && snapshot.cursor.x <= limitX;
 	if (origin && inRegion) {
 		out.push("\x1B[?6h");
-		out.push(`\x1b[${String(snapshot.cursor.y - snapshot.margins.scrollTop + 1)};${String(snapshot.cursor.x + 1)}H`);
+		out.push(`\x1b[${String(snapshot.cursor.y - snapshot.margins.scrollTop + 1)};${String(snapshot.cursor.x - originX + 1)}H`);
 	} else {
 		out.push(`\x1b[${String(snapshot.cursor.y + 1)};${String(snapshot.cursor.x + 1)}H`);
 		if (origin) out.push("\x1B[?6h");
@@ -4138,6 +4376,7 @@ const F_BLINK = 128;
 const F_WIDE = 256;
 const UL_SHIFT = 9;
 const UL_MASK = 7;
+const F_PROTECTED = 65536;
 const UNDERLINE_STYLES = [
 	"none",
 	"single",
@@ -4368,6 +4607,7 @@ function createInterner() {
 		if (cell.inverse) flags |= F_INVERSE;
 		if (cell.hidden) flags |= F_HIDDEN;
 		if (cell.blink) flags |= F_BLINK;
+		if (cell.protected) flags |= F_PROTECTED;
 		if (cell.wide) flags |= F_WIDE;
 		flags |= ulIdx << UL_SHIFT;
 		const key = `${flags}|${fgRef}|${bgRef}|${ulRef}|${urlRef}`;
@@ -4536,6 +4776,7 @@ function makeCell(charIdx, styleIdx, strings, colors, styles) {
 		inverse: (style.flags & F_INVERSE) !== 0,
 		hidden: (style.flags & F_HIDDEN) !== 0,
 		blink: (style.flags & F_BLINK) !== 0,
+		protected: (style.flags & F_PROTECTED) !== 0,
 		wide: (style.flags & F_WIDE) !== 0,
 		url
 	};
@@ -4589,6 +4830,7 @@ function encodeScreenSnapshotBinary(snapshot) {
 		savedState: snapshot.savedState,
 		attrs: snapshot.attrs,
 		modes: snapshot.modes,
+		lineAttrs: snapshot.lineAttrs,
 		margins: snapshot.margins,
 		colors: snapshot.colors,
 		tabStops: snapshot.tabStops,
@@ -4656,6 +4898,7 @@ function decodeScreenSnapshotBinary(bytes) {
 		savedState: header.savedState,
 		attrs: header.attrs,
 		modes: header.modes,
+		lineAttrs: header.lineAttrs,
 		margins: header.margins,
 		colors: header.colors,
 		tabStops: header.tabStops,