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>
fix(parser): chunked WASM scan, op coalescing, and benchmark runtime paths
2026-05-31 15:31:23 -07:00 · 2026-05-31 15:06:00 -07:00 · 2026-05-31 21:35:02 +00:00
226 changed files with 2856 additions and 2282 deletions
@@ -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).
@@ -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
@@ -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
@@ -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'
@@ -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'
@@ -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": [
    {
@@ -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.
@@ -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();
@@ -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 '';
  }
@@ -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`]);
-    });
-  });
 });
@@ -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{
@@ -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;
@@ -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
@@ -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;
  }
 }
@@ -5,7 +5,7 @@

 import type { ITerminalAddon, IDisposable } from '@xterm/xterm';
 import type { ImageAddon as IImageApi } from '@xterm/addon-image';
-import { Emitter, type IEvent } from 'common/primitives/Event';
+import { Emitter, type IEvent } from 'common/Event';
 import { IIPHandler } from './IIPHandler';
 import { ImageRenderer } from './ImageRenderer';
 import { ImageStorage, CELL_SIZE_DEFAULT } from './ImageStorage';
@@ -6,7 +6,7 @@
 import { toRGBA8888 } from 'sixel/lib/Colors';
 import { IDisposable } from '@xterm/xterm';
 import { ICellSize, ImageLayer, ITerminalExt, IImageSpec, IRenderDimensions, IRenderService } from './Types';
-import { Disposable, MutableDisposable, toDisposable } from 'common/primitives/Lifecycle';
+import { Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle';

 const enum Constants {
  PLACEHOLDER_LENGTH = 4096,
@@ -6,11 +6,10 @@
 import { IDisposable, IMarker, Terminal } from '@xterm/xterm';

 // private imports from base repo we build against
-import { Attributes, BgFlags, Content, ExtFlags, UnderlineStyle } from 'common/primitives/buffer/Constants';
-import type { AttributeData } from 'common/primitives/buffer/AttributeData';
-import type { IParams, IDcsHandler, IOscHandler, IApcHandler, IEscapeSequenceParser } from 'common/primitives/parser/Types';
-import type { IInputHandler } from 'common/Types';
-import type { IBufferLine, IExtendedAttrs } from 'common/primitives/buffer/Types';
+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 { 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';
@@ -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;
@@ -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
@@ -5,7 +5,7 @@

 import type { Terminal, ITerminalAddon, IDisposable } from '@xterm/xterm';
 import type { ProgressAddon as IProgressApi, IProgressState } from '@xterm/addon-progress';
-import type { Emitter, IEvent } from 'common/primitives/Event';
+import type { Emitter, IEvent } from 'common/Event';


 const enum ProgressType {
@@ -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/primitives/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);
-  });
-});
@@ -5,7 +5,7 @@

 import type { Terminal, IDisposable, IDecoration } from '@xterm/xterm';
 import type { ISearchDecorationOptions } from '@xterm/addon-search';
-import { dispose, Disposable, toDisposable } from 'common/primitives/Lifecycle';
+import { dispose, Disposable, toDisposable } from 'common/Lifecycle';
 import type { ISearchResult } from './SearchEngine';

 /**
@@ -5,9 +5,9 @@

 import type { Terminal, IDisposable, ITerminalAddon } from '@xterm/xterm';
 import type { SearchAddon as ISearchApi, ISearchOptions, ISearchAddonOptions, ISearchResultChangeEvent, ISearchDecorationOptions } from '@xterm/addon-search';
-import { Emitter, type IEvent } from 'common/primitives/Event';
-import { Disposable, MutableDisposable, toDisposable } from 'common/primitives/Lifecycle';
-import { disposableTimeout } from 'common/primitives/Async';
+import { Emitter, type IEvent } from 'common/Event';
+import { Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle';
+import { disposableTimeout } from 'common/Async';
 import { SearchLineCache } from './SearchLineCache';
 import { SearchState } from './SearchState';
 import { SearchEngine, type ISearchResult } from './SearchEngine';
@@ -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);
@@ -7,7 +7,7 @@ import { SearchEngine } from './SearchEngine';
 import { SearchLineCache } from './SearchLineCache';
 import { Terminal } from 'browser/public/Terminal';
 import type { ISearchOptions } from '@xterm/addon-search';
-import { DisposableStore } from 'common/primitives/Lifecycle';
+import { DisposableStore } from 'common/Lifecycle';

 function writeP(terminal: Terminal, data: string): Promise<void> {
  return new Promise(r => terminal.write(data, r));
@@ -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`);
    }

@@ -5,7 +5,7 @@
 import { assert } from 'chai';
 import { SearchLineCache, LineCacheEntry } from './SearchLineCache';
 import { Terminal } from 'browser/public/Terminal';
