spawn-term 3.4.2 → 3.5.0

package/dist/cjs/lib/TerminalBuffer.js

@@ -8,7 +8,15 @@ Object.defineProperty(exports, "TerminalBuffer", {
         return TerminalBuffer;
     }
 });
-var _headless = /*#__PURE__*/ _interop_require_wildcard(require("@xterm/headless"));
+var _terminalmodel = require("terminal-model");
+function _array_like_to_array(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _array_without_holes(arr) {
+    if (Array.isArray(arr)) return _array_like_to_array(arr);
+}
 function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -28,152 +36,38 @@ function _create_class(Constructor, protoProps, staticProps) {
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
-function _define_property(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-    } else {
-        obj[key] = value;
-    }
-    return obj;
-}
-function _getRequireWildcardCache(nodeInterop) {
-    if (typeof WeakMap !== "function") return null;
-    var cacheBabelInterop = new WeakMap();
-    var cacheNodeInterop = new WeakMap();
-    return (_getRequireWildcardCache = function(nodeInterop) {
-        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
-    })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-    if (!nodeInterop && obj && obj.__esModule) {
-        return obj;
-    }
-    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-        return {
-            default: obj
-        };
-    }
-    var cache = _getRequireWildcardCache(nodeInterop);
-    if (cache && cache.has(obj)) {
-        return cache.get(obj);
-    }
-    var newObj = {
-        __proto__: null
-    };
-    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-    for(var key in obj){
-        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-            if (desc && (desc.get || desc.set)) {
-                Object.defineProperty(newObj, key, desc);
-            } else {
-                newObj[key] = obj[key];
-            }
-        }
-    }
-    newObj.default = obj;
-    if (cache) {
-        cache.set(obj, newObj);
-    }
-    return newObj;
+function _iterable_to_array(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
-function _object_spread(target) {
-    for(var i = 1; i < arguments.length; i++){
-        var source = arguments[i] != null ? arguments[i] : {};
-        var ownKeys = Object.keys(source);
-        if (typeof Object.getOwnPropertySymbols === "function") {
-            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-            }));
-        }
-        ownKeys.forEach(function(key) {
-            _define_property(target, key, source[key]);
-        });
-    }
-    return target;
+function _non_iterable_spread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-var _xterm_default;
-// Handle both ESM and CJS module formats
-var Terminal = _headless.Terminal || ((_xterm_default = _headless.default) === null || _xterm_default === void 0 ? void 0 : _xterm_default.Terminal);
-// ANSI color mode constants from xterm.js
-var COLOR_MODE_DEFAULT = 0;
-var COLOR_MODE_16 = 16777216; // 0x1000000 - 16 color palette (0-15)
-var COLOR_MODE_256 = 33554432; // 0x2000000 - 256 color palette
-var COLOR_MODE_RGB = 50331648; // 0x3000000 - 24-bit RGB
-var DEFAULT_STYLE = {
-    fg: -1,
-    fgMode: COLOR_MODE_DEFAULT,
-    bg: -1,
-    bgMode: COLOR_MODE_DEFAULT,
-    bold: false,
-    dim: false,
-    italic: false,
-    underline: false,
-    inverse: false,
-    strikethrough: false
-};
-function styleEquals(a, b) {
-    return a.fg === b.fg && a.fgMode === b.fgMode && a.bg === b.bg && a.bgMode === b.bgMode && a.bold === b.bold && a.dim === b.dim && a.italic === b.italic && a.underline === b.underline && a.inverse === b.inverse && a.strikethrough === b.strikethrough;
+function _to_consumable_array(arr) {
+    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
 }
-function buildAnsiCode(style) {
-    var codes = [];
-    // Attributes
-    if (style.bold) codes.push(1);
-    if (style.dim) codes.push(2);
-    if (style.italic) codes.push(3);
-    if (style.underline) codes.push(4);
-    if (style.inverse) codes.push(7);
-    if (style.strikethrough) codes.push(9);
-    // Foreground color
-    if (style.fgMode === COLOR_MODE_16) {
-        // 16-color palette: 0-7 are 30-37, 8-15 are 90-97
-        if (style.fg < 8) {
-            codes.push(30 + style.fg);
-        } else {
-            codes.push(90 + (style.fg - 8));
-        }
-    } else if (style.fgMode === COLOR_MODE_256) {
-        codes.push(38, 5, style.fg);
-    } else if (style.fgMode === COLOR_MODE_RGB) {
-        // RGB is encoded in the color value
-        var r = style.fg >> 16 & 0xff;
-        var g = style.fg >> 8 & 0xff;
-        var b = style.fg & 0xff;
-        codes.push(38, 2, r, g, b);
-    }
-    // Background color
-    if (style.bgMode === COLOR_MODE_16) {
-        if (style.bg < 8) {
-            codes.push(40 + style.bg);
-        } else {
-            codes.push(100 + (style.bg - 8));
-        }
-    } else if (style.bgMode === COLOR_MODE_256) {
-        codes.push(48, 5, style.bg);
-    } else if (style.bgMode === COLOR_MODE_RGB) {
-        var r1 = style.bg >> 16 & 0xff;
-        var g1 = style.bg >> 8 & 0xff;
-        var b1 = style.bg & 0xff;
-        codes.push(48, 2, r1, g1, b1);
-    }
-    if (codes.length === 0) return '';
-    return "\x1b[".concat(codes.join(';'), "m");
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
 var TerminalBuffer = /*#__PURE__*/ function() {
     "use strict";
-    function TerminalBuffer(cols) {
-        var scrollback = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 10000;
+    function TerminalBuffer(_cols) {
+        var _this = this;
+        var _scrollback = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 10000;
         _class_call_check(this, TerminalBuffer);
-        this.terminal = new Terminal({
-            cols: cols,
-            rows: 50,
-            scrollback: scrollback,
-            allowProposedApi: true
+        this.allLines = [];
+        // terminal-model doesn't enforce column width during parsing
+        // It preserves all content as-is
+        this.terminal = new _terminalmodel.StreamingTerminal();
+        // Listen for completed lines (when \n is encountered)
+        this.terminal.setLineReadyCallback(function() {
+            var line = _this.terminal.renderLine();
+            _this.terminal.reset();
+            _this.allLines.push(line);
         });
     }
     var _proto = TerminalBuffer.prototype;
@@ -181,79 +75,31 @@ var TerminalBuffer = /*#__PURE__*/ function() {
    * Write raw data to the terminal buffer.
    * The terminal interprets all ANSI sequences automatically.
    */ _proto.write = function write(data) {
-        var str = typeof data === 'string' ? data : data.toString('utf8');
-        this.terminal.write(str);
+        this.terminal.write(data);
     };
     /**
    * Resize the terminal width.
-   */ _proto.resize = function resize(cols) {
-        this.terminal.resize(cols, this.terminal.rows);
+   * terminal-model doesn't use column constraints, so this is a no-op for compatibility.
+   */ _proto.resize = function resize(_cols) {
+    // No-op - terminal-model doesn't enforce column width
     };
     /**
    * Extract the rendered lines from the terminal buffer.
    * This returns the actual visible content after all ANSI sequences
    * have been processed, with color codes preserved.
+   *
+   * CRITICAL: Unlike the xterm implementation, we do NOT call trimStart(),
+   * which preserves legitimate indentation and blank lines.
    */ _proto.getLines = function getLines() {
-        var buffer = this.terminal.buffer.active;
-        var lines = [];
-        for(var i = 0; i < buffer.length; i++){
-            var bufferLine = buffer.getLine(i);
-            if (!bufferLine) continue;
-            var result = '';
-            var currentStyle = _object_spread({}, DEFAULT_STYLE);
-            var _hasContent = false;
-            // First pass: find the last non-empty cell to know where content ends
-            var lastContentIndex = -1;
-            for(var j = bufferLine.length - 1; j >= 0; j--){
-                var cell = bufferLine.getCell(j);
-                if (cell && cell.getChars()) {
-                    lastContentIndex = j;
-                    break;
-                }
-            }
-            // Second pass: build the line with ANSI codes
-            for(var j1 = 0; j1 <= lastContentIndex; j1++){
-                var cell1 = bufferLine.getCell(j1);
-                if (!cell1) continue;
-                var char = cell1.getChars();
-                var cellStyle = {
-                    fg: cell1.getFgColor(),
-                    fgMode: cell1.getFgColorMode(),
-                    bg: cell1.getBgColor(),
-                    bgMode: cell1.getBgColorMode(),
-                    bold: cell1.isBold() !== 0,
-                    dim: cell1.isDim() !== 0,
-                    italic: cell1.isItalic() !== 0,
-                    underline: cell1.isUnderline() !== 0,
-                    inverse: cell1.isInverse() !== 0,
-                    strikethrough: cell1.isStrikethrough() !== 0
-                };
-                // Check if style changed
-                if (!styleEquals(cellStyle, currentStyle)) {
-                    // Reset if going back to default, otherwise emit new style
-                    if (styleEquals(cellStyle, DEFAULT_STYLE)) {
-                        result += '\x1b[0m';
-                    } else {
-                        // If we had styling before, reset first for clean transition
-                        if (!styleEquals(currentStyle, DEFAULT_STYLE)) {
-                            result += '\x1b[0m';
-                        }
-                        result += buildAnsiCode(cellStyle);
-                    }
-                    currentStyle = cellStyle;
-                }
-                result += char || ' ';
-                if (char) _hasContent = true;
-            }
-            // Reset at end of line if we had styling
-            if (!styleEquals(currentStyle, DEFAULT_STYLE)) {
-                result += '\x1b[0m';
-            }
-            // Trim leading whitespace - tools like ncu/npm use cursor positioning
-            // which creates lines with leading spaces when interpreted by xterm
-            lines.push(result.trimStart());
+        // Flush any pending content (incomplete line without \n)
+        if (this.terminal.hasContent()) {
+            var line = this.terminal.renderLine();
+            this.terminal.reset();
+            this.allLines.push(line);
         }
-        // Trim trailing empty lines
+        // Return copy of all lines WITHOUT trimStart() - preserves whitespace
+        var lines = _to_consumable_array(this.allLines);
+        // Trim trailing empty lines only
         while(lines.length > 0 && lines[lines.length - 1] === ''){
             lines.pop();
         }
@@ -263,6 +109,7 @@ var TerminalBuffer = /*#__PURE__*/ function() {
    * Clean up terminal resources.
    */ _proto.dispose = function dispose() {
         this.terminal.dispose();
+        this.allLines = [];
     };
     _create_class(TerminalBuffer, [
         {

package/dist/cjs/lib/TerminalBuffer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/lib/TerminalBuffer.ts"],"sourcesContent":["import * as xterm from '@xterm/headless';\n\n// Handle both ESM and CJS module formats\nconst Terminal = (xterm as { Terminal: typeof xterm.Terminal; default?: { Terminal: typeof xterm.Terminal } }).Terminal || (xterm as { default?: { Terminal: typeof xterm.Terminal } }).default?.Terminal;\n\n// ANSI color mode constants from xterm.js\nconst COLOR_MODE_DEFAULT = 0;\nconst COLOR_MODE_16 = 16777216; // 0x1000000 - 16 color palette (0-15)\nconst COLOR_MODE_256 = 33554432; // 0x2000000 - 256 color palette\nconst COLOR_MODE_RGB = 50331648; // 0x3000000 - 24-bit RGB\n\n/**\n * Wrapper around @xterm/headless Terminal that provides a virtual terminal buffer.\n * Interprets ANSI escape sequences (cursor movement, line clearing, etc.) to produce\n * the actual rendered output rather than raw intermediate states.\n */\n// Cell attribute state for tracking changes\ninterface CellStyle {\n  fg: number;\n  fgMode: number;\n  bg: number;\n  bgMode: number;\n  bold: boolean;\n  dim: boolean;\n  italic: boolean;\n  underline: boolean;\n  inverse: boolean;\n  strikethrough: boolean;\n}\n\nconst DEFAULT_STYLE: CellStyle = {\n  fg: -1,\n  fgMode: COLOR_MODE_DEFAULT,\n  bg: -1,\n  bgMode: COLOR_MODE_DEFAULT,\n  bold: false,\n  dim: false,\n  italic: false,\n  underline: false,\n  inverse: false,\n  strikethrough: false,\n};\n\nfunction styleEquals(a: CellStyle, b: CellStyle): boolean {\n  return a.fg === b.fg && a.fgMode === b.fgMode && a.bg === b.bg && a.bgMode === b.bgMode && a.bold === b.bold && a.dim === b.dim && a.italic === b.italic && a.underline === b.underline && a.inverse === b.inverse && a.strikethrough === b.strikethrough;\n}\n\nfunction buildAnsiCode(style: CellStyle): string {\n  const codes: number[] = [];\n\n  // Attributes\n  if (style.bold) codes.push(1);\n  if (style.dim) codes.push(2);\n  if (style.italic) codes.push(3);\n  if (style.underline) codes.push(4);\n  if (style.inverse) codes.push(7);\n  if (style.strikethrough) codes.push(9);\n\n  // Foreground color\n  if (style.fgMode === COLOR_MODE_16) {\n    // 16-color palette: 0-7 are 30-37, 8-15 are 90-97\n    if (style.fg < 8) {\n      codes.push(30 + style.fg);\n    } else {\n      codes.push(90 + (style.fg - 8));\n    }\n  } else if (style.fgMode === COLOR_MODE_256) {\n    codes.push(38, 5, style.fg);\n  } else if (style.fgMode === COLOR_MODE_RGB) {\n    // RGB is encoded in the color value\n    const r = (style.fg >> 16) & 0xff;\n    const g = (style.fg >> 8) & 0xff;\n    const b = style.fg & 0xff;\n    codes.push(38, 2, r, g, b);\n  }\n\n  // Background color\n  if (style.bgMode === COLOR_MODE_16) {\n    if (style.bg < 8) {\n      codes.push(40 + style.bg);\n    } else {\n      codes.push(100 + (style.bg - 8));\n    }\n  } else if (style.bgMode === COLOR_MODE_256) {\n    codes.push(48, 5, style.bg);\n  } else if (style.bgMode === COLOR_MODE_RGB) {\n    const r = (style.bg >> 16) & 0xff;\n    const g = (style.bg >> 8) & 0xff;\n    const b = style.bg & 0xff;\n    codes.push(48, 2, r, g, b);\n  }\n\n  if (codes.length === 0) return '';\n  return `\\x1b[${codes.join(';')}m`;\n}\n\nexport class TerminalBuffer {\n  private terminal: InstanceType<typeof Terminal>;\n\n  constructor(cols: number, scrollback = 10000) {\n    this.terminal = new Terminal({\n      cols,\n      rows: 50, // Visible rows (doesn't matter much for headless)\n      scrollback,\n      allowProposedApi: true,\n    });\n  }\n\n  /**\n   * Write raw data to the terminal buffer.\n   * The terminal interprets all ANSI sequences automatically.\n   */\n  write(data: string | Buffer): void {\n    const str = typeof data === 'string' ? data : data.toString('utf8');\n    this.terminal.write(str);\n  }\n\n  /**\n   * Resize the terminal width.\n   */\n  resize(cols: number): void {\n    this.terminal.resize(cols, this.terminal.rows);\n  }\n\n  /**\n   * Extract the rendered lines from the terminal buffer.\n   * This returns the actual visible content after all ANSI sequences\n   * have been processed, with color codes preserved.\n   */\n  getLines(): string[] {\n    const buffer = this.terminal.buffer.active;\n    const lines: string[] = [];\n\n    for (let i = 0; i < buffer.length; i++) {\n      const bufferLine = buffer.getLine(i);\n      if (!bufferLine) continue;\n\n      let result = '';\n      let currentStyle: CellStyle = { ...DEFAULT_STYLE };\n      let _hasContent = false;\n\n      // First pass: find the last non-empty cell to know where content ends\n      let lastContentIndex = -1;\n      for (let j = bufferLine.length - 1; j >= 0; j--) {\n        const cell = bufferLine.getCell(j);\n        if (cell && cell.getChars()) {\n          lastContentIndex = j;\n          break;\n        }\n      }\n\n      // Second pass: build the line with ANSI codes\n      for (let j = 0; j <= lastContentIndex; j++) {\n        const cell = bufferLine.getCell(j);\n        if (!cell) continue;\n\n        const char = cell.getChars();\n        const cellStyle: CellStyle = {\n          fg: cell.getFgColor(),\n          fgMode: cell.getFgColorMode(),\n          bg: cell.getBgColor(),\n          bgMode: cell.getBgColorMode(),\n          bold: cell.isBold() !== 0,\n          dim: cell.isDim() !== 0,\n          italic: cell.isItalic() !== 0,\n          underline: cell.isUnderline() !== 0,\n          inverse: cell.isInverse() !== 0,\n          strikethrough: cell.isStrikethrough() !== 0,\n        };\n\n        // Check if style changed\n        if (!styleEquals(cellStyle, currentStyle)) {\n          // Reset if going back to default, otherwise emit new style\n          if (styleEquals(cellStyle, DEFAULT_STYLE)) {\n            result += '\\x1b[0m';\n          } else {\n            // If we had styling before, reset first for clean transition\n            if (!styleEquals(currentStyle, DEFAULT_STYLE)) {\n              result += '\\x1b[0m';\n            }\n            result += buildAnsiCode(cellStyle);\n          }\n          currentStyle = cellStyle;\n        }\n\n        result += char || ' ';\n        if (char) _hasContent = true;\n      }\n\n      // Reset at end of line if we had styling\n      if (!styleEquals(currentStyle, DEFAULT_STYLE)) {\n        result += '\\x1b[0m';\n      }\n\n      // Trim leading whitespace - tools like ncu/npm use cursor positioning\n      // which creates lines with leading spaces when interpreted by xterm\n      lines.push(result.trimStart());\n    }\n\n    // Trim trailing empty lines\n    while (lines.length > 0 && lines[lines.length - 1] === '') {\n      lines.pop();\n    }\n\n    return lines;\n  }\n\n  /**\n   * Get the number of rendered lines.\n   */\n  get lineCount(): number {\n    return this.getLines().length;\n  }\n\n  /**\n   * Clean up terminal resources.\n   */\n  dispose(): void {\n    this.terminal.dispose();\n  }\n}\n"],"names":["TerminalBuffer","Terminal","xterm","default","COLOR_MODE_DEFAULT","COLOR_MODE_16","COLOR_MODE_256","COLOR_MODE_RGB","DEFAULT_STYLE","fg","fgMode","bg","bgMode","bold","dim","italic","underline","inverse","strikethrough","styleEquals","a","b","buildAnsiCode","style","codes","push","r","g","length","join","cols","scrollback","terminal","rows","allowProposedApi","write","data","str","toString","resize","getLines","buffer","active","lines","i","bufferLine","getLine","result","currentStyle","_hasContent","lastContentIndex","j","cell","getCell","getChars","char","cellStyle","getFgColor","getFgColorMode","getBgColor","getBgColorMode","isBold","isDim","isItalic","isUnderline","isInverse","isStrikethrough","trimStart","pop","dispose","lineCount"],"mappings":";;;;+BAgGaA;;;eAAAA;;;gEAhGU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAGoG;AAD3H,yCAAyC;AACzC,IAAMC,WAAW,AAACC,UAA6FD,QAAQ,MAAI,iBAAA,AAACC,UAA4DC,OAAO,cAApE,qCAAA,eAAsEF,QAAQ;AAEzM,0CAA0C;AAC1C,IAAMG,qBAAqB;AAC3B,IAAMC,gBAAgB,UAAU,sCAAsC;AACtE,IAAMC,iBAAiB,UAAU,gCAAgC;AACjE,IAAMC,iBAAiB,UAAU,yBAAyB;AAqB1D,IAAMC,gBAA2B;IAC/BC,IAAI,CAAC;IACLC,QAAQN;IACRO,IAAI,CAAC;IACLC,QAAQR;IACRS,MAAM;IACNC,KAAK;IACLC,QAAQ;IACRC,WAAW;IACXC,SAAS;IACTC,eAAe;AACjB;AAEA,SAASC,YAAYC,CAAY,EAAEC,CAAY;IAC7C,OAAOD,EAAEX,EAAE,KAAKY,EAAEZ,EAAE,IAAIW,EAAEV,MAAM,KAAKW,EAAEX,MAAM,IAAIU,EAAET,EAAE,KAAKU,EAAEV,EAAE,IAAIS,EAAER,MAAM,KAAKS,EAAET,MAAM,IAAIQ,EAAEP,IAAI,KAAKQ,EAAER,IAAI,IAAIO,EAAEN,GAAG,KAAKO,EAAEP,GAAG,IAAIM,EAAEL,MAAM,KAAKM,EAAEN,MAAM,IAAIK,EAAEJ,SAAS,KAAKK,EAAEL,SAAS,IAAII,EAAEH,OAAO,KAAKI,EAAEJ,OAAO,IAAIG,EAAEF,aAAa,KAAKG,EAAEH,aAAa;AAC3P;AAEA,SAASI,cAAcC,KAAgB;IACrC,IAAMC,QAAkB,EAAE;IAE1B,aAAa;IACb,IAAID,MAAMV,IAAI,EAAEW,MAAMC,IAAI,CAAC;IAC3B,IAAIF,MAAMT,GAAG,EAAEU,MAAMC,IAAI,CAAC;IAC1B,IAAIF,MAAMR,MAAM,EAAES,MAAMC,IAAI,CAAC;IAC7B,IAAIF,MAAMP,SAAS,EAAEQ,MAAMC,IAAI,CAAC;IAChC,IAAIF,MAAMN,OAAO,EAAEO,MAAMC,IAAI,CAAC;IAC9B,IAAIF,MAAML,aAAa,EAAEM,MAAMC,IAAI,CAAC;IAEpC,mBAAmB;IACnB,IAAIF,MAAMb,MAAM,KAAKL,eAAe;QAClC,kDAAkD;QAClD,IAAIkB,MAAMd,EAAE,GAAG,GAAG;YAChBe,MAAMC,IAAI,CAAC,KAAKF,MAAMd,EAAE;QAC1B,OAAO;YACLe,MAAMC,IAAI,CAAC,KAAMF,CAAAA,MAAMd,EAAE,GAAG,CAAA;QAC9B;IACF,OAAO,IAAIc,MAAMb,MAAM,KAAKJ,gBAAgB;QAC1CkB,MAAMC,IAAI,CAAC,IAAI,GAAGF,MAAMd,EAAE;IAC5B,OAAO,IAAIc,MAAMb,MAAM,KAAKH,gBAAgB;QAC1C,oCAAoC;QACpC,IAAMmB,IAAI,AAACH,MAAMd,EAAE,IAAI,KAAM;QAC7B,IAAMkB,IAAI,AAACJ,MAAMd,EAAE,IAAI,IAAK;QAC5B,IAAMY,IAAIE,MAAMd,EAAE,GAAG;QACrBe,MAAMC,IAAI,CAAC,IAAI,GAAGC,GAAGC,GAAGN;IAC1B;IAEA,mBAAmB;IACnB,IAAIE,MAAMX,MAAM,KAAKP,eAAe;QAClC,IAAIkB,MAAMZ,EAAE,GAAG,GAAG;YAChBa,MAAMC,IAAI,CAAC,KAAKF,MAAMZ,EAAE;QAC1B,OAAO;YACLa,MAAMC,IAAI,CAAC,MAAOF,CAAAA,MAAMZ,EAAE,GAAG,CAAA;QAC/B;IACF,OAAO,IAAIY,MAAMX,MAAM,KAAKN,gBAAgB;QAC1CkB,MAAMC,IAAI,CAAC,IAAI,GAAGF,MAAMZ,EAAE;IAC5B,OAAO,IAAIY,MAAMX,MAAM,KAAKL,gBAAgB;QAC1C,IAAMmB,KAAI,AAACH,MAAMZ,EAAE,IAAI,KAAM;QAC7B,IAAMgB,KAAI,AAACJ,MAAMZ,EAAE,IAAI,IAAK;QAC5B,IAAMU,KAAIE,MAAMZ,EAAE,GAAG;QACrBa,MAAMC,IAAI,CAAC,IAAI,GAAGC,IAAGC,IAAGN;IAC1B;IAEA,IAAIG,MAAMI,MAAM,KAAK,GAAG,OAAO;IAC/B,OAAO,AAAC,QAAuB,OAAhBJ,MAAMK,IAAI,CAAC,MAAK;AACjC;AAEO,IAAA,AAAM7B,+BAAN;;aAAMA,eAGC8B,IAAY;YAAEC,aAAAA,iEAAa;gCAH5B/B;QAIT,IAAI,CAACgC,QAAQ,GAAG,IAAI/B,SAAS;YAC3B6B,MAAAA;YACAG,MAAM;YACNF,YAAAA;YACAG,kBAAkB;QACpB;;iBATSlC;IAYX;;;GAGC,GACDmC,OAAAA,KAGC,GAHDA,SAAAA,MAAMC,IAAqB;QACzB,IAAMC,MAAM,OAAOD,SAAS,WAAWA,OAAOA,KAAKE,QAAQ,CAAC;QAC5D,IAAI,CAACN,QAAQ,CAACG,KAAK,CAACE;IACtB;IAEA;;GAEC,GACDE,OAAAA,MAEC,GAFDA,SAAAA,OAAOT,IAAY;QACjB,IAAI,CAACE,QAAQ,CAACO,MAAM,CAACT,MAAM,IAAI,CAACE,QAAQ,CAACC,IAAI;IAC/C;IAEA;;;;GAIC,GACDO,OAAAA,QA4EC,GA5EDA,SAAAA;QACE,IAAMC,SAAS,IAAI,CAACT,QAAQ,CAACS,MAAM,CAACC,MAAM;QAC1C,IAAMC,QAAkB,EAAE;QAE1B,IAAK,IAAIC,IAAI,GAAGA,IAAIH,OAAOb,MAAM,EAAEgB,IAAK;YACtC,IAAMC,aAAaJ,OAAOK,OAAO,CAACF;YAClC,IAAI,CAACC,YAAY;YAEjB,IAAIE,SAAS;YACb,IAAIC,eAA0B,mBAAKxC;YACnC,IAAIyC,cAAc;YAElB,sEAAsE;YACtE,IAAIC,mBAAmB,CAAC;YACxB,IAAK,IAAIC,IAAIN,WAAWjB,MAAM,GAAG,GAAGuB,KAAK,GAAGA,IAAK;gBAC/C,IAAMC,OAAOP,WAAWQ,OAAO,CAACF;gBAChC,IAAIC,QAAQA,KAAKE,QAAQ,IAAI;oBAC3BJ,mBAAmBC;oBACnB;gBACF;YACF;YAEA,8CAA8C;YAC9C,IAAK,IAAIA,KAAI,GAAGA,MAAKD,kBAAkBC,KAAK;gBAC1C,IAAMC,QAAOP,WAAWQ,OAAO,CAACF;gBAChC,IAAI,CAACC,OAAM;gBAEX,IAAMG,OAAOH,MAAKE,QAAQ;gBAC1B,IAAME,YAAuB;oBAC3B/C,IAAI2C,MAAKK,UAAU;oBACnB/C,QAAQ0C,MAAKM,cAAc;oBAC3B/C,IAAIyC,MAAKO,UAAU;oBACnB/C,QAAQwC,MAAKQ,cAAc;oBAC3B/C,MAAMuC,MAAKS,MAAM,OAAO;oBACxB/C,KAAKsC,MAAKU,KAAK,OAAO;oBACtB/C,QAAQqC,MAAKW,QAAQ,OAAO;oBAC5B/C,WAAWoC,MAAKY,WAAW,OAAO;oBAClC/C,SAASmC,MAAKa,SAAS,OAAO;oBAC9B/C,eAAekC,MAAKc,eAAe,OAAO;gBAC5C;gBAEA,yBAAyB;gBACzB,IAAI,CAAC/C,YAAYqC,WAAWR,eAAe;oBACzC,2DAA2D;oBAC3D,IAAI7B,YAAYqC,WAAWhD,gBAAgB;wBACzCuC,UAAU;oBACZ,OAAO;wBACL,6DAA6D;wBAC7D,IAAI,CAAC5B,YAAY6B,cAAcxC,gBAAgB;4BAC7CuC,UAAU;wBACZ;wBACAA,UAAUzB,cAAckC;oBAC1B;oBACAR,eAAeQ;gBACjB;gBAEAT,UAAUQ,QAAQ;gBAClB,IAAIA,MAAMN,cAAc;YAC1B;YAEA,yCAAyC;YACzC,IAAI,CAAC9B,YAAY6B,cAAcxC,gBAAgB;gBAC7CuC,UAAU;YACZ;YAEA,sEAAsE;YACtE,oEAAoE;YACpEJ,MAAMlB,IAAI,CAACsB,OAAOoB,SAAS;QAC7B;QAEA,4BAA4B;QAC5B,MAAOxB,MAAMf,MAAM,GAAG,KAAKe,KAAK,CAACA,MAAMf,MAAM,GAAG,EAAE,KAAK,GAAI;YACzDe,MAAMyB,GAAG;QACX;QAEA,OAAOzB;IACT;IASA;;GAEC,GACD0B,OAAAA,OAEC,GAFDA,SAAAA;QACE,IAAI,CAACrC,QAAQ,CAACqC,OAAO;IACvB;kBA3HWrE;;YAkHPsE,KAAAA;iBAAJ,AAHA;;GAEC,GACD;gBACE,OAAO,IAAI,CAAC9B,QAAQ,GAAGZ,MAAM;YAC/B;;;WApHW5B"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/lib/TerminalBuffer.ts"],"sourcesContent":["import { StreamingTerminal } from 'terminal-model';\n\n/**\n * Wrapper around terminal-model's StreamingTerminal that provides a virtual terminal buffer.\n * Interprets ANSI escape sequences (cursor movement, line clearing, etc.) to produce\n * the actual rendered output rather than raw intermediate states.\n *\n * This implementation preserves whitespace and blank lines by NOT calling trimStart(),\n * which was the bug in the previous xterm-based implementation.\n */\nexport class TerminalBuffer {\n  private terminal: StreamingTerminal;\n  private allLines: string[] = [];\n\n  constructor(_cols: number, _scrollback = 10000) {\n    // terminal-model doesn't enforce column width during parsing\n    // It preserves all content as-is\n    this.terminal = new StreamingTerminal();\n\n    // Listen for completed lines (when \\n is encountered)\n    this.terminal.setLineReadyCallback(() => {\n      const line = this.terminal.renderLine();\n      this.terminal.reset();\n      this.allLines.push(line);\n    });\n  }\n\n  /**\n   * Write raw data to the terminal buffer.\n   * The terminal interprets all ANSI sequences automatically.\n   */\n  write(data: string | Buffer): void {\n    this.terminal.write(data);\n  }\n\n  /**\n   * Resize the terminal width.\n   * terminal-model doesn't use column constraints, so this is a no-op for compatibility.\n   */\n  resize(_cols: number): void {\n    // No-op - terminal-model doesn't enforce column width\n  }\n\n  /**\n   * Extract the rendered lines from the terminal buffer.\n   * This returns the actual visible content after all ANSI sequences\n   * have been processed, with color codes preserved.\n   *\n   * CRITICAL: Unlike the xterm implementation, we do NOT call trimStart(),\n   * which preserves legitimate indentation and blank lines.\n   */\n  getLines(): string[] {\n    // Flush any pending content (incomplete line without \\n)\n    if (this.terminal.hasContent()) {\n      const line = this.terminal.renderLine();\n      this.terminal.reset();\n      this.allLines.push(line);\n    }\n\n    // Return copy of all lines WITHOUT trimStart() - preserves whitespace\n    const lines = [...this.allLines];\n\n    // Trim trailing empty lines only\n    while (lines.length > 0 && lines[lines.length - 1] === '') {\n      lines.pop();\n    }\n\n    return lines;\n  }\n\n  /**\n   * Get the number of rendered lines.\n   */\n  get lineCount(): number {\n    return this.getLines().length;\n  }\n\n  /**\n   * Clean up terminal resources.\n   */\n  dispose(): void {\n    this.terminal.dispose();\n    this.allLines = [];\n  }\n}\n"],"names":["TerminalBuffer","_cols","_scrollback","allLines","terminal","StreamingTerminal","setLineReadyCallback","line","renderLine","reset","push","write","data","resize","getLines","hasContent","lines","length","pop","dispose","lineCount"],"mappings":";;;;+BAUaA;;;eAAAA;;;6BAVqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAU3B,IAAA,AAAMA,+BAAN;;aAAMA,eAICC,KAAa;;YAAEC,cAAAA,iEAAc;gCAJ9BF;aAEHG,WAAqB,EAAE;QAG7B,6DAA6D;QAC7D,iCAAiC;QACjC,IAAI,CAACC,QAAQ,GAAG,IAAIC,gCAAiB;QAErC,sDAAsD;QACtD,IAAI,CAACD,QAAQ,CAACE,oBAAoB,CAAC;YACjC,IAAMC,OAAO,MAAKH,QAAQ,CAACI,UAAU;YACrC,MAAKJ,QAAQ,CAACK,KAAK;YACnB,MAAKN,QAAQ,CAACO,IAAI,CAACH;QACrB;;iBAdSP;IAiBX;;;GAGC,GACDW,OAAAA,KAEC,GAFDA,SAAAA,MAAMC,IAAqB;QACzB,IAAI,CAACR,QAAQ,CAACO,KAAK,CAACC;IACtB;IAEA;;;GAGC,GACDC,OAAAA,MAEC,GAFDA,SAAAA,OAAOZ,KAAa;IAClB,sDAAsD;IACxD;IAEA;;;;;;;GAOC,GACDa,OAAAA,QAiBC,GAjBDA,SAAAA;QACE,yDAAyD;QACzD,IAAI,IAAI,CAACV,QAAQ,CAACW,UAAU,IAAI;YAC9B,IAAMR,OAAO,IAAI,CAACH,QAAQ,CAACI,UAAU;YACrC,IAAI,CAACJ,QAAQ,CAACK,KAAK;YACnB,IAAI,CAACN,QAAQ,CAACO,IAAI,CAACH;QACrB;QAEA,sEAAsE;QACtE,IAAMS,QAAS,qBAAG,IAAI,CAACb,QAAQ;QAE/B,iCAAiC;QACjC,MAAOa,MAAMC,MAAM,GAAG,KAAKD,KAAK,CAACA,MAAMC,MAAM,GAAG,EAAE,KAAK,GAAI;YACzDD,MAAME,GAAG;QACX;QAEA,OAAOF;IACT;IASA;;GAEC,GACDG,OAAAA,OAGC,GAHDA,SAAAA;QACE,IAAI,CAACf,QAAQ,CAACe,OAAO;QACrB,IAAI,CAAChB,QAAQ,GAAG,EAAE;IACpB;kBAzEWH;;YA+DPoB,KAAAA;iBAAJ,AAHA;;GAEC,GACD;gBACE,OAAO,IAAI,CAACN,QAAQ,GAAGG,MAAM;YAC/B;;;WAjEWjB"}

package/dist/cjs/src/lib/TerminalBuffer.d.ts

@@ -1,6 +1,15 @@
+/**
+ * Wrapper around terminal-model's StreamingTerminal that provides a virtual terminal buffer.
+ * Interprets ANSI escape sequences (cursor movement, line clearing, etc.) to produce
+ * the actual rendered output rather than raw intermediate states.
+ *
+ * This implementation preserves whitespace and blank lines by NOT calling trimStart(),
+ * which was the bug in the previous xterm-based implementation.
+ */
 export declare class TerminalBuffer {
     private terminal;
-    constructor(cols: number, scrollback?: number);
+    private allLines;
+    constructor(_cols: number, _scrollback?: number);
     /**
      * Write raw data to the terminal buffer.
      * The terminal interprets all ANSI sequences automatically.
@@ -8,12 +17,16 @@ export declare class TerminalBuffer {
     write(data: string | Buffer): void;
     /**
      * Resize the terminal width.
+     * terminal-model doesn't use column constraints, so this is a no-op for compatibility.
      */
-    resize(cols: number): void;
+    resize(_cols: number): void;
     /**
      * Extract the rendered lines from the terminal buffer.
      * This returns the actual visible content after all ANSI sequences
      * have been processed, with color codes preserved.
+     *
+     * CRITICAL: Unlike the xterm implementation, we do NOT call trimStart(),
+     * which preserves legitimate indentation and blank lines.
      */
     getLines(): string[];
     /**

package/dist/esm/lib/TerminalBuffer.js

@@ -1,151 +1,43 @@
-var _xterm_default;
-import * as xterm from '@xterm/headless';
-// Handle both ESM and CJS module formats
-const Terminal = xterm.Terminal || ((_xterm_default = xterm.default) === null || _xterm_default === void 0 ? void 0 : _xterm_default.Terminal);
-// ANSI color mode constants from xterm.js
-const COLOR_MODE_DEFAULT = 0;
-const COLOR_MODE_16 = 16777216; // 0x1000000 - 16 color palette (0-15)
-const COLOR_MODE_256 = 33554432; // 0x2000000 - 256 color palette
-const COLOR_MODE_RGB = 50331648; // 0x3000000 - 24-bit RGB
-const DEFAULT_STYLE = {
-    fg: -1,
-    fgMode: COLOR_MODE_DEFAULT,
-    bg: -1,
-    bgMode: COLOR_MODE_DEFAULT,
-    bold: false,
-    dim: false,
-    italic: false,
-    underline: false,
-    inverse: false,
-    strikethrough: false
-};
-function styleEquals(a, b) {
-    return a.fg === b.fg && a.fgMode === b.fgMode && a.bg === b.bg && a.bgMode === b.bgMode && a.bold === b.bold && a.dim === b.dim && a.italic === b.italic && a.underline === b.underline && a.inverse === b.inverse && a.strikethrough === b.strikethrough;
-}
-function buildAnsiCode(style) {
-    const codes = [];
-    // Attributes
-    if (style.bold) codes.push(1);
-    if (style.dim) codes.push(2);
-    if (style.italic) codes.push(3);
-    if (style.underline) codes.push(4);
-    if (style.inverse) codes.push(7);
-    if (style.strikethrough) codes.push(9);
-    // Foreground color
-    if (style.fgMode === COLOR_MODE_16) {
-        // 16-color palette: 0-7 are 30-37, 8-15 are 90-97
-        if (style.fg < 8) {
-            codes.push(30 + style.fg);
-        } else {
-            codes.push(90 + (style.fg - 8));
-        }
-    } else if (style.fgMode === COLOR_MODE_256) {
-        codes.push(38, 5, style.fg);
-    } else if (style.fgMode === COLOR_MODE_RGB) {
-        // RGB is encoded in the color value
-        const r = style.fg >> 16 & 0xff;
-        const g = style.fg >> 8 & 0xff;
-        const b = style.fg & 0xff;
-        codes.push(38, 2, r, g, b);
-    }
-    // Background color
-    if (style.bgMode === COLOR_MODE_16) {
-        if (style.bg < 8) {
-            codes.push(40 + style.bg);
-        } else {
-            codes.push(100 + (style.bg - 8));
-        }
-    } else if (style.bgMode === COLOR_MODE_256) {
-        codes.push(48, 5, style.bg);
-    } else if (style.bgMode === COLOR_MODE_RGB) {
-        const r = style.bg >> 16 & 0xff;
-        const g = style.bg >> 8 & 0xff;
-        const b = style.bg & 0xff;
-        codes.push(48, 2, r, g, b);
-    }
-    if (codes.length === 0) return '';
-    return `\x1b[${codes.join(';')}m`;
-}
-export class TerminalBuffer {
+import { StreamingTerminal } from 'terminal-model';
+/**
+ * Wrapper around terminal-model's StreamingTerminal that provides a virtual terminal buffer.
+ * Interprets ANSI escape sequences (cursor movement, line clearing, etc.) to produce
+ * the actual rendered output rather than raw intermediate states.
+ *
+ * This implementation preserves whitespace and blank lines by NOT calling trimStart(),
+ * which was the bug in the previous xterm-based implementation.
+ */ export class TerminalBuffer {
     /**
    * Write raw data to the terminal buffer.
    * The terminal interprets all ANSI sequences automatically.
    */ write(data) {
-        const str = typeof data === 'string' ? data : data.toString('utf8');
-        this.terminal.write(str);
+        this.terminal.write(data);
     }
     /**
    * Resize the terminal width.
-   */ resize(cols) {
-        this.terminal.resize(cols, this.terminal.rows);
+   * terminal-model doesn't use column constraints, so this is a no-op for compatibility.
+   */ resize(_cols) {
+    // No-op - terminal-model doesn't enforce column width
     }
     /**
    * Extract the rendered lines from the terminal buffer.
    * This returns the actual visible content after all ANSI sequences
    * have been processed, with color codes preserved.
+   *
+   * CRITICAL: Unlike the xterm implementation, we do NOT call trimStart(),
+   * which preserves legitimate indentation and blank lines.
    */ getLines() {
-        const buffer = this.terminal.buffer.active;
-        const lines = [];
-        for(let i = 0; i < buffer.length; i++){
-            const bufferLine = buffer.getLine(i);
-            if (!bufferLine) continue;
-            let result = '';
-            let currentStyle = {
-                ...DEFAULT_STYLE
-            };
-            let _hasContent = false;
-            // First pass: find the last non-empty cell to know where content ends
-            let lastContentIndex = -1;
-            for(let j = bufferLine.length - 1; j >= 0; j--){
-                const cell = bufferLine.getCell(j);
-                if (cell && cell.getChars()) {
-                    lastContentIndex = j;
-                    break;
-                }
-            }
-            // Second pass: build the line with ANSI codes
-            for(let j = 0; j <= lastContentIndex; j++){
-                const cell = bufferLine.getCell(j);
-                if (!cell) continue;
-                const char = cell.getChars();
-                const cellStyle = {
-                    fg: cell.getFgColor(),
-                    fgMode: cell.getFgColorMode(),
-                    bg: cell.getBgColor(),
-                    bgMode: cell.getBgColorMode(),
-                    bold: cell.isBold() !== 0,
-                    dim: cell.isDim() !== 0,
-                    italic: cell.isItalic() !== 0,
-                    underline: cell.isUnderline() !== 0,
-                    inverse: cell.isInverse() !== 0,
-                    strikethrough: cell.isStrikethrough() !== 0
-                };
-                // Check if style changed
-                if (!styleEquals(cellStyle, currentStyle)) {
-                    // Reset if going back to default, otherwise emit new style
-                    if (styleEquals(cellStyle, DEFAULT_STYLE)) {
-                        result += '\x1b[0m';
-                    } else {
-                        // If we had styling before, reset first for clean transition
-                        if (!styleEquals(currentStyle, DEFAULT_STYLE)) {
-                            result += '\x1b[0m';
-                        }
-                        result += buildAnsiCode(cellStyle);
-                    }
-                    currentStyle = cellStyle;
-                }
-                result += char || ' ';
-                if (char) _hasContent = true;
-            }
-            // Reset at end of line if we had styling
-            if (!styleEquals(currentStyle, DEFAULT_STYLE)) {
-                result += '\x1b[0m';
-            }
-            // Trim leading whitespace - tools like ncu/npm use cursor positioning
-            // which creates lines with leading spaces when interpreted by xterm
-            lines.push(result.trimStart());
+        // Flush any pending content (incomplete line without \n)
+        if (this.terminal.hasContent()) {
+            const line = this.terminal.renderLine();
+            this.terminal.reset();
+            this.allLines.push(line);
         }
-        // Trim trailing empty lines
+        // Return copy of all lines WITHOUT trimStart() - preserves whitespace
+        const lines = [
+            ...this.allLines
+        ];
+        // Trim trailing empty lines only
         while(lines.length > 0 && lines[lines.length - 1] === ''){
             lines.pop();
         }
@@ -160,13 +52,18 @@ export class TerminalBuffer {
    * Clean up terminal resources.
    */ dispose() {
         this.terminal.dispose();
+        this.allLines = [];
     }
-    constructor(cols, scrollback = 10000){
-        this.terminal = new Terminal({
-            cols,
-            rows: 50,
-            scrollback,
-            allowProposedApi: true
+    constructor(_cols, _scrollback = 10000){
+        this.allLines = [];
+        // terminal-model doesn't enforce column width during parsing
+        // It preserves all content as-is
+        this.terminal = new StreamingTerminal();
+        // Listen for completed lines (when \n is encountered)
+        this.terminal.setLineReadyCallback(()=>{
+            const line = this.terminal.renderLine();
+            this.terminal.reset();
+            this.allLines.push(line);
         });
     }
 }

package/dist/esm/lib/TerminalBuffer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/lib/TerminalBuffer.ts"],"sourcesContent":["import * as xterm from '@xterm/headless';\n\n// Handle both ESM and CJS module formats\nconst Terminal = (xterm as { Terminal: typeof xterm.Terminal; default?: { Terminal: typeof xterm.Terminal } }).Terminal || (xterm as { default?: { Terminal: typeof xterm.Terminal } }).default?.Terminal;\n\n// ANSI color mode constants from xterm.js\nconst COLOR_MODE_DEFAULT = 0;\nconst COLOR_MODE_16 = 16777216; // 0x1000000 - 16 color palette (0-15)\nconst COLOR_MODE_256 = 33554432; // 0x2000000 - 256 color palette\nconst COLOR_MODE_RGB = 50331648; // 0x3000000 - 24-bit RGB\n\n/**\n * Wrapper around @xterm/headless Terminal that provides a virtual terminal buffer.\n * Interprets ANSI escape sequences (cursor movement, line clearing, etc.) to produce\n * the actual rendered output rather than raw intermediate states.\n */\n// Cell attribute state for tracking changes\ninterface CellStyle {\n  fg: number;\n  fgMode: number;\n  bg: number;\n  bgMode: number;\n  bold: boolean;\n  dim: boolean;\n  italic: boolean;\n  underline: boolean;\n  inverse: boolean;\n  strikethrough: boolean;\n}\n\nconst DEFAULT_STYLE: CellStyle = {\n  fg: -1,\n  fgMode: COLOR_MODE_DEFAULT,\n  bg: -1,\n  bgMode: COLOR_MODE_DEFAULT,\n  bold: false,\n  dim: false,\n  italic: false,\n  underline: false,\n  inverse: false,\n  strikethrough: false,\n};\n\nfunction styleEquals(a: CellStyle, b: CellStyle): boolean {\n  return a.fg === b.fg && a.fgMode === b.fgMode && a.bg === b.bg && a.bgMode === b.bgMode && a.bold === b.bold && a.dim === b.dim && a.italic === b.italic && a.underline === b.underline && a.inverse === b.inverse && a.strikethrough === b.strikethrough;\n}\n\nfunction buildAnsiCode(style: CellStyle): string {\n  const codes: number[] = [];\n\n  // Attributes\n  if (style.bold) codes.push(1);\n  if (style.dim) codes.push(2);\n  if (style.italic) codes.push(3);\n  if (style.underline) codes.push(4);\n  if (style.inverse) codes.push(7);\n  if (style.strikethrough) codes.push(9);\n\n  // Foreground color\n  if (style.fgMode === COLOR_MODE_16) {\n    // 16-color palette: 0-7 are 30-37, 8-15 are 90-97\n    if (style.fg < 8) {\n      codes.push(30 + style.fg);\n    } else {\n      codes.push(90 + (style.fg - 8));\n    }\n  } else if (style.fgMode === COLOR_MODE_256) {\n    codes.push(38, 5, style.fg);\n  } else if (style.fgMode === COLOR_MODE_RGB) {\n    // RGB is encoded in the color value\n    const r = (style.fg >> 16) & 0xff;\n    const g = (style.fg >> 8) & 0xff;\n    const b = style.fg & 0xff;\n    codes.push(38, 2, r, g, b);\n  }\n\n  // Background color\n  if (style.bgMode === COLOR_MODE_16) {\n    if (style.bg < 8) {\n      codes.push(40 + style.bg);\n    } else {\n      codes.push(100 + (style.bg - 8));\n    }\n  } else if (style.bgMode === COLOR_MODE_256) {\n    codes.push(48, 5, style.bg);\n  } else if (style.bgMode === COLOR_MODE_RGB) {\n    const r = (style.bg >> 16) & 0xff;\n    const g = (style.bg >> 8) & 0xff;\n    const b = style.bg & 0xff;\n    codes.push(48, 2, r, g, b);\n  }\n\n  if (codes.length === 0) return '';\n  return `\\x1b[${codes.join(';')}m`;\n}\n\nexport class TerminalBuffer {\n  private terminal: InstanceType<typeof Terminal>;\n\n  constructor(cols: number, scrollback = 10000) {\n    this.terminal = new Terminal({\n      cols,\n      rows: 50, // Visible rows (doesn't matter much for headless)\n      scrollback,\n      allowProposedApi: true,\n    });\n  }\n\n  /**\n   * Write raw data to the terminal buffer.\n   * The terminal interprets all ANSI sequences automatically.\n   */\n  write(data: string | Buffer): void {\n    const str = typeof data === 'string' ? data : data.toString('utf8');\n    this.terminal.write(str);\n  }\n\n  /**\n   * Resize the terminal width.\n   */\n  resize(cols: number): void {\n    this.terminal.resize(cols, this.terminal.rows);\n  }\n\n  /**\n   * Extract the rendered lines from the terminal buffer.\n   * This returns the actual visible content after all ANSI sequences\n   * have been processed, with color codes preserved.\n   */\n  getLines(): string[] {\n    const buffer = this.terminal.buffer.active;\n    const lines: string[] = [];\n\n    for (let i = 0; i < buffer.length; i++) {\n      const bufferLine = buffer.getLine(i);\n      if (!bufferLine) continue;\n\n      let result = '';\n      let currentStyle: CellStyle = { ...DEFAULT_STYLE };\n      let _hasContent = false;\n\n      // First pass: find the last non-empty cell to know where content ends\n      let lastContentIndex = -1;\n      for (let j = bufferLine.length - 1; j >= 0; j--) {\n        const cell = bufferLine.getCell(j);\n        if (cell && cell.getChars()) {\n          lastContentIndex = j;\n          break;\n        }\n      }\n\n      // Second pass: build the line with ANSI codes\n      for (let j = 0; j <= lastContentIndex; j++) {\n        const cell = bufferLine.getCell(j);\n        if (!cell) continue;\n\n        const char = cell.getChars();\n        const cellStyle: CellStyle = {\n          fg: cell.getFgColor(),\n          fgMode: cell.getFgColorMode(),\n          bg: cell.getBgColor(),\n          bgMode: cell.getBgColorMode(),\n          bold: cell.isBold() !== 0,\n          dim: cell.isDim() !== 0,\n          italic: cell.isItalic() !== 0,\n          underline: cell.isUnderline() !== 0,\n          inverse: cell.isInverse() !== 0,\n          strikethrough: cell.isStrikethrough() !== 0,\n        };\n\n        // Check if style changed\n        if (!styleEquals(cellStyle, currentStyle)) {\n          // Reset if going back to default, otherwise emit new style\n          if (styleEquals(cellStyle, DEFAULT_STYLE)) {\n            result += '\\x1b[0m';\n          } else {\n            // If we had styling before, reset first for clean transition\n            if (!styleEquals(currentStyle, DEFAULT_STYLE)) {\n              result += '\\x1b[0m';\n            }\n            result += buildAnsiCode(cellStyle);\n          }\n          currentStyle = cellStyle;\n        }\n\n        result += char || ' ';\n        if (char) _hasContent = true;\n      }\n\n      // Reset at end of line if we had styling\n      if (!styleEquals(currentStyle, DEFAULT_STYLE)) {\n        result += '\\x1b[0m';\n      }\n\n      // Trim leading whitespace - tools like ncu/npm use cursor positioning\n      // which creates lines with leading spaces when interpreted by xterm\n      lines.push(result.trimStart());\n    }\n\n    // Trim trailing empty lines\n    while (lines.length > 0 && lines[lines.length - 1] === '') {\n      lines.pop();\n    }\n\n    return lines;\n  }\n\n  /**\n   * Get the number of rendered lines.\n   */\n  get lineCount(): number {\n    return this.getLines().length;\n  }\n\n  /**\n   * Clean up terminal resources.\n   */\n  dispose(): void {\n    this.terminal.dispose();\n  }\n}\n"],"names":["xterm","Terminal","default","COLOR_MODE_DEFAULT","COLOR_MODE_16","COLOR_MODE_256","COLOR_MODE_RGB","DEFAULT_STYLE","fg","fgMode","bg","bgMode","bold","dim","italic","underline","inverse","strikethrough","styleEquals","a","b","buildAnsiCode","style","codes","push","r","g","length","join","TerminalBuffer","write","data","str","toString","terminal","resize","cols","rows","getLines","buffer","active","lines","i","bufferLine","getLine","result","currentStyle","_hasContent","lastContentIndex","j","cell","getCell","getChars","char","cellStyle","getFgColor","getFgColorMode","getBgColor","getBgColorMode","isBold","isDim","isItalic","isUnderline","isInverse","isStrikethrough","trimStart","pop","lineCount","dispose","scrollback","allowProposedApi"],"mappings":"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"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node/spawn-term/src/lib/TerminalBuffer.ts"],"sourcesContent":["import { StreamingTerminal } from 'terminal-model';\n\n/**\n * Wrapper around terminal-model's StreamingTerminal that provides a virtual terminal buffer.\n * Interprets ANSI escape sequences (cursor movement, line clearing, etc.) to produce\n * the actual rendered output rather than raw intermediate states.\n *\n * This implementation preserves whitespace and blank lines by NOT calling trimStart(),\n * which was the bug in the previous xterm-based implementation.\n */\nexport class TerminalBuffer {\n  private terminal: StreamingTerminal;\n  private allLines: string[] = [];\n\n  constructor(_cols: number, _scrollback = 10000) {\n    // terminal-model doesn't enforce column width during parsing\n    // It preserves all content as-is\n    this.terminal = new StreamingTerminal();\n\n    // Listen for completed lines (when \\n is encountered)\n    this.terminal.setLineReadyCallback(() => {\n      const line = this.terminal.renderLine();\n      this.terminal.reset();\n      this.allLines.push(line);\n    });\n  }\n\n  /**\n   * Write raw data to the terminal buffer.\n   * The terminal interprets all ANSI sequences automatically.\n   */\n  write(data: string | Buffer): void {\n    this.terminal.write(data);\n  }\n\n  /**\n   * Resize the terminal width.\n   * terminal-model doesn't use column constraints, so this is a no-op for compatibility.\n   */\n  resize(_cols: number): void {\n    // No-op - terminal-model doesn't enforce column width\n  }\n\n  /**\n   * Extract the rendered lines from the terminal buffer.\n   * This returns the actual visible content after all ANSI sequences\n   * have been processed, with color codes preserved.\n   *\n   * CRITICAL: Unlike the xterm implementation, we do NOT call trimStart(),\n   * which preserves legitimate indentation and blank lines.\n   */\n  getLines(): string[] {\n    // Flush any pending content (incomplete line without \\n)\n    if (this.terminal.hasContent()) {\n      const line = this.terminal.renderLine();\n      this.terminal.reset();\n      this.allLines.push(line);\n    }\n\n    // Return copy of all lines WITHOUT trimStart() - preserves whitespace\n    const lines = [...this.allLines];\n\n    // Trim trailing empty lines only\n    while (lines.length > 0 && lines[lines.length - 1] === '') {\n      lines.pop();\n    }\n\n    return lines;\n  }\n\n  /**\n   * Get the number of rendered lines.\n   */\n  get lineCount(): number {\n    return this.getLines().length;\n  }\n\n  /**\n   * Clean up terminal resources.\n   */\n  dispose(): void {\n    this.terminal.dispose();\n    this.allLines = [];\n  }\n}\n"],"names":["StreamingTerminal","TerminalBuffer","write","data","terminal","resize","_cols","getLines","hasContent","line","renderLine","reset","allLines","push","lines","length","pop","lineCount","dispose","_scrollback","setLineReadyCallback"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,iBAAiB;AAEnD;;;;;;;CAOC,GACD,OAAO,MAAMC;IAiBX;;;GAGC,GACDC,MAAMC,IAAqB,EAAQ;QACjC,IAAI,CAACC,QAAQ,CAACF,KAAK,CAACC;IACtB;IAEA;;;GAGC,GACDE,OAAOC,KAAa,EAAQ;IAC1B,sDAAsD;IACxD;IAEA;;;;;;;GAOC,GACDC,WAAqB;QACnB,yDAAyD;QACzD,IAAI,IAAI,CAACH,QAAQ,CAACI,UAAU,IAAI;YAC9B,MAAMC,OAAO,IAAI,CAACL,QAAQ,CAACM,UAAU;YACrC,IAAI,CAACN,QAAQ,CAACO,KAAK;YACnB,IAAI,CAACC,QAAQ,CAACC,IAAI,CAACJ;QACrB;QAEA,sEAAsE;QACtE,MAAMK,QAAQ;eAAI,IAAI,CAACF,QAAQ;SAAC;QAEhC,iCAAiC;QACjC,MAAOE,MAAMC,MAAM,GAAG,KAAKD,KAAK,CAACA,MAAMC,MAAM,GAAG,EAAE,KAAK,GAAI;YACzDD,MAAME,GAAG;QACX;QAEA,OAAOF;IACT;IAEA;;GAEC,GACD,IAAIG,YAAoB;QACtB,OAAO,IAAI,CAACV,QAAQ,GAAGQ,MAAM;IAC/B;IAEA;;GAEC,GACDG,UAAgB;QACd,IAAI,CAACd,QAAQ,CAACc,OAAO;QACrB,IAAI,CAACN,QAAQ,GAAG,EAAE;IACpB;IArEA,YAAYN,KAAa,EAAEa,cAAc,KAAK,CAAE;aAFxCP,WAAqB,EAAE;QAG7B,6DAA6D;QAC7D,iCAAiC;QACjC,IAAI,CAACR,QAAQ,GAAG,IAAIJ;QAEpB,sDAAsD;QACtD,IAAI,CAACI,QAAQ,CAACgB,oBAAoB,CAAC;YACjC,MAAMX,OAAO,IAAI,CAACL,QAAQ,CAACM,UAAU;YACrC,IAAI,CAACN,QAAQ,CAACO,KAAK;YACnB,IAAI,CAACC,QAAQ,CAACC,IAAI,CAACJ;QACrB;IACF;AA2DF"}

package/dist/esm/src/lib/TerminalBuffer.d.ts

@@ -1,6 +1,15 @@
+/**
+ * Wrapper around terminal-model's StreamingTerminal that provides a virtual terminal buffer.
+ * Interprets ANSI escape sequences (cursor movement, line clearing, etc.) to produce
+ * the actual rendered output rather than raw intermediate states.
+ *
+ * This implementation preserves whitespace and blank lines by NOT calling trimStart(),
+ * which was the bug in the previous xterm-based implementation.
+ */
 export declare class TerminalBuffer {
     private terminal;
-    constructor(cols: number, scrollback?: number);
+    private allLines;
+    constructor(_cols: number, _scrollback?: number);
     /**
      * Write raw data to the terminal buffer.
      * The terminal interprets all ANSI sequences automatically.
@@ -8,12 +17,16 @@ export declare class TerminalBuffer {
     write(data: string | Buffer): void;
     /**
      * Resize the terminal width.
+     * terminal-model doesn't use column constraints, so this is a no-op for compatibility.
      */
-    resize(cols: number): void;
+    resize(_cols: number): void;
     /**
      * Extract the rendered lines from the terminal buffer.
      * This returns the actual visible content after all ANSI sequences
      * have been processed, with color codes preserved.
+     *
+     * CRITICAL: Unlike the xterm implementation, we do NOT call trimStart(),
+     * which preserves legitimate indentation and blank lines.
      */
     getLines(): string[];
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spawn-term",
-  "version": "3.4.2",
+  "version": "3.5.0",
   "description": "Formats spawn with for terminal grouping",
   "keywords": [
     "spawn",
@@ -42,11 +42,11 @@
     "version": "tsds version"
   },
   "dependencies": {
-    "@xterm/headless": "^6.0.0",
     "cross-spawn-cb": "^3.0.0",
     "install-module-linked": "^1.3.16",
     "on-one": "^1.0.0",
-    "queue-cb": "^1.0.0"
+    "queue-cb": "^1.0.0",
+    "terminal-model": "^0.1.0"
   },
   "devDependencies": {
     "@types/mocha": "*",