Fix webpack aliases for target-* module paths and out/primitives+runtime

Co-authored-by: Daniel Imms <Tyriar@users.noreply.github.com>

.gitignore

@@ -22,6 +22,10 @@ build/
 yarn.lock
 test-results/
 
+# Tracing/debug files
+.cursor/nal-trace/
+.cursor/*.log
+
 # Keep bundled code out of Git
 dist/
 demo/dist/

AGENTS.md

@@ -2,10 +2,13 @@
 
 ## Architecture Overview
 
-**Core Structure**: xterm.js is a multi-target terminal emulator with three main distributions:
-- `src/browser/`: Full-featured browser terminal with DOM rendering
-- `src/headless/`: Server-side terminal for Node.js (no DOM)
-- `src/common/`: Shared core logic (parsing, buffer management, terminal state)
+**Core Structure**: xterm.js is a multi-target terminal emulator with these main source areas:
+- `src/primitives/`: Building blocks (buffer, parser, input, data, utilities); TypeScript project `src/primitives/tsconfig.json`
+- `src/runtime/`: Services, `CoreTerminal`, `InputHandler`, public API adapters; TypeScript project `src/runtime/tsconfig.json`
+- `src/target-browser/`: Browser terminal with DOM rendering
+- `src/target-headless/`: Node terminal without DOM
+
+See `src/ARCHITECTURE.md` for the dependency graph and import-path conventions (`common/*`, `target-browser/*`, `target-headless/*`).
 
 **Key Classes**:
 - `Terminal` (browser/headless): Public API wrapper
@@ -98,3 +101,15 @@ const cell = line?.getCell(0);
 ## Writing unit tests
 
 - Unit tests live alongside the source code file of the thing it's testing with a .test.ts suffix.
+
+## Cursor Cloud specific instructions
+
+**Demo server**: Start with `npm start` (port 3000). The demo server uses node-pty to spawn real shell sessions over WebSocket. Integration tests auto-start it via Playwright's `webServer` config, so you don't need to start it manually for `npm run test-integration`.
+
+**Build before testing**: Always run `npm run build && npm run esbuild` before `npm run test-unit`. Integration tests also need `npm run esbuild-demo-client` and `npm run esbuild-demo-server`. The update script handles this automatically on session start.
+
+**No external services**: This project has zero external dependencies (no databases, Docker, or APIs). Everything runs locally with Node.js.
+
+**TypeScript compiler**: The project uses `tsgo` (native TypeScript compiler preview) rather than standard `tsc`. It's installed via the `@typescript/native-preview` package.
+
+**Lint only changed files**: Prefer `npm run lint-changes` over `npm run lint` when iterating on code changes — it's significantly faster.

README.md

@@ -253,6 +253,7 @@ Xterm.js is used in many world-class applications to provide great terminal expe
 - [**SSH Connection Manager**](https://github.com/Amtrend/ssh-manager): Modern web-based SSH terminal and SFTP manager with AES-256 encryption, PWA support, and session management.
 - [**WooTTY**](https://github.com/icoretech/wootty): Flawless browser terminal for real operators.
 - [**Orca**](https://github.com/stablyai/orca): Agentic development environment for 100x builders.
+- [**4bit**](https://ciembor.github.io/4bit): Terminal Color Scheme Designer.
 - [And much more...](https://github.com/xtermjs/xterm.js/network/dependents?package_id=UGFja2FnZS0xNjYzMjc4OQ%3D%3D)
 
 Do you use xterm.js in your application as well? Please [open a Pull Request](https://github.com/sourcelair/xterm.js/pulls) to include it here. We would love to have it on our list. Please add any new contributions to the end of the list.

addons/addon-attach/test/tsconfig.json

@@ -11,10 +11,11 @@
     "removeComments": true,
     "paths": {
       "common/*": [
-        "../../../src/common/*"
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
       ],
-      "browser/*": [
-        "../../../src/browser/*"
+      "target-browser/*": [
+        "../../../src/target-browser/*"
       ],
       "*": [
         "./*"
@@ -31,10 +32,10 @@
   ],
   "references": [
     {
-      "path": "../../../src/common"
+      "path": "../../../src"
     },
     {
-      "path": "../../../src/browser"
+      "path": "../../../src/target-browser"
     },
     {
       "path": "../../../test/playwright"

addons/addon-clipboard/src/tsconfig.json

@@ -15,8 +15,8 @@
       "../../../node_modules/@types/mocha"
     ],
     "paths": {
-      "browser/*": [
-        "../../../src/browser/*"
+      "target-browser/*": [
+        "../../../src/target-browser/*"
       ],
       "@xterm/addon-clipboard": [
         "../typings/addon-clipboard.d.ts"
@@ -29,7 +29,7 @@
   ],
   "references": [
     {
-      "path": "../../../src/browser"
+      "path": "../../../src/target-browser"
     }
   ]
 }

addons/addon-clipboard/test/tsconfig.json

@@ -11,10 +11,11 @@
     "removeComments": true,
     "paths": {
       "common/*": [
-        "../../../src/common/*"
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
       ],
-      "browser/*": [
-        "../../../src/browser/*"
+      "target-browser/*": [
+        "../../../src/target-browser/*"
       ],
       "*": [
         "./*"
@@ -31,10 +32,10 @@
   ],
   "references": [
     {
-      "path": "../../../src/common"
+      "path": "../../../src"
     },
     {
-      "path": "../../../src/browser"
+      "path": "../../../src/target-browser"
     },
     {
       "path": "../../../test/playwright"

addons/addon-fit/src/FitAddon.ts

@@ -5,7 +5,7 @@
 
 import type { Terminal, ITerminalAddon, IRenderDimensions } from '@xterm/xterm';
 import type { FitAddon as IFitApi } from '@xterm/addon-fit';
-import { ViewportConstants } from 'browser/shared/Constants';
+import { ViewportConstants } from 'target-browser/shared/Constants';
 
 interface ITerminalDimensions {
   /**

addons/addon-fit/src/tsconfig.json

@@ -15,8 +15,8 @@
       "../../../node_modules/@types/mocha"
     ],
     "paths": {
-      "browser/*": [
-        "../../../src/browser/*"
+      "target-browser/*": [
+        "../../../src/target-browser/*"
       ],
       "@xterm/addon-fit": [
         "../typings/addon-fit.d.ts"
@@ -29,7 +29,7 @@
   ],
   "references": [
     {
-      "path": "../../../src/browser"
+      "path": "../../../src/target-browser"
     }
   ]
 }

addons/addon-fit/test/tsconfig.json

@@ -11,10 +11,11 @@
     "removeComments": true,
     "paths": {
       "common/*": [
-        "../../../src/common/*"
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
       ],
-      "browser/*": [
-        "../../../src/browser/*"
+      "target-browser/*": [
+        "../../../src/target-browser/*"
       ],
       "*": [
         "./*"
@@ -31,10 +32,10 @@
   ],
   "references": [
     {
-      "path": "../../../src/common"
+      "path": "../../../src"
     },
     {
-      "path": "../../../src/browser"
+      "path": "../../../src/target-browser"
     },
     {
       "path": "../../../test/playwright"

addons/addon-image/README.md

@@ -1,6 +1,7 @@
 ## @xterm/addon-image
 
-Inline image output in xterm.js. Supports SIXEL and iTerm's inline image protocol (IIP).
+Inline image output in xterm.js. Supports SIXEL, iTerm's inline image protocol (IIP)
+and partially Kitty's terminal graphics prtocol (TGP).
 
 
 ![](fixture/example.png)
@@ -43,9 +44,6 @@ terminal.loadAddon(imageAddon);
 
 ### General Notes
 
-- *IMPORTANT:* The worker approach as done in previous releases got removed.
-  The addon contructor no longer expects a worker path as first argument.
-
 - By default the addon will activate these `windowOptions` reports on the terminal:
   - getWinSizePixels (CSI 14 t)
   - getCellSizePixels (CSI 16 t)
@@ -73,7 +71,7 @@ terminal.loadAddon(imageAddon);
 
 - **Cursor Positioning**  
   If scrolling is set, the cursor will be placed at the first image column of the last image row (VT340 mode).
-  Other cursor positioning modes as used by xterm or mintty are not supported.
+  Other cursor positioning modes as used by xterm or mintty are not supported for sixel.
 
 - **SIXEL Palette Handling**  
   By default the addon limits the palette size to 256 registers (as demanded by the DEC specification).
@@ -100,17 +98,24 @@ terminal.loadAddon(imageAddon);
   Set by default, change it with `{iipSupport: true}`.
 
   The IIP implementation has the following features / restrictions (sequence will silently fail for unmet conditions):
-  - Supported formats: PNG, JPEG and GIF
+  - Supported formats: PNG, JPEG, GIF and QOI
   - No animation support.
   - Image type hinting is not supported (always deducted from data header).
   - File download is not supported.
   - Filename gets parsed but not used.
   - Strict base64 handling as of RFC4648 §4 (standard alphabet, optional padding, no separator bytes allowed).
-  - Payload size may not exceed CEIL(sizeParameter * 4 / 3).
   - Image scaling beyond terminal viewport size is allowed (e.g. `width=200%`).
   - Image pixel size is restricted by `pixelLimit` (pre- and post resizing).
-  - Size parameter is restricted by `iipSizeLimit`.
-  - Cursor positioning behaves the same as for sixel (see above).
+  - Playload size is restricted by `iipSizeLimit`.
+  - size parameter is not mandatory anymore.
+  - Cursor gets positioned at the next cell of the last image line.
+  - ReportCellSize sequence is supported.
+  - Hi-res display support is currently limited (image gets blurred).
+
+- **Kitty Graphics Support (TGP)**  
+  Set by default, change it with `{kittySupport: true}`.
+
+  Note that the kitty graphics support is still WIP.
 
 
 ### Storage and Drawing Settings
@@ -127,6 +132,7 @@ The addon exposes two properties to interact with the storage limits at runtime:
 By default the addon will show a placeholder pattern for evicted images that are still part
 of the terminal (e.g. in the scrollback). The pattern can be deactivated by toggling `showPlaceholder`.
 
+
 ### Image Data Retrieval
 
 The addon provides the following API endpoints to retrieve raw image data as canvas:
@@ -140,6 +146,7 @@ The addon provides the following API endpoints to retrieve raw image data as can
   The buffer position is the 0-based absolute index (including scrollback at top).
   Note that the canvas gets created and data copied over for every call, thus it is not suitable for performance critical actions.
 
+
 ### 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, lets look at the data flow and processing steps:
@@ -180,8 +187,8 @@ _How can I adjust the memory usage?_
   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 memory peaking for decoding.
-- `sixelSizeLimit`  
-  A constructor setting. This has only a small impact on peaking memory during decoding. It is meant to avoid processing of overly big or broken SIXEL sequences at an earlier phase, thus may stop the decoder from entering its memory intensive task for potentially invalid data.
+- `sixelSizeLimit | iipSizeLimit | kittySizeLimit`  
+  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
@@ -211,23 +218,5 @@ _How can I adjust the memory usage?_
 
 ### Status
 
-- Sixel support and image handling in xterm.js is considered beta quality.
-- IIP support is in alpha stage. Please file a bug for any awkwardities.
-
-
-### Changelog
-
-- 0.5.0 integrate with xtermjs base repo (at v0.4.3)
-- 0.4.3 defer canvas creation
-- 0.4.2 fix image canvas resize
-- 0.4.1 compat release for xterm.js 5.2.0
-- 0.4.0 IIP support
-- 0.3.1 compat release for xterm.js 5.1.0
-- 0.3.0 important change: worker removed from addon
-- 0.2.0 compat release for xterm.js 5.0.0
-- 0.1.3 bugfix: avoid striping
-- 0.1.2 bugfix: reset clear flag
-- 0.1.1 bugfixes:
-  - clear sticky image tiles on render
-  - create folder from bootstrap.sh
-  - fix peer dependency in package.json
+- Sixel and IIP support and image handling in xterm.js is considered beta quality.
+- Kitty support is in alpha stage. Please file a bug for any awkwardities or missing features.

addons/addon-image/src/IIPHandler.ts

@@ -8,7 +8,7 @@ import { IIPImageStorage } from './IIPImageStorage';
 import { CELL_SIZE_DEFAULT } from './ImageStorage';
 import Base64Decoder from 'xterm-wasm-parts/lib/base64/Base64Decoder.wasm';
 import QoiDecoder from 'xterm-wasm-parts/lib/qoi/QoiDecoder.wasm';
-import { HeaderParser, IHeaderFields, HeaderState } from './IIPHeaderParser';
+import { HeaderParser, IHeaderFields, HeaderState, SequenceType } from './IIPHeaderParser';
 import { imageType, UNSUPPORTED_TYPE } from './IIPMetrics';
 
 // Local const enum mirror - esbuild can't inline const enums from external packages
@@ -23,6 +23,7 @@ const enum DecoderConst {
 
 // default IIP header values
 const DEFAULT_HEADER: IHeaderFields = {
+  type: SequenceType.INVALID,
   name: 'Unnamed file',
   size: 0,
   width: 'auto',
@@ -39,6 +40,8 @@ export class IIPHandler implements IOscHandler, IResetHandler {
   private _dec: Base64Decoder;
   private _qoiDec: QoiDecoder;
   private _metrics = UNSUPPORTED_TYPE;
+  private _isMultipart = false;
+  private _abortMulti = false;
 
   constructor(
     private readonly _opts: IImageAddonOptions,
@@ -52,11 +55,14 @@ export class IIPHandler implements IOscHandler, IResetHandler {
     this._qoiDec = new QoiDecoder(DecoderConst.KEEP_DATA);
   }
 
-  public reset(): void {}
+  public reset(): void {
+    this._hp.reset();
+    this._dec.release();
+    this._qoiDec.release();
+  }
 
   public start(): void {
     this._aborted = false;
-    this._header = DEFAULT_HEADER;
     this._metrics  = UNSUPPORTED_TYPE;
     this._hp.reset();
   }
@@ -76,15 +82,27 @@ export class IIPHandler implements IOscHandler, IResetHandler {
         return;
       }
       if (dataPos > 0) {
-        this._header = Object.assign({}, DEFAULT_HEADER, this._hp.fields);
-        if (!this._header.inline || !this._header.size || this._header.size > this._opts.iipSizeLimit) {
+        const seqType = this._hp.fields.type;
+        if (seqType === SequenceType.FILE) {
+          if (this._isMultipart) {
+            this._isMultipart = false;
+            this._abortMulti = false;
+            this._dec.release();
+          }
+          this._header = Object.assign({}, DEFAULT_HEADER, this._hp.fields);
+          if (!this._header.inline) {
+            this._aborted = true;
+            return;
+          }
+          this._dec.init();
+        } else if (this._abortMulti) {
           this._aborted = true;
           return;
         }
-        this._dec.init();
         if ((this._dec.put(data.subarray(dataPos, end)) as number) !== DecoderConst.OK) {
           this._dec.release();
           this._aborted = true;
+          if (this._isMultipart) this._abortMulti = true;
         }
       }
     }
@@ -93,22 +111,58 @@ export class IIPHandler implements IOscHandler, IResetHandler {
   public end(success: boolean): boolean | Promise<boolean> {
     if (this._aborted) return true;
 
+    if (this._hp.state !== HeaderState.END) {
+      if (this._hp.end()) return true;
+    }
+    const seqType = this._hp.fields.type;
+
+    if (seqType === SequenceType.FILEPART) return true;
+
+    if (seqType === SequenceType.REPORTCELLSIZE) {
+      // OSC 1337 ; ReportCellSize=[height];[width];[scale] ST
+      let width = CELL_SIZE_DEFAULT.width;
+      let height = CELL_SIZE_DEFAULT.height;
+      if (this._renderer.dimensions) {
+        width = this._renderer.dimensions.css.canvas.width / this._coreTerminal.cols;
+        height = this._renderer.dimensions.css.canvas.height / this._coreTerminal.rows;
+      }
+      const scale = this._coreTerminal._core._coreBrowserService?.dpr ?? 1;
+      const report = `\x1b]1337;ReportCellSize=${height.toFixed(3)};${width.toFixed(3)};${scale.toFixed(3)}\x1b\\`;
+      this._coreTerminal.input(report, false);
+      return true;
+    }
+
+    if (seqType === SequenceType.MULTIPARTFILE) {
+      this._header = Object.assign({}, DEFAULT_HEADER, this._hp.fields);
+      this._isMultipart = true;
+      this._abortMulti = false;
+      this._dec.release();
+      this._dec.init();
+      return true;
+    }
+
+    if (seqType === SequenceType.FILEEND) {
+      if (!this._isMultipart) return true;
+      this._isMultipart = false;
+      if (this._abortMulti || this._header.type !== SequenceType.MULTIPARTFILE) return true;
+    }
+
+    // fallthrough for SequenceType.FILE & SequenceType.FILEEND
+
     let w = 0;
     let h = 0;
 
     // early exit condition chain
-    let cond: number | boolean = true;
+    let cond: number | boolean;
     if (cond = success) {
       if (cond = !this._dec.end()) {
-        if (cond = this._dec.data8.length === this._header.size) {
-          this._metrics = imageType(this._dec.data8);
-          if (cond = this._metrics.mime !== 'unsupported') {
-            w = this._metrics.width;
-            h = this._metrics.height;
-            if (cond = w && h && w * h < this._opts.pixelLimit) {
-              [w, h] = this._resize(w, h).map(Math.floor);
-              cond = w && h && w * h < this._opts.pixelLimit;
-            }
+        this._metrics = imageType(this._dec.data8);
+        if (cond = this._metrics.mime !== 'unsupported') {
+          w = this._metrics.width;
+          h = this._metrics.height;
+          if (cond = w && h && w * h < this._opts.pixelLimit) {
+            [w, h] = this._resize(w, h).map(Math.floor);
+            cond = w && h && w * h < this._opts.pixelLimit;
           }
         }
       }

addons/addon-image/src/IIPHeaderParser.test.ts

@@ -4,19 +4,20 @@
  */
 
 import { assert } from 'chai';