-import { timeout } from 'common/primitives/Async';
+import { timeout } from 'common/Async';

 function writeP(terminal: Terminal, data: string): Promise<void> {
  return new Promise(r => terminal.write(data, r));
@@ -4,8 +4,8 @@
 */

 import type { Terminal } from '@xterm/xterm';
-import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from 'common/primitives/Lifecycle';
-import { disposableTimeout } from 'common/primitives/Async';
+import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle';
+import { disposableTimeout } from 'common/Async';

 export type LineCacheEntry = [
  /**
@@ -5,8 +5,8 @@

 import type { ISearchResultChangeEvent } from '@xterm/addon-search';
 import type { IDisposable } from '@xterm/xterm';
-import { Emitter, type IEvent } from 'common/primitives/Event';
-import { Disposable } from 'common/primitives/Lifecycle';
+import { Emitter, type IEvent } from 'common/Event';
+import { Disposable } from 'common/Lifecycle';
 import type { ISearchResult } from './SearchEngine';

 /**
@@ -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 }
@@ -6,7 +6,7 @@
 import { perfContext, before, ThroughputRuntimeCase } from 'xterm-benchmark';

 import { spawn } from 'node-pty';
-import { Utf8ToUtf32, stringFromCodePoint } from 'common/primitives/input/TextDecoder';
+import { Utf8ToUtf32, stringFromCodePoint } from 'common/input/TextDecoder';
 import { Terminal } from 'browser/public/Terminal';
 import { SerializeAddon } from 'SerializeAddon';

@@ -7,10 +7,9 @@

 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/primitives/Types';
-import { IAttributeData } from 'common/primitives/buffer/Types';
+import { IAttributeData, IColor } from 'common/Types';
 import { DEFAULT_ANSI_COLORS } from 'browser/Types';
-import { UnderlineStyle } from 'common/primitives/buffer/Constants';
+import { UnderlineStyle } from 'common/buffer/Constants';

 function constrain(value: number, low: number, high: number): number {
  return Math.max(low, Math.min(value, high));
@@ -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)
          ) {
@@ -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,
@@ -6,7 +6,7 @@
 import { perfContext, before, ThroughputRuntimeCase } from 'xterm-benchmark';

 import { spawn } from 'node-pty';
-import { Utf8ToUtf32, stringFromCodePoint } from 'common/primitives/input/TextDecoder';
+import { Utf8ToUtf32, stringFromCodePoint } from 'common/input/TextDecoder';
 import { CoreBrowserTerminal } from 'browser/CoreBrowserTerminal';
 import { UnicodeGraphemeProvider } from 'UnicodeGraphemeProvider';

@@ -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';
@@ -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('');
@@ -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)
@@ -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();
@@ -1,11 +1,11 @@
 import { ISelectionRenderModel } from 'browser/renderer/shared/Types';
 import { ICoreBrowserService, IThemeService } from 'browser/services/Services';
 import { ReadonlyColorSet } from 'browser/Types';
-import { Attributes, BgFlags, ExtFlags, FgFlags, NULL_CELL_CODE, UnderlineStyle } from 'common/primitives/buffer/Constants';
+import { Attributes, BgFlags, ExtFlags, FgFlags, NULL_CELL_CODE, UnderlineStyle } from 'common/buffer/Constants';
 import { IDecorationService, IOptionsService } from 'common/services/Services';
-import { ICellData } from 'common/primitives/buffer/Types';
+import { ICellData } from 'common/Types';
 import { Terminal } from '@xterm/xterm';
-import { rgba } from 'common/primitives/Color';
+import { rgba } from 'common/Color';
 import { treatGlyphAsBackgroundColor } from 'browser/renderer/shared/RendererUtils';
 import { blockPatternCodepoints } from './customGlyphs/CustomGlyphDefinitions';

@@ -6,8 +6,8 @@
 import { assert } from 'chai';
 import { configEquals } from './CharAtlasUtils';
 import { ICharAtlasConfig } from './Types';
-import { NULL_COLOR } from 'common/primitives/Color';
-import { IColor } from 'common/primitives/Types';
+import { NULL_COLOR } from 'common/Color';
+import { IColor } from 'common/Types';

 function createTestConfig(overrides: Partial<ICharAtlasConfig> = {}): ICharAtlasConfig {
  const color: IColor = { css: '#ffffff', rgba: 0xffffffff };
@@ -4,10 +4,10 @@
 */

 import { ICharAtlasConfig } from './Types';
-import { Attributes } from 'common/primitives/buffer/Constants';
+import { Attributes } from 'common/buffer/Constants';
 import { ITerminalOptions } from '@xterm/xterm';
 import { IColorSet, ReadonlyColorSet } from 'browser/Types';
-import { NULL_COLOR } from 'common/primitives/Color';
+import { NULL_COLOR } from 'common/Color';

 export function generateConfig(deviceCellWidth: number, deviceCellHeight: number, deviceCharWidth: number, deviceCharHeight: number, options: Required<ITerminalOptions>, colors: ReadonlyColorSet, devicePixelRatio: number, deviceMaxTextureSize: number, customGlyphs: boolean = true): ICharAtlasConfig {
  // null out some fields that don't matter
@@ -3,7 +3,7 @@
 * @license MIT
 */

-import { isFirefox, isLegacyEdge } from 'common/primitives/Platform';
+import { isFirefox, isLegacyEdge } from 'common/Platform';

 export const DIM_OPACITY = 0.5;
 // The text baseline is set conditionally by browser. Using 'ideographic' for Firefox or Legacy Edge
@@ -3,7 +3,7 @@
 * @license MIT
 */

-import { toDisposable, IDisposable } from 'common/primitives/Lifecycle';
+import { toDisposable, IDisposable } from 'common/Lifecycle';

 export function observeDevicePixelDimensions(element: HTMLElement, parentWindow: Window & typeof globalThis, callback: (deviceWidth: number, deviceHeight: number) => void): IDisposable {
  // Observe any resizes to the element and extract the actual pixel size of the element if the
@@ -4,8 +4,8 @@
 */
 import { TextureAtlas } from './TextureAtlas';
 import { IRenderDimensions } from 'browser/renderer/shared/Types';
-import { NULL_CELL_CODE } from 'common/primitives/buffer/Constants';
-import { Disposable, toDisposable } from 'common/primitives/Lifecycle';
+import { NULL_CELL_CODE } from 'common/buffer/Constants';
+import { Disposable, toDisposable } from 'common/Lifecycle';
 import { Terminal } from '@xterm/xterm';
 import { IRenderModel, IWebGL2RenderingContext, IWebGLVertexArrayObject, type IRasterizedGlyph, type ITextureAtlas } from './Types';
 import { createProgram, GLTexture, PROJECTION_MATRIX } from './WebglUtils';
@@ -220,7 +220,7 @@ export class GlyphRenderer extends Disposable {
  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);
  }
@@ -389,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;
  }

@@ -6,9 +6,9 @@
 import { IRenderDimensions } from 'browser/renderer/shared/Types';
 import { IThemeService } from 'browser/services/Services';
 import { ReadonlyColorSet } from 'browser/Types';
-import { Attributes, FgFlags } from 'common/primitives/buffer/Constants';
-import { Disposable, toDisposable } from 'common/primitives/Lifecycle';
-import { IColor } from 'common/primitives/Types';
+import { Attributes, FgFlags } from 'common/buffer/Constants';
+import { Disposable, toDisposable } from 'common/Lifecycle';
+import { IColor } from 'common/Types';
 import { Terminal } from '@xterm/xterm';
 import { RenderModelConstants } from './RenderModel';
 import { IRenderModel, IWebGL2RenderingContext, IWebGLVertexArrayObject } from './Types';
@@ -8,14 +8,14 @@ import { DIM_OPACITY, TEXT_BASELINE } from './Constants';
 import { tryDrawCustomGlyph } from './customGlyphs/CustomGlyphRasterizer';
 import { computeNextVariantOffset, treatGlyphAsBackgroundColor, isPowerlineGlyph, isRestrictedPowerlineGlyph, throwIfFalsy } from 'browser/renderer/shared/RendererUtils';
 import { IBoundingBox, ICharAtlasConfig, IRasterizedGlyph, ITextureAtlas } from './Types';
-import { NULL_COLOR, channels, color, rgba } from 'common/primitives/Color';
-import { FourKeyMap } from 'common/primitives/MultiKeyMap';
-import { IdleTaskQueue } from 'common/primitives/TaskQueue';
-import { IColor } from 'common/primitives/Types';
-import { AttributeData } from 'common/primitives/buffer/AttributeData';
-import { Attributes, DEFAULT_COLOR, DEFAULT_EXT, UnderlineStyle } from 'common/primitives/buffer/Constants';
+import { NULL_COLOR, channels, color, rgba } from 'common/Color';
+import { FourKeyMap } from 'common/MultiKeyMap';
+import { IdleTaskQueue } from 'common/TaskQueue';
+import { IColor } from 'common/Types';
+import { AttributeData } from 'common/buffer/AttributeData';
+import { Attributes, DEFAULT_COLOR, DEFAULT_EXT, UnderlineStyle } from 'common/buffer/Constants';
 import { ILogService, IUnicodeService } from 'common/services/Services';
-import { Emitter } from 'common/primitives/Event';
+import { Emitter } from 'common/Event';

 /**
 * A shared object which is used to draw nothing for a particular cell.
@@ -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 };
@@ -152,7 +152,7 @@ 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.
@@ -191,7 +191,7 @@ export class TextureAtlas implements ITextureAtlas {
        return newPage;
      }

-      const sortedMergingPagesIndexes = mergingPages.map(e => e.glyphs[0].texturePage).sort((a, b) => a - b);
+      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
@@ -1080,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 {
-        // fallback for non quadmerges (should never be used)
-        for (let i = 0; i < sourcePages.length; ++i) {
-          this._glyphs = this._glyphs.concat(sourcePages[i].glyphs);
-          this._usedPixels += sourcePages[i]._usedPixels;
-        }
-
-      }
-    }
  }

  public clear(): void {
@@ -1141,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
@@ -6,8 +6,8 @@
 import { FontWeight } from '@xterm/xterm';
 import { IColorSet } from 'browser/Types';
 import { ISelectionRenderModel } from 'browser/renderer/shared/Types';
-import { CursorInactiveStyle, CursorStyle, type IDisposable } from 'common/primitives/Types';
-import type { IEvent } from 'common/primitives/Event';
+import { CursorInactiveStyle, CursorStyle, type IDisposable } from 'common/Types';
+import type { IEvent } from 'common/Event';

 export interface IRenderModel {
  cells: Uint32Array;
@@ -7,12 +7,12 @@ import type { ITerminalAddon, Terminal } from '@xterm/xterm';
 import type { IWebglAddonOptions, WebglAddon as IWebglApi } from '@xterm/addon-webgl';
 import { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IRenderService, IThemeService } from 'browser/services/Services';
 import { ITerminal } from 'browser/Types';
-import { Disposable, toDisposable } from 'common/primitives/Lifecycle';
-import { getSafariVersion, isSafari } from 'common/primitives/Platform';
+import { Disposable, toDisposable } from 'common/Lifecycle';
+import { getSafariVersion, isSafari } from 'common/Platform';
 import { ICoreService, IDecorationService, ILogService, IOptionsService } from 'common/services/Services';
 import { IWebGL2RenderingContext } from './Types';
 import { WebglRenderer } from './WebglRenderer';
-import { Emitter, EventUtils } from 'common/primitives/Event';
+import { Emitter, EventUtils } from 'common/Event';

 export class WebglAddon extends Disposable implements ITerminalAddon, IWebglApi {
  private _terminal?: Terminal;
@@ -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();
@@ -10,10 +10,10 @@ 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/primitives/buffer/Types';
-import { AttributeData } from 'common/primitives/buffer/AttributeData';
-import { CellData } from 'common/primitives/buffer/CellData';
-import { Attributes, Content, FgFlags, NULL_CELL_CHAR, NULL_CELL_CODE } from 'common/primitives/buffer/Constants';
+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';
 import { TextBlinkStateManager } from 'browser/renderer/shared/TextBlinkStateManager';
 import { ICoreService, IDecorationService, ILogService, IOptionsService } from 'common/services/Services';
 import { Terminal } from '@xterm/xterm';
@@ -23,9 +23,9 @@ import { COMBINED_CHAR_BIT_MASK, RenderModel, RenderModelConstants } from './Ren
 import { IWebGL2RenderingContext, type ITextureAtlas } from './Types';
 import { LinkRenderLayer } from './renderLayer/LinkRenderLayer';
 import { IRenderLayer } from './renderLayer/Types';
-import { Emitter, EventUtils } from 'common/primitives/Event';
+import { Emitter, EventUtils } from 'common/Event';
 import { addDisposableListener } from 'browser/Dom';
-import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from 'common/primitives/Lifecycle';
+import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle';
 import { createRenderDimensions } from 'browser/renderer/shared/RendererUtils';

 const enum 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);
@@ -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);
@@ -7,8 +7,8 @@ import { ReadonlyColorSet } from 'browser/Types';
 import { acquireTextureAtlas } from '../CharAtlasCache';
 import { IRenderDimensions } from 'browser/renderer/shared/Types';
 import { ICoreBrowserService, IThemeService } from 'browser/services/Services';
-import { Disposable, toDisposable } from 'common/primitives/Lifecycle';
-import { CellData } from 'common/primitives/buffer/CellData';
+import { Disposable, toDisposable } from 'common/Lifecycle';
+import { CellData } from 'common/buffer/CellData';
 import { IOptionsService } from 'common/services/Services';
 import { Terminal } from '@xterm/xterm';
 import { IRenderLayer } from './Types';
@@ -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>;

@@ -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"
@@ -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)`);
@@ -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
@@ -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)`);
@@ -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 */
@@ -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();
@@ -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);
@@ -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(
@@ -7,7 +7,7 @@ import { BaseWindow } from './baseWindow';
 import type { IControlWindow } from '../controlBar';
 import type { IBufferCell } from '@xterm/xterm';

-// Underline style values from common/primitives/buffer/Constants.ts
+// Underline style values from common/buffer/Constants.ts
 const enum UnderlineStyle {
  NONE = 0,
  SINGLE = 1,
@@ -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 = [];
-          }
-        }
-      }
-    }
-  }
 }
