fix(parser): WASM scratch layout and scan cache for chunked parse

Place parser state above the linked transition table so scans emit ops
correctly, and preserve or clear the WASM scan cache across nested and
reused parse buffers.

Co-authored-by: Cursor <cursoragent@cursor.com>

.agents/skills/benchmark/SKILL.md

@@ -25,4 +25,4 @@ When writing benchmark instructions:
 ## Notes
 
 - Benchmarks run from built JS in `out-test/benchmark/*.benchmark.js`.
-- Keep `NODE_PATH=./out` (handled by the npm script).
+- Benchmark sources import compiled modules from `../../out/common/` and `../../out/browser/` (run `npm run build` first).

.github/workflows/ci.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v3
     - name: Use Node.js 22.x
-      uses: actions/setup-node@v5
+      uses: actions/setup-node@v3
       with:
         node-version: 22.x
         cache: 'npm'
@@ -69,7 +69,7 @@ jobs:
           ./addons/addon-webgl/out/* \
           ./addons/addon-webgl/out-*st/*
     - name: Upload artifacts
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v4
       with:
         name: build-artifacts
         path: compressed-build.zip
@@ -79,9 +79,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v3
     - name: Use Node.js 22.x
-      uses: actions/setup-node@v5
+      uses: actions/setup-node@v3
       with:
         node-version: 22.x
         cache: 'npm'
@@ -100,16 +100,16 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v3
     - name: Use Node.js 22.x
-      uses: actions/setup-node@v5
+      uses: actions/setup-node@v3
       with:
         node-version: 22.x
         cache: 'npm'
     - name: Install dependencies
       run: |
         npm ci
-    - uses: actions/download-artifact@v7
+    - uses: actions/download-artifact@v4
       with:
         name: build-artifacts
     - name: Unzip artifacts
@@ -129,7 +129,6 @@ jobs:
         exit $EXIT_CODE
 
   test-unit:
-    needs: build
     timeout-minutes: 20
     strategy:
       matrix:
@@ -137,16 +136,21 @@ jobs:
         runs-on: [ubuntu, macos, windows]
     runs-on: ${{ matrix.runs-on }}-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v3
     - name: Use Node.js ${{ matrix.node-version }}.x
-      uses: actions/setup-node@v5
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}.x
         cache: 'npm'
     - name: Install dependencies
       run: |
         npm ci
-    - uses: actions/download-artifact@v7
+    - name: Wait for build job
+      uses: NathanFirmo/wait-for-other-job@v1.1.1
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        job: build
+    - uses: actions/download-artifact@v4
       with:
         name: build-artifacts
     - name: Unzip artifacts
@@ -162,7 +166,6 @@ jobs:
       run: npm run test-unit --forbid-only
 
   test-integration:
-    needs: build
     timeout-minutes: 20
     strategy:
       matrix:
@@ -171,9 +174,9 @@ jobs:
         browser: [chromium, firefox, webkit]
     runs-on: ${{ matrix.runs-on }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v3
     - name: Use Node.js ${{ matrix.node-version }}.x
-      uses: actions/setup-node@v5
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}.x
         cache: 'npm'
@@ -182,7 +185,12 @@ jobs:
         npm ci
     - name: Install playwright
       run: npx playwright install --with-deps ${{ matrix.browser }}
-    - uses: actions/download-artifact@v7
+    - name: Wait for build job
+      uses: NathanFirmo/wait-for-other-job@v1.1.1
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        job: build
+    - uses: actions/download-artifact@v4
       with:
         name: build-artifacts
     - name: Unzip artifacts
@@ -232,9 +240,9 @@ jobs:
       matrix:
         node-version: [22]
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v3
     - name: Use Node.js ${{ matrix.node-version }}.x
-      uses: actions/setup-node@v5
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}.x
         cache: 'npm'
@@ -243,7 +251,7 @@ jobs:
         npm ci
     - name: Install playwright
       run: npx playwright install
-    - uses: actions/download-artifact@v7
+    - uses: actions/download-artifact@v4
       with:
         name: build-artifacts
     - name: Unzip artifacts

.github/workflows/codeql-analysis.yml

@@ -24,12 +24,12 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v3
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v4
+      uses: github/codeql-action/autobuild@v2
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v4
+      uses: github/codeql-action/analyze@v2

.github/workflows/copilot-setup-steps.yml

@@ -18,9 +18,9 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Use Node.js 22.x
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v3
         with:
           node-version: 22.x
           cache: 'npm'

.github/workflows/release.yml

@@ -10,9 +10,9 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v3
     - name: Use Node.js 22.x
-      uses: actions/setup-node@v5
+      uses: actions/setup-node@v3
       with:
         node-version: 22.x
         cache: 'npm'

.oxlintrc.json

@@ -1,7 +1,6 @@
 {
   "$schema": "./node_modules/oxlint/configuration_schema.json",
   "plugins": [
-    "import",
     "typescript"
   ],
   "categories": {
@@ -105,8 +104,7 @@
     "typescript/no-wrapper-object-types": "error",
     "typescript/prefer-as-const": "error",
     "typescript/prefer-namespace-keyword": "error",
-    "typescript/triple-slash-reference": "error",
-    "import/no-cycle": "error"
+    "typescript/triple-slash-reference": "error"
   },
   "overrides": [
     {

CONTRIBUTING.md

@@ -39,7 +39,7 @@ The preferred way to report bugs or request features is to use
 
 It's pretty common for maintainers of large open source projects to suffer from burnout, especially when needing to triage a large number of incoming issues instead of actually building things. Here are some of the steps we take to try mitigate this:
 
-- Support questions live in [GH discussions](https://github.com/xtermjs/xterm.js/discussions), issues may be transferred there without further comment and core maintainers may or may not participate in discussions.
+- Support questions live in [GH discussions](https://github.com/xtermjs/xterm.js/discussions), issues may be transfered there without further comment and core maintainers may or may not participate in discussions.
 - Issues are strictly for well defined features or bugs that are _actionable_.
 - Sometimes features are out of scope. A common example of this is a niche feature that the pricipal implementation ([VS Code](https://code.visualstudio.com/)) won't leverage and therefore would be difficult to maintain and likely suffer from bitrot. The reporter may not agree with this, but you could always create an addon if that works or maintain your own fork if it comes to that.
 - If a feature does not have a clear way forward or needs more discussion it may be closed ro moved to a discussion.

README.md

@@ -254,7 +254,6 @@ Xterm.js is used in many world-class applications to provide great terminal expe
 - [**WooTTY**](https://github.com/icoretech/wootty): Flawless browser terminal for real operators.
 - [**Orca**](https://github.com/stablyai/orca): Agentic development environment for 100x builders.
 - [**4bit**](https://ciembor.github.io/4bit): Terminal Color Scheme Designer.
-- [**Cate**](https://github.com/0-AI-UG/cate): Open source desktop IDE on an infinite zoomable canvas. Editor, browser, and terminal panels float in spatial space; the terminals are xterm.js with the WebGL addon, backed by node-pty.
 - [And much more...](https://github.com/xtermjs/xterm.js/network/dependents?package_id=UGFja2FnZS0xNjYzMjc4OQ%3D%3D)
 
 Do you use xterm.js in your application as well? Please [open a Pull Request](https://github.com/sourcelair/xterm.js/pulls) to include it here. We would love to have it on our list. Please add any new contributions to the end of the list.

addons/addon-attach/test/AttachAddon.test.ts

@@ -15,7 +15,7 @@ test.beforeAll(async ({ browser }) => {
 });
 test.afterAll(async () => await ctx.page.close());
 
-test.describe('AttachAddon', () => {
+test.describe('Search Tests', () => {
 
   test.beforeEach(async () => {
     await ctx.proxy.reset();

addons/addon-clipboard/src/ClipboardAddon.ts

@@ -78,43 +78,13 @@ export class BrowserClipboardProvider implements IClipboardProvider {
   }
 }
 
-/**
- * TODO: Once the base64 handling on Uint8Arrays is more common,
- * remove the btoa/atob fallbacks below.
- */
-interface IUint8ArrayB64 extends Uint8Array {
-  toBase64(): string;
-}
-interface IUint8ArrayB64Ctor extends Uint8ArrayConstructor {
-  fromBase64(s: string): IUint8ArrayB64;
-}
-
 export class Base64 implements IBase64 {
   public encodeText(data: string): string {
-    const bytes = new TextEncoder().encode(data) as IUint8ArrayB64;
-    if (bytes.toBase64 !== undefined) {
-      return bytes.toBase64();
-    }
-    let bin = '';
-    for (let i = 0; i < bytes.length; i++) {
-      bin += String.fromCharCode(bytes[i]);
-    }
-    return btoa(bin);
+    return btoa(data);
   }
   public decodeText(data: string): string {
-    if ((Uint8Array as IUint8ArrayB64Ctor).fromBase64 !== undefined) {
-      try {
-        return new TextDecoder().decode((Uint8Array as IUint8ArrayB64Ctor).fromBase64(data));
-      } catch {}
-      return '';
-    }
     try {
-      const bin = atob(data);
-      const bytes = new Uint8Array(bin.length);
-      for (let i = 0; i < bin.length; ++i) {
-        bytes[i] = bin.charCodeAt(i);
-      }
-      return new TextDecoder().decode(bytes);
+      return atob(data);
     } catch {}
     return '';
   }

addons/addon-clipboard/test/ClipboardAddon.test.ts

@@ -29,7 +29,7 @@ test.describe('ClipboardAddon', () => {
       await ctx.page.context().grantPermissions(['clipboard-read', 'clipboard-write']);
     }
     await ctx.page.evaluate(`
-      window.term.reset();
+      window.term.reset()
       window.clipboard?.dispose();
       window.clipboard = new ClipboardAddon();
       window.term.loadAddon(window.clipboard);
@@ -92,22 +92,4 @@ test.describe('ClipboardAddon', () => {
       deepEqual(await ctx.page.evaluate(() => window.navigator.clipboard.readText()), '');
     });
   });
-
-  test.describe('non-ASCII', () => {
-    const testDataEncoded = '4oKsbWzDpMO8dMOf';
-    const testDataDecoded = '€mläütß';
-    test('write simple string', async () => {
-      await ctx.proxy.write(`\x1b]52;c;${testDataEncoded}\x07`);
-      deepEqual(await ctx.page.evaluate(() => window.navigator.clipboard.readText()), testDataDecoded);
-    });
-    test('read simple string', async () => {
-      await ctx.page.evaluate(`
-        window.data2 = [];
-        window.term.onData(e => data2.push(e));
-      `);
-      await ctx.page.evaluate((d) => window.navigator.clipboard.writeText(d), testDataDecoded);
-      await ctx.proxy.write(`\x1b]52;c;?\x07`);
-      deepEqual(await ctx.page.evaluate('window.data2'), [`\x1b]52;c;${testDataEncoded}\x07`]);
-    });
-  });
 });

addons/addon-clipboard/typings/addon-clipboard.d.ts

@@ -82,7 +82,7 @@ declare module '@xterm/addon-clipboard' {
   /**
    * The clipboard provider interface that enables xterm.js to access the browser clipboard.
    *
-   * Note that this clipboard provider does not implement own cut buffers as xterm does,
+   * Note this this clipboard provider does not implement own cut buffers as xterm does,
    * but redirect the selection parameter always to navigator.clipboard.
    */
   export class BrowserClipboardProvider implements IClipboardProvider{

addons/addon-fit/src/FitAddon.ts

@@ -74,14 +74,14 @@ export class FitAddon implements ITerminalAddon, IFitApi {
       : (this._terminal.options.scrollbar?.width ?? ViewportConstants.DEFAULT_SCROLL_BAR_WIDTH));
 
     const parentElementStyle = _getComputedStyle(this._terminal.element.parentElement);
-    const parentElementHeight = Math.max(0, parseInt(parentElementStyle.getPropertyValue('height'), 10) || 0);
-    const parentElementWidth = Math.max(0, parseInt(parentElementStyle.getPropertyValue('width'), 10) || 0);
+    const parentElementHeight = parseInt(parentElementStyle.getPropertyValue('height'));
+    const parentElementWidth = Math.max(0, parseInt(parentElementStyle.getPropertyValue('width')));
     const elementStyle = _getComputedStyle(this._terminal.element);
     const elementPadding = {
-      top: parseInt(elementStyle.getPropertyValue('padding-top'), 10) || 0,
-      bottom: parseInt(elementStyle.getPropertyValue('padding-bottom'), 10) || 0,
-      right: parseInt(elementStyle.getPropertyValue('padding-right'), 10) || 0,
-      left: parseInt(elementStyle.getPropertyValue('padding-left'), 10) || 0
+      top: parseInt(elementStyle.getPropertyValue('padding-top')),
+      bottom: parseInt(elementStyle.getPropertyValue('padding-bottom')),
+      right: parseInt(elementStyle.getPropertyValue('padding-right')),
+      left: parseInt(elementStyle.getPropertyValue('padding-left'))
     };
     const elementPaddingVer = elementPadding.top + elementPadding.bottom;
     const elementPaddingHor = elementPadding.right + elementPadding.left;

addons/addon-image/README.md

@@ -90,7 +90,7 @@ terminal.loadAddon(imageAddon);
   therefore palette animations cannot be used.
 
 - **SIXEL Raster Attributes Handling**  
-  If raster attributes were found in the SIXEL data (level 2), the image will always be truncated to the given height/width extent. We deviate here from the specification on purpose, as it allows several processing optimizations. For level 1 SIXEL data without any raster attributes the image can freely grow in width and height up to the last data byte, which has a much higher processing penalty. In general encoding libraries should not create level 1 data anymore and should not produce pixel information beyond the announced height/width extent. Both is discouraged by the >30 years old specification.
+  If raster attributes were found in the SIXEL data (level 2), the image will always be truncated to the given height/width extend. We deviate here from the specification on purpose, as it allows several processing optimizations. For level 1 SIXEL data without any raster attributes the image can freely grow in width and height up to the last data byte, which has a much higher processing penalty. In general encoding libraries should not create level 1 data anymore and should not produce pixel information beyond the announced height/width extend. Both is discouraged by the >30 years old specification.
 
   Currently the SIXEL implementation of the addon does not take custom pixel sizes into account, a SIXEL pixel will map 1:1 to a screen pixel.
 
@@ -149,9 +149,9 @@ The addon provides the following API endpoints to retrieve raw image data as can
 
 ### Memory Usage
 
-The addon does most image processing in JavaScript and therefore can occupy a rather big amount of memory. To get an idea where the memory gets eaten, let's look at the data flow and processing steps:
-- Incoming image data chunk at `term.write` (terminal)  
-  `term.write` might stack up incoming chunks. To circumvent this, you will need proper flow control (see xterm.js docs). Note that with image output it is more likely to run into this issue, as it can create lots of MBs in very short time.
+The addon does most image processing in Javascript and therefore can occupy a rather big amount of memory. To get an idea where the memory gets eaten, lets look at the data flow and processing steps:
+- Incomming image data chunk at `term.write` (terminal)  
+  `term.write` might stock up incoming chunks. To circumvent this, you will need proper flow control (see xterm.js docs). Note that with image output it is more likely to run into this issue, as it can create lots of MBs in very short time.
 - Sequence Parser (terminal)  
   The parser operates on a buffer containing up to 2^17 codepoints (~0.5 MB).
 - Sequence Handler - Chunk Decoding (addon)  
@@ -177,18 +177,18 @@ const totalActive = storageBytes + decodingBytes;
 ```
 
 Note that browsers have offloading tricks for rarely touched memory segments, esp. `storageBytes` might not directly translate into real memory usage. Usage peaks will happen during active decoding of multiple big images due to the need of 2 full pixel buffers at the same time, which cannot be offloaded. Thus you may want to keep an eye on `pixelLimit` under limited memory conditions.  
-Further note that the formulas above do not respect the JavaScript object's overhead. Compared to the raw buffer needs the bookkeeping by these objects is rather small (<<5%).
+Further note that the formulas above do not respect the Javascript object's overhead. Compared to the raw buffer needs the book keeping by these objects is rather small (<<5%).
 
 _Why should I care about memory usage at all?_  
-Well you don't have to, and it probably will just work fine with the addon defaults. But for bigger integrations, where much more data is held in the JavaScript context (like multiple terminals on one page), it is likely to hit the engine's memory limit sooner or later under decoding and/or storage pressure.
+Well you don't have to, and it probably will just work fine with the addon defaults. But for bigger integrations, where much more data is held in the Javascript context (like multiple terminals on one page), it is likely to hit the engine's memory limit sooner or later under decoding and/or storage pressure.
 
 _How can I adjust the memory usage?_  
 - `pixelLimit`  
-  A constructor setting, thus you would have to anticipate, whether (multiple) terminals in your page gonna do lots of concurrent decoding. Since this is normally not the case and the memory usage only peaks temporarily, a rather high value should work even with multiple terminals in one page.
+  A constructor setting, thus you would have to anticipate, whether (multiple) terminals in your page gonna do lots of concurrent decoding. Since this is normally not the case and the memory usage is only temporarily peaking, a rather high value should work even with multiple terminals in one page.
 - `storageLimit`  
-  A constructor and a runtime setting. In conjunction with `storageUsage` you can do runtime checks and adjust the limit to your needs. If you have to lower the limit below the current usage, images will be removed in FIFO order and may turn into a placeholder in the terminal's scrollback (if `showPlaceholder` is set). When adjusting keep in mind to leave enough room for peak memory use during decoding.
+  A constructor and a runtime setting. In conjunction with `storageUsage` you can do runtime checks and adjust the limit to your needs. If you have to lower the limit below the current usage, images will be removed in FIFO order and may turn into a placeholder in the terminal's scrollback (if `showPlaceholder` is set). When adjusting keep in mind to leave enough room for memory peaking for decoding.
 - `sixelSizeLimit | iipSizeLimit | kittySizeLimit`  
-  Constructor settings. This has only a small impact on peak memory during decoding. It is meant to avoid processing of overly big or broken image sequences at an earlier phase, thus may stop the invoked decoders from entering memory intensive tasks for potentially invalid data.
+  Constructor settings. This has only a small impact on peaking memory during decoding. It is meant to avoid processing of overly big or broken image sequences at an earlier phase, thus may stop the invoked decoders from entering memory intensive tasks for potentially invalid data.
 
 
 ### Terminal Interaction

addons/addon-image/src/IIPHandler.ts

@@ -222,8 +222,8 @@ export class IIPHandler implements IOscHandler, IResetHandler {
 
   private _dim(s: string, total: number, cdim: number): number {
     if (s === 'auto') return 0;
-    if (s.endsWith('%')) return parseInt(s.slice(0, -1), 10) * total / 100;
-    if (s.endsWith('px')) return parseInt(s.slice(0, -2), 10);
-    return parseInt(s, 10) * cdim;
+    if (s.endsWith('%')) return parseInt(s.slice(0, -1)) * total / 100;
+    if (s.endsWith('px')) return parseInt(s.slice(0, -2));
+    return parseInt(s) * cdim;
   }
 }

addons/addon-image/src/Types.ts

@@ -9,8 +9,7 @@ import { IDisposable, IMarker, Terminal } from '@xterm/xterm';
 import { Attributes, BgFlags, Content, ExtFlags, UnderlineStyle } from 'common/buffer/Constants';
 import type { AttributeData } from 'common/buffer/AttributeData';
 import type { IParams, IDcsHandler, IOscHandler, IApcHandler, IEscapeSequenceParser } from 'common/parser/Types';
-import type { IInputHandler } from 'common/Types';
-import type { IBufferLine, IExtendedAttrs } from 'common/buffer/Types';
+import type { IBufferLine, IExtendedAttrs, IInputHandler } from 'common/Types';
 import type { ITerminal, ReadonlyColorSet } from 'browser/Types';
 import type { IRenderDimensions } from 'browser/renderer/shared/Types';
 import type { ICoreBrowserService, IRenderService, IThemeService } from 'browser/services/Services';

addons/addon-image/src/kitty/KittyGraphicsTypes.ts

@@ -168,7 +168,7 @@ export function parseKittyCommand(data: string): IKittyCommand {
       cmd.deleteSelector = value;
       continue;
     }
-    const numValue = parseInt(value, 10);
+    const numValue = parseInt(value);
     switch (key) {
       case KittyKey.FORMAT: cmd.format = numValue; break;
       case KittyKey.ID: cmd.id = numValue; break;

addons/addon-ligatures/src/index.ts

@@ -21,7 +21,7 @@ const CACHE_SIZE = 100000;
 
 /**
  * Enable ligature support for the provided Terminal instance. To function
- * properly, this must be called after `open()` is called on the terminal. If
+ * properly, this must be called after `open()` is called on the therminal. If
  * the font currently in use supports ligatures, the terminal will automatically
  * start to render them.
  * @param term Terminal instance from xterm.js

addons/addon-search/src/DecorationManager.test.ts

@@ -1,81 +0,0 @@
-/**
- * Copyright (c) 2026 The xterm.js authors. All rights reserved.
- * @license MIT
- */
-
-import { assert } from 'chai';
-import { DecorationManager } from './DecorationManager';
-import { SearchEngine } from './SearchEngine';
-import { SearchLineCache } from './SearchLineCache';
-import { Terminal } from 'browser/public/Terminal';
-import type { ISearchDecorationOptions } from '@xterm/addon-search';
-import type { IDecorationOptions } from '@xterm/xterm';
-import { DisposableStore } from 'common/Lifecycle';
-
-function writeP(terminal: Terminal, data: string): Promise<void> {
-  return new Promise(r => terminal.write(data, r));
-}
-
-describe('DecorationManager', () => {
-  let store: DisposableStore;
-  let terminal: Terminal;
-  let decorationManager: DecorationManager;
-
-  beforeEach(() => {
-    store = new DisposableStore();
-    terminal = store.add(new Terminal({ cols: 10, rows: 5 }));
-    decorationManager = store.add(new DecorationManager(terminal));
-  });
-
-  it('should split highlight decorations for a wrapped match', async () => {
-    await writeP(terminal, '0123456789abcde');
-    const searchEngine = new SearchEngine(terminal, store.add(new SearchLineCache(terminal)));
-    const match = searchEngine.find('9abc', 0, 0);
-    assert.ok(match);
-
-    const decorationOptions: IDecorationOptions[] = [];
-    const registerDecoration = terminal.registerDecoration.bind(terminal);
-    terminal.registerDecoration = (options: IDecorationOptions) => {
-      decorationOptions.push(options);
-      return registerDecoration(options);
-    };
-
-    const options: ISearchDecorationOptions = {
-      matchOverviewRuler: '#ff0000',
-      activeMatchColorOverviewRuler: '#00ff00'
-    };
-    decorationManager.createHighlightDecorations([match], options);
-
-    assert.strictEqual(decorationOptions.length, 2);
-    assert.strictEqual(decorationOptions[0].x, 9);
-    assert.strictEqual(decorationOptions[0].width, 1);
-    assert.strictEqual(decorationOptions[1].x, 0);
-    assert.strictEqual(decorationOptions[1].width, 3);
-
-    const withOverviewRuler = decorationOptions.filter(o => o.overviewRulerOptions !== undefined);
-    assert.strictEqual(withOverviewRuler.length, 2);
-  });
-
-  it('should only add one overview ruler marker per buffer line', async () => {
-    await writeP(terminal, 'abcdefghij');
-    const decorationOptions: IDecorationOptions[] = [];
-    const registerDecoration = terminal.registerDecoration.bind(terminal);
-    terminal.registerDecoration = (options: IDecorationOptions) => {
-      decorationOptions.push(options);
-      return registerDecoration(options);
-    };
-
-    const options: ISearchDecorationOptions = {
-      matchOverviewRuler: '#ff0000',
-      activeMatchColorOverviewRuler: '#00ff00'
-    };
-    decorationManager.createHighlightDecorations([
-      { term: 'a', col: 0, row: 0, size: 1 },
-      { term: 'f', col: 5, row: 0, size: 1 }
-    ], options);
-
-    const withOverviewRuler = decorationOptions.filter(o => o.overviewRulerOptions !== undefined);
-    assert.strictEqual(withOverviewRuler.length, 1);
-    assert.strictEqual(withOverviewRuler[0].x, 0);
-  });
-});

addons/addon-search/src/SearchAddon.ts

@@ -142,14 +142,12 @@ export class SearchAddon extends Disposable implements ITerminalAddon, ISearchAp
       }
       prevResult = result;
       results.push(prevResult);
-      const cols = this._terminal.cols;
-      let nextCol = prevResult.col + prevResult.size;
-      let nextRow = prevResult.row;
-      if (nextCol >= cols) {
-        nextRow += Math.floor(nextCol / cols);
-        nextCol = nextCol % cols;
-      }
-      result = this._engine.find(term, nextRow, nextCol, searchOptions);
+      result = this._engine.find(
+        term,
+        prevResult.col + prevResult.term.length >= this._terminal.cols ? prevResult.row + 1 : prevResult.row,
+        prevResult.col + prevResult.term.length >= this._terminal.cols ? 0 : prevResult.col + 1,
+        searchOptions
+      );
     }
 
     this._resultTracker.updateResults(results, this._highlightLimit);

addons/addon-search/src/SearchEngine.ts

@@ -60,7 +60,7 @@ export class SearchEngine {
       this._terminal.clearSelection();
       return undefined;
     }