-import { HeaderParser, HeaderState, IHeaderFields } from './IIPHeaderParser';
+import { HeaderParser, HeaderState, IHeaderFields, SequenceType } from './IIPHeaderParser';
 
 
 const CASES: [string, IHeaderFields][] = [
-  ['File=size=123456;name=dGVzdA==:', {name: 'test', size: 123456}],
-  ['File=size=123456;name=dGVzdA:', {name: 'test', size: 123456}],
+  ['File=size=123456;name=dGVzdA==:', {type: SequenceType.FILE, name: 'test', size: 123456}],
+  ['File=size=123456;name=dGVzdA:', {type: SequenceType.FILE, name: 'test', size: 123456}],
   // utf-8 encoding in name
-  ['File=size=123456;name=w7xtbMOkdXTDnw==:', {name: 'ümläutß', size: 123456}],
-  ['File=size=123456;name=w7xtbMOkdXTDnw:', {name: 'ümläutß', size: 123456}],
+  ['File=size=123456;name=w7xtbMOkdXTDnw==:', {type: SequenceType.FILE, name: 'ümläutß', size: 123456}],
+  ['File=size=123456;name=w7xtbMOkdXTDnw:', {type: SequenceType.FILE, name: 'ümläutß', size: 123456}],
   // full header spec
   [
     'File=inline=1;width=10px;height=20%;preserveAspectRatio=1;size=123456;name=w7xtbMOkdXTDnw:',
     {
+      type: SequenceType.FILE,
       inline: 1,
       width: '10px',
       height: '20%',
@@ -28,6 +29,7 @@ const CASES: [string, IHeaderFields][] = [
   [
     'File=inline=1;width=auto;height=20;preserveAspectRatio=1;size=123456;name=w7xtbMOkdXTDnw:',
     {
+      type: SequenceType.FILE,
       inline: 1,
       width: 'auto',
       height: '20',
@@ -101,7 +103,7 @@ describe('IIPHeaderParser', () => {
     let res = hp.parse(inp, 0, inp.length);
     assert.strictEqual(res, inp.length);
     assert.strictEqual(hp.state, HeaderState.END);
-    assert.deepEqual(hp.fields, {name: 'test', size: 0});
+    assert.deepEqual(hp.fields, {type: SequenceType.FILE, name: 'test', size: 0});
     hp.reset();
     inp = fromBs(CASES[0][0]);
     res = hp.parse(inp, 0, inp.length);
@@ -115,7 +117,7 @@ describe('IIPHeaderParser', () => {
     let res = hp.parse(inp, 0, inp.length);
     assert.strictEqual(res, inp.length);
     assert.strictEqual(hp.state, HeaderState.END);
-    assert.deepEqual(hp.fields, {name: '', size: 123456});
+    assert.deepEqual(hp.fields, {type: SequenceType.FILE, name: '', size: 123456});
     hp.reset();
     inp = fromBs(CASES[0][0]);
     res = hp.parse(inp, 0, inp.length);
@@ -135,4 +137,124 @@ describe('IIPHeaderParser', () => {
     assert.strictEqual(hp.state, HeaderState.END);
     assert.deepEqual(hp.fields, CASES[0][1]);
   });
+  it('FilePart sequence', () => {
+    const hp = new HeaderParser();
+    const inp = fromBs('FilePart=w7xtbMOkdXTDnw');
+    const res = hp.parse(inp, 0, inp.length);
+    assert.strictEqual(res, 9);
+    assert.strictEqual(hp.state, HeaderState.END);
+    assert.deepEqual(hp.fields.type, SequenceType.FILEPART);
+  });
+  it('FilePart sequence - bytewise', () => {
+    const hp = new HeaderParser();
+    const inp = fromBs('FilePart=w7xtbMOkdXTDnw');
+    let res = -2;
+    let pos = 0;
+    while (res === -2 && pos < inp.length) {
+      res = hp.parse(new Uint32Array([inp[pos++]]), 0, 1);
+    }
+    assert.strictEqual(res, 1);
+    assert.strictEqual(hp.state, HeaderState.END);
+    assert.deepEqual(hp.fields.type, SequenceType.FILEPART);
+  });
+  it('MultipartFile sequence', () => {
+    const hp = new HeaderParser();
+    const inp = fromBs('MultipartFile=inline=1;width=10px;height=20%;preserveAspectRatio=1;size=123456;name=w7xtbMOkdXTDnw');
+    let res = hp.parse(inp, 0, inp.length);
+    assert.strictEqual(res, -2);
+    assert.strictEqual(hp.state, HeaderState.VALUE);
+    res = hp.end();
+    assert.strictEqual(res, 0);
+    assert.strictEqual(hp.state, HeaderState.END);
+    assert.deepEqual(
+      hp.fields,
+      {
+        type: SequenceType.MULTIPARTFILE,
+        inline: 1,
+        width: '10px',
+        height: '20%',
+        preserveAspectRatio: 1,
+        size: 123456,
+        name: 'ümläutß'
+      }
+    );
+  });
+  it('MultipartFile sequence - bytewise', () => {
+    const hp = new HeaderParser();
+    const inp = fromBs('MultipartFile=inline=1;width=10px;height=20%;preserveAspectRatio=1;size=123456;name=w7xtbMOkdXTDnw');
+    let res = -2;
+    let pos = 0;
+    while (res === -2 && pos < inp.length) {
+      res = hp.parse(new Uint32Array([inp[pos++]]), 0, 1);
+    }
+    assert.strictEqual(res, -2);
+    assert.strictEqual(hp.state, HeaderState.VALUE);
+    res = hp.end();
+    assert.strictEqual(res, 0);
+    assert.strictEqual(hp.state, HeaderState.END);
+    assert.deepEqual(
+      hp.fields,
+      {
+        type: SequenceType.MULTIPARTFILE,
+        inline: 1,
+        width: '10px',
+        height: '20%',
+        preserveAspectRatio: 1,
+        size: 123456,
+        name: 'ümläutß'
+      }
+    );
+  });
+  it('FileEnd sequence', () => {
+    const hp = new HeaderParser();
+    const inp = fromBs('FileEnd');
+    let res = hp.parse(inp, 0, inp.length);
+    assert.strictEqual(res, -2);
+    assert.strictEqual(hp.state, HeaderState.START);
+    res = hp.end();
+    assert.strictEqual(res, 0);
+    assert.strictEqual(hp.state, HeaderState.END);
+    assert.deepEqual(hp.fields.type, SequenceType.FILEEND);
+  });
+  it('FileEnd sequence - bytewise', () => {
+    const hp = new HeaderParser();
+    const inp = fromBs('FileEnd');
+    let res = -2;
+    let pos = 0;
+    while (res === -2 && pos < inp.length) {
+      res = hp.parse(new Uint32Array([inp[pos++]]), 0, 1);
+    }
+    assert.strictEqual(res, -2);
+    assert.strictEqual(hp.state, HeaderState.START);
+    res = hp.end();
+    assert.strictEqual(res, 0);
+    assert.strictEqual(hp.state, HeaderState.END);
+    assert.deepEqual(hp.fields.type, SequenceType.FILEEND);
+  });
+  it('ReportCellSize sequence', () => {
+    const hp = new HeaderParser();
+    const inp = fromBs('ReportCellSize');
+    let res = hp.parse(inp, 0, inp.length);
+    assert.strictEqual(res, -2);
+    assert.strictEqual(hp.state, HeaderState.START);
+    res = hp.end();
+    assert.strictEqual(res, 0);
+    assert.strictEqual(hp.state, HeaderState.END);
+    assert.deepEqual(hp.fields, { type: SequenceType.REPORTCELLSIZE });
+  });
+  it('ReportCellSize sequence - bytewise', () => {
+    const hp = new HeaderParser();
+    const inp = fromBs('ReportCellSize');
+    let res = -2;
+    let pos = 0;
+    while (res === -2 && pos < inp.length) {
+      res = hp.parse(new Uint32Array([inp[pos++]]), 0, 1);
+    }
+    assert.strictEqual(res, -2);
+    assert.strictEqual(hp.state, HeaderState.START);
+    res = hp.end();
+    assert.strictEqual(res, 0);
+    assert.strictEqual(hp.state, HeaderState.END);
+    assert.deepEqual(hp.fields, { type: SequenceType.REPORTCELLSIZE });
+  });
 });

addons/addon-image/src/IIPHeaderParser.ts

@@ -6,9 +6,27 @@
 // eslint-disable-next-line
 declare const Buffer: any;
 
+export const enum HeaderState {
+  START = 0,
+  ABORT = 1,
+  KEY = 2,
+  VALUE = 3,
+  END = 4
+}
+
+export const enum SequenceType {
+  INVALID = 0,
+  FILE = 1,
+  MULTIPARTFILE = 2,
+  FILEPART = 3,
+  FILEEND = 4,
+  REPORTCELLSIZE = 5
+}
 
 export interface IHeaderFields {
   [key: string]: number | string | Uint32Array | null | undefined;
+  // sequence type
+  type: SequenceType;
   // base-64 encoded filename. Defaults to "Unnamed file".
   name: string;
   // File size in bytes. The file transfer will be canceled if this size is exceeded.
@@ -29,14 +47,6 @@ export interface IHeaderFields {
   inline?: number;
 }
 
-export const enum HeaderState {
-  START = 0,
-  ABORT = 1,
-  KEY = 2,
-  VALUE = 3,
-  END = 4
-}
-
 // field value decoders
 
 // ASCII bytes to string
@@ -92,7 +102,19 @@ const DECODERS: {[key: string]: (v: Uint32Array) => number | string} = {
 };
 
 
+// sequence type markers
+// File
 const FILE_MARKER = [70, 105, 108, 101];
+// MultipartFile
+const MULTIPARTFILE_MARKER = [77, 117, 108, 116, 105, 112, 97, 114, 116, 70, 105, 108, 101];
+// FilePart
+const FILEPART_MARKER = [70, 105, 108, 101, 80, 97, 114, 116];
+// FileEnd
+const FILEEND_MARKER = [70, 105, 108, 101, 69, 110, 100];
+// ReportCellSize
+const REPORTCELLSIZE_MARKER = [82, 101, 112, 111, 114, 116, 67, 101, 108, 108, 83, 105, 122, 101];
+
+// max allowed chars for sequence header
 const MAX_FIELDCHARS = 1024;
 
 
@@ -111,12 +133,43 @@ export class HeaderParser {
     this._key = '';
   }
 
+  public end(): number {
+    if (this.state === HeaderState.START) {
+      if (this._position === FILEEND_MARKER.length) {
+        for (let k = 0; k < FILEEND_MARKER.length; ++k) {
+          if (this._buffer[k] !== FILEEND_MARKER[k]) return this._a();
+        }
+        this.fields['type'] = SequenceType.FILEEND;
+        this.state = HeaderState.END;
+        return 0;
+      }
+      if (this._position === REPORTCELLSIZE_MARKER.length) {
+        for (let k = 0; k < REPORTCELLSIZE_MARKER.length; ++k) {
+          if (this._buffer[k] !== REPORTCELLSIZE_MARKER[k]) return this._a();
+        }
+        this.fields['type'] = SequenceType.REPORTCELLSIZE;
+        this.state = HeaderState.END;
+        return 0;
+      }
+      return this._a();
+    }
+    if (this.state === HeaderState.END) return 0;
+    if (this.state === HeaderState.VALUE
+      && this.fields.type === SequenceType.MULTIPARTFILE
+    ) {
+      if (!this._storeValue(this._position)) return this._a();
+      this.state = HeaderState.END;
+      return 0;
+    }
+    return this._a();
+  }
+
   public parse(data: Uint32Array, start: number, end: number): number {
     let state = this.state;
     let pos = this._position;
     const buffer = this._buffer;
     if (state === HeaderState.ABORT || state === HeaderState.END) return -1;
-    if (state === HeaderState.START && pos > 6) return -1;
+    if (state === HeaderState.START && pos > 14) return -1;
     for (let i = start; i < end; ++i) {
       const c = data[i];
       switch (c) {
@@ -127,8 +180,29 @@ export class HeaderParser {
           break;
         case 61: // =
           if (state === HeaderState.START) {
-            for (let k = 0; k < FILE_MARKER.length; ++k) {
-              if (buffer[k] !== FILE_MARKER[k]) return this._a();
+            if (buffer[0] === 70) {
+              // 'File' or 'FilePart'
+              let k = 0;
+              for (; k < FILE_MARKER.length; ++k) {
+                if (buffer[k] !== FILE_MARKER[k]) return this._a();
+              }
+              this.fields['type'] = SequenceType.FILE;
+              if (pos === FILEPART_MARKER.length) {
+                for (; k < FILEPART_MARKER.length; ++k) {
+                  if (buffer[k] !== FILEPART_MARKER[k]) return this._a();
+                }
+                this.fields['type'] = SequenceType.FILEPART;
+                this.state = HeaderState.END;
+                return i + 1;
+              }
+            } else if (buffer[0] === 77) {
+              // 'MultipartFile'
+              for (let k = 0; k < MULTIPARTFILE_MARKER.length; ++k) {
+                if (buffer[k] !== MULTIPARTFILE_MARKER[k]) return this._a();
+              }
+              this.fields['type'] = SequenceType.MULTIPARTFILE;
+            } else {
+              return this._a();
             }
             state = HeaderState.KEY;
             pos = 0;
@@ -158,6 +232,7 @@ export class HeaderParser {
   }
 
   private _a(): number {
+    this.fields.type = SequenceType.INVALID;
     this.state = HeaderState.ABORT;
     return -1;
   }

addons/addon-image/src/IIPImageStorage.ts

@@ -3,6 +3,7 @@
  * @license MIT
  */
 
+import { IAddImageOpts } from 'Types';
 import { ImageStorage } from './ImageStorage';
 
 /**
@@ -12,6 +13,7 @@ import { ImageStorage } from './ImageStorage';
  * - Always uses scrolling mode (cursor advances with image)
  */
 export class IIPImageStorage {
+  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'iip' };
   constructor(
     private readonly _storage: ImageStorage
   ) {}
@@ -21,6 +23,6 @@ export class IIPImageStorage {
    * Always uses scrolling mode — cursor advances past the image.
    */
   public addImage(img: HTMLCanvasElement | ImageBitmap): void {
-    this._storage.addImage(img, true);
+    this._storage.addImage(img, this._addImageOpts);
   }
 }

addons/addon-image/src/IIPMetrics.test.ts

@@ -30,7 +30,8 @@ const TEST_IMAGES: [string, IMetrics][] = [
   ['iphone_hdr_YES.jpg', { mime: 'image/jpeg', width: 3264, height: 2448 }],
   ['nikon-e950.jpg', { mime: 'image/jpeg', width: 800, height: 600 }],
   ['agfa-makernotes.jpg', { mime: 'image/jpeg', width: 8, height: 8 }],
-  ['sony-alpha-6000.jpg', { mime: 'image/jpeg', width: 6000, height: 4000 }]
+  ['sony-alpha-6000.jpg', { mime: 'image/jpeg', width: 6000, height: 4000 }],
+  ['dice.qoi', { mime: 'image/qoi', width: 800, height: 600 }],
 ];
 
 

addons/addon-image/src/ImageAddon.ts

@@ -137,11 +137,6 @@ export class ImageAddon implements ITerminalAddon, IImageApi {
 
     // enable size reports
     if (this._opts.enableSizeReports) {
-      // const windowOptions = terminal.getOption('windowOptions');
-      // windowOptions.getWinSizePixels = true;
-      // windowOptions.getCellSizePixels = true;
-      // windowOptions.getWinSizeChars = true;
-      // terminal.setOption('windowOptions', windowOptions);
       const windowOps = terminal.options.windowOptions ?? {};
       windowOps.getWinSizePixels = true;
       windowOps.getCellSizePixels = true;
@@ -260,7 +255,7 @@ export class ImageAddon implements ITerminalAddon, IImageApi {
   }
 
   private _report(s: string): void {
-    this._terminal?._core.coreService.triggerDataEvent(s);
+    this._terminal?._core.input(s, false);
   }
 
   private _decset(params: (number | number[])[]): boolean {

addons/addon-image/src/ImageRenderer.ts

@@ -146,7 +146,7 @@ export class ImageRenderer extends Disposable implements IDisposable {
   public clearLines(start: number, end: number, layer?: ImageLayer): void {
     const y = start * (this.dimensions?.css.cell.height || 0);
     const w = this.dimensions?.css.canvas.width || 0;
-    const h = (++end - start) * (this.dimensions?.css.cell.height || 0);
+    const h = (end + 1 - start) * (this.dimensions?.css.cell.height || 0);
     if (!layer || layer === 'top') {
       this._layers.get('top')?.clearRect(0, y, w, h);
     }

addons/addon-image/src/ImageStorage.ts

@@ -5,7 +5,11 @@
 
 import { IDisposable } from '@xterm/xterm';
 import { ImageRenderer } from './ImageRenderer';
-import { ITerminalExt, IExtendedAttrsImage, IImageAddonOptions, IImageSpec, IBufferLineExt, BgFlags, Cell, Content, ICellSize, ExtFlags, Attributes, UnderlineStyle, ImageLayer } from './Types';
+import {
+  ITerminalExt, IExtendedAttrsImage, IImageAddonOptions, IImageSpec,
+  IBufferLineExt, BgFlags, Cell, Content, ICellSize, ExtFlags, Attributes,
+  UnderlineStyle, IAddImageOpts
+} from './Types';
 
 
 // fallback default cell size
@@ -235,13 +239,15 @@ export class ImageStorage implements IDisposable {
   /**
    * Method to add an image to the storage.
    * @param img - The image to add (canvas or bitmap).
-   * @param scrolling - When true, cursor advances with the image (lineFeed per row).
-   *   When false, image is placed at (0,0) and cursor is restored (DECSET 80 / sixel origin mode).
-   * @param layer - Which canvas layer to render on ('top' or 'bottom').
-   * @param zIndex - Z-index for image layering within the same layer.
+   * @param opts - Options for addImage:
+   *   - scrolling:  When true, cursor advances with the image.
+   *                 When false, image is placed at ORIGIN and cursor does not move.
+   *   - layer:      Which canvas layer to render on ('top' or 'bottom').
+   *   - zIndex:     Z-index for image layering within the same layer.
+   *   - cursorPos:  'vt340' for bottom-left, 'iip' for bottom.right.
    * @returns The internal image ID assigned to the stored image.
    */
-  public addImage(img: HTMLCanvasElement | ImageBitmap, scrolling: boolean, layer: ImageLayer = 'top', zIndex: number = 0): number {
+  public addImage(img: HTMLCanvasElement | ImageBitmap, opts: IAddImageOpts): number {
     // never allow storage to exceed memory limit
     this._evictOldest(img.width * img.height);
 
@@ -263,7 +269,7 @@ export class ImageStorage implements IDisposable {
     let offset = originX;
     let tileCount = 0;
 
-    if (!scrolling) {
+    if (!opts.scrolling) {
       buffer.x = 0;
       buffer.y = 0;
       offset = 0;
@@ -277,7 +283,7 @@ export class ImageStorage implements IDisposable {
         this._writeToCell(line as IBufferLineExt, offset + col, imageId, row * cols + col);
         tileCount++;
       }
-      if (scrolling) {
+      if (opts.scrolling) {
         if (row < rows - 1) this._terminal._core._inputHandler.lineFeed();
       } else {
         if (++buffer.y >= termRows) break;
@@ -287,8 +293,12 @@ export class ImageStorage implements IDisposable {
     this._terminal._core._inputHandler._dirtyRowTracker.markDirty(buffer.y);
 
     // cursor positioning modes
-    if (scrolling) {
-      buffer.x = offset;
+    if (opts.scrolling) {
+      if (opts.cursorPos === 'iip') {
+        buffer.x = Math.min(offset + cols, termCols);
+      } else {
+        buffer.x = offset;
+      }
     } else {
       buffer.x = originX;
       buffer.y = originY;
@@ -331,8 +341,8 @@ export class ImageStorage implements IDisposable {
       marker: endMarker || undefined,
       tileCount,
       bufferType: this._terminal.buffer.active.type,
-      layer,
-      zIndex
+      layer: opts.layer,
+      zIndex: opts.zIndex
     };
 
     // finally add the image
@@ -455,7 +465,6 @@ export class ImageStorage implements IDisposable {
             if (!nextE || nextE.imageId !== imageId || nextE.tileId !== startTile + count) {
               break;
             }
-            e = nextE;
             count++;
           }
           col--;

addons/addon-image/src/SixelHandler.ts

@@ -91,7 +91,7 @@ export class SixelHandler implements IDcsHandler, IResetHandler {
     const height = this._dec.height;
 
     // partial fix for https://github.com/jerch/xterm-addon-image/issues/37
-    if (!width || ! height) {
+    if (!width || !height) {
       if (height) {
         this._storage.advanceCursor(height);
       }

addons/addon-image/src/SixelImageStorage.ts

@@ -4,7 +4,7 @@
  */
 
 import { ImageStorage, CELL_SIZE_DEFAULT } from './ImageStorage';
-import { IImageAddonOptions, ITerminalExt } from './Types';
+import { IImageAddonOptions, ITerminalExt, IAddImageOpts } from './Types';
 import { ImageRenderer } from './ImageRenderer';
 
 /**
@@ -15,6 +15,7 @@ import { ImageRenderer } from './ImageRenderer';
  * - advanceCursor for empty sixels carrying only height
  */
 export class SixelImageStorage {
+  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'vt340' };
   constructor(
     private readonly _storage: ImageStorage,
     private readonly _opts: IImageAddonOptions,
@@ -27,7 +28,8 @@ export class SixelImageStorage {
    * Cursor behavior depends on the sixelScrolling option (DECSET 80).
    */
   public addImage(img: HTMLCanvasElement | ImageBitmap): void {
-    this._storage.addImage(img, this._opts.sixelScrolling);
+    this._addImageOpts.scrolling = this._opts.sixelScrolling;
+    this._storage.addImage(img, this._addImageOpts);
   }
 
   /**

addons/addon-image/src/Types.ts

@@ -10,9 +10,9 @@ import { Attributes, BgFlags, Content, ExtFlags, UnderlineStyle } from 'common/b
 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';
+import type { ITerminal, ReadonlyColorSet } from 'target-browser/Types';
+import type { IRenderDimensions } from 'target-browser/renderer/shared/Types';
+import type { ICoreBrowserService, IRenderService, IThemeService } from 'target-browser/services/Services';
 
 export const enum Cell {
   CONTENT = 0,  // codepoint and wcwidth information (enum Content)
@@ -100,6 +100,14 @@ export interface ICellSize {
 }
 
 export type ImageLayer = 'top' | 'bottom';
+export type CursorPos = 'vt340' | 'iip';
+
+export interface IAddImageOpts {
+  scrolling: boolean;
+  layer: ImageLayer;
+  zIndex: number;
+  cursorPos: CursorPos;
+}
 
 export interface IImageSpec {
   orig: HTMLCanvasElement | ImageBitmap | undefined;

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

@@ -533,8 +533,8 @@ export class KittyGraphicsHandler implements IApcHandler, IResetHandler, IDispos
 
   private _sendResponse(id: number, message: string, quiet: number, placementId?: number): void {
     const isOk = message === 'OK';
-    if (isOk && quiet === 1) return;
-    if (!isOk && quiet === 2) return;
+    if (isOk && quiet >= 1) return;
+    if (!isOk && quiet >= 2) return;
 
     const pPart = placementId ? `,p=${placementId}` : '';
     const response = `\x1b_Gi=${id}${pPart};${message}\x1b\\`;

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

@@ -5,7 +5,7 @@
 
 import { IDisposable } from '@xterm/xterm';
 import { ImageStorage } from '../ImageStorage';
-import { ImageLayer } from '../Types';
+import { ImageLayer, IAddImageOpts } from '../Types';
 import { IKittyImageData } from './KittyGraphicsTypes';
 
 // Kitty-specific image storage controller.
@@ -42,6 +42,7 @@ export class KittyImageStorage implements IDisposable {
       this._images.delete(kittyId);
     }
   };
+  private _addImageOpts: IAddImageOpts = { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'iip' };
 
   constructor(
     private readonly _storage: ImageStorage
@@ -98,7 +99,10 @@ export class KittyImageStorage implements IDisposable {
     if (oldStorageId !== undefined) {
       this._storageIdToKittyId.delete(oldStorageId);
     }
-    const storageId = this._storage.addImage(image, scrolling, layer, zIndex);
+    this._addImageOpts.scrolling = scrolling;
+    this._addImageOpts.layer = layer;
+    this._addImageOpts.zIndex = zIndex;
+    const storageId = this._storage.addImage(image, this._addImageOpts);
     this._kittyIdToStorageId.set(kittyId, storageId);
     this._storageIdToKittyId.set(storageId, kittyId);
   }

addons/addon-image/src/tsconfig.json

@@ -12,8 +12,11 @@
       "../../../node_modules/@types/mocha"
     ],
     "paths": {
-      "browser/*": [ "../../../src/browser/*" ],
-      "common/*": [ "../../../src/common/*" ],
+      "target-browser/*": [ "../../../src/target-browser/*" ],
+      "common/*": [
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
+      ],
       "@xterm/addon-image": [ "../typings/addon-image.d.ts" ],
       "*": [ "./*" ]
     }
@@ -23,7 +26,7 @@
     "../../../typings/xterm.d.ts"
   ],
   "references": [
-    { "path": "../../../src/browser" },
-    { "path": "../../../src/common" }
+    { "path": "../../../src/target-browser" },
+    { "path": "../../../src" }
   ]
 }

addons/addon-image/test/ImageAddon.test.ts

@@ -290,6 +290,67 @@ test.describe('ImageAddon', () => {
     });
   });
 
+  test.describe('IIP support', () => {
+    test('size params is optional/informative', async () => {
+      // too small size param
+      await ctx.proxy.write(`\x1b]1337;File=inline=1;size=5:${PALETTE_PNG_BASE64}\x07`);
+      deepStrictEqual(await getOrigSize(1), [640, 80]);
+      // no size aparm at all
+      await ctx.proxy.write(`\x1b[10H\x1b]1337;File=inline=1:${PALETTE_QOI_BASE64}\x07`);
+      deepStrictEqual(await getOrigSize(2), [640, 80]);
+    });
+    test.skip('FilePart support - bytewise', async () => {
+      // opener
+      await ctx.proxy.write(`\x1b]1337;MultipartFile=inline=1\x07`);
+      // byte-wise
+      for (let i = 0; i < PALETTE_PNG_BASE64.length; ++i) {
+        await ctx.proxy.write(`\x1b]1337;FilePart=${PALETTE_PNG_BASE64[i]}\x07`);
+      }
+      // finalizer
+      await ctx.proxy.write(`\x1b]1337;FileEnd\x07`);
+      deepStrictEqual(await getOrigSize(1), [640, 80]);
+    });
+    test('FilePart support - chunks', async () => {
+      // opener
+      await ctx.proxy.write(`\x1b]1337;MultipartFile=inline=1\x07`);
+      // chunks
+      for (let i = 0; i < PALETTE_PNG_BASE64.length; i += 256) {
+        await ctx.proxy.write(`\x1b]1337;FilePart=${PALETTE_PNG_BASE64.slice(i, i + 256)}\x07`);
+      }
+      // finalizer
+      await ctx.proxy.write(`\x1b]1337;FileEnd\x07`);
+      deepStrictEqual(await getOrigSize(1), [640, 80]);
+    });
+    test('FilePart support - edgecases', async () => {
+      // multiple opener do not harm
+      for (let i = 0; i < 10; ++i) {
+        await ctx.proxy.write(`\x1b]1337;MultipartFile=inline=1\x07`);
+      }
+      // multiple finalizer do not harm
+      for (let i = 0; i < 5; ++i) {
+        await ctx.proxy.write(`\x1b]1337;FileEnd\x07`);
+      }
+      // chunks w'o opener are ignored
+      for (let i = 0; i < PALETTE_PNG_BASE64.length; i += 256) {
+        await ctx.proxy.write(`\x1b]1337;FilePart=${PALETTE_PNG_BASE64.slice(i, i + 256)}\x07`);
+      }
+      await ctx.proxy.write(`\x1b]1337;FileEnd\x07`);
+      pollFor(ctx.page, 'window.imageAddon._storage._images.size', 0);
+    });
+    test('FilePart support - other IIP sequence cancels chunked image', async () => {
+      // opener
+      await ctx.proxy.write(`\x1b]1337;MultipartFile=inline=1\x07`);
+      // chunks
+      for (let i = 0; i < PALETTE_PNG_BASE64.length; i += 256) {
+        await ctx.proxy.write(`\x1b]1337;FilePart=${PALETTE_PNG_BASE64.slice(i, i + 256)}\x07`);
+      }
+      // finalizer skipped
+      // write spinfox.png
+      await ctx.proxy.write(TESTDATA_IIP[1][0]);
+      deepStrictEqual(await getOrigSize(1), TESTDATA_IIP[1][1]);
+    });
+  });
+
   test.describe('IIP support - testimages', () => {
     test('palette.png', async () => {
       await ctx.proxy.write(TESTDATA_IIP[0][0]);

addons/addon-image/test/KittyGraphics.test.ts

@@ -539,7 +539,6 @@ test.describe('Kitty Graphics Protocol', () => {
 
   test.describe('Query support (a=q)', () => {
     test('responds with OK for capability query without payload', async () => {
-      let response = '';
       await ctx.page.evaluate(() => {
         (window as any).kittyResponse = '';
         (window as any).term.onData((data: string) => { (window as any).kittyResponse = data; });
@@ -548,12 +547,11 @@ test.describe('Kitty Graphics Protocol', () => {
       await ctx.proxy.write('\x1b_Gi=31,a=q;\x1b\\');
       await timeout(100);
 
-      response = await ctx.page.evaluate('window.kittyResponse');
+      const response = await ctx.page.evaluate('window.kittyResponse');
       strictEqual(response, '\x1b_Gi=31;OK\x1b\\');
     });
 
     test('responds with OK for valid PNG query', async () => {
-      let response = '';
       await ctx.page.evaluate(() => {
         (window as any).kittyResponse = '';
         (window as any).term.onData((data: string) => { (window as any).kittyResponse = data; });
@@ -562,7 +560,7 @@ test.describe('Kitty Graphics Protocol', () => {
       await ctx.proxy.write(`\x1b_Gi=42,a=q,f=100;${KITTY_BLACK_1X1_BASE64}\x1b\\`);
       await timeout(100);
 
-      response = await ctx.page.evaluate('window.kittyResponse');
+      const response = await ctx.page.evaluate('window.kittyResponse');
       strictEqual(response, '\x1b_Gi=42;OK\x1b\\');
     });
 
@@ -578,7 +576,6 @@ test.describe('Kitty Graphics Protocol', () => {
     });
 
     test('responds with error for invalid base64', async () => {
-      let response = '';
       await ctx.page.evaluate(() => {
         (window as any).kittyResponse = '';
         (window as any).term.onData((data: string) => { (window as any).kittyResponse = data; });
@@ -587,12 +584,11 @@ test.describe('Kitty Graphics Protocol', () => {
       await ctx.proxy.write('\x1b_Gi=60,a=q,f=100;!!!invalid!!!\x1b\\');
       await timeout(100);
 
-      response = await ctx.page.evaluate('window.kittyResponse');
+      const response: string = await ctx.page.evaluate('window.kittyResponse');
       strictEqual(response.startsWith('\x1b_Gi=60;EINVAL:'), true);
     });
 
     test('responds with error for RGB data without dimensions', async () => {
-      let response = '';
       await ctx.page.evaluate(() => {
         (window as any).kittyResponse = '';
         (window as any).term.onData((data: string) => { (window as any).kittyResponse = data; });
@@ -601,7 +597,7 @@ test.describe('Kitty Graphics Protocol', () => {
       await ctx.proxy.write('\x1b_Gi=70,a=q,f=24;AAAA\x1b\\');
       await timeout(100);
 
-      response = await ctx.page.evaluate('window.kittyResponse');
+      const response = await ctx.page.evaluate('window.kittyResponse');
       strictEqual(response, '\x1b_Gi=70;EINVAL:width and height required for raw pixel data\x1b\\');
     });
 
@@ -617,6 +613,18 @@ test.describe('Kitty Graphics Protocol', () => {
       strictEqual(await ctx.page.evaluate('window.kittyGotResponse'), false);
     });
 
+    test('suppresses OK response when q=2', async () => {
+      await ctx.page.evaluate(() => {
+        (window as any).kittyGotResponse = false;
+        (window as any).term.onData(() => { (window as any).kittyGotResponse = true; });
+      });
+
+      await ctx.proxy.write(`\x1b_Gi=81,a=q,q=2,f=100;${KITTY_BLACK_1X1_BASE64}\x1b\\`);
+      await timeout(100);
+
+      strictEqual(await ctx.page.evaluate('window.kittyGotResponse'), false);
+    });
+
     test('suppresses error response when q=2', async () => {
       await ctx.page.evaluate(() => {
         (window as any).kittyGotResponse = false;
@@ -630,7 +638,6 @@ test.describe('Kitty Graphics Protocol', () => {
     });
 
     test('responds with EINVAL when both i and I keys are specified', async () => {
-      let response = '';
       await ctx.page.evaluate(() => {
         (window as any).kittyResponse = '';
         (window as any).term.onData((data: string) => { (window as any).kittyResponse = data; });
@@ -640,12 +647,11 @@ test.describe('Kitty Graphics Protocol', () => {
       await ctx.proxy.write(`\x1b_Gi=100,I=200,a=q,f=100;${KITTY_BLACK_1X1_BASE64}\x1b\\`);
       await timeout(100);
 
-      response = await ctx.page.evaluate('window.kittyResponse');
+      const response = await ctx.page.evaluate('window.kittyResponse');
       strictEqual(response, '\x1b_Gi=100;EINVAL:cannot specify both i and I keys\x1b\\');
     });
 
     test('responds with EINVAL for i+I conflict even without payload', async () => {
-      let response = '';
       await ctx.page.evaluate(() => {
         (window as any).kittyResponse = '';
         (window as any).term.onData((data: string) => { (window as any).kittyResponse = data; });
@@ -655,7 +661,7 @@ test.describe('Kitty Graphics Protocol', () => {
       await ctx.proxy.write('\x1b_Gi=101,I=201,a=d\x1b\\');
       await timeout(100);
 
-      response = await ctx.page.evaluate('window.kittyResponse');
+      const response = await ctx.page.evaluate('window.kittyResponse');
       strictEqual(response, '\x1b_Gi=101;EINVAL:cannot specify both i and I keys\x1b\\');
     });
   });
@@ -797,6 +803,30 @@ test.describe('Kitty Graphics Protocol', () => {
 
       strictEqual(await ctx.page.evaluate('window.kittyGotResponse'), false);
     });
+
+    test('a=t OK suppressed by q=2', async () => {
+      await ctx.page.evaluate(() => {
+        (window as any).kittyGotResponse = false;
+        (window as any).term.onData(() => { (window as any).kittyGotResponse = true; });
+      });
+
+      await ctx.proxy.write(`\x1b_Gi=181,a=t,q=2,f=100;${KITTY_BLACK_1X1_BASE64}\x1b\\`);
+      await timeout(100);
+
+      strictEqual(await ctx.page.evaluate('window.kittyGotResponse'), false);
+    });
+
+    test('a=T OK suppressed by q=2', async () => {
+      await ctx.page.evaluate(() => {
+        (window as any).kittyGotResponse = false;
+        (window as any).term.onData(() => { (window as any).kittyGotResponse = true; });
+      });
+
+      await ctx.proxy.write(`\x1b_Gi=191,a=T,q=2,f=100;${KITTY_BLACK_1X1_BASE64}\x1b\\`);
+      await timeout(100);
+
+      strictEqual(await ctx.page.evaluate('window.kittyGotResponse'), false);
+    });
   });
 
   test.describe('Transmission medium rejection', () => {
@@ -1146,6 +1176,22 @@ test.describe('Kitty Graphics Protocol', () => {
       strictEqual(await getImageStorageLength(), 1);
     });
 
+    test('OK response suppressed by q=2', async () => {
+      await ctx.proxy.write(`\x1b_Ga=t,f=100,i=221;${KITTY_BLACK_1X1_BASE64}\x1b\\`);
+      await timeout(100);
+
+      await ctx.page.evaluate(() => {
+        (window as any).kittyGotResponse = false;
+        (window as any).term.onData(() => { (window as any).kittyGotResponse = true; });
+      });
+
+      await ctx.proxy.write(`\x1b_Ga=p,i=221,q=2\x1b\\`);
+      await timeout(100);
+
+      strictEqual(await ctx.page.evaluate('window.kittyGotResponse'), false);
+      strictEqual(await getImageStorageLength(), 1);
+    });
+
     test('ENOENT error suppressed by q=2', async () => {
       await ctx.page.evaluate(() => {
         (window as any).kittyGotResponse = false;

addons/addon-image/test/tsconfig.json

@@ -11,10 +11,11 @@
     "removeComments": true,
     "paths": {
       "common/*": [
-        "../../../src/common/*"
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
       ],
-      "browser/*": [
-        "../../../src/browser/*"
+      "target-browser/*": [
+        "../../../src/target-browser/*"
       ],
       "*": [
         "./*"
@@ -31,10 +32,10 @@
   ],
   "references": [
     {
-      "path": "../../../src/common"
+      "path": "../../../src"
     },
     {
-      "path": "../../../src/browser"
+      "path": "../../../src/target-browser"
     },
     {
       "path": "../../../test/playwright"

addons/addon-image/webpack.config.js

@@ -25,8 +25,11 @@ const addon = {
     modules: ['./node_modules'],
     extensions: [ '.js' ],
     alias: {
-      common: path.resolve('../../out/common'),
-      browser: path.resolve('../../out/browser'),
+      common: [
+      path.resolve('../../out/runtime'),
+      path.resolve('../../out/primitives'),
+    ],
+      browser: path.resolve('../../out/target-browser'),
       vs: path.resolve('../../out/vs')
     }
   },

addons/addon-ligatures/package.json

@@ -20,7 +20,7 @@
     "package": "webpack",
     "pretest": "npm run build",
     "test": "nyc mocha out/**/*.test.js",
-    "prepublish": "npm run package"
+    "prepublishOnly": "npm run package"
   },
   "keywords": [
     "font",
@@ -31,15 +31,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "lru-cache": "^6.0.0",
-    "opentype.js": "^0.8.0"
+    "lru-cache": "^11.3.6",
+    "opentype.js": "^2.0.0"
   },
   "devDependencies": {
-    "@types/lru-cache": "^5.1.0",
-    "@types/opentype.js": "^0.7.0",
-    "axios": "^1.15.0",
-    "font-finder": "^1.1.0",
-    "mkdirp": "0.5.5",
-    "yauzl": "^3.2.1"
+    "@types/opentype.js": "^1.3.9",
+    "font-finder": "^1.1.0"
   }
 }

addons/addon-ligatures/src/fontLigatures/index.ts

@@ -1,5 +1,5 @@
 import * as opentype from 'opentype.js';
-import LRUCache = require('lru-cache');
+import { LRUCache } from 'lru-cache';
 
 import { IFont, ILigatureData, IFlattenedLookupTree, ILookupTree, IOptions } from './types';
 import mergeTrees from './merge';
@@ -23,8 +23,8 @@ class FontImpl implements IFont {
 
     if (options.cacheSize > 0) {
       this._cache = new LRUCache({
-        max: options.cacheSize,
-        length: ((val: ILigatureData | [number, number][], key: string) => key.length) as any
+        maxSize: options.cacheSize,
+        sizeCalculation: ((val: ILigatureData | [number, number][], key: string) => key.length) as any
       });
     }
 

addons/addon-ligatures/src/fontLigatures/mergeRange.ts

@@ -44,7 +44,6 @@ export default function mergeRange(ranges: [number, number][], newRangeStart: nu
         // current range
         ranges[i - 1][1] = Math.max(newRangeEnd, range[1]);
         ranges.splice(i, 1);
-        inRange = false;
         return ranges;
       }
       // Case 7: New range extends from previous range past the

addons/addon-progress/src/tsconfig.json

@@ -16,10 +16,11 @@
     ],
     "paths": {
       "common/*": [
-        "../../../src/common/*"
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
       ],
-      "browser/*": [
-        "../../../src/browser/*"
+      "target-browser/*": [
+        "../../../src/target-browser/*"
       ],
       "@xterm/addon-progress": [
         "../typings/addon-progress.d.ts"
@@ -32,10 +33,10 @@
   ],
   "references": [
     {
-      "path": "../../../src/browser"
+      "path": "../../../src/target-browser"
     },
     {
-      "path": "../../../src/common"
+      "path": "../../../src"
     }
   ]
 }

addons/addon-progress/test/ProgressAddon.test.ts

@@ -9,15 +9,18 @@ import { ITestContext, createTestContext, openTerminal } from '../../../test/pla
 
 
 let ctx: ITestContext;
-test.beforeAll(async ({ browser }) => {
-  ctx = await createTestContext(browser);
-  ctx.page.setViewportSize({ width: 1024, height: 768 });
-  await openTerminal(ctx);
-});
-test.afterAll(async () => await ctx.page.close());
-
 
 test.describe('ProgressAddon', () => {
+  test.describe.configure({ mode: 'serial' });
+
+  test.beforeAll(async ({ browser }) => {
+    ctx = await createTestContext(browser);
+    await openTerminal(ctx);
+  });
+  test.afterAll(async () => {
+    await ctx?.page?.close();
+  });
+
   test.beforeEach(async function(): Promise<any> {
     await ctx.page.evaluate(`
       window.progressStack = [];

addons/addon-progress/test/tsconfig.json

@@ -11,10 +11,11 @@
     "removeComments": true,
     "paths": {
       "common/*": [
-        "../../../src/common/*"
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
       ],
-      "browser/*": [
-        "../../../src/browser/*"
+      "target-browser/*": [
+        "../../../src/target-browser/*"
       ],
       "*": [
         "./*"
@@ -31,10 +32,10 @@
   ],
   "references": [
     {
-      "path": "../../../src/common"
+      "path": "../../../src"
     },
     {
-      "path": "../../../src/browser"
+      "path": "../../../src/target-browser"
     },
     {
       "path": "../../../test/playwright"

addons/addon-progress/webpack.config.js

@@ -25,8 +25,11 @@ module.exports = {
     modules: ['./node_modules'],
     extensions: [ '.js' ],
     alias: {
-      common: path.resolve('../../out/common'),
-      browser: path.resolve('../../out/browser'),
+      common: [
+      path.resolve('../../out/runtime'),
+      path.resolve('../../out/primitives'),
+    ],
+      browser: path.resolve('../../out/target-browser'),
       vs: path.resolve('../../out/vs')
     }
   },

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

@@ -5,7 +5,7 @@
 import { assert } from 'chai';
 import { SearchEngine } from './SearchEngine';
 import { SearchLineCache } from './SearchLineCache';
-import { Terminal } from 'browser/public/Terminal';
+import { Terminal } from 'target-browser/public/Terminal';
 import type { ISearchOptions } from '@xterm/addon-search';
 import { DisposableStore } from 'common/Lifecycle';
 

addons/addon-search/src/SearchEngine.ts

@@ -174,7 +174,7 @@ export class SearchEngine {
     this._terminal.clearSelection();
 
     let startRow = this._terminal.buffer.active.baseY + this._terminal.rows - 1;
-    let startCol = this._terminal.cols;
+    const startCol = this._terminal.cols;
     const isReverseSearch = true;
 
     this._lineCache.initLinesCache();
@@ -186,14 +186,14 @@ export class SearchEngine {
     let result: ISearchResult | undefined;
     if (prevSelectedPos) {
       searchPosition.startRow = startRow = prevSelectedPos.start.y;
-      searchPosition.startCol = startCol = prevSelectedPos.start.x;
+      searchPosition.startCol = prevSelectedPos.start.x;
       if (cachedSearchTerm !== term) {
         // Try to expand selection to right first.
         result = this._findInLine(term, searchPosition, searchOptions, false);
         if (!result) {
           // If selection was not able to be expanded to the right, then try reverse search
           searchPosition.startRow = startRow = prevSelectedPos.end.y;
-          searchPosition.startCol = startCol = prevSelectedPos.end.x;
+          searchPosition.startCol = prevSelectedPos.end.x;
         }
       }
     }

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

@@ -4,7 +4,7 @@
  */
 import { assert } from 'chai';
 import { SearchLineCache, LineCacheEntry } from './SearchLineCache';
-import { Terminal } from 'browser/public/Terminal';
+import { Terminal } from 'target-browser/public/Terminal';
 import { timeout } from 'common/Async';
 
 function writeP(terminal: Terminal, data: string): Promise<void> {

addons/addon-search/src/tsconfig.json

@@ -16,10 +16,11 @@
     ],
     "paths": {
       "common/*": [
-        "../../../src/common/*"
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
       ],
-      "browser/*": [
-        "../../../src/browser/*"
+      "target-browser/*": [
+        "../../../src/target-browser/*"
       ],
       "@xterm/addon-search" : [
         "../typings/addon-search.d.ts"
@@ -32,10 +33,10 @@
   ],
   "references": [
     {
-      "path": "../../../src/common"
+      "path": "../../../src"
     },
     {
-      "path": "../../../src/browser"
+      "path": "../../../src/target-browser"
     }
   ]
 }

addons/addon-search/test/tsconfig.json

@@ -11,10 +11,11 @@
     "removeComments": true,
     "paths": {
       "common/*": [
-        "../../../src/common/*"
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
       ],
-      "browser/*": [
-        "../../../src/browser/*"
+      "target-browser/*": [
+        "../../../src/target-browser/*"
       ],
       "*": [
         "./*"
@@ -31,10 +32,10 @@
   ],
   "references": [
     {
-      "path": "../../../src/common"
+      "path": "../../../src"
     },
     {
-      "path": "../../../src/browser"
+      "path": "../../../src/target-browser"
     },
     {
       "path": "../../../test/playwright"

addons/addon-search/webpack.config.js

@@ -25,7 +25,10 @@ module.exports = {
     modules: ['./node_modules'],
     extensions: [ '.js' ],
     alias: {
-      common: path.resolve('../../out/common'),
+      common: [
+      path.resolve('../../out/runtime'),
+      path.resolve('../../out/primitives'),
+    ],
       vs: path.resolve('../../out/vs')
     }
   },

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

@@ -7,7 +7,7 @@ import { perfContext, before, ThroughputRuntimeCase } from 'xterm-benchmark';
 
 import { spawn } from 'node-pty';
 import { Utf8ToUtf32, stringFromCodePoint } from 'common/input/TextDecoder';
-import { Terminal } from 'browser/public/Terminal';
+import { Terminal } from 'target-browser/public/Terminal';
 import { SerializeAddon } from 'SerializeAddon';
 
 class TestTerminal extends Terminal {

addons/addon-serialize/benchmark/tsconfig.json

@@ -7,13 +7,16 @@
     "rootDir": "..",
     "outDir": "../out-benchmark",
     "types": ["../../../node_modules/@types/node"],
-    "moduleResolution": "node",
+    "moduleResolution": "nodenext",
     "strict": false,
     "target": "es2021",
-    "module": "commonjs",
+    "module": "nodenext",
     "paths": {
-      "common/*": ["../../../src/common/*"],
-      "browser/*": ["../../../src/browser/*"],
+      "common/*": [
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
+      ],
+      "target-browser/*": ["../../../src/target-browser/*"],
       "SerializeAddon": ["../src/SerializeAddon"],
       "@xterm/addon-serialize": [
         "../typings/addon-serialize.d.ts"
@@ -23,7 +26,7 @@
   "include": ["../**/*", "../../../typings/xterm.d.ts"],
   "exclude": ["../../../**/*test.ts", "../../**/*api.ts"],
   "references": [
-    { "path": "../../../src/common" },
-    { "path": "../../../src/browser" }
+    { "path": "../../../src" },
+    { "path": "../../../src/target-browser" }
   ]
 }

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

@@ -6,10 +6,10 @@
 import jsdom = require('jsdom');
 import { assert } from 'chai';
 import { SerializeAddon } from './SerializeAddon';
-import { Terminal } from 'browser/public/Terminal';
-import { SelectionModel } from 'browser/selection/SelectionModel';
+import { Terminal } from 'target-browser/public/Terminal';
+import { SelectionModel } from 'target-browser/selection/SelectionModel';
 import { IBufferService } from 'common/services/Services';
-import { ThemeService } from 'browser/services/ThemeService';
+import { ThemeService } from 'target-browser/services/ThemeService';
 
 function sgr(...seq: string[]): string {
   return `\x1b[${seq.join(';')}m`;

addons/addon-serialize/src/SerializeAddon.ts

@@ -8,7 +8,7 @@
 import type { IBuffer, IBufferCell, IBufferRange, ITerminalAddon, Terminal } from '@xterm/xterm';
 import type { IHTMLSerializeOptions, SerializeAddon as ISerializeApi, ISerializeOptions, ISerializeRange } from '@xterm/addon-serialize';
 import { IAttributeData, IColor } from 'common/Types';
-import { DEFAULT_ANSI_COLORS } from 'browser/Types';
+import { DEFAULT_ANSI_COLORS } from 'target-browser/Types';
 import { UnderlineStyle } from 'common/buffer/Constants';
 
 function constrain(value: number, low: number, high: number): number {

addons/addon-serialize/src/tsconfig.json

@@ -12,10 +12,11 @@
     "removeComments": true,
     "paths": {
       "common/*": [
-        "../../../src/common/*"
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
       ],
-      "browser/*": [
-        "../../../src/browser/*"
+      "target-browser/*": [
+        "../../../src/target-browser/*"
       ],
       "@xterm/addon-serialize": [
         "../typings/addon-serialize.d.ts"
@@ -33,10 +34,10 @@
   ],
   "references": [
     {
-      "path": "../../../src/common"
+      "path": "../../../src"
     },
     {
-      "path": "../../../src/browser"
+      "path": "../../../src/target-browser"
     }
   ]
 }

addons/addon-serialize/test/tsconfig.json

@@ -11,10 +11,11 @@
     "removeComments": true,
     "paths": {
       "common/*": [
-        "../../../src/common/*"
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
       ],
-      "browser/*": [
-        "../../../src/browser/*"
+      "target-browser/*": [
+        "../../../src/target-browser/*"
       ]
     },
     "strict": true,
@@ -28,10 +29,10 @@
   ],
   "references": [
     {
-      "path": "../../../src/common"
+      "path": "../../../src"
     },
     {
-      "path": "../../../src/browser"
+      "path": "../../../src/target-browser"
     },
     {
       "path": "../../../test/playwright"

addons/addon-serialize/webpack.config.js

@@ -25,8 +25,11 @@ module.exports = {
     modules: ['./node_modules'],
     extensions: [ '.js' ],
     alias: {
-      common: path.resolve('../../out/common'),
-      browser: path.resolve('../../out/browser')
+      common: [
+      path.resolve('../../out/runtime'),
+      path.resolve('../../out/primitives'),
+    ],
+      browser: path.resolve('../../out/target-browser')
     }
   },
   output: {

addons/addon-unicode-graphemes/benchmark/UnicodeGraphemeAddon.benchmark.ts

@@ -7,7 +7,7 @@ import { perfContext, before, ThroughputRuntimeCase } from 'xterm-benchmark';
 
 import { spawn } from 'node-pty';
 import { Utf8ToUtf32, stringFromCodePoint } from 'common/input/TextDecoder';
-import { CoreBrowserTerminal } from 'browser/CoreBrowserTerminal';
+import { CoreBrowserTerminal } from 'target-browser/CoreBrowserTerminal';
 import { UnicodeGraphemeProvider } from 'UnicodeGraphemeProvider';
 
 

addons/addon-unicode-graphemes/benchmark/tsconfig.json

@@ -4,13 +4,16 @@
     "rootDir": "..",
     "outDir": "../out-benchmark",
     "types": ["../../../node_modules/@types/node"],
-    "moduleResolution": "node",
+    "moduleResolution": "nodenext",
     "strict": false,
     "target": "es2015",
-    "module": "commonjs",
+    "module": "nodenext",
     "paths": {
-      "common/*": ["../../../src/common/*"],
-      "browser/*": ["../../../src/browser/*"],
+      "common/*": [
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
+      ],
+      "target-browser/*": ["../../../src/target-browser/*"],
       "UnicodeGraphemeProvider": ["../src/UnicodeGraphemeProvider"],
       "@xterm/addon-unicode-graphemes": [
         "../typings/addon-unicode-graphemes.d.ts"
@@ -20,7 +23,7 @@
   "include": ["../**/*", "../../../typings/xterm.d.ts"],
   "exclude": ["../../../**/*test.ts", "../../**/*api.ts"],
   "references": [
-    { "path": "../../../src/common" },
-    { "path": "../../../src/browser" }
+    { "path": "../../../src" },
+    { "path": "../../../src/target-browser" }
   ]
 }

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

@@ -4,8 +4,8 @@
  */
 
 import { IUnicodeVersionProvider } from '@xterm/xterm';
-import { UnicodeCharProperties, UnicodeCharWidth } from 'common/services/Services';
-import { UnicodeService } from 'common/services/UnicodeService';
+import { createPropertyValue, extractCharKind, extractWidth } from 'common/input/UnicodeProperties';
+import { UnicodeCharProperties, UnicodeCharWidth } from 'common/input/UnicodeTypes';
 import * as UC from './third-party/UnicodeProperties';
 
 export class UnicodeGraphemeProvider implements IUnicodeVersionProvider {
@@ -19,7 +19,7 @@ export class UnicodeGraphemeProvider implements IUnicodeVersionProvider {
   }
 
   private static readonly _plainNarrowProperties: UnicodeCharProperties
-    = UnicodeService.createPropertyValue(UC.GRAPHEME_BREAK_Other, 1, false);
+    = createPropertyValue(UC.GRAPHEME_BREAK_Other, 1, false);
 
   public charProperties(codepoint: number, preceding: UnicodeCharProperties): UnicodeCharProperties {
     // Optimize the simple ASCII case, under the condition that
@@ -39,9 +39,9 @@ export class UnicodeGraphemeProvider implements IUnicodeVersionProvider {
       w = 1;
     }
     if (preceding !== 0) {
-      const oldWidth = UnicodeService.extractWidth(preceding);
+      const oldWidth = extractWidth(preceding);
       if (this.handleGraphemes) {
-        charInfo = UC.shouldJoin(UnicodeService.extractCharKind(preceding), charInfo);
+        charInfo = UC.shouldJoin(extractCharKind(preceding), charInfo);
       } else {
         charInfo = w === 0 ? 1 : 0;
       }
@@ -54,7 +54,7 @@ export class UnicodeGraphemeProvider implements IUnicodeVersionProvider {
         }
       }
     }
-    return UnicodeService.createPropertyValue(charInfo, w, shouldJoin);
+    return createPropertyValue(charInfo, w, shouldJoin);
   }
 
   public wcwidth(codepoint: number): UnicodeCharWidth {

addons/addon-unicode-graphemes/src/tsconfig.json

@@ -13,7 +13,8 @@
     "strict": true,
     "paths": {
       "common/*": [
-        "../../../src/common/*"
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
       ],
       "@xterm/addon-unicode-graphemes": [
         "../typings/addon-unicode-graphemes.d.ts"
@@ -29,7 +30,7 @@
   ],
   "references": [
     {
-      "path": "../../../src/common"
+      "path": "../../../src"
     }
   ]
 }

addons/addon-unicode-graphemes/test/tsconfig.json

@@ -11,10 +11,11 @@
     "removeComments": true,
     "paths": {
       "common/*": [
-        "../../../src/common/*"
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
       ],
-      "browser/*": [
-        "../../../src/browser/*"
+      "target-browser/*": [
+        "../../../src/target-browser/*"
       ]
     },
     "strict": true,
@@ -28,10 +29,10 @@
   ],
   "references": [
     {
-      "path": "../../../src/common"
+      "path": "../../../src"
     },
     {
-      "path": "../../../src/browser"
+      "path": "../../../src/target-browser"
     },
     {
       "path": "../../../test/playwright"

addons/addon-unicode-graphemes/webpack.config.js

@@ -25,7 +25,10 @@ module.exports = {
     modules: ['./node_modules'],
     extensions: [ '.js' ],
     alias: {
-      common: path.resolve('../../out/common'),
+      common: [
+      path.resolve('../../out/runtime'),
+      path.resolve('../../out/primitives'),
+    ],
       vs: path.resolve('../../out/vs')
     }
   },

addons/addon-unicode11/src/UnicodeV11.ts

@@ -4,8 +4,8 @@
  */
 
 import { IUnicodeVersionProvider } from '@xterm/xterm';
-import { UnicodeCharProperties, UnicodeCharWidth } from 'common/services/Services';
-import { UnicodeService } from 'common/services/UnicodeService';
+import { createPropertyValue, extractWidth } from 'common/input/UnicodeProperties';
+import { UnicodeCharProperties, UnicodeCharWidth } from 'common/input/UnicodeTypes';
 
 const BMP_COMBINING = [
   [0x0300, 0x036F], [0x0483, 0x0489], [0x0591, 0x05BD],
@@ -223,13 +223,13 @@ export class UnicodeV11 implements IUnicodeVersionProvider {
     let width = this.wcwidth(codepoint);
     let shouldJoin = width === 0 && preceding !== 0;
     if (shouldJoin) {
-      const oldWidth = UnicodeService.extractWidth(preceding);
+      const oldWidth = extractWidth(preceding);
       if (oldWidth === 0) {
         shouldJoin = false;
       } else if (oldWidth > width) {
         width = oldWidth;
       }
     }
-    return UnicodeService.createPropertyValue(0, width, shouldJoin);
+    return createPropertyValue(0, width, shouldJoin);
   }
 }

addons/addon-unicode11/src/tsconfig.json

@@ -13,7 +13,8 @@
     "strict": true,
     "paths": {
       "common/*": [
-        "../../../src/common/*"
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
       ],
       "@xterm/addon-unicode11": [
         "../typings/addon-unicode11.d.ts"
@@ -32,7 +33,7 @@
   ],
   "references": [
     {
-      "path": "../../../src/common"
+      "path": "../../../src"
     }
   ]
 }

addons/addon-unicode11/test/tsconfig.json

@@ -11,10 +11,11 @@
     "removeComments": true,
     "paths": {
       "common/*": [
-        "../../../src/common/*"
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
       ],
-      "browser/*": [
-        "../../../src/browser/*"
+      "target-browser/*": [
+        "../../../src/target-browser/*"
       ],
       "*": [
         "./*"
@@ -31,10 +32,10 @@
   ],
   "references": [
     {
-      "path": "../../../src/common"
+      "path": "../../../src"
     },
     {
-      "path": "../../../src/browser"
+      "path": "../../../src/target-browser"
     },
     {
       "path": "../../../test/playwright"

addons/addon-unicode11/webpack.config.js

@@ -25,7 +25,10 @@ module.exports = {
     modules: ['./node_modules'],
     extensions: [ '.js' ],
     alias: {
-      common: path.resolve('../../out/common'),
+      common: [
+      path.resolve('../../out/runtime'),
+      path.resolve('../../out/primitives'),
+    ],
       vs: path.resolve('../../out/vs')
     }
   },

addons/addon-web-fonts/test/WebFontsAddon.test.ts

@@ -78,7 +78,22 @@ test.describe('WebFontsAddon', () => {
       const data = await ctx.page.evaluate(`
           document.styleSheets[0].insertRule("@font-face {font-family: Kongtext; src: url(/fonts/kongtext.regular.ttf) format('truetype'); unicode-range: U+00A0-00FF}", 0);
         `);
-      deepStrictEqual(await getDocumentFonts(), [{ family: 'Kongtext', status: 'unloaded' }]);
+      let fonts = await getDocumentFonts();
+      // safari may have loaded the font, firefox & chrome never load it
+      if (browser.browserType().name() === 'webkit') {
+        try {
+          deepStrictEqual(fonts, [{ family: 'Kongtext', status: 'loading' }]);
+        } catch (e) {
+          try {
+            deepStrictEqual(fonts, [{ family: 'Kongtext', status: 'loaded' }]);
+          } catch (e) {
+            deepStrictEqual(fonts, [{ family: 'Kongtext', status: 'unloaded' }]);
+          }
+        }
+      } else {
+        deepStrictEqual(fonts, [{ family: 'Kongtext', status: 'unloaded' }]);
+      }
+
 
       // broken case: webfont in ctor without addon usage
       await ctx.page.evaluate(`
@@ -86,15 +101,20 @@ test.describe('WebFontsAddon', () => {
           window.helperTerm.open(term.element);
         `);
 
-      // safari loads the font, firefox & chrome dont
+      fonts = await getDocumentFonts();
+      // safari might load the font, firefox & chrome dont
       if (browser.browserType().name() === 'webkit') {
         try {
-          deepStrictEqual(await getDocumentFonts(), [{ family: 'Kongtext', status: 'loading' }]);
+          deepStrictEqual(fonts, [{ family: 'Kongtext', status: 'loading' }]);
         } catch (e) {
-          deepStrictEqual(await getDocumentFonts(), [{ family: 'Kongtext', status: 'loaded' }]);
+          try {
+            deepStrictEqual(fonts, [{ family: 'Kongtext', status: 'loaded' }]);
+          } catch (e) {
+            deepStrictEqual(fonts, [{ family: 'Kongtext', status: 'unloaded' }]);
+          }
         }
       } else {
-        deepStrictEqual(await getDocumentFonts(), [{ family: 'Kongtext', status: 'unloaded' }]);
+        deepStrictEqual(fonts, [{ family: 'Kongtext', status: 'unloaded' }]);
       }
 
       // good case: addon fixes layout for webfont in ctor

addons/addon-web-fonts/test/tsconfig.json

@@ -5,17 +5,17 @@
     "lib": [
       "es2021",
     ],
-    // "downlevelIteration": true,
     "rootDir": ".",
     "outDir": "../out-test",
     "sourceMap": true,
     "removeComments": true,
     "paths": {
       "common/*": [
-        "../../../src/common/*"
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
       ],
-      "browser/*": [
-        "../../../src/browser/*"
+      "target-browser/*": [
+        "../../../src/target-browser/*"
       ],
       "*": [
         "./*"
@@ -32,10 +32,10 @@
   ],
   "references": [
     {
-      "path": "../../../src/common"
+      "path": "../../../src"
     },
     {
-      "path": "../../../src/browser"
+      "path": "../../../src/target-browser"
     },
     {
       "path": "../../../test/playwright"

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

@@ -113,8 +113,8 @@ export class LinkComputer {
     let line: IBufferLine | undefined;
     let topIdx = lineIndex;
     let bottomIdx = lineIndex;
-    let length = 0;
-    let content = '';
+    let length;
+    let content;
     const lines: string[] = [];
 
     if ((line = terminal.buffer.active.getLine(lineIndex))) {

addons/addon-web-links/test/tsconfig.json

@@ -5,17 +5,17 @@
     "lib": [
       "es2021",
     ],
-    // "downlevelIteration": true,
     "rootDir": ".",
     "outDir": "../out-test",
     "sourceMap": true,
     "removeComments": true,
     "paths": {
       "common/*": [
-        "../../../src/common/*"
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
       ],
-      "browser/*": [
-        "../../../src/browser/*"
+      "target-browser/*": [
+        "../../../src/target-browser/*"
       ],
       "*": [
         "./*"
@@ -32,10 +32,10 @@
   ],
   "references": [
     {
-      "path": "../../../src/common"
+      "path": "../../../src"
     },
     {
-      "path": "../../../src/browser"
+      "path": "../../../src/target-browser"
     },
     {
       "path": "../../../test/playwright"

addons/addon-webgl/src/CellColorResolver.ts

@@ -1,12 +1,12 @@
-import { ISelectionRenderModel } from 'browser/renderer/shared/Types';
-import { ICoreBrowserService, IThemeService } from 'browser/services/Services';
-import { ReadonlyColorSet } from 'browser/Types';
+import { ISelectionRenderModel } from 'target-browser/renderer/shared/Types';
+import { ICoreBrowserService, IThemeService } from 'target-browser/services/Services';
+import { ReadonlyColorSet } from 'target-browser/Types';
 import { Attributes, BgFlags, ExtFlags, FgFlags, NULL_CELL_CODE, UnderlineStyle } from 'common/buffer/Constants';
 import { IDecorationService, IOptionsService } from 'common/services/Services';
 import { ICellData } from 'common/Types';
 import { Terminal } from '@xterm/xterm';
 import { rgba } from 'common/Color';
-import { treatGlyphAsBackgroundColor } from 'browser/renderer/shared/RendererUtils';
+import { treatGlyphAsBackgroundColor } from 'target-browser/renderer/shared/RendererUtils';
 import { blockPatternCodepoints } from './customGlyphs/CustomGlyphDefinitions';
 
 // Work variables to avoid garbage collection

addons/addon-webgl/src/CharAtlasCache.ts

@@ -5,7 +5,7 @@
 
 import { TextureAtlas } from './TextureAtlas';
 import { ITerminalOptions, Terminal } from '@xterm/xterm';
-import { ITerminal, ReadonlyColorSet } from 'browser/Types';
+import { ITerminal, ReadonlyColorSet } from 'target-browser/Types';
 import { ICharAtlasConfig, ITextureAtlas } from './Types';
 import { generateConfig, configEquals } from './CharAtlasUtils';
 import type { ILogService } from 'common/services/Services';

addons/addon-webgl/src/CharAtlasUtils.test.ts

@@ -0,0 +1,87 @@
+/**
+ * Copyright (c) 2026 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
+import { assert } from 'chai';
+import { configEquals } from './CharAtlasUtils';
+import { ICharAtlasConfig } from './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 };
+  const contrastCache = {
+    clear: () => {},
+    setCss: () => {},
+    getCss: () => undefined,
+    setColor: () => {},
+    getColor: () => undefined
+  };
+  const colors = {
+    foreground: color,
+    background: color,
+    cursor: NULL_COLOR,
+    cursorAccent: NULL_COLOR,
+    selectionForeground: undefined,
+    selectionBackgroundTransparent: NULL_COLOR,
+    selectionBackgroundOpaque: NULL_COLOR,
+    selectionInactiveBackgroundTransparent: NULL_COLOR,
+    selectionInactiveBackgroundOpaque: NULL_COLOR,
+    overviewRulerBorder: NULL_COLOR,
+    scrollbarSliderBackground: NULL_COLOR,
+    scrollbarSliderHoverBackground: NULL_COLOR,
+    scrollbarSliderActiveBackground: NULL_COLOR,
+    ansi: new Array(256).fill(color),
+    contrastCache,
+    halfContrastCache: contrastCache
+  };
+  return {
+    customGlyphs: true,
+    devicePixelRatio: 1,
+    deviceMaxTextureSize: 4096,
+    letterSpacing: 0,
+    lineHeight: 1,
+    fontSize: 15,
+    fontFamily: 'monospace',
+    fontWeight: 'normal',
+    fontWeightBold: 'bold',
+    deviceCellWidth: 10,
+    deviceCellHeight: 20,
+    deviceCharWidth: 8,
+    deviceCharHeight: 16,
+    allowTransparency: false,
+    drawBoldTextInBrightColors: true,
+    minimumContrastRatio: 1,
+    colors,
+    ...overrides
+  };
+}
+
+describe('CharAtlasUtils', () => {
+  describe('configEquals', () => {
+    it('should return true for identical configs', () => {
+      const a = createTestConfig();
+      const b = createTestConfig();
+      assert.ok(configEquals(a, b));
+    });
+
+    it('should return false when deviceMaxTextureSize differs', () => {
+      const a = createTestConfig();
+      const b = createTestConfig({ deviceMaxTextureSize: 8192 });
+      assert.ok(!configEquals(a, b));
+    });
+
+    it('should return false when deviceCellWidth differs', () => {
+      const a = createTestConfig();
+      const b = createTestConfig({ deviceCellWidth: 11 });
+      assert.ok(!configEquals(a, b));
+    });
+
+    it('should return false when deviceCellHeight differs', () => {
+      const a = createTestConfig();
+      const b = createTestConfig({ deviceCellHeight: 21 });
+      assert.ok(!configEquals(a, b));
+    });
+  });
+});

addons/addon-webgl/src/CharAtlasUtils.ts

@@ -6,7 +6,7 @@
 import { ICharAtlasConfig } from './Types';
 import { Attributes } from 'common/buffer/Constants';
 import { ITerminalOptions } from '@xterm/xterm';
-import { IColorSet, ReadonlyColorSet } from 'browser/Types';
+import { IColorSet, ReadonlyColorSet } from 'target-browser/Types';
 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 {
@@ -59,6 +59,7 @@ export function configEquals(a: ICharAtlasConfig, b: ICharAtlasConfig): boolean
     }
   }
   return a.devicePixelRatio === b.devicePixelRatio &&
+      a.deviceMaxTextureSize === b.deviceMaxTextureSize &&
       a.customGlyphs === b.customGlyphs &&
       a.lineHeight === b.lineHeight &&
       a.letterSpacing === b.letterSpacing &&
@@ -67,6 +68,8 @@ export function configEquals(a: ICharAtlasConfig, b: ICharAtlasConfig): boolean
       a.fontWeight === b.fontWeight &&
       a.fontWeightBold === b.fontWeightBold &&
       a.allowTransparency === b.allowTransparency &&
+      a.deviceCellWidth === b.deviceCellWidth &&
+      a.deviceCellHeight === b.deviceCellHeight &&
       a.deviceCharWidth === b.deviceCharWidth &&
       a.deviceCharHeight === b.deviceCharHeight &&
       a.drawBoldTextInBrightColors === b.drawBoldTextInBrightColors &&

addons/addon-webgl/src/CursorBlinkStateManager.ts

@@ -3,8 +3,8 @@
  * @license MIT
  */
 
-import { RendererConstants } from 'browser/renderer/shared/Constants';
-import { ICoreBrowserService } from 'browser/services/Services';
+import { RendererConstants } from 'target-browser/renderer/shared/Constants';
+import { ICoreBrowserService } from 'target-browser/services/Services';
 
 const enum Constants {
   /**

addons/addon-webgl/src/GlyphRenderer.ts

@@ -3,14 +3,14 @@
  * @license MIT
  */
 import { TextureAtlas } from './TextureAtlas';
-import { IRenderDimensions } from 'browser/renderer/shared/Types';
+import { IRenderDimensions } from 'target-browser/renderer/shared/Types';
 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';
-import type { IOptionsService } from 'common/services/Services';
-import { allowRescaling, throwIfFalsy } from 'browser/renderer/shared/RendererUtils';
+import type { ILogService, IOptionsService } from 'common/services/Services';
+import { allowRescaling, throwIfFalsy } from 'target-browser/renderer/shared/RendererUtils';
 
 interface IVertices {
   attributes: Float32Array;
@@ -114,7 +114,8 @@ export class GlyphRenderer extends Disposable {
     private readonly _terminal: Terminal,
     private readonly _gl: IWebGL2RenderingContext,
     private _dimensions: IRenderDimensions,
-    private readonly _optionsService: IOptionsService
+    private readonly _optionsService: IOptionsService,
+    private readonly _logService: ILogService
   ) {
     super();
 
@@ -127,7 +128,7 @@ export class GlyphRenderer extends Disposable {
       TextureAtlas.maxTextureSize = throwIfFalsy(gl.getParameter(gl.MAX_TEXTURE_SIZE) as number | null);
     }
 
-    this._program = throwIfFalsy(createProgram(gl, vertexShaderSource, createFragmentShaderSource(TextureAtlas.maxAtlasPages)));
+    this._program = throwIfFalsy(createProgram(gl, vertexShaderSource, createFragmentShaderSource(TextureAtlas.maxAtlasPages), this._logService));
     this._register(toDisposable(() => gl.deleteProgram(this._program)));
 
     // Uniform locations
@@ -136,8 +137,9 @@ export class GlyphRenderer extends Disposable {
     this._textureLocation = throwIfFalsy(gl.getUniformLocation(this._program, 'u_texture'));
 
     // Create and set the vertex array object
-    this._vertexArrayObject = gl.createVertexArray();
-    gl.bindVertexArray(this._vertexArrayObject);
+    const vertexArrayObject = this._vertexArrayObject = gl.createVertexArray();
+    this._register(toDisposable(() => gl.deleteVertexArray(vertexArrayObject)));
+    gl.bindVertexArray(vertexArrayObject);
 
     // Setup a_unitquad, this defines the 4 vertices of a rectangle
     const unitQuadVertices = new Float32Array([0, 0, 1, 0, 0, 1, 1, 1]);
@@ -358,7 +360,9 @@ export class GlyphRenderer extends Disposable {
     gl.bindBuffer(gl.ARRAY_BUFFER, this._attributesBuffer);
     gl.bufferData(gl.ARRAY_BUFFER, activeBuffer.subarray(0, bufferLength), gl.STREAM_DRAW);
 
-    // Bind the atlas page texture if they have changed
+    // Bind the atlas page texture if they have changed. AtlasPage.version is globally
+    // monotonic, so a page object swap at the same index (which happens after a page merge)
+    // is detected by the same comparison.
     for (let i = 0; i < this._atlas.pages.length; i++) {
       if (this._atlas.pages[i].version !== this._atlasTextures[i].version) {
         this._bindAtlasPageTexture(gl, this._atlas, i);
@@ -371,6 +375,10 @@ export class GlyphRenderer extends Disposable {
 
   public setAtlas(atlas: ITextureAtlas): void {
     this._atlas = atlas;
+    this.invalidateAtlasTextures();
+  }
+
+  public invalidateAtlasTextures(): void {
     for (const glTexture of this._atlasTextures) {
       glTexture.version = -1;
     }

addons/addon-webgl/src/RectangleRenderer.ts

@@ -3,9 +3,9 @@
  * @license MIT
  */
 
-import { IRenderDimensions } from 'browser/renderer/shared/Types';
-import { IThemeService } from 'browser/services/Services';
-import { ReadonlyColorSet } from 'browser/Types';
+import { IRenderDimensions } from 'target-browser/renderer/shared/Types';
+import { IThemeService } from 'target-browser/services/Services';
+import { ReadonlyColorSet } from 'target-browser/Types';
 import { Attributes, FgFlags } from 'common/buffer/Constants';
 import { Disposable, toDisposable } from 'common/Lifecycle';
 import { IColor } from 'common/Types';
@@ -13,7 +13,8 @@ import { Terminal } from '@xterm/xterm';
 import { RenderModelConstants } from './RenderModel';
 import { IRenderModel, IWebGL2RenderingContext, IWebGLVertexArrayObject } from './Types';
 import { createProgram, expandFloat32Array, PROJECTION_MATRIX } from './WebglUtils';
-import { throwIfFalsy } from 'browser/renderer/shared/RendererUtils';
+import { throwIfFalsy } from 'target-browser/renderer/shared/RendererUtils';
+import type { ILogService } from 'common/services/Services';
 
 const enum VertexAttribLocations {
   POSITION = 0,
@@ -89,21 +90,23 @@ export class RectangleRenderer extends Disposable {
     private _terminal: Terminal,
     private _gl: IWebGL2RenderingContext,
     private _dimensions: IRenderDimensions,
-    private readonly _themeService: IThemeService
+    private readonly _themeService: IThemeService,
+    private readonly _logService: ILogService
   ) {
     super();
 
     const gl = this._gl;
 
-    this._program = throwIfFalsy(createProgram(gl, vertexShaderSource, fragmentShaderSource));
+    this._program = throwIfFalsy(createProgram(gl, vertexShaderSource, fragmentShaderSource, this._logService));
     this._register(toDisposable(() => gl.deleteProgram(this._program)));
 
     // Uniform locations
     this._projectionLocation = throwIfFalsy(gl.getUniformLocation(this._program, 'u_projection'));
 
     // Create and set the vertex array object
-    this._vertexArrayObject = gl.createVertexArray();
-    gl.bindVertexArray(this._vertexArrayObject);
+    const vertexArrayObject = this._vertexArrayObject = gl.createVertexArray();
+    this._register(toDisposable(() => gl.deleteVertexArray(vertexArrayObject)));
+    gl.bindVertexArray(vertexArrayObject);
 
     // Setup a_unitquad, this defines the 4 vertices of a rectangle
     const unitQuadVertices = new Float32Array([0, 0, 1, 0, 0, 1, 1, 1]);
@@ -336,8 +339,9 @@ export class RectangleRenderer extends Disposable {
       }
     }
 
-    if (vertices.attributes.length < offset + 4) {
-      vertices.attributes = expandFloat32Array(vertices.attributes, this._terminal.rows * this._terminal.cols * INDICES_PER_RECTANGLE);
+    if (vertices.attributes.length < offset + INDICES_PER_RECTANGLE) {
+      // +1 for the viewport-clear rectangle at offset 0.
+      vertices.attributes = expandFloat32Array(vertices.attributes, (this._terminal.rows * this._terminal.cols + 1) * INDICES_PER_RECTANGLE);
     }
     $x1 = startX * this._dimensions.device.cell.width;
     $y1 = y * this._dimensions.device.cell.height;

addons/addon-webgl/src/RenderModel.ts

@@ -4,8 +4,8 @@
  */
 
 import { ICursorRenderModel, IRenderModel } from './Types';
-import { ISelectionRenderModel } from 'browser/renderer/shared/Types';
-import { createSelectionRenderModel } from 'browser/renderer/shared/SelectionRenderModel';
+import { ISelectionRenderModel } from 'target-browser/renderer/shared/Types';
+import { createSelectionRenderModel } from 'target-browser/renderer/shared/SelectionRenderModel';
 
 export const enum RenderModelConstants {
   INDICIES_PER_CELL = 4,

addons/addon-webgl/src/TextureAtlas.ts

@@ -3,10 +3,10 @@
  * @license MIT
  */
 
-import { IColorContrastCache } from 'browser/Types';
+import { IColorContrastCache } from 'target-browser/Types';
 import { DIM_OPACITY, TEXT_BASELINE } from './Constants';
 import { tryDrawCustomGlyph } from './customGlyphs/CustomGlyphRasterizer';
-import { computeNextVariantOffset, treatGlyphAsBackgroundColor, isPowerlineGlyph, isRestrictedPowerlineGlyph, throwIfFalsy } from 'browser/renderer/shared/RendererUtils';
+import { computeNextVariantOffset, treatGlyphAsBackgroundColor, isPowerlineGlyph, isRestrictedPowerlineGlyph, throwIfFalsy } from 'target-browser/renderer/shared/RendererUtils';
 import { IBoundingBox, ICharAtlasConfig, IRasterizedGlyph, ITextureAtlas } from './Types';
 import { NULL_COLOR, channels, color, rgba } from 'common/Color';
 import { FourKeyMap } from 'common/MultiKeyMap';
@@ -109,6 +109,7 @@ export class TextureAtlas implements ITextureAtlas {
       page.canvas.remove();
     }
     this._onAddTextureAtlasCanvas.dispose();
+    this._onRemoveTextureAtlasCanvas.dispose();
   }
 
   public warmUp(): void {
@@ -133,7 +134,9 @@ export class TextureAtlas implements ITextureAtlas {
 
   private _requestClearModel = false;
   public beginFrame(): boolean {
-    return this._requestClearModel;
+    const result = this._requestClearModel;
+    this._requestClearModel = false;
+    return result;
   }
 
   public clearTexture(): void {
@@ -193,7 +196,7 @@ export class TextureAtlas implements ITextureAtlas {
 
       // Merge into the new page
       const mergedPage = this._mergePages(mergingPages, mergedPageIndex);
-      mergedPage.version++;
+      mergedPage.version = ++AtlasPage.nextVersion;
 
       // Delete the pages, shifting glyph texture pages as needed
       for (let i = sortedMergingPagesIndexes.length - 1; i >= 0; i--) {
@@ -251,7 +254,7 @@ export class TextureAtlas implements ITextureAtlas {
       for (const g of adjustingPage.glyphs) {
         g.texturePage--;
       }
-      adjustingPage.version++;
+      adjustingPage.version = ++AtlasPage.nextVersion;
     }
   }
 
@@ -527,7 +530,7 @@ export class TextureAtlas implements ITextureAtlas {
     let customGlyph = false;
     if (this._config.customGlyphs !== false) {
       const variantOffset = this._workAttributeData.getUnderlineVariantOffset();
-      customGlyph = tryDrawCustomGlyph(this._tmpCtx, chars, padding, padding, this._config.deviceCellWidth, this._config.deviceCellHeight, this._config.deviceCharWidth, this._config.deviceCharHeight, this._config.fontSize, this._config.devicePixelRatio, backgroundColor.css, variantOffset);
+      customGlyph = tryDrawCustomGlyph(this._tmpCtx, chars, padding, padding, this._config.deviceCellWidth, this._config.deviceCellHeight, this._config.deviceCharWidth, this._config.deviceCharHeight, this._config.fontSize, this._config.devicePixelRatio, this._logService, backgroundColor.css, variantOffset);
     }
 
     // Whether to clear pixels based on a threshold difference between the glyph color and the
@@ -937,7 +940,7 @@ export class TextureAtlas implements ITextureAtlas {
       rasterizedGlyph.size.y
     );
     activePage.addGlyph(rasterizedGlyph);
-    activePage.version++;
+    activePage.version = ++AtlasPage.nextVersion;
 
     return rasterizedGlyph;
   }
@@ -1047,9 +1050,13 @@ class AtlasPage {
   }
 
   /**
-   * Used to check whether the canvas of the atlas page has changed.
+   * Monotonically increasing across all atlas pages globally. Used to detect when the texture
+   * unit at a given index needs to be re-uploaded — both for content changes within the same
+   * page and for a page object swap at the same index (which happens after a page merge,
+   * where a per-page counter could coincide with the previously-bound page's value).
    */
-  public version = 0;
+  public static nextVersion: number = 0;
+  public version = ++AtlasPage.nextVersion;
 
   // Texture atlas current positioning data. The texture packing strategy used is to fill from
   // left-to-right and top-to-bottom. When the glyph being written is less than half of the current
@@ -1092,7 +1099,7 @@ class AtlasPage {
     this.currentRow.y = 0;
     this.currentRow.height = 0;
     this.fixedRows.length = 0;
-    this.version++;
+    this.version = ++AtlasPage.nextVersion;
   }
 }
 

addons/addon-webgl/src/Types.ts

@@ -4,8 +4,8 @@
  */
 
 import { FontWeight } from '@xterm/xterm';
-import { IColorSet } from 'browser/Types';
-import { ISelectionRenderModel } from 'browser/renderer/shared/Types';
+import { IColorSet } from 'target-browser/Types';
+import { ISelectionRenderModel } from 'target-browser/renderer/shared/Types';
 import { CursorInactiveStyle, CursorStyle, type IDisposable } from 'common/Types';
 import type { IEvent } from 'common/Event';
 
@@ -28,6 +28,7 @@ export interface ICursorRenderModel {
 export interface IWebGL2RenderingContext extends WebGLRenderingContext {
   vertexAttribDivisor(index: number, divisor: number): void;
   createVertexArray(): IWebGLVertexArrayObject;
+  deleteVertexArray(vao: IWebGLVertexArrayObject): void;
   bindVertexArray(vao: IWebGLVertexArrayObject): void;
   drawElementsInstanced(mode: number, count: number, type: number, offset: number, instanceCount: number): void;
 }

addons/addon-webgl/src/WebglAddon.ts

@@ -5,11 +5,11 @@
 
 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 { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IRenderService, IThemeService } from 'target-browser/services/Services';
+import { ITerminal } from 'target-browser/Types';
 import { Disposable, toDisposable } from 'common/Lifecycle';
 import { getSafariVersion, isSafari } from 'common/Platform';
-import { ICoreService, IDecorationService, IOptionsService } from 'common/services/Services';
+import { ICoreService, IDecorationService, ILogService, IOptionsService } from 'common/services/Services';
 import { IWebGL2RenderingContext } from './Types';
 import { WebglRenderer } from './WebglRenderer';
 import { Emitter, EventUtils } from 'common/Event';
@@ -65,6 +65,7 @@ export class WebglAddon extends Disposable implements ITerminalAddon, IWebglApi
     const charSizeService: ICharSizeService = unsafeCore._charSizeService;
     const coreBrowserService: ICoreBrowserService = unsafeCore._coreBrowserService;
     const decorationService: IDecorationService = unsafeCore._decorationService;
+    const logService: ILogService = unsafeCore._logService;
     const themeService: IThemeService = unsafeCore._themeService;
 
     this._renderer = this._register(new WebglRenderer(
@@ -74,6 +75,7 @@ export class WebglAddon extends Disposable implements ITerminalAddon, IWebglApi
       coreBrowserService,
       coreService,
       decorationService,
+      logService,
       optionsService,
       themeService,
       this._customGlyphs,

addons/addon-webgl/src/WebglRenderer.ts

@@ -3,19 +3,19 @@
  * @license MIT
  */
 
-import { ITerminal } from 'browser/Types';
+import { ITerminal } from 'target-browser/Types';
 import { CellColorResolver } from './CellColorResolver';
 import { acquireTextureAtlas, removeTerminalFromCache } from './CharAtlasCache';
 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 { IRenderDimensions, IRenderer, IRequestRedrawEvent } from 'target-browser/renderer/shared/Types';
+import { ICharSizeService, ICharacterJoinerService, ICoreBrowserService, IThemeService } from 'target-browser/services/Services';
 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, IOptionsService } from 'common/services/Services';
+import { TextBlinkStateManager } from 'target-browser/renderer/shared/TextBlinkStateManager';
+import { ICoreService, IDecorationService, ILogService, IOptionsService } from 'common/services/Services';
 import { Terminal } from '@xterm/xterm';
 import { GlyphRenderer } from './GlyphRenderer';
 import { RectangleRenderer } from './RectangleRenderer';
@@ -24,9 +24,13 @@ import { IWebGL2RenderingContext, type ITextureAtlas } from './Types';
 import { LinkRenderLayer } from './renderLayer/LinkRenderLayer';
 import { IRenderLayer } from './renderLayer/Types';
 import { Emitter, EventUtils } from 'common/Event';
-import { addDisposableListener } from 'browser/Dom';
+import { addDisposableListener } from 'target-browser/Dom';
 import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle';
-import { createRenderDimensions } from 'browser/renderer/shared/RendererUtils';
+import { createRenderDimensions } from 'target-browser/renderer/shared/RendererUtils';
+
+const enum Constants {
+  MERGE_RETRY_LIMIT = 32
+}
 
 export class WebglRenderer extends Disposable implements IRenderer {
   private _renderLayers: IRenderLayer[];
@@ -73,6 +77,7 @@ export class WebglRenderer extends Disposable implements IRenderer {
     private readonly _coreBrowserService: ICoreBrowserService,
     private readonly _coreService: ICoreService,
     private readonly _decorationService: IDecorationService,
+    private readonly _logService: ILogService,
     private readonly _optionsService: IOptionsService,
     private readonly _themeService: IThemeService,
     private readonly _customGlyphs: boolean = true,
@@ -118,19 +123,19 @@ export class WebglRenderer extends Disposable implements IRenderer {
     this._deviceMaxTextureSize = this._gl.getParameter(this._gl.MAX_TEXTURE_SIZE);
 
     this._register(addDisposableListener(this._canvas, 'webglcontextlost', (e) => {
-      console.log('webglcontextlost event received');
+      this._logService.debug('webglcontextlost event received');
       // Prevent the default behavior in order to enable WebGL context restoration.
       e.preventDefault();
       // Wait a few seconds to see if the 'webglcontextrestored' event is fired.
       // If not, dispatch the onContextLoss notification to observers.
       this._contextRestorationTimeout = setTimeout(() => {
         this._contextRestorationTimeout = undefined;
-        console.warn('webgl context not restored; firing onContextLoss');
+        this._logService.warn('webgl context not restored; firing onContextLoss');
         this._onContextLoss.fire(e);
       }, 3000 /* ms */);
     }));
     this._register(addDisposableListener(this._canvas, 'webglcontextrestored', (e) => {
-      console.warn('webglcontextrestored event received');
+      this._logService.warn('webglcontextrestored event received');
       clearTimeout(this._contextRestorationTimeout);
       this._contextRestorationTimeout = undefined;
       // The texture atlas and glyph renderer must be fully reinitialized
@@ -154,6 +159,8 @@ export class WebglRenderer extends Disposable implements IRenderer {
     this._isAttached = this._core.screenElement!.isConnected;
 
     this._register(toDisposable(() => {
+      clearTimeout(this._contextRestorationTimeout);
+      this._contextRestorationTimeout = undefined;
       for (const l of this._renderLayers) {
         l.dispose();
       }
@@ -270,8 +277,8 @@ export class WebglRenderer extends Disposable implements IRenderer {
    * Initializes members dependent on WebGL context state.
    */
   private _initializeWebGLState(): [RectangleRenderer, GlyphRenderer] {
-    this._rectangleRenderer.value = new RectangleRenderer(this._terminal, this._gl, this.dimensions, this._themeService);
-    this._glyphRenderer.value = new GlyphRenderer(this._terminal, this._gl, this.dimensions, this._optionsService);
+    this._rectangleRenderer.value = new RectangleRenderer(this._terminal, this._gl, this.dimensions, this._themeService, this._logService);
+    this._glyphRenderer.value = new GlyphRenderer(this._terminal, this._gl, this.dimensions, this._optionsService, this._logService);
 
     // Update dimensions and acquire char atlas
     this.handleCharSizeChanged();
@@ -375,6 +382,19 @@ export class WebglRenderer extends Disposable implements IRenderer {
       this._updateModel(start, end);
     }
 
+    // A mid-update atlas page merge invalidates vertex data and may not bump the host
+    // page's version, so re-run the update and force a full texture rebind.
+    let merged = false;
+    let mergeRetries = 0;
+    while (this._charAtlas && this._glyphRenderer.value.beginFrame() && mergeRetries++ < Constants.MERGE_RETRY_LIMIT) {
+      merged = true;
+      this._clearModel(true);
+      this._updateModel(0, this._terminal.rows - 1);
+    }
+    if (merged) {
+      this._glyphRenderer.value.invalidateAtlasTextures();
+    }
+
     // Render
     this._rectangleRenderer.value.renderBackgrounds();
     this._glyphRenderer.value.render(this._model);
@@ -407,8 +427,8 @@ export class WebglRenderer extends Disposable implements IRenderer {
     let line: IBufferLine;
     let joinedRanges: [number, number][];
     let isJoined: boolean;
-    let skipJoinedCheckUntilX: number = 0;
-    let isValidJoinRange: boolean = true;
+    let skipJoinedCheckUntilX: number;
+    let isValidJoinRange: boolean;
     let lastCharX: number;
     let range: [number, number];
     let isCursorRow: boolean;

addons/addon-webgl/src/WebglUtils.ts

@@ -3,7 +3,8 @@
  * @license MIT
  */
 
-import { throwIfFalsy } from 'browser/renderer/shared/RendererUtils';
+import { throwIfFalsy } from 'target-browser/renderer/shared/RendererUtils';
+import type { ILogService } from 'common/services/Services';
 
 /**
  * A matrix that when multiplies will translate 0-1 coordinates (left to right,
@@ -16,21 +17,21 @@ export const PROJECTION_MATRIX = new Float32Array([
   -1, 1, 0, 1
 ]);
 
-export function createProgram(gl: WebGLRenderingContext, vertexSource: string, fragmentSource: string): WebGLProgram | undefined {
+export function createProgram(gl: WebGLRenderingContext, vertexSource: string, fragmentSource: string, logService: ILogService): WebGLProgram | undefined {
   const program = throwIfFalsy(gl.createProgram());
-  gl.attachShader(program, throwIfFalsy(createShader(gl, gl.VERTEX_SHADER, vertexSource)));
-  gl.attachShader(program, throwIfFalsy(createShader(gl, gl.FRAGMENT_SHADER, fragmentSource)));
+  gl.attachShader(program, throwIfFalsy(createShader(gl, gl.VERTEX_SHADER, vertexSource, logService)));
+  gl.attachShader(program, throwIfFalsy(createShader(gl, gl.FRAGMENT_SHADER, fragmentSource, logService)));
   gl.linkProgram(program);
   const success = gl.getProgramParameter(program, gl.LINK_STATUS);
   if (success) {
     return program;
   }
 
-  console.error(gl.getProgramInfoLog(program));
+  logService.error(gl.getProgramInfoLog(program));
   gl.deleteProgram(program);
 }
 
-export function createShader(gl: WebGLRenderingContext, type: number, source: string): WebGLShader | undefined {
+export function createShader(gl: WebGLRenderingContext, type: number, source: string, logService: ILogService): WebGLShader | undefined {
   const shader = throwIfFalsy(gl.createShader(type));
   gl.shaderSource(shader, source);
   gl.compileShader(shader);
@@ -39,7 +40,7 @@ export function createShader(gl: WebGLRenderingContext, type: number, source: st
     return shader;
   }
 
-  console.error(gl.getShaderInfoLog(shader));
+  logService.error(gl.getShaderInfoLog(shader));
   gl.deleteShader(shader);
 }
 

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

@@ -3,7 +3,8 @@
  * @license MIT
  */
 
-import { throwIfFalsy } from 'browser/renderer/shared/RendererUtils';
+import { throwIfFalsy } from 'target-browser/renderer/shared/RendererUtils';
+import type { ILogService } from 'common/services/Services';
 import { customGlyphDefinitions } from './CustomGlyphDefinitions';
 import { CustomGlyphDefinitionType, CustomGlyphScaleType, CustomGlyphVectorType, type CustomGlyphDefinitionPart, type CustomGlyphPathDrawFunctionDefinition, type CustomGlyphPatternDefinition, type ICustomGlyphSolidOctantBlockVector, type ICustomGlyphVectorShape } from './Types';
 
@@ -22,6 +23,7 @@ export function tryDrawCustomGlyph(
   deviceCharHeight: number,
   fontSize: number,
   devicePixelRatio: number,
+  logService: ILogService,
   backgroundColor?: string,
   variantOffset: number = 0
 ): boolean {
@@ -30,7 +32,7 @@ export function tryDrawCustomGlyph(
     // Normalize to array for uniform handling
     const parts = Array.isArray(unifiedCharDefinition) ? unifiedCharDefinition : [unifiedCharDefinition];
     for (const part of parts) {
-      drawDefinitionPart(ctx, part, xOffset, yOffset, deviceCellWidth, deviceCellHeight, deviceCharWidth, deviceCharHeight, fontSize, devicePixelRatio, backgroundColor, variantOffset);
+      drawDefinitionPart(ctx, part, xOffset, yOffset, deviceCellWidth, deviceCellHeight, deviceCharWidth, deviceCharHeight, fontSize, devicePixelRatio, logService, backgroundColor, variantOffset);
     }
     return true;
   }
@@ -49,6 +51,7 @@ function drawDefinitionPart(
   deviceCharHeight: number,
   fontSize: number,
   devicePixelRatio: number,
+  logService: ILogService,
   backgroundColor?: string,
   variantOffset: number = 0
 ): void {
@@ -79,7 +82,7 @@ function drawDefinitionPart(
       drawPatternChar(ctx, part.data, drawXOffset, drawYOffset, drawWidth, drawHeight, variantOffset);
       break;
     case CustomGlyphDefinitionType.PATH_FUNCTION:
-      drawPathFunctionCharacter(ctx, part.data, drawXOffset, drawYOffset, drawWidth, drawHeight, devicePixelRatio, part.strokeWidth);
+      drawPathFunctionCharacter(ctx, part.data, drawXOffset, drawYOffset, drawWidth, drawHeight, devicePixelRatio, logService, part.strokeWidth);
       break;
     case CustomGlyphDefinitionType.PATH:
       drawPathDefinitionCharacter(ctx, part.data, drawXOffset, drawYOffset, drawWidth, drawHeight, devicePixelRatio, part.strokeWidth);
@@ -88,7 +91,7 @@ function drawDefinitionPart(
       drawPathNegativeDefinitionCharacter(ctx, part.data, drawXOffset, drawYOffset, drawWidth, drawHeight, devicePixelRatio, backgroundColor);
       break;
     case CustomGlyphDefinitionType.VECTOR_SHAPE:
-      drawVectorShape(ctx, part.data, drawXOffset, drawYOffset, drawWidth, drawHeight, fontSize, devicePixelRatio);
+      drawVectorShape(ctx, part.data, drawXOffset, drawYOffset, drawWidth, drawHeight, fontSize, devicePixelRatio, logService);
       break;
     case CustomGlyphDefinitionType.BRAILLE:
       drawBrailleCharacter(ctx, part.data, drawXOffset, drawYOffset, drawWidth, drawHeight);
@@ -510,6 +513,7 @@ function drawPathFunctionCharacter(
   deviceCellWidth: number,
   deviceCellHeight: number,
   devicePixelRatio: number,
+  logService: ILogService,
   strokeWidth?: number
 ): void {
   ctx.save();
@@ -536,7 +540,7 @@ function drawPathFunctionCharacter(
     }
     const f = svgToCanvasInstructionMap[type];
     if (!f) {
-      console.error(`Could not find drawing instructions for "${type}"`);
+      logService.error(`Could not find drawing instructions for "${type}"`);
       continue;
     }
     const args: string[] = instruction.substring(1).split(',');
@@ -598,7 +602,8 @@ function drawVectorShape(
   deviceCellWidth: number,
   deviceCellHeight: number,
   fontSize: number,
-  devicePixelRatio: number
+  devicePixelRatio: number,
+  logService: ILogService
 ): void {
   // Clip the cell to make sure drawing doesn't occur beyond bounds
   const clipRegion = new Path2D();
@@ -619,7 +624,7 @@ function drawVectorShape(
     }
     const f = svgToCanvasInstructionMap[type];
     if (!f) {
-      console.error(`Could not find drawing instructions for "${type}"`);
+      logService.error(`Could not find drawing instructions for "${type}"`);
       continue;
     }
     const args: string[] = instruction.substring(1).split(',');

addons/addon-webgl/src/renderLayer/BaseRenderLayer.ts

@@ -3,16 +3,16 @@
  * @license MIT
  */
 
-import { ReadonlyColorSet } from 'browser/Types';
+import { ReadonlyColorSet } from 'target-browser/Types';
 import { acquireTextureAtlas } from '../CharAtlasCache';
-import { IRenderDimensions } from 'browser/renderer/shared/Types';
-import { ICoreBrowserService, IThemeService } from 'browser/services/Services';
+import { IRenderDimensions } from 'target-browser/renderer/shared/Types';
+import { ICoreBrowserService, IThemeService } from 'target-browser/services/Services';
 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';
-import { throwIfFalsy } from 'browser/renderer/shared/RendererUtils';
+import { throwIfFalsy } from 'target-browser/renderer/shared/RendererUtils';
 import { TEXT_BASELINE } from '../Constants';
 import type { ITextureAtlas } from '../Types';
 

addons/addon-webgl/src/renderLayer/LinkRenderLayer.ts

@@ -4,10 +4,10 @@
  */
 
 import { is256Color } from '../CharAtlasUtils';
-import { INVERTED_DEFAULT_COLOR } from 'browser/renderer/shared/Constants';
-import { IRenderDimensions } from 'browser/renderer/shared/Types';
-import { ICoreBrowserService, IThemeService } from 'browser/services/Services';
-import { ILinkifier2, ILinkifierEvent } from 'browser/Types';
+import { INVERTED_DEFAULT_COLOR } from 'target-browser/renderer/shared/Constants';
+import { IRenderDimensions } from 'target-browser/renderer/shared/Types';
+import { ICoreBrowserService, IThemeService } from 'target-browser/services/Services';
+import { ILinkifier2, ILinkifierEvent } from 'target-browser/Types';
 import { IOptionsService } from 'common/services/Services';
 import { Terminal } from '@xterm/xterm';
 import { BaseRenderLayer } from './BaseRenderLayer';

addons/addon-webgl/src/renderLayer/Types.ts

@@ -4,7 +4,7 @@
  */
 
 import { IDisposable, Terminal } from '@xterm/xterm';
-import { IRenderDimensions } from 'browser/renderer/shared/Types';
+import { IRenderDimensions } from 'target-browser/renderer/shared/Types';
 
 export interface IRenderLayer extends IDisposable {
   /**

addons/addon-webgl/src/tsconfig.json

@@ -12,10 +12,11 @@
     "removeComments": true,
     "paths": {
       "common/*": [
-        "../../../src/common/*"
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
       ],
-      "browser/*": [
-        "../../../src/browser/*"
+      "target-browser/*": [
+        "../../../src/target-browser/*"
       ],
       "@xterm/addon-webgl": [
         "../typings/addon-webgl.d.ts"
@@ -25,7 +26,6 @@
       ]
     },
     "strict": true,
-    "downlevelIteration": true,
     "experimentalDecorators": true,
     "types": [
       "../../../node_modules/@types/mocha"
@@ -37,10 +37,10 @@
   ],
   "references": [
     {
-      "path": "../../../src/common"
+      "path": "../../../src"
     },
     {
-      "path": "../../../src/browser"
+      "path": "../../../src/target-browser"
     }
   ]
 }

addons/addon-webgl/test/tsconfig.json

@@ -11,10 +11,11 @@
     "removeComments": true,
     "paths": {
       "common/*": [
-        "../../../src/common/*"
+        "../../../src/primitives/*",
+        "../../../src/runtime/*",
       ],
-      "browser/*": [
-        "../../../src/browser/*"
+      "target-browser/*": [
+        "../../../src/target-browser/*"
       ],
       "*": [
         "./*"
@@ -32,10 +33,10 @@
   ],
   "references": [
     {
-      "path": "../../../src/common"
+      "path": "../../../src"
     },
     {
-      "path": "../../../src/browser"
+      "path": "../../../src/target-browser"
     },
     {
       "path": "../../../test/playwright"

addons/addon-webgl/webpack.config.js

@@ -25,8 +25,11 @@ module.exports = {
     modules: ['./node_modules'],
     extensions: [ '.js' ],
     alias: {
-      common: path.resolve('../../out/common'),
-      browser: path.resolve('../../out/browser'),
+      common: [
+      path.resolve('../../out/runtime'),
+      path.resolve('../../out/primitives'),
+    ],
+      browser: path.resolve('../../out/target-browser'),
       vs: path.resolve('../../out/vs')
     }
   },

bin/esbuild.mjs

@@ -92,6 +92,9 @@ let outConfig = {
 }
 let skipOut = false;
 
+/** @type {esbuild.BuildOptions[] | undefined} */
+let outBuilds;
+
 /** @type {esbuild.BuildOptions} */
 let outTestConfig = {
   format: 'cjs',
@@ -171,7 +174,7 @@ if (config.addon) {
 } else if (config.isHeadless) {
   bundleConfig = {
     ...bundleConfig,
-    entryPoints: [`src/headless/public/Terminal.ts`],
+    entryPoints: [`src/target-headless/public/Terminal.ts`],
     outfile: `headless/lib-headless/xterm-headless.mjs`
   };
   outConfig = {
@@ -183,18 +186,35 @@ if (config.addon) {
 } else {
   bundleConfig = {
     ...bundleConfig,
-    entryPoints: [`src/browser/public/Terminal.ts`],
+    entryPoints: [`src/target-browser/public/Terminal.ts`],
     outfile: `lib/xterm.mjs`
   };
-  outConfig = {
-    ...outConfig,
-    entryPoints: [
-      'src/browser/**/*.ts',
-      'src/common/**/*.ts',
-      'src/headless/**/*.ts'
-    ],
-    outdir: 'out-esbuild/'
-  };
+  outBuilds = [
+    {
+      ...outConfig,
+      entryPoints: ['src/primitives/**/*.ts'],
+      outbase: 'src/primitives',
+      outdir: 'out-esbuild/common',
+    },
+    {
+      ...outConfig,
+      entryPoints: ['src/runtime/**/*.ts'],
+      outbase: 'src/runtime',
+      outdir: 'out-esbuild/common',
+    },
+    {
+      ...outConfig,
+      entryPoints: ['src/target-browser/**/*.ts'],
+      outbase: 'src',
+      outdir: 'out-esbuild',
+    },
+    {
+      ...outConfig,
+      entryPoints: ['src/target-headless/**/*.ts'],
+      outbase: 'src',
+      outdir: 'out-esbuild',
+    },
+  ];
   outTestConfig = {
     ...outConfig,
     entryPoints: ['test/**/*.ts'],
@@ -205,7 +225,9 @@ if (config.addon) {
 if (config.isWatch) {
   context(bundleConfig).then(e => e.watch());
   if (!skipOut) {
-    context(outConfig).then(e => e.watch());
+    for (const buildConfig of outBuilds ?? [outConfig]) {
+      context(buildConfig).then(e => e.watch());
+    }
   }
   if (!skipOutTest) {
     context(outTestConfig).then(e => e.watch());
@@ -213,7 +235,9 @@ if (config.isWatch) {
 } else {
   await build(bundleConfig);
   if (!skipOut) {
-    await build(outConfig);
+    for (const buildConfig of outBuilds ?? [outConfig]) {
+      await build(buildConfig);
+    }
   }
   if (!skipOutTest) {
     await build(outTestConfig);

bin/kitty_keytester.py

@@ -1,196 +0,0 @@
-from termios import tcgetattr, tcsetattr, TCSADRAIN, TIOCGWINSZ, TCSAFLUSH
-from tty import setcbreak, setraw
-import os
-import sys
-from contextlib import contextmanager
-from select import select
-from time import sleep
-from json import dumps, loads
-from typing import Optional, Tuple, Union
-
-
-class TerminalContext:
-    def __init__(self, fd: int, close_fd=False) -> None:
-        if not os.isatty(fd):
-            raise TypeError('fd is not a terminal')
-        self.close_fd = close_fd
-        self.fd = fd
-        self.is_cbreak = False
-        self.is_raw = False
-        self._initial_attr = self.termios_attributes
-
-    @classmethod
-    def from_cterm(cls):
-        fd = os.open(os.ctermid(), os.O_RDWR)
-        return TerminalContext(fd, True)
-
-    def close(self) -> None:
-        tcsetattr(self.fd, TCSADRAIN, self._initial_attr)
-        if self.close_fd:
-            os.close(self.fd)
-
-    @property
-    def termios_attributes(self) -> list:
-        return tcgetattr(self.fd)
-    
-    @property
-    def ttyname(self) -> str:
-        return os.ttyname(self.fd)
-    
-    @contextmanager
-    def cbreak_mode(self):
-        """
-        Enter cbreak mode context.
-        """
-        if self.is_cbreak:
-            yield
-            return
-        tattr = self.termios_attributes
-        try:
-            setcbreak(self.fd, TCSADRAIN)
-            self.is_cbreak = True
-            yield
-        finally:
-            tcsetattr(self.fd, TCSADRAIN, tattr)
-            self.is_cbreak = False
-
-    @contextmanager
-    def raw_mode(self):
-        """
-        Enter cbreak mode context.
-        """
-        if self.is_raw:
-            yield
-            return
-        tattr = self.termios_attributes
-        try:
-            setraw(self.fd, TCSADRAIN)
-            self.is_raw = True
-            yield
-        finally:
-            tcsetattr(self.fd, TCSADRAIN, tattr)
-            self.is_raw = False
-
-    @contextmanager
-    def custom_state(self, undo=None):
-        """
-        Enter custom terminal state, that needs to to be undone by ``undo``.
-        Useful, if you want to apply a custom terminal state and
-        have to make sure, that it gets properly reset to previous state.
-        """
-        try:
-            yield
-        finally:
-            if undo:
-                undo()
-
-    def write(self, data: Union[str, bytes]) -> None:
-        """
-        Write string or bytes directly to the terminal.
-        """
-        if isinstance(data, str):
-            data = data.encode('utf-8')
-        sent = os.write(self.fd, data)
-        while sent:
-            data = data[sent:]
-            sent = os.write(self.fd, data)
-
-    def read(self, amount: int = 1024, timeout: Optional[float] = None) -> bytes:
-        """
-        Blocking read from the terminal.
-        If nothing was sent from the terminal within ``timeout``,
-        empty bytes are returned.
-        """
-        can_read, _, _ = select([self.fd], [], [], timeout)
-        if can_read:
-            return os.read(self.fd, amount)
-        return b''
-
-
-@contextmanager
-def cterminal_context():
-    t = TerminalContext.from_cterm()
-    try:
-        yield t
-    finally:
-        t.close()
-
-
-def extract_events(data: list[str]):
-    if len(data) < 5:
-        raise Exception('not enough reports')
-    types = set(data)
-    if len(types) == 1:
-        return {'PRESS': data[0], 'REPEAT': data[0], 'RELEASE': None}
-    if len(types) == 2:
-        last = data.pop()
-        if last != data[0] and len(set(data)) == 1:
-            return {'PRESS': data[0], 'REPEAT': data[0], 'RELEASE': last}
-        raise Exception('weird reports, 2 types')
-    if len(types) == 3:
-        first = data.pop(0)
-        last = data.pop()
-        if first != last and first != data[0] and last != data[0]:
-            return {'PRESS': first, 'REPEAT': data[0], 'RELEASE': last}
-        raise Exception('weird reports, 3 types')
-    raise Exception('more than 3 types')
-
-
-def query(term: TerminalContext, mode: int):
-    with term.custom_state(undo=lambda:term.write('\x1b[<u')):
-        term.write(f'\x1b[>{mode}u')
-        term.read(timeout=.1)
-        print('PRESS (within 5s) and HOLD (for 5s)\r')
-        data: list[bytes] = []
-        cur = term.read(timeout=5)
-        while cur:
-            data.append(cur)
-            cur = term.read(timeout=.5)
-            if len(data) > 5:
-                print('RELEASE\r', end='')
-        try:
-            return extract_events([b.decode('utf-8') for b in data])
-        except Exception as e:
-            print('Error:', e, '\r')
-            print(data, '\r')
-    term.read(timeout=.1)
-
-
-def save(filedata: dict[str, dict[str, str]], filename, entry, mode, events):
-    try:
-        filedata[entry][mode] = events
-    except KeyError:
-        filedata[entry] = {mode: events}
-    with open(filename, 'w') as f:
-        f.write(dumps(filedata, indent=2))
-
-
-def main():
-    mode = 1
-    filedata = {}
-    print(sys.argv)
-    if len(sys.argv) != 3:
-        print('ERROR: not enough arguments')
-        print('Usage: python kitty_keytester.py <mode> <json-file>')
-        return
-    mode = int(sys.argv[1])
-    filename = sys.argv[2]
-    if os.path.exists(filename):
-        with open(filename) as f:
-            filedata = loads(f.read())
-    with cterminal_context() as term:
-        while True:
-            with term.raw_mode():
-                events = query(term, mode)
-            if events:
-                print(events)
-                entry = input('Entry: ')
-                if entry:
-                    save(filedata, filename, entry, str(mode), events)
-            cont = input('Continue? (y)')
-            if cont not in ['y', '']:
-                break
-
-
-if __name__ == '__main__':
-    main()

bin/publish.js

@@ -81,7 +81,7 @@ function checkAndPublishPackage(packageDir, repoCommit, peerDependencies, update
 
   // Update Version.ts with the new version
   if (updateVersionTs) {
-    const versionTsPath = path.join(packageDir, 'src/common/Version.ts');
+    const versionTsPath = path.join(packageDir, 'src/primitives/Version.ts');
     const versionTsContent = fs.readFileSync(versionTsPath, 'utf8');
     const updatedVersionTs = versionTsContent.replace(
       /export const XTERM_VERSION = '[^']+';/,

bin/vs_base_find_unused.js

@@ -38,4 +38,4 @@ function findUnusedSymbols(
 }
 
 // Example usage
-findUnusedSymbols("./src/browser/tsconfig.json");
+findUnusedSymbols("./src/target-browser/tsconfig.json");

demo/client/components/window/addonImageWindow.ts

@@ -65,7 +65,8 @@ export class AddonImageWindow extends BaseWindow implements IControlWindow {
     const dtIip = document.createElement('dt');
     dtIip.textContent = 'IIP (iTerm)';
     dlIip.appendChild(dtIip);
-    this._addDdWithButton(dlIip, 'image-demo3', 'palette');
+    this._addDdWithButton(dlIip, 'image-demo3', 'palette (png File)');
+    this._addDdWithButton(dlIip, 'image-demo4', 'dice (qoi MultipartFile)');
     container.appendChild(dlIip);
 
     // Kitty demos
@@ -141,6 +142,21 @@ export class AddonImageWindow extends BaseWindow implements IControlWindow {
         this._terminal.write(`\x1b]1337;File=inline=1;size=${data.length}:${btoa(sdata)}\x1b\\`);
       });
 
+    const iipDemoMulti = (url: string) => () => fetch(url)
+      .then(resp => resp.arrayBuffer())
+      .then(buffer => {
+        const data = new Uint8Array(buffer);
+        let sdata = '';
+        for (let i = 0; i < data.length; ++i) sdata += String.fromCharCode(data[i]);
+        const encoded = btoa(sdata);
+        this._terminal.write('\r\n');
+        this._terminal.write(`\x1b]1337;MultipartFile=inline=1\x1b\\`);
+        for (let i = 0; i < encoded.length; i += 100) {
+          this._terminal.write(`\x1b]1337;FilePart=${encoded.slice(i, i + 100)}\x1b\\`);
+        }
+        this._terminal.write(`\x1b]1337;FileEnd\x1b\\`);
+      });
+
     const kittyDemo = (url: string) => () => fetch(url)
       .then(resp => resp.arrayBuffer())
       .then(buffer => {
@@ -158,6 +174,8 @@ export class AddonImageWindow extends BaseWindow implements IControlWindow {
       sixelDemo('https://raw.githubusercontent.com/jerch/node-sixel/master/testfiles/test2.sixel'));
     document.getElementById('image-demo3')!.addEventListener('click',
       iipDemo('https://raw.githubusercontent.com/jerch/node-sixel/master/palette.png'));
+    document.getElementById('image-demo4')!.addEventListener('click',
+      iipDemoMulti('https://raw.githubusercontent.com/jerch/xterm-wasm-parts/master/fixtures/qoi/dice.qoi'));
     document.getElementById('image-demo-kitty1')!.addEventListener('click',
       kittyDemo('https://raw.githubusercontent.com/jerch/node-sixel/master/palette.png'));
 
@@ -176,7 +194,7 @@ export class AddonImageWindow extends BaseWindow implements IControlWindow {
       //   }
       // }
 
-      const pos = (this._terminal as any)._core._mouseService!.getCoords(ev, (this._terminal as any)._core.screenElement!, this._terminal.cols, this._terminal.rows);
+      const pos = (this._terminal as any)._core._mouseCoordsService!.getCoords(ev, (this._terminal as any)._core.screenElement!, this._terminal.cols, this._terminal.rows);
       const x = pos[0] - 1;
       const y = pos[1] - 1;
       const canvas = ev.shiftKey

demo/client/components/window/optionsWindow.ts

@@ -252,6 +252,11 @@ export class OptionsWindow extends BaseWindow implements IControlWindow {
             input.value = 'auto';
             this._handlers.updateTerminalSize();
           }
+          const screenElement = document.querySelector('.xterm-screen');
+          if (screenElement instanceof HTMLElement) {
+            screenElement.style.outline = this._autoResize ? ''
+              : 'solid thin red';
+          }
         } else if (o === 'theme') {
           value = this._getTheme();
         }

demo/client/tsconfig.json

@@ -2,6 +2,7 @@
   "compilerOptions": {
     "module": "commonjs",
     "target": "es2021",
+    "types": ["node"],
     "outDir": "../out-demo/client",
     "rootDir": ".",
     "sourceMap": true,

demo/server/server.ts

@@ -118,7 +118,7 @@ function startServer(): void {
   });
 
   appWs.ws('/terminals/:pid', function (ws, req) {
-    const term = terminals[parseInt(req.params.pid)];
+    const term = terminals[parseInt(Array.isArray(req.params.pid) ? req.params.pid[0] : req.params.pid)];
     console.log('Connected to terminal ' + term.pid);
     temporaryDisposable[term.pid].dispose();
     delete temporaryDisposable[term.pid];

eslint.config.mjs

@@ -37,12 +37,13 @@ export default tseslint.config(
       '@stylistic/comma-spacing': ['warn', { before: false, after: true }],
       '@stylistic/indent': ['warn', 2],
       '@stylistic/semi': ['warn', 'always'],
-      '@stylistic/quotes': ['warn', 'single', { allowTemplateLiterals: true }],
+      '@stylistic/quotes': ['warn', 'single', { allowTemplateLiterals: 'always' }],
       '@stylistic/member-delimiter-style': ['warn', {
         multiline: { delimiter: 'semi', requireLast: true },
         singleline: { delimiter: 'comma', requireLast: false }
       }],
       '@stylistic/type-annotation-spacing': 'warn',
+      '@stylistic/space-unary-ops': 'warn',
 
       '@typescript-eslint/array-type': ['warn', { default: 'array', readonly: 'generic' }],
       '@typescript-eslint/consistent-type-assertions': 'warn',
@@ -85,6 +86,7 @@ export default tseslint.config(
       'eqeqeq': ['warn', 'always'],
       'jsdoc/check-alignment': 'warn',
       'jsdoc/check-param-names': 'warn',
+      'jsdoc/multiline-blocks': 'warn',
       'jsdoc/no-multi-asterisks': 'warn',
       'keyword-spacing': 'warn',
       'max-len': ['warn', {

eslint.config.typings.mjs

@@ -17,7 +17,7 @@ export default tseslint.config(
     rules: {
       '@stylistic/indent': ['warn', 2],
       '@stylistic/semi': ['warn', 'always'],
-      '@stylistic/quotes': ['warn', 'single', { allowTemplateLiterals: true }],
+      '@stylistic/quotes': ['warn', 'single', { allowTemplateLiterals: 'always' }],
       '@stylistic/member-delimiter-style': ['warn', {
         multiline: { delimiter: 'semi', requireLast: true },
         singleline: { delimiter: 'comma', requireLast: false }

fixtures/kitty_keyboard/german_qwertz_capslock_numlock.json

@@ -1,373 +0,0 @@
-{
-  "Escape +CapsLock": {
-    "1": {
-      "PRESS": "\u001b[27;65u",
-      "REPEAT": "\u001b[27;65u",
-      "RELEASE": null
-    }
-  },
-  "F1 +CapsLock": {
-    "1": {
-      "PRESS": "\u001b[1;65P",
-      "REPEAT": "\u001b[1;65P",
-      "RELEASE": null
-    }
-  },
-  "Insert +CapsLock": {
-    "1": {
-      "PRESS": "\u001b[2;65~",
-      "REPEAT": "\u001b[2;65~",
-      "RELEASE": null
-    }
-  },
-  "Delete +CapsLock": {
-    "1": {
-      "PRESS": "\u001b[3;65~",
-      "REPEAT": "\u001b[3;65~",
-      "RELEASE": null
-    }
-  },
-  "PageUp +CapsLock": {
-    "1": {
-      "PRESS": "\u001b[5;65~",
-      "REPEAT": "\u001b[5;65~",
-      "RELEASE": null
-    }
-  },
-  "Dead (Backquote) +CapsLock": {
-    "1": {
-      "PRESS": "^",
-      "REPEAT": "^",
-      "RELEASE": null
-    }
-  },
-  "1 (Digit1) +CapsLock": {
-    "1": {
-      "PRESS": "1",
-      "REPEAT": "1",
-      "RELEASE": null
-    }
-  },
-  "\u00df (Minus) +CapsLock": {
-    "1": {
-      "PRESS": "\u1e9e",
-      "REPEAT": "\u1e9e",
-      "RELEASE": null
-    }
-  },
-  "Dead (Equal) +CapsLock": {
-    "1": {
-      "PRESS": "\u00b4",
-      "REPEAT": "\u00b4",
-      "RELEASE": null
-    }
-  },
-  "Backspace +CapsLock": {
-    "1": {
-      "PRESS": "\u007f",
-      "REPEAT": "\u007f",
-      "RELEASE": null
-    }
-  },
-  "Tab +CapsLock": {
-    "1": {
-      "PRESS": "\t",
-      "REPEAT": "\t",
-      "RELEASE": null
-    }
-  },
-  "Q (KeyQ) +CapsLock": {
-    "1": {
-      "PRESS": "Q",
-      "REPEAT": "Q",
-      "RELEASE": null
-    }
-  },
-  "\u00dc (BracketLeft) +CapsLock": {
-    "1": {
-      "PRESS": "\u00dc",
-      "REPEAT": "\u00dc",
-      "RELEASE": null
-    }
-  },
-  "+ (BracketRight) +CapsLock": {
-    "1": {
-      "PRESS": "+",
-      "REPEAT": "+",
-      "RELEASE": null
-    }
-  },
-  "Enter +CapsLock": {
-    "1": {
-      "PRESS": "\r",
-      "REPEAT": "\r",
-      "RELEASE": null
-    }
-  },
-  "\u00d6 (Semicolon) +CapsLock": {
-    "1": {
-      "PRESS": "\u00d6",
-      "REPEAT": "\u00d6",
-      "RELEASE": null
-    }
-  },
-  "\u00c4 (Quote) +CapsLock": {
-    "1": {
-      "PRESS": "\u00c4",
-      "REPEAT": "\u00c4",
-      "RELEASE": null
-    }
-  },
-  "# (Bashslash) +CapsLock": {
-    "1": {
-      "PRESS": "#",
-      "REPEAT": "#",
-      "RELEASE": null
-    }
-  },
-  "< (IntlBackslash) +CapsLock": {
-    "1": {
-      "PRESS": "<",
-      "REPEAT": "<",
-      "RELEASE": null
-    }
-  },
-  ", (Comma) +CapsLock": {
-    "1": {
-      "PRESS": ",",
-      "REPEAT": ",",
-      "RELEASE": null
-    }
-  },
-  ". (Period) +CapsLock": {
-    "1": {
-      "PRESS": ".",
-      "REPEAT": ".",
-      "RELEASE": null
-    }
-  },
-  "- (Slash) +CapsLock": {
-    "1": {
-      "PRESS": "-",
-      "REPEAT": "-",
-      "RELEASE": null
-    }
-  },
-  "ArrowUp +CapsLock": {
-    "1": {
-      "PRESS": "\u001b[1;65A",
-      "REPEAT": "\u001b[1;65A",
-      "RELEASE": null
-    }
-  },
-  "PageDown +CapsLock": {
-    "1": {
-      "PRESS": "\u001b[6;65~",
-      "REPEAT": "\u001b[6;65~",
-      "RELEASE": null
-    }
-  },
-  "Home +CapsLock": {
-    "1": {
-      "PRESS": "\u001b[1;65H",
-      "REPEAT": "\u001b[1;65H",
-      "RELEASE": null
-    }
-  },
-  "End +CapsLock": {
-    "1": {
-      "PRESS": "\u001b[1;65F",
-      "REPEAT": "\u001b[1;65F",
-      "RELEASE": null
-    }
-  },
-  "+ (NumpadAdd) +CapsLock": {
-    "1": {
-      "PRESS": "+",
-      "REPEAT": "+",
-      "RELEASE": null
-    }
-  },
-  "Enter (NumpadEnter) +CapsLock": {
-    "1": {
-      "PRESS": "\u001b[57414;65u",
-      "REPEAT": "\u001b[57414;65u",
-      "RELEASE": null
-    }
-  },
-  "Insert (Numpad0) +CapsLock": {
-    "1": {
-      "PRESS": "\u001b[57425;65u",
-      "REPEAT": "\u001b[57425;65u",
-      "RELEASE": null
-    }
-  },
-  "\u0000 (NumpadDecimal) +CapsLock": {
-    "1": {
-      "PRESS": "\u001b[57426;65u",
-      "REPEAT": "\u001b[57426;65u",
-      "RELEASE": null
-    }
-  },
-  "Numlock +CapsLock": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "CapsLock +CapsLock": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "Shift (ShiftLeft) +CapsLock": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "Shift (ShiftRight) +CapsLock": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "Control (ControlLeft) +CapsLock": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "Meta (MetaLeft) +CapsLock": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "Alt (AltLeft) +CapsLock": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "AltGraph (AltRight) +CapsLock": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "Control (ControlRight) +CapsLock": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "/ (NumpadDivide) +NumLock": {
-    "1": {
-      "PRESS": "/",
-      "REPEAT": "/",
-      "RELEASE": null
-    }
-  },
-  "* (NumpadMultiply) +NumLock": {
-    "1": {
-      "PRESS": "*",
-      "REPEAT": "*",
-      "RELEASE": null
-    }
-  },
-  "- (NumpadSubtract) +NumLock": {
-    "1": {
-      "PRESS": "-",
-      "REPEAT": "-",
-      "RELEASE": null
-    }
-  },
-  "0 (Numpad0) +NumLock": {
-    "1": {
-      "PRESS": "0",
-      "REPEAT": "0",
-      "RELEASE": null
-    }
-  },
-  "1 (Numpad1) +NumLock": {
-    "1": {
-      "PRESS": "1",
-      "REPEAT": "1",
-      "RELEASE": null
-    }
-  },
-  "2 (Numpad2) +NumLock": {
-    "1": {
-      "PRESS": "2",
-      "REPEAT": "2",
-      "RELEASE": null
-    }
-  },
-  "3 (Numpad3) +NumLock": {
-    "1": {
-      "PRESS": "3",
-      "REPEAT": "3",
-      "RELEASE": null
-    }
-  },
-  "4 (Numpad4) +NumLock": {
-    "1": {
-      "PRESS": "4",
-      "REPEAT": "4",
-      "RELEASE": null
-    }
-  },
-  "5 (Numpad5) +NumLock": {
-    "1": {
-      "PRESS": "5",
-      "REPEAT": "5",
-      "RELEASE": null
-    }
-  },
-  "6 (Numpad6) +NumLock": {
-    "1": {
-      "PRESS": "6",
-      "REPEAT": "6",
-      "RELEASE": null
-    }
-  },
-  "7 (Numpad7) +NumLock": {
-    "1": {
-      "PRESS": "7",
-      "REPEAT": "7",
-      "RELEASE": null
-    }
-  },
-  "8 (Numpad8) +NumLock": {
-    "1": {
-      "PRESS": "8",
-      "REPEAT": "8",
-      "RELEASE": null
-    }
-  },
-  "9 (Numpad9) +NumLock": {
-    "1": {
-      "PRESS": "9",
-      "REPEAT": "9",
-      "RELEASE": null
-    }
-  },
-  ", (NumpadDecimal) +NumLock": {
-    "1": {
-      "PRESS": ",",
-      "REPEAT": ",",
-      "RELEASE": null
-    }
-  }
-}

fixtures/kitty_keyboard/german_qwertz_no_modifier.json

@@ -1,702 +0,0 @@
-{
-  "Escape": {
-    "1": {
-      "PRESS": "\u001b[27u",
-      "REPEAT": "\u001b[27u",
-      "RELEASE": null
-    }
-  },
-  "F1": {
-    "1": {
-      "PRESS": "\u001b[P",
-      "REPEAT": "\u001b[P",
-      "RELEASE": null
-    }
-  },
-  "F2": {
-    "1": {
-      "PRESS": "\u001b[Q",
-      "REPEAT": "\u001b[Q",
-      "RELEASE": null
-    }
-  },
-  "F3": {
-    "1": {
-      "PRESS": "\u001b[13~",
-      "REPEAT": "\u001b[13~",
-      "RELEASE": null
-    }
-  },
-  "F4": {
-    "1": {
-      "PRESS": "\u001b[S",
-      "REPEAT": "\u001b[S",
-      "RELEASE": null
-    }
-  },
-  "F5": {
-    "1": {
-      "PRESS": "\u001b[15~",
-      "REPEAT": "\u001b[15~",
-      "RELEASE": null
-    }
-  },
-  "F6": {
-    "1": {
-      "PRESS": "\u001b[17~",
-      "REPEAT": "\u001b[17~",
-      "RELEASE": null
-    }
-  },
-  "F7": {
-    "1": {
-      "PRESS": "\u001b[18~",
-      "REPEAT": "\u001b[18~",
-      "RELEASE": null
-    }
-  },
-  "F8": {
-    "1": {
-      "PRESS": "\u001b[19~",
-      "REPEAT": "\u001b[19~",
-      "RELEASE": null
-    }
-  },
-  "F9": {
-    "1": {
-      "PRESS": "\u001b[20~",
-      "REPEAT": "\u001b[20~",
-      "RELEASE": null
-    }
-  },
-  "F10": {
-    "1": {
-      "PRESS": "\u001b[21~",
-      "REPEAT": "\u001b[21~",
-      "RELEASE": null
-    }
-  },
-  "F11": {
-    "1": {
-      "PRESS": "\u001b[23~",
-      "REPEAT": "\u001b[23~",
-      "RELEASE": null
-    }
-  },
-  "F12": {
-    "1": {
-      "PRESS": "\u001b[24~",
-      "REPEAT": "\u001b[24~",
-      "RELEASE": null
-    }
-  },
-  "Insert": {
-    "1": {
-      "PRESS": "\u001b[2~",
-      "REPEAT": "\u001b[2~",
-      "RELEASE": null
-    }
-  },
-  "Delete": {
-    "1": {
-      "PRESS": "\u001b[3~",
-      "REPEAT": "\u001b[3~",
-      "RELEASE": null
-    }
-  },
-  "PageUp": {
-    "1": {
-      "PRESS": "\u001b[5~",
-      "REPEAT": "\u001b[5~",
-      "RELEASE": null
-    }
-  },
-  "PageDown": {
-    "1": {
-      "PRESS": "\u001b[6~",
-      "REPEAT": "\u001b[6~",
-      "RELEASE": null
-    }
-  },
-  "Home": {
-    "1": {
-      "PRESS": "\u001b[H",
-      "REPEAT": "\u001b[H",
-      "RELEASE": null
-    }
-  },
-  "End": {
-    "1": {
-      "PRESS": "\u001b[F",
-      "REPEAT": "\u001b[F",
-      "RELEASE": null
-    }
-  },
-  "Dead (Backquote)": {
-    "1": {
-      "PRESS": "^",
-      "REPEAT": "^",
-      "RELEASE": null
-    }
-  },
-  "1 (Digit1)": {
-    "1": {
-      "PRESS": "1",
-      "REPEAT": "1",
-      "RELEASE": null
-    }
-  },
-  "2 (Digit2)": {
-    "1": {
-      "PRESS": "2",
-      "REPEAT": "2",
-      "RELEASE": null
-    }
-  },
-  "3 (Digit3)": {
-    "1": {
-      "PRESS": "3",
-      "REPEAT": "3",
-      "RELEASE": null
-    }
-  },
-  "4 (Digit4)": {
-    "1": {
-      "PRESS": "4",
-      "REPEAT": "4",
-      "RELEASE": null
-    }
-  },
-  "5 (Digit5)": {
-    "1": {
-      "PRESS": "5",
-      "REPEAT": "5",
-      "RELEASE": null
-    }
-  },
-  "6 (Digit6)": {
-    "1": {
-      "PRESS": "6",
-      "REPEAT": "6",
-      "RELEASE": null
-    }
-  },
-  "7 (Digit7)": {
-    "1": {
-      "PRESS": "7",
-      "REPEAT": "7",
-      "RELEASE": null
-    }
-  },
-  "8 (Digit8)": {
-    "1": {
-      "PRESS": "8",
-      "REPEAT": "8",
-      "RELEASE": null
-    }
-  },
-  "9 (Digit9)": {
-    "1": {
-      "PRESS": "9",
-      "REPEAT": "9",
-      "RELEASE": null
-    }
-  },
-  "0 (Digit0)": {
-    "1": {
-      "PRESS": "0",
-      "REPEAT": "0",
-      "RELEASE": null
-    }
-  },
-  "\u00df (Minus)": {
-    "1": {
-      "PRESS": "\u00df",
-      "REPEAT": "\u00df",
-      "RELEASE": null
-    }
-  },
-  "Dead (Equal)": {
-    "1": {
-      "PRESS": "\u00b4",
-      "REPEAT": "\u00b4",
-      "RELEASE": null
-    }
-  },
-  "Backspace": {
-    "1": {
-      "PRESS": "\u007f",
-      "REPEAT": "\u007f",
-      "RELEASE": null
-    }
-  },
-  "Tab": {
-    "1": {
-      "PRESS": "\t",
-      "REPEAT": "\t",
-      "RELEASE": null
-    }
-  },
-  "q (KeyQ)": {
-    "1": {
-      "PRESS": "q",
-      "REPEAT": "q",
-      "RELEASE": null
-    }
-  },
-  "w (KeyW)": {
-    "1": {
-      "PRESS": "w",
-      "REPEAT": "w",
-      "RELEASE": null
-    }
-  },
-  "e (KeyE)": {
-    "1": {
-      "PRESS": "e",
-      "REPEAT": "e",
-      "RELEASE": null
-    }
-  },
-  "r (KeyR)": {
-    "1": {
-      "PRESS": "r",
-      "REPEAT": "r",
-      "RELEASE": null
-    }
-  },
-  "t (KeyT)": {
-    "1": {
-      "PRESS": "t",
-      "REPEAT": "t",
-      "RELEASE": null
-    }
-  },
-  "z (KeyY)": {
-    "1": {
-      "PRESS": "z",
-      "REPEAT": "z",
-      "RELEASE": null
-    }
-  },
-  "u (KeyU)": {
-    "1": {
-      "PRESS": "u",
-      "REPEAT": "u",
-      "RELEASE": null
-    }
-  },
-  "i (KeyI)": {
-    "1": {
-      "PRESS": "i",
-      "REPEAT": "i",
-      "RELEASE": null
-    }
-  },
-  "o (KeyO)": {
-    "1": {
-      "PRESS": "o",
-      "REPEAT": "o",
-      "RELEASE": null
-    }
-  },
-  "p (KeyP)": {
-    "1": {
-      "PRESS": "p",
-      "REPEAT": "p",
-      "RELEASE": null
-    }
-  },
-  "\u00fc (BracketLeft)": {
-    "1": {
-      "PRESS": "\u00fc",
-      "REPEAT": "\u00fc",
-      "RELEASE": null
-    }
-  },
-  "+ (BracketRight)": {
-    "1": {
-      "PRESS": "+",
-      "REPEAT": "+",
-      "RELEASE": null
-    }
-  },
-  "Enter": {
-    "1": {
-      "PRESS": "\r",
-      "REPEAT": "\r",
-      "RELEASE": null
-    }
-  },
-  "a (KeyA)": {
-    "1": {
-      "PRESS": "a",
-      "REPEAT": "a",
-      "RELEASE": null
-    }
-  },
-  "s (KeyS)": {
-    "1": {
-      "PRESS": "s",
-      "REPEAT": "s",
-      "RELEASE": null
-    }
-  },
-  "d (KeyD)": {
-    "1": {
-      "PRESS": "d",
-      "REPEAT": "d",
-      "RELEASE": null
-    }
-  },
-  "f (KeyF)": {
-    "1": {
-      "PRESS": "f",
-      "REPEAT": "f",
-      "RELEASE": null
-    }
-  },
-  "g (KeyG)": {
-    "1": {
-      "PRESS": "g",
-      "REPEAT": "g",
-      "RELEASE": null
-    }
-  },
-  "h (KeyH)": {
-    "1": {
-      "PRESS": "h",
-      "REPEAT": "h",
-      "RELEASE": null
-    }
-  },
-  "j (KeyJ)": {
-    "1": {
-      "PRESS": "j",
-      "REPEAT": "j",
-      "RELEASE": null
-    }
-  },
-  "k (KeyK)": {
-    "1": {
-      "PRESS": "k",
-      "REPEAT": "k",
-      "RELEASE": null
-    }
-  },
-  "l (KeyL)": {
-    "1": {
-      "PRESS": "l",
-      "REPEAT": "l",
-      "RELEASE": null
-    }
-  },
-  "\u00f6 (Semicolon)": {
-    "1": {
-      "PRESS": "\u00f6",
-      "REPEAT": "\u00f6",
-      "RELEASE": null
-    }
-  },
-  "\u00e4 (Quote)": {
-    "1": {
-      "PRESS": "\u00e4",
-      "REPEAT": "\u00e4",
-      "RELEASE": null
-    }
-  },
-  "# (Backslash)": {
-    "1": {
-      "PRESS": "#",
-      "REPEAT": "#",
-      "RELEASE": null
-    }
-  },
-  "< (IntlBackslash)": {
-    "1": {
-      "PRESS": "<",
-      "REPEAT": "<",
-      "RELEASE": null
-    }
-  },
-  "y (KeyZ)": {
-    "1": {
-      "PRESS": "y",
-      "REPEAT": "y",
-      "RELEASE": null
-    }
-  },
-  "x (KeyX)": {
-    "1": {
-      "PRESS": "x",
-      "REPEAT": "x",
-      "RELEASE": null
-    }
-  },
-  "c (KeyC)": {
-    "1": {
-      "PRESS": "c",
-      "REPEAT": "c",
-      "RELEASE": null
-    }
-  },
-  "v (KeyV)": {
-    "1": {
-      "PRESS": "v",
-      "REPEAT": "v",
-      "RELEASE": null
-    }
-  },
-  "b (KeyB)": {
-    "1": {
-      "PRESS": "b",
-      "REPEAT": "b",
-      "RELEASE": null
-    }
-  },
-  "n (KeyN)": {
-    "1": {
-      "PRESS": "n",
-      "REPEAT": "n",
-      "RELEASE": null
-    }
-  },
-  "m (KeyM)": {
-    "1": {
-      "PRESS": "m",
-      "REPEAT": "m",
-      "RELEASE": null
-    }
-  },
-  ", (Comma)": {
-    "1": {
-      "PRESS": ",",
-      "REPEAT": ",",
-      "RELEASE": null
-    }
-  },
-  ". (Period)": {
-    "1": {
-      "PRESS": ".",
-      "REPEAT": ".",
-      "RELEASE": null
-    }
-  },
-  "- (Slash)": {
-    "1": {
-      "PRESS": "-",
-      "REPEAT": "-",
-      "RELEASE": null
-    }
-  },
-  "ArrowLeft": {
-    "1": {
-      "PRESS": "\u001b[D",
-      "REPEAT": "\u001b[D",
-      "RELEASE": null
-    }
-  },
-  "ArrowUp": {
-    "1": {
-      "PRESS": "\u001b[A",
-      "REPEAT": "\u001b[A",
-      "RELEASE": null
-    }
-  },
-  "ArrowRight": {
-    "1": {
-      "PRESS": "\u001b[C",
-      "REPEAT": "\u001b[C",
-      "RELEASE": null
-    }
-  },
-  "ArrowDown": {
-    "1": {
-      "PRESS": "\u001b[B",
-      "REPEAT": "\u001b[B",
-      "RELEASE": null
-    }
-  },
-  "/ (NumpadDivide)": {
-    "1": {
-      "PRESS": "/",
-      "REPEAT": "/",
-      "RELEASE": null
-    }
-  },
-  "* (NumpadMultiply)": {
-    "1": {
-      "PRESS": "*",
-      "REPEAT": "*",
-      "RELEASE": null
-    }
-  },
-  "- (NumpadSubtract)": {
-    "1": {
-      "PRESS": "-",
-      "REPEAT": "-",
-      "RELEASE": null
-    }
-  },
-  "Home (Numpad7)": {
-    "1": {
-      "PRESS": "\u001b[57423u",
-      "REPEAT": "\u001b[57423u",
-      "RELEASE": null
-    }
-  },
-  "ArrowUp (Numpad8)": {
-    "1": {
-      "PRESS": "\u001b[57419u",
-      "REPEAT": "\u001b[57419u",
-      "RELEASE": null
-    }
-  },
-  "PageUp (Numpad9)": {
-    "1": {
-      "PRESS": "\u001b[57421u",
-      "REPEAT": "\u001b[57421u",
-      "RELEASE": null
-    }
-  },
-  "+ (NumpadAdd)": {
-    "1": {
-      "PRESS": "+",
-      "REPEAT": "+",
-      "RELEASE": null
-    }
-  },
-  "ArrowLeft (Numpad4)": {
-    "1": {
-      "PRESS": "\u001b[57417u",
-      "REPEAT": "\u001b[57417u",
-      "RELEASE": null
-    }
-  },
-  "Clear (Numpad5)": {
-    "1": {
-      "PRESS": "\u001b[E",
-      "REPEAT": "\u001b[E",
-      "RELEASE": null
-    }
-  },
-  "ArrowRight (Numpad6)": {
-    "1": {
-      "PRESS": "\u001b[57418u",
-      "REPEAT": "\u001b[57418u",
-      "RELEASE": null
-    }
-  },
-  "End (Numpad1)": {
-    "1": {
-      "PRESS": "\u001b[57424u",
-      "REPEAT": "\u001b[57424u",
-      "RELEASE": null
-    }
-  },
-  "ArrowDown (Numpad2)": {
-    "1": {
-      "PRESS": "\u001b[57420u",
-      "REPEAT": "\u001b[57420u",
-      "RELEASE": null
-    }
-  },
-  "PageDown (Numpad3)": {
-    "1": {
-      "PRESS": "\u001b[57422u",
-      "REPEAT": "\u001b[57422u",
-      "RELEASE": null
-    }
-  },
-  "Enter (NumpadEnter)": {
-    "1": {
-      "PRESS": "\u001b[57414u",
-      "REPEAT": "\u001b[57414u",
-      "RELEASE": null
-    }
-  },
-  "Insert (Numpad0)": {
-    "1": {
-      "PRESS": "\u001b[57425u",
-      "REPEAT": "\u001b[57425u",
-      "RELEASE": null
-    }
-  },
-  "\u0000 (NumpadDecimal)": {
-    "1": {
-      "PRESS": "\u001b[57426u",
-      "REPEAT": "\u001b[57426u",
-      "RELEASE": null
-    }
-  },
-  "Numlock": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "CapsLock": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "Shift (ShiftLeft)": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "Shift (ShiftRight)": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "Control (ControlLeft)": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "Meta (MetaLeft)": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "Alt (AltLeft)": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "  (Space)": {
-    "1": {
-      "PRESS": " ",
-      "REPEAT": " ",
-      "RELEASE": null
-    }
-  },
-  "AltGraph (AltRight)": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "Control (ControlRight)": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  }
-}

fixtures/kitty_keyboard/german_qwertz_shift.json

@@ -1,331 +0,0 @@
-{
-  "Escape +Shift": {
-    "1": {
-      "PRESS": "\u001b[27;2u",
-      "REPEAT": "\u001b[27;2u",
-      "RELEASE": null
-    }
-  },
-  "F1 +Shift": {
-    "1": {
-      "PRESS": "\u001b[1;2P",
-      "REPEAT": "\u001b[1;2P",
-      "RELEASE": null
-    }
-  },
-  "Delete +Shift": {
-    "1": {
-      "PRESS": "\u001b[3;2~",
-      "REPEAT": "\u001b[3;2~",
-      "RELEASE": null
-    }
-  },
-  "PageUp +Shift": {
-    "1": {
-      "PRESS": "\u001b[5;2~",
-      "REPEAT": "\u001b[5;2~",
-      "RELEASE": null
-    }
-  },
-  "Dead (Backquote) +Shift": {
-    "1": {
-      "PRESS": "\u00b0",
-      "REPEAT": "\u00b0",
-      "RELEASE": null
-    }
-  },
-  "! (Digit1) +Shift": {
-    "1": {
-      "PRESS": "!",
-      "REPEAT": "!",
-      "RELEASE": null
-    }
-  },
-  "\" (Digit2) +Shift": {
-    "1": {
-      "PRESS": "\"",
-      "REPEAT": "\"",
-      "RELEASE": null
-    }
-  },
-  "\u00a7 (Digit3) +Shift": {
-    "1": {
-      "PRESS": "\u00a7",
-      "REPEAT": "\u00a7",
-      "RELEASE": null
-    }
-  },
-  "$ (Digit4) +Shifft": {
-    "1": {
-      "PRESS": "$",
-      "REPEAT": "$",
-      "RELEASE": null
-    }
-  },
-  "% (Digit5) +Shift": {
-    "1": {
-      "PRESS": "%",
-      "REPEAT": "%",
-      "RELEASE": null
-    }
-  },
-  "& (Digit6) +Shift": {
-    "1": {
-      "PRESS": "&",
-      "REPEAT": "&",
-      "RELEASE": null
-    }
-  },
-  "/ (Digit7) +Shift": {
-    "1": {
-      "PRESS": "/",
-      "REPEAT": "/",
-      "RELEASE": null
-    }
-  },
-  "( (Digit8) +Shift": {
-    "1": {
-      "PRESS": "(",
-      "REPEAT": "(",
-      "RELEASE": null
-    }
-  },
-  ") (Digit9) +Shift": {
-    "1": {
-      "PRESS": ")",
-      "REPEAT": ")",
-      "RELEASE": null
-    }
-  },
-  "= (Digit0) +Shift": {
-    "1": {
-      "PRESS": "=",
-      "REPEAT": "=",
-      "RELEASE": null
-    }
-  },
-  "? (Minus) +Shift": {
-    "1": {
-      "PRESS": "?",
-      "REPEAT": "?",
-      "RELEASE": null
-    }
-  },
-  "Backspace +Shift": {
-    "1": {
-      "PRESS": "\u001b[127;2u",
-      "REPEAT": "\u001b[127;2u",
-      "RELEASE": null
-    }
-  },
-  "Tab +Shift": {
-    "1": {
-      "PRESS": "\u001b[9;2u",
-      "REPEAT": "\u001b[9;2u",
-      "RELEASE": null
-    }
-  },
-  "Q (KeyQ) +Shift": {
-    "1": {
-      "PRESS": "Q",
-      "REPEAT": "Q",
-      "RELEASE": null
-    }
-  },
-  "\u00dc (BracketLeft) +Shift": {
-    "1": {
-      "PRESS": "\u00dc",
-      "REPEAT": "\u00dc",
-      "RELEASE": null
-    }
-  },
-  "* (BracketRight) +Shift": {
-    "1": {
-      "PRESS": "*",
-      "REPEAT": "*",
-      "RELEASE": null
-    }
-  },
-  "Enter +Shift": {
-    "1": {
-      "PRESS": "\u001b[13;2u",
-      "REPEAT": "\u001b[13;2u",
-      "RELEASE": null
-    }
-  },
-  "\u00d6 (Semicolon) +Shift": {
-    "1": {
-      "PRESS": "\u00d6",
-      "REPEAT": "\u00d6",
-      "RELEASE": null
-    }
-  },
-  "\u00c4 (Quote) +Shift": {
-    "1": {
-      "PRESS": "\u00c4",
-      "REPEAT": "\u00c4",
-      "RELEASE": null
-    }
-  },
-  "' (Backslash) +Shift": {
-    "1": {
-      "PRESS": "'",
-      "REPEAT": "'",
-      "RELEASE": null
-    }
-  },
-  "> (IntlBackslash) +Shift": {
-    "1": {
-      "PRESS": ">",
-      "REPEAT": ">",
-      "RELEASE": null
-    }
-  },
-  "; (Comma) +Shift": {
-    "1": {
-      "PRESS": ";",
-      "REPEAT": ";",
-      "RELEASE": null
-    }
-  },
-  ": (Period) +Shift": {
-    "1": {
-      "PRESS": ":",
-      "REPEAT": ":",
-      "RELEASE": null
-    }
-  },
-  "_ (Slash) +Shift": {
-    "1": {
-      "PRESS": "_",
-      "REPEAT": "_",
-      "RELEASE": null
-    }
-  },
-  "ArrowUp +Shift": {
-    "1": {
-      "PRESS": "\u001b[1;2A",
-      "REPEAT": "\u001b[1;2A",
-      "RELEASE": null
-    }
-  },
-  "PageDown +Shift": {
-    "1": {
-      "PRESS": "\u001b[6;2~",
-      "REPEAT": "\u001b[6;2~",
-      "RELEASE": null
-    }
-  },
-  "Home +Shift": {
-    "1": {
-      "PRESS": "\u001b[1;2H",
-      "REPEAT": "\u001b[1;2H",
-      "RELEASE": null
-    }
-  },
-  "Home (Numpad7) +Shift": {
-    "1": {
-      "PRESS": "\u001b[57423;2u",
-      "REPEAT": "\u001b[57423;2u",
-      "RELEASE": null
-    }
-  },
-  "ArrowUp (Numapd8) +Shift": {
-    "1": {
-      "PRESS": "\u001b[57419;2u",
-      "REPEAT": "\u001b[57419;2u",
-      "RELEASE": null
-    }
-  },
-  "Clear (Numpad5) +Shift": {
-    "1": {
-      "PRESS": "\u001b[1;2E",
-      "REPEAT": "\u001b[1;2E",
-      "RELEASE": null
-    }
-  },
-  "Enter (NumpadEnter) +Shift": {
-    "1": {
-      "PRESS": "\u001b[57414;2u",
-      "REPEAT": "\u001b[57414;2u",
-      "RELEASE": null
-    }
-  },
-  "Insert (Numpad0) +Shift": {
-    "1": {
-      "PRESS": "\u001b[57425;2u",
-      "REPEAT": "\u001b[57425;2u",
-      "RELEASE": null
-    }
-  },
-  "\u0000 (NumpadDecimal) +Shift": {
-    "1": {
-      "PRESS": "\u001b[57426;2u",
-      "REPEAT": "\u001b[57426;2u",
-      "RELEASE": null
-    }
-  },
-  "Numlock +Shift": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "CapsLock +Shift": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "Shift (ShiftRight) +Shift": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "Control (ControlLeft) +Shift": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "Meta (MetaLeft) +Shift": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "Alt (AltLeft) +Shift": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "  (Space) +Shift": {
-    "1": {
-      "PRESS": " ",
-      "REPEAT": " ",
-      "RELEASE": null
-    }
-  },
-  "AltGraph (AltRight) +Shift": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  },
-  "Control (ControlRight) +Shift": {
-    "1": {
-      "PRESS": null,
-      "REPEAT": null,
-      "RELEASE": null
-    }
-  }
-}

package.json

@@ -56,7 +56,6 @@
     "test-unit": "node ./bin/test_unit.js",
     "test-unit-slow-tests": "npm run test-unit | grep \"ms)\"",
     "test-unit-coverage": "node ./bin/test_unit.js --coverage",
-    "test-unit-dev": "cross-env NODE_PATH='./out' mocha",
     "test-integration": "node ./bin/test_integration.js --workers=75%",
     "test-integration-chromium": "node ./bin/test_integration.js --workers=75% \"--project=Chromium\"",
     "test-integration-firefox": "node ./bin/test_integration.js --workers=75% \"--project=FirefoxStable\"",
@@ -76,47 +75,41 @@
     "prepublishOnly": "npm run package"
   },
   "devDependencies": {
+    "@eslint/js": "^10.0.1",
     "@lunapaint/png-codec": "^0.2.0",
-    "@playwright/test": "^1.57.0",
-    "@stylistic/eslint-plugin": "^4.4.1",
-    "@types/chai": "^4.2.22",
-    "@types/debug": "^4.1.7",
-    "@types/deep-equal": "^1.0.1",
-    "@types/express": "4",
+    "@playwright/test": "^1.59.1",
+    "@stylistic/eslint-plugin": "^5.10.0",
+    "@types/chai": "^5.2.3",
+    "@types/express": "^5.0.6",
     "@types/express-ws": "^3.0.1",
-    "@types/jsdom": "^27.0.0",
-    "@types/mocha": "^9.0.0",
+    "@types/jsdom": "^28.0.1",
+    "@types/mocha": "^10.0.10",
     "@types/node": "^22.19.3",
-    "@types/trusted-types": "^1.0.6",
-    "@types/utf8": "^3.0.0",
     "@types/webpack": "^5.28.0",
     "@types/ws": "^8.2.0",
-    "@typescript-eslint/eslint-plugin": "^8.50.1",
-    "@typescript-eslint/parser": "^8.50.1",
-    "@typescript/native-preview": "^7.0.0-dev.20260213.1",
-    "chai": "^4.3.4",
+    "@typescript-eslint/eslint-plugin": "^8.59.2",
+    "@typescript-eslint/parser": "^8.59.2",
+    "@typescript/native-preview": "^7.0.0-dev.20260509.2",
+    "chai": "^6.2.2",
     "concurrently": "^9.1.2",
-    "cross-env": "^7.0.3",
-    "deep-equal": "^2.0.5",
-    "esbuild": "~0.25.2",
-    "eslint": "^9.39.2",
-    "eslint-plugin-jsdoc": "^50.8.0",
-    "express": "^4.19.2",
+    "esbuild": "^0.28.0",
+    "eslint": "^10.3.0",
+    "eslint-plugin-jsdoc": "^62.9.0",
+    "express": "^5.2.1",
     "express-ws": "^5.0.2",
-    "jsdom": "^27.3.0",
-    "mocha": "^10.1.0",
+    "jsdom": "^29.1.1",
+    "mocha": "^11.7.5",
     "mustache": "^4.2.0",
     "node-pty": "^1.2.0-beta.9",
-    "nyc": "^17.1.0",
-    "source-map-loader": "^3.0.0",
+    "nyc": "^18.0.0",
+    "source-map-loader": "^5.0.0",
     "source-map-support": "^0.5.20",
-    "ts-loader": "^9.3.1",
+    "ts-loader": "^9.5.7",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.50.1",
-    "utf8": "^3.0.0",
-    "webpack": "^5.61.0",
-    "webpack-cli": "^4.9.1",
-    "ws": "^8.2.3",
-    "xterm-benchmark": "^0.3.1"
+    "typescript-eslint": "^8.59.2",
+    "webpack": "^5.106.2",
+    "webpack-cli": "^7.0.2",
+    "ws": "^8.20.0",
+    "xterm-benchmark": "^0.3.2"
   }
 }

src/ARCHITECTURE.md

@@ -0,0 +1,70 @@
+# xterm.js source architecture
+
+This document describes how `src/` is organized. The layout follows [issue #5963](https://github.com/xtermjs/xterm.js/issues/5963): **primitives** and **runtime** as separate TypeScript composite projects, with **target-browser** and **target-headless** as platform entry points.
+
+## Dependency graph
+
+```mermaid
+flowchart BT
+  primitives["primitives<br/>building blocks"]
+  runtime["runtime<br/>services, integration"]
+  targetBrowser["target-browser<br/>DOM terminal"]
+  targetHeadless["target-headless<br/>Node terminal"]
+
+  runtime --> primitives
+  targetBrowser --> runtime
+  targetHeadless --> runtime
+```
+
+## TypeScript projects
+
+| Project | `tsconfig` | Output | Role |
+| --- | --- | --- | --- |
+| Primitives | `src/primitives/tsconfig.json` | `out/primitives/` | Buffer, parser, input helpers, static data, shared utilities. Must not import from `runtime/`. |
+| Runtime | `src/runtime/tsconfig.json` | `out/runtime/` | Services (DI), `CoreTerminal`, `InputHandler`, public API adapters, `Types.ts`. References primitives. |
+| Source (solution) | `src/tsconfig.json` | — | Solution root; references primitives + runtime only. |
+| Target browser | `src/target-browser/tsconfig.json` | `out/target-browser/` | Browser rendering, input, public `Terminal`. References `src/`. |
+| Target headless | `src/target-headless/tsconfig.json` | `out/target-headless/` | Headless terminal. References `src/`. |
+
+Unit test files (`**/*.test.ts`) are excluded from composite library builds; they are compiled via esbuild for `npm run test-unit`.
+
+## `primitives/`
+
+| Area | Contents |
+| --- | --- |
+| Root utilities | `Async`, `CircularList`, `Color`, `ColorTypes`, `Event`, `KeyboardTypes`, `Lifecycle`, `MultiKeyMap`, `Platform`, `SortedList`, `StringBuilder`, `TaskQueue`, `TerminalOptions`, `Version` |
+| `buffer/` | Screen buffer, `CellTypes`, `BufferService` / `BufferOptions` / `BufferLog` interfaces (buffer-layer contracts) |
+| `data/` | `Charsets`, `EscapeSequences` |
+| `input/` | UTF decoding, keyboard helpers, `UnicodeTypes`, `UnicodeProperties` |
+| `parser/` | Escape-sequence parser |
+
+Primitives depend only on other primitives (and `@xterm/xterm` typings where needed). Buffer code uses `IBufferService` from `common/buffer/BufferService`, not `common/services/Services`.
+
+## `runtime/`
+
+| Area | Contents |
+| --- | --- |
+| `services/` | DI implementations (`BufferService`, `OptionsService`, …) |
+| `public/` | Public API adapters (`AddonManager`, buffer/parser views) |
+| Root | `CoreTerminal`, `InputHandler`, `WindowsMode`, `Types.ts`, `TestUtils.test.ts` |
+
+`Types.ts` re-exports primitive types and adds integration types (`IInputHandler`, `ICoreTerminal`, mouse/color helpers, etc.).
+
+## Import paths
+
+Source keeps the `common/...` prefix (logical module name, not a physical `common/` folder). Each project's `paths` in `tsconfig.json` map that prefix to `primitives/` and/or `runtime/`.
+
+Platform code uses:
+
+- `target-browser/...` — browser terminal
+- `target-headless/...` — Node terminal
+
+## Published packages vs source folders
+
+The npm package directory `headless/` (e.g. `headless/lib-headless/`) is unchanged; only the **source** tree uses `src/target-headless/`.
+
+## Related issues
+
+- [#5963](https://github.com/xtermjs/xterm.js/issues/5963) — module split
+- [#5896](https://github.com/xtermjs/xterm.js/issues/5896) — relative imports
+- [#5897](https://github.com/xtermjs/xterm.js/issues/5897) — `import/no-cycle` lint

src/browser/tsconfig.json

@@ -1,25 +0,0 @@
-{
-  "extends": "../tsconfig-library-base",
-  "compilerOptions": {
-    "lib": [
-      "dom",
-      "es2021"
-    ],
-    "outDir": "../../out",
-    "types": [
-      "../../node_modules/@types/mocha"
-    ],
-    "skipLibCheck": true,
-    "paths": {
-      "common/*": [ "./../common/*" ],
-      "*": [ "./../*" ]
-    }
-  },
-  "include": [
-    "./**/*",
-    "../../typings/xterm.d.ts"
-  ],
-  "references": [
-    { "path": "../common" }
-  ]
-}