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

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

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

.agents/skills/benchmark/SKILL.md

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

.gitignore

@@ -17,6 +17,7 @@ docs/
 npm-debug.log
 /.idea/
 .env
+mise.toml
 build/
 .DS_Store
 yarn.lock

.oxlintrc.json

@@ -0,0 +1,372 @@
+{
+  "$schema": "./node_modules/oxlint/configuration_schema.json",
+  "plugins": [
+    "typescript"
+  ],
+  "categories": {
+    "correctness": "off"
+  },
+  "options": {
+    "typeAware": true,
+    "maxWarnings": 0
+  },
+  "env": {
+    "builtin": true
+  },
+  "ignorePatterns": [
+    "addons/*/src/third-party/*.ts",
+    "**/out/*",
+    "**/out-test/*",
+    "**/out-esbuild/*",
+    "**/out-esbuild-test/*",
+    "**/inwasm-sdks/*",
+    "**/typings/*.d.ts",
+    "**/node_modules",
+    "**/*.js",
+    "**/*.mjs"
+  ],
+  "rules": {
+    "constructor-super": "error",
+    "for-direction": "error",
+    "getter-return": "error",
+    "no-async-promise-executor": "error",
+    "no-case-declarations": "error",
+    "no-class-assign": "error",
+    "no-compare-neg-zero": "error",
+    "no-cond-assign": "error",
+    "no-const-assign": "error",
+    "no-constant-binary-expression": "error",
+    "no-constant-condition": "error",
+    "no-control-regex": "error",
+    "no-debugger": "error",
+    "no-delete-var": "error",
+    "no-dupe-class-members": "error",
+    "no-dupe-else-if": "error",
+    "no-dupe-keys": "error",
+    "no-duplicate-case": "error",
+    "no-empty": "error",
+    "no-empty-character-class": "error",
+    "no-empty-pattern": "error",
+    "no-empty-static-block": "error",
+    "no-ex-assign": "error",
+    "no-extra-boolean-cast": "error",
+    "no-fallthrough": "error",
+    "no-func-assign": "error",
+    "no-global-assign": "error",
+    "no-import-assign": "error",
+    "no-invalid-regexp": "error",
+    "no-irregular-whitespace": "error",
+    "no-loss-of-precision": "error",
+    "no-misleading-character-class": "error",
+    "no-new-native-nonconstructor": "error",
+    "no-nonoctal-decimal-escape": "error",
+    "no-obj-calls": "error",
+    "no-prototype-builtins": "error",
+    "no-redeclare": "error",
+    "no-regex-spaces": "error",
+    "no-self-assign": "error",
+    "no-setter-return": "error",
+    "no-shadow-restricted-names": "error",
+    "no-sparse-arrays": "error",
+    "no-this-before-super": "error",
+    "no-unassigned-vars": "error",
+    "no-unexpected-multiline": "error",
+    "no-unreachable": "error",
+    "no-unsafe-finally": "error",
+    "no-unsafe-negation": "error",
+    "no-unsafe-optional-chaining": "error",
+    "no-unused-labels": "error",
+    "no-unused-private-class-members": "error",
+    "no-unused-vars": "error",
+    "no-useless-backreference": "error",
+    "no-useless-catch": "error",
+    "no-useless-escape": "error",
+    "no-with": "error",
+    "preserve-caught-error": "error",
+    "require-yield": "error",
+    "use-isnan": "error",
+    "valid-typeof": "error",
+    "no-array-constructor": "error",
+    "no-unused-expressions": "error",
+    "typescript/ban-ts-comment": "error",
+    "typescript/no-duplicate-enum-values": "error",
+    "typescript/no-empty-object-type": "error",
+    "typescript/no-explicit-any": "error",
+    "typescript/no-extra-non-null-assertion": "error",
+    "typescript/no-misused-new": "error",
+    "typescript/no-namespace": "error",
+    "typescript/no-non-null-asserted-optional-chain": "error",
+    "typescript/no-require-imports": "error",
+    "typescript/no-this-alias": "error",
+    "typescript/no-unnecessary-type-constraint": "error",
+    "typescript/no-unsafe-declaration-merging": "error",
+    "typescript/no-unsafe-function-type": "error",
+    "typescript/no-wrapper-object-types": "error",
+    "typescript/prefer-as-const": "error",
+    "typescript/prefer-namespace-keyword": "error",
+    "typescript/triple-slash-reference": "error"
+  },
+  "overrides": [
+    {
+      "files": [
+        "**/*.ts",
+        "**/*.tsx",
+        "**/*.mts",
+        "**/*.cts"
+      ],
+      "rules": {
+        "constructor-super": "off",
+        "getter-return": "off",
+        "no-class-assign": "off",
+        "no-const-assign": "off",
+        "no-dupe-class-members": "off",
+        "no-dupe-keys": "off",
+        "no-func-assign": "off",
+        "no-import-assign": "off",
+        "no-new-native-nonconstructor": "off",
+        "no-obj-calls": "off",
+        "no-redeclare": "off",
+        "no-setter-return": "off",
+        "no-this-before-super": "off",
+        "no-unreachable": "off",
+        "no-unsafe-negation": "off",
+        "no-var": "error",
+        "no-with": "off",
+        "prefer-const": "error",
+        "prefer-rest-params": "error",
+        "prefer-spread": "error"
+      }
+    },
+    {
+      "files": [
+        "**/*.ts"
+      ],
+      "jsPlugins": [
+        "@stylistic/eslint-plugin",
+        {
+          "name": "jsdoc-js",
+          "specifier": "eslint-plugin-jsdoc"
+        },
+        "oxlint-plugin-eslint"
+      ],
+      "rules": {
+        "@stylistic/comma-spacing": [
+          "warn",
+          {
+            "before": false,
+            "after": true
+          }
+        ],
+        "@stylistic/indent": [
+          "warn",
+          2
+        ],
+        "@stylistic/semi": [
+          "warn",
+          "always"
+        ],
+        "@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",
+        "@stylistic/keyword-spacing": "warn",
+        "@stylistic/max-len": [
+          "warn",
+          {
+            "code": 1000,
+            "comments": 100,
+            "ignoreTrailingComments": true,
+            "ignoreUrls": true,
+            "ignorePattern": "^ *((?<vt_comment>(//|\\*) @vt)|(?<table_comment>\\* \\| )|(?<commented_code>//  ))"
+          }
+        ],
+        "@stylistic/new-parens": "warn",
+        "@stylistic/no-extra-semi": "error",
+        "@stylistic/no-trailing-spaces": "warn",
+        "eslint-js/object-curly-spacing": [
+          "warn",
+          "always"
+        ],
+        "@stylistic/spaced-comment": [
+          "warn",
+          "always",
+          {
+            "markers": [
+              "/"
+            ],
+            "exceptions": [
+              "-"
+            ]
+          }
+        ],
+        "jsdoc-js/check-alignment": "warn",
+        "jsdoc-js/check-param-names": "warn",
+        "jsdoc-js/multiline-blocks": "warn",
+        "jsdoc-js/no-multi-asterisks": "warn",
+        "eslint-js/one-var": [
+          "warn",
+          "never"
+        ],
+        "eslint-js/no-restricted-syntax": [
+          "warn",
+          {
+            "selector": "CallExpression[callee.name='requestAnimationFrame']",
+            "message": "The global requestAnimationFrame() should be avoided, call it on the parent window from ICoreBrowserService."
+          },
+          {
+            "selector": "CallExpression[callee.name='cancelAnimationFrame']",
+            "message": "The global cancelAnimationFrame() should be avoided, call it on the parent window from ICoreBrowserService."
+          },
+          {
+            "selector": "CallExpression > MemberExpression[object.name='window'][property.name='requestAnimationFrame']",
+            "message": "window.requestAnimationFrame() should be avoided, call it on the parent window from ICoreBrowserService."
+          },
+          {
+            "selector": "CallExpression > MemberExpression[object.name='window'][property.name='cancelAnimationFrame']",
+            "message": "window.cancelAnimationFrame() should be avoided, call it on the parent window from ICoreBrowserService."
+          },
+          {
+            "selector": "MemberExpression[object.name='window'][property.name='devicePixelRatio']",
+            "message": "window.devicePixelRatio should be avoided, get it from ICoreBrowserService."
+          }
+        ],
+        "curly": [
+          "warn",
+          "multi-line"
+        ],
+        "eqeqeq": [
+          "warn",
+          "always"
+        ],
+        "no-duplicate-imports": "warn",
+        "no-else-return": [
+          "warn",
+          {
+            "allowElseIf": false
+          }
+        ],
+        "no-eval": "warn",
+        "no-irregular-whitespace": "warn",
+        "no-restricted-imports": [
+          "warn",
+          {
+            "patterns": [
+              ".*\\/out\\/.*"
+            ]
+          }
+        ],
+        "no-unsafe-finally": "warn",
+        "no-unused-vars": "off",
+        "no-var": "warn",
+        "no-empty": "off",
+        "no-empty-pattern": "off",
+        "no-cond-assign": "off",
+        "no-case-declarations": "off",
+        "for-direction": "off",
+        "no-prototype-builtins": "off",
+        "no-useless-escape": "off",
+        "no-self-assign": "off",
+        "no-async-promise-executor": "off",
+        "prefer-rest-params": "off",
+        "no-control-regex": "off",
+        "no-fallthrough": "off",
+        "prefer-spread": "off",
+        "prefer-const": "warn",
+        "no-unused-expressions": "off",
+        "typescript/array-type": [
+          "warn",
+          {
+            "default": "array",
+            "readonly": "generic"
+          }
+        ],
+        "typescript/consistent-type-assertions": "warn",
+        "typescript/consistent-type-definitions": "warn",
+        "typescript/explicit-function-return-type": [
+          "warn",
+          {
+            "allowExpressions": true
+          }
+        ],
+        "typescript/explicit-member-accessibility": [
+          "warn",
+          {
+            "accessibility": "explicit",
+            "overrides": {
+              "constructors": "off"
+            }
+          }
+        ],
+        "typescript/no-confusing-void-expression": [
+          "warn",
+          {
+            "ignoreArrowShorthand": true
+          }
+        ],
+        "typescript/no-useless-constructor": "warn",
+        "typescript/prefer-nullish-coalescing": [
+          "warn",
+          {
+            "ignorePrimitives": true
+          }
+        ],
+        "typescript/prefer-namespace-keyword": "warn",
+        "typescript/no-unused-vars": [
+          "warn",
+          {
+            "vars": "all",
+            "args": "none"
+          }
+        ],
+        "typescript/no-require-imports": "off",
+        "typescript/no-explicit-any": "off",
+        "typescript/no-wrapper-object-types": "off",
+        "typescript/no-empty-object-type": "off",
+        "typescript/no-unsafe-function-type": "off",
+        "typescript/no-this-alias": "off",
+        "typescript/no-namespace": "off",
+        "typescript/no-duplicate-enum-values": "off"
+      }
+    },
+    {
+      "files": [
+        "**/*.api.ts",
+        "**/*.test.ts"
+      ],
+      "rules": {
+        "eslint-js/object-curly-spacing": "off",
+        "@stylistic/max-len": "off",
+        "typescript/no-unused-vars": "off",
+        "typescript/explicit-function-return-type": "off",
+        "typescript/explicit-member-accessibility": "off"
+      }
+    },
+    {
+      "files": [
+        "demo/**/*.ts",
+        "**/*.benchmark.ts"
+      ],
+      "rules": {
+        "typescript/prefer-nullish-coalescing": "off"
+      }
+    }
+  ]
+}