-    if (startCol >= this._terminal.cols) {
+    if (startCol > this._terminal.cols) {
       throw new Error(`Invalid col: ${startCol} to search in terminal of ${this._terminal.cols} cols`);
     }
 

addons/addon-search/test/SearchAddon.test.ts

@@ -414,24 +414,10 @@ test.describe('Search Tests', () => {
   });
 
   test.describe('Regression tests', () => {
-    test('should advance highlight-all scan by buffer match size for wide characters', async () => {
-      await ctx.page.evaluate(`
-        window.calls = [];
-        window.search.onDidChangeResults(e => window.calls.push(e));
-      `);
-      await ctx.proxy.resize(3, 5);
-      await ctx.proxy.write('𝄞𝄞𝄞');
-      strictEqual(await ctx.page.evaluate(`window.search.findNext('𝄞', { decorations: { activeMatchColorOverviewRuler: '#ff0000', matchOverviewRuler: '#ffff00' } })`), true);
-      deepStrictEqual(await ctx.page.evaluate('window.calls'), [
-        { resultCount: 3, resultIndex: 0 }
-      ]);
-      await ctx.proxy.resize(80, 24);
-    });
-
     test.describe('#2444 wrapped line content not being found', () => {
       let fixture: string;
       test.beforeAll(async () => {
-        fixture = (await new Promise<Buffer>((res, rej) => readFile(resolve(__dirname, '../fixtures/issue-2444'), (err, data) => err ? rej(err) : res(data)))).toString();
+        fixture = (await new Promise<Buffer>(r => readFile(resolve(__dirname, '../fixtures/issue-2444'), (err, data) => r(data)))).toString();
         if (process.platform !== 'win32') {
           fixture = fixture.replace(/\n/g, '\n\r');
         }
@@ -515,7 +501,7 @@ test.describe('Search Tests', () => {
         window.search.onDidChangeResults(e => window.calls.push(e));
       `);
       // Move cursor forward 1 time to create a null character, as opposed to regular whitespace
-      await ctx.proxy.write('\x1b[CHi Hi');
+      await ctx.proxy.write('\\x1b[CHi Hi');
       strictEqual(await ctx.page.evaluate(`window.search.findPrevious('h', { decorations: { activeMatchColorOverviewRuler: '#ff0000' } })`), true);
       deepStrictEqual(await ctx.page.evaluate('window.calls'), [
         { resultCount: 2, resultIndex: 1 }

addons/addon-serialize/src/SerializeAddon.ts

@@ -7,8 +7,7 @@
 
 import type { IBuffer, IBufferCell, IBufferRange, ITerminalAddon, Terminal } from '@xterm/xterm';
 import type { IHTMLSerializeOptions, SerializeAddon as ISerializeApi, ISerializeOptions, ISerializeRange } from '@xterm/addon-serialize';
-import { IColor } from 'common/Types';
-import { IAttributeData } from 'common/buffer/Types';
+import { IAttributeData, IColor } from 'common/Types';
 import { DEFAULT_ANSI_COLORS } from 'browser/Types';
 import { UnderlineStyle } from 'common/buffer/Constants';
 
@@ -173,7 +172,7 @@ class StringSerializeHandler extends BaseSerializeHandler {
   private _thisRowLastSecondChar: IBufferCell = this._buffer.getNullCell();
   private _nextRowFirstChar: IBufferCell = this._buffer.getNullCell();
   protected _rowEnd(row: number, isLastRow: boolean): void {
-    // if there is colorful empty cell at line end, we must pad it back, or the color block
+    // if there is colorful empty cell at line end, whe must pad it back, or the the color block
     // will missing
     if (this._nullCellCount > 0 && !equalBg(this._cursorStyle, this._backgroundCell)) {
       // use clear right to set background.
@@ -221,7 +220,7 @@ class StringSerializeHandler extends BaseSerializeHandler {
             // you can't use control sequence to move cursor to (x === row)
             (thisRowLastChar.getChars() || thisRowLastChar.getWidth() === 0) &&
             // change background of the first wrapped cell also affects BCE
-            // so we mark it as invalid to simplify the process to determine line separator
+            // so we mark it as invalid to simply the process to determine line separator
             equalBg(thisRowLastChar, nextRowFirstChar)
           ) {
             isValid = true;
@@ -233,7 +232,7 @@ class StringSerializeHandler extends BaseSerializeHandler {
             isNextRowFirstCharDoubleWidth &&
             (thisRowLastSecondChar.getChars() || thisRowLastSecondChar.getWidth() === 0) &&
             // change background of the first wrapped cell also affects BCE
-            // so we mark it as invalid to simplify the process to determine line separator
+            // so we mark it as invalid to simply the process to determine line separator
             equalBg(thisRowLastChar, nextRowFirstChar) &&
             equalBg(thisRowLastSecondChar, nextRowFirstChar)
           ) {

addons/addon-serialize/test/SerializeAddon.test.ts

@@ -192,7 +192,7 @@ test.describe('SerializeAddon', () => {
     const cols = 10;
     const line = '+'.repeat(cols);
     const lines: string[] = [
-      sgr(FG_P16_GREEN) + line,  // Workaround: If we clear all flags at the end, serialize will use \x1b[0m to clear instead of the specific disable sequence
+      sgr(FG_P16_GREEN) + line,  // Workaround: If we clear all flags a the end, serialize will use \x1b[0m to clear instead of the sepcific disable sequence
       sgr(INVERSE) + line,
       sgr(BOLD) + line,
       sgr(UNDERLINED) + line,

addons/addon-unicode-graphemes/src/UnicodeGraphemesAddon.ts

@@ -2,7 +2,7 @@
  * Copyright (c) 2023 The xterm.js authors. All rights reserved.
  * @license MIT
  *
- * UnicodeVersionProvider for V15 with grapheme cluster handling.
+ * UnicodeVersionProvider for V15 with grapeme cluster handleing.
  */
 
 import type { Terminal, ITerminalAddon, IUnicodeHandling } from '@xterm/xterm';

addons/addon-web-links/src/WebLinkProvider.ts

@@ -57,8 +57,7 @@ function isUrl(urlString: string): boolean {
 
 export class LinkComputer {
   public static computeLink(y: number, regex: RegExp, terminal: Terminal, activate: (event: MouseEvent, uri: string) => void): ILink[] {
-    const flags = regex.flags.includes('g') ? regex.flags : `${regex.flags}g`;
-    const rex = new RegExp(regex.source, flags);
+    const rex = new RegExp(regex.source, (regex.flags || '') + 'g');
 
     const [lines, startLineIndex] = LinkComputer._getWindowedLineStrings(y - 1, terminal);
     const line = lines.join('');

addons/addon-web-links/src/WebLinksAddon.ts

@@ -7,13 +7,13 @@ import type { Terminal, ITerminalAddon, IDisposable } from '@xterm/xterm';
 import type { WebLinksAddon as IWebLinksApi } from '@xterm/addon-web-links';
 import { ILinkProviderOptions, WebLinkProvider } from './WebLinkProvider';
 
-// consider everything starting with http:// or https://
+// consider everthing starting with http:// or https://
 // up to first whitespace, `"` or `'` as url
 // NOTE: The repeated end clause is needed to not match a dangling `:`
 // resembling the old (...)*([^:"\'\\s]) final path clause
 // additionally exclude early + final:
 // - unsafe from rfc3986: !*'()
-// - unsafe chars from rfc1738: {}|\^~[]` (minus [] for ipv6 addresses, also allow ~)
+// - unsafe chars from rfc1738: {}|\^~[]` (minus [] as we need them for ipv6 adresses, also allow ~)
 // also exclude as finals:
 // - final interpunction like ,.!?
 // - any sort of brackets <>()[]{} (not spec conform, but often used to enclose urls)

addons/addon-webgl/README.md

@@ -23,7 +23,7 @@ See the full [API](https://github.com/xtermjs/xterm.js/blob/master/addons/addon-
 
 ### Handling Context Loss
 
-The browser may drop WebGL contexts for various reasons like OOM or after the system has been suspended. There is an API exposed that fires the `webglcontextlost` event on the canvas so embedders can handle it however they wish. An easy, but suboptimal way, to handle this is by disposing of WebglAddon when the event fires:
+The browser may drop WebGL contexts for various reasons like OOM or after the system has been suspended. There is an API exposed that fires the `webglcontextlost` event fired on the canvas so embedders can handle it however they wish. An easy, but suboptimal way, to handle this is by disposing of WebglAddon when the event fires:
 
 ```ts
 const terminal = new Terminal();

addons/addon-webgl/src/CellColorResolver.ts

@@ -3,7 +3,7 @@ import { ICoreBrowserService, IThemeService } from 'browser/services/Services';
 import { ReadonlyColorSet } from 'browser/Types';
 import { Attributes, BgFlags, ExtFlags, FgFlags, NULL_CELL_CODE, UnderlineStyle } from 'common/buffer/Constants';
 import { IDecorationService, IOptionsService } from 'common/services/Services';
-import { ICellData } from 'common/buffer/Types';
+import { ICellData } from 'common/Types';
 import { Terminal } from '@xterm/xterm';
 import { rgba } from 'common/Color';
 import { treatGlyphAsBackgroundColor } from 'browser/renderer/shared/RendererUtils';

addons/addon-webgl/src/GlyphRenderer.ts

@@ -100,8 +100,6 @@ export class GlyphRenderer extends Disposable {
   private readonly _attributesBuffer: WebGLBuffer;
 
   private _atlas: ITextureAtlas | undefined;
-  private _lastAtlasPagesVersion: number = -1;
-  private _pageOverflowWarned: boolean = false;
   private _activeBuffer: number = 0;
   private readonly _vertices: IVertices = {
     count: 0,
@@ -215,27 +213,14 @@ export class GlyphRenderer extends Disposable {
     this.handleResize();
   }
 
-  /**
-   * Returns whether the full model must be rebuilt before rendering this frame.
-   * This is tracked per renderer (not on the shared atlas) so that every
-   * terminal sharing the atlas rebuilds its model after a page merge, not just
-   * the first one to render (vscode#322756).
-   */
   public beginFrame(): boolean {
-    if (!this._atlas) {
-      return true;
-    }
-    if (this._atlas.pagesVersion !== this._lastAtlasPagesVersion) {
-      this._lastAtlasPagesVersion = this._atlas.pagesVersion;
-      return true;
-    }
-    return false;
+    return this._atlas ? this._atlas.beginFrame() : true;
   }
 
   public updateCell(x: number, y: number, code: number, bg: number, fg: number, ext: number, chars: string, width: number, lastBg: number): void {
     // Since this function is called for every cell (`rows*cols`), it must be very optimized. It
     // should not instantiate any variables unless a new glyph is drawn to the cache where the
-    // slight slowdown is acceptable for the developer ergonomics provided as it's a one-off for
+    // slight slowdown is acceptable for the developer ergonomics provided as it's a once of for
     // each glyph.
     this._updateCell(this._vertices.attributes, x, y, code, bg, fg, ext, chars, width, lastBg);
   }
@@ -377,15 +362,8 @@ export class GlyphRenderer extends Disposable {
 
     // Bind the atlas page texture if they have changed. AtlasPage.version is globally
     // monotonic, so a page object swap at the same index (which happens after a page merge)
-    // is detected by the same comparison. The page count is clamped to the fixed texture
-    // array size so an atlas page overflow degrades (untextured glyphs) instead of throwing
-    // mid-frame; the atlas is responsible for never exceeding maxAtlasPages.
-    const pageCount = Math.min(this._atlas.pages.length, this._atlasTextures.length);
-    if (this._atlas.pages.length > this._atlasTextures.length && !this._pageOverflowWarned) {
-      this._pageOverflowWarned = true;
-      this._logService.warn(`Atlas page count (${this._atlas.pages.length}) exceeds the renderer's texture capacity (${this._atlasTextures.length}), some glyphs will not render correctly`);
-    }
-    for (let i = 0; i < pageCount; i++) {
+    // is detected by the same comparison.
+    for (let i = 0; i < this._atlas.pages.length; i++) {
       if (this._atlas.pages[i].version !== this._atlasTextures[i].version) {
         this._bindAtlasPageTexture(gl, this._atlas, i);
       }
@@ -397,9 +375,6 @@ export class GlyphRenderer extends Disposable {
 
   public setAtlas(atlas: ITextureAtlas): void {
     this._atlas = atlas;
-    // Force a model rebuild on the next frame as glyph coordinates from a
-    // previous atlas are meaningless in the new one.
-    this._lastAtlasPagesVersion = -1;
     this.invalidateAtlasTextures();
   }
 
@@ -414,9 +389,8 @@ export class GlyphRenderer extends Disposable {
     gl.bindTexture(gl.TEXTURE_2D, this._atlasTextures[i].texture);
     gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
     gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
-    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
-    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
     gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, atlas.pages[i].canvas);
+    gl.generateMipmap(gl.TEXTURE_2D);
     this._atlasTextures[i].version = atlas.pages[i].version;
   }
 

addons/addon-webgl/src/TextureAtlas.ts

@@ -69,7 +69,7 @@ export class TextureAtlas implements ITextureAtlas {
   private _overflowSizePage: AtlasPage | undefined;
 
   private _tmpCanvas: HTMLCanvasElement;
-  // A temporary context that glyphs are drawn to before being transferred to the atlas.
+  // A temporary context that glyphs are drawn to before being transfered to the atlas.
   private _tmpCtx: CanvasRenderingContext2D;
 
   private _workBoundingBox: IBoundingBox = { top: 0, left: 0, bottom: 0, right: 0 };
@@ -132,16 +132,12 @@ export class TextureAtlas implements ITextureAtlas {
     }
   }
 
-  /**
-   * Incremented whenever the structure of the pages array changes in a way that
-   * invalidates texture page indexes/coordinates cached outside the atlas (page
-   * merges, overflow page creation). Renderers compare this against their own
-   * last-seen value to decide when to rebuild their models; the atlas is shared
-   * across terminals, so a consume-once flag would only repair the first
-   * renderer to draw (see the shared-atlas garble in vscode#322756).
-   */
-  private _pagesVersion = 0;
-  public get pagesVersion(): number { return this._pagesVersion; }
+  private _requestClearModel = false;
+  public beginFrame(): boolean {
+    const result = this._requestClearModel;
+    this._requestClearModel = false;
+    return result;
+  }
 
   public clearTexture(): void {
     if (this._pages[0].currentRow.x === 0 && this._pages[0].currentRow.y === 0) {
@@ -156,12 +152,12 @@ export class TextureAtlas implements ITextureAtlas {
   }
 
   private _createNewPage(): AtlasPage {
-    // Try merge the set of the 4 most used pages of the largest size. This is deferred to a
+    // Try merge the set of the 4 most used pages of the largest size. This is is deferred to a
     // microtask to ensure it does not interrupt textures that will be rendered in the current
     // animation frame which would result in blank rendered areas. This is actually not that
     // expensive relative to drawing the glyphs, so there is no need to wait for an idle callback.
     if (TextureAtlas.maxAtlasPages && this._pages.length >= Math.max(4, TextureAtlas.maxAtlasPages)) {
-      // Find the set of the largest images, below the maximum size, with the highest
+      // Find the set of the largest 4 images, below the maximum size, with the highest
       // percentages used
       const pagesBySize = this._pages.filter(e => {
         return e.canvas.width * 2 <= (TextureAtlas.maxTextureSize || Constants.FORCED_MAX_TEXTURE_SIZE);
@@ -171,55 +167,48 @@ export class TextureAtlas implements ITextureAtlas {
         }
         return b.percentageUsed - a.percentageUsed;
       });
-
-      // Find the largest group (up to 4) of same-sized pages, preferring larger page sizes. A
-      // group of 2 or 3 still reduces (or at worst maintains) the page count net of the new page
-      // pushed below; growing past the cap is never an option as GlyphRenderer's texture and
-      // shader sampler arrays are sized to exactly maxAtlasPages (exceeding them crashes render).
-      let bestGroupStart = -1;
-      let bestGroupSize = 0;
-      let groupStart = 0;
-      for (let i = 1; i <= pagesBySize.length; i++) {
-        if (i === pagesBySize.length || pagesBySize[i].canvas.width !== pagesBySize[groupStart].canvas.width) {
-          const groupSize = Math.min(4, i - groupStart);
-          if (groupSize > bestGroupSize) {
-            bestGroupSize = groupSize;
-            bestGroupStart = groupStart;
-            if (groupSize === 4) {
-              break;
-            }
-          }
-          groupStart = i;
+      let sameSizeI = -1;
+      let size = 0;
+      for (let i = 0; i < pagesBySize.length; i++) {
+        if (pagesBySize[i].canvas.width !== size) {
+          sameSizeI = i;
+          size = pagesBySize[i].canvas.width;
+        } else if (i - sameSizeI === 3) {
+          break;
         }
       }
 
-      if (bestGroupSize >= 2) {
-        // Gather details of the merge
-        const mergingPages = pagesBySize.slice(bestGroupStart, bestGroupStart + bestGroupSize);
-        const sortedMergingPagesIndexes = mergingPages.map(e => this._pages.indexOf(e)).sort((a, b) => a - b);
-        const mergedPageIndex = this.pages.length - mergingPages.length;
+      // Gather details of the merge
+      const mergingPages = pagesBySize.slice(sameSizeI, sameSizeI + 4);
 
-        // Merge into the new page
-        const mergedPage = this._mergePages(mergingPages, mergedPageIndex);
-        mergedPage.version = ++AtlasPage.nextVersion;
-
-        // Delete the pages, shifting glyph texture pages as needed
-        for (let i = sortedMergingPagesIndexes.length - 1; i >= 0; i--) {
-          this._deletePage(sortedMergingPagesIndexes[i]);
-        }
-
-        // Add the new merged page to the end
-        this.pages.push(mergedPage);
-
-        // Invalidate models so all texture pages are refreshed.
-        this._pagesVersion++;
-        this._onAddTextureAtlasCanvas.fire(mergedPage.canvas);
-      } else {
-        // No two same-sized pages below the maximum size exist, so merging cannot reduce the
-        // page count. Evict all pages rather than exceed the renderers' fixed texture/sampler
-        // capacity; glyphs re-rasterize on demand and models rebuild via pagesVersion.
-        this._evictAllPages();
+      // Only proceed with merge if we have exactly 4 same-sized pages. If not, we cannot
+      // effectively reduce page count and merging would cause issues.
+      if (mergingPages.length < 4 || mergingPages.some(p => p.canvas.width !== mergingPages[0].canvas.width)) {
+        const newPage = new AtlasPage(this._document, this._textureSize);
+        this._pages.push(newPage);
+        this._activePages.push(newPage);
+        this._onAddTextureAtlasCanvas.fire(newPage.canvas);
+        return newPage;
       }
+
+      const sortedMergingPagesIndexes = mergingPages.map(e => e.glyphs[0].texturePage).sort((a, b) => a > b ? 1 : -1);
+      const mergedPageIndex = this.pages.length - mergingPages.length;
+
+      // Merge into the new page
+      const mergedPage = this._mergePages(mergingPages, mergedPageIndex);
+      mergedPage.version = ++AtlasPage.nextVersion;
+
+      // Delete the pages, shifting glyph texture pages as needed
+      for (let i = sortedMergingPagesIndexes.length - 1; i >= 0; i--) {
+        this._deletePage(sortedMergingPagesIndexes[i]);
+      }
+
+      // Add the new merged page to the end
+      this.pages.push(mergedPage);
+
+      // Request the model to be cleared to refresh all texture pages.
+      this._requestClearModel = true;
+      this._onAddTextureAtlasCanvas.fire(mergedPage.canvas);
     }
 
     // All new atlas pages are created small as they are highly dynamic
@@ -269,27 +258,6 @@ export class TextureAtlas implements ITextureAtlas {
     }
   }
 
-  /**
-   * Removes every page and clears the glyph caches. This is the last resort when the page cap is
-   * reached but no same-sized pages exist to merge: the page count must never exceed
-   * maxAtlasPages because renderers size their texture and shader sampler arrays to exactly
-   * that. Glyphs re-rasterize on demand and renderers rebuild their models via
-   * {@link pagesVersion}.
-   */
-  private _evictAllPages(): void {
-    for (const page of this._pages) {
-      this._onRemoveTextureAtlasCanvas.fire(page.canvas);
-      page.canvas.remove();
-    }
-    this._pages.length = 0;
-    this._activePages.length = 0;
-    this._overflowSizePage = undefined;
-    this._cacheMap.clear();
-    this._cacheMapCombined.clear();
-    this._didWarmUp = false;
-    this._pagesVersion++;
-  }
-
   public getRasterizedGlyphCombinedChar(chars: string, bg: number, fg: number, ext: number, restrictToCellHeight: boolean, domContainer: HTMLElement | undefined): IRasterizedGlyph {
     return this._getFromCacheMap(this._cacheMapCombined, chars, bg, fg, ext, restrictToCellHeight, domContainer);
   }
@@ -850,8 +818,8 @@ export class TextureAtlas implements ITextureAtlas {
           this._overflowSizePage = new AtlasPage(this._document, this._config.deviceMaxTextureSize);
           this.pages.push(this._overflowSizePage);
 
-          // Invalidate models so all texture pages are refreshed.
-          this._pagesVersion++;
+          // Request the model to be cleared to refresh all texture pages.
+          this._requestClearModel = true;
           this._onAddTextureAtlasCanvas.fire(this._overflowSizePage.canvas);
         }
         activePage = this._overflowSizePage;
@@ -1112,33 +1080,17 @@ class AtlasPage {
     size: number,
     sourcePages?: AtlasPage[]
   ) {
+    if (sourcePages) {
+      for (const p of sourcePages) {
+        this._glyphs.push(...p.glyphs);
+        this._usedPixels += p._usedPixels;
+      }
+    }
     this.canvas = createCanvas(document, size, size);
     // The canvas needs alpha because we use clearColor to convert the background color to alpha.
     // It might also contain some characters with transparent backgrounds if allowTransparency is
     // set.
     this.ctx = throwIfFalsy(this.canvas.getContext('2d', { alpha: true }));
-    if (sourcePages) {
-      if (sourcePages.length === 4) {
-        // optimized for quadmerge
-        this._glyphs = this._glyphs.concat(
-          sourcePages[0].glyphs,
-          sourcePages[1].glyphs,
-          sourcePages[2].glyphs,
-          sourcePages[3].glyphs
-        );
-        this._usedPixels = sourcePages[0]._usedPixels +
-          sourcePages[1]._usedPixels +
-          sourcePages[2]._usedPixels +
-          sourcePages[3]._usedPixels;
-      } else {
-        // 2- and 3-page merges, used when no 4-page same-size set exists at the page cap
-        for (let i = 0; i < sourcePages.length; ++i) {
-          this._glyphs = this._glyphs.concat(sourcePages[i].glyphs);
-          this._usedPixels += sourcePages[i]._usedPixels;
-        }
-
-      }
-    }
   }
 
   public clear(): void {
@@ -1173,7 +1125,7 @@ function clearColor(imageData: ImageData, bg: IColor, fg: IColor, enableThreshol
   // were covered (fg=#8ae234, bg=#c4a000).
   const threshold = Math.floor((Math.abs(r - fgR) + Math.abs(g - fgG) + Math.abs(b - fgB)) / 12);
 
-  // Set alpha channel of relevant pixels to 0
+  // Set alpha channel of relevent pixels to 0
   let isEmpty = true;
   for (let offset = 0; offset < imageData.data.length; offset += 4) {
     // Check exact match

addons/addon-webgl/src/Types.ts

@@ -68,13 +68,10 @@ export interface ITextureAtlas extends IDisposable {
   warmUp(): void;
 
   /**
-   * Incremented whenever the pages array changes structurally (page merge,
-   * overflow page creation), invalidating any texture page indexes/coordinates
-   * cached by renderers. Tracked as a version rather than a consumable flag
-   * because the atlas may be shared by multiple renderers, each of which must
-   * notice the change independently.
+   * Call when a frame is being drawn, this will return true if the atlas was cleared to make room
+   * for a new set of glyphs.
    */
-  readonly pagesVersion: number;
+  beginFrame(): boolean;
 
   /**
    * Clear all glyphs from the texture atlas.

addons/addon-webgl/src/WebglAddon.ts

@@ -40,7 +40,7 @@ export class WebglAddon extends Disposable implements ITerminalAddon, IWebglApi
       };
       const gl = document.createElement('canvas').getContext('webgl2', contextAttributes) as IWebGL2RenderingContext;
       if (!gl) {
-        throw new Error('WebGL2 is only supported on Safari 16 and above');
+        throw new Error('Webgl2 is only supported on Safari 16 and above');
       }
     }
     super();

addons/addon-webgl/src/WebglRenderer.ts

@@ -10,7 +10,7 @@ import { CursorBlinkStateManager } from './CursorBlinkStateManager';
 import { observeDevicePixelDimensions } from './DevicePixelObserver';
 import { IRenderDimensions, IRenderer, IRequestRedrawEvent } from 'browser/renderer/shared/Types';
 import { ICharSizeService, ICharacterJoinerService, ICoreBrowserService, IThemeService } from 'browser/services/Services';
-import { CharData, IBufferLine, ICellData } from 'common/buffer/Types';
+import { CharData, IBufferLine, ICellData } from 'common/Types';
 import { AttributeData } from 'common/buffer/AttributeData';
 import { CellData } from 'common/buffer/CellData';
 import { Attributes, Content, FgFlags, NULL_CELL_CHAR, NULL_CELL_CODE } from 'common/buffer/Constants';
@@ -456,18 +456,7 @@ export class WebglRenderer extends Disposable implements IRenderer {
 
     for (y = start; y <= end; y++) {
       row = y + terminal.buffer.ydisp;
-      const bufferLine = terminal.buffer.lines.get(row);
-      if (!bufferLine) {
-        this._model.lineLengths[y] = 0;
-        for (x = 0; x < terminal.cols; x++) {
-          j = ((y * terminal.cols) + x) * RenderModelConstants.INDICIES_PER_CELL;
-          modelUpdated = true;
-          this._nullModelCell(x, y, j, 0, 0, 0);
-        }
-        this._setRowBlinkState(y, false);
-        continue;
-      }
-      line = bufferLine;
+      line = terminal.buffer.lines.get(row)!;
       let rowHasBlinkingCells = false;
       this._model.lineLengths[y] = 0;
       isCursorRow = cursorY === row;
@@ -598,9 +587,13 @@ export class WebglRenderer extends Disposable implements IRenderer {
           // Null out non-first cells
           for (x++; x <= lastCharX; x++) {
             j = ((y * terminal.cols) + x) * RenderModelConstants.INDICIES_PER_CELL;
+            this._glyphRenderer.value!.updateCell(x, y, NULL_CELL_CODE, 0, 0, 0, NULL_CELL_CHAR, 0, 0);
+            this._model.cells[j] = NULL_CELL_CODE;
             // Don't re-resolve the cell color since multi-colored ligature backgrounds are not
             // supported
-            this._nullModelCell(x, y, j, this._cellColorResolver.result.bg, this._cellColorResolver.result.fg, this._cellColorResolver.result.ext);
+            this._model.cells[j + RenderModelConstants.BG_OFFSET] = this._cellColorResolver.result.bg;
+            this._model.cells[j + RenderModelConstants.FG_OFFSET] = this._cellColorResolver.result.fg;
+            this._model.cells[j + RenderModelConstants.EXT_OFFSET] = this._cellColorResolver.result.ext;
           }
           x--; // Go back to the previous update cell for next iteration
         }
@@ -614,14 +607,6 @@ export class WebglRenderer extends Disposable implements IRenderer {
     this._updateTextBlinkState();
   }
 
-  private _nullModelCell(x: number, y: number, cellIndex: number, bg: number, fg: number, ext: number): void {
-    this._glyphRenderer.value!.updateCell(x, y, NULL_CELL_CODE, bg, fg, ext, NULL_CELL_CHAR, 0, 0);
-    this._model.cells[cellIndex] = NULL_CELL_CODE;
-    this._model.cells[cellIndex + RenderModelConstants.BG_OFFSET] = bg;
-    this._model.cells[cellIndex + RenderModelConstants.FG_OFFSET] = fg;
-    this._model.cells[cellIndex + RenderModelConstants.EXT_OFFSET] = ext;
-  }
-
   private _resetBlinkingRowState(): void {
     this._rowHasBlinkingCells = new Array(this._terminal.rows).fill(false);
     this._rowHasBlinkingCellsCount = 0;
@@ -679,10 +664,10 @@ export class WebglRenderer extends Disposable implements IRenderer {
     this.dimensions.device.canvas.height = this._terminal.rows * this.dimensions.device.cell.height;
     this.dimensions.device.canvas.width = this._terminal.cols * this.dimensions.device.cell.width;
 
-    // The size of the canvas on the page. It's important that this rounds to nearest integer
+    // The the size of the canvas on the page. It's important that this rounds to nearest integer
     // and not ceils as browsers often have floating point precision issues where
     // `window.devicePixelRatio` ends up being something like `1.100000023841858` for example, when
-    // it's actually 1.1. Ceiling may cause blurriness as the backing canvas image is 1 pixel too
+    // it's actually 1.1. Ceiling may causes blurriness as the backing canvas image is 1 pixel too
     // large for the canvas element size.
     this.dimensions.css.canvas.height = Math.round(this.dimensions.device.canvas.height / this._devicePixelRatio);
     this.dimensions.css.canvas.width = Math.round(this.dimensions.device.canvas.width / this._devicePixelRatio);

addons/addon-webgl/src/customGlyphs/CustomGlyphRasterizer.ts

@@ -221,8 +221,8 @@ function drawPathDefinitionCharacter(
       const rx = parseFloat(args[0]) * deviceCellWidth;
       const ry = parseFloat(args[1]) * deviceCellHeight;
       const xAxisRotation = parseFloat(args[2]) * Math.PI / 180;
-      const largeArcFlag = parseInt(args[3], 10);
-      const sweepFlag = parseInt(args[4], 10);
+      const largeArcFlag = parseInt(args[3]);
+      const sweepFlag = parseInt(args[4]);
       const x = xOffset + parseFloat(args[5]) * deviceCellWidth;
       const y = yOffset + parseFloat(args[6]) * deviceCellHeight;
       drawSvgArc(ctx, currentX, currentY, rx, ry, xAxisRotation, largeArcFlag, sweepFlag, x, y);

addons/addon-webgl/test/WebglAtlasOverflow.test.ts

@@ -1,104 +0,0 @@
-/**
- * Copyright (c) 2025 The xterm.js authors. All rights reserved.
- * @license MIT
- *
- * Reproduces the single-terminal WebGL crash/garble when the texture atlas
- * page count overflows TextureAtlas.maxAtlasPages (vscode#322756 class).
- *
- * GlyphRenderer sizes its GL texture array and fragment-shader sampler array
- * to exactly maxAtlasPages at construction time, but TextureAtlas._createNewPage
- * pushes past that cap whenever a 4-page same-size merge is impossible (e.g. a
- * heterogeneous mix like 1024+512+512+512). The next GlyphRenderer.render then
- * throws "Cannot read properties of undefined (reading 'version')" and cells
- * reference sampler indexes the shader does not have, freezing/garbling the
- * terminal. Long heavy-CLI sessions hit this in production; the test makes it
- * fast by building the renderer with a small cap (the same code path as the
- * production 8/16/32 values).
- *
- * Chromium only (additive scope; Firefox/WebKit WebGL broken in CI, xtermjs#5854).
- */
-import test, { expect } from '@playwright/test';
-import { ITestContext, createTestContext, openTerminal } from '../../../test/playwright/TestUtils';
-import {
-  captureRowSignatures,
-  expectSignatureMatches,
-  loadWebglStrict,
-  resetMaxAtlasPages,
-  setMaxAtlasPages,
-  writeAndWaitForRender
-} from '../../../test/playwright/RendererTestUtils';
-import { generateUniqueGlyphFlood } from '../../../test/playwright/SyntheticTui';
-
-const HEADER = ' OVERFLOW_REF_0123456789';
-const HEADER_COLS = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
-
-test.describe('atlas page overflow (#322756 class)', () => {
-  test.skip(({ browserName }) => browserName !== 'chromium');
-  test.describe.configure({ timeout: 60000 });
-
-  test('renderer survives the atlas exceeding maxAtlasPages-sized textures', async ({ browser }) => {
-    const ctx: ITestContext = await createTestContext(browser);
-    const errors: string[] = [];
-    const onError = (e: Error): void => { errors.push(e.message); };
-    ctx.page.on('pageerror', onError);
-    try {
-      // Bootstrap: create a throwaway WebGL terminal so the TextureAtlas class
-      // statics exist, then lower the page cap. openTerminal() disposes the old
-      // terminal (and its atlas), so the next WebGL renderer is CONSTRUCTED
-      // with the small cap: its GL texture array and fragment-shader sampler
-      // array have exactly 4 entries, faithfully mirroring production where
-      // they always equal maxAtlasPages.
-      await openTerminal(ctx, { cols: 80, rows: 24 });
-      await loadWebglStrict(ctx);
-      await setMaxAtlasPages(ctx, 4);
-      await openTerminal(ctx, { cols: 80, rows: 24 });
-      await loadWebglStrict(ctx);
-
-      const atlasTexturesLength = await ctx.page.evaluate(() =>
-        (window as any).term._core._renderService._renderer.value._glyphRenderer.value._atlasTextures.length);
-      expect(atlasTexturesLength, 'renderer must be built with the lowered page cap').toBe(4);
-
-      // Pinned header in the alt buffer; body churns distinct CJK glyphs below
-      // (cursor-positioned, no trailing linefeed on the bottom row -> no scroll).
-      await writeAndWaitForRender(ctx, `\x1b[?1049h\x1b[H${HEADER}`);
-      const reference = await captureRowSignatures(ctx, 1, HEADER_COLS);
-      await ctx.page.locator('#terminal-container .xterm-screen').screenshot({ path: 'out-esbuild-test/playwright/overflow-before.png' });
-
-      const glyphsPerChunk = 23 * 40 - 1;
-      for (let c = 0; c < 16; c++) {
-        // Plain write + short wait instead of waiting for a render event: once
-        // the overflow crash fires, render events stop arriving and a render
-        // wait would hang the test instead of failing it.
-        await ctx.proxy.write('\x1b[2;1H' + generateUniqueGlyphFlood(glyphsPerChunk, 80, c * glyphsPerChunk));
-        await ctx.page.waitForTimeout(50);
-      }
-      await ctx.page.waitForTimeout(300);
-      await ctx.page.locator('#terminal-container .xterm-screen').screenshot({ path: 'out-esbuild-test/playwright/overflow-after.png' });
-
-      const state = await ctx.page.evaluate(() => {
-        const renderer = (window as any).term._core._renderService._renderer.value;
-        return {
-          pages: renderer._charAtlas.pages.length,
-          atlasTextures: renderer._glyphRenderer.value._atlasTextures.length
-        };
-      });
-      console.error('[overflow] pages=', state.pages, 'atlasTextures=', state.atlasTextures, 'pageErrors=', errors.length, errors[0] ?? '');
-
-      // Contract: the page count must never exceed the renderer's texture and
-      // sampler capacity, and rendering must never throw.
-      expect(errors, `GlyphRenderer must not crash when the atlas is saturated: ${errors[0] ?? ''}`).toEqual([]);
-      expect(state.pages, 'atlas page count must stay within the renderer texture capacity').toBeLessThanOrEqual(state.atlasTextures);
-
-      // The untouched header must still render correctly after the churn.
-      const after = await captureRowSignatures(ctx, 1, HEADER_COLS);
-      for (let i = 0; i < HEADER_COLS.length; i++) {
-        expectSignatureMatches(after[i], reference[i], 14, `header col ${HEADER_COLS[i]} corrupted after atlas saturation`);
-      }
-    } finally {
-      ctx.page.off('pageerror', onError);
-      // Restore the default so a lowered cap can never leak into other tests.
-      await resetMaxAtlasPages(ctx).catch(() => { /* page may already be unusable after a crash */ });
-      await ctx.page.close();
-    }
-  });
-});

addons/addon-webgl/test/WebglDprResize.test.ts

@@ -1,109 +0,0 @@
-/**
- * Copyright (c) 2025 The xterm.js authors. All rights reserved.
- * @license MIT
- *
- * WebGL device-pixel-ratio (HiDPI) and font-size ("resize") atlas tests.
- *
- * A devicePixelRatio > 1 and font-size changes both change the device cell
- * dimensions, which key the texture atlas cache and force the atlas to be
- * rebuilt. Historically these paths have produced blank/oversized/garbled glyphs
- * (e.g. xtermjs#4728, #5915/#5929). These tests assert glyphs render and stay
- * correct across those transitions.
- *
- * Chromium + SwiftShader only (additive scope; Firefox/WebKit WebGL broken in CI
- * per xtermjs#5854).
- */
-
-import test, { Browser, expect } from '@playwright/test';
-import { ITestContext, TerminalProxy, openTerminal } from '../../../test/playwright/TestUtils';
-import {
-  assertTextureAtlasPresent,
-  captureRowSignatures,
-  expectSignatureMatches,
-  loadWebglStrict,
-  waitForRender,
-  writeAndWaitForRender
-} from '../../../test/playwright/RendererTestUtils';
-
-const REFERENCE_COLS = [1, 2, 3, 4, 5, 6, 7, 8];
-
-/**
- * Creates a test context whose page uses a specific devicePixelRatio. The shared
- * `createTestContext` helper always uses DPR 1 (`browser.newPage()`), so HiDPI
- * tests build their own context here.
- */
-async function createDprContext(browser: Browser, deviceScaleFactor: number): Promise<ITestContext> {
-  const context = await browser.newContext({ deviceScaleFactor });
-  const page = await context.newPage();
-  page.on('pageerror', e => console.error(`[dpr ${deviceScaleFactor}]`, e));
-  await page.goto('/test');
-  const proxy = new TerminalProxy(page);
-  proxy.initPage();
-  return {
-    browser,
-    page,
-    termHandle: await page.evaluateHandle('window.term'),
-    proxy
-  };
-}
-
-test.describe('WebGL HiDPI (devicePixelRatio) rendering', () => {
-  test.skip(({ browserName }) => browserName !== 'chromium', 'WebGL atlas tests run on Chromium/SwiftShader only');
-
-  test('initializes the WebGL renderer and scales to device pixels at devicePixelRatio 2', async ({ browser }) => {
-    const ctx = await createDprContext(browser, 2);
-    try {
-      await openTerminal(ctx, { cols: 80, rows: 24 });
-      // GPU must be genuinely active at HiDPI (asserted inside loadWebglStrict).
-      await loadWebglStrict(ctx);
-      await writeAndWaitForRender(ctx, 'A W .');
-      await assertTextureAtlasPresent(ctx);
-
-      // The WebGL renderer must render at the device resolution: device cell
-      // dimensions should be ~2x the CSS cell dimensions. This catches the
-      // DPR-scaling class of bugs (e.g. xtermjs#4728) without relying on
-      // screenshotting a WebGL canvas at a non-1 device scale factor.
-      const dims = await ctx.proxy.core.renderDimensions;
-      expect(dims.device.cell.width).toBeGreaterThan(dims.css.cell.width * 1.8);
-      expect(dims.device.cell.width).toBeLessThan(dims.css.cell.width * 2.2);
-      expect(dims.device.cell.height).toBeGreaterThan(dims.css.cell.height * 1.8);
-      expect(dims.device.cell.height).toBeLessThan(dims.css.cell.height * 2.2);
-    } finally {
-      await ctx.page.context().close();
-    }
-  });
-});
-
-test.describe('WebGL font-size change atlas integrity', () => {
-  let ctx: ITestContext;
-  test.skip(({ browserName }) => browserName !== 'chromium', 'WebGL atlas tests run on Chromium/SwiftShader only');
-
-  test.beforeAll(async ({ browser }) => {
-    ctx = await createDprContext(browser, 1);
-  });
-  test.afterAll(async () => await ctx.page.close());
-
-  test.beforeEach(async () => {
-    await openTerminal(ctx, { cols: 80, rows: 24, fontSize: 15 });
-    await loadWebglStrict(ctx);
-  });
-
-  test('glyphs stay correct after cycling font size (atlas rebuilds)', async () => {
-    await writeAndWaitForRender(ctx, 'FontRef0123456789');
-    const reference = await captureRowSignatures(ctx, 1, REFERENCE_COLS);
-
-    // Changing font size changes device cell dimensions -> the atlas is rebuilt.
-    for (const fontSize of [12, 18, 21, 15]) {
-      await ctx.proxy.setOption('fontSize', fontSize);
-      await writeAndWaitForRender(ctx, '\r\nchurn');
-    }
-
-    // Back at the original font size the reference glyphs must be unchanged.
-    await ctx.proxy.scrollToTop();
-    await waitForRender(ctx);
-    const after = await captureRowSignatures(ctx, 1, REFERENCE_COLS);
-    for (let i = 0; i < REFERENCE_COLS.length; i++) {
-      expectSignatureMatches(after[i], reference[i], 16, `reference glyph at col ${REFERENCE_COLS[i]} corrupted after font-size cycling`);
-    }
-  });
-});

addons/addon-webgl/test/WebglGlyph.test.ts

@@ -1,121 +0,0 @@
-/**
- * Copyright (c) 2025 The xterm.js authors. All rights reserved.
- * @license MIT
- *
- * WebGL glyph + texture-atlas integrity tests.
- *
- * These tests verify that *glyphs* render correctly (not just that cell colors
- * are right) under conditions that stress the texture atlas: multiple atlas
- * pages, page merges and atlas clears. The goal is to catch the "garbled glyph"
- * corruption class reported in microsoft/vscode#322756.
- *
- * Note: CI runs WebGL on Chromium + SwiftShader (software WebGL). That catches
- * renderer/atlas *logic* corruption (stale texture pages, missing model clears),
- * but not GPU-driver-specific glitches. These tests target the former.
- */
-
-import test, { expect } from '@playwright/test';
-import { ITestContext, createTestContext, openTerminal } from '../../../test/playwright/TestUtils';
-import {
-  assertTextureAtlasPresent,
-  captureRowSignatures,
-  expectSignatureDiffers,
-  expectSignatureMatches,
-  floodDistinctGlyphs,
-  loadWebglStrict,
-  resetMaxAtlasPages,
-  setMaxAtlasPages,
-  waitForRender,
-  writeAndWaitForRender
-} from '../../../test/playwright/RendererTestUtils';
-
-let ctx: ITestContext;
-test.beforeAll(async ({ browser }) => {
-  ctx = await createTestContext(browser);
-});
-test.afterAll(async () => await ctx.page.close());
-
-test.describe('WebGL glyph + atlas integrity', () => {
-  // Additive scope: only run on Chromium (SwiftShader). Firefox/WebKit WebGL
-  // tests are known-broken in CI (xtermjs#5854) and out of scope here.
-  test.skip(({ browserName }) => browserName !== 'chromium', 'WebGL atlas tests run on Chromium/SwiftShader only');
-
-  test.beforeEach(async () => {
-    // Fresh terminal (and therefore a predictable atlas) per test.
-    await openTerminal(ctx, { cols: 80, rows: 24 });
-    await loadWebglStrict(ctx);
-  });
-
-  // A lowered page cap must not leak into renderers built by later tests.
-  test.afterEach(async () => await resetMaxAtlasPages(ctx));
-
-  test('renders distinct, non-blank glyphs', async () => {
-    await writeAndWaitForRender(ctx, 'A W .');
-    await assertTextureAtlasPresent(ctx);
-
-    const [a, w, dot, blank] = await captureRowSignatures(ctx, 1, [1, 3, 5, 40]);
-    // A written cell must differ from an empty cell (glyph actually drawn).
-    expectSignatureDiffers(a, blank, 24, 'glyph "A" should not be blank');
-    expectSignatureDiffers(w, blank, 24, 'glyph "W" should not be blank');
-    // Different glyphs must look different (signature has discriminating power).
-    expectSignatureDiffers(a, w, 24, 'glyphs "A" and "W" should render differently');
-    expectSignatureDiffers(a, dot, 24, 'glyphs "A" and "." should render differently');
-  });
-
-  test('glyphs on the first atlas page stay correct after more pages are allocated', async () => {
-    // Reference: a known row of glyphs that lands on the first atlas page.
-    await writeAndWaitForRender(ctx, 'REFERENCE_LINE_0123456789\r\n');
-    const cols = [1, 2, 3, 4, 5, 6, 7, 8, 9];
-    const reference = await captureRowSignatures(ctx, 1, cols);
-
-    // Flood thousands of distinct glyphs (one screenful rendered at a time, so
-    // they actually rasterize) to force multiple atlas pages.
-    const pages = await floodDistinctGlyphs(ctx, 4);
-    expect(pages, 'flooding distinct glyphs should allocate more than one atlas page').toBeGreaterThan(1);
-
-    // Bring the reference line back into view and re-check its glyphs.
-    await ctx.proxy.scrollToTop();
-    await waitForRender(ctx);
-    const after = await captureRowSignatures(ctx, 1, cols);
-    for (let i = 0; i < cols.length; i++) {
-      expectSignatureMatches(after[i], reference[i], 14, `reference glyph at col ${cols[i]} corrupted after multi-page allocation`);
-    }
-  });
-
-  test('glyphs stay correct after a texture-atlas page merge', async () => {
-    // Force merges to happen almost immediately.
-    await writeAndWaitForRender(ctx, 'MERGE_REF_LINE_0123456789\r\n');
-    await setMaxAtlasPages(ctx, 4);
-
-    const cols = [1, 2, 3, 4, 5, 6, 7, 8, 9];
-    const reference = await captureRowSignatures(ctx, 1, cols);
-
-    // Flood distinct glyphs (rendered per screenful) to exceed the tiny page cap
-    // and trigger merges.
-    const pages = await floodDistinctGlyphs(ctx, 12);
-    expect(pages, 'flood should have allocated multiple atlas pages (and merged)').toBeGreaterThan(1);
-
-    await ctx.proxy.scrollToTop();
-    await waitForRender(ctx);
-    const after = await captureRowSignatures(ctx, 1, cols);
-    for (let i = 0; i < cols.length; i++) {
-      expectSignatureMatches(after[i], reference[i], 14, `reference glyph at col ${cols[i]} corrupted after atlas page merge`);
-    }
-  });
-
-  test('glyphs re-render correctly after clearTextureAtlas() on the same terminal', async () => {
-    await writeAndWaitForRender(ctx, 'CLEAR_REF_LINE_0123456789');
-    const cols = [1, 2, 3, 4, 5, 6, 7, 8, 9];
-    const reference = await captureRowSignatures(ctx, 1, cols);
-
-    await ctx.proxy.clearTextureAtlas();
-    // Force a full redraw so glyphs are re-rasterized into the cleared atlas.
-    await ctx.proxy.refresh(0, (await ctx.proxy.rows) - 1);
-    await waitForRender(ctx);
-
-    const after = await captureRowSignatures(ctx, 1, cols);
-    for (let i = 0; i < cols.length; i++) {
-      expectSignatureMatches(after[i], reference[i], 14, `glyph at col ${cols[i]} corrupted after clearTextureAtlas()`);
-    }
-  });
-});

addons/addon-webgl/test/WebglReproExperiment.test.ts

@@ -1,65 +0,0 @@
-/**
- * Copyright (c) 2025 The xterm.js authors. All rights reserved.
- * @license MIT
- *
- * Single-terminal guard for the vscode#322756 "garbled glyph" class: a pinned
- * alt-buffer header must render identically while the body churns enough
- * distinct colored glyphs to force texture-atlas page merges.
- *
- * Note this scenario is GREEN on current master: the single-terminal mid-frame
- * merge race was fixed upstream (merge-retry loop in WebglRenderer.renderRows +
- * globally monotonic AtlasPage versions). The test asserts the buffer content
- * first so a content bug (e.g. an accidental scroll from the churn stream) can
- * never masquerade as renderer corruption.
- */
-import test, { expect } from '@playwright/test';
-import { ITestContext, createTestContext, openTerminal } from '../../../test/playwright/TestUtils';
-import { captureRowSignatures, expectSignatureMatches, getAtlasPageCount, loadWebglStrict, resetMaxAtlasPages, setMaxAtlasPages, writeAndWaitForRender } from '../../../test/playwright/RendererTestUtils';
-import { generateColoredAsciiFlood } from '../../../test/playwright/SyntheticTui';
-
-const HEADER = ' HEADER_REF_0123456789';
-
-let ctx: ITestContext;
-test.beforeAll(async ({ browser }) => { ctx = await createTestContext(browser); });
-test.afterAll(async () => await ctx.page.close());
-
-test.describe('single-terminal merge integrity (#322756 class)', () => {
-  test.skip(({ browserName }) => browserName !== 'chromium');
-  test.describe.configure({ timeout: 60000 });
-
-  // A lowered page cap must not leak into renderers built by later tests.
-  test.afterEach(async () => await resetMaxAtlasPages(ctx));
-
-  test('pinned header renders identically across 30 merge-heavy body redraws', async () => {
-    await openTerminal(ctx, { cols: 80, rows: 24 });
-    await loadWebglStrict(ctx);
-    await setMaxAtlasPages(ctx, 4);
-    const cols = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
-    // Alt-buffer TUI: pinned header on row 1, body churns below (like Copilot CLI).
-    await writeAndWaitForRender(ctx, `\x1b[?1049h\x1b[H${HEADER}`);
-    const ref = await captureRowSignatures(ctx, 1, cols);
-    let maxDiff = 0;
-    for (let c = 0; c < 30; c++) {
-      // Redraw body rows 2..24 with unique glyphs; the header row is never touched.
-      let frame = '\x1b[2;1H';
-      frame += generateColoredAsciiFlood(23 * 78, c * 23 * 78);
-      await writeAndWaitForRender(ctx, frame);
-      const now = await captureRowSignatures(ctx, 1, cols); // forces GPU sync
-      for (let i = 0; i < cols.length; i++) {
-        const d = Math.max(...ref[i].map((v, k) => Math.abs(v - now[i][k])));
-        maxDiff = Math.max(maxDiff, d);
-      }
-    }
-    console.error('[repro] pages=', await getAtlasPageCount(ctx), 'headerMaxDiff=', maxDiff);
-
-    // Guard: the header must still be in the buffer. If this fails the churn
-    // stream scrolled the screen and any pixel diff is meaningless.
-    const row1Text = await ctx.page.evaluate(() => (window as any).term.buffer.active.getLine(0)?.translateToString(true));
-    expect(row1Text, 'churn stream must not scroll the pinned header out of the buffer').toBe(HEADER);
-
-    const after = await captureRowSignatures(ctx, 1, cols);
-    for (let i = 0; i < cols.length; i++) {
-      expectSignatureMatches(after[i], ref[i], 14, `header col ${cols[i]} garbled`);
-    }
-  });
-});

addons/addon-webgl/test/WebglSharedAtlasGarble.test.ts

@@ -1,159 +0,0 @@
-/**
- * Copyright (c) 2025 The xterm.js authors. All rights reserved.
- * @license MIT
- *
- * Reproduces the vscode#322756 "garbled glyph" corruption across terminals that
- * SHARE a texture atlas (CharAtlasCache hands the same TextureAtlas to every
- * terminal with an equal config — in VS Code that is every integrated terminal
- * using the same font settings, including task/background terminals).
- *
- * Mechanism: when the atlas merges pages it raises a consume-once
- * "clear model" flag (TextureAtlas.beginFrame). Only the FIRST terminal to
- * render consumes it and rebuilds its vertex model; every other terminal keeps
- * stale texture-page indexes/coordinates in its vertex buffer and draws wrong
- * glyphs on its next partial render, even though its buffer content is intact.
- *
- * The DOM-renderer control shows the corruption is exclusive to the GPU path
- * (`terminal.integrated.gpuAcceleration off` cannot reproduce it: the DOM
- * renderer has no texture atlas).
- *
- * Chromium only (additive scope; Firefox/WebKit WebGL broken in CI, xtermjs#5854).
- */
-import test, { expect } from '@playwright/test';
-import { ITestContext, createTestContext, openTerminal } from '../../../test/playwright/TestUtils';
-import {
-  captureRowSignatures,
-  expectSignatureMatches,
-  getAtlasPageCount,
-  loadWebglStrict,
-  setMaxAtlasPages,
-  writeAndWaitForRender
-} from '../../../test/playwright/RendererTestUtils';
-import { generateColoredAsciiFlood } from '../../../test/playwright/SyntheticTui';
-
-const HEADER = ' HEADER_REF_0123456789';
-const HEADER_COLS = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
-const TERM_B_SELECTOR = '#terminal-container-b .xterm-screen';
-
-/**
- * Creates a second terminal ("termB") on the test page with the given options
- * and optionally loads the WebGL addon on it. Identical rendering options mean
- * CharAtlasCache gives it the same atlas instance as `window.term`.
- */
-async function createTerminalB(ctx: ITestContext, options: { useWebgl: boolean }): Promise<void> {
-  await ctx.page.evaluate(async (useWebgl) => {
-    const w = window as any;
-    w.termB?.dispose();
-    document.getElementById('terminal-container-b')?.remove();
-    const el = document.createElement('div');
-    el.id = 'terminal-container-b';
-    document.body.appendChild(el);
-    w.termB = new w.Terminal({ cols: 80, rows: 24, allowProposedApi: true });
-    w.termB.open(el);
-    if (useWebgl) {
-      w.addonB = new w.WebglAddon({ preserveDrawingBuffer: true });
-      w.termB.loadAddon(w.addonB);
-    }
-  }, options.useWebgl);
-}
-
-/** Writes data to termB and resolves after its next render event. */
-async function writeToBAndWaitForRender(ctx: ITestContext, data: string): Promise<void> {
-  await ctx.page.evaluate(d => new Promise<void>(resolve => {
-    const termB = (window as any).termB;
-    const disposable = termB.onRender(() => {
-      disposable.dispose();
-      resolve();
-    });
-    termB.write(d);
-  }), data);
-}
-
-async function getTermBRow1Text(ctx: ITestContext): Promise<string | undefined> {
-  return ctx.page.evaluate(() => (window as any).termB.buffer.active.getLine(0)?.translateToString(true));
-}
-
-test.describe('shared-atlas garble across terminals (#322756)', () => {
-  test.skip(({ browserName }) => browserName !== 'chromium');
-  test.describe.configure({ timeout: 60000 });
-
-  test('terminal B keeps rendering its header correctly while terminal A forces atlas merges', async ({ browser }) => {
-    const ctx: ITestContext = await createTestContext(browser);
-    try {
-      await openTerminal(ctx, { cols: 80, rows: 24 });
-      await loadWebglStrict(ctx);
-      await createTerminalB(ctx, { useWebgl: true });
-
-      // Both terminals must be using the same atlas instance for this test to
-      // mean anything.
-      const atlasShared = await ctx.page.evaluate(() => {
-        const w = window as any;
-        const atlasA = w.term._core._renderService._renderer.value._charAtlas;
-        const atlasB = w.termB._core._renderService._renderer.value._charAtlas;
-        return !!atlasA && atlasA === atlasB;
-      });
-      expect(atlasShared, 'terminals with equal configs should share one texture atlas').toBe(true);
-
-      // Lower the cap AFTER both renderers exist so their shaders/texture
-      // arrays keep the original size (this test targets stale vertex data,
-      // not the page-overflow crash).
-      await setMaxAtlasPages(ctx, 4);
-
-      // Render B's header pre-merge and capture its reference pixels.
-      await writeToBAndWaitForRender(ctx, HEADER);
-      await ctx.page.locator(TERM_B_SELECTOR).screenshot({ path: 'out-esbuild-test/playwright/termB-before.png' });
-      const reference = await captureRowSignatures(ctx, 1, HEADER_COLS, { selector: TERM_B_SELECTOR, termGlobal: 'termB' });
-
-      // Churn terminal A with distinct colored glyphs to force page merges in
-      // the SHARED atlas. A repairs itself (it consumes the clear-model flag);
-      // B is never told.
-      for (let c = 0; c < 10; c++) {
-        await writeAndWaitForRender(ctx, '\x1b[2;1H' + generateColoredAsciiFlood(23 * 78, c * 23 * 78));
-      }
-      const pages = await getAtlasPageCount(ctx);
-      expect(pages, 'churn should have exercised multiple atlas pages').toBeGreaterThan(1);
-
-      // A tiny unrelated update to B's LAST row triggers a partial render in B.
-      // B's header row is untouched; with a healthy renderer its pixels must
-      // not change.
-      await writeToBAndWaitForRender(ctx, '\x1b[24;1Hx');
-      await ctx.page.locator(TERM_B_SELECTOR).screenshot({ path: 'out-esbuild-test/playwright/termB-after.png' });
-
-      // Guard: B's buffer content is intact, so any pixel change is renderer
-      // corruption by construction.
-      expect(await getTermBRow1Text(ctx), 'terminal B buffer must still contain the header').toBe(HEADER);
-
-      const after = await captureRowSignatures(ctx, 1, HEADER_COLS, { selector: TERM_B_SELECTOR, termGlobal: 'termB' });
-      for (let i = 0; i < HEADER_COLS.length; i++) {
-        expectSignatureMatches(after[i], reference[i], 14, `terminal B header col ${HEADER_COLS[i]} garbled by terminal A's atlas merges`);
-      }
-    } finally {
-      await ctx.page.close();
-    }
-  });
-
-  test('DOM renderer control: same workload cannot garble terminal B (no atlas without GPU acceleration)', async ({ browser }) => {
-    const ctx: ITestContext = await createTestContext(browser);
-    try {
-      // No WebGL addon on either terminal -> DOM renderer -> no texture atlas.
-      await openTerminal(ctx, { cols: 80, rows: 24 });
-      await createTerminalB(ctx, { useWebgl: false });
-
-      await writeToBAndWaitForRender(ctx, HEADER);
-      const reference = await captureRowSignatures(ctx, 1, HEADER_COLS, { selector: TERM_B_SELECTOR, termGlobal: 'termB' });
-
-      for (let c = 0; c < 10; c++) {
-        await writeAndWaitForRender(ctx, '\x1b[2;1H' + generateColoredAsciiFlood(23 * 78, c * 23 * 78));
-      }
-      await writeToBAndWaitForRender(ctx, '\x1b[24;1Hx');
-
-      expect(await getTermBRow1Text(ctx), 'terminal B buffer must still contain the header').toBe(HEADER);
-      const after = await captureRowSignatures(ctx, 1, HEADER_COLS, { selector: TERM_B_SELECTOR, termGlobal: 'termB' });
-      for (let i = 0; i < HEADER_COLS.length; i++) {
-        expectSignatureMatches(after[i], reference[i], 14, `DOM-rendered terminal B header col ${HEADER_COLS[i]} unexpectedly changed`);
-      }
-    } finally {
-      await ctx.page.close();
-    }
-  });
-});

addons/addon-webgl/test/WebglSingleTermStress.test.ts

@@ -1,104 +0,0 @@
-/**
- * Copyright (c) 2025 The xterm.js authors. All rights reserved.
- * @license MIT
- *
- * Single-terminal WebGL atlas stress: try to reproduce the "garbled glyph"
- * corruption from microsoft/vscode#322756 in ONE terminal (no shared atlas),
- * via heavy unique-glyph churn that forces atlas page merges, both with content
- * pinned on screen (TUI-style) and mid-scroll. Chromium/SwiftShader only.
- */
-
-import test, { expect } from '@playwright/test';
-import { ITestContext, createTestContext, openTerminal } from '../../../test/playwright/TestUtils';
-import {
-  captureRowSignatures,
-  expectSignatureMatches,
-  floodDistinctGlyphs,
-  getAtlasPageCount,
-  loadWebglStrict,
-  resetMaxAtlasPages,
-  setMaxAtlasPages,
-  waitForRender,
-  writeAndWaitForRender
-} from '../../../test/playwright/RendererTestUtils';
-import { generateUniqueGlyphFlood } from '../../../test/playwright/SyntheticTui';
-
-let ctx: ITestContext;
-test.beforeAll(async ({ browser }) => {
-  ctx = await createTestContext(browser);
-});
-test.afterAll(async () => await ctx.page.close());
-
-test.describe('WebGL single-terminal heavy render + merge', () => {
-  test.skip(({ browserName }) => browserName !== 'chromium', 'WebGL atlas tests run on Chromium/SwiftShader only');
-  test.describe.configure({ timeout: 30000 });
-
-  test.beforeEach(async () => {
-    await openTerminal(ctx, { cols: 80, rows: 24, scrollback: 5000 });
-    await loadWebglStrict(ctx);
-  });
-
-  // A lowered page cap must not leak into renderers built by later tests.
-  test.afterEach(async () => await resetMaxAtlasPages(ctx));
-
-  test('heavy merge churn must not crash the GlyphRenderer (vscode#322756)', async () => {
-    // Guard: heavy merges must not throw from GlyphRenderer.render. Note the
-    // page cap here is lowered AFTER the renderer was built, so _atlasTextures
-    // keeps its original (large) length and this test cannot hit the
-    // page-overflow crash; that scenario needs the cap lowered BEFORE loading
-    // the addon and is covered separately (WebglAtlasOverflow.test.ts).
-    const errors: string[] = [];
-    const onError = (e: Error): void => { errors.push(e.message); };
-    ctx.page.on('pageerror', onError);
-    try {
-      await setMaxAtlasPages(ctx, 4);
-      await floodDistinctGlyphs(ctx, 10);
-      // Force a GPU read (screenshot) mid-churn so a render lands during/after a
-      // merge, then churn more — this reliably exposes the version crash.
-      await captureRowSignatures(ctx, 1, [1, 2, 3]);
-      const pages = await floodDistinctGlyphs(ctx, 10);
-      expect(pages, 'should have allocated/merged pages').toBeGreaterThan(1);
-      await ctx.page.waitForTimeout(300);
-      expect(errors, `renderer crashed during atlas merges: ${errors[0] ?? ''}`).toEqual([]);
-    } finally {
-      ctx.page.off('pageerror', onError);
-    }
-  });
-
-  test('pinned header stays correct while body churns many pages', async () => {
-    const cols = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
-    await writeAndWaitForRender(ctx, 'HEADER_REF_0123456789');
-    const reference = await captureRowSignatures(ctx, 1, cols);
-
-    // Body churns unique glyphs (forces merges) while header line stays on screen.
-    const pages = await floodDistinctGlyphs(ctx, 8);
-    expect(pages, 'should have allocated/merged pages').toBeGreaterThan(1);
-
-    await ctx.proxy.scrollToTop();
-    await waitForRender(ctx);
-    const after = await captureRowSignatures(ctx, 1, cols);
-    for (let i = 0; i < cols.length; i++) {
-      expectSignatureMatches(after[i], reference[i], 14, `header glyph col ${cols[i]} corrupted by single-terminal merges`);
-    }
-  });
-
-  test('visible rows match content while scrolling (no merge)', async () => {
-    // Big scrollback of distinct glyphs across multiple pages (no tiny page cap,
-    // so no merge), then scroll up/down repeatedly.
-    for (let c = 0; c < 8; c++) {
-      await writeAndWaitForRender(ctx, generateUniqueGlyphFlood(24 * 40, 80, c * 24 * 40));
-    }
-    expect(await getAtlasPageCount(ctx)).toBeGreaterThan(1);
-
-    await ctx.proxy.scrollToTop();
-    await waitForRender(ctx);
-    const top = await captureRowSignatures(ctx, 1, [1, 2, 3, 4, 5]);
-    await ctx.proxy.scrollToBottom();
-    await ctx.proxy.scrollToTop();
-    await waitForRender(ctx);
-    const topAgain = await captureRowSignatures(ctx, 1, [1, 2, 3, 4, 5]);
-    for (let i = 0; i < top.length; i++) {
-      expectSignatureMatches(topAgain[i], top[i], 14, `row1 col${i + 1} changed after scroll round-trip`);
-    }
-  });
-});

addons/addon-webgl/test/WebglTuiStress.test.ts

@@ -1,152 +0,0 @@
-/**
- * Copyright (c) 2025 The xterm.js authors. All rights reserved.
- * @license MIT
- *
- * WebGL "heavy TUI" stress tests: large scrollback + scrolling, alternate-buffer
- * full-screen redraws (like an agent CLI animating output), high-volume
- * rendering and replay of recorded real-world TUI sessions (vim, colored ls).
- *
- * The shared invariant: a known reference row of glyphs, captured in a fresh
- * atlas, must still render identically after the stress workload. If the WebGL
- * texture atlas is corrupted by the workload the reference glyphs change and the
- * test fails. See microsoft/vscode#322756.
- *
- * Chromium + SwiftShader only (additive scope; Firefox/WebKit WebGL are broken
- * in CI per xtermjs#5854).
- */
-
-import { readFileSync } from 'fs';
-import test, { expect } from '@playwright/test';
-import { ITestContext, createTestContext, openTerminal } from '../../../test/playwright/TestUtils';
-import {
-  assertTextureAtlasPresent,
-  captureRowSignatures,
-  expectSignatureMatches,
-  loadWebglStrict,
-  waitForRender,
-  writeAndWaitForRender
-} from '../../../test/playwright/RendererTestUtils';
-import { generateMixedGlyphBlock, generateSyntheticTuiFrames, generateUniqueGlyphFlood } from '../../../test/playwright/SyntheticTui';
-
-const REFERENCE_COLS = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
-const REFERENCE_LINE = 'Ref0123456789ABCDEF';
-
-let ctx: ITestContext;
-test.beforeAll(async ({ browser }) => {
-  ctx = await createTestContext(browser);
-});
-test.afterAll(async () => await ctx.page.close());
-
-test.describe('WebGL heavy TUI / scrolling stress', () => {
-  test.skip(({ browserName }) => browserName !== 'chromium', 'WebGL stress tests run on Chromium/SwiftShader only');
-
-  test.beforeEach(async () => {
-    await openTerminal(ctx, { cols: 80, rows: 24, scrollback: 5000 });
-    await loadWebglStrict(ctx);
-  });
-
-  test('reference glyphs survive heavy scrolling through large scrollback', async () => {
-    await writeAndWaitForRender(ctx, `${REFERENCE_LINE}\r\n`);
-    const reference = await captureRowSignatures(ctx, 1, REFERENCE_COLS);
-
-    // Push the reference far up into scrollback with thousands of varied glyphs.
-    for (let i = 0; i < 20; i++) {
-      await ctx.proxy.write(generateMixedGlyphBlock(i + 1, 30, 70));
-    }
-    await waitForRender(ctx);
-
-    // Scroll around, then back to the very top where the reference lives.
-    await ctx.proxy.scrollToTop();
-    await waitForRender(ctx);
-    await ctx.proxy.scrollPages(3);
-    await waitForRender(ctx);
-    await ctx.proxy.scrollToTop();
-    await waitForRender(ctx);
-
-    const after = await captureRowSignatures(ctx, 1, REFERENCE_COLS);
-    for (let i = 0; i < REFERENCE_COLS.length; i++) {
-      expectSignatureMatches(after[i], reference[i], 14, `reference glyph at col ${REFERENCE_COLS[i]} corrupted after heavy scrolling`);
-    }
-  });
-
-  test('alternate-buffer TUI redraws do not corrupt the restored primary buffer', async () => {
-    // Reference content lives in the PRIMARY buffer.
-    await writeAndWaitForRender(ctx, `${REFERENCE_LINE}`);
-    const reference = await captureRowSignatures(ctx, 1, REFERENCE_COLS);
-
-    // Animate a synthetic agent TUI in the alternate buffer.
-    const frames = generateSyntheticTuiFrames({ seed: 7, frames: 30, cols: 80, rows: 24, useAltBuffer: true });
-    for (const frame of frames) {
-      await ctx.proxy.write(frame);
-    }
-    await waitForRender(ctx);
-    await assertTextureAtlasPresent(ctx);
-
-    // Back in the primary buffer the reference glyphs must be intact.
-    await ctx.proxy.refresh(0, (await ctx.proxy.rows) - 1);
-    await waitForRender(ctx);
-    const after = await captureRowSignatures(ctx, 1, REFERENCE_COLS);
-    for (let i = 0; i < REFERENCE_COLS.length; i++) {
-      expectSignatureMatches(after[i], reference[i], 14, `primary-buffer glyph at col ${REFERENCE_COLS[i]} corrupted by alt-buffer TUI redraws`);
-    }
-  });
-
-  test('reference glyphs survive a heavy mixed render + unique-glyph churn', async () => {
-    // Capture the reference rendering of a known line in a fresh atlas.
-    await writeAndWaitForRender(ctx, `${REFERENCE_LINE}`);
-    const reference = await captureRowSignatures(ctx, 1, REFERENCE_COLS);
-
-    // High-volume rendering: synthetic TUI frames (which clear/redraw the screen)
-    // plus a large unique-glyph flood to churn the atlas, mimicking a long agent
-    // CLI session.
-    const frames = generateSyntheticTuiFrames({ seed: 3, frames: 40, cols: 80, rows: 24 });
-    for (const frame of frames) {
-      await ctx.proxy.write(frame);
-    }
-    await ctx.proxy.write(generateUniqueGlyphFlood(3000, 80));
-    await waitForRender(ctx);
-
-    // The synthetic frames erase the screen, so re-render the reference line and
-    // assert the (heavily churned) atlas still draws those glyphs correctly.
-    await writeAndWaitForRender(ctx, `\x1b[2J\x1b[H${REFERENCE_LINE}`);
-    const after = await captureRowSignatures(ctx, 1, REFERENCE_COLS);
-    for (let i = 0; i < REFERENCE_COLS.length; i++) {
-      expectSignatureMatches(after[i], reference[i], 14, `reference glyph at col ${REFERENCE_COLS[i]} corrupted after heavy render`);
-    }
-  });
-
-  test('replaying recorded TUI sessions renders without errors or atlas corruption', async () => {
-    const pageErrors: string[] = [];
-    const onError = (err: Error): void => {
-      pageErrors.push(err.message);
-    };
-    ctx.page.on('pageerror', onError);
-    try {
-      const fixtures = [
-        './test/fixtures/escape_sequence_files/t0090-alt_screen.in',
-        './test/fixtures/escape_sequence_files/t0502-bash_ls_color.in',
-        './test/fixtures/escape_sequence_files/t0500-bash_long_line.in',
-        './test/fixtures/escape_sequence_files/t0504-vim.in'
-      ];
-      for (const fixture of fixtures) {
-        const data = readFileSync(fixture, { encoding: 'latin1' });
-        await ctx.proxy.write(data);
-      }
-      await waitForRender(ctx);
-      await assertTextureAtlasPresent(ctx);
-
-      // Re-rendering the final frame must be idempotent (self-consistent): if the
-      // atlas were corrupted, a forced redraw would differ from what's shown.
-      const before = await captureRowSignatures(ctx, 1, REFERENCE_COLS);
-      await ctx.proxy.refresh(0, (await ctx.proxy.rows) - 1);
-      await waitForRender(ctx);
-      const after = await captureRowSignatures(ctx, 1, REFERENCE_COLS);
-      for (let i = 0; i < REFERENCE_COLS.length; i++) {
-        expectSignatureMatches(after[i], before[i], 14, `fixture replay frame not self-consistent at col ${REFERENCE_COLS[i]}`);
-      }
-      expect(pageErrors, `no page errors during fixture replay, got: ${pageErrors.join(', ')}`).toEqual([]);
-    } finally {
-      ctx.page.off('pageerror', onError);
-    }
-  });
-});

addons/addon-webgl/test/WebglVisual.test.ts

@@ -1,65 +0,0 @@
-/**
- * Copyright (c) 2025 The xterm.js authors. All rights reserved.
- * @license MIT
- * Produces BEFORE/AFTER screenshots of a single terminal under merge-heavy
- * churn for manual inspection (before.png / after.png, mono-*.png). On current
- * master the single-terminal merge path is healthy, so the pinned header lines
- * are expected to remain readable in the "after" images; a corrupted header in
- * these captures indicates a renderer regression. Note the mono "after" body is
- * SUPPOSED to look like glyph soup — that is the mixed box-drawing/braille
- * payload rendered faithfully, not corruption.
- */
-import test from '@playwright/test';
-import { ITestContext, createTestContext, openTerminal } from '../../../test/playwright/TestUtils';
-import { loadWebglStrict, setMaxAtlasPages, writeAndWaitForRender } from '../../../test/playwright/RendererTestUtils';
-import { generateColoredAsciiFlood, generateMixedGlyphBlock } from '../../../test/playwright/SyntheticTui';
-
-test.describe('visual #322756', () => {
-  test.skip(({ browserName }) => browserName !== 'chromium');
-  test.describe.configure({ timeout: 60000 });
-
-  test('capture before/after pinned header under merge churn', async ({ browser }) => {
-    const ctx: ITestContext = await createTestContext(browser);
-    await openTerminal(ctx, { cols: 80, rows: 24 });
-    await loadWebglStrict(ctx);
-    await setMaxAtlasPages(ctx, 4);
-    const screen = ctx.page.locator('#terminal-container .xterm-screen');
-    // Header + readable sentences pinned at top; body region churns below.
-    await writeAndWaitForRender(ctx, '\x1b[?1049h\x1b[H\x1b[97mHEADER: THE QUICK BROWN FOX 0123456789\r\nSTATUS: this line should stay readable\r\n');
-    await screen.screenshot({ path: 'out-esbuild-test/playwright/before.png' });
-    for (let c = 0; c < 30; c++) {
-      await writeAndWaitForRender(ctx, '\x1b[5;1H' + generateColoredAsciiFlood(20 * 78, c * 20 * 78));
-    }
-    await screen.screenshot({ path: 'out-esbuild-test/playwright/after.png' });
-    await ctx.page.close();
-  });
-
-  // Issue-like framing: prefill realistic CLI text, force merges with a mixed
-  // glyph payload, then rewrite the top lines clean. The rewritten header lines
-  // must stay readable in mono-after.png.
-  test('capture mono before/after (issue-like)', async ({ browser }) => {
-    const ctx: ITestContext = await createTestContext(browser);
-    await openTerminal(ctx, { cols: 80, rows: 24 });
-    await loadWebglStrict(ctx);
-    await setMaxAtlasPages(ctx, 4);
-    const screen = ctx.page.locator('#terminal-container .xterm-screen');
-    // Prefill a screenful of normal-looking CLI output (all rendered fine).
-    await writeAndWaitForRender(ctx, '\x1b[?1049h\x1b[2J\x1b[H');
-    let pre = '';
-    for (let r = 0; r < 22; r++) {
-      pre += ` $ Shell inspect bundled MCP JSON schema for type enum values ${r} lines\r\n`;
-    }
-    await writeAndWaitForRender(ctx, pre);
-    await screen.screenshot({ path: 'out-esbuild-test/playwright/mono-before.png' });
-    // Overflow the atlas (cap=4) so pages MERGE while most rows keep their cells,
-    // then rewrite a few lines clean (like scroll/redraw).
-    for (let c = 0; c < 12; c++) {
-      let frame = '\x1b[3;1H';
-      frame += generateMixedGlyphBlock(c + 1, 18, 78);
-      await writeAndWaitForRender(ctx, frame);
-    }
-    await writeAndWaitForRender(ctx, '\x1b[1;1H\x1b[2K $ Shell grep installed Copilot CLI binary - 53 lines\r\n\x1b[2K Thought for 1s');
-    await screen.screenshot({ path: 'out-esbuild-test/playwright/mono-after.png' });
-    await ctx.page.close();
-  });
-});

addons/addon-webgl/typings/addon-webgl.d.ts

@@ -23,12 +23,12 @@ declare module '@xterm/addon-webgl' {
     public readonly onChangeTextureAtlas: IEvent<HTMLCanvasElement>;
 
     /**
-     * An event that is fired when a new page is added to the texture atlas.
+     * An event that is fired when the a new page is added to the texture atlas.
      */
     public readonly onAddTextureAtlasCanvas: IEvent<HTMLCanvasElement>;
 
     /**
-     * An event that is fired when a page is removed from the texture atlas.
+     * An event that is fired when the a page is removed from the texture atlas.
      */
     public readonly onRemoveTextureAtlasCanvas: IEvent<HTMLCanvasElement>;
 

bin/build_parser_wasm.sh

@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+# Copyright (c) 2026 The xterm.js authors. All rights reserved.
+# @license MIT
+set -euo pipefail
+ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+cd "$ROOT"
+
+if [[ ! -f src/common/parser/wasm/transition_table.h ]]; then
+  npm run build
+  node bin/gen_parser_transition_table.mjs
+fi
+
+WASM_DIR=src/common/parser/wasm
+OUT="$WASM_DIR/parser.wasm"
+
+# Apple Clang (Xcode CLT) has no wasm32 target; prefer Homebrew LLVM when needed.
+wasm_clang_has_target() {
+  "$1" --print-targets 2>/dev/null | grep -q 'wasm32'
+}
+
+resolve_wasm_toolchain() {
+  local clang_bin=clang
+  if wasm_clang_has_target clang; then
+    :
+  else
+    local llvm_prefix=""
+    if command -v brew >/dev/null 2>&1; then
+      llvm_prefix="$(brew --prefix llvm 2>/dev/null || true)"
+    fi
+    for prefix in "$llvm_prefix" /opt/homebrew/opt/llvm /usr/local/opt/llvm; do
+      if [[ -n "$prefix" && -x "$prefix/bin/clang" ]] && wasm_clang_has_target "$prefix/bin/clang"; then
+        clang_bin="$prefix/bin/clang"
+        local lld_prefix=""
+        if command -v brew >/dev/null 2>&1; then
+          lld_prefix="$(brew --prefix lld 2>/dev/null || true)"
+        fi
+        for lld_dir in "$lld_prefix/bin" /opt/homebrew/opt/lld/bin /usr/local/opt/lld/bin; do
+          if [[ -n "$lld_dir" && -x "$lld_dir/lld" ]]; then
+            PATH="$lld_dir:$(dirname "$clang_bin"):$PATH"
+            break
+          fi
+        done
+        PATH="$(dirname "$clang_bin"):$PATH"
+        break
+      fi
+    done
+    if ! wasm_clang_has_target "$clang_bin"; then
+      echo "error: no clang with wasm32 support found (macOS: brew install llvm lld)" >&2
+      exit 1
+    fi
+  fi
+  WASM_CLANG="$clang_bin"
+}
+
+resolve_wasm_toolchain
+
+"$WASM_CLANG" --target=wasm32-unknown-unknown -O2 -nostdlib -fuse-ld=lld \
+  -Wl,--no-entry \
+  -Wl,--export-memory \
+  -Wl,--export=reset \
+  -Wl,--export=scan \
+  -Wl,--export=probe_action \
+  -Wl,--export=set_state \
+  -Wl,--export=sync_params_from \
+  -Wl,--export=export_params_to \
+  -Wl,--export=get_params_len \
+  -Wl,--export=get_subparams_len \
+  -Wl,--export=get_subparams_ptr \
+  -Wl,--export=get_subparams_idx_ptr \
+  -Wl,--export=get_input_ptr \
+  -Wl,--export=get_kinds_ptr \
+  -Wl,--export=get_starts_ptr \
+  -Wl,--export=get_lengths_ptr \
+  -Wl,--export=get_aux_ptr \
+  -Wl,--export=get_param_starts_ptr \
+  -Wl,--export=get_param_counts_ptr \
+  -Wl,--export=get_params_ptr \
+  -Wl,--export=get_state_ptr \
+  -Wl,--export=get_header_ptr \
+  -Wl,--initial-memory=67108864 \
+  -Wl,--max-memory=67108864 \
+  "$WASM_DIR/parser.c" -o "$OUT"
+
+node bin/embed_parser_wasm.mjs
+
+echo "Built $OUT"

bin/embed_parser_wasm.mjs

@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) 2026 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
+import { readFileSync, writeFileSync } from 'fs';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const root = join(__dirname, '..');
+const wasm = readFileSync(join(root, 'src/common/parser/wasm/parser.wasm'));
+const b64 = wasm.toString('base64');
+
+const out = `/**
+ * Copyright (c) 2026 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+/** Base64-encoded parser.wasm (generated by bin/build_parser_wasm.sh) */
+export const PARSER_WASM_BASE64 = '${b64}';\n`;
+
+writeFileSync(join(root, 'src/common/parser/wasm/parser.wasm.embed.ts'), out);
+console.info(`Embedded parser.wasm (${wasm.length} bytes)`);

bin/esbuild_all.mjs

@@ -19,17 +19,14 @@ for (const addon of addons) {
 // Demo job - This requires the others to be built so it's not included when building all
 // jobs.push(createJob('demo-client', [`--demo-client`]));
 
-const codes = await Promise.all(jobs.map(job => {
+await Promise.all(jobs.map((job, i) => {
   return new Promise(r => {
     job.cp.on('exit', code => {
       log(`Finished \x1b[32m${job.name}\x1b[0m${code ? ' \x1b[31mwith errors\x1b[0m' : ''}`);
-      r(code ?? 1);
+      r(code);
     });
   });
 }));
-if (codes.some(code => code !== 0)) {
-  process.exit(1);
-}
 
 /**
  * @param {string} message

bin/gen_parser_transition_table.mjs

@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2026 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
+// @ts-check
+import { writeFileSync } from 'fs';
+import { fileURLToPath } from 'url';
+import { dirname, join } from 'path';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const root = join(__dirname, '..');
+
+// Import compiled transition table
+const { VT500_TRANSITION_TABLE } = await import(join(root, 'out/common/parser/EscapeSequenceParser.js'));
+
+const table = VT500_TRANSITION_TABLE.table;
+let out = '/* Auto-generated by bin/gen_parser_transition_table.mjs - do not edit */\n';
+out += `#ifndef PARSER_TRANSITION_TABLE_H\n#define PARSER_TRANSITION_TABLE_H\n\n`;
+out += `#include <stdint.h>\n\n`;
+out += `#define PARSER_TABLE_SIZE ${table.length}\n\n`;
+out += `static const uint16_t PARSER_TRANSITION_TABLE[PARSER_TABLE_SIZE] = {\n`;
+for (let i = 0; i < table.length; i++) {
+  if (i % 16 === 0) out += '  ';
+  out += `0x${table[i].toString(16)}`;
+  out += i < table.length - 1 ? ', ' : '';
+  if (i % 16 === 15) out += '\n';
+}
+if (table.length % 16 !== 0) out += '\n';
+out += `};\n\n#endif\n`;
+
+const headerPath = join(root, 'src/common/parser/wasm/transition_table.h');
+writeFileSync(headerPath, out);
+console.info(`Wrote ${headerPath} (${table.length} entries)`);

bin/setup-full.mjs

@@ -5,7 +5,7 @@ import { spawnSync } from 'node:child_process';
 import { basename, dirname, resolve, sep } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-const repoRoot = resolve(dirname(fileURLToPath(import.meta.url)), '..');
+const repoRoot = resolve(dirname(fileURLToPath(import.meta.url)), '../..');
 const nodeModulesPath = resolve(repoRoot, 'node_modules');
 const npmExecutable = process.platform === 'win32' ? 'npm.cmd' : 'npm';
 
@@ -13,7 +13,7 @@ const npmExecutable = process.platform === 'win32' ? 'npm.cmd' : 'npm';
 
 /** @param {string} message */
 function log(message) {
-  console.info(`[setup-full] ${message}`);
+  console.info(`[setup-fast] ${message}`);
 }
 
 /** @param {string[]} args */

bin/test_integration.js

@@ -12,7 +12,7 @@ let argv = process.argv.slice(2);
 let suiteFilter = undefined;
 while (argv.some(e => e.startsWith('--suite='))) {
   const i = argv.findIndex(e => e.startsWith('--suite='));
-  const match = argv[i].match(/--suite=(?<suitename>.+)/);
+  const match = argv[i].match(/--suite=(?<suitename>.+)/)
   suiteFilter = match?.groups?.suitename ?? undefined;
   argv.splice(i, 1);
 }
@@ -42,18 +42,12 @@ if (suiteFilter) {
   configs = configs.filter(e => e.name === suiteFilter);
 }
 
-if (suiteFilter && configs.length === 0) {
-  console.error(`Unknown suite: ${suiteFilter}`);
-  process.exit(1);
-}
-
 function npmBinScript(script) {
   return path.resolve(__dirname, `../node_modules/.bin/` + (process.platform === 'win32' ?
     `${script}.cmd` : script));
 }
 
 async function run() {
-  let exitCode = 0;
   for (const config of configs) {
     const command = npmBinScript('playwright');
     const args = ['test', '-c', config.path, ...argv];
@@ -68,13 +62,10 @@ async function run() {
 
     if (run.error) {
       console.error(run.error);
-      process.exit(run.status ?? 1);
+      process.exit(run.status ?? -1);
     }
 
-    if (run.status) {
-      exitCode = run.status;
-    }
+    process.exit(run.status);
   }
-  process.exit(exitCode);
 }
 run();

bin/test_mousemodes.js

@@ -177,7 +177,7 @@ const ENC = {
 }
 
 function printMenu() {
-  console.log('\x1b[2J\x1b[HTest mouse reports [Ctrl-C to exit]');
+  console.log('\x1b[2J\x1b\[HTest mouse reports [Ctrl-C to exit]');
   console.log();
   console.log('  Selected protocol [Ctrl-A to switch]');
   const protocols = Object.keys(PROTOCOLS);

bin/test_unit.js

@@ -21,7 +21,7 @@ if (process.argv.length > 2) {
   flagArgs = args.filter(e => e.startsWith('--'));
   // ability to inject particular test files via
   // npm run test [testFileA testFileB ...]
-  const files = args.filter(e => !e.startsWith('--'));
+  files = args.filter(e => !e.startsWith('--'));
   if (files.length) {
     testFiles = files;
   }
@@ -39,6 +39,8 @@ if (checkCoverage) {
     ...testFiles,
     ...flagArgs
   ];
+  console.info('executable', executable);
+  console.info('args', args);
   const run = cp.spawnSync(
     executable,
     args,
@@ -49,7 +51,7 @@ if (checkCoverage) {
       stdio: 'inherit'
     }
   );
-  process.exit(run.status ?? -1);
+  process.exit(run.status);
 }
 
 const run = cp.spawnSync(

demo/client/components/window/webglWindow.ts

@@ -11,33 +11,8 @@ export class WebglWindow extends BaseWindow implements IControlWindow {
   public readonly label = 'webgl';
 
   private _textureAtlasContainer!: HTMLElement;
-  private _stressRunning = false;
-  private _stressScrolling: HTMLInputElement | undefined;
 
   public build(container: HTMLElement): void {
-    const stressDiv = document.createElement('div');
-    const stressStart = document.createElement('button');
-    stressStart.id = 'stress-start';
-    stressStart.textContent = 'atlas stress start';
-    stressStart.addEventListener('click', () => this._stress());
-    stressDiv.appendChild(stressStart);
-
-    const stressStop = document.createElement('button');
-    stressStop.id = 'stress-stop';
-    stressStop.textContent = 'atlas stress stop';
-    stressStop.addEventListener('click', () => this._stressRunning = false);
-    stressDiv.appendChild(stressStop);
-
-    this._stressScrolling = document.createElement('input');
-    this._stressScrolling.type = 'checkbox';
-    this._stressScrolling.id = 'stress-scrolling';
-    stressDiv.appendChild(this._stressScrolling);
-    const stressScrollingLabel = document.createElement('label');
-    stressScrollingLabel.htmlFor = 'stress-scrolling';
-    stressScrollingLabel.textContent = 'stress scrolling';
-    stressDiv.appendChild(stressScrollingLabel);
-    container.appendChild(stressDiv);
-
     const zoomCheckbox = document.createElement('input');
     zoomCheckbox.type = 'checkbox';
     zoomCheckbox.id = 'texture-atlas-zoom';
@@ -73,33 +48,4 @@ export class WebglWindow extends BaseWindow implements IControlWindow {
     canvas.style.width = `${canvas.width / dpr}px`;
     canvas.style.height = `${canvas.height / dpr}px`;
   }
-
-  private async _stress(): Promise<void> {
-    const TEXT = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
-    if (this._stressRunning) {
-      return;
-    }
-    this._stressRunning = true;
-    const scrolling = !!(this._stressScrolling?.checked);
-    for (let r = 0; r < 256; r += 2) {
-      for (let g = 0; g < 256; g += 2) {
-        let s: string[] = [];
-        for (let b = 0; b < 256; b += 2) {
-          if (!this._stressRunning) {
-            return;
-          }
-          const rbg = `RGB: ${[r, g, b]}`;
-          s.push(`\r\x1b[38;2;${r};${g};${b}m${rbg.padEnd(18, ' ')}${TEXT}`);
-          if (s.length >= 16) {
-            if (scrolling) {
-              await new Promise<void>(r => this._terminal.write(s.join('\r\n') + '\r\n', r));
-            } else {
-              await new Promise<void>(r => this._terminal.write('\x1b[H' + s.join('\r\n'), r));
-            }
-            s = [];
-          }
-        }
-      }
-    }
-  }
 }

package-lock.json

@@ -663,9 +663,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.1.tgz",
-      "integrity": "sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.0.tgz",
+      "integrity": "sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA==",
       "cpu": [
         "ppc64"
       ],
@@ -680,9 +680,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.1.tgz",
-      "integrity": "sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.0.tgz",
+      "integrity": "sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ==",
       "cpu": [
         "arm"
       ],
@@ -697,9 +697,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.1.tgz",
-      "integrity": "sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.0.tgz",
+      "integrity": "sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw==",
       "cpu": [
         "arm64"
       ],
@@ -714,9 +714,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.1.tgz",
-      "integrity": "sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.0.tgz",
+      "integrity": "sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA==",
       "cpu": [
         "x64"
       ],
@@ -731,9 +731,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.1.tgz",
-      "integrity": "sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.0.tgz",
+      "integrity": "sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q==",
       "cpu": [
         "arm64"
       ],
@@ -748,9 +748,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.1.tgz",
-      "integrity": "sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.0.tgz",
+      "integrity": "sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ==",
       "cpu": [
         "x64"
       ],
@@ -765,9 +765,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.1.tgz",
-      "integrity": "sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.0.tgz",
+      "integrity": "sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q==",
       "cpu": [
         "arm64"
       ],
@@ -782,9 +782,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.1.tgz",
-      "integrity": "sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.0.tgz",
+      "integrity": "sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw==",
       "cpu": [
         "x64"
       ],
@@ -799,9 +799,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.1.tgz",
-      "integrity": "sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.0.tgz",
+      "integrity": "sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw==",
       "cpu": [
         "arm"
       ],
@@ -816,9 +816,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.1.tgz",
-      "integrity": "sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.0.tgz",
+      "integrity": "sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A==",
       "cpu": [
         "arm64"
       ],
@@ -833,9 +833,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.1.tgz",
-      "integrity": "sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.0.tgz",
+      "integrity": "sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ==",
       "cpu": [
         "ia32"
       ],
@@ -850,9 +850,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.1.tgz",
-      "integrity": "sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.0.tgz",
+      "integrity": "sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg==",
       "cpu": [
         "loong64"
       ],
@@ -867,9 +867,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.1.tgz",
-      "integrity": "sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.0.tgz",
+      "integrity": "sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w==",
       "cpu": [
         "mips64el"
       ],
@@ -884,9 +884,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.1.tgz",
-      "integrity": "sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.0.tgz",
+      "integrity": "sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg==",
       "cpu": [
         "ppc64"
       ],
@@ -901,9 +901,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.1.tgz",
-      "integrity": "sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.0.tgz",
+      "integrity": "sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ==",
       "cpu": [
         "riscv64"
       ],
@@ -918,9 +918,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.1.tgz",
-      "integrity": "sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.0.tgz",
+      "integrity": "sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q==",
       "cpu": [
         "s390x"
       ],
@@ -935,9 +935,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.1.tgz",
-      "integrity": "sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.0.tgz",
+      "integrity": "sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ==",
       "cpu": [
         "x64"
       ],
@@ -952,9 +952,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.1.tgz",
-      "integrity": "sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.0.tgz",
+      "integrity": "sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw==",
       "cpu": [
         "arm64"
       ],
@@ -969,9 +969,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.1.tgz",
-      "integrity": "sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.0.tgz",
+      "integrity": "sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw==",
       "cpu": [
         "x64"
       ],
@@ -986,9 +986,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.1.tgz",
-      "integrity": "sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.0.tgz",
+      "integrity": "sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g==",
       "cpu": [
         "arm64"
       ],
@@ -1003,9 +1003,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.1.tgz",
-      "integrity": "sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.0.tgz",
+      "integrity": "sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA==",
       "cpu": [
         "x64"
       ],
@@ -1020,9 +1020,9 @@
       }
     },
     "node_modules/@esbuild/openharmony-arm64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.1.tgz",
-      "integrity": "sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.0.tgz",
+      "integrity": "sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w==",
       "cpu": [
         "arm64"
       ],
@@ -1037,9 +1037,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.1.tgz",
-      "integrity": "sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.0.tgz",
+      "integrity": "sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw==",
       "cpu": [
         "x64"
       ],
@@ -1054,9 +1054,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.1.tgz",
-      "integrity": "sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.0.tgz",
+      "integrity": "sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA==",
       "cpu": [
         "arm64"
       ],
@@ -1071,9 +1071,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.1.tgz",
-      "integrity": "sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.0.tgz",
+      "integrity": "sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA==",
       "cpu": [
         "ia32"
       ],
@@ -1088,9 +1088,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.1.tgz",
-      "integrity": "sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.0.tgz",
+      "integrity": "sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw==",
       "cpu": [
         "x64"
       ],
@@ -3869,9 +3869,9 @@
       "license": "MIT"
     },
     "node_modules/esbuild": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.1.tgz",
-      "integrity": "sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.0.tgz",
+      "integrity": "sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -3882,32 +3882,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.28.1",
-        "@esbuild/android-arm": "0.28.1",
-        "@esbuild/android-arm64": "0.28.1",
-        "@esbuild/android-x64": "0.28.1",
-        "@esbuild/darwin-arm64": "0.28.1",
-        "@esbuild/darwin-x64": "0.28.1",
-        "@esbuild/freebsd-arm64": "0.28.1",
-        "@esbuild/freebsd-x64": "0.28.1",
-        "@esbuild/linux-arm": "0.28.1",
-        "@esbuild/linux-arm64": "0.28.1",
-        "@esbuild/linux-ia32": "0.28.1",
-        "@esbuild/linux-loong64": "0.28.1",
-        "@esbuild/linux-mips64el": "0.28.1",
-        "@esbuild/linux-ppc64": "0.28.1",
-        "@esbuild/linux-riscv64": "0.28.1",
-        "@esbuild/linux-s390x": "0.28.1",
-        "@esbuild/linux-x64": "0.28.1",
-        "@esbuild/netbsd-arm64": "0.28.1",
-        "@esbuild/netbsd-x64": "0.28.1",
-        "@esbuild/openbsd-arm64": "0.28.1",
-        "@esbuild/openbsd-x64": "0.28.1",
-        "@esbuild/openharmony-arm64": "0.28.1",
-        "@esbuild/sunos-x64": "0.28.1",
-        "@esbuild/win32-arm64": "0.28.1",
-        "@esbuild/win32-ia32": "0.28.1",
-        "@esbuild/win32-x64": "0.28.1"
+        "@esbuild/aix-ppc64": "0.28.0",
+        "@esbuild/android-arm": "0.28.0",
+        "@esbuild/android-arm64": "0.28.0",
+        "@esbuild/android-x64": "0.28.0",
+        "@esbuild/darwin-arm64": "0.28.0",
+        "@esbuild/darwin-x64": "0.28.0",
+        "@esbuild/freebsd-arm64": "0.28.0",
+        "@esbuild/freebsd-x64": "0.28.0",
+        "@esbuild/linux-arm": "0.28.0",
+        "@esbuild/linux-arm64": "0.28.0",
+        "@esbuild/linux-ia32": "0.28.0",
+        "@esbuild/linux-loong64": "0.28.0",
+        "@esbuild/linux-mips64el": "0.28.0",
+        "@esbuild/linux-ppc64": "0.28.0",
+        "@esbuild/linux-riscv64": "0.28.0",
+        "@esbuild/linux-s390x": "0.28.0",
+        "@esbuild/linux-x64": "0.28.0",
+        "@esbuild/netbsd-arm64": "0.28.0",
+        "@esbuild/netbsd-x64": "0.28.0",
+        "@esbuild/openbsd-arm64": "0.28.0",
+        "@esbuild/openbsd-x64": "0.28.0",
+        "@esbuild/openharmony-arm64": "0.28.0",
+        "@esbuild/sunos-x64": "0.28.0",
+        "@esbuild/win32-arm64": "0.28.0",
+        "@esbuild/win32-ia32": "0.28.0",
+        "@esbuild/win32-x64": "0.28.0"
       }
     },
     "node_modules/escalade": {
@@ -6689,6 +6689,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
     "node_modules/range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@@ -6922,6 +6932,27 @@
         "tslib": "^2.1.0"
       }
     },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -7047,13 +7078,13 @@
       }
     },
     "node_modules/serialize-javascript": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-7.0.5.tgz",
-      "integrity": "sha512-F4LcB0UqUl1zErq+1nYEEzSHJnIwb3AF2XWB94b+afhrekOUijwooAYqFyRbjYkm2PAKBabx6oYv/xDxNi8IBw==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
       "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=20.0.0"
+      "dependencies": {
+        "randombytes": "^2.1.0"
       }
     },
     "node_modules/serve-static": {

package.json

@@ -11,9 +11,6 @@
   "workspaces": [
     "addons/*"
   ],
-  "overrides": {
-    "serialize-javascript": "^7.0.3"
-  },
   "keywords": [
     "cli",
     "command-line",
@@ -37,6 +34,7 @@
     "start": "node demo/start",
     "dev": "concurrently -k -p [{name}] -n tsc,esbuild,esbuild-demo-client,esbuild-demo-server,server -c blue,yellow,cyan,green,magenta \"npm:tsc-watch\" \"npm:esbuild-watch\" \"npm:esbuild-demo-client-watch\" \"npm:esbuild-demo-server-watch\" \"npm:start\"",
     "build": "npm run tsc",
+    "build:parser-wasm": "bash bin/build_parser_wasm.sh",
     "watch": "npm run tsc-watch",
     "tsc": "tsgo -b ./tsconfig.all.json",
     "tsc-watch": "tsgo -b -w ./tsconfig.all.json --preserveWatchOutput",
@@ -64,9 +62,9 @@
     "test-integration-firefox": "node ./bin/test_integration.js --workers=75% \"--project=FirefoxStable\"",
     "test-integration-webkit": "node ./bin/test_integration.js --workers=75% \"--project=WebKit\"",
     "test-integration-debug": "node ./bin/test_integration.js  --workers=1 --headed --timeout=30000",
-    "benchmark": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json",
-    "benchmark-baseline": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json --baseline out-test/benchmark/*benchmark.js",
-    "benchmark-eval": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json --eval out-test/benchmark/*benchmark.js",
+    "benchmark": "xterm-benchmark -r 5 -c test/benchmark/benchmark.json",
+    "benchmark-baseline": "xterm-benchmark -r 5 -c test/benchmark/benchmark.json --baseline out-test/benchmark/*benchmark.js",
+    "benchmark-eval": "xterm-benchmark -r 5 -c test/benchmark/benchmark.json --eval out-test/benchmark/*benchmark.js",
     "clean": "rm -rf lib out addons/*/lib addons/*/out",
     "vtfeatures": "node bin/extract_vtfeatures.js src/*/*.ts src/*/*/*.ts src/*.ts addons/**/src/*.ts",
     "prepackage": "npm run build",

src/browser/CoreBrowserTerminal.ts

@@ -102,7 +102,7 @@ export class CoreBrowserTerminal extends CoreTerminal implements ITerminal {
   private _keyDownHandled: boolean = false;
 
   /**
-   * Records whether a keydown event has occurred since the last keyup event, i.e. whether a key
+   * Records whether a keydown event has occured since the last keyup event, i.e. whether a key
    * is currently "pressed".
    */
   private _keyDownSeen: boolean = false;
@@ -505,7 +505,7 @@ export class CoreBrowserTerminal extends CoreTerminal implements ITerminal {
       this.textarea,
       parent.ownerDocument.defaultView ?? window,
       // Force unsafe null in node.js environment for tests
-      this._document ?? ((typeof window !== 'undefined') ? window.document : null as any)
+      this._document ?? (typeof window !== 'undefined') ? window.document : null as any
     ));
     this._instantiationService.setService(ICoreBrowserService, this._coreBrowserService);
 
@@ -1072,6 +1072,10 @@ export class CoreBrowserTerminal extends CoreTerminal implements ITerminal {
    * Clear the entire buffer, making the prompt line the new first line.
    */
   public clear(): void {
+    if (this.buffer.ybase === 0 && this.buffer.y === 0) {
+      // Don't clear if it's already clear
+      return;
+    }
     this.buffer.clearAllMarkers();
     this.buffer.lines.set(0, this.buffer.lines.get(this.buffer.ybase + this.buffer.y)!);
     this.buffer.lines.length = 1;

src/browser/OscLinkProvider.test.ts

@@ -8,8 +8,7 @@ import { OscLinkProvider } from './OscLinkProvider';
 import { ILink } from './Types';
 import { createCellData, MockBufferService, MockOptionsService } from '../common/TestUtils.test';
 import { IBufferService, IOscLinkService } from '../common/services/Services';
-import { IOscLinkData } from '../common/Types';
-import { IBufferLine } from '../common/buffer/Types';
+import { IBufferLine, IOscLinkData } from '../common/Types';
 
 class TestOscLinkService implements IOscLinkService {
   public serviceBrand: any;

src/browser/OscLinkProvider.ts

@@ -6,7 +6,7 @@
 import { IBufferRange, ILink } from './Types';
 import { ILinkProvider } from './services/Services';
 import { CellData } from '../common/buffer/CellData';
-import { IBufferLine } from '../common/buffer/Types';
+import { IBufferLine } from '../common/Types';
 import { IBufferService, IOptionsService, IOscLinkService } from '../common/services/Services';
 
 export class OscLinkProvider implements ILinkProvider {

src/browser/RenderDebouncer.ts

@@ -23,7 +23,7 @@ export class RenderDebouncer implements IRenderDebouncerWithCallback {
   }
 
   public dispose(): void {
-    if (this._animationFrame !== undefined) {
+    if (this._animationFrame) {
       this._coreBrowserService.window.cancelAnimationFrame(this._animationFrame);
       this._animationFrame = undefined;
     }
@@ -31,7 +31,9 @@ export class RenderDebouncer implements IRenderDebouncerWithCallback {
 
   public addRefreshCallback(callback: FrameRequestCallback): number {
     this._refreshCallbacks.push(callback);
-    this._animationFrame ??= this._coreBrowserService.window.requestAnimationFrame(() => this._innerRefresh());
+    if (!this._animationFrame) {
+      this._animationFrame = this._coreBrowserService.window.requestAnimationFrame(() => this._innerRefresh());
+    }
     return this._animationFrame;
   }
 
@@ -44,7 +46,7 @@ export class RenderDebouncer implements IRenderDebouncerWithCallback {
     this._rowStart = this._rowStart !== undefined ? Math.min(this._rowStart, rowStart) : rowStart;
     this._rowEnd = this._rowEnd !== undefined ? Math.max(this._rowEnd, rowEnd) : rowEnd;
 
-    if (this._animationFrame !== undefined) {
+    if (this._animationFrame) {
       return;
     }
 

src/browser/Terminal.test.ts

@@ -9,7 +9,7 @@ import { assert } from 'chai';
 import { DEFAULT_ATTR_DATA } from '../common/buffer/BufferLine';
 import { CellData } from '../common/buffer/CellData';
 import { MockUnicodeService, createCellData } from '../common/TestUtils.test';
-import { IMarker } from '../common/buffer/Types';
+import { IMarker } from '../common/Types';
 
 const INIT_COLS = 80;
 const INIT_ROWS = 24;

src/browser/TestUtils.test.ts

@@ -7,9 +7,8 @@ import { IDisposable, IMarker, ILinkProvider, IDecorationOptions, IDecoration, I
 import { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IMouseService, IRenderService, ISelectionService, IThemeService } from './services/Services';
 import { IRenderDimensions, IRenderer, IRequestRedrawEvent } from './renderer/shared/Types';
 import { IColorSet, ITerminal, ILinkifier2, IBrowser, IViewport, ICompositionHelper, CharacterJoinerHandler, IBufferRange, ReadonlyColorSet, IBufferElementProvider } from './Types';
-import { IAttributeData, IBuffer, IBufferLine, IBufferSet, ICellData } from '../common/buffer/Types';
-import { ICircularList } from '../common/CircularList';
-import { XtermListener, ICharset, ITerminalOptions, ColorIndex } from '../common/Types';
+import { IBuffer, IBufferSet } from '../common/buffer/Types';
+import { IBufferLine, ICellData, IAttributeData, ICircularList, XtermListener, ICharset, ITerminalOptions, ColorIndex } from '../common/Types';
 import { Buffer } from '../common/buffer/Buffer';
 import * as Browser from '../common/Platform';
 import { CoreBrowserTerminal } from './CoreBrowserTerminal';

src/browser/TimeBasedDebouncer.ts

@@ -3,10 +3,10 @@
  * @license MIT
  */
 
-import { IRenderDebouncer } from './Types';
-
 const RENDER_DEBOUNCE_THRESHOLD_MS = 1000; // 1 Second
 
+import { IRenderDebouncer } from './Types';
+
 /**
  * Debounces calls to update screen readers to update at most once configurable interval of time.
  */
@@ -31,9 +31,7 @@ export class TimeBasedDebouncer implements IRenderDebouncer {
   public dispose(): void {
     if (this._refreshTimeoutID) {
       clearTimeout(this._refreshTimeoutID);
-      this._refreshTimeoutID = undefined;
     }
-    this._additionalRefreshRequested = false;
   }
 
   public refresh(rowStart: number | undefined, rowEnd: number | undefined, rowCount: number): void {
@@ -49,12 +47,7 @@ export class TimeBasedDebouncer implements IRenderDebouncer {
     // enough time to pass before refreshing again.
     const refreshRequestTime: number = performance.now();
     if (refreshRequestTime - this._lastRefreshMs >= this._debounceThresholdMS) {
-      // Enough time has elapsed since the last refresh; refresh immediately
-      if (this._refreshTimeoutID !== undefined) {
-        clearTimeout(this._refreshTimeoutID);
-        this._refreshTimeoutID = undefined;
-        this._additionalRefreshRequested = false;
-      }
+      // Enough time has lapsed since the last refresh; refresh immediately
       this._lastRefreshMs = refreshRequestTime;
       this._innerRefresh();
     } else if (!this._additionalRefreshRequested) {

src/browser/Types.ts

@@ -3,9 +3,8 @@
  * @license MIT
  */
 
-import { IColor, ITerminalOptions } from '../common/Types';
-import { CharData, IBuffer } from '../common/buffer/Types';
-import { ICoreTerminal } from '../common/CoreTerminal';
+import { CharData, IColor, ICoreTerminal, ITerminalOptions } from '../common/Types';
+import { IBuffer } from '../common/buffer/Types';
 import { IDisposable, IRenderDimensions as IRenderDimensionsApi, Terminal as ITerminalApi } from '@xterm/xterm';
 import { channels, css } from '../common/Color';
 import type { IEvent } from '../common/Event';

src/browser/input/Mouse.ts

@@ -6,8 +6,8 @@
 export function getCoordsRelativeToElement(window: Pick<Window, 'getComputedStyle'>, event: {clientX: number, clientY: number}, element: HTMLElement): [number, number] {
   const rect = element.getBoundingClientRect();
   const elementStyle = window.getComputedStyle(element);
-  const leftPadding = parseInt(elementStyle.getPropertyValue('padding-left'), 10);
-  const topPadding = parseInt(elementStyle.getPropertyValue('padding-top'), 10);
+  const leftPadding = parseInt(elementStyle.getPropertyValue('padding-left'));
+  const topPadding = parseInt(elementStyle.getPropertyValue('padding-top'));
   return [
     event.clientX - rect.left - leftPadding,
     event.clientY - rect.top - topPadding
@@ -22,7 +22,7 @@ export function getCoordsRelativeToElement(window: Pick<Window, 'getComputedStyl
  * @param event The mouse event.
  * @param element The terminal's container element.
  * @param colCount The number of columns in the terminal.
- * @param rowCount The number of rows in the terminal.
+ * @param rowCount The number of rows n the terminal.
  * @param hasValidCharSize Whether there is a valid character size available.
  * @param cssCellWidth The cell width device pixel render dimensions.
  * @param cssCellHeight The cell height device pixel render dimensions.
@@ -31,17 +31,21 @@ export function getCoordsRelativeToElement(window: Pick<Window, 'getComputedStyl
  * select that cell and the right half will select the next cell.
  */
 export function getCoords(window: Pick<Window, 'getComputedStyle'>, event: Pick<MouseEvent, 'clientX' | 'clientY'>, element: HTMLElement, colCount: number, rowCount: number, hasValidCharSize: boolean, cssCellWidth: number, cssCellHeight: number, isSelection?: boolean): [number, number] | undefined {
-  // Coordinates cannot be measured if there is no valid character size.
+  // Coordinates cannot be measured if there are no valid
   if (!hasValidCharSize) {
     return undefined;
   }
 
   const coords = getCoordsRelativeToElement(window, event, element);
+  if (!coords) {
+    return undefined;
+  }
+
   coords[0] = Math.ceil((coords[0] + (isSelection ? cssCellWidth / 2 : 0)) / cssCellWidth);
   coords[1] = Math.ceil(coords[1] / cssCellHeight);
 
   // Ensure coordinates are within the terminal viewport. Note that selections
-  // need an additional point of precision to cover the end point (as characters
+  // need an addition point of precision to cover the end point (as characters
   // cover half of one char and half of the next).
   coords[0] = Math.min(Math.max(coords[0], 1), colCount + (isSelection ? 1 : 0));
   coords[1] = Math.min(Math.max(coords[1], 1), rowCount);

src/browser/input/MoveToCell.ts

@@ -156,7 +156,7 @@ function wrappedRowsForRow(currentRow: number, bufferService: IBufferService): n
  */
 function horizontalDirection(startX: number, startY: number, targetX: number, targetY: number, bufferService: IBufferService, applicationCursor: boolean): Direction {
   let startRow;
-  if (moveToRequestedRow(startY, targetY, bufferService, applicationCursor).length > 0) {
+  if (moveToRequestedRow(targetX, targetY, bufferService, applicationCursor).length > 0) {
     startRow = targetY - wrappedRowsForRow(targetY, bufferService);
   } else {
     startRow = startY;

src/browser/renderer/dom/DomRenderer.ts

@@ -536,14 +536,9 @@ export class DomRenderer extends Disposable implements IRenderer {
     for (let y = start; y <= end; y++) {
       const row = y + buffer.ydisp;
       const rowElement = this._rowElements[y];
-      if (!rowElement) {
-        continue;
-      }
       const lineData = buffer.lines.get(row);
-      if (!lineData) {
-        rowElement.replaceChildren();
-        this._setRowBlinkState(y, false);
-        continue;
+      if (!rowElement || !lineData) {
+        break;
       }
       rowElement.replaceChildren(
         ...this._rowFactory.createRow(
@@ -615,14 +610,9 @@ export class DomRenderer extends Disposable implements IRenderer {
     for (let i = y; i <= y2; ++i) {
       const row = i + buffer.ydisp;
       const rowElement = this._rowElements[i];
-      if (!rowElement) {
-        continue;
-      }
       const bufferline = buffer.lines.get(row);
-      if (!bufferline) {
-        rowElement.replaceChildren();
-        this._setRowBlinkState(i, false);
-        continue;
+      if (!rowElement || !bufferline) {
+        break;
       }
       rowElement.replaceChildren(
         ...this._rowFactory.createRow(
@@ -704,7 +694,7 @@ class CursorBlinkStateManager {
   }
 
   private _clearIdleTimer(): void {
-    if (this._idleTimeout !== undefined) {
+    if (this._idleTimeout) {
       this._coreBrowserService.window.clearTimeout(this._idleTimeout);
       this._idleTimeout = undefined;
     }

src/browser/renderer/dom/DomRendererRowFactory.test.ts

@@ -9,7 +9,7 @@ import { DomRendererRowFactory } from './DomRendererRowFactory';
 import { NULL_CELL_CODE, NULL_CELL_WIDTH, NULL_CELL_CHAR, DEFAULT_ATTR, FgFlags, BgFlags, Attributes, UnderlineStyle } from '../../../common/buffer/Constants';
 import { BufferLine, DEFAULT_ATTR_DATA } from '../../../common/buffer/BufferLine';
 import { BufferLineStringCache } from '../../../common/buffer/BufferLineStringCache';
-import { IBufferLine } from '../../../common/buffer/Types';
+import { IBufferLine } from '../../../common/Types';
 import { CellData } from '../../../common/buffer/CellData';
 import { MockCoreService, MockDecorationService, MockOptionsService, createCellData, NULL_CELL_DATA } from '../../../common/TestUtils.test';
 import { MockCharacterJoinerService, MockCoreBrowserService, MockThemeService } from '../../TestUtils.test';

src/browser/renderer/dom/DomRendererRowFactory.ts

@@ -3,8 +3,7 @@
  * @license MIT
  */
 
-import { IColor } from '../../../common/Types';
-import { IBufferLine, ICellData } from '../../../common/buffer/Types';
+import { IBufferLine, ICellData, IColor } from '../../../common/Types';
 import { INVERTED_DEFAULT_COLOR } from '../shared/Constants';
 import { WHITESPACE_CELL_CHAR, Attributes } from '../../../common/buffer/Constants';
 import { CellData } from '../../../common/buffer/CellData';

src/browser/scrollable/mouseEvent.ts

@@ -217,7 +217,7 @@ export class StandardWheelEvent {
     let shouldFactorDPR: boolean = false;
     if (platform.isChrome) {
       const chromeVersionMatch = navigator.userAgent.match(/Chrome\/(\d+)/);
-      const chromeMajorVersion = chromeVersionMatch ? parseInt(chromeVersionMatch[1], 10) : 123;
+      const chromeMajorVersion = chromeVersionMatch ? parseInt(chromeVersionMatch[1]) : 123;
       shouldFactorDPR = chromeMajorVersion <= 122;
     }
 

src/browser/selection/SelectionModel.test.ts

@@ -64,13 +64,6 @@ describe('SelectionModel', () => {
       assert.deepEqual(model.finalSelectionStart, undefined);
       assert.deepEqual(model.finalSelectionEnd, undefined);
     });
-    it('should reset selection start to origin when start row is trimmed', () => {
-      model.selectionStart = [50, 0];
-      model.selectionEnd = [10, 2];
-      assert.equal(model.handleTrim(1), true);
-      assert.deepEqual(model.finalSelectionStart, [0, 0]);
-      assert.deepEqual(model.finalSelectionEnd, [10, 1]);
-    });
   });
 
   describe('finalSelectionStart', () => {

src/browser/selection/SelectionModel.ts

@@ -135,10 +135,9 @@ export class SelectionModel {
       return true;
     }
 
-    // If the selection start row is trimmed away, reset to the buffer origin.
+    // If the selection start is trimmed, ensure the start column is 0.
     if (this.selectionStart && this.selectionStart[1] < 0) {
-      this.selectionStart = [0, 0];
-      return true;
+      this.selectionStart[1] = 0;
     }
     return false;
   }

src/browser/services/CharacterJoinerService.test.ts

@@ -8,7 +8,7 @@ import { ICharacterJoinerService } from './Services';
 import { CharacterJoinerService } from './CharacterJoinerService';
 import { BufferLine } from '../../common/buffer/BufferLine';
 import { BufferLineStringCache } from '../../common/buffer/BufferLineStringCache';
-import { IBufferLine } from '../../common/buffer/Types';
+import { IBufferLine } from '../../common/Types';
 import { CellData } from '../../common/buffer/CellData';
 import { MockBufferService, createCellData } from '../../common/TestUtils.test';
 

src/browser/services/CharacterJoinerService.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { CharData, IBufferLine, ICellData } from '../../common/buffer/Types';
+import { IBufferLine, ICellData, CharData } from '../../common/Types';
 import { ICharacterJoiner } from '../Types';
 import { AttributeData } from '../../common/buffer/AttributeData';
 import { WHITESPACE_CELL_CHAR, Content } from '../../common/buffer/Constants';
@@ -100,7 +100,6 @@ export class CharacterJoinerService implements ICharacterJoinerService {
 
     const ranges: [number, number][] = [];
     const lineStr = line.translateToString(true);
-    const trimmedLength = line.getTrimmedLength();
 
     // Because some cells can be represented by multiple javascript characters,
     // we track the cell and the string indexes separately. This allows us to
@@ -112,7 +111,7 @@ export class CharacterJoinerService implements ICharacterJoinerService {
     let rangeAttrFG = line.getFg(0);
     let rangeAttrBG = line.getBg(0);
 
-    for (let x = 0; x < trimmedLength; x++) {
+    for (let x = 0; x < line.getTrimmedLength(); x++) {
       line.loadCell(x, this._workCell);
 
       if (this._workCell.getWidth() === 0) {
@@ -148,7 +147,7 @@ export class CharacterJoinerService implements ICharacterJoinerService {
     }
 
     // Process any trailing ranges.
-    if (trimmedLength - rangeStartColumn > 1) {
+    if (this._bufferService.cols - rangeStartColumn > 1) {
       const joinedRanges = this._getJoinedRanges(
         lineStr,
         rangeStartStringIndex,
@@ -217,8 +216,7 @@ export class CharacterJoinerService implements ICharacterJoinerService {
       return;
     }
 
-    const trimmedLength = line.getTrimmedLength();
-    for (let x = startCol; x < trimmedLength; x++) {
+    for (let x = startCol; x < this._bufferService.cols; x++) {
       const width = line.getWidth(x);
       const length = line.getString(x).length || WHITESPACE_CELL_CHAR.length;
 
@@ -266,7 +264,7 @@ export class CharacterJoinerService implements ICharacterJoinerService {
     // If there is still a range left at the end, it must extend all the way to
     // the end of the line.
     if (currentRange) {
-      currentRange[1] = trimmedLength;
+      currentRange[1] = this._bufferService.cols;
     }
   }
 

src/browser/services/MouseService.test.ts

@@ -176,7 +176,7 @@ describe('MouseService _triggerMouseEvent', () => {
       for (let i = 0; i < bufferService.cols; ++i) {
         assert.equal(trigger({ col: i, row: 0, x: 0, y: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.DOWN }), true);
         if (i > 222) {
-          // suppress mouse reports if we are out of addressable range (max. 222)
+          // supress mouse reports if we are out of addressible range (max. 222)
           assert.deepEqual(toBytes(reports.pop()), []);
         } else {
           assert.deepEqual(toBytes(reports.pop()), [0x1b, 0x5b, 0x4d, 0x20, i + 33, 0x21]);
@@ -351,96 +351,3 @@ describe('MouseService mouseEventsRequireAlt', () => {
     assert.isFalse(element.classList.contains(MouseEventCssClasses.ENABLE_MOUSE_EVENTS));
   });
 });
-
-describe('MouseService multi-window', () => {
-  interface IRecordingDocument {
-    doc: Document;
-    added: string[];
-    removed: string[];
-    listeners: { [type: string]: EventListener[] };
-  }
-
-  function createRecordingDocument(): IRecordingDocument {
-    const added: string[] = [];
-    const removed: string[] = [];
-    const listeners: { [type: string]: EventListener[] } = {};
-    const doc = {
-      addEventListener: (type: string, listener: EventListener) => {
-        added.push(type);
-        (listeners[type] ??= []).push(listener);
-      },
-      removeEventListener: (type: string) => removed.push(type)
-    } as any;
-    return { doc, added, removed, listeners };
-  }
-
-  it('should manage protocol mouseup/mousemove listeners on the element\'s current document, not the document the terminal was opened with', () => {
-    const mouseStateService = new MouseStateService();
-    const optionsService = new OptionsService({});
-    const mouseService = new MouseService(
-      new MockRenderService(),
-      {
-        getMouseReportCoords: () => ({ col: 0, row: 0, x: 0, y: 0 })
-      } as any,
-      mouseStateService,
-      {
-        triggerDataEvent: () => {},
-        triggerBinaryEvent: () => {},
-        decPrivateModes: { applicationCursorKeys: false }
-      } as any,
-      bufferService,
-      optionsService,
-      new TestSelectionService(),
-      logService,
-      new MockCoreBrowserService()
-    );
-
-    // Simulate a terminal that was opened with one document but whose element now lives in
-    // another document (eg. it was moved to a child window)
-    const openDocument = createRecordingDocument();
-    const childDocument = createRecordingDocument();
-    const elementListeners: { [type: string]: EventListener[] } = {};
-    const element = {
-      classList: {
-        add: () => {},
-        remove: () => {},
-        contains: () => false
-      },
-      addEventListener: (type: string, listener: EventListener) => {
-        (elementListeners[type] ??= []).push(listener);
-      },
-      removeEventListener: () => {},
-      ownerDocument: childDocument.doc
-    } as any;
-
-    mouseService.bindMouse({
-      element,
-      screenElement: createTestMouseTargetElement(),
-      document: openDocument.doc
-    }, disposable => disposable, () => {});
-    mouseStateService.activeProtocol = 'ANY';
-
-    elementListeners['mousedown'][0]({
-      type: 'mousedown',
-      button: 0,
-      buttons: 1,
-      altKey: false,
-      ctrlKey: false,
-      shiftKey: false,
-      preventDefault: () => {}
-    } as any);
-    assert.deepEqual(childDocument.added, ['mouseup', 'mousemove']);
-    assert.deepEqual(openDocument.added, []);
-
-    childDocument.listeners['mouseup'][0]({
-      type: 'mouseup',
-      button: 0,
-      buttons: 0,
-      altKey: false,
-      ctrlKey: false,
-      shiftKey: false
-    } as any);
-    assert.deepEqual(childDocument.removed, ['mouseup', 'mousemove']);
-    assert.deepEqual(openDocument.removed, []);
-  });
-});

src/browser/services/MouseService.ts

@@ -7,7 +7,7 @@ import { addDisposableListener } from '../Dom';
 import { IBufferService, IMouseStateService, ICoreService, ILogService, IOptionsService } from '../../common/services/Services';
 import { CoreMouseAction, CoreMouseButton, CoreMouseEventType, ICoreMouseEvent, IDisposable } from '../../common/Types';
 import { C0 } from '../../common/data/EscapeSequences';
-import { DisposableStore, MutableDisposable } from '../../common/Lifecycle';
+import { DisposableStore, MutableDisposable, toDisposable } from '../../common/Lifecycle';
 import { ICoreBrowserService, IMouseCoordsService, IMouseService, IMouseServiceTarget, IRenderService, ISelectionService } from './Services';
 import { Gesture, EventType as GestureEventType, IGestureEvent } from '../scrollable/touch';
 
@@ -21,8 +21,6 @@ interface IMouseBindContext {
   readonly target: IMouseServiceTarget;
   readonly focus: () => void;
   readonly requestedEvents: RequestedMouseEvents;
-  readonly mouseupListener: MutableDisposable<IDisposable>;
-  readonly mousedragListener: MutableDisposable<IDisposable>;
 }
 
 export class MouseService implements IMouseService {
@@ -63,11 +61,7 @@ export class MouseService implements IMouseService {
       mousedrag: null,
       mousemove: null
     };
-    const mouseupListener = new MutableDisposable<IDisposable>();
-    const mousedragListener = new MutableDisposable<IDisposable>();
-    register(mouseupListener);
-    register(mousedragListener);
-    const ctx: IMouseBindContext = { target, focus, requestedEvents, mouseupListener, mousedragListener };
+    const ctx: IMouseBindContext = { target, focus, requestedEvents };
     const eventListeners: Record<'mouseup' | 'wheel' | 'mousedrag' | 'mousemove', EventListener> = {
       mouseup: (ev: Event) => this._handleMouseUp(ctx, ev as MouseEvent),
       wheel: (ev: Event) => this._handleWheel(ctx, ev as WheelEvent),
@@ -91,6 +85,16 @@ export class MouseService implements IMouseService {
     // force initial onProtocolChange so we dont miss early mouse requests
     this._mouseStateService.activeProtocol = this._mouseStateService.activeProtocol;
 
+    // Ensure document-level listeners are removed on dispose
+    register(toDisposable(() => {
+      if (requestedEvents.mouseup) {
+        document.removeEventListener('mouseup', requestedEvents.mouseup);
+      }
+      if (requestedEvents.mousedrag) {
+        document.removeEventListener('mousemove', requestedEvents.mousedrag);
+      }
+    }));
+
     /**
      * "Always on" event listeners.
      */
@@ -195,8 +199,12 @@ export class MouseService implements IMouseService {
     this._sendEvent(ctx, ev);
     if (!ev.buttons) {
       // if no other button is held remove global handlers
-      ctx.mouseupListener.clear();
-      ctx.mousedragListener.clear();
+      if (ctx.requestedEvents.mouseup) {
+        ctx.target.document.removeEventListener('mouseup', ctx.requestedEvents.mouseup);
+      }
+      if (ctx.requestedEvents.mousedrag) {
+        ctx.target.document.removeEventListener('mousemove', ctx.requestedEvents.mousedrag);
+      }
     }
   }
 
@@ -238,14 +246,11 @@ export class MouseService implements IMouseService {
     // of the terminal element.
     // Note: Other emulators also do this for 'mousedown' while a button
     // is held, we currently limit 'mousedown' to the terminal only.
-    // Use the element's current document in case it moved to another window after open.
-    const { element, document: targetDocument } = ctx.target;
-    const listenerDocument = element.ownerDocument ?? targetDocument;
     if (ctx.requestedEvents.mouseup) {
-      ctx.mouseupListener.value = addDisposableListener(listenerDocument, 'mouseup', ctx.requestedEvents.mouseup);
+      ctx.target.document.addEventListener('mouseup', ctx.requestedEvents.mouseup);
     }
     if (ctx.requestedEvents.mousedrag) {
-      ctx.mousedragListener.value = addDisposableListener(listenerDocument, 'mousemove', ctx.requestedEvents.mousedrag);
+      ctx.target.document.addEventListener('mousemove', ctx.requestedEvents.mousedrag);
     }
   }
 
@@ -393,7 +398,7 @@ export class MouseService implements IMouseService {
   }
 
   private _handleProtocolChange(ctx: IMouseBindContext, eventListeners: Record<'mouseup' | 'wheel' | 'mousedrag' | 'mousemove', EventListener>, events: CoreMouseEventType): void {
-    const { element } = ctx.target;
+    const { element, document } = ctx.target;
     const { requestedEvents } = ctx;
     // apply global changes on events
     if (events) {
@@ -428,14 +433,18 @@ export class MouseService implements IMouseService {
     }
 
     if (!(events & CoreMouseEventType.UP)) {
-      ctx.mouseupListener.clear();
+      if (requestedEvents.mouseup) {
+        document.removeEventListener('mouseup', requestedEvents.mouseup);
+      }
       requestedEvents.mouseup = null;
     } else {
       requestedEvents.mouseup ??= eventListeners.mouseup;
     }
 
     if (!(events & CoreMouseEventType.DRAG)) {
-      ctx.mousedragListener.clear();
+      if (requestedEvents.mousedrag) {
+        document.removeEventListener('mousemove', requestedEvents.mousedrag);
+      }
       requestedEvents.mousedrag = null;
     } else {
       requestedEvents.mousedrag ??= eventListeners.mousedrag;

src/browser/services/SelectionService.test.ts

@@ -6,13 +6,14 @@
 import { assert } from 'chai';
 import { SelectionService, SelectionMode } from './SelectionService';
 import { SelectionModel } from '../selection/SelectionModel';
-import { IBuffer, IBufferLine } from '../../common/buffer/Types';
+import { IBufferLine } from '../../common/Types';
 import { MockBufferService, MockOptionsService, MockCoreService, MockMouseStateService, createCellData } from '../../common/TestUtils.test';
 import { BufferLine } from '../../common/buffer/BufferLine';
 import { BufferLineStringCache } from '../../common/buffer/BufferLineStringCache';
 import { IBufferService, IOptionsService } from '../../common/services/Services';
 import { MockCoreBrowserService, MockMouseService, MockRenderService } from '../TestUtils.test';
 import { CellData } from '../../common/buffer/CellData';
+import { IBuffer } from '../../common/buffer/Types';
 import { IRenderService } from './Services';
 
 const TEST_STRING_CACHE = new BufferLineStringCache();

src/browser/services/SelectionService.ts

@@ -11,10 +11,10 @@ import { ISelectionRedrawRequestEvent, ISelectionRequestScrollLinesEvent } from
 import { ICoreBrowserService, IMouseCoordsService, IRenderService, ISelectionService } from './Services';
 import { Disposable, MutableDisposable, toDisposable } from '../../common/Lifecycle';
 import * as Browser from '../../common/Platform';
-import { IDisposable } from '../../common/Types';
-import { IBuffer, IBufferLine, ICellData } from '../../common/buffer/Types';
+import { IBufferLine, ICellData, IDisposable } from '../../common/Types';
 import { getRangeLength } from '../../common/buffer/BufferRange';
 import { CellData } from '../../common/buffer/CellData';
+import { IBuffer } from '../../common/buffer/Types';
 import { IBufferService, ICoreService, IMouseStateService, IOptionsService } from '../../common/services/Services';
 import { Emitter } from '../../common/Event';
 
@@ -704,7 +704,7 @@ export class SelectionService extends Disposable implements ISelectionService {
         if (this._activeSelectionMode !== SelectionMode.COLUMN) {
           this._model.selectionEnd[0] = this._bufferService.cols;
         }
-        this._model.selectionEnd[1] = Math.min(buffer.ydisp + this._bufferService.rows - 1, buffer.lines.length - 1);
+        this._model.selectionEnd[1] = Math.min(buffer.ydisp + this._bufferService.rows, buffer.lines.length - 1);
       } else {
         if (this._activeSelectionMode !== SelectionMode.COLUMN) {
           this._model.selectionEnd[0] = 0;

src/browser/services/ThemeService.ts

@@ -132,7 +132,7 @@ export class ThemeService extends Disposable implements IThemeService {
         colors.ansi[i + 16] = parseColor(theme.extendedAnsi[i], DEFAULT_ANSI_COLORS[i + 16]);
       }
     }
-    // Clear the cache
+    // Clear our the cache
     this._contrastCache.clear();
     this._halfContrastCache.clear();
     this._updateRestoreColors();

src/common/CircularList.ts

@@ -3,8 +3,9 @@
  * @license MIT
  */
 
+import { ICircularList } from './Types';
 import { Disposable } from './Lifecycle';
-import { Emitter, type IEvent } from './Event';
+import { Emitter } from './Event';
 
 export interface IInsertEvent {
   index: number;
@@ -16,28 +17,6 @@ export interface IDeleteEvent {
   amount: number;
 }
 
-export interface ICircularList<T> {
-  length: number;
-  maxLength: number;
-  isFull: boolean;
-
-  onDeleteEmitter: Emitter<IDeleteEvent>;
-  onDelete: IEvent<IDeleteEvent>;
-  onInsertEmitter: Emitter<IInsertEvent>;
-  onInsert: IEvent<IInsertEvent>;
-  onTrimEmitter: Emitter<number>;
-  onTrim: IEvent<number>;
-
-  get(index: number): T | undefined;
-  set(index: number, value: T): void;
-  push(value: T): void;
-  recycle(): T;
-  pop(): T | undefined;
-  splice(start: number, deleteCount: number, ...items: T[]): void;
-  trimStart(count: number): void;
-  shiftElements(start: number, count: number, offset: number): void;
-}
-
 /**
  * Represents a circular list; a list with a maximum size that wraps around when push is called,
  * overriding values at the start of the list.

src/common/Color.ts

@@ -177,9 +177,9 @@ export namespace css {
     // Formats: rgb() or rgba()
     const rgbaMatch = css.match(/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(,\s*(0|1|\d?\.(\d+))\s*)?\)/);
     if (rgbaMatch) {
-      $r = parseInt(rgbaMatch[1], 10);
-      $g = parseInt(rgbaMatch[2], 10);
-      $b = parseInt(rgbaMatch[3], 10);
+      $r = parseInt(rgbaMatch[1]);
+      $g = parseInt(rgbaMatch[2]);
+      $b = parseInt(rgbaMatch[3]);
       $a = Math.round((rgbaMatch[5] === undefined ? 1 : parseFloat(rgbaMatch[5])) * 0xFF);
       return channels.toColor($r, $g, $b, $a);
     }
@@ -373,7 +373,7 @@ export function toPaddedHex(c: number): string {
 /**
  * Gets the contrast ratio between two relative luminance values.
  * @param l1 The first relative luminance.
- * @param l2 The second relative luminance.
+ * @param l2 The first relative luminance.
  * @see https://www.w3.org/TR/WCAG20/#contrast-ratiodef
  */
 export function contrastRatio(l1: number, l2: number): number {

src/common/CoreTerminal.ts

@@ -21,20 +21,19 @@
  *   http://linux.die.net/man/7/urxvt
  */
 
-import { IInstantiationService, IOptionsService, IBufferService, ILogService, ICharsetService, ICoreService, IMouseStateService, IUnicodeService, LogLevelEnum, IOscLinkService } from './services/Services';
+import { IInstantiationService, IOptionsService, IBufferService, ILogService, ICharsetService, ICoreService, IMouseStateService, IUnicodeService, LogLevelEnum, ITerminalOptions, IOscLinkService } from './services/Services';
 import { InstantiationService } from './services/InstantiationService';
 import { LogService } from './services/LogService';
 import { BufferService, BufferServiceConstants } from './services/BufferService';
 import { OptionsService } from './services/OptionsService';
-import { IDisposable, IScrollEvent, ITerminalOptions, IParams } from './Types';
-import { IAttributeData, IBufferSet } from './buffer/Types';
+import { IDisposable, IAttributeData, ICoreTerminal, IScrollEvent } from './Types';
 import { CoreService } from './services/CoreService';
 import { MouseStateService } from './services/MouseStateService';
-import { UnicodeV6 } from './input/UnicodeV6';
 import { UnicodeService } from './services/UnicodeService';
 import { CharsetService } from './services/CharsetService';
 import { updateWindowsModeWrappedState } from './WindowsMode';
-import { IFunctionIdentifier } from './parser/Types';
+import { IFunctionIdentifier, IParams } from './parser/Types';
+import { IBufferSet } from './buffer/Types';
 import { InputHandler } from './InputHandler';
 import { WriteBuffer } from './input/WriteBuffer';
 import { OscLinkService } from './services/OscLinkService';
@@ -44,20 +43,6 @@ import { Disposable, MutableDisposable, toDisposable } from './Lifecycle';
 // Only trigger this warning a single time per session
 let hasWriteSyncWarnHappened = false;
 
-export interface ICoreTerminal {
-  mouseStateService: IMouseStateService;
-  coreService: ICoreService;
-  optionsService: IOptionsService;
-  unicodeService: IUnicodeService;
-  buffers: IBufferSet;
-  options: Required<ITerminalOptions>;
-  registerCsiHandler(id: IFunctionIdentifier, callback: (params: IParams) => boolean | Promise<boolean>): IDisposable;
-  registerDcsHandler(id: IFunctionIdentifier, callback: (data: string, param: IParams) => boolean | Promise<boolean>): IDisposable;
-  registerEscHandler(id: IFunctionIdentifier, callback: () => boolean | Promise<boolean>): IDisposable;
-  registerOscHandler(ident: number, callback: (data: string) => boolean | Promise<boolean>): IDisposable;
-  registerApcHandler(id: IFunctionIdentifier, callback: (data: string) => boolean | Promise<boolean>): IDisposable;
-}
-
 export abstract class CoreTerminal extends Disposable implements ICoreTerminal {
   protected readonly _instantiationService: IInstantiationService;
   protected readonly _bufferService: IBufferService;
@@ -131,7 +116,6 @@ export abstract class CoreTerminal extends Disposable implements ICoreTerminal {
     this.mouseStateService = this._register(this._instantiationService.createInstance(MouseStateService));
     this._instantiationService.setService(IMouseStateService, this.mouseStateService);
     this.unicodeService = this._register(this._instantiationService.createInstance(UnicodeService));
-    this.unicodeService.register(new UnicodeV6());
     this._instantiationService.setService(IUnicodeService, this.unicodeService);
     this._charsetService = this._instantiationService.createInstance(CharsetService);
     this._instantiationService.setService(ICharsetService, this._charsetService);

src/common/InputHandler.test.ts

@@ -5,8 +5,7 @@
 
 import { assert } from 'chai';
 import { InputHandler } from './InputHandler';
-import { IColorEvent, ColorRequestType, SpecialColorIndex } from './Types';
-import { IAttributeData, IBufferLine } from './buffer/Types';
+import { IBufferLine, IAttributeData, IColorEvent, ColorRequestType, SpecialColorIndex } from './Types';
 import { DEFAULT_ATTR_DATA } from './buffer/BufferLine';
 import { CellData } from './buffer/CellData';
 import { Attributes, BgFlags, UnderlineStyle } from './buffer/Constants';
@@ -16,10 +15,8 @@ import { MockCoreService, MockBufferService, MockOptionsService, MockLogService,
 import { IBufferService, ICoreService, type IOscLinkService } from './services/Services';
 import { DEFAULT_OPTIONS } from './services/OptionsService';
 import { BufferService } from './services/BufferService';
-import { CharsetService } from './services/CharsetService';
 import { CoreService } from './services/CoreService';
 import { OscLinkService } from './services/OscLinkService';
-import { CHARSETS } from './data/Charsets';
 
 
 function getCursor(bufferService: IBufferService): number[] {
@@ -641,38 +638,19 @@ describe('InputHandler', () => {
   });
   describe('print', () => {
     it('should not cause an infinite loop (regression test)', () => {
+      const inputHandler = new TestInputHandler(
+        new MockBufferService(80, 30),
+        new MockCharsetService(),
+        new MockCoreService(),
+        new MockLogService(),
+        new MockOptionsService(),
+        new MockOscLinkService(),
+        new MockMouseStateService(),
+        new MockUnicodeService()
+      );
       const container = new Uint32Array(10);
       container[0] = 0x200B;
-      const lineCountBefore = bufferService.buffer.lines.length;
       inputHandler.print(container, 0, 1);
-      assert.strictEqual(bufferService.buffer.y, 0);
-      assert.strictEqual(bufferService.buffer.lines.length, lineCountBefore);
-    });
-    it('should join combining characters in a single print', async () => {
-      await inputHandler.parseP('e\u0301');
-      assert.strictEqual(bufferService.buffer.translateBufferLineToString(0, true), 'e\u0301');
-      assert.strictEqual(bufferService.buffer.x, 1);
-    });
-    it('should join combining characters split across parse calls', async () => {
-      await inputHandler.parseP('e');
-      await inputHandler.parseP('\u0301');
-      assert.strictEqual(bufferService.buffer.translateBufferLineToString(0, true), 'e\u0301');
-      assert.strictEqual(bufferService.buffer.x, 1);
-    });
-    it('should repeat preceding grapheme cluster via REP', async () => {
-      await inputHandler.parseP('e\u0301\x1b[2b');
-      assert.strictEqual(bufferService.buffer.translateBufferLineToString(0, true), 'e\u0301e\u0301e\u0301');
-      assert.strictEqual(bufferService.buffer.x, 3);
-    });
-    it('should not repeat when REP has no preceding join state', async () => {
-      await inputHandler.parseP('\x1b[2b');
-      assert.strictEqual(bufferService.buffer.translateBufferLineToString(0, true), '');
-      assert.strictEqual(bufferService.buffer.x, 0);
-    });
-    it('should not repeat after an intervening escape sequence', async () => {
-      await inputHandler.parseP('a\x1b[0m\x1b[2b');
-      assert.strictEqual(bufferService.buffer.translateBufferLineToString(0, true), 'a');
-      assert.strictEqual(bufferService.buffer.x, 1);
     });
     it('should clear cells to the right on early wrap-around', async () => {
       bufferService.resize(5, 5);
@@ -689,49 +667,6 @@ describe('InputHandler', () => {
     });
   });
 
-  describe('ISO-2022 character sets', () => {
-    let charsetService: CharsetService;
-
-    beforeEach(() => {
-      charsetService = new CharsetService();
-      inputHandler = new TestInputHandler(
-        bufferService,
-        charsetService,
-        coreService,
-        new MockLogService(),
-        optionsService,
-        oscLinkService,
-        new MockMouseStateService(),
-        new MockUnicodeService()
-      );
-    });
-
-    it('should map G0 line drawing via ESC ( 0', async () => {
-      await inputHandler.parseP('\x1b(0q\x1b(Bq');
-      assert.strictEqual(bufferService.buffer.translateBufferLineToString(0, true), '\u2500q');
-    });
-
-    it('should map G1 line drawing after ESC ) 0 and SO', async () => {
-      await inputHandler.parseP('\x1b)0\x0eq\x0f\x1b(Bq');
-      assert.strictEqual(bufferService.buffer.translateBufferLineToString(0, true), '\u2500q');
-    });
-
-    it('should restore charset and glevel on ESC 7 / ESC 8', async () => {
-      await inputHandler.parseP('\x1b)0\x0e');
-      assert.strictEqual(charsetService.glevel, 1);
-      assert.strictEqual(charsetService.charset, CHARSETS['0']);
-      await inputHandler.parseP('\x1b7');
-      await inputHandler.parseP('\x0f\x1b(B');
-      assert.strictEqual(charsetService.glevel, 0);
-      assert.ok(charsetService.charset === undefined);
-      await inputHandler.parseP('\x1b8');
-      assert.strictEqual(charsetService.glevel, 1);
-      assert.strictEqual(charsetService.charset, CHARSETS['0']);
-      await inputHandler.parseP('q');
-      assert.strictEqual(bufferService.buffer.translateBufferLineToString(0, true), '\u2500');
-    });
-  });
-
   describe('alt screen', () => {
     let bufferService: IBufferService;
     let handler: TestInputHandler;
@@ -1246,19 +1181,6 @@ describe('InputHandler', () => {
       await inputHandler.parseP('\x1b[100;100H');
       assert.deepEqual(getCursor(bufferService), [9, 9]);
     });
-    it('cursor position (CUP) with DECOM and scroll margins', async () => {
-      await inputHandler.parseP('\x1b[?6h\x1b[2;3r\x1b[1;1H');
-      assert.deepEqual(getCursor(bufferService), [0, 1]);
-      await inputHandler.parseP('X');
-      assert.strictEqual(getLines(bufferService, 3)[1], 'X');
-      await inputHandler.parseP('\x1b[2;1H');
-      assert.deepEqual(getCursor(bufferService), [0, 2]);
-      await inputHandler.parseP('\x1b[10;10H');
-      assert.deepEqual(getCursor(bufferService), [9, 2]);
-      await inputHandler.parseP('\x1b[?6l');
-      await inputHandler.parseP('\x1b[2;1H');
-      assert.deepEqual(getCursor(bufferService), [0, 1]);
-    });
     it('horizontal position absolute (HPA)', async () => {
       await inputHandler.parseP('\x1b[`');
       assert.deepEqual(getCursor(bufferService), [0, 0]);
@@ -1318,7 +1240,7 @@ describe('InputHandler', () => {
       await inputHandler.parseP('\x1b[e');
       assert.deepEqual(getCursor(bufferService), [8, 5]);
     });
-    describe('should clamp cursor into addressable range', () => {
+    describe('should clamp cursor into addressible range', () => {
       it('CUF', async () => {
         bufferService.buffer.x = 10000;
         bufferService.buffer.y = 10000;

src/common/InputHandler.ts

@@ -4,8 +4,7 @@
  * @license MIT
  */
 
-import { IInputHandler, IDisposable, IWindowOptions, IColorEvent, IParseStack, ColorIndex, ColorRequestType, SpecialColorIndex } from './Types';
-import { IAttributeData, IBuffer } from './buffer/Types';
+import { IInputHandler, IAttributeData, IDisposable, IWindowOptions, IColorEvent, IParseStack, ColorIndex, ColorRequestType, SpecialColorIndex } from './Types';
 import { C0, C1 } from './data/EscapeSequences';
 import { CHARSETS, DEFAULT_CHARSET } from './data/Charsets';
 import { EscapeSequenceParser } from './parser/EscapeSequenceParser';
@@ -21,6 +20,7 @@ import { UnicodeService } from './services/UnicodeService';
 import { OscHandler } from './parser/OscParser';
 import { DcsHandler } from './parser/DcsParser';
 import { ApcHandler } from './parser/ApcParser';
+import { IBuffer } from './buffer/Types';
 import { parseColor } from './input/XParseColor';
 import { Emitter } from './Event';
 import { XTERM_VERSION } from './Version';
@@ -3065,7 +3065,7 @@ export class InputHandler extends Disposable implements IInputHandler {
       const idx = slots.shift() as string;
       const spec = slots.shift() as string;
       if (/^\d+$/.exec(idx)) {
-        const index = parseInt(idx, 10);
+        const index = parseInt(idx);
         if (isValidColorIndex(index)) {
           if (spec === '?') {
             event.push({ type: ColorRequestType.REPORT, index });
@@ -3228,7 +3228,7 @@ export class InputHandler extends Disposable implements IInputHandler {
     const slots = data.split(';');
     for (let i = 0; i < slots.length; ++i) {
       if (/^\d+$/.exec(slots[i])) {
-        const index = parseInt(slots[i], 10);
+        const index = parseInt(slots[i]);
         if (isValidColorIndex(index)) {
           event.push({ type: ColorRequestType.RESTORE, index });
         }

src/common/Platform.ts

@@ -41,10 +41,10 @@ export function getSafariVersion(): number {
   if (majorVersion === null || majorVersion.length < 2) {
     return 0;
   }
-  return parseInt(majorVersion[1], 10);
+  return parseInt(majorVersion[1]);
 }
 
-// Find the user's platform. We use this to interpret the meta key
+// Find the users platform. We use this to interpret the meta key
 // and ISO third level shifts.
 // http://stackoverflow.com/q/19877924/577598
 export const isMac = ['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K'].includes(platform);

src/common/TaskQueue.ts

@@ -8,7 +8,7 @@ import type { ILogService } from './services/Services';
 interface ITaskQueue {
   /**
    * Adds a task to the queue which will run in a future idle callback.
-   * To avoid perceivable stalls on the main thread, tasks with heavy workload
+   * To avoid perceivable stalls on the mainthread, tasks with heavy workload
    * should split their work into smaller pieces and return `true` to get
    * called again until the work is done (on falsy return value).
    */

src/common/TestUtils.test.ts

@@ -6,9 +6,9 @@
 import { IBufferService, ICoreService, ILogService, IOptionsService, ITerminalOptions, IMouseStateService, ICharsetService, UnicodeCharProperties, UnicodeCharWidth, IUnicodeService, IUnicodeVersionProvider, LogLevelEnum, IDecorationService, IInternalDecoration, IOscLinkService, type IBufferResizeEvent } from './services/Services';
 import { UnicodeService } from './services/UnicodeService';
 import { DEFAULT_OPTIONS } from './services/OptionsService';
-import { IAttributeData, IBuffer, IBufferLine, IBufferSet, IExtendedAttrs } from './buffer/Types';
+import { IBufferSet, IBuffer } from './buffer/Types';
 import { BufferSet } from './buffer/BufferSet';
-import { IDecPrivateModes, ICoreMouseEvent, CoreMouseEventType, ICharset, IModes, IOscLinkData, IDisposable } from './Types';
+import { IDecPrivateModes, ICoreMouseEvent, CoreMouseEventType, ICharset, IModes, IAttributeData, IOscLinkData, IDisposable, IBufferLine, IExtendedAttrs } from './Types';
 import { UnicodeV6 } from './input/UnicodeV6';
 import { IDecorationOptions, IDecoration } from '@xterm/xterm';
 import { Emitter, type IEvent } from './Event';

src/common/Types.ts

@@ -3,32 +3,26 @@
  * @license MIT
  */
 
+import { IDeleteEvent, IInsertEvent } from './CircularList';
+import { UnderlineStyle } from './buffer/Constants';
+import { IBufferSet } from './buffer/Types';
+import { IParams } from './parser/Types';
+import { IMouseStateService, ICoreService, IOptionsService, IUnicodeService } from './services/Services';
 import { IFunctionIdentifier, ITerminalOptions as IPublicTerminalOptions } from '@xterm/xterm';
-import type { IEvent } from './Event';
+import type { Emitter, IEvent } from './Event';
 
-/** sequence params serialized to js arrays */
-export type ParamsArray = (number | number[])[];
-
-/** Interface of Params storage class. */
-export interface IParams {
-  /** from ctor */
-  maxLength: number;
-  maxSubParamsLength: number;
-
-  /** param values and its length */
-  params: Int32Array;
-  length: number;
-
-  /** methods */
-  clone(): IParams;
-  toArray(): ParamsArray;
-  reset(): void;
-  resetZdm(): void;
-  addParam(value: number): void;
-  addSubParam(value: number): void;
-  hasSubParams(idx: number): boolean;
-  getSubParams(idx: number): Int32Array | null;
-  getSubParamsAll(): {[idx: number]: Int32Array};
+export interface ICoreTerminal {
+  mouseStateService: IMouseStateService;
+  coreService: ICoreService;
+  optionsService: IOptionsService;
+  unicodeService: IUnicodeService;
+  buffers: IBufferSet;
+  options: Required<ITerminalOptions>;
+  registerCsiHandler(id: IFunctionIdentifier, callback: (params: IParams) => boolean | Promise<boolean>): IDisposable;
+  registerDcsHandler(id: IFunctionIdentifier, callback: (data: string, param: IParams) => boolean | Promise<boolean>): IDisposable;
+  registerEscHandler(id: IFunctionIdentifier, callback: () => boolean | Promise<boolean>): IDisposable;
+  registerOscHandler(ident: number, callback: (data: string) => boolean | Promise<boolean>): IDisposable;
+  registerApcHandler(id: IFunctionIdentifier, callback: (data: string) => boolean | Promise<boolean>): IDisposable;
 }
 
 export interface IDisposable {
@@ -68,6 +62,28 @@ export interface IScrollEvent {
   position: number;
 }
 
+export interface ICircularList<T> {
+  length: number;
+  maxLength: number;
+  isFull: boolean;
+
+  onDeleteEmitter: Emitter<IDeleteEvent>;
+  onDelete: IEvent<IDeleteEvent>;
+  onInsertEmitter: Emitter<IInsertEvent>;
+  onInsert: IEvent<IInsertEvent>;
+  onTrimEmitter: Emitter<number>;
+  onTrim: IEvent<number>;
+
+  get(index: number): T | undefined;
+  set(index: number, value: T): void;
+  push(value: T): void;
+  recycle(): T;
+  pop(): T | undefined;
+  splice(start: number, deleteCount: number, ...items: T[]): void;
+  trimStart(count: number): void;
+  shiftElements(start: number, count: number, offset: number): void;
+}
+
 export const enum KeyboardResultType {
   SEND_KEY,
   SELECT_ALL,
@@ -85,12 +101,24 @@ export interface ICharset {
   [key: string]: string | undefined;
 }
 
+export type CharData = [attr: number, char: string, width: number, code: number];
+
 export interface IColor {
   readonly css: string;
   readonly rgba: number; // 32-bit int with rgba in each byte
 }
 export type IColorRGB = [red: number, green: number, blue: number];
 
+export interface IExtendedAttrs {
+  ext: number;
+  underlineStyle: UnderlineStyle;
+  underlineColor: number;
+  underlineVariantOffset: number;
+  urlId: number;
+  clone(): IExtendedAttrs;
+  isEmpty(): boolean;
+}
+
 /**
  * Tracks the current hyperlink. Since these are treated as extended attirbutes, these get passed on
  * to the linkifier when anything is printed. Doing it this way ensures that even when the cursor
@@ -102,6 +130,136 @@ export interface IOscLinkData {
   uri: string;
 }
 
+/**
+ * An object that represents all attributes of a cell.
+ */
+export interface IAttributeData {
+  /**
+   * "fg" is a 32-bit unsigned integer that stores the foreground color of the cell in the 24 least
+   * significant bits and additional flags in the remaining 8 bits.
+   */
+  fg: number;
+  /**
+   * "bg" is a 32-bit unsigned integer that stores the background color of the cell in the 24 least
+   * significant bits and additional flags in the remaining 8 bits.
+   */
+  bg: number;
+  /**
+   * "extended", aka "ext", stores extended attributes beyond those available in fg and bg. This
+   * data is optional on a cell and encodes less common data.
+   */
+  extended: IExtendedAttrs;
+
+  clone(): IAttributeData;
+
+  // flags
+  isInverse(): number;
+  isBold(): number;
+  isUnderline(): number;
+  isBlink(): number;
+  isInvisible(): number;
+  isItalic(): number;
+  isDim(): number;
+  isStrikethrough(): number;
+  isProtected(): number;
+  isOverline(): number;
+
+  /**
+   * The color mode of the foreground color which determines how to decode {@link getFgColor},
+   * possible values include {@link Attributes.CM_DEFAULT}, {@link Attributes.CM_P16},
+   * {@link Attributes.CM_P256} and {@link Attributes.CM_RGB}.
+   */
+  getFgColorMode(): number;
+  /**
+   * The color mode of the background color which determines how to decode {@link getBgColor},
+   * possible values include {@link Attributes.CM_DEFAULT}, {@link Attributes.CM_P16},
+   * {@link Attributes.CM_P256} and {@link Attributes.CM_RGB}.
+   */
+  getBgColorMode(): number;
+  isFgRGB(): boolean;
+  isBgRGB(): boolean;
+  isFgPalette(): boolean;
+  isBgPalette(): boolean;
+  isFgDefault(): boolean;
+  isBgDefault(): boolean;
+  isAttributeDefault(): boolean;
+
+  /**
+   * Gets an integer representation of the foreground color, how to decode the color depends on the
+   * color mode {@link getFgColorMode}.
+   */
+  getFgColor(): number;
+  /**
+   * Gets an integer representation of the background color, how to decode the color depends on the
+   * color mode {@link getBgColorMode}.
+   */
+  getBgColor(): number;
+
+  // extended attrs
+  hasExtendedAttrs(): number;
+  updateExtended(): void;
+  getUnderlineColor(): number;
+  getUnderlineColorMode(): number;
+  isUnderlineColorRGB(): boolean;
+  isUnderlineColorPalette(): boolean;
+  isUnderlineColorDefault(): boolean;
+  getUnderlineStyle(): number;
+  getUnderlineVariantOffset(): number;
+}
+
+/** Cell data */
+export interface ICellData extends IAttributeData {
+  content: number;
+  combinedData: string;
+  isCombined(): number;
+  getWidth(): number;
+  getChars(): string;
+  getCode(): number;
+  setFromCharData(value: CharData): void;
+  getAsCharData(): CharData;
+}
+
+/**
+ * Interface for a line in the terminal buffer.
+ */
+export interface IBufferLine {
+  length: number;
+  isWrapped: boolean;
+  get(index: number): CharData;
+  set(index: number, value: CharData): void;
+  loadCell(index: number, cell: ICellData): ICellData;
+  setCell(index: number, cell: ICellData): void;
+  setCellFromCodepoint(index: number, codePoint: number, width: number, attrs: IAttributeData): void;
+  addCodepointToCell(index: number, codePoint: number, width: number): void;
+  insertCells(pos: number, n: number, ch: ICellData): void;
+  deleteCells(pos: number, n: number, fill: ICellData): void;
+  replaceCells(start: number, end: number, fill: ICellData, respectProtect?: boolean): void;
+  resize(cols: number, fill: ICellData): boolean;
+  cleanupMemory(): number;
+  fill(fillCellData: ICellData, respectProtect?: boolean): void;
+  copyFrom(line: IBufferLine): void;
+  clone(): IBufferLine;
+  getTrimmedLength(): number;
+  getNoBgTrimmedLength(): number;
+  translateToString(trimRight?: boolean, startCol?: number, endCol?: number, outColumns?: number[]): string;
+
+  /* direct access to cell attrs */
+  getWidth(index: number): number;
+  hasWidth(index: number): number;
+  getFg(index: number): number;
+  getBg(index: number): number;
+  hasContent(index: number): number;
+  getCodePoint(index: number): number;
+  isCombined(index: number): number;
+  getString(index: number): string;
+}
+
+export interface IMarker extends IDisposable {
+  readonly id: number;
+  readonly isDisposed: boolean;
+  readonly line: number;
+  onDispose: IEvent<void>;
+}
 export interface IModes {
   insertMode: boolean;
 }
@@ -181,7 +339,7 @@ export interface ICoreMouseEvent {
   x: number;
   y: number;
   /**
-   * Button the action occurred. Due to restrictions of the tracking protocols
+   * Button the action occured. Due to restrictions of the tracking protocols
    * it is not possible to report multiple buttons at once.
    * Wheel is treated as a button.
    * There are invalid combinations of buttons and actions possible

src/common/WindowsMode.test.ts

@@ -1,54 +0,0 @@
-/**
- * Copyright (c) 2026 The xterm.js authors. All rights reserved.
- * @license MIT
- */
-
-import { assert } from 'chai';
-import { DEFAULT_ATTR_DATA } from './buffer/BufferLine';
-import { updateWindowsModeWrappedState } from './WindowsMode';
-import { BufferService } from './services/BufferService';
-import { OptionsService } from './services/OptionsService';
-import { MockLogService } from './TestUtils.test';
-
-describe('WindowsMode', () => {
-  describe('updateWindowsModeWrappedState', () => {
-    it('should mark the next line wrapped when the previous line ends in a non-whitespace character', () => {
-      const bufferService = new BufferService(new OptionsService({ rows: 5, cols: 10 }), new MockLogService());
-      const buffer = bufferService.buffer;
-      const previousLine = buffer.lines.get(buffer.ybase)!;
-      for (let i = 0; i < bufferService.cols; i++) {
-        previousLine!.setCellFromCodepoint(i, 'a'.charCodeAt(0), 1, DEFAULT_ATTR_DATA);
-      }
-      buffer.y = 1;
-
-      updateWindowsModeWrappedState(bufferService);
-
-      assert.strictEqual(buffer.lines.get(buffer.ybase + 1)!.isWrapped, true);
-    });
-
-    it('should not mark the next line wrapped when the previous line ends in whitespace', () => {
-      const bufferService = new BufferService(new OptionsService({ rows: 5, cols: 10 }), new MockLogService());
-      const buffer = bufferService.buffer;
-      const previousLine = buffer.lines.get(buffer.ybase)!;
-      for (let i = 0; i < bufferService.cols - 1; i++) {
-        previousLine!.setCellFromCodepoint(i, 'a'.charCodeAt(0), 1, DEFAULT_ATTR_DATA);
-      }
-      previousLine!.setCellFromCodepoint(bufferService.cols - 1, ' '.charCodeAt(0), 1, DEFAULT_ATTR_DATA);
-      buffer.y = 1;
-
-      updateWindowsModeWrappedState(bufferService);
-
-      assert.strictEqual(buffer.lines.get(buffer.ybase + 1)!.isWrapped, false);
-    });
-
-    it('should not mark the next line wrapped when the previous line ends in a null cell', () => {
-      const bufferService = new BufferService(new OptionsService({ rows: 5, cols: 10 }), new MockLogService());
-      const buffer = bufferService.buffer;
-      buffer.y = 1;
-
-      updateWindowsModeWrappedState(bufferService);
-
-      assert.strictEqual(buffer.lines.get(buffer.ybase + 1)!.isWrapped, false);
-    });
-  });
-});

src/common/buffer/AttributeData.ts

@@ -3,8 +3,7 @@
  * @license MIT
  */
 
-import { IColorRGB } from '../Types';
-import { IAttributeData, IExtendedAttrs } from './Types';
+import { IAttributeData, IColorRGB, IExtendedAttrs } from '../Types';
 import { Attributes, FgFlags, BgFlags, UnderlineStyle, ExtFlags } from './Constants';
 
 export class AttributeData implements IAttributeData {

src/common/buffer/Buffer.test.ts

@@ -233,27 +233,6 @@ describe('Buffer', () => {
           assert.equal(buffer.lines.length, INIT_ROWS + 10);
         });
       });
-
-      describe('Windows ConPTY', () => {
-        beforeEach(() => {
-          optionsService.options.windowsPty = { backend: 'conpty', buildNumber: 19000 };
-        });
-
-        it('should not adjust ybase or ydisp when growing rows', () => {
-          buffer.fillViewportRows();
-          for (let i = 0; i < 10; i++) {
-            buffer.lines.push(buffer.getBlankLine(DEFAULT_ATTR_DATA));
-          }
-          buffer.y = INIT_ROWS - 1;
-          buffer.ybase = 10;
-          buffer.ydisp = 10;
-          const linesBefore = buffer.lines.length;
-          buffer.resize(INIT_COLS, INIT_ROWS + 5);
-          assert.equal(buffer.ybase, 10);
-          assert.equal(buffer.ydisp, 10);
-          assert.equal(buffer.lines.length, linesBefore + 5);
-        });
-      });
     });
 
     describe('row and column increased', () => {
@@ -326,71 +305,6 @@ describe('Buffer', () => {
         assert.equal(buffer.lines.get(8)!.translateToString(), '     ');
         assert.equal(buffer.lines.get(9)!.translateToString(), '     ');
       });
-      it('should gate reflow on ConPTY buildNumber 21376', () => {
-        const prepareWrappedShrink = () => {
-          buffer.fillViewportRows();
-          buffer.resize(5, 10);
-          const firstLine = buffer.lines.get(0)!;
-          for (let i = 0; i < 5; i++) {
-            const code = 'a'.charCodeAt(0) + i;
-            firstLine.set(i, [0, String.fromCharCode(code), 1, code]);
-          }
-          buffer.y = 1;
-          buffer.resize(1, 10);
-        };
-
-        optionsService.options.windowsPty = { backend: 'conpty', buildNumber: 21375 };
-        prepareWrappedShrink();
-        assert.equal(buffer.lines.get(1)!.translateToString().trim(), '');
-
-        buffer = new TestBuffer(true, optionsService, bufferService, new MockLogService());
-        optionsService.options.windowsPty = { backend: 'conpty', buildNumber: 21376 };
-        prepareWrappedShrink();
-        assert.equal(buffer.lines.get(1)!.translateToString().trim(), 'b');
-        assert.ok(buffer.lines.get(1)!.isWrapped);
-      });
-      it('should unwrap lines on ConPTY builds with reflow support', () => {
-        optionsService.options.windowsPty = { backend: 'conpty', buildNumber: 21376 };
-        buffer.fillViewportRows();
-        buffer.resize(5, 10);
-        const firstLine = buffer.lines.get(0)!;
-        for (let i = 0; i < 5; i++) {
-          const code = 'a'.charCodeAt(0) + i;
-          firstLine.set(i, [0, String.fromCharCode(code), 1, code]);
-        }
-        buffer.y = 1;
-        buffer.resize(1, 10);
-        buffer.resize(5, 10);
-        assert.equal(buffer.lines.get(0)!.translateToString(), 'abcde');
-        assert.equal(buffer.lines.get(1)!.translateToString(), '     ');
-      });
-      it('should reflow wrapped lines containing the cursor when reflowCursorLine is enabled', () => {
-        optionsService.options.reflowCursorLine = true;
-        buffer.fillViewportRows();
-        buffer.resize(5, 10);
-        const firstLine = buffer.lines.get(0)!;
-        for (let i = 0; i < 5; i++) {
-          const code = 'a'.charCodeAt(0) + i;
-          firstLine.set(i, [0, String.fromCharCode(code), 1, code]);
-        }
-        buffer.resize(1, 10);
-        buffer.y = 2;
-        buffer.resize(5, 10);
-        assert.equal(buffer.lines.get(0)!.translateToString(), 'abcde');
-      });
-      it('should not reflow wrapped lines containing the cursor by default', () => {
-        buffer.fillViewportRows();
-        buffer.resize(5, 10);
-        const firstLine = buffer.lines.get(0)!;
-        for (let i = 0; i < 5; i++) {
-          const code = 'a'.charCodeAt(0) + i;
-          firstLine.set(i, [0, String.fromCharCode(code), 1, code]);
-        }
-        buffer.resize(1, 10);
-        buffer.y = 2;
-        buffer.resize(5, 10);
-        assert.notEqual(buffer.lines.get(0)!.translateToString(), 'abcde');
-      });
       it('should discard parts of wrapped lines that go out of the scrollback', () => {
         buffer.fillViewportRows();
         optionsService.options.scrollback = 1;

src/common/buffer/Buffer.ts

@@ -6,8 +6,7 @@
 import { CircularList, IInsertEvent } from '../CircularList';
 import { Disposable, toDisposable } from '../Lifecycle';
 import { IdleTaskQueue } from '../TaskQueue';
-import { ICharset } from '../Types';
-import { IAttributeData, IBuffer, IBufferLine, ICellData } from './Types';
+import { IAttributeData, IBufferLine, ICellData, ICharset } from '../Types';
 import { ExtendedAttrs } from './AttributeData';
 import { BufferLine, DEFAULT_ATTR_DATA } from './BufferLine';
 import { BufferLineStringCache } from './BufferLineStringCache';
@@ -15,6 +14,7 @@ import { getWrappedLineTrimmedLength, reflowLargerApplyNewLayout, reflowLargerCr
 import { CellData } from './CellData';
 import { NULL_CELL_CHAR, NULL_CELL_CODE, NULL_CELL_WIDTH, WHITESPACE_CELL_CHAR, WHITESPACE_CELL_CODE, WHITESPACE_CELL_WIDTH } from './Constants';
 import { Marker } from './Marker';
+import { IBuffer } from './Types';
 import { DEFAULT_CHARSET } from '../data/Charsets';
 import { IBufferService, ILogService, IOptionsService } from '../services/Services';
 
@@ -142,7 +142,7 @@ export class Buffer extends Disposable implements IBuffer {
   }
 
   /**
-   * Clears the buffer to its initial state, discarding all previous data.
+   * Clears the buffer to it's initial state, discarding all previous data.
    */
   public clear(): void {
     this._stringCache.clear();
@@ -197,7 +197,7 @@ export class Buffer extends Disposable implements IBuffer {
         for (let y = this._rows; y < newRows; y++) {
           if (this.lines.length < newRows + this.ybase) {
             if (this._optionsService.rawOptions.windowsPty.backend !== undefined || this._optionsService.rawOptions.windowsPty.buildNumber !== undefined) {
-              // Just add the new missing rows on Windows as conpty reprints the screen with its
+              // Just add the new missing rows on Windows as conpty reprints the screen with it's
               // view of the world. Once a line enters scrollback for conpty it remains there
               this.lines.push(new BufferLine(this._stringCache, newCols, nullCell, false));
             } else {

src/common/buffer/BufferLine.test.ts

@@ -6,7 +6,7 @@ import { NULL_CELL_CHAR, NULL_CELL_WIDTH, NULL_CELL_CODE, DEFAULT_ATTR, Content,
 import { BufferLine } from './BufferLine';
 import { BufferLineStringCache } from './BufferLineStringCache';
 import { CellData } from './CellData';
-import { CharData, IBufferLine, ICellData } from './Types';
+import { CharData, IBufferLine, ICellData } from '../Types';
 import { assert } from 'chai';
 import { AttributeData } from './AttributeData';
 import { createCellData, NULL_CELL_DATA, extendedAttributes } from '../TestUtils.test';

src/common/buffer/BufferLine.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { CharData, IAttributeData, IBufferLine, ICellData, IExtendedAttrs } from './Types';
+import { CharData, IAttributeData, IBufferLine, ICellData, IExtendedAttrs } from '../Types';
 import { AttributeData } from './AttributeData';
 import { CellData } from './CellData';
 import { Attributes, BgFlags, CHAR_DATA_ATTR_INDEX, CHAR_DATA_CHAR_INDEX, CHAR_DATA_WIDTH_INDEX, Content, NULL_CELL_CHAR, NULL_CELL_CODE, NULL_CELL_WIDTH, WHITESPACE_CELL_CHAR } from './Constants';
@@ -73,9 +73,7 @@ export interface IBufferLineStringCache {
  */
 export class BufferLine implements IBufferLine {
   protected _data: Uint32Array;
-  /** Sparse cache; only read when `IS_COMBINED_MASK` is set in `_data`. */
   protected _combined: {[index: number]: string} = {};
-  /** Sparse cache; only read when `HAS_EXTENDED` is set in `_data`. */
   protected _extendedAttrs: {[index: number]: IExtendedAttrs | undefined} = {};
   protected _stringCacheEntryRef: WeakRef<IBufferLineStringCacheEntry> | undefined;
   public length: number;
@@ -207,15 +205,9 @@ export class BufferLine implements IBufferLine {
     cell.bg = this._data[$startIndex + Cell.BG];
     if (cell.content & Content.IS_COMBINED_MASK) {
       cell.combinedData = this._combined[index];
-    } else {
-      cell.combinedData = '';
     }
     if (cell.bg & BgFlags.HAS_EXTENDED) {
       cell.extended = this._extendedAttrs[index]!;
-    } else {
-      // Do not mutate cell.extended in place: it may still reference this line's map entry from a
-      // prior loadCell into a reused CellData (e.g. $workCell during insert/delete).
-      cell.extended = DEFAULT_ATTR_DATA.extended.clone();
     }
     return cell;
   }
@@ -467,7 +459,14 @@ export class BufferLine implements IBufferLine {
       this._data.set(line._data);
     }
     this.length = line.length;
-    this._copySparseMapsFrom(line);
+    this._combined = {};
+    for (const el in line._combined) {
+      this._combined[el] = line._combined[el];
+    }
+    this._extendedAttrs = {};
+    for (const el in line._extendedAttrs) {
+      this._extendedAttrs[el] = line._extendedAttrs[el];
+    }
     this.isWrapped = line.isWrapped;
   }
 
@@ -476,7 +475,12 @@ export class BufferLine implements IBufferLine {
     const newLine = new BufferLine(this._stringCache, 0, undefined, false);
     newLine._data = new Uint32Array(this._data);
     newLine.length = this.length;
-    newLine._copySparseMapsFrom(this);
+    for (const el in this._combined) {
+      newLine._combined[el] = this._combined[el];
+    }
+    for (const el in this._extendedAttrs) {
+      newLine._extendedAttrs[el] = this._extendedAttrs[el];
+    }
     newLine.isWrapped = this.isWrapped;
     return newLine;
   }
@@ -507,14 +511,27 @@ export class BufferLine implements IBufferLine {
         for (let i = 0; i < Constants.CELL_INDICIES; i++) {
           this._data[(destCol + cell) * Constants.CELL_INDICIES + i] = srcData[(srcCol + cell) * Constants.CELL_INDICIES + i];
         }
-        this._copyCellMapsFrom(src, srcCol + cell, destCol + cell);
+        if (srcData[(srcCol + cell) * Constants.CELL_INDICIES + Cell.BG] & BgFlags.HAS_EXTENDED) {
+          this._extendedAttrs[destCol + cell] = src._extendedAttrs[srcCol + cell];
+        }
       }
     } else {
       for (let cell = 0; cell < length; cell++) {
         for (let i = 0; i < Constants.CELL_INDICIES; i++) {
           this._data[(destCol + cell) * Constants.CELL_INDICIES + i] = srcData[(srcCol + cell) * Constants.CELL_INDICIES + i];
         }
-        this._copyCellMapsFrom(src, srcCol + cell, destCol + cell);
+        if (srcData[(srcCol + cell) * Constants.CELL_INDICIES + Cell.BG] & BgFlags.HAS_EXTENDED) {
+          this._extendedAttrs[destCol + cell] = src._extendedAttrs[srcCol + cell];
+        }
+      }
+    }
+
+    // Move any combined data over as needed, FIXME: repeat for extended attrs
+    const srcCombinedKeys = Object.keys(src._combined);
+    for (let i = 0; i < srcCombinedKeys.length; i++) {
+      const key = parseInt(srcCombinedKeys[i], 10);
+      if (key >= srcCol) {
+        this._combined[key - srcCol + destCol] = src._combined[key];
       }
     }
   }
@@ -603,24 +620,4 @@ export class BufferLine implements IBufferLine {
       cacheEntry.isTrimmed = false;
     }
   }
-
-  /** Copy sparse map entries for a single cell when `_data` flags require them. */
-  private _copyCellMapsFrom(src: BufferLine, srcCol: number, destCol: number): void {
-    const srcStart = srcCol * Constants.CELL_INDICIES;
-    if (src._data[srcStart + Cell.CONTENT] & Content.IS_COMBINED_MASK) {
-      this._combined[destCol] = src._combined[srcCol];
-    }
-    if (src._data[srcStart + Cell.BG] & BgFlags.HAS_EXTENDED) {
-      this._extendedAttrs[destCol] = src._extendedAttrs[srcCol];
-    }
-  }
-
-  /** Rebuild sparse maps from another line, keyed only by `_data` flags. */
-  private _copySparseMapsFrom(line: BufferLine): void {
-    this._combined = {};
-    this._extendedAttrs = {};
-    for (let i = 0; i < line.length; i++) {
-      this._copyCellMapsFrom(line, i, i);
-    }
-  }
 }

src/common/buffer/BufferReflow.test.ts

@@ -3,13 +3,10 @@
  * @license MIT
  */
 import { assert } from 'chai';
-import { CircularList } from '../CircularList';
 import { BufferLine } from './BufferLine';
 import { BufferLineStringCache } from './BufferLineStringCache';
-import { CellData } from './CellData';
 import { NULL_CELL_CHAR, NULL_CELL_WIDTH, NULL_CELL_CODE } from './Constants';
-import { reflowLargerGetLinesToRemove, reflowSmallerGetNewLineLengths } from './BufferReflow';
-import { IBufferLine } from './Types';
+import { reflowSmallerGetNewLineLengths } from './BufferReflow';
 
 const TEST_STRING_CACHE = new BufferLineStringCache();
 
@@ -96,31 +93,4 @@ describe('BufferReflow', () => {
       assert.deepEqual(reflowSmallerGetNewLineLengths([line], 4, 2), [2, 2], 'line: 汉, 语');
     });
   });
-  describe('reflowLargerGetLinesToRemove', () => {
-    const nullCell = CellData.fromCharData([0, NULL_CELL_CHAR, NULL_CELL_WIDTH, NULL_CELL_CODE]);
-
-    function createWrappedLines(chars: string): CircularList<IBufferLine> {
-      const lines = new CircularList<IBufferLine>(chars.length);
-      for (let i = 0; i < chars.length; i++) {
-        const line = new BufferLine(TEST_STRING_CACHE, 1);
-        line.set(0, [0, chars[i], 1, chars.charCodeAt(i)]);
-        line.isWrapped = i > 0;
-        lines.push(line);
-      }
-      return lines;
-    }
-
-    it('should skip reflow when the cursor is in a wrapped block and reflowCursorLine is false', () => {
-      const lines = createWrappedLines('abcde');
-      const skipped = reflowLargerGetLinesToRemove(lines, 1, 5, 2, nullCell, false);
-      const reflowed = reflowLargerGetLinesToRemove(lines, 1, 5, 2, nullCell, true);
-      assert.deepEqual(skipped, []);
-      assert.notDeepEqual(reflowed, []);
-    });
-
-    it('should reflow wrapped blocks when the cursor is outside the block', () => {
-      const lines = createWrappedLines('abcde');
-      assert.notDeepEqual(reflowLargerGetLinesToRemove(lines, 1, 5, 10, nullCell, false), []);
-    });
-  });
 });

src/common/buffer/BufferReflow.ts

@@ -5,7 +5,7 @@
 
 import { BufferLine } from './BufferLine';
 import { CircularList } from '../CircularList';
-import { IBufferLine, ICellData } from './Types';
+import { IBufferLine, ICellData } from '../Types';
 
 export interface INewLayoutResult {
   layout: number[];

src/common/buffer/BufferSet.ts

@@ -4,8 +4,9 @@
  */
 
 import { Disposable, MutableDisposable } from '../Lifecycle';
+import { IAttributeData } from '../Types';
 import { Buffer } from './Buffer';
-import { IAttributeData, IBuffer, IBufferSet } from './Types';
+import { IBuffer, IBufferSet } from './Types';
 import { IBufferService, ILogService, IOptionsService } from '../services/Services';
 import { Emitter } from '../Event';
 

src/common/buffer/CellData.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { CharData, ICellData, IExtendedAttrs } from './Types';
+import { CharData, ICellData, IExtendedAttrs } from '../Types';
 import { stringFromCodePoint } from '../input/TextDecoder';
 import { CHAR_DATA_CHAR_INDEX, CHAR_DATA_WIDTH_INDEX, CHAR_DATA_ATTR_INDEX, Content } from './Constants';
 import { AttributeData, ExtendedAttrs } from './AttributeData';

src/common/buffer/Constants.ts

@@ -24,7 +24,7 @@ export const NULL_CELL_CODE = 0;
 /**
  * Whitespace cell.
  * This is meant as a replacement for empty cells when needed
- * during rendering lines to preserve correct alignment.
+ * during rendering lines to preserve correct aligment.
  */
 export const WHITESPACE_CELL_CHAR = ' ';
 export const WHITESPACE_CELL_WIDTH = 1;
@@ -36,18 +36,18 @@ export const WHITESPACE_CELL_CODE = 32;
 export const enum Content {
   /**
    * bit 1..21    codepoint, max allowed in UTF32 is 0x10FFFF (21 bits taken)
-   *              read:   `codepoint = content & Content.CODEPOINT_MASK;`
-   *              write:  `content |= codepoint & Content.CODEPOINT_MASK;`
+   *              read:   `codepoint = content & Content.codepointMask;`
+   *              write:  `content |= codepoint & Content.codepointMask;`
    *                      shortcut if precondition `codepoint <= 0x10FFFF` is met:
    *                      `content |= codepoint;`
    */
   CODEPOINT_MASK = 0x1FFFFF,
 
   /**
-   * bit 22       flag indicating whether a cell contains combined content
-   *              read:   `isCombined = content & Content.IS_COMBINED_MASK;`
-   *              set:    `content |= Content.IS_COMBINED_MASK;`
-   *              clear:  `content &= ~Content.IS_COMBINED_MASK;`
+   * bit 22       flag indication whether a cell contains combined content
+   *              read:   `isCombined = content & Content.isCombined;`
+   *              set:    `content |= Content.isCombined;`
+   *              clear:  `content &= ~Content.isCombined;`
    */
   IS_COMBINED_MASK = 0x200000,  // 1 << 21
 
@@ -55,19 +55,19 @@ export const enum Content {
    * bit 1..22    mask to check whether a cell contains any string data
    *              we need to check for codepoint and isCombined bits to see
    *              whether a cell contains anything
-   *              read:   `isEmpty = !(content & Content.HAS_CONTENT_MASK)`
+   *              read:   `isEmpty = !(content & Content.hasContent)`
    */
   HAS_CONTENT_MASK = 0x3FFFFF,
 
   /**
    * bit 23..24   wcwidth value of cell, takes 2 bits (ranges from 0..2)
-   *              read:   `width = (content & Content.WIDTH_MASK) >> Content.WIDTH_SHIFT;`
-   *                      `hasWidth = content & Content.WIDTH_MASK;`
+   *              read:   `width = (content & Content.widthMask) >> Content.widthShift;`
+   *                      `hasWidth = content & Content.widthMask;`
    *                      as long as wcwidth is highest value in `content`:
-   *                      `width = content >> Content.WIDTH_SHIFT;`
-   *              write:  `content |= (width << Content.WIDTH_SHIFT) & Content.WIDTH_MASK;`
+   *                      `width = content >> Content.widthShift;`
+   *              write:  `content |= (width << Content.widthShift) & Content.widthMask;`
    *                      shortcut if precondition `0 <= width <= 3` is met:
-   *                      `content |= width << Content.WIDTH_SHIFT;`
+   *                      `content |= width << Content.widthShift;`
    */
   WIDTH_MASK = 0xC00000,   // 3 << 22
   WIDTH_SHIFT = 22

src/common/buffer/Marker.ts

@@ -3,9 +3,9 @@
  * @license MIT
  */
 
-import { dispose, IDisposable } from '../Lifecycle';
-import { IMarker } from './Types';
+import { IDisposable, IMarker } from '../Types';
 import { Emitter } from '../Event';
+import { dispose } from '../Lifecycle';
 
 export class Marker implements IMarker {
   private static _nextId = 1;
@@ -30,7 +30,7 @@ export class Marker implements IMarker {
     }
     this.isDisposed = true;
     this.line = -1;
-    // Emit before super.dispose such that dispose listeners get a chance to react
+    // Emit before super.dispose such that dispose listeners get a change to react
     this._onDispose.fire();
     dispose(this._disposables);
     this._disposables.length = 0;

src/common/buffer/Types.ts

@@ -3,158 +3,12 @@
  * @license MIT
  */
 
+import { IAttributeData, ICircularList, IBufferLine, ICellData, IMarker, ICharset, IDisposable } from '../Types';
 import type { IEvent } from '../Event';
-import type { ICircularList } from '../CircularList';
-import type { ICharset } from '../Types';
-import type { IDisposable } from '../Lifecycle';
-import type { UnderlineStyle } from './Constants';
 
 // BufferIndex denotes a position in the buffer: [rowIndex, colIndex]
 export type BufferIndex = [number, number];
 
-export type CharData = [attr: number, char: string, width: number, code: number];
-
-export interface IExtendedAttrs {
-  ext: number;
-  underlineStyle: UnderlineStyle;
-  underlineColor: number;
-  underlineVariantOffset: number;
-  urlId: number;
-  clone(): IExtendedAttrs;
-  isEmpty(): boolean;
-}
-
-/**
- * An object that represents all attributes of a cell.
- */
-export interface IAttributeData {
-  /**
-   * "fg" is a 32-bit unsigned integer that stores the foreground color of the cell in the 24 least
-   * significant bits and additional flags in the remaining 8 bits.
-   */
-  fg: number;
-  /**
-   * "bg" is a 32-bit unsigned integer that stores the background color of the cell in the 24 least
-   * significant bits and additional flags in the remaining 8 bits.
-   */
-  bg: number;
-  /**
-   * "extended", aka "ext", stores extended attributes beyond those available in fg and bg. This
-   * data is optional on a cell and encodes less common data.
-   */
-  extended: IExtendedAttrs;
-
-  clone(): IAttributeData;
-
-  // flags
-  isInverse(): number;
-  isBold(): number;
-  isUnderline(): number;
-  isBlink(): number;
-  isInvisible(): number;
-  isItalic(): number;
-  isDim(): number;
-  isStrikethrough(): number;
-  isProtected(): number;
-  isOverline(): number;
-
-  /**
-   * The color mode of the foreground color which determines how to decode {@link getFgColor},
-   * possible values include {@link Attributes.CM_DEFAULT}, {@link Attributes.CM_P16},
-   * {@link Attributes.CM_P256} and {@link Attributes.CM_RGB}.
-   */
-  getFgColorMode(): number;
-  /**
-   * The color mode of the background color which determines how to decode {@link getBgColor},
-   * possible values include {@link Attributes.CM_DEFAULT}, {@link Attributes.CM_P16},
-   * {@link Attributes.CM_P256} and {@link Attributes.CM_RGB}.
-   */
-  getBgColorMode(): number;
-  isFgRGB(): boolean;
-  isBgRGB(): boolean;
-  isFgPalette(): boolean;
-  isBgPalette(): boolean;
-  isFgDefault(): boolean;
-  isBgDefault(): boolean;
-  isAttributeDefault(): boolean;
-
-  /**
-   * Gets an integer representation of the foreground color, how to decode the color depends on the
-   * color mode {@link getFgColorMode}.
-   */
-  getFgColor(): number;
-  /**
-   * Gets an integer representation of the background color, how to decode the color depends on the
-   * color mode {@link getBgColorMode}.
-   */
-  getBgColor(): number;
-
-  // extended attrs
-  hasExtendedAttrs(): number;
-  updateExtended(): void;
-  getUnderlineColor(): number;
-  getUnderlineColorMode(): number;
-  isUnderlineColorRGB(): boolean;
-  isUnderlineColorPalette(): boolean;
-  isUnderlineColorDefault(): boolean;
-  getUnderlineStyle(): number;
-  getUnderlineVariantOffset(): number;
-}
-
-/** Cell data */
-export interface ICellData extends IAttributeData {
-  content: number;
-  combinedData: string;
-  isCombined(): number;
-  getWidth(): number;
-  getChars(): string;
-  getCode(): number;
-  setFromCharData(value: CharData): void;
-  getAsCharData(): CharData;
-}
-
-/**
- * Interface for a line in the terminal buffer.
- */
-export interface IBufferLine {
-  length: number;
-  isWrapped: boolean;
-  get(index: number): CharData;
-  set(index: number, value: CharData): void;
-  loadCell(index: number, cell: ICellData): ICellData;
-  setCell(index: number, cell: ICellData): void;
-  setCellFromCodepoint(index: number, codePoint: number, width: number, attrs: IAttributeData): void;
-  addCodepointToCell(index: number, codePoint: number, width: number): void;
-  insertCells(pos: number, n: number, ch: ICellData): void;
-  deleteCells(pos: number, n: number, fill: ICellData): void;
-  replaceCells(start: number, end: number, fill: ICellData, respectProtect?: boolean): void;
-  resize(cols: number, fill: ICellData): boolean;
-  cleanupMemory(): number;
-  fill(fillCellData: ICellData, respectProtect?: boolean): void;
-  copyFrom(line: IBufferLine): void;
-  clone(): IBufferLine;
-  getTrimmedLength(): number;
-  getNoBgTrimmedLength(): number;
-  translateToString(trimRight?: boolean, startCol?: number, endCol?: number, outColumns?: number[]): string;
-
-  /* direct access to cell attrs */
-  getWidth(index: number): number;
-  hasWidth(index: number): number;
-  getFg(index: number): number;
-  getBg(index: number): number;
-  hasContent(index: number): number;
-  getCodePoint(index: number): number;
-  isCombined(index: number): number;
-  getString(index: number): string;
-}
-
-export interface IMarker extends IDisposable {
-  readonly id: number;
-  readonly isDisposed: boolean;
-  readonly line: number;
-  onDispose: IEvent<void>;
-}
-
 export interface IBuffer {
   readonly lines: ICircularList<IBufferLine>;
   ydisp: number;