@@ -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": {
@@ -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",
@@ -6,9 +6,9 @@
 import * as Strings from './LocalizableStrings';
 import { ITerminal, IRenderDebouncer } from './Types';
 import { TimeBasedDebouncer } from './TimeBasedDebouncer';
-import { Disposable, toDisposable } from '../common/primitives/Lifecycle';
+import { Disposable, toDisposable } from '../common/Lifecycle';
 import { ICoreBrowserService, IRenderService } from './services/Services';
-import { IBuffer } from '../common/primitives/buffer/Types';
+import { IBuffer } from '../common/buffer/Types';
 import { IInstantiationService } from '../common/services/Services';
 import { addDisposableListener } from './Dom';

@@ -4,8 +4,8 @@
 */

 import { IColorContrastCache } from './Types';
-import { IColor } from '../common/primitives/Types';
-import { TwoKeyMap } from '../common/primitives/MultiKeyMap';
+import { IColor } from '../common/Types';
+import { TwoKeyMap } from '../common/MultiKeyMap';

 export class ColorContrastCache implements IColorContrastCache {
  private _color: TwoKeyMap</* bg */number, /* fg */number, IColor | null> = new TwoKeyMap();
@@ -43,23 +43,22 @@ import { SelectionService } from './services/SelectionService';
 import { ICharSizeService, ICharacterJoinerService, ICoreBrowserService, IKeyboardService, ILinkProviderService, IMouseCoordsService, IMouseService, IRenderService, ISelectionService, IThemeService } from './services/Services';
 import { ThemeService } from './services/ThemeService';
 import { KeyboardService } from './services/KeyboardService';
-import { channels, color, rgb } from '../common/primitives/Color';
+import { channels, color, rgb } from '../common/Color';
 import { CoreTerminal } from '../common/CoreTerminal';
-import * as Browser from '../common/primitives/Platform';
-import { ColorRequestType, IColorEvent, KeyboardResultType, SpecialColorIndex } from '../common/primitives/Types';
-import { ITerminalOptions } from '../common/Types';
-import { DEFAULT_ATTR_DATA } from '../common/primitives/buffer/BufferLine';
-import { IBuffer } from '../common/primitives/buffer/Types';
-import { C0, C1ESCAPED } from '../common/primitives/data/EscapeSequences';
-import { toRgbString } from '../common/primitives/input/XParseColor';
+import * as Browser from '../common/Platform';
+import { ColorRequestType, IColorEvent, ITerminalOptions, KeyboardResultType, SpecialColorIndex } from '../common/Types';
+import { DEFAULT_ATTR_DATA } from '../common/buffer/BufferLine';
+import { IBuffer } from '../common/buffer/Types';
+import { C0, C1ESCAPED } from '../common/data/EscapeSequences';
+import { toRgbString } from '../common/input/XParseColor';
 import { DecorationService } from '../common/services/DecorationService';
 import { IDecorationService } from '../common/services/Services';
 import { WindowsOptionsReportType } from '../common/InputHandler';
 import { AccessibilityManager } from './AccessibilityManager';
 import { Linkifier } from './Linkifier';
-import { Emitter, EventUtils, type IEvent } from '../common/primitives/Event';
+import { Emitter, EventUtils, type IEvent } from '../common/Event';
 import { addDisposableListener } from './Dom';
-import { MutableDisposable, toDisposable } from '../common/primitives/Lifecycle';
+import { MutableDisposable, toDisposable } from '../common/Lifecycle';

 export class CoreBrowserTerminal extends CoreTerminal implements ITerminal {
  public textarea: HTMLTextAreaElement | undefined;
@@ -103,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;
@@ -506,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);

@@ -1073,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;
@@ -5,8 +5,8 @@
 * Minimal DOM helpers for xterm.js browser code.
 */

-import { IntervalTimer } from '../common/primitives/Async';
-import { IDisposable } from '../common/primitives/Lifecycle';
+import { IntervalTimer } from '../common/Async';
+import { IDisposable } from '../common/Lifecycle';

 export function getWindow(e: Node | UIEvent | undefined | null): Window {
  const candidateNode = e as Node | undefined | null;
@@ -4,11 +4,11 @@
 */

 import { IBufferCellPosition, ILink, ILinkDecorations, ILinkWithState, ILinkifier2, ILinkifierEvent } from './Types';
-import { Disposable, dispose, toDisposable } from '../common/primitives/Lifecycle';
-import { IDisposable } from '../common/primitives/Types';
+import { Disposable, dispose, toDisposable } from '../common/Lifecycle';
+import { IDisposable } from '../common/Types';
 import { IBufferService } from '../common/services/Services';
 import { ILinkProviderService, IMouseCoordsService, IRenderService } from './services/Services';
-import { Emitter } from '../common/primitives/Event';
+import { Emitter } from '../common/Event';
 import { addDisposableListener } from './Dom';

 export class Linkifier extends Disposable implements ILinkifier2 {
@@ -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/primitives/Types';
-import { IBufferLine } from '../common/primitives/buffer/Types';
+import { IBufferLine, IOscLinkData } from '../common/Types';

 class TestOscLinkService implements IOscLinkService {
  public serviceBrand: any;
@@ -5,8 +5,8 @@

 import { IBufferRange, ILink } from './Types';
 import { ILinkProvider } from './services/Services';
-import { CellData } from '../common/primitives/buffer/CellData';
-import { IBufferLine } from '../common/primitives/buffer/Types';
+import { CellData } from '../common/buffer/CellData';
+import { IBufferLine } from '../common/Types';
 import { IBufferService, IOptionsService, IOscLinkService } from '../common/services/Services';

 export class OscLinkProvider implements ILinkProvider {
@@ -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;
    }

@@ -6,10 +6,10 @@
 import { MockCompositionHelper, MockRenderer, MockViewport, TestTerminal } from './TestUtils.test';
 import type { IBrowser } from './Types';
 import { assert } from 'chai';
-import { DEFAULT_ATTR_DATA } from '../common/primitives/buffer/BufferLine';
-import { CellData } from '../common/primitives/buffer/CellData';
+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/primitives/buffer/Types';
+import { IMarker } from '../common/Types';

 const INIT_COLS = 80;
 const INIT_ROWS = 24;
@@ -7,20 +7,18 @@ 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/primitives/buffer/Types';
-import { ICircularList } from '../common/primitives/CircularList';
-import { XtermListener, ICharset, ColorIndex } from '../common/primitives/Types';
-import { ITerminalOptions } from '../common/Types';
-import { Buffer } from '../common/primitives/buffer/Buffer';
-import * as Browser from '../common/primitives/Platform';
+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';
 import { IUnicodeService, IOptionsService, ICoreService, IMouseStateService } from '../common/services/Services';
-import { IFunctionIdentifier, IParams } from '../common/primitives/parser/Types';
-import { AttributeData } from '../common/primitives/buffer/AttributeData';
+import { IFunctionIdentifier, IParams } from '../common/parser/Types';
+import { AttributeData } from '../common/buffer/AttributeData';
 import { ISelectionRedrawRequestEvent, ISelectionRequestScrollLinesEvent } from './selection/Types';
-import { css } from '../common/primitives/Color';
+import { css } from '../common/Color';
 import { createRenderDimensions } from './renderer/shared/RendererUtils';
-import { Emitter, type IEvent } from '../common/primitives/Event';
+import { Emitter, type IEvent } from '../common/Event';

 export class TestTerminal extends CoreBrowserTerminal {
  public get curAttrData(): IAttributeData { return (this as any)._inputHandler._curAttrData; }
@@ -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) {
@@ -3,13 +3,11 @@
 * @license MIT
 */

-import { IColor } from '../common/primitives/Types';
-import { ITerminalOptions } from '../common/Types';
-import { CharData, IBuffer } from '../common/primitives/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/primitives/Color';
-import type { IEvent } from '../common/primitives/Event';
+import { channels, css } from '../common/Color';
+import type { IEvent } from '../common/Event';

 /**
 * A portion of the public API that are implemented identially internally and simply passed through.
@@ -5,13 +5,13 @@

 import { ICoreBrowserService, IRenderService, IThemeService } from './services/Services';
 import { ViewportConstants } from './shared/Constants';
-import { Disposable, toDisposable } from '../common/primitives/Lifecycle';
+import { Disposable, toDisposable } from '../common/Lifecycle';
 import { IBufferService, ICoreService, IMouseStateService, IOptionsService } from '../common/services/Services';
-import { CoreMouseEventType } from '../common/primitives/Types';
+import { CoreMouseEventType } from '../common/Types';
 import { scheduleAtNextAnimationFrame } from './Dom';
 import { SmoothScrollableElement } from './scrollable/scrollableElement';
 import type { IScrollableElementChangeOptions } from './scrollable/scrollableElementOptions';
-import { Emitter, EventUtils } from '../common/primitives/Event';
+import { Emitter, EventUtils } from '../common/Event';
 import { Scrollable, ScrollbarVisibility, type IScrollEvent } from './scrollable/scrollable';

 export class Viewport extends Disposable {
@@ -4,7 +4,7 @@
 *--------------------------------------------------------------------------------------------*/

 import { ICoreBrowserService, IRenderService } from '../services/Services';
-import { Disposable, toDisposable } from '../../common/primitives/Lifecycle';
+import { Disposable, toDisposable } from '../../common/Lifecycle';
 import { IBufferService, IDecorationService, IInternalDecoration } from '../../common/services/Services';

 export class BufferDecorationRenderer extends Disposable {
@@ -5,7 +5,7 @@

 import { ColorZoneStore, IColorZone, IColorZoneStore } from './ColorZoneStore';
 import { ICoreBrowserService, IRenderService, IThemeService } from '../services/Services';
-import { Disposable, toDisposable } from '../../common/primitives/Lifecycle';
+import { Disposable, toDisposable } from '../../common/Lifecycle';
 import { IBufferService, IDecorationService, IOptionsService } from '../../common/services/Services';

 const enum Constants {
@@ -5,7 +5,7 @@

 import { IRenderService } from '../services/Services';
 import { IBufferService, ICoreService, IOptionsService } from '../../common/services/Services';
-import { C0 } from '../../common/primitives/data/EscapeSequences';
+import { C0 } from '../../common/data/EscapeSequences';

 interface IPosition {
  start: number;
@@ -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);
@@ -3,7 +3,7 @@
 * @license MIT
 */

-import { C0 } from '../../common/primitives/data/EscapeSequences';
+import { C0 } from '../../common/data/EscapeSequences';
 import { IBufferService } from '../../common/services/Services';

 const enum Direction {
@@ -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;
@@ -6,14 +6,14 @@
 import * as Strings from '../LocalizableStrings';
 import { CoreBrowserTerminal as TerminalCore } from '../CoreBrowserTerminal';
 import { IBufferRange, ITerminal } from '../Types';
-import { Disposable } from '../../common/primitives/Lifecycle';
+import { Disposable } from '../../common/Lifecycle';
 import { ITerminalOptions } from '../../common/Types';
 import { AddonManager } from '../../common/public/AddonManager';
 import { BufferNamespaceApi } from '../../common/public/BufferNamespaceApi';
 import { ParserApi } from '../../common/public/ParserApi';
 import { UnicodeApi } from '../../common/public/UnicodeApi';
 import { IBufferNamespace as IBufferNamespaceApi, IDecoration, IDecorationOptions, IDisposable, ILinkProvider, ILocalizableStrings, IMarker, IModes, IParser, IRenderDimensions, ITerminalAddon, Terminal as ITerminalApi, ITerminalInitOnlyOptions, IUnicodeHandling } from '@xterm/xterm';
-import type { IEvent } from '../../common/primitives/Event';
+import type { IEvent } from '../../common/Event';

 /**
 * The set of options that only have an effect when set in the Terminal constructor.
@@ -12,10 +12,10 @@ import { TextBlinkStateManager } from '../shared/TextBlinkStateManager';
 import { IRenderDimensions, IRenderer, IRequestRedrawEvent, ISelectionRenderModel } from '../shared/Types';
 import { ICharSizeService, ICoreBrowserService, IThemeService } from '../../services/Services';
 import { ILinkifier2, ILinkifierEvent, ITerminal, ReadonlyColorSet } from '../../Types';
-import { color } from '../../../common/primitives/Color';
-import { Disposable, toDisposable } from '../../../common/primitives/Lifecycle';
+import { color } from '../../../common/Color';
+import { Disposable, toDisposable } from '../../../common/Lifecycle';
 import { IBufferService, ICoreService, IInstantiationService, IOptionsService } from '../../../common/services/Services';
-import { Emitter } from '../../../common/primitives/Event';
+import { Emitter } from '../../../common/Event';
 import { addDisposableListener } from '../../Dom';


@@ -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;
    }
@@ -6,11 +6,11 @@
 import jsdom = require('jsdom');
 import { assert } from 'chai';
 import { DomRendererRowFactory } from './DomRendererRowFactory';
-import { NULL_CELL_CODE, NULL_CELL_WIDTH, NULL_CELL_CHAR, DEFAULT_ATTR, FgFlags, BgFlags, Attributes, UnderlineStyle } from '../../../common/primitives/buffer/Constants';
-import { BufferLine, DEFAULT_ATTR_DATA } from '../../../common/primitives/buffer/BufferLine';
-import { BufferLineStringCache } from '../../../common/primitives/buffer/BufferLineStringCache';
-import { IBufferLine } from '../../../common/primitives/buffer/Types';
-import { CellData } from '../../../common/primitives/buffer/CellData';
+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/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';
 import { TestWidthCache } from './WidthCache.test';
@@ -3,17 +3,16 @@
 * @license MIT
 */

-import { IColor } from '../../../common/primitives/Types';
-import { IBufferLine, ICellData } from '../../../common/primitives/buffer/Types';
+import { IBufferLine, ICellData, IColor } from '../../../common/Types';
 import { INVERTED_DEFAULT_COLOR } from '../shared/Constants';
-import { WHITESPACE_CELL_CHAR, Attributes } from '../../../common/primitives/buffer/Constants';
-import { CellData } from '../../../common/primitives/buffer/CellData';
+import { WHITESPACE_CELL_CHAR, Attributes } from '../../../common/buffer/Constants';
+import { CellData } from '../../../common/buffer/CellData';
 import { ICoreService, IDecorationService, IOptionsService } from '../../../common/services/Services';
-import { channels, color } from '../../../common/primitives/Color';
+import { channels, color } from '../../../common/Color';
 import { ICharacterJoinerService, ICoreBrowserService, IThemeService } from '../../services/Services';
 import { JoinedCellData } from '../../services/CharacterJoinerService';
 import { treatGlyphAsBackgroundColor } from '../shared/RendererUtils';
-import { AttributeData } from '../../../common/primitives/buffer/AttributeData';
+import { AttributeData } from '../../../common/buffer/AttributeData';
 import { WidthCache } from './WidthCache';
 import { IColorContrastCache } from '../../Types';

@@ -4,7 +4,7 @@
 */

 import { throwIfFalsy } from '../shared/RendererUtils';
-import { IDisposable } from '../../../common/primitives/Types';
+import { IDisposable } from '../../../common/Types';
 import { FontWeight } from '../../../common/services/Services';


@@ -7,7 +7,7 @@ import { assert } from 'chai';
 import { TextBlinkStateManager } from './TextBlinkStateManager';
 import { MockOptionsService } from '../../../common/TestUtils.test';
 import type { ICoreBrowserService } from '../../services/Services';
-import { Emitter } from '../../../common/primitives/Event';
+import { Emitter } from '../../../common/Event';

 class FakeWindow {
  public nextId = 1;
@@ -4,7 +4,7 @@
 */

 import { ICoreBrowserService } from '../../services/Services';
-import { Disposable, toDisposable } from '../../../common/primitives/Lifecycle';
+import { Disposable, toDisposable } from '../../../common/Lifecycle';
 import { IOptionsService } from '../../../common/services/Services';

 export class TextBlinkStateManager extends Disposable {
@@ -5,8 +5,8 @@

 import { Terminal } from '@xterm/xterm';
 import { ITerminal } from '../../Types';
-import { IDisposable } from '../../../common/primitives/Types';
-import type { IEvent } from '../../../common/primitives/Event';
+import { IDisposable } from '../../../common/Types';
+import type { IEvent } from '../../../common/Event';

 export interface IDimensions {
  width: number;
@@ -11,7 +11,7 @@ import { ScrollbarArrow, IScrollbarArrowOptions } from './scrollbarArrow';
 import { ScrollbarState } from './scrollbarState';
 import { ScrollbarVisibilityController } from './scrollbarVisibilityController';
 import { Widget } from './widget';
-import * as platform from '../../common/primitives/Platform';
+import * as platform from '../../common/Platform';
 import { INewScrollPosition, Scrollable, ScrollbarVisibility } from './scrollable';

 /**
@@ -4,7 +4,7 @@
 *--------------------------------------------------------------------------------------------*/

 import * as dom from '../Dom';
-import { DisposableStore, IDisposable, toDisposable } from '../../common/primitives/Lifecycle';
+import { DisposableStore, IDisposable, toDisposable } from '../../common/Lifecycle';

 type PointerMoveCallback = (event: PointerEvent) => void;
 type OnStopCallback = () => void;
@@ -3,7 +3,7 @@
 *  Licensed under the MIT License. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

-import * as platform from '../../common/primitives/Platform';
+import * as platform from '../../common/Platform';

 interface IWindowChainElement {
  readonly window: WeakRef<Window>;
@@ -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;
    }

@@ -3,8 +3,8 @@
 *  Licensed under the MIT License. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

-import { Emitter, IEvent } from '../../common/primitives/Event';
-import { Disposable, IDisposable } from '../../common/primitives/Lifecycle';
+import { Emitter, IEvent } from '../../common/Event';
+import { Disposable, IDisposable } from '../../common/Lifecycle';

 export const enum ScrollbarVisibility {
  AUTO = 1,
@@ -11,10 +11,10 @@ import { HorizontalScrollbar } from './horizontalScrollbar';
 import { IScrollableElementChangeOptions, IScrollableElementCreationOptions, IScrollableElementResolvedOptions } from './scrollableElementOptions';
 import { VerticalScrollbar } from './verticalScrollbar';
 import { Widget } from './widget';
-import { TimeoutTimer } from '../../common/primitives/Async';
-import { Emitter, IEvent } from '../../common/primitives/Event';
-import { IDisposable, dispose } from '../../common/primitives/Lifecycle';
-import * as platform from '../../common/primitives/Platform';
+import { TimeoutTimer } from '../../common/Async';
+import { Emitter, IEvent } from '../../common/Event';
+import { IDisposable, dispose } from '../../common/Lifecycle';
+import * as platform from '../../common/Platform';
 import { INewScrollDimensions, INewScrollPosition, IScrollDimensions, IScrollPosition, IScrollEvent, Scrollable, ScrollbarVisibility } from './scrollable';
 // import 'vs/css!./media/scrollbars';

@@ -5,7 +5,7 @@

 import { GlobalPointerMoveMonitor } from './globalPointerMoveMonitor';
 import { Widget } from './widget';
-import { TimeoutTimer } from '../../common/primitives/Async';
+import { TimeoutTimer } from '../../common/Async';
 import * as dom from '../Dom';

 export interface IScrollbarArrowOptions {
@@ -4,8 +4,8 @@
 *--------------------------------------------------------------------------------------------*/

 import { FastDomNode } from './fastDomNode';
-import { TimeoutTimer } from '../../common/primitives/Async';
-import { Disposable } from '../../common/primitives/Lifecycle';
+import { TimeoutTimer } from '../../common/Async';
+import { Disposable } from '../../common/Lifecycle';
 import { ScrollbarVisibility } from './scrollable';

 export class ScrollbarVisibilityController extends Disposable {
@@ -4,7 +4,7 @@
 *--------------------------------------------------------------------------------------------*/

 import * as DomUtils from '../Dom';
-import { Disposable, IDisposable, toDisposable } from '../../common/primitives/Lifecycle';
+import { Disposable, IDisposable, toDisposable } from '../../common/Lifecycle';

 const mainWindow = (typeof window === 'object' ? window : globalThis) as Window & typeof globalThis;

@@ -5,7 +5,7 @@

 import * as dom from '../Dom';
 import { IMouseEvent, StandardMouseEvent } from './mouseEvent';
-import { Disposable } from '../../common/primitives/Lifecycle';
+import { Disposable } from '../../common/Lifecycle';

 export abstract class Widget extends Disposable {

@@ -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', () => {
@@ -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;
  }
--- a/Show More
+++ b/Show More