.oxlintrc.typings.json

@@ -0,0 +1,120 @@
+{
+  "$schema": "./node_modules/oxlint/configuration_schema.json",
+  "options": {
+    "maxWarnings": 0
+  },
+  "env": {
+    "builtin": true
+  },
+  "overrides": [
+    {
+      "files": [
+        "typings/**/*.d.ts"
+      ],
+      "plugins": [
+        "typescript"
+      ],
+      "jsPlugins": [
+        "@stylistic/eslint-plugin",
+        {
+          "name": "jsdoc-js",
+          "specifier": "eslint-plugin-jsdoc"
+        },
+        "oxlint-plugin-eslint"
+      ],
+      "rules": {
+        "@stylistic/indent": [
+          "warn",
+          2
+        ],
+        "@stylistic/semi": [
+          "warn",
+          "always"
+        ],
+        "@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/keyword-spacing": "warn",
+        "@stylistic/max-len": [
+          "warn",
+          {
+            "code": 1000,
+            "comments": 80,
+            "ignoreUrls": true,
+            "ignorePattern": "^ *(?<ps_description>\\* Ps=)"
+          }
+        ],
+        "@stylistic/no-extra-semi": "error",
+        "@stylistic/no-trailing-spaces": "warn",
+        "eslint-js/object-curly-spacing": [
+          "warn",
+          "always"
+        ],
+        "@stylistic/spaced-comment": [
+          "warn",
+          "always",
+          {
+            "markers": [
+              "/"
+            ],
+            "exceptions": [
+              "-"
+            ]
+          }
+        ],
+        "@stylistic/comma-dangle": [
+          "warn",
+          {
+            "objects": "never",
+            "arrays": "never",
+            "functions": "never"
+          }
+        ],
+        "@stylistic/eol-last": "warn",
+        "curly": [
+          "warn",
+          "multi-line"
+        ],
+        "eqeqeq": [
+          "warn",
+          "always"
+        ],
+        "jsdoc-js/check-alignment": "warn",
+        "jsdoc-js/check-param-names": "warn",
+        "no-irregular-whitespace": "warn",
+        "typescript/array-type": [
+          "warn",
+          {
+            "default": "array",
+            "readonly": "generic"
+          }
+        ],
+        "typescript/explicit-function-return-type": [
+          "warn",
+          {
+            "allowExpressions": true
+          }
+        ],
+        "typescript/prefer-namespace-keyword": "warn"
+      }
+    }
+  ]
+}

.vscode/launch.json

@@ -15,9 +15,6 @@
         "--recursive",
         "${workspaceRoot}/out/**/*.test.js"
       ],
-      "env": {
-        "NODE_PATH": "${workspaceRoot}/out"
-      },
       "sourceMaps": true,
       "outFiles": [ "${workspaceRoot}/out/**/*.js" ],
       "internalConsoleOptions": "openOnSessionStart"

AGENTS.md

@@ -2,13 +2,10 @@
 
 ## Architecture Overview
 
-**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/*`).
+**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)
 
 **Key Classes**:
 - `Terminal` (browser/headless): Public API wrapper
@@ -29,6 +26,7 @@ npm run build && npm run esbuild # Build all TypeScript and bundle
 - Integration tests: `npm run test-integration` (Playwright across Chrome/Firefox/WebKit)
 - Integration tests by file: `npm run test-integration -- test/playwright/InputHandler.test.ts`. Never use grep to filter tests, it doesn't work
 - Integration tests by addon: `npm run test-integration -- --suite=addon-search`. Suites always follow the format `addon-<something>`
+- Lint: `npm run lint` (oxlint with type-aware rules, then ESLint for `naming-convention` only), `npm run lint-api` for `typings/`, `npm run lint-fix` for oxlint auto-fix
 - Lint changes: `npm run lint-changes` to lint only changed files, `npm run lint-changes-fix` to fix them
 
 ## Addon Development Pattern

addons/addon-attach/test/tsconfig.json

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

addons/addon-clipboard/src/tsconfig.json

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

addons/addon-clipboard/test/tsconfig.json

@@ -11,11 +11,10 @@
     "removeComments": true,
     "paths": {
       "common/*": [
-        "../../../src/primitives/*",
-        "../../../src/runtime/*",
+        "../../../src/common/*"
       ],
-      "target-browser/*": [
-        "../../../src/target-browser/*"
+      "browser/*": [
+        "../../../src/browser/*"
       ],
       "*": [
         "./*"
@@ -32,10 +31,10 @@
   ],
   "references": [
     {
-      "path": "../../../src"
+      "path": "../../../src/common"
     },
     {
-      "path": "../../../src/target-browser"
+      "path": "../../../src/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 'target-browser/shared/Constants';
+import { ViewportConstants } from 'browser/shared/Constants';
 
 interface ITerminalDimensions {
   /**

addons/addon-fit/src/tsconfig.json

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

addons/addon-fit/test/tsconfig.json

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

addons/addon-image/src/IIPImageStorage.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { IAddImageOpts } from 'Types';
+import { IAddImageOpts } from './Types';
 import { ImageStorage } from './ImageStorage';
 
 /**

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 'target-browser/Types';
-import type { IRenderDimensions } from 'target-browser/renderer/shared/Types';
-import type { ICoreBrowserService, IRenderService, IThemeService } from 'target-browser/services/Services';
+import type { ITerminal, ReadonlyColorSet } from 'browser/Types';
+import type { IRenderDimensions } from 'browser/renderer/shared/Types';
+import type { ICoreBrowserService, IRenderService, IThemeService } from 'browser/services/Services';
 
 export const enum Cell {
   CONTENT = 0,  // codepoint and wcwidth information (enum Content)

addons/addon-image/src/tsconfig.json

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

addons/addon-image/test/tsconfig.json

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

addons/addon-image/webpack.config.js

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

addons/addon-progress/src/tsconfig.json

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

addons/addon-progress/test/tsconfig.json

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

addons/addon-progress/webpack.config.js

@@ -25,11 +25,8 @@ module.exports = {
     modules: ['./node_modules'],
     extensions: [ '.js' ],
     alias: {
-      common: [
-      path.resolve('../../out/runtime'),
-      path.resolve('../../out/primitives'),
-    ],
-      browser: path.resolve('../../out/target-browser'),
+      common: path.resolve('../../out/common'),
+      browser: path.resolve('../../out/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 'target-browser/public/Terminal';
+import { Terminal } from 'browser/public/Terminal';
 import type { ISearchOptions } from '@xterm/addon-search';
 import { DisposableStore } from 'common/Lifecycle';
 

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

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

addons/addon-search/src/tsconfig.json

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

addons/addon-search/test/tsconfig.json

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

addons/addon-search/webpack.config.js

@@ -25,10 +25,7 @@ module.exports = {
     modules: ['./node_modules'],
     extensions: [ '.js' ],
     alias: {
-      common: [
-      path.resolve('../../out/runtime'),
-      path.resolve('../../out/primitives'),
-    ],
+      common: path.resolve('../../out/common'),
       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 'target-browser/public/Terminal';
+import { Terminal } from 'browser/public/Terminal';
 import { SerializeAddon } from 'SerializeAddon';
 
 class TestTerminal extends Terminal {

addons/addon-serialize/benchmark/tsconfig.json

@@ -12,11 +12,8 @@
     "target": "es2021",
     "module": "nodenext",
     "paths": {
-      "common/*": [
-        "../../../src/primitives/*",
-        "../../../src/runtime/*",
-      ],
-      "target-browser/*": ["../../../src/target-browser/*"],
+      "common/*": ["../../../src/common/*"],
+      "browser/*": ["../../../src/browser/*"],
       "SerializeAddon": ["../src/SerializeAddon"],
       "@xterm/addon-serialize": [
         "../typings/addon-serialize.d.ts"
@@ -26,7 +23,7 @@
   "include": ["../**/*", "../../../typings/xterm.d.ts"],
   "exclude": ["../../../**/*test.ts", "../../**/*api.ts"],
   "references": [
-    { "path": "../../../src" },
-    { "path": "../../../src/target-browser" }
+    { "path": "../../../src/common" },
+    { "path": "../../../src/browser" }
   ]
 }

addons/addon-serialize/package.json

@@ -21,8 +21,8 @@
     "package": "../../node_modules/.bin/webpack",
     "prepublishOnly": "npm run package",
     "start": "node ../../demo/start",
-    "benchmark": "NODE_PATH=../../out:./out:./out-benchmark/ ../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json",
-    "benchmark-baseline": "NODE_PATH=../../out:./out:./out-benchmark/ ../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json --baseline out-benchmark/benchmark/*benchmark.js",
-    "benchmark-eval": "NODE_PATH=../../out:./out:./out-benchmark/ ../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json --eval out-benchmark/benchmark/*benchmark.js"
+    "benchmark": "../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json",
+    "benchmark-baseline": "../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json --baseline out-benchmark/benchmark/*benchmark.js",
+    "benchmark-eval": "../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json --eval out-benchmark/benchmark/*benchmark.js"
   }
 }

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 'target-browser/public/Terminal';
-import { SelectionModel } from 'target-browser/selection/SelectionModel';
+import { Terminal } from 'browser/public/Terminal';
+import { SelectionModel } from 'browser/selection/SelectionModel';
 import { IBufferService } from 'common/services/Services';
-import { ThemeService } from 'target-browser/services/ThemeService';
+import { ThemeService } from '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 'target-browser/Types';
+import { DEFAULT_ANSI_COLORS } from 'browser/Types';
 import { UnderlineStyle } from 'common/buffer/Constants';
 
 function constrain(value: number, low: number, high: number): number {

addons/addon-serialize/src/tsconfig.json

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

addons/addon-serialize/test/tsconfig.json

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

addons/addon-serialize/webpack.config.js

@@ -25,11 +25,8 @@ module.exports = {
     modules: ['./node_modules'],
     extensions: [ '.js' ],
     alias: {
-      common: [
-      path.resolve('../../out/runtime'),
-      path.resolve('../../out/primitives'),
-    ],
-      browser: path.resolve('../../out/target-browser')
+      common: path.resolve('../../out/common'),
+      browser: path.resolve('../../out/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 'target-browser/CoreBrowserTerminal';
+import { CoreBrowserTerminal } from 'browser/CoreBrowserTerminal';
 import { UnicodeGraphemeProvider } from 'UnicodeGraphemeProvider';
 
 

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

@@ -9,11 +9,8 @@
     "target": "es2015",
     "module": "nodenext",
     "paths": {
-      "common/*": [
-        "../../../src/primitives/*",
-        "../../../src/runtime/*",
-      ],
-      "target-browser/*": ["../../../src/target-browser/*"],
+      "common/*": ["../../../src/common/*"],
+      "browser/*": ["../../../src/browser/*"],
       "UnicodeGraphemeProvider": ["../src/UnicodeGraphemeProvider"],
       "@xterm/addon-unicode-graphemes": [
         "../typings/addon-unicode-graphemes.d.ts"
@@ -23,7 +20,7 @@
   "include": ["../**/*", "../../../typings/xterm.d.ts"],
   "exclude": ["../../../**/*test.ts", "../../**/*api.ts"],
   "references": [
-    { "path": "../../../src" },
-    { "path": "../../../src/target-browser" }
+    { "path": "../../../src/common" },
+    { "path": "../../../src/browser" }
   ]
 }

addons/addon-unicode-graphemes/package.json

@@ -21,8 +21,8 @@
     "package": "../../node_modules/.bin/webpack",
     "prepublishOnly": "npm run package",
     "start": "node ../../demo/start",
-    "benchmark": "NODE_PATH=../../out:./out:./out-benchmark/ ../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json out-benchmark/benchmark/*benchmark.js",
-    "benchmark-baseline": "NODE_PATH=../../out:./out:./out-benchmark/ ../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json --baseline out-benchmark/benchmark/*benchmark.js",
-    "benchmark-eval": "NODE_PATH=../../out:./out:./out-benchmark/ ../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json --eval out-benchmark/benchmark/*benchmark.js"
+    "benchmark": "../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json out-benchmark/benchmark/*benchmark.js",
+    "benchmark-baseline": "../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json --baseline out-benchmark/benchmark/*benchmark.js",
+    "benchmark-eval": "../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json --eval out-benchmark/benchmark/*benchmark.js"
   }
 }

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

@@ -4,8 +4,8 @@
  */
 
 import { IUnicodeVersionProvider } from '@xterm/xterm';
-import { createPropertyValue, extractCharKind, extractWidth } from 'common/input/UnicodeProperties';
-import { UnicodeCharProperties, UnicodeCharWidth } from 'common/input/UnicodeTypes';
+import { UnicodeCharProperties, UnicodeCharWidth } from 'common/services/Services';
+import { UnicodeService } from 'common/services/UnicodeService';
 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
-    = createPropertyValue(UC.GRAPHEME_BREAK_Other, 1, false);
+    = UnicodeService.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 = extractWidth(preceding);
+      const oldWidth = UnicodeService.extractWidth(preceding);
       if (this.handleGraphemes) {
-        charInfo = UC.shouldJoin(extractCharKind(preceding), charInfo);
+        charInfo = UC.shouldJoin(UnicodeService.extractCharKind(preceding), charInfo);
       } else {
         charInfo = w === 0 ? 1 : 0;
       }
@@ -54,7 +54,7 @@ export class UnicodeGraphemeProvider implements IUnicodeVersionProvider {
         }
       }
     }
-    return createPropertyValue(charInfo, w, shouldJoin);
+    return UnicodeService.createPropertyValue(charInfo, w, shouldJoin);
   }
 
   public wcwidth(codepoint: number): UnicodeCharWidth {

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

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

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

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

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

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

addons/addon-unicode11/src/UnicodeV11.ts

@@ -4,8 +4,8 @@
  */
 
 import { IUnicodeVersionProvider } from '@xterm/xterm';
-import { createPropertyValue, extractWidth } from 'common/input/UnicodeProperties';
-import { UnicodeCharProperties, UnicodeCharWidth } from 'common/input/UnicodeTypes';
+import { UnicodeCharProperties, UnicodeCharWidth } from 'common/services/Services';
+import { UnicodeService } from 'common/services/UnicodeService';
 
 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 = extractWidth(preceding);
+      const oldWidth = UnicodeService.extractWidth(preceding);
       if (oldWidth === 0) {
         shouldJoin = false;
       } else if (oldWidth > width) {
         width = oldWidth;
       }
     }
-    return createPropertyValue(0, width, shouldJoin);
+    return UnicodeService.createPropertyValue(0, width, shouldJoin);
   }
 }

addons/addon-unicode11/src/tsconfig.json

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

addons/addon-unicode11/test/tsconfig.json

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

addons/addon-unicode11/webpack.config.js

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

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

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

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

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

addons/addon-webgl/src/CellColorResolver.ts

@@ -1,12 +1,12 @@
-import { ISelectionRenderModel } from 'target-browser/renderer/shared/Types';
-import { ICoreBrowserService, IThemeService } from 'target-browser/services/Services';
-import { ReadonlyColorSet } from 'target-browser/Types';
+import { ISelectionRenderModel } from 'browser/renderer/shared/Types';
+import { ICoreBrowserService, IThemeService } from 'browser/services/Services';
+import { ReadonlyColorSet } from 'browser/Types';
 import { Attributes, BgFlags, ExtFlags, FgFlags, NULL_CELL_CODE, UnderlineStyle } from 'common/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 'target-browser/renderer/shared/RendererUtils';
+import { treatGlyphAsBackgroundColor } from '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 'target-browser/Types';
+import { ITerminal, ReadonlyColorSet } from 'browser/Types';
 import { ICharAtlasConfig, ITextureAtlas } from './Types';
 import { generateConfig, configEquals } from './CharAtlasUtils';
 import type { ILogService } from 'common/services/Services';

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 'target-browser/Types';
+import { IColorSet, ReadonlyColorSet } from '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 {

addons/addon-webgl/src/CursorBlinkStateManager.ts

@@ -3,8 +3,8 @@
  * @license MIT
  */
 
-import { RendererConstants } from 'target-browser/renderer/shared/Constants';
-import { ICoreBrowserService } from 'target-browser/services/Services';
+import { RendererConstants } from 'browser/renderer/shared/Constants';
+import { ICoreBrowserService } from '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 'target-browser/renderer/shared/Types';
+import { IRenderDimensions } from '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 { ILogService, IOptionsService } from 'common/services/Services';
-import { allowRescaling, throwIfFalsy } from 'target-browser/renderer/shared/RendererUtils';
+import { allowRescaling, throwIfFalsy } from 'browser/renderer/shared/RendererUtils';
 
 interface IVertices {
   attributes: Float32Array;

addons/addon-webgl/src/RectangleRenderer.ts

@@ -3,9 +3,9 @@
  * @license MIT
  */
 
-import { IRenderDimensions } from 'target-browser/renderer/shared/Types';
-import { IThemeService } from 'target-browser/services/Services';
-import { ReadonlyColorSet } from 'target-browser/Types';
+import { IRenderDimensions } from 'browser/renderer/shared/Types';
+import { IThemeService } from 'browser/services/Services';
+import { ReadonlyColorSet } from 'browser/Types';
 import { Attributes, FgFlags } from 'common/buffer/Constants';
 import { Disposable, toDisposable } from 'common/Lifecycle';
 import { IColor } from 'common/Types';
@@ -13,7 +13,7 @@ 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 'target-browser/renderer/shared/RendererUtils';
+import { throwIfFalsy } from 'browser/renderer/shared/RendererUtils';
 import type { ILogService } from 'common/services/Services';
 
 const enum VertexAttribLocations {

addons/addon-webgl/src/RenderModel.ts

@@ -4,8 +4,8 @@
  */
 
 import { ICursorRenderModel, IRenderModel } from './Types';
-import { ISelectionRenderModel } from 'target-browser/renderer/shared/Types';
-import { createSelectionRenderModel } from 'target-browser/renderer/shared/SelectionRenderModel';
+import { ISelectionRenderModel } from 'browser/renderer/shared/Types';
+import { createSelectionRenderModel } from '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 'target-browser/Types';
+import { IColorContrastCache } from 'browser/Types';
 import { DIM_OPACITY, TEXT_BASELINE } from './Constants';
 import { tryDrawCustomGlyph } from './customGlyphs/CustomGlyphRasterizer';
-import { computeNextVariantOffset, treatGlyphAsBackgroundColor, isPowerlineGlyph, isRestrictedPowerlineGlyph, throwIfFalsy } from 'target-browser/renderer/shared/RendererUtils';
+import { computeNextVariantOffset, treatGlyphAsBackgroundColor, isPowerlineGlyph, isRestrictedPowerlineGlyph, throwIfFalsy } from 'browser/renderer/shared/RendererUtils';
 import { IBoundingBox, ICharAtlasConfig, IRasterizedGlyph, ITextureAtlas } from './Types';
 import { NULL_COLOR, channels, color, rgba } from 'common/Color';
 import { FourKeyMap } from 'common/MultiKeyMap';

addons/addon-webgl/src/Types.ts

@@ -4,8 +4,8 @@
  */
 
 import { FontWeight } from '@xterm/xterm';
-import { IColorSet } from 'target-browser/Types';
-import { ISelectionRenderModel } from 'target-browser/renderer/shared/Types';
+import { IColorSet } from 'browser/Types';
+import { ISelectionRenderModel } from 'browser/renderer/shared/Types';
 import { CursorInactiveStyle, CursorStyle, type IDisposable } from 'common/Types';
 import type { IEvent } from 'common/Event';
 

addons/addon-webgl/src/WebglAddon.ts

@@ -5,8 +5,8 @@
 
 import type { ITerminalAddon, Terminal } from '@xterm/xterm';
 import type { IWebglAddonOptions, WebglAddon as IWebglApi } from '@xterm/addon-webgl';
-import { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IRenderService, IThemeService } from 'target-browser/services/Services';
-import { ITerminal } from 'target-browser/Types';
+import { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IRenderService, IThemeService } from 'browser/services/Services';
+import { ITerminal } from 'browser/Types';
 import { Disposable, toDisposable } from 'common/Lifecycle';
 import { getSafariVersion, isSafari } from 'common/Platform';
 import { ICoreService, IDecorationService, ILogService, IOptionsService } from 'common/services/Services';

addons/addon-webgl/src/WebglRenderer.ts

@@ -3,18 +3,18 @@
  * @license MIT
  */
 
-import { ITerminal } from 'target-browser/Types';
+import { ITerminal } from 'browser/Types';
 import { CellColorResolver } from './CellColorResolver';
 import { acquireTextureAtlas, removeTerminalFromCache } from './CharAtlasCache';
 import { CursorBlinkStateManager } from './CursorBlinkStateManager';
 import { observeDevicePixelDimensions } from './DevicePixelObserver';
-import { IRenderDimensions, IRenderer, IRequestRedrawEvent } from 'target-browser/renderer/shared/Types';
-import { ICharSizeService, ICharacterJoinerService, ICoreBrowserService, IThemeService } from 'target-browser/services/Services';
+import { IRenderDimensions, IRenderer, IRequestRedrawEvent } from 'browser/renderer/shared/Types';
+import { ICharSizeService, ICharacterJoinerService, ICoreBrowserService, IThemeService } from '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 'target-browser/renderer/shared/TextBlinkStateManager';
+import { TextBlinkStateManager } from 'browser/renderer/shared/TextBlinkStateManager';
 import { ICoreService, IDecorationService, ILogService, IOptionsService } from 'common/services/Services';
 import { Terminal } from '@xterm/xterm';
 import { GlyphRenderer } from './GlyphRenderer';
@@ -24,9 +24,9 @@ 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 'target-browser/Dom';
+import { addDisposableListener } from 'browser/Dom';
 import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle';
-import { createRenderDimensions } from 'target-browser/renderer/shared/RendererUtils';
+import { createRenderDimensions } from 'browser/renderer/shared/RendererUtils';
 
 const enum Constants {
   MERGE_RETRY_LIMIT = 32

addons/addon-webgl/src/WebglUtils.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { throwIfFalsy } from 'target-browser/renderer/shared/RendererUtils';
+import { throwIfFalsy } from 'browser/renderer/shared/RendererUtils';
 import type { ILogService } from 'common/services/Services';
 
 /**

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

@@ -5,7 +5,7 @@
 
 import { CustomGlyphDefinitionType, CustomGlyphScaleType, CustomGlyphVectorType, type CustomGlyphCharacterDefinition, type CustomGlyphDefinitionPart, type CustomGlyphPathDrawFunctionDefinition } from './Types';
 
-/* eslint-disable max-len */
+/* oxlint-disable @stylistic/max-len -- generated glyph path data */
 
 const enum Shapes {
   /** │ */ TOP_TO_BOTTOM = 'M.5,0 L.5,1',

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

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { throwIfFalsy } from 'target-browser/renderer/shared/RendererUtils';
+import { throwIfFalsy } from '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';

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

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

addons/addon-webgl/src/tsconfig.json

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

addons/addon-webgl/test/tsconfig.json

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

addons/addon-webgl/webpack.config.js

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

bin/build_parser_wasm.sh

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

bin/embed_parser_wasm.mjs

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

bin/esbuild.mjs

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

bin/gen_parser_transition_table.mjs

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

bin/lint_changes.js

@@ -33,17 +33,47 @@ if (files.length === 0) {
 
 console.log(`Linting ${files.length} changed file(s)...`);
 
-const eslintArgs = ['--max-warnings', '0', '--no-warn-ignored'];
-if (fix) {
-  eslintArgs.push('--fix');
+const cwd = path.join(__dirname, '..');
+const isWin = process.platform === 'win32';
+
+/**
+ * @param {string} command
+ * @param {string[]} args
+ * @returns {Promise<void>}
+ */
+function run(command, args) {
+  return new Promise(/** @type {(resolve: () => void, reject: (reason: Error) => void) => void} */ ((resolve, reject) => {
+    const child = spawn(command, args, {
+      stdio: 'inherit',
+      cwd,
+      shell: isWin
+    });
+    child.on('close', code => {
+      if (code === 0) {
+        resolve();
+      } else {
+        reject(new Error(`${command} exited with code ${code}`));
+      }
+    });
+  }));
 }
-eslintArgs.push(...files);
 
-const eslint = process.platform === 'win32' ? 'eslint.cmd' : 'eslint';
-const child = spawn(eslint, eslintArgs, {
-  stdio: 'inherit',
-  cwd: path.join(__dirname, '..'),
-  shell: process.platform === 'win32'
+async function main() {
+  const oxlintArgs = ['--type-aware', '--max-warnings', '0'];
+  if (fix) {
+    oxlintArgs.push('--fix');
+  }
+  oxlintArgs.push(...files);
+
+  const oxlint = isWin ? 'oxlint.cmd' : 'oxlint';
+  await run(oxlint, oxlintArgs);
+
+  const eslintArgs = ['--config', 'eslint.config.naming.mjs', '--max-warnings', '0', ...files];
+  const eslint = isWin ? 'eslint.cmd' : 'eslint';
+  await run(eslint, eslintArgs);
+}
+
+main().catch(err => {
+  console.error(err.message);
+  process.exit(1);
 });
-
-child.on('close', code => process.exit(code ?? 0));

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/primitives/Version.ts');
+    const versionTsPath = path.join(packageDir, 'src/common/Version.ts');
     const versionTsContent = fs.readFileSync(versionTsPath, 'utf8');
     const updatedVersionTs = versionTsContent.replace(
       /export const XTERM_VERSION = '[^']+';/,

bin/test_unit.js

@@ -8,7 +8,7 @@ const path = require('path');
 
 const COVERAGE_LINES_THRESHOLD = 40;
 
-// Add `out` to the NODE_PATH so absolute paths can be resolved.
+// Add `out-esbuild` to NODE_PATH so addon path-mapped imports (common/*, browser/*) resolve.
 const env = { ...process.env };
 env.NODE_PATH = path.resolve(__dirname, '../out-esbuild');
 

bin/vs_base_find_unused.js

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

demo/client/components/window/gpuWindow.ts

@@ -43,7 +43,7 @@ export class GpuWindow extends BaseWindow implements IControlWindow {
   }
 
   private _styleAtlasPage(canvas: HTMLCanvasElement): void {
-    // eslint-disable-next-line no-restricted-syntax
+    // oxlint-disable-next-line eslint-js/no-restricted-syntax
     const dpr = window.devicePixelRatio;
     canvas.style.width = `${canvas.width / dpr}px`;
     canvas.style.height = `${canvas.height / dpr}px`;

demo/client/components/window/webglWindow.ts

@@ -43,7 +43,7 @@ export class WebglWindow extends BaseWindow implements IControlWindow {
   }
 
   private _styleAtlasPage(canvas: HTMLCanvasElement): void {
-    // eslint-disable-next-line no-restricted-syntax
+    // oxlint-disable-next-line eslint-js/no-restricted-syntax
     const dpr = window.devicePixelRatio;
     canvas.style.width = `${canvas.width / dpr}px`;
     canvas.style.height = `${canvas.height / dpr}px`;

demo/client/tsconfig.json

@@ -2,26 +2,54 @@
   "compilerOptions": {
     "module": "commonjs",
     "target": "es2021",
-    "types": ["node"],
+    "types": [
+      "node"
+    ],
     "outDir": "../out-demo/client",
     "rootDir": ".",
     "sourceMap": true,
     "strict": true,
     "skipLibCheck": true,
     "paths": {
-      "@xterm/addon-attach": ["../../addons/addon-attach"],
-      "@xterm/addon-clipboard": ["../../addons/addon-clipboard"],
-      "@xterm/addon-fit": ["../../addons/addon-fit"],
-      "@xterm/addon-image": ["../../addons/addon-image"],
-      "@xterm/addon-progress": ["../../addons/addon-progress"],
-      "@xterm/addon-search": ["../../addons/addon-search"],
-      "@xterm/addon-serialize": ["../../addons/addon-serialize"],
-      "@xterm/addon-web-fonts": ["../../addons/addon-web-fonts"],
-      "@xterm/addon-web-links": ["../../addons/addon-web-links"],
-      "@xterm/addon-webgl": ["../../addons/addon-webgl"],
-      "@xterm/addon-unicode11": ["../../addons/addon-unicode11"],
-      "@xterm/addon-unicode-graphemes": ["../../addons/addon-unicode-graphemes"],
-      "@xterm/addon-ligatures": ["../../addons/addon-ligatures"],
+      "@xterm/addon-attach": [
+        "../../addons/addon-attach"
+      ],
+      "@xterm/addon-clipboard": [
+        "../../addons/addon-clipboard"
+      ],
+      "@xterm/addon-fit": [
+        "../../addons/addon-fit"
+      ],
+      "@xterm/addon-image": [
+        "../../addons/addon-image"
+      ],
+      "@xterm/addon-progress": [
+        "../../addons/addon-progress"
+      ],
+      "@xterm/addon-search": [
+        "../../addons/addon-search"
+      ],
+      "@xterm/addon-serialize": [
+        "../../addons/addon-serialize"
+      ],
+      "@xterm/addon-web-fonts": [
+        "../../addons/addon-web-fonts"
+      ],
+      "@xterm/addon-web-links": [
+        "../../addons/addon-web-links"
+      ],
+      "@xterm/addon-webgl": [
+        "../../addons/addon-webgl"
+      ],
+      "@xterm/addon-unicode11": [
+        "../../addons/addon-unicode11"
+      ],
+      "@xterm/addon-unicode-graphemes": [
+        "../../addons/addon-unicode-graphemes"
+      ],
+      "@xterm/addon-ligatures": [
+        "../../addons/addon-ligatures"
+      ],
       "*": ["./*"]
     }
   },

eslint.config.naming.mjs

@@ -0,0 +1,71 @@
+// @ts-check
+import tseslint from 'typescript-eslint';
+
+const ignores = [
+  'addons/*/src/third-party/*.ts',
+  '**/out/*',
+  '**/out-test/*',
+  '**/out-esbuild/*',
+  '**/out-esbuild-test/*',
+  '**/inwasm-sdks/*',
+  '**/node_modules',
+  '**/*.js',
+  '**/*.mjs'
+];
+
+const namingConventionMain = [
+  'warn',
+  { selector: 'default', format: ['camelCase'], filter: { regex: '^[a-z]', match: true } },
+  { selector: 'variable', format: ['camelCase', 'UPPER_CASE'] },
+  { selector: 'variable', filter: '^I.+Service$', format: ['PascalCase'], prefix: ['I'] },
+  { selector: 'memberLike', modifiers: ['private'], format: ['camelCase'], leadingUnderscore: 'require' },
+  { selector: 'memberLike', modifiers: ['protected'], format: ['camelCase'], leadingUnderscore: 'require' },
+  { selector: 'enumMember', format: ['UPPER_CASE'] },
+  { selector: 'property', modifiers: ['public'], format: ['camelCase', 'UPPER_CASE'], filter: { regex: '^[a-z]', match: true } },
+  { selector: 'method', modifiers: ['public'], format: ['camelCase', 'UPPER_CASE'], custom: { regex: '^on[A-Z].+', match: false } },
+  { selector: 'method', modifiers: ['private'], format: ['camelCase'], leadingUnderscore: 'require', custom: { regex: '^on[A-Z].+', match: false } },
+  { selector: 'method', modifiers: ['protected'], format: ['camelCase'], leadingUnderscore: 'require', custom: { regex: '^on[A-Z].+', match: false } },
+  { selector: 'typeLike', format: ['PascalCase'] },
+  { selector: 'interface', format: ['PascalCase'], prefix: ['I'] }
+];
+
+const namingConventionTypings = [
+  'warn',
+  { selector: 'typeLike', format: ['PascalCase'] },
+  { selector: 'interface', format: ['PascalCase'], prefix: ['I'] }
+];
+
+export default tseslint.config(
+  {
+    ignores
+  },
+  {
+    files: ['**/*.ts'],
+    ignores: ['typings/**/*.d.ts', 'addons/**/typings/**'],
+    plugins: {
+      '@typescript-eslint': tseslint.plugin
+    },
+    languageOptions: {
+      parser: tseslint.parser,
+      parserOptions: {
+        projectService: true,
+        tsconfigRootDir: import.meta.dirname
+      }
+    },
+    rules: {
+      '@typescript-eslint/naming-convention': namingConventionMain
+    }
+  },
+  {
+    files: ['typings/**/*.d.ts'],
+    plugins: {
+      '@typescript-eslint': tseslint.plugin
+    },
+    languageOptions: {
+      parser: tseslint.parser
+    },
+    rules: {
+      '@typescript-eslint/naming-convention': namingConventionTypings
+    }
+  }
+);

package-lock.json

@@ -32,6 +32,7 @@
         "esbuild": "^0.28.0",
         "eslint": "^10.3.0",
         "eslint-plugin-jsdoc": "^62.9.0",
+        "eslint-plugin-oxlint": "^1.67.0",
         "express": "^5.2.1",
         "express-ws": "^5.0.2",
         "jsdom": "^29.1.1",
@@ -39,6 +40,9 @@
         "mustache": "^4.2.0",
         "node-pty": "^1.2.0-beta.9",
         "nyc": "^18.0.0",
+        "oxlint": "^1.67.0",
+        "oxlint-plugin-eslint": "^1.67.0",
+        "oxlint-tsgolint": "^0.23.0",
         "source-map-loader": "^5.0.0",
         "source-map-support": "^0.5.20",
         "ts-loader": "^9.5.7",
@@ -1508,6 +1512,413 @@
         "pako": "^2.0.4"
       }
     },
+    "node_modules/@oxlint-tsgolint/darwin-arm64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@oxlint-tsgolint/darwin-arm64/-/darwin-arm64-0.23.0.tgz",
+      "integrity": "sha512-gOs9PVr2wEg4ox9z0aJo+RKhhImW86YL5N6yav8BK/rgPsIrwN/igSZ+pbRr723NFvUNKde9fgMhRA6JrXAOZw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@oxlint-tsgolint/darwin-x64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@oxlint-tsgolint/darwin-x64/-/darwin-x64-0.23.0.tgz",
+      "integrity": "sha512-kjJ8B+7n4tB9VJdxS5A9GdJt6/bYpzbu4lXp2uO1S3sRmCB5gDEABlGoiePNApRWaW+xqL4b4xgiE727jSLhuA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@oxlint-tsgolint/linux-arm64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@oxlint-tsgolint/linux-arm64/-/linux-arm64-0.23.0.tgz",
+      "integrity": "sha512-6dCZuKNu135seMXilkRk9SpCx6i1XgmiipYGalLij5WVRX6ZYS8c4xI7preN/zv9fCXhsQclTIMDu2Y/cytTjw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@oxlint-tsgolint/linux-x64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@oxlint-tsgolint/linux-x64/-/linux-x64-0.23.0.tgz",
+      "integrity": "sha512-3bdilnyA7kmSTjK27rvjIjSxL5SIg3wt7vwNiRkouWB83ytssyKnuGvxSYJxgMEmFpSutzaBzcCUM2jDtPGcgA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@oxlint-tsgolint/win32-arm64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@oxlint-tsgolint/win32-arm64/-/win32-arm64-0.23.0.tgz",
+      "integrity": "sha512-j+OEp44SVYiQ+ZD+uttsX7u6L9SvmbbQ77SO1pSFCcJlsVMeCk8qZsjhKfGKuT/jIA+ipOJMVs/+pqUfObBWNw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@oxlint-tsgolint/win32-x64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@oxlint-tsgolint/win32-x64/-/win32-x64-0.23.0.tgz",
+      "integrity": "sha512-5MyjFuqf+g8OUPJBSGWHJtmoWnzFJYyOg4To9WMQshZYEWig/vtu7JtJ03VWnzHv9LJkAUeApY0gVCOywFR/iQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@oxlint/binding-android-arm-eabi": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-android-arm-eabi/-/binding-android-arm-eabi-1.67.0.tgz",
+      "integrity": "sha512-VrSi571rDv1N8HaEDM+DEX8nmT0y9jJo8tzzW13vsOWTx59xQczCIJx68n2zWOXRT5YKZsOZXp4qkHN/10x4mw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@oxlint/binding-android-arm64": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-android-arm64/-/binding-android-arm64-1.67.0.tgz",
+      "integrity": "sha512-l6+NdYxMoRohix5r5bbigW16LPicceCwGcQ6LKKuE1kUdjgFfQolJjrJsQYPFetIs78Gxj/G/f5TEGoTCwj9nQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@oxlint/binding-darwin-arm64": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-darwin-arm64/-/binding-darwin-arm64-1.67.0.tgz",
+      "integrity": "sha512-jOzXxS1AxFxhImLIRbtGIMrEwaXcgMw3gR57WB1cRk8ai+vpr6726kxXqVvlNsrXtJ/FrmOm8RxlC0m8SW24Qg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@oxlint/binding-darwin-x64": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-darwin-x64/-/binding-darwin-x64-1.67.0.tgz",
+      "integrity": "sha512-3DFAVY94OqjIZHXIPz37yGRSWwOFTAqChQ64/M69GYLawzP0KiwdhDNfqdKKYT0bTR/DNxmMnQsj3ns+8+X/Lg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@oxlint/binding-freebsd-x64": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-freebsd-x64/-/binding-freebsd-x64-1.67.0.tgz",
+      "integrity": "sha512-e4dDKZuLu8TR9DEBssWSDahlPgZBwojTTHZUvnjBRJfJJbpxYCjfjKfi0Z1+CSLMiJBwI2yCDtRM1XJQaARjmg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@oxlint/binding-linux-arm-gnueabihf": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.67.0.tgz",
+      "integrity": "sha512-BKytFdcQzbITV3xlnzDUDTEDtbUMCCiC4EaNTDZ4FyT8gdNvBC4gfiLucXp/sQl0XU3p7syTlorUWVVVBZab2g==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@oxlint/binding-linux-arm-musleabihf": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-1.67.0.tgz",
+      "integrity": "sha512-XYAv0esBDX7BpTzRDjVX2Vdj+zndd8ll2dFQiaeQ6zTZr7A8GRDTN7fH3FP3jU+O0vCDx85oH/EtG7BzPgAXuw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@oxlint/binding-linux-arm64-gnu": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.67.0.tgz",
+      "integrity": "sha512-zizRMjA0i6u/2B0evgda04iycu+MoNuf1pBy6Eh+1CjC5wMEG7qN5zdDKTCvFc0KSYSDM9QTG3gjZHirgtQuKg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@oxlint/binding-linux-arm64-musl": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.67.0.tgz",
+      "integrity": "sha512-zB/Tf6sUjmmvvbva9Gj3JTJ8rJ9t4I8/U0o6vSRtd0DRIsIuyegBwJAzhSUFQHdMijIRJkW0exs/yBhpw2S20w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@oxlint/binding-linux-ppc64-gnu": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.67.0.tgz",
+      "integrity": "sha512-kgU40Gt74CK0TCsF51KZymkIwN9U0BajKsMijB52zPqOeZU9NAHkA/NSQkZDHEaCakx42DxhXkODiAqf2b4Gug==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@oxlint/binding-linux-riscv64-gnu": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-1.67.0.tgz",
+      "integrity": "sha512-tOYhkk/iaG9aD3FvGpBFd1Lrw0x0RaVoJBxjUkfNzS50rC5NS5BteNCwgr8A2zCdADrIIoze6D7u6U5Ic++/iQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@oxlint/binding-linux-riscv64-musl": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-1.67.0.tgz",
+      "integrity": "sha512-sEtywrPb+0b+tHYl1SDCrw903fiC4eyKoNqzP3v+f2JT3Xcv4NEYG+P8rj+eEnX7IWhqV/xj8/JmcmVj21CXaA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@oxlint/binding-linux-s390x-gnu": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.67.0.tgz",
+      "integrity": "sha512-BvR8Moa0zCLxroOx4vZaZN9nUfwAUpSTwjZdxZyKy4bv3PrzrXrxKR/ZQ0L9wNSvlPhnMJeZfa3q5w6ZCTuN6Q==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@oxlint/binding-linux-x64-gnu": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.67.0.tgz",
+      "integrity": "sha512-mm2cxM6fksOpq6l0uFws8BUGKAR4dNa/cZCn37Npq7PFbhD5HDJqWfnoIvTaeRKMy5XdS2tO0MA0qbHDrnXAAA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@oxlint/binding-linux-x64-musl": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-x64-musl/-/binding-linux-x64-musl-1.67.0.tgz",
+      "integrity": "sha512-WmbMuLapKyDlobMkXAaAL0Y+Uczh4LETfIfQsUpbId4Ip8Ai82/jqeYTOoUCkuuhBFapgqP253+d83tLKOksJg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@oxlint/binding-openharmony-arm64": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-openharmony-arm64/-/binding-openharmony-arm64-1.67.0.tgz",
+      "integrity": "sha512-9g/PqxYJelzzTAOR5Y+RiRqdeydhEuXv2KxNeFcAKQ7UsvnWSY1OP4MsuPMbTO2Pf70tz7mFhl1j13H3fyh+8g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@oxlint/binding-win32-arm64-msvc": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.67.0.tgz",
+      "integrity": "sha512-2VhwE6Gatb0vJGnN0TBuQMbKCOiZlSQ/zJvVWYLK4a9d4iDiJOen/yVQkGpmsJ90MuH66fzi0kEKI0jRQMDxGA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@oxlint/binding-win32-ia32-msvc": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-1.67.0.tgz",
+      "integrity": "sha512-EQ3VExXfeM1InbE5+JjufhZZTWy+kHUwgt3yZR7gQ47Je/mE0WspQPan0OJznh493L5anM210YNJtH1PXjTSFg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@oxlint/binding-win32-x64-msvc": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.67.0.tgz",
+      "integrity": "sha512-bw24y+/1MHS4QDkons3YyHkPT9uCMoLHHgQhb+mb8NOjTYwub1CZ+K9Ngr8aO5DMrDrkqHwTzlTwFP2vS8Y/ZQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -3652,6 +4063,19 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/eslint-plugin-oxlint": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-oxlint/-/eslint-plugin-oxlint-1.67.0.tgz",
+      "integrity": "sha512-tS/RGy8x2+rIUp7gV8ICgEeSAgFH6Qg7phzCbUblW/dPUsqXkcedrzO0nOaKhce4fvUVDR9uTmWlLkCNSDKcsw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "jsonc-parser": "^3.3.1"
+      },
+      "peerDependencies": {
+        "oxlint": "~1.67.0"
+      }
+    },
     "node_modules/eslint-scope": {
       "version": "9.1.2",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-9.1.2.tgz",
@@ -5045,6 +5469,13 @@
         "node": ">=6"
       }
     },
+    "node_modules/jsonc-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/keyv": {
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -5797,6 +6228,86 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/oxlint": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/oxlint/-/oxlint-1.67.0.tgz",
+      "integrity": "sha512-blwwaHPdoH8piQ5/z0KHeoHFR7FZgl12WluKJfu4qFLPkZl6mK04PkLE45Fw1NxfBRSlh40Gu7MkxHUw++ociQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "oxlint": "bin/oxlint"
+      },
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/Boshen"
+      },
+      "optionalDependencies": {
+        "@oxlint/binding-android-arm-eabi": "1.67.0",
+        "@oxlint/binding-android-arm64": "1.67.0",
+        "@oxlint/binding-darwin-arm64": "1.67.0",
+        "@oxlint/binding-darwin-x64": "1.67.0",
+        "@oxlint/binding-freebsd-x64": "1.67.0",
+        "@oxlint/binding-linux-arm-gnueabihf": "1.67.0",
+        "@oxlint/binding-linux-arm-musleabihf": "1.67.0",
+        "@oxlint/binding-linux-arm64-gnu": "1.67.0",
+        "@oxlint/binding-linux-arm64-musl": "1.67.0",
+        "@oxlint/binding-linux-ppc64-gnu": "1.67.0",
+        "@oxlint/binding-linux-riscv64-gnu": "1.67.0",
+        "@oxlint/binding-linux-riscv64-musl": "1.67.0",
+        "@oxlint/binding-linux-s390x-gnu": "1.67.0",
+        "@oxlint/binding-linux-x64-gnu": "1.67.0",
+        "@oxlint/binding-linux-x64-musl": "1.67.0",
+        "@oxlint/binding-openharmony-arm64": "1.67.0",
+        "@oxlint/binding-win32-arm64-msvc": "1.67.0",
+        "@oxlint/binding-win32-ia32-msvc": "1.67.0",
+        "@oxlint/binding-win32-x64-msvc": "1.67.0"
+      },
+      "peerDependencies": {
+        "oxlint-tsgolint": ">=0.22.1",
+        "vite-plus": "*"
+      },
+      "peerDependenciesMeta": {
+        "oxlint-tsgolint": {
+          "optional": true
+        },
+        "vite-plus": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/oxlint-plugin-eslint": {
+      "version": "1.67.0",
+      "resolved": "https://registry.npmjs.org/oxlint-plugin-eslint/-/oxlint-plugin-eslint-1.67.0.tgz",
+      "integrity": "sha512-MfpO9t/l/1qWVKym4sTkz0bhErAkUn/cOOQsFegI5ngQkR1cZEp6G23FKIhGcALoYytPBRmu47yjiEa6XWFBRw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/Boshen"
+      }
+    },
+    "node_modules/oxlint-tsgolint": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/oxlint-tsgolint/-/oxlint-tsgolint-0.23.0.tgz",
+      "integrity": "sha512-3mBv3CoPbh8dFbzfDGIWa2ytZjn2v+3EX4aKRXjIhsoGFzG8GCjfRirz3rwZf1wYbZzsNLTSgpw8VjQuWdp/jA==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "tsgolint": "bin/tsgolint.js"
+      },
+      "optionalDependencies": {
+        "@oxlint-tsgolint/darwin-arm64": "0.23.0",
+        "@oxlint-tsgolint/darwin-x64": "0.23.0",
+        "@oxlint-tsgolint/linux-arm64": "0.23.0",
+        "@oxlint-tsgolint/linux-x64": "0.23.0",
+        "@oxlint-tsgolint/win32-arm64": "0.23.0",
+        "@oxlint-tsgolint/win32-x64": "0.23.0"
+      }
+    },
     "node_modules/p-limit": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",

package.json

@@ -34,6 +34,7 @@
     "start": "node demo/start",
     "dev": "concurrently -k -p [{name}] -n tsc,esbuild,esbuild-demo-client,esbuild-demo-server,server -c blue,yellow,cyan,green,magenta \"npm:tsc-watch\" \"npm:esbuild-watch\" \"npm:esbuild-demo-client-watch\" \"npm:esbuild-demo-server-watch\" \"npm:start\"",
     "build": "npm run tsc",
+    "build:parser-wasm": "bash bin/build_parser_wasm.sh",
     "watch": "npm run tsc-watch",
     "tsc": "tsgo -b ./tsconfig.all.json",
     "tsc-watch": "tsgo -b -w ./tsconfig.all.json --preserveWatchOutput",
@@ -48,11 +49,11 @@
     "esbuild-demo-server-watch": "node bin/esbuild.mjs --demo-server --watch",
     "test": "npm run test-unit",
     "posttest": "npm run lint",
-    "lint": "eslint --max-warnings 0 src/ addons/ demo/ test/",
+    "lint": "oxlint --type-aware --max-warnings 0 src addons demo test && eslint --config eslint.config.naming.mjs --max-warnings 0 src addons demo test",
     "lint-changes": "node ./bin/lint_changes.js",
     "lint-changes-fix": "node ./bin/lint_changes.js --fix",
-    "lint-fix": "eslint --fix src/ addons/ demo/ test/",
-    "lint-api": "eslint --config eslint.config.typings.mjs --max-warnings 0 typings/",
+    "lint-fix": "oxlint --type-aware --fix --max-warnings 0 src addons demo test",
+    "lint-api": "oxlint --max-warnings 0 -c .oxlintrc.typings.json typings && eslint --config eslint.config.naming.mjs --max-warnings 0 typings",
     "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",
@@ -61,9 +62,9 @@
     "test-integration-firefox": "node ./bin/test_integration.js --workers=75% \"--project=FirefoxStable\"",
     "test-integration-webkit": "node ./bin/test_integration.js --workers=75% \"--project=WebKit\"",
     "test-integration-debug": "node ./bin/test_integration.js  --workers=1 --headed --timeout=30000",
-    "benchmark": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json",
-    "benchmark-baseline": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json --baseline out-test/benchmark/*benchmark.js",
-    "benchmark-eval": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json --eval out-test/benchmark/*benchmark.js",
+    "benchmark": "xterm-benchmark -r 5 -c test/benchmark/benchmark.json",
+    "benchmark-baseline": "xterm-benchmark -r 5 -c test/benchmark/benchmark.json --baseline out-test/benchmark/*benchmark.js",
+    "benchmark-eval": "xterm-benchmark -r 5 -c test/benchmark/benchmark.json --eval out-test/benchmark/*benchmark.js",
     "clean": "rm -rf lib out addons/*/lib addons/*/out",
     "vtfeatures": "node bin/extract_vtfeatures.js src/*/*.ts src/*/*/*.ts src/*.ts addons/**/src/*.ts",
     "prepackage": "npm run build",
@@ -95,6 +96,7 @@
     "esbuild": "^0.28.0",
     "eslint": "^10.3.0",
     "eslint-plugin-jsdoc": "^62.9.0",
+    "eslint-plugin-oxlint": "^1.67.0",
     "express": "^5.2.1",
     "express-ws": "^5.0.2",
     "jsdom": "^29.1.1",
@@ -102,6 +104,9 @@
     "mustache": "^4.2.0",
     "node-pty": "^1.2.0-beta.9",
     "nyc": "^18.0.0",
+    "oxlint": "^1.67.0",
+    "oxlint-plugin-eslint": "^1.67.0",
+    "oxlint-tsgolint": "^0.23.0",
     "source-map-loader": "^5.0.0",
     "source-map-support": "^0.5.20",
     "ts-loader": "^9.5.7",

src/ARCHITECTURE.md

@@ -1,70 +0,0 @@
-# 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/AccessibilityManager.ts

@@ -3,14 +3,14 @@
  * @license MIT
  */
 
-import * as Strings from 'target-browser/LocalizableStrings';
-import { ITerminal, IRenderDebouncer } from 'target-browser/Types';
-import { TimeBasedDebouncer } from 'target-browser/TimeBasedDebouncer';
-import { Disposable, toDisposable } from 'common/Lifecycle';
-import { ICoreBrowserService, IRenderService } from 'target-browser/services/Services';
-import { IBuffer } from 'common/buffer/Types';
-import { IInstantiationService } from 'common/services/Services';
-import { addDisposableListener } from 'target-browser/Dom';
+import * as Strings from './LocalizableStrings';
+import { ITerminal, IRenderDebouncer } from './Types';
+import { TimeBasedDebouncer } from './TimeBasedDebouncer';
+import { Disposable, toDisposable } from '../common/Lifecycle';
+import { ICoreBrowserService, IRenderService } from './services/Services';
+import { IBuffer } from '../common/buffer/Types';
+import { IInstantiationService } from '../common/services/Services';
+import { addDisposableListener } from './Dom';
 
 const enum Constants {
   MAX_ROWS_TO_READ = 20

src/browser/Clipboard.test.ts

@@ -4,7 +4,7 @@
  */
 
 import { assert } from 'chai';
-import * as Clipboard from 'target-browser/Clipboard';
+import * as Clipboard from './Clipboard';
 
 describe('evaluatePastedTextProcessing', () => {
   it('should replace carriage return and/or line feed with carriage return', () => {

src/browser/Clipboard.ts

@@ -3,8 +3,8 @@
  * @license MIT
  */
 
-import { ISelectionService } from 'target-browser/services/Services';
-import { ICoreService, IOptionsService } from 'common/services/Services';
+import { ISelectionService } from './services/Services';
+import { ICoreService, IOptionsService } from '../common/services/Services';
 
 /**
  * Prepares text to be pasted into the terminal by normalizing the line endings

src/browser/ColorContrastCache.test.ts

@@ -4,7 +4,7 @@
  */
 
 import { assert } from 'chai';
-import { ColorContrastCache } from 'target-browser/ColorContrastCache';
+import { ColorContrastCache } from './ColorContrastCache';
 
 describe('ColorContrastCache', () => {
   let cache: ColorContrastCache;

src/browser/ColorContrastCache.ts

@@ -3,9 +3,9 @@
  * @license MIT
  */
 
-import { IColorContrastCache } from 'target-browser/Types';
-import { IColor } from 'common/Types';
-import { TwoKeyMap } from 'common/MultiKeyMap';
+import { IColorContrastCache } from './Types';
+import { IColor } from '../common/Types';
+import { TwoKeyMap } from '../common/MultiKeyMap';
 
 export class ColorContrastCache implements IColorContrastCache {
   private _color: TwoKeyMap</* bg */number, /* fg */number, IColor | null> = new TwoKeyMap();

src/browser/CoreBrowserTerminal.ts

@@ -22,43 +22,43 @@
  */
 
 import { IDecoration, IDecorationOptions, IDisposable, ILinkProvider, IMarker, IRenderDimensions as IRenderDimensionsApi } from '@xterm/xterm';
-import { copyHandler, handlePasteEvent, moveTextAreaUnderMouseCursor, paste, rightClickHandler } from 'target-browser/Clipboard';
-import * as Strings from 'target-browser/LocalizableStrings';
-import { OscLinkProvider } from 'target-browser/OscLinkProvider';
-import { CharacterJoinerHandler, CustomKeyEventHandler, CustomWheelEventHandler, IBrowser, IBufferRange, ICompositionHelper, ILinkifier2, ITerminal } from 'target-browser/Types';
-import { Viewport } from 'target-browser/Viewport';
-import { BufferDecorationRenderer } from 'target-browser/decorations/BufferDecorationRenderer';
-import { OverviewRulerRenderer } from 'target-browser/decorations/OverviewRulerRenderer';
-import { CompositionHelper } from 'target-browser/input/CompositionHelper';
-import { DomRenderer } from 'target-browser/renderer/dom/DomRenderer';
-import { IRenderer } from 'target-browser/renderer/shared/Types';
-import { CharSizeService } from 'target-browser/services/CharSizeService';
-import { CharacterJoinerService } from 'target-browser/services/CharacterJoinerService';
-import { CoreBrowserService } from 'target-browser/services/CoreBrowserService';
-import { LinkProviderService } from 'target-browser/services/LinkProviderService';
-import { MouseCoordsService } from 'target-browser/services/MouseCoordsService';
-import { MouseEventCssClasses, MouseService } from 'target-browser/services/MouseService';
-import { RenderService } from 'target-browser/services/RenderService';
-import { SelectionService } from 'target-browser/services/SelectionService';
-import { ICharSizeService, ICharacterJoinerService, ICoreBrowserService, IKeyboardService, ILinkProviderService, IMouseCoordsService, IMouseService, IRenderService, ISelectionService, IThemeService } from 'target-browser/services/Services';
-import { ThemeService } from 'target-browser/services/ThemeService';
-import { KeyboardService } from 'target-browser/services/KeyboardService';
-import { channels, color, rgb } from 'common/Color';
-import { CoreTerminal } from 'common/CoreTerminal';
-import * as Browser from 'common/Platform';
-import { ColorRequestType, IColorEvent, ITerminalOptions, KeyboardResultType, SpecialColorIndex } from 'common/Types';
-import { DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine';
-import { IBuffer } from 'common/buffer/Types';
-import { C0, C1ESCAPED } from 'common/data/EscapeSequences';
-import { toRgbString } from 'common/input/XParseColor';
-import { DecorationService } from 'common/services/DecorationService';
-import { IDecorationService } from 'common/services/Services';
-import { WindowsOptionsReportType } from 'common/InputHandler';
+import { copyHandler, handlePasteEvent, moveTextAreaUnderMouseCursor, paste, rightClickHandler } from './Clipboard';
+import * as Strings from './LocalizableStrings';
+import { OscLinkProvider } from './OscLinkProvider';
+import { CharacterJoinerHandler, CustomKeyEventHandler, CustomWheelEventHandler, IBrowser, IBufferRange, ICompositionHelper, ILinkifier2, ITerminal } from './Types';
+import { Viewport } from './Viewport';
+import { BufferDecorationRenderer } from './decorations/BufferDecorationRenderer';
+import { OverviewRulerRenderer } from './decorations/OverviewRulerRenderer';
+import { CompositionHelper } from './input/CompositionHelper';
+import { DomRenderer } from './renderer/dom/DomRenderer';
+import { IRenderer } from './renderer/shared/Types';
+import { CharSizeService } from './services/CharSizeService';
+import { CharacterJoinerService } from './services/CharacterJoinerService';
+import { CoreBrowserService } from './services/CoreBrowserService';
+import { LinkProviderService } from './services/LinkProviderService';
+import { MouseCoordsService } from './services/MouseCoordsService';
+import { MouseEventCssClasses, MouseService } from './services/MouseService';
+import { RenderService } from './services/RenderService';
+import { SelectionService } from './services/SelectionService';
+import { ICharSizeService, ICharacterJoinerService, ICoreBrowserService, IKeyboardService, ILinkProviderService, IMouseCoordsService, IMouseService, IRenderService, ISelectionService, IThemeService } from './services/Services';
+import { ThemeService } from './services/ThemeService';
+import { KeyboardService } from './services/KeyboardService';
+import { channels, color, rgb } from '../common/Color';
+import { CoreTerminal } from '../common/CoreTerminal';
+import * as Browser from '../common/Platform';
+import { ColorRequestType, IColorEvent, ITerminalOptions, KeyboardResultType, SpecialColorIndex } from '../common/Types';
+import { DEFAULT_ATTR_DATA } from '../common/buffer/BufferLine';
+import { IBuffer } from '../common/buffer/Types';
+import { C0, C1ESCAPED } from '../common/data/EscapeSequences';
+import { toRgbString } from '../common/input/XParseColor';
+import { DecorationService } from '../common/services/DecorationService';
+import { IDecorationService } from '../common/services/Services';
+import { WindowsOptionsReportType } from '../common/InputHandler';
 import { AccessibilityManager } from './AccessibilityManager';
 import { Linkifier } from './Linkifier';
-import { Emitter, EventUtils, type IEvent } from 'common/Event';
-import { addDisposableListener } from 'target-browser/Dom';
-import { MutableDisposable, toDisposable } from 'common/Lifecycle';
+import { Emitter, EventUtils, type IEvent } from '../common/Event';
+import { addDisposableListener } from './Dom';
+import { MutableDisposable, toDisposable } from '../common/Lifecycle';
 
 export class CoreBrowserTerminal extends CoreTerminal implements ITerminal {
   public textarea: HTMLTextAreaElement | undefined;

src/browser/Dom.ts

@@ -5,8 +5,8 @@
  * Minimal DOM helpers for xterm.js browser code.
  */
 
-import { IntervalTimer } from 'common/Async';
-import { IDisposable } from 'common/Lifecycle';
+import { IntervalTimer } from '../common/Async';
+import { IDisposable } from '../common/Lifecycle';
 
 export function getWindow(e: Node | UIEvent | undefined | null): Window {
   const candidateNode = e as Node | undefined | null;

src/browser/Linkifier.test.ts

@@ -4,11 +4,11 @@
  */
 
 import { assert } from 'chai';
-import { IBufferService } from 'common/services/Services';
+import { IBufferService } from '../common/services/Services';
 import { Linkifier } from './Linkifier';
-import { MockBufferService } from 'common/TestUtils.test';
-import { ILink } from 'target-browser/Types';
-import { LinkProviderService } from 'target-browser/services/LinkProviderService';
+import { MockBufferService } from '../common/TestUtils.test';
+import { ILink } from './Types';
+import { LinkProviderService } from './services/LinkProviderService';
 import jsdom = require('jsdom');
 
 class TestLinkifier2 extends Linkifier {

src/browser/Linkifier.ts

@@ -3,13 +3,13 @@
  * @license MIT
  */
 
-import { IBufferCellPosition, ILink, ILinkDecorations, ILinkWithState, ILinkifier2, ILinkifierEvent } from 'target-browser/Types';
-import { Disposable, dispose, toDisposable } from 'common/Lifecycle';
-import { IDisposable } from 'common/Types';
-import { IBufferService } from 'common/services/Services';
+import { IBufferCellPosition, ILink, ILinkDecorations, ILinkWithState, ILinkifier2, ILinkifierEvent } from './Types';
+import { Disposable, dispose, toDisposable } from '../common/Lifecycle';
+import { IDisposable } from '../common/Types';
+import { IBufferService } from '../common/services/Services';
 import { ILinkProviderService, IMouseCoordsService, IRenderService } from './services/Services';
-import { Emitter } from 'common/Event';
-import { addDisposableListener } from 'target-browser/Dom';
+import { Emitter } from '../common/Event';
+import { addDisposableListener } from './Dom';
 
 export class Linkifier extends Disposable implements ILinkifier2 {
   public get currentLink(): ILinkWithState | undefined { return this._currentLink; }

src/browser/OscLinkProvider.test.ts

@@ -4,11 +4,11 @@
  */
 
 import { assert } from 'chai';
-import { OscLinkProvider } from 'target-browser/OscLinkProvider';
-import { ILink } from 'target-browser/Types';
-import { createCellData, MockBufferService, MockOptionsService } from 'common/TestUtils.test';
-import { IBufferService, IOscLinkService } from 'common/services/Services';
-import { IBufferLine, IOscLinkData } from 'common/Types';
+import { OscLinkProvider } from './OscLinkProvider';
+import { ILink } from './Types';
+import { createCellData, MockBufferService, MockOptionsService } from '../common/TestUtils.test';
+import { IBufferService, IOscLinkService } from '../common/services/Services';
+import { IBufferLine, IOscLinkData } from '../common/Types';
 
 class TestOscLinkService implements IOscLinkService {
   public serviceBrand: any;

src/browser/OscLinkProvider.ts

@@ -3,11 +3,11 @@
  * @license MIT
  */
 
-import { IBufferRange, ILink } from 'target-browser/Types';
-import { ILinkProvider } from 'target-browser/services/Services';
-import { CellData } from 'common/buffer/CellData';
-import { IBufferLine } from 'common/Types';
-import { IBufferService, IOptionsService, IOscLinkService } from 'common/services/Services';
+import { IBufferRange, ILink } from './Types';
+import { ILinkProvider } from './services/Services';
+import { CellData } from '../common/buffer/CellData';
+import { IBufferLine } from '../common/Types';
+import { IBufferService, IOptionsService, IOscLinkService } from '../common/services/Services';
 
 export class OscLinkProvider implements ILinkProvider {
   private readonly _workCell = new CellData();

src/browser/RenderDebouncer.ts

@@ -3,8 +3,8 @@
  * @license MIT
  */
 
-import { IRenderDebouncerWithCallback } from 'target-browser/Types';
-import { ICoreBrowserService } from 'target-browser/services/Services';
+import { IRenderDebouncerWithCallback } from './Types';
+import { ICoreBrowserService } from './services/Services';
 
 /**
  * Debounces calls to render terminal rows using animation frames.

src/browser/Terminal.test.ts

@@ -3,13 +3,13 @@
  * @license MIT
  */
 
-import { MockCompositionHelper, MockRenderer, MockViewport, TestTerminal } from 'target-browser/TestUtils.test';
-import type { IBrowser } from 'target-browser/Types';
+import { MockCompositionHelper, MockRenderer, MockViewport, TestTerminal } from './TestUtils.test';
+import type { IBrowser } from './Types';
 import { assert } from 'chai';
-import { DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine';
-import { CellData } from 'common/buffer/CellData';
-import { MockUnicodeService, createCellData } from 'common/TestUtils.test';
-import { IMarker } from 'common/Types';
+import { DEFAULT_ATTR_DATA } from '../common/buffer/BufferLine';
+import { CellData } from '../common/buffer/CellData';
+import { MockUnicodeService, createCellData } from '../common/TestUtils.test';
+import { IMarker } from '../common/Types';
 
 const INIT_COLS = 80;
 const INIT_ROWS = 24;

src/browser/Terminal2.test.ts

@@ -7,7 +7,7 @@ import * as path from 'path';
 import * as os from 'os';
 import * as fs from 'fs';
 import * as pty from 'node-pty';
-import { CoreBrowserTerminal } from 'target-browser/CoreBrowserTerminal';
+import { CoreBrowserTerminal } from './CoreBrowserTerminal';
 import { IDisposable } from '@xterm/xterm';
 
 // all test files expect terminal in 80x25

src/browser/TestUtils.test.ts

@@ -4,21 +4,21 @@
  */
 
 import { IDisposable, IMarker, ILinkProvider, IDecorationOptions, IDecoration, IRenderDimensions as IRenderDimensionsApi } from '@xterm/xterm';
-import { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IMouseService, IRenderService, ISelectionService, IThemeService } from 'target-browser/services/Services';
-import { IRenderDimensions, IRenderer, IRequestRedrawEvent } from 'target-browser/renderer/shared/Types';
-import { IColorSet, ITerminal, ILinkifier2, IBrowser, IViewport, ICompositionHelper, CharacterJoinerHandler, IBufferRange, ReadonlyColorSet, IBufferElementProvider } from 'target-browser/Types';
-import { IBuffer, IBufferSet } from 'common/buffer/Types';
-import { IBufferLine, ICellData, IAttributeData, ICircularList, XtermListener, ICharset, ITerminalOptions, ColorIndex } from 'common/Types';
-import { Buffer } from 'common/buffer/Buffer';
-import * as Browser from 'common/Platform';
-import { CoreBrowserTerminal } from 'target-browser/CoreBrowserTerminal';
-import { IUnicodeService, IOptionsService, ICoreService, IMouseStateService } from 'common/services/Services';
-import { IFunctionIdentifier, IParams } from 'common/parser/Types';
-import { AttributeData } from 'common/buffer/AttributeData';
-import { ISelectionRedrawRequestEvent, ISelectionRequestScrollLinesEvent } from 'target-browser/selection/Types';
-import { css } from 'common/Color';
-import { createRenderDimensions } from 'target-browser/renderer/shared/RendererUtils';
-import { Emitter, type IEvent } from 'common/Event';
+import { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IMouseService, IRenderService, ISelectionService, IThemeService } from './services/Services';
+import { IRenderDimensions, IRenderer, IRequestRedrawEvent } from './renderer/shared/Types';
+import { IColorSet, ITerminal, ILinkifier2, IBrowser, IViewport, ICompositionHelper, CharacterJoinerHandler, IBufferRange, ReadonlyColorSet, IBufferElementProvider } from './Types';
+import { IBuffer, IBufferSet } from '../common/buffer/Types';
+import { IBufferLine, ICellData, IAttributeData, ICircularList, XtermListener, ICharset, ITerminalOptions, ColorIndex } from '../common/Types';
+import { Buffer } from '../common/buffer/Buffer';
+import * as Browser from '../common/Platform';
+import { CoreBrowserTerminal } from './CoreBrowserTerminal';
+import { IUnicodeService, IOptionsService, ICoreService, IMouseStateService } from '../common/services/Services';
+import { IFunctionIdentifier, IParams } from '../common/parser/Types';
+import { AttributeData } from '../common/buffer/AttributeData';
+import { ISelectionRedrawRequestEvent, ISelectionRequestScrollLinesEvent } from './selection/Types';
+import { css } from '../common/Color';
+import { createRenderDimensions } from './renderer/shared/RendererUtils';
+import { Emitter, type IEvent } from '../common/Event';
 
 export class TestTerminal extends CoreBrowserTerminal {
   public get curAttrData(): IAttributeData { return (this as any)._inputHandler._curAttrData; }

src/browser/TimeBasedDebouncer.ts

@@ -5,7 +5,7 @@
 
 const RENDER_DEBOUNCE_THRESHOLD_MS = 1000; // 1 Second
 
-import { IRenderDebouncer } from 'target-browser/Types';
+import { IRenderDebouncer } from './Types';
 
 /**
  * Debounces calls to update screen readers to update at most once configurable interval of time.

src/browser/Types.ts

@@ -3,11 +3,11 @@
  * @license MIT
  */
 
-import { CharData, IColor, ICoreTerminal, ITerminalOptions } from 'common/Types';
-import { IBuffer } from 'common/buffer/Types';
+import { CharData, IColor, ICoreTerminal, ITerminalOptions } from '../common/Types';
+import { IBuffer } from '../common/buffer/Types';
 import { IDisposable, IRenderDimensions as IRenderDimensionsApi, Terminal as ITerminalApi } from '@xterm/xterm';
-import { channels, css } from 'common/Color';
-import type { IEvent } from 'common/Event';
+import { channels, css } from '../common/Color';
+import type { IEvent } from '../common/Event';
 
 /**
  * A portion of the public API that are implemented identially internally and simply passed through.

src/browser/Viewport.ts

@@ -3,16 +3,16 @@
  * @license MIT
  */
 
-import { ICoreBrowserService, IRenderService, IThemeService } from 'target-browser/services/Services';
-import { ViewportConstants } from 'target-browser/shared/Constants';
-import { Disposable, toDisposable } from 'common/Lifecycle';
-import { IBufferService, ICoreService, IMouseStateService, IOptionsService } from 'common/services/Services';
-import { CoreMouseEventType } from 'common/Types';
-import { scheduleAtNextAnimationFrame } from 'target-browser/Dom';
-import { SmoothScrollableElement } from 'target-browser/scrollable/scrollableElement';
-import type { IScrollableElementChangeOptions } from 'target-browser/scrollable/scrollableElementOptions';
-import { Emitter, EventUtils } from 'common/Event';
-import { Scrollable, ScrollbarVisibility, type IScrollEvent } from 'target-browser/scrollable/scrollable';
+import { ICoreBrowserService, IRenderService, IThemeService } from './services/Services';
+import { ViewportConstants } from './shared/Constants';
+import { Disposable, toDisposable } from '../common/Lifecycle';
+import { IBufferService, ICoreService, IMouseStateService, IOptionsService } from '../common/services/Services';
+import { CoreMouseEventType } from '../common/Types';
+import { scheduleAtNextAnimationFrame } from './Dom';
+import { SmoothScrollableElement } from './scrollable/scrollableElement';
+import type { IScrollableElementChangeOptions } from './scrollable/scrollableElementOptions';
+import { Emitter, EventUtils } from '../common/Event';
+import { Scrollable, ScrollbarVisibility, type IScrollEvent } from './scrollable/scrollable';
 
 export class Viewport extends Disposable {